1301 files changed, 41101 insertions, 19729 deletions

diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c
index da893c80d471..a9778c1587ab 100644
--- a/arch/arm/mach-imx/mx1ads.c
+++ b/arch/arm/mach-imx/mx1ads.c
@@ -116,7 +116,7 @@ static struct platform_device *devices[] __initdata = {
 };
 
 #ifdef CONFIG_MMC_IMX
-static int mx1ads_mmc_card_present(void)
+static int mx1ads_mmc_card_present(struct device *dev)
 {
         /* MMC/SD Card Detect is PB 20 on MX1ADS V1.0.7 */
         return (SSR(1) & (1 << 20) ? 0 : 1);
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index aab27297b3c6..2363cc64fe07 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -20,6 +20,7 @@
 #include <linux/interrupt.h>
 #include <linux/mmc/host.h>
 #include <linux/pm.h>
+#include <linux/backlight.h>
 
 #include <asm/setup.h>
 #include <asm/memory.h>
@@ -142,15 +143,28 @@ struct corgissp_machinfo corgi_ssp_machinfo = {
 /*
  * Corgi Backlight Device
  */
-static struct corgibl_machinfo corgi_bl_machinfo = {
+static void corgi_bl_kick_battery(void)
+{
+        void (*kick_batt)(void);
+
+        kick_batt = symbol_get(sharpsl_battery_kick);
+        if (kick_batt) {
+                kick_batt();
+                symbol_put(sharpsl_battery_kick);
+        }
+}
+
+static struct generic_bl_info corgi_bl_machinfo = {
+        .name = "corgi-bl",
         .max_intensity = 0x2f,
         .default_intensity = 0x1f,
         .limit_mask = 0x0b,
         .set_bl_intensity = corgi_bl_set_intensity,
+        .kick_battery = corgi_bl_kick_battery,
 };
 
 static struct platform_device corgibl_device = {
-        .name           = "corgi-bl",
+        .name           = "generic-bl",
         .dev            = {
                 .parent = &corgifb_device.dev,
                 .platform_data  = &corgi_bl_machinfo,
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index bae47e145de8..2d78199d24af 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/mmc/host.h>
 #include <linux/pm.h>
+#include <linux/backlight.h>
 
 #include <asm/setup.h>
 #include <asm/memory.h>
@@ -222,14 +223,27 @@ struct corgissp_machinfo spitz_ssp_machinfo = {
 /*
  * Spitz Backlight Device
  */
-static struct corgibl_machinfo spitz_bl_machinfo = {
+static void spitz_bl_kick_battery(void)
+{
+        void (*kick_batt)(void);
+
+        kick_batt = symbol_get(sharpsl_battery_kick);
+        if (kick_batt) {
+                kick_batt();
+                symbol_put(sharpsl_battery_kick);
+        }
+}
+
+static struct generic_bl_info spitz_bl_machinfo = {
+        .name = "corgi-bl",
         .default_intensity = 0x1f,
         .limit_mask = 0x0b,
         .max_intensity = 0x2f,
+        .kick_battery = spitz_bl_kick_battery,
 };
 
 static struct platform_device spitzbl_device = {
-        .name           = "corgi-bl",
+        .name           = "generic-bl",
         .dev            = {
                 .platform_data  = &spitz_bl_machinfo,
         },
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index 0ba7e9060c7b..c326983f4a8f 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -276,7 +276,21 @@ static unsigned char pm_osiris_ctrl0;
 
 static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state)
 {
+        unsigned int tmp;
+
         pm_osiris_ctrl0 = __raw_readb(OSIRIS_VA_CTRL0);
+        tmp = pm_osiris_ctrl0 & ~OSIRIS_CTRL0_NANDSEL;
+
+        /* ensure correct NAND slot is selected on resume */
+        if ((pm_osiris_ctrl0 & OSIRIS_CTRL0_BOOT_INT) == 0)
+                tmp |= 2;
+
+        __raw_writeb(tmp, OSIRIS_VA_CTRL0);
+
+        /* ensure that an nRESET is not generated on resume. */
+        s3c2410_gpio_setpin(S3C2410_GPA21, 1);
+        s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_OUT);
+
         return 0;
 }
 
@@ -285,6 +299,10 @@ static int osiris_pm_resume(struct sys_device *sd)
         if (pm_osiris_ctrl0 & OSIRIS_CTRL0_FIX8)
                 __raw_writeb(OSIRIS_CTRL1_FIX8, OSIRIS_VA_CTRL1);
 
+        __raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0);
+
+        s3c2410_gpio_cfgpin(S3C2410_GPA21, S3C2410_GPA21_nRSTOUT);
+
         return 0;
 }
 
diff --git a/arch/avr32/boards/atngw100/flash.c b/arch/avr32/boards/atngw100/flash.c
index f9b32a8eab9b..b07ae63aa548 100644
--- a/arch/avr32/boards/atngw100/flash.c
+++ b/arch/avr32/boards/atngw100/flash.c
@@ -15,7 +15,7 @@
 
 #include <asm/arch/smc.h>
 
-static struct smc_config flash_config __initdata = {
+static struct smc_timing flash_timing __initdata = {
         .ncs_read_setup         = 0,
         .nrd_setup              = 40,
         .ncs_write_setup        = 0,
@@ -28,7 +28,9 @@ static struct smc_config flash_config __initdata = {
 
         .read_cycle             = 120,
         .write_cycle            = 120,
+};
 
+static struct smc_config flash_config __initdata = {
         .bus_width              = 2,
         .nrd_controlled         = 1,
         .nwe_controlled         = 1,
@@ -82,6 +84,7 @@ static int __init atngw100_flash_init(void)
 {
         int ret;
 
+        smc_set_timing(&flash_config, &flash_timing);
         ret = smc_set_configuration(0, &flash_config);
         if (ret < 0) {
                 printk(KERN_ERR "atngw100: failed to set NOR flash timing\n");
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index ef801563bbf5..52987c81d668 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -125,8 +125,11 @@ static struct platform_device ngw_gpio_leds = {
 };
 
 static struct i2c_gpio_platform_data i2c_gpio_data = {
-        .sda_pin        = GPIO_PIN_PA(6),
-        .scl_pin        = GPIO_PIN_PA(7),
+        .sda_pin                = GPIO_PIN_PA(6),
+        .scl_pin                = GPIO_PIN_PA(7),
+        .sda_is_open_drain      = 1,
+        .scl_is_open_drain      = 1,
+        .udelay                 = 2,    /* close to 100 kHz */
 };
 
 static struct platform_device i2c_gpio_device = {
@@ -154,6 +157,7 @@ static int __init atngw100_init(void)
         set_hw_addr(at32_add_device_eth(1, &eth_data[1]));
 
         at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));
+        at32_add_device_usba(0, NULL);
 
         for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {
                 at32_select_gpio(ngw_leds[i].gpio,
@@ -161,8 +165,10 @@ static int __init atngw100_init(void)
         }
         platform_device_register(&ngw_gpio_leds);
 
-        at32_select_gpio(i2c_gpio_data.sda_pin, 0);
-        at32_select_gpio(i2c_gpio_data.scl_pin, 0);
+        at32_select_gpio(i2c_gpio_data.sda_pin,
+                AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
+        at32_select_gpio(i2c_gpio_data.scl_pin,
+                AT32_GPIOF_MULTIDRV | AT32_GPIOF_OUTPUT | AT32_GPIOF_HIGH);
         platform_device_register(&i2c_gpio_device);
 
         return 0;
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c
index c9981b731efa..6b9e466104ad 100644
--- a/arch/avr32/boards/atstk1000/atstk1002.c
+++ b/arch/avr32/boards/atstk1000/atstk1002.c
@@ -241,6 +241,7 @@ static int __init atstk1002_init(void)
         at32_add_device_lcdc(0, &atstk1000_lcdc_data,
                              fbmem_start, fbmem_size);
 #endif
+        at32_add_device_usba(0, NULL);
 #ifndef CONFIG_BOARD_ATSTK1002_SW3_CUSTOM
         at32_add_device_ssc(0, ATMEL_SSC_TX);
 #endif
diff --git a/arch/avr32/boards/atstk1000/flash.c b/arch/avr32/boards/atstk1000/flash.c
index aac4300cca12..3d0a102ad45e 100644
--- a/arch/avr32/boards/atstk1000/flash.c
+++ b/arch/avr32/boards/atstk1000/flash.c
@@ -15,7 +15,7 @@
 
 #include <asm/arch/smc.h>
 
-static struct smc_config flash_config __initdata = {
+static struct smc_timing flash_timing __initdata = {
         .ncs_read_setup         = 0,
         .nrd_setup              = 40,
         .ncs_write_setup        = 0,
@@ -28,7 +28,9 @@ static struct smc_config flash_config __initdata = {
 
         .read_cycle             = 120,
         .write_cycle            = 120,
+};
 
+static struct smc_config flash_config __initdata = {
         .bus_width              = 2,
         .nrd_controlled         = 1,
         .nwe_controlled         = 1,
@@ -82,6 +84,7 @@ static int __init atstk1000_flash_init(void)
 {
         int ret;
 
+        smc_set_timing(&flash_config, &flash_timing);
         ret = smc_set_configuration(0, &flash_config);
         if (ret < 0) {
                 printk(KERN_ERR "atstk1000: failed to set NOR flash timing\n");
diff --git a/arch/avr32/kernel/Makefile b/arch/avr32/kernel/Makefile
index 90e5afff54a2..989fcd1fef7e 100644
--- a/arch/avr32/kernel/Makefile
+++ b/arch/avr32/kernel/Makefile
@@ -11,8 +11,3 @@ obj-y				+= signal.o sys_avr32.o process.o time.o
 obj-y                           += init_task.o switch_to.o cpu.o
 obj-$(CONFIG_MODULES)           += module.o avr32_ksyms.o
 obj-$(CONFIG_KPROBES)           += kprobes.o
-
-USE_STANDARD_AS_RULE            := true
-
-%.lds: %.lds.c FORCE
-        $(call if_changed_dep,cpp_lds_S)
diff --git a/arch/avr32/kernel/entry-avr32b.S b/arch/avr32/kernel/entry-avr32b.S
index 42657f1703b2..ccadfd9b438d 100644
--- a/arch/avr32/kernel/entry-avr32b.S
+++ b/arch/avr32/kernel/entry-avr32b.S
@@ -159,11 +159,18 @@ handle_vmalloc_miss:
 
         .section .scall.text,"ax",@progbits
 system_call:
+#ifdef CONFIG_PREEMPT
+        mask_interrupts
+#endif
         pushm   r12             /* r12_orig */
         stmts   --sp, r0-lr
-        zero_fp
+
         mfsr    r0, SYSREG_RAR_SUP
         mfsr    r1, SYSREG_RSR_SUP
+#ifdef CONFIG_PREEMPT
+        unmask_interrupts
+#endif
+        zero_fp
         stm     --sp, r0-r1
 
         /* check for syscall tracing */
@@ -638,6 +645,13 @@ irq_level\level:
         stmts   --sp,r0-lr
         mfsr    r8, rar_int\level
         mfsr    r9, rsr_int\level
+
+#ifdef CONFIG_PREEMPT
+        sub     r11, pc, (. - system_call)
+        cp.w    r11, r8
+        breq    4f
+#endif
+
         pushm   r8-r9
 
         mov     r11, sp
@@ -668,6 +682,16 @@ irq_level\level:
         sub     sp, -4          /* ignore r12_orig */
         rete
 
+#ifdef CONFIG_PREEMPT
+4:      mask_interrupts
+        mfsr    r8, rsr_int\level
+        sbr     r8, 16
+        mtsr    rsr_int\level, r8
+        ldmts   sp++, r0-lr
+        sub     sp, -4          /* ignore r12_orig */
+        rete
+#endif
+
 2:      get_thread_info r0
         ld.w    r1, r0[TI_flags]
         bld     r1, TIF_CPU_GOING_TO_SLEEP
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index d08b0bc6b2bb..4b4c1884e1c5 100644
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -248,7 +248,7 @@ static int __init early_parse_fbmem(char *p)
 
         fbmem_size = memparse(p, &p);
         if (*p == '@') {
-                fbmem_start = memparse(p, &p);
+                fbmem_start = memparse(p + 1, &p);
                 ret = add_reserved_region(fbmem_start,
                                           fbmem_start + fbmem_size - 1,
                                           "Framebuffer");
diff --git a/arch/avr32/kernel/vmlinux.lds.c b/arch/avr32/kernel/vmlinux.lds.S
index db0438f35c00..ce9ac9659883 100644
--- a/arch/avr32/kernel/vmlinux.lds.c
+++ b/arch/avr32/kernel/vmlinux.lds.S
@@ -9,6 +9,8 @@
  */
 #define LOAD_OFFSET 0x00000000
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/cache.h>
+#include <asm/thread_info.h>
 
 OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
 OUTPUT_ARCH(avr32)
@@ -58,11 +60,10 @@ SECTIONS
                         *(.init.ramfs)
                 __initramfs_end = .;
 #endif
-                . = ALIGN(4096);
+                . = ALIGN(PAGE_SIZE);
                 __init_end = .;
         }
 
-        . = ALIGN(8192);
         .text           : AT(ADDR(.text) - LOAD_OFFSET) {
                 _evba = .;
                 _text = .;
@@ -96,7 +97,7 @@ SECTIONS
 
         RODATA
 
-        . = ALIGN(8192);
+        . = ALIGN(THREAD_SIZE);
 
         .data           : AT(ADDR(.data) - LOAD_OFFSET) {
                 _data = .;
@@ -107,7 +108,7 @@ SECTIONS
                 *(.data.init_task)
 
                 /* Then, the cacheline aligned data */
-                . = ALIGN(32);
+                . = ALIGN(L1_CACHE_BYTES);
                 *(.data.cacheline_aligned)
 
                 /* And the rest... */
diff --git a/arch/avr32/mach-at32ap/at32ap7000.c b/arch/avr32/mach-at32ap/at32ap7000.c
index 64cc5583ddfb..f6d154ca4d24 100644
--- a/arch/avr32/mach-at32ap/at32ap7000.c
+++ b/arch/avr32/mach-at32ap/at32ap7000.c
@@ -25,12 +25,6 @@
 #include "pio.h"
 #include "pm.h"
 
-/*
- * We can reduce the code size a bit by using a constant here. Since
- * this file is completely chip-specific, it's safe to not use
- * ioremap. Generic drivers should of course never do this.
- */
-#define AT32_PM_BASE    0xfff00000
 
 #define PBMEM(base)                                     \
         {                                               \
@@ -1168,6 +1162,72 @@ at32_add_device_ssc(unsigned int id, unsigned int flags)
 }
 
 /* --------------------------------------------------------------------
+ *  USB Device Controller
+ * -------------------------------------------------------------------- */
+static struct resource usba0_resource[] __initdata = {
+        {
+                .start          = 0xff300000,
+                .end            = 0xff3fffff,
+                .flags          = IORESOURCE_MEM,
+        }, {
+                .start          = 0xfff03000,
+                .end            = 0xfff033ff,
+                .flags          = IORESOURCE_MEM,
+        },
+        IRQ(31),
+};
+static struct clk usba0_pclk = {
+        .name           = "pclk",
+        .parent         = &pbb_clk,
+        .mode           = pbb_clk_mode,
+        .get_rate       = pbb_clk_get_rate,
+        .index          = 12,
+};
+static struct clk usba0_hclk = {
+        .name           = "hclk",
+        .parent         = &hsb_clk,
+        .mode           = hsb_clk_mode,
+        .get_rate       = hsb_clk_get_rate,
+        .index          = 6,
+};
+
+struct platform_device *__init
+at32_add_device_usba(unsigned int id, struct usba_platform_data *data)
+{
+        struct platform_device *pdev;
+
+        if (id != 0)
+                return NULL;
+
+        pdev = platform_device_alloc("atmel_usba_udc", 0);
+        if (!pdev)
+                return NULL;
+
+        if (platform_device_add_resources(pdev, usba0_resource,
+                                          ARRAY_SIZE(usba0_resource)))
+                goto out_free_pdev;
+
+        if (data) {
+                if (platform_device_add_data(pdev, data, sizeof(*data)))
+                        goto out_free_pdev;
+
+                if (data->vbus_pin != GPIO_PIN_NONE)
+                        at32_select_gpio(data->vbus_pin, 0);
+        }
+
+        usba0_pclk.dev = &pdev->dev;
+        usba0_hclk.dev = &pdev->dev;
+
+        platform_device_add(pdev);
+
+        return pdev;
+
+out_free_pdev:
+        platform_device_put(pdev);
+        return NULL;
+}
+
+/* --------------------------------------------------------------------
  *  GCLK
  * -------------------------------------------------------------------- */
 static struct clk gclk0 = {
@@ -1252,6 +1312,8 @@ struct clk *at32_clock_list[] = {
         &ssc0_pclk,
         &ssc1_pclk,
         &ssc2_pclk,
+        &usba0_hclk,
+        &usba0_pclk,
         &gclk0,
         &gclk1,
         &gclk2,
diff --git a/arch/avr32/mach-at32ap/clock.c b/arch/avr32/mach-at32ap/clock.c
index 0f8c89c9f832..4642117cc9ab 100644
--- a/arch/avr32/mach-at32ap/clock.c
+++ b/arch/avr32/mach-at32ap/clock.c
@@ -150,3 +150,119 @@ struct clk *clk_get_parent(struct clk *clk)
         return clk->parent;
 }
 EXPORT_SYMBOL(clk_get_parent);
+
+
+
+#ifdef CONFIG_DEBUG_FS
+
+/* /sys/kernel/debug/at32ap_clk */
+
+#include <linux/io.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
+#include "pm.h"
+
+
+#define NEST_DELTA      2
+#define NEST_MAX        6
+
+struct clkinf {
+        struct seq_file *s;
+        unsigned        nest;
+};
+
+static void
+dump_clock(struct clk *parent, struct clkinf *r)
+{
+        unsigned        nest = r->nest;
+        char            buf[16 + NEST_MAX];
+        struct clk      *clk;
+        unsigned        i;
+
+        /* skip clocks coupled to devices that aren't registered */
+        if (parent->dev && !parent->dev->bus_id[0] && !parent->users)
+                return;
+
+        /* <nest spaces> name <pad to end> */
+        memset(buf, ' ', sizeof(buf) - 1);
+        buf[sizeof(buf) - 1] = 0;
+        i = strlen(parent->name);
+        memcpy(buf + nest, parent->name,
+                        min(i, (unsigned)(sizeof(buf) - 1 - nest)));
+
+        seq_printf(r->s, "%s%c users=%2d %-3s %9ld Hz",
+                buf, parent->set_parent ? '*' : ' ',
+                parent->users,
+                parent->users ? "on" : "off",   /* NOTE: not-paranoid!! */
+                clk_get_rate(parent));
+        if (parent->dev)
+                seq_printf(r->s, ", for %s", parent->dev->bus_id);
+        seq_printf(r->s, "\n");
+
+        /* cost of this scan is small, but not linear... */
+        r->nest = nest + NEST_DELTA;
+        for (i = 3; i < at32_nr_clocks; i++) {
+                clk = at32_clock_list[i];
+                if (clk->parent == parent)
+                        dump_clock(clk, r);
+        }
+        r->nest = nest;
+}
+
+static int clk_show(struct seq_file *s, void *unused)
+{
+        struct clkinf   r;
+        int             i;
+
+        /* show all the power manager registers */
+        seq_printf(s, "MCCTRL  = %8x\n", pm_readl(MCCTRL));
+        seq_printf(s, "CKSEL   = %8x\n", pm_readl(CKSEL));
+        seq_printf(s, "CPUMASK = %8x\n", pm_readl(CPU_MASK));
+        seq_printf(s, "HSBMASK = %8x\n", pm_readl(HSB_MASK));
+        seq_printf(s, "PBAMASK = %8x\n", pm_readl(PBA_MASK));
+        seq_printf(s, "PBBMASK = %8x\n", pm_readl(PBB_MASK));
+        seq_printf(s, "PLL0    = %8x\n", pm_readl(PLL0));
+        seq_printf(s, "PLL1    = %8x\n", pm_readl(PLL1));
+        seq_printf(s, "IMR     = %8x\n", pm_readl(IMR));
+        for (i = 0; i < 8; i++) {
+                if (i == 5)
+                        continue;
+                seq_printf(s, "GCCTRL%d = %8x\n", i, pm_readl(GCCTRL(i)));
+        }
+
+        seq_printf(s, "\n");
+
+        /* show clock tree as derived from the three oscillators
+         * we "know" are at the head of the list
+         */
+        r.s = s;
+        r.nest = 0;
+        dump_clock(at32_clock_list[0], &r);
+        dump_clock(at32_clock_list[1], &r);
+        dump_clock(at32_clock_list[2], &r);
+
+        return 0;
+}
+
+static int clk_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, clk_show, NULL);
+}
+
+static const struct file_operations clk_operations = {
+        .open           = clk_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+static int __init clk_debugfs_init(void)
+{
+        (void) debugfs_create_file("at32ap_clk", S_IFREG | S_IRUGO,
+                        NULL, NULL, &clk_operations);
+
+        return 0;
+}
+postcore_initcall(clk_debugfs_init);
+
+#endif
diff --git a/arch/avr32/mach-at32ap/hsmc.c b/arch/avr32/mach-at32ap/hsmc.c
index 5e22a750632b..704607fbcc69 100644
--- a/arch/avr32/mach-at32ap/hsmc.c
+++ b/arch/avr32/mach-at32ap/hsmc.c
@@ -29,16 +29,25 @@ struct hsmc {
 
 static struct hsmc *hsmc;
 
-int smc_set_configuration(int cs, const struct smc_config *config)
+void smc_set_timing(struct smc_config *config,
+                    const struct smc_timing *timing)
 {
+        int recover;
+        int cycle;
+
         unsigned long mul;
-        unsigned long offset;
-        u32 setup, pulse, cycle, mode;
 
-        if (!hsmc)
-                return -ENODEV;
-        if (cs >= NR_CHIP_SELECTS)
-                return -EINVAL;
+        /* Reset all SMC timings */
+        config->ncs_read_setup  = 0;
+        config->nrd_setup       = 0;
+        config->ncs_write_setup = 0;
+        config->nwe_setup       = 0;
+        config->ncs_read_pulse  = 0;
+        config->nrd_pulse       = 0;
+        config->ncs_write_pulse = 0;
+        config->nwe_pulse       = 0;
+        config->read_cycle      = 0;
+        config->write_cycle     = 0;
 
         /*
          * cycles = x / T = x * f
@@ -50,16 +59,102 @@ int smc_set_configuration(int cs, const struct smc_config *config)
 
 #define ns2cyc(x) ((((x) * mul) + 65535) >> 16)
 
-        setup = (HSMC_BF(NWE_SETUP, ns2cyc(config->nwe_setup))
-                 | HSMC_BF(NCS_WR_SETUP, ns2cyc(config->ncs_write_setup))
-                 | HSMC_BF(NRD_SETUP, ns2cyc(config->nrd_setup))
-                 | HSMC_BF(NCS_RD_SETUP, ns2cyc(config->ncs_read_setup)));
-        pulse = (HSMC_BF(NWE_PULSE, ns2cyc(config->nwe_pulse))
-                 | HSMC_BF(NCS_WR_PULSE, ns2cyc(config->ncs_write_pulse))
-                 | HSMC_BF(NRD_PULSE, ns2cyc(config->nrd_pulse))
-                 | HSMC_BF(NCS_RD_PULSE, ns2cyc(config->ncs_read_pulse)));
-        cycle = (HSMC_BF(NWE_CYCLE, ns2cyc(config->write_cycle))
-                 | HSMC_BF(NRD_CYCLE, ns2cyc(config->read_cycle)));
+        if (timing->ncs_read_setup > 0)
+                config->ncs_read_setup = ns2cyc(timing->ncs_read_setup);
+
+        if (timing->nrd_setup > 0)
+                config->nrd_setup = ns2cyc(timing->nrd_setup);
+
+        if (timing->ncs_write_setup > 0)
+                config->ncs_write_setup = ns2cyc(timing->ncs_write_setup);
+
+        if (timing->nwe_setup > 0)
+                config->nwe_setup = ns2cyc(timing->nwe_setup);
+
+        if (timing->ncs_read_pulse > 0)
+                config->ncs_read_pulse = ns2cyc(timing->ncs_read_pulse);
+
+        if (timing->nrd_pulse > 0)
+                config->nrd_pulse = ns2cyc(timing->nrd_pulse);
+
+        if (timing->ncs_write_pulse > 0)
+                config->ncs_write_pulse = ns2cyc(timing->ncs_write_pulse);
+
+        if (timing->nwe_pulse > 0)
+                config->nwe_pulse = ns2cyc(timing->nwe_pulse);
+
+        if (timing->read_cycle > 0)
+                config->read_cycle = ns2cyc(timing->read_cycle);
+
+        if (timing->write_cycle > 0)
+                config->write_cycle = ns2cyc(timing->write_cycle);
+
+        /* Extend read cycle in needed */
+        if (timing->ncs_read_recover > 0)
+                recover = ns2cyc(timing->ncs_read_recover);
+        else
+                recover = 1;
+
+        cycle = config->ncs_read_setup + config->ncs_read_pulse + recover;
+
+        if (config->read_cycle < cycle)
+                config->read_cycle = cycle;
+
+        /* Extend read cycle in needed */
+        if (timing->nrd_recover > 0)
+                recover = ns2cyc(timing->nrd_recover);
+        else
+                recover = 1;
+
+        cycle = config->nrd_setup + config->nrd_pulse + recover;
+
+        if (config->read_cycle < cycle)
+                config->read_cycle = cycle;
+
+        /* Extend write cycle in needed */
+        if (timing->ncs_write_recover > 0)
+                recover = ns2cyc(timing->ncs_write_recover);
+        else
+                recover = 1;
+
+        cycle = config->ncs_write_setup + config->ncs_write_pulse + recover;
+
+        if (config->write_cycle < cycle)
+                config->write_cycle = cycle;
+
+        /* Extend write cycle in needed */
+        if (timing->nwe_recover > 0)
+                recover = ns2cyc(timing->nwe_recover);
+        else
+                recover = 1;
+
+        cycle = config->nwe_setup + config->nwe_pulse + recover;
+
+        if (config->write_cycle < cycle)
+                config->write_cycle = cycle;
+}
+EXPORT_SYMBOL(smc_set_timing);
+
+int smc_set_configuration(int cs, const struct smc_config *config)
+{
+        unsigned long offset;
+        u32 setup, pulse, cycle, mode;
+
+        if (!hsmc)
+                return -ENODEV;
+        if (cs >= NR_CHIP_SELECTS)
+                return -EINVAL;
+
+        setup = (HSMC_BF(NWE_SETUP, config->nwe_setup)
+                 | HSMC_BF(NCS_WR_SETUP, config->ncs_write_setup)
+                 | HSMC_BF(NRD_SETUP, config->nrd_setup)
+                 | HSMC_BF(NCS_RD_SETUP, config->ncs_read_setup));
+        pulse = (HSMC_BF(NWE_PULSE, config->nwe_pulse)
+                 | HSMC_BF(NCS_WR_PULSE, config->ncs_write_pulse)
+                 | HSMC_BF(NRD_PULSE, config->nrd_pulse)
+                 | HSMC_BF(NCS_RD_PULSE, config->ncs_read_pulse));
+        cycle = (HSMC_BF(NWE_CYCLE, config->write_cycle)
+                 | HSMC_BF(NRD_CYCLE, config->read_cycle));
 
         switch (config->bus_width) {
         case 1:
diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c
index 1eb99b814f5b..d61a02da898c 100644
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
@@ -110,6 +110,10 @@ void __init at32_select_gpio(unsigned int pin, unsigned long flags)
                         pio_writel(pio, SODR, mask);
                 else
                         pio_writel(pio, CODR, mask);
+                if (flags & AT32_GPIOF_MULTIDRV)
+                        pio_writel(pio, MDER, mask);
+                else
+                        pio_writel(pio, MDDR, mask);
                 pio_writel(pio, PUDR, mask);
                 pio_writel(pio, OER, mask);
         } else {
diff --git a/arch/avr32/mach-at32ap/pm.h b/arch/avr32/mach-at32ap/pm.h
index a1f8aced0a8c..47efd0d1951f 100644
--- a/arch/avr32/mach-at32ap/pm.h
+++ b/arch/avr32/mach-at32ap/pm.h
@@ -4,6 +4,14 @@
 #ifndef __ARCH_AVR32_MACH_AT32AP_PM_H__
 #define __ARCH_AVR32_MACH_AT32AP_PM_H__
 
+/*
+ * We can reduce the code size a bit by using a constant here. Since
+ * this file is only used on AVR32 AP CPUs with segmentation enabled,
+ * it's safe to not use ioremap. Generic drivers should of course
+ * never do this.
+ */
+#define AT32_PM_BASE    0xfff00000
+
 /* PM register offsets */
 #define PM_MCCTRL                               0x0000
 #define PM_CKSEL                                0x0004
diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
index 82cf70854b90..480760bde63f 100644
--- a/arch/avr32/mm/init.c
+++ b/arch/avr32/mm/init.c
@@ -224,19 +224,9 @@ void free_initmem(void)
 
 #ifdef CONFIG_BLK_DEV_INITRD
 
-static int keep_initrd;
-
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        if (!keep_initrd)
-                free_area(start, end, "initrd");
-}
-
-static int __init keepinitrd_setup(char *__unused)
-{
-        keep_initrd = 1;
-        return 1;
+        free_area(start, end, "initrd");
 }
 
-__setup("keepinitrd", keepinitrd_setup);
 #endif
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 017defaa525b..b24f4535ffe0 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -57,7 +57,7 @@ config GENERIC_TIME
         bool
         default n
 
-config GENERIC_CALIBRATE_DELAY
+config GENERIC_GPIO
         bool
         default y
 
@@ -323,7 +323,7 @@ config CMDLINE
           to the kernel, you may specify one here. As a minimum, you should specify
           the memory size and the root device (e.g., mem=8M, root=/dev/nfs).
 
-comment "Board Setup"
+comment "Clock/PLL Setup"
 
 config CLKIN_HZ
         int "Crystal Frequency in Hz"
@@ -335,6 +335,118 @@ config CLKIN_HZ
         help
           The frequency of CLKIN crystal oscillator on the board in Hz.
 
+config BFIN_KERNEL_CLOCK
+        bool "Re-program Clocks while Kernel boots?"
+        default n
+        help
+          This option decides if kernel clocks are re-programed from the
+          bootloader settings. If the clocks are not set, the SDRAM settings
+          are also not changed, and the Bootloader does 100% of the hardware
+          configuration.
+
+config PLL_BYPASS
+        bool "Bypass PLL"
+        depends on BFIN_KERNEL_CLOCK
+        default n
+
+config CLKIN_HALF
+        bool "Half Clock In"
+        depends on BFIN_KERNEL_CLOCK && (! PLL_BYPASS)
+        default n
+        help
+          If this is set the clock will be divided by 2, before it goes to the PLL.
+
+config VCO_MULT
+        int "VCO Multiplier"
+        depends on BFIN_KERNEL_CLOCK && (! PLL_BYPASS)
+        range 1 64
+        default "22" if BFIN533_EZKIT
+        default "45" if BFIN533_STAMP
+        default "20" if BFIN537_STAMP
+        default "22" if BFIN533_BLUETECHNIX_CM
+        default "20" if BFIN537_BLUETECHNIX_CM
+        default "20" if BFIN561_BLUETECHNIX_CM
+        default "20" if BFIN561_EZKIT
+        help
+          This controls the frequency of the on-chip PLL. This can be between 1 and 64.
+          PLL Frequency = (Crystal Frequency) * (this setting)
+
+choice
+        prompt "Core Clock Divider"
+        depends on BFIN_KERNEL_CLOCK
+        default CCLK_DIV_1
+        help
+          This sets the frequency of the core. It can be 1, 2, 4 or 8
+          Core Frequency = (PLL frequency) / (this setting)
+
+config CCLK_DIV_1
+        bool "1"
+
+config CCLK_DIV_2
+        bool "2"
+
+config CCLK_DIV_4
+        bool "4"
+
+config CCLK_DIV_8
+        bool "8"
+endchoice
+
+config SCLK_DIV
+        int "System Clock Divider"
+        depends on BFIN_KERNEL_CLOCK
+        range 1 15
+        default 5 if BFIN533_EZKIT
+        default 5 if BFIN533_STAMP
+        default 4 if BFIN537_STAMP
+        default 5 if BFIN533_BLUETECHNIX_CM
+        default 4 if BFIN537_BLUETECHNIX_CM
+        default 4 if BFIN561_BLUETECHNIX_CM
+        default 5 if BFIN561_EZKIT
+        help
+          This sets the frequency of the system clock (including SDRAM or DDR).
+          This can be between 1 and 15
+          System Clock = (PLL frequency) / (this setting)
+
+#
+# Max & Min Speeds for various Chips
+#
+config MAX_VCO_HZ
+        int
+        default 600000000 if BF522
+        default 600000000 if BF525
+        default 600000000 if BF527
+        default 400000000 if BF531
+        default 400000000 if BF532
+        default 750000000 if BF533
+        default 500000000 if BF534
+        default 400000000 if BF536
+        default 600000000 if BF537
+        default 533000000 if BF538
+        default 533000000 if BF539
+        default 600000000 if BF542
+        default 533000000 if BF544
+        default 533000000 if BF549
+        default 600000000 if BF561
+
+config MIN_VCO_HZ
+        int
+        default 50000000
+
+config MAX_SCLK_HZ
+        int
+        default 133000000
+
+config MIN_SCLK_HZ
+        int
+        default 27000000
+
+comment "Kernel Timer/Scheduler"
+
+source kernel/Kconfig.hz
+
+comment "Memory Setup"
+
 config MEM_SIZE
         int "SDRAM Memory Size in MBytes"
         default  32 if BFIN533_EZKIT
@@ -364,15 +476,16 @@ config ENET_FLASH_PIN
 config BOOT_LOAD
         hex "Kernel load address for booting"
         default "0x1000"
+        range 0x1000 0x20000000
         help
           This option allows you to set the load address of the kernel.
           This can be useful if you are on a board which has a small amount
           of memory or you wish to reserve some memory at the beginning of
           the address space.
 
-          Note that you generally want to keep this value at or above 4k
-          (0x1000) as this will allow the kernel to capture NULL pointer
-          references.
+          Note that you need to keep this value above 4k (0x1000) as this
+          memory region is used to capture NULL pointer references as well
+          as some core kernel functions.
 
 comment "LED Status Indicators"
         depends on (BFIN533_STAMP || BFIN533_BLUETECHNIX_CM)
@@ -408,6 +521,52 @@ config BFIN_IDLE_LED_NUM
         help
           Select the LED (marked on the board) for you to blink.
 
+choice
+        prompt "Blackfin Exception Scratch Register"
+        default BFIN_SCRATCH_REG_RETN
+        help
+          Select the resource to reserve for the Exception handler:
+            - RETN: Non-Maskable Interrupt (NMI)
+            - RETE: Exception Return (JTAG/ICE)
+            - CYCLES: Performance counter
+
+          If you are unsure, please select "RETN".
+
+config BFIN_SCRATCH_REG_RETN
+        bool "RETN"
+        help
+          Use the RETN register in the Blackfin exception handler
+          as a stack scratch register.  This means you cannot
+          safely use NMI on the Blackfin while running Linux, but
+          you can debug the system with a JTAG ICE and use the
+          CYCLES performance registers.
+
+          If you are unsure, please select "RETN".
+
+config BFIN_SCRATCH_REG_RETE
+        bool "RETE"
+        help
+          Use the RETE register in the Blackfin exception handler
+          as a stack scratch register.  This means you cannot
+          safely use a JTAG ICE while debugging a Blackfin board,
+          but you can safely use the CYCLES performance registers
+          and the NMI.
+
+          If you are unsure, please select "RETN".
+
+config BFIN_SCRATCH_REG_CYCLES
+        bool "CYCLES"
+        help
+          Use the CYCLES register in the Blackfin exception handler
+          as a stack scratch register.  This means you cannot
+          safely use the CYCLES performance registers on a Blackfin
+          board at anytime, but you can debug the system with a JTAG
+          ICE and use the NMI.
+
+          If you are unsure, please select "RETN".
+
+endchoice
+
 #
 # Sorry - but you need to put the hex address here -
 #
@@ -448,10 +607,6 @@ endmenu
 
 menu "Blackfin Kernel Optimizations"
 
-comment "Timer Tick"
-
-source kernel/Kconfig.hz
-
 comment "Memory Optimizations"
 
 config I_ENTRY_L1
@@ -614,22 +769,22 @@ endchoice
 
 
 comment "Cache Support"
-config BLKFIN_CACHE
+config BFIN_ICACHE
         bool "Enable ICACHE"
-config BLKFIN_DCACHE
+config BFIN_DCACHE
         bool "Enable DCACHE"
-config BLKFIN_DCACHE_BANKA
+config BFIN_DCACHE_BANKA
         bool "Enable only 16k BankA DCACHE - BankB is SRAM"
-        depends on BLKFIN_DCACHE && !BF531
+        depends on BFIN_DCACHE && !BF531
         default n
-config BLKFIN_CACHE_LOCK
-        bool "Enable Cache Locking"
+config BFIN_ICACHE_LOCK
+        bool "Enable Instruction Cache Locking"
 
 choice
         prompt "Policy"
-        depends on BLKFIN_DCACHE
-        default BLKFIN_WB
-config BLKFIN_WB
+        depends on BFIN_DCACHE
+        default BFIN_WB
+config BFIN_WB
         bool "Write back"
         help
           Write Back Policy:
@@ -646,7 +801,7 @@ config BLKFIN_WB
           If you are unsure of the options and you want to be safe,
           then go with Write Through.
 
-config BLKFIN_WT
+config BFIN_WT
         bool "Write through"
         help
           Write Back Policy:
@@ -672,66 +827,9 @@ config L1_MAX_PIECE
           Set the max memory pieces for the L1 SRAM allocation algorithm.
           Min value is 16. Max value is 1024.
 
-menu "Clock Settings"
-
-
-config BFIN_KERNEL_CLOCK
-        bool "Re-program Clocks while Kernel boots?"
-        default n
-        help
-          This option decides if kernel clocks are re-programed from the
-          bootloader settings. If the clocks are not set, the SDRAM settings
-          are also not changed, and the Bootloader does 100% of the hardware
-          configuration.
-
-config VCO_MULT
-        int "VCO Multiplier"
-        depends on BFIN_KERNEL_CLOCK
-        default "22" if BFIN533_EZKIT
-        default "45" if BFIN533_STAMP
-        default "20" if BFIN537_STAMP
-        default "22" if BFIN533_BLUETECHNIX_CM
-        default "20" if BFIN537_BLUETECHNIX_CM
-        default "20" if BFIN561_BLUETECHNIX_CM
-        default "20" if BFIN561_EZKIT
-
-config CCLK_DIV
-        int "Core Clock Divider"
-        depends on BFIN_KERNEL_CLOCK
-        default 1 if BFIN533_EZKIT
-        default 1 if BFIN533_STAMP
-        default 1 if BFIN537_STAMP
-        default 1 if BFIN533_BLUETECHNIX_CM
-        default 1 if BFIN537_BLUETECHNIX_CM
-        default 1 if BFIN561_BLUETECHNIX_CM
-        default 1 if BFIN561_EZKIT
-
-config SCLK_DIV
-        int "System Clock Divider"
-        depends on BFIN_KERNEL_CLOCK
-        default 5 if BFIN533_EZKIT
-        default 5 if BFIN533_STAMP
-        default 4 if BFIN537_STAMP
-        default 5 if BFIN533_BLUETECHNIX_CM
-        default 4 if BFIN537_BLUETECHNIX_CM
-        default 4 if BFIN561_BLUETECHNIX_CM
-        default 5 if BFIN561_EZKIT
-
-config CLKIN_HALF
-        bool "Half ClockIn"
-        depends on BFIN_KERNEL_CLOCK
-        default n
-
-config PLL_BYPASS
-        bool "Bypass PLL"
-        depends on BFIN_KERNEL_CLOCK
-        default n
-
-endmenu
-
 comment "Asynchonous Memory Configuration"
 
-menu "EBIU_AMBCTL Global Control"
+menu "EBIU_AMGCTL Global Control"
 config C_AMCKEN
         bool "Enable CLKOUT"
         default y
@@ -941,24 +1039,6 @@ config DEBUG_ICACHE_CHECK
           also relocates the irq_panic() function to L1 memory, (which is
           un-cached).
 
-config DEBUG_KERNEL_START
-        bool "Debug Kernel Startup"
-        depends on DEBUG_KERNEL
-        help
-          Say Y here to put in an mini-execption handler before the kernel
-          replaces the bootloader exception handler. This will stop kernels
-          from dieing at startup with no visible error messages.
-
-config DEBUG_SERIAL_EARLY_INIT
-        bool "Initialize serial driver early"
-        default n
-        depends on SERIAL_BFIN
-        help
-          Say Y here if you want to get kernel output early when kernel
-          crashes before the normal console initialization. If this option
-          is enable, console output will always go to the ttyBF0, no matter
-          what kernel boot paramters you set.
-
 config DEBUG_HUNT_FOR_ZERO
         bool "Catch NULL pointer reads/writes"
         default y
@@ -973,8 +1053,89 @@ config DEBUG_HUNT_FOR_ZERO
           Enabling this option will take up an extra entry in CPLB table.
           Otherwise, there is no extra overhead.
 
+config DEBUG_BFIN_HWTRACE_ON
+        bool "Turn on Blackfin's Hardware Trace"
+        default y
+        help
+          All Blackfins include a Trace Unit which stores a history of the last
+          16 changes in program flow taken by the program sequencer. The history
+          allows the user to recreate the program sequencer’s recent path. This
+          can be handy when an application dies - we print out the execution
+          path of how it got to the offending instruction.
+
+          By turning this off, you may save a tiny amount of power.
+
+choice
+        prompt "Omit loop Tracing"
+        default DEBUG_BFIN_HWTRACE_COMPRESSION_OFF
+        depends on DEBUG_BFIN_HWTRACE_ON
+        help
+          The trace buffer can be configured to omit recording of changes in
+          program flow that match either the last entry or one of the last
+          two entries. Omitting one of these entries from the record prevents
+          the trace buffer from overflowing because of any sort of loop (for, do
+          while, etc) in the program.
+
+          Because zero-overhead Hardware loops are not recorded in the trace buffer,
+          this feature can be used to prevent trace overflow from loops that
+          are nested four deep.
+
+config DEBUG_BFIN_HWTRACE_COMPRESSION_OFF
+        bool "Trace all Loops"
+        help
+          The trace buffer records all changes of flow 
+
+config DEBUG_BFIN_HWTRACE_COMPRESSION_ONE
+        bool "Compress single-level loops"
+        help
+          The trace buffer does not record single loops - helpful if trace 
+          is spinning on a while or do loop.
+
+config DEBUG_BFIN_HWTRACE_COMPRESSION_TWO
+        bool "Compress two-level loops"
+        help
+          The trace buffer does not record loops two levels deep. Helpful if
+          the trace is spinning in a nested loop
+
+endchoice
+
+config DEBUG_BFIN_HWTRACE_COMPRESSION
+        int
+        depends on DEBUG_BFIN_HWTRACE_ON
+        default 0 if DEBUG_BFIN_HWTRACE_COMPRESSION_OFF
+        default 1 if DEBUG_BFIN_HWTRACE_COMPRESSION_ONE
+        default 2 if DEBUG_BFIN_HWTRACE_COMPRESSION_TWO
+
+
+config DEBUG_BFIN_HWTRACE_EXPAND
+        bool "Expand Trace Buffer greater than 16 entries"
+        depends on DEBUG_BFIN_HWTRACE_ON
+        default n
+        help
+          By selecting this option, every time the 16 hardware entries in
+          the Blackfin's HW Trace buffer are full, the kernel will move them
+          into a software buffer, for dumping when there is an issue. This 
+          has a great impact on performance, (an interrupt every 16 change of 
+          flows) and should normally be turned off, except in those nasty
+          debugging sessions
+
+config DEBUG_BFIN_HWTRACE_EXPAND_LEN
+        int "Size of Trace buffer (in power of 2k)"
+        range 0 4
+        depends on DEBUG_BFIN_HWTRACE_EXPAND
+        default 1
+        help
+          This sets the size of the software buffer that the trace information
+          is kept in.
+          0 for (2^0)  1k, or 256 entries,
+          1 for (2^1)  2k, or 512 entries,
+          2 for (2^2)  4k, or 1024 entries,
+          3 for (2^3)  8k, or 2048 entries,
+          4 for (2^4) 16k, or 4096 entries
+
 config DEBUG_BFIN_NO_KERN_HWTRACE
         bool "Trace user apps (turn off hwtrace in kernel)"
+        depends on DEBUG_BFIN_HWTRACE_ON
         default n
         help
           Some pieces of the kernel contain a lot of flow changes which can
@@ -985,6 +1146,20 @@ config DEBUG_BFIN_NO_KERN_HWTRACE
           Say Y here to disable hardware tracing in some known "jumpy" pieces
           of code so that the trace buffer will extend further back.
 
+config EARLY_PRINTK
+        bool "Early printk" 
+        default n
+        help
+          This option enables special console drivers which allow the kernel
+          to print messages very early in the bootup process.
+
+          This is useful for kernel debugging when your machine crashes very
+          early before the console code is initialized. After enabling this
+          feature, you must add "earlyprintk=serial,uart0,57600" to the
+          command line (bootargs). It is safe to say Y here in all cases, as
+          all of this lives in the init section and is thrown away after the
+          kernel boots completely.
+
 config DUAL_CORE_TEST_MODULE
         tristate "Dual Core Test Module"
         depends on (BF561)
diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig
index 1cf1ab28dc66..57f58d5cd47a 100644
--- a/arch/blackfin/configs/BF533-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF533-EZKIT_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.5
+# Linux kernel version: 2.6.22.6
 #
 # CONFIG_MMU is not set
 # CONFIG_FPU is not set
@@ -15,8 +15,9 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 # CONFIG_GENERIC_TIME is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_GPIO=y
 CONFIG_FORCE_MAX_ZONEORDER=14
+CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_IRQCHIP_DEMUX_GPIO=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
@@ -40,7 +41,9 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -58,15 +61,20 @@ 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_VM_EVENT_COUNTERS=y
 CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
-CONFIG_BUDDY=y
 # CONFIG_NP2 is not set
 CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -184,19 +192,17 @@ CONFIG_WDTIMER=13
 # CONFIG_CMDLINE_BOOL is not set
 
 #
-# Board Setup
+# Clock/PLL Setup
 #
 CONFIG_CLKIN_HZ=27000000
-CONFIG_MEM_SIZE=32
-CONFIG_MEM_ADD_WIDTH=9
-CONFIG_BOOT_LOAD=0x1000
-
-#
-# Blackfin Kernel Optimizations
-#
+# CONFIG_BFIN_KERNEL_CLOCK is not set
+CONFIG_MAX_VCO_HZ=750000000
+CONFIG_MIN_VCO_HZ=50000000
+CONFIG_MAX_SCLK_HZ=133000000
+CONFIG_MIN_SCLK_HZ=27000000
 
 #
-# Timer Tick
+# Kernel Timer/Scheduler
 #
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
@@ -205,6 +211,20 @@ CONFIG_HZ_250=y
 CONFIG_HZ=250
 
 #
+# Memory Setup
+#
+CONFIG_MEM_SIZE=32
+CONFIG_MEM_ADD_WIDTH=9
+CONFIG_BOOT_LOAD=0x1000
+CONFIG_BFIN_SCRATCH_REG_RETN=y
+# CONFIG_BFIN_SCRATCH_REG_RETE is not set
+# CONFIG_BFIN_SCRATCH_REG_CYCLES is not set
+
+#
+# Blackfin Kernel Optimizations
+#
+
+#
 # Memory Optimizations
 #
 CONFIG_I_ENTRY_L1=y
@@ -243,20 +263,15 @@ CONFIG_DMA_UNCACHED_1M=y
 #
 # Cache Support
 #
-CONFIG_BLKFIN_CACHE=y
-CONFIG_BLKFIN_DCACHE=y
-# CONFIG_BLKFIN_DCACHE_BANKA is not set
-# CONFIG_BLKFIN_CACHE_LOCK is not set
-# CONFIG_BLKFIN_WB is not set
-CONFIG_BLKFIN_WT=y
+CONFIG_BFIN_ICACHE=y
+CONFIG_BFIN_DCACHE=y
+# CONFIG_BFIN_DCACHE_BANKA is not set
+# CONFIG_BFIN_ICACHE_LOCK is not set
+# CONFIG_BFIN_WB is not set
+CONFIG_BFIN_WT=y
 CONFIG_L1_MAX_PIECE=16
 
 #
-# Clock Settings
-#
-# CONFIG_BFIN_KERNEL_CLOCK is not set
-
-#
 # Asynchonous Memory Configuration
 #
 
@@ -277,12 +292,13 @@ CONFIG_C_AMBEN_ALL=y
 CONFIG_BANK_0=0x7BB0
 CONFIG_BANK_1=0x7BB0
 CONFIG_BANK_2=0x7BB0
-CONFIG_BANK_3=0x99B3
+CONFIG_BANK_3=0xAAC3
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
 # CONFIG_PCI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -290,10 +306,6 @@ CONFIG_BANK_3=0x99B3
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF_FDPIC=y
@@ -327,7 +339,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -368,20 +379,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_NETLABEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -448,7 +447,16 @@ CONFIG_IRTTY_SIR=m
 # FIR device drivers
 #
 # 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
 
 #
 # Device Drivers
@@ -466,10 +474,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -513,7 +517,6 @@ CONFIG_MTD_MW320D=m
 CONFIG_MTD_RAM=y
 CONFIG_MTD_ROM=m
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -550,16 +553,13 @@ CONFIG_BFIN_FLASH_BANK_3=0x7BB0
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
 
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 
 #
 # Parallel port support
@@ -587,10 +587,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 
 #
@@ -599,10 +595,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 
 #
@@ -611,19 +603,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_MD is not set
 
 #
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -631,10 +610,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 
 #
@@ -644,27 +619,15 @@ CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
 # CONFIG_SMSC911X is not set
+# CONFIG_DM9000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# 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
@@ -688,6 +651,7 @@ CONFIG_SMC91X=y
 #
 CONFIG_INPUT=m
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -704,6 +668,7 @@ CONFIG_INPUT_EVDEV=m
 # 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
 
@@ -718,7 +683,7 @@ CONFIG_INPUT_EVDEV=m
 #
 # CONFIG_AD9960 is not set
 # CONFIG_SPI_ADC_BF533 is not set
-# CONFIG_BF5xx_PFLAGS is not set
+# CONFIG_BFIN_PFLAGS is not set
 # CONFIG_BF5xx_PPIFCD is not set
 # CONFIG_BF5xx_TIMERS is not set
 # CONFIG_BF5xx_PPI is not set
@@ -758,10 +723,6 @@ CONFIG_UNIX98_PTYS=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
@@ -773,7 +734,6 @@ CONFIG_BFIN_WDT=y
 CONFIG_HW_RANDOM=y
 # CONFIG_GEN_RTC is not set
 CONFIG_BLACKFIN_DPMC=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 
@@ -781,10 +741,6 @@ CONFIG_BLACKFIN_DPMC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -803,22 +759,22 @@ CONFIG_SPI_BFIN=y
 # SPI Protocol Masters
 #
 # CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
 
 #
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_LM70 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_HWMON_DEBUG_CHIP is not set
 
 #
@@ -830,16 +786,19 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 
 #
@@ -862,18 +821,17 @@ CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB is not set
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# Enable Host or Gadget support to see Inventra options
 #
 
 #
-# USB Gadget Support
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
-# CONFIG_USB_GADGET is not set
 
 #
-# MMC/SD Card support
+# USB Gadget Support
 #
-# CONFIG_SPI_MMC is not set
+# CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
 
 #
@@ -913,17 +871,29 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
 
 #
-# RTC drivers
+# Platform RTC drivers
 #
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
 CONFIG_RTC_DRV_BFIN=y
 
 #
@@ -940,14 +910,6 @@ CONFIG_RTC_DRV_BFIN=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
-#
-
-#
 # PBX support
 #
 # CONFIG_PBX is not set
@@ -1047,6 +1009,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -1124,14 +1087,20 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set
+CONFIG_DEBUG_MMRS=y
 CONFIG_DEBUG_HUNT_FOR_ZERO=y
+CONFIG_DEBUG_BFIN_HWTRACE_ON=y
+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y
+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE is not set
+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_TWO is not set
+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0
+# CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set
 # CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
+CONFIG_EARLY_PRINTK=y
 CONFIG_CPLB_INFO=y
 CONFIG_ACCESS_CHECK=y
 
@@ -1154,6 +1123,7 @@ CONFIG_SECURITY_CAPABILITIES=m
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
@@ -1161,3 +1131,4 @@ CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig
index 64b7f1b3b2af..306302baff06 100644
--- a/arch/blackfin/configs/BF533-STAMP_defconfig
+++ b/arch/blackfin/configs/BF533-STAMP_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.5
+# Linux kernel version: 2.6.22.6
 #
 # CONFIG_MMU is not set
 # CONFIG_FPU is not set
@@ -15,8 +15,9 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 # CONFIG_GENERIC_TIME is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_GPIO=y
 CONFIG_FORCE_MAX_ZONEORDER=14
+CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_IRQCHIP_DEMUX_GPIO=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
@@ -40,7 +41,9 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -58,15 +61,20 @@ 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_VM_EVENT_COUNTERS=y
 CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
-CONFIG_BUDDY=y
 # CONFIG_NP2 is not set
 CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -185,9 +193,27 @@ CONFIG_WDTIMER=13
 # CONFIG_CMDLINE_BOOL is not set
 
 #
-# Board Setup
+# Clock/PLL Setup
 #
 CONFIG_CLKIN_HZ=11059200
+# CONFIG_BFIN_KERNEL_CLOCK is not set
+CONFIG_MAX_VCO_HZ=750000000
+CONFIG_MIN_VCO_HZ=50000000
+CONFIG_MAX_SCLK_HZ=133000000
+CONFIG_MIN_SCLK_HZ=27000000
+
+#
+# Kernel Timer/Scheduler
+#
+# 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
+
+#
+# Memory Setup
+#
 CONFIG_MEM_SIZE=128
 CONFIG_MEM_ADD_WIDTH=11
 CONFIG_ENET_FLASH_PIN=0
@@ -198,6 +224,9 @@ CONFIG_BOOT_LOAD=0x1000
 #
 # CONFIG_BFIN_ALIVE_LED is not set
 # CONFIG_BFIN_IDLE_LED is not set
+CONFIG_BFIN_SCRATCH_REG_RETN=y
+# CONFIG_BFIN_SCRATCH_REG_RETE is not set
+# CONFIG_BFIN_SCRATCH_REG_CYCLES is not set
 CONFIG_BFIN_ALIVE_LED_PORT=0xFFC00700
 CONFIG_BFIN_ALIVE_LED_DPORT=0xFFC00730
 CONFIG_BFIN_IDLE_LED_PORT=0xFFC00700
@@ -208,15 +237,6 @@ CONFIG_BFIN_IDLE_LED_DPORT=0xFFC00730
 #
 
 #
-# Timer Tick
-#
-# 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
-
-#
 # Memory Optimizations
 #
 CONFIG_I_ENTRY_L1=y
@@ -255,20 +275,15 @@ CONFIG_DMA_UNCACHED_1M=y
 #
 # Cache Support
 #
-CONFIG_BLKFIN_CACHE=y
-CONFIG_BLKFIN_DCACHE=y
-# CONFIG_BLKFIN_DCACHE_BANKA is not set
-# CONFIG_BLKFIN_CACHE_LOCK is not set
-# CONFIG_BLKFIN_WB is not set
-CONFIG_BLKFIN_WT=y
+CONFIG_BFIN_ICACHE=y
+CONFIG_BFIN_DCACHE=y
+# CONFIG_BFIN_DCACHE_BANKA is not set
+# CONFIG_BFIN_ICACHE_LOCK is not set
+# CONFIG_BFIN_WB is not set
+CONFIG_BFIN_WT=y
 CONFIG_L1_MAX_PIECE=16
 
 #
-# Clock Settings
-#
-# CONFIG_BFIN_KERNEL_CLOCK is not set
-
-#
 # Asynchonous Memory Configuration
 #
 
@@ -289,12 +304,13 @@ CONFIG_C_AMBEN_ALL=y
 CONFIG_BANK_0=0x7BB0
 CONFIG_BANK_1=0x7BB0
 CONFIG_BANK_2=0x7BB0
-CONFIG_BANK_3=0x99B3
+CONFIG_BANK_3=0xAAC3
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
 # CONFIG_PCI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -302,10 +318,6 @@ CONFIG_BANK_3=0x99B3
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF_FDPIC=y
@@ -339,7 +351,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -380,20 +391,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_NETLABEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -460,7 +459,16 @@ CONFIG_IRTTY_SIR=m
 # FIR device drivers
 #
 # 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
 
 #
 # Device Drivers
@@ -478,10 +486,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -525,7 +529,6 @@ CONFIG_MTD_MW320D=m
 CONFIG_MTD_RAM=y
 CONFIG_MTD_ROM=m
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -562,16 +565,13 @@ CONFIG_BFIN_FLASH_BANK_3=0x7BB0
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
 
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 
 #
 # Parallel port support
@@ -599,10 +599,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 
 #
@@ -611,10 +607,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 
 #
@@ -623,19 +615,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_MD is not set
 
 #
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -643,10 +622,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 
 #
@@ -656,27 +631,15 @@ CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
 # CONFIG_SMSC911X is not set
+# CONFIG_DM9000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# 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
@@ -700,6 +663,7 @@ CONFIG_SMC91X=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -716,8 +680,14 @@ CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_UINPUT is not set
 # CONFIG_BF53X_PFBUTTONS is not set
 CONFIG_TWI_KEYPAD=m
@@ -734,7 +704,7 @@ CONFIG_BFIN_TWIKEYPAD_IRQ_PFX=39
 #
 # CONFIG_AD9960 is not set
 # CONFIG_SPI_ADC_BF533 is not set
-# CONFIG_BF5xx_PFLAGS is not set
+# CONFIG_BFIN_PFLAGS is not set
 # CONFIG_BF5xx_PPIFCD is not set
 # CONFIG_BF5xx_TIMERS is not set
 # CONFIG_BF5xx_PPI is not set
@@ -777,10 +747,6 @@ CONFIG_UNIX98_PTYS=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
@@ -792,7 +758,6 @@ CONFIG_BFIN_WDT=y
 CONFIG_HW_RANDOM=y
 # CONFIG_GEN_RTC is not set
 CONFIG_BLACKFIN_DPMC=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 
@@ -800,11 +765,8 @@ CONFIG_BLACKFIN_DPMC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m
 
 #
@@ -818,10 +780,11 @@ CONFIG_I2C_ALGOBIT=m
 # I2C Hardware Bus support
 #
 # CONFIG_I2C_BLACKFIN_GPIO is not set
+# CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_STUB is not set
-# CONFIG_I2C_PCA_ISA is not set
 
 #
 # Miscellaneous I2C Chip support
@@ -857,18 +820,16 @@ CONFIG_SPI_BFIN=y
 # SPI Protocol Masters
 #
 # CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
 
 #
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -896,6 +857,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
@@ -920,22 +882,30 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 CONFIG_FB=m
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=m
 CONFIG_FB_CFB_COPYAREA=m
 CONFIG_FB_CFB_IMAGEBLIT=m
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -957,10 +927,6 @@ CONFIG_ADV7393_1XMEM=y
 # CONFIG_ADV7393_2XMEM is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
-
-#
-# Logo configuration
-#
 # CONFIG_LOGO is not set
 
 #
@@ -1001,7 +967,6 @@ CONFIG_SND_BLACKFIN_AD1836_TDM=y
 # CONFIG_SND_BLACKFIN_AD1836_I2S is not set
 CONFIG_SND_BLACKFIN_AD1836_MULSUB=y
 # CONFIG_SND_BLACKFIN_AD1836_5P1 is not set
-CONFIG_SND_BLACKFIN_AD1981B=m
 CONFIG_SND_BLACKFIN_SPORT=0
 CONFIG_SND_BLACKFIN_SPI_PFBIT=4
 CONFIG_SND_BFIN_AD73311=m
@@ -1009,11 +974,16 @@ CONFIG_SND_BFIN_SPORT=0
 CONFIG_SND_BFIN_AD73311_SE=4
 
 #
-# SoC audio support
+# System on Chip audio support
 #
 # CONFIG_SND_SOC is not set
 
 #
+# SoC Audio for the ADI Blackfin
+#
+# CONFIG_SND_BF5XX_HAVE_COLD_RESET is not set
+
+#
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
@@ -1033,18 +1003,17 @@ CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB is not set
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# Enable Host or Gadget support to see Inventra options
 #
 
 #
-# USB Gadget Support
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
-# CONFIG_USB_GADGET is not set
 
 #
-# MMC/SD Card support
+# USB Gadget Support
 #
-# CONFIG_SPI_MMC is not set
+# CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
 
 #
@@ -1084,44 +1053,50 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
 
 #
-# RTC drivers
+# I2C RTC drivers
 #
-# CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+
+#
+# SPI RTC drivers
+#
 # CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-CONFIG_RTC_DRV_BFIN=y
 
 #
-# DMA Engine support
+# Platform RTC drivers
 #
-# CONFIG_DMA_ENGINE is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
-# DMA Clients
+# on-CPU RTC drivers
 #
+CONFIG_RTC_DRV_BFIN=y
 
 #
-# DMA Devices
+# DMA Engine support
 #
+# CONFIG_DMA_ENGINE is not set
 
 #
-# Auxiliary Display support
+# DMA Clients
 #
 
 #
-# Virtualization
+# DMA Devices
 #
 
 #
@@ -1224,6 +1199,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -1301,14 +1277,20 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set
+CONFIG_DEBUG_MMRS=y
 CONFIG_DEBUG_HUNT_FOR_ZERO=y
+CONFIG_DEBUG_BFIN_HWTRACE_ON=y
+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y
+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE is not set
+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_TWO is not set
+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0
+# CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set
 # CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
+CONFIG_EARLY_PRINTK=y
 CONFIG_CPLB_INFO=y
 CONFIG_ACCESS_CHECK=y
 
@@ -1331,6 +1313,7 @@ CONFIG_SECURITY_CAPABILITIES=m
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
@@ -1338,3 +1321,4 @@ CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig
index ccf09dc09a18..828b604438eb 100644
--- a/arch/blackfin/configs/BF537-STAMP_defconfig
+++ b/arch/blackfin/configs/BF537-STAMP_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.5
+# Linux kernel version: 2.6.22.6
 #
 # CONFIG_MMU is not set
 # CONFIG_FPU is not set
@@ -15,8 +15,9 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 # CONFIG_GENERIC_TIME is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_GPIO=y
 CONFIG_FORCE_MAX_ZONEORDER=14
+CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_IRQCHIP_DEMUX_GPIO=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
@@ -40,7 +41,9 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -58,15 +61,20 @@ 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_VM_EVENT_COUNTERS=y
 CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
-CONFIG_BUDDY=y
 # CONFIG_NP2 is not set
 CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -148,13 +156,6 @@ CONFIG_IRQ_PLL_WAKEUP=7
 #
 
 #
-# PORT F/G Selection
-#
-CONFIG_BF537_PORT_F=y
-# CONFIG_BF537_PORT_G is not set
-# CONFIG_BF537_PORT_H is not set
-
-#
 # Interrupt Priority Assignment
 #
 
@@ -199,19 +200,17 @@ CONFIG_IRQ_WATCH=13
 # CONFIG_CMDLINE_BOOL is not set
 
 #
-# Board Setup
+# Clock/PLL Setup
 #
 CONFIG_CLKIN_HZ=25000000
-CONFIG_MEM_SIZE=64
-CONFIG_MEM_ADD_WIDTH=10
-CONFIG_BOOT_LOAD=0x1000
-
-#
-# Blackfin Kernel Optimizations
-#
+# CONFIG_BFIN_KERNEL_CLOCK is not set
+CONFIG_MAX_VCO_HZ=600000000
+CONFIG_MIN_VCO_HZ=50000000
+CONFIG_MAX_SCLK_HZ=133000000
+CONFIG_MIN_SCLK_HZ=27000000
 
 #
-# Timer Tick
+# Kernel Timer/Scheduler
 #
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
@@ -220,6 +219,20 @@ CONFIG_HZ_250=y
 CONFIG_HZ=250
 
 #
+# Memory Setup
+#
+CONFIG_MEM_SIZE=64
+CONFIG_MEM_ADD_WIDTH=10
+CONFIG_BOOT_LOAD=0x1000
+CONFIG_BFIN_SCRATCH_REG_RETN=y
+# CONFIG_BFIN_SCRATCH_REG_RETE is not set
+# CONFIG_BFIN_SCRATCH_REG_CYCLES is not set
+
+#
+# Blackfin Kernel Optimizations
+#
+
+#
 # Memory Optimizations
 #
 CONFIG_I_ENTRY_L1=y
@@ -258,20 +271,15 @@ CONFIG_DMA_UNCACHED_1M=y
 #
 # Cache Support
 #
-CONFIG_BLKFIN_CACHE=y
-CONFIG_BLKFIN_DCACHE=y
-# CONFIG_BLKFIN_DCACHE_BANKA is not set
-# CONFIG_BLKFIN_CACHE_LOCK is not set
-# CONFIG_BLKFIN_WB is not set
-CONFIG_BLKFIN_WT=y
+CONFIG_BFIN_ICACHE=y
+CONFIG_BFIN_DCACHE=y
+# CONFIG_BFIN_DCACHE_BANKA is not set
+# CONFIG_BFIN_ICACHE_LOCK is not set
+# CONFIG_BFIN_WB is not set
+CONFIG_BFIN_WT=y
 CONFIG_L1_MAX_PIECE=16
 
 #
-# Clock Settings
-#
-# CONFIG_BFIN_KERNEL_CLOCK is not set
-
-#
 # Asynchonous Memory Configuration
 #
 
@@ -298,6 +306,7 @@ CONFIG_BANK_3=0x99B3
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
 # CONFIG_PCI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -305,10 +314,6 @@ CONFIG_BANK_3=0x99B3
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF_FDPIC=y
@@ -342,7 +347,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -383,20 +387,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_NETLABEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -463,7 +455,16 @@ CONFIG_IRTTY_SIR=m
 # FIR device drivers
 #
 # 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
 
 #
 # Device Drivers
@@ -481,10 +482,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -528,7 +525,6 @@ CONFIG_MTD_MW320D=m
 CONFIG_MTD_RAM=y
 CONFIG_MTD_ROM=m
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -565,13 +561,10 @@ CONFIG_BFIN_FLASH_BANK_3=0x7BB0
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 CONFIG_MTD_NAND_BFIN=m
 CONFIG_BFIN_NAND_BASE=0x20212000
 CONFIG_BFIN_NAND_CLE=2
@@ -580,11 +573,13 @@ CONFIG_BFIN_NAND_READY=3
 CONFIG_MTD_NAND_IDS=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ONENAND is not set
 
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 
 #
 # Parallel port support
@@ -612,10 +607,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 
 #
@@ -624,10 +615,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 
 #
@@ -636,19 +623,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_MD is not set
 
 #
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -656,11 +630,20 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+CONFIG_PHYLIB=y
 
 #
-# PHY device support
+# MII PHY device drivers
 #
-# CONFIG_PHYLIB is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+CONFIG_SMSC_PHY=y
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_FIXED_PHY is not set
 
 #
 # Ethernet (10 or 100Mbit)
@@ -674,27 +657,15 @@ CONFIG_BFIN_TX_DESC_NUM=10
 CONFIG_BFIN_RX_DESC_NUM=20
 # CONFIG_BFIN_MAC_RMII is not set
 # CONFIG_SMSC911X is not set
+# CONFIG_DM9000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# 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
@@ -718,6 +689,7 @@ CONFIG_BFIN_RX_DESC_NUM=20
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -734,8 +706,14 @@ CONFIG_INPUT_EVDEV=m
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_UINPUT is not set
 # CONFIG_BF53X_PFBUTTONS is not set
 CONFIG_TWI_KEYPAD=m
@@ -752,7 +730,7 @@ CONFIG_BFIN_TWIKEYPAD_IRQ_PFX=72
 #
 # CONFIG_AD9960 is not set
 # CONFIG_SPI_ADC_BF533 is not set
-# CONFIG_BF5xx_PFLAGS is not set
+# CONFIG_BFIN_PFLAGS is not set
 # CONFIG_BF5xx_PPIFCD is not set
 # CONFIG_BF5xx_TIMERS is not set
 # CONFIG_BF5xx_PPI is not set
@@ -803,10 +781,6 @@ CONFIG_CAN_BLACKFIN=m
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
@@ -818,7 +792,6 @@ CONFIG_BFIN_WDT=y
 CONFIG_HW_RANDOM=y
 # CONFIG_GEN_RTC is not set
 CONFIG_BLACKFIN_DPMC=y
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 
@@ -826,11 +799,8 @@ CONFIG_BLACKFIN_DPMC=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=m
 
 #
@@ -846,10 +816,11 @@ CONFIG_I2C_CHARDEV=m
 # CONFIG_I2C_BLACKFIN_GPIO is not set
 CONFIG_I2C_BLACKFIN_TWI=m
 CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=50
+# CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_STUB is not set
-# CONFIG_I2C_PCA_ISA is not set
 
 #
 # Miscellaneous I2C Chip support
@@ -885,18 +856,16 @@ CONFIG_SPI_BFIN=y
 # SPI Protocol Masters
 #
 # CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
 
 #
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -924,6 +893,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
@@ -948,11 +918,8 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
 # Graphics support
@@ -960,12 +927,23 @@ CONFIG_HWMON=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_LCD_CLASS_DEVICE=m
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 CONFIG_FB=m
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=m
 CONFIG_FB_CFB_COPYAREA=m
 CONFIG_FB_CFB_IMAGEBLIT=m
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -991,10 +969,6 @@ CONFIG_LQ035_SLAVE_ADDR=0x58
 # CONFIG_FB_BFIN_BGR is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
-
-#
-# Logo configuration
-#
 # CONFIG_LOGO is not set
 
 #
@@ -1035,7 +1009,6 @@ CONFIG_SND_BLACKFIN_AD1836_TDM=y
 # CONFIG_SND_BLACKFIN_AD1836_I2S is not set
 CONFIG_SND_BLACKFIN_AD1836_MULSUB=y
 # CONFIG_SND_BLACKFIN_AD1836_5P1 is not set
-CONFIG_SND_BLACKFIN_AD1981B=m
 CONFIG_SND_BLACKFIN_SPORT=0
 CONFIG_SND_BLACKFIN_SPI_PFBIT=4
 CONFIG_SND_BFIN_AD73311=m
@@ -1043,11 +1016,16 @@ CONFIG_SND_BFIN_SPORT=0
 CONFIG_SND_BFIN_AD73311_SE=4
 
 #
-# SoC audio support
+# System on Chip audio support
 #
 # CONFIG_SND_SOC is not set
 
 #
+# SoC Audio for the ADI Blackfin
+#
+# CONFIG_SND_BF5XX_HAVE_COLD_RESET is not set
+
+#
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
@@ -1067,18 +1045,17 @@ CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB is not set
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# Enable Host or Gadget support to see Inventra options
 #
 
 #
-# USB Gadget Support
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
-# CONFIG_USB_GADGET is not set
 
 #
-# MMC/SD Card support
+# USB Gadget Support
 #
-# CONFIG_SPI_MMC is not set
+# CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
 
 #
@@ -1118,44 +1095,50 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
 
 #
-# RTC drivers
+# I2C RTC drivers
 #
-# CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+
+#
+# SPI RTC drivers
+#
 # CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-CONFIG_RTC_DRV_BFIN=y
 
 #
-# DMA Engine support
+# Platform RTC drivers
 #
-# CONFIG_DMA_ENGINE is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
-# DMA Clients
+# on-CPU RTC drivers
 #
+CONFIG_RTC_DRV_BFIN=y
 
 #
-# DMA Devices
+# DMA Engine support
 #
+# CONFIG_DMA_ENGINE is not set
 
 #
-# Auxiliary Display support
+# DMA Clients
 #
 
 #
-# Virtualization
+# DMA Devices
 #
 
 #
@@ -1258,6 +1241,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -1335,14 +1319,20 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set
+CONFIG_DEBUG_MMRS=y
 CONFIG_DEBUG_HUNT_FOR_ZERO=y
+CONFIG_DEBUG_BFIN_HWTRACE_ON=y
+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y
+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE is not set
+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_TWO is not set
+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0
+# CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set
 # CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
+CONFIG_EARLY_PRINTK=y
 CONFIG_CPLB_INFO=y
 CONFIG_ACCESS_CHECK=y
 
@@ -1365,6 +1355,7 @@ CONFIG_SECURITY_CAPABILITIES=m
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
@@ -1372,3 +1363,4 @@ CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig
index ac8390fafa9c..e80f3d59c283 100644
--- a/arch/blackfin/configs/BF548-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF548-EZKIT_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.5
+# Linux kernel version: 2.6.22.6
 #
 # CONFIG_MMU is not set
 # CONFIG_FPU is not set
@@ -15,8 +15,9 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 # CONFIG_GENERIC_TIME is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_GPIO=y
 CONFIG_FORCE_MAX_ZONEORDER=14
+CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_IRQCHIP_DEMUX_GPIO=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
@@ -40,7 +41,9 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -51,7 +54,6 @@ CONFIG_EMBEDDED=y
 CONFIG_UID16=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
@@ -59,14 +61,20 @@ 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_VM_EVENT_COUNTERS=y
 CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
 # CONFIG_NP2 is not set
 CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -165,6 +173,7 @@ CONFIG_IRQ_UART1_TX=10
 #
 # BF548 Specific Configuration
 #
+# CONFIG_DEB_DMA_URGENT is not set
 
 #
 # Interrupt Priority Assignment
@@ -242,24 +251,35 @@ CONFIG_IRQ_PINT2=11
 CONFIG_IRQ_PINT3=11
 
 #
-# Board customizations
+# Pin Interrupt to Port Assignment
 #
-# CONFIG_CMDLINE_BOOL is not set
 
 #
-# Board Setup
+# Assignment
 #
-CONFIG_CLKIN_HZ=25000000
-CONFIG_MEM_SIZE=64
-CONFIG_MEM_ADD_WIDTH=10
-CONFIG_BOOT_LOAD=0x1000
+CONFIG_PINTx_REASSIGN=y
+CONFIG_PINT0_ASSIGN=0x00000101
+CONFIG_PINT1_ASSIGN=0x01010000
+CONFIG_PINT2_ASSIGN=0x07000101
+CONFIG_PINT3_ASSIGN=0x02020303
 
 #
-# Blackfin Kernel Optimizations
+# Board customizations
 #
+# CONFIG_CMDLINE_BOOL is not set
 
 #
-# Timer Tick
+# Clock/PLL Setup
+#
+CONFIG_CLKIN_HZ=25000000
+# CONFIG_BFIN_KERNEL_CLOCK is not set
+CONFIG_MAX_VCO_HZ=533000000
+CONFIG_MIN_VCO_HZ=50000000
+CONFIG_MAX_SCLK_HZ=133000000
+CONFIG_MIN_SCLK_HZ=27000000
+
+#
+# Kernel Timer/Scheduler
 #
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
@@ -268,6 +288,20 @@ CONFIG_HZ_250=y
 CONFIG_HZ=250
 
 #
+# Memory Setup
+#
+CONFIG_MEM_SIZE=64
+CONFIG_MEM_ADD_WIDTH=10
+CONFIG_BOOT_LOAD=0x1000
+CONFIG_BFIN_SCRATCH_REG_RETN=y
+# CONFIG_BFIN_SCRATCH_REG_RETE is not set
+# CONFIG_BFIN_SCRATCH_REG_CYCLES is not set
+
+#
+# Blackfin Kernel Optimizations
+#
+
+#
 # Memory Optimizations
 #
 CONFIG_I_ENTRY_L1=y
@@ -275,12 +309,12 @@ CONFIG_EXCPT_IRQ_SYSC_L1=y
 CONFIG_DO_IRQ_L1=y
 CONFIG_CORE_TIMER_IRQ_L1=y
 CONFIG_IDLE_L1=y
-CONFIG_SCHEDULE_L1=y
+# CONFIG_SCHEDULE_L1 is not set
 CONFIG_ARITHMETIC_OPS_L1=y
 CONFIG_ACCESS_OK_L1=y
-CONFIG_MEMSET_L1=y
-CONFIG_MEMCPY_L1=y
-CONFIG_SYS_BFIN_SPINLOCK_L1=y
+# CONFIG_MEMSET_L1 is not set
+# CONFIG_MEMCPY_L1 is not set
+# CONFIG_SYS_BFIN_SPINLOCK_L1 is not set
 # CONFIG_IP_CHECKSUM_L1 is not set
 CONFIG_CACHELINE_ALIGNED_L1=y
 # CONFIG_SYSCALL_TAB_L1 is not set
@@ -306,20 +340,15 @@ CONFIG_DMA_UNCACHED_1M=y
 #
 # Cache Support
 #
-CONFIG_BLKFIN_CACHE=y
-CONFIG_BLKFIN_DCACHE=y
-# CONFIG_BLKFIN_DCACHE_BANKA is not set
-# CONFIG_BLKFIN_CACHE_LOCK is not set
-# CONFIG_BLKFIN_WB is not set
-CONFIG_BLKFIN_WT=y
+CONFIG_BFIN_ICACHE=y
+CONFIG_BFIN_DCACHE=y
+# CONFIG_BFIN_DCACHE_BANKA is not set
+# CONFIG_BFIN_ICACHE_LOCK is not set
+# CONFIG_BFIN_WB is not set
+CONFIG_BFIN_WT=y
 CONFIG_L1_MAX_PIECE=16
 
 #
-# Clock Settings
-#
-# CONFIG_BFIN_KERNEL_CLOCK is not set
-
-#
 # Asynchonous Memory Configuration
 #
 
@@ -327,7 +356,6 @@ CONFIG_L1_MAX_PIECE=16
 # EBIU_AMBCTL Global Control
 #
 CONFIG_C_AMCKEN=y
-CONFIG_C_CDPRIO=y
 # CONFIG_C_AMBEN is not set
 # CONFIG_C_AMBEN_B0 is not set
 # CONFIG_C_AMBEN_B0_B1 is not set
@@ -338,7 +366,7 @@ CONFIG_C_AMBEN_ALL=y
 # EBIU_AMBCTL Control
 #
 CONFIG_BANK_0=0x7BB0
-CONFIG_BANK_1=0x7BB0
+CONFIG_BANK_1=0x5554
 CONFIG_BANK_2=0x7BB0
 CONFIG_BANK_3=0x99B3
 
@@ -346,6 +374,7 @@ CONFIG_BANK_3=0x99B3
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
 # CONFIG_PCI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -353,10 +382,6 @@ CONFIG_BANK_3=0x99B3
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF_FDPIC=y
@@ -383,7 +408,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -424,20 +448,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_NETLABEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -463,7 +475,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO 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
 
 #
 # Device Drivers
@@ -475,29 +496,23 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 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
 
 #
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
 
 #
 # User Modules And Translation Layers
 #
-# CONFIG_MTD_CHAR is not set
+CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_FTL is not set
@@ -509,8 +524,10 @@ CONFIG_MTD_BLOCK=y
 #
 # RAM/ROM/Flash chip drivers
 #
-# CONFIG_MTD_CFI is not set
+CONFIG_MTD_CFI=y
 # CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
@@ -521,22 +538,32 @@ CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
 # CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+# CONFIG_MTD_MW320D is not set
+CONFIG_MTD_CFI_UTIL=y
 CONFIG_MTD_RAM=y
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
 #
 CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0x20000000
+CONFIG_MTD_PHYSMAP_LEN=0x400000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
 # CONFIG_MTD_BF5xx is not set
-CONFIG_MTD_UCLINUX=y
+# CONFIG_MTD_UCLINUX is not set
 # CONFIG_MTD_PLATRAM is not set
 
 #
 # Self-contained MTD device drivers
 #
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -548,16 +575,23 @@ CONFIG_MTD_UCLINUX=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_BFIN is not set
+CONFIG_MTD_NAND_IDS=y
+CONFIG_MTD_NAND_BF5XX=y
+CONFIG_MTD_NAND_BF5XX_HWECC=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ONENAND is not set
 
 #
-# NAND Flash Device Drivers
-#
-# CONFIG_MTD_NAND is not set
-
-#
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 
 #
 # Parallel port support
@@ -585,41 +619,61 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 
 #
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
+CONFIG_SCSI=y
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
 
 #
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
+# SCSI support type (disk, tape, CD-ROM)
 #
-# CONFIG_ATA is not set
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
 
 #
-# Multi-device support (RAID and LVM)
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
 #
-# CONFIG_MD is not set
+# 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
 
 #
-# Fusion MPT device support
+# SCSI Transports
 #
-# CONFIG_FUSION is not set
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
 
 #
-# IEEE 1394 (FireWire) support
+# SCSI low-level drivers
 #
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_PATA_PLATFORM is not set
+CONFIG_PATA_BF54X=y
+CONFIG_PATA_BF54X_DMA=y
 
 #
-# I2O device support
+# Multi-device support (RAID and LVM)
 #
+# CONFIG_MD is not set
 
 #
 # Network device support
@@ -629,10 +683,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 
 #
@@ -641,28 +691,16 @@ CONFIG_NETDEVICES=y
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_SMC91X is not set
-# CONFIG_SMSC911X is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
+CONFIG_SMSC911X=y
+# CONFIG_DM9000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# 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
@@ -686,6 +724,7 @@ CONFIG_MII=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -702,10 +741,17 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
 CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_UINPUT is not set
 # CONFIG_BF53X_PFBUTTONS is not set
+# CONFIG_TWI_KEYPAD is not set
 
 #
 # Hardware I/O ports
@@ -718,12 +764,15 @@ CONFIG_INPUT_MISC=y
 #
 # CONFIG_AD9960 is not set
 # CONFIG_SPI_ADC_BF533 is not set
-# CONFIG_BF5xx_PFLAGS is not set
+# CONFIG_BFIN_PFLAGS is not set
 # CONFIG_BF5xx_PPIFCD is not set
 # CONFIG_BF5xx_TIMERS is not set
 # CONFIG_BF5xx_PPI is not set
 # CONFIG_BFIN_SPORT is not set
 # CONFIG_BFIN_TIMER_LATENCY is not set
+# CONFIG_TWI_LCD is not set
+# CONFIG_AD5304 is not set
+# CONFIG_BF5xx_TEA5764 is not set
 # CONFIG_BF5xx_FBDMA is not set
 # CONFIG_VT is not set
 # CONFIG_SERIAL_NONSTANDARD is not set
@@ -760,14 +809,9 @@ CONFIG_UNIX98_PTYS=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 
@@ -775,32 +819,114 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
 
 #
-# I2C support
+# I2C Hardware Bus support
 #
-# CONFIG_I2C is not set
+# CONFIG_I2C_BLACKFIN_GPIO is not set
+CONFIG_I2C_BLACKFIN_TWI=y
+CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=50
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_STUB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_SENSORS_AD5252 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCF8575 is not set
+# CONFIG_SENSORS_PCA9543 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
 
 #
 # SPI support
 #
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
 
 #
-# Dallas's 1-wire bus
+# SPI Master Controller Drivers
 #
-# CONFIG_W1 is not set
+CONFIG_SPI_BFIN=y
+# CONFIG_SPI_BITBANG is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
 
 #
-# Hardware Monitoring support
+# Dallas's 1-wire bus
 #
+# CONFIG_W1 is not set
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -812,16 +938,19 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 
 #
@@ -844,6 +973,10 @@ CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB is not set
 
 #
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
 
@@ -851,11 +984,20 @@ CONFIG_USB_ARCH_HAS_HCD=y
 # USB Gadget Support
 #
 # CONFIG_USB_GADGET is not set
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD Card Drivers
+#
+CONFIG_MMC_BLOCK=m
 
 #
-# MMC/SD Card support
+# MMC/SD Host Controller Drivers
 #
-# CONFIG_MMC is not set
+CONFIG_SDH_BFIN=m
+# CONFIG_SPI_MMC is not set
 
 #
 # LED devices
@@ -894,15 +1036,37 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
 
 #
-# RTC drivers
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+
+#
+# Platform RTC drivers
 #
 # CONFIG_RTC_DRV_DS1553 is not set
 # CONFIG_RTC_DRV_DS1742 is not set
 # CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
 CONFIG_RTC_DRV_BFIN=y
 
 #
@@ -919,14 +1083,6 @@ CONFIG_RTC_DRV_BFIN=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
-#
-
-#
 # PBX support
 #
 # CONFIG_PBX is not set
@@ -991,8 +1147,25 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_YAFFS_FS is not set
-# CONFIG_JFFS2_FS is not set
+CONFIG_YAFFS_FS=m
+CONFIG_YAFFS_YAFFS1=y
+# CONFIG_YAFFS_DOES_ECC is not set
+CONFIG_YAFFS_YAFFS2=y
+CONFIG_YAFFS_AUTO_YAFFS2=y
+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -1040,36 +1213,20 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_DETECT_SOFTLOCKUP=y
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_MUTEXES is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_DEBUG_INFO=y
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_LIST is not set
-CONFIG_FRAME_POINTER=y
-CONFIG_FORCED_INLINING=y
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_DEBUG_HWERR=y
-# CONFIG_DEBUG_ICACHE_CHECK is not set
-# CONFIG_DEBUG_KERNEL_START is not set
-# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set
+CONFIG_DEBUG_MMRS=y
 CONFIG_DEBUG_HUNT_FOR_ZERO=y
+CONFIG_DEBUG_BFIN_HWTRACE_ON=y
+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y
+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE is not set
+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_TWO is not set
+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0
+# CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set
 # CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
+CONFIG_EARLY_PRINTK=y
 CONFIG_CPLB_INFO=y
 CONFIG_ACCESS_CHECK=y
 
@@ -1092,9 +1249,12 @@ CONFIG_SECURITY_CAPABILITIES=y
 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_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig
index 51c0b6f97798..85e647f87759 100644
--- a/arch/blackfin/configs/BF561-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF561-EZKIT_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.5
+# Linux kernel version: 2.6.22.6
 #
 # CONFIG_MMU is not set
 # CONFIG_FPU is not set
@@ -15,8 +15,9 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 # CONFIG_GENERIC_TIME is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_GPIO=y
 CONFIG_FORCE_MAX_ZONEORDER=14
+CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_IRQCHIP_DEMUX_GPIO=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
@@ -40,7 +41,9 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TASKSTATS is not set
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@@ -58,15 +61,20 @@ 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_VM_EVENT_COUNTERS=y
 CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
-CONFIG_BUDDY=y
 # CONFIG_NP2 is not set
 CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -229,19 +237,17 @@ CONFIG_IRQ_WDTIMER=13
 # CONFIG_CMDLINE_BOOL is not set
 
 #
-# Board Setup
+# Clock/PLL Setup
 #
 CONFIG_CLKIN_HZ=30000000
-CONFIG_MEM_SIZE=64
-CONFIG_MEM_ADD_WIDTH=9
-CONFIG_BOOT_LOAD=0x1000
-
-#
-# Blackfin Kernel Optimizations
-#
+# CONFIG_BFIN_KERNEL_CLOCK is not set
+CONFIG_MAX_VCO_HZ=600000000
+CONFIG_MIN_VCO_HZ=50000000
+CONFIG_MAX_SCLK_HZ=133000000
+CONFIG_MIN_SCLK_HZ=27000000
 
 #
-# Timer Tick
+# Kernel Timer/Scheduler
 #
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
@@ -250,6 +256,20 @@ CONFIG_HZ_250=y
 CONFIG_HZ=250
 
 #
+# Memory Setup
+#
+CONFIG_MEM_SIZE=64
+CONFIG_MEM_ADD_WIDTH=9
+CONFIG_BOOT_LOAD=0x1000
+CONFIG_BFIN_SCRATCH_REG_RETN=y
+# CONFIG_BFIN_SCRATCH_REG_RETE is not set
+# CONFIG_BFIN_SCRATCH_REG_CYCLES is not set
+
+#
+# Blackfin Kernel Optimizations
+#
+
+#
 # Memory Optimizations
 #
 CONFIG_I_ENTRY_L1=y
@@ -288,20 +308,15 @@ CONFIG_DMA_UNCACHED_1M=y
 #
 # Cache Support
 #
-CONFIG_BLKFIN_CACHE=y
-CONFIG_BLKFIN_DCACHE=y
-# CONFIG_BLKFIN_DCACHE_BANKA is not set
-# CONFIG_BLKFIN_CACHE_LOCK is not set
-# CONFIG_BLKFIN_WB is not set
-CONFIG_BLKFIN_WT=y
+CONFIG_BFIN_ICACHE=y
+CONFIG_BFIN_DCACHE=y
+# CONFIG_BFIN_DCACHE_BANKA is not set
+# CONFIG_BFIN_ICACHE_LOCK is not set
+# CONFIG_BFIN_WB is not set
+CONFIG_BFIN_WT=y
 CONFIG_L1_MAX_PIECE=16
 
 #
-# Clock Settings
-#
-# CONFIG_BFIN_KERNEL_CLOCK is not set
-
-#
 # Asynchonous Memory Configuration
 #
 
@@ -326,12 +341,13 @@ CONFIG_C_AMBEN_ALL=y
 CONFIG_BANK_0=0x7BB0
 CONFIG_BANK_1=0x7BB0
 CONFIG_BANK_2=0x7BB0
-CONFIG_BANK_3=0x99B3
+CONFIG_BANK_3=0xAAC3
 
 #
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
 # CONFIG_PCI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -339,10 +355,6 @@ CONFIG_BANK_3=0x99B3
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF_FDPIC=y
@@ -364,7 +376,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -405,20 +416,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_NETLABEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -485,7 +484,16 @@ CONFIG_IRTTY_SIR=m
 # FIR device drivers
 #
 # 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
 
 #
 # Device Drivers
@@ -503,10 +511,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -550,7 +554,6 @@ CONFIG_MTD_MW320D=m
 CONFIG_MTD_RAM=y
 CONFIG_MTD_ROM=m
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -588,16 +591,13 @@ CONFIG_BFIN_FLASH_BANK_3=0x7BB0
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 # CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
 
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 
 #
 # Parallel port support
@@ -625,10 +625,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 
 #
@@ -637,10 +633,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 
 #
@@ -649,19 +641,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_MD is not set
 
 #
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -669,10 +648,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 
 #
@@ -682,27 +657,15 @@ CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_SMC91X=y
 # CONFIG_SMSC911X is not set
+# CONFIG_DM9000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# 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
@@ -726,6 +689,7 @@ CONFIG_SMC91X=y
 #
 CONFIG_INPUT=m
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -742,6 +706,7 @@ CONFIG_INPUT_EVDEV=m
 # 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
 
@@ -756,7 +721,7 @@ CONFIG_INPUT_EVDEV=m
 #
 # CONFIG_AD9960 is not set
 # CONFIG_SPI_ADC_BF533 is not set
-# CONFIG_BF5xx_PFLAGS is not set
+# CONFIG_BFIN_PFLAGS is not set
 # CONFIG_BF5xx_PPIFCD is not set
 # CONFIG_BF5xx_TIMERS is not set
 # CONFIG_BF5xx_PPI is not set
@@ -796,10 +761,6 @@ CONFIG_UNIX98_PTYS=y
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 
@@ -810,7 +771,6 @@ CONFIG_WATCHDOG=y
 CONFIG_BFIN_WDT=y
 CONFIG_HW_RANDOM=y
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 
@@ -818,10 +778,6 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 # CONFIG_I2C is not set
 
 #
@@ -840,22 +796,22 @@ CONFIG_SPI_BFIN=y
 # SPI Protocol Masters
 #
 # CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
 
 #
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
 # CONFIG_SENSORS_LM70 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_HWMON_DEBUG_CHIP is not set
 
 #
@@ -867,16 +823,19 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
-# Digital Video Broadcasting Devices
+# Graphics support
 #
-# CONFIG_DVB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
-# Graphics support
+# Display device support
 #
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 # CONFIG_FB is not set
 
 #
@@ -899,18 +858,17 @@ CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB is not set
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# Enable Host or Gadget support to see Inventra options
 #
 
 #
-# USB Gadget Support
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
-# CONFIG_USB_GADGET is not set
 
 #
-# MMC/SD Card support
+# USB Gadget Support
 #
-# CONFIG_SPI_MMC is not set
+# CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
 
 #
@@ -953,14 +911,6 @@ CONFIG_USB_ARCH_HAS_HCD=y
 #
 
 #
-# Auxiliary Display support
-#
-
-#
-# Virtualization
-#
-
-#
 # PBX support
 #
 # CONFIG_PBX is not set
@@ -1060,6 +1010,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -1137,14 +1088,20 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_MAGIC_SYSRQ is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
+CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set
+CONFIG_DEBUG_MMRS=y
 CONFIG_DEBUG_HUNT_FOR_ZERO=y
+CONFIG_DEBUG_BFIN_HWTRACE_ON=y
+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y
+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE is not set
+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_TWO is not set
+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0
+# CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set
 # CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
+CONFIG_EARLY_PRINTK=y
 # CONFIG_DUAL_CORE_TEST_MODULE is not set
 CONFIG_CPLB_INFO=y
 CONFIG_ACCESS_CHECK=y
@@ -1168,6 +1125,7 @@ CONFIG_SECURITY_CAPABILITIES=m
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
@@ -1175,3 +1133,4 @@ CONFIG_ZLIB_DEFLATE=m
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig
index 983ed181c896..15e36aaf2186 100644
--- a/arch/blackfin/configs/PNAV-10_defconfig
+++ b/arch/blackfin/configs/PNAV-10_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21.5
+# Linux kernel version: 2.6.22.6
 #
 # CONFIG_MMU is not set
 # CONFIG_FPU is not set
@@ -15,8 +15,9 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 # CONFIG_GENERIC_TIME is not set
-CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_GPIO=y
 CONFIG_FORCE_MAX_ZONEORDER=14
+CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_IRQCHIP_DEMUX_GPIO=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
@@ -41,6 +42,7 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_UTS_NS is not set
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -57,15 +59,20 @@ 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_VM_EVENT_COUNTERS=y
 CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=9
-CONFIG_BUDDY=y
 # CONFIG_NP2 is not set
 CONFIG_SLAB=y
-CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 CONFIG_TINY_SHMEM=y
 CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
 
 #
 # Loadable module support
@@ -147,13 +154,6 @@ CONFIG_IRQ_PLL_WAKEUP=7
 #
 
 #
-# PORT F/G Selection
-#
-CONFIG_BF537_PORT_F=y
-# CONFIG_BF537_PORT_G is not set
-# CONFIG_BF537_PORT_H is not set
-
-#
 # Interrupt Priority Assignment
 #
 
@@ -198,19 +198,17 @@ CONFIG_IRQ_WATCH=13
 # CONFIG_CMDLINE_BOOL is not set
 
 #
-# Board Setup
+# Clock/PLL Setup
 #
 CONFIG_CLKIN_HZ=24576000
-CONFIG_MEM_SIZE=64
-CONFIG_MEM_ADD_WIDTH=10
-CONFIG_BOOT_LOAD=0x1000
-
-#
-# Blackfin Kernel Optimizations
-#
+# CONFIG_BFIN_KERNEL_CLOCK is not set
+CONFIG_MAX_VCO_HZ=600000000
+CONFIG_MIN_VCO_HZ=50000000
+CONFIG_MAX_SCLK_HZ=133000000
+CONFIG_MIN_SCLK_HZ=27000000
 
 #
-# Timer Tick
+# Kernel Timer/Scheduler
 #
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
@@ -219,6 +217,20 @@ CONFIG_HZ_250=y
 CONFIG_HZ=250
 
 #
+# Memory Setup
+#
+CONFIG_MEM_SIZE=64
+CONFIG_MEM_ADD_WIDTH=10
+CONFIG_BOOT_LOAD=0x1000
+CONFIG_BFIN_SCRATCH_REG_RETN=y
+# CONFIG_BFIN_SCRATCH_REG_RETE is not set
+# CONFIG_BFIN_SCRATCH_REG_CYCLES is not set
+
+#
+# Blackfin Kernel Optimizations
+#
+
+#
 # Memory Optimizations
 #
 CONFIG_I_ENTRY_L1=y
@@ -257,20 +269,15 @@ CONFIG_DMA_UNCACHED_1M=y
 #
 # Cache Support
 #
-CONFIG_BLKFIN_CACHE=y
-CONFIG_BLKFIN_DCACHE=y
-# CONFIG_BLKFIN_DCACHE_BANKA is not set
-# CONFIG_BLKFIN_CACHE_LOCK is not set
-CONFIG_BLKFIN_WB=y
-# CONFIG_BLKFIN_WT is not set
+CONFIG_BFIN_ICACHE=y
+CONFIG_BFIN_DCACHE=y
+# CONFIG_BFIN_DCACHE_BANKA is not set
+# CONFIG_BFIN_ICACHE_LOCK is not set
+CONFIG_BFIN_WB=y
+# CONFIG_BFIN_WT is not set
 CONFIG_L1_MAX_PIECE=16
 
 #
-# Clock Settings
-#
-# CONFIG_BFIN_KERNEL_CLOCK is not set
-
-#
 # Asynchonous Memory Configuration
 #
 
@@ -297,6 +304,7 @@ CONFIG_BANK_3=0x99B3
 # Bus options (PCI, PCMCIA, EISA, MCA, ISA)
 #
 # CONFIG_PCI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -304,10 +312,6 @@ CONFIG_BANK_3=0x99B3
 # CONFIG_PCCARD is not set
 
 #
-# PCI Hotplug Support
-#
-
-#
 # Executable file formats
 #
 CONFIG_BINFMT_ELF_FDPIC=y
@@ -334,7 +338,6 @@ CONFIG_NET=y
 #
 # Networking options
 #
-# CONFIG_NETDEBUG is not set
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
 CONFIG_UNIX=y
@@ -375,20 +378,8 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_NETLABEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
 # CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -414,7 +405,16 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_HAMRADIO 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
 
 #
 # Device Drivers
@@ -432,10 +432,6 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # Connector - unified userspace <-> kernelspace linker
 #
 # CONFIG_CONNECTOR is not set
-
-#
-# Memory Technology Devices (MTD)
-#
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_CONCAT is not set
@@ -473,7 +469,6 @@ CONFIG_MTD_CFI_I2=y
 CONFIG_MTD_RAM=y
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
 
 #
 # Mapping drivers for chip access
@@ -499,13 +494,10 @@ CONFIG_MTD_UCLINUX=y
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
-
-#
-# NAND Flash Device Drivers
-#
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
 CONFIG_MTD_NAND_BFIN=y
 CONFIG_BFIN_NAND_BASE=0x20100000
 CONFIG_BFIN_NAND_CLE=2
@@ -514,11 +506,13 @@ CONFIG_BFIN_NAND_READY=44
 CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ONENAND is not set
 
 #
-# OneNAND Flash Device Drivers
+# UBI - Unsorted block images
 #
-# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_UBI is not set
 
 #
 # Parallel port support
@@ -546,10 +540,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 #
 # Misc devices
 #
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
 # CONFIG_IDE is not set
 
 #
@@ -558,10 +548,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 # CONFIG_SCSI_NETLINK is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 
 #
@@ -570,19 +556,6 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
 # CONFIG_MD is not set
 
 #
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# I2O device support
-#
-
-#
 # Network device support
 #
 CONFIG_NETDEVICES=y
@@ -590,11 +563,20 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
+CONFIG_PHYLIB=y
 
 #
-# PHY device support
+# MII PHY device drivers
 #
-# CONFIG_PHYLIB is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_FIXED_PHY is not set
 
 #
 # Ethernet (10 or 100Mbit)
@@ -608,27 +590,15 @@ CONFIG_BFIN_TX_DESC_NUM=100
 CONFIG_BFIN_RX_DESC_NUM=100
 CONFIG_BFIN_MAC_RMII=y
 # CONFIG_SMSC911X is not set
+# CONFIG_DM9000 is not set
+CONFIG_NETDEV_1000=y
+CONFIG_NETDEV_10000=y
 
 #
-# Ethernet (1000 Mbit)
-#
-
-#
-# Ethernet (10000 Mbit)
-#
-
-#
-# Token Ring devices
-#
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Wan interfaces
+# 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
@@ -652,6 +622,7 @@ CONFIG_BFIN_MAC_RMII=y
 #
 CONFIG_INPUT=y
 # CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
 
 #
 # Userland interfaces
@@ -670,6 +641,7 @@ CONFIG_INPUT_EVDEV=y
 # 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=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 CONFIG_TOUCHSCREEN_AD7877=y
@@ -681,7 +653,13 @@ CONFIG_TOUCHSCREEN_AD7877=y
 # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
 # CONFIG_TOUCHSCREEN_TOUCHWIN is not set
 # CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
 CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
 CONFIG_INPUT_UINPUT=y
 # CONFIG_BF53X_PFBUTTONS is not set
 # CONFIG_TWI_KEYPAD is not set
@@ -697,7 +675,7 @@ CONFIG_INPUT_UINPUT=y
 #
 # CONFIG_AD9960 is not set
 # CONFIG_SPI_ADC_BF533 is not set
-# CONFIG_BF5xx_PFLAGS is not set
+# CONFIG_BFIN_PFLAGS is not set
 # CONFIG_BF5xx_PPIFCD is not set
 # CONFIG_BF5xx_TIMERS is not set
 # CONFIG_BF5xx_PPI is not set
@@ -749,14 +727,9 @@ CONFIG_CAN_BLACKFIN=m
 # IPMI
 #
 # CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=y
 # CONFIG_GEN_RTC is not set
-# CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 
@@ -764,11 +737,8 @@ CONFIG_HW_RANDOM=y
 # TPM devices
 #
 # CONFIG_TCG_TPM is not set
-
-#
-# I2C support
-#
 CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 
 #
@@ -784,10 +754,11 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_BLACKFIN_GPIO is not set
 CONFIG_I2C_BLACKFIN_TWI=y
 CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=50
+# CONFIG_I2C_GPIO is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_STUB is not set
-# CONFIG_I2C_PCA_ISA is not set
 
 #
 # Miscellaneous I2C Chip support
@@ -823,18 +794,16 @@ CONFIG_SPI_BFIN=y
 # SPI Protocol Masters
 #
 # CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
 
 #
 # Dallas's 1-wire bus
 #
 # CONFIG_W1 is not set
-
-#
-# Hardware Monitoring support
-#
 CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_AD7418 is not set
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
@@ -862,6 +831,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_LM90 is not set
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_PC87427 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
@@ -886,11 +856,8 @@ CONFIG_HWMON=y
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
 
 #
 # Graphics support
@@ -898,12 +865,23 @@ CONFIG_HWMON=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_LCD_CLASS_DEVICE=y
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FB_DDC is not set
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_BACKLIGHT is not set
@@ -921,10 +899,6 @@ CONFIG_FB_BFIN_LANDSCAPE=y
 # CONFIG_FB_BFIN_BGR is not set
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_VIRTUAL is not set
-
-#
-# Logo configuration
-#
 # CONFIG_LOGO is not set
 
 #
@@ -936,8 +910,6 @@ CONFIG_SOUND=y
 # Advanced Linux Sound Architecture
 #
 CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_PCM_OSS is not set
@@ -959,19 +931,23 @@ CONFIG_SND_PCM=m
 # ALSA Blackfin devices
 #
 # CONFIG_SND_BLACKFIN_AD1836 is not set
-CONFIG_SND_BLACKFIN_AD1981B=m
 # CONFIG_SND_BFIN_AD73311 is not set
 
 #
-# SoC audio support
+# System on Chip audio support
 #
 # CONFIG_SND_SOC is not set
 
 #
+# SoC Audio for the ADI Blackfin
+#
+# CONFIG_SND_BF5XX_HAVE_COLD_RESET is not set
+
+#
 # Open Sound System
 #
 CONFIG_SOUND_PRIME=y
-# CONFIG_OBSOLETE_OSS is not set
+# CONFIG_OSS_OBSOLETE is not set
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
 
@@ -989,18 +965,17 @@ CONFIG_USB_ARCH_HAS_HCD=y
 # CONFIG_USB is not set
 
 #
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# Enable Host or Gadget support to see Inventra options
 #
 
 #
-# USB Gadget Support
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
 #
-# CONFIG_USB_GADGET is not set
 
 #
-# MMC/SD Card support
+# USB Gadget Support
 #
-# CONFIG_SPI_MMC is not set
+# CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
 
 #
@@ -1040,44 +1015,50 @@ CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
 
 #
-# RTC drivers
+# I2C RTC drivers
 #
-# CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
 # CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
 # CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+
+#
+# SPI RTC drivers
+#
 # CONFIG_RTC_DRV_RS5C348 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_TEST is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
-# CONFIG_RTC_DRV_V3020 is not set
-CONFIG_RTC_DRV_BFIN=y
 
 #
-# DMA Engine support
+# Platform RTC drivers
 #
-# CONFIG_DMA_ENGINE is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_V3020 is not set
 
 #
-# DMA Clients
+# on-CPU RTC drivers
 #
+CONFIG_RTC_DRV_BFIN=y
 
 #
-# DMA Devices
+# DMA Engine support
 #
+# CONFIG_DMA_ENGINE is not set
 
 #
-# Auxiliary Display support
+# DMA Clients
 #
 
 #
-# Virtualization
+# DMA Devices
 #
 
 #
@@ -1176,6 +1157,7 @@ CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
+# CONFIG_SUNRPC_BIND34 is not set
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 CONFIG_SMB_FS=m
@@ -1256,11 +1238,17 @@ CONFIG_ENABLE_MUST_CHECK=y
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_KERNEL is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set
+# CONFIG_DEBUG_MMRS is not set
 # CONFIG_DEBUG_HUNT_FOR_ZERO is not set
+CONFIG_DEBUG_BFIN_HWTRACE_ON=y
+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_OFF=y
+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_ONE is not set
+# CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION_TWO is not set
+CONFIG_DEBUG_BFIN_HWTRACE_COMPRESSION=0
+# CONFIG_DEBUG_BFIN_HWTRACE_EXPAND is not set
 # CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
+# CONFIG_EARLY_PRINTK is not set
 # CONFIG_CPLB_INFO is not set
 # CONFIG_ACCESS_CHECK is not set
 
@@ -1283,9 +1271,11 @@ CONFIG_SECURITY_CAPABILITIES=y
 CONFIG_BITREVERSE=y
 CONFIG_CRC_CCITT=m
 # CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile
index f429ebc3a961..8aeb6066b19b 100644
--- a/arch/blackfin/kernel/Makefile
+++ b/arch/blackfin/kernel/Makefile
@@ -7,11 +7,10 @@ extra-y := init_task.o vmlinux.lds
 obj-y := \
         entry.o process.o bfin_ksyms.o ptrace.o setup.o signal.o \
         sys_bfin.o time.o traps.o irqchip.o dma-mapping.o flat.o \
-        fixed_code.o cplbinit.o cacheinit.o
+        fixed_code.o cplbinit.o cacheinit.o reboot.o bfin_gpio.o
 
-obj-$(CONFIG_BF53x)                  += bfin_gpio.o
-obj-$(CONFIG_BF561)                  += bfin_gpio.o
 obj-$(CONFIG_MODULES)                += module.o
 obj-$(CONFIG_BFIN_DMA_5XX)           += bfin_dma_5xx.o
 obj-$(CONFIG_DUAL_CORE_TEST_MODULE)  += dualcore_test.o
 obj-$(CONFIG_KGDB)                   += kgdb.o
+obj-$(CONFIG_EARLY_PRINTK)           += early_printk.o
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c
index 7cf02f02a1db..e19164fb4cd1 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -73,6 +73,11 @@ static int __init blackfin_dma_init(void)
         /* Mark MEMDMA Channel 0 as requested since we're using it internally */
         dma_ch[CH_MEM_STREAM0_DEST].chan_status = DMA_CHANNEL_REQUESTED;
         dma_ch[CH_MEM_STREAM0_SRC].chan_status = DMA_CHANNEL_REQUESTED;
+
+#if defined(CONFIG_DEB_DMA_URGENT)
+        bfin_write_EBIU_DDRQUE(bfin_read_EBIU_DDRQUE()
+                         | DEB1_URGENT | DEB2_URGENT | DEB3_URGENT);
+#endif
         return 0;
 }
 
@@ -265,10 +270,23 @@ void set_dma_next_desc_addr(unsigned int channel, unsigned long addr)
 
         dma_ch[channel].regs->next_desc_ptr = addr;
         SSYNC();
-        pr_debug("set_dma_start_addr() : END\n");
+        pr_debug("set_dma_next_desc_addr() : END\n");
 }
 EXPORT_SYMBOL(set_dma_next_desc_addr);
 
+void set_dma_curr_desc_addr(unsigned int channel, unsigned long addr)
+{
+        pr_debug("set_dma_curr_desc_addr() : BEGIN \n");
+
+        BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
+               && channel < MAX_BLACKFIN_DMA_CHANNEL));
+
+        dma_ch[channel].regs->curr_desc_ptr = addr;
+        SSYNC();
+        pr_debug("set_dma_curr_desc_addr() : END\n");
+}
+EXPORT_SYMBOL(set_dma_curr_desc_addr);
+
 void set_dma_x_count(unsigned int channel, unsigned short x_count)
 {
         BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
@@ -345,6 +363,16 @@ void set_dma_sg(unsigned int channel, struct dmasg *sg, int nr_sg)
 }
 EXPORT_SYMBOL(set_dma_sg);
 
+void set_dma_curr_addr(unsigned int channel, unsigned long addr)
+{
+        BUG_ON(!(dma_ch[channel].chan_status != DMA_CHANNEL_FREE
+               && channel < MAX_BLACKFIN_DMA_CHANNEL));
+
+        dma_ch[channel].regs->curr_addr_ptr = addr;
+        SSYNC();
+}
+EXPORT_SYMBOL(set_dma_curr_addr);
+
 /*------------------------------------------------------------------------------
  *      Get the DMA status of a specific DMA channel from the system.
  *-----------------------------------------------------------------------------*/
@@ -408,6 +436,10 @@ static void *__dma_memcpy(void *dest, const void *src, size_t size)
                 blackfin_dcache_flush_range((unsigned int)src,
                                             (unsigned int)(src + size));
 
+        if ((unsigned long)dest < memory_end)
+                blackfin_dcache_invalidate_range((unsigned int)dest,
+                                                 (unsigned int)(dest + size));
+
         bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
 
         if ((unsigned long)src < (unsigned long)dest)
@@ -515,6 +547,8 @@ static void *__dma_memcpy(void *dest, const void *src, size_t size)
                 }
         }
 
+        SSYNC();
+
         while (!(bfin_read_MDMA_D0_IRQ_STATUS() & DMA_DONE))
                 ;
 
@@ -524,9 +558,6 @@ static void *__dma_memcpy(void *dest, const void *src, size_t size)
         bfin_write_MDMA_S0_CONFIG(0);
         bfin_write_MDMA_D0_CONFIG(0);
 
-        if ((unsigned long)dest < memory_end)
-                blackfin_dcache_invalidate_range((unsigned int)dest,
-                                                 (unsigned int)(dest + size));
         local_irq_restore(flags);
 
         return dest;
@@ -555,13 +586,14 @@ void *safe_dma_memcpy(void *dest, const void *src, size_t size)
 }
 EXPORT_SYMBOL(safe_dma_memcpy);
 
-void dma_outsb(void __iomem *addr, const void *buf, unsigned short len)
+void dma_outsb(unsigned long addr, const void *buf, unsigned short len)
 {
         unsigned long flags;
 
         local_irq_save(flags);
 
-        blackfin_dcache_flush_range((unsigned int)buf, (unsigned int)(buf) + len);
+        blackfin_dcache_flush_range((unsigned int)buf,
+                         (unsigned int)(buf) + len);
 
         bfin_write_MDMA_D0_START_ADDR(addr);
         bfin_write_MDMA_D0_X_COUNT(len);
@@ -576,6 +608,8 @@ void dma_outsb(void __iomem *addr, const void *buf, unsigned short len)
         bfin_write_MDMA_S0_CONFIG(DMAEN | WDSIZE_8);
         bfin_write_MDMA_D0_CONFIG(WNR | DI_EN | DMAEN | WDSIZE_8);
 
+        SSYNC();
+
         while (!(bfin_read_MDMA_D0_IRQ_STATUS() & DMA_DONE));
 
         bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -588,10 +622,13 @@ void dma_outsb(void __iomem *addr, const void *buf, unsigned short len)
 EXPORT_SYMBOL(dma_outsb);
 
 
-void dma_insb(const void __iomem *addr, void *buf, unsigned short len)
+void dma_insb(unsigned long addr, void *buf, unsigned short len)
 {
         unsigned long flags;
 
+        blackfin_dcache_invalidate_range((unsigned int)buf,
+                         (unsigned int)(buf) + len);
+
         local_irq_save(flags);
         bfin_write_MDMA_D0_START_ADDR(buf);
         bfin_write_MDMA_D0_X_COUNT(len);
@@ -606,7 +643,7 @@ void dma_insb(const void __iomem *addr, void *buf, unsigned short len)
         bfin_write_MDMA_S0_CONFIG(DMAEN | WDSIZE_8);
         bfin_write_MDMA_D0_CONFIG(WNR | DI_EN | DMAEN | WDSIZE_8);
 
-        blackfin_dcache_invalidate_range((unsigned int)buf, (unsigned int)(buf) + len);
+        SSYNC();
 
         while (!(bfin_read_MDMA_D0_IRQ_STATUS() & DMA_DONE));
 
@@ -619,13 +656,14 @@ void dma_insb(const void __iomem *addr, void *buf, unsigned short len)
 }
 EXPORT_SYMBOL(dma_insb);
 
-void dma_outsw(void __iomem *addr, const void  *buf, unsigned short len)
+void dma_outsw(unsigned long addr, const void  *buf, unsigned short len)
 {
         unsigned long flags;
 
         local_irq_save(flags);
 
-        blackfin_dcache_flush_range((unsigned int)buf, (unsigned int)(buf) + len);
+        blackfin_dcache_flush_range((unsigned int)buf,
+                         (unsigned int)(buf) + len * sizeof(short));
 
         bfin_write_MDMA_D0_START_ADDR(addr);
         bfin_write_MDMA_D0_X_COUNT(len);
@@ -640,6 +678,8 @@ void dma_outsw(void __iomem *addr, const void  *buf, unsigned short len)
         bfin_write_MDMA_S0_CONFIG(DMAEN | WDSIZE_16);
         bfin_write_MDMA_D0_CONFIG(WNR | DI_EN | DMAEN | WDSIZE_16);
 
+        SSYNC();
+
         while (!(bfin_read_MDMA_D0_IRQ_STATUS() & DMA_DONE));
 
         bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -651,10 +691,13 @@ void dma_outsw(void __iomem *addr, const void  *buf, unsigned short len)
 }
 EXPORT_SYMBOL(dma_outsw);
 
-void dma_insw(const void __iomem *addr, void *buf, unsigned short len)
+void dma_insw(unsigned long addr, void *buf, unsigned short len)
 {
         unsigned long flags;
 
+        blackfin_dcache_invalidate_range((unsigned int)buf,
+                         (unsigned int)(buf) + len * sizeof(short));
+
         local_irq_save(flags);
 
         bfin_write_MDMA_D0_START_ADDR(buf);
@@ -670,7 +713,7 @@ void dma_insw(const void __iomem *addr, void *buf, unsigned short len)
         bfin_write_MDMA_S0_CONFIG(DMAEN | WDSIZE_16);
         bfin_write_MDMA_D0_CONFIG(WNR | DI_EN | DMAEN | WDSIZE_16);
 
-        blackfin_dcache_invalidate_range((unsigned int)buf, (unsigned int)(buf) + len);
+        SSYNC();
 
         while (!(bfin_read_MDMA_D0_IRQ_STATUS() & DMA_DONE));
 
@@ -683,13 +726,14 @@ void dma_insw(const void __iomem *addr, void *buf, unsigned short len)
 }
 EXPORT_SYMBOL(dma_insw);
 
-void dma_outsl(void __iomem *addr, const void *buf, unsigned short len)
+void dma_outsl(unsigned long addr, const void *buf, unsigned short len)
 {
         unsigned long flags;
 
         local_irq_save(flags);
 
-        blackfin_dcache_flush_range((unsigned int)buf, (unsigned int)(buf) + len);
+        blackfin_dcache_flush_range((unsigned int)buf,
+                         (unsigned int)(buf) + len * sizeof(long));
 
         bfin_write_MDMA_D0_START_ADDR(addr);
         bfin_write_MDMA_D0_X_COUNT(len);
@@ -704,6 +748,8 @@ void dma_outsl(void __iomem *addr, const void *buf, unsigned short len)
         bfin_write_MDMA_S0_CONFIG(DMAEN | WDSIZE_32);
         bfin_write_MDMA_D0_CONFIG(WNR | DI_EN | DMAEN | WDSIZE_32);
 
+        SSYNC();
+
         while (!(bfin_read_MDMA_D0_IRQ_STATUS() & DMA_DONE));
 
         bfin_write_MDMA_D0_IRQ_STATUS(DMA_DONE | DMA_ERR);
@@ -715,10 +761,13 @@ void dma_outsl(void __iomem *addr, const void *buf, unsigned short len)
 }
 EXPORT_SYMBOL(dma_outsl);
 
-void dma_insl(const void __iomem *addr, void *buf, unsigned short len)
+void dma_insl(unsigned long addr, void *buf, unsigned short len)
 {
         unsigned long flags;
 
+        blackfin_dcache_invalidate_range((unsigned int)buf,
+                         (unsigned int)(buf) + len * sizeof(long));
+
         local_irq_save(flags);
 
         bfin_write_MDMA_D0_START_ADDR(buf);
@@ -734,7 +783,7 @@ void dma_insl(const void __iomem *addr, void *buf, unsigned short len)
         bfin_write_MDMA_S0_CONFIG(DMAEN | WDSIZE_32);
         bfin_write_MDMA_D0_CONFIG(WNR | DI_EN | DMAEN | WDSIZE_32);
 
-        blackfin_dcache_invalidate_range((unsigned int)buf, (unsigned int)(buf) + len);
+        SSYNC();
 
         while (!(bfin_read_MDMA_D0_IRQ_STATUS() & DMA_DONE));
 
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index 5d488ef965ce..3fe0cd49e8db 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -7,7 +7,7 @@
  * Description:  GPIO Abstraction Layer
  *
  * Modified:
- *               Copyright 2006 Analog Devices Inc.
+ *               Copyright 2007 Analog Devices Inc.
  *
  * Bugs:         Enter bugs at http://blackfin.uclinux.org/
  *
@@ -28,9 +28,9 @@
  */
 
 /*
-*  Number     BF537/6/4    BF561    BF533/2/1
+*  Number     BF537/6/4    BF561    BF533/2/1      BF549/8/4/2
 *
-*  GPIO_0       PF0         PF0        PF0
+*  GPIO_0       PF0         PF0        PF0         PA0...PJ13
 *  GPIO_1       PF1         PF1        PF1
 *  GPIO_2       PF2         PF2        PF2
 *  GPIO_3       PF3         PF3        PF3
@@ -80,6 +80,7 @@
 *  GPIO_47      PH15        PF47
 */
 
+#include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/err.h>
 #include <asm/blackfin.h>
@@ -87,6 +88,36 @@
 #include <asm/portmux.h>
 #include <linux/irq.h>
 
+#if ANOMALY_05000311 || ANOMALY_05000323
+enum {
+        AWA_data = SYSCR,
+        AWA_data_clear = SYSCR,
+        AWA_data_set = SYSCR,
+        AWA_toggle = SYSCR,
+        AWA_maska = UART_SCR,
+        AWA_maska_clear = UART_SCR,
+        AWA_maska_set = UART_SCR,
+        AWA_maska_toggle = UART_SCR,
+        AWA_maskb = UART_GCTL,
+        AWA_maskb_clear = UART_GCTL,
+        AWA_maskb_set = UART_GCTL,
+        AWA_maskb_toggle = UART_GCTL,
+        AWA_dir = SPORT1_STAT,
+        AWA_polar = SPORT1_STAT,
+        AWA_edge = SPORT1_STAT,
+        AWA_both = SPORT1_STAT,
+#if ANOMALY_05000311
+        AWA_inen = TIMER_ENABLE,
+#elif ANOMALY_05000323
+        AWA_inen = DMA1_1_CONFIG,
+#endif
+};
+        /* Anomaly Workaround */
+#define AWA_DUMMY_READ(name) bfin_read16(AWA_ ## name)
+#else
+#define AWA_DUMMY_READ(...)  do { } while (0)
+#endif
+
 #ifdef BF533_FAMILY
 static struct gpio_port_t *gpio_bankb[gpio_bank(MAX_BLACKFIN_GPIOS)] = {
         (struct gpio_port_t *) FIO_FLAG_D,
@@ -116,11 +147,31 @@ static struct gpio_port_t *gpio_bankb[gpio_bank(MAX_BLACKFIN_GPIOS)] = {
 };
 #endif
 
+#ifdef BF548_FAMILY
+static struct gpio_port_t *gpio_array[gpio_bank(MAX_BLACKFIN_GPIOS)] = {
+        (struct gpio_port_t *)PORTA_FER,
+        (struct gpio_port_t *)PORTB_FER,
+        (struct gpio_port_t *)PORTC_FER,
+        (struct gpio_port_t *)PORTD_FER,
+        (struct gpio_port_t *)PORTE_FER,
+        (struct gpio_port_t *)PORTF_FER,
+        (struct gpio_port_t *)PORTG_FER,
+        (struct gpio_port_t *)PORTH_FER,
+        (struct gpio_port_t *)PORTI_FER,
+        (struct gpio_port_t *)PORTJ_FER,
+};
+#endif
+
 static unsigned short reserved_gpio_map[gpio_bank(MAX_BLACKFIN_GPIOS)];
 static unsigned short reserved_peri_map[gpio_bank(MAX_BLACKFIN_GPIOS + 16)];
-char *str_ident = NULL;
 
-#define RESOURCE_LABEL_SIZE 16
+#define MAX_RESOURCES           256
+#define RESOURCE_LABEL_SIZE     16
+
+struct str_ident {
+        char name[RESOURCE_LABEL_SIZE];
+} *str_ident;
+
 
 #ifdef CONFIG_PM
 static unsigned short wakeup_map[gpio_bank(MAX_BLACKFIN_GPIOS)];
@@ -141,21 +192,32 @@ static unsigned int sic_iwr_irqs[gpio_bank(MAX_BLACKFIN_GPIOS)] = {IRQ_PROG0_INT
 
 #endif /* CONFIG_PM */
 
+#if defined(BF548_FAMILY)
+inline int check_gpio(unsigned short gpio)
+{
+        if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15
+            || gpio == GPIO_PH14 || gpio == GPIO_PH15
+            || gpio == GPIO_PJ14 || gpio == GPIO_PJ15
+            || gpio > MAX_BLACKFIN_GPIOS)
+                return -EINVAL;
+        return 0;
+}
+#else
 inline int check_gpio(unsigned short gpio)
 {
         if (gpio >= MAX_BLACKFIN_GPIOS)
                 return -EINVAL;
         return 0;
 }
+#endif
 
 static void set_label(unsigned short ident, const char *label)
 {
 
         if (label && str_ident) {
-                strncpy(str_ident + ident * RESOURCE_LABEL_SIZE, label,
+                strncpy(str_ident[ident].name, label,
                          RESOURCE_LABEL_SIZE);
-                str_ident[ident * RESOURCE_LABEL_SIZE +
-                         RESOURCE_LABEL_SIZE - 1] = 0;
+                str_ident[ident].name[RESOURCE_LABEL_SIZE - 1] = 0;
         }
 }
 
@@ -164,14 +226,13 @@ static char *get_label(unsigned short ident)
         if (!str_ident)
                 return "UNKNOWN";
 
-        return (str_ident[ident * RESOURCE_LABEL_SIZE] ?
-                (str_ident + ident * RESOURCE_LABEL_SIZE) : "UNKNOWN");
+        return (*str_ident[ident].name ? str_ident[ident].name : "UNKNOWN");
 }
 
 static int cmp_label(unsigned short ident, const char *label)
 {
         if (label && str_ident)
-                return strncmp(str_ident + ident * RESOURCE_LABEL_SIZE,
+                return strncmp(str_ident[ident].name,
                                  label, strlen(label));
         else
                 return -EINVAL;
@@ -181,50 +242,84 @@ static int cmp_label(unsigned short ident, const char *label)
 static void port_setup(unsigned short gpio, unsigned short usage)
 {
         if (!check_gpio(gpio)) {
-                if (usage == GPIO_USAGE) {
+                if (usage == GPIO_USAGE)
                         *port_fer[gpio_bank(gpio)] &= ~gpio_bit(gpio);
-                } else
+                else
                         *port_fer[gpio_bank(gpio)] |= gpio_bit(gpio);
                 SSYNC();
         }
 }
+#elif defined(BF548_FAMILY)
+static void port_setup(unsigned short gpio, unsigned short usage)
+{
+        if (usage == GPIO_USAGE)
+                gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio);
+        else
+                gpio_array[gpio_bank(gpio)]->port_fer |= gpio_bit(gpio);
+        SSYNC();
+}
 #else
 # define port_setup(...)  do { } while (0)
 #endif
 
 #ifdef BF537_FAMILY
-
-#define PMUX_LUT_RES            0
-#define PMUX_LUT_OFFSET         1
-#define PMUX_LUT_ENTRIES        41
-#define PMUX_LUT_SIZE           2
-
-static unsigned short port_mux_lut[PMUX_LUT_ENTRIES][PMUX_LUT_SIZE] = {
-        {P_PPI0_D13, 11}, {P_PPI0_D14, 11}, {P_PPI0_D15, 11},
-        {P_SPORT1_TFS, 11}, {P_SPORT1_TSCLK, 11}, {P_SPORT1_DTPRI, 11},
-        {P_PPI0_D10, 10}, {P_PPI0_D11, 10}, {P_PPI0_D12, 10},
-        {P_SPORT1_RSCLK, 10}, {P_SPORT1_RFS, 10}, {P_SPORT1_DRPRI, 10},
-        {P_PPI0_D8, 9}, {P_PPI0_D9, 9}, {P_SPORT1_DRSEC, 9},
-        {P_SPORT1_DTSEC, 9}, {P_TMR2, 8}, {P_PPI0_FS3, 8}, {P_TMR3, 7},
-        {P_SPI0_SSEL4, 7}, {P_TMR4, 6}, {P_SPI0_SSEL5, 6}, {P_TMR5, 5},
-        {P_SPI0_SSEL6, 5}, {P_UART1_RX, 4}, {P_UART1_TX, 4}, {P_TMR6, 4},
-        {P_TMR7, 4}, {P_UART0_RX, 3}, {P_UART0_TX, 3}, {P_DMAR0, 3},
-        {P_DMAR1, 3}, {P_SPORT0_DTSEC, 1}, {P_SPORT0_DRSEC, 1},
-        {P_CAN0_RX, 1}, {P_CAN0_TX, 1}, {P_SPI0_SSEL7, 1},
-        {P_SPORT0_TFS, 0}, {P_SPORT0_DTPRI, 0}, {P_SPI0_SSEL2, 0},
-        {P_SPI0_SSEL3, 0}
+static struct {
+        unsigned short res;
+        unsigned short offset;
+} port_mux_lut[] = {
+        {.res = P_PPI0_D13, .offset = 11},
+        {.res = P_PPI0_D14, .offset = 11},
+        {.res = P_PPI0_D15, .offset = 11},
+        {.res = P_SPORT1_TFS, .offset = 11},
+        {.res = P_SPORT1_TSCLK, .offset = 11},
+        {.res = P_SPORT1_DTPRI, .offset = 11},
+        {.res = P_PPI0_D10, .offset = 10},
+        {.res = P_PPI0_D11, .offset = 10},
+        {.res = P_PPI0_D12, .offset = 10},
+        {.res = P_SPORT1_RSCLK, .offset = 10},
+        {.res = P_SPORT1_RFS, .offset = 10},
+        {.res = P_SPORT1_DRPRI, .offset = 10},
+        {.res = P_PPI0_D8, .offset = 9},
+        {.res = P_PPI0_D9, .offset = 9},
+        {.res = P_SPORT1_DRSEC, .offset = 9},
+        {.res = P_SPORT1_DTSEC, .offset = 9},
+        {.res = P_TMR2, .offset = 8},
+        {.res = P_PPI0_FS3, .offset = 8},
+        {.res = P_TMR3, .offset = 7},
+        {.res = P_SPI0_SSEL4, .offset = 7},
+        {.res = P_TMR4, .offset = 6},
+        {.res = P_SPI0_SSEL5, .offset = 6},
+        {.res = P_TMR5, .offset = 5},
+        {.res = P_SPI0_SSEL6, .offset = 5},
+        {.res = P_UART1_RX, .offset = 4},
+        {.res = P_UART1_TX, .offset = 4},
+        {.res = P_TMR6, .offset = 4},
+        {.res = P_TMR7, .offset = 4},
+        {.res = P_UART0_RX, .offset = 3},
+        {.res = P_UART0_TX, .offset = 3},
+        {.res = P_DMAR0, .offset = 3},
+        {.res = P_DMAR1, .offset = 3},
+        {.res = P_SPORT0_DTSEC, .offset = 1},
+        {.res = P_SPORT0_DRSEC, .offset = 1},
+        {.res = P_CAN0_RX, .offset = 1},
+        {.res = P_CAN0_TX, .offset = 1},
+        {.res = P_SPI0_SSEL7, .offset = 1},
+        {.res = P_SPORT0_TFS, .offset = 0},
+        {.res = P_SPORT0_DTPRI, .offset = 0},
+        {.res = P_SPI0_SSEL2, .offset = 0},
+        {.res = P_SPI0_SSEL3, .offset = 0},
 };
 
 static void portmux_setup(unsigned short per, unsigned short function)
 {
-        u16 y, muxreg, offset;
+        u16 y, offset, muxreg;
 
-        for (y = 0; y < PMUX_LUT_ENTRIES; y++) {
-                if (port_mux_lut[y][PMUX_LUT_RES] == per) {
+        for (y = 0; y < ARRAY_SIZE(port_mux_lut); y++) {
+                if (port_mux_lut[y].res == per) {
 
                         /* SET PORTMUX REG */
 
-                        offset = port_mux_lut[y][PMUX_LUT_OFFSET];
+                        offset = port_mux_lut[y].offset;
                         muxreg = bfin_read_PORT_MUX();
 
                         if (offset != 1) {
@@ -238,18 +333,42 @@ static void portmux_setup(unsigned short per, unsigned short function)
                 }
         }
 }
+#elif defined(BF548_FAMILY)
+inline void portmux_setup(unsigned short portno, unsigned short function)
+{
+        u32 pmux;
+
+        pmux = gpio_array[gpio_bank(portno)]->port_mux;
+
+        pmux &= ~(0x3 << (2 * gpio_sub_n(portno)));
+        pmux |= (function & 0x3) << (2 * gpio_sub_n(portno));
 
+        gpio_array[gpio_bank(portno)]->port_mux = pmux;
+}
+
+inline u16 get_portmux(unsigned short portno)
+{
+        u32 pmux;
+
+        pmux = gpio_array[gpio_bank(portno)]->port_mux;
+
+        return (pmux >> (2 * gpio_sub_n(portno)) & 0x3);
+}
 #else
 # define portmux_setup(...)  do { } while (0)
 #endif
 
+#ifndef BF548_FAMILY
 static void default_gpio(unsigned short gpio)
 {
         unsigned short bank, bitmask;
+        unsigned long flags;
 
         bank = gpio_bank(gpio);
         bitmask = gpio_bit(gpio);
 
+        local_irq_save(flags);
+
         gpio_bankb[bank]->maska_clear = bitmask;
         gpio_bankb[bank]->maskb_clear = bitmask;
         SSYNC();
@@ -258,24 +377,32 @@ static void default_gpio(unsigned short gpio)
         gpio_bankb[bank]->polar &= ~bitmask;
         gpio_bankb[bank]->both &= ~bitmask;
         gpio_bankb[bank]->edge &= ~bitmask;
+        AWA_DUMMY_READ(edge);
+        local_irq_restore(flags);
+
 }
+#else
+# define default_gpio(...)  do { } while (0)
+#endif
 
 static int __init bfin_gpio_init(void)
 {
-
-        str_ident = kzalloc(RESOURCE_LABEL_SIZE * 256, GFP_KERNEL);
-        if (!str_ident)
+        str_ident = kcalloc(MAX_RESOURCES,
+                                 sizeof(struct str_ident), GFP_KERNEL);
+        if (str_ident == NULL)
                 return -ENOMEM;
 
+        memset(str_ident, 0, MAX_RESOURCES * sizeof(struct str_ident));
+
         printk(KERN_INFO "Blackfin GPIO Controller\n");
 
         return 0;
 
 }
-
 arch_initcall(bfin_gpio_init);
 
 
+#ifndef BF548_FAMILY
 /***********************************************************
 *
 * FUNCTIONS: Blackfin General Purpose Ports Access Functions
@@ -305,6 +432,7 @@ void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \
                 gpio_bankb[gpio_bank(gpio)]->name |= gpio_bit(gpio); \
         else \
                 gpio_bankb[gpio_bank(gpio)]->name &= ~gpio_bit(gpio); \
+        AWA_DUMMY_READ(name); \
         local_irq_restore(flags); \
 } \
 EXPORT_SYMBOL(set_gpio_ ## name);
@@ -316,6 +444,22 @@ SET_GPIO(edge)
 SET_GPIO(both)
 
 
+#if ANOMALY_05000311 || ANOMALY_05000323
+#define SET_GPIO_SC(name) \
+void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \
+{ \
+        unsigned long flags; \
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))); \
+        local_irq_save(flags); \
+        if (arg) \
+                gpio_bankb[gpio_bank(gpio)]->name ## _set = gpio_bit(gpio); \
+        else \
+                gpio_bankb[gpio_bank(gpio)]->name ## _clear = gpio_bit(gpio); \
+        AWA_DUMMY_READ(name); \
+        local_irq_restore(flags); \
+} \
+EXPORT_SYMBOL(set_gpio_ ## name);
+#else
 #define SET_GPIO_SC(name) \
 void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \
 { \
@@ -326,37 +470,20 @@ void set_gpio_ ## name(unsigned short gpio, unsigned short arg) \
                 gpio_bankb[gpio_bank(gpio)]->name ## _clear = gpio_bit(gpio); \
 } \
 EXPORT_SYMBOL(set_gpio_ ## name);
+#endif
 
 SET_GPIO_SC(maska)
 SET_GPIO_SC(maskb)
-
-#if defined(ANOMALY_05000311)
-void set_gpio_data(unsigned short gpio, unsigned short arg)
-{
-        unsigned long flags;
-        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
-        local_irq_save(flags);
-        if (arg)
-                gpio_bankb[gpio_bank(gpio)]->data_set = gpio_bit(gpio);
-        else
-                gpio_bankb[gpio_bank(gpio)]->data_clear = gpio_bit(gpio);
-        bfin_read_CHIPID();
-        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(set_gpio_data);
-#else
 SET_GPIO_SC(data)
-#endif
-
 
-#if defined(ANOMALY_05000311)
+#if ANOMALY_05000311 || ANOMALY_05000323
 void set_gpio_toggle(unsigned short gpio)
 {
         unsigned long flags;
         BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
         local_irq_save(flags);
         gpio_bankb[gpio_bank(gpio)]->toggle = gpio_bit(gpio);
-        bfin_read_CHIPID();
+        AWA_DUMMY_READ(toggle);
         local_irq_restore(flags);
 }
 #else
@@ -371,13 +498,27 @@ EXPORT_SYMBOL(set_gpio_toggle);
 
 /*Set current PORT date (16-bit word)*/
 
+#if ANOMALY_05000311 || ANOMALY_05000323
 #define SET_GPIO_P(name) \
 void set_gpiop_ ## name(unsigned short gpio, unsigned short arg) \
 { \
+        unsigned long flags; \
+        local_irq_save(flags); \
         gpio_bankb[gpio_bank(gpio)]->name = arg; \
+        AWA_DUMMY_READ(name); \
+        local_irq_restore(flags); \
 } \
 EXPORT_SYMBOL(set_gpiop_ ## name);
+#else
+#define SET_GPIO_P(name) \
+void set_gpiop_ ## name(unsigned short gpio, unsigned short arg) \
+{ \
+        gpio_bankb[gpio_bank(gpio)]->name = arg; \
+} \
+EXPORT_SYMBOL(set_gpiop_ ## name);
+#endif
 
+SET_GPIO_P(data)
 SET_GPIO_P(dir)
 SET_GPIO_P(inen)
 SET_GPIO_P(polar)
@@ -387,31 +528,30 @@ SET_GPIO_P(maska)
 SET_GPIO_P(maskb)
 
 
-#if defined(ANOMALY_05000311)
-void set_gpiop_data(unsigned short gpio, unsigned short arg)
-{
-        unsigned long flags;
-        local_irq_save(flags);
-        gpio_bankb[gpio_bank(gpio)]->data = arg;
-        bfin_read_CHIPID();
-        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(set_gpiop_data);
-#else
-SET_GPIO_P(data)
-#endif
-
-
-
 /* Get a specific bit */
-
+#if ANOMALY_05000311 || ANOMALY_05000323
+#define GET_GPIO(name) \
+unsigned short get_gpio_ ## name(unsigned short gpio) \
+{ \
+        unsigned long flags; \
+        unsigned short ret; \
+        local_irq_save(flags); \
+        ret = 0x01 & (gpio_bankb[gpio_bank(gpio)]->name >> gpio_sub_n(gpio)); \
+        AWA_DUMMY_READ(name); \
+        local_irq_restore(flags); \
+        return ret; \
+} \
+EXPORT_SYMBOL(get_gpio_ ## name);
+#else
 #define GET_GPIO(name) \
 unsigned short get_gpio_ ## name(unsigned short gpio) \
 { \
         return (0x01 & (gpio_bankb[gpio_bank(gpio)]->name >> gpio_sub_n(gpio))); \
 } \
 EXPORT_SYMBOL(get_gpio_ ## name);
+#endif
 
+GET_GPIO(data)
 GET_GPIO(dir)
 GET_GPIO(inen)
 GET_GPIO(polar)
@@ -420,33 +560,31 @@ GET_GPIO(both)
 GET_GPIO(maska)
 GET_GPIO(maskb)
 
-
-#if defined(ANOMALY_05000311)
-unsigned short get_gpio_data(unsigned short gpio)
-{
-        unsigned long flags;
-        unsigned short ret;
-        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
-        local_irq_save(flags);
-        ret = 0x01 & (gpio_bankb[gpio_bank(gpio)]->data >> gpio_sub_n(gpio));
-        bfin_read_CHIPID();
-        local_irq_restore(flags);
-        return ret;
-}
-EXPORT_SYMBOL(get_gpio_data);
-#else
-GET_GPIO(data)
-#endif
-
 /*Get current PORT date (16-bit word)*/
 
+#if ANOMALY_05000311 || ANOMALY_05000323
+#define GET_GPIO_P(name) \
+unsigned short get_gpiop_ ## name(unsigned short gpio) \
+{ \
+        unsigned long flags; \
+        unsigned short ret; \
+        local_irq_save(flags); \
+        ret = (gpio_bankb[gpio_bank(gpio)]->name); \
+        AWA_DUMMY_READ(name); \
+        local_irq_restore(flags); \
+        return ret; \
+} \
+EXPORT_SYMBOL(get_gpiop_ ## name);
+#else
 #define GET_GPIO_P(name) \
 unsigned short get_gpiop_ ## name(unsigned short gpio) \
 { \
         return (gpio_bankb[gpio_bank(gpio)]->name);\
 } \
 EXPORT_SYMBOL(get_gpiop_ ## name);
+#endif
 
+GET_GPIO_P(data)
 GET_GPIO_P(dir)
 GET_GPIO_P(inen)
 GET_GPIO_P(polar)
@@ -455,21 +593,6 @@ GET_GPIO_P(both)
 GET_GPIO_P(maska)
 GET_GPIO_P(maskb)
 
-#if defined(ANOMALY_05000311)
-unsigned short get_gpiop_data(unsigned short gpio)
-{
-        unsigned long flags;
-        unsigned short ret;
-        local_irq_save(flags);
-        ret = gpio_bankb[gpio_bank(gpio)]->data;
-        bfin_read_CHIPID();
-        local_irq_restore(flags);
-        return ret;
-}
-EXPORT_SYMBOL(get_gpiop_data);
-#else
-GET_GPIO_P(data)
-#endif
 
 #ifdef CONFIG_PM
 /***********************************************************
@@ -593,6 +716,8 @@ u32 gpio_pm_setup(void)
                 }
         }
 
+        AWA_DUMMY_READ(maskb_set);
+
         if (sic_iwr)
                 return sic_iwr;
         else
@@ -624,12 +749,99 @@ void gpio_pm_restore(void)
 
                 gpio_bankb[bank]->maskb = gpio_bank_saved[bank].maskb;
         }
+        AWA_DUMMY_READ(maskb);
 }
 
 #endif
+#endif /* BF548_FAMILY */
 
+/***********************************************************
+*
+* FUNCTIONS:    Blackfin Peripheral Resource Allocation
+*               and PortMux Setup
+*
+* INPUTS/OUTPUTS:
+* per   Peripheral Identifier
+* label String
+*
+* DESCRIPTION: Blackfin Peripheral Resource Allocation and Setup API
+*
+* CAUTION:
+*************************************************************
+* MODIFICATION HISTORY :
+**************************************************************/
+
+#ifdef BF548_FAMILY
+int peripheral_request(unsigned short per, const char *label)
+{
+        unsigned long flags;
+        unsigned short ident = P_IDENT(per);
+
+        /*
+         * Don't cares are pins with only one dedicated function
+         */
+
+        if (per & P_DONTCARE)
+                return 0;
+
+        if (!(per & P_DEFINED))
+                return -ENODEV;
+
+        if (check_gpio(ident) < 0)
+                return -EINVAL;
+
+        local_irq_save(flags);
+
+        if (unlikely(reserved_gpio_map[gpio_bank(ident)] & gpio_bit(ident))) {
+                printk(KERN_ERR
+                    "%s: Peripheral %d is already reserved as GPIO by %s !\n",
+                       __FUNCTION__, ident, get_label(ident));
+                dump_stack();
+                local_irq_restore(flags);
+                return -EBUSY;
+        }
+
+        if (unlikely(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident))) {
+
+                u16 funct = get_portmux(ident);
+
+        /*
+         * Pin functions like AMC address strobes my
+         * be requested and used by several drivers
+         */
+
+                if (!((per & P_MAYSHARE) && (funct == P_FUNCT2MUX(per)))) {
+
+                /*
+                 * Allow that the identical pin function can
+                 * be requested from the same driver twice
+                 */
+
+                if (cmp_label(ident, label) == 0)
+                        goto anyway;
 
+                        printk(KERN_ERR
+                               "%s: Peripheral %d function %d is already reserved by %s !\n",
+                               __FUNCTION__, ident, P_FUNCT2MUX(per), get_label(ident));
+                        dump_stack();
+                        local_irq_restore(flags);
+                        return -EBUSY;
+                }
+        }
 
+anyway:
+        reserved_peri_map[gpio_bank(ident)] |= gpio_bit(ident);
+
+        portmux_setup(ident, P_FUNCT2MUX(per));
+        port_setup(ident, PERIPHERAL_USAGE);
+
+        local_irq_restore(flags);
+        set_label(ident, label);
+
+        return 0;
+}
+EXPORT_SYMBOL(peripheral_request);
+#else
 
 int peripheral_request(unsigned short per, const char *label)
 {
@@ -680,7 +892,7 @@ int peripheral_request(unsigned short per, const char *label)
 
                         printk(KERN_ERR
                                "%s: Peripheral %d function %d is already"
-                               "reserved by %s !\n",
+                               " reserved by %s !\n",
                                __FUNCTION__, ident, P_FUNCT2MUX(per),
                                 get_label(ident));
                         dump_stack();
@@ -691,8 +903,6 @@ int peripheral_request(unsigned short per, const char *label)
         }
 
 anyway:
-
-
         portmux_setup(per, P_FUNCT2MUX(per));
 
         port_setup(ident, PERIPHERAL_USAGE);
@@ -704,6 +914,7 @@ anyway:
         return 0;
 }
 EXPORT_SYMBOL(peripheral_request);
+#endif
 
 int peripheral_request_list(unsigned short per[], const char *label)
 {
@@ -711,9 +922,15 @@ int peripheral_request_list(unsigned short per[], const char *label)
         int ret;
 
         for (cnt = 0; per[cnt] != 0; cnt++) {
+
                 ret = peripheral_request(per[cnt], label);
-                if (ret < 0)
-                        return ret;
+
+                if (ret < 0) {
+                        for ( ; cnt > 0; cnt--) {
+                                peripheral_free(per[cnt - 1]);
+                        }
+                return ret;
+                }
         }
 
         return 0;
@@ -748,6 +965,8 @@ void peripheral_free(unsigned short per)
 
         reserved_peri_map[gpio_bank(ident)] &= ~gpio_bit(ident);
 
+        set_label(ident, "free");
+
         local_irq_restore(flags);
 }
 EXPORT_SYMBOL(peripheral_free);
@@ -768,8 +987,8 @@ EXPORT_SYMBOL(peripheral_free_list);
 * FUNCTIONS: Blackfin GPIO Driver
 *
 * INPUTS/OUTPUTS:
-* gpio - GPIO Number between 0 and MAX_BLACKFIN_GPIOS
-*
+* gpio  PIO Number between 0 and MAX_BLACKFIN_GPIOS
+* label String
 *
 * DESCRIPTION: Blackfin GPIO Driver API
 *
@@ -787,17 +1006,39 @@ int gpio_request(unsigned short gpio, const char *label)
 
         local_irq_save(flags);
 
+        /*
+         * Allow that the identical GPIO can
+         * be requested from the same driver twice
+         * Do nothing and return -
+         */
+
+        if (cmp_label(gpio, label) == 0) {
+                local_irq_restore(flags);
+                return 0;
+        }
+
         if (unlikely(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
-                printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved!\n", gpio);
+                printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved by %s !\n",
+                         gpio, get_label(gpio));
                 dump_stack();
                 local_irq_restore(flags);
                 return -EBUSY;
         }
+        if (unlikely(reserved_peri_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
+                printk(KERN_ERR
+                       "bfin-gpio: GPIO %d is already reserved as Peripheral by %s !\n",
+                       gpio, get_label(gpio));
+                dump_stack();
+                local_irq_restore(flags);
+                return -EBUSY;
+        }
+
         reserved_gpio_map[gpio_bank(gpio)] |= gpio_bit(gpio);
 
         local_irq_restore(flags);
 
         port_setup(gpio, GPIO_USAGE);
+        set_label(gpio, label);
 
         return 0;
 }
@@ -823,10 +1064,57 @@ void gpio_free(unsigned short gpio)
 
         reserved_gpio_map[gpio_bank(gpio)] &= ~gpio_bit(gpio);
 
+        set_label(gpio, "free");
+
         local_irq_restore(flags);
 }
 EXPORT_SYMBOL(gpio_free);
 
+#ifdef BF548_FAMILY
+void gpio_direction_input(unsigned short gpio)
+{
+        unsigned long flags;
+
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
+
+        local_irq_save(flags);
+        gpio_array[gpio_bank(gpio)]->port_dir_clear = gpio_bit(gpio);
+        gpio_array[gpio_bank(gpio)]->port_inen |= gpio_bit(gpio);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(gpio_direction_input);
+
+void gpio_direction_output(unsigned short gpio)
+{
+        unsigned long flags;
+
+        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
+
+        local_irq_save(flags);
+        gpio_array[gpio_bank(gpio)]->port_inen &= ~gpio_bit(gpio);
+        gpio_array[gpio_bank(gpio)]->port_dir_set = gpio_bit(gpio);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL(gpio_direction_output);
+
+void gpio_set_value(unsigned short gpio, unsigned short arg)
+{
+        if (arg)
+                gpio_array[gpio_bank(gpio)]->port_set = gpio_bit(gpio);
+        else
+                gpio_array[gpio_bank(gpio)]->port_clear = gpio_bit(gpio);
+
+}
+EXPORT_SYMBOL(gpio_set_value);
+
+unsigned short gpio_get_value(unsigned short gpio)
+{
+        return (1 & (gpio_array[gpio_bank(gpio)]->port_data >> gpio_sub_n(gpio)));
+}
+EXPORT_SYMBOL(gpio_get_value);
+
+#else
+
 void gpio_direction_input(unsigned short gpio)
 {
         unsigned long flags;
@@ -836,6 +1124,7 @@ void gpio_direction_input(unsigned short gpio)
         local_irq_save(flags);
         gpio_bankb[gpio_bank(gpio)]->dir &= ~gpio_bit(gpio);
         gpio_bankb[gpio_bank(gpio)]->inen |= gpio_bit(gpio);
+        AWA_DUMMY_READ(inen);
         local_irq_restore(flags);
 }
 EXPORT_SYMBOL(gpio_direction_input);
@@ -849,6 +1138,28 @@ void gpio_direction_output(unsigned short gpio)
         local_irq_save(flags);
         gpio_bankb[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio);
         gpio_bankb[gpio_bank(gpio)]->dir |= gpio_bit(gpio);
+        AWA_DUMMY_READ(dir);
         local_irq_restore(flags);
 }
 EXPORT_SYMBOL(gpio_direction_output);
+
+/* If we are booting from SPI and our board lacks a strong enough pull up,
+ * the core can reset and execute the bootrom faster than the resistor can
+ * pull the signal logically high.  To work around this (common) error in
+ * board design, we explicitly set the pin back to GPIO mode, force /CS
+ * high, and wait for the electrons to do their thing.
+ *
+ * This function only makes sense to be called from reset code, but it
+ * lives here as we need to force all the GPIO states w/out going through
+ * BUG() checks and such.
+ */
+void bfin_gpio_reset_spi0_ssel1(void)
+{
+        u16 gpio = P_IDENT(P_SPI0_SSEL1);
+
+        port_setup(gpio, GPIO_USAGE);
+        gpio_bankb[gpio_bank(gpio)]->data_set = gpio_bit(gpio);
+        udelay(1);
+}
+
+#endif /*BF548_FAMILY */
diff --git a/arch/blackfin/kernel/bfin_ksyms.c b/arch/blackfin/kernel/bfin_ksyms.c
index 70455949cfd2..2198afe40f33 100644
--- a/arch/blackfin/kernel/bfin_ksyms.c
+++ b/arch/blackfin/kernel/bfin_ksyms.c
@@ -60,6 +60,7 @@ EXPORT_SYMBOL(csum_partial_copy);
  * their interface isn't gonna change any time soon now, so
  * it's OK to leave it out of version control.
  */
+EXPORT_SYMBOL(strcpy);
 EXPORT_SYMBOL(memcpy);
 EXPORT_SYMBOL(memset);
 EXPORT_SYMBOL(memcmp);
diff --git a/arch/blackfin/kernel/cacheinit.c b/arch/blackfin/kernel/cacheinit.c
index 4d41a40e8133..62cbba7364b0 100644
--- a/arch/blackfin/kernel/cacheinit.c
+++ b/arch/blackfin/kernel/cacheinit.c
@@ -21,9 +21,10 @@
 
 #include <asm/cacheflush.h>
 #include <asm/blackfin.h>
+#include <asm/cplb.h>
 #include <asm/cplbinit.h>
 
-#if defined(CONFIG_BLKFIN_CACHE)
+#if defined(CONFIG_BFIN_ICACHE)
 void bfin_icache_init(void)
 {
         unsigned long *table = icplb_table;
@@ -44,7 +45,7 @@ void bfin_icache_init(void)
 }
 #endif
 
-#if defined(CONFIG_BLKFIN_DCACHE)
+#if defined(CONFIG_BFIN_DCACHE)
 void bfin_dcache_init(void)
 {
         unsigned long *table = dcplb_table;
diff --git a/arch/blackfin/kernel/cplbinit.c b/arch/blackfin/kernel/cplbinit.c
index bbdb403fcb55..f2db6a5e2b5b 100644
--- a/arch/blackfin/kernel/cplbinit.c
+++ b/arch/blackfin/kernel/cplbinit.c
@@ -23,6 +23,7 @@
 #include <linux/module.h>
 
 #include <asm/blackfin.h>
+#include <asm/cplb.h>
 #include <asm/cplbinit.h>
 
 u_long icplb_table[MAX_CPLBS+1];
@@ -56,7 +57,7 @@ struct s_cplb {
         struct cplb_tab switch_d;
 };
 
-#if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE)
+#if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_ICACHE)
 static struct cplb_desc cplb_data[] = {
         {
                 .start = 0,
@@ -230,8 +231,8 @@ static void __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_en
                                 cplb_data[i].psize,
                                 cplb_data[i].i_conf);
         } else {
-#if (defined(CONFIG_BLKFIN_CACHE) && defined(ANOMALY_05000263))
-                if (i == SDRAM_KERN) {
+#if defined(CONFIG_BFIN_ICACHE)
+                if (ANOMALY_05000263 && i == SDRAM_KERN) {
                         fill_cplbtab(t,
                                         cplb_data[i].start,
                                         cplb_data[i].end,
diff --git a/arch/blackfin/kernel/early_printk.c b/arch/blackfin/kernel/early_printk.c
new file mode 100644
index 000000000000..6ec518a81113
--- /dev/null
+++ b/arch/blackfin/kernel/early_printk.c
@@ -0,0 +1,214 @@
+/*
+ * File:         arch/blackfin/kernel/early_printk.c
+ * Based on:     arch/x86_64/kernel/early_printk.c
+ * Author:       Robin Getz <rgetz@blackfin.uclinux.org
+ *
+ * Created:      14Aug2007
+ * Description:  allow a console to be used for early printk
+ *
+ * Modified:
+ *               Copyright 2004-2007 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/serial_core.h>
+#include <linux/console.h>
+#include <linux/string.h>
+#include <asm/blackfin.h>
+#include <asm/irq_handler.h>
+#include <asm/early_printk.h>
+
+#ifdef CONFIG_SERIAL_BFIN
+extern struct console *bfin_earlyserial_init(unsigned int port,
+                                                unsigned int cflag);
+#endif
+
+static struct console *early_console;
+
+/* Default console */
+#define DEFAULT_PORT 0
+#define DEFAULT_CFLAG CS8|B57600
+
+/* Default console for early crashes */
+#define DEFAULT_EARLY_PORT "serial,uart0,57600"
+
+#ifdef CONFIG_SERIAL_CORE
+/* What should get here is "0,57600" */
+static struct console * __init earlyserial_init(char *buf)
+{
+        int baud, bit;
+        char parity;
+        unsigned int serial_port = DEFAULT_PORT;
+        unsigned int cflag = DEFAULT_CFLAG;
+
+        serial_port = simple_strtoul(buf, &buf, 10);
+        buf++;
+
+        cflag = 0;
+        baud = simple_strtoul(buf, &buf, 10);
+        switch (baud) {
+        case 1200:
+                cflag |= B1200;
+                break;
+        case 2400:
+                cflag |= B2400;
+                break;
+        case 4800:
+                cflag |= B4800;
+                break;
+        case 9600:
+                cflag |= B9600;
+                break;
+        case 19200:
+                cflag |= B19200;
+                break;
+        case 38400:
+                cflag |= B38400;
+                break;
+        case 115200:
+                cflag |= B115200;
+                break;
+        default:
+                cflag |= B57600;
+        }
+
+        parity = buf[0];
+        buf++;
+        switch (parity) {
+        case 'e':
+                cflag |= PARENB;
+                break;
+        case 'o':
+                cflag |= PARODD;
+                break;
+        }
+
+        bit = simple_strtoul(buf, &buf, 10);
+        switch (bit) {
+        case 5:
+                cflag |= CS5;
+                break;
+        case 6:
+                cflag |= CS5;
+                break;
+        case 7:
+                cflag |= CS5;
+                break;
+        default:
+                cflag |= CS8;
+        }
+
+#ifdef CONFIG_SERIAL_BFIN
+        return bfin_earlyserial_init(serial_port, cflag);
+#else
+        return NULL;
+#endif
+
+}
+#endif
+
+int __init setup_early_printk(char *buf)
+{
+
+        /* Crashing in here would be really bad, so check both the var
+           and the pointer before we start using it
+         */
+        if (!buf)
+                return 0;
+
+        if (!*buf)
+                return 0;
+
+        if (early_console != NULL)
+                return 0;
+
+#ifdef CONFIG_SERIAL_BFIN
+        /* Check for Blackfin Serial */
+        if (!strncmp(buf, "serial,uart", 11)) {
+                buf += 11;
+                early_console = earlyserial_init(buf);
+        }
+#endif
+#ifdef CONFIG_FB
+                /* TODO: add framebuffer console support */
+#endif
+
+        if (likely(early_console)) {
+                early_console->flags |= CON_BOOT;
+
+                register_console(early_console);
+                printk(KERN_INFO "early printk enabled on %s%d\n",
+                        early_console->name,
+                        early_console->index);
+        }
+
+        return 0;
+}
+
+/*
+ * Set up a temporary Event Vector Table, so if something bad happens before
+ * the kernel is fully started, it doesn't vector off into somewhere we don't
+ * know
+ */
+
+asmlinkage void __init init_early_exception_vectors(void)
+{
+        SSYNC();
+
+        /* cannot program in software:
+         * evt0 - emulation (jtag)
+         * evt1 - reset
+         */
+        bfin_write_EVT2(early_trap);
+        bfin_write_EVT3(early_trap);
+        bfin_write_EVT5(early_trap);
+        bfin_write_EVT6(early_trap);
+        bfin_write_EVT7(early_trap);
+        bfin_write_EVT8(early_trap);
+        bfin_write_EVT9(early_trap);
+        bfin_write_EVT10(early_trap);
+        bfin_write_EVT11(early_trap);
+        bfin_write_EVT12(early_trap);
+        bfin_write_EVT13(early_trap);
+        bfin_write_EVT14(early_trap);
+        bfin_write_EVT15(early_trap);
+        CSYNC();
+
+        /* Set all the return from interupt, exception, NMI to a known place
+         * so if we do a RETI, RETX or RETN by mistake - we go somewhere known
+         * Note - don't change RETS - we are in a subroutine, or
+         * RETE - since it might screw up if emulator is attached
+         */
+        asm("\tRETI = %0; RETX = %0; RETN = %0;\n"
+                : : "p"(early_trap));
+
+}
+
+asmlinkage void __init early_trap_c(struct pt_regs *fp, void *retaddr)
+{
+        /* This can happen before the uart is initialized, so initialize
+         * the UART now
+         */
+        if (likely(early_console == NULL))
+                setup_early_printk(DEFAULT_EARLY_PORT);
+
+        dump_bfin_regs(fp, retaddr);
+        dump_bfin_trace_buffer();
+
+        panic("Died early");
+}
+
+early_param("earlyprintk", setup_early_printk);
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c
index 1fc001c7abda..73647c158774 100644
--- a/arch/blackfin/kernel/irqchip.c
+++ b/arch/blackfin/kernel/irqchip.c
@@ -34,6 +34,7 @@
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <asm/trace.h>
 
 static unsigned long irq_err_count;
 static spinlock_t irq_controller_lock;
@@ -97,9 +98,8 @@ int show_interrupts(struct seq_file *p, void *v)
  */
 
 #ifdef CONFIG_DO_IRQ_L1
-asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)__attribute__((l1_text));
+__attribute__((l1_text))
 #endif
-
 asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)
 {
         struct pt_regs *old_regs;
@@ -144,4 +144,12 @@ void __init init_IRQ(void)
         }
 
         init_arch_irq();
+
+#ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND
+        /* Now that evt_ivhw is set up, turn this on */
+        trace_buff_offset = 0;
+        bfin_write_TBUFCTL(BFIN_TRACE_ON);
+        printk(KERN_INFO "Hardware Trace expanded to %ik\n",
+          1 << CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN);
+#endif
 }
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 6a7aefe48346..9124467651c4 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -134,31 +134,6 @@ void cpu_idle(void)
         }
 }
 
-void machine_restart(char *__unused)
-{
-#if defined(CONFIG_BLKFIN_CACHE)
-        bfin_write_IMEM_CONTROL(0x01);
-        SSYNC();
-#endif
-        bfin_reset();
-        /* Dont do anything till the reset occurs */
-        while (1) {
-                SSYNC();
-        }
-}
-
-void machine_halt(void)
-{
-        for (;;)
-                asm volatile ("idle");
-}
-
-void machine_power_off(void)
-{
-        for (;;)
-                asm volatile ("idle");
-}
-
 void show_regs(struct pt_regs *regs)
 {
         printk(KERN_NOTICE "\n");
@@ -420,7 +395,8 @@ void finish_atomic_sections (struct pt_regs *regs)
 #if defined(CONFIG_ACCESS_CHECK)
 int _access_ok(unsigned long addr, unsigned long size)
 {
-
+        if (size == 0)
+                return 1;
         if (addr > (addr + size))
                 return 0;
         if (segment_eq(get_fs(), KERNEL_DS))
diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c
index ed800c7456dd..64ce5fea8609 100644
--- a/arch/blackfin/kernel/ptrace.c
+++ b/arch/blackfin/kernel/ptrace.c
@@ -44,6 +44,7 @@
 #include <asm/processor.h>
 #include <asm/asm-offsets.h>
 #include <asm/dma.h>
+#include <asm/fixed_code.h>
 
 #define MAX_SHARED_LIBS 3
 #define TEXT_OFFSET 0
@@ -169,6 +170,9 @@ static inline int is_user_addr_valid(struct task_struct *child,
                     && start + len <= (unsigned long)sraml->addr + sraml->length)
                         return 0;
 
+        if (start >= FIXED_CODE_START && start + len <= FIXED_CODE_END)
+                return 0;
+
         return -EIO;
 }
 
@@ -215,9 +219,13 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                                 copied = sizeof(tmp);
                         } else
 #endif
-                        copied =
-                            access_process_vm(child, addr + add, &tmp,
-                                              sizeof(tmp), 0);
+                        if (addr + add >= FIXED_CODE_START
+                            && addr + add + sizeof(tmp) <= FIXED_CODE_END) {
+                                memcpy(&tmp, (const void *)(addr + add), sizeof(tmp));
+                                copied = sizeof(tmp);
+                        } else
+                                copied = access_process_vm(child, addr + add, &tmp,
+                                                           sizeof(tmp), 0);
                         pr_debug("ptrace: copied size %d [0x%08lx]\n", copied, tmp);
                         if (copied != sizeof(tmp))
                                 break;
@@ -281,9 +289,13 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                                 copied = sizeof(data);
                         } else
 #endif
-                        copied =
-                            access_process_vm(child, addr + add, &data,
-                                              sizeof(data), 1);
+                        if (addr + add >= FIXED_CODE_START
+                            && addr + add + sizeof(data) <= FIXED_CODE_END) {
+                                memcpy((void *)(addr + add), &data, sizeof(data));
+                                copied = sizeof(data);
+                        } else
+                                copied = access_process_vm(child, addr + add, &data,
+                                                           sizeof(data), 1);
                         pr_debug("ptrace: copied size %d\n", copied);
                         if (copied != sizeof(data))
                                 break;
diff --git a/arch/blackfin/kernel/reboot.c b/arch/blackfin/kernel/reboot.c
new file mode 100644
index 000000000000..356078ec462b
--- /dev/null
+++ b/arch/blackfin/kernel/reboot.c
@@ -0,0 +1,78 @@
+/*
+ * arch/blackfin/kernel/reboot.c - handle shutdown/reboot
+ *
+ * Copyright 2004-2007 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <asm/bfin-global.h>
+#include <asm/reboot.h>
+#include <asm/system.h>
+
+#if defined(BF537_FAMILY) || defined(BF533_FAMILY)
+#define SYSCR_VAL       0x0
+#elif defined(BF561_FAMILY)
+#define SYSCR_VAL       0x20
+#elif defined(BF548_FAMILY)
+#define SYSCR_VAL       0x10
+#endif
+
+/* A system soft reset makes external memory unusable
+ * so force this function into L1.
+ */
+__attribute__((l1_text))
+void bfin_reset(void)
+{
+        /* force BMODE and disable Core B (as needed) */
+        bfin_write_SYSCR(SYSCR_VAL);
+
+        /* we use asm ssync here because it's save and we save some L1 */
+        asm("ssync;");
+
+        while (1) {
+                /* initiate system soft reset with magic 0x7 */
+                bfin_write_SWRST(0x7);
+                asm("ssync;");
+                /* clear system soft reset */
+                bfin_write_SWRST(0);
+                asm("ssync;");
+                /* issue core reset */
+                asm("raise 1");
+        }
+}
+
+__attribute__((weak))
+void native_machine_restart(char *cmd)
+{
+}
+
+void machine_restart(char *cmd)
+{
+        native_machine_restart(cmd);
+        local_irq_disable();
+        bfin_reset();
+}
+
+__attribute__((weak))
+void native_machine_halt(void)
+{
+        idle_with_irq_disabled();
+}
+
+void machine_halt(void)
+{
+        native_machine_halt();
+}
+
+__attribute__((weak))
+void native_machine_power_off(void)
+{
+        idle_with_irq_disabled();
+}
+
+void machine_power_off(void)
+{
+        native_machine_power_off();
+}
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 88f221b89b33..8dcd76e87ed5 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -39,10 +39,12 @@
 #include <linux/cramfs_fs.h>
 #include <linux/romfs_fs.h>
 
+#include <asm/cplb.h>
 #include <asm/cacheflush.h>
 #include <asm/blackfin.h>
 #include <asm/cplbinit.h>
 #include <asm/fixed_code.h>
+#include <asm/early_printk.h>
 
 u16 _bfin_swrst;
 
@@ -66,21 +68,21 @@ char __initdata command_line[COMMAND_LINE_SIZE];
 
 void __init bf53x_cache_init(void)
 {
-#if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE)
+#if defined(CONFIG_BFIN_DCACHE) || defined(CONFIG_BFIN_ICACHE)
         generate_cpl_tables();
 #endif
 
-#ifdef CONFIG_BLKFIN_CACHE
+#ifdef CONFIG_BFIN_ICACHE
         bfin_icache_init();
         printk(KERN_INFO "Instruction Cache Enabled\n");
 #endif
 
-#ifdef CONFIG_BLKFIN_DCACHE
+#ifdef CONFIG_BFIN_DCACHE
         bfin_dcache_init();
         printk(KERN_INFO "Data Cache Enabled"
-# if defined CONFIG_BLKFIN_WB
+# if defined CONFIG_BFIN_WB
                 " (write-back)"
-# elif defined CONFIG_BLKFIN_WT
+# elif defined CONFIG_BFIN_WT
                 " (write-through)"
 # endif
                 "\n");
@@ -156,8 +158,10 @@ static __init void parse_cmdline_early(char *cmdline_p)
                                                             1;
                                         }
                                 }
+                        } else if (!memcmp(to, "earlyprintk=", 12)) {
+                                to += 12;
+                                setup_early_printk(to);
                         }
-
                 }
                 c = *(to++);
                 if (!c)
@@ -176,22 +180,36 @@ void __init setup_arch(char **cmdline_p)
 #ifdef CONFIG_DUMMY_CONSOLE
         conswitchp = &dummy_con;
 #endif
+
+#if defined(CONFIG_CMDLINE_BOOL)
+        strncpy(&command_line[0], CONFIG_CMDLINE, sizeof(command_line));
+        command_line[sizeof(command_line) - 1] = 0;
+#endif
+
+        /* Keep a copy of command line */
+        *cmdline_p = &command_line[0];
+        memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
+        boot_command_line[COMMAND_LINE_SIZE - 1] = '\0';
+
+        /* setup memory defaults from the user config */
+        physical_mem_end = 0;
+        _ramend = CONFIG_MEM_SIZE * 1024 * 1024;
+
+        parse_cmdline_early(&command_line[0]);
+
         cclk = get_cclk();
         sclk = get_sclk();
 
-#if !defined(CONFIG_BFIN_KERNEL_CLOCK) && defined(ANOMALY_05000273)
-        if (cclk == sclk)
+#if !defined(CONFIG_BFIN_KERNEL_CLOCK)
+        if (ANOMALY_05000273 && cclk == sclk)
                 panic("ANOMALY 05000273, SCLK can not be same as CCLK");
 #endif
 
-#if defined(ANOMALY_05000266)
-        bfin_read_IMDMA_D0_IRQ_STATUS();
-        bfin_read_IMDMA_D1_IRQ_STATUS();
-#endif
-
-#ifdef DEBUG_SERIAL_EARLY_INIT
-        bfin_console_init();    /* early console registration */
-        /* this give a chance to get printk() working before crash. */
+#ifdef BF561_FAMILY
+        if (ANOMALY_05000266) {
+                bfin_read_IMDMA_D0_IRQ_STATUS();
+                bfin_read_IMDMA_D1_IRQ_STATUS();
+        }
 #endif
 
         printk(KERN_INFO "Hardware Trace ");
@@ -212,22 +230,6 @@ void __init setup_arch(char **cmdline_p)
         flash_probe();
 #endif
 
-#if defined(CONFIG_CMDLINE_BOOL)
-        strncpy(&command_line[0], CONFIG_CMDLINE, sizeof(command_line));
-        command_line[sizeof(command_line) - 1] = 0;
-#endif
-
-        /* Keep a copy of command line */
-        *cmdline_p = &command_line[0];
-        memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
-        boot_command_line[COMMAND_LINE_SIZE - 1] = '\0';
-
-        /* setup memory defaults from the user config */
-        physical_mem_end = 0;
-        _ramend = CONFIG_MEM_SIZE * 1024 * 1024;
-
-        parse_cmdline_early(&command_line[0]);
-
         if (physical_mem_end == 0)
                 physical_mem_end = _ramend;
 
@@ -260,7 +262,7 @@ void __init setup_arch(char **cmdline_p)
             && ((unsigned long *)mtd_phys)[1] == ROMSB_WORD1)
                 mtd_size =
                     PAGE_ALIGN(be32_to_cpu(((unsigned long *)mtd_phys)[2]));
-#  if (defined(CONFIG_BLKFIN_CACHE) && defined(ANOMALY_05000263))
+#  if (defined(CONFIG_BFIN_ICACHE) && ANOMALY_05000263)
         /* Due to a Hardware Anomaly we need to limit the size of usable
          * instruction memory to max 60MB, 56 if HUNT_FOR_ZERO is on
          * 05000263 - Hardware loop corrupted when taking an ICPLB exception
@@ -289,7 +291,7 @@ void __init setup_arch(char **cmdline_p)
         _ebss = memory_mtd_start;       /* define _ebss for compatible */
 #endif                          /* CONFIG_MTD_UCLINUX */
 
-#if (defined(CONFIG_BLKFIN_CACHE) && defined(ANOMALY_05000263))
+#if (defined(CONFIG_BFIN_ICACHE) && ANOMALY_05000263)
         /* Due to a Hardware Anomaly we need to limit the size of usable
          * instruction memory to max 60MB, 56 if HUNT_FOR_ZERO is on
          * 05000263 - Hardware loop corrupted when taking an ICPLB exception
@@ -334,13 +336,11 @@ void __init setup_arch(char **cmdline_p)
                        CPU, bfin_revid());
         printk(KERN_INFO "Blackfin Linux support by http://blackfin.uclinux.org/\n");
 
-        printk(KERN_INFO "Processor Speed: %lu MHz core clock and %lu Mhz System Clock\n",
+        printk(KERN_INFO "Processor Speed: %lu MHz core clock and %lu MHz System Clock\n",
                cclk / 1000000,  sclk / 1000000);
 
-#if defined(ANOMALY_05000273)
-        if ((cclk >> 1) <= sclk)
+        if (ANOMALY_05000273 && (cclk >> 1) <= sclk)
                 printk("\n\n\nANOMALY_05000273: CCLK must be >= 2*SCLK !!!\n\n\n");
-#endif
 
         printk(KERN_INFO "Board Memory: %ldMB\n", physical_mem_end >> 20);
         printk(KERN_INFO "Kernel Managed Memory: %ldMB\n", _ramend >> 20);
@@ -535,9 +535,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                 seq_printf(m, "I-CACHE:\tOFF\n");
         if ((bfin_read_DMEM_CONTROL()) & (ENDCPLB | DMC_ENABLE))
                 seq_printf(m, "D-CACHE:\tON"
-#if defined CONFIG_BLKFIN_WB
+#if defined CONFIG_BFIN_WB
                            " (write-back)"
-#elif defined CONFIG_BLKFIN_WT
+#elif defined CONFIG_BFIN_WT
                            " (write-through)"
 #endif
                            "\n");
@@ -566,15 +566,15 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         }
 
 
-        seq_printf(m, "I-CACHE Size:\t%dKB\n", BLKFIN_ICACHESIZE / 1024);
+        seq_printf(m, "I-CACHE Size:\t%dKB\n", BFIN_ICACHESIZE / 1024);
         seq_printf(m, "D-CACHE Size:\t%dKB\n", dcache_size);
         seq_printf(m, "I-CACHE Setup:\t%d Sub-banks/%d Ways, %d Lines/Way\n",
-                   BLKFIN_ISUBBANKS, BLKFIN_IWAYS, BLKFIN_ILINES);
+                   BFIN_ISUBBANKS, BFIN_IWAYS, BFIN_ILINES);
         seq_printf(m,
                    "D-CACHE Setup:\t%d Super-banks/%d Sub-banks/%d Ways, %d Lines/Way\n",
-                   dsup_banks, BLKFIN_DSUBBANKS, BLKFIN_DWAYS,
-                   BLKFIN_DLINES);
-#ifdef CONFIG_BLKFIN_CACHE_LOCK
+                   dsup_banks, BFIN_DSUBBANKS, BFIN_DWAYS,
+                   BFIN_DLINES);
+#ifdef CONFIG_BFIN_ICACHE_LOCK
         switch (read_iloc()) {
         case WAY0_L:
                 seq_printf(m, "Way0 Locked-Down\n");
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 792a8416fe10..8823e9ade584 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -51,10 +51,9 @@ void __init trap_init(void)
         CSYNC();
 }
 
-asmlinkage void trap_c(struct pt_regs *fp);
-
 int kstack_depth_to_print = 48;
 
+#ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON
 static int printk_address(unsigned long address)
 {
         struct vm_list_struct *vml;
@@ -131,10 +130,22 @@ static int printk_address(unsigned long address)
         /* we were unable to find this address anywhere */
         return printk("[<0x%p>]", (void *)address);
 }
+#endif
+
+asmlinkage void double_fault_c(struct pt_regs *fp)
+{
+        printk(KERN_EMERG "\n" KERN_EMERG "Double Fault\n");
+        dump_bfin_regs(fp, (void *)fp->retx);
+        panic("Double Fault - unrecoverable event\n");
+
+}
 
 asmlinkage void trap_c(struct pt_regs *fp)
 {
-        int j, sig = 0;
+#ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON
+        int j;
+#endif
+        int sig = 0;
         siginfo_t info;
         unsigned long trapnr = fp->seqstat & SEQSTAT_EXCAUSE;
 
@@ -391,10 +402,6 @@ asmlinkage void trap_c(struct pt_regs *fp)
                 break;
         }
 
-        info.si_signo = sig;
-        info.si_errno = 0;
-        info.si_addr = (void *)fp->pc;
-        force_sig_info(sig, &info, current);
         if (sig != 0 && sig != SIGTRAP) {
                 unsigned long stack;
                 dump_bfin_regs(fp, (void *)fp->retx);
@@ -403,6 +410,10 @@ asmlinkage void trap_c(struct pt_regs *fp)
                 if (current->mm == NULL)
                         panic("Kernel exception");
         }
+        info.si_signo = sig;
+        info.si_errno = 0;
+        info.si_addr = (void *)fp->pc;
+        force_sig_info(sig, &info, current);
 
         /* if the address that we are about to return to is not valid, set it
          * to a valid address, if we have a current application or panic
@@ -429,24 +440,56 @@ asmlinkage void trap_c(struct pt_regs *fp)
 
 /* Typical exception handling routines  */
 
+#define EXPAND_LEN ((1 << CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN) * 256 - 1)
+
 void dump_bfin_trace_buffer(void)
 {
-        int tflags;
+#ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON
+        int tflags, i = 0;
+#ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND
+        int j, index;
+#endif
+
         trace_buffer_save(tflags);
 
+        printk(KERN_EMERG "Hardware Trace:\n");
+
         if (likely(bfin_read_TBUFSTAT() & TBUFCNT)) {
-                int i;
-                printk(KERN_EMERG "Hardware Trace:\n");
-                for (i = 0; bfin_read_TBUFSTAT() & TBUFCNT; i++) {
-                        printk(KERN_EMERG "%2i Target : ", i);
+                for (; bfin_read_TBUFSTAT() & TBUFCNT; i++) {
+                        printk(KERN_EMERG "%4i Target : ", i);
                         printk_address((unsigned long)bfin_read_TBUF());
-                        printk("\n" KERN_EMERG "   Source : ");
+                        printk("\n" KERN_EMERG "     Source : ");
                         printk_address((unsigned long)bfin_read_TBUF());
                         printk("\n");
                 }
         }
 
+#ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND
+        if (trace_buff_offset)
+                index = trace_buff_offset/4 - 1;
+        else
+                index = EXPAND_LEN;
+
+        j = (1 << CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN) * 128;
+        while (j) {
+                printk(KERN_EMERG "%4i Target : ", i);
+                printk_address(software_trace_buff[index]);
+                index -= 1;
+                if (index < 0 )
+                        index = EXPAND_LEN;
+                printk("\n" KERN_EMERG "     Source : ");
+                printk_address(software_trace_buff[index]);
+                index -= 1;
+                if (index < 0)
+                        index = EXPAND_LEN;
+                printk("\n");
+                j--;
+                i++;
+        }
+#endif
+
         trace_buffer_restore(tflags);
+#endif
 }
 EXPORT_SYMBOL(dump_bfin_trace_buffer);
 
@@ -510,7 +553,9 @@ void show_stack(struct task_struct *task, unsigned long *stack)
 void dump_stack(void)
 {
         unsigned long stack;
+#ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON
         int tflags;
+#endif
         trace_buffer_save(tflags);
         dump_bfin_trace_buffer();
         show_stack(current, &stack);
@@ -559,8 +604,7 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
                 unsigned short x = 0;
                 for (; i < ((unsigned int)retaddr & 0xFFFFFFF0) + 32; i += 2) {
                         if (!(i & 0xF))
-                                printk(KERN_EMERG "\n" KERN_EMERG
-                                        "0x%08x: ", i);
+                                printk("\n" KERN_EMERG "0x%08x: ", i);
 
                         if (get_user(x, (unsigned short *)i))
                                 break;
@@ -655,6 +699,42 @@ asmlinkage int sys_bfin_spinlock(int *spinlock)
         return ret;
 }
 
+int bfin_request_exception(unsigned int exception, void (*handler)(void))
+{
+        void (*curr_handler)(void);
+
+        if (exception > 0x3F)
+                return -EINVAL;
+
+        curr_handler = ex_table[exception];
+
+        if (curr_handler != ex_replaceable)
+                return -EBUSY;
+
+        ex_table[exception] = handler;
+
+        return 0;
+}
+EXPORT_SYMBOL(bfin_request_exception);
+
+int bfin_free_exception(unsigned int exception, void (*handler)(void))
+{
+        void (*curr_handler)(void);
+
+        if (exception > 0x3F)
+                return -EINVAL;
+
+        curr_handler = ex_table[exception];
+
+        if (curr_handler != handler)
+                return -EBUSY;
+
+        ex_table[exception] = ex_replaceable;
+
+        return 0;
+}
+EXPORT_SYMBOL(bfin_free_exception);
+
 void panic_cplb_error(int cplb_panic, struct pt_regs *fp)
 {
         switch (cplb_panic) {
diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index fb53780247bc..eec43674a465 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -49,7 +49,8 @@ SECTIONS
                 TEXT_TEXT
                 SCHED_TEXT
                 LOCK_TEXT
-                *(.text.lock)
+                KPROBES_TEXT
+                *(.text.*)
                 *(.fixup)
 
                 . = ALIGN(16);
@@ -61,7 +62,7 @@ SECTIONS
                 __etext = .;
         }
 
-        RODATA
+        RO_DATA(PAGE_SIZE)
 
         .data :
         {
@@ -72,50 +73,63 @@ SECTIONS
                 __sdata = .;
                 . = ALIGN(THREAD_SIZE);
                 *(.data.init_task)
-                DATA_DATA
-                CONSTRUCTORS
 
                 . = ALIGN(32);
                 *(.data.cacheline_aligned)
 
+                DATA_DATA
+                *(.data.*)
+                CONSTRUCTORS
+
                 . = ALIGN(THREAD_SIZE);
                 __edata = .;
         }
 
         ___init_begin = .;
-        .init :
+
+        .init.text :
         {
                 . = ALIGN(PAGE_SIZE);
                 __sinittext = .;
                 *(.init.text)
                 __einittext = .;
+        }
+        .init.data :
+        {
+                . = ALIGN(16);
                 *(.init.data)
+        }
+        .init.setup :
+        {
                 . = ALIGN(16);
                 ___setup_start = .;
                 *(.init.setup)
                 ___setup_end = .;
-                ___start___param = .;
-                *(__param)
-                ___stop___param = .;
+        }
+        .initcall.init :
+        {
                 ___initcall_start = .;
                 INITCALLS
                 ___initcall_end = .;
+        }
+        .con_initcall.init :
+        {
                 ___con_initcall_start = .;
                 *(.con_initcall.init)
                 ___con_initcall_end = .;
-                ___security_initcall_start = .;
-                *(.security_initcall.init)
-                ___security_initcall_end = .;
+        }
+        SECURITY_INIT
+        .init.ramfs :
+        {
                 . = ALIGN(4);
                 ___initramfs_start = .;
                 *(.init.ramfs)
                 ___initramfs_end = .;
-                . = ALIGN(4);
         }
 
         __l1_lma_start = .;
 
-        .text_l1 L1_CODE_START : AT(LOADADDR(.init) + SIZEOF(.init))
+        .text_l1 L1_CODE_START : AT(LOADADDR(.init.ramfs) + SIZEOF(.init.ramfs))
         {
                 . = ALIGN(4);
                 __stext_l1 = .;
@@ -164,13 +178,19 @@ SECTIONS
         {
                 . = ALIGN(4);
                 ___bss_start = .;
-                *(.bss)
+                *(.bss .bss.*)
                 *(COMMON)
                 . = ALIGN(4);
                 ___bss_stop = .;
                 __end = .;
         }
 
+        STABS_DEBUG
+
+        DWARF_DEBUG
+
+        NOTES
+
         /DISCARD/ :
         {
                 *(.exit.text)
diff --git a/arch/blackfin/lib/memcmp.S b/arch/blackfin/lib/memcmp.S
index b88c5d2d1ebe..219fa2877c62 100644
--- a/arch/blackfin/lib/memcmp.S
+++ b/arch/blackfin/lib/memcmp.S
@@ -61,7 +61,7 @@ ENTRY(_memcmp)
 
         LSETUP (.Lquad_loop_s, .Lquad_loop_e) LC0=P1;
 .Lquad_loop_s:
-#ifdef ANOMALY_05000202
+#if ANOMALY_05000202
         R0 = [P0++];
         R1 = [I0++];
 #else
diff --git a/arch/blackfin/lib/memcpy.S b/arch/blackfin/lib/memcpy.S
index 14a5585bbd02..2e6336492b4b 100644
--- a/arch/blackfin/lib/memcpy.S
+++ b/arch/blackfin/lib/memcpy.S
@@ -98,7 +98,7 @@ ENTRY(_memcpy)
         R0 = R1;
         I1 = P1;
         R3 = [I1++];
-#ifdef ANOMALY_05000202
+#if ANOMALY_05000202
 .Lword_loops:
         [P0++] = R3;
 .Lword_loope:
diff --git a/arch/blackfin/lib/memmove.S b/arch/blackfin/lib/memmove.S
index 6ee6e206e77c..33f8653145b7 100644
--- a/arch/blackfin/lib/memmove.S
+++ b/arch/blackfin/lib/memmove.S
@@ -70,7 +70,7 @@ ENTRY(_memmove)
         R1 = [I0++];
 
         LSETUP (.Lquad_loops, .Lquad_loope) LC0=P1;
-#ifdef ANOMALY_05000202
+#if ANOMALY_05000202
 .Lquad_loops:
         [P0++] = R1;
 .Lquad_loope:
@@ -102,7 +102,7 @@ ENTRY(_memmove)
         R1 = B[P3--] (Z);
         CC = P2 == 0;
         IF CC JUMP .Lno_loop;
-#ifdef ANOMALY_05000245
+#if ANOMALY_05000245
         NOP;
         NOP;
 #endif
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c
index 4545f363e641..a57b52d207cd 100644
--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c
+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -34,7 +34,9 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
+#include <linux/pata_platform.h>
 #include <linux/irq.h>
+#include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
 
 /*
@@ -93,7 +95,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80",       /* Name of spi_driver for this device */
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,               /* Framework bus number */
+                .bus_num = 0,               /* Framework bus number */
                 .chip_select = 1,           /* Framework chip select. On STAMP537 it is SPISSEL1*/
                 .platform_data = &bfin_spi_flash_data,
                 .controller_data = &spi_flash_chip_info,
@@ -101,7 +103,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         }, {
                 .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */
                 .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,               /* Framework bus number */
+                .bus_num = 0,               /* Framework bus number */
                 .chip_select = 2,           /* Framework chip select. */
                 .platform_data = NULL,      /* No spi_driver specific config */
                 .controller_data = &spi_adc_chip_info,
@@ -110,24 +112,40 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad1836-spi",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
                 .controller_data = &ad1836_spi_chip_info,
         },
 #endif
 };
 
+/* SPI (0) */
+static struct resource bfin_spi0_resource[] = {
+        [0] = {
+                .start = SPI0_REGBASE,
+                .end   = SPI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = CH_SPI,
+                .end   = CH_SPI,
+                .flags = IORESOURCE_IRQ,
+        }
+};
+
 /* SPI controller data */
-static struct bfin5xx_spi_master spi_bfin_master_info = {
+static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
         .enable_dma = 1,  /* master has the ability to do dma transfer */
 };
 
-static struct platform_device spi_bfin_master_device = {
-        .name = "bfin-spi-master",
-        .id = 1, /* Bus number */
+static struct platform_device bfin_spi0_device = {
+        .name = "bfin-spi",
+        .id = 0, /* Bus number */
+        .num_resources = ARRAY_SIZE(bfin_spi0_resource),
+        .resource = bfin_spi0_resource,
         .dev = {
-                .platform_data = &spi_bfin_master_info, /* Passed to driver */
+                .platform_data = &bfin_spi0_info, /* Passed to driver */
         },
 };
 #endif  /* spi master and devices */
@@ -227,6 +245,43 @@ static struct platform_device isp1362_hcd_device = {
 };
 #endif
 
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#define PATA_INT        38
+
+static struct pata_platform_info bfin_pata_platform_data = {
+        .ioport_shift = 2,
+        .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
+};
+
+static struct resource bfin_pata_resources[] = {
+        {
+                .start = 0x2030C000,
+                .end = 0x2030C01F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = 0x2030D018,
+                .end = 0x2030D01B,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = PATA_INT,
+                .end = PATA_INT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_pata_device = {
+        .name = "pata_platform",
+        .id = -1,
+        .num_resources = ARRAY_SIZE(bfin_pata_resources),
+        .resource = bfin_pata_resources,
+        .dev = {
+                .platform_data = &bfin_pata_platform_data,
+        }
+};
+#endif
+
 static struct platform_device *cm_bf533_devices[] __initdata = {
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
         &bfin_uart_device,
@@ -250,7 +305,11 @@ static struct platform_device *cm_bf533_devices[] __initdata = {
 #endif
 
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
-        &spi_bfin_master_device,
+        &bfin_spi0_device,
+#endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        &bfin_pata_device,
 #endif
 };
 
@@ -261,6 +320,10 @@ static int __init cm_bf533_init(void)
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 #endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
+#endif
         return 0;
 }
 
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c
index 0000b8f1239c..5c1e35d3c012 100644
--- a/arch/blackfin/mach-bf533/boards/ezkit.c
+++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -35,7 +35,9 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
+#include <linux/pata_platform.h>
 #include <linux/irq.h>
+#include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
 
 /*
@@ -50,6 +52,12 @@ static struct platform_device rtc_device = {
 };
 #endif
 
+#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+static struct platform_device bfin_fb_adv7393_device = {
+        .name = "bfin-adv7393",
+};
+#endif
+
 /*
  *  USB-LAN EzExtender board
  *  Driver needs to know address, irq and flag pin.
@@ -131,7 +139,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 2, /* Framework chip select. On STAMP537 it is SPISSEL2*/
                 .platform_data = &bfin_spi_flash_data,
                 .controller_data = &spi_flash_chip_info,
@@ -143,7 +151,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */
                 .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. */
                 .platform_data = NULL, /* No spi_driver specific config */
                 .controller_data = &spi_adc_chip_info,
@@ -154,24 +162,40 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad1836-spi",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
                 .controller_data = &ad1836_spi_chip_info,
         },
 #endif
 };
 
+/* SPI (0) */
+static struct resource bfin_spi0_resource[] = {
+        [0] = {
+                .start = SPI0_REGBASE,
+                .end   = SPI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = CH_SPI,
+                .end   = CH_SPI,
+                .flags = IORESOURCE_IRQ,
+        }
+};
+
 /* SPI controller data */
-static struct bfin5xx_spi_master spi_bfin_master_info = {
+static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
         .enable_dma = 1,  /* master has the ability to do dma transfer */
 };
 
-static struct platform_device spi_bfin_master_device = {
-        .name = "bfin-spi-master",
-        .id = 1, /* Bus number */
+static struct platform_device bfin_spi0_device = {
+        .name = "bfin-spi",
+        .id = 0, /* Bus number */
+        .num_resources = ARRAY_SIZE(bfin_spi0_resource),
+        .resource = bfin_spi0_resource,
         .dev = {
-                .platform_data = &spi_bfin_master_info, /* Passed to driver */
+                .platform_data = &bfin_spi0_info, /* Passed to driver */
         },
 };
 #endif  /* spi master and devices */
@@ -193,13 +217,54 @@ static struct platform_device bfin_uart_device = {
 };
 #endif
 
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#define PATA_INT        55
+
+static struct pata_platform_info bfin_pata_platform_data = {
+        .ioport_shift = 1,
+        .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
+};
+
+static struct resource bfin_pata_resources[] = {
+        {
+                .start = 0x20314020,
+                .end = 0x2031403F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = 0x2031401C,
+                .end = 0x2031401F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = PATA_INT,
+                .end = PATA_INT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_pata_device = {
+        .name = "pata_platform",
+        .id = -1,
+        .num_resources = ARRAY_SIZE(bfin_pata_resources),
+        .resource = bfin_pata_resources,
+        .dev = {
+                .platform_data = &bfin_pata_platform_data,
+        }
+};
+#endif
+
 static struct platform_device *ezkit_devices[] __initdata = {
 #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
         &smc91x_device,
 #endif
 
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
-        &spi_bfin_master_device,
+        &bfin_spi0_device,
+#endif
+
+#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+        &bfin_fb_adv7393_device,
 #endif
 
 #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
@@ -209,6 +274,10 @@ static struct platform_device *ezkit_devices[] __initdata = {
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
         &bfin_uart_device,
 #endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        &bfin_pata_device,
+#endif
 };
 
 static int __init ezkit_init(void)
@@ -218,6 +287,10 @@ static int __init ezkit_init(void)
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 #endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
+#endif
         return 0;
 }
 
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index a9143c4cbdcd..8975e06ea158 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -37,8 +37,11 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb_isp1362.h>
 #endif
+#include <linux/pata_platform.h>
 #include <linux/irq.h>
+#include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
+#include <asm/reboot.h>
 
 /*
  * Name the Board for the /proc/cpuinfo
@@ -77,6 +80,12 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
+#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+static struct platform_device bfin_fb_adv7393_device = {
+        .name = "bfin-adv7393",
+};
+#endif
+
 #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
 static struct resource net2272_bfin_resources[] = {
         {
@@ -177,7 +186,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 2, /* Framework chip select. On STAMP537 it is SPISSEL2*/
                 .platform_data = &bfin_spi_flash_data,
                 .controller_data = &spi_flash_chip_info,
@@ -189,7 +198,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */
                 .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. */
                 .platform_data = NULL, /* No spi_driver specific config */
                 .controller_data = &spi_adc_chip_info,
@@ -200,7 +209,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad1836-spi",
                 .max_speed_hz = 31250000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
                 .controller_data = &ad1836_spi_chip_info,
         },
@@ -210,7 +219,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "spi_mmc_dummy",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 0,
                 .platform_data = NULL,
                 .controller_data = &spi_mmc_chip_info,
@@ -219,7 +228,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "spi_mmc",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SPI_MMC_CS_CHAN,
                 .platform_data = NULL,
                 .controller_data = &spi_mmc_chip_info,
@@ -231,16 +240,16 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "fxs-spi",
                 .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
-                .chip_select = 3,
+                .bus_num = 0,
+                .chip_select = 8 - CONFIG_J11_JUMPER,
                 .controller_data = &spi_si3xxx_chip_info,
                 .mode = SPI_MODE_3,
         },
         {
                 .modalias = "fxo-spi",
                 .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
-                .chip_select = 2,
+                .bus_num = 0,
+                .chip_select = 8 - CONFIG_J19_JUMPER,
                 .controller_data = &spi_si3xxx_chip_info,
                 .mode = SPI_MODE_3,
         },
@@ -250,7 +259,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad5304_spi",
                 .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 2,
                 .platform_data = NULL,
                 .controller_data = &ad5304_chip_info,
@@ -259,17 +268,33 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
+/* SPI (0) */
+static struct resource bfin_spi0_resource[] = {
+        [0] = {
+                .start = SPI0_REGBASE,
+                .end   = SPI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = CH_SPI,
+                .end   = CH_SPI,
+                .flags = IORESOURCE_IRQ,
+        }
+};
+
 /* SPI controller data */
-static struct bfin5xx_spi_master spi_bfin_master_info = {
+static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
         .enable_dma = 1,  /* master has the ability to do dma transfer */
 };
 
-static struct platform_device spi_bfin_master_device = {
-        .name = "bfin-spi-master",
-        .id = 1, /* Bus number */
+static struct platform_device bfin_spi0_device = {
+        .name = "bfin-spi",
+        .id = 0, /* Bus number */
+        .num_resources = ARRAY_SIZE(bfin_spi0_resource),
+        .resource = bfin_spi0_resource,
         .dev = {
-                .platform_data = &spi_bfin_master_info, /* Passed to driver */
+                .platform_data = &bfin_spi0_info, /* Passed to driver */
         },
 };
 #endif  /* spi master and devices */
@@ -309,6 +334,43 @@ static struct platform_device bfin_sport1_uart_device = {
 };
 #endif
 
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#define PATA_INT        55
+
+static struct pata_platform_info bfin_pata_platform_data = {
+        .ioport_shift = 1,
+        .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
+};
+
+static struct resource bfin_pata_resources[] = {
+        {
+                .start = 0x20314020,
+                .end = 0x2031403F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = 0x2031401C,
+                .end = 0x2031401F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = PATA_INT,
+                .end = PATA_INT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_pata_device = {
+        .name = "pata_platform",
+        .id = -1,
+        .num_resources = ARRAY_SIZE(bfin_pata_resources),
+        .resource = bfin_pata_resources,
+        .dev = {
+                .platform_data = &bfin_pata_platform_data,
+        }
+};
+#endif
+
 static struct platform_device *stamp_devices[] __initdata = {
 #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
         &rtc_device,
@@ -318,12 +380,16 @@ static struct platform_device *stamp_devices[] __initdata = {
         &smc91x_device,
 #endif
 
+#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+        &bfin_fb_adv7393_device,
+#endif
+
 #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE)
         &net2272_bfin_device,
 #endif
 
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
-        &spi_bfin_master_device,
+        &bfin_spi0_device,
 #endif
 
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
@@ -334,6 +400,10 @@ static struct platform_device *stamp_devices[] __initdata = {
         &bfin_sport0_uart_device,
         &bfin_sport1_uart_device,
 #endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        &bfin_pata_device,
+#endif
 };
 
 static int __init stamp_init(void)
@@ -355,8 +425,23 @@ static int __init stamp_init(void)
 #endif
 
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
-        return spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
+        spi_register_board_info(bfin_spi_board_info,
+                                ARRAY_SIZE(bfin_spi_board_info));
+#endif
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
 #endif
+        return 0;
 }
 
 arch_initcall(stamp_init);
+
+void native_machine_restart(char *cmd)
+{
+#if defined(CONFIG_BFIN_SHARED_FLASH_ENET)
+# define BIT_TO_SET (1 << CONFIG_ENET_FLASH_PIN)
+        bfin_write_FIO_INEN(~BIT_TO_SET);
+        bfin_write_FIO_DIR(BIT_TO_SET);
+        bfin_write_FIO_FLAG_C(BIT_TO_SET);
+#endif
+}
diff --git a/arch/blackfin/mach-bf533/head.S b/arch/blackfin/mach-bf533/head.S
index 7dd0e9c3a936..1ded945a6fa0 100644
--- a/arch/blackfin/mach-bf533/head.S
+++ b/arch/blackfin/mach-bf533/head.S
@@ -32,11 +32,9 @@
 #include <asm/blackfin.h>
 #include <asm/trace.h>
 #if CONFIG_BFIN_KERNEL_CLOCK
+#include <asm/mach-common/clocks.h>
 #include <asm/mach/mem_init.h>
 #endif
-#if CONFIG_DEBUG_KERNEL_START
-#include <asm/mach-common/def_LPBlackfin.h>
-#endif
 
 .global __rambase
 .global __ramstart
@@ -52,10 +50,12 @@ __INIT
 ENTRY(__start)
         /* R0: argument of command line string, passed from uboot, save it */
         R7 = R0;
-        /* Set the SYSCFG register:
-         * Enable Cycle Counter and Nesting Of Interrupts (3rd Bit)
-         */
-        R0 = 0x36;
+        /* Enable Cycle Counter and Nesting Of Interrupts */
+#ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES
+        R0 = SYSCFG_SNEN;
+#else
+        R0 = SYSCFG_SNEN | SYSCFG_CCEN;
+#endif
         SYSCFG = R0;
         R0 = 0;
 
@@ -97,40 +97,10 @@ ENTRY(__start)
         M2 = r0;
         M3 = r0;
 
-        trace_buffer_start(p0,r0);
+        trace_buffer_init(p0,r0);
         P0 = R1;
         R0 = R1;
 
-#if CONFIG_DEBUG_KERNEL_START
-
-/*
- * Set up a temporary Event Vector Table, so if something bad happens before
- * the kernel is fully started, it doesn't vector off into the bootloaders
- * table
- */
-        P0.l = lo(EVT2);
-        P0.h = hi(EVT2);
-        P1.l = lo(EVT15);
-        P1.h = hi(EVT15);
-        P2.l = debug_kernel_start_trap;
-        P2.h = debug_kernel_start_trap;
-
-        RTS = P2;
-        RTI = P2;
-        RTX = P2;
-        RTN = P2;
-        RTE = P2;
-
-.Lfill_temp_vector_table:
-        [P0++] = P2;    /* Core Event Vector Table */
-        CC = P0 == P1;
-        if !CC JUMP .Lfill_temp_vector_table
-        P0 = r0;
-        P1 = r0;
-        P2 = r0;
-
-#endif
-
         p0.h = hi(FIO_MASKA_C);
         p0.l = lo(FIO_MASKA_C);
         r0 = 0xFFFF(Z);
@@ -144,38 +114,38 @@ ENTRY(__start)
         ssync;
 
         /* Turn off the icache */
-        p0.l = (IMEM_CONTROL & 0xFFFF);
-        p0.h = (IMEM_CONTROL >> 16);
+        p0.l = LO(IMEM_CONTROL);
+        p0.h = HI(IMEM_CONTROL);
         R1 = [p0];
         R0 = ~ENICPLB;
         R0 = R0 & R1;
 
         /* Anomaly 05000125 */
-#ifdef ANOMALY_05000125
+#if ANOMALY_05000125
         CLI R2;
         SSYNC;
 #endif
         [p0] = R0;
         SSYNC;
-#ifdef ANOMALY_05000125
+#if ANOMALY_05000125
         STI R2;
 #endif
 
         /* Turn off the dcache */
-        p0.l = (DMEM_CONTROL & 0xFFFF);
-        p0.h = (DMEM_CONTROL >> 16);
+        p0.l = LO(DMEM_CONTROL);
+        p0.h = HI(DMEM_CONTROL);
         R1 = [p0];
         R0 = ~ENDCPLB;
         R0 = R0 & R1;
 
         /* Anomaly 05000125 */
-#ifdef ANOMALY_05000125
+#if ANOMALY_05000125
         CLI R2;
         SSYNC;
 #endif
         [p0] = R0;
         SSYNC;
-#ifdef ANOMALY_05000125
+#if ANOMALY_05000125
         STI R2;
 #endif
 
@@ -211,6 +181,12 @@ ENTRY(__start)
         fp = sp;
         usp = sp;
 
+#ifdef CONFIG_EARLY_PRINTK
+        SP += -12;
+        call _init_early_exception_vectors;
+        SP += 12;
+#endif
+
         /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */
         call _bf53x_relocate_l1_mem;
 #if CONFIG_BFIN_KERNEL_CLOCK
@@ -264,7 +240,7 @@ ENTRY(__start)
         p0.l = .LWAIT_HERE;
         p0.h = .LWAIT_HERE;
         reti = p0;
-#if defined(ANOMALY_05000281)
+#if ANOMALY_05000281
         nop; nop; nop;
 #endif
         rti;
@@ -417,8 +393,8 @@ ENTRY(_start_dma_code)
         w[p0] = r0.l;
         ssync;
 
-        p0.l = (EBIU_SDBCTL & 0xFFFF);
-        p0.h = (EBIU_SDBCTL >> 16);     /* SDRAM Memory Bank Control Register */
+        p0.l = LO(EBIU_SDBCTL);
+        p0.h = HI(EBIU_SDBCTL);     /* SDRAM Memory Bank Control Register */
         r0 = mem_SDBCTL;
         w[p0] = r0.l;
         ssync;
@@ -456,276 +432,6 @@ ENTRY(_start_dma_code)
 ENDPROC(_start_dma_code)
 #endif /* CONFIG_BFIN_KERNEL_CLOCK */
 
-ENTRY(_bfin_reset)
-        /* No more interrupts to be handled*/
-        CLI R6;
-        SSYNC;
-
-#if defined(CONFIG_BFIN_SHARED_FLASH_ENET)
-        p0.h = hi(FIO_INEN);
-        p0.l = lo(FIO_INEN);
-        r0.l = ~(1 << CONFIG_ENET_FLASH_PIN);
-        w[p0] = r0.l;
-
-        p0.h = hi(FIO_DIR);
-        p0.l = lo(FIO_DIR);
-        r0.l = (1 << CONFIG_ENET_FLASH_PIN);
-        w[p0] = r0.l;
-
-        p0.h = hi(FIO_FLAG_C);
-        p0.l = lo(FIO_FLAG_C);
-        r0.l = (1 << CONFIG_ENET_FLASH_PIN);
-        w[p0] = r0.l;
-#endif
-
-        /* Clear the IMASK register */
-        p0.h = hi(IMASK);
-        p0.l = lo(IMASK);
-        r0 = 0x0;
-        [p0] = r0;
-
-        /* Clear the ILAT register */
-        p0.h = hi(ILAT);
-        p0.l = lo(ILAT);
-        r0 = [p0];
-        [p0] = r0;
-        SSYNC;
-
-        /* make sure SYSCR is set to use BMODE */
-        P0.h = hi(SYSCR);
-        P0.l = lo(SYSCR);
-        R0.l = 0x0;
-        W[P0] = R0.l;
-        SSYNC;
-
-        /* issue a system soft reset */
-        P1.h = hi(SWRST);
-        P1.l = lo(SWRST);
-        R1.l = 0x0007;
-        W[P1] = R1;
-        SSYNC;
-
-        /* clear system soft reset */
-        R0.l = 0x0000;
-        W[P0] = R0;
-        SSYNC;
-
-        /* issue core reset */
-        raise 1;
-
-        RTS;
-ENDPROC(_bfin_reset)
-
-#if CONFIG_DEBUG_KERNEL_START
-debug_kernel_start_trap:
-        /* Set up a temp stack in L1 - SDRAM might not be working  */
-        P0.L = lo(L1_DATA_A_START + 0x100);
-        P0.H = hi(L1_DATA_A_START + 0x100);
-        SP = P0;
-
-        /* Make sure the Clocks are the way I think they should be */
-        r0 = CONFIG_VCO_MULT & 63;       /* Load the VCO multiplier         */
-        r0 = r0 << 9;                    /* Shift it over,                  */
-        r1 = CLKIN_HALF;                 /* Do we need to divide CLKIN by 2?*/
-        r0 = r1 | r0;
-        r1 = PLL_BYPASS;                 /* Bypass the PLL?                 */
-        r1 = r1 << 8;                    /* Shift it over                   */
-        r0 = r1 | r0;                    /* add them all together           */
-
-        p0.h = hi(PLL_CTL);
-        p0.l = lo(PLL_CTL);              /* Load the address                */
-        cli r2;                          /* Disable interrupts              */
-        ssync;
-        w[p0] = r0.l;                    /* Set the value                   */
-        idle;                            /* Wait for the PLL to stablize    */
-        sti r2;                          /* Enable interrupts               */
-
-.Lcheck_again1:
-        p0.h = hi(PLL_STAT);
-        p0.l = lo(PLL_STAT);
-        R0 = W[P0](Z);
-        CC = BITTST(R0,5);
-        if ! CC jump .Lcheck_again1;
-
-        /* Configure SCLK & CCLK Dividers */
-        r0 = (CONFIG_CCLK_ACT_DIV | CONFIG_SCLK_DIV);
-        p0.h = hi(PLL_DIV);
-        p0.l = lo(PLL_DIV);
-        w[p0] = r0.l;
-        ssync;
-
-        /* Make sure UART is enabled - you can never be sure */
-
-/*
- * Setup for console. Argument comes from the menuconfig
- */
-
-#ifdef CONFIG_BAUD_9600
-#define CONSOLE_BAUD_RATE       9600
-#elif CONFIG_BAUD_19200
-#define CONSOLE_BAUD_RATE       19200
-#elif CONFIG_BAUD_38400
-#define CONSOLE_BAUD_RATE       38400
-#elif CONFIG_BAUD_57600
-#define CONSOLE_BAUD_RATE       57600
-#elif CONFIG_BAUD_115200
-#define CONSOLE_BAUD_RATE       115200
-#endif
-
-        p0.h = hi(UART_GCTL);
-        p0.l = lo(UART_GCTL);
-        r0 = 0x00(Z);
-        w[p0] = r0.L;   /* To Turn off UART clocks */
-        ssync;
-
-        p0.h = hi(UART_LCR);
-        p0.l = lo(UART_LCR);
-        r0 = 0x83(Z);
-        w[p0] = r0.L;   /* To enable DLL writes */
-        ssync;
-
-        R1 = (((CONFIG_CLKIN_HZ * CONFIG_VCO_MULT) / CONFIG_SCLK_DIV) / (CONSOLE_BAUD_RATE * 16));
-
-        p0.h = hi(UART_DLL);
-        p0.l = lo(UART_DLL);
-        r0 = 0xFF(Z);
-        r0 = R1 & R0;
-        w[p0] = r0.L;
-        ssync;
-
-        p0.h = hi(UART_DLH);
-        p0.l = lo(UART_DLH);
-        r1 >>= 8 ;
-        w[p0] = r1.L;
-        ssync;
-
-        p0.h = hi(UART_GCTL);
-        p0.l = lo(UART_GCTL);
-        r0 = 0x0(Z);
-        w[p0] = r0.L;   /* To enable UART clock */
-        ssync;
-
-        p0.h = hi(UART_LCR);
-        p0.l = lo(UART_LCR);
-        r0 = 0x03(Z);
-        w[p0] = r0.L;   /* To Turn on UART */
-        ssync;
-
-        p0.h = hi(UART_GCTL);
-        p0.l = lo(UART_GCTL);
-        r0 = 0x01(Z);
-        w[p0] = r0.L;   /* To Turn on UART Clocks */
-        ssync;
-
-        P0.h = hi(UART_THR);
-        P0.l = lo(UART_THR);
-        P1.h = hi(UART_LSR);
-        P1.l = lo(UART_LSR);
-
-        R0.L = 'K';
-        call .Lwait_char;
-        R0.L='e';
-        call .Lwait_char;
-        R0.L='r';
-        call .Lwait_char;
-        R0.L='n'
-        call .Lwait_char;
-        R0.L='e'
-        call .Lwait_char;
-        R0.L='l';
-        call .Lwait_char;
-        R0.L=' ';
-        call .Lwait_char;
-        R0.L='c';
-        call .Lwait_char;
-        R0.L='r';
-        call .Lwait_char;
-        R0.L='a';
-        call .Lwait_char;
-        R0.L='s';
-        call .Lwait_char;
-        R0.L='h';
-        call .Lwait_char;
-        R0.L='\r';
-        call .Lwait_char;
-        R0.L='\n';
-        call .Lwait_char;
-
-        R0.L='S';
-        call .Lwait_char;
-        R0.L='E';
-        call .Lwait_char;
-        R0.L='Q'
-        call .Lwait_char;
-        R0.L='S'
-        call .Lwait_char;
-        R0.L='T';
-        call .Lwait_char;
-        R0.L='A';
-        call .Lwait_char;
-        R0.L='T';
-        call .Lwait_char;
-        R0.L='=';
-        call .Lwait_char;
-        R2 = SEQSTAT;
-        call .Ldump_reg;
-
-        R0.L=' ';
-        call .Lwait_char;
-        R0.L='R';
-        call .Lwait_char;
-        R0.L='E'
-        call .Lwait_char;
-        R0.L='T'
-        call .Lwait_char;
-        R0.L='X';
-        call .Lwait_char;
-        R0.L='=';
-        call .Lwait_char;
-        R2 = RETX;
-        call .Ldump_reg;
-
-        R0.L='\r';
-        call .Lwait_char;
-        R0.L='\n';
-        call .Lwait_char;
-
-.Ldebug_kernel_start_trap_done:
-        JUMP    .Ldebug_kernel_start_trap_done;
-.Ldump_reg:
-        R3 = 32;
-        R4 = 0x0F;
-        R5 = ':';  /* one past 9 */
-
-.Ldump_reg2:
-        R0 = R2;
-        R3 += -4;
-        R0 >>>= R3;
-        R0 = R0 & R4;
-        R0 += 0x30;
-        CC = R0 <= R5;
-        if CC JUMP .Ldump_reg1;
-        R0 += 7;
-
-.Ldump_reg1:
-        R1.l = W[P1];
-        CC = BITTST(R1, 5);
-        if !CC JUMP .Ldump_reg1;
-        W[P0] = r0;
-
-        CC = R3 == 0;
-        if !CC JUMP .Ldump_reg2
-        RTS;
-
-.Lwait_char:
-        R1.l = W[P1];
-        CC = BITTST(R1, 5);
-        if !CC JUMP .Lwait_char;
-        W[P0] = r0;
-        RTS;
-
-#endif  /* CONFIG_DEBUG_KERNEL_START  */
-
 .data
 
 /*
diff --git a/arch/blackfin/mach-bf537/Kconfig b/arch/blackfin/mach-bf537/Kconfig
index cc9ae38a4dda..e6648db09519 100644
--- a/arch/blackfin/mach-bf537/Kconfig
+++ b/arch/blackfin/mach-bf537/Kconfig
@@ -2,33 +2,6 @@ if (BF537 || BF534 || BF536)
 
 menu "BF537 Specific Configuration"
 
-comment "PORT F/G Selection"
-choice
-        prompt "Select BF537/6/4 default GPIO PFx PORTx"
-        help
-          Quick Hack for BF537/6/4 default GPIO PFx PORTF.
-
-config BF537_PORT_F
-        bool "Select BF537/6/4 default GPIO PFx PORTF"
-        depends on (BF537 || BF536 || BF534)
-        help
-          Quick Hack for BF537/6/4 default GPIO PFx PORTF.
-
-config BF537_PORT_G
-        bool "Select BF537/6/4 default GPIO PFx PORTG"
-        depends on (BF537 || BF536 || BF534)
-        help
-          Quick Hack for BF537/6/4 default GPIO PFx PORTG.
-
-config BF537_PORT_H
-        bool "Select BF537/6/4 default GPIO PFx PORTH"
-        depends on (BF537 || BF536 || BF534)
-        help
-          Quick Hack for BF537/6/4 default GPIO PFx PORTH
-          Use only when Blackfin EMAC support is not required.
-
-endchoice
-
 comment "Interrupt Priority Assignment"
 menu "Priority"
 
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index a8f947b72754..44dea05e1d03 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -35,7 +35,9 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
+#include <linux/pata_platform.h>
 #include <linux/irq.h>
+#include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
 
 /*
@@ -113,7 +115,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/
                 .platform_data = &bfin_spi_flash_data,
                 .controller_data = &spi_flash_chip_info,
@@ -125,7 +127,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */
                 .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. */
                 .platform_data = NULL, /* No spi_driver specific config */
                 .controller_data = &spi_adc_chip_info,
@@ -136,7 +138,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad1836-spi",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
                 .controller_data = &ad1836_spi_chip_info,
         },
@@ -146,7 +148,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad9960-spi",
                 .max_speed_hz = 10000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 1,
                 .controller_data = &ad9960_spi_chip_info,
         },
@@ -156,7 +158,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "spi_mmc_dummy",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 7,
                 .platform_data = NULL,
                 .controller_data = &spi_mmc_chip_info,
@@ -165,7 +167,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "spi_mmc",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SPI_MMC_CS_CHAN,
                 .platform_data = NULL,
                 .controller_data = &spi_mmc_chip_info,
@@ -174,17 +176,33 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
+/* SPI (0) */
+static struct resource bfin_spi0_resource[] = {
+        [0] = {
+                .start = SPI0_REGBASE,
+                .end   = SPI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+                },
+        [1] = {
+                .start = CH_SPI,
+                .end   = CH_SPI,
+                .flags = IORESOURCE_IRQ,
+        }
+};
+
 /* SPI controller data */
-static struct bfin5xx_spi_master spi_bfin_master_info = {
+static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
         .enable_dma = 1,  /* master has the ability to do dma transfer */
 };
 
-static struct platform_device spi_bfin_master_device = {
-        .name = "bfin-spi-master",
-        .id = 1, /* Bus number */
+static struct platform_device bfin_spi0_device = {
+        .name = "bfin-spi",
+        .id = 0, /* Bus number */
+        .num_resources = ARRAY_SIZE(bfin_spi0_resource),
+        .resource = bfin_spi0_resource,
         .dev = {
-                .platform_data = &spi_bfin_master_info, /* Passed to driver */
+                .platform_data = &bfin_spi0_info, /* Passed to driver */
         },
 };
 #endif  /* spi master and devices */
@@ -316,6 +334,43 @@ static struct platform_device bfin_mac_device = {
 };
 #endif
 
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#define PATA_INT        64
+
+static struct pata_platform_info bfin_pata_platform_data = {
+        .ioport_shift = 2,
+        .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
+};
+
+static struct resource bfin_pata_resources[] = {
+        {
+                .start = 0x2030C000,
+                .end = 0x2030C01F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = 0x2030D018,
+                .end = 0x2030D01B,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = PATA_INT,
+                .end = PATA_INT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_pata_device = {
+        .name = "pata_platform",
+        .id = -1,
+        .num_resources = ARRAY_SIZE(bfin_pata_resources),
+        .resource = bfin_pata_resources,
+        .dev = {
+                .platform_data = &bfin_pata_platform_data,
+        }
+};
+#endif
+
 static struct platform_device *cm_bf537_devices[] __initdata = {
 #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
         &rtc_device,
@@ -347,7 +402,11 @@ static struct platform_device *cm_bf537_devices[] __initdata = {
 #endif
 
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
-        &spi_bfin_master_device,
+        &bfin_spi0_device,
+#endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        &bfin_pata_device,
 #endif
 };
 
@@ -358,6 +417,10 @@ static int __init cm_bf537_init(void)
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 #endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
+#endif
         return 0;
 }
 
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c
index 648d984e98d6..5e9d09eb8579 100644
--- a/arch/blackfin/mach-bf537/boards/generic_board.c
+++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -8,7 +8,7 @@
  *
  * Modified:
  *               Copyright 2005 National ICT Australia (NICTA)
- *               Copyright 2004-2006 Analog Devices Inc.
+ *               Copyright 2004-2007 Analog Devices Inc.
  *
  * Bugs:         Enter bugs at http://blackfin.uclinux.org/
  *
@@ -34,20 +34,74 @@
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
+#if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb_isp1362.h>
+#endif
+#include <linux/pata_platform.h>
 #include <linux/irq.h>
+#include <linux/interrupt.h>
 #include <linux/usb_sl811.h>
+#include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
+#include <asm/reboot.h>
+#include <linux/spi/ad7877.h>
 
 /*
  * Name the Board for the /proc/cpuinfo
  */
-char *bfin_board_name = "UNKNOWN BOARD";
+char *bfin_board_name = "GENERIC Board";
 
 /*
  *  Driver needs to know address, irq and flag pin.
  */
 
+#define ISP1761_BASE       0x203C0000
+#define ISP1761_IRQ        IRQ_PF7
+
+#if defined(CONFIG_USB_ISP1760_HCD) || defined(CONFIG_USB_ISP1760_HCD_MODULE)
+static struct resource bfin_isp1761_resources[] = {
+        [0] = {
+                .name   = "isp1761-regs",
+                .start  = ISP1761_BASE + 0x00000000,
+                .end    = ISP1761_BASE + 0x000fffff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = ISP1761_IRQ,
+                .end    = ISP1761_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_isp1761_device = {
+        .name           = "isp1761",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(bfin_isp1761_resources),
+        .resource       = bfin_isp1761_resources,
+};
+
+static struct platform_device *bfin_isp1761_devices[] = {
+        &bfin_isp1761_device,
+};
+
+int __init bfin_isp1761_init(void)
+{
+        unsigned int num_devices = ARRAY_SIZE(bfin_isp1761_devices);
+
+        printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
+        set_irq_type(ISP1761_IRQ, IRQF_TRIGGER_FALLING);
+
+        return platform_add_devices(bfin_isp1761_devices, num_devices);
+}
+
+void __exit bfin_isp1761_exit(void)
+{
+        platform_device_unregister(&bfin_isp1761_device);
+}
+
+arch_initcall(bfin_isp1761_init);
+#endif
+
 #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
 static struct resource bfin_pcmcia_cf_resources[] = {
         {
@@ -59,10 +113,6 @@ static struct resource bfin_pcmcia_cf_resources[] = {
                 .end = 0x20311FFF,
                 .flags = IORESOURCE_MEM,
         }, {
-                .start = IRQ_PROG_INTA,
-                .end = IRQ_PROG_INTA,
-                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
-        }, {
                 .start = IRQ_PF4,
                 .end = IRQ_PF4,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
@@ -96,14 +146,7 @@ static struct resource smc91x_resources[] = {
                 .end = 0x20300300 + 16,
                 .flags = IORESOURCE_MEM,
         }, {
-                .start = IRQ_PROG_INTB,
-                .end = IRQ_PROG_INTB,
-                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-        }, {
-                /*
-                 *  denotes the flag pin and is used directly if
-                 *  CONFIG_IRQCHIP_DEMUX_GPIO is defined.
-                 */
+
                 .start = IRQ_PF7,
                 .end = IRQ_PF7,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
@@ -117,6 +160,28 @@ static struct platform_device smc91x_device = {
 };
 #endif
 
+#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+static struct resource dm9000_resources[] = {
+        [0] = {
+                .start  = 0x203FB800,
+                .end    = 0x203FB800 + 8,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_PF9,
+                .end    = IRQ_PF9,
+                .flags  = (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE),
+        },
+};
+
+static struct platform_device dm9000_device = {
+        .name           = "dm9000",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(dm9000_resources),
+        .resource       = dm9000_resources,
+};
+#endif
+
 #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE)
 static struct resource sl811_hcd_resources[] = {
         {
@@ -128,12 +193,8 @@ static struct resource sl811_hcd_resources[] = {
                 .end = 0x20340004,
                 .flags = IORESOURCE_MEM,
         }, {
-                .start = IRQ_PROG_INTA,
-                .end = IRQ_PROG_INTA,
-                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-        }, {
-                .start = IRQ_PF0 + CONFIG_USB_SL811_BFIN_GPIO,
-                .end = IRQ_PF0 + CONFIG_USB_SL811_BFIN_GPIO,
+                .start = CONFIG_USB_SL811_BFIN_IRQ,
+                .end = CONFIG_USB_SL811_BFIN_IRQ,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
         },
 };
@@ -141,21 +202,19 @@ static struct resource sl811_hcd_resources[] = {
 #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS)
 void sl811_port_power(struct device *dev, int is_on)
 {
-        unsigned short mask = (1<<CONFIG_USB_SL811_BFIN_GPIO_VBUS);
-
-        bfin_write_PORT_FER(bfin_read_PORT_FER() & ~mask);
-        bfin_write_FIO_DIR(bfin_read_FIO_DIR() | mask);
+        gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS");
+        gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS);
 
         if (is_on)
-                bfin_write_FIO_FLAG_S(mask);
+                gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 1);
         else
-                bfin_write_FIO_FLAG_C(mask);
+                gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 0);
 }
 #endif
 
 static struct sl811_platform_data sl811_priv = {
         .potpg = 10,
-        .power = 250,           /* == 500mA */
+        .power = 250,       /* == 500mA */
 #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS)
         .port_power = &sl811_port_power,
 #endif
@@ -170,7 +229,6 @@ static struct platform_device sl811_hcd_device = {
         .num_resources = ARRAY_SIZE(sl811_hcd_resources),
         .resource = sl811_hcd_resources,
 };
-
 #endif
 
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
@@ -184,13 +242,9 @@ static struct resource isp1362_hcd_resources[] = {
                 .end = 0x20360004,
                 .flags = IORESOURCE_MEM,
         }, {
-                .start = IRQ_PROG_INTA,
-                .end = IRQ_PROG_INTA,
+                .start = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,
+                .end = CONFIG_USB_ISP1362_BFIN_GPIO_IRQ,
                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-        }, {
-                .start = IRQ_PF0 + CONFIG_USB_ISP1362_BFIN_GPIO,
-                .end = IRQ_PF0 + CONFIG_USB_ISP1362_BFIN_GPIO,
-                .flags = IORESOURCE_IRQ,
         },
 };
 
@@ -246,7 +300,8 @@ static struct platform_device net2272_bfin_device = {
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
 /* all SPI peripherals info goes here */
 
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if defined(CONFIG_MTD_M25P80) \
+        || defined(CONFIG_MTD_M25P80_MODULE)
 static struct mtd_partition bfin_spi_flash_partitions[] = {
         {
                 .name = "bootloader",
@@ -302,70 +357,198 @@ static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
 };
 #endif
 
+#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
+static struct bfin5xx_spi_chip spi_mmc_chip_info = {
+        .enable_dma = 1,
+        .bits_per_word = 8,
+};
+#endif
+
+#if defined(CONFIG_PBX)
+static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
+        .ctl_reg        = 0x4, /* send zero */
+        .enable_dma     = 0,
+        .bits_per_word  = 8,
+        .cs_change_per_word = 1,
+};
+#endif
+
+#if defined(CONFIG_AD5304) || defined(CONFIG_AD5304_MODULE)
+static struct bfin5xx_spi_chip ad5304_chip_info = {
+        .enable_dma = 0,
+        .bits_per_word = 16,
+};
+#endif
+
+#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
+        .enable_dma = 0,
+        .bits_per_word = 16,
+};
+
+static const struct ad7877_platform_data bfin_ad7877_ts_info = {
+        .model                  = 7877,
+        .vref_delay_usecs       = 50,   /* internal, no capacitor */
+        .x_plate_ohms           = 419,
+        .y_plate_ohms           = 486,
+        .pressure_max           = 1000,
+        .pressure_min           = 0,
+        .stopacq_polarity       = 1,
+        .first_conversion_delay = 3,
+        .acquisition_time       = 1,
+        .averaging              = 1,
+        .pen_down_acc_interval  = 1,
+};
+#endif
+
 static struct spi_board_info bfin_spi_board_info[] __initdata = {
-#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
+#if defined(CONFIG_MTD_M25P80) \
+        || defined(CONFIG_MTD_M25P80_MODULE)
         {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
-                .chip_select = 2, /* Framework chip select. On STAMP537 it is SPISSEL1*/
+                .bus_num = 0, /* Framework bus number */
+                .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/
                 .platform_data = &bfin_spi_flash_data,
                 .controller_data = &spi_flash_chip_info,
                 .mode = SPI_MODE_3,
         },
 #endif
 
-#if defined(CONFIG_SPI_ADC_BF533) || defined(CONFIG_SPI_ADC_BF533_MODULE)
+#if defined(CONFIG_SPI_ADC_BF533) \
+        || defined(CONFIG_SPI_ADC_BF533_MODULE)
         {
                 .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */
                 .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. */
                 .platform_data = NULL, /* No spi_driver specific config */
                 .controller_data = &spi_adc_chip_info,
         },
 #endif
 
-#if defined(CONFIG_SND_BLACKFIN_AD1836) || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
+#if defined(CONFIG_SND_BLACKFIN_AD1836) \
+        || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
         {
                 .modalias = "ad1836-spi",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
                 .controller_data = &ad1836_spi_chip_info,
         },
 #endif
-
 #if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
         {
                 .modalias = "ad9960-spi",
                 .max_speed_hz = 10000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 1,
                 .controller_data = &ad9960_spi_chip_info,
         },
 #endif
+#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
+        {
+                .modalias = "spi_mmc_dummy",
+                .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
+                .bus_num = 0,
+                .chip_select = 0,
+                .platform_data = NULL,
+                .controller_data = &spi_mmc_chip_info,
+                .mode = SPI_MODE_3,
+        },
+        {
+                .modalias = "spi_mmc",
+                .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
+                .bus_num = 0,
+                .chip_select = CONFIG_SPI_MMC_CS_CHAN,
+                .platform_data = NULL,
+                .controller_data = &spi_mmc_chip_info,
+                .mode = SPI_MODE_3,
+        },
+#endif
+#if defined(CONFIG_PBX)
+        {
+                .modalias = "fxs-spi",
+                .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
+                .bus_num = 0,
+                .chip_select = 8 - CONFIG_J11_JUMPER,
+                .controller_data = &spi_si3xxx_chip_info,
+                .mode = SPI_MODE_3,
+        },
+        {
+                .modalias = "fxo-spi",
+                .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
+                .bus_num = 0,
+                .chip_select = 8 - CONFIG_J19_JUMPER,
+                .controller_data = &spi_si3xxx_chip_info,
+                .mode = SPI_MODE_3,
+        },
+#endif
+#if defined(CONFIG_AD5304) || defined(CONFIG_AD5304_MODULE)
+        {
+                .modalias = "ad5304_spi",
+                .max_speed_hz = 1250000,     /* max spi clock (SCK) speed in HZ */
+                .bus_num = 0,
+                .chip_select = 2,
+                .platform_data = NULL,
+                .controller_data = &ad5304_chip_info,
+                .mode = SPI_MODE_2,
+        },
+#endif
+#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+        {
+                .modalias               = "ad7877",
+                .platform_data          = &bfin_ad7877_ts_info,
+                .irq                    = IRQ_PF6,
+                .max_speed_hz   = 12500000,     /* max spi clock (SCK) speed in HZ */
+                .bus_num        = 1,
+                .chip_select  = 1,
+                .controller_data = &spi_ad7877_chip_info,
+        },
+#endif
 };
 
 /* SPI controller data */
-static struct bfin5xx_spi_master spi_bfin_master_info = {
+static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
         .enable_dma = 1,  /* master has the ability to do dma transfer */
 };
 
-static struct platform_device spi_bfin_master_device = {
-        .name = "bfin-spi-master",
-        .id = 1, /* Bus number */
+/* SPI (0) */
+static struct resource bfin_spi0_resource[] = {
+        [0] = {
+                .start = SPI0_REGBASE,
+                .end   = SPI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+                },
+        [1] = {
+                .start = CH_SPI,
+                .end   = CH_SPI,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_spi0_device = {
+        .name = "bfin-spi",
+        .id = 0, /* Bus number */
+        .num_resources = ARRAY_SIZE(bfin_spi0_resource),
+        .resource = bfin_spi0_resource,
         .dev = {
-                .platform_data = &spi_bfin_master_info, /* Passed to driver */
+                .platform_data = &bfin_spi0_info, /* Passed to driver */
         },
 };
 #endif  /* spi master and devices */
 
 #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
 static struct platform_device bfin_fb_device = {
-        .name = "bf537-fb",
+        .name = "bf537-lq035",
+};
+#endif
+
+#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+static struct platform_device bfin_fb_adv7393_device = {
+        .name = "bfin-adv7393",
 };
 #endif
 
@@ -390,15 +573,86 @@ static struct platform_device bfin_uart_device = {
 };
 #endif
 
-static struct platform_device *stamp_devices[] __initdata = {
-#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
-        &rtc_device,
+#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static struct resource bfin_twi0_resource[] = {
+        [0] = {
+                .start = TWI0_REGBASE,
+                .end   = TWI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_TWI,
+                .end   = IRQ_TWI,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device i2c_bfin_twi_device = {
+        .name = "i2c-bfin-twi",
+        .id = 0,
+        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
+        .resource = bfin_twi0_resource,
+};
+#endif
+
+#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+static struct platform_device bfin_sport0_uart_device = {
+        .name = "bfin-sport-uart",
+        .id = 0,
+};
+
+static struct platform_device bfin_sport1_uart_device = {
+        .name = "bfin-sport-uart",
+        .id = 1,
+};
+#endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#define PATA_INT        55
+
+static struct pata_platform_info bfin_pata_platform_data = {
+        .ioport_shift = 1,
+        .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
+};
+
+static struct resource bfin_pata_resources[] = {
+        {
+                .start = 0x20314020,
+                .end = 0x2031403F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = 0x2031401C,
+                .end = 0x2031401F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = PATA_INT,
+                .end = PATA_INT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_pata_device = {
+        .name = "pata_platform",
+        .id = -1,
+        .num_resources = ARRAY_SIZE(bfin_pata_resources),
+        .resource = bfin_pata_resources,
+        .dev = {
+                .platform_data = &bfin_pata_platform_data,
+        }
+};
 #endif
 
+static struct platform_device *stamp_devices[] __initdata = {
 #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
         &bfin_pcmcia_cf_device,
 #endif
 
+#if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
+        &rtc_device,
+#endif
+
 #if defined(CONFIG_USB_SL811_HCD) || defined(CONFIG_USB_SL811_HCD_MODULE)
         &sl811_hcd_device,
 #endif
@@ -411,6 +665,10 @@ static struct platform_device *stamp_devices[] __initdata = {
         &smc91x_device,
 #endif
 
+#if defined(CONFIG_DM9000) || defined(CONFIG_DM9000_MODULE)
+        &dm9000_device,
+#endif
+
 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
         &bfin_mac_device,
 #endif
@@ -420,16 +678,33 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
-        &spi_bfin_master_device,
+        &bfin_spi0_device,
 #endif
 
 #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
         &bfin_fb_device,
 #endif
 
+#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+        &bfin_fb_adv7393_device,
+#endif
+
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
         &bfin_uart_device,
 #endif
+
+#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+        &i2c_bfin_twi_device,
+#endif
+
+#if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
+        &bfin_sport0_uart_device,
+        &bfin_sport1_uart_device,
+#endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        &bfin_pata_device,
+#endif
 };
 
 static int __init stamp_init(void)
@@ -437,9 +712,21 @@ static int __init stamp_init(void)
         printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
         platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
-        spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
+        spi_register_board_info(bfin_spi_board_info,
+                                ARRAY_SIZE(bfin_spi_board_info));
+#endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
 #endif
         return 0;
 }
 
 arch_initcall(stamp_init);
+
+void native_machine_restart(char *cmd)
+{
+        /* workaround reboot hang when booting from SPI */
+        if ((bfin_read_SYSCR() & 0x7) == 0x3)
+                bfin_gpio_reset_spi0_ssel1();
+}
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 8806f1230f2d..20507e92a3a4 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -38,6 +38,7 @@
 #include <linux/usb_isp1362.h>
 #endif
 #include <linux/irq.h>
+#include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
 #include <linux/usb_sl811.h>
 
@@ -130,15 +131,13 @@ static struct resource sl811_hcd_resources[] = {
 #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS)
 void sl811_port_power(struct device *dev, int is_on)
 {
-        unsigned short mask = (1 << CONFIG_USB_SL811_BFIN_GPIO_VBUS);
-
-        bfin_write_PORT_FER(bfin_read_PORT_FER() & ~mask);
-        bfin_write_FIO_DIR(bfin_read_FIO_DIR() | mask);
+        gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS");
+        gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS);
 
         if (is_on)
-                bfin_write_FIO_FLAG_S(mask);
+                gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 1);
         else
-                bfin_write_FIO_FLAG_C(mask);
+                gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 0);
 }
 #endif
 
@@ -323,7 +322,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/
                 .platform_data = &bfin_spi_flash_data,
                 .controller_data = &spi_flash_chip_info,
@@ -336,7 +335,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */
                 .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. */
                 .platform_data = NULL, /* No spi_driver specific config */
                 .controller_data = &spi_adc_chip_info,
@@ -348,7 +347,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad1836-spi",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
                 .controller_data = &ad1836_spi_chip_info,
         },
@@ -357,7 +356,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad9960-spi",
                 .max_speed_hz = 10000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 1,
                 .controller_data = &ad9960_spi_chip_info,
         },
@@ -366,7 +365,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "spi_mmc_dummy",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 7,
                 .platform_data = NULL,
                 .controller_data = &spi_mmc_chip_info,
@@ -375,7 +374,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "spi_mmc",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SPI_MMC_CS_CHAN,
                 .platform_data = NULL,
                 .controller_data = &spi_mmc_chip_info,
@@ -396,24 +395,40 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 
 };
 
+/* SPI (0) */
+static struct resource bfin_spi0_resource[] = {
+        [0] = {
+                .start = SPI0_REGBASE,
+                .end   = SPI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+                },
+        [1] = {
+                .start = CH_SPI,
+                .end   = CH_SPI,
+                .flags = IORESOURCE_IRQ,
+        }
+};
+
 /* SPI controller data */
-static struct bfin5xx_spi_master spi_bfin_master_info = {
+static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
         .enable_dma = 1,  /* master has the ability to do dma transfer */
 };
 
-static struct platform_device spi_bfin_master_device = {
-        .name = "bfin-spi-master",
-        .id = 1, /* Bus number */
+static struct platform_device bfin_spi0_device = {
+        .name = "bfin-spi",
+        .id = 0, /* Bus number */
+        .num_resources = ARRAY_SIZE(bfin_spi0_resource),
+        .resource = bfin_spi0_resource,
         .dev = {
-                .platform_data = &spi_bfin_master_info, /* Passed to driver */
+                .platform_data = &bfin_spi0_info, /* Passed to driver */
         },
 };
 #endif  /* spi master and devices */
 
 #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
 static struct platform_device bfin_fb_device = {
-        .name = "bf537-fb",
+        .name = "bf537-lq035",
 };
 #endif
 
@@ -469,7 +484,7 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
-        &spi_bfin_master_device,
+        &bfin_spi0_device,
 #endif
 
 #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 9c43d7756510..47d7d4a0e73d 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -37,10 +37,13 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb_isp1362.h>
 #endif
+#include <linux/pata_platform.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/usb_sl811.h>
+#include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
+#include <asm/reboot.h>
 #include <linux/spi/ad7877.h>
 
 /*
@@ -199,15 +202,13 @@ static struct resource sl811_hcd_resources[] = {
 #if defined(CONFIG_USB_SL811_BFIN_USE_VBUS)
 void sl811_port_power(struct device *dev, int is_on)
 {
-        unsigned short mask = (1 << CONFIG_USB_SL811_BFIN_GPIO_VBUS);
-
-        bfin_write_PORT_FER(bfin_read_PORT_FER() & ~mask);
-        bfin_write_FIO_DIR(bfin_read_FIO_DIR() | mask);
+        gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS");
+        gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS);
 
         if (is_on)
-                bfin_write_FIO_FLAG_S(mask);
+                gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 1);
         else
-                bfin_write_FIO_FLAG_C(mask);
+                gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 0);
 }
 #endif
 
@@ -407,7 +408,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/
                 .platform_data = &bfin_spi_flash_data,
                 .controller_data = &spi_flash_chip_info,
@@ -420,7 +421,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */
                 .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. */
                 .platform_data = NULL, /* No spi_driver specific config */
                 .controller_data = &spi_adc_chip_info,
@@ -432,7 +433,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad1836-spi",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
                 .controller_data = &ad1836_spi_chip_info,
         },
@@ -441,7 +442,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad9960-spi",
                 .max_speed_hz = 10000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 1,
                 .controller_data = &ad9960_spi_chip_info,
         },
@@ -450,7 +451,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "spi_mmc_dummy",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 0,
                 .platform_data = NULL,
                 .controller_data = &spi_mmc_chip_info,
@@ -459,7 +460,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "spi_mmc",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SPI_MMC_CS_CHAN,
                 .platform_data = NULL,
                 .controller_data = &spi_mmc_chip_info,
@@ -470,16 +471,16 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "fxs-spi",
                 .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
-                .chip_select = 3,
+                .bus_num = 0,
+                .chip_select = 8 - CONFIG_J11_JUMPER,
                 .controller_data = &spi_si3xxx_chip_info,
                 .mode = SPI_MODE_3,
         },
         {
                 .modalias = "fxo-spi",
                 .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
-                .chip_select = 2,
+                .bus_num = 0,
+                .chip_select = 8 - CONFIG_J19_JUMPER,
                 .controller_data = &spi_si3xxx_chip_info,
                 .mode = SPI_MODE_3,
         },
@@ -488,7 +489,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad5304_spi",
                 .max_speed_hz = 1250000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 2,
                 .platform_data = NULL,
                 .controller_data = &ad5304_chip_info,
@@ -509,23 +510,45 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 };
 
 /* SPI controller data */
-static struct bfin5xx_spi_master spi_bfin_master_info = {
+static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
         .enable_dma = 1,  /* master has the ability to do dma transfer */
 };
 
-static struct platform_device spi_bfin_master_device = {
-        .name = "bfin-spi-master",
-        .id = 1, /* Bus number */
+/* SPI (0) */
+static struct resource bfin_spi0_resource[] = {
+        [0] = {
+                .start = SPI0_REGBASE,
+                .end   = SPI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+                },
+        [1] = {
+                .start = CH_SPI,
+                .end   = CH_SPI,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_spi0_device = {
+        .name = "bfin-spi",
+        .id = 0, /* Bus number */
+        .num_resources = ARRAY_SIZE(bfin_spi0_resource),
+        .resource = bfin_spi0_resource,
         .dev = {
-                .platform_data = &spi_bfin_master_info, /* Passed to driver */
+                .platform_data = &bfin_spi0_info, /* Passed to driver */
         },
 };
 #endif  /* spi master and devices */
 
 #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
 static struct platform_device bfin_fb_device = {
-        .name = "bf537-fb",
+        .name = "bf537-lq035",
+};
+#endif
+
+#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+static struct platform_device bfin_fb_adv7393_device = {
+        .name = "bfin-adv7393",
 };
 #endif
 
@@ -551,9 +574,24 @@ static struct platform_device bfin_uart_device = {
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static struct resource bfin_twi0_resource[] = {
+        [0] = {
+                .start = TWI0_REGBASE,
+                .end   = TWI0_REGBASE,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_TWI,
+                .end   = IRQ_TWI,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
 static struct platform_device i2c_bfin_twi_device = {
         .name = "i2c-bfin-twi",
         .id = 0,
+        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
+        .resource = bfin_twi0_resource,
 };
 #endif
 
@@ -569,6 +607,43 @@ static struct platform_device bfin_sport1_uart_device = {
 };
 #endif
 
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#define PATA_INT        55
+
+static struct pata_platform_info bfin_pata_platform_data = {
+        .ioport_shift = 1,
+        .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
+};
+
+static struct resource bfin_pata_resources[] = {
+        {
+                .start = 0x20314020,
+                .end = 0x2031403F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = 0x2031401C,
+                .end = 0x2031401F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = PATA_INT,
+                .end = PATA_INT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_pata_device = {
+        .name = "pata_platform",
+        .id = -1,
+        .num_resources = ARRAY_SIZE(bfin_pata_resources),
+        .resource = bfin_pata_resources,
+        .dev = {
+                .platform_data = &bfin_pata_platform_data,
+        }
+};
+#endif
+
 static struct platform_device *stamp_devices[] __initdata = {
 #if defined(CONFIG_BFIN_CFPCMCIA) || defined(CONFIG_BFIN_CFPCMCIA_MODULE)
         &bfin_pcmcia_cf_device,
@@ -603,13 +678,17 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
-        &spi_bfin_master_device,
+        &bfin_spi0_device,
 #endif
 
 #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
         &bfin_fb_device,
 #endif
 
+#if defined(CONFIG_FB_BFIN_7393) || defined(CONFIG_FB_BFIN_7393_MODULE)
+        &bfin_fb_adv7393_device,
+#endif
+
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
         &bfin_uart_device,
 #endif
@@ -622,6 +701,10 @@ static struct platform_device *stamp_devices[] __initdata = {
         &bfin_sport0_uart_device,
         &bfin_sport1_uart_device,
 #endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        &bfin_pata_device,
+#endif
 };
 
 static int __init stamp_init(void)
@@ -632,7 +715,18 @@ static int __init stamp_init(void)
         spi_register_board_info(bfin_spi_board_info,
                                 ARRAY_SIZE(bfin_spi_board_info));
 #endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
+#endif
         return 0;
 }
 
 arch_initcall(stamp_init);
+
+void native_machine_restart(char *cmd)
+{
+        /* workaround reboot hang when booting from SPI */
+        if ((bfin_read_SYSCR() & 0x7) == 0x3)
+                bfin_gpio_reset_spi0_ssel1();
+}
diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S
index 429c8a1019da..3014fe8dd155 100644
--- a/arch/blackfin/mach-bf537/head.S
+++ b/arch/blackfin/mach-bf537/head.S
@@ -33,6 +33,7 @@
 #include <asm/trace.h>
 
 #if CONFIG_BFIN_KERNEL_CLOCK
+#include <asm/mach-common/clocks.h>
 #include <asm/mach/mem_init.h>
 #endif
 
@@ -50,10 +51,12 @@ __INIT
 ENTRY(__start)
         /* R0: argument of command line string, passed from uboot, save it */
         R7 = R0;
-        /* Set the SYSCFG register:
-         * Enable Cycle Counter and Nesting Of Interrupts (3rd Bit)
-         */
-        R0 = 0x36;
+        /* Enable Cycle Counter and Nesting Of Interrupts */
+#ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES
+        R0 = SYSCFG_SNEN;
+#else
+        R0 = SYSCFG_SNEN | SYSCFG_CCEN;
+#endif
         SYSCFG = R0;
         R0 = 0;
 
@@ -95,43 +98,43 @@ ENTRY(__start)
         M2 = r0;
         M3 = r0;
 
-        trace_buffer_start(p0,r0);
+        trace_buffer_init(p0,r0);
         P0 = R1;
         R0 = R1;
 
         /* Turn off the icache */
-        p0.l = (IMEM_CONTROL & 0xFFFF);
-        p0.h = (IMEM_CONTROL >> 16);
+        p0.l = LO(IMEM_CONTROL);
+        p0.h = HI(IMEM_CONTROL);
         R1 = [p0];
         R0 = ~ENICPLB;
         R0 = R0 & R1;
 
         /* Anomaly 05000125 */
-#ifdef ANOMALY_05000125
+#if ANOMALY_05000125
         CLI R2;
         SSYNC;
 #endif
         [p0] = R0;
         SSYNC;
-#ifdef ANOMALY_05000125
+#if ANOMALY_05000125
         STI R2;
 #endif
 
         /* Turn off the dcache */
-        p0.l = (DMEM_CONTROL & 0xFFFF);
-        p0.h = (DMEM_CONTROL >> 16);
+        p0.l = LO(DMEM_CONTROL);
+        p0.h = HI(DMEM_CONTROL);
         R1 = [p0];
         R0 = ~ENDCPLB;
         R0 = R0 & R1;
 
         /* Anomaly 05000125 */
-#ifdef ANOMALY_05000125
+#if ANOMALY_05000125
         CLI R2;
         SSYNC;
 #endif
         [p0] = R0;
         SSYNC;
-#ifdef ANOMALY_05000125
+#if ANOMALY_05000125
         STI R2;
 #endif
 
@@ -141,12 +144,12 @@ ENTRY(__start)
          */
         p0.h = hi(BFIN_PORT_MUX);
         p0.l = lo(BFIN_PORT_MUX);
-#ifdef ANOMALY_05000212
+#if ANOMALY_05000212
         R0.L = W[P0]; /* Read */
         SSYNC;
 #endif
         R0 = (PGDE_UART | PFTE_UART)(Z);
-#ifdef ANOMALY_05000212
+#if ANOMALY_05000212
         W[P0] = R0.L; /* Write */
         SSYNC;
 #endif
@@ -155,12 +158,12 @@ ENTRY(__start)
 
         p0.h = hi(PORTF_FER);
         p0.l = lo(PORTF_FER);
-#ifdef ANOMALY_05000212
+#if ANOMALY_05000212
         R0.L = W[P0]; /* Read */
         SSYNC;
 #endif
         R0 = 0x000F(Z);
-#ifdef ANOMALY_05000212
+#if ANOMALY_05000212
         W[P0] = R0.L; /* Write */
         SSYNC;
 #endif
@@ -221,6 +224,12 @@ ENTRY(__start)
         fp = sp;
         usp = sp;
 
+#ifdef CONFIG_EARLY_PRINTK
+        SP += -12;
+        call _init_early_exception_vectors;
+        SP += 12;
+#endif
+
         /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */
         call _bf53x_relocate_l1_mem;
 #if CONFIG_BFIN_KERNEL_CLOCK
@@ -274,7 +283,7 @@ ENTRY(__start)
         p0.l = .LWAIT_HERE;
         p0.h = .LWAIT_HERE;
         reti = p0;
-#if defined(ANOMALY_05000281)
+#if ANOMALY_05000281
         nop; nop; nop;
 #endif
         rti;
@@ -436,8 +445,8 @@ ENTRY(_start_dma_code)
         w[p0] = r0.l;
         ssync;
 
-        p0.l = (EBIU_SDBCTL & 0xFFFF);
-        p0.h = (EBIU_SDBCTL >> 16);     /* SDRAM Memory Bank Control Register */
+        p0.l = LO(EBIU_SDBCTL);
+        p0.h = HI(EBIU_SDBCTL);     /* SDRAM Memory Bank Control Register */
         r0 = mem_SDBCTL;
         w[p0] = r0.l;
         ssync;
@@ -475,85 +484,6 @@ ENTRY(_start_dma_code)
 ENDPROC(_start_dma_code)
 #endif /* CONFIG_BFIN_KERNEL_CLOCK */
 
-ENTRY(_bfin_reset)
-        /* No more interrupts to be handled*/
-        CLI R6;
-        SSYNC;
-
-#if defined(CONFIG_MTD_M25P80)
-        /*
-         * The following code fix the SPI flash reboot issue,
-         * /CS signal of the chip which is using PF10 return to GPIO mode
-         */
-        p0.h = hi(PORTF_FER);
-        p0.l = lo(PORTF_FER);
-        r0.l = 0x0000;
-        w[p0] = r0.l;
-        SSYNC;
-
-        /* /CS return to high */
-        p0.h = hi(PORTFIO);
-        p0.l = lo(PORTFIO);
-        r0.l = 0xFFFF;
-        w[p0] = r0.l;
-        SSYNC;
-
-        /* Delay some time, This is necessary */
-        r1.h = 0;
-        r1.l = 0x400;
-        p1   = r1;
-        lsetup (.L_delay_lab1, .L_delay_lab1_end) lc1 = p1;
-.L_delay_lab1:
-        r0.h = 0;
-        r0.l = 0x8000;
-        p0   = r0;
-        lsetup (.L_delay_lab0, .L_delay_lab0_end) lc0 = p0;
-.L_delay_lab0:
-        nop;
-.L_delay_lab0_end:
-        nop;
-.L_delay_lab1_end:
-        nop;
-#endif
-
-        /* Clear the IMASK register */
-        p0.h = hi(IMASK);
-        p0.l = lo(IMASK);
-        r0 = 0x0;
-        [p0] = r0;
-
-        /* Clear the ILAT register */
-        p0.h = hi(ILAT);
-        p0.l = lo(ILAT);
-        r0 = [p0];
-        [p0] = r0;
-        SSYNC;
-
-        /* make sure SYSCR is set to use BMODE */
-        P0.h = hi(SYSCR);
-        P0.l = lo(SYSCR);
-        R0.l = 0x0;
-        W[P0] = R0.l;
-        SSYNC;
-
-        /* issue a system soft reset */
-        P1.h = hi(SWRST);
-        P1.l = lo(SWRST);
-        R1.l = 0x0007;
-        W[P1] = R1;
-        SSYNC;
-
-        /* clear system soft reset */
-        R0.l = 0x0000;
-        W[P0] = R0;
-        SSYNC;
-
-        /* issue core reset */
-        raise 1;
-
-        RTS;
-ENDPROC(_bfin_reset)
-
 .data
 
 /*
diff --git a/arch/blackfin/mach-bf548/Kconfig b/arch/blackfin/mach-bf548/Kconfig
index e78b03d56c7c..08d8dc83701c 100644
--- a/arch/blackfin/mach-bf548/Kconfig
+++ b/arch/blackfin/mach-bf548/Kconfig
@@ -2,6 +2,13 @@ if (BF54x)
 
 menu "BF548 Specific Configuration"
 
+config DEB_DMA_URGENT
+        bool "DMA has priority over core for ext. accesses"
+        depends on BF54x
+        default n
+        help
+          Treat any DEB1, DEB2 and DEB3 request as Urgent
+
 comment "Interrupt Priority Assignment"
 menu "Priority"
 
@@ -282,7 +289,7 @@ menu "Assignment"
 
 config PINTx_REASSIGN
         bool "Reprogram PINT Assignment"
-        default n
+        default y
         help
           The interrupt assignment registers controls the pin-to-interrupt
           assignment in a byte-wide manner. Each option allows you to select
@@ -303,7 +310,7 @@ config PINT1_ASSIGN
 config PINT2_ASSIGN
         hex "PINT2_ASSIGN"
         depends on PINTx_REASSIGN
-        default 0x00000101
+        default 0x07000101
 config PINT3_ASSIGN
         hex "PINT3_ASSIGN"
         depends on PINTx_REASSIGN
diff --git a/arch/blackfin/mach-bf548/Makefile b/arch/blackfin/mach-bf548/Makefile
index 060ad78ebf1d..7e7c9c8ac5b2 100644
--- a/arch/blackfin/mach-bf548/Makefile
+++ b/arch/blackfin/mach-bf548/Makefile
@@ -4,6 +4,6 @@
 
 extra-y := head.o
 
-obj-y := ints-priority.o dma.o gpio.o
+obj-y := ints-priority.o dma.o
 
 obj-$(CONFIG_CPU_FREQ)   += cpu.o
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 96ad95fab1a8..2c47db494f7d 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -35,9 +35,16 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/irq.h>
-#include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/usb/musb.h>
 #include <asm/bfin5xx_spi.h>
+#include <asm/cplb.h>
+#include <asm/dma.h>
+#include <asm/gpio.h>
+#include <asm/nand.h>
+#include <asm/mach/bf54x_keys.h>
+#include <linux/input.h>
+#include <linux/spi/ad7877.h>
 
 /*
  * Name the Board for the /proc/cpuinfo
@@ -48,6 +55,88 @@ char *bfin_board_name = "ADSP-BF548-EZKIT";
  *  Driver needs to know address, irq and flag pin.
  */
 
+#if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
+
+#include <asm/mach/bf54x-lq043.h>
+
+static struct bfin_bf54xfb_mach_info bf54x_lq043_data = {
+        .width =        480,
+        .height =       272,
+        .xres =         {480, 480, 480},
+        .yres =         {272, 272, 272},
+        .bpp =          {24, 24, 24},
+        .disp =         GPIO_PE3,
+};
+
+static struct resource bf54x_lq043_resources[] = {
+        {
+                .start = IRQ_EPPI0_ERR,
+                .end = IRQ_EPPI0_ERR,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bf54x_lq043_device = {
+        .name           = "bf54x-lq043",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(bf54x_lq043_resources),
+        .resource       = bf54x_lq043_resources,
+        .dev            = {
+                .platform_data = &bf54x_lq043_data,
+        },
+};
+#endif
+
+#if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE)
+static int bf548_keymap[] = {
+        KEYVAL(0, 0, KEY_ENTER),
+        KEYVAL(0, 1, KEY_HELP),
+        KEYVAL(0, 2, KEY_0),
+        KEYVAL(0, 3, KEY_BACKSPACE),
+        KEYVAL(1, 0, KEY_TAB),
+        KEYVAL(1, 1, KEY_9),
+        KEYVAL(1, 2, KEY_8),
+        KEYVAL(1, 3, KEY_7),
+        KEYVAL(2, 0, KEY_DOWN),
+        KEYVAL(2, 1, KEY_6),
+        KEYVAL(2, 2, KEY_5),
+        KEYVAL(2, 3, KEY_4),
+        KEYVAL(3, 0, KEY_UP),
+        KEYVAL(3, 1, KEY_3),
+        KEYVAL(3, 2, KEY_2),
+        KEYVAL(3, 3, KEY_1),
+};
+
+static struct bfin_kpad_platform_data bf54x_kpad_data = {
+        .rows                   = 4,
+        .cols                   = 4,
+        .keymap                 = bf548_keymap,
+        .keymapsize             = ARRAY_SIZE(bf548_keymap),
+        .repeat                 = 0,
+        .debounce_time          = 5000, /* ns (5ms) */
+        .coldrive_time          = 1000, /* ns (1ms) */
+        .keyup_test_interval    = 50, /* ms (50ms) */
+};
+
+static struct resource bf54x_kpad_resources[] = {
+        {
+                .start = IRQ_KEY,
+                .end = IRQ_KEY,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bf54x_kpad_device = {
+        .name           = "bf54x-keys",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(bf54x_kpad_resources),
+        .resource       = bf54x_kpad_resources,
+        .dev            = {
+                .platform_data = &bf54x_kpad_data,
+        },
+};
+#endif
+
 #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
 static struct platform_device rtc_device = {
         .name = "rtc-bfin",
@@ -94,6 +183,344 @@ static struct platform_device bfin_uart_device = {
 };
 #endif
 
+#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+static struct resource smsc911x_resources[] = {
+        {
+                .name = "smsc911x-memory",
+                .start = 0x24000000,
+                .end = 0x24000000 + 0xFF,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = IRQ_PE8,
+                .end = IRQ_PE8,
+                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
+        },
+};
+static struct platform_device smsc911x_device = {
+        .name = "smsc911x",
+        .id = 0,
+        .num_resources = ARRAY_SIZE(smsc911x_resources),
+        .resource = smsc911x_resources,
+};
+#endif
+
+#if defined(CONFIG_USB_BF54x_HCD) || defined(CONFIG_USB_BF54x_HCD_MODULE)
+static struct resource bf54x_hcd_resources[] = {
+        {
+                .start = 0xFFC03C00,
+                .end = 0xFFC040FF,
+                .flags = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device bf54x_hcd = {
+        .name = "bf54x-hcd",
+        .id = 0,
+        .num_resources = ARRAY_SIZE(bf54x_hcd_resources),
+        .resource = bf54x_hcd_resources,
+};
+#endif
+
+#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+static struct resource musb_resources[] = {
+        [0] = {
+                .start  = 0xFFC03C00,
+                .end    = 0xFFC040FF,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = { /* general IRQ */
+                .start  = IRQ_USB_INT0,
+                .end    = IRQ_USB_INT0,
+                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
+        },
+        [2] = { /* DMA IRQ */
+                .start  = IRQ_USB_DMA,
+                .end    = IRQ_USB_DMA,
+                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
+        },
+};
+
+static struct musb_hdrc_platform_data musb_plat = {
+#ifdef CONFIG_USB_MUSB_OTG
+        .mode           = MUSB_OTG,
+#elif CONFIG_USB_MUSB_HDRC_HCD
+        .mode           = MUSB_HOST,
+#elif CONFIG_USB_GADGET_MUSB_HDRC
+        .mode           = MUSB_PERIPHERAL,
+#endif
+        .multipoint     = 1,
+};
+
+static u64 musb_dmamask = ~(u32)0;
+
+static struct platform_device musb_device = {
+        .name           = "musb_hdrc",
+        .id             = 0,
+        .dev = {
+                .dma_mask               = &musb_dmamask,
+                .coherent_dma_mask      = 0xffffffff,
+                .platform_data          = &musb_plat,
+        },
+        .num_resources  = ARRAY_SIZE(musb_resources),
+        .resource       = musb_resources,
+};
+#endif
+
+#if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE)
+static struct resource bfin_atapi_resources[] = {
+        {
+                .start = 0xFFC03800,
+                .end = 0xFFC0386F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = IRQ_ATAPI_ERR,
+                .end = IRQ_ATAPI_ERR,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_atapi_device = {
+        .name = "pata-bf54x",
+        .id = -1,
+        .num_resources = ARRAY_SIZE(bfin_atapi_resources),
+        .resource = bfin_atapi_resources,
+};
+#endif
+
+#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+static struct mtd_partition partition_info[] = {
+        {
+                .name = "Linux Kernel",
+                .offset = 0,
+                .size = 4 * SIZE_1M,
+        },
+        {
+                .name = "File System",
+                .offset = 4 * SIZE_1M,
+                .size = (256 - 4) * SIZE_1M,
+        },
+};
+
+static struct bf5xx_nand_platform bf5xx_nand_platform = {
+        .page_size = NFC_PG_SIZE_256,
+        .data_width = NFC_NWIDTH_8,
+        .partitions = partition_info,
+        .nr_partitions = ARRAY_SIZE(partition_info),
+        .rd_dly = 3,
+        .wr_dly = 3,
+};
+
+static struct resource bf5xx_nand_resources[] = {
+        {
+                .start = 0xFFC03B00,
+                .end = 0xFFC03B4F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = CH_NFC,
+                .end = CH_NFC,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bf5xx_nand_device = {
+        .name = "bf5xx-nand",
+        .id = 0,
+        .num_resources = ARRAY_SIZE(bf5xx_nand_resources),
+        .resource = bf5xx_nand_resources,
+        .dev = {
+                .platform_data = &bf5xx_nand_platform,
+        },
+};
+#endif
+
+#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN)
+static struct platform_device bf54x_sdh_device = {
+        .name = "bfin-sdh",
+        .id = 0,
+};
+#endif
+
+#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
+/* all SPI peripherals info goes here */
+#if defined(CONFIG_MTD_M25P80) \
+        || defined(CONFIG_MTD_M25P80_MODULE)
+/* SPI flash chip (m25p16) */
+static struct mtd_partition bfin_spi_flash_partitions[] = {
+        {
+                .name = "bootloader",
+                .size = 0x00040000,
+                .offset = 0,
+                .mask_flags = MTD_CAP_ROM
+        }, {
+                .name = "linux kernel",
+                .size = 0x1c0000,
+                .offset = 0x40000
+        }
+};
+
+static struct flash_platform_data bfin_spi_flash_data = {
+        .name = "m25p80",
+        .parts = bfin_spi_flash_partitions,
+        .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),
+        .type = "m25p16",
+};
+
+static struct bfin5xx_spi_chip spi_flash_chip_info = {
+        .enable_dma = 0,         /* use dma transfer with this chip*/
+        .bits_per_word = 8,
+        .cs_change_per_word = 0,
+};
+#endif
+
+#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
+        .cs_change_per_word = 1,
+        .enable_dma = 0,
+        .bits_per_word = 16,
+};
+
+static const struct ad7877_platform_data bfin_ad7877_ts_info = {
+        .model                  = 7877,
+        .vref_delay_usecs       = 50,   /* internal, no capacitor */
+        .x_plate_ohms           = 419,
+        .y_plate_ohms           = 486,
+        .pressure_max           = 1000,
+        .pressure_min           = 0,
+        .stopacq_polarity       = 1,
+        .first_conversion_delay = 3,
+        .acquisition_time       = 1,
+        .averaging              = 1,
+        .pen_down_acc_interval  = 1,
+};
+#endif
+
+static struct spi_board_info bf54x_spi_board_info[] __initdata = {
+#if defined(CONFIG_MTD_M25P80) \
+        || defined(CONFIG_MTD_M25P80_MODULE)
+        {
+                /* the modalias must be the same as spi device driver name */
+                .modalias = "m25p80", /* Name of spi_driver for this device */
+                .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
+                .bus_num = 0, /* Framework bus number */
+                .chip_select = 1, /* SPI_SSEL1*/
+                .platform_data = &bfin_spi_flash_data,
+                .controller_data = &spi_flash_chip_info,
+                .mode = SPI_MODE_3,
+        },
+#endif
+#if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
+{
+        .modalias               = "ad7877",
+        .platform_data          = &bfin_ad7877_ts_info,
+        .irq                    = IRQ_PJ11,
+        .max_speed_hz           = 12500000,     /* max spi clock (SCK) speed in HZ */
+        .bus_num                = 0,
+        .chip_select            = 2,
+        .controller_data = &spi_ad7877_chip_info,
+},
+#endif
+};
+
+/* SPI (0) */
+static struct resource bfin_spi0_resource[] = {
+        [0] = {
+                .start = SPI0_REGBASE,
+                .end   = SPI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = CH_SPI0,
+                .end   = CH_SPI0,
+                .flags = IORESOURCE_IRQ,
+        }
+};
+
+/* SPI (1) */
+static struct resource bfin_spi1_resource[] = {
+        [0] = {
+                .start = SPI1_REGBASE,
+                .end   = SPI1_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = CH_SPI1,
+                .end   = CH_SPI1,
+                .flags = IORESOURCE_IRQ,
+        }
+};
+
+/* SPI controller data */
+static struct bfin5xx_spi_master bf54x_spi_master_info = {
+        .num_chipselect = 8,
+        .enable_dma = 1,  /* master has the ability to do dma transfer */
+};
+
+static struct platform_device bf54x_spi_master0 = {
+        .name = "bfin-spi",
+        .id = 0, /* Bus number */
+        .num_resources = ARRAY_SIZE(bfin_spi0_resource),
+        .resource = bfin_spi0_resource,
+        .dev = {
+                .platform_data = &bf54x_spi_master_info, /* Passed to driver */
+                },
+};
+
+static struct platform_device bf54x_spi_master1 = {
+        .name = "bfin-spi",
+        .id = 1, /* Bus number */
+        .num_resources = ARRAY_SIZE(bfin_spi1_resource),
+        .resource = bfin_spi1_resource,
+        .dev = {
+                .platform_data = &bf54x_spi_master_info, /* Passed to driver */
+                },
+};
+#endif  /* spi master and devices */
+
+#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+static struct resource bfin_twi0_resource[] = {
+        [0] = {
+                .start = TWI0_REGBASE,
+                .end   = TWI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_TWI0,
+                .end   = IRQ_TWI0,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device i2c_bfin_twi0_device = {
+        .name = "i2c-bfin-twi",
+        .id = 0,
+        .num_resources = ARRAY_SIZE(bfin_twi0_resource),
+        .resource = bfin_twi0_resource,
+};
+
+static struct resource bfin_twi1_resource[] = {
+        [0] = {
+                .start = TWI1_REGBASE,
+                .end   = TWI1_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = IRQ_TWI1,
+                .end   = IRQ_TWI1,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device i2c_bfin_twi1_device = {
+        .name = "i2c-bfin-twi",
+        .id = 1,
+        .num_resources = ARRAY_SIZE(bfin_twi1_resource),
+        .resource = bfin_twi1_resource,
+};
+#endif
+
 static struct platform_device *ezkit_devices[] __initdata = {
 #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
         &rtc_device,
@@ -102,12 +529,60 @@ static struct platform_device *ezkit_devices[] __initdata = {
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
         &bfin_uart_device,
 #endif
+
+#if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
+        &bf54x_lq043_device,
+#endif
+
+#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+        &smsc911x_device,
+#endif
+
+#if defined(CONFIG_USB_BF54x_HCD) || defined(CONFIG_USB_BF54x_HCD_MODULE)
+        &bf54x_hcd,
+#endif
+
+#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
+        &musb_device,
+#endif
+
+#if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE)
+        &bfin_atapi_device,
+#endif
+
+#if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
+        &bf5xx_nand_device,
+#endif
+
+#if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN)
+        &bf54x_sdh_device,
+#endif
+
+#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
+        &bf54x_spi_master0,
+/*      &bf54x_spi_master1,*/
+#endif
+
+#if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE)
+        &bf54x_kpad_device,
+#endif
+
+#if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
+        &i2c_bfin_twi0_device,
+        &i2c_bfin_twi1_device,
+#endif
 };
 
 static int __init stamp_init(void)
 {
         printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
         platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices));
+
+#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
+        spi_register_board_info(bf54x_spi_board_info,
+                        ARRAY_SIZE(bf54x_spi_board_info));
+#endif
+
         return 0;
 }
 
diff --git a/arch/blackfin/mach-bf548/gpio.c b/arch/blackfin/mach-bf548/gpio.c
deleted file mode 100644
index 0da5f0003b8c..000000000000
--- a/arch/blackfin/mach-bf548/gpio.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * File:         arch/blackfin/mach-bf548/gpio.c
- * Based on:
- * Author:       Michael Hennerich (hennerich@blackfin.uclinux.org)
- *
- * Created:
- * Description:  GPIO Abstraction Layer
- *
- * Modified:
- *               Copyright 2007 Analog Devices Inc.
- *
- * Bugs:         Enter bugs at http://blackfin.uclinux.org/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see the file COPYING, or write
- * to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <linux/module.h>
-#include <linux/err.h>
-#include <asm/blackfin.h>
-#include <asm/gpio.h>
-#include <asm/portmux.h>
-#include <linux/irq.h>
-
-static struct gpio_port_t *gpio_array[gpio_bank(MAX_BLACKFIN_GPIOS)] = {
-        (struct gpio_port_t *)PORTA_FER,
-        (struct gpio_port_t *)PORTB_FER,
-        (struct gpio_port_t *)PORTC_FER,
-        (struct gpio_port_t *)PORTD_FER,
-        (struct gpio_port_t *)PORTE_FER,
-        (struct gpio_port_t *)PORTF_FER,
-        (struct gpio_port_t *)PORTG_FER,
-        (struct gpio_port_t *)PORTH_FER,
-        (struct gpio_port_t *)PORTI_FER,
-        (struct gpio_port_t *)PORTJ_FER,
-};
-
-static unsigned short reserved_gpio_map[gpio_bank(MAX_BLACKFIN_GPIOS)];
-static unsigned short reserved_peri_map[gpio_bank(MAX_BLACKFIN_GPIOS)];
-
-inline int check_gpio(unsigned short gpio)
-{
-        if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15
-            || gpio == GPIO_PH14 || gpio == GPIO_PH15
-            || gpio == GPIO_PJ14 || gpio == GPIO_PJ15
-            || gpio > MAX_BLACKFIN_GPIOS)
-                return -EINVAL;
-        return 0;
-}
-
-inline void portmux_setup(unsigned short portno, unsigned short function)
-{
-        u32 pmux;
-
-        pmux = gpio_array[gpio_bank(portno)]->port_mux;
-
-        pmux &= ~(0x3 << (2 * gpio_sub_n(portno)));
-        pmux |= (function & 0x3) << (2 * gpio_sub_n(portno));
-
-        gpio_array[gpio_bank(portno)]->port_mux = pmux;
-
-}
-
-inline u16 get_portmux(unsigned short portno)
-{
-        u32 pmux;
-
-        pmux = gpio_array[gpio_bank(portno)]->port_mux;
-
-        return (pmux >> (2 * gpio_sub_n(portno)) & 0x3);
-
-}
-
-static void port_setup(unsigned short gpio, unsigned short usage)
-{
-        if (usage == GPIO_USAGE) {
-                if (gpio_array[gpio_bank(gpio)]->port_fer & gpio_bit(gpio))
-                        printk(KERN_WARNING
-                               "bfin-gpio: Possible Conflict with Peripheral "
-                               "usage and GPIO %d detected!\n", gpio);
-                gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio);
-        } else
-                gpio_array[gpio_bank(gpio)]->port_fer |= gpio_bit(gpio);
-        SSYNC();
-}
-
-static int __init bfin_gpio_init(void)
-{
-        printk(KERN_INFO "Blackfin GPIO Controller\n");
-
-        return 0;
-}
-
-arch_initcall(bfin_gpio_init);
-
-int peripheral_request(unsigned short per, const char *label)
-{
-        unsigned long flags;
-        unsigned short ident = P_IDENT(per);
-
-        if (!(per & P_DEFINED))
-                return -ENODEV;
-
-        if (check_gpio(ident) < 0)
-                return -EINVAL;
-
-        local_irq_save(flags);
-
-        if (unlikely(reserved_gpio_map[gpio_bank(ident)] & gpio_bit(ident))) {
-                printk(KERN_ERR
-                       "%s: Peripheral %d is already reserved as GPIO!\n",
-                       __FUNCTION__, per);
-                dump_stack();
-                local_irq_restore(flags);
-                return -EBUSY;
-        }
-
-        if (unlikely(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident))) {
-
-                u16 funct = get_portmux(ident);
-
-                if (!((per & P_MAYSHARE) && (funct == P_FUNCT2MUX(per)))) {
-                        printk(KERN_ERR
-                               "%s: Peripheral %d is already reserved!\n",
-                               __FUNCTION__, per);
-                        dump_stack();
-                        local_irq_restore(flags);
-                        return -EBUSY;
-                }
-        }
-
-        reserved_peri_map[gpio_bank(ident)] |= gpio_bit(ident);
-
-        portmux_setup(ident, P_FUNCT2MUX(per));
-        port_setup(ident, PERIPHERAL_USAGE);
-
-        local_irq_restore(flags);
-
-        return 0;
-}
-EXPORT_SYMBOL(peripheral_request);
-
-int peripheral_request_list(unsigned short per[], const char *label)
-{
-
-        u16 cnt;
-        int ret;
-
-        for (cnt = 0; per[cnt] != 0; cnt++) {
-                ret = peripheral_request(per[cnt], label);
-                if (ret < 0)
-                        return ret;
-        }
-
-        return 0;
-}
-EXPORT_SYMBOL(peripheral_request_list);
-
-void peripheral_free(unsigned short per)
-{
-        unsigned long flags;
-        unsigned short ident = P_IDENT(per);
-
-        if (!(per & P_DEFINED))
-                return;
-
-        if (check_gpio(ident) < 0)
-                return;
-
-        local_irq_save(flags);
-
-        if (unlikely(!(reserved_peri_map[gpio_bank(ident)] & gpio_bit(ident)))) {
-                printk(KERN_ERR "bfin-gpio: Peripheral %d wasn't reserved!\n", per);
-                dump_stack();
-                local_irq_restore(flags);
-                return;
-        }
-
-        if (!(per & P_MAYSHARE)) {
-                port_setup(ident, GPIO_USAGE);
-        }
-
-        reserved_peri_map[gpio_bank(ident)] &= ~gpio_bit(ident);
-
-        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(peripheral_free);
-
-void peripheral_free_list(unsigned short per[])
-{
-        u16 cnt;
-
-        for (cnt = 0; per[cnt] != 0; cnt++) {
-                peripheral_free(per[cnt]);
-        }
-
-}
-EXPORT_SYMBOL(peripheral_free_list);
-
-/***********************************************************
-*
-* FUNCTIONS: Blackfin GPIO Driver
-*
-* INPUTS/OUTPUTS:
-* gpio - GPIO Number between 0 and MAX_BLACKFIN_GPIOS
-*
-*
-* DESCRIPTION: Blackfin GPIO Driver API
-*
-* CAUTION:
-*************************************************************
-* MODIFICATION HISTORY :
-**************************************************************/
-
-int gpio_request(unsigned short gpio, const char *label)
-{
-        unsigned long flags;
-
-        if (check_gpio(gpio) < 0)
-                return -EINVAL;
-
-        local_irq_save(flags);
-
-        if (unlikely(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
-                printk(KERN_ERR "bfin-gpio: GPIO %d is already reserved!\n", gpio);
-                dump_stack();
-                local_irq_restore(flags);
-                return -EBUSY;
-        }
-
-        if (unlikely(reserved_peri_map[gpio_bank(gpio)] & gpio_bit(gpio))) {
-                printk(KERN_ERR
-                       "bfin-gpio: GPIO %d is already reserved as Peripheral!\n", gpio);
-                dump_stack();
-                local_irq_restore(flags);
-                return -EBUSY;
-        }
-
-        reserved_gpio_map[gpio_bank(gpio)] |= gpio_bit(gpio);
-
-        local_irq_restore(flags);
-
-        port_setup(gpio, GPIO_USAGE);
-
-        return 0;
-}
-EXPORT_SYMBOL(gpio_request);
-
-void gpio_free(unsigned short gpio)
-{
-        unsigned long flags;
-
-        if (check_gpio(gpio) < 0)
-                return;
-
-        local_irq_save(flags);
-
-        if (unlikely(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)))) {
-                printk(KERN_ERR "bfin-gpio: GPIO %d wasn't reserved!\n", gpio);
-                dump_stack();
-                local_irq_restore(flags);
-                return;
-        }
-
-        reserved_gpio_map[gpio_bank(gpio)] &= ~gpio_bit(gpio);
-
-        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(gpio_free);
-
-void gpio_direction_input(unsigned short gpio)
-{
-        unsigned long flags;
-
-        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
-
-        local_irq_save(flags);
-        gpio_array[gpio_bank(gpio)]->port_dir_clear = gpio_bit(gpio);
-        gpio_array[gpio_bank(gpio)]->port_inen |= gpio_bit(gpio);
-        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(gpio_direction_input);
-
-void gpio_direction_output(unsigned short gpio)
-{
-        unsigned long flags;
-
-        BUG_ON(!(reserved_gpio_map[gpio_bank(gpio)] & gpio_bit(gpio)));
-
-        local_irq_save(flags);
-        gpio_array[gpio_bank(gpio)]->port_inen &= ~gpio_bit(gpio);
-        gpio_array[gpio_bank(gpio)]->port_dir_set = gpio_bit(gpio);
-        local_irq_restore(flags);
-}
-EXPORT_SYMBOL(gpio_direction_output);
-
-void gpio_set_value(unsigned short gpio, unsigned short arg)
-{
-        if (arg)
-                gpio_array[gpio_bank(gpio)]->port_set = gpio_bit(gpio);
-        else
-                gpio_array[gpio_bank(gpio)]->port_clear = gpio_bit(gpio);
-
-}
-EXPORT_SYMBOL(gpio_set_value);
-
-unsigned short gpio_get_value(unsigned short gpio)
-{
-        return (1 & (gpio_array[gpio_bank(gpio)]->port_data >> gpio_sub_n(gpio)));
-}
-EXPORT_SYMBOL(gpio_get_value);
diff --git a/arch/blackfin/mach-bf548/head.S b/arch/blackfin/mach-bf548/head.S
index 06751ae8b857..3071c243d426 100644
--- a/arch/blackfin/mach-bf548/head.S
+++ b/arch/blackfin/mach-bf548/head.S
@@ -31,6 +31,7 @@
 #include <asm/blackfin.h>
 #include <asm/trace.h>
 #if CONFIG_BFIN_KERNEL_CLOCK
+#include <asm/mach-common/clocks.h>
 #include <asm/mach/mem_init.h>
 #endif
 
@@ -49,9 +50,13 @@ ENTRY(__start)
 ENTRY(__stext)
         /* R0: argument of command line string, passed from uboot, save it */
         R7 = R0;
-        /* Set the SYSCFG register */
-        R0 = 0x36;
-        SYSCFG = R0;   /*Enable Cycle Counter and Nesting Of Interrupts(3rd Bit)*/
+        /* Enable Cycle Counter and Nesting Of Interrupts */
+#ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES
+        R0 = SYSCFG_SNEN;
+#else
+        R0 = SYSCFG_SNEN | SYSCFG_CCEN;
+#endif
+        SYSCFG = R0;
         R0 = 0;
 
         /* Clear Out All the data and pointer  Registers*/
@@ -92,13 +97,13 @@ ENTRY(__stext)
         M2 = r0;
         M3 = r0;
 
-        trace_buffer_start(p0,r0);
+        trace_buffer_init(p0,r0);
         P0 = R1;
         R0 = R1;
 
         /* Turn off the icache */
-        p0.l = (IMEM_CONTROL & 0xFFFF);
-        p0.h = (IMEM_CONTROL >> 16);
+        p0.l = LO(IMEM_CONTROL);
+        p0.h = HI(IMEM_CONTROL);
         R1 = [p0];
         R0 = ~ENICPLB;
         R0 = R0 & R1;
@@ -106,8 +111,8 @@ ENTRY(__stext)
         SSYNC;
 
         /* Turn off the dcache */
-        p0.l = (DMEM_CONTROL & 0xFFFF);
-        p0.h = (DMEM_CONTROL >> 16);
+        p0.l = LO(DMEM_CONTROL);
+        p0.h = HI(DMEM_CONTROL);
         R1 = [p0];
         R0 = ~ENDCPLB;
         R0 = R0 & R1;
@@ -120,6 +125,12 @@ ENTRY(__stext)
         FP = SP;
         USP = SP;
 
+#ifdef CONFIG_EARLY_PRINTK
+        SP += -12;
+        call _init_early_exception_vectors;
+        SP += 12;
+#endif
+
         /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */
         call _bf53x_relocate_l1_mem;
 #if CONFIG_BFIN_KERNEL_CLOCK
@@ -172,7 +183,7 @@ ENTRY(__stext)
         p0.l = .LWAIT_HERE;
         p0.h = .LWAIT_HERE;
         reti = p0;
-#if defined (ANOMALY_05000281)
+#if ANOMALY_05000281
         nop;
         nop;
         nop;
@@ -335,8 +346,8 @@ ENTRY(_start_dma_code)
         w[p0] = r0.l;
         ssync;
 
-        p0.l = (EBIU_SDBCTL & 0xFFFF);
-        p0.h = (EBIU_SDBCTL >> 16);     /* SDRAM Memory Bank Control Register */
+        p0.l = LO(EBIU_SDBCTL);
+        p0.h = HI(EBIU_SDBCTL);     /* SDRAM Memory Bank Control Register */
         r0 = mem_SDBCTL;
         w[p0] = r0.l;
         ssync;
@@ -373,129 +384,6 @@ ENTRY(_start_dma_code)
         RTS;
 #endif /* CONFIG_BFIN_KERNEL_CLOCK */
 
-ENTRY(_bfin_reset)
-        /* No more interrupts to be handled*/
-        CLI R6;
-        SSYNC;
-
-#if defined(CONFIG_MTD_M25P80)
-/*
- * The following code fix the SPI flash reboot issue,
- * /CS signal of the chip which is using PF10 return to GPIO mode
- */
-        p0.h = hi(PORTF_FER);
-        p0.l = lo(PORTF_FER);
-        r0.l = 0x0000;
-        w[p0] = r0.l;
-        SSYNC;
-
-/* /CS return to high */
-        p0.h = hi(PORTFIO);
-        p0.l = lo(PORTFIO);
-        r0.l = 0xFFFF;
-        w[p0] = r0.l;
-        SSYNC;
-
-/* Delay some time, This is necessary */
-        r1.h = 0;
-        r1.l = 0x400;
-        p1   = r1;
-        lsetup (_delay_lab1,_delay_lab1_end ) lc1 = p1;
-_delay_lab1:
-        r0.h = 0;
-        r0.l = 0x8000;
-        p0   = r0;
-        lsetup (_delay_lab0,_delay_lab0_end ) lc0 = p0;
-_delay_lab0:
-        nop;
-_delay_lab0_end:
-        nop;
-_delay_lab1_end:
-        nop;
-#endif
-
-        /* Clear the bits 13-15 in SWRST if they werent cleared */
-        p0.h = hi(SWRST);
-        p0.l = lo(SWRST);
-        csync;
-        r0.l = w[p0];
-
-        /* Clear the IMASK register */
-        p0.h = hi(IMASK);
-        p0.l = lo(IMASK);
-        r0 = 0x0;
-        [p0] = r0;
-
-        /* Clear the ILAT register */
-        p0.h = hi(ILAT);
-        p0.l = lo(ILAT);
-        r0 = [p0];
-        [p0] = r0;
-        SSYNC;
-
-        /* Disable the WDOG TIMER */
-        p0.h = hi(WDOG_CTL);
-        p0.l = lo(WDOG_CTL);
-        r0.l = 0xAD6;
-        w[p0] = r0.l;
-        SSYNC;
-
-        /* Clear the sticky bit incase it is already set */
-        p0.h = hi(WDOG_CTL);
-        p0.l = lo(WDOG_CTL);
-        r0.l = 0x8AD6;
-        w[p0] = r0.l;
-        SSYNC;
-
-        /* Program the count value */
-        R0.l = 0x100;
-        R0.h = 0x0;
-        P0.h = hi(WDOG_CNT);
-        P0.l = lo(WDOG_CNT);
-        [P0] = R0;
-        SSYNC;
-
-        /* Program WDOG_STAT if necessary */
-        P0.h = hi(WDOG_CTL);
-        P0.l = lo(WDOG_CTL);
-        R0 = W[P0](Z);
-        CC = BITTST(R0,1);
-        if !CC JUMP .LWRITESTAT;
-        CC = BITTST(R0,2);
-        if !CC JUMP .LWRITESTAT;
-        JUMP .LSKIP_WRITE;
-
-.LWRITESTAT:
-        /* When watch dog timer is enabled,
-         * a write to STAT will load the contents of CNT to STAT
-         */
-        R0 = 0x0000(z);
-        P0.h = hi(WDOG_STAT);
-        P0.l = lo(WDOG_STAT)
-        [P0] = R0;
-        SSYNC;
-
-.LSKIP_WRITE:
-        /* Enable the reset event */
-        P0.h = hi(WDOG_CTL);
-        P0.l = lo(WDOG_CTL);
-        R0 = W[P0](Z);
-        BITCLR(R0,1);
-        BITCLR(R0,2);
-        W[P0] = R0.L;
-        SSYNC;
-        NOP;
-
-        /* Enable the wdog counter */
-        R0 = W[P0](Z);
-        BITCLR(R0,4);
-        W[P0] = R0.L;
-        SSYNC;
-
-        IDLE;
-
-        RTS;
-
 .data
 
 /*
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index 5b2b544529a1..cd827a1b6ba1 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -34,7 +34,9 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb_isp1362.h>
+#include <linux/pata_platform.h>
 #include <linux/irq.h>
+#include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
 
 /*
@@ -112,7 +114,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 /* the modalias must be the same as spi device driver name */
                 .modalias = "m25p80", /* Name of spi_driver for this device */
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. On STAMP537 it is SPISSEL1*/
                 .platform_data = &bfin_spi_flash_data,
                 .controller_data = &spi_flash_chip_info,
@@ -124,7 +126,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */
                 .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1, /* Framework bus number */
+                .bus_num = 0, /* Framework bus number */
                 .chip_select = 1, /* Framework chip select. */
                 .platform_data = NULL, /* No spi_driver specific config */
                 .controller_data = &spi_adc_chip_info,
@@ -135,7 +137,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad1836-spi",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
                 .controller_data = &ad1836_spi_chip_info,
         },
@@ -144,7 +146,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad9960-spi",
                 .max_speed_hz = 10000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = 1,
                 .controller_data = &ad9960_spi_chip_info,
         },
@@ -153,7 +155,7 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "spi_mmc",
                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SPI_MMC_CS_CHAN,
                 .platform_data = NULL,
                 .controller_data = &spi_mmc_chip_info,
@@ -162,17 +164,33 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
 #endif
 };
 
+/* SPI (0) */
+static struct resource bfin_spi0_resource[] = {
+        [0] = {
+                .start = SPI0_REGBASE,
+                .end   = SPI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = CH_SPI,
+                .end   = CH_SPI,
+                .flags = IORESOURCE_IRQ,
+        }
+};
+
 /* SPI controller data */
-static struct bfin5xx_spi_master spi_bfin_master_info = {
+static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
         .enable_dma = 1,  /* master has the ability to do dma transfer */
 };
 
-static struct platform_device spi_bfin_master_device = {
-        .name = "bfin-spi-master",
-        .id = 1, /* Bus number */
+static struct platform_device bfin_spi0_device = {
+        .name = "bfin-spi",
+        .id = 0, /* Bus number */
+        .num_resources = ARRAY_SIZE(bfin_spi0_resource),
+        .resource = bfin_spi0_resource,
         .dev = {
-                .platform_data = &spi_bfin_master_info, /* Passed to driver */
+                .platform_data = &bfin_spi0_info, /* Passed to driver */
         },
 };
 #endif  /* spi master and devices */
@@ -256,6 +274,43 @@ static struct platform_device bfin_uart_device = {
 };
 #endif
 
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#define PATA_INT        119
+
+static struct pata_platform_info bfin_pata_platform_data = {
+        .ioport_shift = 2,
+        .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
+};
+
+static struct resource bfin_pata_resources[] = {
+        {
+                .start = 0x2400C000,
+                .end = 0x2400C001F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = 0x2400D018,
+                .end = 0x2400D01B,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = PATA_INT,
+                .end = PATA_INT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_pata_device = {
+        .name = "pata_platform",
+        .id = -1,
+        .num_resources = ARRAY_SIZE(bfin_pata_resources),
+        .resource = bfin_pata_resources,
+        .dev = {
+                .platform_data = &bfin_pata_platform_data,
+        }
+};
+#endif
+
 static struct platform_device *cm_bf561_devices[] __initdata = {
 
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
@@ -271,9 +326,12 @@ static struct platform_device *cm_bf561_devices[] __initdata = {
 #endif
 
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
-        &spi_bfin_master_device,
+        &bfin_spi0_device,
 #endif
 
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        &bfin_pata_device,
+#endif
 };
 
 static int __init cm_bf561_init(void)
@@ -283,6 +341,10 @@ static int __init cm_bf561_init(void)
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
         spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 #endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
+#endif
         return 0;
 }
 
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index 724191da20a2..57e14edca8b1 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -32,6 +32,8 @@
 #include <linux/spi/spi.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/pata_platform.h>
+#include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
 
 /*
@@ -140,17 +142,33 @@ static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
 #endif
 #endif
 
+/* SPI (0) */
+static struct resource bfin_spi0_resource[] = {
+        [0] = {
+                .start = SPI0_REGBASE,
+                .end   = SPI0_REGBASE + 0xFF,
+                .flags = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start = CH_SPI,
+                .end   = CH_SPI,
+                .flags = IORESOURCE_IRQ,
+        }
+};
+
 /* SPI controller data */
-static struct bfin5xx_spi_master spi_bfin_master_info = {
+static struct bfin5xx_spi_master bfin_spi0_info = {
         .num_chipselect = 8,
         .enable_dma = 1,  /* master has the ability to do dma transfer */
 };
 
-static struct platform_device spi_bfin_master_device = {
-        .name = "bfin-spi-master",
-        .id = 1, /* Bus number */
+static struct platform_device bfin_spi0_device = {
+        .name = "bfin-spi",
+        .id = 0, /* Bus number */
+        .num_resources = ARRAY_SIZE(bfin_spi0_resource),
+        .resource = bfin_spi0_resource,
         .dev = {
-                .platform_data = &spi_bfin_master_info, /* Passed to driver */
+                .platform_data = &bfin_spi0_info, /* Passed to driver */
         },
 };
 
@@ -160,23 +178,63 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
         {
                 .modalias = "ad1836-spi",
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
-                .bus_num = 1,
+                .bus_num = 0,
                 .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
                 .controller_data = &ad1836_spi_chip_info,
         },
 #endif
 };
 
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+#define PATA_INT        55
+
+static struct pata_platform_info bfin_pata_platform_data = {
+        .ioport_shift = 1,
+        .irq_type = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
+};
+
+static struct resource bfin_pata_resources[] = {
+        {
+                .start = 0x20314020,
+                .end = 0x2031403F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = 0x2031401C,
+                .end = 0x2031401F,
+                .flags = IORESOURCE_MEM,
+        },
+        {
+                .start = PATA_INT,
+                .end = PATA_INT,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device bfin_pata_device = {
+        .name = "pata_platform",
+        .id = -1,
+        .num_resources = ARRAY_SIZE(bfin_pata_resources),
+        .resource = bfin_pata_resources,
+        .dev = {
+                .platform_data = &bfin_pata_platform_data,
+        }
+};
+#endif
+
 static struct platform_device *ezkit_devices[] __initdata = {
 #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
         &smc91x_device,
 #endif
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
-        &spi_bfin_master_device,
+        &bfin_spi0_device,
 #endif
 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
         &bfin_uart_device,
 #endif
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        &bfin_pata_device,
+#endif
 };
 
 static int __init ezkit_init(void)
@@ -194,7 +252,15 @@ static int __init ezkit_init(void)
         SSYNC();
 #endif
 
-        return spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
+#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
+        spi_register_board_info(bfin_spi_board_info,
+                                ARRAY_SIZE(bfin_spi_board_info));
+#endif
+
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+        irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
+#endif
+        return 0;
 }
 
 arch_initcall(ezkit_init);
diff --git a/arch/blackfin/mach-bf561/head.S b/arch/blackfin/mach-bf561/head.S
index 38650a628980..96a3d456fb6d 100644
--- a/arch/blackfin/mach-bf561/head.S
+++ b/arch/blackfin/mach-bf561/head.S
@@ -33,6 +33,7 @@
 #include <asm/trace.h>
 
 #if CONFIG_BFIN_KERNEL_CLOCK
+#include <asm/mach-common/clocks.h>
 #include <asm/mach/mem_init.h>
 #endif
 
@@ -50,10 +51,12 @@ __INIT
 ENTRY(__start)
         /* R0: argument of command line string, passed from uboot, save it */
         R7 = R0;
-        /* Set the SYSCFG register:
-         * Enable Cycle Counter and Nesting Of Interrupts (3rd Bit)
-         */
-        R0 = 0x36;
+        /* Enable Cycle Counter and Nesting Of Interrupts */
+#ifdef CONFIG_BFIN_SCRATCH_REG_CYCLES
+        R0 = SYSCFG_SNEN;
+#else
+        R0 = SYSCFG_SNEN | SYSCFG_CCEN;
+#endif
         SYSCFG = R0;
         R0 = 0;
 
@@ -95,43 +98,42 @@ ENTRY(__start)
         M2 = r0;
         M3 = r0;
 
-        trace_buffer_start(p0,r0);
+        trace_buffer_init(p0,r0);
         P0 = R1;
         R0 = R1;
 
         /* Turn off the icache */
-        p0.l = (IMEM_CONTROL & 0xFFFF);
-        p0.h = (IMEM_CONTROL >> 16);
+        p0.l = LO(IMEM_CONTROL);
+        p0.h = HI(IMEM_CONTROL);
         R1 = [p0];
         R0 = ~ENICPLB;
         R0 = R0 & R1;
 
-        /* Anomaly 05000125 */
-#ifdef ANOMALY_05000125
+#if ANOMALY_05000125
         CLI R2;
         SSYNC;
 #endif
         [p0] = R0;
         SSYNC;
-#ifdef ANOMALY_05000125
+#if ANOMALY_05000125
         STI R2;
 #endif
 
         /* Turn off the dcache */
-        p0.l = (DMEM_CONTROL & 0xFFFF);
-        p0.h = (DMEM_CONTROL >> 16);
+        p0.l = LO(DMEM_CONTROL);
+        p0.h = HI(DMEM_CONTROL);
         R1 = [p0];
         R0 = ~ENDCPLB;
         R0 = R0 & R1;
 
         /* Anomaly 05000125 */
-#ifdef ANOMALY_05000125
+#if ANOMALY_05000125
         CLI R2;
         SSYNC;
 #endif
         [p0] = R0;
         SSYNC;
-#ifdef ANOMALY_05000125
+#if ANOMALY_05000125
         STI R2;
 #endif
 
@@ -167,6 +169,12 @@ ENTRY(__start)
         fp = sp;
         usp = sp;
 
+#ifdef CONFIG_EARLY_PRINTK
+        SP += -12;
+        call _init_early_exception_vectors;
+        SP += 12;
+#endif
+
         /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */
         call _bf53x_relocate_l1_mem;
 #if CONFIG_BFIN_KERNEL_CLOCK
@@ -220,7 +228,7 @@ ENTRY(__start)
         p0.l = .LWAIT_HERE;
         p0.h = .LWAIT_HERE;
         reti = p0;
-#if defined(ANOMALY_05000281)
+#if ANOMALY_05000281
         nop; nop; nop;
 #endif
         rti;
@@ -372,8 +380,8 @@ ENTRY(_start_dma_code)
         w[p0] = r0.l;
         ssync;
 
-        p0.l = (EBIU_SDBCTL & 0xFFFF);
-        p0.h = (EBIU_SDBCTL >> 16);     /* SDRAM Memory Bank Control Register */
+        p0.l = LO(EBIU_SDBCTL);
+        p0.h = HI(EBIU_SDBCTL);     /* SDRAM Memory Bank Control Register */
         r0 = mem_SDBCTL;
         w[p0] = r0.l;
         ssync;
@@ -404,66 +412,6 @@ ENTRY(_start_dma_code)
 ENDPROC(_start_dma_code)
 #endif /* CONFIG_BFIN_KERNEL_CLOCK */
 
-ENTRY(_bfin_reset)
-        /* No more interrupts to be handled*/
-        CLI R6;
-        SSYNC;
-
-#if defined(CONFIG_BFIN_SHARED_FLASH_ENET)
-        p0.h = hi(FIO_INEN);
-        p0.l = lo(FIO_INEN);
-        r0.l = ~(PF1 | PF0);
-        w[p0] = r0.l;
-
-        p0.h = hi(FIO_DIR);
-        p0.l = lo(FIO_DIR);
-        r0.l = (PF1 | PF0);
-        w[p0] = r0.l;
-
-        p0.h = hi(FIO_FLAG_C);
-        p0.l = lo(FIO_FLAG_C);
-        r0.l = (PF1 | PF0);
-        w[p0] = r0.l;
-#endif
-
-        /* Clear the IMASK register */
-        p0.h = hi(IMASK);
-        p0.l = lo(IMASK);
-        r0 = 0x0;
-        [p0] = r0;
-
-        /* Clear the ILAT register */
-        p0.h = hi(ILAT);
-        p0.l = lo(ILAT);
-        r0 = [p0];
-        [p0] = r0;
-        SSYNC;
-
-        /* make sure SYSCR is set to use BMODE */
-        P0.h = hi(SYSCR);
-        P0.l = lo(SYSCR);
-        R0.l = 0x20;            /* on BF561, disable core b */
-        W[P0] = R0.l;
-        SSYNC;
-
-        /* issue a system soft reset */
-        P1.h = hi(SWRST);
-        P1.l = lo(SWRST);
-        R1.l = 0x0007;
-        W[P1] = R1;
-        SSYNC;
-
-        /* clear system soft reset */
-        R0.l = 0x0000;
-        W[P0] = R0;
-        SSYNC;
-
-        /* issue core reset */
-        raise 1;
-
-        RTS;
-ENDPROC(_bfin_reset)
-
 .data
 
 /*
diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile
index 0279ede70392..4d7733dfd5de 100644
--- a/arch/blackfin/mach-common/Makefile
+++ b/arch/blackfin/mach-common/Makefile
@@ -4,7 +4,7 @@
 
 obj-y := \
         cache.o cacheinit.o cplbhdlr.o cplbmgr.o entry.o \
-        interrupt.o lock.o irqpanic.o
+        interrupt.o lock.o irqpanic.o arch_checks.o
 
 obj-$(CONFIG_CPLB_INFO)          += cplbinfo.o
 obj-$(CONFIG_BFIN_SINGLE_CORE)   += ints-priority-sc.o
diff --git a/arch/blackfin/mach-common/arch_checks.c b/arch/blackfin/mach-common/arch_checks.c
new file mode 100644
index 000000000000..2f6ce397780f
--- /dev/null
+++ b/arch/blackfin/mach-common/arch_checks.c
@@ -0,0 +1,60 @@
+/*
+ * File:         arch/blackfin/mach-common/arch_checks.c
+ * Based on:
+ * Author:       Robin Getz <rgetz@blackfin.uclinux.org>
+ *
+ * Created:      25Jul07
+ * Description:  Do some checking to make sure things are OK
+ *
+ * Modified:
+ *               Copyright 2004-2007 Analog Devices Inc.
+ *
+ * Bugs:         Enter bugs at http://blackfin.uclinux.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see the file COPYING, or write
+ * to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <asm/mach/anomaly.h>
+#include <asm/mach-common/clocks.h>
+
+#ifdef CONFIG_BFIN_KERNEL_CLOCK
+
+# if (CONFIG_VCO_HZ > CONFIG_MAX_VCO_HZ)
+#  error "VCO selected is more than maximum value. Please change the VCO multipler"
+# endif
+
+# if (CONFIG_SCLK_HZ > CONFIG_MAX_SCLK_HZ)
+# error "Sclk value selected is more than maximum. Please select a proper value for SCLK multiplier"
+# endif
+
+# if (CONFIG_SCLK_HZ < CONFIG_MIN_SCLK_HZ)
+# error "Sclk value selected is less than minimum. Please select a proper value for SCLK multiplier"
+# endif
+
+# if (ANOMALY_05000273) && (CONFIG_SCLK_HZ * 2 > CONFIG_CCLK_HZ)
+# error "ANOMALY 05000273, please make sure CCLK is at least 2x SCLK"
+# endif
+
+# if (CONFIG_SCLK_HZ > CONFIG_CCLK_HZ) && (CONFIG_SCLK_HZ != CONFIG_CLKIN_HZ) && (CONFIG_CCLK_HZ != CONFIG_CLKIN_HZ)
+# error "Please select sclk less than cclk"
+# endif
+
+#endif /* CONFIG_BFIN_KERNEL_CLOCK */
+
+#if (CONFIG_MEM_SIZE % 4)
+#error "SDRAM mem size must be multible of 4MB"
+#endif
+
diff --git a/arch/blackfin/mach-common/cache.S b/arch/blackfin/mach-common/cache.S
index 7063795eb7c0..0521b1588204 100644
--- a/arch/blackfin/mach-common/cache.S
+++ b/arch/blackfin/mach-common/cache.S
@@ -79,8 +79,8 @@ ENTRY(_icache_invalidate)
 ENTRY(_invalidate_entire_icache)
         [--SP] = ( R7:5);
 
-        P0.L = (IMEM_CONTROL & 0xFFFF);
-        P0.H = (IMEM_CONTROL >> 16);
+        P0.L = LO(IMEM_CONTROL);
+        P0.H = HI(IMEM_CONTROL);
         R7 = [P0];
 
         /* Clear the IMC bit , All valid bits in the instruction
@@ -197,8 +197,8 @@ ENTRY(_invalidate_entire_dcache)
 ENTRY(_dcache_invalidate)
         [--SP] = ( R7:6);
 
-        P0.L = (DMEM_CONTROL & 0xFFFF);
-        P0.H = (DMEM_CONTROL >> 16);
+        P0.L = LO(DMEM_CONTROL);
+        P0.H = HI(DMEM_CONTROL);
         R7 = [P0];
 
         /* Clear the DMC[1:0] bits, All valid bits in the data
diff --git a/arch/blackfin/mach-common/cacheinit.S b/arch/blackfin/mach-common/cacheinit.S
index 5be6b975ae4a..22fada0c1cb3 100644
--- a/arch/blackfin/mach-common/cacheinit.S
+++ b/arch/blackfin/mach-common/cacheinit.S
@@ -38,13 +38,13 @@
 
 .text
 
-#ifdef ANOMALY_05000125
-#if defined(CONFIG_BLKFIN_CACHE)
+#if ANOMALY_05000125
+#if defined(CONFIG_BFIN_ICACHE)
 ENTRY(_bfin_write_IMEM_CONTROL)
 
         /* Enable Instruction Cache */
-        P0.l = (IMEM_CONTROL & 0xFFFF);
-        P0.h = (IMEM_CONTROL >> 16);
+        P0.l = LO(IMEM_CONTROL);
+        P0.h = HI(IMEM_CONTROL);
 
         /* Anomaly 05000125 */
         CLI R1;
@@ -58,10 +58,10 @@ ENTRY(_bfin_write_IMEM_CONTROL)
 ENDPROC(_bfin_write_IMEM_CONTROL)
 #endif
 
-#if defined(CONFIG_BLKFIN_DCACHE)
+#if defined(CONFIG_BFIN_DCACHE)
 ENTRY(_bfin_write_DMEM_CONTROL)
-        P0.l = (DMEM_CONTROL & 0xFFFF);
-        P0.h = (DMEM_CONTROL >> 16);
+        P0.l = LO(DMEM_CONTROL);
+        P0.h = HI(DMEM_CONTROL);
 
         CLI R1;
         SSYNC;          /* SSYNC required before writing to DMEM_CONTROL. */
diff --git a/arch/blackfin/mach-common/cplbhdlr.S b/arch/blackfin/mach-common/cplbhdlr.S
index 2f3c72c23997..2788532de72b 100644
--- a/arch/blackfin/mach-common/cplbhdlr.S
+++ b/arch/blackfin/mach-common/cplbhdlr.S
@@ -69,14 +69,14 @@ ENTRY(__cplb_hdr)
 
 .Lis_icplb_miss:
 
-#if defined(CONFIG_BLKFIN_CACHE) || defined(CONFIG_BLKFIN_DCACHE)
-# if defined(CONFIG_BLKFIN_CACHE) && !defined(CONFIG_BLKFIN_DCACHE)
+#if defined(CONFIG_BFIN_ICACHE) || defined(CONFIG_BFIN_DCACHE)
+# if defined(CONFIG_BFIN_ICACHE) && !defined(CONFIG_BFIN_DCACHE)
         R1 = CPLB_ENABLE_ICACHE;
 # endif
-# if !defined(CONFIG_BLKFIN_CACHE) && defined(CONFIG_BLKFIN_DCACHE)
+# if !defined(CONFIG_BFIN_ICACHE) && defined(CONFIG_BFIN_DCACHE)
         R1 = CPLB_ENABLE_DCACHE;
 # endif
-# if defined(CONFIG_BLKFIN_CACHE) && defined(CONFIG_BLKFIN_DCACHE)
+# if defined(CONFIG_BFIN_ICACHE) && defined(CONFIG_BFIN_DCACHE)
         R1 = CPLB_ENABLE_DCACHE | CPLB_ENABLE_ICACHE;
 # endif
 #else
diff --git a/arch/blackfin/mach-common/cplbmgr.S b/arch/blackfin/mach-common/cplbmgr.S
index e4b47e09cf13..946703ef48ff 100644
--- a/arch/blackfin/mach-common/cplbmgr.S
+++ b/arch/blackfin/mach-common/cplbmgr.S
@@ -75,15 +75,15 @@ ENTRY(_cplb_mgr)
         * from the configuration table.
         */
 
-        P4.L = (ICPLB_FAULT_ADDR & 0xFFFF);
-        P4.H = (ICPLB_FAULT_ADDR >> 16);
+        P4.L = LO(ICPLB_FAULT_ADDR);
+        P4.H = HI(ICPLB_FAULT_ADDR);
 
         P1 = 16;
         P5.L = _page_size_table;
         P5.H = _page_size_table;
 
-        P0.L = (ICPLB_DATA0 & 0xFFFF);
-        P0.H = (ICPLB_DATA0 >> 16);
+        P0.L = LO(ICPLB_DATA0);
+        P0.H = HI(ICPLB_DATA0);
         R4 = [P4];              /* Get faulting address*/
         R6 = 64;                /* Advance past the fault address, which*/
         R6 = R6 + R4;           /* we'll use if we find a match*/
@@ -117,13 +117,13 @@ ENTRY(_cplb_mgr)
         I0 = R4;                /* Fault address we'll search for*/
 
         /* set up pointers */
-        P0.L = (ICPLB_DATA0 & 0xFFFF);
-        P0.H = (ICPLB_DATA0 >> 16);
+        P0.L = LO(ICPLB_DATA0);
+        P0.H = HI(ICPLB_DATA0);
 
         /* The replacement procedure for ICPLBs */
 
-        P4.L = (IMEM_CONTROL & 0xFFFF);
-        P4.H = (IMEM_CONTROL >> 16);
+        P4.L = LO(IMEM_CONTROL);
+        P4.H = HI(IMEM_CONTROL);
 
         /* disable cplbs */
         R5 = [P4];              /* Control Register*/
@@ -243,8 +243,8 @@ ENTRY(_cplb_mgr)
          * last entry of the table.
          */
 
-        P1.L = (ICPLB_DATA15 & 0xFFFF);         /* ICPLB_DATA15 */
-        P1.H = (ICPLB_DATA15 >> 16);
+        P1.L = LO(ICPLB_DATA15);                /* ICPLB_DATA15 */
+        P1.H = HI(ICPLB_DATA15);
         [P1] = R2;
         [P1-0x100] = R4;
 #ifdef  CONFIG_CPLB_INFO
@@ -292,10 +292,10 @@ ENTRY(_cplb_mgr)
          * pending writes associated with the CPLB.
          */
 
-        P4.L = (DCPLB_STATUS & 0xFFFF);
-        P4.H = (DCPLB_STATUS >> 16);
-        P3.L = (DCPLB_DATA0 & 0xFFFF);
-        P3.H = (DCPLB_DATA0 >> 16);
+        P4.L = LO(DCPLB_STATUS);
+        P4.H = HI(DCPLB_STATUS);
+        P3.L = LO(DCPLB_DATA0);
+        P3.H = HI(DCPLB_DATA0);
         R5 = [P4];
 
         /* A protection violation can be caused by more than just writes
@@ -355,11 +355,11 @@ ENTRY(_cplb_mgr)
          * config table, that covers the faulting address.
          */
 
-        P1.L = (DCPLB_DATA15 & 0xFFFF);
-        P1.H = (DCPLB_DATA15 >> 16);
+        P1.L = LO(DCPLB_DATA15);
+        P1.H = HI(DCPLB_DATA15);
 
-        P4.L = (DCPLB_FAULT_ADDR & 0xFFFF);
-        P4.H = (DCPLB_FAULT_ADDR >> 16);
+        P4.L = LO(DCPLB_FAULT_ADDR);
+        P4.H = HI(DCPLB_FAULT_ADDR);
         R4 = [P4];
         I0 = R4;
 
@@ -368,8 +368,8 @@ ENTRY(_cplb_mgr)
         R6 = R1;        /* Save for later*/
 
         /* Turn off CPLBs while we work.*/
-        P4.L = (DMEM_CONTROL & 0xFFFF);
-        P4.H = (DMEM_CONTROL >> 16);
+        P4.L = LO(DMEM_CONTROL);
+        P4.H = HI(DMEM_CONTROL);
         R5 = [P4];
         BITCLR(R5,ENDCPLB_P);
         CLI R0;
@@ -384,8 +384,8 @@ ENTRY(_cplb_mgr)
          * are no good.
          */
 
-        I1.L = (DCPLB_DATA0 & 0xFFFF);
-        I1.H = (DCPLB_DATA0 >> 16);
+        I1.L = LO(DCPLB_DATA0);
+        I1.H = HI(DCPLB_DATA0);
         P1 = 2;
         P2 = 16;
         I2.L = _dcplb_preference;
@@ -405,7 +405,7 @@ ENTRY(_cplb_mgr)
         P3.L = _page_size_table; /* retrieve end address */
         P3.H = _page_size_table; /* retrieve end address */
         R3 = 0x1002;            /* 16th - position, 2 bits -length */
-#ifdef ANOMALY_05000209
+#if ANOMALY_05000209
         nop;                    /* Anomaly 05000209 */
 #endif
         R7 = EXTRACT(R1,R3.l);
@@ -475,8 +475,8 @@ ENTRY(_cplb_mgr)
          * one space closer to the start.
          */
 
-        R1.L = (DCPLB_DATA16 & 0xFFFF);         /* DCPLB_DATA15 + 4 */
-        R1.H = (DCPLB_DATA16 >> 16);
+        R1.L = LO(DCPLB_DATA16);                /* DCPLB_DATA15 + 4 */
+        R1.H = HI(DCPLB_DATA16);
         R0 = P0;
 
         /* If the victim happens to be in DCPLB15,
@@ -549,8 +549,8 @@ ENTRY(_cplb_mgr)
          * if necessary.
          */
 
-        P1.L = (DCPLB_DATA15 & 0xFFFF);
-        P1.H = (DCPLB_DATA15 >> 16);
+        P1.L = LO(DCPLB_DATA15);
+        P1.H = HI(DCPLB_DATA15);
 
         /* If the DCPLB has cache bits set, but caching hasn't
          * been enabled, then we want to mask off the cache-in-L1
@@ -565,7 +565,7 @@ ENTRY(_cplb_mgr)
          * cost of first-write exceptions to mark the page as dirty.
          */
 
-#ifdef CONFIG_BLKFIN_WT
+#ifdef CONFIG_BFIN_WT
         BITSET(R6, 14);         /* Set WT*/
 #endif
 
diff --git a/arch/blackfin/mach-common/dpmc.S b/arch/blackfin/mach-common/dpmc.S
index 97cdcd6a00d4..39fbc2861107 100644
--- a/arch/blackfin/mach-common/dpmc.S
+++ b/arch/blackfin/mach-common/dpmc.S
@@ -39,8 +39,8 @@ ENTRY(_unmask_wdog_wakeup_evt)
         P0.H = hi(SICA_IWR1);
         P0.L = lo(SICA_IWR1);
 #else
-        P0.h = (SIC_IWR >> 16);
-        P0.l = (SIC_IWR & 0xFFFF);
+        P0.h = HI(SIC_IWR);
+        P0.l = LO(SIC_IWR);
 #endif
         R7 = [P0];
 #if defined(CONFIG_BF561)
@@ -60,11 +60,11 @@ ENTRY(_unmask_wdog_wakeup_evt)
          */
         R7 = 0x0000(z);
 #if defined(CONFIG_BF561)
-        P0.h = (WDOGA_STAT >> 16);
-        P0.l = (WDOGA_STAT & 0xFFFF);
+        P0.h = HI(WDOGA_STAT);
+        P0.l = LO(WDOGA_STAT);
 #else
-        P0.h = (WDOG_STAT >> 16);
-        P0.l = (WDOG_STAT & 0xFFFF);
+        P0.h = HI(WDOG_STAT);
+        P0.l = LO(WDOG_STAT);
 #endif
         [P0] = R7;
         SSYNC;
@@ -73,21 +73,21 @@ ENTRY(_unmask_wdog_wakeup_evt)
 ENTRY(_program_wdog_timer)
         [--SP] = ( R7:0, P5:0 );
 #if defined(CONFIG_BF561)
-        P0.h = (WDOGA_CNT >> 16);
-        P0.l = (WDOGA_CNT & 0xFFFF);
+        P0.h = HI(WDOGA_CNT);
+        P0.l = LO(WDOGA_CNT);
 #else
-        P0.h = (WDOG_CNT >> 16);
-        P0.l = (WDOG_CNT & 0xFFFF);
+        P0.h = HI(WDOG_CNT);
+        P0.l = LO(WDOG_CNT);
 #endif
         [P0] = R0;
         SSYNC;
 
 #if defined(CONFIG_BF561)
-        P0.h = (WDOGA_CTL >> 16);
-        P0.l = (WDOGA_CTL & 0xFFFF);
+        P0.h = HI(WDOGA_CTL);
+        P0.l = LO(WDOGA_CTL);
 #else
-        P0.h = (WDOG_CTL >> 16);
-        P0.l = (WDOG_CTL & 0xFFFF);
+        P0.h = HI(WDOG_CTL);
+        P0.l = LO(WDOG_CTL);
 #endif
         R7 = W[P0](Z);
         CC = BITTST(R7,1);
@@ -97,11 +97,11 @@ ENTRY(_program_wdog_timer)
 
 .LSKIP_WRITE_TO_STAT:
 #if defined(CONFIG_BF561)
-        P0.h = (WDOGA_CTL >> 16);
-            P0.l = (WDOGA_CTL & 0xFFFF);
+        P0.h = HI(WDOGA_CTL);
+        P0.l = LO(WDOGA_CTL);
 #else
-        P0.h = (WDOG_CTL >> 16);
-            P0.l = (WDOG_CTL & 0xFFFF);
+        P0.h = HI(WDOG_CTL);
+        P0.l = LO(WDOG_CTL);
 #endif
         R7 = W[P0](Z);
         BITCLR(R7,1);   /* Enable GP event */
@@ -122,11 +122,11 @@ ENTRY(_clear_wdog_wakeup_evt)
         [--SP] = ( R7:0, P5:0 );
 
 #if defined(CONFIG_BF561)
-        P0.h = (WDOGA_CTL >> 16);
-        P0.l = (WDOGA_CTL & 0xFFFF);
+        P0.h = HI(WDOGA_CTL);
+        P0.l = LO(WDOGA_CTL);
 #else
-        P0.h = (WDOG_CTL >> 16);
-        P0.l = (WDOG_CTL & 0xFFFF);
+        P0.h = HI(WDOG_CTL);
+        P0.l = LO(WDOG_CTL);
 #endif
         R7 = 0x0AD6(Z);
         W[P0] = R7.L;
@@ -149,11 +149,11 @@ ENTRY(_clear_wdog_wakeup_evt)
 ENTRY(_disable_wdog_timer)
         [--SP] = ( R7:0, P5:0 );
 #if defined(CONFIG_BF561)
-        P0.h = (WDOGA_CTL >> 16);
-        P0.l = (WDOGA_CTL & 0xFFFF);
+        P0.h = HI(WDOGA_CTL);
+        P0.l = LO(WDOGA_CTL);
 #else
-        P0.h = (WDOG_CTL >> 16);
-        P0.l = (WDOG_CTL & 0xFFFF);
+        P0.h = HI(WDOG_CTL);
+        P0.l = LO(WDOG_CTL);
 #endif
         R7 = 0xAD6(Z);
         W[P0] = R7.L;
@@ -300,7 +300,7 @@ ENTRY(_sleep_deeper)
         P0.H = hi(PLL_CTL);
         P0.L = lo(PLL_CTL);
         R5 = W[P0](z);
-        R0.L = (MIN_VC/CONFIG_CLKIN_HZ) << 9;
+        R0.L = (CONFIG_MIN_VCO_HZ/CONFIG_CLKIN_HZ) << 9;
         W[P0] = R0.l;
 
         SSYNC;
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index 960458808344..e3ad5802868a 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -29,21 +29,7 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-/*
- * 25-Dec-2004 - LG Soft India
- *      1. Fix in return_from_int, to make sure any pending
- *      system call in ILAT for this process to get
- *      executed, otherwise in case context switch happens,
- *      system call of first process (i.e in ILAT) will be
- *      carried forward to the switched process.
- *      2. Removed Constant references for the following
- *              a.  IPEND
- *              b.  EXCAUSE mask
- *              c.  PAGE Mask
- */
-
-/*
- * NOTE: This code handles signal-recognition, which happens every time
+/* NOTE: This code handles signal-recognition, which happens every time
  * after a timer-interrupt and after each system call.
  */
 
@@ -58,6 +44,23 @@
 
 #include <asm/mach-common/context.S>
 
+#if defined(CONFIG_BFIN_SCRATCH_REG_RETN)
+# define EX_SCRATCH_REG RETN
+#elif defined(CONFIG_BFIN_SCRATCH_REG_RETE)
+# define EX_SCRATCH_REG RETE
+#else
+# define EX_SCRATCH_REG CYCLES
+#endif
+
+#if ANOMALY_05000281
+ENTRY(_safe_speculative_execution)
+        NOP;
+        NOP;
+        NOP;
+        jump _safe_speculative_execution;
+ENDPROC(_safe_speculative_execution)
+#endif
+
 #ifdef CONFIG_EXCPT_IRQ_SYSC_L1
 .section .l1.text
 #else
@@ -69,7 +72,7 @@
  * patch up CPLB misses on the kernel stack.
  */
 ENTRY(_ex_dcplb)
-#if defined(ANOMALY_05000261)
+#if ANOMALY_05000261
         /*
          * Work around an anomaly: if we see a new DCPLB fault, return
          * without doing anything.  Then, if we get the same fault again,
@@ -93,7 +96,7 @@ ENTRY(_ex_icplb)
         call __cplb_hdr;
         DEBUG_START_HWTRACE(p5, r7)
         RESTORE_ALL_SYS
-        SP = RETN;
+        SP = EX_SCRATCH_REG;
         rtx;
 ENDPROC(_ex_icplb)
 
@@ -102,7 +105,7 @@ ENTRY(_ex_syscall)
         (R7:6,P5:4) = [sp++];
         ASTAT = [sp++];
         raise 15;               /* invoked by TRAP #0, for sys call */
-        sp = retn;
+        sp = EX_SCRATCH_REG;
         rtx
 ENDPROC(_ex_syscall)
 
@@ -135,9 +138,9 @@ ENTRY(_ex_single_step)
         cc = r6 == r7;
         if !cc jump _ex_trap_c;
 
-_return_from_exception:
+ENTRY(_return_from_exception)
         DEBUG_START_HWTRACE(p5, r7)
-#ifdef ANOMALY_05000257
+#if ANOMALY_05000257
         R7=LC0;
         LC0=R7;
         R7=LC1;
@@ -145,7 +148,7 @@ _return_from_exception:
 #endif
         (R7:6,P5:4) = [sp++];
         ASTAT = [sp++];
-        sp = retn;
+        sp = EX_SCRATCH_REG;
         rtx;
 ENDPROC(_ex_soft_bp)
 
@@ -163,7 +166,17 @@ ENTRY(_handle_bad_cplb)
         [--sp] = ASTAT;
         [--sp] = (R7:6, P5:4);
 
+ENTRY(_ex_replaceable)
+        nop;
+
 ENTRY(_ex_trap_c)
+        /* Make sure we are not in a double fault */
+        p4.l = lo(IPEND);
+        p4.h = hi(IPEND);
+        r7 = [p4];
+        CC = BITTST (r7, 5);
+        if CC jump _double_fault;
+
         /* Call C code (trap_c) to handle the exception, which most
          * likely involves sending a signal to the current process.
          * To avoid double faults, lower our priority to IRQ5 first.
@@ -204,11 +217,57 @@ ENTRY(_ex_trap_c)
         DEBUG_START_HWTRACE(p5, r7)
         (R7:6,P5:4) = [sp++];
         ASTAT = [sp++];
-        SP = RETN;
+        SP = EX_SCRATCH_REG;
         raise 5;
         rtx;
 ENDPROC(_ex_trap_c)
 
+/* We just realized we got an exception, while we were processing a different
+ * exception. This is a unrecoverable event, so crash
+ */
+ENTRY(_double_fault)
+        /* Turn caches & protection off, to ensure we don't get any more
+         * double exceptions
+         */
+
+        P4.L = LO(IMEM_CONTROL);
+        P4.H = HI(IMEM_CONTROL);
+
+        R5 = [P4];              /* Control Register*/
+        BITCLR(R5,ENICPLB_P);
+        SSYNC;          /* SSYNC required before writing to IMEM_CONTROL. */
+        .align 8;
+        [P4] = R5;
+        SSYNC;
+
+        P4.L = LO(DMEM_CONTROL);
+        P4.H = HI(DMEM_CONTROL);
+        R5 = [P4];
+        BITCLR(R5,ENDCPLB_P);
+        SSYNC;          /* SSYNC required before writing to DMEM_CONTROL. */
+        .align 8;
+        [P4] = R5;
+        SSYNC;
+
+        /* Fix up the stack */
+        (R7:6,P5:4) = [sp++];
+        ASTAT = [sp++];
+        SP = EX_SCRATCH_REG;
+
+        /* We should be out of the exception stack, and back down into
+         * kernel or user space stack
+         */
+        SAVE_ALL_SYS
+
+        r0 = sp;        /* stack frame pt_regs pointer argument ==> r0 */
+        SP += -12;
+        call _double_fault_c;
+        SP += 12;
+.L_double_fault_panic:
+        JUMP .L_double_fault_panic
+
+ENDPROC(_double_fault)
+
 ENTRY(_exception_to_level5)
         SAVE_ALL_SYS
 
@@ -279,7 +338,7 @@ ENTRY(_trap) /* Exception: 4th entry into system event table(supervisor mode)*/
          * covered by a CPLB.  Switch to an exception stack; use RETN as a
          * scratch register (for want of a better option).
          */
-        retn = sp;
+        EX_SCRATCH_REG = sp;
         sp.l = _exception_stack_top;
         sp.h = _exception_stack_top;
         /* Try to deal with syscalls quickly.  */
@@ -290,8 +349,8 @@ ENTRY(_trap) /* Exception: 4th entry into system event table(supervisor mode)*/
         r6.l = lo(SEQSTAT_EXCAUSE);
         r6.h = hi(SEQSTAT_EXCAUSE);
         r7 = r7 & r6;
-        p5.h = _extable;
-        p5.l = _extable;
+        p5.h = _ex_table;
+        p5.l = _ex_table;
         p4 = r7;
         p5 = p5 + (p4 << 2);
         p4 = [p5];
@@ -634,9 +693,9 @@ ENTRY(_return_from_int)
         p1.h = _schedule_and_signal_from_int;
         [p0] = p1;
         csync;
-#if defined(ANOMALY_05000281)
-        r0.l = lo(CONFIG_BOOT_LOAD);
-        r0.h = hi(CONFIG_BOOT_LOAD);
+#if ANOMALY_05000281
+        r0.l = _safe_speculative_execution;
+        r0.h = _safe_speculative_execution;
         reti = r0;
 #endif
         r0 = 0x801f (z);
@@ -648,9 +707,9 @@ ENTRY(_return_from_int)
 ENDPROC(_return_from_int)
 
 ENTRY(_lower_to_irq14)
-#if defined(ANOMALY_05000281)
-        r0.l = lo(CONFIG_BOOT_LOAD);
-        r0.h = hi(CONFIG_BOOT_LOAD);
+#if ANOMALY_05000281
+        r0.l = _safe_speculative_execution;
+        r0.h = _safe_speculative_execution;
         reti = r0;
 #endif
         r0 = 0x401f;
@@ -731,6 +790,114 @@ ENTRY(_init_exception_buff)
         rts;
 ENDPROC(_init_exception_buff)
 
+/* We handle this 100% in exception space - to reduce overhead
+ * Only potiential problem is if the software buffer gets swapped out of the
+ * CPLB table - then double fault. - so we don't let this happen in other places
+ */
+#ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND
+ENTRY(_ex_trace_buff_full)
+        [--sp] = P3;
+        [--sp] = P2;
+        [--sp] = LC0;
+        [--sp] = LT0;
+        [--sp] = LB0;
+        P5.L = _trace_buff_offset;
+        P5.H = _trace_buff_offset;
+        P3 = [P5];              /* trace_buff_offset */
+        P5.L = lo(TBUFSTAT);
+        P5.H = hi(TBUFSTAT);
+        R7 = [P5];
+        R7 <<= 1;               /* double, since we need to read twice */
+        LC0 = R7;
+        R7 <<= 2;               /* need to shift over again,
+                                 * to get the number of bytes */
+        P5.L = lo(TBUF);
+        P5.H = hi(TBUF);
+        R6 = ((1 << CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN)*1024) - 1;
+
+        P2 = R7;
+        P3 = P3 + P2;
+        R7 = P3;
+        R7 = R7 & R6;
+        P3 = R7;
+        P2.L = _trace_buff_offset;
+        P2.H = _trace_buff_offset;
+        [P2] = P3;
+
+        P2.L = _software_trace_buff;
+        P2.H = _software_trace_buff;
+
+        LSETUP (.Lstart, .Lend) LC0;
+.Lstart:
+        R7 = [P5];      /* read TBUF */
+        P4 = P3 + P2;
+        [P4] = R7;
+        P3 += -4;
+        R7 = P3;
+        R7 = R7 & R6;
+.Lend:
+        P3 = R7;
+
+        LB0 = [sp++];
+        LT0 = [sp++];
+        LC0 = [sp++];
+        P2 = [sp++];
+        P3 = [sp++];
+        jump _return_from_exception;
+ENDPROC(_ex_trace_buff_full)
+
+#if CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN == 4
+.data
+#else
+.section .l1.data.B
+#endif /* CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN */
+ENTRY(_trace_buff_offset)
+        .long 0;
+ALIGN
+ENTRY(_software_trace_buff)
+        .rept ((1 << CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN)*256);
+        .long 0
+        .endr
+#endif /* CONFIG_DEBUG_BFIN_HWTRACE_EXPAND */
+
+#if CONFIG_EARLY_PRINTK
+.section .init.text
+ENTRY(_early_trap)
+        SAVE_ALL_SYS
+        trace_buffer_stop(p0,r0);
+
+        /* Turn caches off, to ensure we don't get double exceptions */
+
+        P4.L = LO(IMEM_CONTROL);
+        P4.H = HI(IMEM_CONTROL);
+
+        R5 = [P4];              /* Control Register*/
+        BITCLR(R5,ENICPLB_P);
+        CLI R1;
+        SSYNC;          /* SSYNC required before writing to IMEM_CONTROL. */
+        .align 8;
+        [P4] = R5;
+        SSYNC;
+
+        P4.L = LO(DMEM_CONTROL);
+        P4.H = HI(DMEM_CONTROL);
+        R5 = [P4];
+        BITCLR(R5,ENDCPLB_P);
+        SSYNC;          /* SSYNC required before writing to DMEM_CONTROL. */
+        .align 8;
+        [P4] = R5;
+        SSYNC;
+        STI R1;
+
+        r0 = sp;        /* stack frame pt_regs pointer argument ==> r0 */
+        r1 = RETX;
+
+        SP += -12;
+        call _early_trap_c;
+        SP += 12;
+ENDPROC(_early_trap)
+#endif /* CONFIG_EARLY_PRINTK */
+
 /*
  * Put these in the kernel data section - that should always be covered by
  * a CPLB. This is needed to ensure we don't get double fault conditions
@@ -741,30 +908,33 @@ ENDPROC(_init_exception_buff)
 #else
 .data
 #endif
-ALIGN
-_extable:
+ENTRY(_ex_table)
         /* entry for each EXCAUSE[5:0]
          * This table must be in sync with the table in ./kernel/traps.c
          * EXCPT instruction can provide 4 bits of EXCAUSE, allowing 16 to be user defined
          */
-        .long _ex_syscall;      /* 0x00 - User Defined - Linux Syscall */
+        .long _ex_syscall       /* 0x00 - User Defined - Linux Syscall */
         .long _ex_soft_bp       /* 0x01 - User Defined - Software breakpoint */
-        .long _ex_trap_c        /* 0x02 - User Defined */
+        .long _ex_replaceable   /* 0x02 - User Defined */
         .long _ex_trap_c        /* 0x03 - User Defined - userspace stack overflow */
-        .long _ex_trap_c        /* 0x04 - User Defined */
-        .long _ex_trap_c        /* 0x05 - User Defined */
-        .long _ex_trap_c        /* 0x06 - User Defined */
-        .long _ex_trap_c        /* 0x07 - User Defined */
-        .long _ex_trap_c        /* 0x08 - User Defined */
-        .long _ex_trap_c        /* 0x09 - User Defined */
-        .long _ex_trap_c        /* 0x0A - User Defined */
-        .long _ex_trap_c        /* 0x0B - User Defined */
-        .long _ex_trap_c        /* 0x0C - User Defined */
-        .long _ex_trap_c        /* 0x0D - User Defined */
-        .long _ex_trap_c        /* 0x0E - User Defined */
-        .long _ex_trap_c        /* 0x0F - User Defined */
+        .long _ex_replaceable   /* 0x04 - User Defined */
+        .long _ex_replaceable   /* 0x05 - User Defined */
+        .long _ex_replaceable   /* 0x06 - User Defined */
+        .long _ex_replaceable   /* 0x07 - User Defined */
+        .long _ex_replaceable   /* 0x08 - User Defined */
+        .long _ex_replaceable   /* 0x09 - User Defined */
+        .long _ex_replaceable   /* 0x0A - User Defined */
+        .long _ex_replaceable   /* 0x0B - User Defined */
+        .long _ex_replaceable   /* 0x0C - User Defined */
+        .long _ex_replaceable   /* 0x0D - User Defined */
+        .long _ex_replaceable   /* 0x0E - User Defined */
+        .long _ex_replaceable   /* 0x0F - User Defined */
         .long _ex_single_step   /* 0x10 - HW Single step */
+#ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND
+        .long _ex_trace_buff_full /* 0x11 - Trace Buffer Full */
+#else
         .long _ex_trap_c        /* 0x11 - Trace Buffer Full */
+#endif
         .long _ex_trap_c        /* 0x12 - Reserved */
         .long _ex_trap_c        /* 0x13 - Reserved */
         .long _ex_trap_c        /* 0x14 - Reserved */
@@ -812,8 +982,8 @@ _extable:
         .long _ex_trap_c        /* 0x3D - Reserved */
         .long _ex_trap_c        /* 0x3E - Reserved */
         .long _ex_trap_c        /* 0x3F - Reserved */
+END(_ex_table)
 
-ALIGN
 ENTRY(_sys_call_table)
         .long _sys_restart_syscall      /* 0 */
         .long _sys_exit
@@ -1184,7 +1354,7 @@ _exception_stack:
         .endr
 _exception_stack_top:
 
-#if defined(ANOMALY_05000261)
+#if ANOMALY_05000261
 /* Used by the assembly entry point to work around an anomaly.  */
 _last_cplb_fault_retx:
         .long 0;
diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S
index 203e20709163..c6b32fe0f6e9 100644
--- a/arch/blackfin/mach-common/interrupt.S
+++ b/arch/blackfin/mach-common/interrupt.S
@@ -46,30 +46,6 @@
 
 .align 4        /* just in case */
 
-/*
- * initial interrupt handlers
- */
-
-#ifndef CONFIG_KGDB
-        /* interrupt routine for emulation - 0 */
-        /* Currently used only if GDB stub is not in - invalid */
-        /* gdb-stub set the evt itself */
-        /* save registers for post-mortem only */
-ENTRY(_evt_emulation)
-        SAVE_ALL_SYS
-#ifdef CONFIG_FRAME_POINTER
-        fp = 0;
-#endif
-        r0 = IRQ_EMU;
-        r1 = sp;
-        SP += -12;
-        call _irq_panic;
-        SP += 12;
-        /* - GDB stub fills this in by itself (if defined) */
-        rte;
-ENDPROC(_evt_emulation)
-#endif
-
 /* Common interrupt entry code.  First we do CLI, then push
  * RETI, to keep interrupts disabled, but to allow this state to be changed
  * by local_bh_enable.
@@ -140,7 +116,7 @@ __common_int_entry:
         fp = 0;
 #endif
 
-#if defined (ANOMALY_05000283) || defined (ANOMALY_05000315)
+#if ANOMALY_05000283 || ANOMALY_05000315
         cc = r7 == r7;
         p5.h = 0xffc0;
         p5.l = 0x0014;
@@ -163,7 +139,7 @@ ENTRY(_evt_ivhw)
 #ifdef CONFIG_FRAME_POINTER
         fp = 0;
 #endif
-#ifdef  ANOMALY_05000283
+#if ANOMALY_05000283
         cc = r7 == r7;
         p5.h = 0xffc0;
         p5.l = 0x0014;
@@ -201,27 +177,15 @@ ENTRY(_evt_ivhw)
         jump .Lcommon_restore_context;
 #endif
 
-/* interrupt routine for evt2 - 2.  This is NMI.  */
-ENTRY(_evt_evt2)
-        SAVE_CONTEXT
-#ifdef CONFIG_FRAME_POINTER
-        fp = 0;
-#endif
-#ifdef  ANOMALY_05000283
-        cc = r7 == r7;
-        p5.h = 0xffc0;
-        p5.l = 0x0014;
-        if cc jump 1f;
-        r7.l = W[p5];
-1:
-#endif
-        r0 = IRQ_NMI;
-        r1 =  sp;
-        SP += -12;
-        call _asm_do_IRQ;
-        SP += 12;
-        RESTORE_CONTEXT
+/* Interrupt routine for evt2 (NMI).
+ * We don't actually use this, so just return.
+ * For inner circle type details, please see:
+ * http://docs.blackfin.uclinux.org/doku.php?id=linux:nmi
+ */
+ENTRY(_evt_nmi)
+.weak _evt_nmi
         rtn;
+ENDPROC(_evt_nmi)
 
 /* interrupt routine for core timer - 6 */
 ENTRY(_evt_timer)
diff --git a/arch/blackfin/mach-common/ints-priority-dc.c b/arch/blackfin/mach-common/ints-priority-dc.c
index 660f881b620a..2db3546fc874 100644
--- a/arch/blackfin/mach-common/ints-priority-dc.c
+++ b/arch/blackfin/mach-common/ints-priority-dc.c
@@ -221,7 +221,7 @@ static unsigned int bf561_gpio_irq_startup(unsigned int irq)
 
         if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
 
-                ret = gpio_request(gpionr, NULL);
+                ret = gpio_request(gpionr, "IRQ");
                 if (ret)
                         return ret;
 
@@ -261,7 +261,7 @@ static int bf561_gpio_irq_type(unsigned int irq, unsigned int type)
 
                 if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
 
-                        ret = gpio_request(gpionr, NULL);
+                        ret = gpio_request(gpionr, "IRQ");
                         if (ret)
                                 return ret;
 
@@ -362,10 +362,11 @@ void __init init_exception_vectors(void)
 {
         SSYNC();
 
-#ifndef CONFIG_KGDB
-        bfin_write_EVT0(evt_emulation);
-#endif
-        bfin_write_EVT2(evt_evt2);
+        /* cannot program in software:
+         * evt0 - emulation (jtag)
+         * evt1 - reset
+         */
+        bfin_write_EVT2(evt_nmi);
         bfin_write_EVT3(trap);
         bfin_write_EVT5(evt_ivhw);
         bfin_write_EVT6(evt_timer);
diff --git a/arch/blackfin/mach-common/ints-priority-sc.c b/arch/blackfin/mach-common/ints-priority-sc.c
index 4708023fe716..d3b7672b2b94 100644
--- a/arch/blackfin/mach-common/ints-priority-sc.c
+++ b/arch/blackfin/mach-common/ints-priority-sc.c
@@ -343,7 +343,7 @@ static unsigned int bfin_gpio_irq_startup(unsigned int irq)
         u16 gpionr = irq - IRQ_PF0;
 
         if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
-                ret = gpio_request(gpionr, NULL);
+                ret = gpio_request(gpionr, "IRQ");
                 if (ret)
                         return ret;
         }
@@ -377,7 +377,7 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
         if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING |
                     IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) {
                 if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
-                        ret = gpio_request(gpionr, NULL);
+                        ret = gpio_request(gpionr, "IRQ");
                         if (ret)
                                 return ret;
                 }
@@ -587,7 +587,7 @@ static unsigned int bfin_gpio_irq_startup(unsigned int irq)
         }
 
         if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
-                ret = gpio_request(gpionr, NULL);
+                ret = gpio_request(gpionr, "IRQ");
                 if (ret)
                         return ret;
         }
@@ -627,7 +627,7 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
         if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING |
                     IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) {
                 if (!(gpio_enabled[gpio_bank(gpionr)] & gpio_bit(gpionr))) {
-                        ret = gpio_request(gpionr, NULL);
+                        ret = gpio_request(gpionr, "IRQ");
                         if (ret)
                                 return ret;
                 }
@@ -721,10 +721,11 @@ void __init init_exception_vectors(void)
 {
         SSYNC();
 
-#ifndef CONFIG_KGDB
-        bfin_write_EVT0(evt_emulation);
-#endif
-        bfin_write_EVT2(evt_evt2);
+        /* cannot program in software:
+         * evt0 - emulation (jtag)
+         * evt1 - reset
+         */
+        bfin_write_EVT2(evt_nmi);
         bfin_write_EVT3(trap);
         bfin_write_EVT5(evt_ivhw);
         bfin_write_EVT6(evt_timer);
diff --git a/arch/blackfin/mach-common/lock.S b/arch/blackfin/mach-common/lock.S
index 386ac8dda076..28b87fe9ce3c 100644
--- a/arch/blackfin/mach-common/lock.S
+++ b/arch/blackfin/mach-common/lock.S
@@ -33,7 +33,7 @@
 
 .text
 
-#ifdef CONFIG_BLKFIN_CACHE_LOCK
+#ifdef CONFIG_BFIN_ICACHE_LOCK
 
 /* When you come here, it is assumed that
  * R0 - Which way to be locked
@@ -43,12 +43,12 @@ ENTRY(_cache_grab_lock)
 
         [--SP]=( R7:0,P5:0 );
 
-        P1.H = (IMEM_CONTROL >> 16);
-        P1.L = (IMEM_CONTROL & 0xFFFF);
-        P5.H = (ICPLB_ADDR0 >> 16);
-        P5.L = (ICPLB_ADDR0 & 0xFFFF);
-        P4.H = (ICPLB_DATA0 >> 16);
-        P4.L = (ICPLB_DATA0 & 0xFFFF);
+        P1.H = HI(IMEM_CONTROL);
+        P1.L = LO(IMEM_CONTROL);
+        P5.H = HI(ICPLB_ADDR0);
+        P5.L = LO(ICPLB_ADDR0);
+        P4.H = HI(ICPLB_DATA0);
+        P4.L = LO(ICPLB_DATA0);
         R7 = R0;
 
         /* If the code of interest already resides in the cache
@@ -167,8 +167,8 @@ ENTRY(_cache_lock)
 
         [--SP]=( R7:0,P5:0 );
 
-        P1.H = (IMEM_CONTROL >> 16);
-        P1.L = (IMEM_CONTROL & 0xFFFF);
+        P1.H = HI(IMEM_CONTROL);
+        P1.L = LO(IMEM_CONTROL);
 
         /* Disable the Interrupts*/
         CLI R3;
@@ -189,14 +189,14 @@ ENTRY(_cache_lock)
         RTS;
 ENDPROC(_cache_lock)
 
-#endif  /* BLKFIN_CACHE_LOCK */
+#endif  /* BFIN_ICACHE_LOCK */
 
 /* Return the ILOC bits of IMEM_CONTROL
  */
 
 ENTRY(_read_iloc)
-        P1.H = (IMEM_CONTROL >> 16);
-        P1.L = (IMEM_CONTROL & 0xFFFF);
+        P1.H = HI(IMEM_CONTROL);
+        P1.L = LO(IMEM_CONTROL);
         R1 = 0xF;
         R0 = [P1];
         R0 = R0 >> 3;
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c
index 68459cc052a1..e97ea8fc8dc4 100644
--- a/arch/blackfin/mm/init.c
+++ b/arch/blackfin/mm/init.c
@@ -53,7 +53,7 @@ static unsigned long empty_bad_page;
 
 unsigned long empty_zero_page;
 
-void __init show_mem(void)
+void show_mem(void)
 {
         unsigned long i;
         int free = 0, total = 0, reserved = 0, shared = 0;
diff --git a/arch/blackfin/oprofile/op_blackfin.h b/arch/blackfin/oprofile/op_blackfin.h
index f88f446c814f..05dd08c9d154 100644
--- a/arch/blackfin/oprofile/op_blackfin.h
+++ b/arch/blackfin/oprofile/op_blackfin.h
@@ -68,7 +68,7 @@ static inline unsigned int ctr_read(void)
         unsigned int tmp;
 
         tmp = bfin_read_PFCTL();
-        __builtin_bfin_csync();
+        CSYNC();
 
         return tmp;
 }
@@ -76,21 +76,21 @@ static inline unsigned int ctr_read(void)
 static inline void ctr_write(unsigned int val)
 {
         bfin_write_PFCTL(val);
-        __builtin_bfin_csync();
+        CSYNC();
 }
 
 static inline void count_read(unsigned int *count)
 {
         count[0] = bfin_read_PFCNTR0();
         count[1] = bfin_read_PFCNTR1();
-        __builtin_bfin_csync();
+        CSYNC();
 }
 
 static inline void count_write(unsigned int *count)
 {
         bfin_write_PFCNTR0(count[0]);
         bfin_write_PFCNTR1(count[1]);
-        __builtin_bfin_csync();
+        CSYNC();
 }
 
 extern int pm_overflow_handler(int irq, struct pt_regs *regs);
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 97b64d7d6bf6..6bbbc2755e44 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -226,7 +226,7 @@ config PARAVIRT
           However, when run without a hypervisor the kernel is
           theoretically slower.  If in doubt, say N.
 
-source "arch/i386/xen/Kconfig"
+source "arch/x86/xen/Kconfig"
 
 config VMI
         bool "VMI Paravirt-ops support"
@@ -707,7 +707,7 @@ config MATH_EMULATION
           intend to use this kernel on different machines.
 
           More information about the internals of the Linux math coprocessor
-          emulation can be found in <file:arch/i386/math-emu/README>.
+          emulation can be found in <file:arch/x86/math-emu/README>.
 
           If you are not sure, say Y; apart from resulting in a 66 KB bigger
           kernel, it won't hurt.
@@ -1067,7 +1067,7 @@ config APM_REAL_MODE_POWER_OFF
 
 endif # APM
 
-source "arch/i386/kernel/cpu/cpufreq/Kconfig"
+source "arch/x86/kernel/cpu/cpufreq/Kconfig"
 
 endmenu
 
@@ -1206,6 +1206,16 @@ config SCx200HR_TIMER
           processor goes idle (as is done by the scheduler).  The
           other workaround is idle=poll boot option.
 
+config GEODE_MFGPT_TIMER
+        bool "Geode Multi-Function General Purpose Timer (MFGPT) events"
+        depends on MGEODE_LX && GENERIC_TIME && GENERIC_CLOCKEVENTS
+        default y
+        help
+          This driver provides a clock event source based on the MFGPT
+          timer(s) in the CS5535 and CS5536 companion chip for the geode.
+          MFGPTs have a better resolution and max interval than the
+          generic PIT, and are suitable for use as high-res timers.
+
 config K8_NB
         def_bool y
         depends on AGP_AMD64
@@ -1240,7 +1250,7 @@ menuconfig INSTRUMENTATION
 
 if INSTRUMENTATION
 
-source "arch/i386/oprofile/Kconfig"
+source "arch/x86/oprofile/Kconfig"
 
 config KPROBES
         bool "Kprobes"
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 52b932478c6d..5e50dbf00f3e 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -17,6 +17,9 @@
 # 20050320  Kianusch Sayah Karadji <kianusch@sk-tech.net>
 #           Added support for GEODE CPU
 
+# Fill in SRCARCH
+SRCARCH := x86
+
 HAS_BIARCH      := $(call cc-option-yn, -m32)
 ifeq ($(HAS_BIARCH),y)
 AS              := $(AS) --32
@@ -61,62 +64,62 @@ AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONF
 CFLAGS += $(cflags-y)
 
 # Default subarch .c files
-mcore-y  := mach-default
+mcore-y  := arch/x86/mach-default
 
 # Voyager subarch support
-mflags-$(CONFIG_X86_VOYAGER)    := -Iinclude/asm-i386/mach-voyager
-mcore-$(CONFIG_X86_VOYAGER)     := mach-voyager
+mflags-$(CONFIG_X86_VOYAGER)    := -Iinclude/asm-x86/mach-voyager
+mcore-$(CONFIG_X86_VOYAGER)     := arch/x86/mach-voyager
 
 # VISWS subarch support
-mflags-$(CONFIG_X86_VISWS)      := -Iinclude/asm-i386/mach-visws
-mcore-$(CONFIG_X86_VISWS)       := mach-visws
+mflags-$(CONFIG_X86_VISWS)      := -Iinclude/asm-x86/mach-visws
+mcore-$(CONFIG_X86_VISWS)       := arch/x86/mach-visws
 
 # NUMAQ subarch support
-mflags-$(CONFIG_X86_NUMAQ)      := -Iinclude/asm-i386/mach-numaq
-mcore-$(CONFIG_X86_NUMAQ)       := mach-default
+mflags-$(CONFIG_X86_NUMAQ)      := -Iinclude/asm-x86/mach-numaq
+mcore-$(CONFIG_X86_NUMAQ)       := arch/x86/mach-default
 
 # BIGSMP subarch support
-mflags-$(CONFIG_X86_BIGSMP)     := -Iinclude/asm-i386/mach-bigsmp
-mcore-$(CONFIG_X86_BIGSMP)      := mach-default
+mflags-$(CONFIG_X86_BIGSMP)     := -Iinclude/asm-x86/mach-bigsmp
+mcore-$(CONFIG_X86_BIGSMP)      := arch/x86/mach-default
 
 #Summit subarch support
-mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit
-mcore-$(CONFIG_X86_SUMMIT)  := mach-default
+mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-x86/mach-summit
+mcore-$(CONFIG_X86_SUMMIT)  := arch/x86/mach-default
 
 # generic subarchitecture
-mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic
-mcore-$(CONFIG_X86_GENERICARCH) := mach-default
-core-$(CONFIG_X86_GENERICARCH) += arch/i386/mach-generic/
+mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-x86/mach-generic
+mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default
+core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
 
 # ES7000 subarch support
-mflags-$(CONFIG_X86_ES7000)     := -Iinclude/asm-i386/mach-es7000
-mcore-$(CONFIG_X86_ES7000)      := mach-default
-core-$(CONFIG_X86_ES7000)       := arch/i386/mach-es7000/
+mflags-$(CONFIG_X86_ES7000)     := -Iinclude/asm-x86/mach-es7000
+mcore-$(CONFIG_X86_ES7000)      := arch/x86/mach-default
+core-$(CONFIG_X86_ES7000)       := arch/x86/mach-es7000/
 
 # Xen paravirtualization support
-core-$(CONFIG_XEN)              += arch/i386/xen/
+core-$(CONFIG_XEN)              += arch/x86/xen/
 
 # default subarch .h files
-mflags-y += -Iinclude/asm-i386/mach-default
+mflags-y += -Iinclude/asm-x86/mach-default
 
-head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
+head-y := arch/x86/kernel/head_32.o arch/x86/kernel/init_task_32.o
 
-libs-y                                  += arch/i386/lib/
-core-y                                  += arch/i386/kernel/ \
-                                           arch/i386/mm/ \
-                                           arch/i386/$(mcore-y)/ \
-                                           arch/i386/crypto/
-drivers-$(CONFIG_MATH_EMULATION)        += arch/i386/math-emu/
-drivers-$(CONFIG_PCI)                   += arch/i386/pci/
+libs-y                                  += arch/x86/lib/
+core-y                                  += arch/x86/kernel/ \
+                                           arch/x86/mm/ \
+                                           $(mcore-y)/ \
+                                           arch/x86/crypto/
+drivers-$(CONFIG_MATH_EMULATION)        += arch/x86/math-emu/
+drivers-$(CONFIG_PCI)                   += arch/x86/pci/
 # must be linked after kernel/
-drivers-$(CONFIG_OPROFILE)              += arch/i386/oprofile/
-drivers-$(CONFIG_PM)                    += arch/i386/power/
-drivers-$(CONFIG_FB)                    += arch/i386/video/
+drivers-$(CONFIG_OPROFILE)              += arch/x86/oprofile/
+drivers-$(CONFIG_PM)                    += arch/x86/power/
+drivers-$(CONFIG_FB)                    += arch/x86/video/
 
 CFLAGS += $(mflags-y)
 AFLAGS += $(mflags-y)
 
-boot := arch/i386/boot
+boot := arch/x86/boot
 
 PHONY += zImage bzImage compressed zlilo bzlilo \
          zdisk bzdisk fdimage fdimage144 fdimage288 isoimage install
@@ -125,9 +128,11 @@ all: bzImage
 
 # KBUILD_IMAGE specify target image being built
                     KBUILD_IMAGE := $(boot)/bzImage
-zImage zlilo zdisk: KBUILD_IMAGE := arch/i386/boot/zImage
+zImage zlilo zdisk: KBUILD_IMAGE := arch/x86/boot/zImage
 
 zImage bzImage: vmlinux
+        $(Q)mkdir -p $(objtree)/arch/i386/boot
+        $(Q)ln -fsn $(objtree)/arch/x86/boot/bzImage $(objtree)/arch/i386/boot/bzImage
         $(Q)$(MAKE) $(build)=$(boot) $(KBUILD_IMAGE)
 
 compressed: zImage
@@ -145,7 +150,8 @@ install:
         $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
 
 archclean:
-        $(Q)$(MAKE) $(clean)=arch/i386/boot
+        $(Q)rm -rf $(objtree)/arch/i386/boot
+        $(Q)$(MAKE) $(clean)=arch/x86/boot
 
 define archhelp
   echo  '* bzImage      - Compressed kernel image (arch/$(ARCH)/boot/bzImage)'
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
deleted file mode 100644
index 9d33b00de659..000000000000
--- a/arch/i386/kernel/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-extra-y := head.o init_task.o vmlinux.lds
-
-obj-y   := process.o signal.o entry.o traps.o irq.o \
-                ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
-                pci-dma.o i386_ksyms.o i387.o bootflag.o e820.o\
-                quirks.o i8237.o topology.o alternative.o i8253.o tsc.o
-
-obj-$(CONFIG_STACKTRACE)        += stacktrace.o
-obj-y                           += cpu/
-obj-y                           += acpi/
-obj-$(CONFIG_X86_BIOS_REBOOT)   += reboot.o
-obj-$(CONFIG_MCA)               += mca.o
-obj-$(CONFIG_X86_MSR)           += msr.o
-obj-$(CONFIG_X86_CPUID)         += cpuid.o
-obj-$(CONFIG_MICROCODE)         += microcode.o
-obj-$(CONFIG_APM)               += apm.o
-obj-$(CONFIG_X86_SMP)           += smp.o smpboot.o tsc_sync.o
-obj-$(CONFIG_SMP)               += smpcommon.o
-obj-$(CONFIG_X86_TRAMPOLINE)    += trampoline.o
-obj-$(CONFIG_X86_MPPARSE)       += mpparse.o
-obj-$(CONFIG_X86_LOCAL_APIC)    += apic.o nmi.o
-obj-$(CONFIG_X86_IO_APIC)       += io_apic.o
-obj-$(CONFIG_X86_REBOOTFIXUPS)  += reboot_fixups.o
-obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o crash.o
-obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
-obj-$(CONFIG_X86_NUMAQ)         += numaq.o
-obj-$(CONFIG_X86_SUMMIT_NUMA)   += summit.o
-obj-$(CONFIG_KPROBES)           += kprobes.o
-obj-$(CONFIG_MODULES)           += module.o
-obj-y                           += sysenter.o vsyscall.o
-obj-$(CONFIG_ACPI_SRAT)         += srat.o
-obj-$(CONFIG_EFI)               += efi.o efi_stub.o
-obj-$(CONFIG_DOUBLEFAULT)       += doublefault.o
-obj-$(CONFIG_VM86)              += vm86.o
-obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
-obj-$(CONFIG_HPET_TIMER)        += hpet.o
-obj-$(CONFIG_K8_NB)             += k8.o
-obj-$(CONFIG_MGEODE_LX)         += geode.o
-
-obj-$(CONFIG_VMI)               += vmi.o vmiclock.o
-obj-$(CONFIG_PARAVIRT)          += paravirt.o
-obj-y                           += pcspeaker.o
-
-obj-$(CONFIG_SCx200)            += scx200.o
-
-# vsyscall.o contains the vsyscall DSO images as __initdata.
-# We must build both images before we can assemble it.
-# Note: kbuild does not track this dependency due to usage of .incbin
-$(obj)/vsyscall.o: $(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so
-targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
-targets += vsyscall-note.o vsyscall.lds
-
-# The DSO images are built using a special linker script.
-quiet_cmd_syscall = SYSCALL $@
-      cmd_syscall = $(CC) -m elf_i386 -nostdlib $(SYSCFLAGS_$(@F)) \
-                          -Wl,-T,$(filter-out FORCE,$^) -o $@
-
-export CPPFLAGS_vsyscall.lds += -P -C -U$(ARCH)
-
-vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
-                 $(call ld-option, -Wl$(comma)--hash-style=sysv)
-SYSCFLAGS_vsyscall-sysenter.so  = $(vsyscall-flags)
-SYSCFLAGS_vsyscall-int80.so     = $(vsyscall-flags)
-
-$(obj)/vsyscall-int80.so $(obj)/vsyscall-sysenter.so: \
-$(obj)/vsyscall-%.so: $(src)/vsyscall.lds \
-                      $(obj)/vsyscall-%.o $(obj)/vsyscall-note.o FORCE
-        $(call if_changed,syscall)
-
-# We also create a special relocatable object that should mirror the symbol
-# table and layout of the linked DSO.  With ld -R we can then refer to
-# these symbols in the kernel code rather than hand-coded addresses.
-extra-y += vsyscall-syms.o
-$(obj)/built-in.o: $(obj)/vsyscall-syms.o
-$(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o
-
-SYSCFLAGS_vsyscall-syms.o = -r
-$(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
-                        $(obj)/vsyscall-sysenter.o $(obj)/vsyscall-note.o FORCE
-        $(call if_changed,syscall)
-
-k8-y                      += ../../x86_64/kernel/k8.o
-stacktrace-y              += ../../x86_64/kernel/stacktrace.o
-
diff --git a/arch/i386/kernel/early_printk.c b/arch/i386/kernel/early_printk.c
deleted file mode 100644
index 92f812ba275c..000000000000
--- a/arch/i386/kernel/early_printk.c
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include "../../x86_64/kernel/early_printk.c"
diff --git a/arch/i386/kernel/quirks.c b/arch/i386/kernel/quirks.c
deleted file mode 100644
index 6722469c2633..000000000000
--- a/arch/i386/kernel/quirks.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This file contains work-arounds for x86 and x86_64 platform bugs.
- */
-#include <linux/pci.h>
-#include <linux/irq.h>
-
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI)
-
-static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
-{
-        u8 config, rev;
-        u32 word;
-
-        /* BIOS may enable hardware IRQ balancing for
-         * E7520/E7320/E7525(revision ID 0x9 and below)
-         * based platforms.
-         * Disable SW irqbalance/affinity on those platforms.
-         */
-        pci_read_config_byte(dev, PCI_CLASS_REVISION, &rev);
-        if (rev > 0x9)
-                return;
-
-        /* enable access to config space*/
-        pci_read_config_byte(dev, 0xf4, &config);
-        pci_write_config_byte(dev, 0xf4, config|0x2);
-
-        /* read xTPR register */
-        raw_pci_ops->read(0, 0, 0x40, 0x4c, 2, &word);
-
-        if (!(word & (1 << 13))) {
-                printk(KERN_INFO "Intel E7520/7320/7525 detected. "
-                        "Disabling irq balancing and affinity\n");
-#ifdef CONFIG_IRQBALANCE
-                irqbalance_disable("");
-#endif
-                noirqdebug_setup("");
-#ifdef CONFIG_PROC_FS
-                no_irq_affinity = 1;
-#endif
-        }
-
-        /* put back the original value for config space*/
-        if (!(config & 0x2))
-                pci_write_config_byte(dev, 0xf4, config);
-}
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_E7320_MCH,  quirk_intel_irqbalance);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_E7525_MCH,  quirk_intel_irqbalance);
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_E7520_MCH,  quirk_intel_irqbalance);
-#endif
diff --git a/arch/i386/kernel/tsc_sync.c b/arch/i386/kernel/tsc_sync.c
deleted file mode 100644
index 12424629af87..000000000000
--- a/arch/i386/kernel/tsc_sync.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../x86_64/kernel/tsc_sync.c"
diff --git a/arch/i386/lib/Makefile b/arch/i386/lib/Makefile
deleted file mode 100644
index 4d105fdfe817..000000000000
--- a/arch/i386/lib/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for i386-specific library files..
-#
-
-
-lib-y = checksum.o delay.o usercopy.o getuser.o putuser.o memcpy.o strstr.o \
-        bitops.o semaphore.o string.o
-
-lib-$(CONFIG_X86_USE_3DNOW) += mmx.o
-
-obj-$(CONFIG_SMP)       += msr-on-cpu.o
diff --git a/arch/i386/mach-generic/Makefile b/arch/i386/mach-generic/Makefile
deleted file mode 100644
index 6914485c0d85..000000000000
--- a/arch/i386/mach-generic/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for the generic architecture
-#
-
-EXTRA_CFLAGS    := -Iarch/i386/kernel
-
-obj-y                           := probe.o summit.o bigsmp.o es7000.o default.o ../mach-es7000/
diff --git a/arch/i386/mm/Makefile b/arch/i386/mm/Makefile
deleted file mode 100644
index 80908b5aa60f..000000000000
--- a/arch/i386/mm/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Makefile for the linux i386-specific parts of the memory manager.
-#
-
-obj-y   := init.o pgtable.o fault.o ioremap.o extable.o pageattr.o mmap.o
-
-obj-$(CONFIG_NUMA) += discontig.o
-obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
-obj-$(CONFIG_HIGHMEM) += highmem.o
-obj-$(CONFIG_BOOT_IOREMAP) += boot_ioremap.o
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index 4017696ada63..08b117e2c54b 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -294,6 +294,9 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr)
                 return NOTIFY_DONE;
         }
 
+        if (dev->nd_net != &init_net)
+                return NOTIFY_DONE;
+
         if ( event != NETDEV_UP && event != NETDEV_DOWN ) return NOTIFY_DONE;
 
         /*
diff --git a/arch/ia64/ia32/audit.c b/arch/ia64/ia32/audit.c
index 8850fe40ea34..5e901c75df1b 100644
--- a/arch/ia64/ia32/audit.c
+++ b/arch/ia64/ia32/audit.c
@@ -1,4 +1,4 @@
-#include <asm-i386/unistd.h>
+#include <asm-x86/unistd_32.h>
 
 unsigned ia32_dir_class[] = {
 #include <asm-generic/audit_dir_write.h>
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 3b807b4bc7cd..f943736541cb 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3,6 +3,7 @@ config MIPS
         default y
         # Horrible source of confusion.  Die, die, die ...
         select EMBEDDED
+        select RTC_LIB
 
 mainmenu "Linux/MIPS Kernel Configuration"
 
@@ -44,12 +45,30 @@ config BASLER_EXCITE_PROTOTYPE
           note that a kernel built with this option selected will not be
           able to run on normal units.
 
+config BCM47XX
+        bool "BCM47XX based boards"
+        select DMA_NONCOHERENT
+        select HW_HAS_PCI
+        select IRQ_CPU
+        select SYS_HAS_CPU_MIPS32_R1
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SSB
+        select SSB_DRIVER_MIPS
+        select GENERIC_GPIO
+        select SYS_HAS_EARLY_PRINTK
+        select CFE
+        help
+         Support for BCM47XX based boards
+
 config MIPS_COBALT
         bool "Cobalt Server"
         select DMA_NONCOHERENT
         select HW_HAS_PCI
+        select I8253
         select I8259
         select IRQ_CPU
+        select IRQ_GT641XX
         select PCI_GT64XXX_PCI0
         select SYS_HAS_CPU_NEVADA
         select SYS_HAS_EARLY_PRINTK
@@ -93,6 +112,8 @@ config MACH_JAZZ
         select ARC32
         select ARCH_MAY_HAVE_PC_FDC
         select GENERIC_ISA_DMA
+        select IRQ_CPU
+        select I8253
         select I8259
         select ISA
         select PCSPEAKER
@@ -107,6 +128,20 @@ config MACH_JAZZ
          Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
          Olivetti M700-10 workstations.
 
+config LASAT
+        bool "LASAT Networks platforms"
+        select DMA_NONCOHERENT
+        select SYS_HAS_EARLY_PRINTK
+        select HW_HAS_PCI
+        select PCI_GT64XXX_PCI0
+        select MIPS_NILE4
+        select R5000_CPU_SCACHE
+        select SYS_HAS_CPU_R5000
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_64BIT_KERNEL if BROKEN
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        select GENERIC_HARDIRQS_NO__DO_IRQ
+
 config LEMOTE_FULONG
         bool "Lemote Fulong mini-PC"
         select ARCH_SPARSEMEM_ENABLE
@@ -168,6 +203,7 @@ config MIPS_MALTA
         select GENERIC_ISA_DMA
         select IRQ_CPU
         select HW_HAS_PCI
+        select I8253
         select I8259
         select MIPS_BOARDS_GEN
         select MIPS_BONITO64
@@ -301,7 +337,9 @@ config QEMU
         select DMA_COHERENT
         select GENERIC_ISA_DMA
         select HAVE_STD_PC_SERIAL_PORT
+        select I8253
         select I8259
+        select IRQ_CPU
         select ISA
         select PCSPEAKER
         select SWAP_IO_SPACE
@@ -328,6 +366,7 @@ config SGI_IP22
         select BOOT_ELF32
         select DMA_NONCOHERENT
         select HW_HAS_EISA
+        select I8253
         select IP22_CPU_SCACHE
         select IRQ_CPU
         select GENERIC_ISA_DMA_SUPPORT_BROKEN
@@ -352,7 +391,6 @@ config SGI_IP27
         select SYS_HAS_EARLY_PRINTK
         select HW_HAS_PCI
         select NR_CPUS_DEFAULT_64
-        select PCI_DOMAINS
         select SYS_HAS_CPU_R10000
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
@@ -484,7 +522,6 @@ config SIBYTE_BIGSUR
         select BOOT_ELF32
         select DMA_COHERENT
         select NR_CPUS_DEFAULT_4
-        select PCI_DOMAINS
         select SIBYTE_BCM1x80
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
@@ -502,6 +539,7 @@ config SNI_RM
         select HW_HAS_EISA
         select HW_HAS_PCI
         select IRQ_CPU
+        select I8253
         select I8259
         select ISA
         select PCSPEAKER
@@ -599,6 +637,7 @@ endchoice
 
 source "arch/mips/au1000/Kconfig"
 source "arch/mips/jazz/Kconfig"
+source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
 source "arch/mips/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/Kconfig"
@@ -635,10 +674,18 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
+config GENERIC_CLOCKEVENTS
+        bool
+        default y
+
 config GENERIC_TIME
         bool
         default y
 
+config GENERIC_CMOS_UPDATE
+        bool
+        default y
+
 config SCHED_NO_NO_OMIT_FRAME_POINTER
         bool
         default y
@@ -659,6 +706,9 @@ config ARCH_MAY_HAVE_PC_FDC
 config BOOT_RAW
         bool
 
+config CFE
+        bool
+
 config DMA_COHERENT
         bool
 
@@ -706,6 +756,9 @@ config MIPS_BONITO64
 config MIPS_MSC
         bool
 
+config MIPS_NILE4
+        bool
+
 config MIPS_DISABLE_OBSOLETE_IDE
         bool
 
@@ -775,6 +828,9 @@ config IRQ_MSP_CIC
 config IRQ_TXX9
         bool
 
+config IRQ_GT641XX
+        bool
+
 config MIPS_BOARDS_GEN
         bool
 
@@ -856,6 +912,8 @@ config BOOT_ELF64
 
 menu "CPU selection"
 
+source "kernel/time/Kconfig"
+
 choice
         prompt "CPU type"
         default CPU_R4X00
@@ -1316,6 +1374,7 @@ config MIPS_MT_SMTC
         depends on CPU_MIPS32_R2
         #depends on CPU_MIPS64_R2               # once there is hardware ...
         depends on SYS_SUPPORTS_MULTITHREADING
+        select GENERIC_CLOCKEVENTS_BROADCAST
         select CPU_MIPSR2_IRQ_VI
         select CPU_MIPSR2_IRQ_EI
         select CPU_MIPSR2_SRS
@@ -1378,6 +1437,19 @@ config MIPS_MT_SMTC_IM_BACKSTOP
           impact on interrupt service overhead. Disable it only if you know
           what you are doing.
 
+config MIPS_MT_SMTC_IRQAFF
+        bool "Support IRQ affinity API"
+        depends on MIPS_MT_SMTC
+        default n
+        help
+          Enables SMP IRQ affinity API (/proc/irq/*/smp_affinity, etc.)
+          for SMTC Linux kernel. Requires platform support, of which
+          an example can be found in the MIPS kernel i8259 and Malta
+          platform code.  It is recommended that MIPS_MT_SMTC_INSTANT_REPLAY
+          be enabled if MIPS_MT_SMTC_IRQAFF is used. Adds overhead to
+          interrupt dispatch, and should be used only if you know what
+          you are doing.
+
 config MIPS_VPE_LOADER_TOM
         bool "Load VPE program into memory hidden from linux"
         depends on MIPS_VPE_LOADER
@@ -1472,6 +1544,9 @@ config CPU_HAS_SYNC
         depends on !CPU_R3000
         default y
 
+config GENERIC_CLOCKEVENTS_BROADCAST
+        bool
+
 #
 # Use the generic interrupt handling code in kernel/irq/:
 #
@@ -1762,6 +1837,7 @@ config HW_HAS_PCI
 config PCI
         bool "Support for PCI controller"
         depends on HW_HAS_PCI
+        select PCI_DOMAINS
         help
           Find out whether you have a PCI motherboard. PCI is the name of a
           bus system, i.e. the way the CPU talks to the other stuff inside
@@ -1775,7 +1851,6 @@ config PCI
 
 config PCI_DOMAINS
         bool
-        depends on PCI
 
 source "drivers/pci/Kconfig"
 
@@ -1824,6 +1899,9 @@ config MMU
         bool
         default y
 
+config I8253
+        bool
+
 config PCSPEAKER
         bool
 
@@ -1840,21 +1918,6 @@ source "fs/Kconfig.binfmt"
 config TRAD_SIGNALS
         bool
 
-config BUILD_ELF64
-        bool "Use 64-bit ELF format for building"
-        depends on 64BIT
-        help
-          A 64-bit kernel is usually built using the 64-bit ELF binary object
-          format as it's one that allows arbitrary 64-bit constructs.  For
-          kernels that are loaded within the KSEG compatibility segments the
-          32-bit ELF format can optionally be used resulting in a somewhat
-          smaller binary, but this option is not explicitly supported by the
-          toolchain and since binutils 2.14 it does not even work at all.
-
-          Say Y to use the 64-bit format or N to use the 32-bit one.
-
-          If unsure say Y.
-
 config BINFMT_IRIX
         bool "Include IRIX binary compatibility"
         depends on CPU_BIG_ENDIAN && 32BIT && BROKEN
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 32c1c8fb6f98..ebd5d02a7d78 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -60,11 +60,6 @@ vmlinux-32		= vmlinux.32
 vmlinux-64              = vmlinux
 
 cflags-y                += -mabi=64
-ifdef CONFIG_BUILD_ELF64
-cflags-y                += $(call cc-option,-mno-explicit-relocs)
-else
-cflags-y                += $(call cc-option,-msym32)
-endif
 endif
 
 all-$(CONFIG_BOOT_ELF32)        := $(vmlinux-32)
@@ -153,7 +148,8 @@ endif
 #
 # Firmware support
 #
-libs-$(CONFIG_ARC)              += arch/mips/arc/
+libs-$(CONFIG_ARC)              += arch/mips/fw/arc/
+libs-$(CONFIG_CFE)              += arch/mips/fw/cfe/
 libs-$(CONFIG_SIBYTE_CFE)       += arch/mips/sibyte/cfe/
 
 #
@@ -367,6 +363,13 @@ cflags-$(CONFIG_BASLER_EXCITE)	+= -Iinclude/asm-mips/mach-excite
 load-$(CONFIG_BASLER_EXCITE)    += 0x80100000
 
 #
+# LASAT platforms
+#
+core-$(CONFIG_LASAT)            += arch/mips/lasat/
+cflags-$(CONFIG_LASAT)          += -Iinclude/asm-mips/mach-lasat
+load-$(CONFIG_LASAT)            += 0xffffffff80000000
+
+#
 # Common VR41xx
 #
 core-$(CONFIG_MACH_VR41XX)      += arch/mips/vr41xx/common/
@@ -533,6 +536,13 @@ libs-$(CONFIG_SIBYTE_BIGSUR)	+= arch/mips/sibyte/swarm/
 load-$(CONFIG_SIBYTE_BIGSUR)    := 0xffffffff80100000
 
 #
+# Broadcom BCM47XX boards
+#
+core-$(CONFIG_BCM47XX)          += arch/mips/bcm47xx/
+cflags-$(CONFIG_BCM47XX)        += -Iinclude/asm-mips/mach-bcm47xx
+load-$(CONFIG_BCM47XX)          := 0xffffffff80001000
+
+#
 # SNI RM
 #
 core-$(CONFIG_SNI_RM)           += arch/mips/sni/
@@ -578,6 +588,26 @@ else
 JIFFIES                 = jiffies_64
 endif
 
+#
+# Automatically detect the build format. By default we choose
+# the elf format according to the load address.
+# We can always force a build with a 64-bits symbol format by
+# passing 'KBUILD_SYM32=no' option to the make's command line.
+#
+ifdef CONFIG_64BIT
+  ifndef KBUILD_SYM32
+    ifeq ($(shell expr $(load-y) \< 0xffffffff80000000), 0)
+      KBUILD_SYM32 = y
+    endif
+  endif
+
+  ifeq ($(KBUILD_SYM32), y)
+    ifeq ($(call cc-option-yn,-msym32), y)
+      cflags-y += -msym32 -DKBUILD_64BIT_SYM32
+    endif
+  endif
+endif
+
 AFLAGS          += $(cflags-y)
 CFLAGS          += $(cflags-y) \
                         -D"VMLINUX_LOAD_ADDRESS=$(load-y)"
@@ -615,6 +645,11 @@ core-y			+= arch/mips/kernel/ arch/mips/mm/ arch/mips/math-emu/
 
 drivers-$(CONFIG_OPROFILE)      += arch/mips/oprofile/
 
+ifdef CONFIG_LASAT
+rom.bin rom.sw: vmlinux
+        $(Q)$(MAKE) $(build)=arch/mips/lasat/image $@
+endif
+
 #
 # Some machines like the Indy need 32-bit ELF binaries for booting purposes.
 # Other need ECOFF, so we build a 32-bit ELF binary for them which we then
@@ -658,6 +693,7 @@ endif
 
 archclean:
         @$(MAKE) $(clean)=arch/mips/boot
+        @$(MAKE) $(clean)=arch/mips/lasat
 
 define archhelp
         echo '  vmlinux.ecoff        - ECOFF boot image'
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c
index 626de44bd888..461cf0139737 100644
--- a/arch/mips/au1000/common/dbdma.c
+++ b/arch/mips/au1000/common/dbdma.c
@@ -184,7 +184,7 @@ static dbdev_tab_t dbdev_tab[] = {
 static chan_tab_t *chan_tab_ptr[NUM_DBDMA_CHANS];
 
 static dbdev_tab_t *
-find_dbdev_id (u32 id)
+find_dbdev_id(u32 id)
 {
         int i;
         dbdev_tab_t *p;
@@ -213,7 +213,7 @@ au1xxx_ddma_add_device(dbdev_tab_t *dev)
         if ( NULL != p )
         {
                 memcpy(p, dev, sizeof(dbdev_tab_t));
-                p->dev_id = DSCR_DEV2CUSTOM_ID(new_id,dev->dev_id);
+                p->dev_id = DSCR_DEV2CUSTOM_ID(new_id, dev->dev_id);
                 ret = p->dev_id;
                 new_id++;
 #if 0
@@ -671,7 +671,7 @@ _au1xxx_dbdma_put_dest(u32 chanid, void *buf, int nbytes, u32 flags)
          * parts. If it is fixedin the future, these dma_cache_inv will just
          * be nothing more than empty macros. See io.h.
          * */
-        dma_cache_inv((unsigned long)buf,nbytes);
+        dma_cache_inv((unsigned long)buf, nbytes);
         dp->dscr_cmd0 |= DSCR_CMD0_V;   /* Let it rip */
         au_sync();
         dma_cache_wback_inv((unsigned long)dp, sizeof(dp));
diff --git a/arch/mips/au1000/common/dbg_io.c b/arch/mips/au1000/common/dbg_io.c
index 0a50af7f34b8..79e0b0a51ace 100644
--- a/arch/mips/au1000/common/dbg_io.c
+++ b/arch/mips/au1000/common/dbg_io.c
@@ -53,7 +53,7 @@ typedef         unsigned int  uint32;
 
 /* memory-mapped read/write of the port */
 #define UART16550_READ(y)    (au_readl(DEBUG_BASE + y) & 0xff)
-#define UART16550_WRITE(y,z) (au_writel(z&0xff, DEBUG_BASE + y))
+#define UART16550_WRITE(y, z) (au_writel(z&0xff, DEBUG_BASE + y))
 
 extern unsigned long get_au1x00_uart_baud_base(void);
 extern unsigned long cal_r4koff(void);
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c
index ea6e99fbe2f7..a6640b998c6e 100644
--- a/arch/mips/au1000/common/irq.c
+++ b/arch/mips/au1000/common/irq.c
@@ -65,19 +65,6 @@
 #define EXT_INTC1_REQ1 5 /* IP 5 */
 #define MIPS_TIMER_IP  7 /* IP 7 */
 
-extern void set_debug_traps(void);
-extern irq_cpustat_t irq_stat [NR_CPUS];
-extern void mips_timer_interrupt(void);
-
-static void setup_local_irq(unsigned int irq, int type, int int_req);
-static void end_irq(unsigned int irq_nr);
-static inline void mask_and_ack_level_irq(unsigned int irq_nr);
-static inline void mask_and_ack_rise_edge_irq(unsigned int irq_nr);
-static inline void mask_and_ack_fall_edge_irq(unsigned int irq_nr);
-static inline void mask_and_ack_either_edge_irq(unsigned int irq_nr);
-inline void local_enable_irq(unsigned int irq_nr);
-inline void local_disable_irq(unsigned int irq_nr);
-
 void    (*board_init_irq)(void);
 
 static DEFINE_SPINLOCK(irq_lock);
@@ -646,7 +633,7 @@ asmlinkage void plat_irq_dispatch(void)
         unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
 
         if (pending & CAUSEF_IP7)
-                mips_timer_interrupt();
+                do_IRQ(63);
         else if (pending & CAUSEF_IP2)
                 intc0_req0_irqdispatch();
         else if (pending & CAUSEF_IP3)
diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c
index 6c25e6c09f78..9be99a68932a 100644
--- a/arch/mips/au1000/common/pci.c
+++ b/arch/mips/au1000/common/pci.c
@@ -74,6 +74,7 @@ static int __init au1x_pci_setup(void)
                 printk(KERN_ERR "Unable to ioremap pci space\n");
                 return 1;
         }
+        au1x_controller.io_map_base = virt_io_addr;
 
 #ifdef CONFIG_DMA_NONCOHERENT
         {
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c
index 3901e8e04755..6f57f72a7d57 100644
--- a/arch/mips/au1000/common/power.c
+++ b/arch/mips/au1000/common/power.c
@@ -211,7 +211,7 @@ int au_sleep(void)
         unsigned long wakeup, flags;
         extern  void    save_and_sleep(void);
 
-        spin_lock_irqsave(&pm_lock,flags);
+        spin_lock_irqsave(&pm_lock, flags);
 
         save_core_regs();
 
diff --git a/arch/mips/au1000/common/reset.c b/arch/mips/au1000/common/reset.c
index de5447e83849..b8638d293cf9 100644
--- a/arch/mips/au1000/common/reset.c
+++ b/arch/mips/au1000/common/reset.c
@@ -42,7 +42,7 @@ extern void (*flush_cache_all)(void);
 void au1000_restart(char *command)
 {
         /* Set all integrated peripherals to disabled states */
-        extern void board_reset (void);
+        extern void board_reset(void);
         u32 prid = read_c0_prid();
 
         printk(KERN_NOTICE "\n** Resetting Integrated Peripherals\n");
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index a95b37773196..b212c0726125 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -50,7 +50,6 @@ extern void au1000_halt(void);
 extern void au1000_power_off(void);
 extern void au1x_time_init(void);
 extern void au1x_timer_setup(struct irqaction *irq);
-extern void au1xxx_time_init(void);
 extern void set_cpuspec(void);
 
 void __init plat_mem_setup(void)
@@ -112,7 +111,6 @@ void __init plat_mem_setup(void)
         _machine_restart = au1000_restart;
         _machine_halt = au1000_halt;
         pm_power_off = au1000_power_off;
-        board_time_init = au1xxx_time_init;
 
         /* IO/MEM resources. */
         set_io_port_base(0);
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c
index 8fc29982d700..2556399708ba 100644
--- a/arch/mips/au1000/common/time.c
+++ b/arch/mips/au1000/common/time.c
@@ -64,48 +64,8 @@ static unsigned long last_pc0, last_match20;
 
 static DEFINE_SPINLOCK(time_lock);
 
-static inline void ack_r4ktimer(unsigned long newval)
-{
-        write_c0_compare(newval);
-}
-
-/*
- * There are a lot of conceptually broken versions of the MIPS timer interrupt
- * handler floating around.  This one is rather different, but the algorithm
- * is provably more robust.
- */
 unsigned long wtimer;
 
-void mips_timer_interrupt(void)
-{
-        int irq = 63;
-
-        irq_enter();
-        kstat_this_cpu.irqs[irq]++;
-
-        if (r4k_offset == 0)
-                goto null;
-
-        do {
-                kstat_this_cpu.irqs[irq]++;
-                do_timer(1);
-#ifndef CONFIG_SMP
-                update_process_times(user_mode(get_irq_regs()));
-#endif
-                r4k_cur += r4k_offset;
-                ack_r4ktimer(r4k_cur);
-
-        } while (((unsigned long)read_c0_count()
-                 - r4k_cur) < 0x7fffffff);
-
-        irq_exit();
-        return;
-
-null:
-        ack_r4ktimer(0);
-        irq_exit();
-}
-
 #ifdef CONFIG_PM
 irqreturn_t counter0_irq(int irq, void *dev_id)
 {
@@ -240,7 +200,7 @@ unsigned long cal_r4koff(void)
                 while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T1S);
 
                 while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S);
-                au_writel (0, SYS_TOYWRITE);
+                au_writel(0, SYS_TOYWRITE);
                 while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S);
 
                 cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) *
@@ -329,7 +289,3 @@ void __init plat_timer_setup(struct irqaction *irq)
 
 #endif
 }
-
-void __init au1xxx_time_init(void)
-{
-}
diff --git a/arch/mips/au1000/db1x00/board_setup.c b/arch/mips/au1000/db1x00/board_setup.c
index 8b08edb977be..99eafeada518 100644
--- a/arch/mips/au1000/db1x00/board_setup.c
+++ b/arch/mips/au1000/db1x00/board_setup.c
@@ -46,7 +46,7 @@
 
 static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;
 
-void board_reset (void)
+void board_reset(void)
 {
         /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
         bcsr->swreset = 0x0000;
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c
index 0a3f025eb023..4d7bcfc8cf73 100644
--- a/arch/mips/au1000/db1x00/init.c
+++ b/arch/mips/au1000/db1x00/init.c
@@ -59,14 +59,12 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
-
         /* Set the platform # */
-#if     defined (CONFIG_MIPS_DB1550)
+#if     defined(CONFIG_MIPS_DB1550)
         mips_machtype = MACH_DB1550;
-#elif   defined (CONFIG_MIPS_DB1500)
+#elif   defined(CONFIG_MIPS_DB1500)
         mips_machtype = MACH_DB1500;
-#elif   defined (CONFIG_MIPS_DB1100)
+#elif   defined(CONFIG_MIPS_DB1100)
         mips_machtype = MACH_DB1100;
 #else
         mips_machtype = MACH_DB1000;
diff --git a/arch/mips/au1000/mtx-1/board_setup.c b/arch/mips/au1000/mtx-1/board_setup.c
index 7bc5af8917da..abfc4bcddf7a 100644
--- a/arch/mips/au1000/mtx-1/board_setup.c
+++ b/arch/mips/au1000/mtx-1/board_setup.c
@@ -46,7 +46,7 @@
 extern int (*board_pci_idsel)(unsigned int devsel, int assert);
 int    mtx1_pci_idsel(unsigned int devsel, int assert);
 
-void board_reset (void)
+void board_reset(void)
 {
         /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
         au_writel(0x00000000, 0xAE00001C);
@@ -54,11 +54,11 @@ void board_reset (void)
 
 void __init board_setup(void)
 {
-#ifdef CONFIG_USB_OHCI
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
         // enable USB power switch
         au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
         au_writel( 0x100000, GPIO2_OUTPUT );
-#endif // defined (CONFIG_USB_OHCI)
+#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 
 #ifdef CONFIG_PCI
 #if defined(__MIPSEB__)
diff --git a/arch/mips/au1000/mtx-1/init.c b/arch/mips/au1000/mtx-1/init.c
index 88f2b6d97281..2aa7b2ed6a8c 100644
--- a/arch/mips/au1000/mtx-1/init.c
+++ b/arch/mips/au1000/mtx-1/init.c
@@ -56,7 +56,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_MTX1;      /* set the platform # */
 
         prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1000/board_setup.c b/arch/mips/au1000/pb1000/board_setup.c
index 824cfafaff92..5198c4f98b43 100644
--- a/arch/mips/au1000/pb1000/board_setup.c
+++ b/arch/mips/au1000/pb1000/board_setup.c
@@ -39,7 +39,7 @@
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-pb1x00/pb1000.h>
 
-void board_reset (void)
+void board_reset(void)
 {
 }
 
@@ -54,7 +54,7 @@ void __init board_setup(void)
         au_writel(0, SYS_PINSTATERD);
         udelay(100);
 
-#ifdef CONFIG_USB_OHCI
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
         /* zero and disable FREQ2 */
         sys_freqctrl = au_readl(SYS_FREQCTRL0);
         sys_freqctrl &= ~0xFFF00000;
@@ -102,7 +102,7 @@ void __init board_setup(void)
         /*
          * Route 48MHz FREQ2 into USB Host and/or Device
          */
-#ifdef CONFIG_USB_OHCI
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
         sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
 #endif
         au_writel(sys_clksrc, SYS_CLKSRC);
@@ -116,7 +116,7 @@ void __init board_setup(void)
         au_writel(pin_func, SYS_PINFUNC);
         au_writel(0x2800, SYS_TRIOUTCLR);
         au_writel(0x0030, SYS_OUTPUTCLR);
-#endif // defined (CONFIG_USB_OHCI)
+#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 
         // make gpio 15 an input (for interrupt line)
         pin_func = au_readl(SYS_PINFUNC) & (u32)(~0x100);
diff --git a/arch/mips/au1000/pb1000/init.c b/arch/mips/au1000/pb1000/init.c
index e9fa1bab81f3..4535f7208e18 100644
--- a/arch/mips/au1000/pb1000/init.c
+++ b/arch/mips/au1000/pb1000/init.c
@@ -54,7 +54,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_PB1000;
 
         prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1100/board_setup.c b/arch/mips/au1000/pb1100/board_setup.c
index 6bc1f8e1b608..42874a6b31d1 100644
--- a/arch/mips/au1000/pb1100/board_setup.c
+++ b/arch/mips/au1000/pb1100/board_setup.c
@@ -39,7 +39,7 @@
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-pb1x00/pb1100.h>
 
-void board_reset (void)
+void board_reset(void)
 {
     /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
     au_writel(0x00000000, 0xAE00001C);
@@ -54,7 +54,7 @@ void __init board_setup(void)
         au_writel(0, SYS_PININPUTEN);
         udelay(100);
 
-#ifdef CONFIG_USB_OHCI
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
         {
                 u32 pin_func, sys_freqctrl, sys_clksrc;
 
@@ -98,7 +98,7 @@ void __init board_setup(void)
                 pin_func |= 0x8000;
                 au_writel(pin_func, SYS_PINFUNC);
         }
-#endif // defined (CONFIG_USB_OHCI)
+#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 
         /* Enable sys bus clock divider when IDLE state or no bus activity. */
         au_writel(au_readl(SYS_POWERCTRL) | (0x3 << 5), SYS_POWERCTRL);
diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/au1000/pb1100/init.c
index 6131b56f41b5..7ba6852de7cd 100644
--- a/arch/mips/au1000/pb1100/init.c
+++ b/arch/mips/au1000/pb1100/init.c
@@ -55,7 +55,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg3;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_PB1100;
 
         prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1200/board_setup.c b/arch/mips/au1000/pb1200/board_setup.c
index eea2092bde8d..2122515f79d7 100644
--- a/arch/mips/au1000/pb1200/board_setup.c
+++ b/arch/mips/au1000/pb1200/board_setup.c
@@ -57,7 +57,7 @@
 extern void _board_init_irq(void);
 extern void (*board_init_irq)(void);
 
-void board_reset (void)
+void board_reset(void)
 {
         bcsr->resets = 0;
         bcsr->system = 0;
@@ -148,7 +148,7 @@ void __init board_setup(void)
 }
 
 int
-board_au1200fb_panel (void)
+board_au1200fb_panel(void)
 {
         BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
         int p;
@@ -160,7 +160,7 @@ board_au1200fb_panel (void)
 }
 
 int
-board_au1200fb_panel_init (void)
+board_au1200fb_panel_init(void)
 {
         /* Apply power */
     BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
@@ -170,7 +170,7 @@ board_au1200fb_panel_init (void)
 }
 
 int
-board_au1200fb_panel_shutdown (void)
+board_au1200fb_panel_shutdown(void)
 {
         /* Remove power */
     BCSR *bcsr = (BCSR *)BCSR_KSEG1_ADDR;
diff --git a/arch/mips/au1000/pb1200/init.c b/arch/mips/au1000/pb1200/init.c
index 27f09e374e15..5a70029d5388 100644
--- a/arch/mips/au1000/pb1200/init.c
+++ b/arch/mips/au1000/pb1200/init.c
@@ -55,7 +55,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_PB1200;
 
         prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1200/irqmap.c b/arch/mips/au1000/pb1200/irqmap.c
index b73b2d18bf56..7c708db04a88 100644
--- a/arch/mips/au1000/pb1200/irqmap.c
+++ b/arch/mips/au1000/pb1200/irqmap.c
@@ -132,7 +132,7 @@ static void pb1200_shutdown_irq( unsigned int irq_nr )
         pb1200_disable_irq(irq_nr);
         if (--pb1200_cascade_en == 0)
         {
-                free_irq(AU1000_GPIO_7,&pb1200_cascade_handler );
+                free_irq(AU1000_GPIO_7, &pb1200_cascade_handler );
         }
         return;
 }
diff --git a/arch/mips/au1000/pb1500/board_setup.c b/arch/mips/au1000/pb1500/board_setup.c
index c9b655616fb3..5446836869d6 100644
--- a/arch/mips/au1000/pb1500/board_setup.c
+++ b/arch/mips/au1000/pb1500/board_setup.c
@@ -39,7 +39,7 @@
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-pb1x00/pb1500.h>
 
-void board_reset (void)
+void board_reset(void)
 {
     /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
     au_writel(0x00000000, 0xAE00001C);
@@ -56,7 +56,7 @@ void __init board_setup(void)
         au_writel(0, SYS_PINSTATERD);
         udelay(100);
 
-#ifdef CONFIG_USB_OHCI
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
 
         /* GPIO201 is input for PCMCIA card detect */
         /* GPIO203 is input for PCMCIA interrupt request */
@@ -85,7 +85,7 @@ void __init board_setup(void)
         /*
          * Route 48MHz FREQ2 into USB Host and/or Device
          */
-#ifdef CONFIG_USB_OHCI
+#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
         sys_clksrc |= ((4<<12) | (0<<11) | (0<<10));
 #endif
         au_writel(sys_clksrc, SYS_CLKSRC);
@@ -95,7 +95,7 @@ void __init board_setup(void)
         // 2nd USB port is USB host
         pin_func |= 0x8000;
         au_writel(pin_func, SYS_PINFUNC);
-#endif // defined (CONFIG_USB_OHCI)
+#endif /* defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE) */
 
 
 
diff --git a/arch/mips/au1000/pb1500/init.c b/arch/mips/au1000/pb1500/init.c
index 733d2e469db2..e58a9d6c5021 100644
--- a/arch/mips/au1000/pb1500/init.c
+++ b/arch/mips/au1000/pb1500/init.c
@@ -55,7 +55,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_PB1500;
 
         prom_init_cmdline();
diff --git a/arch/mips/au1000/pb1550/board_setup.c b/arch/mips/au1000/pb1550/board_setup.c
index 05fd27dc24e6..e3cfb0d73180 100644
--- a/arch/mips/au1000/pb1550/board_setup.c
+++ b/arch/mips/au1000/pb1550/board_setup.c
@@ -44,7 +44,7 @@
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-pb1x00/pb1550.h>
 
-void board_reset (void)
+void board_reset(void)
 {
     /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
         au_writew(au_readw(0xAF00001C) & ~(1<<15), 0xAF00001C);
diff --git a/arch/mips/au1000/pb1550/init.c b/arch/mips/au1000/pb1550/init.c
index 41daa3371be3..fad53bf5aad1 100644
--- a/arch/mips/au1000/pb1550/init.c
+++ b/arch/mips/au1000/pb1550/init.c
@@ -55,7 +55,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_PB1550;
 
         prom_init_cmdline();
diff --git a/arch/mips/au1000/xxs1500/board_setup.c b/arch/mips/au1000/xxs1500/board_setup.c
index ae3d6b19e94d..a9237f41933d 100644
--- a/arch/mips/au1000/xxs1500/board_setup.c
+++ b/arch/mips/au1000/xxs1500/board_setup.c
@@ -39,7 +39,7 @@
 #include <asm/pgtable.h>
 #include <asm/au1000.h>
 
-void board_reset (void)
+void board_reset(void)
 {
         /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
         au_writel(0x00000000, 0xAE00001C);
diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c
index f1c76533b6fc..9f839c36f69e 100644
--- a/arch/mips/au1000/xxs1500/init.c
+++ b/arch/mips/au1000/xxs1500/init.c
@@ -54,7 +54,6 @@ void __init prom_init(void)
         prom_argv = (char **) fw_arg1;
         prom_envp = (char **) fw_arg2;
 
-        mips_machgroup = MACH_GROUP_ALCHEMY;
         mips_machtype = MACH_XXS1500;   /* set the platform # */
 
         prom_init_cmdline();
diff --git a/arch/mips/basler/excite/excite_prom.c b/arch/mips/basler/excite/excite_prom.c
index 6ecd512b999d..2d752c2f6e59 100644
--- a/arch/mips/basler/excite/excite_prom.c
+++ b/arch/mips/basler/excite/excite_prom.c
@@ -136,7 +136,6 @@ void __init prom_init(void)
 #       error 64 bit support not implemented
 #endif /* CONFIG_64BIT */
 
-        mips_machgroup = MACH_GROUP_TITAN;
         mips_machtype = MACH_TITAN_EXCITE;
 }
 
diff --git a/arch/mips/basler/excite/excite_setup.c b/arch/mips/basler/excite/excite_setup.c
index 56003188f17c..404ca9284b30 100644
--- a/arch/mips/basler/excite/excite_setup.c
+++ b/arch/mips/basler/excite/excite_setup.c
@@ -68,7 +68,7 @@ DEFINE_SPINLOCK(titan_lock);
 int titan_irqflags;
 
 
-static void excite_timer_init(void)
+void __init plat_time_init(void)
 {
         const u32 modebit5 = ocd_readl(0x00e4);
         unsigned int
@@ -216,7 +216,7 @@ static int __init excite_platform_init(void)
         titan_writel(0x80021dff, GXCFG);        /* XDMA reset */
         titan_writel(0x00000000, CPXCISRA);
         titan_writel(0x00000000, CPXCISRB);     /* clear pending interrupts */
-#if defined (CONFIG_HIGHMEM)
+#if defined(CONFIG_HIGHMEM)
 #       error change for HIGHMEM support!
 #else
         titan_writel(0x00000000, GXDMADRPFX);   /* buffer address prefix */
@@ -261,16 +261,13 @@ void __init plat_mem_setup(void)
         /* Announce RAM to system */
         add_memory_region(0x00000000, memsize, BOOT_MEM_RAM);
 
-        /* Set up timer initialization hooks */
-        board_time_init = excite_timer_init;
-
         /* Set up the peripheral address map */
-        *(boot_ocd_base + (LKB9 / sizeof (u32))) = 0;
-        *(boot_ocd_base + (LKB10 / sizeof (u32))) = 0;
-        *(boot_ocd_base + (LKB11 / sizeof (u32))) = 0;
-        *(boot_ocd_base + (LKB12 / sizeof (u32))) = 0;
+        *(boot_ocd_base + (LKB9 / sizeof(u32))) = 0;
+        *(boot_ocd_base + (LKB10 / sizeof(u32))) = 0;
+        *(boot_ocd_base + (LKB11 / sizeof(u32))) = 0;
+        *(boot_ocd_base + (LKB12 / sizeof(u32))) = 0;
         wmb();
-        *(boot_ocd_base + (LKB0 / sizeof (u32))) = EXCITE_PHYS_OCD >> 4;
+        *(boot_ocd_base + (LKB0 / sizeof(u32))) = EXCITE_PHYS_OCD >> 4;
         wmb();
 
         ocd_writel((EXCITE_PHYS_TITAN >> 4) | 0x1UL, LKB5);
diff --git a/arch/mips/bcm47xx/Makefile b/arch/mips/bcm47xx/Makefile
new file mode 100644
index 000000000000..35294b12d638
--- /dev/null
+++ b/arch/mips/bcm47xx/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the BCM47XX specific kernel interface routines
+# under Linux.
+#
+
+obj-y := gpio.o irq.o prom.o serial.o setup.o time.o wgt634u.o
diff --git a/arch/mips/bcm47xx/gpio.c b/arch/mips/bcm47xx/gpio.c
new file mode 100644
index 000000000000..f5a53acf995a
--- /dev/null
+++ b/arch/mips/bcm47xx/gpio.c
@@ -0,0 +1,79 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 Aurelien Jarno <aurelien@aurel32.net>
+ */
+
+#include <linux/ssb/ssb.h>
+#include <linux/ssb/ssb_driver_chipcommon.h>
+#include <linux/ssb/ssb_driver_extif.h>
+#include <asm/mach-bcm47xx/bcm47xx.h>
+#include <asm/mach-bcm47xx/gpio.h>
+
+int bcm47xx_gpio_to_irq(unsigned gpio)
+{
+        if (ssb_bcm47xx.chipco.dev)
+                return ssb_mips_irq(ssb_bcm47xx.chipco.dev) + 2;
+        else if (ssb_bcm47xx.extif.dev)
+                return ssb_mips_irq(ssb_bcm47xx.extif.dev) + 2;
+        else
+                return -EINVAL;
+}
+EXPORT_SYMBOL_GPL(bcm47xx_gpio_to_irq);
+
+int bcm47xx_gpio_get_value(unsigned gpio)
+{
+        if (ssb_bcm47xx.chipco.dev)
+                return ssb_chipco_gpio_in(&ssb_bcm47xx.chipco, 1 << gpio);
+        else if (ssb_bcm47xx.extif.dev)
+                return ssb_extif_gpio_in(&ssb_bcm47xx.extif, 1 << gpio);
+        else
+                return 0;
+}
+EXPORT_SYMBOL_GPL(bcm47xx_gpio_get_value);
+
+void bcm47xx_gpio_set_value(unsigned gpio, int value)
+{
+        if (ssb_bcm47xx.chipco.dev)
+                ssb_chipco_gpio_out(&ssb_bcm47xx.chipco,
+                                    1 << gpio,
+                                    value ? 1 << gpio : 0);
+        else if (ssb_bcm47xx.extif.dev)
+                ssb_extif_gpio_out(&ssb_bcm47xx.extif,
+                                   1 << gpio,
+                                   value ? 1 << gpio : 0);
+}
+EXPORT_SYMBOL_GPL(bcm47xx_gpio_set_value);
+
+int bcm47xx_gpio_direction_input(unsigned gpio)
+{
+        if (ssb_bcm47xx.chipco.dev && (gpio < BCM47XX_CHIPCO_GPIO_LINES))
+                ssb_chipco_gpio_outen(&ssb_bcm47xx.chipco,
+                                      1 << gpio, 0);
+        else if (ssb_bcm47xx.extif.dev && (gpio < BCM47XX_EXTIF_GPIO_LINES))
+                ssb_extif_gpio_outen(&ssb_bcm47xx.extif,
+                                     1 << gpio, 0);
+        else
+                return -EINVAL;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_input);
+
+int bcm47xx_gpio_direction_output(unsigned gpio, int value)
+{
+        bcm47xx_gpio_set_value(gpio, value);
+
+        if (ssb_bcm47xx.chipco.dev && (gpio < BCM47XX_CHIPCO_GPIO_LINES))
+                ssb_chipco_gpio_outen(&ssb_bcm47xx.chipco,
+                                      1 << gpio, 1 << gpio);
+        else if (ssb_bcm47xx.extif.dev && (gpio < BCM47XX_EXTIF_GPIO_LINES))
+                ssb_extif_gpio_outen(&ssb_bcm47xx.extif,
+                                     1 << gpio, 1 << gpio);
+        else
+                return -EINVAL;
+        return 0;
+}
+EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_output);
+
diff --git a/arch/mips/bcm47xx/irq.c b/arch/mips/bcm47xx/irq.c
new file mode 100644
index 000000000000..325757acd020
--- /dev/null
+++ b/arch/mips/bcm47xx/irq.c
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  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.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <asm/irq_cpu.h>
+
+void plat_irq_dispatch(void)
+{
+        u32 cause;
+
+        cause = read_c0_cause() & read_c0_status() & CAUSEF_IP;
+
+        clear_c0_status(cause);
+
+        if (cause & CAUSEF_IP7)
+                do_IRQ(7);
+        if (cause & CAUSEF_IP2)
+                do_IRQ(2);
+        if (cause & CAUSEF_IP3)
+                do_IRQ(3);
+        if (cause & CAUSEF_IP4)
+                do_IRQ(4);
+        if (cause & CAUSEF_IP5)
+                do_IRQ(5);
+        if (cause & CAUSEF_IP6)
+                do_IRQ(6);
+}
+
+void __init arch_init_irq(void)
+{
+        mips_cpu_irq_init();
+}
diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
new file mode 100644
index 000000000000..079e33d52783
--- /dev/null
+++ b/arch/mips/bcm47xx/prom.c
@@ -0,0 +1,158 @@
+/*
+ *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
+ *  Copyright (C) 2007 Aurelien Jarno <aurelien@aurel32.net>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  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.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <asm/bootinfo.h>
+#include <asm/fw/cfe/cfe_api.h>
+#include <asm/fw/cfe/cfe_error.h>
+
+static int cfe_cons_handle;
+
+const char *get_system_type(void)
+{
+        return "Broadcom BCM47XX";
+}
+
+void prom_putchar(char c)
+{
+        while (cfe_write(cfe_cons_handle, &c, 1) == 0)
+                ;
+}
+
+static __init void prom_init_cfe(void)
+{
+        uint32_t cfe_ept;
+        uint32_t cfe_handle;
+        uint32_t cfe_eptseal;
+        int argc = fw_arg0;
+        char **envp = (char **) fw_arg2;
+        int *prom_vec = (int *) fw_arg3;
+
+        /*
+         * Check if a loader was used; if NOT, the 4 arguments are
+         * what CFE gives us (handle, 0, EPT and EPTSEAL)
+         */
+        if (argc < 0) {
+                cfe_handle = (uint32_t)argc;
+                cfe_ept = (uint32_t)envp;
+                cfe_eptseal = (uint32_t)prom_vec;
+        } else {
+                if ((int)prom_vec < 0) {
+                        /*
+                         * Old loader; all it gives us is the handle,
+                         * so use the "known" entrypoint and assume
+                         * the seal.
+                         */
+                        cfe_handle = (uint32_t)prom_vec;
+                        cfe_ept = 0xBFC00500;
+                        cfe_eptseal = CFE_EPTSEAL;
+                } else {
+                        /*
+                         * Newer loaders bundle the handle/ept/eptseal
+                         * Note: prom_vec is in the loader's useg
+                         * which is still alive in the TLB.
+                         */
+                        cfe_handle = prom_vec[0];
+                        cfe_ept = prom_vec[2];
+                        cfe_eptseal = prom_vec[3];
+                }
+        }
+
+        if (cfe_eptseal != CFE_EPTSEAL) {
+                /* too early for panic to do any good */
+                printk(KERN_ERR "CFE's entrypoint seal doesn't match.");
+                while (1) ;
+        }
+
+        cfe_init(cfe_handle, cfe_ept);
+}
+
+static __init void prom_init_console(void)
+{
+        /* Initialize CFE console */
+        cfe_cons_handle = cfe_getstdhandle(CFE_STDHANDLE_CONSOLE);
+}
+
+static __init void prom_init_cmdline(void)
+{
+        char buf[CL_SIZE];
+
+        /* Get the kernel command line from CFE */
+        if (cfe_getenv("LINUX_CMDLINE", buf, CL_SIZE) >= 0) {
+                buf[CL_SIZE-1] = 0;
+                strcpy(arcs_cmdline, buf);
+        }
+
+        /* Force a console handover by adding a console= argument if needed,
+         * as CFE is not available anymore later in the boot process. */
+        if ((strstr(arcs_cmdline, "console=")) == NULL) {
+                /* Try to read the default serial port used by CFE */
+                if ((cfe_getenv("BOOT_CONSOLE", buf, CL_SIZE) < 0)
+                    || (strncmp("uart", buf, 4)))
+                        /* Default to uart0 */
+                        strcpy(buf, "uart0");
+
+                /* Compute the new command line */
+                snprintf(arcs_cmdline, CL_SIZE, "%s console=ttyS%c,115200",
+                         arcs_cmdline, buf[4]);
+        }
+}
+
+static __init void prom_init_mem(void)
+{
+        unsigned long mem;
+
+        /* Figure out memory size by finding aliases.
+         *
+         * We should theoretically use the mapping from CFE using cfe_enummem().
+         * However as the BCM47XX is mostly used on low-memory systems, we
+         * want to reuse the memory used by CFE (around 4MB). That means cfe_*
+         * functions stop to work at some point during the boot, we should only
+         * call them at the beginning of the boot.
+         */
+        for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) {
+                if (*(unsigned long *)((unsigned long)(prom_init) + mem) ==
+                    *(unsigned long *)(prom_init))
+                        break;
+        }
+
+        add_memory_region(0, mem, BOOT_MEM_RAM);
+}
+
+void __init prom_init(void)
+{
+        prom_init_cfe();
+        prom_init_console();
+        prom_init_cmdline();
+        prom_init_mem();
+}
+
+void __init prom_free_prom_memory(void)
+{
+}
+
diff --git a/arch/mips/bcm47xx/serial.c b/arch/mips/bcm47xx/serial.c
new file mode 100644
index 000000000000..59c11afdb2ab
--- /dev/null
+++ b/arch/mips/bcm47xx/serial.c
@@ -0,0 +1,52 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 Aurelien Jarno <aurelien@aurel32.net>
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/serial.h>
+#include <linux/serial_8250.h>
+#include <linux/ssb/ssb.h>
+#include <bcm47xx.h>
+
+static struct plat_serial8250_port uart8250_data[5];
+
+static struct platform_device uart8250_device = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM,
+        .dev                    = {
+                .platform_data  = uart8250_data,
+        },
+};
+
+static int __init uart8250_init(void)
+{
+        int i;
+        struct ssb_mipscore *mcore = &(ssb_bcm47xx.mipscore);
+
+        memset(&uart8250_data, 0,  sizeof(uart8250_data));
+
+        for (i = 0; i < mcore->nr_serial_ports; i++) {
+                struct plat_serial8250_port *p = &(uart8250_data[i]);
+                struct ssb_serial_port *ssb_port = &(mcore->serial_ports[i]);
+
+                p->mapbase = (unsigned int) ssb_port->regs;
+                p->membase = (void *) ssb_port->regs;
+                p->irq = ssb_port->irq + 2;
+                p->uartclk = ssb_port->baud_base;
+                p->regshift = ssb_port->reg_shift;
+                p->iotype = UPIO_MEM;
+                p->flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
+        }
+        return platform_device_register(&uart8250_device);
+}
+
+module_init(uart8250_init);
+
+MODULE_AUTHOR("Aurelien Jarno <aurelien@aurel32.net>");
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("8250 UART probe driver for the BCM47XX platforms");
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
new file mode 100644
index 000000000000..1b6b0fa5028f
--- /dev/null
+++ b/arch/mips/bcm47xx/setup.c
@@ -0,0 +1,123 @@
+/*
+ *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
+ *  Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
+ *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2006 Michael Buesch <mb@bu3sch.de>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  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.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/types.h>
+#include <linux/ssb/ssb.h>
+#include <asm/bootinfo.h>
+#include <asm/reboot.h>
+#include <asm/time.h>
+#include <bcm47xx.h>
+#include <asm/fw/cfe/cfe_api.h>
+
+struct ssb_bus ssb_bcm47xx;
+EXPORT_SYMBOL(ssb_bcm47xx);
+
+static void bcm47xx_machine_restart(char *command)
+{
+        printk(KERN_ALERT "Please stand by while rebooting the system...\n");
+        local_irq_disable();
+        /* Set the watchdog timer to reset immediately */
+        ssb_chipco_watchdog_timer_set(&ssb_bcm47xx.chipco, 1);
+        while (1)
+                cpu_relax();
+}
+
+static void bcm47xx_machine_halt(void)
+{
+        /* Disable interrupts and watchdog and spin forever */
+        local_irq_disable();
+        ssb_chipco_watchdog_timer_set(&ssb_bcm47xx.chipco, 0);
+        while (1)
+                cpu_relax();
+}
+
+static void str2eaddr(char *str, char *dest)
+{
+        int i = 0;
+
+        if (str == NULL) {
+                memset(dest, 0, 6);
+                return;
+        }
+
+        for (;;) {
+                dest[i++] = (char) simple_strtoul(str, NULL, 16);
+                str += 2;
+                if (!*str++ || i == 6)
+                        break;
+        }
+}
+
+static int bcm47xx_get_invariants(struct ssb_bus *bus,
+                                   struct ssb_init_invariants *iv)
+{
+        char buf[100];
+
+        /* Fill boardinfo structure */
+        memset(&(iv->boardinfo), 0 , sizeof(struct ssb_boardinfo));
+
+        if (cfe_getenv("boardvendor", buf, sizeof(buf)) >= 0)
+                iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
+        if (cfe_getenv("boardtype", buf, sizeof(buf)) >= 0)
+                iv->boardinfo.type = (u16)simple_strtoul(buf, NULL, 0);
+        if (cfe_getenv("boardrev", buf, sizeof(buf)) >= 0)
+                iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
+
+        /* Fill sprom structure */
+        memset(&(iv->sprom), 0, sizeof(struct ssb_sprom));
+        iv->sprom.revision = 3;
+
+        if (cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
+                str2eaddr(buf, iv->sprom.r1.et0mac);
+        if (cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
+                str2eaddr(buf, iv->sprom.r1.et1mac);
+        if (cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
+                iv->sprom.r1.et0phyaddr = simple_strtoul(buf, NULL, 10);
+        if (cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
+                iv->sprom.r1.et1phyaddr = simple_strtoul(buf, NULL, 10);
+        if (cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
+                iv->sprom.r1.et0mdcport = simple_strtoul(buf, NULL, 10);
+        if (cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
+                iv->sprom.r1.et1mdcport = simple_strtoul(buf, NULL, 10);
+
+        return 0;
+}
+
+void __init plat_mem_setup(void)
+{
+        int err;
+
+        err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE,
+                                      bcm47xx_get_invariants);
+        if (err)
+                panic("Failed to initialize SSB bus (err %d)\n", err);
+
+        _machine_restart = bcm47xx_machine_restart;
+        _machine_halt = bcm47xx_machine_halt;
+        pm_power_off = bcm47xx_machine_halt;
+}
+
diff --git a/arch/mips/bcm47xx/time.c b/arch/mips/bcm47xx/time.c
new file mode 100644
index 000000000000..0ab4676c8bd3
--- /dev/null
+++ b/arch/mips/bcm47xx/time.c
@@ -0,0 +1,55 @@
+/*
+ *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
+ *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
+ *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
+ *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
+ *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  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.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#include <linux/init.h>
+#include <linux/ssb/ssb.h>
+#include <asm/time.h>
+#include <bcm47xx.h>
+
+void __init plat_time_init(void)
+{
+        unsigned long hz;
+
+        /*
+         * Use deterministic values for initial counter interrupt
+         * so that calibrate delay avoids encountering a counter wrap.
+         */
+        write_c0_count(0);
+        write_c0_compare(0xffff);
+
+        hz = ssb_cpu_clock(&ssb_bcm47xx.mipscore) / 2;
+        if (!hz)
+                hz = 100000000;
+
+        /* Set MIPS counter frequency for fixed_rate_gettimeoffset() */
+        mips_hpt_frequency = hz;
+}
+
+void __init
+plat_timer_setup(struct irqaction *irq)
+{
+        /* Enable the timer interrupt */
+        setup_irq(7, irq);
+}
diff --git a/arch/mips/bcm47xx/wgt634u.c b/arch/mips/bcm47xx/wgt634u.c
new file mode 100644
index 000000000000..5a017eaee712
--- /dev/null
+++ b/arch/mips/bcm47xx/wgt634u.c
@@ -0,0 +1,64 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 Aurelien Jarno <aurelien@aurel32.net>
+ */
+
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/leds.h>
+#include <linux/ssb/ssb.h>
+#include <asm/mach-bcm47xx/bcm47xx.h>
+
+/* GPIO definitions for the WGT634U */
+#define WGT634U_GPIO_LED        3
+#define WGT634U_GPIO_RESET      2
+#define WGT634U_GPIO_TP1        7
+#define WGT634U_GPIO_TP2        6
+#define WGT634U_GPIO_TP3        5
+#define WGT634U_GPIO_TP4        4
+#define WGT634U_GPIO_TP5        1
+
+static struct gpio_led wgt634u_leds[] = {
+        {
+                .name = "power",
+                .gpio = WGT634U_GPIO_LED,
+                .active_low = 1,
+                .default_trigger = "heartbeat",
+        },
+};
+
+static struct gpio_led_platform_data wgt634u_led_data = {
+        .num_leds =     ARRAY_SIZE(wgt634u_leds),
+        .leds =         wgt634u_leds,
+};
+
+static struct platform_device wgt634u_gpio_leds = {
+        .name =         "leds-gpio",
+        .id =           -1,
+        .dev = {
+                .platform_data = &wgt634u_led_data,
+        }
+};
+
+static int __init wgt634u_init(void)
+{
+        /* There is no easy way to detect that we are running on a WGT634U
+         * machine. Use the MAC address as an heuristic. Netgear Inc. has
+         * been allocated ranges 00:09:5b:xx:xx:xx and 00:0f:b5:xx:xx:xx.
+         */
+
+        u8 *et0mac = ssb_bcm47xx.sprom.r1.et0mac;
+
+        if (et0mac[0] == 0x00 &&
+            ((et0mac[1] == 0x09 && et0mac[2] == 0x5b) ||
+             (et0mac[1] == 0x0f && et0mac[2] == 0xb5)))
+                return platform_device_register(&wgt634u_gpio_leds);
+        else
+                return -ENODEV;
+}
+
+module_init(wgt634u_init);
+
diff --git a/arch/mips/boot/addinitrd.c b/arch/mips/boot/addinitrd.c
index 8b3033304770..b5b3febc10cc 100644
--- a/arch/mips/boot/addinitrd.c
+++ b/arch/mips/boot/addinitrd.c
@@ -32,15 +32,15 @@
 
 #define SWAB(a) (swab ? swab32(a) : (a))
 
-void die (char *s)
+void die(char *s)
 {
-        perror (s);
-        exit (1);
+        perror(s);
+        exit(1);
 }
 
-int main (int argc, char *argv[])
+int main(int argc, char *argv[])
 {
-        int fd_vmlinux,fd_initrd,fd_outfile;
+        int fd_vmlinux, fd_initrd, fd_outfile;
         FILHDR efile;
         AOUTHDR eaout;
         SCNHDR esecs[3];
@@ -48,22 +48,22 @@ int main (int argc, char *argv[])
         char buf[1024];
         unsigned long loadaddr;
         unsigned long initrd_header[2];
-        int i,cnt;
+        int i, cnt;
         int swab = 0;
 
         if (argc != 4) {
-                printf ("Usage: %s <vmlinux> <initrd> <outfile>\n",argv[0]);
-                exit (1);
+                printf("Usage: %s <vmlinux> <initrd> <outfile>\n", argv[0]);
+                exit(1);
         }
 
-        if ((fd_vmlinux = open (argv[1],O_RDONLY)) < 0)
-                 die ("open vmlinux");
+        if ((fd_vmlinux = open (argv[1], O_RDONLY)) < 0)
+                 die("open vmlinux");
         if (read (fd_vmlinux, &efile, sizeof efile) != sizeof efile)
-                die ("read file header");
+                die("read file header");
         if (read (fd_vmlinux, &eaout, sizeof eaout) != sizeof eaout)
-                die ("read aout header");
+                die("read aout header");
         if (read (fd_vmlinux, esecs, sizeof esecs) != sizeof esecs)
-                die ("read section headers");
+                die("read section headers");
         /*
          * check whether the file is good for us
          */
@@ -82,13 +82,13 @@ int main (int argc, char *argv[])
 
         /* make sure we have an empty data segment for the initrd */
         if (eaout.dsize || esecs[1].s_size) {
-                fprintf (stderr, "Data segment not empty. Giving up!\n");
-                exit (1);
+                fprintf(stderr, "Data segment not empty. Giving up!\n");
+                exit(1);
         }
         if ((fd_initrd = open (argv[2], O_RDONLY)) < 0)
-                die ("open initrd");
+                die("open initrd");
         if (fstat (fd_initrd, &st) < 0)
-                die ("fstat initrd");
+                die("fstat initrd");
         loadaddr = ((SWAB(esecs[2].s_vaddr) + SWAB(esecs[2].s_size)
                         + MIPS_PAGE_SIZE-1) & ~MIPS_PAGE_MASK) - 8;
         if (loadaddr < (SWAB(esecs[2].s_vaddr) + SWAB(esecs[2].s_size)))
@@ -98,34 +98,34 @@ int main (int argc, char *argv[])
         eaout.dsize = esecs[1].s_size = initrd_header[1] = SWAB(st.st_size+8);
         eaout.data_start = esecs[1].s_vaddr = esecs[1].s_paddr = SWAB(loadaddr);
 
-        if ((fd_outfile = open (argv[3], O_RDWR|O_CREAT|O_TRUNC,0666)) < 0)
-                die ("open outfile");
+        if ((fd_outfile = open (argv[3], O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0)
+                die("open outfile");
         if (write (fd_outfile, &efile, sizeof efile) != sizeof efile)
-                die ("write file header");
+                die("write file header");
         if (write (fd_outfile, &eaout, sizeof eaout) != sizeof eaout)
-                die ("write aout header");
+                die("write aout header");
         if (write (fd_outfile, esecs, sizeof esecs) != sizeof esecs)
-                die ("write section headers");
+                die("write section headers");
         /* skip padding */
         if(lseek(fd_vmlinux, SWAB(esecs[0].s_scnptr), SEEK_SET) == (off_t)-1)
-                die ("lseek vmlinux");
+                die("lseek vmlinux");
         if(lseek(fd_outfile, SWAB(esecs[0].s_scnptr), SEEK_SET) == (off_t)-1)
-                die ("lseek outfile");
+                die("lseek outfile");
         /* copy text segment */
         cnt = SWAB(eaout.tsize);
         while (cnt) {
                 if ((i = read (fd_vmlinux, buf, sizeof buf)) <= 0)
-                        die ("read vmlinux");
+                        die("read vmlinux");
                 if (write (fd_outfile, buf, i) != i)
-                        die ("write vmlinux");
+                        die("write vmlinux");
                 cnt -= i;
         }
         if (write (fd_outfile, initrd_header, sizeof initrd_header) != sizeof initrd_header)
-                die ("write initrd header");
+                die("write initrd header");
         while ((i = read (fd_initrd, buf, sizeof buf)) > 0)
                 if (write (fd_outfile, buf, i) != i)
-                        die ("write initrd");
-        close (fd_vmlinux);
-        close (fd_initrd);
+                        die("write initrd");
+        close(fd_vmlinux);
+        close(fd_initrd);
         return 0;
 }
diff --git a/arch/mips/boot/elf2ecoff.c b/arch/mips/boot/elf2ecoff.c
index c3543d9eb266..c5a7f308c405 100644
--- a/arch/mips/boot/elf2ecoff.c
+++ b/arch/mips/boot/elf2ecoff.c
@@ -467,7 +467,7 @@ int main(int argc, char *argv[])
         esecs[0].s_scnptr = N_TXTOFF(efh, eah);
         esecs[1].s_scnptr = N_DATOFF(efh, eah);
 #define ECOFF_SEGMENT_ALIGNMENT(a) 0x10
-#define ECOFF_ROUND(s,a) (((s)+(a)-1)&~((a)-1))
+#define ECOFF_ROUND(s, a) (((s)+(a)-1)&~((a)-1))
         esecs[2].s_scnptr = esecs[1].s_scnptr +
             ECOFF_ROUND(esecs[1].s_size, ECOFF_SEGMENT_ALIGNMENT(&eah));
         if (addflag) {
diff --git a/arch/mips/cobalt/Makefile b/arch/mips/cobalt/Makefile
index a043f93f7d08..6b83f4ddc8fc 100644
--- a/arch/mips/cobalt/Makefile
+++ b/arch/mips/cobalt/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the Cobalt micro systems family specific parts of the kernel
 #
 
-obj-y := buttons.o irq.o reset.o rtc.o serial.o setup.o
+obj-y := buttons.o irq.o led.o reset.o rtc.o serial.o setup.o
 
 obj-$(CONFIG_PCI)               += pci.o
 obj-$(CONFIG_EARLY_PRINTK)      += console.o
diff --git a/arch/mips/cobalt/console.c b/arch/mips/cobalt/console.c
index 0485d51f7216..db330e811025 100644
--- a/arch/mips/cobalt/console.c
+++ b/arch/mips/cobalt/console.c
@@ -1,16 +1,15 @@
 /*
  * (C) P. Horton 2006
  */
+#include <linux/io.h>
 #include <linux/serial_reg.h>
 
-#include <asm/addrspace.h>
-
-#include <cobalt.h>
+#define UART_BASE       ((void __iomem *)CKSEG1ADDR(0x1c800000))
 
 void prom_putchar(char c)
 {
-        while(!(COBALT_UART[UART_LSR] & UART_LSR_THRE))
+        while (!(readb(UART_BASE + UART_LSR) & UART_LSR_THRE))
                 ;
 
-        COBALT_UART[UART_TX] = c;
+        writeb(c, UART_BASE + UART_TX);
 }
diff --git a/arch/mips/cobalt/irq.c b/arch/mips/cobalt/irq.c
index 950ad1e8be44..ac4fb912649d 100644
--- a/arch/mips/cobalt/irq.c
+++ b/arch/mips/cobalt/irq.c
@@ -15,102 +15,48 @@
 
 #include <asm/i8259.h>
 #include <asm/irq_cpu.h>
+#include <asm/irq_gt641xx.h>
 #include <asm/gt64120.h>
 
-#include <cobalt.h>
-
-/*
- * We have two types of interrupts that we handle, ones that come in through
- * the CPU interrupt lines, and ones that come in on the via chip. The CPU
- * mappings are:
- *
- *    16   - Software interrupt 0 (unused)      IE_SW0
- *    17   - Software interrupt 1 (unused)      IE_SW1
- *    18   - Galileo chip (timer)               IE_IRQ0
- *    19   - Tulip 0 + NCR SCSI                 IE_IRQ1
- *    20   - Tulip 1                            IE_IRQ2
- *    21   - 16550 UART                         IE_IRQ3
- *    22   - VIA southbridge PIC                IE_IRQ4
- *    23   - unused                             IE_IRQ5
- *
- * The VIA chip is a master/slave 8259 setup and has the following interrupts:
- *
- *     8  - RTC
- *     9  - PCI
- *    14  - IDE0
- *    15  - IDE1
- */
-
-static inline void galileo_irq(void)
-{
-        unsigned int mask, pending, devfn;
-
-        mask = GT_READ(GT_INTRMASK_OFS);
-        pending = GT_READ(GT_INTRCAUSE_OFS) & mask;
-
-        if (pending & GT_INTR_T0EXP_MSK) {
-                GT_WRITE(GT_INTRCAUSE_OFS, ~GT_INTR_T0EXP_MSK);
-                do_IRQ(COBALT_GALILEO_IRQ);
-        } else if (pending & GT_INTR_RETRYCTR0_MSK) {
-                devfn = GT_READ(GT_PCI0_CFGADDR_OFS) >> 8;
-                GT_WRITE(GT_INTRCAUSE_OFS, ~GT_INTR_RETRYCTR0_MSK);
-                printk(KERN_WARNING
-                       "Galileo: PCI retry count exceeded (%02x.%u)\n",
-                       PCI_SLOT(devfn), PCI_FUNC(devfn));
-        } else {
-                GT_WRITE(GT_INTRMASK_OFS, mask & ~pending);
-                printk(KERN_WARNING
-                       "Galileo: masking unexpected interrupt %08x\n", pending);
-        }
-}
-
-static inline void via_pic_irq(void)
-{
-        int irq;
-
-        irq = i8259_irq();
-        if (irq >= 0)
-                do_IRQ(irq);
-}
+#include <irq.h>
 
 asmlinkage void plat_irq_dispatch(void)
 {
-        unsigned pending = read_c0_status() & read_c0_cause();
+        unsigned pending = read_c0_status() & read_c0_cause() & ST0_IM;
+        int irq;
 
-        if (pending & CAUSEF_IP2)               /* COBALT_GALILEO_IRQ (18) */
-                galileo_irq();
-        else if (pending & CAUSEF_IP6)          /* COBALT_VIA_IRQ (22) */
-                via_pic_irq();
-        else if (pending & CAUSEF_IP3)          /* COBALT_ETH0_IRQ (19) */
-                do_IRQ(COBALT_CPU_IRQ + 3);
-        else if (pending & CAUSEF_IP4)          /* COBALT_ETH1_IRQ (20) */
-                do_IRQ(COBALT_CPU_IRQ + 4);
-        else if (pending & CAUSEF_IP5)          /* COBALT_SERIAL_IRQ (21) */
-                do_IRQ(COBALT_CPU_IRQ + 5);
-        else if (pending & CAUSEF_IP7)          /* IRQ 23 */
-                do_IRQ(COBALT_CPU_IRQ + 7);
+        if (pending & CAUSEF_IP2)
+                gt641xx_irq_dispatch();
+        else if (pending & CAUSEF_IP6) {
+                irq = i8259_irq();
+                if (irq < 0)
+                        spurious_interrupt();
+                else
+                        do_IRQ(irq);
+        } else if (pending & CAUSEF_IP3)
+                do_IRQ(MIPS_CPU_IRQ_BASE + 3);
+        else if (pending & CAUSEF_IP4)
+                do_IRQ(MIPS_CPU_IRQ_BASE + 4);
+        else if (pending & CAUSEF_IP5)
+                do_IRQ(MIPS_CPU_IRQ_BASE + 5);
+        else if (pending & CAUSEF_IP7)
+                do_IRQ(MIPS_CPU_IRQ_BASE + 7);
+        else
+                spurious_interrupt();
 }
 
-static struct irqaction irq_via = {
-        no_action, 0, { { 0, } }, "cascade", NULL, NULL
+static struct irqaction cascade = {
+        .handler        = no_action,
+        .mask           = CPU_MASK_NONE,
+        .name           = "cascade",
 };
 
 void __init arch_init_irq(void)
 {
-        /*
-         * Mask all Galileo interrupts. The Galileo
-         * handler is set in cobalt_timer_setup()
-         */
-        GT_WRITE(GT_INTRMASK_OFS, 0);
-
-        init_i8259_irqs();                              /*  0 ... 15 */
-        mips_cpu_irq_init();            /* 16 ... 23 */
-
-        /*
-         * Mask all cpu interrupts
-         *  (except IE4, we already masked those at VIA level)
-         */
-        change_c0_status(ST0_IM, IE_IRQ4);
+        mips_cpu_irq_init();
+        gt641xx_irq_init();
+        init_i8259_irqs();
 
-        setup_irq(COBALT_VIA_IRQ, &irq_via);
+        setup_irq(GT641XX_CASCADE_IRQ, &cascade);
+        setup_irq(I8259_CASCADE_IRQ, &cascade);
 }
diff --git a/arch/mips/cobalt/led.c b/arch/mips/cobalt/led.c
new file mode 100644
index 000000000000..1c6ebd468b07
--- /dev/null
+++ b/arch/mips/cobalt/led.c
@@ -0,0 +1,62 @@
+/*
+ *  Registration of Cobalt LED platform device.
+ *
+ *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+
+#include <cobalt.h>
+
+static struct resource cobalt_led_resource __initdata = {
+        .start  = 0x1c000000,
+        .end    = 0x1c000000,
+        .flags  = IORESOURCE_MEM,
+};
+
+static __init int cobalt_led_add(void)
+{
+        struct platform_device *pdev;
+        int retval;
+
+        if (cobalt_board_id == COBALT_BRD_ID_QUBE1 ||
+            cobalt_board_id == COBALT_BRD_ID_QUBE2)
+                pdev = platform_device_alloc("cobalt-qube-leds", -1);
+        else
+                pdev = platform_device_alloc("cobalt-raq-leds", -1);
+
+        if (!pdev)
+                return -ENOMEM;
+
+        retval = platform_device_add_resources(pdev, &cobalt_led_resource, 1);
+        if (retval)
+                goto err_free_device;
+
+        retval = platform_device_add(pdev);
+        if (retval)
+                goto err_free_device;
+
+        return 0;
+
+err_free_device:
+        platform_device_put(pdev);
+
+        return retval;
+}
+device_initcall(cobalt_led_add);
diff --git a/arch/mips/cobalt/reset.c b/arch/mips/cobalt/reset.c
index 43cca21fdbc0..71eb4ccc4bc1 100644
--- a/arch/mips/cobalt/reset.c
+++ b/arch/mips/cobalt/reset.c
@@ -8,36 +8,46 @@
  * Copyright (C) 1995, 1996, 1997 by Ralf Baechle
  * Copyright (C) 2001 by Liam Davies (ldavies@agile.tv)
  */
+#include <linux/init.h>
+#include <linux/io.h>
 #include <linux/jiffies.h>
-
-#include <asm/io.h>
-#include <asm/reboot.h>
+#include <linux/leds.h>
 
 #include <cobalt.h>
 
+#define RESET_PORT      ((void __iomem *)CKSEG1ADDR(0x1c000000))
+#define RESET           0x0f
+
+DEFINE_LED_TRIGGER(power_off_led_trigger);
+
+static int __init ledtrig_power_off_init(void)
+{
+        led_trigger_register_simple("power-off", &power_off_led_trigger);
+        return 0;
+}
+device_initcall(ledtrig_power_off_init);
+
 void cobalt_machine_halt(void)
 {
         int state, last, diff;
         unsigned long mark;
 
         /*
-         * turn off bar on Qube, flash power off LED on RaQ (0.5Hz)
+         * turn on power off LED on RaQ
          *
          * restart if ENTER and SELECT are pressed
          */
 
         last = COBALT_KEY_PORT;
 
-        for (state = 0;;) {
-
-                state ^= COBALT_LED_POWER_OFF;
-                COBALT_LED_PORT = state;
+        led_trigger_event(power_off_led_trigger, LED_FULL);
 
+        for (state = 0;;) {
                 diff = COBALT_KEY_PORT ^ last;
                 last ^= diff;
 
                 if((diff & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)) && !(~last & (COBALT_KEY_ENTER | COBALT_KEY_SELECT)))
-                        COBALT_LED_PORT = COBALT_LED_RESET;
+                        writeb(RESET, RESET_PORT);
 
                 for (mark = jiffies; jiffies - mark < HZ;)
                         ;
@@ -46,17 +56,8 @@ void cobalt_machine_halt(void)
 
 void cobalt_machine_restart(char *command)
 {
-        COBALT_LED_PORT = COBALT_LED_RESET;
+        writeb(RESET, RESET_PORT);
 
         /* we should never get here */
         cobalt_machine_halt();
 }
-
-/*
- * This triggers the luser mode device driver for the power switch ;-)
- */
-void cobalt_machine_power_off(void)
-{
-        printk("You can switch the machine off now.\n");
-        cobalt_machine_halt();
-}
diff --git a/arch/mips/cobalt/rtc.c b/arch/mips/cobalt/rtc.c
index 284daefc5c55..e70794b8bcba 100644
--- a/arch/mips/cobalt/rtc.c
+++ b/arch/mips/cobalt/rtc.c
@@ -20,6 +20,7 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
+#include <linux/mc146818rtc.h>
 #include <linux/platform_device.h>
 
 static struct resource cobalt_rtc_resource[] __initdata = {
@@ -29,8 +30,8 @@ static struct resource cobalt_rtc_resource[] __initdata = {
                 .flags  = IORESOURCE_IO,
         },
         {
-                .start  = 8,
-                .end    = 8,
+                .start  = RTC_IRQ,
+                .end    = RTC_IRQ,
                 .flags  = IORESOURCE_IRQ,
         },
 };
diff --git a/arch/mips/cobalt/serial.c b/arch/mips/cobalt/serial.c
index 08e739704cc9..53b8d0d6da90 100644
--- a/arch/mips/cobalt/serial.c
+++ b/arch/mips/cobalt/serial.c
@@ -24,6 +24,7 @@
 #include <linux/serial_8250.h>
 
 #include <cobalt.h>
+#include <irq.h>
 
 static struct resource cobalt_uart_resource[] __initdata = {
         {
@@ -32,15 +33,15 @@ static struct resource cobalt_uart_resource[] __initdata = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                .start  = COBALT_SERIAL_IRQ,
-                .end    = COBALT_SERIAL_IRQ,
+                .start  = SERIAL_IRQ,
+                .end    = SERIAL_IRQ,
                 .flags  = IORESOURCE_IRQ,
         },
 };
 
 static struct plat_serial8250_port cobalt_serial8250_port[] = {
         {
-                .irq            = COBALT_SERIAL_IRQ,
+                .irq            = SERIAL_IRQ,
                 .uartclk        = 18432000,
                 .iotype         = UPIO_MEM,
                 .flags          = UPF_IOREMAP | UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c
index 7abe45e78425..d11bb1bc7b6b 100644
--- a/arch/mips/cobalt/setup.c
+++ b/arch/mips/cobalt/setup.c
@@ -15,15 +15,16 @@
 
 #include <asm/bootinfo.h>
 #include <asm/time.h>
+#include <asm/i8253.h>
 #include <asm/io.h>
 #include <asm/reboot.h>
 #include <asm/gt64120.h>
 
 #include <cobalt.h>
+#include <irq.h>
 
 extern void cobalt_machine_restart(char *command);
 extern void cobalt_machine_halt(void);
-extern void cobalt_machine_power_off(void);
 
 const char *get_system_type(void)
 {
@@ -45,14 +46,10 @@ void __init plat_timer_setup(struct irqaction *irq)
         /* Load timer value for HZ (TCLK is 50MHz) */
         GT_WRITE(GT_TC0_OFS, 50*1000*1000 / HZ);
 
-        /* Enable timer */
+        /* Enable timer0 */
         GT_WRITE(GT_TC_CONTROL_OFS, GT_TC_CONTROL_ENTC0_MSK | GT_TC_CONTROL_SELTC0_MSK);
 
-        /* Register interrupt */
-        setup_irq(COBALT_GALILEO_IRQ, irq);
-
-        /* Enable interrupt */
-        GT_WRITE(GT_INTRMASK_OFS, GT_INTR_T0EXP_MSK | GT_READ(GT_INTRMASK_OFS));
+        setup_irq(GT641XX_TIMER0_IRQ, irq);
 }
 
 /*
@@ -87,13 +84,18 @@ static struct resource cobalt_reserved_resources[] = {
         },
 };
 
+void __init plat_time_init(void)
+{
+        setup_pit_timer();
+}
+
 void __init plat_mem_setup(void)
 {
         int i;
 
         _machine_restart = cobalt_machine_restart;
         _machine_halt = cobalt_machine_halt;
-        pm_power_off = cobalt_machine_power_off;
+        pm_power_off = cobalt_machine_halt;
 
         set_io_port_base(CKSEG1ADDR(GT_DEF_PCI0_IO_BASE));
 
@@ -117,8 +119,6 @@ void __init prom_init(void)
         unsigned long memsz;
         char **argv;
 
-        mips_machgroup = MACH_GROUP_COBALT;
-
         memsz = fw_arg0 & 0x7fff0000;
         narg = fw_arg0 & 0x0000ffff;
 
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig
index 700a3a2d688e..80b0c99c2cfb 100644
--- a/arch/mips/configs/bigsur_defconfig
+++ b/arch/mips/configs/bigsur_defconfig
@@ -69,7 +69,6 @@ CONFIG_SIBYTE_SB1xxx_SOC=y
 CONFIG_SIBYTE_CFE=y
 # CONFIG_SIBYTE_CFE_CONSOLE is not set
 # CONFIG_SIBYTE_BUS_WATCHER is not set
-# CONFIG_SIBYTE_SB1250_PROF is not set
 # CONFIG_SIBYTE_TBPROF is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -574,7 +573,7 @@ CONFIG_MII=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_R8169 is not set
-CONFIG_NET_SB1250_MAC=y
+CONFIG_SB1250_MAC=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig
index ebcb7ad8814b..36c13039e237 100644
--- a/arch/mips/configs/cobalt_defconfig
+++ b/arch/mips/configs/cobalt_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc2
-# Tue Aug  7 22:12:54 2007
+# Linux kernel version: 2.6.23-rc5
+# Thu Sep  6 13:14:29 2007
 #
 CONFIG_MIPS=y
 
@@ -55,12 +55,14 @@ CONFIG_DMA_NONCOHERENT=y
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_SYS_HAS_EARLY_PRINTK=y
+# CONFIG_HOTPLUG_CPU is not set
 CONFIG_I8259=y
 # CONFIG_NO_IOPORT is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
 CONFIG_IRQ_CPU=y
+CONFIG_IRQ_GT641XX=y
 CONFIG_PCI_GT64XXX_PCI0=y
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 
@@ -235,6 +237,7 @@ CONFIG_TRAD_SIGNALS=y
 # Power management options
 #
 # CONFIG_PM is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
 
 #
 # Networking
@@ -844,7 +847,21 @@ CONFIG_USB_MON=y
 #
 # CONFIG_USB_GADGET is not set
 # CONFIG_MMC is not set
-# CONFIG_NEW_LEDS is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_COBALT_QUBE=y
+CONFIG_LEDS_COBALT_RAQ=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_TIMER is not set
+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_INFINIBAND is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
diff --git a/arch/mips/configs/lasat_defconfig b/arch/mips/configs/lasat_defconfig
new file mode 100644
index 000000000000..2c665fcef089
--- /dev/null
+++ b/arch/mips/configs/lasat_defconfig
@@ -0,0 +1,828 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-rc3
+# Sat Aug 18 17:37:58 2007
+#
+CONFIG_MIPS=y
+
+#
+# Machine selection
+#
+# CONFIG_MACH_ALCHEMY is not set
+# CONFIG_BASLER_EXCITE is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MACH_JAZZ is not set
+CONFIG_LASAT=y
+# CONFIG_LEMOTE_FULONG is not set
+# CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SEAD is not set
+# CONFIG_MIPS_SIM is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_PMC_MSP is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_QEMU is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_PTSWARM is not set
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SNI_RM is not set
+# CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_TOSHIBA_RBTX4927 is not set
+# CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
+CONFIG_PICVUE=y
+CONFIG_PICVUE_PROC=y
+CONFIG_DS1603=y
+CONFIG_LASAT_SYSCTL=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_DMA_NONCOHERENT=y
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_SYS_HAS_EARLY_PRINTK=y
+# CONFIG_HOTPLUG_CPU is not set
+CONFIG_MIPS_NILE4=y
+# CONFIG_NO_IOPORT is not set
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_PCI_GT64XXX_PCI0=y
+CONFIG_MIPS_L1_CACHE_SHIFT=5
+
+#
+# CPU selection
+#
+# CONFIG_CPU_LOONGSON2 is not set
+# CONFIG_CPU_MIPS32_R1 is not set
+# CONFIG_CPU_MIPS32_R2 is not set
+# CONFIG_CPU_MIPS64_R1 is not set
+# CONFIG_CPU_MIPS64_R2 is not set
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+# CONFIG_CPU_VR41XX is not set
+# CONFIG_CPU_R4300 is not set
+# CONFIG_CPU_R4X00 is not set
+# CONFIG_CPU_TX49XX is not set
+CONFIG_CPU_R5000=y
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R6000 is not set
+# CONFIG_CPU_NEVADA is not set
+# CONFIG_CPU_R8000 is not set
+# CONFIG_CPU_R10000 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_RM9000 is not set
+# CONFIG_CPU_SB1 is not set
+CONFIG_SYS_HAS_CPU_R5000=y
+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
+
+#
+# Kernel type
+#
+CONFIG_32BIT=y
+# CONFIG_64BIT is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_BOARD_SCACHE=y
+CONFIG_R5000_CPU_SCACHE=y
+CONFIG_MIPS_MT_DISABLED=y
+# CONFIG_MIPS_MT_SMP is not set
+# CONFIG_MIPS_MT_SMTC is not set
+CONFIG_CPU_HAS_LLSC=y
+CONFIG_CPU_HAS_SYNC=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_ARCH_FLATMEM_ENABLE=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_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_HZ_48 is not set
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_128 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_256 is not set
+CONFIG_HZ_1000=y
+# CONFIG_HZ_1024 is not set
+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
+CONFIG_HZ=1000
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_KEXEC is not set
+# CONFIG_SECCOMP is not set
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=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 is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_KALLSYMS is not set
+# CONFIG_HOTPLUG is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+# CONFIG_EPOLL is not set
+# CONFIG_SIGNALFD is not set
+# CONFIG_TIMERFD is not set
+# CONFIG_EVENTFD is not set
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+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 is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+
+#
+# Bus options (PCI, PCMCIA, EISA, ISA, TC)
+#
+CONFIG_HW_HAS_PCI=y
+CONFIG_PCI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_MMU=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_TRAD_SIGNALS=y
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+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 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_DIAG is not set
+# 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
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS 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
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_LASAT=y
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# 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 is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MISC_DEVICES 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=y
+CONFIG_IDEDISK_MULTI_MODE=y
+# 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_IDEPCI=y
+# CONFIG_IDEPCI_SHARE_IRQ is not set
+CONFIG_IDEPCI_PCIBUS_ORDER=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_IDEDMA_ONLYDISK is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+CONFIG_BLK_DEV_CMD64X=y
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# 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_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_ARCNET is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_AX88796 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_DM9000 is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=y
+# CONFIG_PCNET32_NAPI is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_TC35815 is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 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_SHAPER 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_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_LIBPS2 is not set
+CONFIG_SERIO_RAW=y
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD 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 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_RTC is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_DRM 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
+
+#
+# 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 is not set
+
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_MMC is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_RTC_CLASS is not set
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# 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 is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_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 is not set
+# CONFIG_QUOTA is not set
+# CONFIG_DNOTIFY 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_RAMFS=y
+CONFIG_CONFIGFS_FS=y
+
+#
+# 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
+
+#
+# Network File Systems
+#
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD 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
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_CROSSCOMPILE=y
+CONFIG_CMDLINE=""
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_CRYPTO 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
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig
new file mode 100644
index 000000000000..0280ef389d8d
--- /dev/null
+++ b/arch/mips/configs/mtx1_defconfig
@@ -0,0 +1,3115 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-rc8
+# Sun Sep 30 12:56:10 2007
+#
+CONFIG_MIPS=y
+
+#
+# Machine selection
+#
+CONFIG_MACH_ALCHEMY=y
+# CONFIG_BASLER_EXCITE is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_LEMOTE_FULONG is not set
+# CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SEAD is not set
+# CONFIG_MIPS_SIM is not set
+# CONFIG_MARKEINS is not set
+# CONFIG_MACH_VR41XX is not set
+# CONFIG_PNX8550_JBS is not set
+# CONFIG_PNX8550_STB810 is not set
+# CONFIG_PMC_MSP is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_QEMU is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SIBYTE_CRHINE is not set
+# CONFIG_SIBYTE_CARMEL is not set
+# CONFIG_SIBYTE_CRHONE is not set
+# CONFIG_SIBYTE_RHONE is not set
+# CONFIG_SIBYTE_SWARM is not set
+# CONFIG_SIBYTE_LITTLESUR is not set
+# CONFIG_SIBYTE_SENTOSA is not set
+# CONFIG_SIBYTE_PTSWARM is not set
+# CONFIG_SIBYTE_BIGSUR is not set
+# CONFIG_SNI_RM is not set
+# CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_TOSHIBA_RBTX4927 is not set
+# CONFIG_TOSHIBA_RBTX4938 is not set
+# CONFIG_WR_PPMC is not set
+CONFIG_MIPS_MTX1=y
+# CONFIG_MIPS_BOSPORUS is not set
+# CONFIG_MIPS_DB1000 is not set
+# CONFIG_MIPS_DB1100 is not set
+# CONFIG_MIPS_DB1200 is not set
+# CONFIG_MIPS_DB1500 is not set
+# CONFIG_MIPS_DB1550 is not set
+# CONFIG_MIPS_MIRAGE is not set
+# CONFIG_MIPS_PB1000 is not set
+# CONFIG_MIPS_PB1100 is not set
+# CONFIG_MIPS_PB1200 is not set
+# CONFIG_MIPS_PB1500 is not set
+# CONFIG_MIPS_PB1550 is not set
+# CONFIG_MIPS_XXS1500 is not set
+CONFIG_SOC_AU1500=y
+CONFIG_SOC_AU1X00=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
+CONFIG_DMA_NONCOHERENT=y
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_NO_IOPORT is not set
+# CONFIG_CPU_BIG_ENDIAN is not set
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
+CONFIG_MIPS_L1_CACHE_SHIFT=5
+
+#
+# CPU selection
+#
+# CONFIG_CPU_LOONGSON2 is not set
+CONFIG_CPU_MIPS32_R1=y
+# CONFIG_CPU_MIPS32_R2 is not set
+# CONFIG_CPU_MIPS64_R1 is not set
+# CONFIG_CPU_MIPS64_R2 is not set
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+# CONFIG_CPU_VR41XX is not set
+# CONFIG_CPU_R4300 is not set
+# CONFIG_CPU_R4X00 is not set
+# CONFIG_CPU_TX49XX is not set
+# CONFIG_CPU_R5000 is not set
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R6000 is not set
+# CONFIG_CPU_NEVADA is not set
+# CONFIG_CPU_R8000 is not set
+# CONFIG_CPU_R10000 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_RM9000 is not set
+# CONFIG_CPU_SB1 is not set
+CONFIG_SYS_HAS_CPU_MIPS32_R1=y
+CONFIG_CPU_MIPS32=y
+CONFIG_CPU_MIPSR1=y
+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
+
+#
+# Kernel type
+#
+CONFIG_32BIT=y
+# CONFIG_64BIT is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_CPU_HAS_PREFETCH=y
+CONFIG_MIPS_MT_DISABLED=y
+# CONFIG_MIPS_MT_SMP is not set
+# CONFIG_MIPS_MT_SMTC is not set
+CONFIG_64BIT_PHYS_ADDR=y
+CONFIG_CPU_HAS_LLSC=y
+CONFIG_CPU_HAS_SYNC=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_CPU_SUPPORTS_HIGHMEM=y
+CONFIG_ARCH_FLATMEM_ENABLE=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_SPLIT_PTLOCK_CPUS=4
+CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_HZ_48 is not set
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_128 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_256 is not set
+# CONFIG_HZ_1000 is not set
+# CONFIG_HZ_1024 is not set
+CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
+CONFIG_HZ=250
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+# CONFIG_KEXEC is not set
+CONFIG_SECCOMP=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=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 is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+CONFIG_AUDIT=y
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=17
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_RELAY=y
+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_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_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+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=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+CONFIG_LBD=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# Bus options (PCI, PCMCIA, EISA, ISA, TC)
+#
+CONFIG_HW_HAS_PCI=y
+CONFIG_PCI=y
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_MMU=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+CONFIG_PCCARD=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_PCMCIA_IOCTL=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+# CONFIG_PCMCIA_AU1X00 is not set
+CONFIG_PCCARD_NONSTATIC=m
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+CONFIG_TRAD_SIGNALS=y
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_LEGACY is not set
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_SUSPEND=y
+# CONFIG_APM_EMULATION is not set
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETLABEL is not set
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_IPRANGE=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration (EXPERIMENTAL)
+#
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_OWNER=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AH=m
+# CONFIG_IP6_NF_MATCH_MH is not set
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_RAW=m
+
+#
+# DECnet: Netfilter Configuration
+#
+CONFIG_DECNET_NF_GRABULATOR=m
+
+#
+# Bridge: Netfilter Configuration
+#
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+CONFIG_IP_DCCP_ACKVEC=y
+
+#
+# DCCP CCIDs Configuration (EXPERIMENTAL)
+#
+CONFIG_IP_DCCP_CCID2=m
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_TFRC_LIB=m
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_CCID3_RTO=100
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_ATM=y
+CONFIG_ATM_CLIP=y
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=y
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_ECONET=m
+CONFIG_ECONET_AUNUDP=y
+CONFIG_ECONET_NATIVE=y
+CONFIG_WAN_ROUTER=m
+
+#
+# QoS and/or fair queueing
+#
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_FIFO=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+# CONFIG_NET_SCH_RR is not set
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_INGRESS=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=y
+# CONFIG_NET_ACT_GACT is not set
+# CONFIG_NET_ACT_MIRRED is not set
+# CONFIG_NET_ACT_IPT is not set
+# CONFIG_NET_ACT_PEDIT is not set
+# CONFIG_NET_ACT_SIMP is not set
+CONFIG_NET_CLS_POLICE=y
+# CONFIG_NET_CLS_IND is not set
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+# CONFIG_AX25_DAMA_SLAVE is not set
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_BAYCOM_EPP=m
+CONFIG_YAM=m
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+CONFIG_IRDA_DEBUG=y
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+# CONFIG_TOIM3232_DONGLE is not set
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+# CONFIG_KINGSUN_DONGLE is not set
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_TOSHIBA_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+# CONFIG_RXKAD is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_SOFTMAC=m
+# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=m
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# 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=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_PHYSMAP_START=0x8000000
+CONFIG_MTD_PHYSMAP_LEN=0x4000000
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_ALCHEMY is not set
+# CONFIG_MTD_MTX1 is not set
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PLATRAM=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+# CONFIG_MTD_PMC551_BUGFIX is not set
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_DATAFLASH=m
+CONFIG_MTD_M25P80=m
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOC2000=m
+CONFIG_MTD_DOC2001=m
+CONFIG_MTD_DOC2001PLUS=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCECC=m
+# CONFIG_MTD_DOCPROBE_ADVANCED is not set
+CONFIG_MTD_DOCPROBE_ADDRESS=0
+CONFIG_MTD_NAND=m
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_IDS=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+# CONFIG_MTD_NAND_CAFE is not set
+CONFIG_MTD_NAND_NANDSIM=m
+# CONFIG_MTD_NAND_PLATFORM is not set
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+# CONFIG_MTD_ONENAND_OTP is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_PC_SUPERIO=y
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_BLK_DEV=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_BPCK6=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_UMEM=m
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SX8=m
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+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=m
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECS=m
+# CONFIG_BLK_DEV_DELKIN is not set
+CONFIG_BLK_DEV_IDECD=m
+CONFIG_BLK_DEV_IDETAPE=m
+CONFIG_BLK_DEV_IDEFLOPPY=m
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=m
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=m
+CONFIG_BLK_DEV_OPTI621=m
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_AEC62XX=m
+CONFIG_BLK_DEV_ALI15X3=m
+# CONFIG_WDC_ALI15X3 is not set
+CONFIG_BLK_DEV_AMD74XX=m
+CONFIG_BLK_DEV_CMD64X=m
+CONFIG_BLK_DEV_TRIFLEX=m
+CONFIG_BLK_DEV_CY82C693=m
+# CONFIG_BLK_DEV_CS5520 is not set
+CONFIG_BLK_DEV_CS5530=m
+CONFIG_BLK_DEV_HPT34X=m
+# CONFIG_HPT34X_AUTODMA is not set
+CONFIG_BLK_DEV_HPT366=m
+# CONFIG_BLK_DEV_JMICRON is not set
+CONFIG_BLK_DEV_SC1200=m
+CONFIG_BLK_DEV_PIIX=m
+# CONFIG_BLK_DEV_IT8213 is not set
+CONFIG_BLK_DEV_IT821X=m
+CONFIG_BLK_DEV_NS87415=m
+CONFIG_BLK_DEV_PDC202XX_OLD=m
+CONFIG_PDC202XX_BURST=y
+CONFIG_BLK_DEV_PDC202XX_NEW=m
+CONFIG_BLK_DEV_SVWKS=m
+CONFIG_BLK_DEV_SIIMAGE=m
+# CONFIG_BLK_DEV_SLC90E66 is not set
+CONFIG_BLK_DEV_TRM290=m
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_BLK_DEV_TC86C001 is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+# CONFIG_SCSI_SAS_ATA is not set
+# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+CONFIG_AIC7XXX_DEBUG_ENABLE=y
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+CONFIG_AIC79XX_DEBUG_ENABLE=y
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+# CONFIG_SCSI_INIA100 is not set
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+CONFIG_SCSI_NSP32=m
+CONFIG_SCSI_DEBUG=m
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_SVW=m
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SX4=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIL24=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+# 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=m
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+CONFIG_PATA_EFAR=m
+CONFIG_ATA_GENERIC=m
+# 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=m
+CONFIG_PATA_TRIFLEX=m
+# CONFIG_PATA_MARVELL is not set
+CONFIG_PATA_MPIIX=m
+# CONFIG_PATA_OLDPIIX is not set
+CONFIG_PATA_NETCELL=m
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+CONFIG_PATA_PCMCIA=m
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+CONFIG_PATA_RZ1000=m
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+# CONFIG_PATA_PLATFORM is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+# CONFIG_MD_RAID5_RESHAPE is not set
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_EMC=m
+# CONFIG_DM_MULTIPATH_RDAC is not set
+# CONFIG_DM_DELAY is not set
+
+#
+# Fusion MPT device support
+#
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+
+#
+# Controllers
+#
+CONFIG_IEEE1394_PCILYNX=m
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocols
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_CONFIG=m
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_IFB is not set
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+# CONFIG_MACVLAN is not set
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+CONFIG_FIXED_PHY=m
+# CONFIG_FIXED_MII_10_FDX is not set
+# CONFIG_FIXED_MII_100_FDX is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=m
+# CONFIG_AX88796 is not set
+# CONFIG_MIPS_AU1X00_ENET is not set
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+# CONFIG_PCMCIA_XIRTULIP is not set
+CONFIG_HP100=m
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+# CONFIG_PCNET32_NAPI is not set
+CONFIG_AMD8111_ETH=m
+# CONFIG_AMD8111E_NAPI is not set
+CONFIG_ADAPTEC_STARFIRE=m
+# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
+CONFIG_B44=m
+CONFIG_FORCEDETH=m
+# CONFIG_FORCEDETH_NAPI is not set
+# CONFIG_TC35815 is not set
+CONFIG_DGRS=m
+CONFIG_EEPRO100=m
+CONFIG_E100=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+# CONFIG_VIA_RHINE_NAPI is not set
+# CONFIG_SC92031 is not set
+CONFIG_NET_POCKET=y
+CONFIG_DE600=m
+CONFIG_DE620=m
+CONFIG_NETDEV_1000=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+# CONFIG_E1000_NAPI is not set
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+# CONFIG_R8169_NAPI is not set
+CONFIG_R8169_VLAN=y
+CONFIG_SIS190=m
+CONFIG_SKGE=m
+CONFIG_SKY2=m
+CONFIG_SK98LIN=m
+CONFIG_VIA_VELOCITY=m
+CONFIG_TIGON3=m
+CONFIG_BNX2=m
+CONFIG_QLA3XXX=m
+# CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
+CONFIG_CHELSIO_T1=m
+# CONFIG_CHELSIO_T1_1G is not set
+CONFIG_CHELSIO_T1_NAPI=y
+# CONFIG_CHELSIO_T3 is not set
+CONFIG_IXGB=m
+# CONFIG_IXGB_NAPI is not set
+CONFIG_S2IO=m
+# CONFIG_S2IO_NAPI is not set
+CONFIG_MYRI10GE=m
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
+CONFIG_TR=y
+CONFIG_IBMOL=m
+CONFIG_IBMLS=m
+CONFIG_3C359=m
+CONFIG_TMS380TR=m
+CONFIG_TMSPCI=m
+CONFIG_ABYSS=m
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_USBNET_MII=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_DM9601 is not set
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_PCMCIA_IBMTR=m
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300=m
+CONFIG_PC300_MLPPP=y
+
+#
+# Cyclades-PC300 MLPPP support is disabled.
+#
+
+#
+# Refer to the file README.mlppp, provided by PC300 package.
+#
+# CONFIG_PC300TOO is not set
+CONFIG_FARSYNC=m
+CONFIG_DSCC4=m
+CONFIG_DSCC4_PCISYNC=y
+CONFIG_DSCC4_PCI_RST=y
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_WAN_ROUTER_DRIVERS=m
+CONFIG_CYCLADES_SYNC=m
+CONFIG_CYCLOMX_X25=y
+CONFIG_LAPBETHER=m
+CONFIG_X25_ASY=m
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E_MAYBE=m
+CONFIG_ATM_FORE200E_PCA=y
+CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_FORE200E=m
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+CONFIG_HIPPI=y
+CONFIG_ROADRUNNER=m
+# CONFIG_ROADRUNNER_LARGE_RINGS is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
+# CONFIG_PPPOL2TP is not set
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_NET_FC=y
+CONFIG_SHAPER=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_ISDN=m
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+CONFIG_ISDN_X25=y
+
+#
+# ISDN feature submodules
+#
+# CONFIG_ISDN_DRV_LOOP is not set
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+# CONFIG_HISAX_NO_SENDCOMPLETE is not set
+# CONFIG_HISAX_NO_LLC is not set
+# CONFIG_HISAX_NO_KEYPAD is not set
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+CONFIG_HISAX_HDLC=y
+
+#
+# Active cards
+#
+# CONFIG_HYSDN is not set
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+# CONFIG_GIGASET_M101 is not set
+# CONFIG_GIGASET_DEBUG is not set
+# CONFIG_GIGASET_UNDOCREQ is not set
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=m
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_TSDEV=m
+CONFIG_INPUT_TSDEV_SCREEN_X=240
+CONFIG_INPUT_TSDEV_SCREEN_Y=320
+CONFIG_INPUT_EVDEV=m
+CONFIG_INPUT_EVBUG=m
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_STOWAWAY=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_SERIAL=m
+# CONFIG_MOUSE_APPLETOUCH is not set
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_JOYDUMP=m
+# CONFIG_JOYSTICK_XPAD is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+# CONFIG_TOUCHSCREEN_UCB1400 is not set
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=m
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+CONFIG_INPUT_UINPUT=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_SERIAL_NONSTANDARD=y
+# CONFIG_COMPUTONE is not set
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_DIGIEPCA=m
+# CONFIG_MOXA_INTELLIO is not set
+CONFIG_MOXA_SMARTIO=m
+# CONFIG_MOXA_SMARTIO_NEW is not set
+# CONFIG_ISI is not set
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_N_HDLC=m
+# CONFIG_RISCOM8 is not set
+CONFIG_SPECIALIX=m
+# CONFIG_SPECIALIX_RTSCTS is not set
+CONFIG_SX=m
+# CONFIG_RIO is not set
+CONFIG_STALDRV=y
+# CONFIG_STALLION is not set
+# CONFIG_ISTALLION is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250_PCI=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=48
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+# CONFIG_SERIAL_8250_AU1X00 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=m
+CONFIG_SERIAL_JSM=m
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_TIPAR=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+# CONFIG_WDT_MTX1 is not set
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+CONFIG_WDT_501_PCI=y
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_HW_RANDOM=y
+CONFIG_RTC=y
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_TCG_TPM=m
+CONFIG_TCG_ATMEL=m
+CONFIG_DEVPORT=y
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=m
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_I810=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_PROSAVAGE=m
+CONFIG_I2C_SAVAGE4=m
+# CONFIG_I2C_SIMTEC is not set
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+# CONFIG_I2C_TAOS_EVM is not set
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_TINY_USB is not set
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_VOODOO3=m
+
+#
+# Miscellaneous I2C Chip support
+#
+CONFIG_SENSORS_DS1337=m
+CONFIG_SENSORS_DS1374=m
+# CONFIG_DS1682 is not set
+CONFIG_SENSORS_EEPROM=m
+CONFIG_SENSORS_PCF8574=m
+CONFIG_SENSORS_PCA9539=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_SENSORS_MAX6875=m
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+# CONFIG_SPI_LM70_LLP is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_AT25 is not set
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+CONFIG_SENSORS_ABITUGURU=m
+# CONFIG_SENSORS_ABITUGURU3 is not set
+# CONFIG_SENSORS_AD7418 is not set
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+# CONFIG_SENSORS_ADM1029 is not set
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_FSCHER=m
+CONFIG_SENSORS_FSCPOS=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+# CONFIG_SENSORS_LM93 is not set
+CONFIG_SENSORS_MAX1619=m
+# CONFIG_SENSORS_MAX6650 is not set
+CONFIG_SENSORS_PC87360=m
+# CONFIG_SENSORS_PC87427 is not set
+CONFIG_SENSORS_SIS5595=m
+# CONFIG_SENSORS_DME1737 is not set
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+# CONFIG_SENSORS_THMC50 is not set
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+# CONFIG_SENSORS_W83793 is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# Multimedia devices
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA9875=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA7111=m
+CONFIG_VIDEO_SAA7114=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_VPX3220=m
+CONFIG_VIDEO_CX25840=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_VIVI=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_SAA6588=m
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_PP=m
+CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_CPIA2=m
+CONFIG_VIDEO_SAA5246A=m
+CONFIG_VIDEO_SAA5249=m
+CONFIG_TUNER_3036=m
+# CONFIG_TUNER_TEA5761 is not set
+CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_ZORAN_ZR36060=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_DC30=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_OSS=m
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DPC=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_VP3054=m
+# CONFIG_VIDEO_IVTV is not set
+# CONFIG_VIDEO_CAFE_CCIC is not set
+CONFIG_V4L_USB_DRIVERS=y
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_29XXX=y
+CONFIG_VIDEO_PVRUSB2_24XXX=y
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_EM28XX=m
+# CONFIG_VIDEO_USBVISION is not set
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+CONFIG_USB_QUICKCAM_MESSENGER=m
+CONFIG_USB_ET61X251=m
+CONFIG_VIDEO_OVCAMCHIP=m
+CONFIG_USB_W9968CF=m
+# CONFIG_USB_OV511 is not set
+CONFIG_USB_SE401=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_STV680=m
+CONFIG_USB_ZC0301=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+# CONFIG_USB_ZR364XX is not set
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_GEMTEK_PCI=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_USB_DSBR=m
+CONFIG_DVB_CORE=m
+CONFIG_DVB_CORE_ATTACH=y
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+
+#
+# Supported USB Adapters
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_M920X is not set
+# CONFIG_DVB_USB_GL861 is not set
+# CONFIG_DVB_USB_AU6610 is not set
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+# CONFIG_DVB_USB_TTUSB2 is not set
+CONFIG_DVB_USB_DTT200U=m
+# CONFIG_DVB_USB_OPERA1 is not set
+# CONFIG_DVB_USB_AF9005 is not set
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_DVB_CINERGYT2=m
+CONFIG_DVB_CINERGYT2_TUNING=y
+CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32
+CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512
+CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250
+CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y
+CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=100
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported Pluto2 Adapters
+#
+CONFIG_DVB_PLUTO2=m
+
+#
+# Supported DVB Frontends
+#
+
+#
+# Customise DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_TDA10086=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+
+#
+# Tuners/PLL support
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TDA827X=m
+# CONFIG_DVB_TUNER_QT1010 is not set
+CONFIG_DVB_TUNER_MT2060=m
+
+#
+# Miscellaneous devices
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_TUA6100=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEO_BUF=m
+CONFIG_VIDEO_BUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR_I2C=m
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_DAB=y
+CONFIG_USB_DABUSB=m
+
+#
+# Graphics support
+#
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_CFB_FILLRECT=m
+CONFIG_FB_CFB_COPYAREA=m
+CONFIG_FB_CFB_IMAGEBLIT=m
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+CONFIG_FB_PM2_FIFO_DISCONNECT=y
+CONFIG_FB_CYBER2000=m
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GENERIC_LCD=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+# CONFIG_FB_S3 is not set
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+CONFIG_FB_SAVAGE_ACCEL=y
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+CONFIG_FB_VOODOO1=m
+# CONFIG_FB_VT8623 is not set
+CONFIG_FB_TRIDENT=m
+# CONFIG_FB_TRIDENT_ACCEL is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=m
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_LOGO is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_RTCTIMER=m
+CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+# CONFIG_SND_PORTMAN2X4 is not set
+
+#
+# PCI devices
+#
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL=y
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL=y
+# CONFIG_SND_AC97_POWER_SAVE is not set
+
+#
+# ALSA MIPS devices
+#
+# CONFIG_SND_AU1X00 is not set
+
+#
+# USB devices
+#
+CONFIG_SND_USB_AUDIO=m
+# CONFIG_SND_USB_CAIAQ is not set
+
+#
+# PCMCIA devices
+#
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# SoC Audio support for SuperH
+#
+
+#
+# Open Sound System
+#
+CONFIG_SOUND_PRIME=m
+CONFIG_SOUND_TRIDENT=m
+# CONFIG_SOUND_MSNDCLAS is not set
+# CONFIG_SOUND_MSNDPIN is not set
+CONFIG_AC97_BUS=m
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT_POWERBOOK=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_PERSIST is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_SPLIT_ISO=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_CS=m
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_DPCM=y
+CONFIG_USB_STORAGE_USBAT=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_STORAGE_ALAUDA=y
+CONFIG_USB_STORAGE_KARMA=y
+CONFIG_USB_LIBUSUAL=y
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_AIRPRIME=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP2101=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_FUNSOFT=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_OTI6858 is not set
+CONFIG_USB_SERIAL_HP4X=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_EZUSB=y
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_AUERSWALD=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+# CONFIG_USB_BERRY_CHARGE is not set
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_PHIDGET=m
+CONFIG_USB_PHIDGETKIT=m
+CONFIG_USB_PHIDGETMOTORCONTROL=m
+CONFIG_USB_PHIDGETSERVO=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+# CONFIG_USB_SISUSBVGA_CON is not set
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+# CONFIG_USB_IOWARRIOR is not set
+CONFIG_USB_TEST=m
+
+#
+# USB DSL modem support
+#
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+CONFIG_USB_GADGET_NET2280=y
+CONFIG_USB_NET2280=m
+# CONFIG_USB_GADGET_PXA2XX is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_BOUNCE=y
+
+#
+# MMC/SD Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=m
+
+#
+# LED drivers
+#
+
+#
+# LED Triggers
+#
+# CONFIG_LEDS_TRIGGERS is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_AMSO1100=m
+CONFIG_INFINIBAND_AMSO1100_DEBUG=y
+# CONFIG_MLX4_INFINIBAND is not set
+CONFIG_INFINIBAND_IPOIB=m
+# CONFIG_INFINIBAND_IPOIB_CM is not set
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1672=m
+# CONFIG_RTC_DRV_MAX6900 is not set
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+# CONFIG_RTC_DRV_M41T80 is not set
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+CONFIG_RTC_DRV_DS1553=m
+# CONFIG_RTC_DRV_STK17TA8 is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_M48T86=m
+# CONFIG_RTC_DRV_M48T59 is not set
+CONFIG_RTC_DRV_V3020=m
+
+#
+# on-CPU RTC drivers
+#
+
+#
+# DMA Engine support
+#
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_IOATDMA=m
+# CONFIG_AUXDISPLAY is not set
+
+#
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=m
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_SECURITY=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_MINIX_FS=m
+CONFIG_ROMFS_FS=m
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_QUOTA=y
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_DNOTIFY=y
+CONFIG_AUTOFS_FS=m
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+CONFIG_CONFIGFS_FS=m
+
+#
+# Miscellaneous filesystems
+#
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_CRAMFS=y
+CONFIG_VXFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+CONFIG_NFS_DIRECTIO=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_RPCSEC_GSS_SPKM3=m
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+CONFIG_NCPFS_IOCTL_LOCKING=y
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+# CONFIG_NCPFS_SMALLDOS is not set
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+# CONFIG_CODA_FS_OLD_API is not set
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_ACORN_PARTITION=y
+# CONFIG_ACORN_PARTITION_CUMANA is not set
+# CONFIG_ACORN_PARTITION_EESOX is not set
+CONFIG_ACORN_PARTITION_ICS=y
+# CONFIG_ACORN_PARTITION_ADFS is not set
+# CONFIG_ACORN_PARTITION_POWERTEC is not set
+CONFIG_ACORN_PARTITION_RISCIX=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+CONFIG_SGI_PARTITION=y
+CONFIG_ULTRIX_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="cp437"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+
+#
+# Distributed Lock Manager
+#
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Profiling support
+#
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_CROSSCOMPILE is not set
+CONFIG_CMDLINE=""
+CONFIG_SYS_SUPPORTS_KGDB=y
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_CAPABILITIES=m
+CONFIG_SECURITY_ROOTPLUG=m
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_TGR192=m
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=m
+# CONFIG_CRYPTO_FCRYPT is not set
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_HW=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=m
+CONFIG_AUDIT_GENERIC=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig
index 93f9e8331ad7..3ed991ae0ebe 100644
--- a/arch/mips/configs/sb1250-swarm_defconfig
+++ b/arch/mips/configs/sb1250-swarm_defconfig
@@ -70,7 +70,6 @@ CONFIG_SIBYTE_HAS_LDT=y
 CONFIG_SIBYTE_CFE=y
 # CONFIG_SIBYTE_CFE_CONSOLE is not set
 # CONFIG_SIBYTE_BUS_WATCHER is not set
-# CONFIG_SIBYTE_SB1250_PROF is not set
 # CONFIG_SIBYTE_TBPROF is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -566,7 +565,7 @@ CONFIG_MII=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_R8169 is not set
-CONFIG_NET_SB1250_MAC=y
+CONFIG_SB1250_MAC=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
diff --git a/arch/mips/dec/ecc-berr.c b/arch/mips/dec/ecc-berr.c
index 6d55e8aab668..6a17c9b508ea 100644
--- a/arch/mips/dec/ecc-berr.c
+++ b/arch/mips/dec/ecc-berr.c
@@ -263,7 +263,7 @@ static inline void dec_kn03_be_init(void)
          */
         *mcr = (*mcr & ~(KN03_MCR_DIAGCHK | KN03_MCR_DIAGGEN)) |
                KN03_MCR_CORRECT;
-        if (current_cpu_data.cputype == CPU_R4400SC)
+        if (current_cpu_type() == CPU_R4400SC)
                 *mbcs |= KN4K_MB_CSR_EE;
         fast_iob();
 }
diff --git a/arch/mips/dec/kn02xa-berr.c b/arch/mips/dec/kn02xa-berr.c
index 7a053aadcd3a..5f04545c3606 100644
--- a/arch/mips/dec/kn02xa-berr.c
+++ b/arch/mips/dec/kn02xa-berr.c
@@ -132,7 +132,7 @@ void __init dec_kn02xa_be_init(void)
         volatile u32 *mbcs = (void *)CKSEG1ADDR(KN4K_SLOT_BASE + KN4K_MB_CSR);
 
         /* For KN04 we need to make sure EE (?) is enabled in the MB.  */
-        if (current_cpu_data.cputype == CPU_R4000SC)
+        if (current_cpu_type() == CPU_R4000SC)
                 *mbcs |= KN4K_MB_CSR_EE;
         fast_iob();
 
diff --git a/arch/mips/dec/prom/identify.c b/arch/mips/dec/prom/identify.c
index cd85924e2572..95e26f4bb38f 100644
--- a/arch/mips/dec/prom/identify.c
+++ b/arch/mips/dec/prom/identify.c
@@ -133,9 +133,6 @@ void __init prom_identify_arch(u32 magic)
         dec_firmrev = (dec_sysid & 0xff00) >> 8;
         dec_etc = dec_sysid & 0xff;
 
-        /* We're obviously one of the DEC machines */
-        mips_machgroup = MACH_GROUP_DEC;
-
         /*
          * FIXME: This may not be an exhaustive list of DECStations/Servers!
          * Put all model-specific initialisation calls here.
diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c
index 808c182fd3fa..93f1239af524 100644
--- a/arch/mips/dec/prom/init.c
+++ b/arch/mips/dec/prom/init.c
@@ -108,8 +108,8 @@ void __init prom_init(void)
 
         /* Were we compiled with the right CPU option? */
 #if defined(CONFIG_CPU_R3000)
-        if ((current_cpu_data.cputype == CPU_R4000SC) ||
-            (current_cpu_data.cputype == CPU_R4400SC)) {
+        if ((current_cpu_type() == CPU_R4000SC) ||
+            (current_cpu_type() == CPU_R4400SC)) {
                 static char r4k_msg[] __initdata =
                         "Please recompile with \"CONFIG_CPU_R4x00 = y\".\n";
                 printk(cpu_msg);
@@ -119,8 +119,8 @@ void __init prom_init(void)
 #endif
 
 #if defined(CONFIG_CPU_R4X00)
-        if ((current_cpu_data.cputype == CPU_R3000) ||
-            (current_cpu_data.cputype == CPU_R3000A)) {
+        if ((current_cpu_type() == CPU_R3000) ||
+            (current_cpu_type() == CPU_R3000A)) {
                 static char r3k_msg[] __initdata =
                         "Please recompile with \"CONFIG_CPU_R3000 = y\".\n";
                 printk(cpu_msg);
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c
index 3e634f2f5443..bd5431e1f408 100644
--- a/arch/mips/dec/setup.c
+++ b/arch/mips/dec/setup.c
@@ -145,13 +145,9 @@ static void __init dec_be_init(void)
         }
 }
 
-
-extern void dec_time_init(void);
-
 void __init plat_mem_setup(void)
 {
         board_be_init = dec_be_init;
-        board_time_init = dec_time_init;
 
         wbflush_setup();
 
diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c
index 8b7e0c17ac35..820e5331205f 100644
--- a/arch/mips/dec/time.c
+++ b/arch/mips/dec/time.c
@@ -24,7 +24,6 @@
 
 #include <asm/bootinfo.h>
 #include <asm/cpu.h>
-#include <asm/div64.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mipsregs.h>
@@ -36,7 +35,7 @@
 #include <asm/dec/ioasic_addrs.h>
 #include <asm/dec/machtype.h>
 
-static unsigned long dec_rtc_get_time(void)
+unsigned long read_persistent_clock(void)
 {
         unsigned int year, mon, day, hour, min, sec, real_year;
         unsigned long flags;
@@ -75,13 +74,13 @@ static unsigned long dec_rtc_get_time(void)
 }
 
 /*
- * In order to set the CMOS clock precisely, dec_rtc_set_mmss has to
+ * In order to set the CMOS clock precisely, rtc_mips_set_mmss has to
  * be called 500 ms after the second nowtime has started, because when
  * nowtime is written into the registers of the CMOS clock, it will
  * jump to the next second precisely 500 ms later.  Check the Dallas
  * DS1287 data sheet for details.
  */
-static int dec_rtc_set_mmss(unsigned long nowtime)
+int rtc_mips_set_mmss(unsigned long nowtime)
 {
         int retval = 0;
         int real_seconds, real_minutes, cmos_minutes;
@@ -140,7 +139,6 @@ static int dec_rtc_set_mmss(unsigned long nowtime)
         return retval;
 }
 
-
 static int dec_timer_state(void)
 {
         return (CMOS_READ(RTC_REG_C) & RTC_PF) != 0;
@@ -161,11 +159,8 @@ static cycle_t dec_ioasic_hpt_read(void)
 }
 
 
-void __init dec_time_init(void)
+void __init plat_time_init(void)
 {
-        rtc_mips_get_time = dec_rtc_get_time;
-        rtc_mips_set_mmss = dec_rtc_set_mmss;
-
         mips_timer_state = dec_timer_state;
         mips_timer_ack = dec_timer_ack;
 
diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma2rh/common/prom.c
index 7433bd8e5562..0f791eb6bb66 100644
--- a/arch/mips/emma2rh/common/prom.c
+++ b/arch/mips/emma2rh/common/prom.c
@@ -62,8 +62,6 @@ void __init prom_init(void)
                 strcat(arcs_cmdline, " ");
         }
 
-        mips_machgroup = MACH_GROUP_NEC_EMMA2RH;
-
 #if defined(CONFIG_MARKEINS)
         mips_machtype = MACH_NEC_MARKEINS;
         add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
diff --git a/arch/mips/emma2rh/markeins/setup.c b/arch/mips/emma2rh/markeins/setup.c
index 2f060e1ed36c..5e1da53b04a7 100644
--- a/arch/mips/emma2rh/markeins/setup.c
+++ b/arch/mips/emma2rh/markeins/setup.c
@@ -88,7 +88,7 @@ static unsigned int __init detect_bus_frequency(unsigned long rtc_base)
         return clock[reg];
 }
 
-static void __init emma2rh_time_init(void)
+void __init plat_time_init(void)
 {
         u32 reg;
         if (bus_frequency == 0)
@@ -124,8 +124,6 @@ void __init plat_mem_setup(void)
 
         set_io_port_base(KSEG1ADDR(EMMA2RH_PCI_IO_BASE));
 
-        board_time_init = emma2rh_time_init;
-
         _machine_restart = markeins_machine_restart;
         _machine_halt = markeins_machine_halt;
         pm_power_off = markeins_machine_power_off;
diff --git a/arch/mips/arc/Makefile b/arch/mips/fw/arc/Makefile
index 4f349ec1ea2d..4f349ec1ea2d 100644
--- a/arch/mips/arc/Makefile
+++ b/arch/mips/fw/arc/Makefile
diff --git a/arch/mips/arc/arc_con.c b/arch/mips/fw/arc/arc_con.c
index bc32fe64f42a..bc32fe64f42a 100644
--- a/arch/mips/arc/arc_con.c
+++ b/arch/mips/fw/arc/arc_con.c
diff --git a/arch/mips/arc/cmdline.c b/arch/mips/fw/arc/cmdline.c
index fd604ef28823..fd604ef28823 100644
--- a/arch/mips/arc/cmdline.c
+++ b/arch/mips/fw/arc/cmdline.c
diff --git a/arch/mips/arc/env.c b/arch/mips/fw/arc/env.c
index e521a6e010aa..6f5dd42b96e2 100644
--- a/arch/mips/arc/env.c
+++ b/arch/mips/fw/arc/env.c
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 
 PCHAR __init
diff --git a/arch/mips/arc/file.c b/arch/mips/fw/arc/file.c
index cb0127cf5bc1..30335341b447 100644
--- a/arch/mips/arc/file.c
+++ b/arch/mips/fw/arc/file.c
@@ -10,7 +10,7 @@
  */
 #include <linux/init.h>
 
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 
 LONG
diff --git a/arch/mips/arc/identify.c b/arch/mips/fw/arc/identify.c
index 4b907369b0f9..28dfd2e2989a 100644
--- a/arch/mips/arc/identify.c
+++ b/arch/mips/fw/arc/identify.c
@@ -22,52 +22,51 @@
 struct smatch {
         char *arcname;
         char *liname;
-        int group;
         int type;
         int flags;
 };
 
 static struct smatch mach_table[] = {
-        {       "SGI-IP22",
-                "SGI Indy",
-                MACH_GROUP_SGI,
-                MACH_SGI_IP22,
-                PROM_FLAG_ARCS
-        }, {    "SGI-IP27",
-                "SGI Origin",
-                MACH_GROUP_SGI,
-                MACH_SGI_IP27,
-                PROM_FLAG_ARCS
-        }, {    "SGI-IP28",
-                "SGI IP28",
-                MACH_GROUP_SGI,
-                MACH_SGI_IP28,
-                PROM_FLAG_ARCS
-        }, {    "SGI-IP30",
-                "SGI Octane",
-                MACH_GROUP_SGI,
-                MACH_SGI_IP30,
-                PROM_FLAG_ARCS
-        }, {    "SGI-IP32",
-                "SGI O2",
-                MACH_GROUP_SGI,
-                MACH_SGI_IP32,
-                PROM_FLAG_ARCS
-        }, {    "Microsoft-Jazz",
-                "Jazz MIPS_Magnum_4000",
-                MACH_GROUP_JAZZ,
-                MACH_MIPS_MAGNUM_4000,
-                0
-        }, {    "PICA-61",
-                "Jazz Acer_PICA_61",
-                MACH_GROUP_JAZZ,
-                MACH_ACER_PICA_61,
-                0
-        }, {    "RM200PCI",
-                "SNI RM200_PCI",
-                MACH_GROUP_SNI_RM,
-                MACH_SNI_RM200_PCI,
-                PROM_FLAG_DONT_FREE_TEMP
+        {
+                .arcname        = "SGI-IP22",
+                .liname         = "SGI Indy",
+                .type           = MACH_SGI_IP22,
+                .flags          = PROM_FLAG_ARCS,
+        }, {
+                .arcname        = "SGI-IP27",
+                .liname         = "SGI Origin",
+                .type           = MACH_SGI_IP27,
+                .flags          = PROM_FLAG_ARCS,
+        }, {
+                .arcname        = "SGI-IP28",
+                .liname         = "SGI IP28",
+                .type           = MACH_SGI_IP28,
+                .flags          = PROM_FLAG_ARCS,
+        }, {
+                .arcname        = "SGI-IP30",
+                .liname         = "SGI Octane",
+                .type           = MACH_SGI_IP30,
+                .flags          = PROM_FLAG_ARCS,
+        }, {
+                .arcname        = "SGI-IP32",
+                .liname         = "SGI O2",
+                .type           = MACH_SGI_IP32,
+                .flags          = PROM_FLAG_ARCS,
+        }, {
+                .arcname        = "Microsoft-Jazz",
+                .liname         = "Jazz MIPS_Magnum_4000",
+                .type           = MACH_MIPS_MAGNUM_4000,
+                .flags          = 0,
+        }, {
+                .arcname        = "PICA-61",
+                .liname         = "Jazz Acer_PICA_61",
+                .type           = MACH_ACER_PICA_61,
+                .flags          = 0,
+        }, {
+                .arcname        = "RM200PCI",
+                .liname         = "SNI RM200_PCI",
+                .type           = MACH_SNI_RM200_PCI,
+                .flags          = PROM_FLAG_DONT_FREE_TEMP,
         }
 };
 
@@ -117,7 +116,6 @@ void __init prom_identify_arch(void)
         mach = string_to_mach(iname);
         system_type = mach->liname;
 
-        mips_machgroup = mach->group;
         mips_machtype = mach->type;
         prom_flags = mach->flags;
 }
diff --git a/arch/mips/arc/init.c b/arch/mips/fw/arc/init.c
index e2f75b13312f..e2f75b13312f 100644
--- a/arch/mips/arc/init.c
+++ b/arch/mips/fw/arc/init.c
diff --git a/arch/mips/arc/memory.c b/arch/mips/fw/arc/memory.c
index 83d15791ef6a..8b8eea2b6cf6 100644
--- a/arch/mips/arc/memory.c
+++ b/arch/mips/fw/arc/memory.c
@@ -63,7 +63,7 @@ static char *arc_mtypes[8] = {
                                                 : arc_mtypes[a.arc]
 #endif
 
-static inline int memtype_classify_arcs (union linux_memtypes type)
+static inline int memtype_classify_arcs(union linux_memtypes type)
 {
         switch (type.arcs) {
         case arcs_fcontig:
@@ -83,7 +83,7 @@ static inline int memtype_classify_arcs (union linux_memtypes type)
         while(1);                               /* Nuke warning.  */
 }
 
-static inline int memtype_classify_arc (union linux_memtypes type)
+static inline int memtype_classify_arc(union linux_memtypes type)
 {
         switch (type.arc) {
         case arc_free:
@@ -103,7 +103,7 @@ static inline int memtype_classify_arc (union linux_memtypes type)
         while(1);                               /* Nuke warning.  */
 }
 
-static int __init prom_memtype_classify (union linux_memtypes type)
+static int __init prom_memtype_classify(union linux_memtypes type)
 {
         if (prom_flags & PROM_FLAG_ARCS)        /* SGI is ``different'' ... */
                 return memtype_classify_arcs(type);
diff --git a/arch/mips/arc/misc.c b/arch/mips/fw/arc/misc.c
index b2e10b9e9452..e527c5fd5a32 100644
--- a/arch/mips/arc/misc.c
+++ b/arch/mips/fw/arc/misc.c
@@ -14,7 +14,7 @@
 
 #include <asm/bcache.h>
 
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 #include <asm/bootinfo.h>
 #include <asm/system.h>
diff --git a/arch/mips/arc/promlib.c b/arch/mips/fw/arc/promlib.c
index c508c00dbb64..c508c00dbb64 100644
--- a/arch/mips/arc/promlib.c
+++ b/arch/mips/fw/arc/promlib.c
diff --git a/arch/mips/arc/salone.c b/arch/mips/fw/arc/salone.c
index e6afb64723d0..e6afb64723d0 100644
--- a/arch/mips/arc/salone.c
+++ b/arch/mips/fw/arc/salone.c
diff --git a/arch/mips/arc/time.c b/arch/mips/fw/arc/time.c
index 299ff2c5c0b5..42138c837d48 100644
--- a/arch/mips/arc/time.c
+++ b/arch/mips/fw/arc/time.c
@@ -9,7 +9,7 @@
  */
 #include <linux/init.h>
 
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 
 struct linux_tinfo * __init
diff --git a/arch/mips/arc/tree.c b/arch/mips/fw/arc/tree.c
index abd1786ea09b..d68e5a59c1f6 100644
--- a/arch/mips/arc/tree.c
+++ b/arch/mips/fw/arc/tree.c
@@ -10,7 +10,7 @@
  * Copyright (C) 1999 Silicon Graphics, Inc.
  */
 #include <linux/init.h>
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 
 #undef DEBUG_PROM_TREE
diff --git a/arch/mips/fw/cfe/Makefile b/arch/mips/fw/cfe/Makefile
new file mode 100644
index 000000000000..8f20044c0adf
--- /dev/null
+++ b/arch/mips/fw/cfe/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Broadcom Common Firmware Environment support
+#
+
+lib-y += cfe_api.o
diff --git a/arch/mips/sibyte/cfe/cfe_api.c b/arch/mips/fw/cfe/cfe_api.c
index c0213605e18a..a9f69e4e40ac 100644
--- a/arch/mips/sibyte/cfe/cfe_api.c
+++ b/arch/mips/fw/cfe/cfe_api.c
@@ -30,7 +30,7 @@
     *
     ********************************************************************* */
 
-#include "cfe_api.h"
+#include <asm/fw/cfe/cfe_api.h>
 #include "cfe_api_int.h"
 
 /* Cast from a native pointer to a cfe_xptr_t and back.  */
diff --git a/arch/mips/sibyte/cfe/cfe_api_int.h b/arch/mips/fw/cfe/cfe_api_int.h
index f7e5a64b55f3..f7e5a64b55f3 100644
--- a/arch/mips/sibyte/cfe/cfe_api_int.h
+++ b/arch/mips/fw/cfe/cfe_api_int.h
diff --git a/arch/mips/gt64120/wrppmc/Makefile b/arch/mips/gt64120/wrppmc/Makefile
index bef15c90ae15..b49d282bee8a 100644
--- a/arch/mips/gt64120/wrppmc/Makefile
+++ b/arch/mips/gt64120/wrppmc/Makefile
@@ -9,6 +9,6 @@
 # Makefile for the Wind River MIPS 4KC PPMC Eval Board
 #
 
-obj-y += irq.o reset.o setup.o time.o pci.o
+obj-y += irq.o pci.o reset.o serial.o setup.o time.o
 
 EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/gt64120/wrppmc/irq.c b/arch/mips/gt64120/wrppmc/irq.c
index 06177bf5b1d6..c6e706274db4 100644
--- a/arch/mips/gt64120/wrppmc/irq.c
+++ b/arch/mips/gt64120/wrppmc/irq.c
@@ -9,26 +9,13 @@
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  */
-#include <linux/errno.h>
+#include <linux/hardirq.h>
 #include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/module.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/timex.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/bitops.h>
-#include <asm/bootinfo.h>
-#include <asm/io.h>
-#include <asm/bitops.h>
-#include <asm/mipsregs.h>
-#include <asm/system.h>
-#include <asm/irq_cpu.h>
+#include <linux/irq.h>
+
 #include <asm/gt64120.h>
+#include <asm/irq_cpu.h>
+#include <asm/mipsregs.h>
 
 asmlinkage void plat_irq_dispatch(void)
 {
diff --git a/arch/mips/gt64120/wrppmc/pci.c b/arch/mips/gt64120/wrppmc/pci.c
index 0d5289bc1804..d06192faeb7c 100644
--- a/arch/mips/gt64120/wrppmc/pci.c
+++ b/arch/mips/gt64120/wrppmc/pci.c
@@ -8,9 +8,10 @@
  * for more details.
  */
 #include <linux/init.h>
+#include <linux/ioport.h>
 #include <linux/types.h>
 #include <linux/pci.h>
-#include <linux/kernel.h>
+
 #include <asm/gt64120.h>
 
 extern struct pci_ops gt64xxx_pci0_ops;
diff --git a/arch/mips/gt64120/wrppmc/reset.c b/arch/mips/gt64120/wrppmc/reset.c
index b97039c6d3db..c355cff38f6c 100644
--- a/arch/mips/gt64120/wrppmc/reset.c
+++ b/arch/mips/gt64120/wrppmc/reset.c
@@ -5,14 +5,10 @@
  *
  * Copyright (C) 1997 Ralf Baechle
  */
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/reboot.h>
-#include <asm/system.h>
+#include <linux/kernel.h>
+
 #include <asm/cacheflush.h>
+#include <asm/mipsregs.h>
 
 void wrppmc_machine_restart(char *command)
 {
diff --git a/arch/mips/gt64120/wrppmc/serial.c b/arch/mips/gt64120/wrppmc/serial.c
new file mode 100644
index 000000000000..5ec1c2ffd3a5
--- /dev/null
+++ b/arch/mips/gt64120/wrppmc/serial.c
@@ -0,0 +1,80 @@
+/*
+ *  Registration of WRPPMC UART platform device.
+ *
+ *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/serial_8250.h>
+
+#include <asm/gt64120.h>
+
+static struct resource wrppmc_uart_resource[] __initdata = {
+        {
+                .start  = WRPPMC_UART16550_BASE,
+                .end    = WRPPMC_UART16550_BASE + 7,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = WRPPMC_UART16550_IRQ,
+                .end    = WRPPMC_UART16550_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct plat_serial8250_port wrppmc_serial8250_port[] = {
+        {
+                .irq            = WRPPMC_UART16550_IRQ,
+                .uartclk        = WRPPMC_UART16550_CLOCK,
+                .iotype         = UPIO_MEM,
+                .flags          = UPF_IOREMAP | UPF_SKIP_TEST,
+                .mapbase        = WRPPMC_UART16550_BASE,
+        },
+        {},
+};
+
+static __init int wrppmc_uart_add(void)
+{
+        struct platform_device *pdev;
+        int retval;
+
+        pdev = platform_device_alloc("serial8250", -1);
+        if (!pdev)
+                return -ENOMEM;
+
+        pdev->id = PLAT8250_DEV_PLATFORM;
+        pdev->dev.platform_data = wrppmc_serial8250_port;
+
+        retval = platform_device_add_resources(pdev, wrppmc_uart_resource,
+                                        ARRAY_SIZE(wrppmc_uart_resource));
+        if (retval)
+                goto err_free_device;
+
+        retval = platform_device_add(pdev);
+        if (retval)
+                goto err_free_device;
+
+        return 0;
+
+err_free_device:
+        platform_device_put(pdev);
+
+        return retval;
+}
+device_initcall(wrppmc_uart_add);
diff --git a/arch/mips/gt64120/wrppmc/setup.c b/arch/mips/gt64120/wrppmc/setup.c
index ed58c13b6032..51f6b7862460 100644
--- a/arch/mips/gt64120/wrppmc/setup.c
+++ b/arch/mips/gt64120/wrppmc/setup.c
@@ -11,10 +11,6 @@
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <linux/serial_8250.h>
 #include <linux/pm.h>
 
 #include <asm/io.h>
@@ -98,35 +94,8 @@ void __init prom_free_prom_memory(void)
 {
 }
 
-#ifdef CONFIG_SERIAL_8250
-static void wrppmc_setup_serial(void)
-{
-        struct uart_port up;
-
-        memset(&up, 0x00, sizeof(struct uart_port));
-
-        /*
-         * A note about mapbase/membase
-         * -) mapbase is the physical address of the IO port.
-         * -) membase is an 'ioremapped' cookie.
-         */
-        up.line = 0;
-        up.type = PORT_16550;
-        up.iotype = UPIO_MEM;
-        up.mapbase = WRPPMC_UART16550_BASE;
-        up.membase = ioremap(up.mapbase, 8);
-        up.irq = WRPPMC_UART16550_IRQ;
-        up.uartclk = WRPPMC_UART16550_CLOCK;
-        up.flags = UPF_SKIP_TEST/* | UPF_BOOT_AUTOCONF */;
-        up.regshift = 0;
-
-        early_serial_setup(&up);
-}
-#endif
-
 void __init plat_mem_setup(void)
 {
-        extern void wrppmc_time_init(void);
         extern void wrppmc_machine_restart(char *command);
         extern void wrppmc_machine_halt(void);
         extern void wrppmc_machine_power_off(void);
@@ -135,17 +104,10 @@ void __init plat_mem_setup(void)
         _machine_halt    = wrppmc_machine_halt;
         pm_power_off     = wrppmc_machine_power_off;
 
-        /* Use MIPS Count/Compare Timer */
-        board_time_init   = wrppmc_time_init;
-
         /* This makes the operations of 'in/out[bwl]' to the
          * physical address ( < KSEG0) can work via KSEG1
          */
         set_io_port_base(KSEG1);
-
-#ifdef CONFIG_SERIAL_8250
-        wrppmc_setup_serial();
-#endif
 }
 
 const char *get_system_type(void)
@@ -159,7 +121,6 @@ const char *get_system_type(void)
  */
 void __init prom_init(void)
 {
-        mips_machgroup = MACH_GROUP_WINDRIVER;
         mips_machtype = MACH_WRPPMC;
 
         add_memory_region(WRPPMC_SDRAM_SCS0_BASE, WRPPMC_SDRAM_SCS0_SIZE, BOOT_MEM_RAM);
diff --git a/arch/mips/gt64120/wrppmc/time.c b/arch/mips/gt64120/wrppmc/time.c
index 5b440859bcee..b207e7f1417a 100644
--- a/arch/mips/gt64120/wrppmc/time.c
+++ b/arch/mips/gt64120/wrppmc/time.c
@@ -11,18 +11,11 @@
  * Copyright (C) 2006, Wind River System Inc.
  */
 #include <linux/init.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/param.h>        /* for HZ */
-#include <linux/irq.h>
-#include <linux/timex.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
 
-#include <asm/reboot.h>
-#include <asm/time.h>
-#include <asm/io.h>
-#include <asm/bootinfo.h>
 #include <asm/gt64120.h>
+#include <asm/time.h>
 
 #define WRPPMC_CPU_CLK_FREQ 40000000 /* 40MHZ */
 
@@ -38,7 +31,7 @@ void __init plat_timer_setup(struct irqaction *irq)
  * NOTE: We disable all GT64120 timers, and use MIPS processor internal
  * timer as the source of kernel clock tick.
  */
-void __init wrppmc_time_init(void)
+void __init plat_time_init(void)
 {
         /* Disable GT64120 timers */
         GT_WRITE(GT_TC_CONTROL_OFS, 0x00);
diff --git a/arch/mips/jazz/Makefile b/arch/mips/jazz/Makefile
index 575a9442bc82..5aee0c266d18 100644
--- a/arch/mips/jazz/Makefile
+++ b/arch/mips/jazz/Makefile
@@ -2,6 +2,6 @@
 # Makefile for the Jazz family specific parts of the kernel
 #
 
-obj-y           := irq.o jazzdma.o jazz-platform.o reset.o setup.o
+obj-y           := irq.o jazzdma.o reset.o setup.o
 
 EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index 015cf4bb51dd..835b056cea36 100644
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -6,20 +6,23 @@
  * Copyright (C) 1992 Linus Torvalds
  * Copyright (C) 1994 - 2001, 2003 Ralf Baechle
  */
+#include <linux/clockchips.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 
+#include <asm/irq_cpu.h>
 #include <asm/i8259.h>
 #include <asm/io.h>
 #include <asm/jazz.h>
+#include <asm/pgtable.h>
 
 static DEFINE_SPINLOCK(r4030_lock);
 
 static void enable_r4030_irq(unsigned int irq)
 {
-        unsigned int mask = 1 << (irq - JAZZ_PARALLEL_IRQ);
+        unsigned int mask = 1 << (irq - JAZZ_IRQ_START);
         unsigned long flags;
 
         spin_lock_irqsave(&r4030_lock, flags);
@@ -30,7 +33,7 @@ static void enable_r4030_irq(unsigned int irq)
 
 void disable_r4030_irq(unsigned int irq)
 {
-        unsigned int mask = ~(1 << (irq - JAZZ_PARALLEL_IRQ));
+        unsigned int mask = ~(1 << (irq - JAZZ_IRQ_START));
         unsigned long flags;
 
         spin_lock_irqsave(&r4030_lock, flags);
@@ -51,7 +54,7 @@ void __init init_r4030_ints(void)
 {
         int i;
 
-        for (i = JAZZ_PARALLEL_IRQ; i <= JAZZ_TIMER_IRQ; i++)
+        for (i = JAZZ_IRQ_START; i <= JAZZ_IRQ_END; i++)
                 set_irq_chip_and_handler(i, &r4030_irq_type, handle_level_irq);
 
         r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, 0);
@@ -66,82 +69,87 @@ void __init init_r4030_ints(void)
  */
 void __init arch_init_irq(void)
 {
+        /*
+         * this is a hack to get back the still needed wired mapping
+         * killed by init_mm()
+         */
+
+        /* Map 0xe0000000 -> 0x0:800005C0, 0xe0010000 -> 0x1:30000580 */
+        add_wired_entry(0x02000017, 0x03c00017, 0xe0000000, PM_64K);
+        /* Map 0xe2000000 -> 0x0:900005C0, 0xe3010000 -> 0x0:910005C0 */
+        add_wired_entry(0x02400017, 0x02440017, 0xe2000000, PM_16M);
+        /* Map 0xe4000000 -> 0x0:600005C0, 0xe4100000 -> 400005C0 */
+        add_wired_entry(0x01800017, 0x01000017, 0xe4000000, PM_4M);
+
         init_i8259_irqs();                      /* Integrated i8259  */
+        mips_cpu_irq_init();
         init_r4030_ints();
 
-        change_c0_status(ST0_IM, IE_IRQ4 | IE_IRQ3 | IE_IRQ2 | IE_IRQ1);
-}
-
-static void loc_call(unsigned int irq, unsigned int mask)
-{
-        r4030_write_reg16(JAZZ_IO_IRQ_ENABLE,
-                          r4030_read_reg16(JAZZ_IO_IRQ_ENABLE) & mask);
-        do_IRQ(irq);
-        r4030_write_reg16(JAZZ_IO_IRQ_ENABLE,
-                          r4030_read_reg16(JAZZ_IO_IRQ_ENABLE) | mask);
-}
-
-static void ll_local_dev(void)
-{
-        switch (r4030_read_reg32(JAZZ_IO_IRQ_SOURCE)) {
-        case 0:
-                panic("Unimplemented loc_no_irq handler");
-                break;
-        case 4:
-                loc_call(JAZZ_PARALLEL_IRQ, JAZZ_IE_PARALLEL);
-                break;
-        case 8:
-                loc_call(JAZZ_PARALLEL_IRQ, JAZZ_IE_FLOPPY);
-                break;
-        case 12:
-                panic("Unimplemented loc_sound handler");
-                break;
-        case 16:
-                panic("Unimplemented loc_video handler");
-                break;
-        case 20:
-                loc_call(JAZZ_ETHERNET_IRQ, JAZZ_IE_ETHERNET);
-                break;
-        case 24:
-                loc_call(JAZZ_SCSI_IRQ, JAZZ_IE_SCSI);
-                break;
-        case 28:
-                loc_call(JAZZ_KEYBOARD_IRQ, JAZZ_IE_KEYBOARD);
-                break;
-        case 32:
-                loc_call(JAZZ_MOUSE_IRQ, JAZZ_IE_MOUSE);
-                break;
-        case 36:
-                loc_call(JAZZ_SERIAL1_IRQ, JAZZ_IE_SERIAL1);
-                break;
-        case 40:
-                loc_call(JAZZ_SERIAL2_IRQ, JAZZ_IE_SERIAL2);
-                break;
-        }
+        change_c0_status(ST0_IM, IE_IRQ2 | IE_IRQ1);
 }
 
 asmlinkage void plat_irq_dispatch(void)
 {
         unsigned int pending = read_c0_cause() & read_c0_status();
+        unsigned int irq;
 
-        if (pending & IE_IRQ5)
-                write_c0_compare(0);
-        else if (pending & IE_IRQ4) {
+        if (pending & IE_IRQ4) {
                 r4030_read_reg32(JAZZ_TIMER_REGISTER);
                 do_IRQ(JAZZ_TIMER_IRQ);
-        } else if (pending & IE_IRQ3)
-                panic("Unimplemented ISA NMI handler");
-        else if (pending & IE_IRQ2)
+        } else if (pending & IE_IRQ2)
                 do_IRQ(r4030_read_reg32(JAZZ_EISA_IRQ_ACK));
         else if (pending & IE_IRQ1) {
-                ll_local_dev();
-        } else if (unlikely(pending & IE_IRQ0))
-                panic("Unimplemented local_dma handler");
-        else if (pending & IE_SW1) {
-                clear_c0_cause(IE_SW1);
-                panic("Unimplemented sw1 handler");
-        } else if (pending & IE_SW0) {
-                clear_c0_cause(IE_SW0);
-                panic("Unimplemented sw0 handler");
+                irq = *(volatile u8 *)JAZZ_IO_IRQ_SOURCE >> 2;
+                if (likely(irq > 0))
+                        do_IRQ(irq + JAZZ_IRQ_START - 1);
+                else
+                        panic("Unimplemented loc_no_irq handler");
         }
 }
+
+static void r4030_set_mode(enum clock_event_mode mode,
+                           struct clock_event_device *evt)
+{
+        /* Nothing to do ...  */
+}
+
+struct clock_event_device r4030_clockevent = {
+        .name           = "r4030",
+        .features       = CLOCK_EVT_FEAT_PERIODIC,
+        .rating         = 100,
+        .irq            = JAZZ_TIMER_IRQ,
+        .cpumask        = CPU_MASK_CPU0,
+        .set_mode       = r4030_set_mode,
+};
+
+static irqreturn_t r4030_timer_interrupt(int irq, void *dev_id)
+{
+        r4030_clockevent.event_handler(&r4030_clockevent);
+
+        return IRQ_HANDLED;
+}
+
+static struct irqaction r4030_timer_irqaction = {
+        .handler        = r4030_timer_interrupt,
+        .flags          = IRQF_DISABLED,
+        .mask           = CPU_MASK_CPU0,
+        .name           = "timer",
+};
+
+void __init plat_timer_setup(struct irqaction *ignored)
+{
+        struct irqaction *irq = &r4030_timer_irqaction;
+
+        BUG_ON(HZ != 100);
+
+        /*
+         * Set clock to 100Hz.
+         *
+         * The R4030 timer receives an input clock of 1kHz which is divieded by
+         * a programmable 4-bit divider.  This makes it fairly inflexible.
+         */
+        r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9);
+        setup_irq(JAZZ_TIMER_IRQ, irq);
+
+        clockevents_register_device(&r4030_clockevent);
+}
diff --git a/arch/mips/jazz/jazz-platform.c b/arch/mips/jazz/jazz-platform.c
deleted file mode 100644
index fd736703eef2..000000000000
--- a/arch/mips/jazz/jazz-platform.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)
- */
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/serial_8250.h>
-
-#include <asm/jazz.h>
-
-/*
- * Confusion ...  It seems the original Microsoft Jazz machine used to have a
- * 4.096MHz clock for its UART while the MIPS Magnum and Millenium systems
- * had 8MHz.  The Olivetti M700-10 and the Acer PICA have 1.8432MHz like PCs.
- */
-#ifdef CONFIG_OLIVETTI_M700
-#define JAZZ_BASE_BAUD 1843200
-#else
-#define JAZZ_BASE_BAUD  8000000 /* 3072000 */
-#endif
-
-#define JAZZ_UART_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP)
-
-#define JAZZ_PORT(base, int)                                            \
-{                                                                       \
-        .mapbase        = base,                                         \
-        .irq            = int,                                          \
-        .uartclk        = JAZZ_BASE_BAUD,                               \
-        .iotype         = UPIO_MEM,                                     \
-        .flags          = JAZZ_UART_FLAGS,                              \
-        .regshift       = 0,                                            \
-}
-
-static struct plat_serial8250_port uart8250_data[] = {
-        JAZZ_PORT(JAZZ_SERIAL1_BASE, JAZZ_SERIAL1_IRQ),
-        JAZZ_PORT(JAZZ_SERIAL2_BASE, JAZZ_SERIAL2_IRQ),
-        { },
-};
-
-static struct platform_device uart8250_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM,
-        .dev                    = {
-                .platform_data  = uart8250_data,
-        },
-};
-
-static int __init uart8250_init(void)
-{
-        return platform_device_register(&uart8250_device);
-}
-
-module_init(uart8250_init);
-
-MODULE_AUTHOR("Ralf Baechle <ralf@linux-mips.org>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("8250 UART probe driver for the Jazz family");
diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c
index e8e0ffb9354d..c672c08d49e5 100644
--- a/arch/mips/jazz/jazzdma.c
+++ b/arch/mips/jazz/jazzdma.c
@@ -27,7 +27,7 @@
  */
 #define CONF_DEBUG_VDMA 0
 
-static unsigned long vdma_pagetable_start;
+static VDMA_PGTBL_ENTRY *pgtbl;
 
 static DEFINE_SPINLOCK(vdma_lock);
 
@@ -46,7 +46,6 @@ static int debuglvl = 3;
  */
 static inline void vdma_pgtbl_init(void)
 {
-        VDMA_PGTBL_ENTRY *pgtbl = (VDMA_PGTBL_ENTRY *) vdma_pagetable_start;
         unsigned long paddr = 0;
         int i;
 
@@ -60,31 +59,31 @@ static inline void vdma_pgtbl_init(void)
 /*
  * Initialize the Jazz R4030 dma controller
  */
-void __init vdma_init(void)
+static int __init vdma_init(void)
 {
         /*
          * Allocate 32k of memory for DMA page tables.  This needs to be page
          * aligned and should be uncached to avoid cache flushing after every
          * update.
          */
-        vdma_pagetable_start =
-                (unsigned long) alloc_bootmem_low_pages(VDMA_PGTBL_SIZE);
-        if (!vdma_pagetable_start)
+        pgtbl = (VDMA_PGTBL_ENTRY *)__get_free_pages(GFP_KERNEL | GFP_DMA,
+                                                    get_order(VDMA_PGTBL_SIZE));
+        if (!pgtbl)
                 BUG();
-        dma_cache_wback_inv(vdma_pagetable_start, VDMA_PGTBL_SIZE);
-        vdma_pagetable_start = KSEG1ADDR(vdma_pagetable_start);
+        dma_cache_wback_inv((unsigned long)pgtbl, VDMA_PGTBL_SIZE);
+        pgtbl = (VDMA_PGTBL_ENTRY *)KSEG1ADDR(pgtbl);
 
         /*
          * Clear the R4030 translation table
          */
         vdma_pgtbl_init();
 
-        r4030_write_reg32(JAZZ_R4030_TRSTBL_BASE,
-                          CPHYSADDR(vdma_pagetable_start));
+        r4030_write_reg32(JAZZ_R4030_TRSTBL_BASE, CPHYSADDR(pgtbl));
         r4030_write_reg32(JAZZ_R4030_TRSTBL_LIM, VDMA_PGTBL_SIZE);
         r4030_write_reg32(JAZZ_R4030_TRSTBL_INV, 0);
 
-        printk("VDMA: R4030 DMA pagetables initialized.\n");
+        printk(KERN_INFO "VDMA: R4030 DMA pagetables initialized.\n");
+        return 0;
 }
 
 /*
@@ -92,7 +91,6 @@ void __init vdma_init(void)
  */
 unsigned long vdma_alloc(unsigned long paddr, unsigned long size)
 {
-        VDMA_PGTBL_ENTRY *entry = (VDMA_PGTBL_ENTRY *) vdma_pagetable_start;
         int first, last, pages, frame, i;
         unsigned long laddr, flags;
 
@@ -114,10 +112,10 @@ unsigned long vdma_alloc(unsigned long paddr, unsigned long size)
         /*
          * Find free chunk
          */
-        pages = (size + 4095) >> 12;    /* no. of pages to allocate */
+        pages = VDMA_PAGE(paddr + size) - VDMA_PAGE(paddr) + 1;
         first = 0;
         while (1) {
-                while (entry[first].owner != VDMA_PAGE_EMPTY &&
+                while (pgtbl[first].owner != VDMA_PAGE_EMPTY &&
                        first < VDMA_PGTBL_ENTRIES) first++;
                 if (first + pages > VDMA_PGTBL_ENTRIES) {       /* nothing free */
                         spin_unlock_irqrestore(&vdma_lock, flags);
@@ -125,12 +123,13 @@ unsigned long vdma_alloc(unsigned long paddr, unsigned long size)
                 }
 
                 last = first + 1;
-                while (entry[last].owner == VDMA_PAGE_EMPTY
+                while (pgtbl[last].owner == VDMA_PAGE_EMPTY
                        && last - first < pages)
                         last++;
 
                 if (last - first == pages)
                         break;  /* found */
+                first = last + 1;
         }
 
         /*
@@ -140,8 +139,8 @@ unsigned long vdma_alloc(unsigned long paddr, unsigned long size)
         frame = paddr & ~(VDMA_PAGESIZE - 1);
 
         for (i = first; i < last; i++) {
-                entry[i].frame = frame;
-                entry[i].owner = laddr;
+                pgtbl[i].frame = frame;
+                pgtbl[i].owner = laddr;
                 frame += VDMA_PAGESIZE;
         }
 
@@ -160,10 +159,10 @@ unsigned long vdma_alloc(unsigned long paddr, unsigned long size)
                         printk("%08x ", i << 12);
                 printk("\nPADDR: ");
                 for (i = first; i < last; i++)
-                        printk("%08x ", entry[i].frame);
+                        printk("%08x ", pgtbl[i].frame);
                 printk("\nOWNER: ");
                 for (i = first; i < last; i++)
-                        printk("%08x ", entry[i].owner);
+                        printk("%08x ", pgtbl[i].owner);
                 printk("\n");
         }
 
@@ -181,7 +180,6 @@ EXPORT_SYMBOL(vdma_alloc);
  */
 int vdma_free(unsigned long laddr)
 {
-        VDMA_PGTBL_ENTRY *pgtbl = (VDMA_PGTBL_ENTRY *) vdma_pagetable_start;
         int i;
 
         i = laddr >> 12;
@@ -213,8 +211,6 @@ EXPORT_SYMBOL(vdma_free);
  */
 int vdma_remap(unsigned long laddr, unsigned long paddr, unsigned long size)
 {
-        VDMA_PGTBL_ENTRY *pgtbl =
-            (VDMA_PGTBL_ENTRY *) vdma_pagetable_start;
         int first, pages, npages;
 
         if (laddr > 0xffffff) {
@@ -289,8 +285,6 @@ unsigned long vdma_phys2log(unsigned long paddr)
 {
         int i;
         int frame;
-        VDMA_PGTBL_ENTRY *pgtbl =
-            (VDMA_PGTBL_ENTRY *) vdma_pagetable_start;
 
         frame = paddr & ~(VDMA_PAGESIZE - 1);
 
@@ -312,9 +306,6 @@ EXPORT_SYMBOL(vdma_phys2log);
  */
 unsigned long vdma_log2phys(unsigned long laddr)
 {
-        VDMA_PGTBL_ENTRY *pgtbl =
-            (VDMA_PGTBL_ENTRY *) vdma_pagetable_start;
-
         return pgtbl[laddr >> 12].frame + (laddr & (VDMA_PAGESIZE - 1));
 }
 
@@ -564,3 +555,5 @@ int vdma_get_enable(int channel)
 
         return enable;
 }
+
+arch_initcall(vdma_init);
diff --git a/arch/mips/jazz/reset.c b/arch/mips/jazz/reset.c
index d8ade85060b3..dd889fe86bd1 100644
--- a/arch/mips/jazz/reset.c
+++ b/arch/mips/jazz/reset.c
@@ -49,8 +49,8 @@ void jazz_machine_restart(char *command)
 {
         while(1) {
                 kb_wait();
-                jazz_write_command (0xd1);
+                jazz_write_command(0xd1);
                 kb_wait();
-                jazz_write_output (0x00);
+                jazz_write_output(0x00);
         }
 }
diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index 798279e06691..cfc7dce78dab 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -7,6 +7,7 @@
  *
  * Copyright (C) 1996, 1997, 1998, 2001 by Ralf Baechle
  * Copyright (C) 2001 MIPS Technologies, Inc.
+ * Copyright (C) 2007 by Thomas Bogendoerfer
  */
 #include <linux/eisa.h>
 #include <linux/hdreg.h>
@@ -20,8 +21,11 @@
 #include <linux/ide.h>
 #include <linux/pm.h>
 #include <linux/screen_info.h>
+#include <linux/platform_device.h>
+#include <linux/serial_8250.h>
 
 #include <asm/bootinfo.h>
+#include <asm/i8253.h>
 #include <asm/irq.h>
 #include <asm/jazz.h>
 #include <asm/jazzdma.h>
@@ -30,18 +34,12 @@
 #include <asm/pgtable.h>
 #include <asm/time.h>
 #include <asm/traps.h>
+#include <asm/mc146818-time.h>
 
 extern asmlinkage void jazz_handle_int(void);
 
 extern void jazz_machine_restart(char *command);
 
-void __init plat_timer_setup(struct irqaction *irq)
-{
-        /* set the clock to 100 Hz */
-        r4030_write_reg32(JAZZ_TIMER_INTERVAL, 9);
-        setup_irq(JAZZ_TIMER_IRQ, irq);
-}
-
 static struct resource jazz_io_resources[] = {
         {
                 .start  = 0x00,
@@ -66,18 +64,21 @@ static struct resource jazz_io_resources[] = {
         }
 };
 
+void __init plat_time_init(void)
+{
+        setup_pit_timer();
+}
+
 void __init plat_mem_setup(void)
 {
         int i;
 
         /* Map 0xe0000000 -> 0x0:800005C0, 0xe0010000 -> 0x1:30000580 */
-        add_wired_entry (0x02000017, 0x03c00017, 0xe0000000, PM_64K);
-
+        add_wired_entry(0x02000017, 0x03c00017, 0xe0000000, PM_64K);
         /* Map 0xe2000000 -> 0x0:900005C0, 0xe3010000 -> 0x0:910005C0 */
-        add_wired_entry (0x02400017, 0x02440017, 0xe2000000, PM_16M);
-
+        add_wired_entry(0x02400017, 0x02440017, 0xe2000000, PM_16M);
         /* Map 0xe4000000 -> 0x0:600005C0, 0xe4100000 -> 400005C0 */
-        add_wired_entry (0x01800017, 0x01000017, 0xe4000000, PM_4M);
+        add_wired_entry(0x01800017, 0x01000017, 0xe4000000, PM_4M);
 
         set_io_port_base(JAZZ_PORT_BASE);
 #ifdef CONFIG_EISA
@@ -94,6 +95,7 @@ void __init plat_mem_setup(void)
 
         _machine_restart = jazz_machine_restart;
 
+#ifdef CONFIG_VT
         screen_info = (struct screen_info) {
                 0, 0,           /* orig-x, orig-y */
                 0,              /* unused */
@@ -105,6 +107,112 @@ void __init plat_mem_setup(void)
                 0,              /* orig_video_isVGA */
                 16              /* orig_video_points */
         };
+#endif
 
-        vdma_init();
+        add_preferred_console("ttyS", 0, "9600");
 }
+
+#ifdef CONFIG_OLIVETTI_M700
+#define UART_CLK  1843200
+#else
+/* Some Jazz machines seem to have an 8MHz crystal clock but I don't know
+   exactly which ones ... XXX */
+#define UART_CLK (8000000 / 16) /* ( 3072000 / 16) */
+#endif
+
+#define MEMPORT(_base, _irq)                            \
+        {                                               \
+                .mapbase        = (_base),              \
+                .membase        = (void *)(_base),      \
+                .irq            = (_irq),               \
+                .uartclk        = UART_CLK,             \
+                .iotype         = UPIO_MEM,             \
+                .flags          = UPF_BOOT_AUTOCONF,    \
+        }
+
+static struct plat_serial8250_port jazz_serial_data[] = {
+        MEMPORT(JAZZ_SERIAL1_BASE, JAZZ_SERIAL1_IRQ),
+        MEMPORT(JAZZ_SERIAL2_BASE, JAZZ_SERIAL2_IRQ),
+        { },
+};
+
+static struct platform_device jazz_serial8250_device = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM,
+        .dev                    = {
+                .platform_data  = jazz_serial_data,
+        },
+};
+
+static struct resource jazz_esp_rsrc[] = {
+        {
+                .start = JAZZ_SCSI_BASE,
+                .end   = JAZZ_SCSI_BASE + 31,
+                .flags = IORESOURCE_MEM
+        },
+        {
+                .start = JAZZ_SCSI_DMA,
+                .end   = JAZZ_SCSI_DMA,
+                .flags = IORESOURCE_MEM
+        },
+        {
+                .start = JAZZ_SCSI_IRQ,
+                .end   = JAZZ_SCSI_IRQ,
+                .flags = IORESOURCE_IRQ
+        }
+};
+
+static struct platform_device jazz_esp_pdev = {
+        .name           = "jazz_esp",
+        .num_resources  = ARRAY_SIZE(jazz_esp_rsrc),
+        .resource       = jazz_esp_rsrc
+};
+
+static struct resource jazz_sonic_rsrc[] = {
+        {
+                .start = JAZZ_ETHERNET_BASE,
+                .end   = JAZZ_ETHERNET_BASE + 0xff,
+                .flags = IORESOURCE_MEM
+        },
+        {
+                .start = JAZZ_ETHERNET_IRQ,
+                .end   = JAZZ_ETHERNET_IRQ,
+                .flags = IORESOURCE_IRQ
+        }
+};
+
+static struct platform_device jazz_sonic_pdev = {
+        .name           = "jazzsonic",
+        .num_resources  = ARRAY_SIZE(jazz_sonic_rsrc),
+        .resource       = jazz_sonic_rsrc
+};
+
+static struct resource jazz_cmos_rsrc[] = {
+        {
+                .start = 0x70,
+                .end   = 0x71,
+                .flags = IORESOURCE_IO
+        },
+        {
+                .start = 8,
+                .end   = 8,
+                .flags = IORESOURCE_IRQ
+        }
+};
+
+static struct platform_device jazz_cmos_pdev = {
+        .name           = "rtc_cmos",
+        .num_resources  = ARRAY_SIZE(jazz_cmos_rsrc),
+        .resource       = jazz_cmos_rsrc
+};
+
+static int __init jazz_setup_devinit(void)
+{
+        platform_device_register(&jazz_serial8250_device);
+        platform_device_register(&jazz_esp_pdev);
+        platform_device_register(&jazz_sonic_pdev);
+        platform_device_register(&jazz_cmos_pdev);
+        return 0;
+}
+
+device_initcall(jazz_setup_devinit);
diff --git a/arch/mips/jmr3927/rbhma3100/init.c b/arch/mips/jmr3927/rbhma3100/init.c
index 9169fab1773a..b643f75ec9a5 100644
--- a/arch/mips/jmr3927/rbhma3100/init.c
+++ b/arch/mips/jmr3927/rbhma3100/init.c
@@ -51,7 +51,6 @@ void __init prom_init(void)
         if ((tx3927_ccfgptr->ccfg & TX3927_CCFG_TLBOFF) == 0)
                 puts("Warning: TX3927 TLB off\n");
 #endif
-        mips_machgroup = MACH_GROUP_TOSHIBA;
 
 #ifdef CONFIG_TOSHIBA_JMR3927
         mips_machtype = MACH_TOSHIBA_JMR3927;
diff --git a/arch/mips/jmr3927/rbhma3100/irq.c b/arch/mips/jmr3927/rbhma3100/irq.c
index d9efe692e551..3a47e8ce1196 100644
--- a/arch/mips/jmr3927/rbhma3100/irq.c
+++ b/arch/mips/jmr3927/rbhma3100/irq.c
@@ -104,7 +104,9 @@ static irqreturn_t jmr3927_ioc_interrupt(int irq, void *dev_id)
 }
 
 static struct irqaction ioc_action = {
-        jmr3927_ioc_interrupt, 0, CPU_MASK_NONE, "IOC", NULL, NULL,
+        .handler = jmr3927_ioc_interrupt,
+        .mask = CPU_MASK_NONE,
+        .name = "IOC",
 };
 
 static irqreturn_t jmr3927_pcierr_interrupt(int irq, void *dev_id)
@@ -116,7 +118,9 @@ static irqreturn_t jmr3927_pcierr_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 static struct irqaction pcierr_action = {
-        jmr3927_pcierr_interrupt, 0, CPU_MASK_NONE, "PCI error", NULL, NULL,
+        .handler = jmr3927_pcierr_interrupt,
+        .mask = CPU_MASK_NONE,
+        .name = "PCI error",
 };
 
 static void __init jmr3927_irq_init(void);
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c
index fde56e86c2ab..7f14f70a1b88 100644
--- a/arch/mips/jmr3927/rbhma3100/setup.c
+++ b/arch/mips/jmr3927/rbhma3100/setup.c
@@ -109,7 +109,7 @@ static void jmr3927_timer_ack(void)
         jmr3927_tmrptr->tisr = 0;       /* ack interrupt */
 }
 
-static void __init jmr3927_time_init(void)
+void __init plat_time_init(void)
 {
         clocksource_mips.read = jmr3927_hpt_read;
         mips_timer_ack = jmr3927_timer_ack;
@@ -141,8 +141,6 @@ void __init plat_mem_setup(void)
 
         set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO);
 
-        board_time_init = jmr3927_time_init;
-
         _machine_restart = jmr3927_machine_restart;
         _machine_halt = jmr3927_machine_halt;
         pm_power_off = jmr3927_machine_power_off;
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index 2fd96d95a39c..a2689f93c160 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -51,6 +51,7 @@ obj-$(CONFIG_IRQ_CPU_RM7K)	+= irq-rm7000.o
 obj-$(CONFIG_IRQ_CPU_RM9K)      += irq-rm9000.o
 obj-$(CONFIG_MIPS_BOARDS_GEN)   += irq-msc01.o
 obj-$(CONFIG_IRQ_TXX9)          += irq_txx9.o
+obj-$(CONFIG_IRQ_GT641XX)       += irq-gt641xx.o
 
 obj-$(CONFIG_32BIT)             += scall32-o32.o
 obj-$(CONFIG_64BIT)             += scall64-64.o
@@ -64,6 +65,7 @@ obj-$(CONFIG_PROC_FS)		+= proc.o
 
 obj-$(CONFIG_64BIT)             += cpu-bugs64.o
 
+obj-$(CONFIG_I8253)             += i8253.o
 obj-$(CONFIG_PCSPEAKER)         += pcspeaker.o
 
 obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
index 993f7ec70f35..da41eac195ca 100644
--- a/arch/mips/kernel/binfmt_elfo32.c
+++ b/arch/mips/kernel/binfmt_elfo32.c
@@ -110,7 +110,7 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
 }
 
 #undef ELF_CORE_COPY_REGS
-#define ELF_CORE_COPY_REGS(_dest,_regs) elf32_core_copy_regs(_dest,_regs);
+#define ELF_CORE_COPY_REGS(_dest, _regs) elf32_core_copy_regs(_dest, _regs);
 
 void elf32_core_copy_regs(elf_gregset_t grp, struct pt_regs *regs)
 {
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
index 6648fde20b96..af78456d4138 100644
--- a/arch/mips/kernel/cpu-bugs64.c
+++ b/arch/mips/kernel/cpu-bugs64.c
@@ -29,7 +29,7 @@ static inline void align_mod(const int align, const int mod)
                 ".endr\n\t"
                 ".set   pop"
                 :
-                : GCC_IMM_ASM (align), GCC_IMM_ASM (mod));
+                : GCC_IMM_ASM(align), GCC_IMM_ASM(mod));
 }
 
 static inline void mult_sh_align_mod(long *v1, long *v2, long *w,
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 3e004161ebd5..c8c47a2d1972 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -159,6 +159,7 @@ static inline void check_wait(void)
         case CPU_5KC:
         case CPU_25KF:
         case CPU_PR4450:
+        case CPU_BCM3302:
                 cpu_wait = r4k_wait;
                 break;
 
@@ -745,14 +746,6 @@ static inline void cpu_probe_sibyte(struct cpuinfo_mips *c)
 {
         decode_configs(c);
 
-        /*
-         * For historical reasons the SB1 comes with it's own variant of
-         * cache code which eventually will be folded into c-r4k.c.  Until
-         * then we pretend it's got it's own cache architecture.
-         */
-        c->options &= ~MIPS_CPU_4K_CACHE;
-        c->options |= MIPS_CPU_SB1_CACHE;
-
         switch (c->processor_id & 0xff00) {
         case PRID_IMP_SB1:
                 c->cputype = CPU_SB1;
@@ -793,9 +786,111 @@ static inline void cpu_probe_philips(struct cpuinfo_mips *c)
 }
 
 
+static inline void cpu_probe_broadcom(struct cpuinfo_mips *c)
+{
+        decode_configs(c);
+        switch (c->processor_id & 0xff00) {
+        case PRID_IMP_BCM3302:
+                c->cputype = CPU_BCM3302;
+                break;
+        case PRID_IMP_BCM4710:
+                c->cputype = CPU_BCM4710;
+                break;
+        default:
+                c->cputype = CPU_UNKNOWN;
+                break;
+        }
+}
+
+const char *__cpu_name[NR_CPUS];
+
+/*
+ * Name a CPU
+ */
+static __init const char *cpu_to_name(struct cpuinfo_mips *c)
+{
+        const char *name = NULL;
+
+        switch (c->cputype) {
+        case CPU_UNKNOWN:       name = "unknown"; break;
+        case CPU_R2000:         name = "R2000"; break;
+        case CPU_R3000:         name = "R3000"; break;
+        case CPU_R3000A:        name = "R3000A"; break;
+        case CPU_R3041:         name = "R3041"; break;
+        case CPU_R3051:         name = "R3051"; break;
+        case CPU_R3052:         name = "R3052"; break;
+        case CPU_R3081:         name = "R3081"; break;
+        case CPU_R3081E:        name = "R3081E"; break;
+        case CPU_R4000PC:       name = "R4000PC"; break;
+        case CPU_R4000SC:       name = "R4000SC"; break;
+        case CPU_R4000MC:       name = "R4000MC"; break;
+        case CPU_R4200:         name = "R4200"; break;
+        case CPU_R4400PC:       name = "R4400PC"; break;
+        case CPU_R4400SC:       name = "R4400SC"; break;
+        case CPU_R4400MC:       name = "R4400MC"; break;
+        case CPU_R4600:         name = "R4600"; break;
+        case CPU_R6000:         name = "R6000"; break;
+        case CPU_R6000A:        name = "R6000A"; break;
+        case CPU_R8000:         name = "R8000"; break;
+        case CPU_R10000:        name = "R10000"; break;
+        case CPU_R12000:        name = "R12000"; break;
+        case CPU_R14000:        name = "R14000"; break;
+        case CPU_R4300:         name = "R4300"; break;
+        case CPU_R4650:         name = "R4650"; break;
+        case CPU_R4700:         name = "R4700"; break;
+        case CPU_R5000:         name = "R5000"; break;
+        case CPU_R5000A:        name = "R5000A"; break;
+        case CPU_R4640:         name = "R4640"; break;
+        case CPU_NEVADA:        name = "Nevada"; break;
+        case CPU_RM7000:        name = "RM7000"; break;
+        case CPU_RM9000:        name = "RM9000"; break;
+        case CPU_R5432:         name = "R5432"; break;
+        case CPU_4KC:           name = "MIPS 4Kc"; break;
+        case CPU_5KC:           name = "MIPS 5Kc"; break;
+        case CPU_R4310:         name = "R4310"; break;
+        case CPU_SB1:           name = "SiByte SB1"; break;
+        case CPU_SB1A:          name = "SiByte SB1A"; break;
+        case CPU_TX3912:        name = "TX3912"; break;
+        case CPU_TX3922:        name = "TX3922"; break;
+        case CPU_TX3927:        name = "TX3927"; break;
+        case CPU_AU1000:        name = "Au1000"; break;
+        case CPU_AU1500:        name = "Au1500"; break;
+        case CPU_AU1100:        name = "Au1100"; break;
+        case CPU_AU1550:        name = "Au1550"; break;
+        case CPU_AU1200:        name = "Au1200"; break;
+        case CPU_4KEC:          name = "MIPS 4KEc"; break;
+        case CPU_4KSC:          name = "MIPS 4KSc"; break;
+        case CPU_VR41XX:        name = "NEC Vr41xx"; break;
+        case CPU_R5500:         name = "R5500"; break;
+        case CPU_TX49XX:        name = "TX49xx"; break;
+        case CPU_20KC:          name = "MIPS 20Kc"; break;
+        case CPU_24K:           name = "MIPS 24K"; break;
+        case CPU_25KF:          name = "MIPS 25Kf"; break;
+        case CPU_34K:           name = "MIPS 34K"; break;
+        case CPU_74K:           name = "MIPS 74K"; break;
+        case CPU_VR4111:        name = "NEC VR4111"; break;
+        case CPU_VR4121:        name = "NEC VR4121"; break;
+        case CPU_VR4122:        name = "NEC VR4122"; break;
+        case CPU_VR4131:        name = "NEC VR4131"; break;
+        case CPU_VR4133:        name = "NEC VR4133"; break;
+        case CPU_VR4181:        name = "NEC VR4181"; break;
+        case CPU_VR4181A:       name = "NEC VR4181A"; break;
+        case CPU_SR71000:       name = "Sandcraft SR71000"; break;
+        case CPU_BCM3302:       name = "Broadcom BCM3302"; break;
+        case CPU_BCM4710:       name = "Broadcom BCM4710"; break;
+        case CPU_PR4450:        name = "Philips PR4450"; break;
+        case CPU_LOONGSON2:     name = "ICT Loongson-2"; break;
+        default:
+                BUG();
+        }
+
+        return name;
+}
+
 __init void cpu_probe(void)
 {
         struct cpuinfo_mips *c = &current_cpu_data;
+        unsigned int cpu = smp_processor_id();
 
         c->processor_id = PRID_IMP_UNKNOWN;
         c->fpu_id       = FPIR_IMP_NONE;
@@ -815,6 +910,9 @@ __init void cpu_probe(void)
         case PRID_COMP_SIBYTE:
                 cpu_probe_sibyte(c);
                 break;
+        case PRID_COMP_BROADCOM:
+                cpu_probe_broadcom(c);
+                break;
         case PRID_COMP_SANDCRAFT:
                 cpu_probe_sandcraft(c);
                 break;
@@ -824,6 +922,14 @@ __init void cpu_probe(void)
         default:
                 c->cputype = CPU_UNKNOWN;
         }
+
+        /*
+         * Platform code can force the cpu type to optimize code
+         * generation. In that case be sure the cpu type is correctly
+         * manually setup otherwise it could trigger some nasty bugs.
+         */
+        BUG_ON(current_cpu_type() != c->cputype);
+
         if (c->options & MIPS_CPU_FPU) {
                 c->fpu_id = cpu_get_fpu_id();
 
@@ -835,13 +941,16 @@ __init void cpu_probe(void)
                                 c->ases |= MIPS_ASE_MIPS3D;
                 }
         }
+
+        __cpu_name[cpu] = cpu_to_name(c);
 }
 
 __init void cpu_report(void)
 {
         struct cpuinfo_mips *c = &current_cpu_data;
 
-        printk("CPU revision is: %08x\n", c->processor_id);
+        printk(KERN_INFO "CPU revision is: %08x (%s)\n",
+               c->processor_id, cpu_name_string());
         if (c->options & MIPS_CPU_FPU)
-                printk("FPU revision is: %08x\n", c->fpu_id);
+                printk(KERN_INFO "FPU revision is: %08x\n", c->fpu_id);
 }
diff --git a/arch/mips/kernel/gdb-stub.c b/arch/mips/kernel/gdb-stub.c
index cb5623aad552..3191afa29ad8 100644
--- a/arch/mips/kernel/gdb-stub.c
+++ b/arch/mips/kernel/gdb-stub.c
@@ -676,15 +676,18 @@ static void kgdb_wait(void *arg)
 static int kgdb_smp_call_kgdb_wait(void)
 {
 #ifdef CONFIG_SMP
+        cpumask_t mask = cpu_online_map;
         struct call_data_struct data;
-        int i, cpus = num_online_cpus() - 1;
         int cpu = smp_processor_id();
+        int cpus;
 
         /*
          * Can die spectacularly if this CPU isn't yet marked online
          */
         BUG_ON(!cpu_online(cpu));
 
+        cpu_clear(cpu, mask);
+        cpus = cpus_weight(mask);
         if (!cpus)
                 return 0;
 
@@ -711,10 +714,7 @@ static int kgdb_smp_call_kgdb_wait(void)
         call_data = &data;
         mb();
 
-        /* Send a message to all other CPUs and wait for them to respond */
-        for (i = 0; i < NR_CPUS; i++)
-                if (cpu_online(i) && i != cpu)
-                        core_send_ipi(i, SMP_CALL_FUNCTION);
+        core_send_ipi_mask(mask, SMP_CALL_FUNCTION);
 
         /* Wait for response */
         /* FIXME: lock-up detection, backtrace on lock-up */
@@ -733,7 +733,7 @@ static int kgdb_smp_call_kgdb_wait(void)
  * returns 1 if you should skip the instruction at the trap address, 0
  * otherwise.
  */
-void handle_exception (struct gdb_regs *regs)
+void handle_exception(struct gdb_regs *regs)
 {
         int trap;                       /* Trap type */
         int sigval;
@@ -769,7 +769,7 @@ void handle_exception (struct gdb_regs *regs)
         /*
          * acquire the CPU spinlocks
          */
-        for (i = num_online_cpus()-1; i >= 0; i--)
+        for_each_online_cpu(i)
                 if (__raw_spin_trylock(&kgdb_cpulock[i]) == 0)
                         panic("kgdb: couldn't get cpulock %d\n", i);
 
@@ -902,7 +902,7 @@ void handle_exception (struct gdb_regs *regs)
                         hex2mem(ptr, (char *)&regs->frame_ptr, 2*sizeof(long), 0, 0);
                         ptr += 2*(2*sizeof(long));
                         hex2mem(ptr, (char *)&regs->cp0_index, 16*sizeof(long), 0, 0);
-                        strcpy(output_buffer,"OK");
+                        strcpy(output_buffer, "OK");
                  }
                 break;
 
@@ -917,9 +917,9 @@ void handle_exception (struct gdb_regs *regs)
                                 && hexToInt(&ptr, &length)) {
                                 if (mem2hex((char *)addr, output_buffer, length, 1))
                                         break;
-                                strcpy (output_buffer, "E03");
+                                strcpy(output_buffer, "E03");
                         } else
-                                strcpy(output_buffer,"E01");
+                                strcpy(output_buffer, "E01");
                         break;
 
                 /*
@@ -996,7 +996,7 @@ void handle_exception (struct gdb_regs *regs)
                         ptr = &input_buffer[1];
                         if (!hexToInt(&ptr, &baudrate))
                         {
-                                strcpy(output_buffer,"B01");
+                                strcpy(output_buffer, "B01");
                                 break;
                         }
 
@@ -1015,7 +1015,7 @@ void handle_exception (struct gdb_regs *regs)
                                         break;
                                 default:
                                         baudrate = 0;
-                                        strcpy(output_buffer,"B02");
+                                        strcpy(output_buffer, "B02");
                                         goto x1;
                         }
 
@@ -1044,7 +1044,7 @@ finish_kgdb:
 
 exit_kgdb_exception:
         /* release locks so other CPUs can go */
-        for (i = num_online_cpus()-1; i >= 0; i--)
+        for_each_online_cpu(i)
                 __raw_spin_unlock(&kgdb_cpulock[i]);
         spin_unlock(&kgdb_lock);
 
diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c
new file mode 100644
index 000000000000..5d9830df3595
--- /dev/null
+++ b/arch/mips/kernel/i8253.c
@@ -0,0 +1,213 @@
+/*
+ * i8253.c  8253/PIT functions
+ *
+ */
+#include <linux/clockchips.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/jiffies.h>
+#include <linux/module.h>
+#include <linux/spinlock.h>
+
+#include <asm/delay.h>
+#include <asm/i8253.h>
+#include <asm/io.h>
+
+static DEFINE_SPINLOCK(i8253_lock);
+
+/*
+ * Initialize the PIT timer.
+ *
+ * This is also called after resume to bring the PIT into operation again.
+ */
+static void init_pit_timer(enum clock_event_mode mode,
+                           struct clock_event_device *evt)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&i8253_lock, flags);
+
+        switch(mode) {
+        case CLOCK_EVT_MODE_PERIODIC:
+                /* binary, mode 2, LSB/MSB, ch 0 */
+                outb_p(0x34, PIT_MODE);
+                outb_p(LATCH & 0xff , PIT_CH0); /* LSB */
+                outb(LATCH >> 8 , PIT_CH0);     /* MSB */
+                break;
+
+        case CLOCK_EVT_MODE_SHUTDOWN:
+        case CLOCK_EVT_MODE_UNUSED:
+                if (evt->mode == CLOCK_EVT_MODE_PERIODIC ||
+                    evt->mode == CLOCK_EVT_MODE_ONESHOT) {
+                        outb_p(0x30, PIT_MODE);
+                        outb_p(0, PIT_CH0);
+                        outb_p(0, PIT_CH0);
+                }
+                break;
+
+        case CLOCK_EVT_MODE_ONESHOT:
+                /* One shot setup */
+                outb_p(0x38, PIT_MODE);
+                break;
+
+        case CLOCK_EVT_MODE_RESUME:
+                /* Nothing to do here */
+                break;
+        }
+        spin_unlock_irqrestore(&i8253_lock, flags);
+}
+
+/*
+ * Program the next event in oneshot mode
+ *
+ * Delta is given in PIT ticks
+ */
+static int pit_next_event(unsigned long delta, struct clock_event_device *evt)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&i8253_lock, flags);
+        outb_p(delta & 0xff , PIT_CH0); /* LSB */
+        outb(delta >> 8 , PIT_CH0);     /* MSB */
+        spin_unlock_irqrestore(&i8253_lock, flags);
+
+        return 0;
+}
+
+/*
+ * On UP the PIT can serve all of the possible timer functions. On SMP systems
+ * it can be solely used for the global tick.
+ *
+ * The profiling and update capabilites are switched off once the local apic is
+ * registered. This mechanism replaces the previous #ifdef LOCAL_APIC -
+ * !using_apic_timer decisions in do_timer_interrupt_hook()
+ */
+struct clock_event_device pit_clockevent = {
+        .name           = "pit",
+        .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+        .set_mode       = init_pit_timer,
+        .set_next_event = pit_next_event,
+        .shift          = 32,
+        .irq            = 0,
+};
+
+irqreturn_t timer_interrupt(int irq, void *dev_id)
+{
+        pit_clockevent.event_handler(&pit_clockevent);
+
+        return IRQ_HANDLED;
+}
+
+static struct irqaction irq0  = {
+        .handler = timer_interrupt,
+        .flags = IRQF_DISABLED | IRQF_NOBALANCING,
+        .mask = CPU_MASK_NONE,
+        .name = "timer"
+};
+
+/*
+ * Initialize the conversion factor and the min/max deltas of the clock event
+ * structure and register the clock event source with the framework.
+ */
+void __init setup_pit_timer(void)
+{
+        /*
+         * Start pit with the boot cpu mask and make it global after the
+         * IO_APIC has been initialized.
+         */
+        pit_clockevent.cpumask = cpumask_of_cpu(0);
+        pit_clockevent.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, 32);
+        pit_clockevent.max_delta_ns =
+                clockevent_delta2ns(0x7FFF, &pit_clockevent);
+        pit_clockevent.min_delta_ns =
+                clockevent_delta2ns(0xF, &pit_clockevent);
+        clockevents_register_device(&pit_clockevent);
+
+        irq0.mask = cpumask_of_cpu(0);
+        setup_irq(0, &irq0);
+}
+
+/*
+ * Since the PIT overflows every tick, its not very useful
+ * to just read by itself. So use jiffies to emulate a free
+ * running counter:
+ */
+static cycle_t pit_read(void)
+{
+        unsigned long flags;
+        int count;
+        u32 jifs;
+        static int old_count;
+        static u32 old_jifs;
+
+        spin_lock_irqsave(&i8253_lock, flags);
+        /*
+         * Although our caller may have the read side of xtime_lock,
+         * this is now a seqlock, and we are cheating in this routine
+         * by having side effects on state that we cannot undo if
+         * there is a collision on the seqlock and our caller has to
+         * retry.  (Namely, old_jifs and old_count.)  So we must treat
+         * jiffies as volatile despite the lock.  We read jiffies
+         * before latching the timer count to guarantee that although
+         * the jiffies value might be older than the count (that is,
+         * the counter may underflow between the last point where
+         * jiffies was incremented and the point where we latch the
+         * count), it cannot be newer.
+         */
+        jifs = jiffies;
+        outb_p(0x00, PIT_MODE); /* latch the count ASAP */
+        count = inb_p(PIT_CH0); /* read the latched count */
+        count |= inb_p(PIT_CH0) << 8;
+
+        /* VIA686a test code... reset the latch if count > max + 1 */
+        if (count > LATCH) {
+                outb_p(0x34, PIT_MODE);
+                outb_p(LATCH & 0xff, PIT_CH0);
+                outb(LATCH >> 8, PIT_CH0);
+                count = LATCH - 1;
+        }
+
+        /*
+         * It's possible for count to appear to go the wrong way for a
+         * couple of reasons:
+         *
+         *  1. The timer counter underflows, but we haven't handled the
+         *     resulting interrupt and incremented jiffies yet.
+         *  2. Hardware problem with the timer, not giving us continuous time,
+         *     the counter does small "jumps" upwards on some Pentium systems,
+         *     (see c't 95/10 page 335 for Neptun bug.)
+         *
+         * Previous attempts to handle these cases intelligently were
+         * buggy, so we just do the simple thing now.
+         */
+        if (count > old_count && jifs == old_jifs) {
+                count = old_count;
+        }
+        old_count = count;
+        old_jifs = jifs;
+
+        spin_unlock_irqrestore(&i8253_lock, flags);
+
+        count = (LATCH - 1) - count;
+
+        return (cycle_t)(jifs * LATCH) + count;
+}
+
+static struct clocksource clocksource_pit = {
+        .name   = "pit",
+        .rating = 110,
+        .read   = pit_read,
+        .mask   = CLOCKSOURCE_MASK(32),
+        .mult   = 0,
+        .shift  = 20,
+};
+
+static int __init init_pit_clocksource(void)
+{
+        if (num_possible_cpus() > 1) /* PIT does not scale! */
+                return 0;
+
+        clocksource_pit.mult = clocksource_hz2mult(CLOCK_TICK_RATE, 20);
+        return clocksource_register(&clocksource_pit);
+}
+arch_initcall(init_pit_clocksource);
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index 3a2d255361bc..471013577108 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -30,8 +30,10 @@
 
 static int i8259A_auto_eoi = -1;
 DEFINE_SPINLOCK(i8259A_lock);
-/* some platforms call this... */
-void mask_and_ack_8259A(unsigned int);
+static void disable_8259A_irq(unsigned int irq);
+static void enable_8259A_irq(unsigned int irq);
+static void mask_and_ack_8259A(unsigned int irq);
+static void init_8259A(int auto_eoi);
 
 static struct irq_chip i8259A_chip = {
         .name           = "XT-PIC",
@@ -39,6 +41,9 @@ static struct irq_chip i8259A_chip = {
         .disable        = disable_8259A_irq,
         .unmask         = enable_8259A_irq,
         .mask_ack       = mask_and_ack_8259A,
+#ifdef CONFIG_MIPS_MT_SMTC_IRQAFF
+        .set_affinity   = plat_set_irq_affinity,
+#endif /* CONFIG_MIPS_MT_SMTC_IRQAFF */
 };
 
 /*
@@ -53,7 +58,7 @@ static unsigned int cached_irq_mask = 0xffff;
 #define cached_master_mask      (cached_irq_mask)
 #define cached_slave_mask       (cached_irq_mask >> 8)
 
-void disable_8259A_irq(unsigned int irq)
+static void disable_8259A_irq(unsigned int irq)
 {
         unsigned int mask;
         unsigned long flags;
@@ -69,7 +74,7 @@ void disable_8259A_irq(unsigned int irq)
         spin_unlock_irqrestore(&i8259A_lock, flags);
 }
 
-void enable_8259A_irq(unsigned int irq)
+static void enable_8259A_irq(unsigned int irq)
 {
         unsigned int mask;
         unsigned long flags;
@@ -122,14 +127,14 @@ static inline int i8259A_irq_real(unsigned int irq)
         int irqmask = 1 << irq;
 
         if (irq < 8) {
-                outb(0x0B,PIC_MASTER_CMD);      /* ISR register */
+                outb(0x0B, PIC_MASTER_CMD);     /* ISR register */
                 value = inb(PIC_MASTER_CMD) & irqmask;
-                outb(0x0A,PIC_MASTER_CMD);      /* back to the IRR register */
+                outb(0x0A, PIC_MASTER_CMD);     /* back to the IRR register */
                 return value;
         }
-        outb(0x0B,PIC_SLAVE_CMD);       /* ISR register */
+        outb(0x0B, PIC_SLAVE_CMD);      /* ISR register */
         value = inb(PIC_SLAVE_CMD) & (irqmask >> 8);
-        outb(0x0A,PIC_SLAVE_CMD);       /* back to the IRR register */
+        outb(0x0A, PIC_SLAVE_CMD);      /* back to the IRR register */
         return value;
 }
 
@@ -139,7 +144,7 @@ static inline int i8259A_irq_real(unsigned int irq)
  * first, _then_ send the EOI, and the order of EOI
  * to the two 8259s is important!
  */
-void mask_and_ack_8259A(unsigned int irq)
+static void mask_and_ack_8259A(unsigned int irq)
 {
         unsigned int irqmask;
         unsigned long flags;
@@ -170,12 +175,12 @@ handle_real_irq:
         if (irq & 8) {
                 inb(PIC_SLAVE_IMR);     /* DUMMY - (do we need this?) */
                 outb(cached_slave_mask, PIC_SLAVE_IMR);
-                outb(0x60+(irq&7),PIC_SLAVE_CMD);/* 'Specific EOI' to slave */
-                outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */
+                outb(0x60+(irq&7), PIC_SLAVE_CMD);/* 'Specific EOI' to slave */
+                outb(0x60+PIC_CASCADE_IR, PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */
         } else {
                 inb(PIC_MASTER_IMR);    /* DUMMY - (do we need this?) */
                 outb(cached_master_mask, PIC_MASTER_IMR);
-                outb(0x60+irq,PIC_MASTER_CMD);  /* 'Specific EOI to master */
+                outb(0x60+irq, PIC_MASTER_CMD); /* 'Specific EOI to master */
         }
         smtc_im_ack_irq(irq);
         spin_unlock_irqrestore(&i8259A_lock, flags);
@@ -253,7 +258,7 @@ static int __init i8259A_init_sysfs(void)
 
 device_initcall(i8259A_init_sysfs);
 
-void init_8259A(int auto_eoi)
+static void init_8259A(int auto_eoi)
 {
         unsigned long flags;
 
@@ -300,7 +305,9 @@ void init_8259A(int auto_eoi)
  * IRQ2 is cascade interrupt to second interrupt controller
  */
 static struct irqaction irq2 = {
-        no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL
+        .handler = no_action,
+        .mask = CPU_MASK_NONE,
+        .name = "cascade",
 };
 
 static struct resource pic1_io_resource = {
@@ -322,7 +329,7 @@ static struct resource pic2_io_resource = {
  * driver compatibility reasons interrupts 0 - 15 to be the i8259
  * interrupts even if the hardware uses a different interrupt numbering.
  */
-void __init init_i8259_irqs (void)
+void __init init_i8259_irqs(void)
 {
         int i;
 
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c
index 403d96f99e77..8ef5cf4cc423 100644
--- a/arch/mips/kernel/irixelf.c
+++ b/arch/mips/kernel/irixelf.c
@@ -203,8 +203,8 @@ static unsigned long * create_irix_tables(char * p, int argc, int envc,
          * Put the ELF interpreter info on the stack
          */
 #define NEW_AUX_ENT(nr, id, val) \
-          __put_user ((id), sp+(nr*2)); \
-          __put_user ((val), sp+(nr*2+1)); \
+          __put_user((id), sp+(nr*2)); \
+          __put_user((val), sp+(nr*2+1)); \
 
         sp -= 2;
         NEW_AUX_ENT(0, AT_NULL, 0);
@@ -212,17 +212,17 @@ static unsigned long * create_irix_tables(char * p, int argc, int envc,
         if (exec) {
                 sp -= 11*2;
 
-                NEW_AUX_ENT (0, AT_PHDR, load_addr + exec->e_phoff);
-                NEW_AUX_ENT (1, AT_PHENT, sizeof (struct elf_phdr));
-                NEW_AUX_ENT (2, AT_PHNUM, exec->e_phnum);
-                NEW_AUX_ENT (3, AT_PAGESZ, ELF_EXEC_PAGESIZE);
-                NEW_AUX_ENT (4, AT_BASE, interp_load_addr);
-                NEW_AUX_ENT (5, AT_FLAGS, 0);
-                NEW_AUX_ENT (6, AT_ENTRY, (elf_addr_t) exec->e_entry);
-                NEW_AUX_ENT (7, AT_UID, (elf_addr_t) current->uid);
-                NEW_AUX_ENT (8, AT_EUID, (elf_addr_t) current->euid);
-                NEW_AUX_ENT (9, AT_GID, (elf_addr_t) current->gid);
-                NEW_AUX_ENT (10, AT_EGID, (elf_addr_t) current->egid);
+                NEW_AUX_ENT(0, AT_PHDR, load_addr + exec->e_phoff);
+                NEW_AUX_ENT(1, AT_PHENT, sizeof(struct elf_phdr));
+                NEW_AUX_ENT(2, AT_PHNUM, exec->e_phnum);
+                NEW_AUX_ENT(3, AT_PAGESZ, ELF_EXEC_PAGESIZE);
+                NEW_AUX_ENT(4, AT_BASE, interp_load_addr);
+                NEW_AUX_ENT(5, AT_FLAGS, 0);
+                NEW_AUX_ENT(6, AT_ENTRY, (elf_addr_t) exec->e_entry);
+                NEW_AUX_ENT(7, AT_UID, (elf_addr_t) current->uid);
+                NEW_AUX_ENT(8, AT_EUID, (elf_addr_t) current->euid);
+                NEW_AUX_ENT(9, AT_GID, (elf_addr_t) current->gid);
+                NEW_AUX_ENT(10, AT_EGID, (elf_addr_t) current->egid);
         }
 #undef NEW_AUX_ENT
 
@@ -231,16 +231,16 @@ static unsigned long * create_irix_tables(char * p, int argc, int envc,
         sp -= argc+1;
         argv = sp;
 
-        __put_user((elf_addr_t)argc,--sp);
+        __put_user((elf_addr_t)argc, --sp);
         current->mm->arg_start = (unsigned long) p;
         while (argc-->0) {
-                __put_user((unsigned long)p,argv++);
+                __put_user((unsigned long)p, argv++);
                 p += strlen_user(p);
         }
         __put_user((unsigned long) NULL, argv);
         current->mm->arg_end = current->mm->env_start = (unsigned long) p;
         while (envc-->0) {
-                __put_user((unsigned long)p,envp++);
+                __put_user((unsigned long)p, envp++);
                 p += strlen_user(p);
         }
         __put_user((unsigned long) NULL, envp);
@@ -581,7 +581,7 @@ static void irix_map_prda_page(void)
         struct prda *pp;
 
         down_write(&current->mm->mmap_sem);
-        v =  do_brk (PRDA_ADDRESS, PAGE_SIZE);
+        v =  do_brk(PRDA_ADDRESS, PAGE_SIZE);
         up_write(&current->mm->mmap_sem);
 
         if (v < 0)
@@ -815,7 +815,7 @@ out_free_interp:
         kfree(elf_interpreter);
 out_free_file:
 out_free_ph:
-        kfree (elf_phdata);
+        kfree(elf_phdata);
         goto out;
 }
 
@@ -831,7 +831,7 @@ static int load_irix_library(struct file *file)
         int retval;
         unsigned int bss;
         int error;
-        int i,j, k;
+        int i, j, k;
 
         error = kernel_read(file, 0, (char *) &elf_ex, sizeof(elf_ex));
         if (error != sizeof(elf_ex))
@@ -1232,7 +1232,7 @@ static int irix_core_dump(long signr, struct pt_regs * regs, struct file *file)
         strlcpy(psinfo.pr_fname, current->comm, sizeof(psinfo.pr_fname));
 
         /* Try to dump the FPU. */
-        prstatus.pr_fpvalid = dump_fpu (regs, &fpu);
+        prstatus.pr_fpvalid = dump_fpu(regs, &fpu);
         if (!prstatus.pr_fpvalid) {
                 numnote--;
         } else {
diff --git a/arch/mips/kernel/irixinv.c b/arch/mips/kernel/irixinv.c
index de8584f62311..cf2dcd3d6a93 100644
--- a/arch/mips/kernel/irixinv.c
+++ b/arch/mips/kernel/irixinv.c
@@ -14,7 +14,7 @@ int inventory_items = 0;
 
 static inventory_t inventory [MAX_INVENTORY];
 
-void add_to_inventory (int class, int type, int controller, int unit, int state)
+void add_to_inventory(int class, int type, int controller, int unit, int state)
 {
         inventory_t *ni = &inventory [inventory_items];
 
@@ -30,7 +30,7 @@ void add_to_inventory (int class, int type, int controller, int unit, int state)
         inventory_items++;
 }
 
-int dump_inventory_to_user (void __user *userbuf, int size)
+int dump_inventory_to_user(void __user *userbuf, int size)
 {
         inventory_t *inv  = &inventory [0];
         inventory_t __user *user = userbuf;
@@ -45,7 +45,7 @@ int dump_inventory_to_user (void __user *userbuf, int size)
                         return -EFAULT;
                 user++;
         }
-        return inventory_items * sizeof (inventory_t);
+        return inventory_items * sizeof(inventory_t);
 }
 
 int __init init_inventory(void)
@@ -55,24 +55,24 @@ int __init init_inventory(void)
          * most likely this will not let just anyone run the X server
          * until we put the right values all over the place
          */
-        add_to_inventory (10, 3, 0, 0, 16400);
-        add_to_inventory (1, 1, 150, -1, 12);
-        add_to_inventory (1, 3, 0, 0, 8976);
-        add_to_inventory (1, 2, 0, 0, 8976);
-        add_to_inventory (4, 8, 0, 0, 2);
-        add_to_inventory (5, 5, 0, 0, 1);
-        add_to_inventory (3, 3, 0, 0, 32768);
-        add_to_inventory (3, 4, 0, 0, 32768);
-        add_to_inventory (3, 8, 0, 0, 524288);
-        add_to_inventory (3, 9, 0, 0, 64);
-        add_to_inventory (3, 1, 0, 0, 67108864);
-        add_to_inventory (12, 3, 0, 0, 16);
-        add_to_inventory (8, 7, 17, 0, 16777472);
-        add_to_inventory (8, 0, 0, 0, 1);
-        add_to_inventory (2, 1, 0, 13, 2);
-        add_to_inventory (2, 2, 0, 2, 0);
-        add_to_inventory (2, 2, 0, 1, 0);
-        add_to_inventory (7, 14, 0, 0, 6);
+        add_to_inventory(10, 3, 0, 0, 16400);
+        add_to_inventory(1, 1, 150, -1, 12);
+        add_to_inventory(1, 3, 0, 0, 8976);
+        add_to_inventory(1, 2, 0, 0, 8976);
+        add_to_inventory(4, 8, 0, 0, 2);
+        add_to_inventory(5, 5, 0, 0, 1);
+        add_to_inventory(3, 3, 0, 0, 32768);
+        add_to_inventory(3, 4, 0, 0, 32768);
+        add_to_inventory(3, 8, 0, 0, 524288);
+        add_to_inventory(3, 9, 0, 0, 64);
+        add_to_inventory(3, 1, 0, 0, 67108864);
+        add_to_inventory(12, 3, 0, 0, 16);
+        add_to_inventory(8, 7, 17, 0, 16777472);
+        add_to_inventory(8, 0, 0, 0, 1);
+        add_to_inventory(2, 1, 0, 13, 2);
+        add_to_inventory(2, 2, 0, 2, 0);
+        add_to_inventory(2, 2, 0, 1, 0);
+        add_to_inventory(7, 14, 0, 0, 6);
 
         return 0;
 }
diff --git a/arch/mips/kernel/irixioctl.c b/arch/mips/kernel/irixioctl.c
index 30f9eb09db3f..2bde200d5ad0 100644
--- a/arch/mips/kernel/irixioctl.c
+++ b/arch/mips/kernel/irixioctl.c
@@ -238,7 +238,7 @@ asmlinkage int irix_ioctl(int fd, unsigned long cmd, unsigned long arg)
                        current->comm, current->pid, cmd);
                 do_exit(255);
 #else
-                error = sys_ioctl (fd, cmd, arg);
+                error = sys_ioctl(fd, cmd, arg);
 #endif
         }
 
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index 28b2a8f00911..85c2e389edd6 100644
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -163,9 +163,9 @@ static inline int handle_signal(unsigned long sig, siginfo_t *info,
                 ret = setup_irix_frame(ka, regs, sig, oldset);
 
         spin_lock_irq(&current->sighand->siglock);
-        sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
+        sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
         if (!(ka->sa.sa_flags & SA_NODEFER))
-                sigaddset(&current->blocked,sig);
+                sigaddset(&current->blocked, sig);
         recalc_sigpending();
         spin_unlock_irq(&current->sighand->siglock);
 
@@ -605,8 +605,8 @@ repeat:
         current->state = TASK_INTERRUPTIBLE;
         read_lock(&tasklist_lock);
         tsk = current;
-        list_for_each(_p,&tsk->children) {
-                p = list_entry(_p,struct task_struct,sibling);
+        list_for_each(_p, &tsk->children) {
+                p = list_entry(_p, struct task_struct, sibling);
                 if ((type == IRIX_P_PID) && p->pid != pid)
                         continue;
                 if ((type == IRIX_P_PGID) && process_group(p) != pid)
diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
new file mode 100644
index 000000000000..1b81b131f43c
--- /dev/null
+++ b/arch/mips/kernel/irq-gt641xx.c
@@ -0,0 +1,131 @@
+/*
+ *  GT641xx IRQ routines.
+ *
+ *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/hardirq.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
+#include <asm/gt64120.h>
+
+#define GT641XX_IRQ_TO_BIT(irq) (1U << (irq - GT641XX_IRQ_BASE))
+
+static DEFINE_SPINLOCK(gt641xx_irq_lock);
+
+static void ack_gt641xx_irq(unsigned int irq)
+{
+        unsigned long flags;
+        u32 cause;
+
+        spin_lock_irqsave(&gt641xx_irq_lock, flags);
+        cause = GT_READ(GT_INTRCAUSE_OFS);
+        cause &= ~GT641XX_IRQ_TO_BIT(irq);
+        GT_WRITE(GT_INTRCAUSE_OFS, cause);
+        spin_unlock_irqrestore(&gt641xx_irq_lock, flags);
+}
+
+static void mask_gt641xx_irq(unsigned int irq)
+{
+        unsigned long flags;
+        u32 mask;
+
+        spin_lock_irqsave(&gt641xx_irq_lock, flags);
+        mask = GT_READ(GT_INTRMASK_OFS);
+        mask &= ~GT641XX_IRQ_TO_BIT(irq);
+        GT_WRITE(GT_INTRMASK_OFS, mask);
+        spin_unlock_irqrestore(&gt641xx_irq_lock, flags);
+}
+
+static void mask_ack_gt641xx_irq(unsigned int irq)
+{
+        unsigned long flags;
+        u32 cause, mask;
+
+        spin_lock_irqsave(&gt641xx_irq_lock, flags);
+        mask = GT_READ(GT_INTRMASK_OFS);
+        mask &= ~GT641XX_IRQ_TO_BIT(irq);
+        GT_WRITE(GT_INTRMASK_OFS, mask);
+
+        cause = GT_READ(GT_INTRCAUSE_OFS);
+        cause &= ~GT641XX_IRQ_TO_BIT(irq);
+        GT_WRITE(GT_INTRCAUSE_OFS, cause);
+        spin_unlock_irqrestore(&gt641xx_irq_lock, flags);
+}
+
+static void unmask_gt641xx_irq(unsigned int irq)
+{
+        unsigned long flags;
+        u32 mask;
+
+        spin_lock_irqsave(&gt641xx_irq_lock, flags);
+        mask = GT_READ(GT_INTRMASK_OFS);
+        mask |= GT641XX_IRQ_TO_BIT(irq);
+        GT_WRITE(GT_INTRMASK_OFS, mask);
+        spin_unlock_irqrestore(&gt641xx_irq_lock, flags);
+}
+
+static struct irq_chip gt641xx_irq_chip = {
+        .name           = "GT641xx",
+        .ack            = ack_gt641xx_irq,
+        .mask           = mask_gt641xx_irq,
+        .mask_ack       = mask_ack_gt641xx_irq,
+        .unmask         = unmask_gt641xx_irq,
+};
+
+void gt641xx_irq_dispatch(void)
+{
+        u32 cause, mask;
+        int i;
+
+        cause = GT_READ(GT_INTRCAUSE_OFS);
+        mask = GT_READ(GT_INTRMASK_OFS);
+        cause &= mask;
+
+        /*
+         * bit0 : logical or of all the interrupt bits.
+         * bit30: logical or of bits[29:26,20:1].
+         * bit31: logical or of bits[25:1].
+         */
+        for (i = 1; i < 30; i++) {
+                if (cause & (1U << i)) {
+                        do_IRQ(GT641XX_IRQ_BASE + i);
+                        return;
+                }
+        }
+
+        atomic_inc(&irq_err_count);
+}
+
+void __init gt641xx_irq_init(void)
+{
+        int i;
+
+        GT_WRITE(GT_INTRMASK_OFS, 0);
+        GT_WRITE(GT_INTRCAUSE_OFS, 0);
+
+        /*
+         * bit0 : logical or of all the interrupt bits.
+         * bit30: logical or of bits[29:26,20:1].
+         * bit31: logical or of bits[25:1].
+         */
+        for (i = 1; i < 30; i++)
+                set_irq_chip_and_handler(GT641XX_IRQ_BASE + i,
+                                         &gt641xx_irq_chip, handle_level_irq);
+}
diff --git a/arch/mips/kernel/irq-msc01.c b/arch/mips/kernel/irq-msc01.c
index 1ecdd50bfc60..4edc7e451d91 100644
--- a/arch/mips/kernel/irq-msc01.c
+++ b/arch/mips/kernel/irq-msc01.c
@@ -99,7 +99,7 @@ void ll_msc_irq(void)
 }
 
 void
-msc_bind_eic_interrupt (unsigned int irq, unsigned int set)
+msc_bind_eic_interrupt(unsigned int irq, unsigned int set)
 {
         MSCIC_WRITE(MSC01_IC_RAMW,
                     (irq<<MSC01_IC_RAMW_ADDR_SHF) | (set<<MSC01_IC_RAMW_DATA_SHF));
@@ -130,7 +130,7 @@ void __init init_msc_irqs(unsigned long icubase, unsigned int irqbase, msc_irqma
 {
         extern void (*board_bind_eic_interrupt)(unsigned int irq, unsigned int regset);
 
-        _icctrl_msc = (unsigned long) ioremap (icubase, 0x40000);
+        _icctrl_msc = (unsigned long) ioremap(icubase, 0x40000);
 
         /* Reset interrupt controller - initialises all registers to 0 */
         MSCIC_WRITE(MSC01_IC_RST, MSC01_IC_RST_RST_BIT);
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index a990aad2f049..d06e9c9af790 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -93,7 +93,7 @@ int show_interrupts(struct seq_file *p, void *v)
         if (i == 0) {
                 seq_printf(p, "           ");
                 for_each_online_cpu(j)
-                        seq_printf(p, "CPU%d       ",j);
+                        seq_printf(p, "CPU%d       ", j);
                 seq_putc(p, '\n');
         }
 
@@ -102,7 +102,7 @@ int show_interrupts(struct seq_file *p, void *v)
                 action = irq_desc[i].action;
                 if (!action)
                         goto skip;
-                seq_printf(p, "%3d: ",i);
+                seq_printf(p, "%3d: ", i);
 #ifndef CONFIG_SMP
                 seq_printf(p, "%10u ", kstat_irqs(i));
 #else
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c
index cb9a14a1ca5b..d2c2e00e5864 100644
--- a/arch/mips/kernel/kspd.c
+++ b/arch/mips/kernel/kspd.c
@@ -118,11 +118,11 @@ struct apsp_table syscall_command_table[] = {
 
 static int sp_syscall(int num, int arg0, int arg1, int arg2, int arg3)
 {
-        register long int _num  __asm__ ("$2") = num;
-        register long int _arg0  __asm__ ("$4") = arg0;
-        register long int _arg1  __asm__ ("$5") = arg1;
-        register long int _arg2  __asm__ ("$6") = arg2;
-        register long int _arg3  __asm__ ("$7") = arg3;
+        register long int _num  __asm__("$2") = num;
+        register long int _arg0  __asm__("$4") = arg0;
+        register long int _arg1  __asm__("$5") = arg1;
+        register long int _arg2  __asm__("$6") = arg2;
+        register long int _arg3  __asm__("$7") = arg3;
 
         mm_segment_t old_fs;
 
@@ -239,7 +239,7 @@ void sp_work_handle_request(void)
         case MTSP_SYSCALL_GETTOD:
                 memset(&tz, 0, sizeof(tz));
                 if ((ret.retval = sp_syscall(__NR_gettimeofday, (int)&tv,
-                                             (int)&tz, 0,0)) == 0)
+                                             (int)&tz, 0, 0)) == 0)
                 ret.retval = tv.tv_sec;
                 break;
 
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 135d9a5fe337..d6e01215fb2b 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -58,10 +58,10 @@
 #define AA(__x) ((unsigned long)((int)__x))
 
 #ifdef __MIPSEB__
-#define merge_64(r1,r2) ((((r1) & 0xffffffffUL) << 32) + ((r2) & 0xffffffffUL))
+#define merge_64(r1, r2) ((((r1) & 0xffffffffUL) << 32) + ((r2) & 0xffffffffUL))
 #endif
 #ifdef __MIPSEL__
-#define merge_64(r1,r2) ((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL))
+#define merge_64(r1, r2) ((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL))
 #endif
 
 /*
@@ -96,7 +96,7 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)
 #endif
         tmp.st_blocks = stat->blocks;
         tmp.st_blksize = stat->blksize;
-        return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0;
+        return copy_to_user(statbuf, &tmp, sizeof(tmp)) ? -EFAULT : 0;
 }
 
 asmlinkage unsigned long
@@ -300,13 +300,13 @@ asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid,
 {
         struct timespec t;
         int ret;
-        mm_segment_t old_fs = get_fs ();
+        mm_segment_t old_fs = get_fs();
 
-        set_fs (KERNEL_DS);
+        set_fs(KERNEL_DS);
         ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
-        set_fs (old_fs);
+        set_fs(old_fs);
         if (put_user (t.tv_sec, &interval->tv_sec) ||
-            __put_user (t.tv_nsec, &interval->tv_nsec))
+            __put_user(t.tv_nsec, &interval->tv_nsec))
                 return -EFAULT;
         return ret;
 }
@@ -314,7 +314,7 @@ asmlinkage int sys32_sched_rr_get_interval(compat_pid_t pid,
 #ifdef CONFIG_SYSVIPC
 
 asmlinkage long
-sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
+sys32_ipc(u32 call, int first, int second, int third, u32 ptr, u32 fifth)
 {
         int version, err;
 
@@ -373,7 +373,7 @@ sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
 #else
 
 asmlinkage long
-sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u32 fifth)
+sys32_ipc(u32 call, int first, int second, int third, u32 ptr, u32 fifth)
 {
         return -ENOSYS;
 }
@@ -505,16 +505,16 @@ asmlinkage int sys32_ustat(dev_t dev, struct ustat32 __user * ubuf32)
 
         set_fs(KERNEL_DS);
         err = sys_ustat(dev, (struct ustat __user *)&tmp);
-        set_fs (old_fs);
+        set_fs(old_fs);
 
         if (err)
                 goto out;
 
-        memset(&tmp32,0,sizeof(struct ustat32));
+        memset(&tmp32, 0, sizeof(struct ustat32));
         tmp32.f_tfree = tmp.f_tfree;
         tmp32.f_tinode = tmp.f_tinode;
 
-        err = copy_to_user(ubuf32,&tmp32,sizeof(struct ustat32)) ? -EFAULT : 0;
+        err = copy_to_user(ubuf32, &tmp32, sizeof(struct ustat32)) ? -EFAULT : 0;
 
 out:
         return err;
diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c
index 56750b02ab40..3d6b1ec1f328 100644
--- a/arch/mips/kernel/mips-mt.c
+++ b/arch/mips/kernel/mips-mt.c
@@ -236,7 +236,7 @@ void mips_mt_set_cpuoptions(void)
         if (oconfig7 != nconfig7) {
                 __asm__ __volatile("sync");
                 write_c0_config7(nconfig7);
-                ehb ();
+                ehb();
                 printk("Config7: 0x%08x\n", read_c0_config7());
         }
 
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index ec04f5a1a5ea..efd2d1314123 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -17,76 +17,6 @@
 
 unsigned int vced_count, vcei_count;
 
-static const char *cpu_name[] = {
-        [CPU_UNKNOWN]   = "unknown",
-        [CPU_R2000]     = "R2000",
-        [CPU_R3000]     = "R3000",
-        [CPU_R3000A]    = "R3000A",
-        [CPU_R3041]     = "R3041",
-        [CPU_R3051]     = "R3051",
-        [CPU_R3052]     = "R3052",
-        [CPU_R3081]     = "R3081",
-        [CPU_R3081E]    = "R3081E",
-        [CPU_R4000PC]   = "R4000PC",
-        [CPU_R4000SC]   = "R4000SC",
-        [CPU_R4000MC]   = "R4000MC",
-        [CPU_R4200]     = "R4200",
-        [CPU_R4400PC]   = "R4400PC",
-        [CPU_R4400SC]   = "R4400SC",
-        [CPU_R4400MC]   = "R4400MC",
-        [CPU_R4600]     = "R4600",
-        [CPU_R6000]     = "R6000",
-        [CPU_R6000A]    = "R6000A",
-        [CPU_R8000]     = "R8000",
-        [CPU_R10000]    = "R10000",
-        [CPU_R12000]    = "R12000",
-        [CPU_R14000]    = "R14000",
-        [CPU_R4300]     = "R4300",
-        [CPU_R4650]     = "R4650",
-        [CPU_R4700]     = "R4700",
-        [CPU_R5000]     = "R5000",
-        [CPU_R5000A]    = "R5000A",
-        [CPU_R4640]     = "R4640",
-        [CPU_NEVADA]    = "Nevada",
-        [CPU_RM7000]    = "RM7000",
-        [CPU_RM9000]    = "RM9000",
-        [CPU_R5432]     = "R5432",
-        [CPU_4KC]       = "MIPS 4Kc",
-        [CPU_5KC]       = "MIPS 5Kc",
-        [CPU_R4310]     = "R4310",
-        [CPU_SB1]       = "SiByte SB1",
-        [CPU_SB1A]      = "SiByte SB1A",
-        [CPU_TX3912]    = "TX3912",
-        [CPU_TX3922]    = "TX3922",
-        [CPU_TX3927]    = "TX3927",
-        [CPU_AU1000]    = "Au1000",
-        [CPU_AU1500]    = "Au1500",
-        [CPU_AU1100]    = "Au1100",
-        [CPU_AU1550]    = "Au1550",
-        [CPU_AU1200]    = "Au1200",
-        [CPU_4KEC]      = "MIPS 4KEc",
-        [CPU_4KSC]      = "MIPS 4KSc",
-        [CPU_VR41XX]    = "NEC Vr41xx",
-        [CPU_R5500]     = "R5500",
-        [CPU_TX49XX]    = "TX49xx",
-        [CPU_20KC]      = "MIPS 20Kc",
-        [CPU_24K]       = "MIPS 24K",
-        [CPU_25KF]      = "MIPS 25Kf",
-        [CPU_34K]       = "MIPS 34K",
-        [CPU_74K]       = "MIPS 74K",
-        [CPU_VR4111]    = "NEC VR4111",
-        [CPU_VR4121]    = "NEC VR4121",
-        [CPU_VR4122]    = "NEC VR4122",
-        [CPU_VR4131]    = "NEC VR4131",
-        [CPU_VR4133]    = "NEC VR4133",
-        [CPU_VR4181]    = "NEC VR4181",
-        [CPU_VR4181A]   = "NEC VR4181A",
-        [CPU_SR71000]   = "Sandcraft SR71000",
-        [CPU_PR4450]    = "Philips PR4450",
-        [CPU_LOONGSON2] = "ICT Loongson-2",
-};
-
-
 static int show_cpuinfo(struct seq_file *m, void *v)
 {
         unsigned long n = (unsigned long) v - 1;
@@ -108,8 +38,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         seq_printf(m, "processor\t\t: %ld\n", n);
         sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
                 cpu_data[n].options & MIPS_CPU_FPU ? "  FPU V%d.%d" : "");
-        seq_printf(m, fmt, cpu_name[cpu_data[n].cputype <= CPU_LAST ?
-                                    cpu_data[n].cputype : CPU_UNKNOWN],
+        seq_printf(m, fmt, __cpu_name[smp_processor_id()],
                                    (version >> 4) & 0x0f, version & 0x0f,
                                    (fp_vers >> 4) & 0x0f, fp_vers & 0x0f);
         seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n",
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index e6ce943099a0..11cb264f59ce 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -11,6 +11,7 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/sched.h>
+#include <linux/tick.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/stddef.h>
@@ -52,6 +53,7 @@ void __noreturn cpu_idle(void)
 {
         /* endless idle loop with no priority at all */
         while (1) {
+                tick_nohz_stop_sched_tick();
                 while (!need_resched()) {
 #ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG
                         extern void smtc_idle_loop_hook(void);
@@ -61,6 +63,7 @@ void __noreturn cpu_idle(void)
                         if (cpu_wait)
                                 (*cpu_wait)();
                 }
+                tick_nohz_restart_sched_tick();
                 preempt_enable_no_resched();
                 schedule();
                 preempt_disable();
@@ -199,13 +202,13 @@ void elf_dump_regs(elf_greg_t *gp, struct pt_regs *regs)
 #endif
 }
 
-int dump_task_regs (struct task_struct *tsk, elf_gregset_t *regs)
+int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
 {
         elf_dump_regs(*regs, task_pt_regs(tsk));
         return 1;
 }
 
-int dump_task_fpu (struct task_struct *t, elf_fpregset_t *fpr)
+int dump_task_fpu(struct task_struct *t, elf_fpregset_t *fpr)
 {
         memcpy(fpr, &t->thread.fpu, sizeof(current->thread.fpu));
 
@@ -231,8 +234,8 @@ long kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
         regs.cp0_epc = (unsigned long) kernel_thread_helper;
         regs.cp0_status = read_c0_status();
 #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
-        regs.cp0_status &= ~(ST0_KUP | ST0_IEC);
-        regs.cp0_status |= ST0_IEP;
+        regs.cp0_status = (regs.cp0_status & ~(ST0_KUP | ST0_IEP | ST0_IEC)) |
+                          ((regs.cp0_status & (ST0_KUC | ST0_IEC)) << 2);
 #else
         regs.cp0_status |= ST0_EXL;
 #endif
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index bbd57b20b43e..58aa6fec1146 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -54,7 +54,7 @@ void ptrace_disable(struct task_struct *child)
  * for 32-bit kernels and for 32-bit processes on a 64-bit kernel.
  * Registers are sign extended to fill the available space.
  */
-int ptrace_getregs (struct task_struct *child, __s64 __user *data)
+int ptrace_getregs(struct task_struct *child, __s64 __user *data)
 {
         struct pt_regs *regs;
         int i;
@@ -65,13 +65,13 @@ int ptrace_getregs (struct task_struct *child, __s64 __user *data)
         regs = task_pt_regs(child);
 
         for (i = 0; i < 32; i++)
-                __put_user (regs->regs[i], data + i);
-        __put_user (regs->lo, data + EF_LO - EF_R0);
-        __put_user (regs->hi, data + EF_HI - EF_R0);
-        __put_user (regs->cp0_epc, data + EF_CP0_EPC - EF_R0);
-        __put_user (regs->cp0_badvaddr, data + EF_CP0_BADVADDR - EF_R0);
-        __put_user (regs->cp0_status, data + EF_CP0_STATUS - EF_R0);
-        __put_user (regs->cp0_cause, data + EF_CP0_CAUSE - EF_R0);
+                __put_user(regs->regs[i], data + i);
+        __put_user(regs->lo, data + EF_LO - EF_R0);
+        __put_user(regs->hi, data + EF_HI - EF_R0);
+        __put_user(regs->cp0_epc, data + EF_CP0_EPC - EF_R0);
+        __put_user(regs->cp0_badvaddr, data + EF_CP0_BADVADDR - EF_R0);
+        __put_user(regs->cp0_status, data + EF_CP0_STATUS - EF_R0);
+        __put_user(regs->cp0_cause, data + EF_CP0_CAUSE - EF_R0);
 
         return 0;
 }
@@ -81,7 +81,7 @@ int ptrace_getregs (struct task_struct *child, __s64 __user *data)
  * the 64-bit format.  On a 32-bit kernel only the lower order half
  * (according to endianness) will be used.
  */
-int ptrace_setregs (struct task_struct *child, __s64 __user *data)
+int ptrace_setregs(struct task_struct *child, __s64 __user *data)
 {
         struct pt_regs *regs;
         int i;
@@ -92,17 +92,17 @@ int ptrace_setregs (struct task_struct *child, __s64 __user *data)
         regs = task_pt_regs(child);
 
         for (i = 0; i < 32; i++)
-                __get_user (regs->regs[i], data + i);
-        __get_user (regs->lo, data + EF_LO - EF_R0);
-        __get_user (regs->hi, data + EF_HI - EF_R0);
-        __get_user (regs->cp0_epc, data + EF_CP0_EPC - EF_R0);
+                __get_user(regs->regs[i], data + i);
+        __get_user(regs->lo, data + EF_LO - EF_R0);
+        __get_user(regs->hi, data + EF_HI - EF_R0);
+        __get_user(regs->cp0_epc, data + EF_CP0_EPC - EF_R0);
 
         /* badvaddr, status, and cause may not be written.  */
 
         return 0;
 }
 
-int ptrace_getfpregs (struct task_struct *child, __u32 __user *data)
+int ptrace_getfpregs(struct task_struct *child, __u32 __user *data)
 {
         int i;
         unsigned int tmp;
@@ -113,13 +113,13 @@ int ptrace_getfpregs (struct task_struct *child, __u32 __user *data)
         if (tsk_used_math(child)) {
                 fpureg_t *fregs = get_fpu_regs(child);
                 for (i = 0; i < 32; i++)
-                        __put_user (fregs[i], i + (__u64 __user *) data);
+                        __put_user(fregs[i], i + (__u64 __user *) data);
         } else {
                 for (i = 0; i < 32; i++)
-                        __put_user ((__u64) -1, i + (__u64 __user *) data);
+                        __put_user((__u64) -1, i + (__u64 __user *) data);
         }
 
-        __put_user (child->thread.fpu.fcr31, data + 64);
+        __put_user(child->thread.fpu.fcr31, data + 64);
 
         preempt_disable();
         if (cpu_has_fpu) {
@@ -142,12 +142,12 @@ int ptrace_getfpregs (struct task_struct *child, __u32 __user *data)
                 tmp = 0;
         }
         preempt_enable();
-        __put_user (tmp, data + 65);
+        __put_user(tmp, data + 65);
 
         return 0;
 }
 
-int ptrace_setfpregs (struct task_struct *child, __u32 __user *data)
+int ptrace_setfpregs(struct task_struct *child, __u32 __user *data)
 {
         fpureg_t *fregs;
         int i;
@@ -158,9 +158,9 @@ int ptrace_setfpregs (struct task_struct *child, __u32 __user *data)
         fregs = get_fpu_regs(child);
 
         for (i = 0; i < 32; i++)
-                __get_user (fregs[i], i + (__u64 __user *) data);
+                __get_user(fregs[i], i + (__u64 __user *) data);
 
-        __get_user (child->thread.fpu.fcr31, data + 64);
+        __get_user(child->thread.fpu.fcr31, data + 64);
 
         /* FIR may not be written.  */
 
@@ -390,19 +390,19 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 }
 
         case PTRACE_GETREGS:
-                ret = ptrace_getregs (child, (__u64 __user *) data);
+                ret = ptrace_getregs(child, (__u64 __user *) data);
                 break;
 
         case PTRACE_SETREGS:
-                ret = ptrace_setregs (child, (__u64 __user *) data);
+                ret = ptrace_setregs(child, (__u64 __user *) data);
                 break;
 
         case PTRACE_GETFPREGS:
-                ret = ptrace_getfpregs (child, (__u32 __user *) data);
+                ret = ptrace_getfpregs(child, (__u32 __user *) data);
                 break;
 
         case PTRACE_SETFPREGS:
-                ret = ptrace_setfpregs (child, (__u32 __user *) data);
+                ret = ptrace_setfpregs(child, (__u32 __user *) data);
                 break;
 
         case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c
index d9a39c169450..f2bffed94fa3 100644
--- a/arch/mips/kernel/ptrace32.c
+++ b/arch/mips/kernel/ptrace32.c
@@ -36,11 +36,11 @@
 #include <asm/uaccess.h>
 #include <asm/bootinfo.h>
 
-int ptrace_getregs (struct task_struct *child, __s64 __user *data);
-int ptrace_setregs (struct task_struct *child, __s64 __user *data);
+int ptrace_getregs(struct task_struct *child, __s64 __user *data);
+int ptrace_setregs(struct task_struct *child, __s64 __user *data);
 
-int ptrace_getfpregs (struct task_struct *child, __u32 __user *data);
-int ptrace_setfpregs (struct task_struct *child, __u32 __user *data);
+int ptrace_getfpregs(struct task_struct *child, __u32 __user *data);
+int ptrace_setfpregs(struct task_struct *child, __u32 __user *data);
 
 /*
  * Tracing a 32-bit process with a 64-bit strace and vice versa will not
@@ -346,19 +346,19 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
                 }
 
         case PTRACE_GETREGS:
-                ret = ptrace_getregs (child, (__u64 __user *) (__u64) data);
+                ret = ptrace_getregs(child, (__u64 __user *) (__u64) data);
                 break;
 
         case PTRACE_SETREGS:
-                ret = ptrace_setregs (child, (__u64 __user *) (__u64) data);
+                ret = ptrace_setregs(child, (__u64 __user *) (__u64) data);
                 break;
 
         case PTRACE_GETFPREGS:
-                ret = ptrace_getfpregs (child, (__u32 __user *) (__u64) data);
+                ret = ptrace_getfpregs(child, (__u32 __user *) (__u64) data);
                 break;
 
         case PTRACE_SETFPREGS:
-                ret = ptrace_setfpregs (child, (__u32 __user *) (__u64) data);
+                ret = ptrace_setfpregs(child, (__u32 __user *) (__u64) data);
                 break;
 
         case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 316685fca059..a06a27d6cfcd 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -51,10 +51,8 @@ EXPORT_SYMBOL(PCI_DMA_BUS_IS_PHYS);
  * These are initialized so they are in the .data section
  */
 unsigned long mips_machtype __read_mostly = MACH_UNKNOWN;
-unsigned long mips_machgroup __read_mostly = MACH_GROUP_UNKNOWN;
 
 EXPORT_SYMBOL(mips_machtype);
-EXPORT_SYMBOL(mips_machgroup);
 
 struct boot_mem_map boot_mem_map;
 
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 2a08ce41bf2b..a4e106c56ab5 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -613,9 +613,9 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
                 ret = current->thread.abi->setup_frame(ka, regs, sig, oldset);
 
         spin_lock_irq(&current->sighand->siglock);
-        sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
+        sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
         if (!(ka->sa.sa_flags & SA_NODEFER))
-                sigaddset(&current->blocked,sig);
+                sigaddset(&current->blocked, sig);
         recalc_sigpending();
         spin_unlock_irq(&current->sighand->siglock);
 
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
index 64b612a0a622..572c610db1b1 100644
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -261,11 +261,11 @@ static inline int put_sigset(const sigset_t *kbuf, compat_sigset_t __user *ubuf)
         default:
                 __put_sigset_unknown_nsig();
         case 2:
-                err |= __put_user (kbuf->sig[1] >> 32, &ubuf->sig[3]);
-                err |= __put_user (kbuf->sig[1] & 0xffffffff, &ubuf->sig[2]);
+                err |= __put_user(kbuf->sig[1] >> 32, &ubuf->sig[3]);
+                err |= __put_user(kbuf->sig[1] & 0xffffffff, &ubuf->sig[2]);
         case 1:
-                err |= __put_user (kbuf->sig[0] >> 32, &ubuf->sig[1]);
-                err |= __put_user (kbuf->sig[0] & 0xffffffff, &ubuf->sig[0]);
+                err |= __put_user(kbuf->sig[0] >> 32, &ubuf->sig[1]);
+                err |= __put_user(kbuf->sig[0] & 0xffffffff, &ubuf->sig[0]);
         }
 
         return err;
@@ -283,12 +283,12 @@ static inline int get_sigset(sigset_t *kbuf, const compat_sigset_t __user *ubuf)
         default:
                 __get_sigset_unknown_nsig();
         case 2:
-                err |= __get_user (sig[3], &ubuf->sig[3]);
-                err |= __get_user (sig[2], &ubuf->sig[2]);
+                err |= __get_user(sig[3], &ubuf->sig[3]);
+                err |= __get_user(sig[2], &ubuf->sig[2]);
                 kbuf->sig[1] = sig[2] | (sig[3] << 32);
         case 1:
-                err |= __get_user (sig[1], &ubuf->sig[1]);
-                err |= __get_user (sig[0], &ubuf->sig[0]);
+                err |= __get_user(sig[1], &ubuf->sig[1]);
+                err |= __get_user(sig[0], &ubuf->sig[0]);
                 kbuf->sig[0] = sig[0] | (sig[1] << 32);
         }
 
@@ -412,10 +412,10 @@ asmlinkage int sys32_sigaltstack(nabi_no_regargs struct pt_regs regs)
                         return -EFAULT;
         }
 
-        set_fs (KERNEL_DS);
+        set_fs(KERNEL_DS);
         ret = do_sigaltstack(uss ? (stack_t __user *)&kss : NULL,
                              uoss ? (stack_t __user *)&koss : NULL, usp);
-        set_fs (old_fs);
+        set_fs(old_fs);
 
         if (!ret && uoss) {
                 if (!access_ok(VERIFY_WRITE, uoss, sizeof(*uoss)))
@@ -559,9 +559,9 @@ asmlinkage void sys32_rt_sigreturn(nabi_no_regargs struct pt_regs regs)
         /* It is more difficult to avoid calling this function than to
            call it and ignore errors.  */
         old_fs = get_fs();
-        set_fs (KERNEL_DS);
+        set_fs(KERNEL_DS);
         do_sigaltstack((stack_t __user *)&st, NULL, regs.regs[29]);
-        set_fs (old_fs);
+        set_fs(old_fs);
 
         /*
          * Don't let your children do this ...
@@ -746,11 +746,11 @@ asmlinkage int sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
         if (set && get_sigset(&new_set, set))
                 return -EFAULT;
 
-        set_fs (KERNEL_DS);
+        set_fs(KERNEL_DS);
         ret = sys_rt_sigprocmask(how, set ? (sigset_t __user *)&new_set : NULL,
                                  oset ? (sigset_t __user *)&old_set : NULL,
                                  sigsetsize);
-        set_fs (old_fs);
+        set_fs(old_fs);
 
         if (!ret && oset && put_sigset(&old_set, oset))
                 return -EFAULT;
@@ -765,9 +765,9 @@ asmlinkage int sys32_rt_sigpending(compat_sigset_t __user *uset,
         sigset_t set;
         mm_segment_t old_fs = get_fs();
 
-        set_fs (KERNEL_DS);
+        set_fs(KERNEL_DS);
         ret = sys_rt_sigpending((sigset_t __user *)&set, sigsetsize);
-        set_fs (old_fs);
+        set_fs(old_fs);
 
         if (!ret && put_sigset(&set, uset))
                 return -EFAULT;
@@ -781,12 +781,12 @@ asmlinkage int sys32_rt_sigqueueinfo(int pid, int sig, compat_siginfo_t __user *
         int ret;
         mm_segment_t old_fs = get_fs();
 
-        if (copy_from_user (&info, uinfo, 3*sizeof(int)) ||
-            copy_from_user (info._sifields._pad, uinfo->_sifields._pad, SI_PAD_SIZE))
+        if (copy_from_user(&info, uinfo, 3*sizeof(int)) ||
+            copy_from_user(info._sifields._pad, uinfo->_sifields._pad, SI_PAD_SIZE))
                 return -EFAULT;
-        set_fs (KERNEL_DS);
+        set_fs(KERNEL_DS);
         ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
-        set_fs (old_fs);
+        set_fs(old_fs);
         return ret;
 }
 
@@ -801,10 +801,10 @@ sys32_waitid(int which, compat_pid_t pid,
         mm_segment_t old_fs = get_fs();
 
         info.si_signo = 0;
-        set_fs (KERNEL_DS);
+        set_fs(KERNEL_DS);
         ret = sys_waitid(which, pid, (siginfo_t __user *) &info, options,
                          uru ? (struct rusage __user *) &ru : NULL);
-        set_fs (old_fs);
+        set_fs(old_fs);
 
         if (ret < 0 || info.si_signo == 0)
                 return ret;
diff --git a/arch/mips/kernel/signal_n32.c b/arch/mips/kernel/signal_n32.c
index eb7e05926ebe..bb277e82d421 100644
--- a/arch/mips/kernel/signal_n32.c
+++ b/arch/mips/kernel/signal_n32.c
@@ -88,7 +88,7 @@ struct rt_sigframe_n32 {
 
 #endif  /* !ICACHE_REFILLS_WORKAROUND_WAR */
 
-extern void sigset_from_compat (sigset_t *set, compat_sigset_t *compat);
+extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
 
 asmlinkage int sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
 {
@@ -105,7 +105,7 @@ asmlinkage int sysn32_rt_sigsuspend(nabi_no_regargs struct pt_regs regs)
         unewset = (compat_sigset_t __user *) regs.regs[4];
         if (copy_from_user(&uset, unewset, sizeof(uset)))
                 return -EFAULT;
-        sigset_from_compat (&newset, &uset);
+        sigset_from_compat(&newset, &uset);
         sigdelsetmask(&newset, ~_BLOCKABLE);
 
         spin_lock_irq(&current->sighand->siglock);
diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index 05dcce416325..94e210cc6cb6 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -353,7 +353,7 @@ void core_send_ipi(int cpu, unsigned int action)
         unsigned long flags;
         int vpflags;
 
-        local_irq_save (flags);
+        local_irq_save(flags);
 
         vpflags = dvpe();       /* cant access the other CPU's registers whilst MVPE enabled */
 
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 73b0dab02668..432f2e376aea 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -38,6 +38,7 @@
 #include <asm/system.h>
 #include <asm/mmu_context.h>
 #include <asm/smp.h>
+#include <asm/time.h>
 
 #ifdef CONFIG_MIPS_MT_SMTC
 #include <asm/mipsmtregs.h>
@@ -70,6 +71,7 @@ asmlinkage __cpuinit void start_secondary(void)
         cpu_probe();
         cpu_report();
         per_cpu_trap_init();
+        mips_clockevent_init();
         prom_init_secondary();
 
         /*
@@ -95,6 +97,8 @@ struct call_data_struct *call_data;
 
 /*
  * Run a function on all other CPUs.
+ *
+ *  <mask>      cpuset_t of all processors to run the function on.
  *  <func>      The function to run. This must be fast and non-blocking.
  *  <info>      An arbitrary pointer to pass to the function.
  *  <retry>     If true, keep retrying until ready.
@@ -119,18 +123,20 @@ struct call_data_struct *call_data;
  * Spin waiting for call_lock
  * Deadlock                            Deadlock
  */
-int smp_call_function (void (*func) (void *info), void *info, int retry,
-                                                                int wait)
+int smp_call_function_mask(cpumask_t mask, void (*func) (void *info),
+        void *info, int retry, int wait)
 {
         struct call_data_struct data;
-        int i, cpus = num_online_cpus() - 1;
         int cpu = smp_processor_id();
+        int cpus;
 
         /*
          * Can die spectacularly if this CPU isn't yet marked online
          */
         BUG_ON(!cpu_online(cpu));
 
+        cpu_clear(cpu, mask);
+        cpus = cpus_weight(mask);
         if (!cpus)
                 return 0;
 
@@ -149,9 +155,7 @@ int smp_call_function (void (*func) (void *info), void *info, int retry,
         smp_mb();
 
         /* Send a message to all other CPUs and wait for them to respond */
-        for_each_online_cpu(i)
-                if (i != cpu)
-                        core_send_ipi(i, SMP_CALL_FUNCTION);
+        core_send_ipi_mask(mask, SMP_CALL_FUNCTION);
 
         /* Wait for response */
         /* FIXME: lock-up detection, backtrace on lock-up */
@@ -167,6 +171,11 @@ int smp_call_function (void (*func) (void *info), void *info, int retry,
         return 0;
 }
 
+int smp_call_function(void (*func) (void *info), void *info, int retry,
+        int wait)
+{
+        return smp_call_function_mask(cpu_online_map, func, info, retry, wait);
+}
 
 void smp_call_function_interrupt(void)
 {
@@ -197,8 +206,7 @@ void smp_call_function_interrupt(void)
 int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
                              int retry, int wait)
 {
-        struct call_data_struct data;
-        int me;
+        int ret, me;
 
         /*
          * Can die spectacularly if this CPU isn't yet marked online
@@ -217,33 +225,8 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info,
                 return 0;
         }
 
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
-        data.func = func;
-        data.info = info;
-        atomic_set(&data.started, 0);
-        data.wait = wait;
-        if (wait)
-                atomic_set(&data.finished, 0);
-
-        spin_lock(&smp_call_lock);
-        call_data = &data;
-        smp_mb();
-
-        /* Send a message to the other CPU */
-        core_send_ipi(cpu, SMP_CALL_FUNCTION);
-
-        /* Wait for response */
-        /* FIXME: lock-up detection, backtrace on lock-up */
-        while (atomic_read(&data.started) != 1)
-                barrier();
-
-        if (wait)
-                while (atomic_read(&data.finished) != 1)
-                        barrier();
-        call_data = NULL;
-        spin_unlock(&smp_call_lock);
+        ret = smp_call_function_mask(cpumask_of_cpu(cpu), func, info, retry,
+                                     wait);
 
         put_cpu();
         return 0;
@@ -390,12 +373,15 @@ void flush_tlb_mm(struct mm_struct *mm)
         preempt_disable();
 
         if ((atomic_read(&mm->mm_users) != 1) || (current->mm != mm)) {
-                smp_on_other_tlbs(flush_tlb_mm_ipi, (void *)mm);
+                smp_on_other_tlbs(flush_tlb_mm_ipi, mm);
         } else {
-                int i;
-                for (i = 0; i < num_online_cpus(); i++)
-                        if (smp_processor_id() != i)
-                                cpu_context(i, mm) = 0;
+                cpumask_t mask = cpu_online_map;
+                unsigned int cpu;
+
+                cpu_clear(smp_processor_id(), mask);
+                for_each_online_cpu(cpu)
+                        if (cpu_context(cpu, mm))
+                                cpu_context(cpu, mm) = 0;
         }
         local_flush_tlb_mm(mm);
 
@@ -410,7 +396,7 @@ struct flush_tlb_data {
 
 static void flush_tlb_range_ipi(void *info)
 {
-        struct flush_tlb_data *fd = (struct flush_tlb_data *)info;
+        struct flush_tlb_data *fd = info;
 
         local_flush_tlb_range(fd->vma, fd->addr1, fd->addr2);
 }
@@ -421,17 +407,21 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned l
 
         preempt_disable();
         if ((atomic_read(&mm->mm_users) != 1) || (current->mm != mm)) {
-                struct flush_tlb_data fd;
+                struct flush_tlb_data fd = {
+                        .vma = vma,
+                        .addr1 = start,
+                        .addr2 = end,
+                };
 
-                fd.vma = vma;
-                fd.addr1 = start;
-                fd.addr2 = end;
-                smp_on_other_tlbs(flush_tlb_range_ipi, (void *)&fd);
+                smp_on_other_tlbs(flush_tlb_range_ipi, &fd);
         } else {
-                int i;
-                for (i = 0; i < num_online_cpus(); i++)
-                        if (smp_processor_id() != i)
-                                cpu_context(i, mm) = 0;
+                cpumask_t mask = cpu_online_map;
+                unsigned int cpu;
+
+                cpu_clear(smp_processor_id(), mask);
+                for_each_online_cpu(cpu)
+                        if (cpu_context(cpu, mm))
+                                cpu_context(cpu, mm) = 0;
         }
         local_flush_tlb_range(vma, start, end);
         preempt_enable();
@@ -439,23 +429,24 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned l
 
 static void flush_tlb_kernel_range_ipi(void *info)
 {
-        struct flush_tlb_data *fd = (struct flush_tlb_data *)info;
+        struct flush_tlb_data *fd = info;
 
         local_flush_tlb_kernel_range(fd->addr1, fd->addr2);
 }
 
 void flush_tlb_kernel_range(unsigned long start, unsigned long end)
 {
-        struct flush_tlb_data fd;
+        struct flush_tlb_data fd = {
+                .addr1 = start,
+                .addr2 = end,
+        };
 
-        fd.addr1 = start;
-        fd.addr2 = end;
-        on_each_cpu(flush_tlb_kernel_range_ipi, (void *)&fd, 1, 1);
+        on_each_cpu(flush_tlb_kernel_range_ipi, &fd, 1, 1);
 }
 
 static void flush_tlb_page_ipi(void *info)
 {
-        struct flush_tlb_data *fd = (struct flush_tlb_data *)info;
+        struct flush_tlb_data *fd = info;
 
         local_flush_tlb_page(fd->vma, fd->addr1);
 }
@@ -464,16 +455,20 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
 {
         preempt_disable();
         if ((atomic_read(&vma->vm_mm->mm_users) != 1) || (current->mm != vma->vm_mm)) {
-                struct flush_tlb_data fd;
+                struct flush_tlb_data fd = {
+                        .vma = vma,
+                        .addr1 = page,
+                };
 
-                fd.vma = vma;
-                fd.addr1 = page;
-                smp_on_other_tlbs(flush_tlb_page_ipi, (void *)&fd);
+                smp_on_other_tlbs(flush_tlb_page_ipi, &fd);
         } else {
-                int i;
-                for (i = 0; i < num_online_cpus(); i++)
-                        if (smp_processor_id() != i)
-                                cpu_context(i, vma->vm_mm) = 0;
+                cpumask_t mask = cpu_online_map;
+                unsigned int cpu;
+
+                cpu_clear(smp_processor_id(), mask);
+                for_each_online_cpu(cpu)
+                        if (cpu_context(cpu, vma->vm_mm))
+                                cpu_context(cpu, vma->vm_mm) = 0;
         }
         local_flush_tlb_page(vma, page);
         preempt_enable();
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index f09404377ef1..a8c1a698d588 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -1,5 +1,6 @@
 /* Copyright (C) 2004 Mips Technologies, Inc */
 
+#include <linux/clockchips.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/cpumask.h>
@@ -62,7 +63,7 @@ asiduse smtc_live_asid[MAX_SMTC_TLBS][MAX_SMTC_ASIDS];
  * Clock interrupt "latch" buffers, per "CPU"
  */
 
-unsigned int ipi_timer_latch[NR_CPUS];
+static atomic_t ipi_timer_latch[NR_CPUS];
 
 /*
  * Number of InterProcessor Interupt (IPI) message buffers to allocate
@@ -179,7 +180,7 @@ void __init sanitize_tlb_entries(void)
 
 static void smtc_configure_tlb(void)
 {
-        int i,tlbsiz,vpes;
+        int i, tlbsiz, vpes;
         unsigned long mvpconf0;
         unsigned long config1val;
 
@@ -296,8 +297,10 @@ int __init mipsmt_build_cpu_map(int start_cpu_slot)
                 __cpu_number_map[i] = i;
                 __cpu_logical_map[i] = i;
         }
+#ifdef CONFIG_MIPS_MT_FPAFF
         /* Initialize map of CPUs with FPUs */
         cpus_clear(mt_fpu_cpumask);
+#endif
 
         /* One of those TC's is the one booting, and not a secondary... */
         printk("%i available secondary CPU TC(s)\n", i - 1);
@@ -359,7 +362,7 @@ void mipsmt_prepare_cpus(void)
                 IPIQ[i].head = IPIQ[i].tail = NULL;
                 spin_lock_init(&IPIQ[i].lock);
                 IPIQ[i].depth = 0;
-                ipi_timer_latch[i] = 0;
+                atomic_set(&ipi_timer_latch[i], 0);
         }
 
         /* cpu_data index starts at zero */
@@ -369,7 +372,7 @@ void mipsmt_prepare_cpus(void)
         cpu++;
 
         /* Report on boot-time options */
-        mips_mt_set_cpuoptions ();
+        mips_mt_set_cpuoptions();
         if (vpelimit > 0)
                 printk("Limit of %d VPEs set\n", vpelimit);
         if (tclimit > 0)
@@ -420,7 +423,7 @@ void mipsmt_prepare_cpus(void)
                          * code.  Leave it alone!
                          */
                         if (tc != 0) {
-                                smtc_tc_setup(vpe,tc, cpu);
+                                smtc_tc_setup(vpe, tc, cpu);
                                 cpu++;
                         }
                         printk(" %d", tc);
@@ -428,7 +431,7 @@ void mipsmt_prepare_cpus(void)
                 }
                 if (slop) {
                         if (tc != 0) {
-                                smtc_tc_setup(vpe,tc, cpu);
+                                smtc_tc_setup(vpe, tc, cpu);
                                 cpu++;
                         }
                         printk(" %d", tc);
@@ -482,10 +485,12 @@ void mipsmt_prepare_cpus(void)
 
         /* Set up coprocessor affinity CPU mask(s) */
 
+#ifdef CONFIG_MIPS_MT_FPAFF
         for (tc = 0; tc < ntc; tc++) {
                 if (cpu_data[tc].options & MIPS_CPU_FPU)
                         cpu_set(tc, mt_fpu_cpumask);
         }
+#endif
 
         /* set up ipi interrupts... */
 
@@ -567,7 +572,7 @@ void smtc_init_secondary(void)
         if (((read_c0_tcbind() & TCBIND_CURTC) != 0) &&
             ((read_c0_tcbind() & TCBIND_CURVPE)
             != cpu_data[smp_processor_id() - 1].vpe_id)){
-                write_c0_compare (read_c0_count() + mips_hpt_frequency/HZ);
+                write_c0_compare(read_c0_count() + mips_hpt_frequency/HZ);
         }
 
         local_irq_enable();
@@ -606,6 +611,60 @@ int setup_irq_smtc(unsigned int irq, struct irqaction * new,
         return setup_irq(irq, new);
 }
 
+#ifdef CONFIG_MIPS_MT_SMTC_IRQAFF
+/*
+ * Support for IRQ affinity to TCs
+ */
+
+void smtc_set_irq_affinity(unsigned int irq, cpumask_t affinity)
+{
+        /*
+         * If a "fast path" cache of quickly decodable affinity state
+         * is maintained, this is where it gets done, on a call up
+         * from the platform affinity code.
+         */
+}
+
+void smtc_forward_irq(unsigned int irq)
+{
+        int target;
+
+        /*
+         * OK wise guy, now figure out how to get the IRQ
+         * to be serviced on an authorized "CPU".
+         *
+         * Ideally, to handle the situation where an IRQ has multiple
+         * eligible CPUS, we would maintain state per IRQ that would
+         * allow a fair distribution of service requests.  Since the
+         * expected use model is any-or-only-one, for simplicity
+         * and efficiency, we just pick the easiest one to find.
+         */
+
+        target = first_cpu(irq_desc[irq].affinity);
+
+        /*
+         * We depend on the platform code to have correctly processed
+         * IRQ affinity change requests to ensure that the IRQ affinity
+         * mask has been purged of bits corresponding to nonexistent and
+         * offline "CPUs", and to TCs bound to VPEs other than the VPE
+         * connected to the physical interrupt input for the interrupt
+         * in question.  Otherwise we have a nasty problem with interrupt
+         * mask management.  This is best handled in non-performance-critical
+         * platform IRQ affinity setting code,  to minimize interrupt-time
+         * checks.
+         */
+
+        /* If no one is eligible, service locally */
+        if (target >= NR_CPUS) {
+                do_IRQ_no_affinity(irq);
+                return;
+        }
+
+        smtc_send_ipi(target, IRQ_AFFINITY_IPI, irq);
+}
+
+#endif /* CONFIG_MIPS_MT_SMTC_IRQAFF */
+
 /*
  * IPI model for SMTC is tricky, because interrupts aren't TC-specific.
  * Within a VPE one TC can interrupt another by different approaches.
@@ -648,7 +707,7 @@ static void smtc_ipi_qdump(void)
  * be done with the atomic.h primitives). And since this is
  * MIPS MT, we can assume that we have LL/SC.
  */
-static __inline__ int atomic_postincrement(unsigned int *pv)
+static inline int atomic_postincrement(atomic_t *v)
 {
         unsigned long result;
 
@@ -659,9 +718,9 @@ static __inline__ int atomic_postincrement(unsigned int *pv)
         "       addu    %1, %0, 1                               \n"
         "       sc      %1, %2                                  \n"
         "       beqz    %1, 1b                                  \n"
-        "       sync                                            \n"
-        : "=&r" (result), "=&r" (temp), "=m" (*pv)
-        : "m" (*pv)
+        __WEAK_LLSC_MB
+        : "=&r" (result), "=&r" (temp), "=m" (v->counter)
+        : "m" (v->counter)
         : "memory");
 
         return result;
@@ -689,6 +748,8 @@ void smtc_send_ipi(int cpu, int type, unsigned int action)
         pipi->arg = (void *)action;
         pipi->dest = cpu;
         if (cpu_data[cpu].vpe_id != cpu_data[smp_processor_id()].vpe_id) {
+                if (type == SMTC_CLOCK_TICK)
+                        atomic_inc(&ipi_timer_latch[cpu]);
                 /* If not on same VPE, enqueue and send cross-VPE interupt */
                 smtc_ipi_nq(&IPIQ[cpu], pipi);
                 LOCK_CORE_PRA();
@@ -730,6 +791,8 @@ void smtc_send_ipi(int cpu, int type, unsigned int action)
                         }
                         smtc_ipi_nq(&IPIQ[cpu], pipi);
                 } else {
+                        if (type == SMTC_CLOCK_TICK)
+                                atomic_inc(&ipi_timer_latch[cpu]);
                         post_direct_ipi(cpu, pipi);
                         write_tc_c0_tchalt(0);
                         UNLOCK_CORE_PRA();
@@ -747,6 +810,7 @@ static void post_direct_ipi(int cpu, struct smtc_ipi *pipi)
         unsigned long tcrestart;
         extern u32 kernelsp[NR_CPUS];
         extern void __smtc_ipi_vector(void);
+//printk("%s: on %d for %d\n", __func__, smp_processor_id(), cpu);
 
         /* Extract Status, EPC from halted TC */
         tcstatus = read_tc_c0_tcstatus();
@@ -797,25 +861,31 @@ static void ipi_call_interrupt(void)
         smp_call_function_interrupt();
 }
 
+DECLARE_PER_CPU(struct clock_event_device, smtc_dummy_clockevent_device);
+
 void ipi_decode(struct smtc_ipi *pipi)
 {
+        unsigned int cpu = smp_processor_id();
+        struct clock_event_device *cd;
         void *arg_copy = pipi->arg;
         int type_copy = pipi->type;
-        int dest_copy = pipi->dest;
+        int ticks;
 
         smtc_ipi_nq(&freeIPIq, pipi);
         switch (type_copy) {
         case SMTC_CLOCK_TICK:
                 irq_enter();
-                kstat_this_cpu.irqs[MIPS_CPU_IRQ_BASE + cp0_compare_irq]++;
-                /* Invoke Clock "Interrupt" */
-                ipi_timer_latch[dest_copy] = 0;
-#ifdef CONFIG_SMTC_IDLE_HOOK_DEBUG
-                clock_hang_reported[dest_copy] = 0;
-#endif /* CONFIG_SMTC_IDLE_HOOK_DEBUG */
-                local_timer_interrupt(0, NULL);
+                kstat_this_cpu.irqs[MIPS_CPU_IRQ_BASE + 1]++;
+                cd = &per_cpu(smtc_dummy_clockevent_device, cpu);
+                ticks = atomic_read(&ipi_timer_latch[cpu]);
+                atomic_sub(ticks, &ipi_timer_latch[cpu]);
+                while (ticks) {
+                        cd->event_handler(cd);
+                        ticks--;
+                }
                 irq_exit();
                 break;
+
         case LINUX_SMP_IPI:
                 switch ((int)arg_copy) {
                 case SMP_RESCHEDULE_YOURSELF:
@@ -830,6 +900,15 @@ void ipi_decode(struct smtc_ipi *pipi)
                         break;
                 }
                 break;
+#ifdef CONFIG_MIPS_MT_SMTC_IRQAFF
+        case IRQ_AFFINITY_IPI:
+                /*
+                 * Accept a "forwarded" interrupt that was initially
+                 * taken by a TC who doesn't have affinity for the IRQ.
+                 */
+                do_IRQ_no_affinity((int)arg_copy);
+                break;
+#endif /* CONFIG_MIPS_MT_SMTC_IRQAFF */
         default:
                 printk("Impossible SMTC IPI Type 0x%x\n", type_copy);
                 break;
@@ -858,25 +937,6 @@ void deferred_smtc_ipi(void)
 }
 
 /*
- * Send clock tick to all TCs except the one executing the funtion
- */
-
-void smtc_timer_broadcast(void)
-{
-        int cpu;
-        int myTC = cpu_data[smp_processor_id()].tc_id;
-        int myVPE = cpu_data[smp_processor_id()].vpe_id;
-
-        smtc_cpu_stats[smp_processor_id()].timerints++;
-
-        for_each_online_cpu(cpu) {
-                if (cpu_data[cpu].vpe_id == myVPE &&
-                    cpu_data[cpu].tc_id != myTC)
-                        smtc_send_ipi(cpu, SMTC_CLOCK_TICK, 0);
-        }
-}
-
-/*
  * Cross-VPE interrupts in the SMTC prototype use "software interrupts"
  * set via cross-VPE MTTR manipulation of the Cause register. It would be
  * in some regards preferable to have external logic for "doorbell" hardware
@@ -1117,11 +1177,11 @@ void smtc_idle_loop_hook(void)
         for (tc = 0; tc < NR_CPUS; tc++) {
                 /* Don't check ourself - we'll dequeue IPIs just below */
                 if ((tc != smp_processor_id()) &&
-                    ipi_timer_latch[tc] > timerq_limit) {
+                    atomic_read(&ipi_timer_latch[tc]) > timerq_limit) {
                     if (clock_hang_reported[tc] == 0) {
                         pdb_msg += sprintf(pdb_msg,
                                 "TC %d looks hung with timer latch at %d\n",
-                                tc, ipi_timer_latch[tc]);
+                                tc, atomic_read(&ipi_timer_latch[tc]));
                         clock_hang_reported[tc]++;
                         }
                 }
@@ -1162,7 +1222,7 @@ void smtc_soft_dump(void)
         smtc_ipi_qdump();
         printk("Timer IPI Backlogs:\n");
         for (i=0; i < NR_CPUS; i++) {
-                printk("%d: %d\n", i, ipi_timer_latch[i]);
+                printk("%d: %d\n", i, atomic_read(&ipi_timer_latch[i]));
         }
         printk("%d Recoveries of \"stolen\" FPU\n",
                atomic_read(&smtc_fpu_recoveries));
@@ -1204,7 +1264,7 @@ void smtc_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu)
                         if (cpu_has_vtag_icache)
                                 flush_icache_all();
                         /* Traverse all online CPUs (hack requires contigous range) */
-                        for (i = 0; i < num_online_cpus(); i++) {
+                        for_each_online_cpu(i) {
                                 /*
                                  * We don't need to worry about our own CPU, nor those of
                                  * CPUs who don't share our TLB.
@@ -1233,7 +1293,7 @@ void smtc_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu)
         /*
          * SMTC shares the TLB within VPEs and possibly across all VPEs.
          */
-        for (i = 0; i < num_online_cpus(); i++) {
+        for_each_online_cpu(i) {
                 if ((smtc_status & SMTC_TLB_SHARED) ||
                     (cpu_data[i].vpe_id == cpu_data[cpu].vpe_id))
                         cpu_context(i, mm) = asid_cache(i) = asid;
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index 7c800ec3ff55..17c4374d2209 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -245,7 +245,7 @@ asmlinkage int sys_olduname(struct oldold_utsname __user * name)
 
         if (!name)
                 return -EFAULT;
-        if (!access_ok(VERIFY_WRITE,name,sizeof(struct oldold_utsname)))
+        if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname)))
                 return -EFAULT;
 
         error = __copy_to_user(&name->sysname, &utsname()->sysname,
@@ -314,8 +314,8 @@ asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)
  *
  * This is really horribly ugly.
  */
-asmlinkage int sys_ipc (unsigned int call, int first, int second,
-                        unsigned long third, void __user *ptr, long fifth)
+asmlinkage int sys_ipc(unsigned int call, int first, int second,
+                       unsigned long third, void __user *ptr, long fifth)
 {
         int version, ret;
 
@@ -324,26 +324,26 @@ asmlinkage int sys_ipc (unsigned int call, int first, int second,
 
         switch (call) {
         case SEMOP:
-                return sys_semtimedop (first, (struct sembuf __user *)ptr,
-                                       second, NULL);
+                return sys_semtimedop(first, (struct sembuf __user *)ptr,
+                                      second, NULL);
         case SEMTIMEDOP:
-                return sys_semtimedop (first, (struct sembuf __user *)ptr,
-                                       second,
-                                       (const struct timespec __user *)fifth);
+                return sys_semtimedop(first, (struct sembuf __user *)ptr,
+                                      second,
+                                      (const struct timespec __user *)fifth);
         case SEMGET:
-                return sys_semget (first, second, third);
+                return sys_semget(first, second, third);
         case SEMCTL: {
                 union semun fourth;
                 if (!ptr)
                         return -EINVAL;
                 if (get_user(fourth.__pad, (void __user *__user *) ptr))
                         return -EFAULT;
-                return sys_semctl (first, second, third, fourth);
+                return sys_semctl(first, second, third, fourth);
         }
 
         case MSGSND:
-                return sys_msgsnd (first, (struct msgbuf __user *) ptr,
-                                   second, third);
+                return sys_msgsnd(first, (struct msgbuf __user *) ptr,
+                                  second, third);
         case MSGRCV:
                 switch (version) {
                 case 0: {
@@ -353,45 +353,45 @@ asmlinkage int sys_ipc (unsigned int call, int first, int second,
 
                         if (copy_from_user(&tmp,
                                            (struct ipc_kludge __user *) ptr,
-                                           sizeof (tmp)))
+                                           sizeof(tmp)))
                                 return -EFAULT;
-                        return sys_msgrcv (first, tmp.msgp, second,
-                                           tmp.msgtyp, third);
+                        return sys_msgrcv(first, tmp.msgp, second,
+                                          tmp.msgtyp, third);
                 }
                 default:
-                        return sys_msgrcv (first,
-                                           (struct msgbuf __user *) ptr,
-                                           second, fifth, third);
+                        return sys_msgrcv(first,
+                                          (struct msgbuf __user *) ptr,
+                                          second, fifth, third);
                 }
         case MSGGET:
-                return sys_msgget ((key_t) first, second);
+                return sys_msgget((key_t) first, second);
         case MSGCTL:
-                return sys_msgctl (first, second,
-                                   (struct msqid_ds __user *) ptr);
+                return sys_msgctl(first, second,
+                                  (struct msqid_ds __user *) ptr);
 
         case SHMAT:
                 switch (version) {
                 default: {
                         unsigned long raddr;
-                        ret = do_shmat (first, (char __user *) ptr, second,
-                                        &raddr);
+                        ret = do_shmat(first, (char __user *) ptr, second,
+                                       &raddr);
                         if (ret)
                                 return ret;
-                        return put_user (raddr, (unsigned long __user *) third);
+                        return put_user(raddr, (unsigned long __user *) third);
                 }
                 case 1: /* iBCS2 emulator entry point */
                         if (!segment_eq(get_fs(), get_ds()))
                                 return -EINVAL;
-                        return do_shmat (first, (char __user *) ptr, second,
-                                         (unsigned long *) third);
+                        return do_shmat(first, (char __user *) ptr, second,
+                                        (unsigned long *) third);
                 }
         case SHMDT:
-                return sys_shmdt ((char __user *)ptr);
+                return sys_shmdt((char __user *)ptr);
         case SHMGET:
-                return sys_shmget (first, second, third);
+                return sys_shmget(first, second, third);
         case SHMCTL:
-                return sys_shmctl (first, second,
-                                   (struct shmid_ds __user *) ptr);
+                return sys_shmctl(first, second,
+                                  (struct shmid_ds __user *) ptr);
         default:
                 return -ENOSYS;
         }
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c
index 93a148486f88..ee7790d9debe 100644
--- a/arch/mips/kernel/sysirix.c
+++ b/arch/mips/kernel/sysirix.c
@@ -486,10 +486,10 @@ asmlinkage int irix_syssgi(struct pt_regs *regs)
 
                 switch (arg1) {
                 case SGI_INV_SIZEOF:
-                        retval = sizeof (inventory_t);
+                        retval = sizeof(inventory_t);
                         break;
                 case SGI_INV_READ:
-                        retval = dump_inventory_to_user (buffer, count);
+                        retval = dump_inventory_to_user(buffer, count);
                         break;
                 default:
                         retval = -EINVAL;
@@ -778,7 +778,7 @@ asmlinkage int irix_times(struct tms __user *tbuf)
         int err = 0;
 
         if (tbuf) {
-                if (!access_ok(VERIFY_WRITE,tbuf,sizeof *tbuf))
+                if (!access_ok(VERIFY_WRITE, tbuf, sizeof *tbuf))
                         return -EFAULT;
 
                 err = __put_user(current->utime, &tbuf->tms_utime);
@@ -1042,9 +1042,9 @@ asmlinkage unsigned long irix_mmap32(unsigned long addr, size_t len, int prot,
                         long max_size = offset + len;
 
                         if (max_size > file->f_path.dentry->d_inode->i_size) {
-                                old_pos = sys_lseek (fd, max_size - 1, 0);
-                                sys_write (fd, (void __user *) "", 1);
-                                sys_lseek (fd, old_pos, 0);
+                                old_pos = sys_lseek(fd, max_size - 1, 0);
+                                sys_write(fd, (void __user *) "", 1);
+                                sys_lseek(fd, old_pos, 0);
                         }
                 }
         }
@@ -1176,7 +1176,7 @@ static int irix_xstat32_xlate(struct kstat *stat, void __user *ubuf)
         ub.st_ctime1  = stat->atime.tv_nsec;
         ub.st_blksize = stat->blksize;
         ub.st_blocks  = stat->blocks;
-        strcpy (ub.st_fstype, "efs");
+        strcpy(ub.st_fstype, "efs");
 
         return copy_to_user(ubuf, &ub, sizeof(ub)) ? -EFAULT : 0;
 }
@@ -1208,7 +1208,7 @@ static int irix_xstat64_xlate(struct kstat *stat, void __user *ubuf)
         ks.st_nlink = (u32) stat->nlink;
         ks.st_uid = (s32) stat->uid;
         ks.st_gid = (s32) stat->gid;
-        ks.st_rdev = sysv_encode_dev (stat->rdev);
+        ks.st_rdev = sysv_encode_dev(stat->rdev);
         ks.st_pad2[0] = ks.st_pad2[1] = 0;
         ks.st_size = (long long) stat->size;
         ks.st_pad3 = 0;
@@ -1527,9 +1527,9 @@ asmlinkage int irix_mmap64(struct pt_regs *regs)
                         long max_size = off2 + len;
 
                         if (max_size > file->f_path.dentry->d_inode->i_size) {
-                                old_pos = sys_lseek (fd, max_size - 1, 0);
-                                sys_write (fd, (void __user *) "", 1);
-                                sys_lseek (fd, old_pos, 0);
+                                old_pos = sys_lseek(fd, max_size - 1, 0);
+                                sys_write(fd, (void __user *) "", 1);
+                                sys_lseek(fd, old_pos, 0);
                         }
                 }
         }
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 9a5596bf8571..5892491b40eb 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -11,6 +11,7 @@
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  */
+#include <linux/clockchips.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -24,6 +25,7 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/kallsyms.h>
 
 #include <asm/bootinfo.h>
 #include <asm/cache.h>
@@ -32,8 +34,11 @@
 #include <asm/cpu-features.h>
 #include <asm/div64.h>
 #include <asm/sections.h>
+#include <asm/smtc_ipi.h>
 #include <asm/time.h>
 
+#include <irq.h>
+
 /*
  * The integer part of the number of usecs per jiffy is taken from tick,
  * but the fractional part is not recorded, so we calculate it using the
@@ -49,32 +54,27 @@
  * forward reference
  */
 DEFINE_SPINLOCK(rtc_lock);
+EXPORT_SYMBOL(rtc_lock);
 
-/*
- * By default we provide the null RTC ops
- */
-static unsigned long null_rtc_get_time(void)
+int __weak rtc_mips_set_time(unsigned long sec)
 {
-        return mktime(2000, 1, 1, 0, 0, 0);
+        return 0;
 }
+EXPORT_SYMBOL(rtc_mips_set_time);
 
-static int null_rtc_set_time(unsigned long sec)
+int __weak rtc_mips_set_mmss(unsigned long nowtime)
 {
-        return 0;
+        return rtc_mips_set_time(nowtime);
 }
 
-unsigned long (*rtc_mips_get_time)(void) = null_rtc_get_time;
-int (*rtc_mips_set_time)(unsigned long) = null_rtc_set_time;
-int (*rtc_mips_set_mmss)(unsigned long);
-
+int update_persistent_clock(struct timespec now)
+{
+        return rtc_mips_set_mmss(now.tv_sec);
+}
 
 /* how many counter cycles in a jiffy */
 static unsigned long cycles_per_jiffy __read_mostly;
 
-/* expirelo is the count value for next CPU timer interrupt */
-static unsigned int expirelo;
-
-
 /*
  * Null timer ack for systems not needing one (e.g. i8254).
  */
@@ -93,18 +93,7 @@ static cycle_t null_hpt_read(void)
  */
 static void c0_timer_ack(void)
 {
-        unsigned int count;
-
-        /* Ack this timer interrupt and set the next one.  */
-        expirelo += cycles_per_jiffy;
-        write_c0_compare(expirelo);
-
-        /* Check to see if we have missed any timer interrupts.  */
-        while (((count = read_c0_count()) - expirelo) < 0x7fffffff) {
-                /* missed_timer_count++; */
-                expirelo = count + cycles_per_jiffy;
-                write_c0_compare(expirelo);
-        }
+        write_c0_compare(read_c0_compare());
 }
 
 /*
@@ -115,19 +104,9 @@ static cycle_t c0_hpt_read(void)
         return read_c0_count();
 }
 
-/* For use both as a high precision timer and an interrupt source.  */
-static void __init c0_hpt_timer_init(void)
-{
-        expirelo = read_c0_count() + cycles_per_jiffy;
-        write_c0_compare(expirelo);
-}
-
 int (*mips_timer_state)(void);
 void (*mips_timer_ack)(void);
 
-/* last time when xtime and rtc are sync'ed up */
-static long last_rtc_update;
-
 /*
  * local_timer_interrupt() does profiling and process accounting
  * on a per-CPU basis.
@@ -144,60 +123,15 @@ void local_timer_interrupt(int irq, void *dev_id)
         update_process_times(user_mode(get_irq_regs()));
 }
 
-/*
- * High-level timer interrupt service routines.  This function
- * is set as irqaction->handler and is invoked through do_IRQ.
- */
-irqreturn_t timer_interrupt(int irq, void *dev_id)
-{
-        write_seqlock(&xtime_lock);
-
-        mips_timer_ack();
-
-        /*
-         * call the generic timer interrupt handling
-         */
-        do_timer(1);
-
-        /*
-         * If we have an externally synchronized Linux clock, then update
-         * CMOS clock accordingly every ~11 minutes. rtc_mips_set_time() has to be
-         * called as close as possible to 500 ms before the new second starts.
-         */
-        if (ntp_synced() &&
-            xtime.tv_sec > last_rtc_update + 660 &&
-            (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
-            (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
-                if (rtc_mips_set_mmss(xtime.tv_sec) == 0) {
-                        last_rtc_update = xtime.tv_sec;
-                } else {
-                        /* do it again in 60 s */
-                        last_rtc_update = xtime.tv_sec - 600;
-                }
-        }
-
-        write_sequnlock(&xtime_lock);
-
-        /*
-         * In UP mode, we call local_timer_interrupt() to do profiling
-         * and process accouting.
-         *
-         * In SMP mode, local_timer_interrupt() is invoked by appropriate
-         * low-level local timer interrupt handler.
-         */
-        local_timer_interrupt(irq, dev_id);
-
-        return IRQ_HANDLED;
-}
-
 int null_perf_irq(void)
 {
         return 0;
 }
 
+EXPORT_SYMBOL(null_perf_irq);
+
 int (*perf_irq)(void) = null_perf_irq;
 
-EXPORT_SYMBOL(null_perf_irq);
 EXPORT_SYMBOL(perf_irq);
 
 /*
@@ -215,7 +149,7 @@ EXPORT_SYMBOL_GPL(cp0_perfcount_irq);
  * Possibly handle a performance counter interrupt.
  * Return true if the timer interrupt should not be checked
  */
-static inline int handle_perf_irq (int r2)
+static inline int handle_perf_irq(int r2)
 {
         /*
          * The performance counter overflow interrupt may be shared with the
@@ -229,63 +163,23 @@ static inline int handle_perf_irq (int r2)
                 !r2;
 }
 
-asmlinkage void ll_timer_interrupt(int irq)
-{
-        int r2 = cpu_has_mips_r2;
-
-        irq_enter();
-        kstat_this_cpu.irqs[irq]++;
-
-        if (handle_perf_irq(r2))
-                goto out;
-
-        if (r2 && ((read_c0_cause() & (1 << 30)) == 0))
-                goto out;
-
-        timer_interrupt(irq, NULL);
-
-out:
-        irq_exit();
-}
-
-asmlinkage void ll_local_timer_interrupt(int irq)
-{
-        irq_enter();
-        if (smp_processor_id() != 0)
-                kstat_this_cpu.irqs[irq]++;
-
-        /* we keep interrupt disabled all the time */
-        local_timer_interrupt(irq, NULL);
-
-        irq_exit();
-}
-
 /*
  * time_init() - it does the following things.
  *
- * 1) board_time_init() -
+ * 1) plat_time_init() -
  *      a) (optional) set up RTC routines,
  *      b) (optional) calibrate and set the mips_hpt_frequency
  *          (only needed if you intended to use cpu counter as timer interrupt
  *           source)
- * 2) setup xtime based on rtc_mips_get_time().
- * 3) calculate a couple of cached variables for later usage
- * 4) plat_timer_setup() -
+ * 2) calculate a couple of cached variables for later usage
+ * 3) plat_timer_setup() -
  *      a) (optional) over-write any choices made above by time_init().
  *      b) machine specific code should setup the timer irqaction.
  *      c) enable the timer interrupt
  */
 
-void (*board_time_init)(void);
-
 unsigned int mips_hpt_frequency;
 
-static struct irqaction timer_irqaction = {
-        .handler = timer_interrupt,
-        .flags = IRQF_DISABLED | IRQF_PERCPU,
-        .name = "timer",
-};
-
 static unsigned int __init calibrate_hpt(void)
 {
         cycle_t frequency, hpt_start, hpt_end, hpt_count, hz;
@@ -334,6 +228,84 @@ struct clocksource clocksource_mips = {
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
+static int mips_next_event(unsigned long delta,
+                           struct clock_event_device *evt)
+{
+        unsigned int cnt;
+        int res;
+
+#ifdef CONFIG_MIPS_MT_SMTC
+        {
+        unsigned long flags, vpflags;
+        local_irq_save(flags);
+        vpflags = dvpe();
+#endif
+        cnt = read_c0_count();
+        cnt += delta;
+        write_c0_compare(cnt);
+        res = ((long)(read_c0_count() - cnt ) > 0) ? -ETIME : 0;
+#ifdef CONFIG_MIPS_MT_SMTC
+        evpe(vpflags);
+        local_irq_restore(flags);
+        }
+#endif
+        return res;
+}
+
+static void mips_set_mode(enum clock_event_mode mode,
+                          struct clock_event_device *evt)
+{
+        /* Nothing to do ...  */
+}
+
+static DEFINE_PER_CPU(struct clock_event_device, mips_clockevent_device);
+static int cp0_timer_irq_installed;
+
+static irqreturn_t timer_interrupt(int irq, void *dev_id)
+{
+        const int r2 = cpu_has_mips_r2;
+        struct clock_event_device *cd;
+        int cpu = smp_processor_id();
+
+        /*
+         * Suckage alert:
+         * Before R2 of the architecture there was no way to see if a
+         * performance counter interrupt was pending, so we have to run
+         * the performance counter interrupt handler anyway.
+         */
+        if (handle_perf_irq(r2))
+                goto out;
+
+        /*
+         * The same applies to performance counter interrupts.  But with the
+         * above we now know that the reason we got here must be a timer
+         * interrupt.  Being the paranoiacs we are we check anyway.
+         */
+        if (!r2 || (read_c0_cause() & (1 << 30))) {
+                c0_timer_ack();
+#ifdef CONFIG_MIPS_MT_SMTC
+                if (cpu_data[cpu].vpe_id)
+                        goto out;
+                cpu = 0;
+#endif
+                cd = &per_cpu(mips_clockevent_device, cpu);
+                cd->event_handler(cd);
+        }
+
+out:
+        return IRQ_HANDLED;
+}
+
+static struct irqaction timer_irqaction = {
+        .handler = timer_interrupt,
+#ifdef CONFIG_MIPS_MT_SMTC
+        .flags = IRQF_DISABLED,
+#else
+        .flags = IRQF_DISABLED | IRQF_PERCPU,
+#endif
+        .name = "timer",
+};
+
 static void __init init_mips_clocksource(void)
 {
         u64 temp;
@@ -357,19 +329,127 @@ static void __init init_mips_clocksource(void)
         clocksource_register(&clocksource_mips);
 }
 
-void __init time_init(void)
+void __init __weak plat_time_init(void)
+{
+}
+
+void __init __weak plat_timer_setup(struct irqaction *irq)
+{
+}
+
+#ifdef CONFIG_MIPS_MT_SMTC
+DEFINE_PER_CPU(struct clock_event_device, smtc_dummy_clockevent_device);
+
+static void smtc_set_mode(enum clock_event_mode mode,
+                          struct clock_event_device *evt)
+{
+}
+
+int dummycnt[NR_CPUS];
+
+static void mips_broadcast(cpumask_t mask)
+{
+        unsigned int cpu;
+
+        for_each_cpu_mask(cpu, mask)
+                smtc_send_ipi(cpu, SMTC_CLOCK_TICK, 0);
+}
+
+static void setup_smtc_dummy_clockevent_device(void)
+{
+        //uint64_t mips_freq = mips_hpt_^frequency;
+        unsigned int cpu = smp_processor_id();
+        struct clock_event_device *cd;
+
+        cd = &per_cpu(smtc_dummy_clockevent_device, cpu);
+
+        cd->name                = "SMTC";
+        cd->features            = CLOCK_EVT_FEAT_DUMMY;
+
+        /* Calculate the min / max delta */
+        cd->mult        = 0; //div_sc((unsigned long) mips_freq, NSEC_PER_SEC, 32);
+        cd->shift               = 0; //32;
+        cd->max_delta_ns        = 0; //clockevent_delta2ns(0x7fffffff, cd);
+        cd->min_delta_ns        = 0; //clockevent_delta2ns(0x30, cd);
+
+        cd->rating              = 200;
+        cd->irq                 = 17; //-1;
+//      if (cpu)
+//              cd->cpumask     = CPU_MASK_ALL; // cpumask_of_cpu(cpu);
+//      else
+                cd->cpumask     = cpumask_of_cpu(cpu);
+
+        cd->set_mode            = smtc_set_mode;
+
+        cd->broadcast           = mips_broadcast;
+
+        clockevents_register_device(cd);
+}
+#endif
+
+static void mips_event_handler(struct clock_event_device *dev)
 {
-        if (board_time_init)
-                board_time_init();
+}
 
-        if (!rtc_mips_set_mmss)
-                rtc_mips_set_mmss = rtc_mips_set_time;
+void __cpuinit mips_clockevent_init(void)
+{
+        uint64_t mips_freq = mips_hpt_frequency;
+        unsigned int cpu = smp_processor_id();
+        struct clock_event_device *cd;
+        unsigned int irq = MIPS_CPU_IRQ_BASE + 7;
 
-        xtime.tv_sec = rtc_mips_get_time();
-        xtime.tv_nsec = 0;
+        if (!cpu_has_counter)
+                return;
 
-        set_normalized_timespec(&wall_to_monotonic,
-                                -xtime.tv_sec, -xtime.tv_nsec);
+#ifdef CONFIG_MIPS_MT_SMTC
+        setup_smtc_dummy_clockevent_device();
+
+        /*
+         * On SMTC we only register VPE0's compare interrupt as clockevent
+         * device.
+         */
+        if (cpu)
+                return;
+#endif
+
+        cd = &per_cpu(mips_clockevent_device, cpu);
+
+        cd->name                = "MIPS";
+        cd->features            = CLOCK_EVT_FEAT_ONESHOT;
+
+        /* Calculate the min / max delta */
+        cd->mult        = div_sc((unsigned long) mips_freq, NSEC_PER_SEC, 32);
+        cd->shift               = 32;
+        cd->max_delta_ns        = clockevent_delta2ns(0x7fffffff, cd);
+        cd->min_delta_ns        = clockevent_delta2ns(0x30, cd);
+
+        cd->rating              = 300;
+        cd->irq                 = irq;
+#ifdef CONFIG_MIPS_MT_SMTC
+        cd->cpumask             = CPU_MASK_ALL;
+#else
+        cd->cpumask             = cpumask_of_cpu(cpu);
+#endif
+        cd->set_next_event      = mips_next_event;
+        cd->set_mode            = mips_set_mode;
+        cd->event_handler       = mips_event_handler;
+
+        clockevents_register_device(cd);
+
+        if (!cp0_timer_irq_installed) {
+#ifdef CONFIG_MIPS_MT_SMTC
+#define CPUCTR_IMASKBIT (0x100 << cp0_compare_irq)
+                setup_irq_smtc(irq, &timer_irqaction, CPUCTR_IMASKBIT);
+#else
+                setup_irq(irq, &timer_irqaction);
+#endif /* CONFIG_MIPS_MT_SMTC */
+                cp0_timer_irq_installed = 1;
+        }
+}
+
+void __init time_init(void)
+{
+        plat_time_init();
 
         /* Choose appropriate high precision timer routines.  */
         if (!cpu_has_counter && !clocksource_mips.read)
@@ -392,11 +472,6 @@ void __init time_init(void)
                                 /* Calculate cache parameters.  */
                                 cycles_per_jiffy =
                                         (mips_hpt_frequency + HZ / 2) / HZ;
-                                /*
-                                 * This sets up the high precision
-                                 * timer for the first interrupt.
-                                 */
-                                c0_hpt_timer_init();
                         }
                 }
                 if (!mips_hpt_frequency)
@@ -406,6 +481,10 @@ void __init time_init(void)
                 printk("Using %u.%03u MHz high precision timer.\n",
                        ((mips_hpt_frequency + 500) / 1000) / 1000,
                        ((mips_hpt_frequency + 500) / 1000) % 1000);
+
+#ifdef CONFIG_IRQ_CPU
+                setup_irq(MIPS_CPU_IRQ_BASE + 7, &timer_irqaction);
+#endif
         }
 
         if (!mips_timer_ack)
@@ -426,56 +505,5 @@ void __init time_init(void)
         plat_timer_setup(&timer_irqaction);
 
         init_mips_clocksource();
+        mips_clockevent_init();
 }
-
-#define FEBRUARY                2
-#define STARTOFTIME             1970
-#define SECDAY                  86400L
-#define SECYR                   (SECDAY * 365)
-#define leapyear(y)             ((!((y) % 4) && ((y) % 100)) || !((y) % 400))
-#define days_in_year(y)         (leapyear(y) ? 366 : 365)
-#define days_in_month(m)        (month_days[(m) - 1])
-
-static int month_days[12] = {
-        31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-};
-
-void to_tm(unsigned long tim, struct rtc_time *tm)
-{
-        long hms, day, gday;
-        int i;
-
-        gday = day = tim / SECDAY;
-        hms = tim % SECDAY;
-
-        /* Hours, minutes, seconds are easy */
-        tm->tm_hour = hms / 3600;
-        tm->tm_min = (hms % 3600) / 60;
-        tm->tm_sec = (hms % 3600) % 60;
-
-        /* Number of years in days */
-        for (i = STARTOFTIME; day >= days_in_year(i); i++)
-                day -= days_in_year(i);
-        tm->tm_year = i;
-
-        /* Number of months in days left */
-        if (leapyear(tm->tm_year))
-                days_in_month(FEBRUARY) = 29;
-        for (i = 1; day >= days_in_month(i); i++)
-                day -= days_in_month(i);
-        days_in_month(FEBRUARY) = 28;
-        tm->tm_mon = i - 1;             /* tm_mon starts from 0 to 11 */
-
-        /* Days are what is left over (+1) from all that. */
-        tm->tm_mday = day + 1;
-
-        /*
-         * Determine the day of week
-         */
-        tm->tm_wday = (gday + 4) % 7;   /* 1970/1/1 was Thursday */
-}
-
-EXPORT_SYMBOL(rtc_lock);
-EXPORT_SYMBOL(to_tm);
-EXPORT_SYMBOL(rtc_mips_set_time);
-EXPORT_SYMBOL(rtc_mips_get_time);
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 6379003f9d8d..632bce1bf420 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -295,7 +295,8 @@ void show_regs(struct pt_regs *regs)
         if (1 <= cause && cause <= 5)
                 printk("BadVA : %0*lx\n", field, regs->cp0_badvaddr);
 
-        printk("PrId  : %08x\n", read_c0_prid());
+        printk("PrId  : %08x (%s)\n", read_c0_prid(),
+               cpu_name_string());
 }
 
 void show_registers(struct pt_regs *regs)
@@ -627,7 +628,7 @@ asmlinkage void do_fpe(struct pt_regs *regs, unsigned long fcr31)
                 lose_fpu(1);
 
                 /* Run the emulator */
-                sig = fpu_emulator_cop1Handler (regs, &current->thread.fpu, 1);
+                sig = fpu_emulator_cop1Handler(regs, &current->thread.fpu, 1);
 
                 /*
                  * We can't allow the emulated instruction to leave any of
@@ -954,7 +955,7 @@ asmlinkage void do_reserved(struct pt_regs *regs)
  */
 static inline void parity_protection_init(void)
 {
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_24K:
         case CPU_34K:
         case CPU_5KC:
@@ -1075,8 +1076,8 @@ void *set_except_vector(int n, void *addr)
 
         exception_handlers[n] = handler;
         if (n == 0 && cpu_has_divec) {
-                *(volatile u32 *)(ebase + 0x200) = 0x08000000 |
-                                                 (0x03ffffff & (handler >> 2));
+                *(u32 *)(ebase + 0x200) = 0x08000000 |
+                                          (0x03ffffff & (handler >> 2));
                 flush_icache_range(ebase + 0x200, ebase + 0x204);
         }
         return (void *)old_handler;
@@ -1165,11 +1166,11 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)
 
         if (cpu_has_veic) {
                 if (board_bind_eic_interrupt)
-                        board_bind_eic_interrupt (n, srs);
+                        board_bind_eic_interrupt(n, srs);
         } else if (cpu_has_vint) {
                 /* SRSMap is only defined if shadow sets are implemented */
                 if (mips_srs_max() > 1)
-                        change_c0_srsmap (0xf << n*4, srs << n*4);
+                        change_c0_srsmap(0xf << n*4, srs << n*4);
         }
 
         if (srs == 0) {
@@ -1198,10 +1199,10 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)
                          * Sigh... panicing won't help as the console
                          * is probably not configured :(
                          */
-                        panic ("VECTORSPACING too small");
+                        panic("VECTORSPACING too small");
                 }
 
-                memcpy (b, &except_vec_vi, handler_len);
+                memcpy(b, &except_vec_vi, handler_len);
 #ifdef CONFIG_MIPS_MT_SMTC
                 BUG_ON(n > 7);  /* Vector index %d exceeds SMTC maximum. */
 
@@ -1370,9 +1371,9 @@ void __init per_cpu_trap_init(void)
 #endif /* CONFIG_MIPS_MT_SMTC */
 
         if (cpu_has_veic || cpu_has_vint) {
-                write_c0_ebase (ebase);
+                write_c0_ebase(ebase);
                 /* Setting vector spacing enables EI/VI mode  */
-                change_c0_intctl (0x3e0, VECTORSPACING);
+                change_c0_intctl(0x3e0, VECTORSPACING);
         }
         if (cpu_has_divec) {
                 if (cpu_has_mipsmt) {
@@ -1390,8 +1391,8 @@ void __init per_cpu_trap_init(void)
          *  o read IntCtl.IPPCI to determine the performance counter interrupt
          */
         if (cpu_has_mips_r2) {
-                cp0_compare_irq = (read_c0_intctl () >> 29) & 7;
-                cp0_perfcount_irq = (read_c0_intctl () >> 26) & 7;
+                cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
+                cp0_perfcount_irq = (read_c0_intctl() >> 26) & 7;
                 if (cp0_perfcount_irq == cp0_compare_irq)
                         cp0_perfcount_irq = -1;
         } else {
@@ -1429,14 +1430,17 @@ void __init per_cpu_trap_init(void)
 }
 
 /* Install CPU exception handler */
-void __init set_handler (unsigned long offset, void *addr, unsigned long size)
+void __init set_handler(unsigned long offset, void *addr, unsigned long size)
 {
         memcpy((void *)(ebase + offset), addr, size);
         flush_icache_range(ebase + offset, ebase + offset + size);
 }
 
+static char panic_null_cerr[] __initdata =
+        "Trying to set NULL cache error exception handler";
+
 /* Install uncached CPU exception handler */
-void __init set_uncached_handler (unsigned long offset, void *addr, unsigned long size)
+void __init set_uncached_handler(unsigned long offset, void *addr, unsigned long size)
 {
 #ifdef CONFIG_32BIT
         unsigned long uncached_ebase = KSEG1ADDR(ebase);
@@ -1445,6 +1449,9 @@ void __init set_uncached_handler (unsigned long offset, void *addr, unsigned lon
         unsigned long uncached_ebase = TO_UNCAC(ebase);
 #endif
 
+        if (!addr)
+                panic(panic_null_cerr);
+
         memcpy((void *)(uncached_ebase + offset), addr, size);
 }
 
@@ -1464,7 +1471,7 @@ void __init trap_init(void)
         unsigned long i;
 
         if (cpu_has_veic || cpu_has_vint)
-                ebase = (unsigned long) alloc_bootmem_low_pages (0x200 + VECTORSPACING*64);
+                ebase = (unsigned long) alloc_bootmem_low_pages(0x200 + VECTORSPACING*64);
         else
                 ebase = CAC_BASE;
 
@@ -1490,7 +1497,7 @@ void __init trap_init(void)
          * destination.
          */
         if (cpu_has_ejtag && board_ejtag_handler_setup)
-                board_ejtag_handler_setup ();
+                board_ejtag_handler_setup();
 
         /*
          * Only some CPUs have the watch exceptions.
@@ -1543,8 +1550,8 @@ void __init trap_init(void)
         set_except_vector(12, handle_ov);
         set_except_vector(13, handle_tr);
 
-        if (current_cpu_data.cputype == CPU_R6000 ||
-            current_cpu_data.cputype == CPU_R6000A) {
+        if (current_cpu_type() == CPU_R6000 ||
+            current_cpu_type() == CPU_R6000A) {
                 /*
                  * The R6000 is the only R-series CPU that features a machine
                  * check exception (similar to the R4000 cache error) and
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index d34b1fb3665d..c327b21bca81 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -481,7 +481,7 @@ fault:
         if (fixup_exception(regs))
                 return;
 
-        die_if_kernel ("Unhandled kernel unaligned access", regs);
+        die_if_kernel("Unhandled kernel unaligned access", regs);
         send_sig(SIGSEGV, current, 1);
 
         return;
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 087ab997487d..84f9a4cc6f2f 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -6,163 +6,202 @@
 OUTPUT_ARCH(mips)
 ENTRY(kernel_entry)
 jiffies = JIFFIES;
+
 SECTIONS
 {
 #ifdef CONFIG_BOOT_ELF64
-  /* Read-only sections, merged into text segment: */
-  /* . = 0xc000000000000000; */
+        /* Read-only sections, merged into text segment: */
+        /* . = 0xc000000000000000; */
 
-  /* This is the value for an Origin kernel, taken from an IRIX kernel.  */
-  /* . = 0xc00000000001c000; */
+        /* This is the value for an Origin kernel, taken from an IRIX kernel.  */
+        /* . = 0xc00000000001c000; */
 
-  /* Set the vaddr for the text segment to a value
-        >= 0xa800 0000 0001 9000 if no symmon is going to configured
-        >= 0xa800 0000 0030 0000 otherwise  */
+        /* Set the vaddr for the text segment to a value
+         *   >= 0xa800 0000 0001 9000 if no symmon is going to configured
+         *   >= 0xa800 0000 0030 0000 otherwise
+         */
 
-  /* . = 0xa800000000300000; */
-  /* . = 0xa800000000300000; */
-  . = 0xffffffff80300000;
+        /* . = 0xa800000000300000; */
+        /* . = 0xa800000000300000; */
+        . = 0xffffffff80300000;
 #endif
-  . = LOADADDR;
-  /* read-only */
-  _text = .;                    /* Text and read-only data */
-  .text : {
-    TEXT_TEXT
-    SCHED_TEXT
-    LOCK_TEXT
-    *(.fixup)
-    *(.gnu.warning)
-  } =0
-
-  _etext = .;                   /* End of text section */
-
-  . = ALIGN(16);                /* Exception table */
-  __start___ex_table = .;
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
-
-  __start___dbe_table = .;      /* Exception table for data bus errors */
-  __dbe_table : { *(__dbe_table) }
-  __stop___dbe_table = .;
-
-  NOTES
-
-  RODATA
-
-  /* writeable */
-  .data : {                     /* Data */
-    . = . + DATAOFFSET;         /* for CONFIG_MAPPED_KERNEL */
-    /*
-     * This ALIGN is needed as a workaround for a bug a gcc bug upto 4.1 which
-     * limits the maximum alignment to at most 32kB and results in the following
-     * warning:
-     *
-     *  CC      arch/mips/kernel/init_task.o
-     * arch/mips/kernel/init_task.c:30: warning: alignment of ‘init_thread_union’
-     * is greater than maximum object file alignment.  Using 32768
-     */
-    . = ALIGN(_PAGE_SIZE);
-    *(.data.init_task)
-
-    DATA_DATA
-
-    CONSTRUCTORS
-  }
-  _gp = . + 0x8000;
-  .lit8 : { *(.lit8) }
-  .lit4 : { *(.lit4) }
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata     : { *(.sdata) }
-
-  . = ALIGN(_PAGE_SIZE);
-  __nosave_begin = .;
-  .data_nosave : { *(.data.nosave) }
-  . = ALIGN(_PAGE_SIZE);
-  __nosave_end = .;
-
-  . = ALIGN(32);
-  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
-
-  _edata =  .;                  /* End of data section */
-
-  /* will be freed after init */
-  . = ALIGN(_PAGE_SIZE);                /* Init code and data */
-  __init_begin = .;
-  .init.text : {
-        _sinittext = .;
-        *(.init.text)
-        _einittext = .;
-  }
-  .init.data : { *(.init.data) }
-  . = ALIGN(16);
-  __setup_start = .;
-  .init.setup : { *(.init.setup) }
-  __setup_end = .;
-
-  __initcall_start = .;
-  .initcall.init : {
-        INITCALLS
-  }
-  __initcall_end = .;
-
-  __con_initcall_start = .;
-  .con_initcall.init : { *(.con_initcall.init) }
-  __con_initcall_end = .;
-  SECURITY_INIT
-    /* .exit.text is discarded at runtime, not link time, to deal with
-     references from .rodata */
-  .exit.text : { *(.exit.text) }
-  .exit.data : { *(.exit.data) }
+        . = LOADADDR;
+        /* read-only */
+        _text = .;      /* Text and read-only data */
+        .text : {
+                TEXT_TEXT
+                SCHED_TEXT
+                LOCK_TEXT
+                *(.fixup)
+                *(.gnu.warning)
+        } =0
+        _etext = .;     /* End of text section */
+
+        /* Exception table */
+        . = ALIGN(16);
+        __ex_table : {
+                __start___ex_table = .;
+                *(__ex_table)
+                __stop___ex_table = .;
+        }
+
+        /* Exception table for data bus errors */
+        __dbe_table : {
+                __start___dbe_table = .;
+                *(__dbe_table)
+                __stop___dbe_table = .;
+        }
+        RODATA
+
+        /* writeable */
+        .data : {       /* Data */
+          . = . + DATAOFFSET;           /* for CONFIG_MAPPED_KERNEL */
+          /*
+           * This ALIGN is needed as a workaround for a bug a gcc bug upto 4.1 which
+           * limits the maximum alignment to at most 32kB and results in the following
+           * warning:
+           *
+           *  CC      arch/mips/kernel/init_task.o
+           * arch/mips/kernel/init_task.c:30: warning: alignment of ‘init_thread_union’
+           * is greater than maximum object file alignment.  Using 32768
+           */
+          . = ALIGN(_PAGE_SIZE);
+          *(.data.init_task)
+
+          DATA_DATA
+          CONSTRUCTORS
+        }
+        _gp = . + 0x8000;
+        .lit8 : {
+                *(.lit8)
+        }
+        .lit4 : {
+                *(.lit4)
+        }
+        /* We want the small data sections together, so single-instruction offsets
+           can access them all, and initialized data all before uninitialized, so
+           we can shorten the on-disk segment size.  */
+        .sdata : {
+                *(.sdata)
+        }
+
+        . = ALIGN(_PAGE_SIZE);
+        .data_nosave : {
+                __nosave_begin = .;
+                *(.data.nosave)
+        }
+        . = ALIGN(_PAGE_SIZE);
+        __nosave_end = .;
+
+        . = ALIGN(32);
+        .data.cacheline_aligned : {
+                *(.data.cacheline_aligned)
+        }
+        _edata =  .;                    /* End of data section */
+
+        /* will be freed after init */
+        . = ALIGN(_PAGE_SIZE);          /* Init code and data */
+        __init_begin = .;
+        .init.text : {
+                _sinittext = .;
+                *(.init.text)
+                _einittext = .;
+        }
+        .init.data : {
+                *(.init.data)
+        }
+        . = ALIGN(16);
+        .init.setup : {
+                __setup_start = .;
+                *(.init.setup)
+                __setup_end = .;
+        }
+
+        .initcall.init : {
+                __initcall_start = .;
+                INITCALLS
+                __initcall_end = .;
+        }
+
+        .con_initcall.init : {
+                __con_initcall_start = .;
+                *(.con_initcall.init)
+                __con_initcall_end = .;
+        }
+        SECURITY_INIT
+
+        /* .exit.text is discarded at runtime, not link time, to deal with
+         * references from .rodata
+         */
+        .exit.text : {
+                *(.exit.text)
+        }
+        .exit.data : {
+                *(.exit.data)
+        }
 #if defined(CONFIG_BLK_DEV_INITRD)
-  . = ALIGN(_PAGE_SIZE);
-  __initramfs_start = .;
-  .init.ramfs : { *(.init.ramfs) }
-  __initramfs_end = .;
+        . = ALIGN(_PAGE_SIZE);
+        .init.ramfs : {
+                __initramfs_start = .;
+                *(.init.ramfs)
+                __initramfs_end = .;
+        }
 #endif
-  PERCPU(_PAGE_SIZE)
-  . = ALIGN(_PAGE_SIZE);
-  __init_end = .;
-  /* freed after init ends here */
-
-  __bss_start = .;              /* BSS */
-  .sbss      : {
-    *(.sbss)
-    *(.scommon)
-  }
-  .bss : {
-    *(.bss)
-    *(COMMON)
-  }
-  __bss_stop = .;
-
-  _end = . ;
-
-  /* Sections to be discarded */
-  /DISCARD/ : {
-        *(.exitcall.exit)
-
-        /* ABI crap starts here */
-        *(.MIPS.options)
-        *(.options)
-        *(.pdr)
-        *(.reginfo)
-  }
-
-  /* These mark the ABI of the kernel for debuggers.  */
-  .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) }
-  .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) }
-
-  /* This is the MIPS specific mdebug section.  */
-  .mdebug : { *(.mdebug) }
-
-  STABS_DEBUG
-
-  DWARF_DEBUG
-
-  /* These must appear regardless of  .  */
-  .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
-  .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
-  .note : { *(.note) }
+        PERCPU(_PAGE_SIZE)
+        . = ALIGN(_PAGE_SIZE);
+        __init_end = .;
+        /* freed after init ends here */
+
+        __bss_start = .;        /* BSS */
+        .sbss  : {
+                *(.sbss)
+                *(.scommon)
+        }
+        .bss : {
+                *(.bss)
+                *(COMMON)
+        }
+        __bss_stop = .;
+
+        _end = . ;
+
+        /* Sections to be discarded */
+        /DISCARD/ : {
+                *(.exitcall.exit)
+
+                /* ABI crap starts here */
+                *(.MIPS.options)
+                *(.options)
+                *(.pdr)
+                *(.reginfo)
+        }
+
+        /* These mark the ABI of the kernel for debuggers.  */
+        .mdebug.abi32 : {
+                KEEP(*(.mdebug.abi32))
+        }
+        .mdebug.abi64 : {
+                KEEP(*(.mdebug.abi64))
+        }
+
+        /* This is the MIPS specific mdebug section.  */
+        .mdebug : {
+                *(.mdebug)
+        }
+
+        STABS_DEBUG
+        DWARF_DEBUG
+
+        /* These must appear regardless of  .  */
+        .gptab.sdata : {
+                *(.gptab.data)
+                *(.gptab.sdata)
+        }
+        .gptab.sbss : {
+                *(.gptab.bss)
+                *(.gptab.sbss)
+        }
+        .note : {
+                *(.note)
+        }
 }
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 3c09b9785f4c..61b729fa0548 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -936,8 +936,18 @@ static int vpe_elfload(struct vpe * v)
 
                 }
         } else {
-                for (i = 0; i < hdr->e_shnum; i++) {
+                struct elf_phdr *phdr = (struct elf_phdr *) ((char *)hdr + hdr->e_phoff);
 
+                for (i = 0; i < hdr->e_phnum; i++) {
+                        if (phdr->p_type != PT_LOAD)
+                                continue;
+
+                        memcpy((void *)phdr->p_vaddr, (char *)hdr + phdr->p_offset, phdr->p_filesz);
+                        memset((void *)phdr->p_vaddr + phdr->p_filesz, 0, phdr->p_memsz - phdr->p_filesz);
+                        phdr++;
+                }
+
+                for (i = 0; i < hdr->e_shnum; i++) {
                         /* Internal symbols and strings. */
                         if (sechdrs[i].sh_type == SHT_SYMTAB) {
                                 symindex = i;
@@ -948,39 +958,6 @@ static int vpe_elfload(struct vpe * v)
                                    magic symbols */
                                 sechdrs[i].sh_addr = (size_t) hdr + sechdrs[i].sh_offset;
                         }
-
-                        /* filter sections we dont want in the final image */
-                        if (!(sechdrs[i].sh_flags & SHF_ALLOC) ||
-                            (sechdrs[i].sh_type == SHT_MIPS_REGINFO)) {
-                                printk( KERN_DEBUG " ignoring section, "
-                                        "name %s type %x address 0x%x \n",
-                                        secstrings + sechdrs[i].sh_name,
-                                        sechdrs[i].sh_type, sechdrs[i].sh_addr);
-                                continue;
-                        }
-
-                        if (sechdrs[i].sh_addr < (unsigned int)v->load_addr) {
-                                printk( KERN_WARNING "VPE loader: "
-                                        "fully linked image has invalid section, "
-                                        "name %s type %x address 0x%x, before load "
-                                        "address of 0x%x\n",
-                                        secstrings + sechdrs[i].sh_name,
-                                        sechdrs[i].sh_type, sechdrs[i].sh_addr,
-                                        (unsigned int)v->load_addr);
-                                return -ENOEXEC;
-                        }
-
-                        printk(KERN_DEBUG " copying section sh_name %s, sh_addr 0x%x "
-                               "size 0x%x0 from x%p\n",
-                               secstrings + sechdrs[i].sh_name, sechdrs[i].sh_addr,
-                               sechdrs[i].sh_size, hdr + sechdrs[i].sh_offset);
-
-                        if (sechdrs[i].sh_type != SHT_NOBITS)
-                                memcpy((void *)sechdrs[i].sh_addr,
-                                       (char *)hdr + sechdrs[i].sh_offset,
-                                       sechdrs[i].sh_size);
-                        else
-                                memset((void *)sechdrs[i].sh_addr, 0, sechdrs[i].sh_size);
                 }
         }
 
@@ -1044,7 +1021,7 @@ static int getcwd(char *buff, int size)
         old_fs = get_fs();
         set_fs(KERNEL_DS);
 
-        ret = sys_getcwd(buff,size);
+        ret = sys_getcwd(buff, size);
 
         set_fs(old_fs);
 
diff --git a/arch/mips/lasat/Kconfig b/arch/mips/lasat/Kconfig
new file mode 100644
index 000000000000..1d2ee8a9be13
--- /dev/null
+++ b/arch/mips/lasat/Kconfig
@@ -0,0 +1,15 @@
+config PICVUE
+        tristate "PICVUE LCD display driver"
+        depends on LASAT
+
+config PICVUE_PROC
+        tristate "PICVUE LCD display driver /proc interface"
+        depends on PICVUE
+
+config DS1603
+        bool "DS1603 RTC driver"
+        depends on LASAT
+
+config LASAT_SYSCTL
+        bool "LASAT sysctl interface"
+        depends on LASAT
diff --git a/arch/mips/lasat/Makefile b/arch/mips/lasat/Makefile
new file mode 100644
index 000000000000..33791609fe99
--- /dev/null
+++ b/arch/mips/lasat/Makefile
@@ -0,0 +1,16 @@
+#
+# Makefile for the LASAT specific kernel interface routines under Linux.
+#
+
+obj-y                           += reset.o setup.o prom.o lasat_board.o \
+                                   at93c.o interrupt.o serial.o
+
+obj-$(CONFIG_LASAT_SYSCTL)      += sysctl.o
+obj-$(CONFIG_DS1603)            += ds1603.o
+obj-$(CONFIG_PICVUE)            += picvue.o
+obj-$(CONFIG_PICVUE_PROC)       += picvue_proc.o
+
+clean:
+        make -C image clean
+
+EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/lasat/at93c.c b/arch/mips/lasat/at93c.c
new file mode 100644
index 000000000000..793e234719a6
--- /dev/null
+++ b/arch/mips/lasat/at93c.c
@@ -0,0 +1,149 @@
+/*
+ * Atmel AT93C46 serial eeprom driver
+ *
+ * Brian Murphy <brian.murphy@eicon.com>
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <asm/lasat/lasat.h>
+#include <linux/module.h>
+#include <linux/init.h>
+
+#include "at93c.h"
+
+#define AT93C_ADDR_SHIFT        7
+#define AT93C_ADDR_MAX          ((1 << AT93C_ADDR_SHIFT) - 1)
+#define AT93C_RCMD              (0x6 << AT93C_ADDR_SHIFT)
+#define AT93C_WCMD              (0x5 << AT93C_ADDR_SHIFT)
+#define AT93C_WENCMD            0x260
+#define AT93C_WDSCMD            0x200
+
+struct at93c_defs *at93c;
+
+static void at93c_reg_write(u32 val)
+{
+        *at93c->reg = val;
+}
+
+static u32 at93c_reg_read(void)
+{
+        u32 tmp = *at93c->reg;
+        return tmp;
+}
+
+static u32 at93c_datareg_read(void)
+{
+        u32 tmp = *at93c->rdata_reg;
+        return tmp;
+}
+
+static void at93c_cycle_clk(u32 data)
+{
+        at93c_reg_write(data | at93c->clk);
+        lasat_ndelay(250);
+        at93c_reg_write(data & ~at93c->clk);
+        lasat_ndelay(250);
+}
+
+static void at93c_write_databit(u8 bit)
+{
+        u32 data = at93c_reg_read();
+        if (bit)
+                data |= 1 << at93c->wdata_shift;
+        else
+                data &= ~(1 << at93c->wdata_shift);
+
+        at93c_reg_write(data);
+        lasat_ndelay(100);
+        at93c_cycle_clk(data);
+}
+
+static unsigned int at93c_read_databit(void)
+{
+        u32 data;
+
+        at93c_cycle_clk(at93c_reg_read());
+        data = (at93c_datareg_read() >> at93c->rdata_shift) & 1;
+        return data;
+}
+
+static u8 at93c_read_byte(void)
+{
+        int i;
+        u8 data = 0;
+
+        for (i = 0; i <= 7; i++) {
+                data <<= 1;
+                data |= at93c_read_databit();
+        }
+        return data;
+}
+
+static void at93c_write_bits(u32 data, int size)
+{
+        int i;
+        int shift = size - 1;
+        u32 mask = (1 << shift);
+
+        for (i = 0; i < size; i++) {
+                at93c_write_databit((data & mask) >> shift);
+                data <<= 1;
+        }
+}
+
+static void at93c_init_op(void)
+{
+        at93c_reg_write((at93c_reg_read() | at93c->cs) &
+                        ~at93c->clk & ~(1 << at93c->rdata_shift));
+        lasat_ndelay(50);
+}
+
+static void at93c_end_op(void)
+{
+        at93c_reg_write(at93c_reg_read() & ~at93c->cs);
+        lasat_ndelay(250);
+}
+
+static void at93c_wait(void)
+{
+        at93c_init_op();
+        while (!at93c_read_databit())
+                ;
+        at93c_end_op();
+};
+
+static void at93c_disable_wp(void)
+{
+        at93c_init_op();
+        at93c_write_bits(AT93C_WENCMD, 10);
+        at93c_end_op();
+}
+
+static void at93c_enable_wp(void)
+{
+        at93c_init_op();
+        at93c_write_bits(AT93C_WDSCMD, 10);
+        at93c_end_op();
+}
+
+u8 at93c_read(u8 addr)
+{
+        u8 byte;
+        at93c_init_op();
+        at93c_write_bits((addr & AT93C_ADDR_MAX)|AT93C_RCMD, 10);
+        byte = at93c_read_byte();
+        at93c_end_op();
+        return byte;
+}
+
+void at93c_write(u8 addr, u8 data)
+{
+        at93c_disable_wp();
+        at93c_init_op();
+        at93c_write_bits((addr & AT93C_ADDR_MAX)|AT93C_WCMD, 10);
+        at93c_write_bits(data, 8);
+        at93c_end_op();
+        at93c_wait();
+        at93c_enable_wp();
+}
diff --git a/arch/mips/lasat/at93c.h b/arch/mips/lasat/at93c.h
new file mode 100644
index 000000000000..cfe2f99b1d44
--- /dev/null
+++ b/arch/mips/lasat/at93c.h
@@ -0,0 +1,18 @@
+/*
+ * Atmel AT93C46 serial eeprom driver
+ *
+ * Brian Murphy <brian.murphy@eicon.com>
+ *
+ */
+
+extern struct at93c_defs {
+        volatile u32 *reg;
+        volatile u32 *rdata_reg;
+        int rdata_shift;
+        int wdata_shift;
+        u32 cs;
+        u32 clk;
+} *at93c;
+
+u8 at93c_read(u8 addr);
+void at93c_write(u8 addr, u8 data);
diff --git a/arch/mips/lasat/ds1603.c b/arch/mips/lasat/ds1603.c
new file mode 100644
index 000000000000..52cb1436a12a
--- /dev/null
+++ b/arch/mips/lasat/ds1603.c
@@ -0,0 +1,183 @@
+/*
+ * Dallas Semiconductors 1603 RTC driver
+ *
+ * Brian Murphy <brian@murphy.dk>
+ *
+ */
+#include <linux/kernel.h>
+#include <asm/lasat/lasat.h>
+#include <linux/delay.h>
+#include <asm/lasat/ds1603.h>
+#include <asm/time.h>
+
+#include "ds1603.h"
+
+#define READ_TIME_CMD 0x81
+#define SET_TIME_CMD 0x80
+#define TRIMMER_SET_CMD 0xC0
+#define TRIMMER_VALUE_MASK 0x38
+#define TRIMMER_SHIFT 3
+
+struct ds_defs *ds1603;
+
+/* HW specific register functions */
+static void rtc_reg_write(unsigned long val)
+{
+        *ds1603->reg = val;
+}
+
+static unsigned long rtc_reg_read(void)
+{
+        unsigned long tmp = *ds1603->reg;
+        return tmp;
+}
+
+static unsigned long rtc_datareg_read(void)
+{
+        unsigned long tmp = *ds1603->data_reg;
+        return tmp;
+}
+
+static void rtc_nrst_high(void)
+{
+        rtc_reg_write(rtc_reg_read() | ds1603->rst);
+}
+
+static void rtc_nrst_low(void)
+{
+        rtc_reg_write(rtc_reg_read() & ~ds1603->rst);
+}
+
+static void rtc_cycle_clock(unsigned long data)
+{
+        data |= ds1603->clk;
+        rtc_reg_write(data);
+        lasat_ndelay(250);
+        if (ds1603->data_reversed)
+                data &= ~ds1603->data;
+        else
+                data |= ds1603->data;
+        data &= ~ds1603->clk;
+        rtc_reg_write(data);
+        lasat_ndelay(250 + ds1603->huge_delay);
+}
+
+static void rtc_write_databit(unsigned int bit)
+{
+        unsigned long data = rtc_reg_read();
+        if (ds1603->data_reversed)
+                bit = !bit;
+        if (bit)
+                data |= ds1603->data;
+        else
+                data &= ~ds1603->data;
+
+        rtc_reg_write(data);
+        lasat_ndelay(50 + ds1603->huge_delay);
+        rtc_cycle_clock(data);
+}
+
+static unsigned int rtc_read_databit(void)
+{
+        unsigned int data;
+
+        data = (rtc_datareg_read() & (1 << ds1603->data_read_shift))
+                >> ds1603->data_read_shift;
+        rtc_cycle_clock(rtc_reg_read());
+        return data;
+}
+
+static void rtc_write_byte(unsigned int byte)
+{
+        int i;
+
+        for (i = 0; i <= 7; i++) {
+                rtc_write_databit(byte & 1L);
+                byte >>= 1;
+        }
+}
+
+static void rtc_write_word(unsigned long word)
+{
+        int i;
+
+        for (i = 0; i <= 31; i++) {
+                rtc_write_databit(word & 1L);
+                word >>= 1;
+        }
+}
+
+static unsigned long rtc_read_word(void)
+{
+        int i;
+        unsigned long word = 0;
+        unsigned long shift = 0;
+
+        for (i = 0; i <= 31; i++) {
+                word |= rtc_read_databit() << shift;
+                shift++;
+        }
+        return word;
+}
+
+static void rtc_init_op(void)
+{
+        rtc_nrst_high();
+
+        rtc_reg_write(rtc_reg_read() & ~ds1603->clk);
+
+        lasat_ndelay(50);
+}
+
+static void rtc_end_op(void)
+{
+        rtc_nrst_low();
+        lasat_ndelay(1000);
+}
+
+unsigned long read_persistent_clock(void)
+{
+        unsigned long word;
+        unsigned long flags;
+
+        spin_lock_irqsave(&rtc_lock, flags);
+        rtc_init_op();
+        rtc_write_byte(READ_TIME_CMD);
+        word = rtc_read_word();
+        rtc_end_op();
+        spin_unlock_irqrestore(&rtc_lock, flags);
+
+        return word;
+}
+
+int rtc_mips_set_mmss(unsigned long time)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&rtc_lock, flags);
+        rtc_init_op();
+        rtc_write_byte(SET_TIME_CMD);
+        rtc_write_word(time);
+        rtc_end_op();
+        spin_unlock_irqrestore(&rtc_lock, flags);
+
+        return 0;
+}
+
+void ds1603_set_trimmer(unsigned int trimval)
+{
+        rtc_init_op();
+        rtc_write_byte(((trimval << TRIMMER_SHIFT) & TRIMMER_VALUE_MASK)
+                        | (TRIMMER_SET_CMD));
+        rtc_end_op();
+}
+
+void ds1603_disable(void)
+{
+        ds1603_set_trimmer(TRIMMER_DISABLE_RTC);
+}
+
+void ds1603_enable(void)
+{
+        ds1603_set_trimmer(TRIMMER_DEFAULT);
+}
diff --git a/arch/mips/lasat/ds1603.h b/arch/mips/lasat/ds1603.h
new file mode 100644
index 000000000000..2da3704044fd
--- /dev/null
+++ b/arch/mips/lasat/ds1603.h
@@ -0,0 +1,31 @@
+/*
+ * Dallas Semiconductors 1603 RTC driver
+ *
+ * Brian Murphy <brian@murphy.dk>
+ *
+ */
+#ifndef __DS1603_H
+#define __DS1603_H
+
+struct ds_defs {
+        volatile u32 *reg;
+        volatile u32 *data_reg;
+        u32 rst;
+        u32 clk;
+        u32 data;
+        u32 data_read_shift;
+        char data_reversed;
+        u32 huge_delay;
+};
+
+extern struct ds_defs *ds1603;
+
+void ds1603_set_trimmer(unsigned int);
+void ds1603_enable(void);
+void ds1603_disable(void);
+void ds1603_init(struct ds_defs *);
+
+#define TRIMMER_DEFAULT 3
+#define TRIMMER_DISABLE_RTC 0
+
+#endif
diff --git a/arch/mips/lasat/image/Makefile b/arch/mips/lasat/image/Makefile
new file mode 100644
index 000000000000..5332449ec040
--- /dev/null
+++ b/arch/mips/lasat/image/Makefile
@@ -0,0 +1,54 @@
+#
+# MAKEFILE FOR THE MIPS LINUX BOOTLOADER AND ROM DEBUGGER
+#
+# i-data Networks
+#
+# Author: Thomas Horsten <thh@i-data.com>
+#
+
+ifndef Version
+ Version = "$(USER)-test"
+endif
+
+MKLASATIMG = mklasatimg
+MKLASATIMG_ARCH = mq2,mqpro,sp100,sp200
+KERNEL_IMAGE = $(TOPDIR)/vmlinux
+KERNEL_START = $(shell $(NM) $(KERNEL_IMAGE) | grep " _text" | cut -f1 -d\ )
+KERNEL_ENTRY = $(shell $(NM) $(KERNEL_IMAGE) | grep kernel_entry | cut -f1 -d\ )
+
+LDSCRIPT= -L$(obj) -Tromscript.normal
+
+HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \
+                -D_kernel_entry=0x$(KERNEL_ENTRY) \
+                -D VERSION="\"$(Version)\"" \
+                -D TIMESTAMP=$(shell date +%s)
+
+$(obj)/head.o: $(obj)/head.S $(KERNEL_IMAGE)
+        $(CC) -fno-pic $(HEAD_DEFINES) -I$(TOPDIR)/include -c -o $@ $<
+
+OBJECTS = head.o kImage.o
+
+rom.sw: $(obj)/rom.sw
+rom.bin:        $(obj)/rom.bin
+
+$(obj)/rom.sw:  $(obj)/rom.bin
+        $(MKLASATIMG) -o $@ -k $^ -m $(MKLASATIMG_ARCH)
+
+$(obj)/rom.bin: $(obj)/rom
+        $(OBJCOPY) -O binary -S $^ $@
+
+# Rule to make the bootloader
+$(obj)/rom: $(addprefix $(obj)/,$(OBJECTS))
+        $(LD) $(LDFLAGS) $(LDSCRIPT) -o $@ $^
+
+$(obj)/%.o: $(obj)/%.gz
+        $(LD) -r -o $@ -b binary $<
+
+$(obj)/%.gz: $(obj)/%.bin
+        gzip -cf -9 $< > $@
+
+$(obj)/kImage.bin: $(KERNEL_IMAGE)
+        $(OBJCOPY) -O binary -S $^ $@
+
+clean:
+        rm -f rom rom.bin rom.sw kImage.bin kImage.o
diff --git a/arch/mips/lasat/image/head.S b/arch/mips/lasat/image/head.S
new file mode 100644
index 000000000000..efb95f2609c2
--- /dev/null
+++ b/arch/mips/lasat/image/head.S
@@ -0,0 +1,31 @@
+#include <asm/lasat/head.h>
+
+        .text
+        .section .text.start, "ax"
+        .set noreorder
+        .set mips3
+
+        /* Magic words identifying a software image */
+        .word   LASAT_K_MAGIC0_VAL
+        .word   LASAT_K_MAGIC1_VAL
+
+        /* Image header version */
+        .word   0x00000002
+
+        /* image start and size */
+        .word   _image_start
+        .word   _image_size
+
+        /* start of kernel and entrypoint in uncompressed image */
+        .word   _kernel_start
+        .word   _kernel_entry
+
+        /* Here we have room for future flags */
+
+        .org    0x40
+reldate:
+        .word   TIMESTAMP
+
+        .org    0x50
+release:
+        .string VERSION
diff --git a/arch/mips/lasat/image/romscript.normal b/arch/mips/lasat/image/romscript.normal
new file mode 100644
index 000000000000..988f8ad189cb
--- /dev/null
+++ b/arch/mips/lasat/image/romscript.normal
@@ -0,0 +1,23 @@
+OUTPUT_ARCH(mips)
+
+SECTIONS
+{
+  .text :
+  {
+    *(.text.start)
+  }
+
+  /* Data in ROM */
+
+  .data ALIGN(0x10) :
+  {
+    *(.data)
+  }
+  _image_start = ADDR(.data);
+  _image_size = SIZEOF(.data);
+
+  .other :
+  {
+    *(.*)
+  }
+}
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c
new file mode 100644
index 000000000000..5f35289bfff5
--- /dev/null
+++ b/arch/mips/lasat/interrupt.c
@@ -0,0 +1,130 @@
+/*
+ * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
+ *
+ *  This program is free software; you can distribute 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 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.
+ *
+ * Routines for generic manipulation of the interrupts found on the
+ * Lasat boards.
+ */
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/interrupt.h>
+#include <linux/kernel_stat.h>
+
+#include <asm/bootinfo.h>
+#include <asm/lasat/lasatint.h>
+#include <asm/time.h>
+#include <asm/gdb-stub.h>
+
+static volatile int *lasat_int_status;
+static volatile int *lasat_int_mask;
+static volatile int lasat_int_mask_shift;
+
+void disable_lasat_irq(unsigned int irq_nr)
+{
+        *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift;
+}
+
+void enable_lasat_irq(unsigned int irq_nr)
+{
+        *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift;
+}
+
+static struct irq_chip lasat_irq_type = {
+        .name = "Lasat",
+        .ack = disable_lasat_irq,
+        .mask = disable_lasat_irq,
+        .mask_ack = disable_lasat_irq,
+        .unmask = enable_lasat_irq,
+};
+
+static inline int ls1bit32(unsigned int x)
+{
+        int b = 31, s;
+
+        s = 16; if (x << 16 == 0) s = 0; b -= s; x <<= s;
+        s =  8; if (x <<  8 == 0) s = 0; b -= s; x <<= s;
+        s =  4; if (x <<  4 == 0) s = 0; b -= s; x <<= s;
+        s =  2; if (x <<  2 == 0) s = 0; b -= s; x <<= s;
+        s =  1; if (x <<  1 == 0) s = 0; b -= s;
+
+        return b;
+}
+
+static unsigned long (*get_int_status)(void);
+
+static unsigned long get_int_status_100(void)
+{
+        return *lasat_int_status & *lasat_int_mask;
+}
+
+static unsigned long get_int_status_200(void)
+{
+        unsigned long int_status;
+
+        int_status = *lasat_int_status;
+        int_status &= (int_status >> LASATINT_MASK_SHIFT_200) & 0xffff;
+        return int_status;
+}
+
+asmlinkage void plat_irq_dispatch(void)
+{
+        unsigned long int_status;
+        unsigned int cause = read_c0_cause();
+        int irq;
+
+        if (cause & CAUSEF_IP7) {       /* R4000 count / compare IRQ */
+                ll_timer_interrupt(7);
+                return;
+        }
+
+        int_status = get_int_status();
+
+        /* if int_status == 0, then the interrupt has already been cleared */
+        if (int_status) {
+                irq = ls1bit32(int_status);
+
+                do_IRQ(irq);
+        }
+}
+
+void __init arch_init_irq(void)
+{
+        int i;
+
+        switch (mips_machtype) {
+        case MACH_LASAT_100:
+                lasat_int_status = (void *)LASAT_INT_STATUS_REG_100;
+                lasat_int_mask = (void *)LASAT_INT_MASK_REG_100;
+                lasat_int_mask_shift = LASATINT_MASK_SHIFT_100;
+                get_int_status = get_int_status_100;
+                *lasat_int_mask = 0;
+                break;
+        case MACH_LASAT_200:
+                lasat_int_status = (void *)LASAT_INT_STATUS_REG_200;
+                lasat_int_mask = (void *)LASAT_INT_MASK_REG_200;
+                lasat_int_mask_shift = LASATINT_MASK_SHIFT_200;
+                get_int_status = get_int_status_200;
+                *lasat_int_mask &= 0xffff;
+                break;
+        default:
+                panic("arch_init_irq: mips_machtype incorrect");
+        }
+
+        for (i = 0; i <= LASATINT_END; i++)
+                set_irq_chip_and_handler(i, &lasat_irq_type, handle_level_irq);
+}
diff --git a/arch/mips/lasat/lasat_board.c b/arch/mips/lasat/lasat_board.c
new file mode 100644
index 000000000000..ec2f658c3709
--- /dev/null
+++ b/arch/mips/lasat/lasat_board.c
@@ -0,0 +1,280 @@
+/*
+ * Thomas Horsten <thh@lasat.com>
+ * Copyright (C) 2000 LASAT Networks A/S.
+ *
+ *  This program is free software; you can distribute 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 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.
+ *
+ * Routines specific to the LASAT boards
+ */
+#include <linux/types.h>
+#include <linux/crc32.h>
+#include <asm/lasat/lasat.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/ctype.h>
+#include <asm/bootinfo.h>
+#include <asm/addrspace.h>
+#include "at93c.h"
+/* New model description table */
+#include "lasat_models.h"
+
+#define EEPROM_CRC(data, len) (~crc32(~0, data, len))
+
+struct lasat_info lasat_board_info;
+
+void update_bcastaddr(void);
+
+int EEPROMRead(unsigned int pos, unsigned char *data, int len)
+{
+        int i;
+
+        for (i = 0; i < len; i++)
+                *data++ = at93c_read(pos++);
+
+        return 0;
+}
+
+int EEPROMWrite(unsigned int pos, unsigned char *data, int len)
+{
+        int i;
+
+        for (i = 0; i < len; i++)
+                at93c_write(pos++, *data++);
+
+        return 0;
+}
+
+static void init_flash_sizes(void)
+{
+        unsigned long *lb = lasat_board_info.li_flashpart_base;
+        unsigned long *ls = lasat_board_info.li_flashpart_size;
+        int i;
+
+        ls[LASAT_MTD_BOOTLOADER] = 0x40000;
+        ls[LASAT_MTD_SERVICE] = 0xC0000;
+        ls[LASAT_MTD_NORMAL] = 0x100000;
+
+        if (mips_machtype == MACH_LASAT_100) {
+                lasat_board_info.li_flash_base = 0x1e000000;
+
+                lb[LASAT_MTD_BOOTLOADER] = 0x1e400000;
+
+                if (lasat_board_info.li_flash_size > 0x200000) {
+                        ls[LASAT_MTD_CONFIG] = 0x100000;
+                        ls[LASAT_MTD_FS] = 0x500000;
+                }
+        } else {
+                lasat_board_info.li_flash_base = 0x10000000;
+
+                if (lasat_board_info.li_flash_size < 0x1000000) {
+                        lb[LASAT_MTD_BOOTLOADER] = 0x10000000;
+                        ls[LASAT_MTD_CONFIG] = 0x100000;
+                        if (lasat_board_info.li_flash_size >= 0x400000)
+                                ls[LASAT_MTD_FS] =
+                                     lasat_board_info.li_flash_size - 0x300000;
+                }
+        }
+
+        for (i = 1; i < LASAT_MTD_LAST; i++)
+                lb[i] = lb[i-1] + ls[i-1];
+}
+
+int lasat_init_board_info(void)
+{
+        int c;
+        unsigned long crc;
+        unsigned long cfg0, cfg1;
+        const struct product_info   *ppi;
+        int i_n_base_models = N_BASE_MODELS;
+        const char * const * i_txt_base_models = txt_base_models;
+        int i_n_prids = N_PRIDS;
+
+        memset(&lasat_board_info, 0, sizeof(lasat_board_info));
+
+        /* First read the EEPROM info */
+        EEPROMRead(0, (unsigned char *)&lasat_board_info.li_eeprom_info,
+                   sizeof(struct lasat_eeprom_struct));
+
+        /* Check the CRC */
+        crc = EEPROM_CRC((unsigned char *)(&lasat_board_info.li_eeprom_info),
+                    sizeof(struct lasat_eeprom_struct) - 4);
+
+        if (crc != lasat_board_info.li_eeprom_info.crc32) {
+                printk(KERN_WARNING "WARNING...\nWARNING...\nEEPROM CRC does "
+                       "not match calculated, attempting to soldier on...\n");
+        }
+
+        if (lasat_board_info.li_eeprom_info.version != LASAT_EEPROM_VERSION) {
+                printk(KERN_WARNING "WARNING...\nWARNING...\nEEPROM version "
+                       "%d, wanted version %d, attempting to soldier on...\n",
+                       (unsigned int)lasat_board_info.li_eeprom_info.version,
+                       LASAT_EEPROM_VERSION);
+        }
+
+        cfg0 = lasat_board_info.li_eeprom_info.cfg[0];
+        cfg1 = lasat_board_info.li_eeprom_info.cfg[1];
+
+        if (LASAT_W0_DSCTYPE(cfg0) != 1) {
+                printk(KERN_WARNING "WARNING...\nWARNING...\n"
+                       "Invalid configuration read from EEPROM, attempting to "
+                       "soldier on...");
+        }
+        /* We have a valid configuration */
+
+        switch (LASAT_W0_SDRAMBANKSZ(cfg0)) {
+        case 0:
+                lasat_board_info.li_memsize = 0x0800000;
+                break;
+        case 1:
+                lasat_board_info.li_memsize = 0x1000000;
+                break;
+        case 2:
+                lasat_board_info.li_memsize = 0x2000000;
+                break;
+        case 3:
+                lasat_board_info.li_memsize = 0x4000000;
+                break;
+        case 4:
+                lasat_board_info.li_memsize = 0x8000000;
+                break;
+        default:
+                lasat_board_info.li_memsize = 0;
+        }
+
+        switch (LASAT_W0_SDRAMBANKS(cfg0)) {
+        case 0:
+                break;
+        case 1:
+                lasat_board_info.li_memsize *= 2;
+                break;
+        default:
+                break;
+        }
+
+        switch (LASAT_W0_BUSSPEED(cfg0)) {
+        case 0x0:
+                lasat_board_info.li_bus_hz = 60000000;
+                break;
+        case 0x1:
+                lasat_board_info.li_bus_hz = 66000000;
+                break;
+        case 0x2:
+                lasat_board_info.li_bus_hz = 66666667;
+                break;
+        case 0x3:
+                lasat_board_info.li_bus_hz = 80000000;
+                break;
+        case 0x4:
+                lasat_board_info.li_bus_hz = 83333333;
+                break;
+        case 0x5:
+                lasat_board_info.li_bus_hz = 100000000;
+                break;
+        }
+
+        switch (LASAT_W0_CPUCLK(cfg0)) {
+        case 0x0:
+                lasat_board_info.li_cpu_hz =
+                        lasat_board_info.li_bus_hz;
+                break;
+        case 0x1:
+                lasat_board_info.li_cpu_hz =
+                        lasat_board_info.li_bus_hz +
+                        (lasat_board_info.li_bus_hz >> 1);
+                break;
+        case 0x2:
+                lasat_board_info.li_cpu_hz =
+                        lasat_board_info.li_bus_hz +
+                        lasat_board_info.li_bus_hz;
+                break;
+        case 0x3:
+                lasat_board_info.li_cpu_hz =
+                        lasat_board_info.li_bus_hz +
+                        lasat_board_info.li_bus_hz +
+                        (lasat_board_info.li_bus_hz >> 1);
+                break;
+        case 0x4:
+                lasat_board_info.li_cpu_hz =
+                        lasat_board_info.li_bus_hz +
+                        lasat_board_info.li_bus_hz +
+                        lasat_board_info.li_bus_hz;
+                break;
+        }
+
+        /* Flash size */
+        switch (LASAT_W1_FLASHSIZE(cfg1)) {
+        case 0:
+                lasat_board_info.li_flash_size = 0x200000;
+                break;
+        case 1:
+                lasat_board_info.li_flash_size = 0x400000;
+                break;
+        case 2:
+                lasat_board_info.li_flash_size = 0x800000;
+                break;
+        case 3:
+                lasat_board_info.li_flash_size = 0x1000000;
+                break;
+        case 4:
+                lasat_board_info.li_flash_size = 0x2000000;
+                break;
+        }
+
+        init_flash_sizes();
+
+        lasat_board_info.li_bmid = LASAT_W0_BMID(cfg0);
+        lasat_board_info.li_prid = lasat_board_info.li_eeprom_info.prid;
+        if (lasat_board_info.li_prid == 0xffff || lasat_board_info.li_prid == 0)
+                lasat_board_info.li_prid = lasat_board_info.li_bmid;
+
+        /* Base model stuff */
+        if (lasat_board_info.li_bmid > i_n_base_models)
+                lasat_board_info.li_bmid = i_n_base_models;
+        strcpy(lasat_board_info.li_bmstr,
+               i_txt_base_models[lasat_board_info.li_bmid]);
+
+        /* Product ID dependent values */
+        c = lasat_board_info.li_prid;
+        if (c >= i_n_prids) {
+                strcpy(lasat_board_info.li_namestr, "Unknown Model");
+                strcpy(lasat_board_info.li_typestr, "Unknown Type");
+        } else {
+                ppi = &vendor_info_table[0].vi_product_info[c];
+                strcpy(lasat_board_info.li_namestr, ppi->pi_name);
+                if (ppi->pi_type)
+                        strcpy(lasat_board_info.li_typestr, ppi->pi_type);
+                else
+                        sprintf(lasat_board_info.li_typestr, "%d", 10 * c);
+        }
+
+#if defined(CONFIG_INET) && defined(CONFIG_SYSCTL)
+        update_bcastaddr();
+#endif
+
+        return 0;
+}
+
+void lasat_write_eeprom_info(void)
+{
+        unsigned long crc;
+
+        /* Generate the CRC */
+        crc = EEPROM_CRC((unsigned char *)(&lasat_board_info.li_eeprom_info),
+                    sizeof(struct lasat_eeprom_struct) - 4);
+        lasat_board_info.li_eeprom_info.crc32 = crc;
+
+        /* Write the EEPROM info */
+        EEPROMWrite(0, (unsigned char *)&lasat_board_info.li_eeprom_info,
+                    sizeof(struct lasat_eeprom_struct));
+}
diff --git a/arch/mips/lasat/lasat_models.h b/arch/mips/lasat/lasat_models.h
new file mode 100644
index 000000000000..e1cbd26ae1b3
--- /dev/null
+++ b/arch/mips/lasat/lasat_models.h
@@ -0,0 +1,67 @@
+/*
+ * Model description tables
+ */
+#include <linux/kernel.h>
+
+struct product_info {
+        const char     *pi_name;
+        const char     *pi_type;
+};
+
+struct vendor_info {
+        const char     *vi_name;
+        const struct product_info *vi_product_info;
+};
+
+/*
+ * Base models
+ */
+static const char * const txt_base_models[] = {
+        "MQ 2", "MQ Pro", "SP 25", "SP 50", "SP 100", "SP 5000", "SP 7000",
+        "SP 1000", "Unknown"
+};
+#define N_BASE_MODELS (ARRAY_SIZE(txt_base_models) - 1)
+
+/*
+ * Eicon Networks
+ */
+static const char txt_en_mq[] = "Masquerade";
+static const char txt_en_sp[] = "Safepipe";
+
+static const struct product_info product_info_eicon[] = {
+        { txt_en_mq, "II"   }, /*  0 */
+        { txt_en_mq, "Pro"  }, /*  1 */
+        { txt_en_sp, "25"   }, /*  2 */
+        { txt_en_sp, "50"   }, /*  3 */
+        { txt_en_sp, "100"  }, /*  4 */
+        { txt_en_sp, "5000" }, /*  5 */
+        { txt_en_sp, "7000" }, /*  6 */
+        { txt_en_sp, "30"   }, /*  7 */
+        { txt_en_sp, "5100" }, /*  8 */
+        { txt_en_sp, "7100" }, /*  9 */
+        { txt_en_sp, "1110" }, /* 10 */
+        { txt_en_sp, "3020" }, /* 11 */
+        { txt_en_sp, "3030" }, /* 12 */
+        { txt_en_sp, "5020" }, /* 13 */
+        { txt_en_sp, "5030" }, /* 14 */
+        { txt_en_sp, "1120" }, /* 15 */
+        { txt_en_sp, "1130" }, /* 16 */
+        { txt_en_sp, "6010" }, /* 17 */
+        { txt_en_sp, "6110" }, /* 18 */
+        { txt_en_sp, "6210" }, /* 19 */
+        { txt_en_sp, "1020" }, /* 20 */
+        { txt_en_sp, "1040" }, /* 21 */
+        { txt_en_sp, "1050" }, /* 22 */
+        { txt_en_sp, "1060" }, /* 23 */
+};
+
+#define N_PRIDS ARRAY_SIZE(product_info_eicon)
+
+/*
+ * The vendor table
+ */
+static struct vendor_info const vendor_info_table[] = {
+        { "Eicon Networks",     product_info_eicon   },
+};
+
+#define N_VENDORS ARRAY_SIZE(vendor_info_table)
diff --git a/arch/mips/lasat/picvue.c b/arch/mips/lasat/picvue.c
new file mode 100644
index 000000000000..6471d0663fd8
--- /dev/null
+++ b/arch/mips/lasat/picvue.c
@@ -0,0 +1,244 @@
+/*
+ * Picvue PVC160206 display driver
+ *
+ * Brian Murphy <brian@murphy.dk>
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <asm/bootinfo.h>
+#include <asm/lasat/lasat.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+
+#include "picvue.h"
+
+#define PVC_BUSY                0x80
+#define PVC_NLINES              2
+#define PVC_DISPMEM             80
+#define PVC_LINELEN             PVC_DISPMEM / PVC_NLINES
+
+struct pvc_defs *picvue;
+
+DECLARE_MUTEX(pvc_sem);
+
+static void pvc_reg_write(u32 val)
+{
+        *picvue->reg = val;
+}
+
+static u32 pvc_reg_read(void)
+{
+        u32 tmp = *picvue->reg;
+        return tmp;
+}
+
+static void pvc_write_byte(u32 data, u8 byte)
+{
+        data |= picvue->e;
+        pvc_reg_write(data);
+        data &= ~picvue->data_mask;
+        data |= byte << picvue->data_shift;
+        pvc_reg_write(data);
+        ndelay(220);
+        pvc_reg_write(data & ~picvue->e);
+        ndelay(220);
+}
+
+static u8 pvc_read_byte(u32 data)
+{
+        u8 byte;
+
+        data |= picvue->e;
+        pvc_reg_write(data);
+        ndelay(220);
+        byte = (pvc_reg_read() & picvue->data_mask) >> picvue->data_shift;
+        data &= ~picvue->e;
+        pvc_reg_write(data);
+        ndelay(220);
+        return byte;
+}
+
+static u8 pvc_read_data(void)
+{
+        u32 data = pvc_reg_read();
+        u8 byte;
+        data |= picvue->rw;
+        data &= ~picvue->rs;
+        pvc_reg_write(data);
+        ndelay(40);
+        byte = pvc_read_byte(data);
+        data |= picvue->rs;
+        pvc_reg_write(data);
+        return byte;
+}
+
+#define TIMEOUT 1000
+static int pvc_wait(void)
+{
+        int i = TIMEOUT;
+        int err = 0;
+
+        while ((pvc_read_data() & PVC_BUSY) && i)
+                i--;
+        if (i == 0)
+                err = -ETIME;
+
+        return err;
+}
+
+#define MODE_INST 0
+#define MODE_DATA 1
+static void pvc_write(u8 byte, int mode)
+{
+        u32 data = pvc_reg_read();
+        data &= ~picvue->rw;
+        if (mode == MODE_DATA)
+                data |= picvue->rs;
+        else
+                data &= ~picvue->rs;
+        pvc_reg_write(data);
+        ndelay(40);
+        pvc_write_byte(data, byte);
+        if (mode == MODE_DATA)
+                data &= ~picvue->rs;
+        else
+                data |= picvue->rs;
+        pvc_reg_write(data);
+        pvc_wait();
+}
+
+void pvc_write_string(const unsigned char *str, u8 addr, int line)
+{
+        int i = 0;
+
+        if (line > 0 && (PVC_NLINES > 1))
+                addr += 0x40 * line;
+        pvc_write(0x80 | addr, MODE_INST);
+
+        while (*str != 0 && i < PVC_LINELEN) {
+                pvc_write(*str++, MODE_DATA);
+                i++;
+        }
+}
+
+void pvc_write_string_centered(const unsigned char *str, int line)
+{
+        int len = strlen(str);
+        u8 addr;
+
+        if (len > PVC_VISIBLE_CHARS)
+                addr = 0;
+        else
+                addr = (PVC_VISIBLE_CHARS - strlen(str))/2;
+
+        pvc_write_string(str, addr, line);
+}
+
+void pvc_dump_string(const unsigned char *str)
+{
+        int len = strlen(str);
+
+        pvc_write_string(str, 0, 0);
+        if (len > PVC_VISIBLE_CHARS)
+                pvc_write_string(&str[PVC_VISIBLE_CHARS], 0, 1);
+}
+
+#define BM_SIZE                 8
+#define MAX_PROGRAMMABLE_CHARS  8
+int pvc_program_cg(int charnum, u8 bitmap[BM_SIZE])
+{
+        int i;
+        int addr;
+
+        if (charnum > MAX_PROGRAMMABLE_CHARS)
+                return -ENOENT;
+
+        addr = charnum * 8;
+        pvc_write(0x40 | addr, MODE_INST);
+
+        for (i = 0; i < BM_SIZE; i++)
+                pvc_write(bitmap[i], MODE_DATA);
+        return 0;
+}
+
+#define FUNC_SET_CMD    0x20
+#define  EIGHT_BYTE     (1 << 4)
+#define  FOUR_BYTE      0
+#define  TWO_LINES      (1 << 3)
+#define  ONE_LINE       0
+#define  LARGE_FONT     (1 << 2)
+#define  SMALL_FONT     0
+
+static void pvc_funcset(u8 cmd)
+{
+        pvc_write(FUNC_SET_CMD | (cmd & (EIGHT_BYTE|TWO_LINES|LARGE_FONT)),
+                  MODE_INST);
+}
+
+#define ENTRYMODE_CMD           0x4
+#define  AUTO_INC               (1 << 1)
+#define  AUTO_DEC               0
+#define  CURSOR_FOLLOWS_DISP    (1 << 0)
+
+static void pvc_entrymode(u8 cmd)
+{
+        pvc_write(ENTRYMODE_CMD | (cmd & (AUTO_INC|CURSOR_FOLLOWS_DISP)),
+                  MODE_INST);
+}
+
+#define DISP_CNT_CMD    0x08
+#define  DISP_OFF       0
+#define  DISP_ON        (1 << 2)
+#define  CUR_ON         (1 << 1)
+#define  CUR_BLINK      (1 << 0)
+void pvc_dispcnt(u8 cmd)
+{
+        pvc_write(DISP_CNT_CMD | (cmd & (DISP_ON|CUR_ON|CUR_BLINK)), MODE_INST);
+}
+
+#define MOVE_CMD        0x10
+#define  DISPLAY        (1 << 3)
+#define  CURSOR         0
+#define  RIGHT          (1 << 2)
+#define  LEFT           0
+void pvc_move(u8 cmd)
+{
+        pvc_write(MOVE_CMD | (cmd & (DISPLAY|RIGHT)), MODE_INST);
+}
+
+#define CLEAR_CMD       0x1
+void pvc_clear(void)
+{
+        pvc_write(CLEAR_CMD, MODE_INST);
+}
+
+#define HOME_CMD        0x2
+void pvc_home(void)
+{
+        pvc_write(HOME_CMD, MODE_INST);
+}
+
+int pvc_init(void)
+{
+        u8 cmd = EIGHT_BYTE;
+
+        if (PVC_NLINES == 2)
+                cmd |= (SMALL_FONT|TWO_LINES);
+        else
+                cmd |= (LARGE_FONT|ONE_LINE);
+        pvc_funcset(cmd);
+        pvc_dispcnt(DISP_ON);
+        pvc_entrymode(AUTO_INC);
+
+        pvc_clear();
+        pvc_write_string_centered("Display", 0);
+        pvc_write_string_centered("Initialized", 1);
+
+        return 0;
+}
+
+module_init(pvc_init);
+MODULE_LICENSE("GPL");
diff --git a/arch/mips/lasat/picvue.h b/arch/mips/lasat/picvue.h
new file mode 100644
index 000000000000..2a96bf971897
--- /dev/null
+++ b/arch/mips/lasat/picvue.h
@@ -0,0 +1,48 @@
+/*
+ * Picvue PVC160206 display driver
+ *
+ * Brian Murphy <brian.murphy@eicon.com>
+ *
+ */
+#include <asm/semaphore.h>
+
+struct pvc_defs {
+        volatile u32 *reg;
+        u32 data_shift;
+        u32 data_mask;
+        u32 e;
+        u32 rw;
+        u32 rs;
+};
+
+extern struct pvc_defs *picvue;
+
+#define PVC_NLINES              2
+#define PVC_DISPMEM             80
+#define PVC_LINELEN             PVC_DISPMEM / PVC_NLINES
+#define PVC_VISIBLE_CHARS       16
+
+void pvc_write_string(const unsigned char *str, u8 addr, int line);
+void pvc_write_string_centered(const unsigned char *str, int line);
+void pvc_dump_string(const unsigned char *str);
+
+#define BM_SIZE                 8
+#define MAX_PROGRAMMABLE_CHARS  8
+int pvc_program_cg(int charnum, u8 bitmap[BM_SIZE]);
+
+void pvc_dispcnt(u8 cmd);
+#define  DISP_OFF       0
+#define  DISP_ON        (1 << 2)
+#define  CUR_ON         (1 << 1)
+#define  CUR_BLINK      (1 << 0)
+
+void pvc_move(u8 cmd);
+#define  DISPLAY        (1 << 3)
+#define  CURSOR         0
+#define  RIGHT          (1 << 2)
+#define  LEFT           0
+
+void pvc_clear(void);
+void pvc_home(void);
+
+extern struct semaphore pvc_sem;
diff --git a/arch/mips/lasat/picvue_proc.c b/arch/mips/lasat/picvue_proc.c
new file mode 100644
index 000000000000..9947c1525822
--- /dev/null
+++ b/arch/mips/lasat/picvue_proc.c
@@ -0,0 +1,191 @@
+/*
+ * Picvue PVC160206 display driver
+ *
+ * Brian Murphy <brian.murphy@eicon.com>
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+
+#include <linux/proc_fs.h>
+#include <linux/interrupt.h>
+
+#include <linux/timer.h>
+
+#include "picvue.h"
+
+static char pvc_lines[PVC_NLINES][PVC_LINELEN+1];
+static int pvc_linedata[PVC_NLINES];
+static struct proc_dir_entry *pvc_display_dir;
+static char *pvc_linename[PVC_NLINES] = {"line1", "line2"};
+#define DISPLAY_DIR_NAME "display"
+static int scroll_dir, scroll_interval;
+
+static struct timer_list timer;
+
+static void pvc_display(unsigned long data)
+{
+        int i;
+
+        pvc_clear();
+        for (i = 0; i < PVC_NLINES; i++)
+                pvc_write_string(pvc_lines[i], 0, i);
+}
+
+static DECLARE_TASKLET(pvc_display_tasklet, &pvc_display, 0);
+
+static int pvc_proc_read_line(char *page, char **start,
+                             off_t off, int count,
+                             int *eof, void *data)
+{
+        char *origpage = page;
+        int lineno = *(int *)data;
+
+        if (lineno < 0 || lineno > PVC_NLINES) {
+                printk(KERN_WARNING "proc_read_line: invalid lineno %d\n", lineno);
+                return 0;
+        }
+
+        down(&pvc_sem);
+        page += sprintf(page, "%s\n", pvc_lines[lineno]);
+        up(&pvc_sem);
+
+        return page - origpage;
+}
+
+static int pvc_proc_write_line(struct file *file, const char *buffer,
+                           unsigned long count, void *data)
+{
+        int origcount = count;
+        int lineno = *(int *)data;
+
+        if (lineno < 0 || lineno > PVC_NLINES) {
+                printk(KERN_WARNING "proc_write_line: invalid lineno %d\n",
+                       lineno);
+                return origcount;
+        }
+
+        if (count > PVC_LINELEN)
+                count = PVC_LINELEN;
+
+        if (buffer[count-1] == '\n')
+                count--;
+
+        down(&pvc_sem);
+        strncpy(pvc_lines[lineno], buffer, count);
+        pvc_lines[lineno][count] = '\0';
+        up(&pvc_sem);
+
+        tasklet_schedule(&pvc_display_tasklet);
+
+        return origcount;
+}
+
+static int pvc_proc_write_scroll(struct file *file, const char *buffer,
+                           unsigned long count, void *data)
+{
+        int origcount = count;
+        int cmd = simple_strtol(buffer, NULL, 10);
+
+        down(&pvc_sem);
+        if (scroll_interval != 0)
+                del_timer(&timer);
+
+        if (cmd == 0) {
+                scroll_dir = 0;
+                scroll_interval = 0;
+        } else {
+                if (cmd < 0) {
+                        scroll_dir = -1;
+                        scroll_interval = -cmd;
+                } else {
+                        scroll_dir = 1;
+                        scroll_interval = cmd;
+                }
+                add_timer(&timer);
+        }
+        up(&pvc_sem);
+
+        return origcount;
+}
+
+static int pvc_proc_read_scroll(char *page, char **start,
+                             off_t off, int count,
+                             int *eof, void *data)
+{
+        char *origpage = page;
+
+        down(&pvc_sem);
+        page += sprintf(page, "%d\n", scroll_dir * scroll_interval);
+        up(&pvc_sem);
+
+        return page - origpage;
+}
+
+
+void pvc_proc_timerfunc(unsigned long data)
+{
+        if (scroll_dir < 0)
+                pvc_move(DISPLAY|RIGHT);
+        else if (scroll_dir > 0)
+                pvc_move(DISPLAY|LEFT);
+
+        timer.expires = jiffies + scroll_interval;
+        add_timer(&timer);
+}
+
+static void pvc_proc_cleanup(void)
+{
+        int i;
+        for (i = 0; i < PVC_NLINES; i++)
+                remove_proc_entry(pvc_linename[i], pvc_display_dir);
+        remove_proc_entry("scroll", pvc_display_dir);
+        remove_proc_entry(DISPLAY_DIR_NAME, NULL);
+
+        del_timer(&timer);
+}
+
+static int __init pvc_proc_init(void)
+{
+        struct proc_dir_entry *proc_entry;
+        int i;
+
+        pvc_display_dir = proc_mkdir(DISPLAY_DIR_NAME, NULL);
+        if (pvc_display_dir == NULL)
+                goto error;
+
+        for (i = 0; i < PVC_NLINES; i++) {
+                strcpy(pvc_lines[i], "");
+                pvc_linedata[i] = i;
+        }
+        for (i = 0; i < PVC_NLINES; i++) {
+                proc_entry = create_proc_entry(pvc_linename[i], 0644,
+                                               pvc_display_dir);
+                if (proc_entry == NULL)
+                        goto error;
+
+                proc_entry->read_proc = pvc_proc_read_line;
+                proc_entry->write_proc = pvc_proc_write_line;
+                proc_entry->data = &pvc_linedata[i];
+        }
+        proc_entry = create_proc_entry("scroll", 0644, pvc_display_dir);
+        if (proc_entry == NULL)
+                goto error;
+
+        proc_entry->write_proc = pvc_proc_write_scroll;
+        proc_entry->read_proc = pvc_proc_read_scroll;
+
+        init_timer(&timer);
+        timer.function = pvc_proc_timerfunc;
+
+        return 0;
+error:
+        pvc_proc_cleanup();
+        return -ENOMEM;
+}
+
+module_init(pvc_proc_init);
+module_exit(pvc_proc_cleanup);
+MODULE_LICENSE("GPL");
diff --git a/arch/mips/lasat/prom.c b/arch/mips/lasat/prom.c
new file mode 100644
index 000000000000..209edcc26f07
--- /dev/null
+++ b/arch/mips/lasat/prom.c
@@ -0,0 +1,126 @@
+/*
+ * PROM interface routines.
+ */
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/ctype.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/bootmem.h>
+#include <linux/ioport.h>
+#include <asm/bootinfo.h>
+#include <asm/lasat/lasat.h>
+#include <asm/cpu.h>
+
+#include "at93c.h"
+#include <asm/lasat/eeprom.h>
+#include "prom.h"
+
+#define RESET_VECTOR    0xbfc00000
+#define PROM_JUMP_TABLE_ENTRY(n) (*((u32 *)(RESET_VECTOR + 0x20) + n))
+#define PROM_DISPLAY_ADDR       PROM_JUMP_TABLE_ENTRY(0)
+#define PROM_PUTC_ADDR          PROM_JUMP_TABLE_ENTRY(1)
+#define PROM_MONITOR_ADDR       PROM_JUMP_TABLE_ENTRY(2)
+
+static void null_prom_display(const char *string, int pos, int clear)
+{
+}
+
+static void null_prom_monitor(void)
+{
+}
+
+static void null_prom_putc(char c)
+{
+}
+
+/* these are functions provided by the bootloader */
+static void (*__prom_putc)(char c) = null_prom_putc;
+
+void prom_putchar(char c)
+{
+        __prom_putc(c);
+}
+
+void (*prom_display)(const char *string, int pos, int clear) =
+                null_prom_display;
+void (*prom_monitor)(void) = null_prom_monitor;
+
+unsigned int lasat_ndelay_divider;
+
+static void setup_prom_vectors(void)
+{
+        u32 version = *(u32 *)(RESET_VECTOR + 0x90);
+
+        if (version >= 307) {
+                prom_display = (void *)PROM_DISPLAY_ADDR;
+                __prom_putc = (void *)PROM_PUTC_ADDR;
+                prom_monitor = (void *)PROM_MONITOR_ADDR;
+        }
+        printk(KERN_DEBUG "prom vectors set up\n");
+}
+
+static struct at93c_defs at93c_defs[N_MACHTYPES] = {
+        {
+                .reg            = (void *)AT93C_REG_100,
+                .rdata_reg      = (void *)AT93C_RDATA_REG_100,
+                .rdata_shift    = AT93C_RDATA_SHIFT_100,
+                .wdata_shift    = AT93C_WDATA_SHIFT_100,
+                .cs             = AT93C_CS_M_100,
+                .clk            = AT93C_CLK_M_100
+        }, {
+                .reg            = (void *)AT93C_REG_200,
+                .rdata_reg      = (void *)AT93C_RDATA_REG_200,
+                .rdata_shift    = AT93C_RDATA_SHIFT_200,
+                .wdata_shift    = AT93C_WDATA_SHIFT_200,
+                .cs             = AT93C_CS_M_200,
+                .clk            = AT93C_CLK_M_200
+        },
+};
+
+void __init prom_init(void)
+{
+        int argc = fw_arg0;
+        char **argv = (char **) fw_arg1;
+
+        setup_prom_vectors();
+
+        if (current_cpu_data.cputype == CPU_R5000) {
+                printk(KERN_INFO "LASAT 200 board\n");
+                mips_machtype = MACH_LASAT_200;
+                lasat_ndelay_divider = LASAT_200_DIVIDER;
+        } else {
+                printk(KERN_INFO "LASAT 100 board\n");
+                mips_machtype = MACH_LASAT_100;
+                lasat_ndelay_divider = LASAT_100_DIVIDER;
+        }
+
+        at93c = &at93c_defs[mips_machtype];
+
+        lasat_init_board_info();                /* Read info from EEPROM */
+
+        /* Get the command line */
+        if (argc > 0) {
+                strncpy(arcs_cmdline, argv[0], CL_SIZE-1);
+                arcs_cmdline[CL_SIZE-1] = '\0';
+        }
+
+        /* Set the I/O base address */
+        set_io_port_base(KSEG1);
+
+        /* Set memory regions */
+        ioport_resource.start = 0;
+        ioport_resource.end = 0xffffffff;       /* Wrong, fixme.  */
+
+        add_memory_region(0, lasat_board_info.li_memsize, BOOT_MEM_RAM);
+}
+
+void __init prom_free_prom_memory(void)
+{
+}
+
+const char *get_system_type(void)
+{
+        return lasat_board_info.li_bmstr;
+}
diff --git a/arch/mips/lasat/prom.h b/arch/mips/lasat/prom.h
new file mode 100644
index 000000000000..337acbc27442
--- /dev/null
+++ b/arch/mips/lasat/prom.h
@@ -0,0 +1,7 @@
+#ifndef __PROM_H
+#define __PROM_H
+
+extern void (*prom_display)(const char *string, int pos, int clear);
+extern void (*prom_monitor)(void);
+
+#endif /* __PROM_H */
diff --git a/arch/mips/lasat/reset.c b/arch/mips/lasat/reset.c
new file mode 100644
index 000000000000..b1e7a89fb730
--- /dev/null
+++ b/arch/mips/lasat/reset.c
@@ -0,0 +1,61 @@
+/*
+ * Thomas Horsten <thh@lasat.com>
+ * Copyright (C) 2000 LASAT Networks A/S.
+ *
+ *  This program is free software; you can distribute 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 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.
+ *
+ * Reset the LASAT board.
+ */
+#include <linux/kernel.h>
+#include <linux/pm.h>
+
+#include <asm/reboot.h>
+#include <asm/system.h>
+#include <asm/lasat/lasat.h>
+
+#include "picvue.h"
+#include "prom.h"
+
+static void lasat_machine_restart(char *command);
+static void lasat_machine_halt(void);
+
+/* Used to set machine to boot in service mode via /proc interface */
+int lasat_boot_to_service;
+
+static void lasat_machine_restart(char *command)
+{
+        local_irq_disable();
+
+        if (lasat_boot_to_service) {
+                *(volatile unsigned int *)0xa0000024 = 0xdeadbeef;
+                *(volatile unsigned int *)0xa00000fc = 0xfedeabba;
+        }
+        *lasat_misc->reset_reg = 0xbedead;
+        for (;;) ;
+}
+
+static void lasat_machine_halt(void)
+{
+        local_irq_disable();
+
+        prom_monitor();
+        for (;;) ;
+}
+
+void lasat_reboot_setup(void)
+{
+        _machine_restart = lasat_machine_restart;
+        _machine_halt = lasat_machine_halt;
+        pm_power_off = lasat_machine_halt;
+}
diff --git a/arch/mips/lasat/serial.c b/arch/mips/lasat/serial.c
new file mode 100644
index 000000000000..205bd397d75b
--- /dev/null
+++ b/arch/mips/lasat/serial.c
@@ -0,0 +1,94 @@
+/*
+ *  Registration of Lasat UART platform device.
+ *
+ *  Copyright (C) 2007  Brian Murphy <brian@murphy.dk>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/serial_8250.h>
+
+#include <asm/bootinfo.h>
+#include <asm/lasat/lasat.h>
+#include <asm/lasat/serial.h>
+
+static struct resource lasat_serial_res[2] __initdata;
+
+static struct plat_serial8250_port lasat_serial8250_port[] = {
+        {
+                .iotype         = UPIO_MEM,
+                .flags          = UPF_IOREMAP | UPF_BOOT_AUTOCONF |
+                                  UPF_SKIP_TEST,
+        },
+        {},
+};
+
+static __init int lasat_uart_add(void)
+{
+        struct platform_device *pdev;
+        int retval;
+
+        pdev = platform_device_alloc("serial8250", -1);
+        if (!pdev)
+                return -ENOMEM;
+
+        if (mips_machtype == MACH_LASAT_100) {
+                lasat_serial_res[0].start = KSEG1ADDR(LASAT_UART_REGS_BASE_100);
+                lasat_serial_res[0].end = lasat_serial_res[0].start + LASAT_UART_REGS_SHIFT_100 * 8 - 1;
+                lasat_serial_res[0].flags = IORESOURCE_MEM;
+                lasat_serial_res[1].start = LASATINT_UART_100;
+                lasat_serial_res[1].end = LASATINT_UART_100;
+                lasat_serial_res[1].flags = IORESOURCE_IRQ;
+
+                lasat_serial8250_port[0].mapbase = LASAT_UART_REGS_BASE_100;
+                lasat_serial8250_port[0].uartclk = LASAT_BASE_BAUD_100 * 16;
+                lasat_serial8250_port[0].regshift = LASAT_UART_REGS_SHIFT_100;
+                lasat_serial8250_port[0].irq = LASATINT_UART_100;
+        } else {
+                lasat_serial_res[0].start = KSEG1ADDR(LASAT_UART_REGS_BASE_200);
+                lasat_serial_res[0].end = lasat_serial_res[0].start + LASAT_UART_REGS_SHIFT_200 * 8 - 1;
+                lasat_serial_res[0].flags = IORESOURCE_MEM;
+                lasat_serial_res[1].start = LASATINT_UART_200;
+                lasat_serial_res[1].end = LASATINT_UART_200;
+                lasat_serial_res[1].flags = IORESOURCE_IRQ;
+
+                lasat_serial8250_port[0].mapbase = LASAT_UART_REGS_BASE_200;
+                lasat_serial8250_port[0].uartclk = LASAT_BASE_BAUD_200 * 16;
+                lasat_serial8250_port[0].regshift = LASAT_UART_REGS_SHIFT_200;
+                lasat_serial8250_port[0].irq = LASATINT_UART_200;
+        }
+
+        pdev->id = PLAT8250_DEV_PLATFORM;
+        pdev->dev.platform_data = lasat_serial8250_port;
+
+        retval = platform_device_add_resources(pdev, lasat_serial_res, ARRAY_SIZE(lasat_serial_res));
+        if (retval)
+                goto err_free_device;
+
+        retval = platform_device_add(pdev);
+        if (retval)
+                goto err_free_device;
+
+        return 0;
+
+err_free_device:
+        platform_device_put(pdev);
+
+        return retval;
+}
+device_initcall(lasat_uart_add);
diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c
new file mode 100644
index 000000000000..54827d0174bf
--- /dev/null
+++ b/arch/mips/lasat/setup.c
@@ -0,0 +1,154 @@
+/*
+ * Carsten Langgaard, carstenl@mips.com
+ * Copyright (C) 1999 MIPS Technologies, Inc.  All rights reserved.
+ *
+ * Thomas Horsten <thh@lasat.com>
+ * Copyright (C) 2000 LASAT Networks A/S.
+ *
+ * Brian Murphy <brian@murphy.dk>
+ *
+ *  This program is free software; you can distribute 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 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.
+ *
+ * Lasat specific setup.
+ */
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/pci.h>
+#include <linux/interrupt.h>
+#include <linux/tty.h>
+
+#include <asm/time.h>
+#include <asm/cpu.h>
+#include <asm/bootinfo.h>
+#include <asm/irq.h>
+#include <asm/lasat/lasat.h>
+#include <asm/lasat/serial.h>
+
+#ifdef CONFIG_PICVUE
+#include <linux/notifier.h>
+#endif
+
+#include "ds1603.h"
+#include <asm/lasat/ds1603.h>
+#include <asm/lasat/picvue.h>
+#include <asm/lasat/eeprom.h>
+
+#include "prom.h"
+
+int lasat_command_line;
+void lasatint_init(void);
+
+extern void lasat_reboot_setup(void);
+extern void pcisetup(void);
+extern void edhac_init(void *, void *, void *);
+extern void addrflt_init(void);
+
+struct lasat_misc lasat_misc_info[N_MACHTYPES] = {
+        {
+                .reset_reg      = (void *)KSEG1ADDR(0x1c840000),
+                .flash_wp_reg   = (void *)KSEG1ADDR(0x1c800000), 2
+        }, {
+                .reset_reg      = (void *)KSEG1ADDR(0x11080000),
+                .flash_wp_reg   = (void *)KSEG1ADDR(0x11000000), 6
+        }
+};
+
+struct lasat_misc *lasat_misc;
+
+#ifdef CONFIG_DS1603
+static struct ds_defs ds_defs[N_MACHTYPES] = {
+        { (void *)DS1603_REG_100, (void *)DS1603_REG_100,
+                DS1603_RST_100, DS1603_CLK_100, DS1603_DATA_100,
+                DS1603_DATA_SHIFT_100, 0, 0 },
+        { (void *)DS1603_REG_200, (void *)DS1603_DATA_REG_200,
+                DS1603_RST_200, DS1603_CLK_200, DS1603_DATA_200,
+                DS1603_DATA_READ_SHIFT_200, 1, 2000 }
+};
+#endif
+
+#ifdef CONFIG_PICVUE
+#include "picvue.h"
+static struct pvc_defs pvc_defs[N_MACHTYPES] = {
+        { (void *)PVC_REG_100, PVC_DATA_SHIFT_100, PVC_DATA_M_100,
+                PVC_E_100, PVC_RW_100, PVC_RS_100 },
+        { (void *)PVC_REG_200, PVC_DATA_SHIFT_200, PVC_DATA_M_200,
+                PVC_E_200, PVC_RW_200, PVC_RS_200 }
+};
+#endif
+
+static int lasat_panic_display(struct notifier_block *this,
+                             unsigned long event, void *ptr)
+{
+#ifdef CONFIG_PICVUE
+        unsigned char *string = ptr;
+        if (string == NULL)
+                string = "Kernel Panic";
+        pvc_dump_string(string);
+#endif
+        return NOTIFY_DONE;
+}
+
+static int lasat_panic_prom_monitor(struct notifier_block *this,
+                             unsigned long event, void *ptr)
+{
+        prom_monitor();
+        return NOTIFY_DONE;
+}
+
+static struct notifier_block lasat_panic_block[] =
+{
+        {
+                .notifier_call  = lasat_panic_display,
+                .priority       = INT_MAX
+        }, {
+                .notifier_call  = lasat_panic_prom_monitor,
+                .priority       = INT_MIN
+        }
+};
+
+void plat_time_init(void)
+{
+        mips_hpt_frequency = lasat_board_info.li_cpu_hz / 2;
+}
+
+void __init plat_timer_setup(struct irqaction *irq)
+{
+        change_c0_status(ST0_IM, IE_IRQ0 | IE_IRQ5);
+}
+
+void __init plat_mem_setup(void)
+{
+        int i;
+        lasat_misc  = &lasat_misc_info[mips_machtype];
+#ifdef CONFIG_PICVUE
+        picvue = &pvc_defs[mips_machtype];
+#endif
+
+        /* Set up panic notifier */
+        for (i = 0; i < ARRAY_SIZE(lasat_panic_block); i++)
+                atomic_notifier_chain_register(&panic_notifier_list,
+                                &lasat_panic_block[i]);
+
+        lasat_reboot_setup();
+
+#ifdef CONFIG_DS1603
+        ds1603 = &ds_defs[mips_machtype];
+#endif
+
+#ifdef DYNAMIC_SERIAL_INIT
+        serial_init();
+#endif
+
+        pr_info("Lasat specific initialization complete\n");
+}
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c
new file mode 100644
index 000000000000..389336c4ecc5
--- /dev/null
+++ b/arch/mips/lasat/sysctl.c
@@ -0,0 +1,456 @@
+/*
+ * Thomas Horsten <thh@lasat.com>
+ * Copyright (C) 2000 LASAT Networks A/S.
+ *
+ *  This program is free software; you can distribute 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 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.
+ *
+ * Routines specific to the LASAT boards
+ */
+#include <linux/types.h>
+#include <asm/lasat/lasat.h>
+
+#include <linux/module.h>
+#include <linux/sysctl.h>
+#include <linux/stddef.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/ctype.h>
+#include <linux/string.h>
+#include <linux/net.h>
+#include <linux/inet.h>
+#include <linux/mutex.h>
+#include <linux/uaccess.h>
+
+#include <asm/time.h>
+
+#include "sysctl.h"
+#include "ds1603.h"
+
+static DEFINE_MUTEX(lasat_info_mutex);
+
+/* Strategy function to write EEPROM after changing string entry */
+int sysctl_lasatstring(ctl_table *table, int *name, int nlen,
+                void *oldval, size_t *oldlenp,
+                void *newval, size_t newlen)
+{
+        int r;
+
+        mutex_lock(&lasat_info_mutex);
+        r = sysctl_string(table, name,
+                          nlen, oldval, oldlenp, newval, newlen);
+        if (r < 0) {
+                mutex_unlock(&lasat_info_mutex);
+                return r;
+        }
+        if (newval && newlen)
+                lasat_write_eeprom_info();
+        mutex_unlock(&lasat_info_mutex);
+
+        return 1;
+}
+
+
+/* And the same for proc */
+int proc_dolasatstring(ctl_table *table, int write, struct file *filp,
+                       void *buffer, size_t *lenp, loff_t *ppos)
+{
+        int r;
+
+        mutex_lock(&lasat_info_mutex);
+        r = proc_dostring(table, write, filp, buffer, lenp, ppos);
+        if ((!write) || r) {
+                mutex_unlock(&lasat_info_mutex);
+                return r;
+        }
+        lasat_write_eeprom_info();
+        mutex_unlock(&lasat_info_mutex);
+
+        return 0;
+}
+
+/* proc function to write EEPROM after changing int entry */
+int proc_dolasatint(ctl_table *table, int write, struct file *filp,
+                       void *buffer, size_t *lenp, loff_t *ppos)
+{
+        int r;
+
+        mutex_lock(&lasat_info_mutex);
+        r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
+        if ((!write) || r) {
+                mutex_unlock(&lasat_info_mutex);
+                return r;
+        }
+        lasat_write_eeprom_info();
+        mutex_unlock(&lasat_info_mutex);
+
+        return 0;
+}
+
+static int rtctmp;
+
+#ifdef CONFIG_DS1603
+/* proc function to read/write RealTime Clock */
+int proc_dolasatrtc(ctl_table *table, int write, struct file *filp,
+                       void *buffer, size_t *lenp, loff_t *ppos)
+{
+        int r;
+
+        mutex_lock(&lasat_info_mutex);
+        if (!write) {
+                rtctmp = read_persistent_clock();
+                /* check for time < 0 and set to 0 */
+                if (rtctmp < 0)
+                        rtctmp = 0;
+        }
+        r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
+        if ((!write) || r) {
+                mutex_unlock(&lasat_info_mutex);
+                return r;
+        }
+        rtc_mips_set_mmss(rtctmp);
+        mutex_unlock(&lasat_info_mutex);
+
+        return 0;
+}
+#endif
+
+/* Sysctl for setting the IP addresses */
+int sysctl_lasat_intvec(ctl_table *table, int *name, int nlen,
+                    void *oldval, size_t *oldlenp,
+                    void *newval, size_t newlen)
+{
+        int r;
+
+        mutex_lock(&lasat_info_mutex);
+        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
+        if (r < 0) {
+                mutex_unlock(&lasat_info_mutex);
+                return r;
+        }
+        if (newval && newlen)
+                lasat_write_eeprom_info();
+        mutex_unlock(&lasat_info_mutex);
+
+        return 1;
+}
+
+#ifdef CONFIG_DS1603
+/* Same for RTC */
+int sysctl_lasat_rtc(ctl_table *table, int *name, int nlen,
+                    void *oldval, size_t *oldlenp,
+                    void *newval, size_t newlen)
+{
+        int r;
+
+        mutex_lock(&lasat_info_mutex);
+        rtctmp = read_persistent_clock();
+        if (rtctmp < 0)
+                rtctmp = 0;
+        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
+        if (r < 0) {
+                mutex_unlock(&lasat_info_mutex);
+                return r;
+        }
+        if (newval && newlen)
+                rtc_mips_set_mmss(rtctmp);
+        mutex_unlock(&lasat_info_mutex);
+
+        return 1;
+}
+#endif
+
+#ifdef CONFIG_INET
+static char lasat_bcastaddr[16];
+
+void update_bcastaddr(void)
+{
+        unsigned int ip;
+
+        ip = (lasat_board_info.li_eeprom_info.ipaddr &
+                lasat_board_info.li_eeprom_info.netmask) |
+                ~lasat_board_info.li_eeprom_info.netmask;
+
+        sprintf(lasat_bcastaddr, "%d.%d.%d.%d",
+                        (ip)       & 0xff,
+                        (ip >>  8) & 0xff,
+                        (ip >> 16) & 0xff,
+                        (ip >> 24) & 0xff);
+}
+
+static char proc_lasat_ipbuf[32];
+
+/* Parsing of IP address */
+int proc_lasat_ip(ctl_table *table, int write, struct file *filp,
+                       void *buffer, size_t *lenp, loff_t *ppos)
+{
+        unsigned int ip;
+        char *p, c;
+        int len;
+
+        if (!table->data || !table->maxlen || !*lenp ||
+            (*ppos && !write)) {
+                *lenp = 0;
+                return 0;
+        }
+
+        mutex_lock(&lasat_info_mutex);
+        if (write) {
+                len = 0;
+                p = buffer;
+                while (len < *lenp) {
+                        if (get_user(c, p++)) {
+                                mutex_unlock(&lasat_info_mutex);
+                                return -EFAULT;
+                        }
+                        if (c == 0 || c == '\n')
+                                break;
+                        len++;
+                }
+                if (len >= sizeof(proc_lasat_ipbuf)-1)
+                        len = sizeof(proc_lasat_ipbuf) - 1;
+                if (copy_from_user(proc_lasat_ipbuf, buffer, len)) {
+                        mutex_unlock(&lasat_info_mutex);
+                        return -EFAULT;
+                }
+                proc_lasat_ipbuf[len] = 0;
+                *ppos += *lenp;
+                /* Now see if we can convert it to a valid IP */
+                ip = in_aton(proc_lasat_ipbuf);
+                *(unsigned int *)(table->data) = ip;
+                lasat_write_eeprom_info();
+        } else {
+                ip = *(unsigned int *)(table->data);
+                sprintf(proc_lasat_ipbuf, "%d.%d.%d.%d",
+                        (ip)       & 0xff,
+                        (ip >>  8) & 0xff,
+                        (ip >> 16) & 0xff,
+                        (ip >> 24) & 0xff);
+                len = strlen(proc_lasat_ipbuf);
+                if (len > *lenp)
+                        len = *lenp;
+                if (len)
+                        if (copy_to_user(buffer, proc_lasat_ipbuf, len)) {
+                                mutex_unlock(&lasat_info_mutex);
+                                return -EFAULT;
+                        }
+                if (len < *lenp) {
+                        if (put_user('\n', ((char *) buffer) + len)) {
+                                mutex_unlock(&lasat_info_mutex);
+                                return -EFAULT;
+                        }
+                        len++;
+                }
+                *lenp = len;
+                *ppos += len;
+        }
+        update_bcastaddr();
+        mutex_unlock(&lasat_info_mutex);
+
+        return 0;
+}
+#endif /* defined(CONFIG_INET) */
+
+static int sysctl_lasat_eeprom_value(ctl_table *table, int *name, int nlen,
+                                     void *oldval, size_t *oldlenp,
+                                     void *newval, size_t newlen)
+{
+        int r;
+
+        mutex_lock(&lasat_info_mutex);
+        r = sysctl_intvec(table, name, nlen, oldval, oldlenp, newval, newlen);
+        if (r < 0) {
+                mutex_unlock(&lasat_info_mutex);
+                return r;
+        }
+
+        if (newval && newlen) {
+                if (name && *name == LASAT_PRID)
+                        lasat_board_info.li_eeprom_info.prid = *(int *)newval;
+
+                lasat_write_eeprom_info();
+                lasat_init_board_info();
+        }
+        mutex_unlock(&lasat_info_mutex);
+
+        return 0;
+}
+
+int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp,
+                       void *buffer, size_t *lenp, loff_t *ppos)
+{
+        int r;
+
+        mutex_lock(&lasat_info_mutex);
+        r = proc_dointvec(table, write, filp, buffer, lenp, ppos);
+        if ((!write) || r) {
+                mutex_unlock(&lasat_info_mutex);
+                return r;
+        }
+        if (filp && filp->f_path.dentry) {
+                if (!strcmp(filp->f_path.dentry->d_name.name, "prid"))
+                        lasat_board_info.li_eeprom_info.prid =
+                                lasat_board_info.li_prid;
+                if (!strcmp(filp->f_path.dentry->d_name.name, "debugaccess"))
+                        lasat_board_info.li_eeprom_info.debugaccess =
+                                lasat_board_info.li_debugaccess;
+        }
+        lasat_write_eeprom_info();
+        mutex_unlock(&lasat_info_mutex);
+
+        return 0;
+}
+
+extern int lasat_boot_to_service;
+
+#ifdef CONFIG_SYSCTL
+
+static ctl_table lasat_table[] = {
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "cpu-hz",
+                .data           = &lasat_board_info.li_cpu_hz,
+                .maxlen         = sizeof(int),
+                .mode           = 0444,
+                .proc_handler   = &proc_dointvec,
+                .strategy       = &sysctl_intvec
+        },
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "bus-hz",
+                .data           = &lasat_board_info.li_bus_hz,
+                .maxlen         = sizeof(int),
+                .mode           = 0444,
+                .proc_handler   = &proc_dointvec,
+                .strategy       = &sysctl_intvec
+        },
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "bmid",
+                .data           = &lasat_board_info.li_bmid,
+                .maxlen         = sizeof(int),
+                .mode           = 0444,
+                .proc_handler   = &proc_dointvec,
+                .strategy       = &sysctl_intvec
+        },
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "prid",
+                .data           = &lasat_board_info.li_prid,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_lasat_eeprom_value,
+                .strategy       = &sysctl_lasat_eeprom_value
+        },
+#ifdef CONFIG_INET
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "ipaddr",
+                .data           = &lasat_board_info.li_eeprom_info.ipaddr,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_lasat_ip,
+                .strategy       = &sysctl_lasat_intvec
+        },
+        {
+                .ctl_name       = LASAT_NETMASK,
+                .procname       = "netmask",
+                .data           = &lasat_board_info.li_eeprom_info.netmask,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_lasat_ip,
+                .strategy       = &sysctl_lasat_intvec
+        },
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "bcastaddr",
+                .data           = &lasat_bcastaddr,
+                .maxlen         = sizeof(lasat_bcastaddr),
+                .mode           = 0600,
+                .proc_handler   = &proc_dostring,
+                .strategy       = &sysctl_string
+        },
+#endif
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "passwd_hash",
+                .data           = &lasat_board_info.li_eeprom_info.passwd_hash,
+                .maxlen         =
+                        sizeof(lasat_board_info.li_eeprom_info.passwd_hash),
+                .mode           = 0600,
+                .proc_handler   = &proc_dolasatstring,
+                .strategy       = &sysctl_lasatstring
+        },
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "boot-service",
+                .data           = &lasat_boot_to_service,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dointvec,
+                .strategy       = &sysctl_intvec
+        },
+#ifdef CONFIG_DS1603
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "rtc",
+                .data           = &rtctmp,
+                .maxlen         = sizeof(int),
+                .mode           = 0644,
+                .proc_handler   = &proc_dolasatrtc,
+                .strategy       = &sysctl_lasat_rtc
+        },
+#endif
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "namestr",
+                .data           = &lasat_board_info.li_namestr,
+                .maxlen         = sizeof(lasat_board_info.li_namestr),
+                .mode           = 0444,
+                .proc_handler   =  &proc_dostring,
+                .strategy       = &sysctl_string
+        },
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "typestr",
+                .data           = &lasat_board_info.li_typestr,
+                .maxlen         = sizeof(lasat_board_info.li_typestr),
+                .mode           = 0444,
+                .proc_handler   = &proc_dostring,
+                .strategy       = &sysctl_string
+        },
+        {}
+};
+
+static ctl_table lasat_root_table[] = {
+        {
+                .ctl_name       = CTL_UNNUMBERED,
+                .procname       = "lasat",
+                .mode           =  0555,
+                .child          = lasat_table
+        },
+        {}
+};
+
+static int __init lasat_register_sysctl(void)
+{
+        struct ctl_table_header *lasat_table_header;
+
+        lasat_table_header =
+                register_sysctl_table(lasat_root_table);
+
+        return 0;
+}
+
+__initcall(lasat_register_sysctl);
+#endif /* CONFIG_SYSCTL */
diff --git a/arch/mips/lasat/sysctl.h b/arch/mips/lasat/sysctl.h
new file mode 100644
index 000000000000..341b97933423
--- /dev/null
+++ b/arch/mips/lasat/sysctl.h
@@ -0,0 +1,24 @@
+/*
+ * LASAT sysctl values
+ */
+
+#ifndef _LASAT_SYSCTL_H
+#define _LASAT_SYSCTL_H
+
+/* /proc/sys/lasat */
+enum {
+        LASAT_CPU_HZ = 1,
+        LASAT_BUS_HZ,
+        LASAT_MODEL,
+        LASAT_PRID,
+        LASAT_IPADDR,
+        LASAT_NETMASK,
+        LASAT_BCAST,
+        LASAT_PASSWORD,
+        LASAT_SBOOT,
+        LASAT_RTC,
+        LASAT_NAMESTR,
+        LASAT_TYPESTR,
+};
+
+#endif /* _LASAT_SYSCTL_H */
diff --git a/arch/mips/lemote/lm2e/Makefile b/arch/mips/lemote/lm2e/Makefile
index dcaf6f4c3a37..d34671d1b899 100644
--- a/arch/mips/lemote/lm2e/Makefile
+++ b/arch/mips/lemote/lm2e/Makefile
@@ -4,5 +4,4 @@
 
 obj-y += setup.o prom.o reset.o irq.o pci.o bonito-irq.o dbg_io.o mem.o
 
-EXTRA_AFLAGS := $(CFLAGS)
 EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/lemote/lm2e/prom.c b/arch/mips/lemote/lm2e/prom.c
index 3efb1cf111f2..824336812198 100644
--- a/arch/mips/lemote/lm2e/prom.c
+++ b/arch/mips/lemote/lm2e/prom.c
@@ -57,7 +57,6 @@ void __init prom_init(void)
         arg = (int *)fw_arg1;
         env = (int *)fw_arg2;
 
-        mips_machgroup = MACH_GROUP_LEMOTE;
         mips_machtype = MACH_LEMOTE_FULONG;
 
         prom_init_cmdline();
diff --git a/arch/mips/lemote/lm2e/setup.c b/arch/mips/lemote/lm2e/setup.c
index f34350a4f271..09314a20f9fb 100644
--- a/arch/mips/lemote/lm2e/setup.c
+++ b/arch/mips/lemote/lm2e/setup.c
@@ -58,13 +58,13 @@ void __init plat_timer_setup(struct irqaction *irq)
         setup_irq(MIPS_CPU_IRQ_BASE + 7, irq);
 }
 
-static void __init loongson2e_time_init(void)
+void __init plat_time_init(void)
 {
         /* setup mips r4k timer */
         mips_hpt_frequency = cpu_clock_freq / 2;
 }
 
-static unsigned long __init mips_rtc_get_time(void)
+unsigned long read_persistent_clock(void)
 {
         return mc146818_get_cmos_time();
 }
@@ -89,9 +89,6 @@ void __init plat_mem_setup(void)
 
         mips_reboot_setup();
 
-        board_time_init = loongson2e_time_init;
-        rtc_mips_get_time = mips_rtc_get_time;
-
         __wbflush = wbflush_loongson2e;
 
         add_memory_region(0x0, (memsize << 20), BOOT_MEM_RAM);
diff --git a/arch/mips/lib/ucmpdi2.c b/arch/mips/lib/ucmpdi2.c
index e2ff6072b5a3..b33d8569bcb0 100644
--- a/arch/mips/lib/ucmpdi2.c
+++ b/arch/mips/lib/ucmpdi2.c
@@ -2,7 +2,7 @@
 
 #include "libgcc.h"
 
-word_type __ucmpdi2 (unsigned long long a, unsigned long long b)
+word_type __ucmpdi2(unsigned long long a, unsigned long long b)
 {
         const DWunion au = {.ll = a};
         const DWunion bu = {.ll = b};
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
index 17419e11ecad..b08fc65c13a6 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -178,24 +178,24 @@ static int isBranchInstr(mips_instruction * i)
 #define FR_BIT 0
 #endif
 
-#define SIFROMREG(si,x) ((si) = \
+#define SIFROMREG(si, x) ((si) = \
                         (xcp->cp0_status & FR_BIT) || !(x & 1) ? \
                         (int)ctx->fpr[x] : \
                         (int)(ctx->fpr[x & ~1] >> 32 ))
-#define SITOREG(si,x)   (ctx->fpr[x & ~((xcp->cp0_status & FR_BIT) == 0)] = \
+#define SITOREG(si, x)  (ctx->fpr[x & ~((xcp->cp0_status & FR_BIT) == 0)] = \
                         (xcp->cp0_status & FR_BIT) || !(x & 1) ? \
                         ctx->fpr[x & ~1] >> 32 << 32 | (u32)(si) : \
                         ctx->fpr[x & ~1] << 32 >> 32 | (u64)(si) << 32)
 
-#define DIFROMREG(di,x) ((di) = \
+#define DIFROMREG(di, x) ((di) = \
                         ctx->fpr[x & ~((xcp->cp0_status & FR_BIT) == 0)])
-#define DITOREG(di,x)   (ctx->fpr[x & ~((xcp->cp0_status & FR_BIT) == 0)] \
+#define DITOREG(di, x)  (ctx->fpr[x & ~((xcp->cp0_status & FR_BIT) == 0)] \
                         = (di))
 
-#define SPFROMREG(sp,x) SIFROMREG((sp).bits,x)
-#define SPTOREG(sp,x)   SITOREG((sp).bits,x)
-#define DPFROMREG(dp,x) DIFROMREG((dp).bits,x)
-#define DPTOREG(dp,x)   DITOREG((dp).bits,x)
+#define SPFROMREG(sp, x) SIFROMREG((sp).bits, x)
+#define SPTOREG(sp, x)  SITOREG((sp).bits, x)
+#define DPFROMREG(dp, x)        DIFROMREG((dp).bits, x)
+#define DPTOREG(dp, x)  DITOREG((dp).bits, x)
 
 /*
  * Emulate the single floating point instruction pointed at by EPC.
@@ -549,16 +549,16 @@ static const unsigned char cmptab[8] = {
  */
 
 #define DEF3OP(name, p, f1, f2, f3) \
-static ieee754##p fpemu_##p##_##name (ieee754##p r, ieee754##p s, \
+static ieee754##p fpemu_##p##_##name(ieee754##p r, ieee754##p s, \
     ieee754##p t) \
 { \
         struct _ieee754_csr ieee754_csr_save; \
-        s = f1 (s, t); \
+        s = f1(s, t); \
         ieee754_csr_save = ieee754_csr; \
-        s = f2 (s, r); \
+        s = f2(s, r); \
         ieee754_csr_save.cx |= ieee754_csr.cx; \
         ieee754_csr_save.sx |= ieee754_csr.sx; \
-        s = f3 (s); \
+        s = f3(s); \
         ieee754_csr.cx |= ieee754_csr_save.cx; \
         ieee754_csr.sx |= ieee754_csr_save.sx; \
         return s; \
@@ -584,12 +584,12 @@ static ieee754sp fpemu_sp_rsqrt(ieee754sp s)
         return ieee754sp_div(ieee754sp_one(0), ieee754sp_sqrt(s));
 }
 
-DEF3OP(madd, sp, ieee754sp_mul, ieee754sp_add,);
-DEF3OP(msub, sp, ieee754sp_mul, ieee754sp_sub,);
+DEF3OP(madd, sp, ieee754sp_mul, ieee754sp_add, );
+DEF3OP(msub, sp, ieee754sp_mul, ieee754sp_sub, );
 DEF3OP(nmadd, sp, ieee754sp_mul, ieee754sp_add, ieee754sp_neg);
 DEF3OP(nmsub, sp, ieee754sp_mul, ieee754sp_sub, ieee754sp_neg);
-DEF3OP(madd, dp, ieee754dp_mul, ieee754dp_add,);
-DEF3OP(msub, dp, ieee754dp_mul, ieee754dp_sub,);
+DEF3OP(madd, dp, ieee754dp_mul, ieee754dp_add, );
+DEF3OP(msub, dp, ieee754dp_mul, ieee754dp_sub, );
 DEF3OP(nmadd, dp, ieee754dp_mul, ieee754dp_add, ieee754dp_neg);
 DEF3OP(nmsub, dp, ieee754dp_mul, ieee754dp_sub, ieee754dp_neg);
 
diff --git a/arch/mips/math-emu/dp_mul.c b/arch/mips/math-emu/dp_mul.c
index f2373902f524..48908a809c17 100644
--- a/arch/mips/math-emu/dp_mul.c
+++ b/arch/mips/math-emu/dp_mul.c
@@ -121,7 +121,7 @@ ieee754dp ieee754dp_mul(ieee754dp x, ieee754dp y)
                  */
 
                 /* 32 * 32 => 64 */
-#define DPXMULT(x,y)    ((u64)(x) * (u64)y)
+#define DPXMULT(x, y)   ((u64)(x) * (u64)y)
 
                 {
                         unsigned lxm = xm;
diff --git a/arch/mips/math-emu/ieee754.c b/arch/mips/math-emu/ieee754.c
index a93c45dbdefd..946aee331788 100644
--- a/arch/mips/math-emu/ieee754.c
+++ b/arch/mips/math-emu/ieee754.c
@@ -47,13 +47,13 @@
 
 
 #if (defined(BYTE_ORDER) && BYTE_ORDER == LITTLE_ENDIAN) || defined(__MIPSEL__)
-#define SPSTR(s,b,m) {m,b,s}
-#define DPSTR(s,b,mh,ml) {ml,mh,b,s}
+#define SPSTR(s, b, m) {m, b, s}
+#define DPSTR(s, b, mh, ml) {ml, mh, b, s}
 #endif
 
 #ifdef __MIPSEB__
-#define SPSTR(s,b,m) {s,b,m}
-#define DPSTR(s,b,mh,ml) {s,b,mh,ml}
+#define SPSTR(s, b, m) {s, b, m}
+#define DPSTR(s, b, mh, ml) {s, b, mh, ml}
 #endif
 
 const struct ieee754dp_konst __ieee754dp_spcvals[] = {
@@ -65,7 +65,7 @@ const struct ieee754dp_konst __ieee754dp_spcvals[] = {
         DPSTR(1, 3 + DP_EBIAS, 0x40000, 0),     /* - 10.0   */
         DPSTR(0, DP_EMAX + 1 + DP_EBIAS, 0, 0), /* + infinity */
         DPSTR(1, DP_EMAX + 1 + DP_EBIAS, 0, 0), /* - infinity */
-        DPSTR(0,DP_EMAX+1+DP_EBIAS,0x7FFFF,0xFFFFFFFF), /* + indef quiet Nan */
+        DPSTR(0, DP_EMAX+1+DP_EBIAS, 0x7FFFF, 0xFFFFFFFF), /* + indef quiet Nan */
         DPSTR(0, DP_EMAX + DP_EBIAS, 0xFFFFF, 0xFFFFFFFF),      /* + max */
         DPSTR(1, DP_EMAX + DP_EBIAS, 0xFFFFF, 0xFFFFFFFF),      /* - max */
         DPSTR(0, DP_EMIN + DP_EBIAS, 0, 0),     /* + min normal */
@@ -85,7 +85,7 @@ const struct ieee754sp_konst __ieee754sp_spcvals[] = {
         SPSTR(1, 3 + SP_EBIAS, 0x200000),       /* - 10.0   */
         SPSTR(0, SP_EMAX + 1 + SP_EBIAS, 0),    /* + infinity */
         SPSTR(1, SP_EMAX + 1 + SP_EBIAS, 0),    /* - infinity */
-        SPSTR(0,SP_EMAX+1+SP_EBIAS,0x3FFFFF),     /* + indef quiet Nan  */
+        SPSTR(0, SP_EMAX+1+SP_EBIAS, 0x3FFFFF),     /* + indef quiet Nan  */
         SPSTR(0, SP_EMAX + SP_EBIAS, 0x7FFFFF), /* + max normal */
         SPSTR(1, SP_EMAX + SP_EBIAS, 0x7FFFFF), /* - max normal */
         SPSTR(0, SP_EMIN + SP_EBIAS, 0),        /* + min normal */
diff --git a/arch/mips/math-emu/ieee754dp.h b/arch/mips/math-emu/ieee754dp.h
index a37370dae232..8977eb585a37 100644
--- a/arch/mips/math-emu/ieee754dp.h
+++ b/arch/mips/math-emu/ieee754dp.h
@@ -43,8 +43,8 @@
 /* convert denormal to normalized with extended exponent */
 #define DPDNORMx(m,e) \
   while( (m >> DP_MBITS) == 0) { m <<= 1; e--; }
-#define DPDNORMX        DPDNORMx(xm,xe)
-#define DPDNORMY        DPDNORMx(ym,ye)
+#define DPDNORMX        DPDNORMx(xm, xe)
+#define DPDNORMY        DPDNORMx(ym, ye)
 
 static __inline ieee754dp builddp(int s, int bx, u64 m)
 {
@@ -71,13 +71,13 @@ extern ieee754dp ieee754dp_bestnan(ieee754dp, ieee754dp);
 extern ieee754dp ieee754dp_format(int, int, u64);
 
 
-#define DPNORMRET2(s,e,m,name,a0,a1) \
+#define DPNORMRET2(s, e, m, name, a0, a1) \
 { \
-    ieee754dp V = ieee754dp_format(s,e,m); \
+    ieee754dp V = ieee754dp_format(s, e, m); \
     if(TSTX()) \
-      return ieee754dp_xcpt(V,name,a0,a1); \
+      return ieee754dp_xcpt(V, name, a0, a1); \
     else \
       return V; \
 }
 
-#define DPNORMRET1(s,e,m,name,a0)  DPNORMRET2(s,e,m,name,a0,a0)
+#define DPNORMRET1(s, e, m, name, a0)  DPNORMRET2(s, e, m, name, a0, a0)
diff --git a/arch/mips/math-emu/ieee754int.h b/arch/mips/math-emu/ieee754int.h
index 4a5a81d6b893..1a846c5425cd 100644
--- a/arch/mips/math-emu/ieee754int.h
+++ b/arch/mips/math-emu/ieee754int.h
@@ -55,16 +55,16 @@
 #define DPBEXP(dp)      (dp.parts.bexp)
 #define DPMANT(dp)      (dp.parts.mant)
 
-#define CLPAIR(x,y)     ((x)*6+(y))
+#define CLPAIR(x, y)    ((x)*6+(y))
 
 #define CLEARCX \
   (ieee754_csr.cx = 0)
 
 #define SETCX(x) \
-  (ieee754_csr.cx |= (x),ieee754_csr.sx |= (x))
+  (ieee754_csr.cx |= (x), ieee754_csr.sx |= (x))
 
 #define SETANDTESTCX(x) \
-  (SETCX(x),ieee754_csr.mx & (x))
+  (SETCX(x), ieee754_csr.mx & (x))
 
 #define TSTX()  \
         (ieee754_csr.cx & ieee754_csr.mx)
@@ -76,7 +76,7 @@
 #define COMPYSP \
   unsigned ym; int ye; int ys; int yc
 
-#define EXPLODESP(v,vc,vs,ve,vm) \
+#define EXPLODESP(v, vc, vs, ve, vm) \
 {\
     vs = SPSIGN(v);\
     ve = SPBEXP(v);\
@@ -100,8 +100,8 @@
         vc = IEEE754_CLASS_NORM;\
     }\
 }
-#define EXPLODEXSP EXPLODESP(x,xc,xs,xe,xm)
-#define EXPLODEYSP EXPLODESP(y,yc,ys,ye,ym)
+#define EXPLODEXSP EXPLODESP(x, xc, xs, xe, xm)
+#define EXPLODEYSP EXPLODESP(y, yc, ys, ye, ym)
 
 
 #define COMPXDP \
@@ -110,7 +110,7 @@ u64 xm; int xe; int xs; int xc
 #define COMPYDP \
 u64 ym; int ye; int ys; int yc
 
-#define EXPLODEDP(v,vc,vs,ve,vm) \
+#define EXPLODEDP(v, vc, vs, ve, vm) \
 {\
     vm = DPMANT(v);\
     vs = DPSIGN(v);\
@@ -134,10 +134,10 @@ u64 ym; int ye; int ys; int yc
         vc = IEEE754_CLASS_NORM;\
     }\
 }
-#define EXPLODEXDP EXPLODEDP(x,xc,xs,xe,xm)
-#define EXPLODEYDP EXPLODEDP(y,yc,ys,ye,ym)
+#define EXPLODEXDP EXPLODEDP(x, xc, xs, xe, xm)
+#define EXPLODEYDP EXPLODEDP(y, yc, ys, ye, ym)
 
-#define FLUSHDP(v,vc,vs,ve,vm) \
+#define FLUSHDP(v, vc, vs, ve, vm) \
         if(vc==IEEE754_CLASS_DNORM) {\
             if(ieee754_csr.nod) {\
                 SETCX(IEEE754_INEXACT);\
@@ -148,7 +148,7 @@ u64 ym; int ye; int ys; int yc
             }\
         }
 
-#define FLUSHSP(v,vc,vs,ve,vm) \
+#define FLUSHSP(v, vc, vs, ve, vm) \
         if(vc==IEEE754_CLASS_DNORM) {\
             if(ieee754_csr.nod) {\
                 SETCX(IEEE754_INEXACT);\
@@ -159,7 +159,7 @@ u64 ym; int ye; int ys; int yc
             }\
         }
 
-#define FLUSHXDP FLUSHDP(x,xc,xs,xe,xm)
-#define FLUSHYDP FLUSHDP(y,yc,ys,ye,ym)
-#define FLUSHXSP FLUSHSP(x,xc,xs,xe,xm)
-#define FLUSHYSP FLUSHSP(y,yc,ys,ye,ym)
+#define FLUSHXDP FLUSHDP(x, xc, xs, xe, xm)
+#define FLUSHYDP FLUSHDP(y, yc, ys, ye, ym)
+#define FLUSHXSP FLUSHSP(x, xc, xs, xe, xm)
+#define FLUSHYSP FLUSHSP(y, yc, ys, ye, ym)
diff --git a/arch/mips/math-emu/ieee754sp.h b/arch/mips/math-emu/ieee754sp.h
index ae82f51297e5..9917c1e4d947 100644
--- a/arch/mips/math-emu/ieee754sp.h
+++ b/arch/mips/math-emu/ieee754sp.h
@@ -48,8 +48,8 @@
 /* convert denormal to normalized with extended exponent */
 #define SPDNORMx(m,e) \
   while( (m >> SP_MBITS) == 0) { m <<= 1; e--; }
-#define SPDNORMX        SPDNORMx(xm,xe)
-#define SPDNORMY        SPDNORMx(ym,ye)
+#define SPDNORMX        SPDNORMx(xm, xe)
+#define SPDNORMY        SPDNORMx(ym, ye)
 
 static __inline ieee754sp buildsp(int s, int bx, unsigned m)
 {
@@ -77,13 +77,13 @@ extern ieee754sp ieee754sp_bestnan(ieee754sp, ieee754sp);
 extern ieee754sp ieee754sp_format(int, int, unsigned);
 
 
-#define SPNORMRET2(s,e,m,name,a0,a1) \
+#define SPNORMRET2(s, e, m, name, a0, a1) \
 { \
-    ieee754sp V = ieee754sp_format(s,e,m); \
+    ieee754sp V = ieee754sp_format(s, e, m); \
     if(TSTX()) \
-      return ieee754sp_xcpt(V,name,a0,a1); \
+      return ieee754sp_xcpt(V, name, a0, a1); \
     else \
       return V; \
 }
 
-#define SPNORMRET1(s,e,m,name,a0)  SPNORMRET2(s,e,m,name,a0,a0)
+#define SPNORMRET1(s, e, m, name, a0)  SPNORMRET2(s, e, m, name, a0, a0)
diff --git a/arch/mips/mips-boards/atlas/atlas_gdb.c b/arch/mips/mips-boards/atlas/atlas_gdb.c
index fb65280f1780..00c98cff62dc 100644
--- a/arch/mips/mips-boards/atlas/atlas_gdb.c
+++ b/arch/mips/mips-boards/atlas/atlas_gdb.c
@@ -22,7 +22,7 @@
 #include <asm/mips-boards/saa9730_uart.h>
 
 #define INB(a)     inb((unsigned long)a)
-#define OUTB(x,a)  outb(x,(unsigned long)a)
+#define OUTB(x, a)  outb(x, (unsigned long)a)
 
 /*
  * This is the interface to the remote debugger stub
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c
index 3c692abc2553..6fb29c3ff62d 100644
--- a/arch/mips/mips-boards/atlas/atlas_int.c
+++ b/arch/mips/mips-boards/atlas/atlas_int.c
@@ -112,7 +112,7 @@ static inline void atlas_hw0_irqdispatch(void)
 
 static inline int clz(unsigned long x)
 {
-        __asm__ (
+        __asm__(
         "       .set    push                                    \n"
         "       .set    mips32                                  \n"
         "       clz     %0, %1                                  \n"
@@ -194,7 +194,7 @@ asmlinkage void plat_irq_dispatch(void)
                 spurious_interrupt();
 }
 
-static inline void init_atlas_irqs (int base)
+static inline void init_atlas_irqs(int base)
 {
         int i;
 
@@ -249,21 +249,21 @@ void __init arch_init_irq(void)
         case MIPS_REVISION_CORID_CORE_24K:
         case MIPS_REVISION_CORID_CORE_EMUL_MSC:
                 if (cpu_has_veic)
-                        init_msc_irqs (MSC01E_INT_BASE, MSC01E_INT_BASE,
-                                       msc_eicirqmap, msc_nr_eicirqs);
+                        init_msc_irqs(MSC01E_INT_BASE, MSC01E_INT_BASE,
+                                      msc_eicirqmap, msc_nr_eicirqs);
                 else
-                        init_msc_irqs (MSC01E_INT_BASE, MSC01C_INT_BASE,
-                                       msc_irqmap, msc_nr_irqs);
+                        init_msc_irqs(MSC01E_INT_BASE, MSC01C_INT_BASE,
+                                      msc_irqmap, msc_nr_irqs);
         }
 
         if (cpu_has_veic) {
-                set_vi_handler (MSC01E_INT_ATLAS, atlas_hw0_irqdispatch);
-                setup_irq (MSC01E_INT_BASE + MSC01E_INT_ATLAS, &atlasirq);
+                set_vi_handler(MSC01E_INT_ATLAS, atlas_hw0_irqdispatch);
+                setup_irq(MSC01E_INT_BASE + MSC01E_INT_ATLAS, &atlasirq);
         } else if (cpu_has_vint) {
-                set_vi_handler (MIPSCPU_INT_ATLAS, atlas_hw0_irqdispatch);
+                set_vi_handler(MIPSCPU_INT_ATLAS, atlas_hw0_irqdispatch);
 #ifdef CONFIG_MIPS_MT_SMTC
-                setup_irq_smtc (MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS,
-                                &atlasirq, (0x100 << MIPSCPU_INT_ATLAS));
+                setup_irq_smtc(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS,
+                               &atlasirq, (0x100 << MIPSCPU_INT_ATLAS));
 #else /* Not SMTC */
                 setup_irq(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, &atlasirq);
 #endif /* CONFIG_MIPS_MT_SMTC */
diff --git a/arch/mips/mips-boards/atlas/atlas_setup.c b/arch/mips/mips-boards/atlas/atlas_setup.c
index c68358a476dd..e405d112a067 100644
--- a/arch/mips/mips-boards/atlas/atlas_setup.c
+++ b/arch/mips/mips-boards/atlas/atlas_setup.c
@@ -35,8 +35,6 @@
 #include <asm/traps.h>
 
 extern void mips_reboot_setup(void);
-extern void mips_time_init(void);
-extern unsigned long mips_rtc_get_time(void);
 
 #ifdef CONFIG_KGDB
 extern void kgdb_config(void);
@@ -57,15 +55,12 @@ void __init plat_mem_setup(void)
 
         ioport_resource.end = 0x7fffffff;
 
-        serial_init ();
+        serial_init();
 
 #ifdef CONFIG_KGDB
         kgdb_config();
 #endif
         mips_reboot_setup();
-
-        board_time_init = mips_time_init;
-        rtc_mips_get_time = mips_rtc_get_time;
 }
 
 static void __init serial_init(void)
diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mips-boards/generic/init.c
index e2c7147fedf7..30f1f54cb68b 100644
--- a/arch/mips/mips-boards/generic/init.c
+++ b/arch/mips/mips-boards/generic/init.c
@@ -166,15 +166,15 @@ static void __init console_config(void)
                         bits = '8';
                 if (flow == '\0')
                         flow = 'r';
-                sprintf (console_string, " console=ttyS0,%d%c%c%c", baud, parity, bits, flow);
-                strcat (prom_getcmdline(), console_string);
+                sprintf(console_string, " console=ttyS0,%d%c%c%c", baud, parity, bits, flow);
+                strcat(prom_getcmdline(), console_string);
                 pr_info("Config serial console:%s\n", console_string);
         }
 }
 #endif
 
 #ifdef CONFIG_KGDB
-void __init kgdb_config (void)
+void __init kgdb_config(void)
 {
         extern int (*generic_putDebugChar)(char);
         extern char (*generic_getDebugChar)(void);
@@ -218,7 +218,7 @@ void __init kgdb_config (void)
                 {
                         char *s;
                         for (s = "Please connect GDB to this port\r\n"; *s; )
-                                generic_putDebugChar (*s++);
+                                generic_putDebugChar(*s++);
                 }
 
                 /* Breakpoint is invoked after interrupts are initialised */
@@ -226,7 +226,7 @@ void __init kgdb_config (void)
 }
 #endif
 
-void __init mips_nmi_setup (void)
+void __init mips_nmi_setup(void)
 {
         void *base;
         extern char except_vec_nmi;
@@ -238,7 +238,7 @@ void __init mips_nmi_setup (void)
         flush_icache_range((unsigned long)base, (unsigned long)base + 0x80);
 }
 
-void __init mips_ejtag_setup (void)
+void __init mips_ejtag_setup(void)
 {
         void *base;
         extern char except_vec_ejtag_debug;
diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c
index ae39953da2c4..dc272c188233 100644
--- a/arch/mips/mips-boards/generic/memory.c
+++ b/arch/mips/mips-boards/generic/memory.c
@@ -125,7 +125,7 @@ struct prom_pmemblock * __init prom_getmdesc(void)
         return &mdesc[0];
 }
 
-static int __init prom_memtype_classify (unsigned int type)
+static int __init prom_memtype_classify(unsigned int type)
 {
         switch (type) {
         case yamon_free:
@@ -158,7 +158,7 @@ void __init prom_meminit(void)
                 long type;
                 unsigned long base, size;
 
-                type = prom_memtype_classify (p->type);
+                type = prom_memtype_classify(p->type);
                 base = p->base;
                 size = p->size;
 
diff --git a/arch/mips/mips-boards/generic/pci.c b/arch/mips/mips-boards/generic/pci.c
index c9852206890a..b9743190609a 100644
--- a/arch/mips/mips-boards/generic/pci.c
+++ b/arch/mips/mips-boards/generic/pci.c
@@ -239,5 +239,5 @@ void __init mips_pcibios_init(void)
         iomem_resource.end &= 0xfffffffffULL;                   /* 64 GB */
         ioport_resource.end = controller->io_resource->end;
 
-        register_pci_controller (controller);
+        register_pci_controller(controller);
 }
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c
index d7bff9ca5356..1d00b778ff1e 100644
--- a/arch/mips/mips-boards/generic/time.c
+++ b/arch/mips/mips-boards/generic/time.c
@@ -31,6 +31,7 @@
 #include <asm/mipsregs.h>
 #include <asm/mipsmtregs.h>
 #include <asm/hardirq.h>
+#include <asm/i8253.h>
 #include <asm/irq.h>
 #include <asm/div64.h>
 #include <asm/cpu.h>
@@ -55,7 +56,6 @@ unsigned long cpu_khz;
 
 static int mips_cpu_timer_irq;
 extern int cp0_perfcount_irq;
-extern void smtc_timer_broadcast(void);
 
 static void mips_timer_dispatch(void)
 {
@@ -68,108 +68,6 @@ static void mips_perf_dispatch(void)
 }
 
 /*
- * Redeclare until I get around mopping the timer code insanity on MIPS.
- */
-extern int null_perf_irq(void);
-
-extern int (*perf_irq)(void);
-
-/*
- * Possibly handle a performance counter interrupt.
- * Return true if the timer interrupt should not be checked
- */
-static inline int handle_perf_irq (int r2)
-{
-        /*
-         * The performance counter overflow interrupt may be shared with the
-         * timer interrupt (cp0_perfcount_irq < 0). If it is and a
-         * performance counter has overflowed (perf_irq() == IRQ_HANDLED)
-         * and we can't reliably determine if a counter interrupt has also
-         * happened (!r2) then don't check for a timer interrupt.
-         */
-        return (cp0_perfcount_irq < 0) &&
-                perf_irq() == IRQ_HANDLED &&
-                !r2;
-}
-
-irqreturn_t mips_timer_interrupt(int irq, void *dev_id)
-{
-        int cpu = smp_processor_id();
-
-#ifdef CONFIG_MIPS_MT_SMTC
-        /*
-         *  In an SMTC system, one Count/Compare set exists per VPE.
-         *  Which TC within a VPE gets the interrupt is essentially
-         *  random - we only know that it shouldn't be one with
-         *  IXMT set. Whichever TC gets the interrupt needs to
-         *  send special interprocessor interrupts to the other
-         *  TCs to make sure that they schedule, etc.
-         *
-         *  That code is specific to the SMTC kernel, not to
-         *  the a particular platform, so it's invoked from
-         *  the general MIPS timer_interrupt routine.
-         */
-
-        /*
-         * We could be here due to timer interrupt,
-         * perf counter overflow, or both.
-         */
-        (void) handle_perf_irq(1);
-
-        if (read_c0_cause() & (1 << 30)) {
-                /*
-                 * There are things we only want to do once per tick
-                 * in an "MP" system.   One TC of each VPE will take
-                 * the actual timer interrupt.  The others will get
-                 * timer broadcast IPIs. We use whoever it is that takes
-                 * the tick on VPE 0 to run the full timer_interrupt().
-                 */
-                if (cpu_data[cpu].vpe_id == 0) {
-                        timer_interrupt(irq, NULL);
-                } else {
-                        write_c0_compare(read_c0_count() +
-                                         (mips_hpt_frequency/HZ));
-                        local_timer_interrupt(irq, dev_id);
-                }
-                smtc_timer_broadcast();
-        }
-#else /* CONFIG_MIPS_MT_SMTC */
-        int r2 = cpu_has_mips_r2;
-
-        if (handle_perf_irq(r2))
-                goto out;
-
-        if (r2 && ((read_c0_cause() & (1 << 30)) == 0))
-                goto out;
-
-        if (cpu == 0) {
-                /*
-                 * CPU 0 handles the global timer interrupt job and process
-                 * accounting resets count/compare registers to trigger next
-                 * timer int.
-                 */
-                timer_interrupt(irq, NULL);
-        } else {
-                /* Everyone else needs to reset the timer int here as
-                   ll_local_timer_interrupt doesn't */
-                /*
-                 * FIXME: need to cope with counter underflow.
-                 * More support needs to be added to kernel/time for
-                 * counter/timer interrupts on multiple CPU's
-                 */
-                write_c0_compare(read_c0_count() + (mips_hpt_frequency/HZ));
-
-                /*
-                 * Other CPUs should do profiling and process accounting
-                 */
-                local_timer_interrupt(irq, dev_id);
-        }
-out:
-#endif /* CONFIG_MIPS_MT_SMTC */
-        return IRQ_HANDLED;
-}
-
-/*
  * Estimate CPU frequency.  Sets mips_hpt_frequency as a side-effect
  */
 static unsigned int __init estimate_cpu_frequency(void)
@@ -224,19 +122,19 @@ static unsigned int __init estimate_cpu_frequency(void)
         return count;
 }
 
-unsigned long __init mips_rtc_get_time(void)
+unsigned long read_persistent_clock(void)
 {
         return mc146818_get_cmos_time();
 }
 
-void __init mips_time_init(void)
+void __init plat_time_init(void)
 {
         unsigned int est_freq;
 
         /* Set Data mode - binary. */
         CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL);
 
-        est_freq = estimate_cpu_frequency ();
+        est_freq = estimate_cpu_frequency();
 
         printk("CPU frequency %d.%02d MHz\n", est_freq/1000000,
                (est_freq%1000000)*100/1000000);
@@ -244,38 +142,37 @@ void __init mips_time_init(void)
         cpu_khz = est_freq / 1000;
 
         mips_scroll_message();
+#ifdef CONFIG_I8253             /* Only Malta has a PIT */
+        setup_pit_timer();
+#endif
 }
 
-irqreturn_t mips_perf_interrupt(int irq, void *dev_id)
-{
-        return perf_irq();
-}
+//static irqreturn_t mips_perf_interrupt(int irq, void *dev_id)
+//{
+//      return perf_irq();
+//}
 
-static struct irqaction perf_irqaction = {
-        .handler = mips_perf_interrupt,
-        .flags = IRQF_DISABLED | IRQF_PERCPU,
-        .name = "performance",
-};
+//static struct irqaction perf_irqaction = {
+//      .handler = mips_perf_interrupt,
+//      .flags = IRQF_DISABLED | IRQF_PERCPU,
+//      .name = "performance",
+//};
 
-void __init plat_perf_setup(struct irqaction *irq)
+void __init plat_perf_setup(void)
 {
+//      struct irqaction *irq = &perf_irqaction;
+
         cp0_perfcount_irq = -1;
 
 #ifdef MSC01E_INT_BASE
         if (cpu_has_veic) {
-                set_vi_handler (MSC01E_INT_PERFCTR, mips_perf_dispatch);
+                set_vi_handler(MSC01E_INT_PERFCTR, mips_perf_dispatch);
                 cp0_perfcount_irq = MSC01E_INT_BASE + MSC01E_INT_PERFCTR;
         } else
 #endif
         if (cp0_perfcount_irq >= 0) {
                 if (cpu_has_vint)
                         set_vi_handler(cp0_perfcount_irq, mips_perf_dispatch);
-#ifdef CONFIG_MIPS_MT_SMTC
-                setup_irq_smtc(cp0_perfcount_irq, irq,
-                               0x100 << cp0_perfcount_irq);
-#else
-                setup_irq(cp0_perfcount_irq, irq);
-#endif /* CONFIG_MIPS_MT_SMTC */
 #ifdef CONFIG_SMP
                 set_irq_handler(cp0_perfcount_irq, handle_percpu_irq);
 #endif
@@ -286,7 +183,7 @@ void __init plat_timer_setup(struct irqaction *irq)
 {
 #ifdef MSC01E_INT_BASE
         if (cpu_has_veic) {
-                set_vi_handler (MSC01E_INT_CPUCTR, mips_timer_dispatch);
+                set_vi_handler(MSC01E_INT_CPUCTR, mips_timer_dispatch);
                 mips_cpu_timer_irq = MSC01E_INT_BASE + MSC01E_INT_CPUCTR;
         }
         else
@@ -297,8 +194,6 @@ void __init plat_timer_setup(struct irqaction *irq)
                 mips_cpu_timer_irq = MIPS_CPU_IRQ_BASE + cp0_compare_irq;
         }
 
-        /* we are using the cpu counter for timer interrupts */
-        irq->handler = mips_timer_interrupt;    /* we use our own handler */
 #ifdef CONFIG_MIPS_MT_SMTC
         setup_irq_smtc(mips_cpu_timer_irq, irq, 0x100 << cp0_compare_irq);
 #else
@@ -308,5 +203,5 @@ void __init plat_timer_setup(struct irqaction *irq)
         set_irq_handler(mips_cpu_timer_irq, handle_percpu_irq);
 #endif
 
-        plat_perf_setup(&perf_irqaction);
+        plat_perf_setup();
 }
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c
index b73f21823c5e..f010261b75d8 100644
--- a/arch/mips/mips-boards/malta/malta_int.c
+++ b/arch/mips/mips-boards/malta/malta_int.c
@@ -124,7 +124,7 @@ static void corehi_irqdispatch(void)
 {
         unsigned int intedge, intsteer, pcicmd, pcibadaddr;
         unsigned int pcimstat, intisr, inten, intpol;
-        unsigned int intrcause,datalo,datahi;
+        unsigned int intrcause, datalo, datahi;
         struct pt_regs *regs = get_irq_regs();
 
         printk("CoreHI interrupt, shouldn't happen, so we die here!!!\n");
@@ -178,7 +178,7 @@ static void corehi_irqdispatch(void)
 
 static inline int clz(unsigned long x)
 {
-        __asm__ (
+        __asm__(
         "       .set    push                                    \n"
         "       .set    mips32                                  \n"
         "       clz     %0, %1                                  \n"
@@ -303,32 +303,32 @@ void __init arch_init_irq(void)
         case MIPS_REVISION_SCON_SOCIT:
         case MIPS_REVISION_SCON_ROCIT:
                 if (cpu_has_veic)
-                        init_msc_irqs (MIPS_MSC01_IC_REG_BASE, MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs);
+                        init_msc_irqs(MIPS_MSC01_IC_REG_BASE, MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs);
                 else
-                        init_msc_irqs (MIPS_MSC01_IC_REG_BASE, MSC01C_INT_BASE, msc_irqmap, msc_nr_irqs);
+                        init_msc_irqs(MIPS_MSC01_IC_REG_BASE, MSC01C_INT_BASE, msc_irqmap, msc_nr_irqs);
                 break;
 
         case MIPS_REVISION_SCON_SOCITSC:
         case MIPS_REVISION_SCON_SOCITSCP:
                 if (cpu_has_veic)
-                        init_msc_irqs (MIPS_SOCITSC_IC_REG_BASE, MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs);
+                        init_msc_irqs(MIPS_SOCITSC_IC_REG_BASE, MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs);
                 else
-                        init_msc_irqs (MIPS_SOCITSC_IC_REG_BASE, MSC01C_INT_BASE, msc_irqmap, msc_nr_irqs);
+                        init_msc_irqs(MIPS_SOCITSC_IC_REG_BASE, MSC01C_INT_BASE, msc_irqmap, msc_nr_irqs);
         }
 
         if (cpu_has_veic) {
-                set_vi_handler (MSC01E_INT_I8259A, malta_hw0_irqdispatch);
-                set_vi_handler (MSC01E_INT_COREHI, corehi_irqdispatch);
-                setup_irq (MSC01E_INT_BASE+MSC01E_INT_I8259A, &i8259irq);
-                setup_irq (MSC01E_INT_BASE+MSC01E_INT_COREHI, &corehi_irqaction);
+                set_vi_handler(MSC01E_INT_I8259A, malta_hw0_irqdispatch);
+                set_vi_handler(MSC01E_INT_COREHI, corehi_irqdispatch);
+                setup_irq(MSC01E_INT_BASE+MSC01E_INT_I8259A, &i8259irq);
+                setup_irq(MSC01E_INT_BASE+MSC01E_INT_COREHI, &corehi_irqaction);
         }
         else if (cpu_has_vint) {
-                set_vi_handler (MIPSCPU_INT_I8259A, malta_hw0_irqdispatch);
-                set_vi_handler (MIPSCPU_INT_COREHI, corehi_irqdispatch);
+                set_vi_handler(MIPSCPU_INT_I8259A, malta_hw0_irqdispatch);
+                set_vi_handler(MIPSCPU_INT_COREHI, corehi_irqdispatch);
 #ifdef CONFIG_MIPS_MT_SMTC
-                setup_irq_smtc (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq,
+                setup_irq_smtc(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq,
                         (0x100 << MIPSCPU_INT_I8259A));
-                setup_irq_smtc (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI,
+                setup_irq_smtc(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI,
                         &corehi_irqaction, (0x100 << MIPSCPU_INT_COREHI));
                 /*
                  * Temporary hack to ensure that the subsidiary device
@@ -343,12 +343,12 @@ void __init arch_init_irq(void)
                                 irq_hwmask[i] = (0x100 << MIPSCPU_INT_I8259A);
                 }
 #else /* Not SMTC */
-                setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq);
-                setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction);
+                setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq);
+                setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction);
 #endif /* CONFIG_MIPS_MT_SMTC */
         }
         else {
-                setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq);
-                setup_irq (MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction);
+                setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq);
+                setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction);
         }
 }
diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mips-boards/malta/malta_setup.c
index 8f1b78dfd89f..9a2636e56243 100644
--- a/arch/mips/mips-boards/malta/malta_setup.c
+++ b/arch/mips/mips-boards/malta/malta_setup.c
@@ -36,7 +36,6 @@
 #endif
 
 extern void mips_reboot_setup(void);
-extern void mips_time_init(void);
 extern unsigned long mips_rtc_get_time(void);
 
 #ifdef CONFIG_KGDB
@@ -100,7 +99,7 @@ void __init plat_mem_setup(void)
         enable_dma(4);
 
 #ifdef CONFIG_KGDB
-        kgdb_config ();
+        kgdb_config();
 #endif
 
         if (mips_revision_sconid == MIPS_REVISION_SCON_BONITO) {
@@ -109,7 +108,7 @@ void __init plat_mem_setup(void)
                 argptr = prom_getcmdline();
                 if (strstr(argptr, "debug")) {
                         BONITO_BONGENCFG |= BONITO_BONGENCFG_DEBUGMODE;
-                        printk ("Enabled Bonito debug mode\n");
+                        printk("Enabled Bonito debug mode\n");
                 }
                 else
                         BONITO_BONGENCFG &= ~BONITO_BONGENCFG_DEBUGMODE;
@@ -160,14 +159,14 @@ void __init plat_mem_setup(void)
                 if (pciclock != 33 && !strstr (argptr, "idebus=")) {
                         printk("WARNING: PCI clock is %dMHz, setting idebus\n", pciclock);
                         argptr += strlen(argptr);
-                        sprintf (argptr, " idebus=%d", pciclock);
+                        sprintf(argptr, " idebus=%d", pciclock);
                         if (pciclock < 20 || pciclock > 66)
-                                printk ("WARNING: IDE timing calculations will be incorrect\n");
+                                printk("WARNING: IDE timing calculations will be incorrect\n");
                 }
         }
 #endif
 #ifdef CONFIG_BLK_DEV_FD
-        fd_activate ();
+        fd_activate();
 #endif
 #ifdef CONFIG_VT
 #if defined(CONFIG_VGA_CONSOLE)
@@ -177,7 +176,7 @@ void __init plat_mem_setup(void)
                 0,                      /* orig-video-page */
                 0,                      /* orig-video-mode */
                 80,                     /* orig-video-cols */
-                0,0,0,                  /* ega_ax, ega_bx, ega_cx */
+                0, 0, 0,                /* ega_ax, ega_bx, ega_cx */
                 25,                     /* orig-video-lines */
                 VIDEO_TYPE_VGAC,        /* orig-video-isVGA */
                 16                      /* orig-video-points */
@@ -185,7 +184,4 @@ void __init plat_mem_setup(void)
 #endif
 #endif
         mips_reboot_setup();
-
-        board_time_init = mips_time_init;
-        rtc_mips_get_time = mips_rtc_get_time;
 }
diff --git a/arch/mips/mips-boards/malta/malta_smtc.c b/arch/mips/mips-boards/malta/malta_smtc.c
index ae05d058cb37..5c980f4a48fe 100644
--- a/arch/mips/mips-boards/malta/malta_smtc.c
+++ b/arch/mips/mips-boards/malta/malta_smtc.c
@@ -88,3 +88,53 @@ void __cpuinit prom_smp_finish(void)
 void prom_cpus_done(void)
 {
 }
+
+#ifdef CONFIG_MIPS_MT_SMTC_IRQAFF
+/*
+ * IRQ affinity hook
+ */
+
+
+void plat_set_irq_affinity(unsigned int irq, cpumask_t affinity)
+{
+        cpumask_t tmask = affinity;
+        int cpu = 0;
+        void smtc_set_irq_affinity(unsigned int irq, cpumask_t aff);
+
+        /*
+         * On the legacy Malta development board, all I/O interrupts
+         * are routed through the 8259 and combined in a single signal
+         * to the CPU daughterboard, and on the CoreFPGA2/3 34K models,
+         * that signal is brought to IP2 of both VPEs. To avoid racing
+         * concurrent interrupt service events, IP2 is enabled only on
+         * one VPE, by convention VPE0.  So long as no bits are ever
+         * cleared in the affinity mask, there will never be any
+         * interrupt forwarding.  But as soon as a program or operator
+         * sets affinity for one of the related IRQs, we need to make
+         * sure that we don't ever try to forward across the VPE boundry,
+         * at least not until we engineer a system where the interrupt
+         * _ack() or _end() function can somehow know that it corresponds
+         * to an interrupt taken on another VPE, and perform the appropriate
+         * restoration of Status.IM state using MFTR/MTTR instead of the
+         * normal local behavior. We also ensure that no attempt will
+         * be made to forward to an offline "CPU".
+         */
+
+        for_each_cpu_mask(cpu, affinity) {
+                if ((cpu_data[cpu].vpe_id != 0) || !cpu_online(cpu))
+                        cpu_clear(cpu, tmask);
+        }
+        irq_desc[irq].affinity = tmask;
+
+        if (cpus_empty(tmask))
+                /*
+                 * We could restore a default mask here, but the
+                 * runtime code can anyway deal with the null set
+                 */
+                printk(KERN_WARNING
+                        "IRQ affinity leaves no legal CPU for IRQ %d\n", irq);
+
+        /* Do any generic SMTC IRQ affinity setup */
+        smtc_set_irq_affinity(irq, tmask);
+}
+#endif /* CONFIG_MIPS_MT_SMTC_IRQAFF */
diff --git a/arch/mips/mips-boards/sead/sead_int.c b/arch/mips/mips-boards/sead/sead_int.c
index 9ca0f82f1360..ec6dd194c14a 100644
--- a/arch/mips/mips-boards/sead/sead_int.c
+++ b/arch/mips/mips-boards/sead/sead_int.c
@@ -31,7 +31,7 @@
 
 static inline int clz(unsigned long x)
 {
-        __asm__ (
+        __asm__(
         "       .set    push                                    \n"
         "       .set    mips32                                  \n"
         "       clz     %0, %1                                  \n"
diff --git a/arch/mips/mips-boards/sead/sead_setup.c b/arch/mips/mips-boards/sead/sead_setup.c
index 5f70eaf01fab..1fb61b852304 100644
--- a/arch/mips/mips-boards/sead/sead_setup.c
+++ b/arch/mips/mips-boards/sead/sead_setup.c
@@ -35,7 +35,6 @@
 #include <asm/time.h>
 
 extern void mips_reboot_setup(void);
-extern void mips_time_init(void);
 
 static void __init serial_init(void);
 
@@ -50,9 +49,7 @@ void __init plat_mem_setup(void)
 {
         ioport_resource.end = 0x7fffffff;
 
-        serial_init ();
-
-        board_time_init = mips_time_init;
+        serial_init();
 
         mips_reboot_setup();
 }
diff --git a/arch/mips/mipssim/sim_int.c b/arch/mips/mipssim/sim_int.c
index 5cbc3509ab52..46067ad542dc 100644
--- a/arch/mips/mipssim/sim_int.c
+++ b/arch/mips/mipssim/sim_int.c
@@ -25,7 +25,7 @@
 
 static inline int clz(unsigned long x)
 {
-        __asm__ (
+        __asm__(
         "       .set    push                                    \n"
         "       .set    mips32                                  \n"
         "       clz     %0, %1                                  \n"
diff --git a/arch/mips/mipssim/sim_mem.c b/arch/mips/mipssim/sim_mem.c
index 2312483eb838..953d836a7713 100644
--- a/arch/mips/mipssim/sim_mem.c
+++ b/arch/mips/mipssim/sim_mem.c
@@ -69,7 +69,7 @@ struct prom_pmemblock * __init prom_getmdesc(void)
         return &mdesc[0];
 }
 
-static int __init prom_memtype_classify (unsigned int type)
+static int __init prom_memtype_classify(unsigned int type)
 {
         switch (type) {
         case simmem_free:
@@ -90,7 +90,7 @@ void __init prom_meminit(void)
                 long type;
                 unsigned long base, size;
 
-                type = prom_memtype_classify (p->type);
+                type = prom_memtype_classify(p->type);
                 base = p->base;
                 size = p->size;
 
diff --git a/arch/mips/mipssim/sim_setup.c b/arch/mips/mipssim/sim_setup.c
index d012719c4d24..452c129d02c1 100644
--- a/arch/mips/mipssim/sim_setup.c
+++ b/arch/mips/mipssim/sim_setup.c
@@ -36,7 +36,6 @@
 #include <asm/mips-boards/simint.h>
 
 
-extern void sim_time_init(void);
 static void __init serial_init(void);
 unsigned int _isbonito = 0;
 
@@ -54,7 +53,6 @@ void __init plat_mem_setup(void)
 
         serial_init();
 
-        board_time_init = sim_time_init;
         pr_info("Linux started...\n");
 
 #ifdef CONFIG_MIPS_MT_SMP
diff --git a/arch/mips/mipssim/sim_time.c b/arch/mips/mipssim/sim_time.c
index a0f5a5dca1b2..e7fa0d1078a3 100644
--- a/arch/mips/mipssim/sim_time.c
+++ b/arch/mips/mipssim/sim_time.c
@@ -23,77 +23,6 @@
 
 unsigned long cpu_khz;
 
-irqreturn_t sim_timer_interrupt(int irq, void *dev_id)
-{
-#ifdef CONFIG_SMP
-        int cpu = smp_processor_id();
-
-        /*
-         * CPU 0 handles the global timer interrupt job
-         * resets count/compare registers to trigger next timer int.
-         */
-#ifndef CONFIG_MIPS_MT_SMTC
-        if (cpu == 0) {
-                timer_interrupt(irq, dev_id);
-        } else {
-                /* Everyone else needs to reset the timer int here as
-                   ll_local_timer_interrupt doesn't */
-                /*
-                 * FIXME: need to cope with counter underflow.
-                 * More support needs to be added to kernel/time for
-                 * counter/timer interrupts on multiple CPU's
-                 */
-                write_c0_compare (read_c0_count() + ( mips_hpt_frequency/HZ));
-        }
-#else /* SMTC */
-        /*
-         *  In SMTC system, one Count/Compare set exists per VPE.
-         *  Which TC within a VPE gets the interrupt is essentially
-         *  random - we only know that it shouldn't be one with
-         *  IXMT set. Whichever TC gets the interrupt needs to
-         *  send special interprocessor interrupts to the other
-         *  TCs to make sure that they schedule, etc.
-         *
-         *  That code is specific to the SMTC kernel, not to
-         *  the simulation platform, so it's invoked from
-         *  the general MIPS timer_interrupt routine.
-         *
-         * We have a problem in that the interrupt vector code
-         * had to turn off the timer IM bit to avoid redundant
-         * entries, but we may never get to mips_cpu_irq_end
-         * to turn it back on again if the scheduler gets
-         * involved.  So we clear the pending timer here,
-         * and re-enable the mask...
-         */
-
-        int vpflags = dvpe();
-        write_c0_compare (read_c0_count() - 1);
-        clear_c0_cause(0x100 << cp0_compare_irq);
-        set_c0_status(0x100 << cp0_compare_irq);
-        irq_enable_hazard();
-        evpe(vpflags);
-
-        if (cpu_data[cpu].vpe_id == 0)
-                timer_interrupt(irq, dev_id);
-        else
-                write_c0_compare (read_c0_count() + ( mips_hpt_frequency/HZ));
-        smtc_timer_broadcast(cpu_data[cpu].vpe_id);
-
-#endif /* CONFIG_MIPS_MT_SMTC */
-
-        /*
-         * every CPU should do profiling and process accounting
-         */
-        local_timer_interrupt (irq, dev_id);
-
-        return IRQ_HANDLED;
-#else
-        return timer_interrupt (irq, dev_id);
-#endif
-}
-
-
-
 /*
  * Estimate CPU frequency.  Sets mips_hpt_frequency as a side-effect
  */
@@ -146,7 +75,7 @@ static unsigned int __init estimate_cpu_frequency(void)
         return count;
 }
 
-void __init sim_time_init(void)
+void __init plat_time_init(void)
 {
         unsigned int est_freq, flags;
 
@@ -155,7 +84,7 @@ void __init sim_time_init(void)
         /* Set Data mode - binary. */
         CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL);
 
-        est_freq = estimate_cpu_frequency ();
+        est_freq = estimate_cpu_frequency();
 
         printk(KERN_INFO "CPU frequency %d.%02d MHz\n", est_freq / 1000000,
                (est_freq % 1000000) * 100 / 1000000);
@@ -185,7 +114,6 @@ void __init plat_timer_setup(struct irqaction *irq)
         }
 
         /* we are using the cpu counter for timer interrupts */
-        irq->handler = sim_timer_interrupt;
         setup_irq(mips_cpu_timer_irq, irq);
 
 #ifdef CONFIG_SMP
diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
index 43e4810dcaa8..32fd5db95774 100644
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_CPU_R5432)		+= c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
 obj-$(CONFIG_CPU_R8000)         += c-r4k.o cex-gen.o pg-r4k.o tlb-r8k.o
 obj-$(CONFIG_CPU_RM7000)        += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
 obj-$(CONFIG_CPU_RM9000)        += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
-obj-$(CONFIG_CPU_SB1)           += c-sb1.o cerr-sb1.o cex-sb1.o pg-sb1.o \
+obj-$(CONFIG_CPU_SB1)           += c-r4k.o cerr-sb1.o cex-sb1.o pg-sb1.o \
                                    tlb-r4k.o
 obj-$(CONFIG_CPU_TX39XX)        += c-tx39.o pg-r4k.o tlb-r3k.o
 obj-$(CONFIG_CPU_TX49XX)        += c-r4k.o cex-gen.o pg-r4k.o tlb-r4k.o
diff --git a/arch/mips/mm/c-r3k.c b/arch/mips/mm/c-r3k.c
index 59868a1edf66..c55312f6fd3a 100644
--- a/arch/mips/mm/c-r3k.c
+++ b/arch/mips/mm/c-r3k.c
@@ -121,7 +121,7 @@ static void r3k_flush_icache_range(unsigned long start, unsigned long end)
         write_c0_status((ST0_ISC|ST0_SWC|flags)&~ST0_IEC);
 
         for (i = 0; i < size; i += 0x080) {
-                asm (   "sb\t$0, 0x000(%0)\n\t"
+                asm(    "sb\t$0, 0x000(%0)\n\t"
                         "sb\t$0, 0x004(%0)\n\t"
                         "sb\t$0, 0x008(%0)\n\t"
                         "sb\t$0, 0x00c(%0)\n\t"
@@ -178,7 +178,7 @@ static void r3k_flush_dcache_range(unsigned long start, unsigned long end)
         write_c0_status((ST0_ISC|flags)&~ST0_IEC);
 
         for (i = 0; i < size; i += 0x080) {
-                asm (   "sb\t$0, 0x000(%0)\n\t"
+                asm(    "sb\t$0, 0x000(%0)\n\t"
                         "sb\t$0, 0x004(%0)\n\t"
                         "sb\t$0, 0x008(%0)\n\t"
                         "sb\t$0, 0x00c(%0)\n\t"
@@ -217,8 +217,8 @@ static void r3k_flush_dcache_range(unsigned long start, unsigned long end)
         write_c0_status(flags);
 }
 
-static inline unsigned long get_phys_page (unsigned long addr,
-                                           struct mm_struct *mm)
+static inline unsigned long get_phys_page(unsigned long addr,
+                                          struct mm_struct *mm)
 {
         pgd_t *pgd;
         pud_t *pud;
@@ -281,13 +281,13 @@ static void r3k_flush_cache_sigtramp(unsigned long addr)
         write_c0_status(flags&~ST0_IEC);
 
         /* Fill the TLB to avoid an exception with caches isolated. */
-        asm (   "lw\t$0, 0x000(%0)\n\t"
+        asm(    "lw\t$0, 0x000(%0)\n\t"
                 "lw\t$0, 0x004(%0)\n\t"
                 : : "r" (addr) );
 
         write_c0_status((ST0_ISC|ST0_SWC|flags)&~ST0_IEC);
 
-        asm (   "sb\t$0, 0x000(%0)\n\t"
+        asm(    "sb\t$0, 0x000(%0)\n\t"
                 "sb\t$0, 0x004(%0)\n\t"
                 : : "r" (addr) );
 
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index bad571971bf6..971f6c047b8a 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -8,7 +8,9 @@
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  */
 #include <linux/init.h>
+#include <linux/highmem.h>
 #include <linux/kernel.h>
+#include <linux/linkage.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/bitops.h>
@@ -162,12 +164,12 @@ static inline void tx49_blast_icache32(void)
         /* I'm in even chunk.  blast odd chunks */
         for (ws = 0; ws < ws_end; ws += ws_inc)
                 for (addr = start + 0x400; addr < end; addr += 0x400 * 2)
-                        cache32_unroll32(addr|ws,Index_Invalidate_I);
+                        cache32_unroll32(addr|ws, Index_Invalidate_I);
         CACHE32_UNROLL32_ALIGN;
         /* I'm in odd chunk.  blast even chunks */
         for (ws = 0; ws < ws_end; ws += ws_inc)
                 for (addr = start; addr < end; addr += 0x400 * 2)
-                        cache32_unroll32(addr|ws,Index_Invalidate_I);
+                        cache32_unroll32(addr|ws, Index_Invalidate_I);
 }
 
 static inline void blast_icache32_r4600_v1_page_indexed(unsigned long page)
@@ -193,12 +195,12 @@ static inline void tx49_blast_icache32_page_indexed(unsigned long page)
         /* I'm in even chunk.  blast odd chunks */
         for (ws = 0; ws < ws_end; ws += ws_inc)
                 for (addr = start + 0x400; addr < end; addr += 0x400 * 2)
-                        cache32_unroll32(addr|ws,Index_Invalidate_I);
+                        cache32_unroll32(addr|ws, Index_Invalidate_I);
         CACHE32_UNROLL32_ALIGN;
         /* I'm in odd chunk.  blast even chunks */
         for (ws = 0; ws < ws_end; ws += ws_inc)
                 for (addr = start; addr < end; addr += 0x400 * 2)
-                        cache32_unroll32(addr|ws,Index_Invalidate_I);
+                        cache32_unroll32(addr|ws, Index_Invalidate_I);
 }
 
 static void (* r4k_blast_icache_page)(unsigned long addr);
@@ -317,23 +319,6 @@ static void __init r4k_blast_scache_setup(void)
                 r4k_blast_scache = blast_scache128;
 }
 
-/*
- * This is former mm's flush_cache_all() which really should be
- * flush_cache_vunmap these days ...
- */
-static inline void local_r4k_flush_cache_all(void * args)
-{
-        r4k_blast_dcache();
-}
-
-static void r4k_flush_cache_all(void)
-{
-        if (!cpu_has_dc_aliases)
-                return;
-
-        r4k_on_each_cpu(local_r4k_flush_cache_all, NULL, 1, 1);
-}
-
 static inline void local_r4k___flush_cache_all(void * args)
 {
 #if defined(CONFIG_CPU_LOONGSON2)
@@ -343,7 +328,7 @@ static inline void local_r4k___flush_cache_all(void * args)
         r4k_blast_dcache();
         r4k_blast_icache();
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_R4000SC:
         case CPU_R4000MC:
         case CPU_R4400SC:
@@ -392,10 +377,10 @@ static inline void local_r4k_flush_cache_mm(void * args)
          * R4000SC and R4400SC indexed S-cache ops also invalidate primary
          * caches, so we can bail out early.
          */
-        if (current_cpu_data.cputype == CPU_R4000SC ||
-            current_cpu_data.cputype == CPU_R4000MC ||
-            current_cpu_data.cputype == CPU_R4400SC ||
-            current_cpu_data.cputype == CPU_R4400MC) {
+        if (current_cpu_type() == CPU_R4000SC ||
+            current_cpu_type() == CPU_R4000MC ||
+            current_cpu_type() == CPU_R4400SC ||
+            current_cpu_type() == CPU_R4400MC) {
                 r4k_blast_scache();
                 return;
         }
@@ -422,13 +407,14 @@ static inline void local_r4k_flush_cache_page(void *args)
         struct flush_cache_page_args *fcp_args = args;
         struct vm_area_struct *vma = fcp_args->vma;
         unsigned long addr = fcp_args->addr;
-        unsigned long paddr = fcp_args->pfn << PAGE_SHIFT;
+        struct page *page = pfn_to_page(fcp_args->pfn);
         int exec = vma->vm_flags & VM_EXEC;
         struct mm_struct *mm = vma->vm_mm;
         pgd_t *pgdp;
         pud_t *pudp;
         pmd_t *pmdp;
         pte_t *ptep;
+        void *vaddr;
 
         /*
          * If ownes no valid ASID yet, cannot possibly have gotten
@@ -450,43 +436,40 @@ static inline void local_r4k_flush_cache_page(void *args)
         if (!(pte_val(*ptep) & _PAGE_PRESENT))
                 return;
 
-        /*
-         * Doing flushes for another ASID than the current one is
-         * too difficult since stupid R4k caches do a TLB translation
-         * for every cache flush operation.  So we do indexed flushes
-         * in that case, which doesn't overly flush the cache too much.
-         */
-        if ((mm == current->active_mm) && (pte_val(*ptep) & _PAGE_VALID)) {
-                if (cpu_has_dc_aliases || (exec && !cpu_has_ic_fills_f_dc)) {
-                        r4k_blast_dcache_page(addr);
-                        if (exec && !cpu_icache_snoops_remote_store)
-                                r4k_blast_scache_page(addr);
-                }
-                if (exec)
-                        r4k_blast_icache_page(addr);
-
-                return;
+        if ((mm == current->active_mm) && (pte_val(*ptep) & _PAGE_VALID))
+                vaddr = NULL;
+        else {
+                /*
+                 * Use kmap_coherent or kmap_atomic to do flushes for
+                 * another ASID than the current one.
+                 */
+                if (cpu_has_dc_aliases)
+                        vaddr = kmap_coherent(page, addr);
+                else
+                        vaddr = kmap_atomic(page, KM_USER0);
+                addr = (unsigned long)vaddr;
         }
 
-        /*
-         * Do indexed flush, too much work to get the (possible) TLB refills
-         * to work correctly.
-         */
         if (cpu_has_dc_aliases || (exec && !cpu_has_ic_fills_f_dc)) {
-                r4k_blast_dcache_page_indexed(cpu_has_pindexed_dcache ?
-                                              paddr : addr);
-                if (exec && !cpu_icache_snoops_remote_store) {
-                        r4k_blast_scache_page_indexed(paddr);
-                }
+                r4k_blast_dcache_page(addr);
+                if (exec && !cpu_icache_snoops_remote_store)
+                        r4k_blast_scache_page(addr);
         }
         if (exec) {
-                if (cpu_has_vtag_icache && mm == current->active_mm) {
+                if (vaddr && cpu_has_vtag_icache && mm == current->active_mm) {
                         int cpu = smp_processor_id();
 
                         if (cpu_context(cpu, mm) != 0)
                                 drop_mmu_context(mm, cpu);
                 } else
-                        r4k_blast_icache_page_indexed(addr);
+                        r4k_blast_icache_page(addr);
+        }
+
+        if (vaddr) {
+                if (cpu_has_dc_aliases)
+                        kunmap_coherent();
+                else
+                        kunmap_atomic(vaddr, KM_USER0);
         }
 }
 
@@ -948,12 +931,16 @@ static void __init probe_pcache(void)
         switch (c->cputype) {
         case CPU_20KC:
         case CPU_25KF:
+        case CPU_SB1:
+        case CPU_SB1A:
                 c->dcache.flags |= MIPS_CACHE_PINDEX;
+                break;
+
         case CPU_R10000:
         case CPU_R12000:
         case CPU_R14000:
-        case CPU_SB1:
                 break;
+
         case CPU_24K:
         case CPU_34K:
         case CPU_74K:
@@ -1210,7 +1197,7 @@ static void __init coherency_setup(void)
          * this bit and; some wire it to zero, others like Toshiba had the
          * silly idea of putting something else there ...
          */
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_R4000PC:
         case CPU_R4000SC:
         case CPU_R4000MC:
@@ -1235,11 +1222,20 @@ void __init r4k_cache_init(void)
 {
         extern void build_clear_page(void);
         extern void build_copy_page(void);
-        extern char except_vec2_generic;
+        extern char __weak except_vec2_generic;
+        extern char __weak except_vec2_sb1;
         struct cpuinfo_mips *c = &current_cpu_data;
 
-        /* Default cache error handler for R4000 and R5000 family */
-        set_uncached_handler (0x100, &except_vec2_generic, 0x80);
+        switch (c->cputype) {
+        case CPU_SB1:
+        case CPU_SB1A:
+                set_uncached_handler(0x100, &except_vec2_sb1, 0x80);
+                break;
+
+        default:
+                set_uncached_handler(0x100, &except_vec2_generic, 0x80);
+                break;
+        }
 
         probe_pcache();
         setup_scache();
@@ -1265,7 +1261,7 @@ void __init r4k_cache_init(void)
                                         PAGE_SIZE - 1);
         else
                 shm_align_mask = PAGE_SIZE-1;
-        flush_cache_all         = r4k_flush_cache_all;
+        flush_cache_all         = cache_noop;
         __flush_cache_all       = r4k___flush_cache_all;
         flush_cache_mm          = r4k_flush_cache_mm;
         flush_cache_page        = r4k_flush_cache_page;
diff --git a/arch/mips/mm/c-sb1.c b/arch/mips/mm/c-sb1.c
deleted file mode 100644
index 85ce2842d0da..000000000000
--- a/arch/mips/mm/c-sb1.c
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
- * Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org)
- * Copyright (C) 2000, 2001, 2002, 2003 Broadcom Corporation
- * Copyright (C) 2004  Maciej W. Rozycki
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-#include <linux/init.h>
-#include <linux/hardirq.h>
-
-#include <asm/asm.h>
-#include <asm/bootinfo.h>
-#include <asm/cacheops.h>
-#include <asm/cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/mmu_context.h>
-#include <asm/uaccess.h>
-
-extern void sb1_dma_init(void);
-
-/* These are probed at ld_mmu time */
-static unsigned long icache_size;
-static unsigned long dcache_size;
-
-static unsigned short icache_line_size;
-static unsigned short dcache_line_size;
-
-static unsigned int icache_index_mask;
-static unsigned int dcache_index_mask;
-
-static unsigned short icache_assoc;
-static unsigned short dcache_assoc;
-
-static unsigned short icache_sets;
-static unsigned short dcache_sets;
-
-static unsigned int icache_range_cutoff;
-static unsigned int dcache_range_cutoff;
-
-static inline void sb1_on_each_cpu(void (*func) (void *info), void *info,
-                                   int retry, int wait)
-{
-        preempt_disable();
-        smp_call_function(func, info, retry, wait);
-        func(info);
-        preempt_enable();
-}
-
-/*
- * The dcache is fully coherent to the system, with one
- * big caveat:  the instruction stream.  In other words,
- * if we miss in the icache, and have dirty data in the
- * L1 dcache, then we'll go out to memory (or the L2) and
- * get the not-as-recent data.
- *
- * So the only time we have to flush the dcache is when
- * we're flushing the icache.  Since the L2 is fully
- * coherent to everything, including I/O, we never have
- * to flush it
- */
-
-#define cache_set_op(op, addr)                                          \
-        __asm__ __volatile__(                                           \
-        "       .set    noreorder               \n"                     \
-        "       .set    mips64\n\t              \n"                     \
-        "       cache   %0, (0<<13)(%1)         \n"                     \
-        "       cache   %0, (1<<13)(%1)         \n"                     \
-        "       cache   %0, (2<<13)(%1)         \n"                     \
-        "       cache   %0, (3<<13)(%1)         \n"                     \
-        "       .set    mips0                   \n"                     \
-        "       .set    reorder"                                        \
-        :                                                               \
-        : "i" (op), "r" (addr))
-
-#define sync()                                                          \
-        __asm__ __volatile(                                             \
-        "       .set    mips64\n\t              \n"                     \
-        "       sync                            \n"                     \
-        "       .set    mips0")
-
-#define mispredict()                                                    \
-        __asm__ __volatile__(                                           \
-        "       bnezl  $0, 1f           \n" /* Force mispredict */      \
-        "1:                             \n");
-
-/*
- * Writeback and invalidate the entire dcache
- */
-static inline void __sb1_writeback_inv_dcache_all(void)
-{
-        unsigned long addr = 0;
-
-        while (addr < dcache_line_size * dcache_sets) {
-                cache_set_op(Index_Writeback_Inv_D, addr);
-                addr += dcache_line_size;
-        }
-}
-
-/*
- * Writeback and invalidate a range of the dcache.  The addresses are
- * virtual, and since we're using index ops and bit 12 is part of both
- * the virtual frame and physical index, we have to clear both sets
- * (bit 12 set and cleared).
- */
-static inline void __sb1_writeback_inv_dcache_range(unsigned long start,
-        unsigned long end)
-{
-        unsigned long index;
-
-        start &= ~(dcache_line_size - 1);
-        end = (end + dcache_line_size - 1) & ~(dcache_line_size - 1);
-
-        while (start != end) {
-                index = start & dcache_index_mask;
-                cache_set_op(Index_Writeback_Inv_D, index);
-                cache_set_op(Index_Writeback_Inv_D, index ^ (1<<12));
-                start += dcache_line_size;
-        }
-        sync();
-}
-
-/*
- * Writeback and invalidate a range of the dcache.  With physical
- * addresseses, we don't have to worry about possible bit 12 aliasing.
- * XXXKW is it worth turning on KX and using hit ops with xkphys?
- */
-static inline void __sb1_writeback_inv_dcache_phys_range(unsigned long start,
-        unsigned long end)
-{
-        start &= ~(dcache_line_size - 1);
-        end = (end + dcache_line_size - 1) & ~(dcache_line_size - 1);
-
-        while (start != end) {
-                cache_set_op(Index_Writeback_Inv_D, start & dcache_index_mask);
-                start += dcache_line_size;
-        }
-        sync();
-}
-
-
-/*
- * Invalidate the entire icache
- */
-static inline void __sb1_flush_icache_all(void)
-{
-        unsigned long addr = 0;
-
-        while (addr < icache_line_size * icache_sets) {
-                cache_set_op(Index_Invalidate_I, addr);
-                addr += icache_line_size;
-        }
-}
-
-/*
- * Invalidate a range of the icache.  The addresses are virtual, and
- * the cache is virtually indexed and tagged.  However, we don't
- * necessarily have the right ASID context, so use index ops instead
- * of hit ops.
- */
-static inline void __sb1_flush_icache_range(unsigned long start,
-        unsigned long end)
-{
-        start &= ~(icache_line_size - 1);
-        end = (end + icache_line_size - 1) & ~(icache_line_size - 1);
-
-        while (start != end) {
-                cache_set_op(Index_Invalidate_I, start & icache_index_mask);
-                start += icache_line_size;
-        }
-        mispredict();
-        sync();
-}
-
-/*
- * Flush the icache for a given physical page.  Need to writeback the
- * dcache first, then invalidate the icache.  If the page isn't
- * executable, nothing is required.
- */
-static void local_sb1_flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn)
-{
-        int cpu = smp_processor_id();
-
-#ifndef CONFIG_SMP
-        if (!(vma->vm_flags & VM_EXEC))
-                return;
-#endif
-
-        __sb1_writeback_inv_dcache_range(addr, addr + PAGE_SIZE);
-
-        /*
-         * Bumping the ASID is probably cheaper than the flush ...
-         */
-        if (vma->vm_mm == current->active_mm) {
-                if (cpu_context(cpu, vma->vm_mm) != 0)
-                        drop_mmu_context(vma->vm_mm, cpu);
-        } else
-                __sb1_flush_icache_range(addr, addr + PAGE_SIZE);
-}
-
-#ifdef CONFIG_SMP
-struct flush_cache_page_args {
-        struct vm_area_struct *vma;
-        unsigned long addr;
-        unsigned long pfn;
-};
-
-static void sb1_flush_cache_page_ipi(void *info)
-{
-        struct flush_cache_page_args *args = info;
-
-        local_sb1_flush_cache_page(args->vma, args->addr, args->pfn);
-}
-
-/* Dirty dcache could be on another CPU, so do the IPIs */
-static void sb1_flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn)
-{
-        struct flush_cache_page_args args;
-
-        if (!(vma->vm_flags & VM_EXEC))
-                return;
-
-        addr &= PAGE_MASK;
-        args.vma = vma;
-        args.addr = addr;
-        args.pfn = pfn;
-        sb1_on_each_cpu(sb1_flush_cache_page_ipi, (void *) &args, 1, 1);
-}
-#else
-void sb1_flush_cache_page(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn)
-        __attribute__((alias("local_sb1_flush_cache_page")));
-#endif
-
-#ifdef CONFIG_SMP
-static void sb1_flush_cache_data_page_ipi(void *info)
-{
-        unsigned long start = (unsigned long)info;
-
-        __sb1_writeback_inv_dcache_range(start, start + PAGE_SIZE);
-}
-
-static void sb1_flush_cache_data_page(unsigned long addr)
-{
-        if (in_atomic())
-                __sb1_writeback_inv_dcache_range(addr, addr + PAGE_SIZE);
-        else
-                on_each_cpu(sb1_flush_cache_data_page_ipi, (void *) addr, 1, 1);
-}
-#else
-
-static void local_sb1_flush_cache_data_page(unsigned long addr)
-{
-        __sb1_writeback_inv_dcache_range(addr, addr + PAGE_SIZE);
-}
-
-void sb1_flush_cache_data_page(unsigned long)
-        __attribute__((alias("local_sb1_flush_cache_data_page")));
-#endif
-
-/*
- * Invalidate all caches on this CPU
- */
-static void __used local_sb1___flush_cache_all(void)
-{
-        __sb1_writeback_inv_dcache_all();
-        __sb1_flush_icache_all();
-}
-
-#ifdef CONFIG_SMP
-void sb1___flush_cache_all_ipi(void *ignored)
-        __attribute__((alias("local_sb1___flush_cache_all")));
-
-static void sb1___flush_cache_all(void)
-{
-        sb1_on_each_cpu(sb1___flush_cache_all_ipi, 0, 1, 1);
-}
-#else
-void sb1___flush_cache_all(void)
-        __attribute__((alias("local_sb1___flush_cache_all")));
-#endif
-
-/*
- * When flushing a range in the icache, we have to first writeback
- * the dcache for the same range, so new ifetches will see any
- * data that was dirty in the dcache.
- *
- * The start/end arguments are Kseg addresses (possibly mapped Kseg).
- */
-
-static void local_sb1_flush_icache_range(unsigned long start,
-        unsigned long end)
-{
-        /* Just wb-inv the whole dcache if the range is big enough */
-        if ((end - start) > dcache_range_cutoff)
-                __sb1_writeback_inv_dcache_all();
-        else
-                __sb1_writeback_inv_dcache_range(start, end);
-
-        /* Just flush the whole icache if the range is big enough */
-        if ((end - start) > icache_range_cutoff)
-                __sb1_flush_icache_all();
-        else
-                __sb1_flush_icache_range(start, end);
-}
-
-#ifdef CONFIG_SMP
-struct flush_icache_range_args {
-        unsigned long start;
-        unsigned long end;
-};
-
-static void sb1_flush_icache_range_ipi(void *info)
-{
-        struct flush_icache_range_args *args = info;
-
-        local_sb1_flush_icache_range(args->start, args->end);
-}
-
-void sb1_flush_icache_range(unsigned long start, unsigned long end)
-{
-        struct flush_icache_range_args args;
-
-        args.start = start;
-        args.end = end;
-        sb1_on_each_cpu(sb1_flush_icache_range_ipi, &args, 1, 1);
-}
-#else
-void sb1_flush_icache_range(unsigned long start, unsigned long end)
-        __attribute__((alias("local_sb1_flush_icache_range")));
-#endif
-
-/*
- * A signal trampoline must fit into a single cacheline.
- */
-static void local_sb1_flush_cache_sigtramp(unsigned long addr)
-{
-        cache_set_op(Index_Writeback_Inv_D, addr & dcache_index_mask);
-        cache_set_op(Index_Writeback_Inv_D, (addr ^ (1<<12)) & dcache_index_mask);
-        cache_set_op(Index_Invalidate_I, addr & icache_index_mask);
-        mispredict();
-}
-
-#ifdef CONFIG_SMP
-static void sb1_flush_cache_sigtramp_ipi(void *info)
-{
-        unsigned long iaddr = (unsigned long) info;
-        local_sb1_flush_cache_sigtramp(iaddr);
-}
-
-static void sb1_flush_cache_sigtramp(unsigned long addr)
-{
-        sb1_on_each_cpu(sb1_flush_cache_sigtramp_ipi, (void *) addr, 1, 1);
-}
-#else
-void sb1_flush_cache_sigtramp(unsigned long addr)
-        __attribute__((alias("local_sb1_flush_cache_sigtramp")));
-#endif
-
-
-/*
- * Anything that just flushes dcache state can be ignored, as we're always
- * coherent in dcache space.  This is just a dummy function that all the
- * nop'ed routines point to
- */
-static void sb1_nop(void)
-{
-}
-
-/*
- *  Cache set values (from the mips64 spec)
- * 0 - 64
- * 1 - 128
- * 2 - 256
- * 3 - 512
- * 4 - 1024
- * 5 - 2048
- * 6 - 4096
- * 7 - Reserved
- */
-
-static unsigned int decode_cache_sets(unsigned int config_field)
-{
-        if (config_field == 7) {
-                /* JDCXXX - Find a graceful way to abort. */
-                return 0;
-        }
-        return (1<<(config_field + 6));
-}
-
-/*
- *  Cache line size values (from the mips64 spec)
- * 0 - No cache present.
- * 1 - 4 bytes
- * 2 - 8 bytes
- * 3 - 16 bytes
- * 4 - 32 bytes
- * 5 - 64 bytes
- * 6 - 128 bytes
- * 7 - Reserved
- */
-
-static unsigned int decode_cache_line_size(unsigned int config_field)
-{
-        if (config_field == 0) {
-                return 0;
-        } else if (config_field == 7) {
-                /* JDCXXX - Find a graceful way to abort. */
-                return 0;
-        }
-        return (1<<(config_field + 1));
-}
-
-/*
- * Relevant bits of the config1 register format (from the MIPS32/MIPS64 specs)
- *
- * 24:22 Icache sets per way
- * 21:19 Icache line size
- * 18:16 Icache Associativity
- * 15:13 Dcache sets per way
- * 12:10 Dcache line size
- * 9:7   Dcache Associativity
- */
-
-static char *way_string[] = {
-        "direct mapped", "2-way", "3-way", "4-way",
-        "5-way", "6-way", "7-way", "8-way",
-};
-
-static __init void probe_cache_sizes(void)
-{
-        u32 config1;
-
-        config1 = read_c0_config1();
-        icache_line_size = decode_cache_line_size((config1 >> 19) & 0x7);
-        dcache_line_size = decode_cache_line_size((config1 >> 10) & 0x7);
-        icache_sets = decode_cache_sets((config1 >> 22) & 0x7);
-        dcache_sets = decode_cache_sets((config1 >> 13) & 0x7);
-        icache_assoc = ((config1 >> 16) & 0x7) + 1;
-        dcache_assoc = ((config1 >> 7) & 0x7) + 1;
-        icache_size = icache_line_size * icache_sets * icache_assoc;
-        dcache_size = dcache_line_size * dcache_sets * dcache_assoc;
-        /* Need to remove non-index bits for index ops */
-        icache_index_mask = (icache_sets - 1) * icache_line_size;
-        dcache_index_mask = (dcache_sets - 1) * dcache_line_size;
-        /*
-         * These are for choosing range (index ops) versus all.
-         * icache flushes all ways for each set, so drop icache_assoc.
-         * dcache flushes all ways and each setting of bit 12 for each
-         * index, so drop dcache_assoc and halve the dcache_sets.
-         */
-        icache_range_cutoff = icache_sets * icache_line_size;
-        dcache_range_cutoff = (dcache_sets / 2) * icache_line_size;
-
-        printk("Primary instruction cache %ldkB, %s, linesize %d bytes.\n",
-               icache_size >> 10, way_string[icache_assoc - 1],
-               icache_line_size);
-        printk("Primary data cache %ldkB, %s, linesize %d bytes.\n",
-               dcache_size >> 10, way_string[dcache_assoc - 1],
-               dcache_line_size);
-}
-
-/*
- * This is called from cache.c.  We have to set up all the
- * memory management function pointers, as well as initialize
- * the caches and tlbs
- */
-void __init sb1_cache_init(void)
-{
-        extern char except_vec2_sb1;
-
-        /* Special cache error handler for SB1 */
-        set_uncached_handler (0x100, &except_vec2_sb1, 0x80);
-
-        probe_cache_sizes();
-
-#ifdef CONFIG_SIBYTE_DMA_PAGEOPS
-        sb1_dma_init();
-#endif
-
-        /*
-         * None of these are needed for the SB1 - the Dcache is
-         * physically indexed and tagged, so no virtual aliasing can
-         * occur
-         */
-        flush_cache_range = (void *) sb1_nop;
-        flush_cache_mm = (void (*)(struct mm_struct *))sb1_nop;
-        flush_cache_all = sb1_nop;
-
-        /* These routines are for Icache coherence with the Dcache */
-        flush_icache_range = sb1_flush_icache_range;
-        flush_icache_all = __sb1_flush_icache_all; /* local only */
-
-        /* This implies an Icache flush too, so can't be nop'ed */
-        flush_cache_page = sb1_flush_cache_page;
-
-        flush_cache_sigtramp = sb1_flush_cache_sigtramp;
-        local_flush_data_cache_page = (void *) sb1_nop;
-        flush_data_cache_page = sb1_flush_cache_data_page;
-
-        /* Full flush */
-        __flush_cache_all = sb1___flush_cache_all;
-
-        change_c0_config(CONF_CM_CMASK, CONF_CM_DEFAULT);
-
-        /*
-         * This is the only way to force the update of K0 to complete
-         * before subsequent instruction fetch.
-         */
-        __asm__ __volatile__(
-                ".set   push                    \n"
-        "       .set    noat                    \n"
-        "       .set    noreorder               \n"
-        "       .set    mips3                   \n"
-        "       " STR(PTR_LA) " $1, 1f          \n"
-        "       " STR(MTC0) "   $1, $14         \n"
-        "       eret                            \n"
-        "1:     .set    pop"
-        :
-        :
-        : "memory");
-
-        local_sb1___flush_cache_all();
-}
diff --git a/arch/mips/mm/c-tx39.c b/arch/mips/mm/c-tx39.c
index 560a6de96556..9ea121e8cdce 100644
--- a/arch/mips/mm/c-tx39.c
+++ b/arch/mips/mm/c-tx39.c
@@ -69,7 +69,7 @@ static void tx39h_dma_cache_wback_inv(unsigned long addr, unsigned long size)
 /* TX39H2,TX39H3 */
 static inline void tx39_blast_dcache_page(unsigned long addr)
 {
-        if (current_cpu_data.cputype != CPU_TX3912)
+        if (current_cpu_type() != CPU_TX3912)
                 blast_dcache16_page(addr);
 }
 
@@ -307,7 +307,7 @@ static __init void tx39_probe_cache(void)
                                   TX39_CONF_DCS_SHIFT));
 
         current_cpu_data.icache.linesz = 16;
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_TX3912:
                 current_cpu_data.icache.ways = 1;
                 current_cpu_data.dcache.ways = 1;
@@ -341,7 +341,7 @@ void __init tx39_cache_init(void)
 
         tx39_probe_cache();
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_TX3912:
                 /* TX39/H core (writethru direct-map cache) */
                 flush_cache_all = tx39h_flush_icache_all;
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 81f925a9a731..43dde874f414 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -3,13 +3,14 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1994 - 2003, 07 by Ralf Baechle (ralf@linux-mips.org)
+ * Copyright (C) 1994 - 2003, 06, 07 by Ralf Baechle (ralf@linux-mips.org)
  * Copyright (C) 2007 MIPS Technologies, Inc.
  */
 #include <linux/fs.h>
 #include <linux/fcntl.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/linkage.h>
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -157,12 +158,6 @@ void __init cpu_cache_init(void)
                 tx39_cache_init();
                 return;
         }
-        if (cpu_has_sb1_cache) {
-                extern void __weak sb1_cache_init(void);
-
-                sb1_cache_init();
-                return;
-        }
 
         panic(cache_panic);
 }
diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c
index 4c72e650f9b6..e7f539e3284b 100644
--- a/arch/mips/mm/cerr-sb1.c
+++ b/arch/mips/mm/cerr-sb1.c
@@ -271,14 +271,22 @@ asmlinkage void sb1_cache_error(void)
 
 /* Parity lookup table. */
 static const uint8_t parity[256] = {
-        0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,
-        1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,
-        1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,
-        0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,
-        1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,
-        0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,
-        0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0,1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,
-        1,0,0,1,0,1,1,0,0,1,1,0,1,0,0,1,0,1,1,0,1,0,0,1,1,0,0,1,0,1,1,0
+        0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+        1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+        1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+        0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+        1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+        0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+        0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+        1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+        1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+        0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+        0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+        1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+        0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+        1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+        1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+        0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0
 };
 
 /* Masks to select bits for Hamming parity, mask_72_64[i] for bit[i] */
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index f60b3dc0fc62..98b5e5bac02e 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -35,8 +35,8 @@ static inline unsigned long dma_addr_to_virt(dma_addr_t dma_addr)
 static inline int cpu_is_noncoherent_r10000(struct device *dev)
 {
         return !plat_device_is_coherent(dev) &&
-               (current_cpu_data.cputype == CPU_R10000 ||
-               current_cpu_data.cputype == CPU_R12000);
+               (current_cpu_type() == CPU_R10000 ||
+               current_cpu_type() == CPU_R12000);
 }
 
 void *dma_alloc_noncoherent(struct device *dev, size_t size,
diff --git a/arch/mips/mm/pg-r4k.c b/arch/mips/mm/pg-r4k.c
index e47e9e9486bf..4f770ac885ce 100644
--- a/arch/mips/mm/pg-r4k.c
+++ b/arch/mips/mm/pg-r4k.c
@@ -347,13 +347,14 @@ void __init build_clear_page(void)
 {
         unsigned int loop_start;
         unsigned long off;
+        int i;
 
         epc = (unsigned int *) &clear_page_array;
         instruction_pending = 0;
         store_offset = 0;
 
         if (cpu_has_prefetch) {
-                switch (current_cpu_data.cputype) {
+                switch (current_cpu_type()) {
                 case CPU_TX49XX:
                         /* TX49 supports only Pref_Load */
                         pref_offset_clear = 0;
@@ -434,12 +435,22 @@ dest = label();
         build_jr_ra();
 
         BUG_ON(epc > clear_page_array + ARRAY_SIZE(clear_page_array));
+
+        pr_info("Synthesized clear page handler (%u instructions).\n",
+                (unsigned int)(epc - clear_page_array));
+
+        pr_debug("\t.set push\n");
+        pr_debug("\t.set noreorder\n");
+        for (i = 0; i < (epc - clear_page_array); i++)
+                pr_debug("\t.word 0x%08x\n", clear_page_array[i]);
+        pr_debug("\t.set pop\n");
 }
 
 void __init build_copy_page(void)
 {
         unsigned int loop_start;
         unsigned long off;
+        int i;
 
         epc = (unsigned int *) &copy_page_array;
         store_offset = load_offset = 0;
@@ -515,4 +526,13 @@ dest = label();
         build_jr_ra();
 
         BUG_ON(epc > copy_page_array + ARRAY_SIZE(copy_page_array));
+
+        pr_info("Synthesized copy page handler (%u instructions).\n",
+                (unsigned int)(epc - copy_page_array));
+
+        pr_debug("\t.set push\n");
+        pr_debug("\t.set noreorder\n");
+        for (i = 0; i < (epc - copy_page_array); i++)
+                pr_debug("\t.word 0x%08x\n", copy_page_array[i]);
+        pr_debug("\t.set pop\n");
 }
diff --git a/arch/mips/mm/pg-sb1.c b/arch/mips/mm/pg-sb1.c
index adb37d0a30ea..a3e98c243a89 100644
--- a/arch/mips/mm/pg-sb1.c
+++ b/arch/mips/mm/pg-sb1.c
@@ -188,9 +188,9 @@ static inline void copy_page_cpu(void *to, void *from)
         : "+r" (src), "+r" (dst)
         : "r" (end)
 #ifdef CONFIG_64BIT
-        : "$8","$9","$10","$11","memory");
+        : "$8", "$9", "$10", "$11", "memory");
 #else
-        : "$2","$3","$6","$7","$8","$9","$10","$11","memory");
+        : "$2", "$3", "$6", "$7", "$8", "$9", "$10", "$11", "memory");
 #endif
 }
 
@@ -292,3 +292,11 @@ void copy_page(void *to, void *from)
 
 EXPORT_SYMBOL(clear_page);
 EXPORT_SYMBOL(copy_page);
+
+void __init build_clear_page(void)
+{
+}
+
+void __init build_copy_page(void)
+{
+}
diff --git a/arch/mips/mm/pgtable.c b/arch/mips/mm/pgtable.c
index c93aa6cbcaca..57df1c38e303 100644
--- a/arch/mips/mm/pgtable.c
+++ b/arch/mips/mm/pgtable.c
@@ -29,9 +29,9 @@ void show_mem(void)
                         shared += page_count(page) - 1;
         }
         printk("%d pages of RAM\n", total);
-        printk("%d pages of HIGHMEM\n",highmem);
-        printk("%d reserved pages\n",reserved);
-        printk("%d pages shared\n",shared);
-        printk("%d pages swap cached\n",cached);
+        printk("%d pages of HIGHMEM\n", highmem);
+        printk("%d reserved pages\n", reserved);
+        printk("%d pages shared\n", shared);
+        printk("%d pages swap cached\n", cached);
 #endif
 }
diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c
index 42b50964c644..c13170bc675c 100644
--- a/arch/mips/mm/sc-mips.c
+++ b/arch/mips/mm/sc-mips.c
@@ -102,7 +102,7 @@ static inline int __init mips_sc_probe(void)
 
 int __init mips_sc_init(void)
 {
-        int found = mips_sc_probe ();
+        int found = mips_sc_probe();
         if (found) {
                 mips_sc_enable();
                 bcops = &mips_sc_ops;
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index dcd6913dc1ff..74ae0348cc92 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -491,7 +491,7 @@ void __init tlb_init(void)
                         int wired = current_cpu_data.tlbsize - ntlb;
                         write_c0_wired(wired);
                         write_c0_index(wired-1);
-                        printk ("Restricting TLB to %d entries\n", ntlb);
+                        printk("Restricting TLB to %d entries\n", ntlb);
                 } else
                         printk("Ignoring invalid argument ntlb=%d\n", ntlb);
         }
diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c
index 266a47d65eed..bd8409d8ff62 100644
--- a/arch/mips/mm/tlb-r8k.c
+++ b/arch/mips/mm/tlb-r8k.c
@@ -56,7 +56,7 @@ void local_flush_tlb_mm(struct mm_struct *mm)
         int cpu = smp_processor_id();
 
         if (cpu_context(cpu, mm) != 0)
-                drop_mmu_context(mm,cpu);
+                drop_mmu_context(mm, cpu);
 }
 
 void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 6c425b052442..01b0961acfb6 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -35,24 +35,24 @@
 #include <asm/smp.h>
 #include <asm/war.h>
 
-static __init int __maybe_unused r45k_bvahwbug(void)
+static inline int r45k_bvahwbug(void)
 {
         /* XXX: We should probe for the presence of this bug, but we don't. */
         return 0;
 }
 
-static __init int __maybe_unused r4k_250MHZhwbug(void)
+static inline int r4k_250MHZhwbug(void)
 {
         /* XXX: We should probe for the presence of this bug, but we don't. */
         return 0;
 }
 
-static __init int __maybe_unused bcm1250_m3_war(void)
+static inline int __maybe_unused bcm1250_m3_war(void)
 {
         return BCM1250_M3_WAR;
 }
 
-static __init int __maybe_unused r10000_llsc_war(void)
+static inline int __maybe_unused r10000_llsc_war(void)
 {
         return R10000_LLSC_WAR;
 }
@@ -66,7 +66,7 @@ static __init int __maybe_unused r10000_llsc_war(void)
  * why; it's not an issue caused by the core RTL.
  *
  */
-static __init int __attribute__((unused)) m4kc_tlbp_war(void)
+static int __init m4kc_tlbp_war(void)
 {
         return (current_cpu_data.processor_id & 0xffff00) ==
                (PRID_COMP_MIPS | PRID_IMP_4KC);
@@ -140,60 +140,60 @@ struct insn {
          | (e) << RE_SH                                         \
          | (f) << FUNC_SH)
 
-static __initdata struct insn insn_table[] = {
-        { insn_addiu, M(addiu_op,0,0,0,0,0), RS | RT | SIMM },
-        { insn_addu, M(spec_op,0,0,0,0,addu_op), RS | RT | RD },
-        { insn_and, M(spec_op,0,0,0,0,and_op), RS | RT | RD },
-        { insn_andi, M(andi_op,0,0,0,0,0), RS | RT | UIMM },
-        { insn_beq, M(beq_op,0,0,0,0,0), RS | RT | BIMM },
-        { insn_beql, M(beql_op,0,0,0,0,0), RS | RT | BIMM },
-        { insn_bgez, M(bcond_op,0,bgez_op,0,0,0), RS | BIMM },
-        { insn_bgezl, M(bcond_op,0,bgezl_op,0,0,0), RS | BIMM },
-        { insn_bltz, M(bcond_op,0,bltz_op,0,0,0), RS | BIMM },
-        { insn_bltzl, M(bcond_op,0,bltzl_op,0,0,0), RS | BIMM },
-        { insn_bne, M(bne_op,0,0,0,0,0), RS | RT | BIMM },
-        { insn_daddiu, M(daddiu_op,0,0,0,0,0), RS | RT | SIMM },
-        { insn_daddu, M(spec_op,0,0,0,0,daddu_op), RS | RT | RD },
-        { insn_dmfc0, M(cop0_op,dmfc_op,0,0,0,0), RT | RD | SET},
-        { insn_dmtc0, M(cop0_op,dmtc_op,0,0,0,0), RT | RD | SET},
-        { insn_dsll, M(spec_op,0,0,0,0,dsll_op), RT | RD | RE },
-        { insn_dsll32, M(spec_op,0,0,0,0,dsll32_op), RT | RD | RE },
-        { insn_dsra, M(spec_op,0,0,0,0,dsra_op), RT | RD | RE },
-        { insn_dsrl, M(spec_op,0,0,0,0,dsrl_op), RT | RD | RE },
-        { insn_dsrl32, M(spec_op,0,0,0,0,dsrl32_op), RT | RD | RE },
-        { insn_dsubu, M(spec_op,0,0,0,0,dsubu_op), RS | RT | RD },
-        { insn_eret, M(cop0_op,cop_op,0,0,0,eret_op), 0 },
-        { insn_j, M(j_op,0,0,0,0,0), JIMM },
-        { insn_jal, M(jal_op,0,0,0,0,0), JIMM },
-        { insn_jr, M(spec_op,0,0,0,0,jr_op), RS },
-        { insn_ld, M(ld_op,0,0,0,0,0), RS | RT | SIMM },
-        { insn_ll, M(ll_op,0,0,0,0,0), RS | RT | SIMM },
-        { insn_lld, M(lld_op,0,0,0,0,0), RS | RT | SIMM },
-        { insn_lui, M(lui_op,0,0,0,0,0), RT | SIMM },
-        { insn_lw, M(lw_op,0,0,0,0,0), RS | RT | SIMM },
-        { insn_mfc0, M(cop0_op,mfc_op,0,0,0,0), RT | RD | SET},
-        { insn_mtc0, M(cop0_op,mtc_op,0,0,0,0), RT | RD | SET},
-        { insn_ori, M(ori_op,0,0,0,0,0), RS | RT | UIMM },
-        { insn_rfe, M(cop0_op,cop_op,0,0,0,rfe_op), 0 },
-        { insn_sc, M(sc_op,0,0,0,0,0), RS | RT | SIMM },
-        { insn_scd, M(scd_op,0,0,0,0,0), RS | RT | SIMM },
-        { insn_sd, M(sd_op,0,0,0,0,0), RS | RT | SIMM },
-        { insn_sll, M(spec_op,0,0,0,0,sll_op), RT | RD | RE },
-        { insn_sra, M(spec_op,0,0,0,0,sra_op), RT | RD | RE },
-        { insn_srl, M(spec_op,0,0,0,0,srl_op), RT | RD | RE },
-        { insn_subu, M(spec_op,0,0,0,0,subu_op), RS | RT | RD },
-        { insn_sw, M(sw_op,0,0,0,0,0), RS | RT | SIMM },
-        { insn_tlbp, M(cop0_op,cop_op,0,0,0,tlbp_op), 0 },
-        { insn_tlbwi, M(cop0_op,cop_op,0,0,0,tlbwi_op), 0 },
-        { insn_tlbwr, M(cop0_op,cop_op,0,0,0,tlbwr_op), 0 },
-        { insn_xor, M(spec_op,0,0,0,0,xor_op), RS | RT | RD },
-        { insn_xori, M(xori_op,0,0,0,0,0), RS | RT | UIMM },
+static struct insn insn_table[] __initdata = {
+        { insn_addiu, M(addiu_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
+        { insn_addu, M(spec_op, 0, 0, 0, 0, addu_op), RS | RT | RD },
+        { insn_and, M(spec_op, 0, 0, 0, 0, and_op), RS | RT | RD },
+        { insn_andi, M(andi_op, 0, 0, 0, 0, 0), RS | RT | UIMM },
+        { insn_beq, M(beq_op, 0, 0, 0, 0, 0), RS | RT | BIMM },
+        { insn_beql, M(beql_op, 0, 0, 0, 0, 0), RS | RT | BIMM },
+        { insn_bgez, M(bcond_op, 0, bgez_op, 0, 0, 0), RS | BIMM },
+        { insn_bgezl, M(bcond_op, 0, bgezl_op, 0, 0, 0), RS | BIMM },
+        { insn_bltz, M(bcond_op, 0, bltz_op, 0, 0, 0), RS | BIMM },
+        { insn_bltzl, M(bcond_op, 0, bltzl_op, 0, 0, 0), RS | BIMM },
+        { insn_bne, M(bne_op, 0, 0, 0, 0, 0), RS | RT | BIMM },
+        { insn_daddiu, M(daddiu_op, 0, 0, 0, 0, 0), RS | RT | SIMM },
+        { insn_daddu, M(spec_op, 0, 0, 0, 0, daddu_op), RS | RT | RD },
+        { insn_dmfc0, M(cop0_op, dmfc_op, 0, 0, 0, 0), RT | RD | SET},
+        { insn_dmtc0, M(cop0_op, dmtc_op, 0, 0, 0, 0), RT | RD | SET},
+        { insn_dsll, M(spec_op, 0, 0, 0, 0, dsll_op), RT | RD | RE },
+        { insn_dsll32, M(spec_op, 0, 0, 0, 0, dsll32_op), RT | RD | RE },
+        { insn_dsra, M(spec_op, 0, 0, 0, 0, dsra_op), RT | RD | RE },
+        { insn_dsrl, M(spec_op, 0, 0, 0, 0, dsrl_op), RT | RD | RE },
+        { insn_dsrl32, M(spec_op, 0, 0, 0, 0, dsrl32_op), RT | RD | RE },
+        { insn_dsubu, M(spec_op, 0, 0, 0, 0, dsubu_op), RS | RT | RD },
+        { insn_eret,  M(cop0_op, cop_op, 0, 0, 0, eret_op),  0 },
+        { insn_j,  M(j_op, 0, 0, 0, 0, 0),  JIMM },
+        { insn_jal,  M(jal_op, 0, 0, 0, 0, 0),  JIMM },
+        { insn_jr,  M(spec_op, 0, 0, 0, 0, jr_op),  RS },
+        { insn_ld,  M(ld_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
+        { insn_ll,  M(ll_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
+        { insn_lld,  M(lld_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
+        { insn_lui,  M(lui_op, 0, 0, 0, 0, 0),  RT | SIMM },
+        { insn_lw,  M(lw_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
+        { insn_mfc0,  M(cop0_op, mfc_op, 0, 0, 0, 0),  RT | RD | SET},
+        { insn_mtc0,  M(cop0_op, mtc_op, 0, 0, 0, 0),  RT | RD | SET},
+        { insn_ori,  M(ori_op, 0, 0, 0, 0, 0),  RS | RT | UIMM },
+        { insn_rfe,  M(cop0_op, cop_op, 0, 0, 0, rfe_op),  0 },
+        { insn_sc,  M(sc_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
+        { insn_scd,  M(scd_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
+        { insn_sd,  M(sd_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
+        { insn_sll,  M(spec_op, 0, 0, 0, 0, sll_op),  RT | RD | RE },
+        { insn_sra,  M(spec_op, 0, 0, 0, 0, sra_op),  RT | RD | RE },
+        { insn_srl,  M(spec_op, 0, 0, 0, 0, srl_op),  RT | RD | RE },
+        { insn_subu,  M(spec_op, 0, 0, 0, 0, subu_op),  RS | RT | RD },
+        { insn_sw,  M(sw_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
+        { insn_tlbp,  M(cop0_op, cop_op, 0, 0, 0, tlbp_op),  0 },
+        { insn_tlbwi,  M(cop0_op, cop_op, 0, 0, 0, tlbwi_op),  0 },
+        { insn_tlbwr,  M(cop0_op, cop_op, 0, 0, 0, tlbwr_op),  0 },
+        { insn_xor,  M(spec_op, 0, 0, 0, 0, xor_op),  RS | RT | RD },
+        { insn_xori,  M(xori_op, 0, 0, 0, 0, 0),  RS | RT | UIMM },
         { insn_invalid, 0, 0 }
 };
 
 #undef M
 
-static __init u32 build_rs(u32 arg)
+static u32 __init build_rs(u32 arg)
 {
         if (arg & ~RS_MASK)
                 printk(KERN_WARNING "TLB synthesizer field overflow\n");
@@ -201,7 +201,7 @@ static __init u32 build_rs(u32 arg)
         return (arg & RS_MASK) << RS_SH;
 }
 
-static __init u32 build_rt(u32 arg)
+static u32 __init build_rt(u32 arg)
 {
         if (arg & ~RT_MASK)
                 printk(KERN_WARNING "TLB synthesizer field overflow\n");
@@ -209,7 +209,7 @@ static __init u32 build_rt(u32 arg)
         return (arg & RT_MASK) << RT_SH;
 }
 
-static __init u32 build_rd(u32 arg)
+static u32 __init build_rd(u32 arg)
 {
         if (arg & ~RD_MASK)
                 printk(KERN_WARNING "TLB synthesizer field overflow\n");
@@ -217,7 +217,7 @@ static __init u32 build_rd(u32 arg)
         return (arg & RD_MASK) << RD_SH;
 }
 
-static __init u32 build_re(u32 arg)
+static u32 __init build_re(u32 arg)
 {
         if (arg & ~RE_MASK)
                 printk(KERN_WARNING "TLB synthesizer field overflow\n");
@@ -225,7 +225,7 @@ static __init u32 build_re(u32 arg)
         return (arg & RE_MASK) << RE_SH;
 }
 
-static __init u32 build_simm(s32 arg)
+static u32 __init build_simm(s32 arg)
 {
         if (arg > 0x7fff || arg < -0x8000)
                 printk(KERN_WARNING "TLB synthesizer field overflow\n");
@@ -233,7 +233,7 @@ static __init u32 build_simm(s32 arg)
         return arg & 0xffff;
 }
 
-static __init u32 build_uimm(u32 arg)
+static u32 __init build_uimm(u32 arg)
 {
         if (arg & ~IMM_MASK)
                 printk(KERN_WARNING "TLB synthesizer field overflow\n");
@@ -241,7 +241,7 @@ static __init u32 build_uimm(u32 arg)
         return arg & IMM_MASK;
 }
 
-static __init u32 build_bimm(s32 arg)
+static u32 __init build_bimm(s32 arg)
 {
         if (arg > 0x1ffff || arg < -0x20000)
                 printk(KERN_WARNING "TLB synthesizer field overflow\n");
@@ -252,7 +252,7 @@ static __init u32 build_bimm(s32 arg)
         return ((arg < 0) ? (1 << 15) : 0) | ((arg >> 2) & 0x7fff);
 }
 
-static __init u32 build_jimm(u32 arg)
+static u32 __init build_jimm(u32 arg)
 {
         if (arg & ~((JIMM_MASK) << 2))
                 printk(KERN_WARNING "TLB synthesizer field overflow\n");
@@ -260,7 +260,7 @@ static __init u32 build_jimm(u32 arg)
         return (arg >> 2) & JIMM_MASK;
 }
 
-static __init u32 build_func(u32 arg)
+static u32 __init build_func(u32 arg)
 {
         if (arg & ~FUNC_MASK)
                 printk(KERN_WARNING "TLB synthesizer field overflow\n");
@@ -268,7 +268,7 @@ static __init u32 build_func(u32 arg)
         return arg & FUNC_MASK;
 }
 
-static __init u32 build_set(u32 arg)
+static u32 __init build_set(u32 arg)
 {
         if (arg & ~SET_MASK)
                 printk(KERN_WARNING "TLB synthesizer field overflow\n");
@@ -315,69 +315,69 @@ static void __init build_insn(u32 **buf, enum opcode opc, ...)
 }
 
 #define I_u1u2u3(op)                                            \
-        static inline void __init i##op(u32 **buf, unsigned int a,      \
+        static inline void i##op(u32 **buf, unsigned int a,     \
                 unsigned int b, unsigned int c)                 \
         {                                                       \
                 build_insn(buf, insn##op, a, b, c);             \
         }
 
 #define I_u2u1u3(op)                                            \
-        static inline void __init i##op(u32 **buf, unsigned int a,      \
+        static inline void i##op(u32 **buf, unsigned int a,     \
                 unsigned int b, unsigned int c)                 \
         {                                                       \
                 build_insn(buf, insn##op, b, a, c);             \
         }
 
 #define I_u3u1u2(op)                                            \
-        static inline void __init i##op(u32 **buf, unsigned int a,      \
+        static inline void i##op(u32 **buf, unsigned int a,     \
                 unsigned int b, unsigned int c)                 \
         {                                                       \
                 build_insn(buf, insn##op, b, c, a);             \
         }
 
 #define I_u1u2s3(op)                                            \
-        static inline void __init i##op(u32 **buf, unsigned int a,      \
+        static inline void i##op(u32 **buf, unsigned int a,     \
                 unsigned int b, signed int c)                   \
         {                                                       \
                 build_insn(buf, insn##op, a, b, c);             \
         }
 
 #define I_u2s3u1(op)                                            \
-        static inline void __init i##op(u32 **buf, unsigned int a,      \
+        static inline void i##op(u32 **buf, unsigned int a,     \
                 signed int b, unsigned int c)                   \
         {                                                       \
                 build_insn(buf, insn##op, c, a, b);             \
         }
 
 #define I_u2u1s3(op)                                            \
-        static inline void __init i##op(u32 **buf, unsigned int a,      \
+        static inline void i##op(u32 **buf, unsigned int a,     \
                 unsigned int b, signed int c)                   \
         {                                                       \
                 build_insn(buf, insn##op, b, a, c);             \
         }
 
 #define I_u1u2(op)                                              \
-        static inline void __init i##op(u32 **buf, unsigned int a,      \
+        static inline void i##op(u32 **buf, unsigned int a,     \
                 unsigned int b)                                 \
         {                                                       \
                 build_insn(buf, insn##op, a, b);                \
         }
 
 #define I_u1s2(op)                                              \
-        static inline void __init i##op(u32 **buf, unsigned int a,      \
+        static inline void i##op(u32 **buf, unsigned int a,     \
                 signed int b)                                   \
         {                                                       \
                 build_insn(buf, insn##op, a, b);                \
         }
 
 #define I_u1(op)                                                \
-        static inline void __init i##op(u32 **buf, unsigned int a)      \
+        static inline void i##op(u32 **buf, unsigned int a)     \
         {                                                       \
                 build_insn(buf, insn##op, a);                   \
         }
 
 #define I_0(op)                                                 \
-        static inline void __init i##op(u32 **buf)              \
+        static inline void i##op(u32 **buf)             \
         {                                                       \
                 build_insn(buf, insn##op);                      \
         }
@@ -457,7 +457,7 @@ struct label {
         enum label_id lab;
 };
 
-static __init void build_label(struct label **lab, u32 *addr,
+static void __init build_label(struct label **lab, u32 *addr,
                                enum label_id l)
 {
         (*lab)->addr = addr;
@@ -526,34 +526,34 @@ L_LA(_r3000_write_probe_fail)
 #define i_ehb(buf) i_sll(buf, 0, 0, 3)
 
 #ifdef CONFIG_64BIT
-static __init int __maybe_unused in_compat_space_p(long addr)
+static int __init __maybe_unused in_compat_space_p(long addr)
 {
         /* Is this address in 32bit compat space? */
         return (((addr) & 0xffffffff00000000L) == 0xffffffff00000000L);
 }
 
-static __init int __maybe_unused rel_highest(long val)
+static int __init __maybe_unused rel_highest(long val)
 {
         return ((((val + 0x800080008000L) >> 48) & 0xffff) ^ 0x8000) - 0x8000;
 }
 
-static __init int __maybe_unused rel_higher(long val)
+static int __init __maybe_unused rel_higher(long val)
 {
         return ((((val + 0x80008000L) >> 32) & 0xffff) ^ 0x8000) - 0x8000;
 }
 #endif
 
-static __init int rel_hi(long val)
+static int __init rel_hi(long val)
 {
         return ((((val + 0x8000L) >> 16) & 0xffff) ^ 0x8000) - 0x8000;
 }
 
-static __init int rel_lo(long val)
+static int __init rel_lo(long val)
 {
         return ((val & 0xffff) ^ 0x8000) - 0x8000;
 }
 
-static __init void i_LA_mostly(u32 **buf, unsigned int rs, long addr)
+static void __init i_LA_mostly(u32 **buf, unsigned int rs, long addr)
 {
 #ifdef CONFIG_64BIT
         if (!in_compat_space_p(addr)) {
@@ -571,7 +571,7 @@ static __init void i_LA_mostly(u32 **buf, unsigned int rs, long addr)
                 i_lui(buf, rs, rel_hi(addr));
 }
 
-static __init void __maybe_unused i_LA(u32 **buf, unsigned int rs,
+static void __init __maybe_unused i_LA(u32 **buf, unsigned int rs,
                                              long addr)
 {
         i_LA_mostly(buf, rs, addr);
@@ -589,7 +589,7 @@ struct reloc {
         enum label_id lab;
 };
 
-static __init void r_mips_pc16(struct reloc **rel, u32 *addr,
+static void __init r_mips_pc16(struct reloc **rel, u32 *addr,
                                enum label_id l)
 {
         (*rel)->addr = addr;
@@ -614,7 +614,7 @@ static inline void __resolve_relocs(struct reloc *rel, struct label *lab)
         }
 }
 
-static __init void resolve_relocs(struct reloc *rel, struct label *lab)
+static void __init resolve_relocs(struct reloc *rel, struct label *lab)
 {
         struct label *l;
 
@@ -624,7 +624,7 @@ static __init void resolve_relocs(struct reloc *rel, struct label *lab)
                                 __resolve_relocs(rel, l);
 }
 
-static __init void move_relocs(struct reloc *rel, u32 *first, u32 *end,
+static void __init move_relocs(struct reloc *rel, u32 *first, u32 *end,
                                long off)
 {
         for (; rel->lab != label_invalid; rel++)
@@ -632,7 +632,7 @@ static __init void move_relocs(struct reloc *rel, u32 *first, u32 *end,
                         rel->addr += off;
 }
 
-static __init void move_labels(struct label *lab, u32 *first, u32 *end,
+static void __init move_labels(struct label *lab, u32 *first, u32 *end,
                                long off)
 {
         for (; lab->lab != label_invalid; lab++)
@@ -640,7 +640,7 @@ static __init void move_labels(struct label *lab, u32 *first, u32 *end,
                         lab->addr += off;
 }
 
-static __init void copy_handler(struct reloc *rel, struct label *lab,
+static void __init copy_handler(struct reloc *rel, struct label *lab,
                                 u32 *first, u32 *end, u32 *target)
 {
         long off = (long)(target - first);
@@ -651,7 +651,7 @@ static __init void copy_handler(struct reloc *rel, struct label *lab,
         move_labels(lab, first, end, off);
 }
 
-static __init int __maybe_unused insn_has_bdelay(struct reloc *rel,
+static int __init __maybe_unused insn_has_bdelay(struct reloc *rel,
                                                        u32 *addr)
 {
         for (; rel->lab != label_invalid; rel++) {
@@ -743,11 +743,11 @@ il_bgez(u32 **p, struct reloc **r, unsigned int reg, enum label_id l)
  * We deliberately chose a buffer size of 128, so we won't scribble
  * over anything important on overflow before we panic.
  */
-static __initdata u32 tlb_handler[128];
+static u32 tlb_handler[128] __initdata;
 
 /* simply assume worst case size for labels and relocs */
-static __initdata struct label labels[128];
-static __initdata struct reloc relocs[128];
+static struct label labels[128] __initdata;
+static struct reloc relocs[128] __initdata;
 
 /*
  * The R3000 TLB handler is simple.
@@ -801,7 +801,7 @@ static void __init build_r3000_tlb_refill_handler(void)
  * other one.To keep things simple, we first assume linear space,
  * then we relocate it to the final handler layout as needed.
  */
-static __initdata u32 final_handler[64];
+static u32 final_handler[64] __initdata;
 
 /*
  * Hazards
@@ -825,9 +825,9 @@ static __initdata u32 final_handler[64];
  *
  * As if we MIPS hackers wouldn't know how to nop pipelines happy ...
  */
-static __init void __maybe_unused build_tlb_probe_entry(u32 **p)
+static void __init __maybe_unused build_tlb_probe_entry(u32 **p)
 {
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         /* Found by experiment: R4600 v2.0 needs this, too.  */
         case CPU_R4600:
         case CPU_R5000:
@@ -849,7 +849,7 @@ static __init void __maybe_unused build_tlb_probe_entry(u32 **p)
  */
 enum tlb_write_entry { tlb_random, tlb_indexed };
 
-static __init void build_tlb_write_entry(u32 **p, struct label **l,
+static void __init build_tlb_write_entry(u32 **p, struct label **l,
                                          struct reloc **r,
                                          enum tlb_write_entry wmode)
 {
@@ -860,7 +860,7 @@ static __init void build_tlb_write_entry(u32 **p, struct label **l,
         case tlb_indexed: tlbw = i_tlbwi; break;
         }
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_R4000PC:
         case CPU_R4000SC:
         case CPU_R4000MC:
@@ -908,6 +908,8 @@ static __init void build_tlb_write_entry(u32 **p, struct label **l,
         case CPU_4KSC:
         case CPU_20KC:
         case CPU_25KF:
+        case CPU_BCM3302:
+        case CPU_BCM4710:
         case CPU_LOONGSON2:
                 if (m4kc_tlbp_war())
                         i_nop(p);
@@ -991,7 +993,7 @@ static __init void build_tlb_write_entry(u32 **p, struct label **l,
  * TMP and PTR are scratch.
  * TMP will be clobbered, PTR will hold the pmd entry.
  */
-static __init void
+static void __init
 build_get_pmde64(u32 **p, struct label **l, struct reloc **r,
                  unsigned int tmp, unsigned int ptr)
 {
@@ -1052,7 +1054,7 @@ build_get_pmde64(u32 **p, struct label **l, struct reloc **r,
  * BVADDR is the faulting address, PTR is scratch.
  * PTR will hold the pgd for vmalloc.
  */
-static __init void
+static void __init
 build_get_pgd_vmalloc64(u32 **p, struct label **l, struct reloc **r,
                         unsigned int bvaddr, unsigned int ptr)
 {
@@ -1116,7 +1118,7 @@ build_get_pgd_vmalloc64(u32 **p, struct label **l, struct reloc **r,
  * TMP and PTR are scratch.
  * TMP will be clobbered, PTR will hold the pgd entry.
  */
-static __init void __maybe_unused
+static void __init __maybe_unused
 build_get_pgde32(u32 **p, unsigned int tmp, unsigned int ptr)
 {
         long pgdc = (long)pgd_current;
@@ -1151,12 +1153,12 @@ build_get_pgde32(u32 **p, unsigned int tmp, unsigned int ptr)
 
 #endif /* !CONFIG_64BIT */
 
-static __init void build_adjust_context(u32 **p, unsigned int ctx)
+static void __init build_adjust_context(u32 **p, unsigned int ctx)
 {
         unsigned int shift = 4 - (PTE_T_LOG2 + 1) + PAGE_SHIFT - 12;
         unsigned int mask = (PTRS_PER_PTE / 2 - 1) << (PTE_T_LOG2 + 1);
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR41XX:
         case CPU_VR4111:
         case CPU_VR4121:
@@ -1177,7 +1179,7 @@ static __init void build_adjust_context(u32 **p, unsigned int ctx)
         i_andi(p, ctx, ctx, mask);
 }
 
-static __init void build_get_ptep(u32 **p, unsigned int tmp, unsigned int ptr)
+static void __init build_get_ptep(u32 **p, unsigned int tmp, unsigned int ptr)
 {
         /*
          * Bug workaround for the Nevada. It seems as if under certain
@@ -1186,7 +1188,7 @@ static __init void build_get_ptep(u32 **p, unsigned int tmp, unsigned int ptr)
          * in a different cacheline or a load instruction, probably any
          * memory reference, is between them.
          */
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_NEVADA:
                 i_LW(p, ptr, 0, ptr);
                 GET_CONTEXT(p, tmp); /* get context reg */
@@ -1202,7 +1204,7 @@ static __init void build_get_ptep(u32 **p, unsigned int tmp, unsigned int ptr)
         i_ADDU(p, ptr, ptr, tmp); /* add in offset */
 }
 
-static __init void build_update_entries(u32 **p, unsigned int tmp,
+static void __init build_update_entries(u32 **p, unsigned int tmp,
                                         unsigned int ptep)
 {
         /*
@@ -1870,7 +1872,7 @@ void __init build_tlb_refill_handler(void)
          */
         static int run_once = 0;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_R2000:
         case CPU_R3000:
         case CPU_R3000A:
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index 4e0a90b3916b..aa52aa146cea 100644
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -74,7 +74,7 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         struct op_mips_model *lmodel = NULL;
         int res;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_5KC:
         case CPU_20KC:
         case CPU_24K:
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index 1ea5c9c1010b..423bc2c473df 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -118,7 +118,7 @@ static void mipsxx_reg_setup(struct op_counter_config *ctr)
 
 /* Program all of the registers in preparation for enabling profiling.  */
 
-static void mipsxx_cpu_setup (void *args)
+static void mipsxx_cpu_setup(void *args)
 {
         unsigned int counters = op_model_mipsxx_ops.num_counters;
 
@@ -222,7 +222,7 @@ static inline int n_counters(void)
 {
         int counters;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_R10000:
                 counters = 2;
                 break;
@@ -274,7 +274,7 @@ static int __init mipsxx_init(void)
 #endif
 
         op_model_mipsxx_ops.num_counters = counters;
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_20KC:
                 op_model_mipsxx_ops.cpu_type = "mips/20K";
                 break;
diff --git a/arch/mips/oprofile/op_model_rm9000.c b/arch/mips/oprofile/op_model_rm9000.c
index d29040a56aea..a45d3202894f 100644
--- a/arch/mips/oprofile/op_model_rm9000.c
+++ b/arch/mips/oprofile/op_model_rm9000.c
@@ -60,7 +60,7 @@ static void rm9000_reg_setup(struct op_counter_config *ctr)
 
 /* Program all of the registers in preparation for enabling profiling.  */
 
-static void rm9000_cpu_setup (void *args)
+static void rm9000_cpu_setup(void *args)
 {
         uint64_t perfcount;
 
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index 4ee6800e67e6..ed0c07622baa 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -10,6 +10,7 @@ obj-y				+= pci.o
 obj-$(CONFIG_MIPS_BONITO64)     += ops-bonito64.o
 obj-$(CONFIG_PCI_GT64XXX_PCI0)  += ops-gt64xxx_pci0.o
 obj-$(CONFIG_MIPS_MSC)          += ops-msc.o
+obj-$(CONFIG_MIPS_NILE4)        += ops-nile4.o
 obj-$(CONFIG_MIPS_TX3927)       += ops-tx3927.o
 obj-$(CONFIG_PCI_VR41XX)        += ops-vr41xx.o pci-vr41xx.o
 obj-$(CONFIG_NEC_CMBVR4133)     += fixup-vr4133.o
@@ -19,6 +20,7 @@ obj-$(CONFIG_MARKEINS)		+= ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o
 # These are still pretty much in the old state, watch, go blind.
 #
 obj-$(CONFIG_BASLER_EXCITE)     += ops-titan.o pci-excite.o fixup-excite.o
+obj-$(CONFIG_LASAT)             += pci-lasat.o
 obj-$(CONFIG_MIPS_ATLAS)        += fixup-atlas.o
 obj-$(CONFIG_MIPS_COBALT)       += fixup-cobalt.o
 obj-$(CONFIG_SOC_AU1500)        += fixup-au1000.o ops-au1000.o
diff --git a/arch/mips/pci/fixup-atlas.c b/arch/mips/pci/fixup-atlas.c
index 45224fd2c7ba..506e883a8c71 100644
--- a/arch/mips/pci/fixup-atlas.c
+++ b/arch/mips/pci/fixup-atlas.c
@@ -77,12 +77,12 @@ int pcibios_plat_dev_init(struct pci_dev *dev)
  * code, but it is better than nothing...
  */
 
-static void atlas_saa9730_base_fixup (struct pci_dev *pdev)
+static void atlas_saa9730_base_fixup(struct pci_dev *pdev)
 {
         extern void *saa9730_base;
         if (pdev->bus == 0 && PCI_SLOT(pdev->devfn) == 19)
-                (void) pci_read_config_dword (pdev, 0x14, (u32 *)&saa9730_base);
-        printk ("saa9730_base = %x\n", saa9730_base);
+                (void) pci_read_config_dword(pdev, 0x14, (u32 *)&saa9730_base);
+        printk("saa9730_base = %x\n", saa9730_base);
 }
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA9730,
diff --git a/arch/mips/pci/fixup-cobalt.c b/arch/mips/pci/fixup-cobalt.c
index 76b4f0ffb1e5..f7df1142912b 100644
--- a/arch/mips/pci/fixup-cobalt.c
+++ b/arch/mips/pci/fixup-cobalt.c
@@ -18,6 +18,24 @@
 #include <asm/gt64120.h>
 
 #include <cobalt.h>
+#include <irq.h>
+
+/*
+ * PCI slot numbers
+ */
+#define COBALT_PCICONF_CPU      0x06
+#define COBALT_PCICONF_ETH0     0x07
+#define COBALT_PCICONF_RAQSCSI  0x08
+#define COBALT_PCICONF_VIA      0x09
+#define COBALT_PCICONF_PCISLOT  0x0A
+#define COBALT_PCICONF_ETH1     0x0C
+
+/*
+ * The Cobalt board ID information.  The boards have an ID number wired
+ * into the VIA that is available in the high nibble of register 94.
+ */
+#define VIA_COBALT_BRD_ID_REG  0x94
+#define VIA_COBALT_BRD_REG_to_ID(reg)   ((unsigned char)(reg) >> 4)
 
 static void qube_raq_galileo_early_fixup(struct pci_dev *dev)
 {
@@ -132,29 +150,29 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_0,
 
 static char irq_tab_qube1[] __initdata = {
   [COBALT_PCICONF_CPU]     = 0,
-  [COBALT_PCICONF_ETH0]    = COBALT_QUBE1_ETH0_IRQ,
-  [COBALT_PCICONF_RAQSCSI] = COBALT_SCSI_IRQ,
+  [COBALT_PCICONF_ETH0]    = QUBE1_ETH0_IRQ,
+  [COBALT_PCICONF_RAQSCSI] = SCSI_IRQ,
   [COBALT_PCICONF_VIA]     = 0,
-  [COBALT_PCICONF_PCISLOT] = COBALT_QUBE_SLOT_IRQ,
+  [COBALT_PCICONF_PCISLOT] = PCISLOT_IRQ,
   [COBALT_PCICONF_ETH1]    = 0
 };
 
 static char irq_tab_cobalt[] __initdata = {
   [COBALT_PCICONF_CPU]     = 0,
-  [COBALT_PCICONF_ETH0]    = COBALT_ETH0_IRQ,
-  [COBALT_PCICONF_RAQSCSI] = COBALT_SCSI_IRQ,
+  [COBALT_PCICONF_ETH0]    = ETH0_IRQ,
+  [COBALT_PCICONF_RAQSCSI] = SCSI_IRQ,
   [COBALT_PCICONF_VIA]     = 0,
-  [COBALT_PCICONF_PCISLOT] = COBALT_QUBE_SLOT_IRQ,
-  [COBALT_PCICONF_ETH1]    = COBALT_ETH1_IRQ
+  [COBALT_PCICONF_PCISLOT] = PCISLOT_IRQ,
+  [COBALT_PCICONF_ETH1]    = ETH1_IRQ
 };
 
 static char irq_tab_raq2[] __initdata = {
   [COBALT_PCICONF_CPU]     = 0,
-  [COBALT_PCICONF_ETH0]    = COBALT_ETH0_IRQ,
-  [COBALT_PCICONF_RAQSCSI] = COBALT_RAQ_SCSI_IRQ,
+  [COBALT_PCICONF_ETH0]    = ETH0_IRQ,
+  [COBALT_PCICONF_RAQSCSI] = RAQ2_SCSI_IRQ,
   [COBALT_PCICONF_VIA]     = 0,
-  [COBALT_PCICONF_PCISLOT] = COBALT_QUBE_SLOT_IRQ,
-  [COBALT_PCICONF_ETH1]    = COBALT_ETH1_IRQ
+  [COBALT_PCICONF_PCISLOT] = PCISLOT_IRQ,
+  [COBALT_PCICONF_ETH1]    = ETH1_IRQ
 };
 
 int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
diff --git a/arch/mips/pci/ops-au1000.c b/arch/mips/pci/ops-au1000.c
index 7932dfe5eb9b..6b29904acf45 100644
--- a/arch/mips/pci/ops-au1000.c
+++ b/arch/mips/pci/ops-au1000.c
@@ -112,7 +112,7 @@ static int config_access(unsigned char access_type, struct pci_bus *bus,
                 first_cfg = 0;
                 pci_cfg_vm = get_vm_area(0x2000, VM_IOREMAP);
                 if (!pci_cfg_vm)
-                        panic (KERN_ERR "PCI unable to get vm area\n");
+                        panic(KERN_ERR "PCI unable to get vm area\n");
                 pci_cfg_wired_entry = read_c0_wired();
                 add_wired_entry(0, 0, (unsigned long)pci_cfg_vm->addr, PM_4K);
                 last_entryLo0  = last_entryLo1 = 0xffffffff;
diff --git a/arch/mips/pci/ops-mace.c b/arch/mips/pci/ops-mace.c
index 8008e31c5e81..fe5451449304 100644
--- a/arch/mips/pci/ops-mace.c
+++ b/arch/mips/pci/ops-mace.c
@@ -29,22 +29,20 @@
  * 4  N/C
  */
 
-#define chkslot(_bus,_devfn)                                    \
-do {                                                            \
-        if ((_bus)->number > 0 || PCI_SLOT (_devfn) < 1 \
-            || PCI_SLOT (_devfn) > 3)                           \
-                return PCIBIOS_DEVICE_NOT_FOUND;                \
-} while (0)
+static inline int mkaddr(struct pci_bus *bus, unsigned int devfn,
+        unsigned int reg)
+{
+        return ((bus->number & 0xff) << 16) |
+                ((devfn & 0xff) << 8) |
+                (reg & 0xfc);
+}
 
-#define mkaddr(_devfn, _reg) \
-((((_devfn) & 0xffUL) << 8) | ((_reg) & 0xfcUL))
 
 static int
 mace_pci_read_config(struct pci_bus *bus, unsigned int devfn,
                      int reg, int size, u32 *val)
 {
-        chkslot(bus, devfn);
-        mace->pci.config_addr = mkaddr(devfn, reg);
+        mace->pci.config_addr = mkaddr(bus, devfn, reg);
         switch (size) {
         case 1:
                 *val = mace->pci.config_data.b[(reg & 3) ^ 3];
@@ -66,8 +64,7 @@ static int
 mace_pci_write_config(struct pci_bus *bus, unsigned int devfn,
                       int reg, int size, u32 val)
 {
-        chkslot(bus, devfn);
-        mace->pci.config_addr = mkaddr(devfn, reg);
+        mace->pci.config_addr = mkaddr(bus, devfn, reg);
         switch (size) {
         case 1:
                 mace->pci.config_data.b[(reg & 3) ^ 3] = val;
diff --git a/arch/mips/pci/ops-nile4.c b/arch/mips/pci/ops-nile4.c
new file mode 100644
index 000000000000..b7f0fb0210f4
--- /dev/null
+++ b/arch/mips/pci/ops-nile4.c
@@ -0,0 +1,147 @@
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <asm/bootinfo.h>
+
+#include <asm/lasat/lasat.h>
+#include <asm/gt64120.h>
+#include <asm/nile4.h>
+
+#define PCI_ACCESS_READ  0
+#define PCI_ACCESS_WRITE 1
+
+#define LO(reg) (reg / 4)
+#define HI(reg) (reg / 4 + 1)
+
+volatile unsigned long *const vrc_pciregs = (void *) Vrc5074_BASE;
+
+static DEFINE_SPINLOCK(nile4_pci_lock);
+
+static int nile4_pcibios_config_access(unsigned char access_type,
+        struct pci_bus *bus, unsigned int devfn, int where, u32 *val)
+{
+        unsigned char busnum = bus->number;
+        u32 adr, mask, err;
+
+        if ((busnum == 0) && (PCI_SLOT(devfn) > 8))
+                /* The addressing scheme chosen leaves room for just
+                 * 8 devices on the first busnum (besides the PCI
+                 * controller itself) */
+                return PCIBIOS_DEVICE_NOT_FOUND;
+
+        if ((busnum == 0) && (devfn == PCI_DEVFN(0, 0))) {
+                /* Access controller registers directly */
+                if (access_type == PCI_ACCESS_WRITE) {
+                        vrc_pciregs[(0x200 + where) >> 2] = *val;
+                } else {
+                        *val = vrc_pciregs[(0x200 + where) >> 2];
+                }
+                return PCIBIOS_SUCCESSFUL;
+        }
+
+        /* Temporarily map PCI Window 1 to config space */
+        mask = vrc_pciregs[LO(NILE4_PCIINIT1)];
+        vrc_pciregs[LO(NILE4_PCIINIT1)] = 0x0000001a | (busnum ? 0x200 : 0);
+
+        /* Clear PCI Error register. This also clears the Error Type
+         * bits in the Control register */
+        vrc_pciregs[LO(NILE4_PCIERR)] = 0;
+        vrc_pciregs[HI(NILE4_PCIERR)] = 0;
+
+        /* Setup address */
+        if (busnum == 0)
+                adr =
+                    KSEG1ADDR(PCI_WINDOW1) +
+                    ((1 << (PCI_SLOT(devfn) + 15)) | (PCI_FUNC(devfn) << 8)
+                     | (where & ~3));
+        else
+                adr = KSEG1ADDR(PCI_WINDOW1) | (busnum << 16) | (devfn << 8) |
+                      (where & ~3);
+
+        if (access_type == PCI_ACCESS_WRITE)
+                *(u32 *) adr = *val;
+        else
+                *val = *(u32 *) adr;
+
+        /* Check for master or target abort */
+        err = (vrc_pciregs[HI(NILE4_PCICTRL)] >> 5) & 0x7;
+
+        /* Restore PCI Window 1 */
+        vrc_pciregs[LO(NILE4_PCIINIT1)] = mask;
+
+        if (err)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static int nile4_pcibios_read(struct pci_bus *bus, unsigned int devfn,
+        int where, int size, u32 *val)
+{
+        unsigned long flags;
+        u32 data = 0;
+        int err;
+
+        if ((size == 2) && (where & 1))
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+        else if ((size == 4) && (where & 3))
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+
+        spin_lock_irqsave(&nile4_pci_lock, flags);
+        err = nile4_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, where,
+                                        &data);
+        spin_unlock_irqrestore(&nile4_pci_lock, flags);
+
+        if (err)
+                return err;
+
+        if (size == 1)
+                *val = (data >> ((where & 3) << 3)) & 0xff;
+        else if (size == 2)
+                *val = (data >> ((where & 3) << 3)) & 0xffff;
+        else
+                *val = data;
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static int nile4_pcibios_write(struct pci_bus *bus, unsigned int devfn,
+        int where, int size, u32 val)
+{
+        unsigned long flags;
+        u32 data = 0;
+        int err;
+
+        if ((size == 2) && (where & 1))
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+        else if ((size == 4) && (where & 3))
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+
+        spin_lock_irqsave(&nile4_pci_lock, flags);
+        err = nile4_pcibios_config_access(PCI_ACCESS_READ, bus, devfn, where,
+                                          &data);
+        spin_unlock_irqrestore(&nile4_pci_lock, flags);
+
+        if (err)
+                return err;
+
+        if (size == 1)
+                data = (data & ~(0xff << ((where & 3) << 3))) |
+                    (val << ((where & 3) << 3));
+        else if (size == 2)
+                data = (data & ~(0xffff << ((where & 3) << 3))) |
+                    (val << ((where & 3) << 3));
+        else
+                data = val;
+
+        if (nile4_pcibios_config_access
+            (PCI_ACCESS_WRITE, bus, devfn, where, &data))
+                return -1;
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+struct pci_ops nile4_pci_ops = {
+        .read = nile4_pcibios_read,
+        .write = nile4_pcibios_write,
+};
diff --git a/arch/mips/pci/ops-sni.c b/arch/mips/pci/ops-sni.c
index fa2d2c60f797..97ed25b92edf 100644
--- a/arch/mips/pci/ops-sni.c
+++ b/arch/mips/pci/ops-sni.c
@@ -70,13 +70,13 @@ static int pcimt_write(struct pci_bus *bus, unsigned int devfn, int reg,
 
         switch (size) {
         case 1:
-                outb (val, PCIMT_CONFIG_DATA + (reg & 3));
+                outb(val, PCIMT_CONFIG_DATA + (reg & 3));
                 break;
         case 2:
-                outw (val, PCIMT_CONFIG_DATA + (reg & 2));
+                outw(val, PCIMT_CONFIG_DATA + (reg & 2));
                 break;
         case 4:
-                outl (val, PCIMT_CONFIG_DATA);
+                outl(val, PCIMT_CONFIG_DATA);
                 break;
         }
 
@@ -93,7 +93,7 @@ static int pcit_set_config_address(unsigned int busno, unsigned int devfn, int r
         if ((devfn > 255) || (reg > 255) || (busno > 255))
                 return PCIBIOS_BAD_REGISTER_NUMBER;
 
-        outl ((1 << 31) | ((busno & 0xff) << 16) | ((devfn & 0xff) << 8) | (reg & 0xfc), 0xcf8);
+        outl((1 << 31) | ((busno & 0xff) << 16) | ((devfn & 0xff) << 8) | (reg & 0xfc), 0xcf8);
         return PCIBIOS_SUCCESSFUL;
 }
 
@@ -108,12 +108,12 @@ static int pcit_read(struct pci_bus *bus, unsigned int devfn, int reg,
          * we don't do it, we will get a data bus error
          */
         if (bus->number == 0) {
-                pcit_set_config_address (0, 0, 0x68);
-                outl (inl (0xcfc) | 0xc0000000, 0xcfc);
+                pcit_set_config_address(0, 0, 0x68);
+                outl(inl(0xcfc) | 0xc0000000, 0xcfc);
                 if ((res = pcit_set_config_address(0, devfn, 0)))
                         return res;
-                outl (0xffffffff, 0xcfc);
-                pcit_set_config_address (0, 0, 0x68);
+                outl(0xffffffff, 0xcfc);
+                pcit_set_config_address(0, 0, 0x68);
                 if (inl(0xcfc) & 0x100000)
                         return PCIBIOS_DEVICE_NOT_FOUND;
         }
@@ -144,13 +144,13 @@ static int pcit_write(struct pci_bus *bus, unsigned int devfn, int reg,
 
         switch (size) {
         case 1:
-                outb (val, PCIMT_CONFIG_DATA + (reg & 3));
+                outb(val, PCIMT_CONFIG_DATA + (reg & 3));
                 break;
         case 2:
-                outw (val, PCIMT_CONFIG_DATA + (reg & 2));
+                outw(val, PCIMT_CONFIG_DATA + (reg & 2));
                 break;
         case 4:
-                outl (val, PCIMT_CONFIG_DATA);
+                outl(val, PCIMT_CONFIG_DATA);
                 break;
         }
 
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c
index 2b4e30c7d105..5443ea3596f8 100644
--- a/arch/mips/pci/pci-bcm1480.c
+++ b/arch/mips/pci/pci-bcm1480.c
@@ -49,8 +49,8 @@
  * Macros for calculating offsets into config space given a device
  * structure or dev/fun/reg
  */
-#define CFGOFFSET(bus,devfn,where) (((bus)<<16)+((devfn)<<8)+(where))
-#define CFGADDR(bus,devfn,where)   CFGOFFSET((bus)->number,(devfn),where)
+#define CFGOFFSET(bus, devfn, where) (((bus)<<16)+((devfn)<<8)+(where))
+#define CFGADDR(bus, devfn, where)   CFGOFFSET((bus)->number, (devfn), where)
 
 static void *cfg_space;
 
@@ -255,7 +255,7 @@ static int __init bcm1480_pcibios_init(void)
         register_pci_controller(&bcm1480_controller);
 
 #ifdef CONFIG_VGA_CONSOLE
-        take_over_console(&vga_con,0,MAX_NR_CONSOLES-1,1);
+        take_over_console(&vga_con, 0, MAX_NR_CONSOLES-1, 1);
 #endif
         return 0;
 }
diff --git a/arch/mips/pci/pci-bcm1480ht.c b/arch/mips/pci/pci-bcm1480ht.c
index ba2e34b09231..a63e3bd6b0ac 100644
--- a/arch/mips/pci/pci-bcm1480ht.c
+++ b/arch/mips/pci/pci-bcm1480ht.c
@@ -48,8 +48,8 @@
  * Macros for calculating offsets into config space given a device
  * structure or dev/fun/reg
  */
-#define CFGOFFSET(bus,devfn,where) (((bus)<<16)+((devfn)<<8)+(where))
-#define CFGADDR(bus,devfn,where)   CFGOFFSET((bus)->number,(devfn),where)
+#define CFGOFFSET(bus, devfn, where) (((bus)<<16)+((devfn)<<8)+(where))
+#define CFGADDR(bus, devfn, where)   CFGOFFSET((bus)->number, (devfn), where)
 
 static void *ht_cfg_space;
 
diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c
new file mode 100644
index 000000000000..5abd5c7119be
--- /dev/null
+++ b/arch/mips/pci/pci-lasat.c
@@ -0,0 +1,91 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2000, 2001, 04 Keith M Wesolowski
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/types.h>
+#include <asm/bootinfo.h>
+
+extern struct pci_ops nile4_pci_ops;
+extern struct pci_ops gt64xxx_pci0_ops;
+static struct resource lasat_pci_mem_resource = {
+        .name   = "LASAT PCI MEM",
+        .start  = 0x18000000,
+        .end    = 0x19ffffff,
+        .flags  = IORESOURCE_MEM,
+};
+
+static struct resource lasat_pci_io_resource = {
+        .name   = "LASAT PCI IO",
+        .start  = 0x1a000000,
+        .end    = 0x1bffffff,
+        .flags  = IORESOURCE_IO,
+};
+
+static struct pci_controller lasat_pci_controller = {
+        .mem_resource   = &lasat_pci_mem_resource,
+        .io_resource    = &lasat_pci_io_resource,
+};
+
+static int __init lasat_pci_setup(void)
+{
+        printk(KERN_DEBUG "PCI: starting\n");
+
+        switch (mips_machtype) {
+        case MACH_LASAT_100:
+                lasat_pci_controller.pci_ops = &gt64xxx_pci0_ops;
+                break;
+        case MACH_LASAT_200:
+                lasat_pci_controller.pci_ops = &nile4_pci_ops;
+                break;
+        default:
+                panic("pcibios_init: mips_machtype incorrect");
+        }
+
+        register_pci_controller(&lasat_pci_controller);
+
+        return 0;
+}
+
+arch_initcall(lasat_pci_setup);
+
+#define LASATINT_ETH1   0
+#define LASATINT_ETH0   1
+#define LASATINT_HDC    2
+#define LASATINT_COMP   3
+#define LASATINT_HDLC   4
+#define LASATINT_PCIA   5
+#define LASATINT_PCIB   6
+#define LASATINT_PCIC   7
+#define LASATINT_PCID   8
+
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+        switch (slot) {
+        case 1:
+        case 2:
+        case 3:
+                return LASATINT_PCIA + (((slot-1) + (pin-1)) % 4);
+        case 4:
+                return LASATINT_ETH1;   /* Ethernet 1 (LAN 2) */
+        case 5:
+                return LASATINT_ETH0;   /* Ethernet 0 (LAN 1) */
+        case 6:
+                return LASATINT_HDC;    /* IDE controller */
+        default:
+                return 0xff;            /* Illegal */
+        }
+
+        return -1;
+}
+
+/* Do platform specific device initialization at pci_enable_device() time */
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+        return 0;
+}
diff --git a/arch/mips/pci/pci-sb1250.c b/arch/mips/pci/pci-sb1250.c
index c1ac6493155e..42e4d2c800fa 100644
--- a/arch/mips/pci/pci-sb1250.c
+++ b/arch/mips/pci/pci-sb1250.c
@@ -49,8 +49,8 @@
  * Macros for calculating offsets into config space given a device
  * structure or dev/fun/reg
  */
-#define CFGOFFSET(bus,devfn,where) (((bus)<<16) + ((devfn)<<8) + (where))
-#define CFGADDR(bus,devfn,where)   CFGOFFSET((bus)->number,(devfn),where)
+#define CFGOFFSET(bus, devfn, where) (((bus)<<16) + ((devfn)<<8) + (where))
+#define CFGADDR(bus, devfn, where)   CFGOFFSET((bus)->number, (devfn), where)
 
 static void *cfg_space;
 
diff --git a/arch/mips/pci/pci-vr41xx.c b/arch/mips/pci/pci-vr41xx.c
index 9885fa403603..240df9e33813 100644
--- a/arch/mips/pci/pci-vr41xx.c
+++ b/arch/mips/pci/pci-vr41xx.c
@@ -228,7 +228,7 @@ static int __init vr41xx_pciu_init(void)
         else
                 pciu_write(PCIEXACCREG, 0);
 
-        if (current_cpu_data.cputype == CPU_VR4122)
+        if (current_cpu_type() == CPU_VR4122)
                 pciu_write(PCITRDYVREG, TRDYV(setup->wait_time_limit_from_irdy_to_trdy));
 
         pciu_write(LATTIMEREG, MLTIM(setup->master_latency_timer));
diff --git a/arch/mips/philips/pnx8550/common/proc.c b/arch/mips/philips/pnx8550/common/proc.c
index 92311e95b700..18b125e3b65d 100644
--- a/arch/mips/philips/pnx8550/common/proc.c
+++ b/arch/mips/philips/pnx8550/common/proc.c
@@ -27,20 +27,20 @@
 #include <uart.h>
 
 
-static int pnx8550_timers_read (char* page, char** start, off_t offset, int count, int* eof, void* data)
+static int pnx8550_timers_read(char* page, char** start, off_t offset, int count, int* eof, void* data)
 {
         int len = 0;
         int configPR = read_c0_config7();
 
         if (offset==0) {
-                len += sprintf(&page[len],"Timer:       count,  compare, tc, status\n");
-                len += sprintf(&page[len],"    1: %11i, %8i,  %1i, %s\n",
+                len += sprintf(&page[len], "Timer:       count,  compare, tc, status\n");
+                len += sprintf(&page[len], "    1: %11i, %8i,  %1i, %s\n",
                                read_c0_count(), read_c0_compare(),
                               (configPR>>6)&0x1, ((configPR>>3)&0x1)? "off":"on");
-                len += sprintf(&page[len],"    2: %11i, %8i,  %1i, %s\n",
+                len += sprintf(&page[len], "    2: %11i, %8i,  %1i, %s\n",
                                read_c0_count2(), read_c0_compare2(),
                               (configPR>>7)&0x1, ((configPR>>4)&0x1)? "off":"on");
-                len += sprintf(&page[len],"    3: %11i, %8i,  %1i, %s\n",
+                len += sprintf(&page[len], "    3: %11i, %8i,  %1i, %s\n",
                                read_c0_count3(), read_c0_compare3(),
                               (configPR>>8)&0x1, ((configPR>>5)&0x1)? "off":"on");
         }
@@ -48,23 +48,23 @@ static int pnx8550_timers_read (char* page, char** start, off_t offset, int coun
         return len;
 }
 
-static int pnx8550_registers_read (char* page, char** start, off_t offset, int count, int* eof, void* data)
+static int pnx8550_registers_read(char* page, char** start, off_t offset, int count, int* eof, void* data)
 {
         int len = 0;
 
         if (offset==0) {
-                len += sprintf(&page[len],"config1:   %#10.8x\n",read_c0_config1());
-                len += sprintf(&page[len],"config2:   %#10.8x\n",read_c0_config2());
-                len += sprintf(&page[len],"config3:   %#10.8x\n",read_c0_config3());
-                len += sprintf(&page[len],"configPR:  %#10.8x\n",read_c0_config7());
-                len += sprintf(&page[len],"status:    %#10.8x\n",read_c0_status());
-                len += sprintf(&page[len],"cause:     %#10.8x\n",read_c0_cause());
-                len += sprintf(&page[len],"count:     %#10.8x\n",read_c0_count());
-                len += sprintf(&page[len],"count_2:   %#10.8x\n",read_c0_count2());
-                len += sprintf(&page[len],"count_3:   %#10.8x\n",read_c0_count3());
-                len += sprintf(&page[len],"compare:   %#10.8x\n",read_c0_compare());
-                len += sprintf(&page[len],"compare_2: %#10.8x\n",read_c0_compare2());
-                len += sprintf(&page[len],"compare_3: %#10.8x\n",read_c0_compare3());
+                len += sprintf(&page[len], "config1:   %#10.8x\n", read_c0_config1());
+                len += sprintf(&page[len], "config2:   %#10.8x\n", read_c0_config2());
+                len += sprintf(&page[len], "config3:   %#10.8x\n", read_c0_config3());
+                len += sprintf(&page[len], "configPR:  %#10.8x\n", read_c0_config7());
+                len += sprintf(&page[len], "status:    %#10.8x\n", read_c0_status());
+                len += sprintf(&page[len], "cause:     %#10.8x\n", read_c0_cause());
+                len += sprintf(&page[len], "count:     %#10.8x\n", read_c0_count());
+                len += sprintf(&page[len], "count_2:   %#10.8x\n", read_c0_count2());
+                len += sprintf(&page[len], "count_3:   %#10.8x\n", read_c0_count3());
+                len += sprintf(&page[len], "compare:   %#10.8x\n", read_c0_compare());
+                len += sprintf(&page[len], "compare_2: %#10.8x\n", read_c0_compare2());
+                len += sprintf(&page[len], "compare_3: %#10.8x\n", read_c0_compare3());
         }
 
         return len;
diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c
index 5bd737477685..2ce298f4d19a 100644
--- a/arch/mips/philips/pnx8550/common/setup.c
+++ b/arch/mips/philips/pnx8550/common/setup.c
@@ -47,7 +47,6 @@ extern void pnx8550_machine_halt(void);
 extern void pnx8550_machine_power_off(void);
 extern struct resource ioport_resource;
 extern struct resource iomem_resource;
-extern void pnx8550_time_init(void);
 extern void rs_kgdb_hook(int tty_no);
 extern char *prom_getcmdline(void);
 
@@ -104,8 +103,6 @@ void __init plat_mem_setup(void)
         _machine_halt = pnx8550_machine_halt;
         pm_power_off = pnx8550_machine_power_off;
 
-        board_time_init = pnx8550_time_init;
-
         /* Clear the Global 2 Register, PCI Inta Output Enable Registers
            Bit 1:Enable DAC Powerdown
           -> 0:DACs are enabled and are working normally
diff --git a/arch/mips/philips/pnx8550/common/time.c b/arch/mips/philips/pnx8550/common/time.c
index 68def3880a1c..e818fd0f1584 100644
--- a/arch/mips/philips/pnx8550/common/time.c
+++ b/arch/mips/philips/pnx8550/common/time.c
@@ -1,6 +1,7 @@
 /*
  * Copyright 2001, 2002, 2003 MontaVista Software Inc.
  * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net
+ * Copyright (C) 2007 Ralf Baechle (ralf@linux-mips.org)
  *
  * Common time service routines for MIPS machines. See
  * Documents/MIPS/README.txt.
@@ -46,16 +47,16 @@ static void timer_ack(void)
 }
 
 /*
- * pnx8550_time_init() - it does the following things:
+ * plat_time_init() - it does the following things:
  *
- * 1) board_time_init() -
+ * 1) plat_time_init() -
  *      a) (optional) set up RTC routines,
  *      b) (optional) calibrate and set the mips_hpt_frequency
  *          (only needed if you intended to use cpu counter as timer interrupt
  *           source)
  */
 
-void pnx8550_time_init(void)
+__init void plat_time_init(void)
 {
         unsigned int             n;
         unsigned int             m;
diff --git a/arch/mips/philips/pnx8550/jbs/init.c b/arch/mips/philips/pnx8550/jbs/init.c
index 85f449174bc3..cfd90fa3d799 100644
--- a/arch/mips/philips/pnx8550/jbs/init.c
+++ b/arch/mips/philips/pnx8550/jbs/init.c
@@ -48,7 +48,6 @@ void __init prom_init(void)
 
         unsigned long memsize;
 
-        mips_machgroup = MACH_GROUP_PHILIPS;
         mips_machtype = MACH_PHILIPS_JBS;
 
         //memsize = 0x02800000; /* Trimedia uses memory above */
diff --git a/arch/mips/philips/pnx8550/stb810/prom_init.c b/arch/mips/philips/pnx8550/stb810/prom_init.c
index ea5b4e0fb47d..fdb33ed089b9 100644
--- a/arch/mips/philips/pnx8550/stb810/prom_init.c
+++ b/arch/mips/philips/pnx8550/stb810/prom_init.c
@@ -41,7 +41,6 @@ void __init prom_init(void)
 
         prom_init_cmdline();
 
-        mips_machgroup = MACH_GROUP_PHILIPS;
         mips_machtype = MACH_PHILIPS_STB810;
 
         memsize = 0x08000000; /* Trimedia uses memory above */
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
index 6fa85728158b..ab96a2d7f4c4 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c
@@ -163,7 +163,7 @@ static int msp_hwbutton_register(struct hwbutton_interrupt *hirq)
                 CIC_EXT_SET_ACTIVE_HI(cic_ext, hirq->eirq);
         *CIC_EXT_CFG_REG = cic_ext;
 
-        return request_irq(hirq->irq, hwbutton_handler, SA_INTERRUPT,
+        return request_irq(hirq->irq, hwbutton_handler, IRQF_DISABLED,
                                 hirq->name, (void *)hirq);
 }
 
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_serial.c b/arch/mips/pmc-sierra/msp71xx/msp_serial.c
index e25bac537d77..15e7b8000b4c 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_serial.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_serial.c
@@ -117,7 +117,7 @@ void __init msp_serial_setup(void)
 
         /* Initialize first serial port */
         up.mapbase      = MSP_UART0_BASE;
-        up.membase      = ioremap_nocache(up.mapbase,MSP_UART_REG_LEN);
+        up.membase      = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);
         up.irq          = MSP_INT_UART0;
         up.uartclk      = uartclk;
         up.regshift     = 2;
@@ -145,9 +145,9 @@ void __init msp_serial_setup(void)
                         if( DEBUG_PORT_BASE == KSEG1ADDR(MSP_UART1_BASE) ) {
                                 if( mips_machtype == MACH_MSP4200_FPGA
                                  || mips_machtype == MACH_MSP7120_FPGA )
-                                        initDebugPort(uartclk,19200);
+                                        initDebugPort(uartclk, 19200);
                                 else
-                                        initDebugPort(uartclk,57600);
+                                        initDebugPort(uartclk, 57600);
                         }
 #endif
                         break;
@@ -157,7 +157,7 @@ void __init msp_serial_setup(void)
         }
 
         up.mapbase      = MSP_UART1_BASE;
-        up.membase      = ioremap_nocache(up.mapbase,MSP_UART_REG_LEN);
+        up.membase      = ioremap_nocache(up.mapbase, MSP_UART_REG_LEN);
         up.irq          = MSP_INT_UART1;
         up.line         = 1;
         up.private_data         = (void*)UART1_STATUS_REG;
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
index 8f69b789be90..c93675615f5d 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_setup.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c
@@ -25,7 +25,6 @@
 #define MSP_BOARD_RESET_GPIO    9
 #endif
 
-extern void msp_timer_init(void);
 extern void msp_serial_setup(void);
 extern void pmctwiled_setup(void);
 
@@ -149,8 +148,6 @@ void __init plat_mem_setup(void)
         _machine_restart = msp_restart;
         _machine_halt = msp_halt;
         pm_power_off = msp_power_off;
-
-        board_time_init = msp_timer_init;
 }
 
 void __init prom_init(void)
@@ -176,16 +173,13 @@ void __init prom_init(void)
         case FAMILY_FPGA:
                 if (FPGA_IS_MSP4200(revision)) {
                         /* Old-style revision ID */
-                        mips_machgroup = MACH_GROUP_MSP;
                         mips_machtype = MACH_MSP4200_FPGA;
                 } else {
-                        mips_machgroup = MACH_GROUP_MSP;
                         mips_machtype = MACH_MSP_OTHER;
                 }
                 break;
 
         case FAMILY_MSP4200:
-                mips_machgroup = MACH_GROUP_MSP;
 #if defined(CONFIG_PMC_MSP4200_EVAL)
                 mips_machtype  = MACH_MSP4200_EVAL;
 #elif defined(CONFIG_PMC_MSP4200_GW)
@@ -196,12 +190,10 @@ void __init prom_init(void)
                 break;
 
         case FAMILY_MSP4200_FPGA:
-                mips_machgroup = MACH_GROUP_MSP;
                 mips_machtype  = MACH_MSP4200_FPGA;
                 break;
 
         case FAMILY_MSP7100:
-                mips_machgroup = MACH_GROUP_MSP;
 #if defined(CONFIG_PMC_MSP7120_EVAL)
                 mips_machtype = MACH_MSP7120_EVAL;
 #elif defined(CONFIG_PMC_MSP7120_GW)
@@ -212,22 +204,14 @@ void __init prom_init(void)
                 break;
 
         case FAMILY_MSP7100_FPGA:
-                mips_machgroup = MACH_GROUP_MSP;
                 mips_machtype  = MACH_MSP7120_FPGA;
                 break;
 
         default:
                 /* we don't recognize the machine */
-                mips_machgroup = MACH_GROUP_UNKNOWN;
                 mips_machtype  = MACH_UNKNOWN;
-                break;
-        }
-
-        /* make sure we have the right initialization routine - sanity */
-        if (mips_machgroup != MACH_GROUP_MSP) {
-                ppfinit("Unknown machine group in a "
-                        "MSP initialization routine\n");
                 panic("***Bogosity factor five***, exiting\n");
+                break;
         }
 
         prom_init_cmdline();
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_time.c b/arch/mips/pmc-sierra/msp71xx/msp_time.c
index 2a2beac5a4f8..f221d4763625 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_time.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_time.c
@@ -36,7 +36,7 @@
 #include <msp_int.h>
 #include <msp_regs.h>
 
-void __init msp_timer_init(void)
+void __init plat_time_init(void)
 {
         char    *endp, *s;
         unsigned long cpu_rate = 0;
@@ -81,7 +81,6 @@ void __init msp_timer_init(void)
         mips_hpt_frequency = cpu_rate/2;
 }
 
-
 void __init plat_timer_setup(struct irqaction *irq)
 {
 #ifdef CONFIG_IRQ_MSP_CIC
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_usb.c b/arch/mips/pmc-sierra/msp71xx/msp_usb.c
index 21f9c70b6923..f7ca4f582331 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_usb.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_usb.c
@@ -58,7 +58,7 @@ static struct platform_device msp_usbhost_device = {
                 .dma_mask = &msp_usbhost_dma_mask,
                 .coherent_dma_mask = DMA_32BIT_MASK,
         },
-        .num_resources  = ARRAY_SIZE (msp_usbhost_resources),
+        .num_resources  = ARRAY_SIZE(msp_usbhost_resources),
         .resource       = msp_usbhost_resources,
 };
 #endif /* CONFIG_USB_EHCI_HCD */
@@ -86,7 +86,7 @@ static struct platform_device msp_usbdev_device = {
                 .dma_mask = &msp_usbdev_dma_mask,
                 .coherent_dma_mask = DMA_32BIT_MASK,
         },
-        .num_resources  = ARRAY_SIZE (msp_usbdev_resources),
+        .num_resources  = ARRAY_SIZE(msp_usbdev_resources),
         .resource       = msp_usbdev_resources,
 };
 #endif /* CONFIG_USB_GADGET */
@@ -129,7 +129,7 @@ static int __init msp_usb_setup(void)
                 ppfinit("platform add USB HOST done %s.\n",
                             msp_devs[0]->name);
 
-                result = platform_add_devices(msp_devs, ARRAY_SIZE (msp_devs));
+                result = platform_add_devices(msp_devs, ARRAY_SIZE(msp_devs));
 #endif /* CONFIG_USB_EHCI_HCD */
         }
 #if defined(CONFIG_USB_GADGET)
@@ -139,7 +139,7 @@ static int __init msp_usb_setup(void)
                 ppfinit("platform add USB DEVICE done %s.\n",
                             msp_devs[0]->name);
 
-                result = platform_add_devices(msp_devs, ARRAY_SIZE (msp_devs));
+                result = platform_add_devices(msp_devs, ARRAY_SIZE(msp_devs));
         }
 #endif /* CONFIG_USB_GADGET */
 #endif /* CONFIG_USB_EHCI_HCD || CONFIG_USB_GADGET */
diff --git a/arch/mips/pmc-sierra/yosemite/ht.c b/arch/mips/pmc-sierra/yosemite/ht.c
index 1f7c999eb7c6..6380662bbf3c 100644
--- a/arch/mips/pmc-sierra/yosemite/ht.c
+++ b/arch/mips/pmc-sierra/yosemite/ht.c
@@ -115,7 +115,7 @@ static int titan_ht_config_read_word(struct pci_dev *device,
 
 u32 longswap(unsigned long l)
 {
-        unsigned char b1,b2,b3,b4;
+        unsigned char b1, b2, b3, b4;
 
         b1 = l&255;
         b2 = (l>>8)&255;
diff --git a/arch/mips/pmc-sierra/yosemite/prom.c b/arch/mips/pmc-sierra/yosemite/prom.c
index 0cd78f0f5f2d..9b9936de6589 100644
--- a/arch/mips/pmc-sierra/yosemite/prom.c
+++ b/arch/mips/pmc-sierra/yosemite/prom.c
@@ -126,7 +126,6 @@ void __init prom_init(void)
                 env++;
         }
 
-        mips_machgroup = MACH_GROUP_TITAN;
         mips_machtype = MACH_TITAN_YOSEMITE;
 
         prom_grab_secondary();
diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c
index 58862c8d1d00..015fcc363dc0 100644
--- a/arch/mips/pmc-sierra/yosemite/setup.c
+++ b/arch/mips/pmc-sierra/yosemite/setup.c
@@ -70,7 +70,7 @@ void __init bus_error_init(void)
 }
 
 
-unsigned long m48t37y_get_time(void)
+unsigned long read_persistent_clock(void)
 {
         unsigned int year, month, day, hour, min, sec;
         unsigned long flags;
@@ -95,13 +95,17 @@ unsigned long m48t37y_get_time(void)
         return mktime(year, month, day, hour, min, sec);
 }
 
-int m48t37y_set_time(unsigned long sec)
+int rtc_mips_set_time(unsigned long tim)
 {
         struct rtc_time tm;
         unsigned long flags;
 
-        /* convert to a more useful format -- note months count from 0 */
-        to_tm(sec, &tm);
+        /*
+         * Convert to a more useful format -- note months count from 0
+         * and years from 1900
+         */
+        rtc_time_to_tm(tim, &tm);
+        tm.tm_year += 1900;
         tm.tm_mon += 1;
 
         spin_lock_irqsave(&rtc_lock, flags);
@@ -138,7 +142,7 @@ void __init plat_timer_setup(struct irqaction *irq)
         setup_irq(7, irq);
 }
 
-void yosemite_time_init(void)
+void __init plat_time_init(void)
 {
         mips_hpt_frequency = cpu_clock_freq / 2;
 mips_hpt_frequency = 33000000 * 3 * 5;
@@ -198,17 +202,6 @@ static void __init py_rtc_setup(void)
         m48t37_base = ioremap(YOSEMITE_RTC_BASE, YOSEMITE_RTC_SIZE);
         if (!m48t37_base)
                 printk(KERN_ERR "Mapping the RTC failed\n");
-
-        rtc_mips_get_time = m48t37y_get_time;
-        rtc_mips_set_time = m48t37y_set_time;
-
-        write_seqlock(&xtime_lock);
-        xtime.tv_sec = m48t37y_get_time();
-        xtime.tv_nsec = 0;
-
-        set_normalized_timespec(&wall_to_monotonic,
-                                -xtime.tv_sec, -xtime.tv_nsec);
-        write_sequnlock(&xtime_lock);
 }
 
 /* Not only time init but that's what the hook it's called through is named */
@@ -221,7 +214,6 @@ static void __init py_late_time_init(void)
 
 void __init plat_mem_setup(void)
 {
-        board_time_init = yosemite_time_init;
         late_time_init = py_late_time_init;
 
         /* Add memory regions */
diff --git a/arch/mips/qemu/q-firmware.c b/arch/mips/qemu/q-firmware.c
index fb2a8673a6bf..c2239b417587 100644
--- a/arch/mips/qemu/q-firmware.c
+++ b/arch/mips/qemu/q-firmware.c
@@ -10,7 +10,7 @@ void __init prom_init(void)
         cmdline = (int *) (CKSEG0 + (0x10 << 20) - 260);
         if (*cmdline == 0x12345678) {
                 if (*(char *)(cmdline + 1))
-                        strcpy (arcs_cmdline, (char *)(cmdline + 1));
+                        strcpy(arcs_cmdline, (char *)(cmdline + 1));
                 add_memory_region(0x0<<20, cmdline[-1], BOOT_MEM_RAM);
         } else {
                 add_memory_region(0x0<<20, 0x10<<20, BOOT_MEM_RAM);
diff --git a/arch/mips/qemu/q-irq.c b/arch/mips/qemu/q-irq.c
index 89891e984b3b..4681757460a1 100644
--- a/arch/mips/qemu/q-irq.c
+++ b/arch/mips/qemu/q-irq.c
@@ -2,6 +2,7 @@
 #include <linux/linkage.h>
 
 #include <asm/i8259.h>
+#include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
 #include <asm/qemu.h>
 #include <asm/system.h>
@@ -12,7 +13,7 @@ asmlinkage void plat_irq_dispatch(void)
         unsigned int pending = read_c0_status() & read_c0_cause();
 
         if (pending & 0x8000) {
-                ll_timer_interrupt(Q_COUNT_COMPARE_IRQ);
+                do_IRQ(Q_COUNT_COMPARE_IRQ);
                 return;
         }
         if (pending & 0x0400) {
@@ -29,6 +30,7 @@ void __init arch_init_irq(void)
 {
         mips_hpt_frequency = QEMU_C0_COUNTER_CLOCK;             /* 100MHz */
 
+        mips_cpu_irq_init();
         init_i8259_irqs();
         set_c0_status(0x8400);
 }
diff --git a/arch/mips/qemu/q-setup.c b/arch/mips/qemu/q-setup.c
index 841394336f00..23d34c1917c0 100644
--- a/arch/mips/qemu/q-setup.c
+++ b/arch/mips/qemu/q-setup.c
@@ -1,4 +1,6 @@
 #include <linux/init.h>
+
+#include <asm/i8253.h>
 #include <asm/io.h>
 #include <asm/time.h>
 
@@ -11,13 +13,9 @@ const char *get_system_type(void)
         return "Qemu";
 }
 
-void __init plat_timer_setup(struct irqaction *irq)
+void __init plat_time_init(void)
 {
-        /* set the clock to 100 Hz */
-        outb_p(0x34,0x43);              /* binary, mode 2, LSB/MSB, ch 0 */
-        outb_p(LATCH & 0xff , 0x40);    /* LSB */
-        outb(LATCH >> 8 , 0x40);        /* MSB */
-        setup_irq(0, irq);
+        setup_pit_timer();
 }
 
 void __init plat_mem_setup(void)
diff --git a/arch/mips/sgi-ip22/ip22-eisa.c b/arch/mips/sgi-ip22/ip22-eisa.c
index 6b6e97b90c6e..26854fb11e7c 100644
--- a/arch/mips/sgi-ip22/ip22-eisa.c
+++ b/arch/mips/sgi-ip22/ip22-eisa.c
@@ -55,7 +55,7 @@ static char __init *decode_eisa_sig(unsigned long addr)
         int i;
 
         for (i = 0; i < 4; i++) {
-                sig[i] = inb (addr + i);
+                sig[i] = inb(addr + i);
 
                 if (!i && (sig[0] & 0x80))
                         return NULL;
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c
index 18348321795d..f6d9bf4b26e7 100644
--- a/arch/mips/sgi-ip22/ip22-int.c
+++ b/arch/mips/sgi-ip22/ip22-int.c
@@ -20,10 +20,10 @@
 #include <asm/mipsregs.h>
 #include <asm/addrspace.h>
 #include <asm/irq_cpu.h>
-
 #include <asm/sgi/ioc.h>
 #include <asm/sgi/hpc3.h>
 #include <asm/sgi/ip22.h>
+#include <asm/time.h>
 
 /* #define DEBUG_SGINT */
 
@@ -204,7 +204,6 @@ static struct irqaction map1_cascade = {
 #define SGI_INTERRUPTS  SGINT_LOCAL3
 #endif
 
-extern void indy_r4k_timer_interrupt(void);
 extern void indy_8254timer_irq(void);
 
 /*
@@ -243,7 +242,7 @@ asmlinkage void plat_irq_dispatch(void)
          * First we check for r4k counter/timer IRQ.
          */
         if (pending & CAUSEF_IP7)
-                indy_r4k_timer_interrupt();
+                do_IRQ(SGI_TIMER_IRQ);
         else if (pending & CAUSEF_IP2)
                 indy_local0_irqdispatch();
         else if (pending & CAUSEF_IP3)
@@ -345,6 +344,6 @@ void __init arch_init_irq(void)
 
 #ifdef CONFIG_EISA
         if (ip22_is_fullhouse())        /* Only Indigo-2 has EISA stuff */
-                ip22_eisa_init ();
+                ip22_eisa_init();
 #endif
 }
diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c
index e7ce7982db72..174f09e42f6b 100644
--- a/arch/mips/sgi-ip22/ip22-setup.c
+++ b/arch/mips/sgi-ip22/ip22-setup.c
@@ -51,7 +51,6 @@ void ip22_do_break(void)
 EXPORT_SYMBOL(ip22_do_break);
 
 extern void ip22_be_init(void) __init;
-extern void ip22_time_init(void) __init;
 
 void __init plat_mem_setup(void)
 {
@@ -59,7 +58,6 @@ void __init plat_mem_setup(void)
         char *cserial;
 
         board_be_init = ip22_be_init;
-        ip22_time_init();
 
         /* Init the INDY HPC I/O controller.  Need to call this before
          * fucking with the memory controller because it needs to know the
diff --git a/arch/mips/sgi-ip22/ip22-time.c b/arch/mips/sgi-ip22/ip22-time.c
index de3d01823ad5..9b9bffd2e8fb 100644
--- a/arch/mips/sgi-ip22/ip22-time.c
+++ b/arch/mips/sgi-ip22/ip22-time.c
@@ -20,6 +20,7 @@
 
 #include <asm/cpu.h>
 #include <asm/mipsregs.h>
+#include <asm/i8253.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/time.h>
@@ -29,10 +30,10 @@
 #include <asm/sgi/ip22.h>
 
 /*
- * note that mktime uses month from 1 to 12 while to_tm
+ * Note that mktime uses month from 1 to 12 while rtc_time_to_tm
  * uses 0 to 11.
  */
-static unsigned long indy_rtc_get_time(void)
+unsigned long read_persistent_clock(void)
 {
         unsigned int yrs, mon, day, hrs, min, sec;
         unsigned int save_control;
@@ -60,16 +61,16 @@ static unsigned long indy_rtc_get_time(void)
         return mktime(yrs + 1900, mon, day, hrs, min, sec);
 }
 
-static int indy_rtc_set_time(unsigned long tim)
+int rtc_mips_set_time(unsigned long tim)
 {
         struct rtc_time tm;
         unsigned int save_control;
         unsigned long flags;
 
-        to_tm(tim, &tm);
+        rtc_time_to_tm(tim, &tm);
 
         tm.tm_mon += 1;         /* tm_mon starts at zero */
-        tm.tm_year -= 1940;
+        tm.tm_year -= 40;
         if (tm.tm_year >= 100)
                 tm.tm_year -= 100;
 
@@ -128,7 +129,7 @@ static unsigned long dosample(void)
 /*
  * Here we need to calibrate the cycle counter to at least be close.
  */
-static __init void indy_time_init(void)
+__init void plat_time_init(void)
 {
         unsigned long r4k_ticks[3];
         unsigned long r4k_tick;
@@ -172,6 +173,9 @@ static __init void indy_time_init(void)
                 (int) (r4k_tick % (500000 / HZ)));
 
         mips_hpt_frequency = r4k_tick * HZ;
+
+        if (ip22_is_fullhouse())
+                setup_pit_timer();
 }
 
 /* Generic SGI handler for (spurious) 8254 interrupts */
@@ -189,16 +193,6 @@ void indy_8254timer_irq(void)
         irq_exit();
 }
 
-void indy_r4k_timer_interrupt(void)
-{
-        int irq = SGI_TIMER_IRQ;
-
-        irq_enter();
-        kstat_this_cpu.irqs[irq]++;
-        timer_interrupt(irq, NULL);
-        irq_exit();
-}
-
 void __init plat_timer_setup(struct irqaction *irq)
 {
         /* over-write the handler, we use our own way */
@@ -207,12 +201,3 @@ void __init plat_timer_setup(struct irqaction *irq)
         /* setup irqaction */
         setup_irq(SGI_TIMER_IRQ, irq);
 }
-
-void __init ip22_time_init(void)
-{
-        /* setup hookup functions */
-        rtc_mips_get_time = indy_rtc_get_time;
-        rtc_mips_set_time = indy_rtc_set_time;
-
-        board_time_init = indy_time_init;
-}
diff --git a/arch/mips/sgi-ip27/ip27-berr.c b/arch/mips/sgi-ip27/ip27-berr.c
index 123141ab21a2..7d05e68fdc77 100644
--- a/arch/mips/sgi-ip27/ip27-berr.c
+++ b/arch/mips/sgi-ip27/ip27-berr.c
@@ -21,8 +21,6 @@
 #include <asm/traps.h>
 #include <asm/uaccess.h>
 
-extern void dump_tlb_all(void);
-
 static void dump_hub_information(unsigned long errst0, unsigned long errst1)
 {
         static char *err_type[2][8] = {
diff --git a/arch/mips/sgi-ip27/ip27-init.c b/arch/mips/sgi-ip27/ip27-init.c
index 74158d349630..681b593071cb 100644
--- a/arch/mips/sgi-ip27/ip27-init.c
+++ b/arch/mips/sgi-ip27/ip27-init.c
@@ -47,6 +47,9 @@ cnodeid_t	cpuid_to_compact_node[MAXCPUS];
 
 EXPORT_SYMBOL(nasid_to_compact_node);
 
+struct cpuinfo_ip27 sn_cpu_info[NR_CPUS];
+EXPORT_SYMBOL_GPL(sn_cpu_info);
+
 extern void pcibr_setup(cnodeid_t);
 
 extern void xtalk_probe_node(cnodeid_t nid);
@@ -191,7 +194,6 @@ static inline void ioc3_eth_init(void)
         ioc3->eier = 0;
 }
 
-extern void ip27_time_init(void);
 extern void ip27_reboot_setup(void);
 
 void __init plat_mem_setup(void)
@@ -238,6 +240,4 @@ void __init plat_mem_setup(void)
         per_cpu_init();
 
         set_io_port_base(IO_BASE);
-
-        board_time_init = ip27_time_init;
 }
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index fbb27728a76a..a70656d42191 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -33,7 +33,7 @@ static void alloc_cpupda(cpuid_t cpu, int cpunum)
         nasid_t nasid = COMPACT_TO_NASID_NODEID(node);
 
         cputonasid(cpunum) = nasid;
-        cpu_data[cpunum].p_nodeid = node;
+        sn_cpu_info[cpunum].p_nodeid = node;
         cputoslice(cpunum) = get_cpu_slice(cpu);
 }
 
@@ -176,7 +176,7 @@ void __cpuinit prom_boot_secondary(int cpu, struct task_struct *idle)
         unsigned long gp = (unsigned long)task_thread_info(idle);
         unsigned long sp = __KSTK_TOS(idle);
 
-        LAUNCH_SLAVE(cputonasid(cpu),cputoslice(cpu),
+        LAUNCH_SLAVE(cputonasid(cpu), cputoslice(cpu),
                 (launch_proc_t)MAPPED_KERN_RW_TO_K0(smp_bootstrap),
                 0, (void *) sp, (void *) gp);
 }
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index 8c3c78c63ccd..b7b3479b6bce 100644
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -40,7 +40,6 @@
 #define TICK_SIZE (tick_nsec / 1000)
 
 static unsigned long ct_cur[NR_CPUS];   /* What counter should be at next timer irq */
-static long last_rtc_update;            /* Last time the rtc clock got updated */
 
 #if 0
 static int set_rtc_mmss(unsigned long nowtime)
@@ -113,23 +112,6 @@ again:
 
         update_process_times(user_mode(get_irq_regs()));
 
-        /*
-         * If we have an externally synchronized Linux clock, then update
-         * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
-         * called as close as possible to when a second starts.
-         */
-        if (ntp_synced() &&
-            xtime.tv_sec > last_rtc_update + 660 &&
-            (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
-            (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
-                if (rtc_mips_set_time(xtime.tv_sec) == 0) {
-                        last_rtc_update = xtime.tv_sec;
-                } else {
-                        last_rtc_update = xtime.tv_sec - 600;
-                        /* do it again in 60 s */
-                }
-        }
-
         write_sequnlock(&xtime_lock);
         irq_exit();
 }
@@ -141,7 +123,7 @@ again:
 #include <asm/sn/sn0/hubio.h>
 #include <asm/pci/bridge.h>
 
-static __init unsigned long get_m48t35_time(void)
+unsigned long read_persistent_clock(void)
 {
         unsigned int year, month, date, hour, min, sec;
         struct m48t35_rtc *rtc;
@@ -218,17 +200,23 @@ void __init plat_timer_setup(struct irqaction *irq)
         setup_irq(irqno, &rt_irqaction);
 }
 
-static cycle_t ip27_hpt_read(void)
+static cycle_t hub_rt_read(void)
 {
         return REMOTE_HUB_L(cputonasid(0), PI_RT_COUNT);
 }
 
-void __init ip27_time_init(void)
+struct clocksource ht_rt_clocksource = {
+        .name   = "HUB",
+        .rating = 200,
+        .read   = hub_rt_read,
+        .mask   = CLOCKSOURCE_MASK(52),
+        .shift  = 32,
+        .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
+};
+
+void __init plat_time_init(void)
 {
-        clocksource_mips.read = ip27_hpt_read;
-        mips_hpt_frequency = CYCLES_PER_SEC;
-        xtime.tv_sec = get_m48t35_time();
-        xtime.tv_nsec = 0;
+        clocksource_register(&ht_rt_clocksource);
 }
 
 void __init cpu_time_init(void)
diff --git a/arch/mips/sgi-ip32/crime.c b/arch/mips/sgi-ip32/crime.c
index bff508704d03..563c614ad021 100644
--- a/arch/mips/sgi-ip32/crime.c
+++ b/arch/mips/sgi-ip32/crime.c
@@ -35,8 +35,8 @@ void __init crime_init(void)
         id = crime->id;
         rev = id & CRIME_ID_REV;
         id = (id & CRIME_ID_IDBITS) >> 4;
-        printk (KERN_INFO "CRIME id %1x rev %d at 0x%0*lx\n",
-                id, rev, field, (unsigned long) CRIME_BASE);
+        printk(KERN_INFO "CRIME id %1x rev %d at 0x%0*lx\n",
+               id, rev, field, (unsigned long) CRIME_BASE);
 }
 
 irqreturn_t crime_memerr_intr(unsigned int irq, void *dev_id)
@@ -96,7 +96,7 @@ irqreturn_t crime_cpuerr_intr(unsigned int irq, void *dev_id)
         unsigned long addr = crime->cpu_error_addr & CRIME_CPU_ERROR_ADDR_MASK;
 
         addr <<= 2;
-        printk ("CRIME CPU error at 0x%09lx status 0x%08lx\n", addr, stat);
+        printk("CRIME CPU error at 0x%09lx status 0x%08lx\n", addr, stat);
         crime->cpu_error_stat = 0;
 
         return IRQ_HANDLED;
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c
index fb9da9acf53f..7f4b793c3df3 100644
--- a/arch/mips/sgi-ip32/ip32-irq.c
+++ b/arch/mips/sgi-ip32/ip32-irq.c
@@ -117,10 +117,18 @@ static void inline flush_mace_bus(void)
 extern irqreturn_t crime_memerr_intr(int irq, void *dev_id);
 extern irqreturn_t crime_cpuerr_intr(int irq, void *dev_id);
 
-struct irqaction memerr_irq = { crime_memerr_intr, IRQF_DISABLED,
-                        CPU_MASK_NONE, "CRIME memory error", NULL, NULL };
-struct irqaction cpuerr_irq = { crime_cpuerr_intr, IRQF_DISABLED,
-                        CPU_MASK_NONE, "CRIME CPU error", NULL, NULL };
+struct irqaction memerr_irq = {
+        .handler = crime_memerr_intr,
+        .flags = IRQF_DISABLED,
+        .mask = CPU_MASK_NONE,
+        .name = "CRIME memory error",
+};
+struct irqaction cpuerr_irq = {
+        .handler = crime_cpuerr_intr,
+        .flags = IRQF_DISABLED,
+        .mask = CPU_MASK_NONE,
+        .name = "CRIME CPU error",
+};
 
 /*
  * For interrupts wired from a single device to the CPU.  Only the clock
@@ -140,7 +148,7 @@ static void disable_cpu_irq(unsigned int irq)
 static void end_cpu_irq(unsigned int irq)
 {
         if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
-                enable_cpu_irq (irq);
+                enable_cpu_irq(irq);
 }
 
 static struct irq_chip ip32_cpu_interrupt = {
@@ -281,11 +289,11 @@ static struct irq_chip ip32_macepci_interrupt = {
 
 static unsigned long maceisa_mask;
 
-static void enable_maceisa_irq (unsigned int irq)
+static void enable_maceisa_irq(unsigned int irq)
 {
         unsigned int crime_int = 0;
 
-        DBG ("maceisa enable: %u\n", irq);
+        DBG("maceisa enable: %u\n", irq);
 
         switch (irq) {
         case MACEISA_AUDIO_SW_IRQ ... MACEISA_AUDIO3_MERR_IRQ:
@@ -298,7 +306,7 @@ static void enable_maceisa_irq (unsigned int irq)
                 crime_int = MACE_SUPERIO_INT;
                 break;
         }
-        DBG ("crime_int %08x enabled\n", crime_int);
+        DBG("crime_int %08x enabled\n", crime_int);
         crime_mask |= crime_int;
         crime->imask = crime_mask;
         maceisa_mask |= 1 << (irq - 33);
@@ -389,15 +397,15 @@ static struct irq_chip ip32_mace_interrupt = {
 
 static void ip32_unknown_interrupt(void)
 {
-        printk ("Unknown interrupt occurred!\n");
-        printk ("cp0_status: %08x\n", read_c0_status());
-        printk ("cp0_cause: %08x\n", read_c0_cause());
-        printk ("CRIME intr mask: %016lx\n", crime->imask);
-        printk ("CRIME intr status: %016lx\n", crime->istat);
-        printk ("CRIME hardware intr register: %016lx\n", crime->hard_int);
-        printk ("MACE ISA intr mask: %08lx\n", mace->perif.ctrl.imask);
-        printk ("MACE ISA intr status: %08lx\n", mace->perif.ctrl.istat);
-        printk ("MACE PCI control register: %08x\n", mace->pci.control);
+        printk("Unknown interrupt occurred!\n");
+        printk("cp0_status: %08x\n", read_c0_status());
+        printk("cp0_cause: %08x\n", read_c0_cause());
+        printk("CRIME intr mask: %016lx\n", crime->imask);
+        printk("CRIME intr status: %016lx\n", crime->istat);
+        printk("CRIME hardware intr register: %016lx\n", crime->hard_int);
+        printk("MACE ISA intr mask: %08lx\n", mace->perif.ctrl.imask);
+        printk("MACE ISA intr status: %08lx\n", mace->perif.ctrl.istat);
+        printk("MACE PCI control register: %08x\n", mace->pci.control);
 
         printk("Register dump:\n");
         show_regs(get_irq_regs());
@@ -449,7 +457,7 @@ static void ip32_irq4(void)
 
 static void ip32_irq5(void)
 {
-        ll_timer_interrupt(IP32_R4K_TIMER_IRQ);
+        do_IRQ(IP32_R4K_TIMER_IRQ);
 }
 
 asmlinkage void plat_irq_dispatch(void)
diff --git a/arch/mips/sgi-ip32/ip32-memory.c b/arch/mips/sgi-ip32/ip32-memory.c
index 849d392a0013..ca93ecf825ae 100644
--- a/arch/mips/sgi-ip32/ip32-memory.c
+++ b/arch/mips/sgi-ip32/ip32-memory.c
@@ -19,7 +19,7 @@
 
 extern void crime_init(void);
 
-void __init prom_meminit (void)
+void __init prom_meminit(void)
 {
         u64 base, size;
         int bank;
@@ -38,7 +38,7 @@ void __init prom_meminit (void)
 
                 printk("CRIME MC: bank %u base 0x%016lx size %luMiB\n",
                         bank, base, size >> 20);
-                add_memory_region (base, size, BOOT_MEM_RAM);
+                add_memory_region(base, size, BOOT_MEM_RAM);
         }
 }
 
diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c
index bbba066cb405..4125a5ba119e 100644
--- a/arch/mips/sgi-ip32/ip32-setup.c
+++ b/arch/mips/sgi-ip32/ip32-setup.c
@@ -62,10 +62,15 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
 }
 #endif
 
+unsigned long read_persistent_clock(void)
+{
+        return mc146818_get_cmos_time();
+}
+
 /* An arbitrary time; this can be decreased if reliability looks good */
 #define WAIT_MS 10
 
-void __init ip32_time_init(void)
+void __init plat_time_init(void)
 {
         printk(KERN_INFO "Calibrating system timer... ");
         write_c0_count(0);
@@ -85,11 +90,6 @@ void __init plat_mem_setup(void)
 {
         board_be_init = ip32_be_init;
 
-        rtc_mips_get_time = mc146818_get_cmos_time;
-        rtc_mips_set_mmss = mc146818_set_rtc_mmss;
-
-        board_time_init = ip32_time_init;
-
 #ifdef CONFIG_SGI_O2MACE_ETH
         {
                 char *mac = ArcGetEnvironmentVariable("eaddr");
diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig
index fdd7bd98fb44..e8fb880272bd 100644
--- a/arch/mips/sibyte/Kconfig
+++ b/arch/mips/sibyte/Kconfig
@@ -1,6 +1,7 @@
 config SIBYTE_SB1250
         bool
         select HW_HAS_PCI
+        select IRQ_CPU
         select SIBYTE_ENABLE_LDT_IF_PCI
         select SIBYTE_HAS_ZBUS_PROFILING
         select SIBYTE_SB1xxx_SOC
@@ -8,6 +9,7 @@ config SIBYTE_SB1250
 
 config SIBYTE_BCM1120
         bool
+        select IRQ_CPU
         select SIBYTE_BCM112X
         select SIBYTE_HAS_ZBUS_PROFILING
         select SIBYTE_SB1xxx_SOC
@@ -15,6 +17,7 @@ config SIBYTE_BCM1120
 config SIBYTE_BCM1125
         bool
         select HW_HAS_PCI
+        select IRQ_CPU
         select SIBYTE_BCM112X
         select SIBYTE_HAS_ZBUS_PROFILING
         select SIBYTE_SB1xxx_SOC
@@ -22,6 +25,7 @@ config SIBYTE_BCM1125
 config SIBYTE_BCM1125H
         bool
         select HW_HAS_PCI
+        select IRQ_CPU
         select SIBYTE_BCM112X
         select SIBYTE_ENABLE_LDT_IF_PCI
         select SIBYTE_HAS_ZBUS_PROFILING
@@ -29,12 +33,14 @@ config SIBYTE_BCM1125H
 
 config SIBYTE_BCM112X
         bool
+        select IRQ_CPU
         select SIBYTE_SB1xxx_SOC
         select SIBYTE_HAS_ZBUS_PROFILING
 
 config SIBYTE_BCM1x80
         bool
         select HW_HAS_PCI
+        select IRQ_CPU
         select SIBYTE_HAS_ZBUS_PROFILING
         select SIBYTE_SB1xxx_SOC
         select SYS_SUPPORTS_SMP
@@ -42,6 +48,7 @@ config SIBYTE_BCM1x80
 config SIBYTE_BCM1x55
         bool
         select HW_HAS_PCI
+        select IRQ_CPU
         select SIBYTE_SB1xxx_SOC
         select SIBYTE_HAS_ZBUS_PROFILING
         select SYS_SUPPORTS_SMP
@@ -49,6 +56,7 @@ config SIBYTE_BCM1x55
 config SIBYTE_SB1xxx_SOC
         bool
         select DMA_COHERENT
+        select IRQ_CPU
         select SIBYTE_CFE
         select SWAP_IO_SPACE
         select SYS_SUPPORTS_32BIT_KERNEL
@@ -124,6 +132,7 @@ config SB1_CERR_STALL
 config SIBYTE_CFE
         bool "Booting from CFE"
         depends on SIBYTE_SB1xxx_SOC
+        select CFE
         select SYS_HAS_EARLY_PRINTK
         help
           Make use of the CFE API for enumerating available memory,
@@ -165,10 +174,6 @@ config SIBYTE_BW_TRACE
           buffer activity.  Raw buffer data is dumped to console, and
           must be processed off-line.
 
-config SIBYTE_SB1250_PROF
-        bool "Support for SB1/SOC profiling - SB1/SCD perf counters"
-        depends on SIBYTE_SB1xxx_SOC
-
 config SIBYTE_TBPROF
         tristate "Support for ZBbus profiling"
         depends on SIBYTE_HAS_ZBUS_PROFILING
diff --git a/arch/mips/sibyte/bcm1480/irq.c b/arch/mips/sibyte/bcm1480/irq.c
index e729b5f30264..7aa79bf63c4a 100644
--- a/arch/mips/sibyte/bcm1480/irq.c
+++ b/arch/mips/sibyte/bcm1480/irq.c
@@ -289,7 +289,7 @@ int bcm1480_steal_irq(int irq)
         if (irq >= BCM1480_NR_IRQS)
                 return -EINVAL;
 
-        spin_lock_irqsave(&desc->lock,flags);
+        spin_lock_irqsave(&desc->lock, flags);
         /* Don't allow sharing at all for these */
         if (desc->action != NULL)
                 retval = -EBUSY;
@@ -297,7 +297,7 @@ int bcm1480_steal_irq(int irq)
                 desc->action = &bcm1480_dummy_action;
                 desc->depth = 0;
         }
-        spin_unlock_irqrestore(&desc->lock,flags);
+        spin_unlock_irqrestore(&desc->lock, flags);
         return 0;
 }
 
@@ -431,8 +431,8 @@ void __init arch_init_irq(void)
 
 #include <linux/delay.h>
 
-#define duart_out(reg, val)     csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port,reg)))
-#define duart_in(reg)           csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port,reg)))
+#define duart_out(reg, val)     csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
+#define duart_in(reg)           csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
 
 static void bcm1480_kgdb_interrupt(void)
 {
@@ -450,7 +450,6 @@ static void bcm1480_kgdb_interrupt(void)
 
 #endif  /* CONFIG_KGDB */
 
-extern void bcm1480_timer_interrupt(void);
 extern void bcm1480_mailbox_interrupt(void);
 
 asmlinkage void plat_irq_dispatch(void)
@@ -470,8 +469,16 @@ asmlinkage void plat_irq_dispatch(void)
         else
 #endif
 
-        if (pending & CAUSEF_IP4)
-                bcm1480_timer_interrupt();
+        if (pending & CAUSEF_IP4) {
+                int cpu = smp_processor_id();
+                int irq = K_BCM1480_INT_TIMER_0 + cpu;
+
+                /* Reset the timer */
+                __raw_writeq(M_SCD_TIMER_ENABLE|M_SCD_TIMER_MODE_CONTINUOUS,
+                            IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
+
+                do_IRQ(irq);
+        }
 
 #ifdef CONFIG_SMP
         else if (pending & CAUSEF_IP3)
diff --git a/arch/mips/sibyte/bcm1480/setup.c b/arch/mips/sibyte/bcm1480/setup.c
index 7e1aa348b8e0..05ed92c92b69 100644
--- a/arch/mips/sibyte/bcm1480/setup.c
+++ b/arch/mips/sibyte/bcm1480/setup.c
@@ -43,16 +43,49 @@ static unsigned int part_type;
 static char *soc_str;
 static char *pass_str;
 
-static inline int setup_bcm1x80_bcm1x55(void);
+static int __init setup_bcm1x80_bcm1x55(void)
+{
+        int ret = 0;
+
+        switch (soc_pass) {
+        case K_SYS_REVISION_BCM1480_S0:
+                periph_rev = 1;
+                pass_str = "S0 (pass1)";
+                break;
+        case K_SYS_REVISION_BCM1480_A1:
+                periph_rev = 1;
+                pass_str = "A1 (pass1)";
+                break;
+        case K_SYS_REVISION_BCM1480_A2:
+                periph_rev = 1;
+                pass_str = "A2 (pass1)";
+                break;
+        case K_SYS_REVISION_BCM1480_A3:
+                periph_rev = 1;
+                pass_str = "A3 (pass1)";
+                break;
+        case K_SYS_REVISION_BCM1480_B0:
+                periph_rev = 1;
+                pass_str = "B0 (pass2)";
+                break;
+        default:
+                printk("Unknown %s rev %x\n", soc_str, soc_pass);
+                periph_rev = 1;
+                pass_str = "Unknown Revision";
+                break;
+        }
+
+        return ret;
+}
 
 /* Setup code likely to be common to all SiByte platforms */
 
-static inline int sys_rev_decode(void)
+static int __init sys_rev_decode(void)
 {
         int ret = 0;
 
         switch (soc_type) {
-            case K_SYS_SOC_TYPE_BCM1x80:
+        case K_SYS_SOC_TYPE_BCM1x80:
                 if (part_type == K_SYS_PART_BCM1480)
                     soc_str = "BCM1480";
                 else if (part_type == K_SYS_PART_BCM1280)
@@ -62,7 +95,7 @@ static inline int sys_rev_decode(void)
                 ret = setup_bcm1x80_bcm1x55();
                 break;
 
-            case K_SYS_SOC_TYPE_BCM1x55:
+        case K_SYS_SOC_TYPE_BCM1x55:
                 if (part_type == K_SYS_PART_BCM1455)
                     soc_str = "BCM1455";
                 else if (part_type == K_SYS_PART_BCM1255)
@@ -72,49 +105,16 @@ static inline int sys_rev_decode(void)
                 ret = setup_bcm1x80_bcm1x55();
                 break;
 
-            default:
+        default:
                 printk("Unknown part type %x\n", part_type);
                 ret = 1;
                 break;
         }
-        return ret;
-}
 
-static inline int setup_bcm1x80_bcm1x55(void)
-{
-        int ret = 0;
-
-        switch (soc_pass) {
-            case K_SYS_REVISION_BCM1480_S0:
-                periph_rev = 1;
-                pass_str = "S0 (pass1)";
-                break;
-            case K_SYS_REVISION_BCM1480_A1:
-                periph_rev = 1;
-                pass_str = "A1 (pass1)";
-                break;
-            case K_SYS_REVISION_BCM1480_A2:
-                periph_rev = 1;
-                pass_str = "A2 (pass1)";
-                break;
-            case K_SYS_REVISION_BCM1480_A3:
-                periph_rev = 1;
-                pass_str = "A3 (pass1)";
-                break;
-            case K_SYS_REVISION_BCM1480_B0:
-                periph_rev = 1;
-                pass_str = "B0 (pass2)";
-                break;
-            default:
-                printk("Unknown %s rev %x\n", soc_str, soc_pass);
-                periph_rev = 1;
-                pass_str = "Unknown Revision";
-                break;
-        }
         return ret;
 }
 
-void bcm1480_setup(void)
+void __init bcm1480_setup(void)
 {
         uint64_t sys_rev;
         int plldiv;
diff --git a/arch/mips/sibyte/bcm1480/time.c b/arch/mips/sibyte/bcm1480/time.c
index 6f3f71bf4244..40d7126cd5bf 100644
--- a/arch/mips/sibyte/bcm1480/time.c
+++ b/arch/mips/sibyte/bcm1480/time.c
@@ -25,6 +25,7 @@
  * code to do general bookkeeping (e.g. update jiffies, run
  * bottom halves, etc.)
  */
+#include <linux/clockchips.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
@@ -55,15 +56,12 @@
 
 extern int bcm1480_steal_irq(int irq);
 
-void bcm1480_time_init(void)
+void __init plat_time_init(void)
 {
-        int cpu = smp_processor_id();
-        int irq = K_BCM1480_INT_TIMER_0+cpu;
+        unsigned int cpu = smp_processor_id();
+        unsigned int irq = K_BCM1480_INT_TIMER_0 + cpu;
 
-        /* Only have 4 general purpose timers */
-        if (cpu > 3) {
-                BUG();
-        }
+        BUG_ON(cpu > 3);        /* Only have 4 general purpose timers */
 
         bcm1480_mask_irq(cpu, irq);
 
@@ -71,27 +69,83 @@ void bcm1480_time_init(void)
         __raw_writeq(IMR_IP4_VAL, IOADDR(A_BCM1480_IMR_REGISTER(cpu, R_BCM1480_IMR_INTERRUPT_MAP_BASE_H)
               + (irq<<3)));
 
-        /* the general purpose timer ticks at 1 Mhz independent of the rest of the system */
-        /* Disable the timer and set up the count */
-        __raw_writeq(0, IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
-        __raw_writeq(
-                BCM1480_HPT_VALUE/HZ
-                , IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT)));
+        bcm1480_unmask_irq(cpu, irq);
+        bcm1480_steal_irq(irq);
+}
+
+/*
+ * The general purpose timer ticks at 1 Mhz independent if
+ * the rest of the system
+ */
+static void sibyte_set_mode(enum clock_event_mode mode,
+                           struct clock_event_device *evt)
+{
+        unsigned int cpu = smp_processor_id();
+        void __iomem *timer_cfg, *timer_init;
+
+        timer_cfg = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));
+        timer_init = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));
+
+        switch (mode) {
+        case CLOCK_EVT_MODE_PERIODIC:
+                __raw_writeq(0, timer_cfg);
+                __raw_writeq(BCM1480_HPT_VALUE / HZ - 1, timer_init);
+                __raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
+                             timer_cfg);
+                break;
+
+        case CLOCK_EVT_MODE_ONESHOT:
+                /* Stop the timer until we actually program a shot */
+        case CLOCK_EVT_MODE_SHUTDOWN:
+                __raw_writeq(0, timer_cfg);
+                break;
+
+        case CLOCK_EVT_MODE_UNUSED:     /* shuddup gcc */
+                ;
+        }
+}
+
+struct clock_event_device sibyte_hpt_clockevent = {
+        .name           = "bcm1480-counter",
+        .features       = CLOCK_EVT_FEAT_PERIODIC,
+        .set_mode       = sibyte_set_mode,
+        .shift          = 32,
+        .irq            = 0,
+};
+
+static irqreturn_t sibyte_counter_handler(int irq, void *dev_id)
+{
+        struct clock_event_device *cd = &sibyte_hpt_clockevent;
+        unsigned int cpu = smp_processor_id();
 
-        /* Set the timer running */
+        /* Reset the timer */
         __raw_writeq(M_SCD_TIMER_ENABLE|M_SCD_TIMER_MODE_CONTINUOUS,
-              IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
+                     IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
+        cd->event_handler(cd);
 
-        bcm1480_unmask_irq(cpu, irq);
-        bcm1480_steal_irq(irq);
-        /*
-         * This interrupt is "special" in that it doesn't use the request_irq
-         * way to hook the irq line.  The timer interrupt is initialized early
-         * enough to make this a major pain, and it's also firing enough to
-         * warrant a bit of special case code.  bcm1480_timer_interrupt is
-         * called directly from irq_handler.S when IP[4] is set during an
-         * interrupt
-         */
+        return IRQ_HANDLED;
+}
+
+static struct irqaction sibyte_counter_irqaction = {
+        .handler        = sibyte_counter_handler,
+        .flags          = IRQF_DISABLED | IRQF_PERCPU,
+        .name           = "timer",
+};
+
+/*
+ * This interrupt is "special" in that it doesn't use the request_irq
+ * way to hook the irq line.  The timer interrupt is initialized early
+ * enough to make this a major pain, and it's also firing enough to
+ * warrant a bit of special case code.  bcm1480_timer_interrupt is
+ * called directly from irq_handler.S when IP[4] is set during an
+ * interrupt
+ */
+static void __init sb1480_clockevent_init(void)
+{
+        unsigned int cpu = smp_processor_id();
+        unsigned int irq = K_BCM1480_INT_TIMER_0 + cpu;
+
+        setup_irq(irq, &sibyte_counter_irqaction);
 }
 
 void bcm1480_timer_interrupt(void)
@@ -103,18 +157,7 @@ void bcm1480_timer_interrupt(void)
         __raw_writeq(M_SCD_TIMER_ENABLE|M_SCD_TIMER_MODE_CONTINUOUS,
               IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
 
-        if (cpu == 0) {
-                /*
-                 * CPU 0 handles the global timer interrupt job
-                 */
-                ll_timer_interrupt(irq);
-        }
-        else {
-                /*
-                 * other CPUs should just do profiling and process accounting
-                 */
-                ll_local_timer_interrupt(irq);
-        }
+        ll_timer_interrupt(irq);
 }
 
 static cycle_t bcm1480_hpt_read(void)
@@ -129,4 +172,5 @@ void __init bcm1480_hpt_setup(void)
 {
         clocksource_mips.read = bcm1480_hpt_read;
         mips_hpt_frequency = BCM1480_HPT_VALUE;
+        sb1480_clockevent_init();
 }
diff --git a/arch/mips/sibyte/cfe/Makefile b/arch/mips/sibyte/cfe/Makefile
index 059d84a1d8a8..a1214937b705 100644
--- a/arch/mips/sibyte/cfe/Makefile
+++ b/arch/mips/sibyte/cfe/Makefile
@@ -1,3 +1,3 @@
-lib-y                                   = cfe_api.o setup.o
+lib-y                                   = setup.o
 lib-$(CONFIG_SMP)                       += smp.o
 lib-$(CONFIG_SIBYTE_CFE_CONSOLE)        += console.o
diff --git a/arch/mips/sibyte/cfe/cfe_api.h b/arch/mips/sibyte/cfe/cfe_api.h
deleted file mode 100644
index d8230cc53b81..000000000000
--- a/arch/mips/sibyte/cfe/cfe_api.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (C) 2000, 2001, 2002 Broadcom 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.
- *
- * 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.
- */
-
-/*  *********************************************************************
-    *
-    *  Broadcom Common Firmware Environment (CFE)
-    *
-    *  Device function prototypes               File: cfe_api.h
-    *
-    *  This file contains declarations for doing callbacks to
-    *  cfe from an application.  It should be the only header
-    *  needed by the application to use this library
-    *
-    *  Authors:  Mitch Lichtenberg, Chris Demetriou
-    *
-    ********************************************************************* */
-
-#ifndef CFE_API_H
-#define CFE_API_H
-
-/*
- * Apply customizations here for different OSes.  These need to:
- *      * typedef uint64_t, int64_t, intptr_t, uintptr_t.
- *      * define cfe_strlen() if use of an existing function is desired.
- *      * define CFE_API_IMPL_NAMESPACE if API functions are to use
- *        names in the implementation namespace.
- * Also, optionally, if the build environment does not do so automatically,
- * CFE_API_* can be defined here as desired.
- */
-/* Begin customization. */
-#include <linux/types.h>
-#include <linux/string.h>
-
-typedef long intptr_t;
-
-#define cfe_strlen strlen
-
-#define CFE_API_ALL
-#define CFE_API_STRLEN_CUSTOM
-/* End customization. */
-
-
-/*  *********************************************************************
-    *  Constants
-    ********************************************************************* */
-
-/* Seal indicating CFE's presence, passed to user program. */
-#define CFE_EPTSEAL 0x43464531
-
-#define CFE_MI_RESERVED 0       /* memory is reserved, do not use */
-#define CFE_MI_AVAILABLE 1      /* memory is available */
-
-#define CFE_FLG_WARMSTART     0x00000001
-#define CFE_FLG_FULL_ARENA    0x00000001
-#define CFE_FLG_ENV_PERMANENT 0x00000001
-
-#define CFE_CPU_CMD_START 1
-#define CFE_CPU_CMD_STOP 0
-
-#define CFE_STDHANDLE_CONSOLE   0
-
-#define CFE_DEV_NETWORK         1
-#define CFE_DEV_DISK            2
-#define CFE_DEV_FLASH           3
-#define CFE_DEV_SERIAL          4
-#define CFE_DEV_CPU             5
-#define CFE_DEV_NVRAM           6
-#define CFE_DEV_CLOCK           7
-#define CFE_DEV_OTHER           8
-#define CFE_DEV_MASK            0x0F
-
-#define CFE_CACHE_FLUSH_D       1
-#define CFE_CACHE_INVAL_I       2
-#define CFE_CACHE_INVAL_D       4
-#define CFE_CACHE_INVAL_L2      8
-
-#define CFE_FWI_64BIT           0x00000001
-#define CFE_FWI_32BIT           0x00000002
-#define CFE_FWI_RELOC           0x00000004
-#define CFE_FWI_UNCACHED        0x00000008
-#define CFE_FWI_MULTICPU        0x00000010
-#define CFE_FWI_FUNCSIM         0x00000020
-#define CFE_FWI_RTLSIM          0x00000040
-
-typedef struct {
-        int64_t fwi_version;            /* major, minor, eco version */
-        int64_t fwi_totalmem;           /* total installed mem */
-        int64_t fwi_flags;              /* various flags */
-        int64_t fwi_boardid;            /* board ID */
-        int64_t fwi_bootarea_va;        /* VA of boot area */
-        int64_t fwi_bootarea_pa;        /* PA of boot area */
-        int64_t fwi_bootarea_size;      /* size of boot area */
-} cfe_fwinfo_t;
-
-
-/*
- * cfe_strlen is handled specially: If already defined, it has been
- * overridden in this environment with a standard strlen-like function.
- */
-#ifdef cfe_strlen
-# define CFE_API_STRLEN_CUSTOM
-#else
-# ifdef CFE_API_IMPL_NAMESPACE
-#  define cfe_strlen(a)                 __cfe_strlen(a)
-# endif
-int cfe_strlen(char *name);
-#endif
-
-/*
- * Defines and prototypes for functions which take no arguments.
- */
-#ifdef CFE_API_IMPL_NAMESPACE
-int64_t __cfe_getticks(void);
-#define cfe_getticks()                  __cfe_getticks()
-#else
-int64_t cfe_getticks(void);
-#endif
-
-/*
- * Defines and prototypes for the rest of the functions.
- */
-#ifdef CFE_API_IMPL_NAMESPACE
-#define cfe_close(a)                    __cfe_close(a)
-#define cfe_cpu_start(a,b,c,d,e)        __cfe_cpu_start(a,b,c,d,e)
-#define cfe_cpu_stop(a)                 __cfe_cpu_stop(a)
-#define cfe_enumenv(a,b,d,e,f)          __cfe_enumenv(a,b,d,e,f)
-#define cfe_enummem(a,b,c,d,e)          __cfe_enummem(a,b,c,d,e)
-#define cfe_exit(a,b)                   __cfe_exit(a,b)
-#define cfe_flushcache(a)               __cfe_cacheflush(a)
-#define cfe_getdevinfo(a)               __cfe_getdevinfo(a)
-#define cfe_getenv(a,b,c)               __cfe_getenv(a,b,c)
-#define cfe_getfwinfo(a)                __cfe_getfwinfo(a)
-#define cfe_getstdhandle(a)             __cfe_getstdhandle(a)
-#define cfe_init(a,b)                   __cfe_init(a,b)
-#define cfe_inpstat(a)                  __cfe_inpstat(a)
-#define cfe_ioctl(a,b,c,d,e,f)          __cfe_ioctl(a,b,c,d,e,f)
-#define cfe_open(a)                     __cfe_open(a)
-#define cfe_read(a,b,c)                 __cfe_read(a,b,c)
-#define cfe_readblk(a,b,c,d)            __cfe_readblk(a,b,c,d)
-#define cfe_setenv(a,b)                 __cfe_setenv(a,b)
-#define cfe_write(a,b,c)                __cfe_write(a,b,c)
-#define cfe_writeblk(a,b,c,d)           __cfe_writeblk(a,b,c,d)
-#endif                          /* CFE_API_IMPL_NAMESPACE */
-
-int cfe_close(int handle);
-int cfe_cpu_start(int cpu, void (*fn) (void), long sp, long gp, long a1);
-int cfe_cpu_stop(int cpu);
-int cfe_enumenv(int idx, char *name, int namelen, char *val, int vallen);
-int cfe_enummem(int idx, int flags, uint64_t * start, uint64_t * length,
-                uint64_t * type);
-int cfe_exit(int warm, int status);
-int cfe_flushcache(int flg);
-int cfe_getdevinfo(char *name);
-int cfe_getenv(char *name, char *dest, int destlen);
-int cfe_getfwinfo(cfe_fwinfo_t * info);
-int cfe_getstdhandle(int flg);
-int cfe_init(uint64_t handle, uint64_t ept);
-int cfe_inpstat(int handle);
-int cfe_ioctl(int handle, unsigned int ioctlnum, unsigned char *buffer,
-              int length, int *retlen, uint64_t offset);
-int cfe_open(char *name);
-int cfe_read(int handle, unsigned char *buffer, int length);
-int cfe_readblk(int handle, int64_t offset, unsigned char *buffer,
-                int length);
-int cfe_setenv(char *name, char *val);
-int cfe_write(int handle, unsigned char *buffer, int length);
-int cfe_writeblk(int handle, int64_t offset, unsigned char *buffer,
-                 int length);
-
-#endif                          /* CFE_API_H */
diff --git a/arch/mips/sibyte/cfe/cfe_error.h b/arch/mips/sibyte/cfe/cfe_error.h
deleted file mode 100644
index 975f00002cbe..000000000000
--- a/arch/mips/sibyte/cfe/cfe_error.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2000, 2001, 2002 Broadcom 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.
- *
- * 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.
- */
-
-/*  *********************************************************************
-    *
-    *  Broadcom Common Firmware Environment (CFE)
-    *
-    *  Error codes                              File: cfe_error.h
-    *
-    *  CFE's global error code list is here.
-    *
-    *  Author:  Mitch Lichtenberg
-    *
-    ********************************************************************* */
-
-
-#define CFE_OK                   0
-#define CFE_ERR                 -1      /* generic error */
-#define CFE_ERR_INV_COMMAND     -2
-#define CFE_ERR_EOF             -3
-#define CFE_ERR_IOERR           -4
-#define CFE_ERR_NOMEM           -5
-#define CFE_ERR_DEVNOTFOUND     -6
-#define CFE_ERR_DEVOPEN         -7
-#define CFE_ERR_INV_PARAM       -8
-#define CFE_ERR_ENVNOTFOUND     -9
-#define CFE_ERR_ENVREADONLY     -10
-
-#define CFE_ERR_NOTELF          -11
-#define CFE_ERR_NOT32BIT        -12
-#define CFE_ERR_WRONGENDIAN     -13
-#define CFE_ERR_BADELFVERS      -14
-#define CFE_ERR_NOTMIPS         -15
-#define CFE_ERR_BADELFFMT       -16
-#define CFE_ERR_BADADDR         -17
-
-#define CFE_ERR_FILENOTFOUND    -18
-#define CFE_ERR_UNSUPPORTED     -19
-
-#define CFE_ERR_HOSTUNKNOWN     -20
-
-#define CFE_ERR_TIMEOUT         -21
-
-#define CFE_ERR_PROTOCOLERR     -22
-
-#define CFE_ERR_NETDOWN         -23
-#define CFE_ERR_NONAMESERVER    -24
-
-#define CFE_ERR_NOHANDLES       -25
-#define CFE_ERR_ALREADYBOUND    -26
-
-#define CFE_ERR_CANNOTSET       -27
-#define CFE_ERR_NOMORE          -28
-#define CFE_ERR_BADFILESYS      -29
-#define CFE_ERR_FSNOTAVAIL      -30
-
-#define CFE_ERR_INVBOOTBLOCK    -31
-#define CFE_ERR_WRONGDEVTYPE    -32
-#define CFE_ERR_BBCHECKSUM      -33
-#define CFE_ERR_BOOTPROGCHKSUM  -34
-
-#define CFE_ERR_LDRNOTAVAIL     -35
-
-#define CFE_ERR_NOTREADY        -36
-
-#define CFE_ERR_GETMEM          -37
-#define CFE_ERR_SETMEM          -38
-
-#define CFE_ERR_NOTCONN         -39
-#define CFE_ERR_ADDRINUSE       -40
diff --git a/arch/mips/sibyte/cfe/console.c b/arch/mips/sibyte/cfe/console.c
index 4cec9d798d2f..81e3d54376e9 100644
--- a/arch/mips/sibyte/cfe/console.c
+++ b/arch/mips/sibyte/cfe/console.c
@@ -4,8 +4,8 @@
 
 #include <asm/sibyte/board.h>
 
-#include "cfe_api.h"
-#include "cfe_error.h"
+#include <asm/fw/cfe/cfe_api.h>
+#include <asm/fw/cfe/cfe_error.h>
 
 extern int cfe_cons_handle;
 
@@ -14,7 +14,7 @@ static void cfe_console_write(struct console *cons, const char *str,
 {
         int i, last, written;
 
-        for (i=0,last=0; i<count; i++) {
+        for (i=0, last=0; i<count; i++) {
                 if (!str[i])
                         /* XXXKW can/should this ever happen? */
                         return;
diff --git a/arch/mips/sibyte/cfe/setup.c b/arch/mips/sibyte/cfe/setup.c
index 51898dd1304a..dbd6e6fdd3f9 100644
--- a/arch/mips/sibyte/cfe/setup.c
+++ b/arch/mips/sibyte/cfe/setup.c
@@ -29,8 +29,8 @@
 #include <asm/reboot.h>
 #include <asm/sibyte/board.h>
 
-#include "cfe_api.h"
-#include "cfe_error.h"
+#include <asm/fw/cfe/cfe_api.h>
+#include <asm/fw/cfe/cfe_error.h>
 
 /* Max ram addressable in 32-bit segments */
 #ifdef CONFIG_64BIT
@@ -309,7 +309,7 @@ void __init prom_init(void)
         }
 
 #ifdef CONFIG_KGDB
-        if ((arg = strstr(arcs_cmdline,"kgdb=duart")) != NULL)
+        if ((arg = strstr(arcs_cmdline, "kgdb=duart")) != NULL)
                 kgdb_port = (arg[10] == '0') ? 0 : 1;
         else
                 kgdb_port = 1;
@@ -339,7 +339,6 @@ void __init prom_init(void)
         /* Not sure this is needed, but it's the safe way. */
         arcs_cmdline[CL_SIZE-1] = 0;
 
-        mips_machgroup = MACH_GROUP_SIBYTE;
         prom_meminit();
 }
 
diff --git a/arch/mips/sibyte/cfe/smp.c b/arch/mips/sibyte/cfe/smp.c
index 5de4cff9d14a..534a62912f21 100644
--- a/arch/mips/sibyte/cfe/smp.c
+++ b/arch/mips/sibyte/cfe/smp.c
@@ -21,8 +21,8 @@
 #include <linux/smp.h>
 #include <asm/processor.h>
 
-#include "cfe_api.h"
-#include "cfe_error.h"
+#include <asm/fw/cfe/cfe_api.h>
+#include <asm/fw/cfe/cfe_error.h>
 
 /*
  * Use CFE to find out how many CPUs are available, setting up
diff --git a/arch/mips/sibyte/common/Makefile b/arch/mips/sibyte/common/Makefile
index f8ae30066a05..48a91b9e5870 100644
--- a/arch/mips/sibyte/common/Makefile
+++ b/arch/mips/sibyte/common/Makefile
@@ -2,5 +2,4 @@ obj-y :=
 
 obj-$(CONFIG_SIBYTE_TBPROF)             += sb_tbprof.o
 
-EXTRA_AFLAGS := $(CFLAGS)
 EXTRA_CFLAGS += -Werror
diff --git a/arch/mips/sibyte/common/sb_tbprof.c b/arch/mips/sibyte/common/sb_tbprof.c
index 4fcdaa8ba514..63b444eaf01e 100644
--- a/arch/mips/sibyte/common/sb_tbprof.c
+++ b/arch/mips/sibyte/common/sb_tbprof.c
@@ -276,8 +276,8 @@ static int sbprof_zbprof_start(struct file *filp)
         sbp.next_tb_sample = 0;
         filp->f_pos = 0;
 
-        err = request_irq (K_INT_TRACE_FREEZE, sbprof_tb_intr, 0,
-                           DEVNAME " trace freeze", &sbp);
+        err = request_irq(K_INT_TRACE_FREEZE, sbprof_tb_intr, 0,
+                          DEVNAME " trace freeze", &sbp);
         if (err)
                 return -EBUSY;
 
diff --git a/arch/mips/sibyte/sb1250/irq.c b/arch/mips/sibyte/sb1250/irq.c
index ad593a6c20be..7659174819c6 100644
--- a/arch/mips/sibyte/sb1250/irq.c
+++ b/arch/mips/sibyte/sb1250/irq.c
@@ -28,6 +28,7 @@
 #include <asm/errno.h>
 #include <asm/signal.h>
 #include <asm/system.h>
+#include <asm/time.h>
 #include <asm/io.h>
 
 #include <asm/sibyte/sb1250_regs.h>
@@ -258,7 +259,7 @@ int sb1250_steal_irq(int irq)
         if (irq >= SB1250_NR_IRQS)
                 return -EINVAL;
 
-        spin_lock_irqsave(&desc->lock,flags);
+        spin_lock_irqsave(&desc->lock, flags);
         /* Don't allow sharing at all for these */
         if (desc->action != NULL)
                 retval = -EBUSY;
@@ -266,7 +267,7 @@ int sb1250_steal_irq(int irq)
                 desc->action = &sb1250_dummy_action;
                 desc->depth = 0;
         }
-        spin_unlock_irqrestore(&desc->lock,flags);
+        spin_unlock_irqrestore(&desc->lock, flags);
         return 0;
 }
 
@@ -380,8 +381,8 @@ void __init arch_init_irq(void)
 
 #include <linux/delay.h>
 
-#define duart_out(reg, val)     csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port,reg)))
-#define duart_in(reg)           csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port,reg)))
+#define duart_out(reg, val)     csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
+#define duart_in(reg)           csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
 
 static void sb1250_kgdb_interrupt(void)
 {
@@ -399,18 +400,45 @@ static void sb1250_kgdb_interrupt(void)
 
 #endif  /* CONFIG_KGDB */
 
-extern void sb1250_timer_interrupt(void);
+static inline void sb1250_timer_interrupt(void)
+{
+        int cpu = smp_processor_id();
+        int irq = K_INT_TIMER_0 + cpu;
+
+        irq_enter();
+        kstat_this_cpu.irqs[irq]++;
+
+        write_seqlock(&xtime_lock);
+
+        /* ACK interrupt */
+        ____raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
+                       IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
+
+        /*
+         * call the generic timer interrupt handling
+         */
+        do_timer(1);
+
+        write_sequnlock(&xtime_lock);
+
+        /*
+         * In UP mode, we call local_timer_interrupt() to do profiling
+         * and process accouting.
+         *
+         * In SMP mode, local_timer_interrupt() is invoked by appropriate
+         * low-level local timer interrupt handler.
+         */
+        local_timer_interrupt(irq);
+
+        irq_exit();
+}
+
 extern void sb1250_mailbox_interrupt(void);
 
 asmlinkage void plat_irq_dispatch(void)
 {
         unsigned int pending;
 
-#ifdef CONFIG_SIBYTE_SB1250_PROF
-        /* Set compare to count to silence count/compare timer interrupts */
-        write_c0_compare(read_c0_count());
-#endif
-
         /*
          * What a pain. We have to be really careful saving the upper 32 bits
          * of any * register across function calls if we don't want them
@@ -423,13 +451,9 @@ asmlinkage void plat_irq_dispatch(void)
 
         pending = read_c0_cause() & read_c0_status() & ST0_IM;
 
-#ifdef CONFIG_SIBYTE_SB1250_PROF
-        if (pending & CAUSEF_IP7) /* Cpu performance counter interrupt */
-                sbprof_cpu_intr();
-        else
-#endif
-
-        if (pending & CAUSEF_IP4)
+        if (pending & CAUSEF_IP7) /* CPU performance counter interrupt */
+                do_IRQ(MIPS_CPU_IRQ_BASE + 7);
+        else if (pending & CAUSEF_IP4)
                 sb1250_timer_interrupt();
 
 #ifdef CONFIG_SMP
diff --git a/arch/mips/sibyte/sb1250/prom.c b/arch/mips/sibyte/sb1250/prom.c
index 257c4e674353..cf8f6b3de86c 100644
--- a/arch/mips/sibyte/sb1250/prom.c
+++ b/arch/mips/sibyte/sb1250/prom.c
@@ -66,7 +66,7 @@ static void prom_linux_exit(void)
 {
 #ifdef CONFIG_SMP
         if (smp_processor_id()) {
-                smp_call_function(prom_cpu0_exit,NULL,1,1);
+                smp_call_function(prom_cpu0_exit, NULL, 1, 1);
         }
 #endif
         while(1);
@@ -83,7 +83,6 @@ void __init prom_init(void)
 
         strcpy(arcs_cmdline, "root=/dev/ram0 ");
 
-        mips_machgroup = MACH_GROUP_SIBYTE;
         prom_meminit();
 }
 
diff --git a/arch/mips/sibyte/sb1250/setup.c b/arch/mips/sibyte/sb1250/setup.c
index 2d5c6d8b41f2..0444da1e23c2 100644
--- a/arch/mips/sibyte/sb1250/setup.c
+++ b/arch/mips/sibyte/sb1250/setup.c
@@ -40,43 +40,6 @@ static char *soc_str;
 static char *pass_str;
 static unsigned int war_pass;   /* XXXKW don't overload PASS defines? */
 
-static inline int setup_bcm1250(void);
-static inline int setup_bcm112x(void);
-
-/* Setup code likely to be common to all SiByte platforms */
-
-static int __init sys_rev_decode(void)
-{
-        int ret = 0;
-
-        war_pass = soc_pass;
-        switch (soc_type) {
-        case K_SYS_SOC_TYPE_BCM1250:
-        case K_SYS_SOC_TYPE_BCM1250_ALT:
-        case K_SYS_SOC_TYPE_BCM1250_ALT2:
-                soc_str = "BCM1250";
-                ret = setup_bcm1250();
-                break;
-        case K_SYS_SOC_TYPE_BCM1120:
-                soc_str = "BCM1120";
-                ret = setup_bcm112x();
-                break;
-        case K_SYS_SOC_TYPE_BCM1125:
-                soc_str = "BCM1125";
-                ret = setup_bcm112x();
-                break;
-        case K_SYS_SOC_TYPE_BCM1125H:
-                soc_str = "BCM1125H";
-                ret = setup_bcm112x();
-                break;
-        default:
-                printk("Unknown SOC type %x\n", soc_type);
-                ret = 1;
-                break;
-        }
-        return ret;
-}
-
 static int __init setup_bcm1250(void)
 {
         int ret = 0;
@@ -120,6 +83,7 @@ static int __init setup_bcm1250(void)
                 }
                 break;
         }
+
         return ret;
 }
 
@@ -158,6 +122,42 @@ static int __init setup_bcm112x(void)
                 printk("Unknown %s rev %x\n", soc_str, soc_pass);
                 ret = 1;
         }
+
+        return ret;
+}
+
+/* Setup code likely to be common to all SiByte platforms */
+
+static int __init sys_rev_decode(void)
+{
+        int ret = 0;
+
+        war_pass = soc_pass;
+        switch (soc_type) {
+        case K_SYS_SOC_TYPE_BCM1250:
+        case K_SYS_SOC_TYPE_BCM1250_ALT:
+        case K_SYS_SOC_TYPE_BCM1250_ALT2:
+                soc_str = "BCM1250";
+                ret = setup_bcm1250();
+                break;
+        case K_SYS_SOC_TYPE_BCM1120:
+                soc_str = "BCM1120";
+                ret = setup_bcm112x();
+                break;
+        case K_SYS_SOC_TYPE_BCM1125:
+                soc_str = "BCM1125";
+                ret = setup_bcm112x();
+                break;
+        case K_SYS_SOC_TYPE_BCM1125H:
+                soc_str = "BCM1125H";
+                ret = setup_bcm112x();
+                break;
+        default:
+                printk("Unknown SOC type %x\n", soc_type);
+                ret = 1;
+                break;
+        }
+
         return ret;
 }
 
diff --git a/arch/mips/sibyte/sb1250/time.c b/arch/mips/sibyte/sb1250/time.c
index 2efffe15ff23..38199ad8fc54 100644
--- a/arch/mips/sibyte/sb1250/time.c
+++ b/arch/mips/sibyte/sb1250/time.c
@@ -25,6 +25,7 @@
  * code to do general bookkeeping (e.g. update jiffies, run
  * bottom halves, etc.)
  */
+#include <linux/clockchips.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
@@ -71,16 +72,158 @@ void __init sb1250_hpt_setup(void)
         }
 }
 
+/*
+ * The general purpose timer ticks at 1 Mhz independent if
+ * the rest of the system
+ */
+static void sibyte_set_mode(enum clock_event_mode mode,
+                           struct clock_event_device *evt)
+{
+        unsigned int cpu = smp_processor_id();
+        void __iomem *timer_cfg, *timer_init;
+
+        timer_cfg = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));
+        timer_init = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));
 
-void sb1250_time_init(void)
+        switch(mode) {
+        case CLOCK_EVT_MODE_PERIODIC:
+                __raw_writeq(0, timer_cfg);
+                __raw_writeq((V_SCD_TIMER_FREQ / HZ) - 1, timer_init);
+                __raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
+                             timer_cfg);
+                break;
+
+        case CLOCK_EVT_MODE_ONESHOT:
+                /* Stop the timer until we actually program a shot */
+        case CLOCK_EVT_MODE_SHUTDOWN:
+                __raw_writeq(0, timer_cfg);
+                break;
+
+        case CLOCK_EVT_MODE_UNUSED:     /* shuddup gcc */
+                ;
+        }
+}
+
+static int
+sibyte_next_event(unsigned long delta, struct clock_event_device *evt)
 {
-        int cpu = smp_processor_id();
-        int irq = K_INT_TIMER_0+cpu;
+        unsigned int cpu = smp_processor_id();
+        void __iomem *timer_cfg, *timer_init;
 
-        /* Only have 4 general purpose timers, and we use last one as hpt */
-        if (cpu > 2) {
-                BUG();
+        timer_cfg = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));
+        timer_init = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));
+
+        __raw_writeq(0, timer_cfg);
+        __raw_writeq(delta, timer_init);
+        __raw_writeq(M_SCD_TIMER_ENABLE, timer_cfg);
+
+        return 0;
+}
+
+struct clock_event_device sibyte_hpt_clockevent = {
+        .name           = "sb1250-counter",
+        .features       = CLOCK_EVT_FEAT_PERIODIC,
+        .set_mode       = sibyte_set_mode,
+        .set_next_event = sibyte_next_event,
+        .shift          = 32,
+        .irq            = 0,
+};
+
+static irqreturn_t sibyte_counter_handler(int irq, void *dev_id)
+{
+        struct clock_event_device *cd = &sibyte_hpt_clockevent;
+
+        cd->event_handler(cd);
+
+        return IRQ_HANDLED;
+}
+
+static struct irqaction sibyte_irqaction = {
+        .handler        = sibyte_counter_handler,
+        .flags          = IRQF_DISABLED | IRQF_PERCPU,
+        .name           = "timer",
+};
+
+/*
+ * The general purpose timer ticks at 1 Mhz independent if
+ * the rest of the system
+ */
+static void sibyte_set_mode(enum clock_event_mode mode,
+                           struct clock_event_device *evt)
+{
+        unsigned int cpu = smp_processor_id();
+        void __iomem *timer_cfg, *timer_init;
+
+        timer_cfg = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));
+        timer_init = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));
+
+        switch (mode) {
+        case CLOCK_EVT_MODE_PERIODIC:
+                __raw_writeq(0, timer_cfg);
+                __raw_writeq((V_SCD_TIMER_FREQ / HZ) - 1, timer_init);
+                __raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
+                             timer_cfg);
+                break;
+
+        case CLOCK_EVT_MODE_ONESHOT:
+                /* Stop the timer until we actually program a shot */
+        case CLOCK_EVT_MODE_SHUTDOWN:
+                __raw_writeq(0, timer_cfg);
+                break;
+
+        case CLOCK_EVT_MODE_UNUSED:     /* shuddup gcc */
+                ;
         }
+}
+
+static int
+sibyte_next_event(unsigned long delta, struct clock_event_device *evt)
+{
+        unsigned int cpu = smp_processor_id();
+        void __iomem *timer_cfg, *timer_init;
+
+        timer_cfg = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));
+        timer_init = IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG));
+
+        __raw_writeq(0, timer_cfg);
+        __raw_writeq(delta, timer_init);
+        __raw_writeq(M_SCD_TIMER_ENABLE, timer_cfg);
+
+        return 0;
+}
+
+struct clock_event_device sibyte_hpt_clockevent = {
+        .name           = "sb1250-counter",
+        .features       = CLOCK_EVT_FEAT_PERIODIC,
+        .set_mode       = sibyte_set_mode,
+        .set_next_event = sibyte_next_event,
+        .shift          = 32,
+        .irq            = 0,
+};
+
+static irqreturn_t sibyte_counter_handler(int irq, void *dev_id)
+{
+        struct clock_event_device *cd = &sibyte_hpt_clockevent;
+
+        cd->event_handler(cd);
+
+        return IRQ_HANDLED;
+}
+
+static struct irqaction sibyte_irqaction = {
+        .handler        = sibyte_counter_handler,
+        .flags          = IRQF_DISABLED | IRQF_PERCPU,
+        .name           = "timer",
+};
+
+static void __init sb1250_clockevent_init(void)
+{
+        struct clock_event_device *cd = &sibyte_hpt_clockevent;
+        unsigned int cpu = smp_processor_id();
+        int irq = K_INT_TIMER_0 + cpu;
+
+        /* Only have 4 general purpose timers, and we use last one as hpt */
+        BUG_ON(cpu > 2);
 
         sb1250_mask_irq(cpu, irq);
 
@@ -88,24 +231,11 @@ void sb1250_time_init(void)
         __raw_writeq(IMR_IP4_VAL,
                      IOADDR(A_IMR_REGISTER(cpu, R_IMR_INTERRUPT_MAP_BASE) +
                             (irq << 3)));
-
-        /* the general purpose timer ticks at 1 Mhz independent if the rest of the system */
-        /* Disable the timer and set up the count */
-        __raw_writeq(0, IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
-#ifdef CONFIG_SIMULATION
-        __raw_writeq((50000 / HZ) - 1,
-                     IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT)));
-#else
-        __raw_writeq((V_SCD_TIMER_FREQ / HZ) - 1,
-                     IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT)));
-#endif
-
-        /* Set the timer running */
-        __raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
-                     IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
+        cd->cpumask = cpumask_of_cpu(0);
 
         sb1250_unmask_irq(cpu, irq);
         sb1250_steal_irq(irq);
+
         /*
          * This interrupt is "special" in that it doesn't use the request_irq
          * way to hook the irq line.  The timer interrupt is initialized early
@@ -114,29 +244,15 @@ void sb1250_time_init(void)
          * called directly from irq_handler.S when IP[4] is set during an
          * interrupt
          */
+        setup_irq(irq, &sibyte_irqaction);
+
+        clockevents_register_device(cd);
 }
 
-void sb1250_timer_interrupt(void)
+void __init plat_time_init(void)
 {
-        int cpu = smp_processor_id();
-        int irq = K_INT_TIMER_0 + cpu;
-
-        /* ACK interrupt */
-        ____raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
-                       IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
-
-        if (cpu == 0) {
-                /*
-                 * CPU 0 handles the global timer interrupt job
-                 */
-                ll_timer_interrupt(irq);
-        }
-        else {
-                /*
-                 * other CPUs should just do profiling and process accounting
-                 */
-                ll_local_timer_interrupt(irq);
-        }
+        sb1250_clocksource_init();
+        sb1250_clockevent_init();
 }
 
 /*
diff --git a/arch/mips/sibyte/swarm/dbg_io.c b/arch/mips/sibyte/swarm/dbg_io.c
index 75ce14c8eb69..b97ae3048482 100644
--- a/arch/mips/sibyte/swarm/dbg_io.c
+++ b/arch/mips/sibyte/swarm/dbg_io.c
@@ -37,8 +37,8 @@ static int duart_initialized = 0;	/* 0: need to be init'ed by kgdb */
 /* -------------------- END OF CONFIG --------------------- */
 extern int kgdb_port;
 
-#define duart_out(reg, val)     csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port,reg)))
-#define duart_in(reg)           csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port,reg)))
+#define duart_out(reg, val)     csr_out32(val, IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
+#define duart_in(reg)           csr_in32(IOADDR(A_DUART_CHANREG(kgdb_port, reg)))
 
 void putDebugChar(unsigned char c);
 unsigned char getDebugChar(void);
diff --git a/arch/mips/sibyte/swarm/rtc_m41t81.c b/arch/mips/sibyte/swarm/rtc_m41t81.c
index c13914bdda59..26fbff4c15b1 100644
--- a/arch/mips/sibyte/swarm/rtc_m41t81.c
+++ b/arch/mips/sibyte/swarm/rtc_m41t81.c
@@ -146,7 +146,8 @@ int m41t81_set_time(unsigned long t)
         struct rtc_time tm;
         unsigned long flags;
 
-        to_tm(t, &tm);
+        /* Note we don't care about the century */
+        rtc_time_to_tm(t, &tm);
 
         /*
          * Note the write order matters as it ensures the correctness.
diff --git a/arch/mips/sibyte/swarm/rtc_xicor1241.c b/arch/mips/sibyte/swarm/rtc_xicor1241.c
index f4a178836415..ff3e5dabb348 100644
--- a/arch/mips/sibyte/swarm/rtc_xicor1241.c
+++ b/arch/mips/sibyte/swarm/rtc_xicor1241.c
@@ -115,7 +115,8 @@ int xicor_set_time(unsigned long t)
         int tmp;
         unsigned long flags;
 
-        to_tm(t, &tm);
+        rtc_time_to_tm(t, &tm);
+        tm.tm_year += 1900;
 
         spin_lock_irqsave(&rtc_lock, flags);
         /* unlock writes to the CCR */
diff --git a/arch/mips/sibyte/swarm/setup.c b/arch/mips/sibyte/swarm/setup.c
index 83572d8f3e14..8b3ef0e4cd55 100644
--- a/arch/mips/sibyte/swarm/setup.c
+++ b/arch/mips/sibyte/swarm/setup.c
@@ -69,7 +69,7 @@ const char *get_system_type(void)
         return "SiByte " SIBYTE_BOARD_NAME;
 }
 
-void __init swarm_time_init(void)
+void __init plat_time_init(void)
 {
 #if defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
         /* Setup HPT */
@@ -104,6 +104,44 @@ int swarm_be_handler(struct pt_regs *regs, int is_fixup)
         return (is_fixup ? MIPS_BE_FIXUP : MIPS_BE_FATAL);
 }
 
+enum swarm_rtc_type {
+        RTC_NONE,
+        RTC_XICOR,
+        RTC_M4LT81
+};
+
+enum swarm_rtc_type swarm_rtc_type;
+
+unsigned long read_persistent_clock(void)
+{
+        switch (swarm_rtc_type) {
+        case RTC_XICOR:
+                return xicor_get_time();
+
+        case RTC_M4LT81:
+                return m41t81_get_time();
+
+        case RTC_NONE:
+        default:
+                return mktime(2000, 1, 1, 0, 0, 0);
+        }
+}
+
+int rtc_mips_set_time(unsigned long sec)
+{
+        switch (swarm_rtc_type) {
+        case RTC_XICOR:
+                return xicor_set_time(sec);
+
+        case RTC_M4LT81:
+                return m41t81_set_time(sec);
+
+        case RTC_NONE:
+        default:
+                return -1;
+        }
+}
+
 void __init plat_mem_setup(void)
 {
 #if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
@@ -116,20 +154,12 @@ void __init plat_mem_setup(void)
 
         panic_timeout = 5;  /* For debug.  */
 
-        board_time_init = swarm_time_init;
         board_be_handler = swarm_be_handler;
 
-        if (xicor_probe()) {
-                printk("swarm setup: Xicor 1241 RTC detected.\n");
-                rtc_mips_get_time = xicor_get_time;
-                rtc_mips_set_time = xicor_set_time;
-        }
-
-        if (m41t81_probe()) {
-                printk("swarm setup: M41T81 RTC detected.\n");
-                rtc_mips_get_time = m41t81_get_time;
-                rtc_mips_set_time = m41t81_set_time;
-        }
+        if (xicor_probe())
+                swarm_rtc_type = RTC_XICOR;
+        if (m41t81_probe())
+                swarm_rtc_type = RTC_M4LT81;
 
         printk("This kernel optimized for "
 #ifdef CONFIG_SIMULATION
diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c
index acc9ba76c1a9..b74607599971 100644
--- a/arch/mips/sni/a20r.c
+++ b/arch/mips/sni/a20r.c
@@ -127,7 +127,7 @@ static u32 a20r_ack_hwint(void)
 {
         u32 status = read_c0_status();
 
-        write_c0_status (status | 0x00010000);
+        write_c0_status(status | 0x00010000);
         asm volatile(
         "       .set    push                    \n"
         "       .set    noat                    \n"
@@ -195,7 +195,7 @@ static void a20r_hwint(void)
         u32 cause, status;
         int irq;
 
-        clear_c0_status (IE_IRQ0);
+        clear_c0_status(IE_IRQ0);
         status = a20r_ack_hwint();
         cause = read_c0_cause();
 
@@ -213,7 +213,7 @@ void __init sni_a20r_irq_init(void)
                 set_irq_chip(i, &a20r_irq_type);
         sni_hwint = a20r_hwint;
         change_c0_status(ST0_IM, IE_IRQ0);
-        setup_irq (SNI_A20R_IRQ_BASE + 3, &sni_isa_irq);
+        setup_irq(SNI_A20R_IRQ_BASE + 3, &sni_isa_irq);
 }
 
 void sni_a20r_init(void)
diff --git a/arch/mips/sni/pcimt.c b/arch/mips/sni/pcimt.c
index 44b1ae62aa4a..39bb15f1f2a6 100644
--- a/arch/mips/sni/pcimt.c
+++ b/arch/mips/sni/pcimt.c
@@ -284,9 +284,9 @@ static void sni_pcimt_hwint(void)
         u32 pending = read_c0_cause() & read_c0_status();
 
         if (pending & C_IRQ5)
-                do_IRQ (MIPS_CPU_IRQ_BASE + 7);
+                do_IRQ(MIPS_CPU_IRQ_BASE + 7);
         else if (pending & C_IRQ4)
-                do_IRQ (MIPS_CPU_IRQ_BASE + 6);
+                do_IRQ(MIPS_CPU_IRQ_BASE + 6);
         else if (pending & C_IRQ3)
                 pcimt_hwint3();
         else if (pending & C_IRQ1)
@@ -313,7 +313,6 @@ void __init sni_pcimt_init(void)
 {
         sni_pcimt_detect();
         sni_pcimt_sc_init();
-        board_time_init = sni_cpu_time_init;
         ioport_resource.end = sni_io_resource.end;
 #ifdef CONFIG_PCI
         PCIBIOS_MIN_IO = 0x9000;
diff --git a/arch/mips/sni/pcit.c b/arch/mips/sni/pcit.c
index 2480c478dcbd..416f397c768b 100644
--- a/arch/mips/sni/pcit.c
+++ b/arch/mips/sni/pcit.c
@@ -188,8 +188,8 @@ static void pcit_hwint1(void)
         irq = ffs((pending >> 16) & 0x7f);
 
         if (likely(irq > 0))
-                do_IRQ (irq + SNI_PCIT_INT_START - 1);
-        set_c0_status (IE_IRQ1);
+                do_IRQ(irq + SNI_PCIT_INT_START - 1);
+        set_c0_status(IE_IRQ1);
 }
 
 static void pcit_hwint0(void)
@@ -201,8 +201,8 @@ static void pcit_hwint0(void)
         irq = ffs((pending >> 16) & 0x3f);
 
         if (likely(irq > 0))
-                do_IRQ (irq + SNI_PCIT_INT_START - 1);
-        set_c0_status (IE_IRQ0);
+                do_IRQ(irq + SNI_PCIT_INT_START - 1);
+        set_c0_status(IE_IRQ0);
 }
 
 static void sni_pcit_hwint(void)
@@ -212,11 +212,11 @@ static void sni_pcit_hwint(void)
         if (pending & C_IRQ1)
                 pcit_hwint1();
         else if (pending & C_IRQ2)
-                do_IRQ (MIPS_CPU_IRQ_BASE + 4);
+                do_IRQ(MIPS_CPU_IRQ_BASE + 4);
         else if (pending & C_IRQ3)
-                do_IRQ (MIPS_CPU_IRQ_BASE + 5);
+                do_IRQ(MIPS_CPU_IRQ_BASE + 5);
         else if (pending & C_IRQ5)
-                do_IRQ (MIPS_CPU_IRQ_BASE + 7);
+                do_IRQ(MIPS_CPU_IRQ_BASE + 7);
 }
 
 static void sni_pcit_hwint_cplus(void)
@@ -226,13 +226,13 @@ static void sni_pcit_hwint_cplus(void)
         if (pending & C_IRQ0)
                 pcit_hwint0();
         else if (pending & C_IRQ1)
-                do_IRQ (MIPS_CPU_IRQ_BASE + 3);
+                do_IRQ(MIPS_CPU_IRQ_BASE + 3);
         else if (pending & C_IRQ2)
-                do_IRQ (MIPS_CPU_IRQ_BASE + 4);
+                do_IRQ(MIPS_CPU_IRQ_BASE + 4);
         else if (pending & C_IRQ3)
-                do_IRQ (MIPS_CPU_IRQ_BASE + 5);
+                do_IRQ(MIPS_CPU_IRQ_BASE + 5);
         else if (pending & C_IRQ5)
-                do_IRQ (MIPS_CPU_IRQ_BASE + 7);
+                do_IRQ(MIPS_CPU_IRQ_BASE + 7);
 }
 
 void __init sni_pcit_irq_init(void)
@@ -245,7 +245,7 @@ void __init sni_pcit_irq_init(void)
         *(volatile u32 *)SNI_PCIT_INT_REG = 0;
         sni_hwint = sni_pcit_hwint;
         change_c0_status(ST0_IM, IE_IRQ1);
-        setup_irq (SNI_PCIT_INT_START + 6, &sni_isa_irq);
+        setup_irq(SNI_PCIT_INT_START + 6, &sni_isa_irq);
 }
 
 void __init sni_pcit_cplus_irq_init(void)
@@ -258,12 +258,11 @@ void __init sni_pcit_cplus_irq_init(void)
         *(volatile u32 *)SNI_PCIT_INT_REG = 0x40000000;
         sni_hwint = sni_pcit_hwint_cplus;
         change_c0_status(ST0_IM, IE_IRQ0);
-        setup_irq (MIPS_CPU_IRQ_BASE + 3, &sni_isa_irq);
+        setup_irq(MIPS_CPU_IRQ_BASE + 3, &sni_isa_irq);
 }
 
 void __init sni_pcit_init(void)
 {
-        board_time_init = sni_cpu_time_init;
         ioport_resource.end = sni_io_resource.end;
 #ifdef CONFIG_PCI
         PCIBIOS_MIN_IO = 0x9000;
diff --git a/arch/mips/sni/reset.c b/arch/mips/sni/reset.c
index 38b6a97a31b5..79f8d70f48c9 100644
--- a/arch/mips/sni/reset.c
+++ b/arch/mips/sni/reset.c
@@ -35,7 +35,7 @@ void sni_machine_restart(char *command)
                         kb_wait();
                         for (j = 0; j < 100000 ; j++)
                                 /* nothing */;
-                        outb_p(0xfe,0x64);       /* pulse reset low */
+                        outb_p(0xfe, 0x64);      /* pulse reset low */
                 }
         }
 }
diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c
index 28a11d8605ce..67b061eef6cd 100644
--- a/arch/mips/sni/rm200.c
+++ b/arch/mips/sni/rm200.c
@@ -162,16 +162,16 @@ static void sni_rm200_hwint(void)
         int irq;
 
         if (pending & C_IRQ5)
-                do_IRQ (MIPS_CPU_IRQ_BASE + 7);
+                do_IRQ(MIPS_CPU_IRQ_BASE + 7);
         else if (pending & C_IRQ0) {
-                clear_c0_status (IE_IRQ0);
+                clear_c0_status(IE_IRQ0);
                 mask = *(volatile u8 *)SNI_RM200_INT_ENA_REG ^ 0x1f;
                 stat = *(volatile u8 *)SNI_RM200_INT_STAT_REG ^ 0x14;
                 irq = ffs(stat & mask & 0x1f);
 
                 if (likely(irq > 0))
-                        do_IRQ (irq + SNI_RM200_INT_START - 1);
-                set_c0_status (IE_IRQ0);
+                        do_IRQ(irq + SNI_RM200_INT_START - 1);
+                set_c0_status(IE_IRQ0);
         }
 }
 
@@ -187,12 +187,11 @@ void __init sni_rm200_irq_init(void)
                 set_irq_chip(i, &rm200_irq_type);
         sni_hwint = sni_rm200_hwint;
         change_c0_status(ST0_IM, IE_IRQ0);
-        setup_irq (SNI_RM200_INT_START + 0, &sni_isa_irq);
+        setup_irq(SNI_RM200_INT_START + 0, &sni_isa_irq);
 }
 
 void __init sni_rm200_init(void)
 {
         set_io_port_base(SNI_PORT_BASE + 0x02000000);
         ioport_resource.end += 0x02000000;
-        board_time_init = sni_cpu_time_init;
 }
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 6edbb3051c82..e8b26bdee24c 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -15,7 +15,7 @@
 #include <linux/screen_info.h>
 
 #ifdef CONFIG_ARC
-#include <asm/arc/types.h>
+#include <asm/fw/arc/types.h>
 #include <asm/sgialib.h>
 #endif
 
@@ -106,11 +106,11 @@ static void __devinit quirk_cirrus_ram_size(struct pci_dev *dev)
          * need to do it here, otherwise we get screen corruption
          * on older Cirrus chips
          */
-        pci_read_config_word (dev, PCI_COMMAND, &cmd);
+        pci_read_config_word(dev, PCI_COMMAND, &cmd);
         if ((cmd & (PCI_COMMAND_IO|PCI_COMMAND_MEMORY))
                 == (PCI_COMMAND_IO|PCI_COMMAND_MEMORY)) {
-                vga_wseq (NULL, CL_SEQR6, 0x12);        /* unlock all extension registers */
-                vga_wseq (NULL, CL_SEQRF, 0x18);
+                vga_wseq(NULL, CL_SEQR6, 0x12); /* unlock all extension registers */
+                vga_wseq(NULL, CL_SEQRF, 0x18);
         }
 }
 
diff --git a/arch/mips/sni/sniprom.c b/arch/mips/sni/sniprom.c
index db544a6e23f3..eff4b89d7b75 100644
--- a/arch/mips/sni/sniprom.c
+++ b/arch/mips/sni/sniprom.c
@@ -45,7 +45,7 @@ void prom_putchar(char c)
 static char *(*__prom_getenv)(char *)     = (char *(*)(char *))PROM_ENTRY(PROM_GETENV);
 static void (*__prom_get_memconf)(void *) = (void (*)(void *))PROM_ENTRY(PROM_GET_MEMCONF);
 
-char *prom_getenv (char *s)
+char *prom_getenv(char *s)
 {
         return __prom_getenv(s);
 }
@@ -131,9 +131,9 @@ static void __init sni_console_setup(void)
         int port;
         static char options[8];
 
-        cdev = prom_getenv ("console_dev");
+        cdev = prom_getenv("console_dev");
         if (strncmp (cdev, "tty", 3) == 0) {
-                ctype = prom_getenv ("console");
+                ctype = prom_getenv("console");
                 switch (*ctype) {
                 default:
                 case 'l':
@@ -233,7 +233,7 @@ void __init prom_init(void)
                 systype = "RM300-Exx";
                 break;
         }
-        pr_debug("Found SNI brdtype %02x name %s\n", sni_brd_type,systype);
+        pr_debug("Found SNI brdtype %02x name %s\n", sni_brd_type, systype);
 
 #ifdef DEBUG
         sni_idprom_dump();
diff --git a/arch/mips/sni/time.c b/arch/mips/sni/time.c
index 20028fc7757e..b80877349d38 100644
--- a/arch/mips/sni/time.c
+++ b/arch/mips/sni/time.c
@@ -2,8 +2,10 @@
 #include <linux/interrupt.h>
 #include <linux/time.h>
 
+#include <asm/i8253.h>
 #include <asm/sni.h>
 #include <asm/time.h>
+#include <asm-generic/rtc.h>
 
 #define SNI_CLOCK_TICK_RATE     3686400
 #define SNI_COUNTER2_DIV        64
@@ -42,23 +44,23 @@ static __init unsigned long dosample(void)
         volatile u8 msb, lsb;
 
         /* Start the counter. */
-        outb_p (0x34, 0x43);
+        outb_p(0x34, 0x43);
         outb_p(SNI_8254_TCSAMP_COUNTER & 0xff, 0x40);
-        outb (SNI_8254_TCSAMP_COUNTER >> 8, 0x40);
+        outb(SNI_8254_TCSAMP_COUNTER >> 8, 0x40);
 
         /* Get initial counter invariant */
         ct0 = read_c0_count();
 
         /* Latch and spin until top byte of counter0 is zero */
         do {
-                outb (0x00, 0x43);
-                lsb = inb (0x40);
-                msb = inb (0x40);
+                outb(0x00, 0x43);
+                lsb = inb(0x40);
+                msb = inb(0x40);
                 ct1 = read_c0_count();
         } while (msb);
 
         /* Stop the counter. */
-        outb (0x38, 0x43);
+        outb(0x38, 0x43);
         /*
          * Return the difference, this is how far the r4k counter increments
          * for every 1/HZ seconds. We round off the nearest 1 MHz of master
@@ -71,7 +73,7 @@ static __init unsigned long dosample(void)
 /*
  * Here we need to calibrate the cycle counter to at least be close.
  */
-__init void sni_cpu_time_init(void)
+void __init plat_time_init(void)
 {
         unsigned long r4k_ticks[3];
         unsigned long r4k_tick;
@@ -115,6 +117,8 @@ __init void sni_cpu_time_init(void)
                 (int) (r4k_tick % (500000 / HZ)));
 
         mips_hpt_frequency = r4k_tick * HZ;
+
+        setup_pit_timer();
 }
 
 /*
@@ -133,7 +137,7 @@ void __init plat_timer_setup(struct irqaction *irq)
         case SNI_BRD_10NEW:
         case SNI_BRD_TOWER_OASIC:
         case SNI_BRD_MINITOWER:
-                sni_a20r_timer_setup (irq);
+                sni_a20r_timer_setup(irq);
                 break;
 
         case SNI_BRD_PCI_TOWER:
@@ -142,7 +146,12 @@ void __init plat_timer_setup(struct irqaction *irq)
         case SNI_BRD_PCI_DESKTOP:
         case SNI_BRD_PCI_TOWER_CPLUS:
         case SNI_BRD_PCI_MTOWER_CPLUS:
-                sni_cpu_timer_setup (irq);
+                sni_cpu_timer_setup(irq);
                 break;
         }
 }
+
+unsigned long read_persistent_clock(void)
+{
+        return -1;
+}
diff --git a/arch/mips/tx4927/common/tx4927_dbgio.c b/arch/mips/tx4927/common/tx4927_dbgio.c
index 09bdf2baa835..d8423e001b2d 100644
--- a/arch/mips/tx4927/common/tx4927_dbgio.c
+++ b/arch/mips/tx4927/common/tx4927_dbgio.c
@@ -31,7 +31,6 @@
 
 #include <asm/mipsregs.h>
 #include <asm/system.h>
-#include <asm/tx4927/tx4927_mips.h>
 
 u8 getDebugChar(void)
 {
diff --git a/arch/mips/tx4927/common/tx4927_prom.c b/arch/mips/tx4927/common/tx4927_prom.c
index 7d4cbf512d8a..6eed53d8f386 100644
--- a/arch/mips/tx4927/common/tx4927_prom.c
+++ b/arch/mips/tx4927/common/tx4927_prom.c
@@ -38,7 +38,7 @@
 #include <asm/bootinfo.h>
 #include <asm/tx4927/tx4927.h>
 
-static unsigned int __init tx4927_process_sdccr(u64 * addr)
+static unsigned int __init tx4927_process_sdccr(unsigned long addr)
 {
         u64 val;
         unsigned int sdccr_ce;
@@ -52,7 +52,7 @@ static unsigned int __init tx4927_process_sdccr(u64 * addr)
         unsigned int mw = 0;
         unsigned int msize = 0;
 
-        val = (*((vu64 *) (addr)));
+        val = __raw_readq((void __iomem *)addr);
 
         /* MVMCP -- need #defs for these bits masks */
         sdccr_ce = ((val & (1 << 10)) >> 10);
@@ -136,10 +136,10 @@ unsigned int __init tx4927_get_mem_size(void)
         unsigned int total;
 
         /* MVMCP -- need #defs for these registers */
-        c0 = tx4927_process_sdccr((u64 *) 0xff1f8000);
-        c1 = tx4927_process_sdccr((u64 *) 0xff1f8008);
-        c2 = tx4927_process_sdccr((u64 *) 0xff1f8010);
-        c3 = tx4927_process_sdccr((u64 *) 0xff1f8018);
+        c0 = tx4927_process_sdccr(0xff1f8000);
+        c1 = tx4927_process_sdccr(0xff1f8008);
+        c2 = tx4927_process_sdccr(0xff1f8010);
+        c3 = tx4927_process_sdccr(0xff1f8018);
         total = c0 + c1 + c2 + c3;
 
         return (total);
diff --git a/arch/mips/tx4927/common/tx4927_setup.c b/arch/mips/tx4927/common/tx4927_setup.c
index c8e49feb345b..8ce0989671d8 100644
--- a/arch/mips/tx4927/common/tx4927_setup.c
+++ b/arch/mips/tx4927/common/tx4927_setup.c
@@ -49,14 +49,11 @@
 
 #undef DEBUG
 
-void __init tx4927_time_init(void);
 void dump_cp0(char *key);
 
 
 void __init plat_mem_setup(void)
 {
-        board_time_init = tx4927_time_init;
-
 #ifdef CONFIG_TOSHIBA_RBTX4927
         {
                 extern void toshiba_rbtx4927_setup(void);
@@ -65,20 +62,16 @@ void __init plat_mem_setup(void)
 #endif
 }
 
-void __init tx4927_time_init(void)
+void __init plat_time_init(void)
 {
-
 #ifdef CONFIG_TOSHIBA_RBTX4927
         {
                 extern void toshiba_rbtx4927_time_init(void);
                 toshiba_rbtx4927_time_init();
         }
 #endif
-
-        return;
 }
 
-
 void __init plat_timer_setup(struct irqaction *irq)
 {
         setup_irq(TX4927_IRQ_CPU_TIMER, irq);
@@ -124,10 +117,10 @@ dump_cp0(char *key)
         return;
 }
 
-void print_pic(char *key, u32 reg, char *name)
+void print_pic(char *key, unsigned long reg, char *name)
 {
-        printk("%s pic:0x%08x:%s=0x%08x\n", key, reg, name,
-               TX4927_RD(reg));
+        printk(KERN_INFO "%s pic:0x%08lx:%s=0x%08x\n", key, reg, name,
+               __raw_readl((void __iomem *)reg));
         return;
 }
 
@@ -166,9 +159,10 @@ void dump_pic(char *key)
 }
 
 
-void print_addr(char *hdr, char *key, u32 addr)
+void print_addr(char *hdr, char *key, unsigned long addr)
 {
-        printk("%s %s:0x%08x=0x%08x\n", hdr, key, addr, TX4927_RD(addr));
+        printk(KERN_INFO "%s %s:0x%08lx=0x%08x\n", hdr, key, addr,
+               __raw_readl((void __iomem *)addr));
         return;
 }
 
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
index 9607ad5e734a..3f808b629242 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_irq.c
@@ -176,7 +176,7 @@ static const u32 toshiba_rbtx4927_irq_debug_flag =
            printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \
         }
 #else
-#define TOSHIBA_RBTX4927_IRQ_DPRINTK(flag,str...)
+#define TOSHIBA_RBTX4927_IRQ_DPRINTK(flag, str...)
 #endif
 
 
@@ -204,8 +204,8 @@ static struct irq_chip toshiba_rbtx4927_irq_ioc_type = {
         .mask_ack = toshiba_rbtx4927_irq_ioc_disable,
         .unmask = toshiba_rbtx4927_irq_ioc_enable,
 };
-#define TOSHIBA_RBTX4927_IOC_INTR_ENAB 0xbc002000
-#define TOSHIBA_RBTX4927_IOC_INTR_STAT 0xbc002006
+#define TOSHIBA_RBTX4927_IOC_INTR_ENAB (void __iomem *)0xbc002000UL
+#define TOSHIBA_RBTX4927_IOC_INTR_STAT (void __iomem *)0xbc002006UL
 
 
 u32 bit2num(u32 num)
@@ -224,7 +224,7 @@ int toshiba_rbtx4927_irq_nested(int sw_irq)
 {
         u32 level3;
 
-        level3 = reg_rd08(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;
+        level3 = readb(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;
         if (level3) {
                 sw_irq = TOSHIBA_RBTX4927_IRQ_IOC_BEG + bit2num(level3);
                 if (sw_irq != TOSHIBA_RBTX4927_IRQ_NEST_ISA_ON_IOC) {
@@ -243,10 +243,12 @@ int toshiba_rbtx4927_irq_nested(int sw_irq)
         return (sw_irq);
 }
 
-//#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, 0, CPU_MASK_NONE, s, NULL, NULL }
-#define TOSHIBA_RBTX4927_PIC_ACTION(s) { no_action, IRQF_SHARED, CPU_MASK_NONE, s, NULL, NULL }
-static struct irqaction toshiba_rbtx4927_irq_ioc_action =
-TOSHIBA_RBTX4927_PIC_ACTION(TOSHIBA_RBTX4927_IOC_NAME);
+static struct irqaction toshiba_rbtx4927_irq_ioc_action = {
+        .handler        = no_action,
+        .flags          = IRQF_SHARED,
+        .mask           = CPU_MASK_NONE,
+        .name           = TOSHIBA_RBTX4927_IOC_NAME
+};
 
 
 /**********************************************************************************/
@@ -286,9 +288,9 @@ static void toshiba_rbtx4927_irq_ioc_enable(unsigned int irq)
                 panic("\n");
         }
 
-        v = TX4927_RD08(TOSHIBA_RBTX4927_IOC_INTR_ENAB);
+        v = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB);
         v |= (1 << (irq - TOSHIBA_RBTX4927_IRQ_IOC_BEG));
-        TOSHIBA_RBTX4927_WR08(TOSHIBA_RBTX4927_IOC_INTR_ENAB, v);
+        writeb(v, TOSHIBA_RBTX4927_IOC_INTR_ENAB);
 }
 
 
@@ -306,9 +308,10 @@ static void toshiba_rbtx4927_irq_ioc_disable(unsigned int irq)
                 panic("\n");
         }
 
-        v = TX4927_RD08(TOSHIBA_RBTX4927_IOC_INTR_ENAB);
+        v = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB);
         v &= ~(1 << (irq - TOSHIBA_RBTX4927_IRQ_IOC_BEG));
-        TOSHIBA_RBTX4927_WR08(TOSHIBA_RBTX4927_IOC_INTR_ENAB, v);
+        writeb(v, TOSHIBA_RBTX4927_IOC_INTR_ENAB);
+        mmiowb();
 }
 
 
@@ -385,12 +388,12 @@ void toshiba_rbtx4927_irq_dump_pics(char *s)
         level1_m = level0_m;
         level1_s = level0_s & 0x87;
 
-        level2 = TX4927_RD(0xff1ff6a0);
+        level2 = __raw_readl((void __iomem *)0xff1ff6a0UL);
         level2_p = (((level2 & 0x10000)) ? 0 : 1);
         level2_s = (((level2 & 0x1f) == 0x1f) ? 0 : (level2 & 0x1f));
 
-        level3_m = reg_rd08(TOSHIBA_RBTX4927_IOC_INTR_ENAB) & 0x1f;
-        level3_s = reg_rd08(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;
+        level3_m = readb(TOSHIBA_RBTX4927_IOC_INTR_ENAB) & 0x1f;
+        level3_s = readb(TOSHIBA_RBTX4927_IOC_INTR_STAT) & 0x1f;
 
         level4_m = inb(0x21);
         outb(0x0A, 0x20);
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
index 9a3a5babd1fb..f3f86857beae 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_prom.c
@@ -66,8 +66,6 @@ void __init prom_init(void)
 
         prom_init_cmdline();
 
-        mips_machgroup = MACH_GROUP_TOSHIBA;
-
         if ((read_c0_prid() & 0xff) == PRID_REV_TX4927) {
                 mips_machtype = MACH_TOSHIBA_RBTX4927;
                 toshiba_name  = "TX4927";
diff --git a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
index 3e84237abe63..acaf613358c7 100644
--- a/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
+++ b/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
@@ -122,7 +122,7 @@ static const u32 toshiba_rbtx4927_setup_debug_flag =
            printk( "%s(%s:%u)::%s", __FUNCTION__, __FILE__, __LINE__, tmp ); \
         }
 #else
-#define TOSHIBA_RBTX4927_SETUP_DPRINTK(flag,str...)
+#define TOSHIBA_RBTX4927_SETUP_DPRINTK(flag, str...)
 #endif
 
 /* These functions are used for rebooting or halting the machine*/
@@ -497,7 +497,7 @@ void __init tx4927_pci_setup(void)
                      "Internal");
                 called = 1;
         }
-        printk("%s PCIC --%s PCICLK:",toshiba_name,
+        printk("%s PCIC --%s PCICLK:", toshiba_name,
                (tx4927_ccfgptr->ccfg & TX4927_CCFG_PCI66) ? " PCI66" : "");
         if (tx4927_ccfgptr->pcfg & TX4927_PCFG_PCICLKEN_ALL) {
                 int pciclk = 0;
@@ -679,25 +679,30 @@ void __init tx4927_pci_setup(void)
 
 #endif /* CONFIG_PCI */
 
+static void __noreturn wait_forever(void)
+{
+        while (1)
+                if (cpu_wait)
+                        (*cpu_wait)();
+}
+
 void toshiba_rbtx4927_restart(char *command)
 {
         printk(KERN_NOTICE "System Rebooting...\n");
 
         /* enable the s/w reset register */
-        reg_wr08(RBTX4927_SW_RESET_ENABLE, RBTX4927_SW_RESET_ENABLE_SET);
+        writeb(RBTX4927_SW_RESET_ENABLE_SET, RBTX4927_SW_RESET_ENABLE);
 
         /* wait for enable to be seen */
-        while ((reg_rd08(RBTX4927_SW_RESET_ENABLE) &
+        while ((readb(RBTX4927_SW_RESET_ENABLE) &
                 RBTX4927_SW_RESET_ENABLE_SET) == 0x00);
 
         /* do a s/w reset */
-        reg_wr08(RBTX4927_SW_RESET_DO, RBTX4927_SW_RESET_DO_SET);
+        writeb(RBTX4927_SW_RESET_DO_SET, RBTX4927_SW_RESET_DO);
 
         /* do something passive while waiting for reset */
         local_irq_disable();
-        while (1)
-                asm_wait();
-
+        wait_forever();
         /* no return */
 }
 
@@ -706,9 +711,7 @@ void toshiba_rbtx4927_halt(void)
 {
         printk(KERN_NOTICE "System Halted\n");
         local_irq_disable();
-        while (1) {
-                asm_wait();
-        }
+        wait_forever();
         /* no return */
 }
 
@@ -720,7 +723,7 @@ void toshiba_rbtx4927_power_off(void)
 
 void __init toshiba_rbtx4927_setup(void)
 {
-        vu32 cp0_config;
+        u32 cp0_config;
         char *argptr;
 
         printk("CPU is %s\n", toshiba_name);
@@ -747,15 +750,6 @@ void __init toshiba_rbtx4927_setup(void)
         }
 #endif
 
-        /* setup serial stuff */
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
-                                       ":Setting up tx4927 sio.\n");
-        TX4927_WR(0xff1ff314, 0x00000000);      /* h/w flow control off */
-        TX4927_WR(0xff1ff414, 0x00000000);      /* h/w flow control off */
-
-        TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
-                                       "+\n");
-
         set_io_port_base(KSEG1 + TBTX4927_ISA_IO_OFFSET);
         TOSHIBA_RBTX4927_SETUP_DPRINTK(TOSHIBA_RBTX4927_SETUP_SETUP,
                                        ":mips_io_port_base=0x%08lx\n",
diff --git a/arch/mips/tx4938/common/setup.c b/arch/mips/tx4938/common/setup.c
index 142abf453e40..ab4082267553 100644
--- a/arch/mips/tx4938/common/setup.c
+++ b/arch/mips/tx4938/common/setup.c
@@ -34,25 +34,16 @@
 #include <asm/tx4938/rbtx4938.h>
 
 extern void toshiba_rbtx4938_setup(void);
-extern void rbtx4938_time_init(void);
 
 void __init tx4938_setup(void);
-void __init tx4938_time_init(void);
 void dump_cp0(char *key);
 
 void __init
 plat_mem_setup(void)
 {
-        board_time_init = tx4938_time_init;
         toshiba_rbtx4938_setup();
 }
 
-void __init
-tx4938_time_init(void)
-{
-        rbtx4938_time_init();
-}
-
 void __init plat_timer_setup(struct irqaction *irq)
 {
         setup_irq(TX4938_IRQ_CPU_TIMER, irq);
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/prom.c b/arch/mips/tx4938/toshiba_rbtx4938/prom.c
index 7dc6a0aae21c..69f21c1b7942 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/prom.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/prom.c
@@ -47,7 +47,6 @@ void __init prom_init(void)
 #ifndef CONFIG_TX4938_NAND_BOOT
         prom_init_cmdline();
 #endif
-        mips_machgroup = MACH_GROUP_TOSHIBA;
         mips_machtype = MACH_TOSHIBA_RBTX4938;
 
         msize = tx4938_get_mem_size();
diff --git a/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
index f236b1ff8923..ceecaf498957 100644
--- a/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/setup.c
@@ -39,7 +39,6 @@
 #include <asm/tx4938/spi.h>
 #include <asm/gpio.h>
 
-extern void rbtx4938_time_init(void) __init;
 extern char * __init prom_getcmdline(void);
 static inline void tx4938_report_pcic_status1(struct tx4938_pcic_reg *pcicptr);
 
@@ -458,9 +457,9 @@ extern struct pci_controller tx4938_pci_controller[];
 static int __init tx4938_pcibios_init(void)
 {
         unsigned long mem_base[2];
-        unsigned long mem_size[2] = {TX4938_PCIMEM_SIZE_0,TX4938_PCIMEM_SIZE_1}; /* MAX 128M,64K */
+        unsigned long mem_size[2] = {TX4938_PCIMEM_SIZE_0, TX4938_PCIMEM_SIZE_1}; /* MAX 128M,64K */
         unsigned long io_base[2];
-        unsigned long io_size[2] = {TX4938_PCIIO_SIZE_0,TX4938_PCIIO_SIZE_1}; /* MAX 16M,64K */
+        unsigned long io_size[2] = {TX4938_PCIIO_SIZE_0, TX4938_PCIIO_SIZE_1}; /* MAX 16M,64K */
         /* TX4938 PCIC1: 64K MEM/IO is enough for ETH0,ETH1 */
         int extarb = !(tx4938_ccfgptr->ccfg & TX4938_CCFG_PCIXARB);
 
@@ -856,7 +855,7 @@ void tx4938_report_pcic_status(void)
 /* We use onchip r4k counter or TMR timer as our system wide timer
  * interrupt running at 100HZ. */
 
-void __init rbtx4938_time_init(void)
+void __init plat_time_init(void)
 {
         mips_hpt_frequency = txx9_cpu_clock / 2;
 }
diff --git a/arch/mips/vr41xx/common/bcu.c b/arch/mips/vr41xx/common/bcu.c
index ff272b2e8395..d77c330a0d59 100644
--- a/arch/mips/vr41xx/common/bcu.c
+++ b/arch/mips/vr41xx/common/bcu.c
@@ -70,7 +70,7 @@ EXPORT_SYMBOL_GPL(vr41xx_get_tclock_frequency);
 
 static inline uint16_t read_clkspeed(void)
 {
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121: return readw(CLKSPEEDREG_TYPE1);
         case CPU_VR4122:
@@ -88,7 +88,7 @@ static inline unsigned long calculate_pclock(uint16_t clkspeed)
 {
         unsigned long pclock = 0;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 pclock = 18432000 * 64;
@@ -138,7 +138,7 @@ static inline unsigned long calculate_vtclock(uint16_t clkspeed, unsigned long p
 {
         unsigned long vtclock = 0;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
                 /* The NEC VR4111 doesn't have the VTClock. */
                 break;
@@ -180,7 +180,7 @@ static inline unsigned long calculate_tclock(uint16_t clkspeed, unsigned long pc
 {
         unsigned long tclock = 0;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
                 if (!(clkspeed & DIV2B))
                         tclock = pclock / 2;
diff --git a/arch/mips/vr41xx/common/cmu.c b/arch/mips/vr41xx/common/cmu.c
index 657c5133c933..ad0e8e3409d9 100644
--- a/arch/mips/vr41xx/common/cmu.c
+++ b/arch/mips/vr41xx/common/cmu.c
@@ -95,8 +95,8 @@ void vr41xx_supply_clock(vr41xx_clock_t clock)
                 cmuclkmsk |= MSKFIR | MSKFFIR;
                 break;
         case DSIU_CLOCK:
-                if (current_cpu_data.cputype == CPU_VR4111 ||
-                    current_cpu_data.cputype == CPU_VR4121)
+                if (current_cpu_type() == CPU_VR4111 ||
+                    current_cpu_type() == CPU_VR4121)
                         cmuclkmsk |= MSKDSIU;
                 else
                         cmuclkmsk |= MSKSIU | MSKDSIU;
@@ -146,8 +146,8 @@ void vr41xx_mask_clock(vr41xx_clock_t clock)
                 cmuclkmsk &= ~MSKPIU;
                 break;
         case SIU_CLOCK:
-                if (current_cpu_data.cputype == CPU_VR4111 ||
-                    current_cpu_data.cputype == CPU_VR4121) {
+                if (current_cpu_type() == CPU_VR4111 ||
+                    current_cpu_type() == CPU_VR4121) {
                         cmuclkmsk &= ~(MSKSIU | MSKSSIU);
                 } else {
                         if (cmuclkmsk & MSKDSIU)
@@ -166,8 +166,8 @@ void vr41xx_mask_clock(vr41xx_clock_t clock)
                 cmuclkmsk &= ~(MSKFIR | MSKFFIR);
                 break;
         case DSIU_CLOCK:
-                if (current_cpu_data.cputype == CPU_VR4111 ||
-                    current_cpu_data.cputype == CPU_VR4121) {
+                if (current_cpu_type() == CPU_VR4111 ||
+                    current_cpu_type() == CPU_VR4121) {
                         cmuclkmsk &= ~MSKDSIU;
                 } else {
                         if (cmuclkmsk & MSKSSIU)
@@ -216,7 +216,7 @@ static int __init vr41xx_cmu_init(void)
 {
         unsigned long start, size;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 start = CMU_TYPE1_BASE;
@@ -246,7 +246,7 @@ static int __init vr41xx_cmu_init(void)
         }
 
         cmuclkmsk = cmu_read(CMUCLKMSK);
-        if (current_cpu_data.cputype == CPU_VR4133)
+        if (current_cpu_type() == CPU_VR4133)
                 cmuclkmsk2 = cmu_read(CMUCLKMSK2);
 
         spin_lock_init(&cmu_lock);
diff --git a/arch/mips/vr41xx/common/giu.c b/arch/mips/vr41xx/common/giu.c
index d21f6f2d22a3..2b272f1496fe 100644
--- a/arch/mips/vr41xx/common/giu.c
+++ b/arch/mips/vr41xx/common/giu.c
@@ -81,7 +81,7 @@ static int __init vr41xx_giu_add(void)
         if (!pdev)
                 return -ENOMEM;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 pdev->id = GPIO_50PINS_PULLUPDOWN;
diff --git a/arch/mips/vr41xx/common/icu.c b/arch/mips/vr41xx/common/icu.c
index adabc6bad440..1899601e5862 100644
--- a/arch/mips/vr41xx/common/icu.c
+++ b/arch/mips/vr41xx/common/icu.c
@@ -157,8 +157,8 @@ void vr41xx_enable_piuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + PIU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4111 ||
-            current_cpu_data.cputype == CPU_VR4121) {
+        if (current_cpu_type() == CPU_VR4111 ||
+            current_cpu_type() == CPU_VR4121) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu1_set(MPIUINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -172,8 +172,8 @@ void vr41xx_disable_piuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + PIU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4111 ||
-            current_cpu_data.cputype == CPU_VR4121) {
+        if (current_cpu_type() == CPU_VR4111 ||
+            current_cpu_type() == CPU_VR4121) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu1_clear(MPIUINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -187,8 +187,8 @@ void vr41xx_enable_aiuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + AIU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4111 ||
-            current_cpu_data.cputype == CPU_VR4121) {
+        if (current_cpu_type() == CPU_VR4111 ||
+            current_cpu_type() == CPU_VR4121) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu1_set(MAIUINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -202,8 +202,8 @@ void vr41xx_disable_aiuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + AIU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4111 ||
-            current_cpu_data.cputype == CPU_VR4121) {
+        if (current_cpu_type() == CPU_VR4111 ||
+            current_cpu_type() == CPU_VR4121) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu1_clear(MAIUINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -217,8 +217,8 @@ void vr41xx_enable_kiuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + KIU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4111 ||
-            current_cpu_data.cputype == CPU_VR4121) {
+        if (current_cpu_type() == CPU_VR4111 ||
+            current_cpu_type() == CPU_VR4121) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu1_set(MKIUINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -232,8 +232,8 @@ void vr41xx_disable_kiuint(uint16_t mask)
         struct irq_desc *desc = irq_desc + KIU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4111 ||
-            current_cpu_data.cputype == CPU_VR4121) {
+        if (current_cpu_type() == CPU_VR4111 ||
+            current_cpu_type() == CPU_VR4121) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu1_clear(MKIUINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -319,9 +319,9 @@ void vr41xx_enable_pciint(void)
         struct irq_desc *desc = irq_desc + PCI_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MPCIINTREG, PCIINT0);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -335,9 +335,9 @@ void vr41xx_disable_pciint(void)
         struct irq_desc *desc = irq_desc + PCI_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MPCIINTREG, 0);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -351,9 +351,9 @@ void vr41xx_enable_scuint(void)
         struct irq_desc *desc = irq_desc + SCU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MSCUINTREG, SCUINT0);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -367,9 +367,9 @@ void vr41xx_disable_scuint(void)
         struct irq_desc *desc = irq_desc + SCU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MSCUINTREG, 0);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -383,9 +383,9 @@ void vr41xx_enable_csiint(uint16_t mask)
         struct irq_desc *desc = irq_desc + CSI_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_set(MCSIINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -399,9 +399,9 @@ void vr41xx_disable_csiint(uint16_t mask)
         struct irq_desc *desc = irq_desc + CSI_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_clear(MCSIINTREG, mask);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -415,9 +415,9 @@ void vr41xx_enable_bcuint(void)
         struct irq_desc *desc = irq_desc + BCU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MBCUINTREG, BCUINTR);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -431,9 +431,9 @@ void vr41xx_disable_bcuint(void)
         struct irq_desc *desc = irq_desc + BCU_IRQ;
         unsigned long flags;
 
-        if (current_cpu_data.cputype == CPU_VR4122 ||
-            current_cpu_data.cputype == CPU_VR4131 ||
-            current_cpu_data.cputype == CPU_VR4133) {
+        if (current_cpu_type() == CPU_VR4122 ||
+            current_cpu_type() == CPU_VR4131 ||
+            current_cpu_type() == CPU_VR4133) {
                 spin_lock_irqsave(&desc->lock, flags);
                 icu2_write(MBCUINTREG, 0);
                 spin_unlock_irqrestore(&desc->lock, flags);
@@ -608,7 +608,7 @@ int vr41xx_set_intassign(unsigned int irq, unsigned char intassign)
 {
         int retval = -EINVAL;
 
-        if (current_cpu_data.cputype != CPU_VR4133)
+        if (current_cpu_type() != CPU_VR4133)
                 return -EINVAL;
 
         if (intassign > INTASSIGN_MAX)
@@ -665,7 +665,7 @@ static int __init vr41xx_icu_init(void)
         unsigned long icu1_start, icu2_start;
         int i;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 icu1_start = ICU1_TYPE1_BASE;
diff --git a/arch/mips/vr41xx/common/init.c b/arch/mips/vr41xx/common/init.c
index 4f97e0ba9e24..407cec203b29 100644
--- a/arch/mips/vr41xx/common/init.c
+++ b/arch/mips/vr41xx/common/init.c
@@ -36,7 +36,7 @@ static void __init iomem_resource_init(void)
         iomem_resource.end = IO_MEM_RESOURCE_END;
 }
 
-static void __init setup_timer_frequency(void)
+void __init plat_time_init(void)
 {
         unsigned long tclock;
 
@@ -53,16 +53,10 @@ void __init plat_timer_setup(struct irqaction *irq)
         setup_irq(TIMER_IRQ, irq);
 }
 
-static void __init timer_init(void)
-{
-        board_time_init = setup_timer_frequency;
-}
-
 void __init plat_mem_setup(void)
 {
         vr41xx_calculate_clock_frequency();
 
-        timer_init();
         iomem_resource_init();
 }
 
diff --git a/arch/mips/vr41xx/common/pmu.c b/arch/mips/vr41xx/common/pmu.c
index 5e469796413f..028aaf75eb21 100644
--- a/arch/mips/vr41xx/common/pmu.c
+++ b/arch/mips/vr41xx/common/pmu.c
@@ -1,7 +1,7 @@
 /*
  *  pmu.c, Power Management Unit routines for NEC VR4100 series.
  *
- *  Copyright (C) 2003-2005  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *  Copyright (C) 2003-2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *
  *  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
@@ -22,11 +22,13 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/pm.h>
-#include <linux/smp.h>
+#include <linux/sched.h>
 #include <linux/types.h>
 
+#include <asm/cacheflush.h>
 #include <asm/cpu.h>
 #include <asm/io.h>
+#include <asm/processor.h>
 #include <asm/reboot.h>
 #include <asm/system.h>
 
@@ -44,11 +46,23 @@ static void __iomem *pmu_base;
 #define pmu_read(offset)                readw(pmu_base + (offset))
 #define pmu_write(offset, value)        writew((value), pmu_base + (offset))
 
+static void vr41xx_cpu_wait(void)
+{
+        local_irq_disable();
+        if (!need_resched())
+                /*
+                 * "standby" sets IE bit of the CP0_STATUS to 1.
+                 */
+                __asm__("standby;\n");
+        else
+                local_irq_enable();
+}
+
 static inline void software_reset(void)
 {
         uint16_t pmucnt2;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4122:
         case CPU_VR4131:
         case CPU_VR4133:
@@ -57,6 +71,11 @@ static inline void software_reset(void)
                 pmu_write(PMUCNT2REG, pmucnt2);
                 break;
         default:
+                set_c0_status(ST0_BEV | ST0_ERL);
+                change_c0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
+                flush_cache_all();
+                write_c0_wired(0);
+                __asm__("jr     %0"::"r"(0xbfc00000));
                 break;
         }
 }
@@ -65,7 +84,6 @@ static void vr41xx_restart(char *command)
 {
         local_irq_disable();
         software_reset();
-        printk(KERN_NOTICE "\nYou can reset your system\n");
         while (1) ;
 }
 
@@ -73,21 +91,14 @@ static void vr41xx_halt(void)
 {
         local_irq_disable();
         printk(KERN_NOTICE "\nYou can turn off the power supply\n");
-        while (1) ;
-}
-
-static void vr41xx_power_off(void)
-{
-        local_irq_disable();
-        printk(KERN_NOTICE "\nYou can turn off the power supply\n");
-        while (1) ;
+        __asm__("hibernate;\n");
 }
 
 static int __init vr41xx_pmu_init(void)
 {
         unsigned long start, size;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 start = PMU_TYPE1_BASE;
@@ -113,9 +124,10 @@ static int __init vr41xx_pmu_init(void)
                 return -EBUSY;
         }
 
+        cpu_wait = vr41xx_cpu_wait;
         _machine_restart = vr41xx_restart;
         _machine_halt = vr41xx_halt;
-        pm_power_off = vr41xx_power_off;
+        pm_power_off = vr41xx_halt;
 
         return 0;
 }
diff --git a/arch/mips/vr41xx/common/rtc.c b/arch/mips/vr41xx/common/rtc.c
index cce605b3d688..9f26c14edcac 100644
--- a/arch/mips/vr41xx/common/rtc.c
+++ b/arch/mips/vr41xx/common/rtc.c
@@ -82,7 +82,7 @@ static int __init vr41xx_rtc_add(void)
         if (!pdev)
                 return -ENOMEM;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 res = rtc_type1_resource;
diff --git a/arch/mips/vr41xx/common/siu.c b/arch/mips/vr41xx/common/siu.c
index a1e774142163..b735f45b25f0 100644
--- a/arch/mips/vr41xx/common/siu.c
+++ b/arch/mips/vr41xx/common/siu.c
@@ -83,7 +83,7 @@ static int __init vr41xx_siu_add(void)
         if (!pdev)
                 return -ENOMEM;
 
-        switch (current_cpu_data.cputype) {
+        switch (current_cpu_type()) {
         case CPU_VR4111:
         case CPU_VR4121:
                 pdev->dev.platform_data = siu_type1_ports;
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/init.c b/arch/mips/vr41xx/nec-cmbvr4133/init.c
index ae1af6b21c45..7c5e18ee2231 100644
--- a/arch/mips/vr41xx/nec-cmbvr4133/init.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/init.c
@@ -36,7 +36,7 @@ void disable_pcnet(void)
          */
 
         writel((2 << 16)                |
-               (PCI_DEVFN(1,0) << 8)    |
+               (PCI_DEVFN(1, 0) << 8)   |
                (0 & 0xfc)               |
                1UL,
                PCICONFAREG);
@@ -44,7 +44,7 @@ void disable_pcnet(void)
         data = readl(PCICONFDREG);
 
         writel((2 << 16)                |
-               (PCI_DEVFN(1,0) << 8)    |
+               (PCI_DEVFN(1, 0) << 8)   |
                (4 & 0xfc)               |
                1UL,
                PCICONFAREG);
@@ -52,7 +52,7 @@ void disable_pcnet(void)
         data = readl(PCICONFDREG);
 
         writel((2 << 16)                |
-               (PCI_DEVFN(1,0) << 8)    |
+               (PCI_DEVFN(1, 0) << 8)   |
                (4 & 0xfc)               |
                1UL,
                PCICONFAREG);
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c b/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c
index f45caccedc07..1341f3287d04 100644
--- a/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c
@@ -38,7 +38,7 @@
                 outb_p((dev_no), DATA_PORT(port));      \
         } while(0)
 
-#define WRITE_CONFIG_DATA(port,index,data)              \
+#define WRITE_CONFIG_DATA(port, index, data)            \
         do {                                            \
                 outb_p((index), INDEX_PORT(port));      \
                 outb_p((data), DATA_PORT(port));        \
@@ -206,8 +206,8 @@ static inline u16 ali_config_readw(u8 reg, int devfn)
 int vr4133_rockhopper = 0;
 void __init ali_m5229_preinit(void)
 {
-        if (ali_config_readw(PCI_VENDOR_ID,16) == PCI_VENDOR_ID_AL &&
-            ali_config_readw(PCI_DEVICE_ID,16) == PCI_DEVICE_ID_AL_M1533) {
+        if (ali_config_readw(PCI_VENDOR_ID, 16) == PCI_VENDOR_ID_AL &&
+            ali_config_readw(PCI_DEVICE_ID, 16) == PCI_DEVICE_ID_AL_M1533) {
                 printk(KERN_INFO "Found an NEC Rockhopper \n");
                 vr4133_rockhopper = 1;
                 /*
diff --git a/arch/mips/vr41xx/nec-cmbvr4133/setup.c b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
index b20b93b2b95e..58e47686b499 100644
--- a/arch/mips/vr41xx/nec-cmbvr4133/setup.c
+++ b/arch/mips/vr41xx/nec-cmbvr4133/setup.c
@@ -64,7 +64,6 @@ static void __init nec_cmbvr4133_setup(void)
 #endif
         set_io_port_base(KSEG1ADDR(0x16000000));
 
-        mips_machgroup = MACH_GROUP_NEC_VR41XX;
         mips_machtype = MACH_NEC_CMBVR4133;
 
 #ifdef CONFIG_PCI
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 00099efe0e9f..037664d496d7 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -14,6 +14,11 @@ config 64BIT
         bool
         default y if PPC64
 
+config WORD_SIZE
+        int
+        default 64 if PPC64
+        default 32 if !PPC64
+
 config PPC_MERGE
         def_bool y
 
@@ -21,6 +26,18 @@ config MMU
         bool
         default y
 
+config GENERIC_CMOS_UPDATE
+        def_bool y
+
+config GENERIC_TIME
+        def_bool y
+
+config GENERIC_TIME_VSYSCALL
+        def_bool y
+
+config GENERIC_CLOCKEVENTS
+        def_bool y
+
 config GENERIC_HARDIRQS
         bool
         default y
@@ -156,6 +173,7 @@ config HIGHMEM
         bool "High memory support"
         depends on PPC32
 
+source kernel/time/Kconfig
 source kernel/Kconfig.hz
 source kernel/Kconfig.preempt
 source "fs/Kconfig.binfmt"
@@ -180,17 +198,29 @@ config MATH_EMULATION
           unit, which will allow programs that use floating-point
           instructions to run.
 
+config 8XX_MINIMAL_FPEMU
+        bool "Minimal math emulation for 8xx"
+        depends on 8xx && !MATH_EMULATION
+        help
+          Older arch/ppc kernels still emulated a few floating point
+          instructions such as load and store, even when full math
+          emulation is disabled.  Say "Y" here if you want to preserve
+          this behavior.
+
+          It is recommended that you build a soft-float userspace instead.
+
 config IOMMU_VMERGE
-        bool "Enable IOMMU virtual merging (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && PPC64
-        default n
+        bool "Enable IOMMU virtual merging"
+        depends on PPC64
+        default y
         help
           Cause IO segments sent to a device for DMA to be merged virtually
           by the IOMMU when they happen to have been allocated contiguously.
           This doesn't add pressure to the IOMMU allocator. However, some
           drivers don't support getting large merged segments coming back
-          from *_map_sg(). Say Y if you know the drivers you are using are
-          properly handling this case.
+          from *_map_sg().
+
+          Most drivers don't have this problem; it is safe to say Y here.
 
 config HOTPLUG_CPU
         bool "Support for enabling/disabling CPUs"
@@ -465,7 +495,7 @@ config PCI_8260
 
 config 8260_PCI9
         bool "Enable workaround for MPC826x erratum PCI 9"
-        depends on PCI_8260 && !ADS8272
+        depends on PCI_8260 && !8272
         default y
 
 choice
@@ -569,7 +599,8 @@ config TASK_SIZE_BOOL
 
 config TASK_SIZE
         hex "Size of user task space" if TASK_SIZE_BOOL
-        default "0x80000000"
+        default "0x80000000" if PPC_PREP || PPC_8xx
+        default "0xc0000000"
 
 config CONSISTENT_START_BOOL
         bool "Set custom consistent memory pool address"
@@ -581,6 +612,7 @@ config CONSISTENT_START_BOOL
 
 config CONSISTENT_START
         hex "Base virtual address of consistent memory pool" if CONSISTENT_START_BOOL
+        default "0xfd000000" if (NOT_COHERENT_CACHE && 8xx)
         default "0xff100000" if NOT_COHERENT_CACHE
 
 config CONSISTENT_SIZE_BOOL
@@ -662,3 +694,7 @@ config KEYS_COMPAT
         default y
 
 source "crypto/Kconfig"
+
+config PPC_CLOCK
+        bool
+        default n
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 22acece95b11..464f9b4b3169 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -124,6 +124,16 @@ config IRQSTACKS
           for handling hard and soft interrupts.  This can help avoid
           overflowing the process kernel stacks.
 
+config VIRQ_DEBUG
+        bool "Expose hardware/virtual IRQ mapping via debugfs"
+        depends on DEBUG_FS && PPC_MERGE
+        help
+          This option will show the mapping relationship between hardware irq
+          numbers and virtual irq numbers. The mapping is exposed via debugfs
+          in the file powerpc/virq_mapping.
+
+          If you don't know what this means you don't need it.
+
 config BDI_SWITCH
         bool "Include BDI-2000 user context switcher"
         depends on DEBUG_KERNEL && PPC32
@@ -211,6 +221,15 @@ config PPC_EARLY_DEBUG_44x
           Select this to enable early debugging for IBM 44x chips via the
           inbuilt serial port.
 
+config PPC_EARLY_DEBUG_CPM
+        bool "Early serial debugging for Freescale CPM-based serial ports"
+        depends on SERIAL_CPM
+        select PIN_TLB if PPC_8xx
+        help
+          Select this to enable early debugging for Freescale chips
+          using a CPM-based serial port.  This assumes that the bootwrapper
+          has run, and set up the CPM in a particular way.
+
 endchoice
 
 config PPC_EARLY_DEBUG_44x_PHYSLOW
@@ -223,4 +242,16 @@ config PPC_EARLY_DEBUG_44x_PHYSHIGH
         depends PPC_EARLY_DEBUG_44x
         default "0x1"
 
+config PPC_EARLY_DEBUG_CPM_ADDR
+        hex "CPM UART early debug transmit descriptor address"
+        depends on PPC_EARLY_DEBUG_CPM
+        default "0xfa202008" if PPC_EP88XC
+        default "0xf0000008" if CPM2
+        default "0xff002008" if CPM1
+        help
+          This specifies the address of the transmit descriptor
+          used for early debug output.  Because it is needed before
+          platform probing is done, all platforms selected must
+          share the same address.
+
 endmenu
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 6c1e36c33faa..643839a3f5d8 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -35,11 +35,14 @@ endif
 
 export CROSS32CC CROSS32AS CROSS32LD CROSS32AR CROSS32OBJCOPY
 
+ifeq ($(CROSS_COMPILE),)
 KBUILD_DEFCONFIG := $(shell uname -m)_defconfig
+else
+KBUILD_DEFCONFIG := ppc64_defconfig
+endif
 
 ifeq ($(CONFIG_PPC64),y)
 OLDARCH := ppc64
-SZ      := 64
 
 new_nm := $(shell if $(NM) --help 2>&1 | grep -- '--synthetic' > /dev/null; then echo y; else echo n; fi)
 
@@ -49,22 +52,26 @@ endif
 
 else
 OLDARCH := ppc
-SZ      := 32
+endif
+
+# It seems there are times we use this Makefile without
+# including the config file, but this replicates the old behaviour
+ifeq ($(CONFIG_WORD_SIZE),)
+CONFIG_WORD_SIZE := 32
 endif
 
 UTS_MACHINE := $(OLDARCH)
 
 ifeq ($(HAS_BIARCH),y)
-override AS     += -a$(SZ)
-override LD     += -m elf$(SZ)ppc
-override CC     += -m$(SZ)
-override AR     := GNUTARGET=elf$(SZ)-powerpc $(AR)
+override AS     += -a$(CONFIG_WORD_SIZE)
+override LD     += -m elf$(CONFIG_WORD_SIZE)ppc
+override CC     += -m$(CONFIG_WORD_SIZE)
+override AR     := GNUTARGET=elf$(CONFIG_WORD_SIZE)-powerpc $(AR)
 endif
 
 LDFLAGS_vmlinux := -Bstatic
 
-# The -Iarch/$(ARCH)/include is temporary while we are merging
-CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH) -Iarch/$(ARCH)/include
+CPPFLAGS-$(CONFIG_PPC32) := -Iarch/$(ARCH)
 AFLAGS-$(CONFIG_PPC32)  := -Iarch/$(ARCH)
 CFLAGS-$(CONFIG_PPC64)  := -mminimal-toc -mtraceback=none  -mcall-aixdesc
 CFLAGS-$(CONFIG_PPC32)  := -Iarch/$(ARCH) -ffixed-r2 -mmultiple
@@ -72,11 +79,8 @@ CPPFLAGS	+= $(CPPFLAGS-y)
 AFLAGS          += $(AFLAGS-y)
 CFLAGS          += -msoft-float -pipe $(CFLAGS-y)
 CPP             = $(CC) -E $(CFLAGS)
-# Temporary hack until we have migrated to asm-powerpc
-LINUXINCLUDE-$(CONFIG_PPC32)    := -Iarch/$(ARCH)/include
-LINUXINCLUDE    += $(LINUXINCLUDE-y)
 
-CHECKFLAGS      += -m$(SZ) -D__powerpc__ -D__powerpc$(SZ)__
+CHECKFLAGS      += -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
 
 ifeq ($(CONFIG_PPC64),y)
 GCC_BROKEN_VEC  := $(shell if [ $(call cc-version) -lt 0400 ] ; then echo "y"; fi)
@@ -96,6 +100,10 @@ else
 endif
 endif
 
+ifeq ($(CONFIG_TUNE_CELL),y)
+        CFLAGS += $(call cc-option,-mtune=cell)
+endif
+
 # No AltiVec instruction when building kernel
 CFLAGS += $(call cc-option,-mno-altivec)
 
@@ -120,10 +128,9 @@ cpu-as-$(CONFIG_E200)		+= -Wa,-me200
 AFLAGS += $(cpu-as-y)
 CFLAGS += $(cpu-as-y)
 
-head-y                          := arch/powerpc/kernel/head_32.o
-head-$(CONFIG_PPC64)            := arch/powerpc/kernel/head_64.o
+head-y                          := arch/powerpc/kernel/head_$(CONFIG_WORD_SIZE).o
 head-$(CONFIG_8xx)              := arch/powerpc/kernel/head_8xx.o
-head-$(CONFIG_4xx)              := arch/powerpc/kernel/head_4xx.o
+head-$(CONFIG_40x)              := arch/powerpc/kernel/head_40x.o
 head-$(CONFIG_44x)              := arch/powerpc/kernel/head_44x.o
 head-$(CONFIG_FSL_BOOKE)        := arch/powerpc/kernel/head_fsl_booke.o
 
@@ -166,25 +173,20 @@ define archhelp
   @echo '  *_defconfig     - Select default config from arch/$(ARCH)/configs'
 endef
 
-install:
+install: vdso_install
         $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
 
+vdso_install:
+ifeq ($(CONFIG_PPC64),y)
+        $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@
+endif
+        $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@
+
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
-archmrproper:
-        $(Q)rm -rf arch/$(ARCH)/include
-
 archprepare: checkbin
 
-ifeq ($(CONFIG_PPC32),y)
-# Temporary hack until we have migrated to asm-powerpc
-include/asm: arch/$(ARCH)/include/asm
-arch/$(ARCH)/include/asm: FORCE
-        $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
-        $(Q)ln -fsn $(srctree)/include/asm-$(OLDARCH) arch/$(ARCH)/include/asm
-endif
-
 # Use the file '.tmp_gas_check' for binutils tests, as gas won't output
 # to stdout and these checks are run even on install targets.
 TOUT    := .tmp_gas_check
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index eec7af7e5993..65f4118cbe78 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -18,14 +18,15 @@ kernel-vmlinux.strip.c
 kernel-vmlinux.strip.gz
 mktree
 uImage
-cuImage
-cuImage.bin.gz
-cuImage.elf
+cuImage.*
+treeImage.*
 zImage
+zImage.bin.*
 zImage.chrp
 zImage.coff
 zImage.coff.lds
-zImage.lds
+zImage.ep*
+zImage.*lds
 zImage.miboot
 zImage.pmac
 zImage.pseries
diff --git a/arch/powerpc/boot/44x.c b/arch/powerpc/boot/44x.c
deleted file mode 100644
index 9f64e840bef6..000000000000
--- a/arch/powerpc/boot/44x.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2007 David Gibson, IBM Corporation.
- *
- * Based on earlier code:
- *   Matt Porter <mporter@kernel.crashing.org>
- *   Copyright 2002-2005 MontaVista Software Inc.
- *
- *   Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
- *   Copyright (c) 2003, 2004 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 <stddef.h>
-#include "types.h"
-#include "string.h"
-#include "stdio.h"
-#include "ops.h"
-#include "reg.h"
-#include "dcr.h"
-
-/* Read the 44x memory controller to get size of system memory. */
-void ibm44x_fixup_memsize(void)
-{
-        int i;
-        unsigned long memsize, bank_config;
-
-        memsize = 0;
-        for (i = 0; i < ARRAY_SIZE(sdram_bxcr); i++) {
-                mtdcr(DCRN_SDRAM0_CFGADDR, sdram_bxcr[i]);
-                bank_config = mfdcr(DCRN_SDRAM0_CFGDATA);
-
-                if (bank_config & SDRAM_CONFIG_BANK_ENABLE)
-                        memsize += SDRAM_CONFIG_BANK_SIZE(bank_config);
-        }
-
-        dt_fixup_memory(0, memsize);
-}
-
-#define SPRN_DBCR0              0x134
-#define   DBCR0_RST_SYSTEM      0x30000000
-
-void ibm44x_dbcr_reset(void)
-{
-        unsigned long tmp;
-
-        asm volatile (
-                "mfspr  %0,%1\n"
-                "oris   %0,%0,%2@h\n"
-                "mtspr  %1,%0"
-                : "=&r"(tmp) : "i"(SPRN_DBCR0), "i"(DBCR0_RST_SYSTEM)
-                );
-
-}
-
-/* Read 4xx EBC bus bridge registers to get mappings of the peripheral
- * banks into the OPB address space */
-void ibm4xx_fixup_ebc_ranges(const char *ebc)
-{
-        void *devp;
-        u32 bxcr;
-        u32 ranges[EBC_NUM_BANKS*4];
-        u32 *p = ranges;
-        int i;
-
-        for (i = 0; i < EBC_NUM_BANKS; i++) {
-                mtdcr(DCRN_EBC0_CFGADDR, EBC_BXCR(i));
-                bxcr = mfdcr(DCRN_EBC0_CFGDATA);
-
-                if ((bxcr & EBC_BXCR_BU) != EBC_BXCR_BU_OFF) {
-                        *p++ = i;
-                        *p++ = 0;
-                        *p++ = bxcr & EBC_BXCR_BAS;
-                        *p++ = EBC_BXCR_BANK_SIZE(bxcr);
-                }
-        }
-
-        devp = finddevice(ebc);
-        if (! devp)
-                fatal("Couldn't locate EBC node %s\n\r", ebc);
-
-        setprop(devp, "ranges", ranges, (p - ranges) * sizeof(u32));
-}
diff --git a/arch/powerpc/boot/44x.h b/arch/powerpc/boot/44x.h
index 577982c9a3cd..02563443788a 100644
--- a/arch/powerpc/boot/44x.h
+++ b/arch/powerpc/boot/44x.h
@@ -10,10 +10,7 @@
 #ifndef _PPC_BOOT_44X_H_
 #define _PPC_BOOT_44X_H_
 
-void ibm44x_fixup_memsize(void);
-void ibm4xx_fixup_ebc_ranges(const char *ebc);
-
-void ibm44x_dbcr_reset(void);
 void ebony_init(void *mac0, void *mac1);
+void bamboo_init(void *mac0, void *mac1);
 
 #endif /* _PPC_BOOT_44X_H_ */
diff --git a/arch/powerpc/boot/4xx.c b/arch/powerpc/boot/4xx.c
new file mode 100644
index 000000000000..ebf9e217612d
--- /dev/null
+++ b/arch/powerpc/boot/4xx.c
@@ -0,0 +1,300 @@
+/*
+ * Copyright 2007 David Gibson, IBM Corporation.
+ *
+ * Based on earlier code:
+ *   Matt Porter <mporter@kernel.crashing.org>
+ *   Copyright 2002-2005 MontaVista Software Inc.
+ *
+ *   Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
+ *   Copyright (c) 2003, 2004 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 <stddef.h>
+#include "types.h"
+#include "string.h"
+#include "stdio.h"
+#include "ops.h"
+#include "reg.h"
+#include "dcr.h"
+
+/* Read the 4xx SDRAM controller to get size of system memory. */
+void ibm4xx_fixup_memsize(void)
+{
+        int i;
+        unsigned long memsize, bank_config;
+
+        memsize = 0;
+        for (i = 0; i < ARRAY_SIZE(sdram_bxcr); i++) {
+                mtdcr(DCRN_SDRAM0_CFGADDR, sdram_bxcr[i]);
+                bank_config = mfdcr(DCRN_SDRAM0_CFGDATA);
+
+                if (bank_config & SDRAM_CONFIG_BANK_ENABLE)
+                        memsize += SDRAM_CONFIG_BANK_SIZE(bank_config);
+        }
+
+        dt_fixup_memory(0, memsize);
+}
+
+/* 4xx DDR1/2 Denali memory controller support */
+/* DDR0 registers */
+#define DDR0_02                 2
+#define DDR0_08                 8
+#define DDR0_10                 10
+#define DDR0_14                 14
+#define DDR0_42                 42
+#define DDR0_43                 43
+
+/* DDR0_02 */
+#define DDR_START               0x1
+#define DDR_START_SHIFT         0
+#define DDR_MAX_CS_REG          0x3
+#define DDR_MAX_CS_REG_SHIFT    24
+#define DDR_MAX_COL_REG         0xf
+#define DDR_MAX_COL_REG_SHIFT   16
+#define DDR_MAX_ROW_REG         0xf
+#define DDR_MAX_ROW_REG_SHIFT   8
+/* DDR0_08 */
+#define DDR_DDR2_MODE           0x1
+#define DDR_DDR2_MODE_SHIFT     0
+/* DDR0_10 */
+#define DDR_CS_MAP              0x3
+#define DDR_CS_MAP_SHIFT        8
+/* DDR0_14 */
+#define DDR_REDUC               0x1
+#define DDR_REDUC_SHIFT         16
+/* DDR0_42 */
+#define DDR_APIN                0x7
+#define DDR_APIN_SHIFT          24
+/* DDR0_43 */
+#define DDR_COL_SZ              0x7
+#define DDR_COL_SZ_SHIFT        8
+#define DDR_BANK8               0x1
+#define DDR_BANK8_SHIFT         0
+
+#define DDR_GET_VAL(val, mask, shift)   (((val) >> (shift)) & (mask))
+
+static inline u32 mfdcr_sdram0(u32 reg)
+{
+        mtdcr(DCRN_SDRAM0_CFGADDR, reg);
+        return mfdcr(DCRN_SDRAM0_CFGDATA);
+}
+
+void ibm4xx_denali_fixup_memsize(void)
+{
+        u32 val, max_cs, max_col, max_row;
+        u32 cs, col, row, bank, dpath;
+        unsigned long memsize;
+
+        val = mfdcr_sdram0(DDR0_02);
+        if (!DDR_GET_VAL(val, DDR_START, DDR_START_SHIFT))
+                fatal("DDR controller is not initialized\n");
+
+        /* get maximum cs col and row values */
+        max_cs  = DDR_GET_VAL(val, DDR_MAX_CS_REG, DDR_MAX_CS_REG_SHIFT);
+        max_col = DDR_GET_VAL(val, DDR_MAX_COL_REG, DDR_MAX_COL_REG_SHIFT);
+        max_row = DDR_GET_VAL(val, DDR_MAX_ROW_REG, DDR_MAX_ROW_REG_SHIFT);
+
+        /* get CS value */
+        val = mfdcr_sdram0(DDR0_10);
+
+        val = DDR_GET_VAL(val, DDR_CS_MAP, DDR_CS_MAP_SHIFT);
+        cs = 0;
+        while (val) {
+                if (val && 0x1)
+                        cs++;
+                val = val >> 1;
+        }
+
+        if (!cs)
+                fatal("No memory installed\n");
+        if (cs > max_cs)
+                fatal("DDR wrong CS configuration\n");
+
+        /* get data path bytes */
+        val = mfdcr_sdram0(DDR0_14);
+
+        if (DDR_GET_VAL(val, DDR_REDUC, DDR_REDUC_SHIFT))
+                dpath = 8; /* 64 bits */
+        else
+                dpath = 4; /* 32 bits */
+
+        /* get adress pins (rows) */
+        val = mfdcr_sdram0(DDR0_42);
+
+        row = DDR_GET_VAL(val, DDR_APIN, DDR_APIN_SHIFT);
+        if (row > max_row)
+                fatal("DDR wrong APIN configuration\n");
+        row = max_row - row;
+
+        /* get collomn size and banks */
+        val = mfdcr_sdram0(DDR0_43);
+
+        col = DDR_GET_VAL(val, DDR_COL_SZ, DDR_COL_SZ_SHIFT);
+        if (col > max_col)
+                fatal("DDR wrong COL configuration\n");
+        col = max_col - col;
+
+        if (DDR_GET_VAL(val, DDR_BANK8, DDR_BANK8_SHIFT))
+                bank = 8; /* 8 banks */
+        else
+                bank = 4; /* 4 banks */
+
+        memsize = cs * (1 << (col+row)) * bank * dpath;
+        dt_fixup_memory(0, memsize);
+}
+
+#define SPRN_DBCR0_40X 0x3F2
+#define SPRN_DBCR0_44X 0x134
+#define DBCR0_RST_SYSTEM 0x30000000
+
+void ibm44x_dbcr_reset(void)
+{
+        unsigned long tmp;
+
+        asm volatile (
+                "mfspr  %0,%1\n"
+                "oris   %0,%0,%2@h\n"
+                "mtspr  %1,%0"
+                : "=&r"(tmp) : "i"(SPRN_DBCR0_44X), "i"(DBCR0_RST_SYSTEM)
+                );
+
+}
+
+void ibm40x_dbcr_reset(void)
+{
+        unsigned long tmp;
+
+        asm volatile (
+                "mfspr  %0,%1\n"
+                "oris   %0,%0,%2@h\n"
+                "mtspr  %1,%0"
+                : "=&r"(tmp) : "i"(SPRN_DBCR0_40X), "i"(DBCR0_RST_SYSTEM)
+                );
+}
+
+#define EMAC_RESET 0x20000000
+void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1)
+{
+        /* Quiesce the MAL and EMAC(s) since PIBS/OpenBIOS don't do this for us */
+        if (emac0)
+                *emac0 = EMAC_RESET;
+        if (emac1)
+                *emac1 = EMAC_RESET;
+
+        mtdcr(DCRN_MAL0_CFG, MAL_RESET);
+}
+
+/* Read 4xx EBC bus bridge registers to get mappings of the peripheral
+ * banks into the OPB address space */
+void ibm4xx_fixup_ebc_ranges(const char *ebc)
+{
+        void *devp;
+        u32 bxcr;
+        u32 ranges[EBC_NUM_BANKS*4];
+        u32 *p = ranges;
+        int i;
+
+        for (i = 0; i < EBC_NUM_BANKS; i++) {
+                mtdcr(DCRN_EBC0_CFGADDR, EBC_BXCR(i));
+                bxcr = mfdcr(DCRN_EBC0_CFGDATA);
+
+                if ((bxcr & EBC_BXCR_BU) != EBC_BXCR_BU_OFF) {
+                        *p++ = i;
+                        *p++ = 0;
+                        *p++ = bxcr & EBC_BXCR_BAS;
+                        *p++ = EBC_BXCR_BANK_SIZE(bxcr);
+                }
+        }
+
+        devp = finddevice(ebc);
+        if (! devp)
+                fatal("Couldn't locate EBC node %s\n\r", ebc);
+
+        setprop(devp, "ranges", ranges, (p - ranges) * sizeof(u32));
+}
+
+#define SPRN_CCR1 0x378
+void ibm440ep_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)
+{
+        u32 cpu, plb, opb, ebc, tb, uart0, m, vco;
+        u32 reg;
+        u32 fwdva, fwdvb, fbdv, lfbdv, opbdv0, perdv0, spcid0, prbdv0, tmp;
+
+        mtdcr(DCRN_CPR0_ADDR, CPR0_PLLD0);
+        reg = mfdcr(DCRN_CPR0_DATA);
+        tmp = (reg & 0x000F0000) >> 16;
+        fwdva = tmp ? tmp : 16;
+        tmp = (reg & 0x00000700) >> 8;
+        fwdvb = tmp ? tmp : 8;
+        tmp = (reg & 0x1F000000) >> 24;
+        fbdv = tmp ? tmp : 32;
+        lfbdv = (reg & 0x0000007F);
+
+        mtdcr(DCRN_CPR0_ADDR, CPR0_OPBD0);
+        reg = mfdcr(DCRN_CPR0_DATA);
+        tmp = (reg & 0x03000000) >> 24;
+        opbdv0 = tmp ? tmp : 4;
+
+        mtdcr(DCRN_CPR0_ADDR, CPR0_PERD0);
+        reg = mfdcr(DCRN_CPR0_DATA);
+        tmp = (reg & 0x07000000) >> 24;
+        perdv0 = tmp ? tmp : 8;
+
+        mtdcr(DCRN_CPR0_ADDR, CPR0_PRIMBD0);
+        reg = mfdcr(DCRN_CPR0_DATA);
+        tmp = (reg & 0x07000000) >> 24;
+        prbdv0 = tmp ? tmp : 8;
+
+        mtdcr(DCRN_CPR0_ADDR, CPR0_SCPID);
+        reg = mfdcr(DCRN_CPR0_DATA);
+        tmp = (reg & 0x03000000) >> 24;
+        spcid0 = tmp ? tmp : 4;
+
+        /* Calculate M */
+        mtdcr(DCRN_CPR0_ADDR, CPR0_PLLC0);
+        reg = mfdcr(DCRN_CPR0_DATA);
+        tmp = (reg & 0x03000000) >> 24;
+        if (tmp == 0) { /* PLL output */
+                tmp = (reg & 0x20000000) >> 29;
+                if (!tmp) /* PLLOUTA */
+                        m = fbdv * lfbdv * fwdva;
+                else
+                        m = fbdv * lfbdv * fwdvb;
+        }
+        else if (tmp == 1) /* CPU output */
+                m = fbdv * fwdva;
+        else
+                m = perdv0 * opbdv0 * fwdvb;
+
+        vco = (m * sysclk) + (m >> 1);
+        cpu = vco / fwdva;
+        plb = vco / fwdvb / prbdv0;
+        opb = plb / opbdv0;
+        ebc = plb / perdv0;
+
+        /* FIXME */
+        uart0 = ser_clk;
+
+        /* Figure out timebase.  Either CPU or default TmrClk */
+        asm volatile (
+                        "mfspr  %0,%1\n"
+                        :
+                        "=&r"(reg) : "i"(SPRN_CCR1));
+        if (reg & 0x0080)
+                tb = 25000000; /* TmrClk is 25MHz */
+        else
+                tb = cpu;
+
+        dt_fixup_cpu_clocks(cpu, tb, 0);
+        dt_fixup_clock("/plb", plb);
+        dt_fixup_clock("/plb/opb", opb);
+        dt_fixup_clock("/plb/opb/ebc", ebc);
+        dt_fixup_clock("/plb/opb/serial@ef600300", uart0);
+        dt_fixup_clock("/plb/opb/serial@ef600400", uart0);
+        dt_fixup_clock("/plb/opb/serial@ef600500", uart0);
+        dt_fixup_clock("/plb/opb/serial@ef600600", uart0);
+}
diff --git a/arch/powerpc/boot/4xx.h b/arch/powerpc/boot/4xx.h
new file mode 100644
index 000000000000..adba6a599a93
--- /dev/null
+++ b/arch/powerpc/boot/4xx.h
@@ -0,0 +1,22 @@
+/*
+ * PowerPC 4xx related functions
+ *
+ * Copyright 2007 IBM Corporation.
+ * 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.
+ */
+#ifndef _POWERPC_BOOT_4XX_H_
+#define _POWERPC_BOOT_4XX_H_
+
+void ibm4xx_fixup_memsize(void);
+void ibm4xx_denali_fixup_memsize(void);
+void ibm44x_dbcr_reset(void);
+void ibm40x_dbcr_reset(void);
+void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1);
+void ibm4xx_fixup_ebc_ranges(const char *ebc);
+void ibm440ep_fixup_clocks(unsigned int sysclk, unsigned int ser_clk);
+
+#endif /* _POWERPC_BOOT_4XX_H_ */
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 61a6f34ca5ed..18e32719d0ed 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -25,14 +25,19 @@ BOOTCFLAGS    := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
                  -isystem $(shell $(CROSS32CC) -print-file-name=include)
 BOOTAFLAGS      := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
 
+ifdef CONFIG_DEBUG_INFO
+BOOTCFLAGS      += -g
+endif
+
 ifeq ($(call cc-option-yn, -fstack-protector),y)
 BOOTCFLAGS      += -fno-stack-protector
 endif
 
 BOOTCFLAGS      += -I$(obj) -I$(srctree)/$(obj)
 
-$(obj)/44x.o: BOOTCFLAGS += -mcpu=440
+$(obj)/4xx.o: BOOTCFLAGS += -mcpu=440
 $(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
+$(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
 
 zlib       := inffast.c inflate.c inftrees.c
 zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h
@@ -44,10 +49,14 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \
 src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
                 ns16550.c serial.c simple_alloc.c div64.S util.S \
                 gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
-                44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c
-src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \
+                4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \
+                cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \
+                fsl-soc.c mpc8xx.c pq2.c
+src-plat := of.c cuboot-52xx.c cuboot-83xx.c cuboot-85xx.c holly.c \
                 cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
-                ps3-head.S ps3-hvcall.S ps3.c
+                ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \
+                cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c cuboot-bamboo.c \
+                fixed-head.S ep88xc.c cuboot-hpc2.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -139,9 +148,17 @@ image-$(CONFIG_PPC_ISERIES)		+= zImage.iseries
 image-$(CONFIG_DEFAULT_UIMAGE)          += uImage
 
 ifneq ($(CONFIG_DEVICE_TREE),"")
+image-$(CONFIG_PPC_8xx)                 += cuImage.8xx
+image-$(CONFIG_PPC_EP88XC)              += zImage.ep88xc
+image-$(CONFIG_8260)                    += cuImage.pq2
+image-$(CONFIG_PPC_MPC52xx)             += cuImage.52xx
 image-$(CONFIG_PPC_83xx)                += cuImage.83xx
 image-$(CONFIG_PPC_85xx)                += cuImage.85xx
+image-$(CONFIG_MPC7448HPC2)             += cuImage.hpc2
 image-$(CONFIG_EBONY)                   += treeImage.ebony cuImage.ebony
+image-$(CONFIG_BAMBOO)                  += treeImage.bamboo cuImage.bamboo
+image-$(CONFIG_SEQUOIA)                 += cuImage.sequoia
+image-$(CONFIG_WALNUT)                  += treeImage.walnut
 endif
 
 # For 32-bit powermacs, build the COFF and miboot images
diff --git a/arch/powerpc/boot/bamboo.c b/arch/powerpc/boot/bamboo.c
new file mode 100644
index 000000000000..f61fcdab1c7c
--- /dev/null
+++ b/arch/powerpc/boot/bamboo.c
@@ -0,0 +1,47 @@
+/*
+ * Copyright IBM Corporation, 2007
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * Based on ebony wrapper:
+ * Copyright 2007 David Gibson, IBM Corporation.
+ *
+ * Clocking code based on code by:
+ * Stefan Roese <sr@denx.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2 of the License
+ */
+#include <stdarg.h>
+#include <stddef.h>
+#include "types.h"
+#include "elf.h"
+#include "string.h"
+#include "stdio.h"
+#include "page.h"
+#include "ops.h"
+#include "dcr.h"
+#include "4xx.h"
+#include "44x.h"
+
+static u8 *bamboo_mac0, *bamboo_mac1;
+
+static void bamboo_fixups(void)
+{
+        unsigned long sysclk = 33333333;
+
+        ibm440ep_fixup_clocks(sysclk, 11059200);
+        ibm4xx_fixup_memsize();
+        ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
+        dt_fixup_mac_addresses(bamboo_mac0, bamboo_mac1);
+}
+
+void bamboo_init(void *mac0, void *mac1)
+{
+        platform_ops.fixups = bamboo_fixups;
+        platform_ops.exit = ibm44x_dbcr_reset;
+        bamboo_mac0 = mac0;
+        bamboo_mac1 = mac1;
+        ft_init(_dtb_start, 0, 32);
+        serial_console_init();
+}
diff --git a/arch/powerpc/boot/cpm-serial.c b/arch/powerpc/boot/cpm-serial.c
new file mode 100644
index 000000000000..28296facb2ae
--- /dev/null
+++ b/arch/powerpc/boot/cpm-serial.c
@@ -0,0 +1,269 @@
+/*
+ * CPM serial console support.
+ *
+ * Copyright 2007 Freescale Semiconductor, Inc.
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * It is assumed that the firmware (or the platform file) has already set
+ * up the port.
+ */
+
+#include "types.h"
+#include "io.h"
+#include "ops.h"
+
+struct cpm_scc {
+        u32 gsmrl;
+        u32 gsmrh;
+        u16 psmr;
+        u8 res1[2];
+        u16 todr;
+        u16 dsr;
+        u16 scce;
+        u8 res2[2];
+        u16 sccm;
+        u8 res3;
+        u8 sccs;
+        u8 res4[8];
+};
+
+struct cpm_smc {
+        u8 res1[2];
+        u16 smcmr;
+        u8 res2[2];
+        u8 smce;
+        u8 res3[3];
+        u8 smcm;
+        u8 res4[5];
+};
+
+struct cpm_param {
+        u16 rbase;
+        u16 tbase;
+        u8 rfcr;
+        u8 tfcr;
+};
+
+struct cpm_bd {
+        u16 sc;   /* Status and Control */
+        u16 len;  /* Data length in buffer */
+        u8 *addr; /* Buffer address in host memory */
+};
+
+static void *cpcr;
+static struct cpm_param *param;
+static struct cpm_smc *smc;
+static struct cpm_scc *scc;
+struct cpm_bd *tbdf, *rbdf;
+static u32 cpm_cmd;
+static u8 *muram_start;
+static u32 muram_offset;
+
+static void (*do_cmd)(int op);
+static void (*enable_port)(void);
+static void (*disable_port)(void);
+
+#define CPM_CMD_STOP_TX     4
+#define CPM_CMD_RESTART_TX  6
+#define CPM_CMD_INIT_RX_TX  0
+
+static void cpm1_cmd(int op)
+{
+        while (in_be16(cpcr) & 1)
+                ;
+
+        out_be16(cpcr, (op << 8) | cpm_cmd | 1);
+
+        while (in_be16(cpcr) & 1)
+                ;
+}
+
+static void cpm2_cmd(int op)
+{
+        while (in_be32(cpcr) & 0x10000)
+                ;
+
+        out_be32(cpcr, op | cpm_cmd | 0x10000);
+
+        while (in_be32(cpcr) & 0x10000)
+                ;
+}
+
+static void smc_disable_port(void)
+{
+        do_cmd(CPM_CMD_STOP_TX);
+        out_be16(&smc->smcmr, in_be16(&smc->smcmr) & ~3);
+}
+
+static void scc_disable_port(void)
+{
+        do_cmd(CPM_CMD_STOP_TX);
+        out_be32(&scc->gsmrl, in_be32(&scc->gsmrl) & ~0x30);
+}
+
+static void smc_enable_port(void)
+{
+        out_be16(&smc->smcmr, in_be16(&smc->smcmr) | 3);
+        do_cmd(CPM_CMD_RESTART_TX);
+}
+
+static void scc_enable_port(void)
+{
+        out_be32(&scc->gsmrl, in_be32(&scc->gsmrl) | 0x30);
+        do_cmd(CPM_CMD_RESTART_TX);
+}
+
+static int cpm_serial_open(void)
+{
+        disable_port();
+
+        out_8(&param->rfcr, 0x10);
+        out_8(&param->tfcr, 0x10);
+
+        rbdf = (struct cpm_bd *)muram_start;
+        rbdf->addr = (u8 *)(rbdf + 2);
+        rbdf->sc = 0xa000;
+        rbdf->len = 1;
+
+        tbdf = rbdf + 1;
+        tbdf->addr = (u8 *)(rbdf + 2) + 1;
+        tbdf->sc = 0x2000;
+        tbdf->len = 1;
+
+        sync();
+        out_be16(&param->rbase, muram_offset);
+        out_be16(&param->tbase, muram_offset + sizeof(struct cpm_bd));
+
+        do_cmd(CPM_CMD_INIT_RX_TX);
+
+        enable_port();
+        return 0;
+}
+
+static void cpm_serial_putc(unsigned char c)
+{
+        while (tbdf->sc & 0x8000)
+                barrier();
+
+        sync();
+
+        tbdf->addr[0] = c;
+        eieio();
+        tbdf->sc |= 0x8000;
+}
+
+static unsigned char cpm_serial_tstc(void)
+{
+        barrier();
+        return !(rbdf->sc & 0x8000);
+}
+
+static unsigned char cpm_serial_getc(void)
+{
+        unsigned char c;
+
+        while (!cpm_serial_tstc())
+                ;
+
+        sync();
+        c = rbdf->addr[0];
+        eieio();
+        rbdf->sc |= 0x8000;
+
+        return c;
+}
+
+int cpm_console_init(void *devp, struct serial_console_data *scdp)
+{
+        void *reg_virt[2];
+        int is_smc = 0, is_cpm2 = 0, n;
+        unsigned long reg_phys;
+        void *parent, *muram;
+
+        if (dt_is_compatible(devp, "fsl,cpm1-smc-uart")) {
+                is_smc = 1;
+        } else if (dt_is_compatible(devp, "fsl,cpm2-scc-uart")) {
+                is_cpm2 = 1;
+        } else if (dt_is_compatible(devp, "fsl,cpm2-smc-uart")) {
+                is_cpm2 = 1;
+                is_smc = 1;
+        }
+
+        if (is_smc) {
+                enable_port = smc_enable_port;
+                disable_port = smc_disable_port;
+        } else {
+                enable_port = scc_enable_port;
+                disable_port = scc_disable_port;
+        }
+
+        if (is_cpm2)
+                do_cmd = cpm2_cmd;
+        else
+                do_cmd = cpm1_cmd;
+
+        n = getprop(devp, "fsl,cpm-command", &cpm_cmd, 4);
+        if (n < 4)
+                return -1;
+
+        n = getprop(devp, "virtual-reg", reg_virt, sizeof(reg_virt));
+        if (n < (int)sizeof(reg_virt)) {
+                for (n = 0; n < 2; n++) {
+                        if (!dt_xlate_reg(devp, n, &reg_phys, NULL))
+                                return -1;
+
+                        reg_virt[n] = (void *)reg_phys;
+                }
+        }
+
+        if (is_smc)
+                smc = reg_virt[0];
+        else
+                scc = reg_virt[0];
+
+        param = reg_virt[1];
+
+        parent = get_parent(devp);
+        if (!parent)
+                return -1;
+
+        n = getprop(parent, "virtual-reg", reg_virt, sizeof(reg_virt));
+        if (n < (int)sizeof(reg_virt)) {
+                if (!dt_xlate_reg(parent, 0, &reg_phys, NULL))
+                        return -1;
+
+                reg_virt[0] = (void *)reg_phys;
+        }
+
+        cpcr = reg_virt[0];
+
+        muram = finddevice("/soc/cpm/muram/data");
+        if (!muram)
+                return -1;
+
+        /* For bootwrapper-compatible device trees, we assume that the first
+         * entry has at least 18 bytes, and that #address-cells/#data-cells
+         * is one for both parent and child.
+         */
+
+        n = getprop(muram, "virtual-reg", reg_virt, sizeof(reg_virt));
+        if (n < (int)sizeof(reg_virt)) {
+                if (!dt_xlate_reg(muram, 0, &reg_phys, NULL))
+                        return -1;
+
+                reg_virt[0] = (void *)reg_phys;
+        }
+
+        muram_start = reg_virt[0];
+
+        n = getprop(muram, "reg", &muram_offset, 4);
+        if (n < 4)
+                return -1;
+
+        scdp->open = cpm_serial_open;
+        scdp->putc = cpm_serial_putc;
+        scdp->getc = cpm_serial_getc;
+        scdp->tstc = cpm_serial_tstc;
+
+        return 0;
+}
diff --git a/arch/powerpc/boot/cuboot-52xx.c b/arch/powerpc/boot/cuboot-52xx.c
new file mode 100644
index 000000000000..9256a26d40e4
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-52xx.c
@@ -0,0 +1,59 @@
+/*
+ * Old U-boot compatibility for MPC5200
+ *
+ * Author: Grant Likely <grant.likely@secretlab.ca>
+ *
+ * Copyright (c) 2007 Secret Lab Technologies Ltd.
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+#include "io.h"
+#include "cuboot.h"
+
+#define TARGET_PPC_MPC52xx
+#include "ppcboot.h"
+
+static bd_t bd;
+
+static void platform_fixups(void)
+{
+        void *soc, *reg;
+        int div;
+        u32 sysfreq;
+
+
+        dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
+        dt_fixup_mac_addresses(bd.bi_enetaddr);
+        dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq);
+
+        /* Unfortunately, the specific model number is encoded in the
+         * soc node name in existing dts files -- once that is fixed,
+         * this can do a simple path lookup.
+         */
+        soc = find_node_by_devtype(NULL, "soc");
+        if (soc) {
+                setprop(soc, "bus-frequency", &bd.bi_ipbfreq,
+                        sizeof(bd.bi_ipbfreq));
+
+                if (!dt_xlate_reg(soc, 0, (void*)&reg, NULL))
+                        return;
+                div = in_8(reg + 0x204) & 0x0020 ? 8 : 4;
+                sysfreq = bd.bi_busfreq * div;
+                setprop(soc, "system-frequency", &sysfreq, sizeof(sysfreq));
+        }
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        serial_console_init();
+        platform_ops.fixups = platform_fixups;
+}
diff --git a/arch/powerpc/boot/cuboot-83xx.c b/arch/powerpc/boot/cuboot-83xx.c
index 296025d8b295..a0505509abcc 100644
--- a/arch/powerpc/boot/cuboot-83xx.c
+++ b/arch/powerpc/boot/cuboot-83xx.c
@@ -18,7 +18,6 @@
 #include "ppcboot.h"
 
 static bd_t bd;
-extern char _dtb_start[], _dtb_end[];
 
 static void platform_fixups(void)
 {
diff --git a/arch/powerpc/boot/cuboot-85xx.c b/arch/powerpc/boot/cuboot-85xx.c
index 10f0f697c935..345dcbecef0f 100644
--- a/arch/powerpc/boot/cuboot-85xx.c
+++ b/arch/powerpc/boot/cuboot-85xx.c
@@ -18,7 +18,6 @@
 #include "ppcboot.h"
 
 static bd_t bd;
-extern char _dtb_start[], _dtb_end[];
 
 static void platform_fixups(void)
 {
diff --git a/arch/powerpc/boot/cuboot-8xx.c b/arch/powerpc/boot/cuboot-8xx.c
new file mode 100644
index 000000000000..0e82015a5f95
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-8xx.c
@@ -0,0 +1,47 @@
+/*
+ * Old U-boot compatibility for 8xx
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+#include "cuboot.h"
+
+#define TARGET_8xx
+#define TARGET_HAS_ETH1
+#include "ppcboot.h"
+
+static bd_t bd;
+
+static void platform_fixups(void)
+{
+        void *node;
+
+        dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
+        dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr);
+        dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 16, bd.bi_busfreq);
+
+        node = finddevice("/soc/cpm");
+        if (node)
+                setprop(node, "clock-frequency", &bd.bi_busfreq, 4);
+
+        node = finddevice("/soc/cpm/brg");
+        if (node)
+                setprop(node, "clock-frequency",  &bd.bi_busfreq, 4);
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        serial_console_init();
+        platform_ops.fixups = platform_fixups;
+}
diff --git a/arch/powerpc/boot/cuboot-bamboo.c b/arch/powerpc/boot/cuboot-bamboo.c
new file mode 100644
index 000000000000..900c7ff2b7e9
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-bamboo.c
@@ -0,0 +1,30 @@
+/*
+ * Old U-boot compatibility for Bamboo
+ *
+ * Author: Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * Copyright 2007 IBM Corporation
+ *
+ * Based on cuboot-ebony.c
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+#include "44x.h"
+#include "cuboot.h"
+
+#define TARGET_44x
+#include "ppcboot.h"
+
+static bd_t bd;
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+        bamboo_init(&bd.bi_enetaddr, &bd.bi_enet1addr);
+}
diff --git a/arch/powerpc/boot/cuboot-hpc2.c b/arch/powerpc/boot/cuboot-hpc2.c
new file mode 100644
index 000000000000..d333898bca30
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-hpc2.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
+ *
+ * Author: Roy Zang <tie-fei.zang@freescale.com>
+ *
+ * Description:
+ * Old U-boot compatibility for mpc7448hpc2 board
+ * Based on the code of Scott Wood <scottwood@freescale.com>
+ * for 83xx and 85xx.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of  the GNU General  Public License as published by
+ * the Free Software Foundation;  either version 2 of the  License, or
+ * (at your option) any later version.
+ *
+ */
+
+#include "ops.h"
+#include "stdio.h"
+#include "cuboot.h"
+
+#define TARGET_HAS_ETH1
+#include "ppcboot.h"
+
+static bd_t bd;
+extern char _dtb_start[], _dtb_end[];
+
+static void platform_fixups(void)
+{
+        void *tsi;
+
+        dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
+        dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr);
+        dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq);
+        tsi = find_node_by_devtype(NULL, "tsi-bridge");
+        if (tsi)
+                setprop(tsi, "bus-frequency", &bd.bi_busfreq,
+                        sizeof(bd.bi_busfreq));
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        serial_console_init();
+        platform_ops.fixups = platform_fixups;
+}
diff --git a/arch/powerpc/boot/cuboot-pq2.c b/arch/powerpc/boot/cuboot-pq2.c
new file mode 100644
index 000000000000..61574f3272dd
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-pq2.c
@@ -0,0 +1,261 @@
+/*
+ * Old U-boot compatibility for PowerQUICC II
+ * (a.k.a. 82xx with CPM, not the 8240 family of chips)
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+#include "cuboot.h"
+#include "io.h"
+#include "fsl-soc.h"
+
+#define TARGET_CPM2
+#define TARGET_HAS_ETH1
+#include "ppcboot.h"
+
+static bd_t bd;
+
+struct cs_range {
+        u32 csnum;
+        u32 base; /* must be zero */
+        u32 addr;
+        u32 size;
+};
+
+struct pci_range {
+        u32 flags;
+        u32 pci_addr[2];
+        u32 phys_addr;
+        u32 size[2];
+};
+
+struct cs_range cs_ranges_buf[MAX_PROP_LEN / sizeof(struct cs_range)];
+struct pci_range pci_ranges_buf[MAX_PROP_LEN / sizeof(struct pci_range)];
+
+/* Different versions of u-boot put the BCSR in different places, and
+ * some don't set up the PCI PIC at all, so we assume the device tree is
+ * sane and update the BRx registers appropriately.
+ *
+ * For any node defined as compatible with fsl,pq2-localbus,
+ * #address/#size must be 2/1 for the localbus, and 1/1 for the parent bus.
+ * Ranges must be for whole chip selects.
+ */
+static void update_cs_ranges(void)
+{
+        void *bus_node, *parent_node;
+        u32 *ctrl_addr;
+        unsigned long ctrl_size;
+        u32 naddr, nsize;
+        int len;
+        int i;
+
+        bus_node = finddevice("/localbus");
+        if (!bus_node || !dt_is_compatible(bus_node, "fsl,pq2-localbus"))
+                return;
+
+        dt_get_reg_format(bus_node, &naddr, &nsize);
+        if (naddr != 2 || nsize != 1)
+                goto err;
+
+        parent_node = get_parent(bus_node);
+        if (!parent_node)
+                goto err;
+
+        dt_get_reg_format(parent_node, &naddr, &nsize);
+        if (naddr != 1 || nsize != 1)
+                goto err;
+
+        if (!dt_xlate_reg(bus_node, 0, (unsigned long *)&ctrl_addr,
+                          &ctrl_size))
+                goto err;
+
+        len = getprop(bus_node, "ranges", cs_ranges_buf, sizeof(cs_ranges_buf));
+
+        for (i = 0; i < len / sizeof(struct cs_range); i++) {
+                u32 base, option;
+                int cs = cs_ranges_buf[i].csnum;
+                if (cs >= ctrl_size / 8)
+                        goto err;
+
+                if (cs_ranges_buf[i].base != 0)
+                        goto err;
+
+                base = in_be32(&ctrl_addr[cs * 2]);
+
+                /* If CS is already valid, use the existing flags.
+                 * Otherwise, guess a sane default.
+                 */
+                if (base & 1) {
+                        base &= 0x7fff;
+                        option = in_be32(&ctrl_addr[cs * 2 + 1]) & 0x7fff;
+                } else {
+                        base = 0x1801;
+                        option = 0x10;
+                }
+
+                out_be32(&ctrl_addr[cs * 2], 0);
+                out_be32(&ctrl_addr[cs * 2 + 1],
+                         option | ~(cs_ranges_buf[i].size - 1));
+                out_be32(&ctrl_addr[cs * 2], base | cs_ranges_buf[i].addr);
+        }
+
+        return;
+
+err:
+        printf("Bad /localbus node\r\n");
+}
+
+/* Older u-boots don't set PCI up properly.  Update the hardware to match
+ * the device tree.  The prefetch mem region and non-prefetch mem region
+ * must be contiguous in the host bus.  As required by the PCI binding,
+ * PCI #addr/#size must be 3/2.  The parent bus must be 1/1.  Only
+ * 32-bit PCI is supported.  All three region types (prefetchable mem,
+ * non-prefetchable mem, and I/O) must be present.
+ */
+static void fixup_pci(void)
+{
+        struct pci_range *mem = NULL, *mmio = NULL,
+                         *io = NULL, *mem_base = NULL;
+        u32 *pci_regs[3];
+        u8 *soc_regs;
+        int i, len;
+        void *node, *parent_node;
+        u32 naddr, nsize, mem_log2;
+
+        node = finddevice("/pci");
+        if (!node || !dt_is_compatible(node, "fsl,pq2-pci"))
+                return;
+
+        for (i = 0; i < 3; i++)
+                if (!dt_xlate_reg(node, i,
+                                  (unsigned long *)&pci_regs[i], NULL))
+                        goto err;
+
+        soc_regs = (u8 *)fsl_get_immr();
+        if (!soc_regs)
+                goto err;
+
+        dt_get_reg_format(node, &naddr, &nsize);
+        if (naddr != 3 || nsize != 2)
+                goto err;
+
+        parent_node = get_parent(node);
+        if (!parent_node)
+                goto err;
+
+        dt_get_reg_format(parent_node, &naddr, &nsize);
+        if (naddr != 1 || nsize != 1)
+                goto err;
+
+        len = getprop(node, "ranges", pci_ranges_buf,
+                      sizeof(pci_ranges_buf));
+
+        for (i = 0; i < len / sizeof(struct pci_range); i++) {
+                u32 flags = pci_ranges_buf[i].flags & 0x43000000;
+
+                if (flags == 0x42000000)
+                        mem = &pci_ranges_buf[i];
+                else if (flags == 0x02000000)
+                        mmio = &pci_ranges_buf[i];
+                else if (flags == 0x01000000)
+                        io = &pci_ranges_buf[i];
+        }
+
+        if (!mem || !mmio || !io)
+                goto err;
+
+        if (mem->phys_addr + mem->size[1] == mmio->phys_addr)
+                mem_base = mem;
+        else if (mmio->phys_addr + mmio->size[1] == mem->phys_addr)
+                mem_base = mmio;
+        else
+                goto err;
+
+        out_be32(&pci_regs[1][0], mem_base->phys_addr | 1);
+        out_be32(&pci_regs[2][0], ~(mem->size[1] + mmio->size[1] - 1));
+
+        out_be32(&pci_regs[1][1], io->phys_addr | 1);
+        out_be32(&pci_regs[2][1], ~(io->size[1] - 1));
+
+        out_le32(&pci_regs[0][0], mem->pci_addr[1] >> 12);
+        out_le32(&pci_regs[0][2], mem->phys_addr >> 12);
+        out_le32(&pci_regs[0][4], (~(mem->size[1] - 1) >> 12) | 0xa0000000);
+
+        out_le32(&pci_regs[0][6], mmio->pci_addr[1] >> 12);
+        out_le32(&pci_regs[0][8], mmio->phys_addr >> 12);
+        out_le32(&pci_regs[0][10], (~(mmio->size[1] - 1) >> 12) | 0x80000000);
+
+        out_le32(&pci_regs[0][12], io->pci_addr[1] >> 12);
+        out_le32(&pci_regs[0][14], io->phys_addr >> 12);
+        out_le32(&pci_regs[0][16], (~(io->size[1] - 1) >> 12) | 0xc0000000);
+
+        /* Inbound translation */
+        out_le32(&pci_regs[0][58], 0);
+        out_le32(&pci_regs[0][60], 0);
+
+        mem_log2 = 1 << (__ilog2_u32(bd.bi_memsize - 1) + 1);
+        out_le32(&pci_regs[0][62], 0xa0000000 | ~((1 << (mem_log2 - 12)) - 1));
+
+        /* If PCI is disabled, drive RST high to enable. */
+        if (!(in_le32(&pci_regs[0][32]) & 1)) {
+                 /* Tpvrh (Power valid to RST# high) 100 ms */
+                udelay(100000);
+
+                out_le32(&pci_regs[0][32], 1);
+
+                /* Trhfa (RST# high to first cfg access) 2^25 clocks */
+                udelay(1020000);
+        }
+
+        /* Enable bus master and memory access */
+        out_le32(&pci_regs[0][64], 0x80000004);
+        out_le32(&pci_regs[0][65], in_le32(&pci_regs[0][65]) | 6);
+
+        /* Park the bus on PCI, and elevate PCI's arbitration priority,
+         * as required by section 9.6 of the user's manual.
+         */
+        out_8(&soc_regs[0x10028], 3);
+        out_be32((u32 *)&soc_regs[0x1002c], 0x01236745);
+
+        return;
+
+err:
+        printf("Bad PCI node\r\n");
+}
+
+static void pq2_platform_fixups(void)
+{
+        void *node;
+
+        dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
+        dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr);
+        dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq);
+
+        node = finddevice("/soc/cpm");
+        if (node)
+                setprop(node, "clock-frequency", &bd.bi_cpmfreq, 4);
+
+        node = finddevice("/soc/cpm/brg");
+        if (node)
+                setprop(node, "clock-frequency",  &bd.bi_brgfreq, 4);
+
+        update_cs_ranges();
+        fixup_pci();
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        serial_console_init();
+        platform_ops.fixups = pq2_platform_fixups;
+}
diff --git a/arch/powerpc/boot/cuboot-sequoia.c b/arch/powerpc/boot/cuboot-sequoia.c
new file mode 100644
index 000000000000..ec635e0bd4ec
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-sequoia.c
@@ -0,0 +1,56 @@
+/*
+ * Old U-boot compatibility for Sequoia
+ *
+ * Valentine Barshak <vbarshak@ru.mvista.com>
+ * Copyright 2007 MontaVista Software, Inc
+ *
+ * Based on Ebony code by David Gibson <david@gibson.dropbear.id.au>
+ * Copyright IBM Corporation, 2007
+ *
+ * Based on Bamboo code by Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ * Copyright IBM Corporation, 2007
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2 of the License
+ */
+
+#include <stdarg.h>
+#include <stddef.h>
+#include "types.h"
+#include "elf.h"
+#include "string.h"
+#include "stdio.h"
+#include "page.h"
+#include "ops.h"
+#include "dcr.h"
+#include "4xx.h"
+#include "44x.h"
+#include "cuboot.h"
+
+#define TARGET_4xx
+#define TARGET_44x
+#include "ppcboot.h"
+
+static bd_t bd;
+
+
+static void sequoia_fixups(void)
+{
+        unsigned long sysclk = 33333333;
+
+        ibm440ep_fixup_clocks(sysclk, 11059200);
+        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
+        ibm4xx_denali_fixup_memsize();
+        dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+        platform_ops.fixups = sequoia_fixups;
+        platform_ops.exit = ibm44x_dbcr_reset;
+        ft_init(_dtb_start, 0, 32);
+        serial_console_init();
+}
diff --git a/arch/powerpc/boot/cuboot.c b/arch/powerpc/boot/cuboot.c
index 65795468ad6f..7768b2306b7a 100644
--- a/arch/powerpc/boot/cuboot.c
+++ b/arch/powerpc/boot/cuboot.c
@@ -17,9 +17,6 @@
 
 #include "ppcboot.h"
 
-extern char _end[];
-extern char _dtb_start[], _dtb_end[];
-
 void cuboot_init(unsigned long r4, unsigned long r5,
                  unsigned long r6, unsigned long r7,
                  unsigned long end_of_ram)
diff --git a/arch/powerpc/boot/dcr.h b/arch/powerpc/boot/dcr.h
index 14b44aa96fea..83b88aa92888 100644
--- a/arch/powerpc/boot/dcr.h
+++ b/arch/powerpc/boot/dcr.h
@@ -121,4 +121,22 @@ static const unsigned long sdram_bxcr[] = { SDRAM0_B0CR, SDRAM0_B1CR, SDRAM0_B2C
 #define DCRN_CPC0_MIRQ1                                 0x0ed
 #define DCRN_CPC0_JTAGID                                0x0ef
 
+#define DCRN_MAL0_CFG                                   0x180
+#define MAL_RESET 0x80000000
+
+/* 440EP Clock/Power-on Reset regs */
+#define DCRN_CPR0_ADDR  0xc
+#define DCRN_CPR0_DATA  0xd
+#define CPR0_PLLD0      0x60
+#define CPR0_OPBD0      0xc0
+#define CPR0_PERD0      0xe0
+#define CPR0_PRIMBD0    0xa0
+#define CPR0_SCPID      0x120
+#define CPR0_PLLC0      0x40
+
+/* 405GP Clocking/Power Management/Chip Control regs */
+#define DCRN_CPC0_PLLMR 0xb0
+#define DCRN_405_CPC0_CR0 0xb1
+#define DCRN_405_CPC0_CR1 0xb2
+
 #endif  /* _PPC_BOOT_DCR_H_ */
diff --git a/arch/powerpc/boot/devtree.c b/arch/powerpc/boot/devtree.c
index c9951550ed2c..e5dfe4497313 100644
--- a/arch/powerpc/boot/devtree.c
+++ b/arch/powerpc/boot/devtree.c
@@ -74,6 +74,8 @@ void dt_fixup_cpu_clocks(u32 cpu, u32 tb, u32 bus)
                 if (bus > 0)
                         setprop_val(devp, "bus-frequency", bus);
         }
+
+        timebase_period_ns = 1000000000 / tb;
 }
 
 void dt_fixup_clock(const char *path, u32 freq)
@@ -86,34 +88,38 @@ void dt_fixup_clock(const char *path, u32 freq)
         }
 }
 
+void dt_fixup_mac_address(u32 index, const u8 *addr)
+{
+        void *devp = find_node_by_prop_value(NULL, "linux,network-index",
+                                             (void*)&index, sizeof(index));
+
+        if (devp) {
+                printf("ENET%d: local-mac-address <-"
+                       " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index,
+                       addr[0], addr[1], addr[2],
+                       addr[3], addr[4], addr[5]);
+
+                setprop(devp, "local-mac-address", addr, 6);
+        }
+}
+
 void __dt_fixup_mac_addresses(u32 startindex, ...)
 {
         va_list ap;
         u32 index = startindex;
-        void *devp;
         const u8 *addr;
 
         va_start(ap, startindex);
-        while ((addr = va_arg(ap, const u8 *))) {
-                devp = find_node_by_prop_value(NULL, "linux,network-index",
-                                               (void*)&index, sizeof(index));
-
-                printf("ENET%d: local-mac-address <-"
-                       " %02x:%02x:%02x:%02x:%02x:%02x\n\r", index,
-                       addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
 
-                if (devp)
-                        setprop(devp, "local-mac-address", addr, 6);
+        while ((addr = va_arg(ap, const u8 *)))
+                dt_fixup_mac_address(index++, addr);
 
-                index++;
-        }
         va_end(ap);
 }
 
 #define MAX_ADDR_CELLS 4
-#define MAX_RANGES 8
 
-static void get_reg_format(void *node, u32 *naddr, u32 *nsize)
+void dt_get_reg_format(void *node, u32 *naddr, u32 *nsize)
 {
         if (getprop(node, "#address-cells", naddr, 4) != 4)
                 *naddr = 2;
@@ -207,7 +213,7 @@ static int find_range(u32 *reg, u32 *ranges, int nregaddr,
  * In particular, PCI is not supported.  Also, only the beginning of the
  * reg block is tracked; size is ignored except in ranges.
  */
-static u32 dt_xlate_buf[MAX_ADDR_CELLS * MAX_RANGES * 3];
+static u32 prop_buf[MAX_PROP_LEN / 4];
 
 static int dt_xlate(void *node, int res, int reglen, unsigned long *addr,
                 unsigned long *size)
@@ -216,14 +222,14 @@ static int dt_xlate(void *node, int res, int reglen, unsigned long *addr,
         u32 this_addr[MAX_ADDR_CELLS];
         void *parent;
         u64 ret_addr, ret_size;
-        u32 naddr, nsize, prev_naddr;
+        u32 naddr, nsize, prev_naddr, prev_nsize;
         int buflen, offset;
 
         parent = get_parent(node);
         if (!parent)
                 return 0;
 
-        get_reg_format(parent, &naddr, &nsize);
+        dt_get_reg_format(parent, &naddr, &nsize);
 
         if (nsize > 2)
                 return 0;
@@ -231,41 +237,47 @@ static int dt_xlate(void *node, int res, int reglen, unsigned long *addr,
         offset = (naddr + nsize) * res;
 
         if (reglen < offset + naddr + nsize ||
-            sizeof(dt_xlate_buf) < offset + naddr + nsize)
+            MAX_PROP_LEN < (offset + naddr + nsize) * 4)
                 return 0;
 
-        copy_val(last_addr, dt_xlate_buf + offset, naddr);
+        copy_val(last_addr, prop_buf + offset, naddr);
 
-        ret_size = dt_xlate_buf[offset + naddr];
+        ret_size = prop_buf[offset + naddr];
         if (nsize == 2) {
                 ret_size <<= 32;
-                ret_size |= dt_xlate_buf[offset + naddr + 1];
+                ret_size |= prop_buf[offset + naddr + 1];
         }
 
-        while ((node = get_parent(node))) {
+        for (;;) {
                 prev_naddr = naddr;
+                prev_nsize = nsize;
+                node = parent;
+
+                parent = get_parent(node);
+                if (!parent)
+                        break;
 
-                get_reg_format(node, &naddr, &nsize);
+                dt_get_reg_format(parent, &naddr, &nsize);
 
-                buflen = getprop(node, "ranges", dt_xlate_buf,
-                                sizeof(dt_xlate_buf));
-                if (buflen < 0)
+                buflen = getprop(node, "ranges", prop_buf,
+                                sizeof(prop_buf));
+                if (buflen == 0)
                         continue;
-                if (buflen > sizeof(dt_xlate_buf))
+                if (buflen < 0 || buflen > sizeof(prop_buf))
                         return 0;
 
-                offset = find_range(last_addr, dt_xlate_buf, prev_naddr,
-                                    naddr, nsize, buflen / 4);
+                offset = find_range(last_addr, prop_buf, prev_naddr,
+                                    naddr, prev_nsize, buflen / 4);
 
                 if (offset < 0)
                         return 0;
 
-                copy_val(this_addr, dt_xlate_buf + offset, prev_naddr);
+                copy_val(this_addr, prop_buf + offset, prev_naddr);
 
                 if (!sub_reg(last_addr, this_addr))
                         return 0;
 
-                copy_val(this_addr, dt_xlate_buf + offset + prev_naddr, naddr);
+                copy_val(this_addr, prop_buf + offset + prev_naddr, naddr);
 
                 if (!add_reg(last_addr, this_addr, naddr))
                         return 0;
@@ -292,16 +304,35 @@ int dt_xlate_reg(void *node, int res, unsigned long *addr, unsigned long *size)
 {
         int reglen;
 
-        reglen = getprop(node, "reg", dt_xlate_buf, sizeof(dt_xlate_buf)) / 4;
+        reglen = getprop(node, "reg", prop_buf, sizeof(prop_buf)) / 4;
         return dt_xlate(node, res, reglen, addr, size);
 }
 
 int dt_xlate_addr(void *node, u32 *buf, int buflen, unsigned long *xlated_addr)
 {
 
-        if (buflen > sizeof(dt_xlate_buf))
+        if (buflen > sizeof(prop_buf))
                 return 0;
 
-        memcpy(dt_xlate_buf, buf, buflen);
+        memcpy(prop_buf, buf, buflen);
         return dt_xlate(node, 0, buflen / 4, xlated_addr, NULL);
 }
+
+int dt_is_compatible(void *node, const char *compat)
+{
+        char *buf = (char *)prop_buf;
+        int len, pos;
+
+        len = getprop(node, "compatible", buf, MAX_PROP_LEN);
+        if (len < 0)
+                return 0;
+
+        for (pos = 0; pos < len; pos++) {
+                if (!strcmp(buf + pos, compat))
+                        return 1;
+
+                pos += strnlen(&buf[pos], len - pos);
+        }
+
+        return 0;
+}
diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts
new file mode 100644
index 000000000000..a88ae3d218a5
--- /dev/null
+++ b/arch/powerpc/boot/dts/bamboo.dts
@@ -0,0 +1,244 @@
+/*
+ * Device Tree Source for AMCC Bamboo
+ *
+ * Copyright (c) 2006, 2007 IBM Corp.
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * FIXME: Draft only!
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ */
+
+/ {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        model = "amcc,bamboo";
+        compatible = "amcc,bamboo";
+        dcr-parent = <&/cpus/PowerPC,440EP@0>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,440EP@0 {
+                        device_type = "cpu";
+                        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>;
+                        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 3 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 */
+                                ranges;
+                                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>;
+                        };
+
+                        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>;
+                        };
+
+                        IIC0: i2c@ef600700 {
+                                device_type = "i2c";
+                                compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
+                                reg = <ef600700 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+
+                        IIC1: i2c@ef600800 {
+                                device_type = "i2c";
+                                compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
+                                reg = <ef600800 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <7 4>;
+                        };
+
+                        ZMII0: emac-zmii@ef600d00 {
+                                device_type = "zmii-interface";
+                                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 = <00000001>;
+                                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 = <00000001>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <1>;
+                        };
+                };
+        };
+
+        chosen {
+                linux,stdout-path = "/plb/opb/serial@ef600300";
+                bootargs = "console=ttyS0,115200";
+        };
+};
diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index c5f99613fc7b..bc259972aaa0 100644
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -9,10 +9,6 @@
  * 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.
- *
- * To build:
- *   dtc -I dts -O asm -o ebony.S -b 0 ebony.dts
- *   dtc -I dts -O dtb -o ebony.dtb -b 0 ebony.dts
  */
 
 / {
@@ -142,13 +138,16 @@
                                 interrupt-parent = <&UIC1>;
 
                                 small-flash@0,80000 {
-                                        device_type = "rom";
-                                        compatible = "direct-mapped";
-                                        probe-type = "JEDEC";
+                                        compatible = "jedec-flash";
                                         bank-width = <1>;
-                                        partitions = <0 80000>;
-                                        partition-names = "OpenBIOS";
                                         reg = <0 80000 80000>;
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+                                        partition@0 {
+                                                label = "OpenBIOS";
+                                                reg = <0 80000>;
+                                                read-only;
+                                        };
                                 };
 
                                 ds1743@1,0 {
@@ -158,14 +157,19 @@
                                 };
 
                                 large-flash@2,0 {
-                                        device_type = "rom";
-                                        compatible = "direct-mapped";
-                                        probe-type = "JEDEC";
+                                        compatible = "jedec-flash";
                                         bank-width = <1>;
-                                        partitions = <0 380000
-                                                      380000 80000>;
-                                        partition-names = "fs", "firmware";
                                         reg = <2 0 400000>;
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+                                        partition@0 {
+                                                label = "fs";
+                                                reg = <0 380000>;
+                                        };
+                                        partition@380000 {
+                                                label = "firmware";
+                                                reg = <380000 80000>;
+                                        };
                                 };
 
                                 ir@3,0 {
@@ -175,6 +179,7 @@
                                 fpga@7,0 {
                                         compatible = "Ebony-FPGA";
                                         reg = <7 0 10>;
+                                        virtual-reg = <e8300000>;
                                 };
                         };
 
diff --git a/arch/powerpc/boot/dts/ep88xc.dts b/arch/powerpc/boot/dts/ep88xc.dts
new file mode 100644
index 000000000000..02705f299790
--- /dev/null
+++ b/arch/powerpc/boot/dts/ep88xc.dts
@@ -0,0 +1,214 @@
+/*
+ * EP88xC Device Tree Source
+ *
+ * Copyright 2006 MontaVista Software, Inc.
+ * Copyright 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+
+/ {
+        model = "EP88xC";
+        compatible = "fsl,ep88xc";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,885@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <d#16>;
+                        i-cache-line-size = <d#16>;
+                        d-cache-size = <d#8192>;
+                        i-cache-size = <d#8192>;
+                        timebase-frequency = <0>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                        interrupts = <f 2>;     // decrementer interrupt
+                        interrupt-parent = <&PIC>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0>;
+        };
+
+        localbus@fa200100 {
+                compatible = "fsl,mpc885-localbus", "fsl,pq1-localbus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <fa200100 40>;
+
+                ranges = <
+                        0 0 fc000000 04000000
+                        3 0 fa000000 01000000
+                >;
+
+                flash@0,2000000 {
+                        compatible = "cfi-flash";
+                        reg = <0 2000000 2000000>;
+                        bank-width = <4>;
+                        device-width = <2>;
+                };
+
+                board-control@3,400000 {
+                        reg = <3 400000 10>;
+                        compatible = "fsl,ep88xc-bcsr";
+                };
+        };
+
+        soc@fa200000 {
+                compatible = "fsl,mpc885", "fsl,pq1-soc";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0 fa200000 00004000>;
+                bus-frequency = <0>;
+
+                // Temporary -- will go away once kernel uses ranges for get_immrbase().
+                reg = <fa200000 4000>;
+
+                mdio@e00 {
+                        compatible = "fsl,mpc885-fec-mdio", "fsl,pq1-fec-mdio";
+                        reg = <e00 188>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        PHY0: ethernet-phy@0 {
+                                reg = <0>;
+                                device_type = "ethernet-phy";
+                        };
+
+                        PHY1: ethernet-phy@1 {
+                                reg = <1>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                ethernet@e00 {
+                        device_type = "network";
+                        compatible = "fsl,mpc885-fec-enet",
+                                     "fsl,pq1-fec-enet";
+                        reg = <e00 188>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <3 1>;
+                        interrupt-parent = <&PIC>;
+                        phy-handle = <&PHY0>;
+                        linux,network-index = <0>;
+                };
+
+                ethernet@1e00 {
+                        device_type = "network";
+                        compatible = "fsl,mpc885-fec-enet",
+                                     "fsl,pq1-fec-enet";
+                        reg = <1e00 188>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <7 1>;
+                        interrupt-parent = <&PIC>;
+                        phy-handle = <&PHY1>;
+                        linux,network-index = <1>;
+                };
+
+                PIC: interrupt-controller@0 {
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                        reg = <0 24>;
+                        compatible = "fsl,mpc885-pic", "fsl,pq1-pic";
+                };
+
+                pcmcia@80 {
+                        #address-cells = <3>;
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        compatible = "fsl,pq-pcmcia";
+                        device_type = "pcmcia";
+                        reg = <80 80>;
+                        interrupt-parent = <&PIC>;
+                        interrupts = <d 1>;
+                };
+
+                cpm@9c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc885-cpm", "fsl,cpm1";
+                        command-proc = <9c0>;
+                        interrupts = <0>;       // cpm error interrupt
+                        interrupt-parent = <&CPM_PIC>;
+                        reg = <9c0 40>;
+                        ranges;
+
+                        muram@2000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 2000 2000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 1c00>;
+                                };
+                        };
+
+                        brg@9f0 {
+                                compatible = "fsl,mpc885-brg",
+                                             "fsl,cpm1-brg",
+                                             "fsl,cpm-brg";
+                                reg = <9f0 10>;
+                        };
+
+                        CPM_PIC: interrupt-controller@930 {
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                                interrupts = <5 2 0 2>;
+                                interrupt-parent = <&PIC>;
+                                reg = <930 20>;
+                                compatible = "fsl,mpc885-cpm-pic",
+                                             "fsl,cpm1-pic";
+                        };
+
+                        // MON-1
+                        serial@a80 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc885-smc-uart",
+                                             "fsl,cpm1-smc-uart";
+                                reg = <a80 10 3e80 40>;
+                                interrupts = <4>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-brg = <1>;
+                                fsl,cpm-command = <0090>;
+                                linux,planetcore-label = "SMC1";
+                        };
+
+                        // SER-1
+                        serial@a20 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc885-scc-uart",
+                                             "fsl,cpm1-scc-uart";
+                                reg = <a20 20 3d00 80>;
+                                interrupts = <1d>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-brg = <2>;
+                                fsl,cpm-command = <0040>;
+                                linux,planetcore-label = "SCC2";
+                        };
+
+                        usb@a00 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,mpc885-usb",
+                                             "fsl,cpm1-usb";
+                                reg = <a00 18 1c00 80>;
+                                interrupt-parent = <&CPM_PIC>;
+                                interrupts = <1e>;
+                                fsl,cpm-command = <0000>;
+                        };
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/holly.dts b/arch/powerpc/boot/dts/holly.dts
index 80a4fab8ee37..b5d87895fe06 100644
--- a/arch/powerpc/boot/dts/holly.dts
+++ b/arch/powerpc/boot/dts/holly.dts
@@ -8,10 +8,6 @@
  * 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.
- *
- * To build:
- *   dtc -I dts -O asm -o holly.S -b 0 holly.dts
- *   dtc -I dts -O dtb -o holly.dtb -b 0 holly.dts
  */
 
 / {
@@ -35,7 +31,6 @@
                         timebase-frequency = <2faf080>;
                         clock-frequency = <23c34600>;
                         bus-frequency = <bebc200>;
-                        32-bit;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
new file mode 100644
index 000000000000..c824e8f06454
--- /dev/null
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -0,0 +1,252 @@
+/*
+ * Device Tree Source for AMCC Kilauea (405EX)
+ *
+ * Copyright 2007 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ */
+
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        model = "amcc,kilauea";
+        compatible = "amcc,kilauea";
+        dcr-parent = <&/cpus/PowerPC,405EX@0>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,405EX@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        clock-frequency = <0>; /* Filled in by U-Boot */
+                        timebase-frequency = <0>; /* Filled in by U-Boot */
+                        i-cache-line-size = <20>;
+                        d-cache-line-size = <20>;
+                        i-cache-size = <4000>; /* 16 kB */
+                        d-cache-size = <4000>; /* 16 kB */
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0>; /* Filled in by U-Boot */
+        };
+
+        UIC0: interrupt-controller {
+                compatible = "ibm,uic-405ex", "ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0c0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+
+        UIC1: interrupt-controller1 {
+                compatible = "ibm,uic-405ex","ibm,uic";
+                interrupt-controller;
+                cell-index = <1>;
+                dcr-reg = <0d0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        UIC2: interrupt-controller2 {
+                compatible = "ibm,uic-405ex","ibm,uic";
+                interrupt-controller;
+                cell-index = <2>;
+                dcr-reg = <0e0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1c 4 1d 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        plb {
+                compatible = "ibm,plb-405ex", "ibm,plb4";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by U-Boot */
+
+                SDRAM0: memory-controller {
+                        compatible = "ibm,sdram-405ex";
+                        dcr-reg = <010 2>;
+                };
+
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-405ex", "ibm,mcmal2";
+                        dcr-reg = <180 62>;
+                        num-tx-chans = <2>;
+                        num-rx-chans = <2>;
+                        interrupt-parent = <&MAL0>;
+                        interrupts = <0 1 2 3 4>;
+                        #interrupt-cells = <1>;
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
+                                        /*RXEOB*/ 1 &UIC0 b 4
+                                        /*SERR*/  2 &UIC1 0 4
+                                        /*TXDE*/  3 &UIC1 1 4
+                                        /*RXDE*/  4 &UIC1 2 4>;
+                        interrupt-map-mask = <ffffffff>;
+                };
+
+                POB0: opb {
+                        compatible = "ibm,opb-405ex", "ibm,opb";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <80000000 80000000 10000000
+                                  ef600000 ef600000 a00000
+                                  f0000000 f0000000 10000000>;
+                        dcr-reg = <0a0 5>;
+                        clock-frequency = <0>; /* Filled in by U-Boot */
+
+                        EBC0: ebc {
+                                compatible = "ibm,ebc-405ex", "ibm,ebc";
+                                dcr-reg = <012 2>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                /* ranges property is supplied by U-Boot */
+                                interrupts = <5 1>;
+                                interrupt-parent = <&UIC1>;
+
+                                nor_flash@0,0 {
+                                        compatible = "amd,s29gl512n", "cfi-flash";
+                                        bank-width = <2>;
+                                        reg = <0 000000 4000000>;
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+                                        partition@0 {
+                                                label = "kernel";
+                                                reg = <0 200000>;
+                                        };
+                                        partition@200000 {
+                                                label = "root";
+                                                reg = <200000 200000>;
+                                        };
+                                        partition@400000 {
+                                                label = "user";
+                                                reg = <400000 3b60000>;
+                                        };
+                                        partition@3f60000 {
+                                                label = "env";
+                                                reg = <3f60000 40000>;
+                                        };
+                                        partition@3fa0000 {
+                                                label = "u-boot";
+                                                reg = <3fa0000 60000>;
+                                        };
+                                };
+                        };
+
+                        UART0: serial@ef600200 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600200 8>;
+                                virtual-reg = <ef600200>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1a 4>;
+                        };
+
+                        UART1: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600300 8>;
+                                virtual-reg = <ef600300>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+
+                        IIC0: i2c@ef600400 {
+                                device_type = "i2c";
+                                compatible = "ibm,iic-405ex", "ibm,iic";
+                                reg = <ef600400 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+
+                        IIC1: i2c@ef600500 {
+                                device_type = "i2c";
+                                compatible = "ibm,iic-405ex", "ibm,iic";
+                                reg = <ef600500 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <7 4>;
+                        };
+
+
+                        RGMII0: emac-rgmii@ef600b00 {
+                                device_type = "rgmii-interface";
+                                compatible = "ibm,rgmii-405ex", "ibm,rgmii";
+                                reg = <ef600b00 104>;
+                        };
+
+                        EMAC0: ethernet@ef600900 {
+                                linux,network-index = <0>;
+                                device_type = "network";
+                                compatible = "ibm,emac-405ex", "ibm,emac4";
+                                interrupt-parent = <&EMAC0>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC0 18 4
+                                                /*Wake*/  1 &UIC1 1d 4>;
+                                reg = <ef600900 70>;
+                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <0>;
+                                mal-rx-channel = <0>;
+                                cell-index = <0>;
+                                max-frame-size = <5dc>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000000>;
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <0>;
+                        };
+
+                        EMAC1: ethernet@ef600a00 {
+                                linux,network-index = <1>;
+                                device_type = "network";
+                                compatible = "ibm,emac-405ex", "ibm,emac4";
+                                interrupt-parent = <&EMAC1>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC0 19 4
+                                                /*Wake*/  1 &UIC1 1f 4>;
+                                reg = <ef600a00 70>;
+                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <1>;
+                                mal-rx-channel = <1>;
+                                cell-index = <1>;
+                                max-frame-size = <5dc>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000000>;
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <1>;
+                        };
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts b/arch/powerpc/boot/dts/kuroboxHD.dts
index 122537419d9f..ec71ab819fee 100644
--- a/arch/powerpc/boot/dts/kuroboxHD.dts
+++ b/arch/powerpc/boot/dts/kuroboxHD.dts
@@ -15,9 +15,6 @@
 
 XXXX add flash parts, rtc, ??
 
-build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
-
-
  */
 
 / {
@@ -50,7 +47,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
         soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 compatible = "mpc10x";
                 store-gathering = <0>; /* 0 == off, !0 == on */
@@ -72,7 +68,7 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
 
                         rtc@32 {
                                 device_type = "rtc";
-                                compatible = "ricoh,rs5c372b";
+                                compatible = "ricoh,rs5c372a";
                                 reg = <32>;
                         };
                 };
@@ -83,7 +79,7 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
                         reg = <80004500 8>;
                         clock-frequency = <5d08d88>;
                         current-speed = <2580>;
-                        interrupts = <9 2>;
+                        interrupts = <9 0>;
                         interrupt-parent = <&mpic>;
                 };
 
@@ -104,7 +100,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
                         compatible = "chrp,open-pic";
                         interrupt-controller;
                         reg = <80040000 40000>;
-                        built-in;
                 };
 
                 pci@fec00000 {
diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts
index 579aa8b967d9..32ecd2319928 100644
--- a/arch/powerpc/boot/dts/kuroboxHG.dts
+++ b/arch/powerpc/boot/dts/kuroboxHG.dts
@@ -15,9 +15,6 @@
 
 XXXX add flash parts, rtc, ??
 
-build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
-
-
  */
 
 / {
@@ -50,7 +47,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
         soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 compatible = "mpc10x";
                 store-gathering = <0>; /* 0 == off, !0 == on */
@@ -72,7 +68,7 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
 
                         rtc@32 {
                                 device_type = "rtc";
-                                compatible = "ricoh,rs5c372b";
+                                compatible = "ricoh,rs5c372a";
                                 reg = <32>;
                         };
                 };
@@ -83,7 +79,7 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
                         reg = <80004500 8>;
                         clock-frequency = <7c044a8>;
                         current-speed = <2580>;
-                        interrupts = <9 2>;
+                        interrupts = <9 0>;
                         interrupt-parent = <&mpic>;
                 };
 
@@ -104,7 +100,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
                         compatible = "chrp,open-pic";
                         interrupt-controller;
                         reg = <80040000 40000>;
-                        built-in;
                 };
 
                 pci@fec00000 {
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
index d29308fe4c24..bc45f5fbb060 100644
--- a/arch/powerpc/boot/dts/lite5200.dts
+++ b/arch/powerpc/boot/dts/lite5200.dts
@@ -19,7 +19,7 @@
 / {
         model = "fsl,lite5200";
         // revision = "1.0";
-        compatible = "fsl,lite5200\0generic-mpc5200";
+        compatible = "fsl,lite5200","generic-mpc5200";
         #address-cells = <1>;
         #size-cells = <1>;
 
@@ -37,7 +37,6 @@
                         timebase-frequency = <0>;       // from bootloader
                         bus-frequency = <0>;            // from bootloader
                         clock-frequency = <0>;          // from bootloader
-                        32-bit;
                 };
         };
 
@@ -50,10 +49,9 @@
                 model = "fsl,mpc5200";
                 compatible = "mpc5200";
                 revision = "";                  // from bootloader
-                #interrupt-cells = <3>;
                 device_type = "soc";
-                ranges = <0 f0000000 f0010000>;
-                reg = <f0000000 00010000>;
+                ranges = <0 f0000000 0000c000>;
+                reg = <f0000000 00000100>;
                 bus-frequency = <0>;            // from bootloader
                 system-frequency = <0>;         // from bootloader
 
@@ -69,7 +67,6 @@
                         device_type = "interrupt-controller";
                         compatible = "mpc5200-pic";
                         reg = <500 80>;
-                        built-in;
                 };
 
                 gpt@600 {       // General Purpose Timer
@@ -185,27 +182,6 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                pci@0d00 {
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        device_type = "pci";
-                        compatible = "mpc5200-pci";
-                        reg = <d00 100>;
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3
-                                         c000 0 0 2 &mpc5200_pic 0 0 3
-                                         c000 0 0 3 &mpc5200_pic 0 0 3
-                                         c000 0 0 4 &mpc5200_pic 0 0 3>;
-                        clock-frequency = <0>; // From boot loader
-                        interrupts = <2 8 0 2 9 0 2 a 0>;
-                        interrupt-parent = <&mpc5200_pic>;
-                        bus-range = <0 0>;
-                        ranges = <42000000 0 80000000 80000000 0 20000000
-                                  02000000 0 a0000000 a0000000 0 10000000
-                                  01000000 0 00000000 b0000000 0 01000000>;
-                };
-
                 spi@f00 {
                         device_type = "spi";
                         compatible = "mpc5200-spi";
@@ -216,7 +192,7 @@
 
                 usb@1000 {
                         device_type = "usb-ohci-be";
-                        compatible = "mpc5200-ohci\0ohci-be";
+                        compatible = "mpc5200-ohci","ohci-be";
                         reg = <1000 ff>;
                         interrupts = <2 6 0>;
                         interrupt-parent = <&mpc5200_pic>;
@@ -317,7 +293,7 @@
 
                 i2c@3d00 {
                         device_type = "i2c";
-                        compatible = "mpc5200-i2c\0fsl-i2c";
+                        compatible = "mpc5200-i2c","fsl-i2c";
                         cell-index = <0>;
                         reg = <3d00 40>;
                         interrupts = <2 f 0>;
@@ -327,7 +303,7 @@
 
                 i2c@3d40 {
                         device_type = "i2c";
-                        compatible = "mpc5200-i2c\0fsl-i2c";
+                        compatible = "mpc5200-i2c","fsl-i2c";
                         cell-index = <1>;
                         reg = <3d40 40>;
                         interrupts = <2 10 0>;
@@ -336,8 +312,29 @@
                 };
                 sram@8000 {
                         device_type = "sram";
-                        compatible = "mpc5200-sram\0sram";
+                        compatible = "mpc5200-sram","sram";
                         reg = <8000 4000>;
                 };
         };
+
+        pci@f0000d00 {
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                device_type = "pci";
+                compatible = "mpc5200-pci";
+                reg = <f0000d00 100>;
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3
+                                 c000 0 0 2 &mpc5200_pic 0 0 3
+                                 c000 0 0 3 &mpc5200_pic 0 0 3
+                                 c000 0 0 4 &mpc5200_pic 0 0 3>;
+                clock-frequency = <0>; // From boot loader
+                interrupts = <2 8 0 2 9 0 2 a 0>;
+                interrupt-parent = <&mpc5200_pic>;
+                bus-range = <0 0>;
+                ranges = <42000000 0 80000000 80000000 0 20000000
+                          02000000 0 a0000000 a0000000 0 10000000
+                          01000000 0 00000000 b0000000 0 01000000>;
+        };
 };
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index f242531f0451..a6bb1d0558ef 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -19,7 +19,7 @@
 / {
         model = "fsl,lite5200b";
         // revision = "1.0";
-        compatible = "fsl,lite5200b\0generic-mpc5200";
+        compatible = "fsl,lite5200b","generic-mpc5200";
         #address-cells = <1>;
         #size-cells = <1>;
 
@@ -37,7 +37,6 @@
                         timebase-frequency = <0>;       // from bootloader
                         bus-frequency = <0>;            // from bootloader
                         clock-frequency = <0>;          // from bootloader
-                        32-bit;
                 };
         };
 
@@ -50,15 +49,14 @@
                 model = "fsl,mpc5200b";
                 compatible = "mpc5200";
                 revision = "";                  // from bootloader
-                #interrupt-cells = <3>;
                 device_type = "soc";
-                ranges = <0 f0000000 f0010000>;
-                reg = <f0000000 00010000>;
+                ranges = <0 f0000000 0000c000>;
+                reg = <f0000000 00000100>;
                 bus-frequency = <0>;            // from bootloader
                 system-frequency = <0>;         // from bootloader
 
                 cdm@200 {
-                        compatible = "mpc5200b-cdm\0mpc5200-cdm";
+                        compatible = "mpc5200b-cdm","mpc5200-cdm";
                         reg = <200 38>;
                 };
 
@@ -67,13 +65,12 @@
                         interrupt-controller;
                         #interrupt-cells = <3>;
                         device_type = "interrupt-controller";
-                        compatible = "mpc5200b-pic\0mpc5200-pic";
+                        compatible = "mpc5200b-pic","mpc5200-pic";
                         reg = <500 80>;
-                        built-in;
                 };
 
                 gpt@600 {       // General Purpose Timer
-                        compatible = "mpc5200b-gpt\0mpc5200-gpt";
+                        compatible = "mpc5200b-gpt","mpc5200-gpt";
                         device_type = "gpt";
                         cell-index = <0>;
                         reg = <600 10>;
@@ -83,7 +80,7 @@
                 };
 
                 gpt@610 {       // General Purpose Timer
-                        compatible = "mpc5200b-gpt\0mpc5200-gpt";
+                        compatible = "mpc5200b-gpt","mpc5200-gpt";
                         device_type = "gpt";
                         cell-index = <1>;
                         reg = <610 10>;
@@ -92,7 +89,7 @@
                 };
 
                 gpt@620 {       // General Purpose Timer
-                        compatible = "mpc5200b-gpt\0mpc5200-gpt";
+                        compatible = "mpc5200b-gpt","mpc5200-gpt";
                         device_type = "gpt";
                         cell-index = <2>;
                         reg = <620 10>;
@@ -101,7 +98,7 @@
                 };
 
                 gpt@630 {       // General Purpose Timer
-                        compatible = "mpc5200b-gpt\0mpc5200-gpt";
+                        compatible = "mpc5200b-gpt","mpc5200-gpt";
                         device_type = "gpt";
                         cell-index = <3>;
                         reg = <630 10>;
@@ -110,7 +107,7 @@
                 };
 
                 gpt@640 {       // General Purpose Timer
-                        compatible = "mpc5200b-gpt\0mpc5200-gpt";
+                        compatible = "mpc5200b-gpt","mpc5200-gpt";
                         device_type = "gpt";
                         cell-index = <4>;
                         reg = <640 10>;
@@ -119,7 +116,7 @@
                 };
 
                 gpt@650 {       // General Purpose Timer
-                        compatible = "mpc5200b-gpt\0mpc5200-gpt";
+                        compatible = "mpc5200b-gpt","mpc5200-gpt";
                         device_type = "gpt";
                         cell-index = <5>;
                         reg = <650 10>;
@@ -128,7 +125,7 @@
                 };
 
                 gpt@660 {       // General Purpose Timer
-                        compatible = "mpc5200b-gpt\0mpc5200-gpt";
+                        compatible = "mpc5200b-gpt","mpc5200-gpt";
                         device_type = "gpt";
                         cell-index = <6>;
                         reg = <660 10>;
@@ -137,7 +134,7 @@
                 };
 
                 gpt@670 {       // General Purpose Timer
-                        compatible = "mpc5200b-gpt\0mpc5200-gpt";
+                        compatible = "mpc5200b-gpt","mpc5200-gpt";
                         device_type = "gpt";
                         cell-index = <7>;
                         reg = <670 10>;
@@ -146,7 +143,7 @@
                 };
 
                 rtc@800 {       // Real time clock
-                        compatible = "mpc5200b-rtc\0mpc5200-rtc";
+                        compatible = "mpc5200b-rtc","mpc5200-rtc";
                         device_type = "rtc";
                         reg = <800 100>;
                         interrupts = <1 5 0 1 6 0>;
@@ -155,7 +152,7 @@
 
                 mscan@900 {
                         device_type = "mscan";
-                        compatible = "mpc5200b-mscan\0mpc5200-mscan";
+                        compatible = "mpc5200b-mscan","mpc5200-mscan";
                         cell-index = <0>;
                         interrupts = <2 11 0>;
                         interrupt-parent = <&mpc5200_pic>;
@@ -164,7 +161,7 @@
 
                 mscan@980 {
                         device_type = "mscan";
-                        compatible = "mpc5200b-mscan\0mpc5200-mscan";
+                        compatible = "mpc5200b-mscan","mpc5200-mscan";
                         cell-index = <1>;
                         interrupts = <2 12 0>;
                         interrupt-parent = <&mpc5200_pic>;
@@ -172,48 +169,22 @@
                 };
 
                 gpio@b00 {
-                        compatible = "mpc5200b-gpio\0mpc5200-gpio";
+                        compatible = "mpc5200b-gpio","mpc5200-gpio";
                         reg = <b00 40>;
                         interrupts = <1 7 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
                 gpio-wkup@c00 {
-                        compatible = "mpc5200b-gpio-wkup\0mpc5200-gpio-wkup";
+                        compatible = "mpc5200b-gpio-wkup","mpc5200-gpio-wkup";
                         reg = <c00 40>;
                         interrupts = <1 8 0 0 3 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                pci@0d00 {
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        device_type = "pci";
-                        compatible = "mpc5200b-pci\0mpc5200-pci";
-                        reg = <d00 100>;
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
-                                         c000 0 0 2 &mpc5200_pic 1 1 3
-                                         c000 0 0 3 &mpc5200_pic 1 2 3
-                                         c000 0 0 4 &mpc5200_pic 1 3 3
-
-                                         c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot
-                                         c800 0 0 2 &mpc5200_pic 1 2 3
-                                         c800 0 0 3 &mpc5200_pic 1 3 3
-                                         c800 0 0 4 &mpc5200_pic 0 0 3>;
-                        clock-frequency = <0>; // From boot loader
-                        interrupts = <2 8 0 2 9 0 2 a 0>;
-                        interrupt-parent = <&mpc5200_pic>;
-                        bus-range = <0 0>;
-                        ranges = <42000000 0 80000000 80000000 0 20000000
-                                  02000000 0 a0000000 a0000000 0 10000000
-                                  01000000 0 00000000 b0000000 0 01000000>;
-                };
-
                 spi@f00 {
                         device_type = "spi";
-                        compatible = "mpc5200b-spi\0mpc5200-spi";
+                        compatible = "mpc5200b-spi","mpc5200-spi";
                         reg = <f00 20>;
                         interrupts = <2 d 0 2 e 0>;
                         interrupt-parent = <&mpc5200_pic>;
@@ -221,7 +192,7 @@
 
                 usb@1000 {
                         device_type = "usb-ohci-be";
-                        compatible = "mpc5200b-ohci\0mpc5200-ohci\0ohci-be";
+                        compatible = "mpc5200b-ohci","mpc5200-ohci","ohci-be";
                         reg = <1000 ff>;
                         interrupts = <2 6 0>;
                         interrupt-parent = <&mpc5200_pic>;
@@ -229,7 +200,7 @@
 
                 bestcomm@1200 {
                         device_type = "dma-controller";
-                        compatible = "mpc5200b-bestcomm\0mpc5200-bestcomm";
+                        compatible = "mpc5200b-bestcomm","mpc5200-bestcomm";
                         reg = <1200 80>;
                         interrupts = <3 0 0  3 1 0  3 2 0  3 3 0
                                       3 4 0  3 5 0  3 6 0  3 7 0
@@ -239,13 +210,13 @@
                 };
 
                 xlb@1f00 {
-                        compatible = "mpc5200b-xlb\0mpc5200-xlb";
+                        compatible = "mpc5200b-xlb","mpc5200-xlb";
                         reg = <1f00 100>;
                 };
 
                 serial@2000 {           // PSC1
                         device_type = "serial";
-                        compatible = "mpc5200b-psc-uart\0mpc5200-psc-uart";
+                        compatible = "mpc5200b-psc-uart","mpc5200-psc-uart";
                         port-number = <0>;  // Logical port assignment
                         cell-index = <0>;
                         reg = <2000 100>;
@@ -256,7 +227,7 @@
                 // PSC2 in ac97 mode example
                 //ac97@2200 {           // PSC2
                 //      device_type = "sound";
-                //      compatible = "mpc5200b-psc-ac97\0mpc5200-psc-ac97";
+                //      compatible = "mpc5200b-psc-ac97","mpc5200-psc-ac97";
                 //      cell-index = <1>;
                 //      reg = <2200 100>;
                 //      interrupts = <2 2 0>;
@@ -276,7 +247,7 @@
                 // PSC4 in uart mode example
                 //serial@2600 {         // PSC4
                 //      device_type = "serial";
-                //      compatible = "mpc5200b-psc-uart\0mpc5200-psc-uart";
+                //      compatible = "mpc5200b-psc-uart","mpc5200-psc-uart";
                 //      cell-index = <3>;
                 //      reg = <2600 100>;
                 //      interrupts = <2 b 0>;
@@ -286,7 +257,7 @@
                 // PSC5 in uart mode example
                 //serial@2800 {         // PSC5
                 //      device_type = "serial";
-                //      compatible = "mpc5200b-psc-uart\0mpc5200-psc-uart";
+                //      compatible = "mpc5200b-psc-uart","mpc5200-psc-uart";
                 //      cell-index = <4>;
                 //      reg = <2800 100>;
                 //      interrupts = <2 c 0>;
@@ -296,7 +267,7 @@
                 // PSC6 in spi mode example
                 //spi@2c00 {            // PSC6
                 //      device_type = "spi";
-                //      compatible = "mpc5200b-psc-spi\0mpc5200-psc-spi";
+                //      compatible = "mpc5200b-psc-spi","mpc5200-psc-spi";
                 //      cell-index = <5>;
                 //      reg = <2c00 100>;
                 //      interrupts = <2 4 0>;
@@ -305,7 +276,7 @@
 
                 ethernet@3000 {
                         device_type = "network";
-                        compatible = "mpc5200b-fec\0mpc5200-fec";
+                        compatible = "mpc5200b-fec","mpc5200-fec";
                         reg = <3000 800>;
                         mac-address = [ 02 03 04 05 06 07 ]; // Bad!
                         interrupts = <2 5 0>;
@@ -314,7 +285,7 @@
 
                 ata@3a00 {
                         device_type = "ata";
-                        compatible = "mpc5200b-ata\0mpc5200-ata";
+                        compatible = "mpc5200b-ata","mpc5200-ata";
                         reg = <3a00 100>;
                         interrupts = <2 7 0>;
                         interrupt-parent = <&mpc5200_pic>;
@@ -322,7 +293,7 @@
 
                 i2c@3d00 {
                         device_type = "i2c";
-                        compatible = "mpc5200b-i2c\0mpc5200-i2c\0fsl-i2c";
+                        compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
                         cell-index = <0>;
                         reg = <3d00 40>;
                         interrupts = <2 f 0>;
@@ -332,7 +303,7 @@
 
                 i2c@3d40 {
                         device_type = "i2c";
-                        compatible = "mpc5200b-i2c\0mpc5200-i2c\0fsl-i2c";
+                        compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
                         cell-index = <1>;
                         reg = <3d40 40>;
                         interrupts = <2 10 0>;
@@ -341,8 +312,34 @@
                 };
                 sram@8000 {
                         device_type = "sram";
-                        compatible = "mpc5200b-sram\0mpc5200-sram\0sram";
+                        compatible = "mpc5200b-sram","mpc5200-sram","sram";
                         reg = <8000 4000>;
                 };
         };
+
+        pci@f0000d00 {
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                device_type = "pci";
+                compatible = "mpc5200b-pci","mpc5200-pci";
+                reg = <f0000d00 100>;
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
+                                 c000 0 0 2 &mpc5200_pic 1 1 3
+                                 c000 0 0 3 &mpc5200_pic 1 2 3
+                                 c000 0 0 4 &mpc5200_pic 1 3 3
+
+                                 c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot
+                                 c800 0 0 2 &mpc5200_pic 1 2 3
+                                 c800 0 0 3 &mpc5200_pic 1 3 3
+                                 c800 0 0 4 &mpc5200_pic 0 0 3>;
+                clock-frequency = <0>; // From boot loader
+                interrupts = <2 8 0 2 9 0 2 a 0>;
+                interrupt-parent = <&mpc5200_pic>;
+                bus-range = <0 0>;
+                ranges = <42000000 0 80000000 80000000 0 20000000
+                          02000000 0 a0000000 a0000000 0 10000000
+                          01000000 0 00000000 b0000000 0 01000000>;
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc7448hpc2.dts b/arch/powerpc/boot/dts/mpc7448hpc2.dts
index b9158eb2797e..8fb542387436 100644
--- a/arch/powerpc/boot/dts/mpc7448hpc2.dts
+++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts
@@ -31,7 +31,6 @@
                         timebase-frequency = <0>;       // 33 MHz, from uboot
                         clock-frequency = <0>;          // From U-Boot
                         bus-frequency = <0>;            // From U-Boot
-                        32-bit;
                 };
         };
 
@@ -44,7 +43,6 @@
         tsi108@c0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "tsi-bridge";
                 ranges = <00000000 c0000000 00010000>;
                 reg = <c0000000 00010000>;
@@ -80,6 +78,7 @@
                 };
 
                 ethernet@6200 {
+                        linux,network-index = <0>;
                         #size-cells = <0>;
                         device_type = "network";
                         compatible = "tsi108-ethernet";
@@ -92,6 +91,7 @@
                 };
 
                 ethernet@6600 {
+                        linux,network-index = <1>;
                         #address-cells = <1>;
                         #size-cells = <0>;
                         device_type = "network";
@@ -128,7 +128,6 @@
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <7400 400>;
-                        built-in;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
                         big-endian;
@@ -180,12 +179,14 @@
                                 device_type = "pic-router";
                                 #address-cells = <0>;
                                 #interrupt-cells = <2>;
-                                built-in;
                                 big-endian;
                                 interrupts = <17 2>;
                                 interrupt-parent = <&mpic>;
                         };
                 };
         };
+        chosen {
+                linux,stdout-path = "/tsi108@c0000000/serial@7808";
+        };
 
 };
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts
index 1934b800278e..7285ca1325fd 100644
--- a/arch/powerpc/boot/dts/mpc8272ads.dts
+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -10,207 +10,240 @@
  */
 
 / {
-       model = "MPC8272ADS";
-       compatible = "MPC8260ADS";
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       cpus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               PowerPC,8272@0 {
-                       device_type = "cpu";
-                       reg = <0>;
-                       d-cache-line-size = <20>;       // 32 bytes
-                       i-cache-line-size = <20>;       // 32 bytes
-                       d-cache-size = <4000>;          // L1, 16K
-                       i-cache-size = <4000>;          // L1, 16K
-                       timebase-frequency = <0>;
-                       bus-frequency = <0>;
-                       clock-frequency = <0>;
-                       32-bit;
-               };
-       };
-
-                pci_pic: interrupt-controller@f8200000 {
-               #address-cells = <0>;
-               #interrupt-cells = <2>;
-               interrupt-controller;
-               reg = <f8200000 f8200004>;
-               built-in;
-               device_type = "pci-pic";
-       };
-       memory {
-               device_type = "memory";
-               reg = <00000000 4000000 f4500000 00000020>;
-       };
-
-       chosen {
-               name = "chosen";
-               linux,platform = <0>;
-                interrupt-controller = <&Cpm_pic>;
-       };
-
-       soc8272@f0000000 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               #interrupt-cells = <2>;
-               device_type = "soc";
-               ranges = <00000000 f0000000 00053000>;
-               reg = <f0000000 10000>;
-
-               mdio@0 {
-                       device_type = "mdio";
-                       compatible = "fs_enet";
-                       reg = <0 0>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                        phy0:ethernet-phy@0 {
-                                interrupt-parent = <&Cpm_pic>;
-                               interrupts = <17 4>;
-                               reg = <0>;
-                               bitbang = [ 12 12 13 02 02 01 ];
-                               device_type = "ethernet-phy";
-                       };
-                        phy1:ethernet-phy@1 {
-                                interrupt-parent = <&Cpm_pic>;
-                               interrupts = <17 4>;
-                               bitbang = [ 12 12 13 02 02 01 ];
-                               reg = <3>;
-                               device_type = "ethernet-phy";
-                       };
-               };
-
-               ethernet@24000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       device_type = "network";
-                       device-id = <1>;
-                       compatible = "fs_enet";
-                       model = "FCC";
-                       reg = <11300 20 8400 100 11380 30>;
-                       mac-address = [ 00 11 2F 99 43 54 ];
-                       interrupts = <20 2>;
-                        interrupt-parent = <&Cpm_pic>;
-                        phy-handle = <&Phy0>;
-                       rx-clock = <13>;
-                       tx-clock = <12>;
-               };
-
-               ethernet@25000 {
-                       device_type = "network";
-                       device-id = <2>;
-                       compatible = "fs_enet";
-                       model = "FCC";
-                       reg = <11320 20 8500 100 113b0 30>;
-                       mac-address = [ 00 11 2F 99 44 54 ];
-                       interrupts = <21 2>;
-                        interrupt-parent = <&Cpm_pic>;
-                        phy-handle = <&Phy1>;
-                       rx-clock = <17>;
-                       tx-clock = <18>;
-               };
-
-               cpm@f0000000 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       #interrupt-cells = <2>;
-                       device_type = "cpm";
-                       model = "CPM2";
-                       ranges = <00000000 00000000 20000>;
-                       reg = <0 20000>;
-                       command-proc = <119c0>;
-                       brg-frequency = <17D7840>;
-                       cpm_clk = <BEBC200>;
-
-                       scc@11a00 {
-                               device_type = "serial";
-                               compatible = "cpm_uart";
-                               model = "SCC";
-                               device-id = <1>;
-                               reg = <11a00 20 8000 100>;
-                               current-speed = <1c200>;
-                               interrupts = <28 2>;
-                                interrupt-parent = <&Cpm_pic>;
-                               clock-setup = <0 00ffffff>;
-                               rx-clock = <1>;
-                               tx-clock = <1>;
-                       };
-
-                       scc@11a60 {
-                               device_type = "serial";
-                               compatible = "cpm_uart";
-                               model = "SCC";
-                               device-id = <4>;
-                               reg = <11a60 20 8300 100>;
-                               current-speed = <1c200>;
-                               interrupts = <2b 2>;
-                                interrupt-parent = <&Cpm_pic>;
-                               clock-setup = <1b ffffff00>;
-                               rx-clock = <4>;
-                               tx-clock = <4>;
-                       };
-
-               };
-                        cpm_pic:interrupt-controller@10c00 {
-                       #address-cells = <0>;
-                       #interrupt-cells = <2>;
-                       interrupt-controller;
-                       reg = <10c00 80>;
-                       built-in;
-                       device_type = "cpm-pic";
-                       compatible = "CPM2";
-               };
-               pci@0500 {
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       compatible = "8272";
-                       device_type = "pci";
-                       reg = <10430 4dc>;
-                       clock-frequency = <3f940aa>;
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-
-                                       /* IDSEL 0x16 */
-                                        b000 0 0 1 f8200000 40 8
-                                        b000 0 0 2 f8200000 41 8
-                                        b000 0 0 3 f8200000 42 8
-                                        b000 0 0 4 f8200000 43 8
-
-                                       /* IDSEL 0x17 */
-                                        b800 0 0 1 f8200000 43 8
-                                        b800 0 0 2 f8200000 40 8
-                                        b800 0 0 3 f8200000 41 8
-                                        b800 0 0 4 f8200000 42 8
-
-                                       /* IDSEL 0x18 */
-                                        c000 0 0 1 f8200000 42 8
-                                        c000 0 0 2 f8200000 43 8
-                                        c000 0 0 3 f8200000 40 8
-                                        c000 0 0 4 f8200000 41 8>;
-                        interrupt-parent = <&Cpm_pic>;
-                       interrupts = <14 8>;
-                       bus-range = <0 0>;
-                       ranges = <02000000 0 80000000 80000000 0 40000000
-                                 01000000 0 00000000 f6000000 0 02000000>;
-               };
+        model = "MPC8272ADS";
+        compatible = "fsl,mpc8272ads";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8272@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <d#32>;
+                        i-cache-line-size = <d#32>;
+                        d-cache-size = <d#16384>;
+                        i-cache-size = <d#16384>;
+                        timebase-frequency = <0>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0>;
+        };
+
+        localbus@f0010100 {
+                compatible = "fsl,mpc8272-localbus",
+                             "fsl,pq2-localbus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <f0010100 40>;
+
+                ranges = <0 0 fe000000 02000000
+                          1 0 f4500000 00008000
+                          3 0 f8200000 00008000>;
+
+                flash@0,0 {
+                        compatible = "jedec-flash";
+                        reg = <0 0 2000000>;
+                        bank-width = <4>;
+                        device-width = <1>;
+                };
+
+                board-control@1,0 {
+                        reg = <1 0 20>;
+                        compatible = "fsl,mpc8272ads-bcsr";
+                };
+
+                PCI_PIC: interrupt-controller@3,0 {
+                        compatible = "fsl,mpc8272ads-pci-pic",
+                                     "fsl,pq2ads-pci-pic";
+                        #interrupt-cells = <1>;
+                        interrupt-controller;
+                        reg = <3 0 8>;
+                        interrupt-parent = <&PIC>;
+                        interrupts = <14 8>;
+                };
+        };
+
+
+        pci@f0010800 {
+                device_type = "pci";
+                reg = <f0010800 10c f00101ac 8 f00101c4 8>;
+                compatible = "fsl,mpc8272-pci", "fsl,pq2-pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                clock-frequency = <d#66666666>;
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                                 /* IDSEL 0x16 */
+                                 b000 0 0 1 &PCI_PIC 0
+                                 b000 0 0 2 &PCI_PIC 1
+                                 b000 0 0 3 &PCI_PIC 2
+                                 b000 0 0 4 &PCI_PIC 3
+
+                                 /* IDSEL 0x17 */
+                                 b800 0 0 1 &PCI_PIC 4
+                                 b800 0 0 2 &PCI_PIC 5
+                                 b800 0 0 3 &PCI_PIC 6
+                                 b800 0 0 4 &PCI_PIC 7
+
+                                 /* IDSEL 0x18 */
+                                 c000 0 0 1 &PCI_PIC 8
+                                 c000 0 0 2 &PCI_PIC 9
+                                 c000 0 0 3 &PCI_PIC a
+                                 c000 0 0 4 &PCI_PIC b>;
+
+                interrupt-parent = <&PIC>;
+                interrupts = <12 8>;
+                ranges = <42000000 0 80000000 80000000 0 20000000
+                          02000000 0 a0000000 a0000000 0 20000000
+                          01000000 0 00000000 f6000000 0 02000000>;
+        };
+
+        soc@f0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "fsl,mpc8272", "fsl,pq2-soc";
+                ranges = <00000000 f0000000 00053000>;
+
+                // Temporary -- will go away once kernel uses ranges for get_immrbase().
+                reg = <f0000000 00053000>;
+
+                cpm@119c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8272-cpm", "fsl,cpm2";
+                        reg = <119c0 30>;
+                        ranges;
+
+                        muram@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0 10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 2000 9800 800>;
+                                };
+                        };
+
+                        brg@119f0 {
+                                compatible = "fsl,mpc8272-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <119f0 10 115f0 10>;
+                        };
+
+                        serial@11a00 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc8272-scc-uart",
+                                             "fsl,cpm2-scc-uart";
+                                reg = <11a00 20 8000 100>;
+                                interrupts = <28 8>;
+                                interrupt-parent = <&PIC>;
+                                fsl,cpm-brg = <1>;
+                                fsl,cpm-command = <00800000>;
+                        };
+
+                        serial@11a60 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc8272-scc-uart",
+                                             "fsl,cpm2-scc-uart";
+                                reg = <11a60 20 8300 100>;
+                                interrupts = <2b 8>;
+                                interrupt-parent = <&PIC>;
+                                fsl,cpm-brg = <4>;
+                                fsl,cpm-command = <0ce00000>;
+                        };
+
+                        mdio@10d40 {
+                                device_type = "mdio";
+                                compatible = "fsl,mpc8272ads-mdio-bitbang",
+                                             "fsl,mpc8272-mdio-bitbang",
+                                             "fsl,cpm2-mdio-bitbang";
+                                reg = <10d40 14>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                fsl,mdio-pin = <12>;
+                                fsl,mdc-pin = <13>;
+
+                                PHY0: ethernet-phy@0 {
+                                        interrupt-parent = <&PIC>;
+                                        interrupts = <17 8>;
+                                        reg = <0>;
+                                        device_type = "ethernet-phy";
+                                };
+
+                                PHY1: ethernet-phy@1 {
+                                        interrupt-parent = <&PIC>;
+                                        interrupts = <17 8>;
+                                        reg = <3>;
+                                        device_type = "ethernet-phy";
+                                };
+                        };
+
+                        ethernet@11300 {
+                                device_type = "network";
+                                compatible = "fsl,mpc8272-fcc-enet",
+                                             "fsl,cpm2-fcc-enet";
+                                reg = <11300 20 8400 100 11390 1>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                                interrupts = <20 8>;
+                                interrupt-parent = <&PIC>;
+                                phy-handle = <&PHY0>;
+                                linux,network-index = <0>;
+                                fsl,cpm-command = <12000300>;
+                        };
+
+                        ethernet@11320 {
+                                device_type = "network";
+                                compatible = "fsl,mpc8272-fcc-enet",
+                                             "fsl,cpm2-fcc-enet";
+                                reg = <11320 20 8500 100 113b0 1>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                                interrupts = <21 8>;
+                                interrupt-parent = <&PIC>;
+                                phy-handle = <&PHY1>;
+                                linux,network-index = <1>;
+                                fsl,cpm-command = <16200300>;
+                        };
+                };
+
+                PIC: interrupt-controller@10c00 {
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        reg = <10c00 80>;
+                        compatible = "fsl,mpc8272-pic", "fsl,cpm2-pic";
+                };
 
 /* May need to remove if on a part without crypto engine */
-               crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "talitos";
-                       reg = <30000 10000>;
-                       interrupts = <b 2>;
-                        interrupt-parent = <&Cpm_pic>;
-                       num-channels = <4>;
-                       channel-fifo-len = <18>;
-                       exec-units-mask = <0000007e>;
+                crypto@30000 {
+                        device_type = "crypto";
+                        model = "SEC2";
+                        compatible = "fsl,mpc8272-talitos-sec2",
+                                     "fsl,talitos-sec2",
+                                     "fsl,talitos",
+                                     "talitos";
+                        reg = <30000 10000>;
+                        interrupts = <b 8>;
+                        interrupt-parent = <&PIC>;
+                        num-channels = <4>;
+                        channel-fifo-len = <18>;
+                        exec-units-mask = <0000007e>;
 /* desc mask is for rev1.x, we need runtime fixup for >=2.x */
-                       descriptor-types-mask = <01010ebf>;
-               };
+                        descriptor-types-mask = <01010ebf>;
+                };
+        };
 
-       };
+        chosen {
+                linux,stdout-path = "/soc/cpm/serial@11a00";
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index c5adbe40364e..9e7eba973262 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -29,7 +29,6 @@
                         timebase-frequency = <0>;       // from bootloader
                         bus-frequency = <0>;            // from bootloader
                         clock-frequency = <0>;          // from bootloader
-                        32-bit;
                 };
         };
 
@@ -41,7 +40,6 @@
         soc8313@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 e0000000 00100000>;
                 reg = <e0000000 00000200>;
@@ -73,11 +71,11 @@
 
                 spi@7000 {
                         device_type = "spi";
-                        compatible = "mpc83xx_spi";
+                        compatible = "fsl_spi";
                         reg = <7000 1000>;
                         interrupts = <10 8>;
                         interrupt-parent = < &ipic >;
-                        mode = <0>;
+                        mode = "cpu";
                 };
 
                 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
@@ -152,36 +150,6 @@
                         interrupt-parent = < &ipic >;
                 };
 
-                pci@8500 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-
-                                        /* IDSEL 0x0E -mini PCI */
-                                         7000 0 0 1 &ipic 12 8
-                                         7000 0 0 2 &ipic 12 8
-                                         7000 0 0 3 &ipic 12 8
-                                         7000 0 0 4 &ipic 12 8
-
-                                        /* IDSEL 0x0F - PCI slot */
-                                         7800 0 0 1 &ipic 11 8
-                                         7800 0 0 2 &ipic 12 8
-                                         7800 0 0 3 &ipic 11 8
-                                         7800 0 0 4 &ipic 12 8>;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <42 8>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 90000000 90000000 0 10000000
-                                  42000000 0 80000000 80000000 0 10000000
-                                  01000000 0 00000000 e2000000 0 00100000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8500 100>;
-                        compatible = "fsl,mpc8349-pci";
-                        device_type = "pci";
-                };
-
                 crypto@30000 {
                         device_type = "crypto";
                         model = "SEC2";
@@ -207,8 +175,37 @@
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <700 100>;
-                        built-in;
                         device_type = "ipic";
                 };
         };
+
+        pci@e0008500 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+
+                                /* IDSEL 0x0E -mini PCI */
+                                 7000 0 0 1 &ipic 12 8
+                                 7000 0 0 2 &ipic 12 8
+                                 7000 0 0 3 &ipic 12 8
+                                 7000 0 0 4 &ipic 12 8
+
+                                /* IDSEL 0x0F - PCI slot */
+                                 7800 0 0 1 &ipic 11 8
+                                 7800 0 0 2 &ipic 12 8
+                                 7800 0 0 3 &ipic 11 8
+                                 7800 0 0 4 &ipic 12 8>;
+                interrupt-parent = < &ipic >;
+                interrupts = <42 8>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 90000000 90000000 0 10000000
+                          42000000 0 80000000 80000000 0 10000000
+                          01000000 0 00000000 e2000000 0 00100000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008500 100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index f158ed781ba8..fcd333c391ec 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -29,7 +29,6 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
-                        32-bit;
                 };
         };
 
@@ -46,7 +45,6 @@
         soc8323@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 e0000000 00100000>;
                 reg = <e0000000 00000200>;
@@ -99,71 +97,11 @@
                         descriptor-types-mask = <0122003f>;
                 };
 
-                pci@8500 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-                                        /* IDSEL 0x11 AD17 */
-                                         8800 0 0 1 &ipic 14 8
-                                         8800 0 0 2 &ipic 15 8
-                                         8800 0 0 3 &ipic 16 8
-                                         8800 0 0 4 &ipic 17 8
-
-                                        /* IDSEL 0x12 AD18 */
-                                         9000 0 0 1 &ipic 16 8
-                                         9000 0 0 2 &ipic 17 8
-                                         9000 0 0 3 &ipic 14 8
-                                         9000 0 0 4 &ipic 15 8
-
-                                        /* IDSEL 0x13 AD19 */
-                                         9800 0 0 1 &ipic 17 8
-                                         9800 0 0 2 &ipic 14 8
-                                         9800 0 0 3 &ipic 15 8
-                                         9800 0 0 4 &ipic 16 8
-
-                                        /* IDSEL 0x15 AD21*/
-                                         a800 0 0 1 &ipic 14 8
-                                         a800 0 0 2 &ipic 15 8
-                                         a800 0 0 3 &ipic 16 8
-                                         a800 0 0 4 &ipic 17 8
-
-                                        /* IDSEL 0x16 AD22*/
-                                         b000 0 0 1 &ipic 17 8
-                                         b000 0 0 2 &ipic 14 8
-                                         b000 0 0 3 &ipic 15 8
-                                         b000 0 0 4 &ipic 16 8
-
-                                        /* IDSEL 0x17 AD23*/
-                                         b800 0 0 1 &ipic 16 8
-                                         b800 0 0 2 &ipic 17 8
-                                         b800 0 0 3 &ipic 14 8
-                                         b800 0 0 4 &ipic 15 8
-
-                                        /* IDSEL 0x18 AD24*/
-                                         c000 0 0 1 &ipic 15 8
-                                         c000 0 0 2 &ipic 16 8
-                                         c000 0 0 3 &ipic 17 8
-                                         c000 0 0 4 &ipic 14 8>;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <42 8>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 90000000 90000000 0 10000000
-                                  42000000 0 80000000 80000000 0 10000000
-                                  01000000 0 00000000 d0000000 0 00100000>;
-                        clock-frequency = <0>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8500 100>;
-                        compatible = "fsl,mpc8349-pci";
-                        device_type = "pci";
-                };
-
                 ipic: pic@700 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <700 100>;
-                        built-in;
                         device_type = "ipic";
                 };
                 
@@ -333,10 +271,68 @@
                         #address-cells = <0>;
                         #interrupt-cells = <1>;
                         reg = <80 80>;
-                        built-in;
                         big-endian;
                         interrupts = <20 8 21 8>; //high:32 low:33
                         interrupt-parent = < &ipic >;
                 };
         };
+
+        pci@e0008500 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                                /* IDSEL 0x11 AD17 */
+                                 8800 0 0 1 &ipic 14 8
+                                 8800 0 0 2 &ipic 15 8
+                                 8800 0 0 3 &ipic 16 8
+                                 8800 0 0 4 &ipic 17 8
+
+                                /* IDSEL 0x12 AD18 */
+                                 9000 0 0 1 &ipic 16 8
+                                 9000 0 0 2 &ipic 17 8
+                                 9000 0 0 3 &ipic 14 8
+                                 9000 0 0 4 &ipic 15 8
+
+                                /* IDSEL 0x13 AD19 */
+                                 9800 0 0 1 &ipic 17 8
+                                 9800 0 0 2 &ipic 14 8
+                                 9800 0 0 3 &ipic 15 8
+                                 9800 0 0 4 &ipic 16 8
+
+                                /* IDSEL 0x15 AD21*/
+                                 a800 0 0 1 &ipic 14 8
+                                 a800 0 0 2 &ipic 15 8
+                                 a800 0 0 3 &ipic 16 8
+                                 a800 0 0 4 &ipic 17 8
+
+                                /* IDSEL 0x16 AD22*/
+                                 b000 0 0 1 &ipic 17 8
+                                 b000 0 0 2 &ipic 14 8
+                                 b000 0 0 3 &ipic 15 8
+                                 b000 0 0 4 &ipic 16 8
+
+                                /* IDSEL 0x17 AD23*/
+                                 b800 0 0 1 &ipic 16 8
+                                 b800 0 0 2 &ipic 17 8
+                                 b800 0 0 3 &ipic 14 8
+                                 b800 0 0 4 &ipic 15 8
+
+                                /* IDSEL 0x18 AD24*/
+                                 c000 0 0 1 &ipic 15 8
+                                 c000 0 0 2 &ipic 16 8
+                                 c000 0 0 3 &ipic 17 8
+                                 c000 0 0 4 &ipic 14 8>;
+                interrupt-parent = < &ipic >;
+                interrupts = <42 8>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 90000000 90000000 0 10000000
+                          42000000 0 80000000 80000000 0 10000000
+                          01000000 0 00000000 d0000000 0 00100000>;
+                clock-frequency = <0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008500 100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 7c4beff3e200..388c8a7012e1 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -29,7 +29,6 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
-                        32-bit;
                 };
         };
 
@@ -41,7 +40,6 @@
         soc8323@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 e0000000 00100000>;
                 reg = <e0000000 00000200>;
@@ -94,45 +92,11 @@
                         descriptor-types-mask = <0122003f>;
                 };
 
-                pci@8500 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-                                        /* IDSEL 0x10 AD16 (USB) */
-                                         8000 0 0 1 &pic 11 8
-
-                                        /* IDSEL 0x11 AD17 (Mini1)*/
-                                         8800 0 0 1 &pic 12 8
-                                         8800 0 0 2 &pic 13 8
-                                         8800 0 0 3 &pic 14 8
-                                         8800 0 0 4 &pic 30 8
-
-                                        /* IDSEL 0x12 AD18 (PCI/Mini2) */
-                                         9000 0 0 1 &pic 13 8
-                                         9000 0 0 2 &pic 14 8
-                                         9000 0 0 3 &pic 30 8
-                                         9000 0 0 4 &pic 11 8>;
-
-                        interrupt-parent = <&pic>;
-                        interrupts = <42 8>;
-                        bus-range = <0 0>;
-                        ranges = <42000000 0 80000000 80000000 0 10000000
-                                  02000000 0 90000000 90000000 0 10000000
-                                  01000000 0 d0000000 d0000000 0 04000000>;
-                        clock-frequency = <0>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8500 100>;
-                        compatible = "fsl,mpc8349-pci";
-                        device_type = "pci";
-                };
-
                 pic:pic@700 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <700 100>;
-                        built-in;
                         device_type = "ipic";
                 };
 
@@ -211,7 +175,7 @@
                         reg = <4c0 40>;
                         interrupts = <2>;
                         interrupt-parent = <&qeic>;
-                        mode = "cpu";
+                        mode = "cpu-qe";
                 };
 
                 spi@500 {
@@ -292,10 +256,42 @@
                         #address-cells = <0>;
                         #interrupt-cells = <1>;
                         reg = <80 80>;
-                        built-in;
                         big-endian;
                         interrupts = <20 8 21 8>; //high:32 low:33
                         interrupt-parent = <&pic>;
                 };
         };
+
+        pci@e0008500 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                                /* IDSEL 0x10 AD16 (USB) */
+                                 8000 0 0 1 &pic 11 8
+
+                                /* IDSEL 0x11 AD17 (Mini1)*/
+                                 8800 0 0 1 &pic 12 8
+                                 8800 0 0 2 &pic 13 8
+                                 8800 0 0 3 &pic 14 8
+                                 8800 0 0 4 &pic 30 8
+
+                                /* IDSEL 0x12 AD18 (PCI/Mini2) */
+                                 9000 0 0 1 &pic 13 8
+                                 9000 0 0 2 &pic 14 8
+                                 9000 0 0 3 &pic 30 8
+                                 9000 0 0 4 &pic 11 8>;
+
+                interrupt-parent = <&pic>;
+                interrupts = <42 8>;
+                bus-range = <0 0>;
+                ranges = <42000000 0 80000000 80000000 0 10000000
+                          02000000 0 90000000 90000000 0 10000000
+                          01000000 0 d0000000 d0000000 0 04000000>;
+                clock-frequency = <0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008500 100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 44c065a6b5e7..5072f6d0a46d 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -28,7 +28,6 @@
                         timebase-frequency = <0>;       // from bootloader
                         bus-frequency = <0>;            // from bootloader
                         clock-frequency = <0>;          // from bootloader
-                        32-bit;
                 };
         };
 
@@ -40,7 +39,6 @@
         soc8349@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 e0000000 00100000>;
                 reg = <e0000000 00000200>;
@@ -72,11 +70,11 @@
 
                 spi@7000 {
                         device_type = "spi";
-                        compatible = "mpc83xx_spi";
+                        compatible = "fsl_spi";
                         reg = <7000 1000>;
                         interrupts = <10 8>;
                         interrupt-parent = < &ipic >;
-                        mode = <0>;
+                        mode = "cpu";
                 };
 
                 usb@22000 {
@@ -142,6 +140,7 @@
                         interrupts = <20 8 21 8 22 8>;
                         interrupt-parent = < &ipic >;
                         phy-handle = < &phy1c >;
+                        linux,network-index = <0>;
                 };
 
                 ethernet@25000 {
@@ -161,6 +160,7 @@
                         interrupts = <23 8 24 8 25 8>;
                         interrupt-parent = < &ipic >;
                         phy-handle = < &phy1f >;
+                        linux,network-index = <1>;
                 };
 
                 serial@4500 {
@@ -181,52 +181,6 @@
                         interrupt-parent = < &ipic >;
                 };
 
-                pci@8500 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-                                        /* IDSEL 0x10 - SATA */
-                                        8000 0 0 1 &ipic 16 8 /* SATA_INTA */
-                                        >;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <42 8>;
-                        bus-range = <0 0>;
-                        ranges = <42000000 0 80000000 80000000 0 10000000
-                                  02000000 0 90000000 90000000 0 10000000
-                                  01000000 0 00000000 e2000000 0 01000000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8500 100>;
-                        compatible = "fsl,mpc8349-pci";
-                        device_type = "pci";
-                };
-
-                pci@8600 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-                                        /* IDSEL 0x0E - MiniPCI Slot */
-                                        7000 0 0 1 &ipic 15 8 /* PCI_INTA */
-
-                                        /* IDSEL 0x0F - PCI Slot */
-                                        7800 0 0 1 &ipic 14 8 /* PCI_INTA */
-                                        7800 0 0 2 &ipic 15 8 /* PCI_INTB */
-                                         >;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <43 8>;
-                        bus-range = <1 1>;
-                        ranges = <42000000 0 a0000000 a0000000 0 10000000
-                                  02000000 0 b0000000 b0000000 0 10000000
-                                  01000000 0 00000000 e3000000 0 01000000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8600 100>;
-                        compatible = "fsl,mpc8349-pci";
-                        device_type = "pci";
-                };
-
                 crypto@30000 {
                         device_type = "crypto";
                         model = "SEC2";
@@ -245,8 +199,56 @@
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <700 100>;
-                        built-in;
                         device_type = "ipic";
                 };
         };
+
+        pci@e0008500 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                                /* IDSEL 0x10 - SATA */
+                                8000 0 0 1 &ipic 16 8 /* SATA_INTA */
+                                >;
+                interrupt-parent = < &ipic >;
+                interrupts = <42 8>;
+                bus-range = <0 0>;
+                ranges = <42000000 0 80000000 80000000 0 10000000
+                          02000000 0 90000000 90000000 0 10000000
+                          01000000 0 00000000 e2000000 0 01000000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008500 100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
+
+        pci@e0008600 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                                /* IDSEL 0x0E - MiniPCI Slot */
+                                7000 0 0 1 &ipic 15 8 /* PCI_INTA */
+
+                                /* IDSEL 0x0F - PCI Slot */
+                                7800 0 0 1 &ipic 14 8 /* PCI_INTA */
+                                7800 0 0 2 &ipic 15 8 /* PCI_INTB */
+                                 >;
+                interrupt-parent = < &ipic >;
+                interrupts = <43 8>;
+                bus-range = <0 0>;
+                ranges = <42000000 0 a0000000 a0000000 0 10000000
+                          02000000 0 b0000000 b0000000 0 10000000
+                          01000000 0 00000000 e3000000 0 01000000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008600 100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
+
+
+
 };
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index 0b8387141d88..074f7a2ab7e4 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -28,7 +28,6 @@
                         timebase-frequency = <0>;       // from bootloader
                         bus-frequency = <0>;            // from bootloader
                         clock-frequency = <0>;          // from bootloader
-                        32-bit;
                 };
         };
 
@@ -40,7 +39,6 @@
         soc8349@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 e0000000 00100000>;
                 reg = <e0000000 00000200>;
@@ -72,11 +70,11 @@
 
                 spi@7000 {
                         device_type = "spi";
-                        compatible = "mpc83xx_spi";
+                        compatible = "fsl_spi";
                         reg = <7000 1000>;
                         interrupts = <10 8>;
                         interrupt-parent = < &ipic >;
-                        mode = <0>;
+                        mode = "cpu";
                 };
 
                 usb@23000 {
@@ -116,6 +114,7 @@
                         interrupts = <20 8 21 8 22 8>;
                         interrupt-parent = < &ipic >;
                         phy-handle = < &phy1c >;
+                        linux,network-index = <0>;
                 };
 
                 serial@4500 {
@@ -136,28 +135,6 @@
                         interrupt-parent = < &ipic >;
                 };
 
-                pci@8600 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-                                        /* IDSEL 0x0F - PCI Slot */
-                                        7800 0 0 1 &ipic 14 8 /* PCI_INTA */
-                                        7800 0 0 2 &ipic 15 8 /* PCI_INTB */
-                                         >;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <43 8>;
-                        bus-range = <1 1>;
-                        ranges = <42000000 0 a0000000 a0000000 0 10000000
-                                  02000000 0 b0000000 b0000000 0 10000000
-                                  01000000 0 00000000 e3000000 0 01000000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8600 100>;
-                        compatible = "fsl,mpc8349-pci";
-                        device_type = "pci";
-                };
-
                 crypto@30000 {
                         device_type = "crypto";
                         model = "SEC2";
@@ -176,8 +153,29 @@
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <700 100>;
-                        built-in;
                         device_type = "ipic";
                 };
         };
+
+        pci@e0008600 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                                /* IDSEL 0x0F - PCI Slot */
+                                7800 0 0 1 &ipic 14 8 /* PCI_INTA */
+                                7800 0 0 2 &ipic 15 8 /* PCI_INTB */
+                                 >;
+                interrupt-parent = < &ipic >;
+                interrupts = <43 8>;
+                bus-range = <1 1>;
+                ranges = <42000000 0 a0000000 a0000000 0 10000000
+                          02000000 0 b0000000 b0000000 0 10000000
+                          01000000 0 00000000 e3000000 0 01000000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008600 100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 481099756e44..e5a84ef9f4b0 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -29,7 +29,6 @@
                         timebase-frequency = <0>;       // from bootloader
                         bus-frequency = <0>;            // from bootloader
                         clock-frequency = <0>;          // from bootloader
-                        32-bit;
                 };
         };
 
@@ -46,7 +45,6 @@
         soc8349@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 e0000000 00100000>;
                 reg = <e0000000 00000200>;
@@ -78,11 +76,11 @@
 
                 spi@7000 {
                         device_type = "spi";
-                        compatible = "mpc83xx_spi";
+                        compatible = "fsl_spi";
                         reg = <7000 1000>;
                         interrupts = <10 8>;
                         interrupt-parent = < &ipic >;
-                        mode = <0>;
+                        mode = "cpu";
                 };
 
                 /* phy type (ULPI or SERIAL) are only types supportted for MPH */
@@ -146,6 +144,7 @@
                         interrupts = <20 8 21 8 22 8>;
                         interrupt-parent = < &ipic >;
                         phy-handle = < &phy0 >;
+                        linux,network-index = <0>;
                 };
 
                 ethernet@25000 {
@@ -165,6 +164,7 @@
                         interrupts = <23 8 24 8 25 8>;
                         interrupt-parent = < &ipic >;
                         phy-handle = < &phy1 >;
+                        linux,network-index = <1>;
                 };
 
                 serial@4500 {
@@ -185,126 +185,6 @@
                         interrupt-parent = < &ipic >;
                 };
 
-                pci@8500 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-
-                                        /* IDSEL 0x11 */
-                                         8800 0 0 1 &ipic 14 8
-                                         8800 0 0 2 &ipic 15 8
-                                         8800 0 0 3 &ipic 16 8
-                                         8800 0 0 4 &ipic 17 8
-
-                                        /* IDSEL 0x12 */
-                                         9000 0 0 1 &ipic 16 8
-                                         9000 0 0 2 &ipic 17 8
-                                         9000 0 0 3 &ipic 14 8
-                                         9000 0 0 4 &ipic 15 8
-
-                                        /* IDSEL 0x13 */
-                                         9800 0 0 1 &ipic 17 8
-                                         9800 0 0 2 &ipic 14 8
-                                         9800 0 0 3 &ipic 15 8
-                                         9800 0 0 4 &ipic 16 8
-
-                                        /* IDSEL 0x15 */
-                                         a800 0 0 1 &ipic 14 8
-                                         a800 0 0 2 &ipic 15 8
-                                         a800 0 0 3 &ipic 16 8
-                                         a800 0 0 4 &ipic 17 8
-
-                                        /* IDSEL 0x16 */
-                                         b000 0 0 1 &ipic 17 8
-                                         b000 0 0 2 &ipic 14 8
-                                         b000 0 0 3 &ipic 15 8
-                                         b000 0 0 4 &ipic 16 8
-
-                                        /* IDSEL 0x17 */
-                                         b800 0 0 1 &ipic 16 8
-                                         b800 0 0 2 &ipic 17 8
-                                         b800 0 0 3 &ipic 14 8
-                                         b800 0 0 4 &ipic 15 8
-
-                                        /* IDSEL 0x18 */
-                                         c000 0 0 1 &ipic 15 8
-                                         c000 0 0 2 &ipic 16 8
-                                         c000 0 0 3 &ipic 17 8
-                                         c000 0 0 4 &ipic 14 8>;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <42 8>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 90000000 90000000 0 10000000
-                                  42000000 0 80000000 80000000 0 10000000
-                                  01000000 0 00000000 e2000000 0 00100000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8500 100>;
-                        compatible = "fsl,mpc8349-pci";
-                        device_type = "pci";
-                };
-
-                pci@8600 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-
-                                        /* IDSEL 0x11 */
-                                         8800 0 0 1 &ipic 14 8
-                                         8800 0 0 2 &ipic 15 8
-                                         8800 0 0 3 &ipic 16 8
-                                         8800 0 0 4 &ipic 17 8
-
-                                        /* IDSEL 0x12 */
-                                         9000 0 0 1 &ipic 16 8
-                                         9000 0 0 2 &ipic 17 8
-                                         9000 0 0 3 &ipic 14 8
-                                         9000 0 0 4 &ipic 15 8
-
-                                        /* IDSEL 0x13 */
-                                         9800 0 0 1 &ipic 17 8
-                                         9800 0 0 2 &ipic 14 8
-                                         9800 0 0 3 &ipic 15 8
-                                         9800 0 0 4 &ipic 16 8
-
-                                        /* IDSEL 0x15 */
-                                         a800 0 0 1 &ipic 14 8
-                                         a800 0 0 2 &ipic 15 8
-                                         a800 0 0 3 &ipic 16 8
-                                         a800 0 0 4 &ipic 17 8
-
-                                        /* IDSEL 0x16 */
-                                         b000 0 0 1 &ipic 17 8
-                                         b000 0 0 2 &ipic 14 8
-                                         b000 0 0 3 &ipic 15 8
-                                         b000 0 0 4 &ipic 16 8
-
-                                        /* IDSEL 0x17 */
-                                         b800 0 0 1 &ipic 16 8
-                                         b800 0 0 2 &ipic 17 8
-                                         b800 0 0 3 &ipic 14 8
-                                         b800 0 0 4 &ipic 15 8
-
-                                        /* IDSEL 0x18 */
-                                         c000 0 0 1 &ipic 15 8
-                                         c000 0 0 2 &ipic 16 8
-                                         c000 0 0 3 &ipic 17 8
-                                         c000 0 0 4 &ipic 14 8>;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <42 8>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 b0000000 b0000000 0 10000000
-                                  42000000 0 a0000000 a0000000 0 10000000
-                                  01000000 0 00000000 e2100000 0 00100000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8600 100>;
-                        compatible = "fsl,mpc8349-pci";
-                        device_type = "pci";
-                };
-
                 /* May need to remove if on a part without crypto engine */
                 crypto@30000 {
                         device_type = "crypto";
@@ -332,8 +212,127 @@
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <700 100>;
-                        built-in;
                         device_type = "ipic";
                 };
         };
+
+        pci@e0008500 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+
+                                /* IDSEL 0x11 */
+                                 8800 0 0 1 &ipic 14 8
+                                 8800 0 0 2 &ipic 15 8
+                                 8800 0 0 3 &ipic 16 8
+                                 8800 0 0 4 &ipic 17 8
+
+                                /* IDSEL 0x12 */
+                                 9000 0 0 1 &ipic 16 8
+                                 9000 0 0 2 &ipic 17 8
+                                 9000 0 0 3 &ipic 14 8
+                                 9000 0 0 4 &ipic 15 8
+
+                                /* IDSEL 0x13 */
+                                 9800 0 0 1 &ipic 17 8
+                                 9800 0 0 2 &ipic 14 8
+                                 9800 0 0 3 &ipic 15 8
+                                 9800 0 0 4 &ipic 16 8
+
+                                /* IDSEL 0x15 */
+                                 a800 0 0 1 &ipic 14 8
+                                 a800 0 0 2 &ipic 15 8
+                                 a800 0 0 3 &ipic 16 8
+                                 a800 0 0 4 &ipic 17 8
+
+                                /* IDSEL 0x16 */
+                                 b000 0 0 1 &ipic 17 8
+                                 b000 0 0 2 &ipic 14 8
+                                 b000 0 0 3 &ipic 15 8
+                                 b000 0 0 4 &ipic 16 8
+
+                                /* IDSEL 0x17 */
+                                 b800 0 0 1 &ipic 16 8
+                                 b800 0 0 2 &ipic 17 8
+                                 b800 0 0 3 &ipic 14 8
+                                 b800 0 0 4 &ipic 15 8
+
+                                /* IDSEL 0x18 */
+                                 c000 0 0 1 &ipic 15 8
+                                 c000 0 0 2 &ipic 16 8
+                                 c000 0 0 3 &ipic 17 8
+                                 c000 0 0 4 &ipic 14 8>;
+                interrupt-parent = < &ipic >;
+                interrupts = <42 8>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 90000000 90000000 0 10000000
+                          42000000 0 80000000 80000000 0 10000000
+                          01000000 0 00000000 e2000000 0 00100000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008500 100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
+
+        pci@e0008600 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+
+                                /* IDSEL 0x11 */
+                                 8800 0 0 1 &ipic 14 8
+                                 8800 0 0 2 &ipic 15 8
+                                 8800 0 0 3 &ipic 16 8
+                                 8800 0 0 4 &ipic 17 8
+
+                                /* IDSEL 0x12 */
+                                 9000 0 0 1 &ipic 16 8
+                                 9000 0 0 2 &ipic 17 8
+                                 9000 0 0 3 &ipic 14 8
+                                 9000 0 0 4 &ipic 15 8
+
+                                /* IDSEL 0x13 */
+                                 9800 0 0 1 &ipic 17 8
+                                 9800 0 0 2 &ipic 14 8
+                                 9800 0 0 3 &ipic 15 8
+                                 9800 0 0 4 &ipic 16 8
+
+                                /* IDSEL 0x15 */
+                                 a800 0 0 1 &ipic 14 8
+                                 a800 0 0 2 &ipic 15 8
+                                 a800 0 0 3 &ipic 16 8
+                                 a800 0 0 4 &ipic 17 8
+
+                                /* IDSEL 0x16 */
+                                 b000 0 0 1 &ipic 17 8
+                                 b000 0 0 2 &ipic 14 8
+                                 b000 0 0 3 &ipic 15 8
+                                 b000 0 0 4 &ipic 16 8
+
+                                /* IDSEL 0x17 */
+                                 b800 0 0 1 &ipic 16 8
+                                 b800 0 0 2 &ipic 17 8
+                                 b800 0 0 3 &ipic 14 8
+                                 b800 0 0 4 &ipic 15 8
+
+                                /* IDSEL 0x18 */
+                                 c000 0 0 1 &ipic 15 8
+                                 c000 0 0 2 &ipic 16 8
+                                 c000 0 0 3 &ipic 17 8
+                                 c000 0 0 4 &ipic 14 8>;
+                interrupt-parent = < &ipic >;
+                interrupts = <42 8>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 b0000000 b0000000 0 10000000
+                          42000000 0 a0000000 a0000000 0 10000000
+                          01000000 0 00000000 e2100000 0 00100000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008600 100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index e3f7c1282068..fbd1573c348b 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -34,7 +34,6 @@
                         timebase-frequency = <3EF1480>;
                         bus-frequency = <FBC5200>;
                         clock-frequency = <1F78A400>;
-                        32-bit;
                 };
         };
 
@@ -51,7 +50,6 @@
         soc8360@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 e0000000 00100000>;
                 reg = <e0000000 00000200>;
@@ -113,72 +111,11 @@
                         descriptor-types-mask = <01010ebf>;
                 };
 
-                pci@8500 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-
-                                        /* IDSEL 0x11 AD17 */
-                                         8800 0 0 1 &ipic 14 8
-                                         8800 0 0 2 &ipic 15 8
-                                         8800 0 0 3 &ipic 16 8
-                                         8800 0 0 4 &ipic 17 8
-
-                                        /* IDSEL 0x12 AD18 */
-                                         9000 0 0 1 &ipic 16 8
-                                         9000 0 0 2 &ipic 17 8
-                                         9000 0 0 3 &ipic 14 8
-                                         9000 0 0 4 &ipic 15 8
-
-                                        /* IDSEL 0x13 AD19 */
-                                         9800 0 0 1 &ipic 17 8
-                                         9800 0 0 2 &ipic 14 8
-                                         9800 0 0 3 &ipic 15 8
-                                         9800 0 0 4 &ipic 16 8
-
-                                        /* IDSEL 0x15 AD21*/
-                                         a800 0 0 1 &ipic 14 8
-                                         a800 0 0 2 &ipic 15 8
-                                         a800 0 0 3 &ipic 16 8
-                                         a800 0 0 4 &ipic 17 8
-
-                                        /* IDSEL 0x16 AD22*/
-                                         b000 0 0 1 &ipic 17 8
-                                         b000 0 0 2 &ipic 14 8
-                                         b000 0 0 3 &ipic 15 8
-                                         b000 0 0 4 &ipic 16 8
-
-                                        /* IDSEL 0x17 AD23*/
-                                         b800 0 0 1 &ipic 16 8
-                                         b800 0 0 2 &ipic 17 8
-                                         b800 0 0 3 &ipic 14 8
-                                         b800 0 0 4 &ipic 15 8
-
-                                        /* IDSEL 0x18 AD24*/
-                                         c000 0 0 1 &ipic 15 8
-                                         c000 0 0 2 &ipic 16 8
-                                         c000 0 0 3 &ipic 17 8
-                                         c000 0 0 4 &ipic 14 8>;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <42 8>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 a0000000 a0000000 0 10000000
-                                  42000000 0 80000000 80000000 0 10000000
-                                  01000000 0 00000000 e2000000 0 00100000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8500 100>;
-                        compatible = "fsl,mpc8349-pci";
-                        device_type = "pci";
-                };
-
                 ipic: pic@700 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <700 100>;
-                        built-in;
                         device_type = "ipic";
                 };
 
@@ -364,11 +301,69 @@
                         #address-cells = <0>;
                         #interrupt-cells = <1>;
                         reg = <80 80>;
-                        built-in;
                         big-endian;
                         interrupts = <20 8 21 8>; //high:32 low:33
                         interrupt-parent = < &ipic >;
                 };
+        };
 
+        pci@e0008500 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+
+                                /* IDSEL 0x11 AD17 */
+                                 8800 0 0 1 &ipic 14 8
+                                 8800 0 0 2 &ipic 15 8
+                                 8800 0 0 3 &ipic 16 8
+                                 8800 0 0 4 &ipic 17 8
+
+                                /* IDSEL 0x12 AD18 */
+                                 9000 0 0 1 &ipic 16 8
+                                 9000 0 0 2 &ipic 17 8
+                                 9000 0 0 3 &ipic 14 8
+                                 9000 0 0 4 &ipic 15 8
+
+                                /* IDSEL 0x13 AD19 */
+                                 9800 0 0 1 &ipic 17 8
+                                 9800 0 0 2 &ipic 14 8
+                                 9800 0 0 3 &ipic 15 8
+                                 9800 0 0 4 &ipic 16 8
+
+                                /* IDSEL 0x15 AD21*/
+                                 a800 0 0 1 &ipic 14 8
+                                 a800 0 0 2 &ipic 15 8
+                                 a800 0 0 3 &ipic 16 8
+                                 a800 0 0 4 &ipic 17 8
+
+                                /* IDSEL 0x16 AD22*/
+                                 b000 0 0 1 &ipic 17 8
+                                 b000 0 0 2 &ipic 14 8
+                                 b000 0 0 3 &ipic 15 8
+                                 b000 0 0 4 &ipic 16 8
+
+                                /* IDSEL 0x17 AD23*/
+                                 b800 0 0 1 &ipic 16 8
+                                 b800 0 0 2 &ipic 17 8
+                                 b800 0 0 3 &ipic 14 8
+                                 b800 0 0 4 &ipic 15 8
+
+                                /* IDSEL 0x18 AD24*/
+                                 c000 0 0 1 &ipic 15 8
+                                 c000 0 0 2 &ipic 16 8
+                                 c000 0 0 3 &ipic 17 8
+                                 c000 0 0 4 &ipic 14 8>;
+                interrupt-parent = < &ipic >;
+                interrupts = <42 8>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 a0000000 a0000000 0 10000000
+                          42000000 0 80000000 80000000 0 10000000
+                          01000000 0 00000000 e2000000 0 00100000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008500 100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
         };
 };
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index fc8dff9f6201..6442a717ec3b 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -30,7 +30,6 @@
                         timebase-frequency = <0>;       //  33 MHz, from uboot
                         bus-frequency = <0>;    // 166 MHz
                         clock-frequency = <0>;  // 825 MHz, from uboot
-                        32-bit;
                 };
         };
 
@@ -42,7 +41,6 @@
         soc8540@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 e0000000 00100000>;
                 reg = <e0000000 00100000>;      // CCSRBAR 1M
@@ -173,105 +171,104 @@
                         interrupts = <2a 2>;
                         interrupt-parent = <&mpic>;
                 };
-                pci@8000 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
+                mpic: pic@40000 {
+                        clock-frequency = <0>;
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <40000 40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                        big-endian;
+                };
+        };
 
-                                /* IDSEL 0x02 */
-                                1000 0 0 1 &mpic 1 1
-                                1000 0 0 2 &mpic 2 1
-                                1000 0 0 3 &mpic 3 1
-                                1000 0 0 4 &mpic 4 1
+        pci@e0008000 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
 
-                                /* IDSEL 0x03 */
-                                1800 0 0 1 &mpic 4 1
-                                1800 0 0 2 &mpic 1 1
-                                1800 0 0 3 &mpic 2 1
-                                1800 0 0 4 &mpic 3 1
+                        /* IDSEL 0x02 */
+                        1000 0 0 1 &mpic 1 1
+                        1000 0 0 2 &mpic 2 1
+                        1000 0 0 3 &mpic 3 1
+                        1000 0 0 4 &mpic 4 1
 
-                                /* IDSEL 0x04 */
-                                2000 0 0 1 &mpic 3 1
-                                2000 0 0 2 &mpic 4 1
-                                2000 0 0 3 &mpic 1 1
-                                2000 0 0 4 &mpic 2 1
+                        /* IDSEL 0x03 */
+                        1800 0 0 1 &mpic 4 1
+                        1800 0 0 2 &mpic 1 1
+                        1800 0 0 3 &mpic 2 1
+                        1800 0 0 4 &mpic 3 1
 
-                                /* IDSEL 0x05 */
-                                2800 0 0 1 &mpic 2 1
-                                2800 0 0 2 &mpic 3 1
-                                2800 0 0 3 &mpic 4 1
-                                2800 0 0 4 &mpic 1 1
+                        /* IDSEL 0x04 */
+                        2000 0 0 1 &mpic 3 1
+                        2000 0 0 2 &mpic 4 1
+                        2000 0 0 3 &mpic 1 1
+                        2000 0 0 4 &mpic 2 1
 
-                                /* IDSEL 0x0c */
-                                6000 0 0 1 &mpic 1 1
-                                6000 0 0 2 &mpic 2 1
-                                6000 0 0 3 &mpic 3 1
-                                6000 0 0 4 &mpic 4 1
+                        /* IDSEL 0x05 */
+                        2800 0 0 1 &mpic 2 1
+                        2800 0 0 2 &mpic 3 1
+                        2800 0 0 3 &mpic 4 1
+                        2800 0 0 4 &mpic 1 1
 
-                                /* IDSEL 0x0d */
-                                6800 0 0 1 &mpic 4 1
-                                6800 0 0 2 &mpic 1 1
-                                6800 0 0 3 &mpic 2 1
-                                6800 0 0 4 &mpic 3 1
+                        /* IDSEL 0x0c */
+                        6000 0 0 1 &mpic 1 1
+                        6000 0 0 2 &mpic 2 1
+                        6000 0 0 3 &mpic 3 1
+                        6000 0 0 4 &mpic 4 1
 
-                                /* IDSEL 0x0e */
-                                7000 0 0 1 &mpic 3 1
-                                7000 0 0 2 &mpic 4 1
-                                7000 0 0 3 &mpic 1 1
-                                7000 0 0 4 &mpic 2 1
+                        /* IDSEL 0x0d */
+                        6800 0 0 1 &mpic 4 1
+                        6800 0 0 2 &mpic 1 1
+                        6800 0 0 3 &mpic 2 1
+                        6800 0 0 4 &mpic 3 1
 
-                                /* IDSEL 0x0f */
-                                7800 0 0 1 &mpic 2 1
-                                7800 0 0 2 &mpic 3 1
-                                7800 0 0 3 &mpic 4 1
-                                7800 0 0 4 &mpic 1 1
+                        /* IDSEL 0x0e */
+                        7000 0 0 1 &mpic 3 1
+                        7000 0 0 2 &mpic 4 1
+                        7000 0 0 3 &mpic 1 1
+                        7000 0 0 4 &mpic 2 1
 
-                                /* IDSEL 0x12 */
-                                9000 0 0 1 &mpic 1 1
-                                9000 0 0 2 &mpic 2 1
-                                9000 0 0 3 &mpic 3 1
-                                9000 0 0 4 &mpic 4 1
+                        /* IDSEL 0x0f */
+                        7800 0 0 1 &mpic 2 1
+                        7800 0 0 2 &mpic 3 1
+                        7800 0 0 3 &mpic 4 1
+                        7800 0 0 4 &mpic 1 1
 
-                                /* IDSEL 0x13 */
-                                9800 0 0 1 &mpic 4 1
-                                9800 0 0 2 &mpic 1 1
-                                9800 0 0 3 &mpic 2 1
-                                9800 0 0 4 &mpic 3 1
+                        /* IDSEL 0x12 */
+                        9000 0 0 1 &mpic 1 1
+                        9000 0 0 2 &mpic 2 1
+                        9000 0 0 3 &mpic 3 1
+                        9000 0 0 4 &mpic 4 1
 
-                                /* IDSEL 0x14 */
-                                a000 0 0 1 &mpic 3 1
-                                a000 0 0 2 &mpic 4 1
-                                a000 0 0 3 &mpic 1 1
-                                a000 0 0 4 &mpic 2 1
+                        /* IDSEL 0x13 */
+                        9800 0 0 1 &mpic 4 1
+                        9800 0 0 2 &mpic 1 1
+                        9800 0 0 3 &mpic 2 1
+                        9800 0 0 4 &mpic 3 1
 
-                                /* IDSEL 0x15 */
-                                a800 0 0 1 &mpic 2 1
-                                a800 0 0 2 &mpic 3 1
-                                a800 0 0 3 &mpic 4 1
-                                a800 0 0 4 &mpic 1 1>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <18 2>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 80000000 80000000 0 20000000
-                                  01000000 0 00000000 e2000000 0 00100000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8000 1000>;
-                        compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
-                        device_type = "pci";
-                };
+                        /* IDSEL 0x14 */
+                        a000 0 0 1 &mpic 3 1
+                        a000 0 0 2 &mpic 4 1
+                        a000 0 0 3 &mpic 1 1
+                        a000 0 0 4 &mpic 2 1
 
-                mpic: pic@40000 {
-                        clock-frequency = <0>;
-                        interrupt-controller;
-                        #address-cells = <0>;
-                        #interrupt-cells = <2>;
-                        reg = <40000 40000>;
-                        built-in;
-                        compatible = "chrp,open-pic";
-                        device_type = "open-pic";
-                        big-endian;
-                };
+                        /* IDSEL 0x15 */
+                        a800 0 0 1 &mpic 2 1
+                        a800 0 0 2 &mpic 3 1
+                        a800 0 0 3 &mpic 4 1
+                        a800 0 0 4 &mpic 1 1>;
+                interrupt-parent = <&mpic>;
+                interrupts = <18 2>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 80000000 80000000 0 20000000
+                          01000000 0 00000000 e2000000 0 00100000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008000 1000>;
+                compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+                device_type = "pci";
         };
 };
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts
index fb0b647f8c2a..f3f4d79deb63 100644
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -30,7 +30,6 @@
                         timebase-frequency = <0>;       //  33 MHz, from uboot
                         bus-frequency = <0>;    // 166 MHz
                         clock-frequency = <0>;  // 825 MHz, from uboot
-                        32-bit;
                 };
         };
 
@@ -42,10 +41,9 @@
         soc8541@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 e0000000 00100000>;
-                reg = <e0000000 00100000>;      // CCSRBAR 1M
+                reg = <e0000000 00001000>;      // CCSRBAR 1M
                 bus-frequency = <0>;
 
                 memory-controller@2000 {
@@ -137,113 +135,145 @@
                         interrupt-parent = <&mpic>;
                 };
 
-                pci1: pci@8000 {
-                        interrupt-map-mask = <1f800 0 0 7>;
-                        interrupt-map = <
-
-                                /* IDSEL 0x10 */
-                                08000 0 0 1 &mpic 0 1
-                                08000 0 0 2 &mpic 1 1
-                                08000 0 0 3 &mpic 2 1
-                                08000 0 0 4 &mpic 3 1
-
-                                /* IDSEL 0x11 */
-                                08800 0 0 1 &mpic 0 1
-                                08800 0 0 2 &mpic 1 1
-                                08800 0 0 3 &mpic 2 1
-                                08800 0 0 4 &mpic 3 1
-
-                                /* IDSEL 0x12 (Slot 1) */
-                                09000 0 0 1 &mpic 0 1
-                                09000 0 0 2 &mpic 1 1
-                                09000 0 0 3 &mpic 2 1
-                                09000 0 0 4 &mpic 3 1
-
-                                /* IDSEL 0x13 (Slot 2) */
-                                09800 0 0 1 &mpic 1 1
-                                09800 0 0 2 &mpic 2 1
-                                09800 0 0 3 &mpic 3 1
-                                09800 0 0 4 &mpic 0 1
-
-                                /* IDSEL 0x14 (Slot 3) */
-                                0a000 0 0 1 &mpic 2 1
-                                0a000 0 0 2 &mpic 3 1
-                                0a000 0 0 3 &mpic 0 1
-                                0a000 0 0 4 &mpic 1 1
-
-                                /* IDSEL 0x15 (Slot 4) */
-                                0a800 0 0 1 &mpic 3 1
-                                0a800 0 0 2 &mpic 0 1
-                                0a800 0 0 3 &mpic 1 1
-                                0a800 0 0 4 &mpic 2 1
-
-                                /* Bus 1 (Tundra Bridge) */
-                                /* IDSEL 0x12 (ISA bridge) */
-                                19000 0 0 1 &mpic 0 1
-                                19000 0 0 2 &mpic 1 1
-                                19000 0 0 3 &mpic 2 1
-                                19000 0 0 4 &mpic 3 1>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <18 2>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 80000000 80000000 0 20000000
-                                  01000000 0 00000000 e2000000 0 00100000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8000 1000>;
-                        compatible = "fsl,mpc8540-pci";
-                        device_type = "pci";
-
-                        i8259@19000 {
-                                clock-frequency = <0>;
+                mpic: pic@40000 {
+                        clock-frequency = <0>;
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <40000 40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                        big-endian;
+                };
+
+                cpm@919c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8541-cpm", "fsl,cpm2";
+                        reg = <919c0 30>;
+                        ranges;
+
+                        muram@80000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 80000 10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 2000 9000 1000>;
+                                };
+                        };
+
+                        brg@919f0 {
+                                compatible = "fsl,mpc8541-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <919f0 10 915f0 10>;
+                        };
+
+                        cpmpic: pic@90c00 {
                                 interrupt-controller;
-                                device_type = "interrupt-controller";
-                                reg = <19000 0 0 0 1>;
                                 #address-cells = <0>;
                                 #interrupt-cells = <2>;
-                                built-in;
-                                compatible = "chrp,iic";
-                                big-endian;
-                                interrupts = <1>;
-                                interrupt-parent = <&pci1>;
+                                interrupts = <2e 2>;
+                                interrupt-parent = <&mpic>;
+                                reg = <90c00 80>;
+                                compatible = "fsl,mpc8541-cpm-pic", "fsl,cpm2-pic";
                         };
                 };
+        };
 
-                pci@9000 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
+        pci1: pci@e0008000 {
+                interrupt-map-mask = <1f800 0 0 7>;
+                interrupt-map = <
 
-                                /* IDSEL 0x15 */
-                                a800 0 0 1 &mpic b 1
-                                a800 0 0 2 &mpic b 1
-                                a800 0 0 3 &mpic b 1
-                                a800 0 0 4 &mpic b 1>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <19 2>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 a0000000 a0000000 0 20000000
-                                  01000000 0 00000000 e3000000 0 00100000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <9000 1000>;
-                        compatible = "fsl,mpc8540-pci";
-                        device_type = "pci";
-                };
+                        /* IDSEL 0x10 */
+                        08000 0 0 1 &mpic 0 1
+                        08000 0 0 2 &mpic 1 1
+                        08000 0 0 3 &mpic 2 1
+                        08000 0 0 4 &mpic 3 1
 
-                mpic: pic@40000 {
-                        clock-frequency = <0>;
+                        /* IDSEL 0x11 */
+                        08800 0 0 1 &mpic 0 1
+                        08800 0 0 2 &mpic 1 1
+                        08800 0 0 3 &mpic 2 1
+                        08800 0 0 4 &mpic 3 1
+
+                        /* IDSEL 0x12 (Slot 1) */
+                        09000 0 0 1 &mpic 0 1
+                        09000 0 0 2 &mpic 1 1
+                        09000 0 0 3 &mpic 2 1
+                        09000 0 0 4 &mpic 3 1
+
+                        /* IDSEL 0x13 (Slot 2) */
+                        09800 0 0 1 &mpic 1 1
+                        09800 0 0 2 &mpic 2 1
+                        09800 0 0 3 &mpic 3 1
+                        09800 0 0 4 &mpic 0 1
+
+                        /* IDSEL 0x14 (Slot 3) */
+                        0a000 0 0 1 &mpic 2 1
+                        0a000 0 0 2 &mpic 3 1
+                        0a000 0 0 3 &mpic 0 1
+                        0a000 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x15 (Slot 4) */
+                        0a800 0 0 1 &mpic 3 1
+                        0a800 0 0 2 &mpic 0 1
+                        0a800 0 0 3 &mpic 1 1
+                        0a800 0 0 4 &mpic 2 1
+
+                        /* Bus 1 (Tundra Bridge) */
+                        /* IDSEL 0x12 (ISA bridge) */
+                        19000 0 0 1 &mpic 0 1
+                        19000 0 0 2 &mpic 1 1
+                        19000 0 0 3 &mpic 2 1
+                        19000 0 0 4 &mpic 3 1>;
+                interrupt-parent = <&mpic>;
+                interrupts = <18 2>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 80000000 80000000 0 20000000
+                          01000000 0 00000000 e2000000 0 00100000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008000 1000>;
+                compatible = "fsl,mpc8540-pci";
+                device_type = "pci";
+
+                i8259@19000 {
                         interrupt-controller;
+                        device_type = "interrupt-controller";
+                        reg = <19000 0 0 0 1>;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
-                        reg = <40000 40000>;
-                        built-in;
-                        compatible = "chrp,open-pic";
-                        device_type = "open-pic";
-                        big-endian;
+                        compatible = "chrp,iic";
+                        interrupts = <1>;
+                        interrupt-parent = <&pci1>;
                 };
         };
+
+        pci@e0009000 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+
+                        /* IDSEL 0x15 */
+                        a800 0 0 1 &mpic b 1
+                        a800 0 0 2 &mpic b 1
+                        a800 0 0 3 &mpic b 1
+                        a800 0 0 4 &mpic b 1>;
+                interrupt-parent = <&mpic>;
+                interrupts = <19 2>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 a0000000 a0000000 0 20000000
+                          01000000 0 00000000 e3000000 0 00100000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0009000 1000>;
+                compatible = "fsl,mpc8540-pci";
+                device_type = "pci";
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts
index 3e79bf0a3159..3f9d15cf13e0 100644
--- a/arch/powerpc/boot/dts/mpc8544ds.dts
+++ b/arch/powerpc/boot/dts/mpc8544ds.dts
@@ -30,7 +30,6 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
-                        32-bit;
                 };
         };
 
@@ -42,19 +41,9 @@
         soc8544@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
 
-
-                ranges = <00001000 e0001000 000ff000
-                          80000000 80000000 20000000
-                          a0000000 a0000000 10000000
-                          b0000000 b0000000 00100000
-                          c0000000 c0000000 20000000
-                          b0100000 b0100000 00100000
-                          e1000000 e1000000 00010000
-                          e1010000 e1010000 00010000
-                          e1020000 e1020000 00010000>;
+                ranges = <00000000 e0000000 00100000>;
                 reg = <e0000000 00001000>;      // CCSRBAR 1M
                 bus-frequency = <0>;            // Filled out by uboot.
 
@@ -149,115 +138,173 @@
                         interrupt-parent = <&mpic>;
                 };
 
-                pci@8000 {
-                        compatible = "fsl,mpc8540-pci";
-                        device_type = "pci";
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-
-                                /* IDSEL 0x11 J17 Slot 1 */
-                                8800 0 0 1 &mpic 2 1
-                                8800 0 0 2 &mpic 3 1
-                                8800 0 0 3 &mpic 4 1
-                                8800 0 0 4 &mpic 1 1
+                global-utilities@e0000 {        //global utilities block
+                        compatible = "fsl,mpc8548-guts";
+                        reg = <e0000 1000>;
+                        fsl,has-rstcr;
+                };
 
-                                /* IDSEL 0x12 J16 Slot 2 */
+                mpic: pic@40000 {
+                        clock-frequency = <0>;
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <40000 40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                        big-endian;
+                };
+        };
 
-                                9000 0 0 1 &mpic 3 1
-                                9000 0 0 2 &mpic 4 1
-                                9000 0 0 3 &mpic 2 1
-                                9000 0 0 4 &mpic 1 1>;
+        pci@e0008000 {
+                compatible = "fsl,mpc8540-pci";
+                device_type = "pci";
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+
+                        /* IDSEL 0x11 J17 Slot 1 */
+                        8800 0 0 1 &mpic 2 1
+                        8800 0 0 2 &mpic 3 1
+                        8800 0 0 3 &mpic 4 1
+                        8800 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x12 J16 Slot 2 */
+
+                        9000 0 0 1 &mpic 3 1
+                        9000 0 0 2 &mpic 4 1
+                        9000 0 0 3 &mpic 2 1
+                        9000 0 0 4 &mpic 1 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <18 2>;
+                bus-range = <0 ff>;
+                ranges = <02000000 0 c0000000 c0000000 0 20000000
+                          01000000 0 00000000 e1000000 0 00010000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008000 1000>;
+        };
 
-                        interrupt-parent = <&mpic>;
-                        interrupts = <18 2>;
-                        bus-range = <0 ff>;
-                        ranges = <02000000 0 c0000000 c0000000 0 20000000
-                                  01000000 0 00000000 e1000000 0 00010000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
+        pcie@e0009000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0009000 1000>;
+                bus-range = <0 ff>;
+                ranges = <02000000 0 80000000 80000000 0 20000000
+                          01000000 0 00000000 e1010000 0 00010000>;
+                clock-frequency = <1fca055>;
+                interrupt-parent = <&mpic>;
+                interrupts = <1a 2>;
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0 0 1 &mpic 4 1
+                        0000 0 0 2 &mpic 5 1
+                        0000 0 0 3 &mpic 6 1
+                        0000 0 0 4 &mpic 7 1
+                        >;
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
                         #size-cells = <2>;
                         #address-cells = <3>;
-                        reg = <8000 1000>;
-                };
-
-                pcie@9000 {
-                        compatible = "fsl,mpc8548-pcie";
                         device_type = "pci";
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <9000 1000>;
-                        bus-range = <0 ff>;
-                        ranges = <02000000 0 80000000 80000000 0 20000000
-                                  01000000 0 00000000 e1010000 0 00010000>;
-                        clock-frequency = <1fca055>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <1a 2>;
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-                                /* IDSEL 0x0 */
-                                0000 0 0 1 &mpic 4 1
-                                0000 0 0 2 &mpic 5 1
-                                0000 0 0 3 &mpic 6 1
-                                0000 0 0 4 &mpic 7 1
-                                >;
+                        ranges = <02000000 0 80000000
+                                  02000000 0 80000000
+                                  0 20000000
+
+                                  01000000 0 00000000
+                                  01000000 0 00000000
+                                  0 00010000>;
                 };
+        };
 
-                pcie@a000 {
-                        compatible = "fsl,mpc8548-pcie";
-                        device_type = "pci";
-                        #interrupt-cells = <1>;
+        pcie@e000a000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e000a000 1000>;
+                bus-range = <0 ff>;
+                ranges = <02000000 0 a0000000 a0000000 0 10000000
+                          01000000 0 00000000 e1020000 0 00010000>;
+                clock-frequency = <1fca055>;
+                interrupt-parent = <&mpic>;
+                interrupts = <19 2>;
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0 0 1 &mpic 0 1
+                        0000 0 0 2 &mpic 1 1
+                        0000 0 0 3 &mpic 2 1
+                        0000 0 0 4 &mpic 3 1
+                        >;
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
                         #size-cells = <2>;
                         #address-cells = <3>;
-                        reg = <a000 1000>;
-                        bus-range = <0 ff>;
-                        ranges = <02000000 0 a0000000 a0000000 0 10000000
-                                  01000000 0 00000000 e1020000 0 00010000>;
-                        clock-frequency = <1fca055>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <19 2>;
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-                                /* IDSEL 0x0 */
-                                0000 0 0 1 &mpic 0 1
-                                0000 0 0 2 &mpic 1 1
-                                0000 0 0 3 &mpic 2 1
-                                0000 0 0 4 &mpic 3 1
-                                >;
+                        device_type = "pci";
+                        ranges = <02000000 0 a0000000
+                                  02000000 0 a0000000
+                                  0 10000000
+
+                                  01000000 0 00000000
+                                  01000000 0 00000000
+                                  0 00010000>;
                 };
+        };
 
-                pcie@b000 {
-                        compatible = "fsl,mpc8548-pcie";
-                        device_type = "pci";
-                        #interrupt-cells = <1>;
+        pcie@e000b000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e000b000 1000>;
+                bus-range = <0 ff>;
+                ranges = <02000000 0 b0000000 b0000000 0 00100000
+                          01000000 0 00000000 b0100000 0 00100000>;
+                clock-frequency = <1fca055>;
+                interrupt-parent = <&mpic>;
+                interrupts = <1b 2>;
+                interrupt-map-mask = <fb00 0 0 0>;
+                interrupt-map = <
+                        // IDSEL 0x1c  USB
+                        e000 0 0 0 &i8259 c 2
+                        e100 0 0 0 &i8259 9 2
+                        e200 0 0 0 &i8259 a 2
+                        e300 0 0 0 &i8259 b 2
+
+                        // IDSEL 0x1d  Audio
+                        e800 0 0 0 &i8259 6 2
+
+                        // IDSEL 0x1e Legacy
+                        f000 0 0 0 &i8259 7 2
+                        f100 0 0 0 &i8259 7 2
+
+                        // IDSEL 0x1f IDE/SATA
+                        f800 0 0 0 &i8259 e 2
+                        f900 0 0 0 &i8259 5 2
+                >;
+
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
                         #size-cells = <2>;
                         #address-cells = <3>;
-                        reg = <b000 1000>;
-                        bus-range = <0 ff>;
-                        ranges = <02000000 0 b0000000 b0000000 0 00100000
-                                  01000000 0 00000000 b0100000 0 00100000>;
-                        clock-frequency = <1fca055>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <1b 2>;
-                        interrupt-map-mask = <fb00 0 0 0>;
-                        interrupt-map = <
-                                // IDSEL 0x1c  USB
-                                e000 0 0 0 &i8259 c 2
-                                e100 0 0 0 &i8259 9 2
-                                e200 0 0 0 &i8259 a 2
-                                e300 0 0 0 &i8259 b 2
-
-                                // IDSEL 0x1d  Audio
-                                e800 0 0 0 &i8259 6 2
-
-                                // IDSEL 0x1e Legacy
-                                f000 0 0 0 &i8259 7 2
-                                f100 0 0 0 &i8259 7 2
-
-                                // IDSEL 0x1f IDE/SATA
-                                f800 0 0 0 &i8259 e 2
-                                f900 0 0 0 &i8259 5 2
-                        >;
+                        device_type = "pci";
+                        ranges = <02000000 0 b0000000
+                                  02000000 0 b0000000
+                                  0 00100000
+
+                                  01000000 0 00000000
+                                  01000000 0 00000000
+                                  0 00100000>;
+
                         uli1575@0 {
                                 reg = <0 0 0 0 0>;
                                 #size-cells = <2>;
@@ -265,95 +312,63 @@
                                 ranges = <02000000 0 b0000000
                                           02000000 0 b0000000
                                           0 00100000
+
                                           01000000 0 00000000
                                           01000000 0 00000000
                                           0 00100000>;
-
-                                pci_bridge@0 {
-                                        reg = <0 0 0 0 0>;
-                                        #size-cells = <2>;
-                                        #address-cells = <3>;
-                                        ranges = <02000000 0 b0000000
-                                                  02000000 0 b0000000
-                                                  0 00100000
-                                                  01000000 0 00000000
-                                                  01000000 0 00000000
-                                                  0 00100000>; 
-
-                                        isa@1e {
-                                                device_type = "isa";
+                                isa@1e {
+                                        device_type = "isa";
+                                        #interrupt-cells = <2>;
+                                        #size-cells = <1>;
+                                        #address-cells = <2>;
+                                        reg = <f000 0 0 0 0>;
+                                        ranges = <1 0
+                                                  01000000 0 0
+                                                  00001000>;
+                                        interrupt-parent = <&i8259>;
+
+                                        i8259: interrupt-controller@20 {
+                                                reg = <1 20 2
+                                                       1 a0 2
+                                                       1 4d0 2>;
+                                                interrupt-controller;
+                                                device_type = "interrupt-controller";
+                                                #address-cells = <0>;
                                                 #interrupt-cells = <2>;
-                                                #size-cells = <1>;
-                                                #address-cells = <2>;
-                                                reg = <f000 0 0 0 0>;
-                                                ranges = <1 0
-                                                          01000000 0 0
-                                                          00001000>;
+                                                compatible = "chrp,iic";
+                                                interrupts = <9 2>;
+                                                interrupt-parent = <&mpic>;
+                                        };
+
+                                        i8042@60 {
+                                                #size-cells = <0>;
+                                                #address-cells = <1>;
+                                                reg = <1 60 1 1 64 1>;
+                                                interrupts = <1 3 c 3>;
                                                 interrupt-parent = <&i8259>;
 
-                                                i8259: interrupt-controller@20 {
-                                                        reg = <1 20 2
-                                                               1 a0 2
-                                                               1 4d0 2>;
-                                                        clock-frequency = <0>;
-                                                        interrupt-controller;
-                                                        device_type = "interrupt-controller";
-                                                        #address-cells = <0>;
-                                                        #interrupt-cells = <2>;
-                                                        built-in;
-                                                        compatible = "chrp,iic";
-                                                        interrupts = <9 2>;
-                                                        interrupt-parent = <&mpic>;
+                                                keyboard@0 {
+                                                        reg = <0>;
+                                                        compatible = "pnpPNP,303";
                                                 };
 
-                                                i8042@60 {
-                                                        #size-cells = <0>;
-                                                        #address-cells = <1>;
-                                                        reg = <1 60 1 1 64 1>;
-                                                        interrupts = <1 3 c 3>;
-                                                        interrupt-parent = <&i8259>;
-
-                                                        keyboard@0 {
-                                                                reg = <0>;
-                                                                compatible = "pnpPNP,303";
-                                                        };
-
-                                                        mouse@1 {
-                                                                reg = <1>;
-                                                                compatible = "pnpPNP,f03";
-                                                        };
+                                                mouse@1 {
+                                                        reg = <1>;
+                                                        compatible = "pnpPNP,f03";
                                                 };
+                                        };
 
-                                                rtc@70 {
-                                                        compatible = "pnpPNP,b00";
-                                                        reg = <1 70 2>;
-                                                };
+                                        rtc@70 {
+                                                compatible = "pnpPNP,b00";
+                                                reg = <1 70 2>;
+                                        };
 
-                                                gpio@400 {
-                                                        reg = <1 400 80>;
-                                                };
+                                        gpio@400 {
+                                                reg = <1 400 80>;
                                         };
                                 };
                         };
-
                 };
 
-                global-utilities@e0000 {        //global utilities block
-                        compatible = "fsl,mpc8548-guts";
-                        reg = <e0000 1000>;
-                        fsl,has-rstcr;
-                };
-
-                mpic: pic@40000 {
-                        clock-frequency = <0>;
-                        interrupt-controller;
-                        #address-cells = <0>;
-                        #interrupt-cells = <2>;
-                        reg = <40000 40000>;
-                        built-in;
-                        compatible = "chrp,open-pic";
-                        device_type = "open-pic";
-                        big-endian;
-                };
         };
 };
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts
index d215d21fff42..69ca5025d972 100644
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -30,7 +30,6 @@
                         timebase-frequency = <0>;       //  33 MHz, from uboot
                         bus-frequency = <0>;    // 166 MHz
                         clock-frequency = <0>;  // 825 MHz, from uboot
-                        32-bit;
                 };
         };
 
@@ -42,15 +41,8 @@
         soc8548@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
-                ranges = <00001000 e0001000 000ff000
-                          80000000 80000000 10000000
-                          e2000000 e2000000 00800000
-                          90000000 90000000 10000000
-                          e2800000 e2800000 00800000
-                          a0000000 a0000000 20000000
-                          e3000000 e3000000 01000000>;
+                ranges = <00000000 e0000000 00100000>;
                 reg = <e0000000 00001000>;      // CCSRBAR
                 bus-frequency = <0>;
 
@@ -189,215 +181,225 @@
                         fsl,has-rstcr;
                 };
 
-                pci@8000 {
+                mpic: pic@40000 {
+                        clock-frequency = <0>;
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <40000 40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                        big-endian;
+                };
+        };
+
+        pci@e0008000 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x4 (PCIX Slot 2) */
+                        02000 0 0 1 &mpic 0 1
+                        02000 0 0 2 &mpic 1 1
+                        02000 0 0 3 &mpic 2 1
+                        02000 0 0 4 &mpic 3 1
+
+                        /* IDSEL 0x5 (PCIX Slot 3) */
+                        02800 0 0 1 &mpic 1 1
+                        02800 0 0 2 &mpic 2 1
+                        02800 0 0 3 &mpic 3 1
+                        02800 0 0 4 &mpic 0 1
+
+                        /* IDSEL 0x6 (PCIX Slot 4) */
+                        03000 0 0 1 &mpic 2 1
+                        03000 0 0 2 &mpic 3 1
+                        03000 0 0 3 &mpic 0 1
+                        03000 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x8 (PCIX Slot 5) */
+                        04000 0 0 1 &mpic 0 1
+                        04000 0 0 2 &mpic 1 1
+                        04000 0 0 3 &mpic 2 1
+                        04000 0 0 4 &mpic 3 1
+
+                        /* IDSEL 0xC (Tsi310 bridge) */
+                        06000 0 0 1 &mpic 0 1
+                        06000 0 0 2 &mpic 1 1
+                        06000 0 0 3 &mpic 2 1
+                        06000 0 0 4 &mpic 3 1
+
+                        /* IDSEL 0x14 (Slot 2) */
+                        0a000 0 0 1 &mpic 0 1
+                        0a000 0 0 2 &mpic 1 1
+                        0a000 0 0 3 &mpic 2 1
+                        0a000 0 0 4 &mpic 3 1
+
+                        /* IDSEL 0x15 (Slot 3) */
+                        0a800 0 0 1 &mpic 1 1
+                        0a800 0 0 2 &mpic 2 1
+                        0a800 0 0 3 &mpic 3 1
+                        0a800 0 0 4 &mpic 0 1
+
+                        /* IDSEL 0x16 (Slot 4) */
+                        0b000 0 0 1 &mpic 2 1
+                        0b000 0 0 2 &mpic 3 1
+                        0b000 0 0 3 &mpic 0 1
+                        0b000 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x18 (Slot 5) */
+                        0c000 0 0 1 &mpic 0 1
+                        0c000 0 0 2 &mpic 1 1
+                        0c000 0 0 3 &mpic 2 1
+                        0c000 0 0 4 &mpic 3 1
+
+                        /* IDSEL 0x1C (Tsi310 bridge PCI primary) */
+                        0E000 0 0 1 &mpic 0 1
+                        0E000 0 0 2 &mpic 1 1
+                        0E000 0 0 3 &mpic 2 1
+                        0E000 0 0 4 &mpic 3 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <18 2>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 80000000 80000000 0 10000000
+                          01000000 0 00000000 e2000000 0 00800000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008000 1000>;
+                compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+                device_type = "pci";
+
+                pci_bridge@1c {
                         interrupt-map-mask = <f800 0 0 7>;
                         interrupt-map = <
-                                /* IDSEL 0x4 (PCIX Slot 2) */
-                                02000 0 0 1 &mpic 0 1
-                                02000 0 0 2 &mpic 1 1
-                                02000 0 0 3 &mpic 2 1
-                                02000 0 0 4 &mpic 3 1
-
-                                /* IDSEL 0x5 (PCIX Slot 3) */
-                                02800 0 0 1 &mpic 1 1
-                                02800 0 0 2 &mpic 2 1
-                                02800 0 0 3 &mpic 3 1
-                                02800 0 0 4 &mpic 0 1
-
-                                /* IDSEL 0x6 (PCIX Slot 4) */
-                                03000 0 0 1 &mpic 2 1
-                                03000 0 0 2 &mpic 3 1
-                                03000 0 0 3 &mpic 0 1
-                                03000 0 0 4 &mpic 1 1
-
-                                /* IDSEL 0x8 (PCIX Slot 5) */
-                                04000 0 0 1 &mpic 0 1
-                                04000 0 0 2 &mpic 1 1
-                                04000 0 0 3 &mpic 2 1
-                                04000 0 0 4 &mpic 3 1
-
-                                /* IDSEL 0xC (Tsi310 bridge) */
-                                06000 0 0 1 &mpic 0 1
-                                06000 0 0 2 &mpic 1 1
-                                06000 0 0 3 &mpic 2 1
-                                06000 0 0 4 &mpic 3 1
-
-                                /* IDSEL 0x14 (Slot 2) */
-                                0a000 0 0 1 &mpic 0 1
-                                0a000 0 0 2 &mpic 1 1
-                                0a000 0 0 3 &mpic 2 1
-                                0a000 0 0 4 &mpic 3 1
-
-                                /* IDSEL 0x15 (Slot 3) */
-                                0a800 0 0 1 &mpic 1 1
-                                0a800 0 0 2 &mpic 2 1
-                                0a800 0 0 3 &mpic 3 1
-                                0a800 0 0 4 &mpic 0 1
-
-                                /* IDSEL 0x16 (Slot 4) */
-                                0b000 0 0 1 &mpic 2 1
-                                0b000 0 0 2 &mpic 3 1
-                                0b000 0 0 3 &mpic 0 1
-                                0b000 0 0 4 &mpic 1 1
-
-                                /* IDSEL 0x18 (Slot 5) */
-                                0c000 0 0 1 &mpic 0 1
-                                0c000 0 0 2 &mpic 1 1
-                                0c000 0 0 3 &mpic 2 1
-                                0c000 0 0 4 &mpic 3 1
-
-                                /* IDSEL 0x1C (Tsi310 bridge PCI primary) */
-                                0E000 0 0 1 &mpic 0 1
-                                0E000 0 0 2 &mpic 1 1
-                                0E000 0 0 3 &mpic 2 1
-                                0E000 0 0 4 &mpic 3 1>;
 
-                        interrupt-parent = <&mpic>;
-                        interrupts = <18 2>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 80000000 80000000 0 10000000
-                                  01000000 0 00000000 e2000000 0 00800000>;
-                        clock-frequency = <3f940aa>;
+                                /* IDSEL 0x00 (PrPMC Site) */
+                                0000 0 0 1 &mpic 0 1
+                                0000 0 0 2 &mpic 1 1
+                                0000 0 0 3 &mpic 2 1
+                                0000 0 0 4 &mpic 3 1
+
+                                /* IDSEL 0x04 (VIA chip) */
+                                2000 0 0 1 &mpic 0 1
+                                2000 0 0 2 &mpic 1 1
+                                2000 0 0 3 &mpic 2 1
+                                2000 0 0 4 &mpic 3 1
+
+                                /* IDSEL 0x05 (8139) */
+                                2800 0 0 1 &mpic 1 1
+
+                                /* IDSEL 0x06 (Slot 6) */
+                                3000 0 0 1 &mpic 2 1
+                                3000 0 0 2 &mpic 3 1
+                                3000 0 0 3 &mpic 0 1
+                                3000 0 0 4 &mpic 1 1
+
+                                /* IDESL 0x07 (Slot 7) */
+                                3800 0 0 1 &mpic 3 1
+                                3800 0 0 2 &mpic 0 1
+                                3800 0 0 3 &mpic 1 1
+                                3800 0 0 4 &mpic 2 1>;
+
+                        reg = <e000 0 0 0 0>;
                         #interrupt-cells = <1>;
                         #size-cells = <2>;
                         #address-cells = <3>;
-                        reg = <8000 1000>;
-                        compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
-                        device_type = "pci";
+                        ranges = <02000000 0 80000000
+                                  02000000 0 80000000
+                                  0 20000000
+                                  01000000 0 00000000
+                                  01000000 0 00000000
+                                  0 00080000>;
+                        clock-frequency = <1fca055>;
 
-                        pci_bridge@1c {
-                                interrupt-map-mask = <f800 0 0 7>;
-                                interrupt-map = <
-
-                                        /* IDSEL 0x00 (PrPMC Site) */
-                                        0000 0 0 1 &mpic 0 1
-                                        0000 0 0 2 &mpic 1 1
-                                        0000 0 0 3 &mpic 2 1
-                                        0000 0 0 4 &mpic 3 1
-
-                                        /* IDSEL 0x04 (VIA chip) */
-                                        2000 0 0 1 &mpic 0 1
-                                        2000 0 0 2 &mpic 1 1
-                                        2000 0 0 3 &mpic 2 1
-                                        2000 0 0 4 &mpic 3 1
-
-                                        /* IDSEL 0x05 (8139) */
-                                        2800 0 0 1 &mpic 1 1
-
-                                        /* IDSEL 0x06 (Slot 6) */
-                                        3000 0 0 1 &mpic 2 1
-                                        3000 0 0 2 &mpic 3 1
-                                        3000 0 0 3 &mpic 0 1
-                                        3000 0 0 4 &mpic 1 1
-
-                                        /* IDESL 0x07 (Slot 7) */
-                                        3800 0 0 1 &mpic 3 1
-                                        3800 0 0 2 &mpic 0 1
-                                        3800 0 0 3 &mpic 1 1
-                                        3800 0 0 4 &mpic 2 1>;
-
-                                reg = <e000 0 0 0 0>;
-                                #interrupt-cells = <1>;
-                                #size-cells = <2>;
-                                #address-cells = <3>;
-                                ranges = <02000000 0 80000000
-                                          02000000 0 80000000
-                                          0 20000000
-                                          01000000 0 00000000
-                                          01000000 0 00000000
-                                          0 00080000>;
-                                clock-frequency = <1fca055>;
-
-                                isa@4 {
-                                        device_type = "isa";
+                        isa@4 {
+                                device_type = "isa";
+                                #interrupt-cells = <2>;
+                                #size-cells = <1>;
+                                #address-cells = <2>;
+                                reg = <2000 0 0 0 0>;
+                                ranges = <1 0 01000000 0 0 00001000>;
+                                interrupt-parent = <&i8259>;
+
+                                i8259: interrupt-controller@20 {
+                                        interrupt-controller;
+                                        device_type = "interrupt-controller";
+                                        reg = <1 20 2
+                                               1 a0 2
+                                               1 4d0 2>;
+                                        #address-cells = <0>;
                                         #interrupt-cells = <2>;
-                                        #size-cells = <1>;
-                                        #address-cells = <2>;
-                                        reg = <2000 0 0 0 0>;
-                                        ranges = <1 0 01000000 0 0 00001000>;
-                                        interrupt-parent = <&i8259>;
-
-                                        i8259: interrupt-controller@20 {
-                                                clock-frequency = <0>;
-                                                interrupt-controller;
-                                                device_type = "interrupt-controller";
-                                                reg = <1 20 2
-                                                       1 a0 2
-                                                       1 4d0 2>;
-                                                #address-cells = <0>;
-                                                #interrupt-cells = <2>;
-                                                built-in;
-                                                compatible = "chrp,iic";
-                                                interrupts = <0 1>;
-                                                interrupt-parent = <&mpic>;
-                                        };
-
-                                        rtc@70 {
-                                                compatible = "pnpPNP,b00";
-                                                reg = <1 70 2>;
-                                        };
+                                        compatible = "chrp,iic";
+                                        interrupts = <0 1>;
+                                        interrupt-parent = <&mpic>;
                                 };
-                        };
-                };
 
-                pci@9000 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-
-                                /* IDSEL 0x15 */
-                                a800 0 0 1 &mpic b 1
-                                a800 0 0 2 &mpic 1 1
-                                a800 0 0 3 &mpic 2 1
-                                a800 0 0 4 &mpic 3 1>;
-
-                        interrupt-parent = <&mpic>;
-                        interrupts = <19 2>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 90000000 90000000 0 10000000
-                                  01000000 0 00000000 e2800000 0 00800000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <9000 1000>;
-                        compatible = "fsl,mpc8540-pci";
-                        device_type = "pci";
+                                rtc@70 {
+                                        compatible = "pnpPNP,b00";
+                                        reg = <1 70 2>;
+                                };
+                        };
                 };
-                /* PCI Express */
-                pcie@a000 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
+        };
 
-                                /* IDSEL 0x0 (PEX) */
-                                00000 0 0 1 &mpic 0 1
-                                00000 0 0 2 &mpic 1 1
-                                00000 0 0 3 &mpic 2 1
-                                00000 0 0 4 &mpic 3 1>;
+        pci@e0009000 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+
+                        /* IDSEL 0x15 */
+                        a800 0 0 1 &mpic b 1
+                        a800 0 0 2 &mpic 1 1
+                        a800 0 0 3 &mpic 2 1
+                        a800 0 0 4 &mpic 3 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <19 2>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 90000000 90000000 0 10000000
+                          01000000 0 00000000 e2800000 0 00800000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0009000 1000>;
+                compatible = "fsl,mpc8540-pci";
+                device_type = "pci";
+        };
 
-                        interrupt-parent = <&mpic>;
-                        interrupts = <1a 2>;
-                        bus-range = <0 ff>;
-                        ranges = <02000000 0 a0000000 a0000000 0 20000000
-                                  01000000 0 00000000 e3000000 0 08000000>;
-                        clock-frequency = <1fca055>;
-                        #interrupt-cells = <1>;
+        pcie@e000a000 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+
+                        /* IDSEL 0x0 (PEX) */
+                        00000 0 0 1 &mpic 0 1
+                        00000 0 0 2 &mpic 1 1
+                        00000 0 0 3 &mpic 2 1
+                        00000 0 0 4 &mpic 3 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <1a 2>;
+                bus-range = <0 ff>;
+                ranges = <02000000 0 a0000000 a0000000 0 20000000
+                          01000000 0 00000000 e3000000 0 08000000>;
+                clock-frequency = <1fca055>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e000a000 1000>;
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
                         #size-cells = <2>;
                         #address-cells = <3>;
-                        reg = <a000 1000>;
-                        compatible = "fsl,mpc8548-pcie";
                         device_type = "pci";
-                };
+                        ranges = <02000000 0 a0000000
+                                  02000000 0 a0000000
+                                  0 20000000
 
-                mpic: pic@40000 {
-                        clock-frequency = <0>;
-                        interrupt-controller;
-                        #address-cells = <0>;
-                        #interrupt-cells = <2>;
-                        reg = <40000 40000>;
-                        built-in;
-                        compatible = "chrp,open-pic";
-                        device_type = "open-pic";
-                        big-endian;
+                                  01000000 0 00000000
+                                  01000000 0 00000000
+                                  0 08000000>;
                 };
         };
 };
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index c3c888252121..57029cca32b2 100644
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -30,7 +30,6 @@
                         timebase-frequency = <0>;       //  33 MHz, from uboot
                         bus-frequency = <0>;    // 166 MHz
                         clock-frequency = <0>;  // 825 MHz, from uboot
-                        32-bit;
                 };
         };
 
@@ -42,10 +41,9 @@
         soc8555@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 e0000000 00100000>;
-                reg = <e0000000 00100000>;      // CCSRBAR 1M
+                reg = <e0000000 00001000>;      // CCSRBAR 1M
                 bus-frequency = <0>;
 
                 memory-controller@2000 {
@@ -137,113 +135,145 @@
                         interrupt-parent = <&mpic>;
                 };
 
-                pci1: pci@8000 {
-                        interrupt-map-mask = <1f800 0 0 7>;
-                        interrupt-map = <
-
-                                /* IDSEL 0x10 */
-                                08000 0 0 1 &mpic 0 1
-                                08000 0 0 2 &mpic 1 1
-                                08000 0 0 3 &mpic 2 1
-                                08000 0 0 4 &mpic 3 1
-
-                                /* IDSEL 0x11 */
-                                08800 0 0 1 &mpic 0 1
-                                08800 0 0 2 &mpic 1 1
-                                08800 0 0 3 &mpic 2 1
-                                08800 0 0 4 &mpic 3 1
-
-                                /* IDSEL 0x12 (Slot 1) */
-                                09000 0 0 1 &mpic 0 1
-                                09000 0 0 2 &mpic 1 1
-                                09000 0 0 3 &mpic 2 1
-                                09000 0 0 4 &mpic 3 1
-
-                                /* IDSEL 0x13 (Slot 2) */
-                                09800 0 0 1 &mpic 1 1
-                                09800 0 0 2 &mpic 2 1
-                                09800 0 0 3 &mpic 3 1
-                                09800 0 0 4 &mpic 0 1
-
-                                /* IDSEL 0x14 (Slot 3) */
-                                0a000 0 0 1 &mpic 2 1
-                                0a000 0 0 2 &mpic 3 1
-                                0a000 0 0 3 &mpic 0 1
-                                0a000 0 0 4 &mpic 1 1
-
-                                /* IDSEL 0x15 (Slot 4) */
-                                0a800 0 0 1 &mpic 3 1
-                                0a800 0 0 2 &mpic 0 1
-                                0a800 0 0 3 &mpic 1 1
-                                0a800 0 0 4 &mpic 2 1
-
-                                /* Bus 1 (Tundra Bridge) */
-                                /* IDSEL 0x12 (ISA bridge) */
-                                19000 0 0 1 &mpic 0 1
-                                19000 0 0 2 &mpic 1 1
-                                19000 0 0 3 &mpic 2 1
-                                19000 0 0 4 &mpic 3 1>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <18 2>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 80000000 80000000 0 20000000
-                                  01000000 0 00000000 e2000000 0 00100000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8000 1000>;
-                        compatible = "fsl,mpc8540-pci";
-                        device_type = "pci";
-
-                        i8259@19000 {
-                                clock-frequency = <0>;
+                mpic: pic@40000 {
+                        clock-frequency = <0>;
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <40000 40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                        big-endian;
+                };
+
+                cpm@919c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8555-cpm", "fsl,cpm2";
+                        reg = <919c0 30>;
+                        ranges;
+
+                        muram@80000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 80000 10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 2000 9000 1000>;
+                                };
+                        };
+
+                        brg@919f0 {
+                                compatible = "fsl,mpc8555-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <919f0 10 915f0 10>;
+                        };
+
+                        cpmpic: pic@90c00 {
                                 interrupt-controller;
-                                device_type = "interrupt-controller";
-                                reg = <19000 0 0 0 1>;
                                 #address-cells = <0>;
                                 #interrupt-cells = <2>;
-                                built-in;
-                                compatible = "chrp,iic";
-                                big-endian;
-                                interrupts = <1>;
-                                interrupt-parent = <&pci1>;
+                                interrupts = <2e 2>;
+                                interrupt-parent = <&mpic>;
+                                reg = <90c00 80>;
+                                compatible = "fsl,mpc8555-cpm-pic", "fsl,cpm2-pic";
                         };
                 };
+        };
 
-                pci@9000 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
+        pci1: pci@e0008000 {
+                interrupt-map-mask = <1f800 0 0 7>;
+                interrupt-map = <
 
-                                /* IDSEL 0x15 */
-                                a800 0 0 1 &mpic b 1
-                                a800 0 0 2 &mpic b 1
-                                a800 0 0 3 &mpic b 1
-                                a800 0 0 4 &mpic b 1>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <19 2>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 a0000000 a0000000 0 20000000
-                                  01000000 0 00000000 e3000000 0 00100000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <9000 1000>;
-                        compatible = "fsl,mpc8540-pci";
-                        device_type = "pci";
-                };
+                        /* IDSEL 0x10 */
+                        08000 0 0 1 &mpic 0 1
+                        08000 0 0 2 &mpic 1 1
+                        08000 0 0 3 &mpic 2 1
+                        08000 0 0 4 &mpic 3 1
 
-                mpic: pic@40000 {
-                        clock-frequency = <0>;
+                        /* IDSEL 0x11 */
+                        08800 0 0 1 &mpic 0 1
+                        08800 0 0 2 &mpic 1 1
+                        08800 0 0 3 &mpic 2 1
+                        08800 0 0 4 &mpic 3 1
+
+                        /* IDSEL 0x12 (Slot 1) */
+                        09000 0 0 1 &mpic 0 1
+                        09000 0 0 2 &mpic 1 1
+                        09000 0 0 3 &mpic 2 1
+                        09000 0 0 4 &mpic 3 1
+
+                        /* IDSEL 0x13 (Slot 2) */
+                        09800 0 0 1 &mpic 1 1
+                        09800 0 0 2 &mpic 2 1
+                        09800 0 0 3 &mpic 3 1
+                        09800 0 0 4 &mpic 0 1
+
+                        /* IDSEL 0x14 (Slot 3) */
+                        0a000 0 0 1 &mpic 2 1
+                        0a000 0 0 2 &mpic 3 1
+                        0a000 0 0 3 &mpic 0 1
+                        0a000 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x15 (Slot 4) */
+                        0a800 0 0 1 &mpic 3 1
+                        0a800 0 0 2 &mpic 0 1
+                        0a800 0 0 3 &mpic 1 1
+                        0a800 0 0 4 &mpic 2 1
+
+                        /* Bus 1 (Tundra Bridge) */
+                        /* IDSEL 0x12 (ISA bridge) */
+                        19000 0 0 1 &mpic 0 1
+                        19000 0 0 2 &mpic 1 1
+                        19000 0 0 3 &mpic 2 1
+                        19000 0 0 4 &mpic 3 1>;
+                interrupt-parent = <&mpic>;
+                interrupts = <18 2>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 80000000 80000000 0 20000000
+                          01000000 0 00000000 e2000000 0 00100000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008000 1000>;
+                compatible = "fsl,mpc8540-pci";
+                device_type = "pci";
+
+                i8259@19000 {
                         interrupt-controller;
+                        device_type = "interrupt-controller";
+                        reg = <19000 0 0 0 1>;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
-                        reg = <40000 40000>;
-                        built-in;
-                        compatible = "chrp,open-pic";
-                        device_type = "open-pic";
-                        big-endian;
+                        compatible = "chrp,iic";
+                        interrupts = <1>;
+                        interrupt-parent = <&pci1>;
                 };
         };
+
+        pci@e0009000 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+
+                        /* IDSEL 0x15 */
+                        a800 0 0 1 &mpic b 1
+                        a800 0 0 2 &mpic b 1
+                        a800 0 0 3 &mpic b 1
+                        a800 0 0 4 &mpic b 1>;
+                interrupt-parent = <&mpic>;
+                interrupts = <19 2>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 a0000000 a0000000 0 20000000
+                          01000000 0 00000000 e3000000 0 00100000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0009000 1000>;
+                compatible = "fsl,mpc8540-pci";
+                device_type = "pci";
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 16dbe848cecf..6b362f8222c1 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -30,7 +30,6 @@
                         timebase-frequency = <04ead9a0>;
                         bus-frequency = <13ab6680>;
                         clock-frequency = <312c8040>;
-                        32-bit;
                 };
         };
 
@@ -42,7 +41,6 @@
         soc8560@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 e0000000 00100000>;
                 reg = <e0000000 00000200>;
@@ -132,115 +130,39 @@
                         phy-handle = <&phy1>;
                 };
 
-                pci@8000 {
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
-                        device_type = "pci";
-                        reg = <8000 1000>;
-                        clock-frequency = <3f940aa>;
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-
-                                        /* IDSEL 0x2 */
-                                         1000 0 0 1 &mpic 1 1
-                                         1000 0 0 2 &mpic 2 1
-                                         1000 0 0 3 &mpic 3 1
-                                         1000 0 0 4 &mpic 4 1
-
-                                        /* IDSEL 0x3 */
-                                         1800 0 0 1 &mpic 4 1
-                                         1800 0 0 2 &mpic 1 1
-                                         1800 0 0 3 &mpic 2 1
-                                         1800 0 0 4 &mpic 3 1
-
-                                        /* IDSEL 0x4 */
-                                         2000 0 0 1 &mpic 3 1
-                                         2000 0 0 2 &mpic 4 1
-                                         2000 0 0 3 &mpic 1 1
-                                         2000 0 0 4 &mpic 2 1
-
-                                        /* IDSEL 0x5  */
-                                         2800 0 0 1 &mpic 2 1
-                                         2800 0 0 2 &mpic 3 1
-                                         2800 0 0 3 &mpic 4 1
-                                         2800 0 0 4 &mpic 1 1
-
-                                        /* IDSEL 12 */
-                                         6000 0 0 1 &mpic 1 1
-                                         6000 0 0 2 &mpic 2 1
-                                         6000 0 0 3 &mpic 3 1
-                                         6000 0 0 4 &mpic 4 1
-
-                                        /* IDSEL 13 */
-                                         6800 0 0 1 &mpic 4 1
-                                         6800 0 0 2 &mpic 1 1
-                                         6800 0 0 3 &mpic 2 1
-                                         6800 0 0 4 &mpic 3 1
-
-                                        /* IDSEL 14*/
-                                         7000 0 0 1 &mpic 3 1
-                                         7000 0 0 2 &mpic 4 1
-                                         7000 0 0 3 &mpic 1 1
-                                         7000 0 0 4 &mpic 2 1
-
-                                        /* IDSEL 15 */
-                                         7800 0 0 1 &mpic 2 1
-                                         7800 0 0 2 &mpic 3 1
-                                         7800 0 0 3 &mpic 4 1
-                                         7800 0 0 4 &mpic 1 1
-
-                                        /* IDSEL 18 */
-                                         9000 0 0 1 &mpic 1 1
-                                         9000 0 0 2 &mpic 2 1
-                                         9000 0 0 3 &mpic 3 1
-                                         9000 0 0 4 &mpic 4 1
-
-                                        /* IDSEL 19 */
-                                         9800 0 0 1 &mpic 4 1
-                                         9800 0 0 2 &mpic 1 1
-                                         9800 0 0 3 &mpic 2 1
-                                         9800 0 0 4 &mpic 3 1
-
-                                        /* IDSEL 20 */
-                                         a000 0 0 1 &mpic 3 1
-                                         a000 0 0 2 &mpic 4 1
-                                         a000 0 0 3 &mpic 1 1
-                                         a000 0 0 4 &mpic 2 1
-
-                                        /* IDSEL 21 */
-                                         a800 0 0 1 &mpic 2 1
-                                         a800 0 0 2 &mpic 3 1
-                                         a800 0 0 3 &mpic 4 1
-                                         a800 0 0 4 &mpic 1 1>;
-
-                        interrupt-parent = <&mpic>;
-                        interrupts = <18 2>;
-                        bus-range = <0 0>;
-                        ranges = <02000000 0 80000000 80000000 0 20000000
-                                  01000000 0 00000000 e2000000 0 01000000>;
-                };
-
                 mpic: pic@40000 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <40000 40000>;
-                        built-in;
                         device_type = "open-pic";
                 };
 
-                cpm@e0000000 {
+                cpm@919c0 {
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        #interrupt-cells = <2>;
-                        device_type = "cpm";
-                        model = "CPM2";
-                        ranges = <0 0 c0000>;
-                        reg = <80000 40000>;
-                        command-proc = <919c0>;
-                        brg-frequency = <9d5b340>;
+                        compatible = "fsl,mpc8560-cpm", "fsl,cpm2";
+                        reg = <919c0 30>;
+                        ranges;
+
+                        muram@80000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 80000 10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 4000 9000 2000>;
+                                };
+                        };
+
+                        brg@919f0 {
+                                compatible = "fsl,mpc8560-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <919f0 10 915f0 10>;
+                                clock-frequency = <d#165000000>;
+                        };
 
                         cpmpic: pic@90c00 {
                                 interrupt-controller;
@@ -249,44 +171,38 @@
                                 interrupts = <2e 2>;
                                 interrupt-parent = <&mpic>;
                                 reg = <90c00 80>;
-                                built-in;
-                                device_type = "cpm-pic";
+                                compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
                         };
 
-                        scc@91a00 {
+                        serial@91a00 {
                                 device_type = "serial";
-                                compatible = "cpm_uart";
-                                model = "SCC";
-                                device-id = <1>;
+                                compatible = "fsl,mpc8560-scc-uart",
+                                             "fsl,cpm2-scc-uart";
                                 reg = <91a00 20 88000 100>;
-                                clock-setup = <00ffffff 0>;
-                                rx-clock = <1>;
-                                tx-clock = <1>;
+                                fsl,cpm-brg = <1>;
+                                fsl,cpm-command = <00800000>;
                                 current-speed = <1c200>;
                                 interrupts = <28 8>;
                                 interrupt-parent = <&cpmpic>;
                         };
 
-                        scc@91a20 {
+                        serial@91a20 {
                                 device_type = "serial";
-                                compatible = "cpm_uart";
-                                model = "SCC";
-                                device-id = <2>;
+                                compatible = "fsl,mpc8560-scc-uart",
+                                             "fsl,cpm2-scc-uart";
                                 reg = <91a20 20 88100 100>;
-                                clock-setup = <ff00ffff 90000>;
-                                rx-clock = <2>;
-                                tx-clock = <2>;
+                                fsl,cpm-brg = <2>;
+                                fsl,cpm-command = <04a00000>;
                                 current-speed = <1c200>;
                                 interrupts = <29 8>;
                                 interrupt-parent = <&cpmpic>;
                         };
 
-                        fcc@91320 {
+                        ethernet@91320 {
                                 device_type = "network";
-                                compatible = "fs_enet";
-                                model = "FCC";
-                                device-id = <2>;
-                                reg = <91320 20 88500 100 913a0 30>;
+                                compatible = "fsl,mpc8560-fcc-enet",
+                                             "fsl,cpm2-fcc-enet";
+                                reg = <91320 20 88500 100 913b0 1>;
                                 /*
                                  * mac-address is deprecated and will be removed
                                  * in 2.6.25.  Only recent versions of
@@ -294,20 +210,17 @@
                                  */
                                 mac-address = [ 00 00 00 00 00 00 ];
                                 local-mac-address = [ 00 00 00 00 00 00 ];
-                                clock-setup = <ff00ffff 250000>;
-                                rx-clock = <15>;
-                                tx-clock = <16>;
+                                fsl,cpm-command = <16200300>;
                                 interrupts = <21 8>;
                                 interrupt-parent = <&cpmpic>;
                                 phy-handle = <&phy2>;
                         };
 
-                        fcc@91340 {
+                        ethernet@91340 {
                                 device_type = "network";
-                                compatible = "fs_enet";
-                                model = "FCC";
-                                device-id = <3>;
-                                reg = <91340 20 88600 100 913d0 30>;
+                                compatible = "fsl,mpc8560-fcc-enet",
+                                             "fsl,cpm2-fcc-enet";
+                                reg = <91340 20 88600 100 913d0 1>;
                                 /*
                                  * mac-address is deprecated and will be removed
                                  * in 2.6.25.  Only recent versions of
@@ -315,13 +228,101 @@
                                  */
                                 mac-address = [ 00 00 00 00 00 00 ];
                                 local-mac-address = [ 00 00 00 00 00 00 ];
-                                clock-setup = <ffff00ff 3700>;
-                                rx-clock = <17>;
-                                tx-clock = <18>;
+                                fsl,cpm-command = <1a400300>;
                                 interrupts = <22 8>;
                                 interrupt-parent = <&cpmpic>;
                                 phy-handle = <&phy3>;
                         };
                 };
         };
+
+        pci@e0008000 {
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+                device_type = "pci";
+                reg = <e0008000 1000>;
+                clock-frequency = <3f940aa>;
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+
+                                /* IDSEL 0x2 */
+                                 1000 0 0 1 &mpic 1 1
+                                 1000 0 0 2 &mpic 2 1
+                                 1000 0 0 3 &mpic 3 1
+                                 1000 0 0 4 &mpic 4 1
+
+                                /* IDSEL 0x3 */
+                                 1800 0 0 1 &mpic 4 1
+                                 1800 0 0 2 &mpic 1 1
+                                 1800 0 0 3 &mpic 2 1
+                                 1800 0 0 4 &mpic 3 1
+
+                                /* IDSEL 0x4 */
+                                 2000 0 0 1 &mpic 3 1
+                                 2000 0 0 2 &mpic 4 1
+                                 2000 0 0 3 &mpic 1 1
+                                 2000 0 0 4 &mpic 2 1
+
+                                /* IDSEL 0x5  */
+                                 2800 0 0 1 &mpic 2 1
+                                 2800 0 0 2 &mpic 3 1
+                                 2800 0 0 3 &mpic 4 1
+                                 2800 0 0 4 &mpic 1 1
+
+                                /* IDSEL 12 */
+                                 6000 0 0 1 &mpic 1 1
+                                 6000 0 0 2 &mpic 2 1
+                                 6000 0 0 3 &mpic 3 1
+                                 6000 0 0 4 &mpic 4 1
+
+                                /* IDSEL 13 */
+                                 6800 0 0 1 &mpic 4 1
+                                 6800 0 0 2 &mpic 1 1
+                                 6800 0 0 3 &mpic 2 1
+                                 6800 0 0 4 &mpic 3 1
+
+                                /* IDSEL 14*/
+                                 7000 0 0 1 &mpic 3 1
+                                 7000 0 0 2 &mpic 4 1
+                                 7000 0 0 3 &mpic 1 1
+                                 7000 0 0 4 &mpic 2 1
+
+                                /* IDSEL 15 */
+                                 7800 0 0 1 &mpic 2 1
+                                 7800 0 0 2 &mpic 3 1
+                                 7800 0 0 3 &mpic 4 1
+                                 7800 0 0 4 &mpic 1 1
+
+                                /* IDSEL 18 */
+                                 9000 0 0 1 &mpic 1 1
+                                 9000 0 0 2 &mpic 2 1
+                                 9000 0 0 3 &mpic 3 1
+                                 9000 0 0 4 &mpic 4 1
+
+                                /* IDSEL 19 */
+                                 9800 0 0 1 &mpic 4 1
+                                 9800 0 0 2 &mpic 1 1
+                                 9800 0 0 3 &mpic 2 1
+                                 9800 0 0 4 &mpic 3 1
+
+                                /* IDSEL 20 */
+                                 a000 0 0 1 &mpic 3 1
+                                 a000 0 0 2 &mpic 4 1
+                                 a000 0 0 3 &mpic 1 1
+                                 a000 0 0 4 &mpic 2 1
+
+                                /* IDSEL 21 */
+                                 a800 0 0 1 &mpic 2 1
+                                 a800 0 0 2 &mpic 3 1
+                                 a800 0 0 3 &mpic 4 1
+                                 a800 0 0 4 &mpic 1 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <18 2>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 80000000 80000000 0 20000000
+                          01000000 0 00000000 e2000000 0 01000000>;
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index b1dcfbe8c1f8..54394372b12a 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -34,7 +34,6 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
-                        32-bit;
                 };
         };
 
@@ -51,10 +50,9 @@
         soc8568@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 e0000000 00100000>;
-                reg = <e0000000 00100000>;
+                reg = <e0000000 00001000>;
                 bus-frequency = <0>;
 
                 memory-controller@2000 {
@@ -74,15 +72,24 @@
                 };
 
                 i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
                         device_type = "i2c";
                         compatible = "fsl-i2c";
                         reg = <3000 100>;
                         interrupts = <2b 2>;
                         interrupt-parent = <&mpic>;
                         dfsrr;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1374";
+                                reg = <68>;
+                        };
                 };
 
                 i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
                         device_type = "i2c";
                         compatible = "fsl-i2c";
                         reg = <3100 100>;
@@ -97,10 +104,10 @@
                         device_type = "mdio";
                         compatible = "gianfar";
                         reg = <24520 20>;
-                        phy0: ethernet-phy@0 {
+                        phy0: ethernet-phy@7 {
                                 interrupt-parent = <&mpic>;
                                 interrupts = <1 1>;
-                                reg = <0>;
+                                reg = <7>;
                                 device_type = "ethernet-phy";
                         };
                         phy1: ethernet-phy@1 {
@@ -176,60 +183,6 @@
                         fsl,has-rstcr;
                 };
 
-                pci@8000 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-                                /* IDSEL 0x12 AD18 */
-                                9000 0 0 1 &mpic 5 1
-                                9000 0 0 2 &mpic 6 1
-                                9000 0 0 3 &mpic 7 1
-                                9000 0 0 4 &mpic 4 1
-
-                                /* IDSEL 0x13 AD19 */
-                                9800 0 0 1 &mpic 6 1
-                                9800 0 0 2 &mpic 7 1
-                                9800 0 0 3 &mpic 4 1
-                                9800 0 0 4 &mpic 5 1>;
-
-                        interrupt-parent = <&mpic>;
-                        interrupts = <18 2>;
-                        bus-range = <0 ff>;
-                        ranges = <02000000 0 80000000 80000000 0 20000000
-                                  01000000 0 00000000 e2000000 0 00800000>;
-                        clock-frequency = <3f940aa>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <8000 1000>;
-                        compatible = "fsl,mpc8540-pci";
-                        device_type = "pci";
-                };
-
-                /* PCI Express */
-                pcie@a000 {
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-
-                                /* IDSEL 0x0 (PEX) */
-                                00000 0 0 1 &mpic 0 1
-                                00000 0 0 2 &mpic 1 1
-                                00000 0 0 3 &mpic 2 1
-                                00000 0 0 4 &mpic 3 1>;
-
-                        interrupt-parent = <&mpic>;
-                        interrupts = <1a 2>;
-                        bus-range = <0 ff>;
-                        ranges = <02000000 0 a0000000 a0000000 0 20000000
-                                  01000000 0 00000000 e3000000 0 08000000>;
-                        clock-frequency = <1fca055>;
-                        #interrupt-cells = <1>;
-                        #size-cells = <2>;
-                        #address-cells = <3>;
-                        reg = <a000 1000>;
-                        compatible = "fsl,mpc8548-pcie";
-                        device_type = "pci";
-                };
-
                 serial@4600 {
                         device_type = "serial";
                         compatible = "ns16550";
@@ -258,11 +211,11 @@
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <40000 40000>;
-                        built-in;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
                         big-endian;
                 };
+
                 par_io@e0100 {
                         reg = <e0100 100>;
                         device_type = "par_io";
@@ -289,12 +242,13 @@
                                         4  1a  2  0  2  0       /* RxD7 */
                                         4  0b  1  0  2  0       /* TX_EN */
                                         4  18  1  0  2  0       /* TX_ER */
-                                        4  0f  2  0  2  0       /* RX_DV */
+                                        4  10  2  0  2  0       /* RX_DV */
                                         4  1e  2  0  2  0       /* RX_ER */
                                         4  11  2  0  2  0       /* RX_CLK */
                                         4  13  1  0  2  0       /* GTX_CLK */
                                         1  1f  2  0  3  0>;     /* GTX125 */
                         };
+
                         pio2: ucc_pin@02 {
                                 pio-map = <
                         /* port  pin  dir  open_drain  assignment  has_irq */
@@ -380,10 +334,10 @@
                         mac-address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         rx-clock = <0>;
-                        tx-clock = <19>;
-                        phy-handle = <&qe_phy0>;
-                        phy-connection-type = "gmii";
+                        tx-clock = <20>;
                         pio-handle = <&pio1>;
+                        phy-handle = <&phy0>;
+                        phy-connection-type = "rgmii-id";
                 };
 
                 ucc@3000 {
@@ -402,10 +356,10 @@
                         mac-address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         rx-clock = <0>;
-                        tx-clock = <14>;
-                        phy-handle = <&qe_phy1>;
-                        phy-connection-type = "gmii";
+                        tx-clock = <20>;
                         pio-handle = <&pio2>;
+                        phy-handle = <&phy1>;
+                        phy-connection-type = "rgmii-id";
                 };
 
                 mdio@2120 {
@@ -417,10 +371,10 @@
 
                         /* These are the same PHYs as on
                          * gianfar's MDIO bus */
-                        qe_phy0: ethernet-phy@00 {
+                        qe_phy0: ethernet-phy@07 {
                                 interrupt-parent = <&mpic>;
                                 interrupts = <1 1>;
-                                reg = <0>;
+                                reg = <7>;
                                 device_type = "ethernet-phy";
                         };
                         qe_phy1: ethernet-phy@01 {
@@ -449,11 +403,77 @@
                         #address-cells = <0>;
                         #interrupt-cells = <1>;
                         reg = <80 80>;
-                        built-in;
                         big-endian;
                         interrupts = <2e 2 2e 2>; //high:30 low:30
                         interrupt-parent = <&mpic>;
                 };
 
         };
+
+        pci@e0008000 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x12 AD18 */
+                        9000 0 0 1 &mpic 5 1
+                        9000 0 0 2 &mpic 6 1
+                        9000 0 0 3 &mpic 7 1
+                        9000 0 0 4 &mpic 4 1
+
+                        /* IDSEL 0x13 AD19 */
+                        9800 0 0 1 &mpic 6 1
+                        9800 0 0 2 &mpic 7 1
+                        9800 0 0 3 &mpic 4 1
+                        9800 0 0 4 &mpic 5 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <18 2>;
+                bus-range = <0 ff>;
+                ranges = <02000000 0 80000000 80000000 0 20000000
+                          01000000 0 00000000 e2000000 0 00800000>;
+                clock-frequency = <3f940aa>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008000 1000>;
+                compatible = "fsl,mpc8540-pci";
+                device_type = "pci";
+        };
+
+        /* PCI Express */
+        pcie@e000a000 {
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+
+                        /* IDSEL 0x0 (PEX) */
+                        00000 0 0 1 &mpic 0 1
+                        00000 0 0 2 &mpic 1 1
+                        00000 0 0 3 &mpic 2 1
+                        00000 0 0 4 &mpic 3 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <1a 2>;
+                bus-range = <0 ff>;
+                ranges = <02000000 0 a0000000 a0000000 0 10000000
+                          01000000 0 00000000 e2800000 0 00800000>;
+                clock-frequency = <1fca055>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e000a000 1000>;
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <02000000 0 a0000000
+                                  02000000 0 a0000000
+                                  0 10000000
+
+                                  01000000 0 00000000
+                                  01000000 0 00000000
+                                  0 00800000>;
+                };
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
new file mode 100644
index 000000000000..d638deec7652
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -0,0 +1,404 @@
+/*
+ * MPC8572 DS Device Tree Source
+ *
+ * Copyright 2007 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/ {
+        model = "fsl,MPC8572DS";
+        compatible = "fsl,MPC8572DS";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8572@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <20>;       // 32 bytes
+                        i-cache-line-size = <20>;       // 32 bytes
+                        d-cache-size = <8000>;          // L1, 32K
+                        i-cache-size = <8000>;          // L1, 32K
+                        timebase-frequency = <0>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <00000000 00000000>;      // Filled by U-Boot
+        };
+
+        soc8572@ffe00000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <00000000 ffe00000 00100000>;
+                reg = <ffe00000 00001000>;      // CCSRBAR & soc regs, remove once parse code for immrbase fixed
+                bus-frequency = <0>;            // Filled out by uboot.
+
+                memory-controller@2000 {
+                        compatible = "fsl,mpc8572-memory-controller";
+                        reg = <2000 1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <12 2>;
+                };
+
+                memory-controller@6000 {
+                        compatible = "fsl,mpc8572-memory-controller";
+                        reg = <6000 1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <12 2>;
+                };
+
+                l2-cache-controller@20000 {
+                        compatible = "fsl,mpc8572-l2-cache-controller";
+                        reg = <20000 1000>;
+                        cache-line-size = <20>; // 32 bytes
+                        cache-size = <80000>;   // L2, 512K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <10 2>;
+                };
+
+                i2c@3000 {
+                        device_type = "i2c";
+                        compatible = "fsl-i2c";
+                        reg = <3000 100>;
+                        interrupts = <2b 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                i2c@3100 {
+                        device_type = "i2c";
+                        compatible = "fsl-i2c";
+                        reg = <3100 100>;
+                        interrupts = <2b 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        device_type = "mdio";
+                        compatible = "gianfar";
+                        reg = <24520 20>;
+                        phy0: ethernet-phy@0 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <a 1>;
+                                reg = <0>;
+                        };
+                        phy1: ethernet-phy@1 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <a 1>;
+                                reg = <1>;
+                        };
+                        phy2: ethernet-phy@2 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <a 1>;
+                                reg = <2>;
+                        };
+                        phy3: ethernet-phy@3 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <a 1>;
+                                reg = <3>;
+                        };
+                };
+
+                ethernet@24000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <24000 1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <1d 2 1e 2 22 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy0>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                ethernet@25000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <25000 1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <23 2 24 2 28 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy1>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                ethernet@26000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <26000 1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <1f 2 20 2 21 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy2>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                ethernet@27000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <27000 1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <25 2 26 2 27 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy3>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                serial@4500 {
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <4500 100>;
+                        clock-frequency = <0>;
+                        interrupts = <2a 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial@4600 {
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <4600 100>;
+                        clock-frequency = <0>;
+                        interrupts = <2a 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                global-utilities@e0000 {        //global utilities block
+                        compatible = "fsl,mpc8572-guts";
+                        reg = <e0000 1000>;
+                        fsl,has-rstcr;
+                };
+
+                mpic: pic@40000 {
+                        clock-frequency = <0>;
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <40000 40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                        big-endian;
+                };
+        };
+
+        pcie@ffe08000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <ffe08000 1000>;
+                bus-range = <0 ff>;
+                ranges = <02000000 0 80000000 80000000 0 20000000
+                          01000000 0 00000000 ffc00000 0 00010000>;
+                clock-frequency = <1fca055>;
+                interrupt-parent = <&mpic>;
+                interrupts = <18 2>;
+                interrupt-map-mask = <fb00 0 0 0>;
+                interrupt-map = <
+                        /* IDSEL 0x11 - PCI slot 1 */
+                        8800 0 0 1 &mpic 2 1
+                        8800 0 0 2 &mpic 3 1
+                        8800 0 0 3 &mpic 4 1
+                        8800 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x12 - PCI slot 2 */
+                        9000 0 0 1 &mpic 3 1
+                        9000 0 0 2 &mpic 4 1
+                        9000 0 0 3 &mpic 1 1
+                        9000 0 0 4 &mpic 2 1
+
+                        // IDSEL 0x1c  USB
+                        e000 0 0 0 &i8259 c 2
+                        e100 0 0 0 &i8259 9 2
+                        e200 0 0 0 &i8259 a 2
+                        e300 0 0 0 &i8259 b 2
+
+                        // IDSEL 0x1d  Audio
+                        e800 0 0 0 &i8259 6 2
+
+                        // IDSEL 0x1e Legacy
+                        f000 0 0 0 &i8259 7 2
+                        f100 0 0 0 &i8259 7 2
+
+                        // IDSEL 0x1f IDE/SATA
+                        f800 0 0 0 &i8259 e 2
+                        f900 0 0 0 &i8259 5 2
+
+                        >;
+
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <02000000 0 80000000
+                                  02000000 0 80000000
+                                  0 20000000
+
+                                  01000000 0 00000000
+                                  01000000 0 00000000
+                                  0 00100000>;
+                        uli1575@0 {
+                                reg = <0 0 0 0 0>;
+                                #size-cells = <2>;
+                                #address-cells = <3>;
+                                ranges = <02000000 0 80000000
+                                          02000000 0 80000000
+                                          0 20000000
+
+                                          01000000 0 00000000
+                                          01000000 0 00000000
+                                          0 00100000>;
+                                isa@1e {
+                                        device_type = "isa";
+                                        #interrupt-cells = <2>;
+                                        #size-cells = <1>;
+                                        #address-cells = <2>;
+                                        reg = <f000 0 0 0 0>;
+                                        ranges = <1 0 01000000 0 0
+                                                  00001000>;
+                                        interrupt-parent = <&i8259>;
+
+                                        i8259: interrupt-controller@20 {
+                                                reg = <1 20 2
+                                                       1 a0 2
+                                                       1 4d0 2>;
+                                                interrupt-controller;
+                                                device_type = "interrupt-controller";
+                                                #address-cells = <0>;
+                                                #interrupt-cells = <2>;
+                                                compatible = "chrp,iic";
+                                                interrupts = <9 2>;
+                                                interrupt-parent = <&mpic>;
+                                        };
+
+                                        i8042@60 {
+                                                #size-cells = <0>;
+                                                #address-cells = <1>;
+                                                reg = <1 60 1 1 64 1>;
+                                                interrupts = <1 3 c 3>;
+                                                interrupt-parent =
+                                                        <&i8259>;
+
+                                                keyboard@0 {
+                                                        reg = <0>;
+                                                        compatible = "pnpPNP,303";
+                                                };
+
+                                                mouse@1 {
+                                                        reg = <1>;
+                                                        compatible = "pnpPNP,f03";
+                                                };
+                                        };
+
+                                        rtc@70 {
+                                                compatible = "pnpPNP,b00";
+                                                reg = <1 70 2>;
+                                        };
+
+                                        gpio@400 {
+                                                reg = <1 400 80>;
+                                        };
+                                };
+                        };
+                };
+
+        };
+
+        pcie@ffe09000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <ffe09000 1000>;
+                bus-range = <0 ff>;
+                ranges = <02000000 0 a0000000 a0000000 0 20000000
+                          01000000 0 00000000 ffc10000 0 00010000>;
+                clock-frequency = <1fca055>;
+                interrupt-parent = <&mpic>;
+                interrupts = <1a 2>;
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0 0 1 &mpic 4 1
+                        0000 0 0 2 &mpic 5 1
+                        0000 0 0 3 &mpic 6 1
+                        0000 0 0 4 &mpic 7 1
+                        >;
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <02000000 0 a0000000
+                                  02000000 0 a0000000
+                                  0 20000000
+
+                                  01000000 0 00000000
+                                  01000000 0 00000000
+                                  0 00100000>;
+                };
+        };
+
+        pcie@ffe0a000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <ffe0a000 1000>;
+                bus-range = <0 ff>;
+                ranges = <02000000 0 c0000000 c0000000 0 20000000
+                          01000000 0 00000000 ffc20000 0 00010000>;
+                clock-frequency = <1fca055>;
+                interrupt-parent = <&mpic>;
+                interrupts = <1b 2>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0 0 1 &mpic 0 1
+                        0000 0 0 2 &mpic 1 1
+                        0000 0 0 3 &mpic 2 1
+                        0000 0 0 4 &mpic 3 1
+                        >;
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <02000000 0 c0000000
+                                  02000000 0 c0000000
+                                  0 20000000
+
+                                  01000000 0 00000000
+                                  01000000 0 00000000
+                                  0 00100000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
new file mode 100644
index 000000000000..966edf1161a6
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -0,0 +1,191 @@
+/*
+ * MPC8610 HPCD Device Tree Source
+ *
+ * Copyright 2007 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under the terms of the GNU General Public License Version 2 as published
+ * by the Free Software Foundation.
+ */
+
+
+/ {
+        model = "MPC8610HPCD";
+        compatible = "fsl,MPC8610HPCD";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8610@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <d# 32>;    // bytes
+                        i-cache-line-size = <d# 32>;    // bytes
+                        d-cache-size = <8000>;          // L1, 32K
+                        i-cache-size = <8000>;          // L1, 32K
+                        timebase-frequency = <0>;       // 33 MHz, from uboot
+                        bus-frequency = <0>;            // From uboot
+                        clock-frequency = <0>;          // From uboot
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <00000000 20000000>;      // 512M at 0x0
+        };
+
+        soc@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                #interrupt-cells = <2>;
+                device_type = "soc";
+                ranges = <0 e0000000 00100000>;
+                reg = <e0000000 1000>;
+                bus-frequency = <0>;
+
+                i2c@3000 {
+                        device_type = "i2c";
+                        compatible = "fsl-i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <3000 100>;
+                        interrupts = <2b 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                i2c@3100 {
+                        device_type = "i2c";
+                        compatible = "fsl-i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <3100 100>;
+                        interrupts = <2b 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                serial@4500 {
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <4500 100>;
+                        clock-frequency = <0>;
+                        interrupts = <2a 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial@4600 {
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <4600 100>;
+                        clock-frequency = <0>;
+                        interrupts = <1c 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+
+                mpic: interrupt-controller@40000 {
+                        clock-frequency = <0>;
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <40000 40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                        big-endian;
+                };
+
+                global-utilities@e0000 {
+                        compatible = "fsl,mpc8610-guts";
+                        reg = <e0000 1000>;
+                        fsl,has-rstcr;
+                };
+        };
+
+        pci@e0008000 {
+                compatible = "fsl,mpc8610-pci";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e0008000 1000>;
+                bus-range = <0 0>;
+                ranges = <02000000 0 80000000 80000000 0 10000000
+                          01000000 0 00000000 e1000000 0 00100000>;
+                clock-frequency = <1fca055>;
+                interrupt-parent = <&mpic>;
+                interrupts = <18 2>;
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x11 */
+                        8800 0 0 1 &mpic 4 1
+                        8800 0 0 2 &mpic 5 1
+                        8800 0 0 3 &mpic 6 1
+                        8800 0 0 4 &mpic 7 1
+
+                        /* IDSEL 0x12 */
+                        9000 0 0 1 &mpic 5 1
+                        9000 0 0 2 &mpic 6 1
+                        9000 0 0 3 &mpic 7 1
+                        9000 0 0 4 &mpic 4 1
+                        >;
+        };
+
+        pcie@e000a000 {
+                compatible = "fsl,mpc8641-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <e000a000 1000>;
+                bus-range = <1 3>;
+                ranges = <02000000 0 a0000000 a0000000 0 10000000
+                          01000000 0 00000000 e3000000 0 00100000>;
+                clock-frequency = <1fca055>;
+                interrupt-parent = <&mpic>;
+                interrupts = <1a 2>;
+                interrupt-map-mask = <f800 0 0 7>;
+
+                interrupt-map = <
+                        /* IDSEL 0x1b */
+                        d800 0 0 1 &mpic 2 1
+
+                        /* IDSEL 0x1c*/
+                        e000 0 0 1 &mpic 1 1
+                        e000 0 0 2 &mpic 1 1
+                        e000 0 0 3 &mpic 1 1
+                        e000 0 0 4 &mpic 1 1
+
+                        /* IDSEL 0x1f */
+                        f800 0 0 1 &mpic 3 0
+                        f800 0 0 2 &mpic 0 1
+                >;
+
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <02000000 0 a0000000
+                                  02000000 0 a0000000
+                                  0 10000000
+                                  01000000 0 00000000
+                                  01000000 0 00000000
+                                  0 00100000>;
+                        uli1575@0 {
+                                reg = <0 0 0 0 0>;
+                                #size-cells = <2>;
+                                #address-cells = <3>;
+                                ranges = <02000000 0 a0000000
+                                          02000000 0 a0000000
+                                          0 10000000
+                                          01000000 0 00000000
+                                          01000000 0 00000000
+                                          0 00100000>;
+                        };
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index b0166e5c177e..367765937a06 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -30,7 +30,6 @@
                         timebase-frequency = <0>;       // 33 MHz, from uboot
                         bus-frequency = <0>;            // From uboot
                         clock-frequency = <0>;          // From uboot
-                        32-bit;
                 };
                 PowerPC,8641@1 {
                         device_type = "cpu";
@@ -42,7 +41,6 @@
                         timebase-frequency = <0>;       // 33 MHz, from uboot
                         bus-frequency = <0>;            // From uboot
                         clock-frequency = <0>;          // From uboot
-                        32-bit;
                 };
         };
 
@@ -54,13 +52,8 @@
         soc8641@f8000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
-                ranges = <00001000 f8001000 000ff000
-                          80000000 80000000 20000000
-                          e2000000 e2000000 00100000
-                          a0000000 a0000000 20000000
-                          e3000000 e3000000 00100000>;
+                ranges = <00000000 f8000000 00100000>;
                 reg = <f8000000 00001000>;      // CCSRBAR
                 bus-frequency = <0>;
 
@@ -211,50 +204,81 @@
                         interrupt-parent = <&mpic>;
                 };
 
-                pcie@8000 {
-                        compatible = "fsl,mpc8641-pcie";
-                        device_type = "pci";
-                        #interrupt-cells = <1>;
+                mpic: pic@40000 {
+                        clock-frequency = <0>;
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <40000 40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                        big-endian;
+                };
+
+                global-utilities@e0000 {
+                        compatible = "fsl,mpc8641-guts";
+                        reg = <e0000 1000>;
+                        fsl,has-rstcr;
+                };
+        };
+
+        pcie@f8008000 {
+                compatible = "fsl,mpc8641-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <f8008000 1000>;
+                bus-range = <0 ff>;
+                ranges = <02000000 0 80000000 80000000 0 20000000
+                          01000000 0 00000000 e2000000 0 00100000>;
+                clock-frequency = <1fca055>;
+                interrupt-parent = <&mpic>;
+                interrupts = <18 2>;
+                interrupt-map-mask = <fb00 0 0 0>;
+                interrupt-map = <
+                        /* IDSEL 0x11 */
+                        8800 0 0 1 &i8259 9 2
+                        8800 0 0 2 &i8259 a 2
+                        8800 0 0 3 &i8259 b 2
+                        8800 0 0 4 &i8259 c 2
+
+                        /* IDSEL 0x12 */
+                        9000 0 0 1 &i8259 a 2
+                        9000 0 0 2 &i8259 b 2
+                        9000 0 0 3 &i8259 c 2
+                        9000 0 0 4 &i8259 9 2
+
+                        // IDSEL 0x1c  USB
+                        e000 0 0 0 &i8259 c 2
+                        e100 0 0 0 &i8259 9 2
+                        e200 0 0 0 &i8259 a 2
+                        e300 0 0 0 &i8259 b 2
+
+                        // IDSEL 0x1d  Audio
+                        e800 0 0 0 &i8259 6 2
+
+                        // IDSEL 0x1e Legacy
+                        f000 0 0 0 &i8259 7 2
+                        f100 0 0 0 &i8259 7 2
+
+                        // IDSEL 0x1f IDE/SATA
+                        f800 0 0 0 &i8259 e 2
+                        f900 0 0 0 &i8259 5 2
+                        >;
+
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
                         #size-cells = <2>;
                         #address-cells = <3>;
-                        reg = <8000 1000>;
-                        bus-range = <0 ff>;
-                        ranges = <02000000 0 80000000 80000000 0 20000000
-                                  01000000 0 00000000 e2000000 0 00100000>;
-                        clock-frequency = <1fca055>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <18 2>;
-                        interrupt-map-mask = <fb00 0 0 0>;
-                        interrupt-map = <
-                                /* IDSEL 0x11 */
-                                8800 0 0 1 &i8259 9 2
-                                8800 0 0 2 &i8259 a 2
-                                8800 0 0 3 &i8259 b 2
-                                8800 0 0 4 &i8259 c 2
-
-                                /* IDSEL 0x12 */
-                                9000 0 0 1 &i8259 a 2
-                                9000 0 0 2 &i8259 b 2
-                                9000 0 0 3 &i8259 c 2
-                                9000 0 0 4 &i8259 9 2
-
-                                // IDSEL 0x1c  USB
-                                e000 0 0 0 &i8259 c 2
-                                e100 0 0 0 &i8259 9 2
-                                e200 0 0 0 &i8259 a 2
-                                e300 0 0 0 &i8259 b 2
-
-                                // IDSEL 0x1d  Audio
-                                e800 0 0 0 &i8259 6 2
-
-                                // IDSEL 0x1e Legacy
-                                f000 0 0 0 &i8259 7 2
-                                f100 0 0 0 &i8259 7 2
-
-                                // IDSEL 0x1f IDE/SATA
-                                f800 0 0 0 &i8259 e 2
-                                f900 0 0 0 &i8259 5 2
-                                >;
+                        device_type = "pci";
+                        ranges = <02000000 0 80000000
+                                  02000000 0 80000000
+                                  0 20000000
+
+                                  01000000 0 00000000
+                                  01000000 0 00000000
+                                  0 00100000>;
                         uli1575@0 {
                                 reg = <0 0 0 0 0>;
                                 #size-cells = <2>;
@@ -265,111 +289,96 @@
                                           01000000 0 00000000
                                           01000000 0 00000000
                                           0 00100000>;
+                                isa@1e {
+                                        device_type = "isa";
+                                        #interrupt-cells = <2>;
+                                        #size-cells = <1>;
+                                        #address-cells = <2>;
+                                        reg = <f000 0 0 0 0>;
+                                        ranges = <1 0 01000000 0 0
+                                                  00001000>;
+                                        interrupt-parent = <&i8259>;
 
-                                pci_bridge@0 {
-                                        reg = <0 0 0 0 0>;
-                                        #size-cells = <2>;
-                                        #address-cells = <3>;
-                                        ranges = <02000000 0 80000000
-                                                  02000000 0 80000000
-                                                  0 20000000
-                                                  01000000 0 00000000
-                                                  01000000 0 00000000
-                                                  0 00100000>;
-
-                                        isa@1e {
-                                                device_type = "isa";
+                                        i8259: interrupt-controller@20 {
+                                                reg = <1 20 2
+                                                       1 a0 2
+                                                       1 4d0 2>;
+                                                interrupt-controller;
+                                                device_type = "interrupt-controller";
+                                                #address-cells = <0>;
                                                 #interrupt-cells = <2>;
-                                                #size-cells = <1>;
-                                                #address-cells = <2>;
-                                                reg = <f000 0 0 0 0>;
-                                                ranges = <1 0 01000000 0 0
-                                                          00001000>;
-                                                interrupt-parent = <&i8259>;
-
-                                                i8259: interrupt-controller@20 {
-                                                        reg = <1 20 2
-                                                               1 a0 2
-                                                               1 4d0 2>;
-                                                        clock-frequency = <0>;
-                                                        interrupt-controller;
-                                                        device_type = "interrupt-controller";
-                                                        #address-cells = <0>;
-                                                        #interrupt-cells = <2>;
-                                                        built-in;
-                                                        compatible = "chrp,iic";
-                                                        interrupts = <9 2>;
-                                                        interrupt-parent =
-                                                                <&mpic>;
-                                                };
+                                                compatible = "chrp,iic";
+                                                interrupts = <9 2>;
+                                                interrupt-parent = <&mpic>;
+                                        };
 
-                                                i8042@60 {
-                                                        #size-cells = <0>;
-                                                        #address-cells = <1>;
-                                                        reg = <1 60 1 1 64 1>;
-                                                        interrupts = <1 3 c 3>;
-                                                        interrupt-parent =
-                                                                <&i8259>;
-
-                                                        keyboard@0 {
-                                                                reg = <0>;
-                                                                compatible = "pnpPNP,303";
-                                                        };
-
-                                                        mouse@1 {
-                                                                reg = <1>;
-                                                                compatible = "pnpPNP,f03";
-                                                        };
-                                                };
+                                        i8042@60 {
+                                                #size-cells = <0>;
+                                                #address-cells = <1>;
+                                                reg = <1 60 1 1 64 1>;
+                                                interrupts = <1 3 c 3>;
+                                                interrupt-parent =
+                                                        <&i8259>;
 
-                                                rtc@70 {
-                                                        compatible =
-                                                                "pnpPNP,b00";
-                                                        reg = <1 70 2>;
+                                                keyboard@0 {
+                                                        reg = <0>;
+                                                        compatible = "pnpPNP,303";
                                                 };
 
-                                                gpio@400 {
-                                                        reg = <1 400 80>;
+                                                mouse@1 {
+                                                        reg = <1>;
+                                                        compatible = "pnpPNP,f03";
                                                 };
                                         };
+
+                                        rtc@70 {
+                                                compatible =
+                                                        "pnpPNP,b00";
+                                                reg = <1 70 2>;
+                                        };
+
+                                        gpio@400 {
+                                                reg = <1 400 80>;
+                                        };
                                 };
                         };
-
                 };
 
-                pcie@9000 {
-                        compatible = "fsl,mpc8641-pcie";
-                        device_type = "pci";
-                        #interrupt-cells = <1>;
+        };
+
+        pcie@f8009000 {
+                compatible = "fsl,mpc8641-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <f8009000 1000>;
+                bus-range = <0 ff>;
+                ranges = <02000000 0 a0000000 a0000000 0 20000000
+                          01000000 0 00000000 e3000000 0 00100000>;
+                clock-frequency = <1fca055>;
+                interrupt-parent = <&mpic>;
+                interrupts = <19 2>;
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0 0 1 &mpic 4 1
+                        0000 0 0 2 &mpic 5 1
+                        0000 0 0 3 &mpic 6 1
+                        0000 0 0 4 &mpic 7 1
+                        >;
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
                         #size-cells = <2>;
                         #address-cells = <3>;
-                        reg = <9000 1000>;
-                        bus-range = <0 ff>;
-                        ranges = <02000000 0 a0000000 a0000000 0 20000000
-                                  01000000 0 00000000 e3000000 0 00100000>;
-                        clock-frequency = <1fca055>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <19 2>;
-                        interrupt-map-mask = <f800 0 0 7>;
-                        interrupt-map = <
-                                /* IDSEL 0x0 */
-                                0000 0 0 1 &mpic 4 1
-                                0000 0 0 2 &mpic 5 1
-                                0000 0 0 3 &mpic 6 1
-                                0000 0 0 4 &mpic 7 1
-                                >;
-                };
+                        device_type = "pci";
+                        ranges = <02000000 0 a0000000
+                                  02000000 0 a0000000
+                                  0 20000000
 
-                mpic: pic@40000 {
-                        clock-frequency = <0>;
-                        interrupt-controller;
-                        #address-cells = <0>;
-                        #interrupt-cells = <2>;
-                        reg = <40000 40000>;
-                        built-in;
-                        compatible = "chrp,open-pic";
-                        device_type = "open-pic";
-                        big-endian;
+                                  01000000 0 00000000
+                                  01000000 0 00000000
+                                  0 00100000>;
                 };
         };
 };
diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts
index e5e7726ddb03..90f2293ed3cd 100644
--- a/arch/powerpc/boot/dts/mpc866ads.dts
+++ b/arch/powerpc/boot/dts/mpc866ads.dts
@@ -30,7 +30,6 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
-                        32-bit;
                         interrupts = <f 2>;     // decrementer interrupt
                         interrupt-parent = <&Mpc8xx_pic>;
                 };
@@ -44,7 +43,6 @@
         soc866@ff000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
                 ranges = <0 ff000000 00100000>;
                 reg = <ff000000 00000200>;
@@ -78,7 +76,6 @@
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0 24>;
-                        built-in;
                         device_type = "mpc8xx-pic";
                         compatible = "CPM";
                 };
@@ -86,7 +83,6 @@
                 cpm@ff000000 {
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        #interrupt-cells = <2>;
                         device_type = "cpm";
                         model = "CPM";
                         ranges = <0 0 4000>;
@@ -103,7 +99,6 @@
                                 interrupts = <5 2 0 2>;
                                 interrupt-parent = <&Mpc8xx_pic>;
                                 reg = <930 20>;
-                                built-in;
                                 device_type = "cpm-pic";
                                 compatible = "CPM";
                         };
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts
index dc7ab9c80611..8848e637293e 100644
--- a/arch/powerpc/boot/dts/mpc885ads.dts
+++ b/arch/powerpc/boot/dts/mpc885ads.dts
@@ -2,6 +2,7 @@
  * MPC885 ADS Device Tree Source
  *
  * Copyright 2006 MontaVista Software, Inc.
+ * Copyright 2007 Freescale Semiconductor, Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -12,7 +13,7 @@
 
 / {
         model = "MPC885ADS";
-        compatible = "mpc8xx";
+        compatible = "fsl,mpc885ads";
         #address-cells = <1>;
         #size-cells = <1>;
 
@@ -23,161 +24,199 @@
                 PowerPC,885@0 {
                         device_type = "cpu";
                         reg = <0>;
-                        d-cache-line-size = <20>;       // 32 bytes
-                        i-cache-line-size = <20>;       // 32 bytes
-                        d-cache-size = <2000>;          // L1, 8K
-                        i-cache-size = <2000>;          // L1, 8K
+                        d-cache-line-size = <d#16>;
+                        i-cache-line-size = <d#16>;
+                        d-cache-size = <d#8192>;
+                        i-cache-size = <d#8192>;
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
-                        32-bit;
                         interrupts = <f 2>;     // decrementer interrupt
-                        interrupt-parent = <&Mpc8xx_pic>;
+                        interrupt-parent = <&PIC>;
                 };
         };
 
         memory {
                 device_type = "memory";
-                reg = <00000000 800000>;
+                reg = <0 0>;
         };
 
-        soc885@ff000000 {
+        localbus@ff000100 {
+                compatible = "fsl,mpc885-localbus", "fsl,pq1-localbus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <ff000100 40>;
+
+                ranges = <
+                        0 0 fe000000 00800000
+                        1 0 ff080000 00008000
+                        5 0 ff0a0000 00008000
+                >;
+
+                flash@0,0 {
+                        compatible = "jedec-flash";
+                        reg = <0 0 800000>;
+                        bank-width = <4>;
+                        device-width = <1>;
+                };
+
+                board-control@1,0 {
+                        reg = <1 0 20 5 300 4>;
+                        compatible = "fsl,mpc885ads-bcsr";
+                };
+        };
+
+        soc@ff000000 {
+                compatible = "fsl,mpc885", "fsl,pq1-soc";
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <2>;
                 device_type = "soc";
-                ranges = <0 ff000000 00100000>;
-                reg = <ff000000 00000200>;
+                ranges = <0 ff000000 00004000>;
                 bus-frequency = <0>;
-                mdio@e80 {
-                        device_type = "mdio";
-                        compatible = "fs_enet";
-                        reg = <e80 8>;
+
+                // Temporary -- will go away once kernel uses ranges for get_immrbase().
+                reg = <ff000000 4000>;
+
+                mdio@e00 {
+                        compatible = "fsl,mpc885-fec-mdio", "fsl,pq1-fec-mdio";
+                        reg = <e00 188>;
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        Phy0: ethernet-phy@0 {
+
+                        PHY0: ethernet-phy@0 {
                                 reg = <0>;
                                 device_type = "ethernet-phy";
                         };
-                        Phy1: ethernet-phy@1 {
+
+                        PHY1: ethernet-phy@1 {
                                 reg = <1>;
                                 device_type = "ethernet-phy";
                         };
-                        Phy2: ethernet-phy@2 {
+
+                        PHY2: ethernet-phy@2 {
                                 reg = <2>;
                                 device_type = "ethernet-phy";
                         };
                 };
 
-                fec@e00 {
+                ethernet@e00 {
                         device_type = "network";
-                        compatible = "fs_enet";
-                        model = "FEC";
-                        device-id = <1>;
+                        compatible = "fsl,mpc885-fec-enet",
+                                     "fsl,pq1-fec-enet";
                         reg = <e00 188>;
-                        mac-address = [ 00 00 0C 00 01 FD ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <3 1>;
-                        interrupt-parent = <&Mpc8xx_pic>;
-                        phy-handle = <&Phy1>;
+                        interrupt-parent = <&PIC>;
+                        phy-handle = <&PHY0>;
+                        linux,network-index = <0>;
                 };
 
-                fec@1e00 {
+                ethernet@1e00 {
                         device_type = "network";
-                        compatible = "fs_enet";
-                        model = "FEC";
-                        device-id = <2>;
+                        compatible = "fsl,mpc885-fec-enet",
+                                     "fsl,pq1-fec-enet";
                         reg = <1e00 188>;
-                        mac-address = [ 00 00 0C 00 02 FD ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <7 1>;
-                        interrupt-parent = <&Mpc8xx_pic>;
-                        phy-handle = <&Phy2>;
+                        interrupt-parent = <&PIC>;
+                        phy-handle = <&PHY1>;
+                        linux,network-index = <1>;
                 };
 
-                Mpc8xx_pic: pic@ff000000 {
+                PIC: interrupt-controller@0 {
                         interrupt-controller;
-                        #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0 24>;
-                        built-in;
-                        device_type = "mpc8xx-pic";
-                        compatible = "CPM";
+                        compatible = "fsl,mpc885-pic", "fsl,pq1-pic";
                 };
 
-                pcmcia@0080 {
+                pcmcia@80 {
                         #address-cells = <3>;
                         #interrupt-cells = <1>;
                         #size-cells = <2>;
                         compatible = "fsl,pq-pcmcia";
                         device_type = "pcmcia";
                         reg = <80 80>;
-                        interrupt-parent = <&Mpc8xx_pic>;
+                        interrupt-parent = <&PIC>;
                         interrupts = <d 1>;
                 };
 
-                cpm@ff000000 {
+                cpm@9c0 {
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        #interrupt-cells = <2>;
-                        device_type = "cpm";
-                        model = "CPM";
-                        ranges = <0 0 4000>;
-                        reg = <860 f0>;
+                        compatible = "fsl,mpc885-cpm", "fsl,cpm1";
                         command-proc = <9c0>;
-                        brg-frequency = <0>;
-                        interrupts = <0 2>;     // cpm error interrupt
-                        interrupt-parent = <&Cpm_pic>;
+                        interrupts = <0>;       // cpm error interrupt
+                        interrupt-parent = <&CPM_PIC>;
+                        reg = <9c0 40>;
+                        ranges;
+
+                        muram@2000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 2000 2000>;
 
-                        Cpm_pic: pic@930 {
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 1c00>;
+                                };
+                        };
+
+                        brg@9f0 {
+                                compatible = "fsl,mpc885-brg",
+                                             "fsl,cpm1-brg",
+                                             "fsl,cpm-brg";
+                                reg = <9f0 10>;
+                        };
+
+                        CPM_PIC: interrupt-controller@930 {
                                 interrupt-controller;
-                                #address-cells = <0>;
-                                #interrupt-cells = <2>;
+                                #interrupt-cells = <1>;
                                 interrupts = <5 2 0 2>;
-                                interrupt-parent = <&Mpc8xx_pic>;
+                                interrupt-parent = <&PIC>;
                                 reg = <930 20>;
-                                built-in;
-                                device_type = "cpm-pic";
-                                compatible = "CPM";
+                                compatible = "fsl,mpc885-cpm-pic",
+                                             "fsl,cpm1-pic";
                         };
 
-                        smc@a80 {
+                        serial@a80 {
                                 device_type = "serial";
-                                compatible = "cpm_uart";
-                                model = "SMC";
-                                device-id = <1>;
+                                compatible = "fsl,mpc885-smc-uart",
+                                             "fsl,cpm1-smc-uart";
                                 reg = <a80 10 3e80 40>;
-                                clock-setup = <00ffffff 0>;
-                                rx-clock = <1>;
-                                tx-clock = <1>;
-                                current-speed = <0>;
-                                interrupts = <4 3>;
-                                interrupt-parent = <&Cpm_pic>;
+                                interrupts = <4>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-brg = <1>;
+                                fsl,cpm-command = <0090>;
                         };
 
-                        smc@a90 {
+                        serial@a90 {
                                 device_type = "serial";
-                                compatible = "cpm_uart";
-                                model = "SMC";
-                                device-id = <2>;
-                                reg = <a90 20 3f80 40>;
-                                clock-setup = <ff00ffff 90000>;
-                                rx-clock = <2>;
-                                tx-clock = <2>;
-                                current-speed = <0>;
-                                interrupts = <3 3>;
-                                interrupt-parent = <&Cpm_pic>;
+                                compatible = "fsl,mpc885-smc-uart",
+                                             "fsl,cpm1-smc-uart";
+                                reg = <a90 10 3f80 40>;
+                                interrupts = <3>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-brg = <2>;
+                                fsl,cpm-command = <00d0>;
                         };
 
-                        scc@a40 {
+                        ethernet@a40 {
                                 device_type = "network";
-                                compatible = "fs_enet";
-                                model = "SCC";
-                                device-id = <3>;
-                                reg = <a40 18 3e00 80>;
-                                mac-address = [ 00 00 0C 00 03 FD ];
-                                interrupts = <1c 3>;
-                                interrupt-parent = <&Cpm_pic>;
-                                phy-handle = <&Phy2>;
+                                compatible = "fsl,mpc885-scc-enet",
+                                             "fsl,cpm1-scc-enet";
+                                reg = <a40 18 3e00 100>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                                interrupts = <1c>;
+                                interrupt-parent = <&CPM_PIC>;
+                                phy-handle = <&PHY2>;
+                                fsl,cpm-command = <0080>;
+                                linux,network-index = <2>;
                         };
                 };
         };
+
+        chosen {
+                linux,stdout-path = "/soc/cpm/serial@a80";
+        };
 };
diff --git a/arch/powerpc/boot/dts/pq2fads.dts b/arch/powerpc/boot/dts/pq2fads.dts
new file mode 100644
index 000000000000..2d564921897a
--- /dev/null
+++ b/arch/powerpc/boot/dts/pq2fads.dts
@@ -0,0 +1,240 @@
+/*
+ * Device Tree for the PQ2FADS-ZU board with an MPC8280 chip.
+ *
+ * Copyright 2007 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/ {
+        model = "pq2fads";
+        compatible = "fsl,pq2fads";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <d#32>;
+                        i-cache-line-size = <d#32>;
+                        d-cache-size = <d#16384>;
+                        i-cache-size = <d#16384>;
+                        timebase-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0>;
+        };
+
+        localbus@f0010100 {
+                compatible = "fsl,mpc8280-localbus",
+                             "fsl,pq2-localbus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <f0010100 60>;
+
+                ranges = <0 0 fe000000 00800000
+                          1 0 f4500000 00008000
+                          8 0 f8200000 00008000>;
+
+                flash@0,0 {
+                        compatible = "jedec-flash";
+                        reg = <0 0 800000>;
+                        bank-width = <4>;
+                        device-width = <1>;
+                };
+
+                bcsr@1,0 {
+                        reg = <1 0 20>;
+                        compatible = "fsl,pq2fads-bcsr";
+                };
+
+                PCI_PIC: pic@8,0 {
+                        #interrupt-cells = <1>;
+                        interrupt-controller;
+                        reg = <8 0 8>;
+                        compatible = "fsl,pq2ads-pci-pic";
+                        interrupt-parent = <&PIC>;
+                        interrupts = <18 8>;
+                };
+        };
+
+        pci@f0010800 {
+                device_type = "pci";
+                reg = <f0010800 10c f00101ac 8 f00101c4 8>;
+                compatible = "fsl,mpc8280-pci", "fsl,pq2-pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                clock-frequency = <d#66000000>;
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <
+                                /* IDSEL 0x16 */
+                                 b000 0 0 1 &PCI_PIC 0
+                                 b000 0 0 2 &PCI_PIC 1
+                                 b000 0 0 3 &PCI_PIC 2
+                                 b000 0 0 4 &PCI_PIC 3
+
+                                /* IDSEL 0x17 */
+                                 b800 0 0 1 &PCI_PIC 4
+                                 b800 0 0 2 &PCI_PIC 5
+                                 b800 0 0 3 &PCI_PIC 6
+                                 b800 0 0 4 &PCI_PIC 7
+
+                                /* IDSEL 0x18 */
+                                 c000 0 0 1 &PCI_PIC 8
+                                 c000 0 0 2 &PCI_PIC 9
+                                 c000 0 0 3 &PCI_PIC a
+                                 c000 0 0 4 &PCI_PIC b>;
+
+                interrupt-parent = <&PIC>;
+                interrupts = <12 8>;
+                ranges = <42000000 0 80000000 80000000 0 20000000
+                          02000000 0 a0000000 a0000000 0 20000000
+                          01000000 0 00000000 f6000000 0 02000000>;
+        };
+
+        soc@f0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "fsl,mpc8280", "fsl,pq2-soc";
+                ranges = <00000000 f0000000 00053000>;
+
+                // Temporary -- will go away once kernel uses ranges for get_immrbase().
+                reg = <f0000000 00053000>;
+
+                cpm@119c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        #interrupt-cells = <2>;
+                        compatible = "fsl,mpc8280-cpm", "fsl,cpm2";
+                        reg = <119c0 30>;
+                        ranges;
+
+                        muram@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0 10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 2000 9800 800>;
+                                };
+                        };
+
+                        brg@119f0 {
+                                compatible = "fsl,mpc8280-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <119f0 10 115f0 10>;
+                        };
+
+                        serial@11a00 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc8280-scc-uart",
+                                             "fsl,cpm2-scc-uart";
+                                reg = <11a00 20 8000 100>;
+                                interrupts = <28 8>;
+                                interrupt-parent = <&PIC>;
+                                fsl,cpm-brg = <1>;
+                                fsl,cpm-command = <00800000>;
+                        };
+
+                        serial@11a20 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc8280-scc-uart",
+                                             "fsl,cpm2-scc-uart";
+                                reg = <11a20 20 8100 100>;
+                                interrupts = <29 8>;
+                                interrupt-parent = <&PIC>;
+                                fsl,cpm-brg = <2>;
+                                fsl,cpm-command = <04a00000>;
+                        };
+
+                        ethernet@11320 {
+                                device_type = "network";
+                                compatible = "fsl,mpc8280-fcc-enet",
+                                             "fsl,cpm2-fcc-enet";
+                                reg = <11320 20 8500 100 113b0 1>;
+                                interrupts = <21 8>;
+                                interrupt-parent = <&PIC>;
+                                phy-handle = <&PHY0>;
+                                linux,network-index = <0>;
+                                fsl,cpm-command = <16200300>;
+                        };
+
+                        ethernet@11340 {
+                                device_type = "network";
+                                compatible = "fsl,mpc8280-fcc-enet",
+                                             "fsl,cpm2-fcc-enet";
+                                reg = <11340 20 8600 100 113d0 1>;
+                                interrupts = <22 8>;
+                                interrupt-parent = <&PIC>;
+                                phy-handle = <&PHY1>;
+                                linux,network-index = <1>;
+                                fsl,cpm-command = <1a400300>;
+                                local-mac-address = [00 e0 0c 00 79 01];
+                        };
+
+                        mdio@10d40 {
+                                device_type = "mdio";
+                                compatible = "fsl,pq2fads-mdio-bitbang",
+                                             "fsl,mpc8280-mdio-bitbang",
+                                             "fsl,cpm2-mdio-bitbang";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                reg = <10d40 14>;
+                                fsl,mdio-pin = <9>;
+                                fsl,mdc-pin = <a>;
+
+                                PHY0: ethernet-phy@0 {
+                                        interrupt-parent = <&PIC>;
+                                        interrupts = <19 2>;
+                                        reg = <0>;
+                                        device_type = "ethernet-phy";
+                                };
+
+                                PHY1: ethernet-phy@1 {
+                                        interrupt-parent = <&PIC>;
+                                        interrupts = <19 2>;
+                                        reg = <3>;
+                                        device_type = "ethernet-phy";
+                                };
+                        };
+
+                        usb@11b60 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,mpc8280-usb",
+                                             "fsl,cpm2-usb";
+                                reg = <11b60 18 8b00 100>;
+                                interrupt-parent = <&PIC>;
+                                interrupts = <b 8>;
+                                fsl,cpm-command = <2e600000>;
+                        };
+                };
+
+                PIC: interrupt-controller@10c00 {
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        reg = <10c00 80>;
+                        compatible = "fsl,mpc8280-pic", "fsl,cpm2-pic";
+                };
+
+        };
+
+        chosen {
+                linux,stdout-path = "/soc/cpm/serial@11a00";
+        };
+};
diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 5300b50cdc2f..297dfa53fe9e 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -9,10 +9,6 @@
  *
  * Property values that are labeled as "Default" will be updated by bootwrapper
  * if it can determine the exact PrPMC type.
- *
- * To build:
- *   dtc -I dts -O asm -o prpmc2800.S -b 0 prpmc2800.dts
- *   dtc -I dts -O dtb -o prpmc2800.dtb -b 0 prpmc2800.dts
  */
 
 / {
@@ -47,7 +43,6 @@
         mv64x60@f1000000 { /* Marvell Discovery */
                 #address-cells = <1>;
                 #size-cells = <1>;
-                #interrupt-cells = <1>;
                 model = "mv64360";                      /* Default */
                 compatible = "marvell,mv64x60";
                 clock-frequency = <7f28155>;            /* 133.333333 MHz */
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
new file mode 100644
index 000000000000..36be75b04de1
--- /dev/null
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -0,0 +1,302 @@
+/*
+ * Device Tree Source for AMCC Sequoia
+ *
+ * Based on Bamboo code by Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ * Copyright (c) 2006, 2007 IBM Corp.
+ *
+ * FIXME: Draft only!
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ *
+ */
+
+/ {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        model = "amcc,sequoia";
+        compatible = "amcc,sequoia";
+        dcr-parent = <&/cpus/PowerPC,440EPx@0>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,440EPx@0 {
+                        device_type = "cpu";
+                        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-440epx","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-440epx","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-440epx","ibm,uic";
+                interrupt-controller;
+                cell-index = <2>;
+                dcr-reg = <0e0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1c 4 1d 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        SDR0: sdr {
+                compatible = "ibm,sdr-440epx", "ibm,sdr-440ep";
+                dcr-reg = <00e 002>;
+        };
+
+        CPR0: cpr {
+                compatible = "ibm,cpr-440epx", "ibm,cpr-440ep";
+                dcr-reg = <00c 002>;
+        };
+
+        plb {
+                compatible = "ibm,plb-440epx", "ibm,plb4";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by zImage */
+
+                SDRAM0: sdram {
+                        device_type = "memory-controller";
+                        compatible = "ibm,sdram-440epx", "ibm,sdram-44x-ddr2denali";
+                        dcr-reg = <010 2>;
+                };
+
+                DMA0: dma {
+                        compatible = "ibm,dma-440epx", "ibm,dma-4xx";
+                        dcr-reg = <100 027>;
+                };
+
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-440epx", "ibm,mcmal2";
+                        dcr-reg = <180 62>;
+                        num-tx-chans = <2>;
+                        num-rx-chans = <2>;
+                        interrupt-parent = <&MAL0>;
+                        interrupts = <0 1 2 3 4>;
+                        #interrupt-cells = <1>;
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
+                                        /*RXEOB*/ 1 &UIC0 b 4
+                                        /*SERR*/  2 &UIC1 0 4
+                                        /*TXDE*/  3 &UIC1 1 4
+                                        /*RXDE*/  4 &UIC1 2 4>;
+                        interrupt-map-mask = <ffffffff>;
+                };
+
+                POB0: opb {
+                        compatible = "ibm,opb-440epx", "ibm,opb";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <00000000 1 00000000 80000000
+                                  80000000 1 80000000 80000000>;
+                        interrupt-parent = <&UIC1>;
+                        interrupts = <7 4>;
+                        clock-frequency = <0>; /* Filled in by zImage */
+
+                        EBC0: ebc {
+                                compatible = "ibm,ebc-440epx", "ibm,ebc";
+                                dcr-reg = <012 2>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                interrupts = <5 1>;
+                                interrupt-parent = <&UIC1>;
+
+                                nor_flash@0,0 {
+                                        compatible = "amd,s29gl256n", "cfi-flash";
+                                        bank-width = <2>;
+                                        reg = <0 000000 4000000>;
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+                                        partition@0 {
+                                                label = "Kernel";
+                                                reg = <0 180000>;
+                                        };
+                                        partition@180000 {
+                                                label = "ramdisk";
+                                                reg = <180000 200000>;
+                                        };
+                                        partition@380000 {
+                                                label = "file system";
+                                                reg = <380000 3aa0000>;
+                                        };
+                                        partition@3e20000 {
+                                                label = "kozio";
+                                                reg = <3e20000 140000>;
+                                        };
+                                        partition@3f60000 {
+                                                label = "env";
+                                                reg = <3f60000 40000>;
+                                        };
+                                        partition@3fa0000 {
+                                                label = "u-boot";
+                                                reg = <3fa0000 60000>;
+                                        };
+                                };
+
+                        };
+
+                        UART0: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600300 8>;
+                                virtual-reg = <ef600300>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                current-speed = <1c200>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <0 4>;
+                        };
+
+                        UART1: serial@ef600400 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600400 8>;
+                                virtual-reg = <ef600400>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+
+                        UART2: serial@ef600500 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600500 8>;
+                                virtual-reg = <ef600500>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <3 4>;
+                        };
+
+                        UART3: serial@ef600600 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600600 8>;
+                                virtual-reg = <ef600600>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <4 4>;
+                        };
+
+                        IIC0: i2c@ef600700 {
+                                device_type = "i2c";
+                                compatible = "ibm,iic-440epx", "ibm,iic";
+                                reg = <ef600700 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+
+                        IIC1: i2c@ef600800 {
+                                device_type = "i2c";
+                                compatible = "ibm,iic-440epx", "ibm,iic";
+                                reg = <ef600800 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <7 4>;
+                        };
+
+                        ZMII0: emac-zmii@ef600d00 {
+                                device_type = "zmii-interface";
+                                compatible = "ibm,zmii-440epx", "ibm,zmii";
+                                reg = <ef600d00 c>;
+                        };
+
+                        EMAC0: ethernet@ef600e00 {
+                                linux,network-index = <0>;
+                                device_type = "network";
+                                compatible = "ibm,emac-440epx", "ibm,emac4";
+                                interrupt-parent = <&EMAC0>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC0 18 4
+                                                /*Wake*/  1 &UIC1 1d 4>;
+                                reg = <ef600e00 70>;
+                                local-mac-address = [000000000000];
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <0>;
+                                mal-rx-channel = <0>;
+                                cell-index = <0>;
+                                max-frame-size = <5dc>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rmii";
+                                phy-map = <00000000>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <0>;
+                        };
+
+                        EMAC1: ethernet@ef600f00 {
+                                linux,network-index = <1>;
+                                device_type = "network";
+                                compatible = "ibm,emac-440epx", "ibm,emac4";
+                                interrupt-parent = <&EMAC1>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC0 19 4
+                                                /*Wake*/  1 &UIC1 1f 4>;
+                                reg = <ef600f00 70>;
+                                local-mac-address = [000000000000];
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <1>;
+                                mal-rx-channel = <1>;
+                                cell-index = <1>;
+                                max-frame-size = <5dc>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rmii";
+                                phy-map = <00000000>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <1>;
+                        };
+                };
+        };
+
+        chosen {
+                linux,stdout-path = "/plb/opb/serial@ef600300";
+                bootargs = "console=ttyS0,115200";
+        };
+};
diff --git a/arch/powerpc/boot/dts/walnut.dts b/arch/powerpc/boot/dts/walnut.dts
new file mode 100644
index 000000000000..ec54f4e04ad6
--- /dev/null
+++ b/arch/powerpc/boot/dts/walnut.dts
@@ -0,0 +1,190 @@
+/*
+ * Device Tree Source for IBM Walnut
+ *
+ * Copyright 2007 IBM Corp.
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ */
+
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        model = "ibm,walnut";
+        compatible = "ibm,walnut";
+        dcr-parent = <&/cpus/PowerPC,405GP@0>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,405GP@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        clock-frequency = <bebc200>; /* Filled in by zImage */
+                        timebase-frequency = <0>; /* Filled in by zImage */
+                        i-cache-line-size = <20>;
+                        d-cache-line-size = <20>;
+                        i-cache-size = <4000>;
+                        d-cache-size = <4000>;
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0>; /* Filled in by zImage */
+        };
+
+        UIC0: interrupt-controller {
+                compatible = "ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0c0 9>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+
+        plb {
+                compatible = "ibm,plb3";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by zImage */
+
+                SDRAM0: memory-controller {
+                        compatible = "ibm,sdram-405gp";
+                        dcr-reg = <010 2>;
+                };
+
+                MAL: mcmal {
+                        compatible = "ibm,mcmal-405gp", "ibm,mcmal";
+                        dcr-reg = <180 62>;
+                        num-tx-chans = <2>;
+                        num-rx-chans = <1>;
+                        interrupt-parent = <&UIC0>;
+                        interrupts = <a 4 b 4 c 4 d 4 e 4>;
+                };
+
+                POB0: opb {
+                        compatible = "ibm,opb-405gp", "ibm,opb";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <ef600000 ef600000 a00000>;
+                        dcr-reg = <0a0 5>;
+                        clock-frequency = <0>; /* Filled in by zImage */
+
+                        UART0: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600300 8>;
+                                virtual-reg = <ef600300>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                current-speed = <2580>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <0 4>;
+                        };
+
+                        UART1: serial@ef600400 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600400 8>;
+                                virtual-reg = <ef600400>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                current-speed = <2580>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+
+                        IIC: i2c@ef600500 {
+                                compatible = "ibm,iic-405gp", "ibm,iic";
+                                reg = <ef600500 11>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+
+                        GPIO: gpio@ef600700 {
+                                compatible = "ibm,gpio-405gp";
+                                reg = <ef600700 20>;
+                        };
+
+                        EMAC: ethernet@ef600800 {
+                                linux,network-index = <0>;
+                                device_type = "network";
+                                compatible = "ibm,emac-405gp", "ibm,emac";
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <9 4 f 4>;
+                                reg = <ef600800 70>;
+                                mal-device = <&MAL>;
+                                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 = <00000001>;
+                        };
+
+                };
+
+                EBC0: ebc {
+                        compatible = "ibm,ebc-405gp", "ibm,ebc";
+                        dcr-reg = <012 2>;
+                        #address-cells = <2>;
+                        #size-cells = <1>;
+                        /* The ranges property is supplied by the bootwrapper
+                         * and is based on the firmware's configuration of the
+                         * EBC bridge
+                         */
+                        clock-frequency = <0>; /* Filled in by zImage */
+
+                        sram@0,0 {
+                                reg = <0 0 80000>;
+                        };
+
+                        flash@0,80000 {
+                                compatible = "jedec-flash";
+                                bank-width = <1>;
+                                reg = <0 80000 80000>;
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                partition@0 {
+                                        label = "OpenBIOS";
+                                        reg = <0 80000>;
+                                        read-only;
+                                };
+                        };
+
+                        ds1743@1,0 {
+                                /* NVRAM and RTC */
+                                compatible = "ds1743";
+                                reg = <1 0 2000>;
+                        };
+
+                        keyboard@2,0 {
+                                compatible = "intel,82C42PC";
+                                reg = <2 0 2>;
+                        };
+
+                        ir@3,0 {
+                                compatible = "ti,TIR2000PAG";
+                                reg = <3 0 10>;
+                        };
+
+                        fpga@7,0 {
+                                compatible = "Walnut-FPGA";
+                                reg = <7 0 10>;
+                                virtual-reg = <f0300005>;
+                        };
+                };
+        };
+
+        chosen {
+                linux,stdout-path = "/plb/opb/serial@ef600300";
+        };
+};
diff --git a/arch/powerpc/boot/ebony.c b/arch/powerpc/boot/ebony.c
index 75daedafd0a4..86c0f5df0a86 100644
--- a/arch/powerpc/boot/ebony.c
+++ b/arch/powerpc/boot/ebony.c
@@ -24,12 +24,11 @@
 #include "page.h"
 #include "ops.h"
 #include "reg.h"
+#include "io.h"
 #include "dcr.h"
+#include "4xx.h"
 #include "44x.h"
 
-extern char _dtb_start[];
-extern char _dtb_end[];
-
 static u8 *ebony_mac0, *ebony_mac1;
 
 /* Calculate 440GP clocks */
@@ -92,15 +91,53 @@ void ibm440gp_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)
         dt_fixup_clock("/plb/opb/serial@40000300", uart1);
 }
 
+#define EBONY_FPGA_PATH         "/plb/opb/ebc/fpga"
+#define EBONY_FPGA_FLASH_SEL    0x01
+#define EBONY_SMALL_FLASH_PATH  "/plb/opb/ebc/small-flash"
+
+static void ebony_flashsel_fixup(void)
+{
+        void *devp;
+        u32 reg[3] = {0x0, 0x0, 0x80000};
+        u8 *fpga;
+        u8 fpga_reg0 = 0x0;
+
+        devp = finddevice(EBONY_FPGA_PATH);
+        if (!devp)
+                fatal("Couldn't locate FPGA node %s\n\r", EBONY_FPGA_PATH);
+
+        if (getprop(devp, "virtual-reg", &fpga, sizeof(fpga)) != sizeof(fpga))
+                fatal("%s has missing or invalid virtual-reg property\n\r",
+                      EBONY_FPGA_PATH);
+
+        fpga_reg0 = in_8(fpga);
+
+        devp = finddevice(EBONY_SMALL_FLASH_PATH);
+        if (!devp)
+                fatal("Couldn't locate small flash node %s\n\r",
+                      EBONY_SMALL_FLASH_PATH);
+
+        if (getprop(devp, "reg", reg, sizeof(reg)) != sizeof(reg))
+                fatal("%s has reg property of unexpected size\n\r",
+                      EBONY_SMALL_FLASH_PATH);
+
+        /* Invert address bit 14 (IBM-endian) if FLASH_SEL fpga bit is set */
+        if (fpga_reg0 & EBONY_FPGA_FLASH_SEL)
+                reg[1] ^= 0x80000;
+
+        setprop(devp, "reg", reg, sizeof(reg));
+}
+
 static void ebony_fixups(void)
 {
         // FIXME: sysclk should be derived by reading the FPGA registers
         unsigned long sysclk = 33000000;
 
         ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
-        ibm44x_fixup_memsize();
+        ibm4xx_fixup_memsize();
         dt_fixup_mac_addresses(ebony_mac0, ebony_mac1);
         ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
+        ebony_flashsel_fixup();
 }
 
 void ebony_init(void *mac0, void *mac1)
diff --git a/arch/powerpc/boot/ep88xc.c b/arch/powerpc/boot/ep88xc.c
new file mode 100644
index 000000000000..6b87cdce3fe7
--- /dev/null
+++ b/arch/powerpc/boot/ep88xc.c
@@ -0,0 +1,54 @@
+/*
+ * Embedded Planet EP88xC with PlanetCore firmware
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+#include "planetcore.h"
+#include "mpc8xx.h"
+
+static char *table;
+static u64 mem_size;
+
+static void platform_fixups(void)
+{
+        u64 val;
+
+        dt_fixup_memory(0, mem_size);
+        planetcore_set_mac_addrs(table);
+
+        if (!planetcore_get_decimal(table, PLANETCORE_KEY_CRYSTAL_HZ, &val)) {
+                printf("No PlanetCore crystal frequency key.\r\n");
+                return;
+        }
+
+        mpc885_fixup_clocks(val);
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        table = (char *)r3;
+        planetcore_prepare_table(table);
+
+        if (!planetcore_get_decimal(table, PLANETCORE_KEY_MB_RAM, &mem_size))
+                return;
+
+        mem_size *= 1024 * 1024;
+        simple_alloc_init(_end, mem_size - (unsigned long)_end, 32, 64);
+
+        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+
+        planetcore_set_stdout_path(table);
+
+        serial_console_init();
+        platform_ops.fixups = platform_fixups;
+}
diff --git a/arch/powerpc/boot/fixed-head.S b/arch/powerpc/boot/fixed-head.S
new file mode 100644
index 000000000000..8e14cd9e1a54
--- /dev/null
+++ b/arch/powerpc/boot/fixed-head.S
@@ -0,0 +1,4 @@
+        .text
+        .global _zimage_start
+_zimage_start:
+        b       _zimage_start_lib
diff --git a/arch/powerpc/boot/flatdevtree.c b/arch/powerpc/boot/flatdevtree.c
index 13761bf160c4..cf30675c6116 100644
--- a/arch/powerpc/boot/flatdevtree.c
+++ b/arch/powerpc/boot/flatdevtree.c
@@ -354,16 +354,21 @@ static void ft_put_bin(struct ft_cxt *cxt, const void *data, unsigned int sz)
         cxt->p += sza;
 }
 
-int ft_begin_node(struct ft_cxt *cxt, const char *name)
+char *ft_begin_node(struct ft_cxt *cxt, const char *name)
 {
         unsigned long nlen = strlen(name) + 1;
         unsigned long len = 8 + _ALIGN(nlen, 4);
+        char *ret;
 
         if (!ft_make_space(cxt, &cxt->p, FT_STRUCT, len))
-                return -1;
+                return NULL;
+
+        ret = cxt->p;
+
         ft_put_word(cxt, OF_DT_BEGIN_NODE);
         ft_put_bin(cxt, name, strlen(name) + 1);
-        return 0;
+
+        return ret;
 }
 
 void ft_end_node(struct ft_cxt *cxt)
@@ -625,25 +630,17 @@ void ft_end_tree(struct ft_cxt *cxt)
         bph->dt_strings_size = cpu_to_be32(ssize);
 }
 
-void *ft_find_device(struct ft_cxt *cxt, const char *srch_path)
-{
-        char *node;
-
-        /* require absolute path */
-        if (srch_path[0] != '/')
-                return NULL;
-        node = ft_find_descendent(cxt, ft_root_node(cxt), srch_path);
-        return ft_get_phandle(cxt, node);
-}
-
-void *ft_find_device_rel(struct ft_cxt *cxt, const void *top,
-                         const char *srch_path)
+void *ft_find_device(struct ft_cxt *cxt, const void *top, const char *srch_path)
 {
         char *node;
 
-        node = ft_node_ph2node(cxt, top);
-        if (node == NULL)
-                return NULL;
+        if (top) {
+                node = ft_node_ph2node(cxt, top);
+                if (node == NULL)
+                        return NULL;
+        } else {
+                node = ft_root_node(cxt);
+        }
 
         node = ft_find_descendent(cxt, node, srch_path);
         return ft_get_phandle(cxt, node);
@@ -945,7 +942,7 @@ int ft_del_prop(struct ft_cxt *cxt, const void *phandle, const char *propname)
 void *ft_create_node(struct ft_cxt *cxt, const void *parent, const char *name)
 {
         struct ft_atom atom;
-        char *p, *next;
+        char *p, *next, *ret;
         int depth = 0;
 
         if (parent) {
@@ -970,11 +967,70 @@ void *ft_create_node(struct ft_cxt *cxt, const void *parent, const char *name)
                                 break;
                         /* end of node, insert here */
                         cxt->p = p;
-                        ft_begin_node(cxt, name);
+                        ret = ft_begin_node(cxt, name);
                         ft_end_node(cxt);
-                        return p;
+                        return ft_get_phandle(cxt, ret);
                 }
                 p = next;
         }
         return NULL;
 }
+
+/* Returns the start of the path within the provided buffer, or NULL on
+ * error.
+ */
+char *ft_get_path(struct ft_cxt *cxt, const void *phandle,
+                  char *buf, int len)
+{
+        const char *path_comp[FT_MAX_DEPTH];
+        struct ft_atom atom;
+        char *p, *next, *pos;
+        int depth = 0, i;
+        void *node;
+
+        node = ft_node_ph2node(cxt, phandle);
+        if (node == NULL)
+                return NULL;
+
+        p = ft_root_node(cxt);
+
+        while ((next = ft_next(cxt, p, &atom)) != NULL) {
+                switch (atom.tag) {
+                case OF_DT_BEGIN_NODE:
+                        path_comp[depth++] = atom.name;
+                        if (p == node)
+                                goto found;
+
+                        break;
+
+                case OF_DT_END_NODE:
+                        if (--depth == 0)
+                                return NULL;
+                }
+
+                p = next;
+        }
+
+found:
+        pos = buf;
+        for (i = 1; i < depth; i++) {
+                int this_len;
+
+                if (len <= 1)
+                        return NULL;
+
+                *pos++ = '/';
+                len--;
+
+                strncpy(pos, path_comp[i], len);
+
+                if (pos[len - 1] != 0)
+                        return NULL;
+
+                this_len = strlen(pos);
+                len -= this_len;
+                pos += this_len;
+        }
+
+        return buf;
+}
diff --git a/arch/powerpc/boot/flatdevtree.h b/arch/powerpc/boot/flatdevtree.h
index cb26325d72db..b0957a2d967f 100644
--- a/arch/powerpc/boot/flatdevtree.h
+++ b/arch/powerpc/boot/flatdevtree.h
@@ -76,7 +76,7 @@ struct ft_cxt {
         unsigned int nodes_used;
 };
 
-int ft_begin_node(struct ft_cxt *cxt, const char *name);
+char *ft_begin_node(struct ft_cxt *cxt, const char *name);
 void ft_end_node(struct ft_cxt *cxt);
 
 void ft_begin_tree(struct ft_cxt *cxt);
@@ -96,9 +96,8 @@ int ft_add_rsvmap(struct ft_cxt *cxt, u64 physaddr, u64 size);
 
 void ft_dump_blob(const void *bphp);
 void ft_merge_blob(struct ft_cxt *cxt, void *blob);
-void *ft_find_device(struct ft_cxt *cxt, const char *srch_path);
-void *ft_find_device_rel(struct ft_cxt *cxt, const void *top,
-                         const char *srch_path);
+void *ft_find_device(struct ft_cxt *cxt, const void *top,
+                     const char *srch_path);
 void *ft_find_descendent(struct ft_cxt *cxt, void *top, const char *srch_path);
 int ft_get_prop(struct ft_cxt *cxt, const void *phandle, const char *propname,
                 void *buf, const unsigned int buflen);
@@ -109,5 +108,6 @@ void *ft_find_node_by_prop_value(struct ft_cxt *cxt, const void *prev,
                                  const char *propname, const char *propval,
                                  int proplen);
 void *ft_create_node(struct ft_cxt *cxt, const void *parent, const char *name);
+char *ft_get_path(struct ft_cxt *cxt, const void *phandle, char *buf, int len);
 
 #endif /* FLATDEVTREE_H */
diff --git a/arch/powerpc/boot/flatdevtree_env.h b/arch/powerpc/boot/flatdevtree_env.h
index 83bc1c718836..ad0420da8921 100644
--- a/arch/powerpc/boot/flatdevtree_env.h
+++ b/arch/powerpc/boot/flatdevtree_env.h
@@ -24,24 +24,4 @@
 #define be64_to_cpu(x)          (x)
 #define cpu_to_be64(x)          (x)
 
-static inline int strncmp(const char *cs, const char *ct, size_t count)
-{
-        signed char __res = 0;
-
-        while (count) {
-                if ((__res = *cs - *ct++) != 0 || !*cs++)
-                        break;
-                count--;
-        }
-        return __res;
-}
-
-static inline char *strchr(const char *s, int c)
-{
-        for (; *s != (char)c; ++s)
-                if (*s == '\0')
-                        return NULL;
-        return (char *)s;
-}
-
 #endif /* _PPC_BOOT_FLATDEVTREE_ENV_H_ */
diff --git a/arch/powerpc/boot/flatdevtree_misc.c b/arch/powerpc/boot/flatdevtree_misc.c
index 4341e6558c1a..b3670096fa71 100644
--- a/arch/powerpc/boot/flatdevtree_misc.c
+++ b/arch/powerpc/boot/flatdevtree_misc.c
@@ -18,7 +18,7 @@ static struct ft_cxt cxt;
 
 static void *fdtm_finddevice(const char *name)
 {
-        return ft_find_device(&cxt, name);
+        return ft_find_device(&cxt, NULL, name);
 }
 
 static int fdtm_getprop(const void *phandle, const char *propname,
@@ -58,6 +58,11 @@ static unsigned long fdtm_finalize(void)
         return (unsigned long)cxt.bph;
 }
 
+static char *fdtm_get_path(const void *phandle, char *buf, int len)
+{
+        return ft_get_path(&cxt, phandle, buf, len);
+}
+
 int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device)
 {
         dt_ops.finddevice = fdtm_finddevice;
@@ -67,6 +72,7 @@ int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device)
         dt_ops.create_node = fdtm_create_node;
         dt_ops.find_node_by_prop_value = fdtm_find_node_by_prop_value;
         dt_ops.finalize = fdtm_finalize;
+        dt_ops.get_path = fdtm_get_path;
 
         return ft_open(&cxt, dt_blob, max_size, max_find_device,
                         platform_ops.realloc);
diff --git a/arch/powerpc/boot/fsl-soc.c b/arch/powerpc/boot/fsl-soc.c
new file mode 100644
index 000000000000..b835ed69e1a1
--- /dev/null
+++ b/arch/powerpc/boot/fsl-soc.c
@@ -0,0 +1,57 @@
+/*
+ * Freescale SOC support functions
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "types.h"
+#include "fsl-soc.h"
+#include "stdio.h"
+
+static u32 prop_buf[MAX_PROP_LEN / 4];
+
+u32 *fsl_get_immr(void)
+{
+        void *soc;
+        unsigned long ret = 0;
+
+        soc = find_node_by_devtype(NULL, "soc");
+        if (soc) {
+                int size;
+                u32 naddr;
+
+                size = getprop(soc, "#address-cells", prop_buf, MAX_PROP_LEN);
+                if (size == 4)
+                        naddr = prop_buf[0];
+                else
+                        naddr = 2;
+
+                if (naddr != 1 && naddr != 2)
+                        goto err;
+
+                size = getprop(soc, "ranges", prop_buf, MAX_PROP_LEN);
+
+                if (size < 12)
+                        goto err;
+                if (prop_buf[0] != 0)
+                        goto err;
+                if (naddr == 2 && prop_buf[1] != 0)
+                        goto err;
+
+                if (!dt_xlate_addr(soc, prop_buf + naddr, 8, &ret))
+                        ret = 0;
+        }
+
+err:
+        if (!ret)
+                printf("fsl_get_immr: Failed to find immr base\r\n");
+
+        return (u32 *)ret;
+}
diff --git a/arch/powerpc/boot/fsl-soc.h b/arch/powerpc/boot/fsl-soc.h
new file mode 100644
index 000000000000..5da26fc6e3cf
--- /dev/null
+++ b/arch/powerpc/boot/fsl-soc.h
@@ -0,0 +1,8 @@
+#ifndef _PPC_BOOT_FSL_SOC_H_
+#define _PPC_BOOT_FSL_SOC_H_
+
+#include "types.h"
+
+u32 *fsl_get_immr(void);
+
+#endif
diff --git a/arch/powerpc/boot/gunzip_util.c b/arch/powerpc/boot/gunzip_util.c
index df8ab07e9ff4..ef2aed0f63ca 100644
--- a/arch/powerpc/boot/gunzip_util.c
+++ b/arch/powerpc/boot/gunzip_util.c
@@ -78,6 +78,7 @@ void gunzip_start(struct gunzip_state *state, void *src, int srclen)
                         fatal("inflateInit2 returned %d\n\r", r);
         }
 
+        state->s.total_in = hdrlen;
         state->s.next_in = src + hdrlen;
         state->s.avail_in = srclen - hdrlen;
 }
@@ -193,13 +194,10 @@ int gunzip_finish(struct gunzip_state *state, void *dst, int dstlen)
 {
         int len;
 
+        len = gunzip_partial(state, dst, dstlen);
+
         if (state->s.workspace) {
-                len = gunzip_partial(state, dst, dstlen);
                 zlib_inflateEnd(&state->s);
-        } else {
-                /* uncompressed image */
-                len = min(state->s.avail_in, (unsigned)dstlen);
-                memcpy(dst, state->s.next_in, len);
         }
 
         return len;
diff --git a/arch/powerpc/boot/holly.c b/arch/powerpc/boot/holly.c
index 7d6539f5e22c..199e783aea4d 100644
--- a/arch/powerpc/boot/holly.c
+++ b/arch/powerpc/boot/holly.c
@@ -21,11 +21,6 @@
 #include "ops.h"
 #include "io.h"
 
-extern char _start[];
-extern char _end[];
-extern char _dtb_start[];
-extern char _dtb_end[];
-
 BSS_STACK(4096);
 
 void platform_init(unsigned long r3, unsigned long r4, unsigned long r5)
diff --git a/arch/powerpc/boot/io.h b/arch/powerpc/boot/io.h
index 32974ed49e02..ccaedaec50d5 100644
--- a/arch/powerpc/boot/io.h
+++ b/arch/powerpc/boot/io.h
@@ -1,5 +1,8 @@
 #ifndef _IO_H
 #define __IO_H
+
+#include "types.h"
+
 /*
  * Low-level I/O routines.
  *
@@ -20,6 +23,37 @@ static inline void out_8(volatile unsigned char *addr, int val)
                              : "=m" (*addr) : "r" (val));
 }
 
+static inline unsigned in_le16(const volatile u16 *addr)
+{
+        unsigned ret;
+
+        __asm__ __volatile__("lhbrx %0,0,%1; twi 0,%0,0; isync"
+                             : "=r" (ret) : "r" (addr), "m" (*addr));
+
+        return ret;
+}
+
+static inline unsigned in_be16(const volatile u16 *addr)
+{
+        unsigned ret;
+
+        __asm__ __volatile__("lhz%U1%X1 %0,%1; twi 0,%0,0; isync"
+                             : "=r" (ret) : "m" (*addr));
+        return ret;
+}
+
+static inline void out_le16(volatile u16 *addr, int val)
+{
+        __asm__ __volatile__("sthbrx %1,0,%2; sync" : "=m" (*addr)
+                             : "r" (val), "r" (addr));
+}
+
+static inline void out_be16(volatile u16 *addr, int val)
+{
+        __asm__ __volatile__("sth%U0%X0 %1,%0; sync"
+                             : "=m" (*addr) : "r" (val));
+}
+
 static inline unsigned in_le32(const volatile unsigned *addr)
 {
         unsigned ret;
@@ -50,4 +84,19 @@ static inline void out_be32(volatile unsigned *addr, int val)
                              : "=m" (*addr) : "r" (val));
 }
 
+static inline void sync(void)
+{
+        asm volatile("sync" : : : "memory");
+}
+
+static inline void eieio(void)
+{
+        asm volatile("eieio" : : : "memory");
+}
+
+static inline void barrier(void)
+{
+        asm volatile("" : : : "memory");
+}
+
 #endif /* _IO_H */
diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index 416dc3857bfe..1b496b37eca0 100644
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
@@ -19,16 +19,6 @@
 #include "flatdevtree.h"
 #include "reg.h"
 
-extern char _start[];
-extern char __bss_start[];
-extern char _end[];
-extern char _vmlinux_start[];
-extern char _vmlinux_end[];
-extern char _initrd_start[];
-extern char _initrd_end[];
-extern char _dtb_start[];
-extern char _dtb_end[];
-
 static struct gunzip_state gzstate;
 
 struct addr_range {
diff --git a/arch/powerpc/boot/mpc52xx-psc.c b/arch/powerpc/boot/mpc52xx-psc.c
new file mode 100644
index 000000000000..1074626e6a37
--- /dev/null
+++ b/arch/powerpc/boot/mpc52xx-psc.c
@@ -0,0 +1,69 @@
+/*
+ * MPC5200 PSC serial console support.
+ *
+ * Author: Grant Likely <grant.likely@secretlab.ca>
+ *
+ * Copyright (c) 2007 Secret Lab Technologies Ltd.
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * It is assumed that the firmware (or the platform file) has already set
+ * up the port.
+ */
+
+#include "types.h"
+#include "io.h"
+#include "ops.h"
+
+/* Programmable Serial Controller (PSC) status register bits */
+#define MPC52xx_PSC_SR          0x04
+#define MPC52xx_PSC_SR_RXRDY            0x0100
+#define MPC52xx_PSC_SR_RXFULL           0x0200
+#define MPC52xx_PSC_SR_TXRDY            0x0400
+#define MPC52xx_PSC_SR_TXEMP            0x0800
+
+#define MPC52xx_PSC_BUFFER      0x0C
+
+static void *psc;
+
+static int psc_open(void)
+{
+        /* Assume the firmware has already configured the PSC into
+         * uart mode */
+        return 0;
+}
+
+static void psc_putc(unsigned char c)
+{
+        while (!(in_be16(psc + MPC52xx_PSC_SR) & MPC52xx_PSC_SR_TXRDY)) ;
+        out_8(psc + MPC52xx_PSC_BUFFER, c);
+}
+
+static unsigned char psc_tstc(void)
+{
+        return (in_be16(psc + MPC52xx_PSC_SR) & MPC52xx_PSC_SR_RXRDY) != 0;
+}
+
+static unsigned char psc_getc(void)
+{
+        while (!(in_be16(psc + MPC52xx_PSC_SR) & MPC52xx_PSC_SR_RXRDY)) ;
+        return in_8(psc + MPC52xx_PSC_BUFFER);
+}
+
+int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp)
+{
+        int n;
+
+        /* Get the base address of the psc registers */
+        n = getprop(devp, "virtual-reg", &psc, sizeof(psc));
+        if (n != sizeof(psc)) {
+                if (!dt_xlate_reg(devp, 0, (void *)&psc, NULL))
+                        return -1;
+        }
+
+        scdp->open = psc_open;
+        scdp->putc = psc_putc;
+        scdp->getc = psc_getc;
+        scdp->tstc = psc_tstc;
+
+        return 0;
+}
diff --git a/arch/powerpc/boot/mpc8xx.c b/arch/powerpc/boot/mpc8xx.c
new file mode 100644
index 000000000000..add55a7f184f
--- /dev/null
+++ b/arch/powerpc/boot/mpc8xx.c
@@ -0,0 +1,82 @@
+/*
+ * MPC8xx support functions
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "types.h"
+#include "fsl-soc.h"
+#include "mpc8xx.h"
+#include "stdio.h"
+#include "io.h"
+
+#define MPC8XX_PLPRCR (0x284/4) /* PLL and Reset Control Register */
+
+/* Return system clock from crystal frequency */
+u32 mpc885_get_clock(u32 crystal)
+{
+        u32 *immr;
+        u32 plprcr;
+        int mfi, mfn, mfd, pdf, div;
+        u32 ret;
+
+        immr = fsl_get_immr();
+        if (!immr) {
+                printf("mpc885_get_clock: Couldn't get IMMR base.\r\n");
+                return 0;
+        }
+
+        plprcr = in_be32(&immr[MPC8XX_PLPRCR]);
+
+        mfi = (plprcr >> 16) & 15;
+        if (mfi < 5) {
+                printf("Warning: PLPRCR[MFI] value of %d out-of-bounds\r\n",
+                       mfi);
+                mfi = 5;
+        }
+
+        pdf = (plprcr >> 1) & 0xf;
+        div = (plprcr >> 20) & 3;
+        mfd = (plprcr >> 22) & 0x1f;
+        mfn = (plprcr >> 27) & 0x1f;
+
+        ret = crystal * mfi;
+
+        if (mfn != 0)
+                ret += crystal * mfn / (mfd + 1);
+
+        return ret / (pdf + 1);
+}
+
+/* Set common device tree fields based on the given clock frequencies. */
+void mpc8xx_set_clocks(u32 sysclk)
+{
+        void *node;
+
+        dt_fixup_cpu_clocks(sysclk, sysclk / 16, sysclk);
+
+        node = finddevice("/soc/cpm");
+        if (node)
+                setprop(node, "clock-frequency", &sysclk, 4);
+
+        node = finddevice("/soc/cpm/brg");
+        if (node)
+                setprop(node, "clock-frequency", &sysclk, 4);
+}
+
+int mpc885_fixup_clocks(u32 crystal)
+{
+        u32 sysclk = mpc885_get_clock(crystal);
+        if (!sysclk)
+                return 0;
+
+        mpc8xx_set_clocks(sysclk);
+        return 1;
+}
diff --git a/arch/powerpc/boot/mpc8xx.h b/arch/powerpc/boot/mpc8xx.h
new file mode 100644
index 000000000000..3f59901ab1c0
--- /dev/null
+++ b/arch/powerpc/boot/mpc8xx.h
@@ -0,0 +1,11 @@
+#ifndef _PPC_BOOT_MPC8xx_H_
+#define _PPC_BOOT_MPC8xx_H_
+
+#include "types.h"
+
+void mpc8xx_set_clocks(u32 sysclk);
+
+u32 mpc885_get_clock(u32 crystal);
+int mpc885_fixup_clocks(u32 crystal);
+
+#endif
diff --git a/arch/powerpc/boot/mpsc.c b/arch/powerpc/boot/mpsc.c
index f1c0e965e5ce..802ea53790d8 100644
--- a/arch/powerpc/boot/mpsc.c
+++ b/arch/powerpc/boot/mpsc.c
@@ -17,7 +17,6 @@
 #include "io.h"
 #include "ops.h"
 
-extern void udelay(long delay);
 
 #define MPSC_CHR_1              0x000c
 
diff --git a/arch/powerpc/boot/mv64x60_i2c.c b/arch/powerpc/boot/mv64x60_i2c.c
index 435fe8528680..d085377be3bc 100644
--- a/arch/powerpc/boot/mv64x60_i2c.c
+++ b/arch/powerpc/boot/mv64x60_i2c.c
@@ -21,8 +21,6 @@
 #include "ops.h"
 #include "mv64x60.h"
 
-extern void udelay(long);
-
 /* Register defines */
 #define MV64x60_I2C_REG_SLAVE_ADDR                      0x00
 #define MV64x60_I2C_REG_DATA                            0x04
diff --git a/arch/powerpc/boot/of.c b/arch/powerpc/boot/of.c
index 385e08b83b7e..61d9899aa0d0 100644
--- a/arch/powerpc/boot/of.c
+++ b/arch/powerpc/boot/of.c
@@ -17,8 +17,6 @@
 
 #include "of.h"
 
-extern char _end[];
-
 /* Value picked to match that used by yaboot */
 #define PROG_START      0x01400000      /* only used on 64-bit systems */
 #define RAM_END         (512<<20)       /* Fixme: use OF */
diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index 86077066cd7c..a180b6505f47 100644
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -47,6 +47,7 @@ struct dt_ops {
                                          const char *propname,
                                          const char *propval, int proplen);
         unsigned long (*finalize)(void);
+        char *(*get_path)(const void *phandle, char *buf, int len);
 };
 extern struct dt_ops dt_ops;
 
@@ -82,11 +83,16 @@ int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device);
 int serial_console_init(void);
 int ns16550_console_init(void *devp, struct serial_console_data *scdp);
 int mpsc_console_init(void *devp, struct serial_console_data *scdp);
+int cpm_console_init(void *devp, struct serial_console_data *scdp);
+int mpc5200_psc_console_init(void *devp, struct serial_console_data *scdp);
+int uartlite_console_init(void *devp, struct serial_console_data *scdp);
 void *simple_alloc_init(char *base, unsigned long heap_size,
                         unsigned long granularity, unsigned long max_allocs);
 extern void flush_cache(void *, unsigned long);
 int dt_xlate_reg(void *node, int res, unsigned long *addr, unsigned long *size);
 int dt_xlate_addr(void *node, u32 *buf, int buflen, unsigned long *xlated_addr);
+int dt_is_compatible(void *node, const char *compat);
+void dt_get_reg_format(void *node, u32 *naddr, u32 *nsize);
 
 static inline void *finddevice(const char *name)
 {
@@ -156,6 +162,7 @@ static inline void *find_node_by_devtype(const void *prev,
 void dt_fixup_memory(u64 start, u64 size);
 void dt_fixup_cpu_clocks(u32 cpufreq, u32 tbfreq, u32 busfreq);
 void dt_fixup_clock(const char *path, u32 freq);
+void dt_fixup_mac_address(u32 index, const u8 *addr);
 void __dt_fixup_mac_addresses(u32 startindex, ...);
 #define dt_fixup_mac_addresses(...) \
         __dt_fixup_mac_addresses(0, __VA_ARGS__, NULL)
@@ -167,6 +174,14 @@ static inline void *find_node_by_linuxphandle(const u32 linuxphandle)
                         (char *)&linuxphandle, sizeof(u32));
 }
 
+static inline char *get_path(const void *phandle, char *buf, int len)
+{
+        if (dt_ops.get_path)
+                return dt_ops.get_path(phandle, buf, len);
+
+        return NULL;
+}
+
 static inline void *malloc(unsigned long size)
 {
         return (platform_ops.malloc) ? platform_ops.malloc(size) : NULL;
@@ -191,4 +206,25 @@ static inline void exit(void)
         static char _bss_stack[size]; \
         void *_platform_stack_top = _bss_stack + sizeof(_bss_stack);
 
+extern unsigned long timebase_period_ns;
+void udelay(long delay);
+
+extern char _start[];
+extern char __bss_start[];
+extern char _end[];
+extern char _vmlinux_start[];
+extern char _vmlinux_end[];
+extern char _initrd_start[];
+extern char _initrd_end[];
+extern char _dtb_start[];
+extern char _dtb_end[];
+
+static inline __attribute__((const))
+int __ilog2_u32(u32 n)
+{
+        int bit;
+        asm ("cntlzw %0,%1" : "=r" (bit) : "r" (n));
+        return 31 - bit;
+}
+
 #endif /* _PPC_BOOT_OPS_H_ */
diff --git a/arch/powerpc/boot/planetcore.c b/arch/powerpc/boot/planetcore.c
new file mode 100644
index 000000000000..0d8558a475bb
--- /dev/null
+++ b/arch/powerpc/boot/planetcore.c
@@ -0,0 +1,166 @@
+/*
+ * PlanetCore configuration data support functions
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "stdio.h"
+#include "stdlib.h"
+#include "ops.h"
+#include "planetcore.h"
+#include "io.h"
+
+/* PlanetCore passes information to the OS in the form of
+ * a table of key=value strings, separated by newlines.
+ *
+ * The list is terminated by an empty string (i.e. two
+ * consecutive newlines).
+ *
+ * To make it easier to parse, we first convert all the
+ * newlines into null bytes.
+ */
+
+void planetcore_prepare_table(char *table)
+{
+        do {
+                if (*table == '\n')
+                        *table = 0;
+
+                table++;
+        } while (*(table - 1) || *table != '\n');
+
+        *table = 0;
+}
+
+const char *planetcore_get_key(const char *table, const char *key)
+{
+        int keylen = strlen(key);
+
+        do {
+                if (!strncmp(table, key, keylen) && table[keylen] == '=')
+                        return table + keylen + 1;
+
+                table += strlen(table) + 1;
+        } while (strlen(table) != 0);
+
+        return NULL;
+}
+
+int planetcore_get_decimal(const char *table, const char *key, u64 *val)
+{
+        const char *str = planetcore_get_key(table, key);
+        if (!str)
+                return 0;
+
+        *val = strtoull(str, NULL, 10);
+        return 1;
+}
+
+int planetcore_get_hex(const char *table, const char *key, u64 *val)
+{
+        const char *str = planetcore_get_key(table, key);
+        if (!str)
+                return 0;
+
+        *val = strtoull(str, NULL, 16);
+        return 1;
+}
+
+static u64 mac_table[4] = {
+        0x000000000000,
+        0x000000800000,
+        0x000000400000,
+        0x000000c00000,
+};
+
+void planetcore_set_mac_addrs(const char *table)
+{
+        u8 addr[4][6];
+        u64 int_addr;
+        u32 i;
+        int j;
+
+        if (!planetcore_get_hex(table, PLANETCORE_KEY_MAC_ADDR, &int_addr))
+                return;
+
+        for (i = 0; i < 4; i++) {
+                u64 this_dev_addr = (int_addr & ~0x000000c00000) |
+                                    mac_table[i];
+
+                for (j = 5; j >= 0; j--) {
+                        addr[i][j] = this_dev_addr & 0xff;
+                        this_dev_addr >>= 8;
+                }
+
+                dt_fixup_mac_address(i, addr[i]);
+        }
+}
+
+static char prop_buf[MAX_PROP_LEN];
+
+void planetcore_set_stdout_path(const char *table)
+{
+        char *path;
+        const char *label;
+        void *node, *chosen;
+
+        label = planetcore_get_key(table, PLANETCORE_KEY_SERIAL_PORT);
+        if (!label)
+                return;
+
+        node = find_node_by_prop_value_str(NULL, "linux,planetcore-label",
+                                           label);
+        if (!node)
+                return;
+
+        path = get_path(node, prop_buf, MAX_PROP_LEN);
+        if (!path)
+                return;
+
+        chosen = finddevice("/chosen");
+        if (!chosen)
+                chosen = create_node(NULL, "chosen");
+        if (!chosen)
+                return;
+
+        setprop_str(chosen, "linux,stdout-path", path);
+}
+
+void planetcore_set_serial_speed(const char *table)
+{
+        void *chosen, *stdout;
+        u64 baud;
+        u32 baud32;
+        int len;
+
+        chosen = finddevice("/chosen");
+        if (!chosen)
+                return;
+
+        len = getprop(chosen, "linux,stdout-path", prop_buf, MAX_PROP_LEN);
+        if (len <= 0)
+                return;
+
+        stdout = finddevice(prop_buf);
+        if (!stdout) {
+                printf("planetcore_set_serial_speed: "
+                       "Bad /chosen/linux,stdout-path.\r\n");
+
+                return;
+        }
+
+        if (!planetcore_get_decimal(table, PLANETCORE_KEY_SERIAL_BAUD,
+                                    &baud)) {
+                printf("planetcore_set_serial_speed: No SB tag.\r\n");
+                return;
+        }
+
+        baud32 = baud;
+        setprop(stdout, "current-speed", &baud32, 4);
+}
diff --git a/arch/powerpc/boot/planetcore.h b/arch/powerpc/boot/planetcore.h
new file mode 100644
index 000000000000..0d4094f1771c
--- /dev/null
+++ b/arch/powerpc/boot/planetcore.h
@@ -0,0 +1,49 @@
+#ifndef _PPC_BOOT_PLANETCORE_H_
+#define _PPC_BOOT_PLANETCORE_H_
+
+#include "types.h"
+
+#define PLANETCORE_KEY_BOARD_TYPE   "BO"
+#define PLANETCORE_KEY_BOARD_REV    "BR"
+#define PLANETCORE_KEY_MB_RAM       "D1"
+#define PLANETCORE_KEY_MAC_ADDR     "EA"
+#define PLANETCORE_KEY_FLASH_SPEED  "FS"
+#define PLANETCORE_KEY_IP_ADDR      "IP"
+#define PLANETCORE_KEY_KB_NVRAM     "NV"
+#define PLANETCORE_KEY_PROCESSOR    "PR"
+#define PLANETCORE_KEY_PROC_VARIANT "PV"
+#define PLANETCORE_KEY_SERIAL_BAUD  "SB"
+#define PLANETCORE_KEY_SERIAL_PORT  "SP"
+#define PLANETCORE_KEY_SWITCH       "SW"
+#define PLANETCORE_KEY_TEMP_OFFSET  "TC"
+#define PLANETCORE_KEY_TARGET_IP    "TIP"
+#define PLANETCORE_KEY_CRYSTAL_HZ   "XT"
+
+/* Prepare the table for processing, by turning all newlines
+ * into NULL bytes.
+ */
+void planetcore_prepare_table(char *table);
+
+/* Return the value associated with a given key in text,
+ * decimal, or hex format.
+ *
+ * Returns zero/NULL on failure, non-zero on success.
+ */
+const char *planetcore_get_key(const char *table, const char *key);
+int planetcore_get_decimal(const char *table, const char *key, u64 *val);
+int planetcore_get_hex(const char *table, const char *key, u64 *val);
+
+/* Updates the device tree local-mac-address properties based
+ * on the EA tag.
+ */
+void planetcore_set_mac_addrs(const char *table);
+
+/* Sets the linux,stdout-path in the /chosen node.  This requires the
+ * linux,planetcore-label property in each serial node.
+ */
+void planetcore_set_stdout_path(const char *table);
+
+/* Sets the current-speed property in the serial node. */
+void planetcore_set_serial_speed(const char *table);
+
+#endif
diff --git a/arch/powerpc/boot/ppcboot.h b/arch/powerpc/boot/ppcboot.h
index 5290ff2c2b2b..6ae6f9063952 100644
--- a/arch/powerpc/boot/ppcboot.h
+++ b/arch/powerpc/boot/ppcboot.h
@@ -78,17 +78,18 @@ typedef struct bd_info {
         hymod_conf_t    bi_hymod_conf;  /* hymod configuration information */
 #endif
 #if defined(TARGET_EVB64260) || defined(TARGET_405EP) || defined(TARGET_44x) || \
-        defined(TARGET_85xx) || defined(TARGET_83xx)
+        defined(TARGET_85xx) || defined(TARGET_83xx) || defined(TARGET_HAS_ETH1)
         /* second onboard ethernet port */
         unsigned char   bi_enet1addr[6];
 #define HAVE_ENET1ADDR
 #endif
-#if defined(TARGET_EVB64260) || defined(TARGET_440GX) || defined(TARGET_85xx)
+#if defined(TARGET_EVB64260) || defined(TARGET_440GX) || \
+    defined(TARGET_85xx) || defined(TARGET_HAS_ETH2)
         /* third onboard ethernet ports */
         unsigned char   bi_enet2addr[6];
 #define HAVE_ENET2ADDR
 #endif
-#if defined(TARGET_440GX)
+#if defined(TARGET_440GX) || defined(TARGET_HAS_ETH3)
         /* fourth onboard ethernet ports */
         unsigned char   bi_enet3addr[6];
 #define HAVE_ENET3ADDR
diff --git a/arch/powerpc/boot/pq2.c b/arch/powerpc/boot/pq2.c
new file mode 100644
index 000000000000..f6d118558f1d
--- /dev/null
+++ b/arch/powerpc/boot/pq2.c
@@ -0,0 +1,102 @@
+/*
+ * PowerQUICC II support functions
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "types.h"
+#include "fsl-soc.h"
+#include "pq2.h"
+#include "stdio.h"
+#include "io.h"
+
+#define PQ2_SCCR (0x10c80/4) /* System Clock Configuration Register */
+#define PQ2_SCMR (0x10c88/4) /* System Clock Mode Register */
+
+static int pq2_corecnf_map[] = {
+        3, 2, 2, 2, 4, 4, 5, 9, 6, 11, 8, 10, 3, 12, 7, -1,
+        6, 5, 13, 2, 14, 4, 15, 9, 0, 11, 8, 10, 16, 12, 7, -1
+};
+
+/* Get various clocks from crystal frequency.
+ * Returns zero on failure and non-zero on success.
+ */
+int pq2_get_clocks(u32 crystal, u32 *sysfreq, u32 *corefreq,
+                   u32 *timebase, u32 *brgfreq)
+{
+        u32 *immr;
+        u32 sccr, scmr, mainclk, busclk;
+        int corecnf, busdf, plldf, pllmf, dfbrg;
+
+        immr = fsl_get_immr();
+        if (!immr) {
+                printf("pq2_get_clocks: Couldn't get IMMR base.\r\n");
+                return 0;
+        }
+
+        sccr = in_be32(&immr[PQ2_SCCR]);
+        scmr = in_be32(&immr[PQ2_SCMR]);
+
+        dfbrg = sccr & 3;
+        corecnf = (scmr >> 24) & 0x1f;
+        busdf = (scmr >> 20) & 0xf;
+        plldf = (scmr >> 12) & 1;
+        pllmf = scmr & 0xfff;
+
+        mainclk = crystal * (pllmf + 1) / (plldf + 1);
+        busclk = mainclk / (busdf + 1);
+
+        if (sysfreq)
+                *sysfreq = mainclk / 2;
+        if (timebase)
+                *timebase = busclk / 4;
+        if (brgfreq)
+                *brgfreq = mainclk / (1 << ((dfbrg + 1) * 2));
+
+        if (corefreq) {
+                int coremult = pq2_corecnf_map[corecnf];
+
+                if (coremult < 0)
+                        *corefreq = mainclk / 2;
+                else if (coremult == 0)
+                        return 0;
+                else
+                        *corefreq = busclk * coremult / 2;
+        }
+
+        return 1;
+}
+
+/* Set common device tree fields based on the given clock frequencies. */
+void pq2_set_clocks(u32 sysfreq, u32 corefreq, u32 timebase, u32 brgfreq)
+{
+        void *node;
+
+        dt_fixup_cpu_clocks(corefreq, timebase, sysfreq);
+
+        node = finddevice("/soc/cpm");
+        if (node)
+                setprop(node, "clock-frequency", &sysfreq, 4);
+
+        node = finddevice("/soc/cpm/brg");
+        if (node)
+                setprop(node, "clock-frequency", &brgfreq, 4);
+}
+
+int pq2_fixup_clocks(u32 crystal)
+{
+        u32 sysfreq, corefreq, timebase, brgfreq;
+
+        if (!pq2_get_clocks(crystal, &sysfreq, &corefreq, &timebase, &brgfreq))
+                return 0;
+
+        pq2_set_clocks(sysfreq, corefreq, timebase, brgfreq);
+        return 1;
+}
diff --git a/arch/powerpc/boot/pq2.h b/arch/powerpc/boot/pq2.h
new file mode 100644
index 000000000000..481698c7a51a
--- /dev/null
+++ b/arch/powerpc/boot/pq2.h
@@ -0,0 +1,11 @@
+#ifndef _PPC_BOOT_PQ2_H_
+#define _PPC_BOOT_PQ2_H_
+
+#include "types.h"
+
+int pq2_get_clocks(u32 crystal, u32 *sysfreq, u32 *corefreq,
+                   u32 *timebase, u32 *brgfreq);
+void pq2_set_clocks(u32 sysfreq, u32 corefreq, u32 timebase, u32 brgfreq);
+int pq2_fixup_clocks(u32 crystal);
+
+#endif
diff --git a/arch/powerpc/boot/prpmc2800.c b/arch/powerpc/boot/prpmc2800.c
index f428bac10d4a..9614e1db9dae 100644
--- a/arch/powerpc/boot/prpmc2800.c
+++ b/arch/powerpc/boot/prpmc2800.c
@@ -21,12 +21,6 @@
 #include "gunzip_util.h"
 #include "mv64x60.h"
 
-extern char _end[];
-extern char _vmlinux_start[], _vmlinux_end[];
-extern char _dtb_start[], _dtb_end[];
-
-extern void udelay(long delay);
-
 #define KB      1024U
 #define MB      (KB*KB)
 #define GB      (KB*MB)
diff --git a/arch/powerpc/boot/ps3.c b/arch/powerpc/boot/ps3.c
index 893d59339c26..d6661151b494 100644
--- a/arch/powerpc/boot/ps3.c
+++ b/arch/powerpc/boot/ps3.c
@@ -120,10 +120,6 @@ void ps3_copy_vectors(void)
 
 void platform_init(void)
 {
-        extern char _end[];
-        extern char _dtb_start[];
-        extern char _initrd_start[];
-        extern char _initrd_end[];
         const u32 heapsize = 0x1000000 - (u32)_end; /* 16MiB */
         void *chosen;
         unsigned long ft_addr;
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index eaa0d3ae3518..cafeece20ac7 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -19,8 +19,6 @@
 #include "io.h"
 #include "ops.h"
 
-extern void udelay(long delay);
-
 static int serial_open(void)
 {
         struct serial_console_data *scdp = console_ops.data;
@@ -114,29 +112,36 @@ int serial_console_init(void)
 {
         void *devp;
         int rc = -1;
-        char compat[MAX_PROP_LEN];
 
         devp = serial_get_stdout_devp();
         if (devp == NULL)
                 goto err_out;
 
-        if (getprop(devp, "compatible", compat, sizeof(compat)) < 0)
-                goto err_out;
-
-        if (!strcmp(compat, "ns16550"))
+        if (dt_is_compatible(devp, "ns16550"))
                 rc = ns16550_console_init(devp, &serial_cd);
-        else if (!strcmp(compat, "marvell,mpsc"))
+        else if (dt_is_compatible(devp, "marvell,mpsc"))
                 rc = mpsc_console_init(devp, &serial_cd);
+        else if (dt_is_compatible(devp, "fsl,cpm1-scc-uart") ||
+                 dt_is_compatible(devp, "fsl,cpm1-smc-uart") ||
+                 dt_is_compatible(devp, "fsl,cpm2-scc-uart") ||
+                 dt_is_compatible(devp, "fsl,cpm2-smc-uart"))
+                rc = cpm_console_init(devp, &serial_cd);
+        else if (dt_is_compatible(devp, "mpc5200-psc-uart"))
+                rc = mpc5200_psc_console_init(devp, &serial_cd);
+        else if (dt_is_compatible(devp, "xilinx,uartlite"))
+                rc = uartlite_console_init(devp, &serial_cd);
 
         /* Add other serial console driver calls here */
 
         if (!rc) {
                 console_ops.open = serial_open;
                 console_ops.write = serial_write;
-                console_ops.edit_cmdline = serial_edit_cmdline;
                 console_ops.close = serial_close;
                 console_ops.data = &serial_cd;
 
+                if (serial_cd.getc)
+                        console_ops.edit_cmdline = serial_edit_cmdline;
+
                 return 0;
         }
 err_out:
diff --git a/arch/powerpc/boot/stdlib.c b/arch/powerpc/boot/stdlib.c
new file mode 100644
index 000000000000..e00d58c29eea
--- /dev/null
+++ b/arch/powerpc/boot/stdlib.c
@@ -0,0 +1,45 @@
+/*
+ * stdlib functions
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "stdlib.h"
+
+/* Not currently supported: leading whitespace, sign, 0x prefix, zero base */
+unsigned long long int strtoull(const char *ptr, char **end, int base)
+{
+        unsigned long long ret = 0;
+
+        if (base > 36)
+                goto out;
+
+        while (*ptr) {
+                int digit;
+
+                if (*ptr >= '0' && *ptr <= '9' && *ptr < '0' + base)
+                        digit = *ptr - '0';
+                else if (*ptr >= 'A' && *ptr < 'A' + base - 10)
+                        digit = *ptr - 'A' + 10;
+                else if (*ptr >= 'a' && *ptr < 'a' + base - 10)
+                        digit = *ptr - 'a' + 10;
+                else
+                        break;
+
+                ret *= base;
+                ret += digit;
+                ptr++;
+        }
+
+out:
+        if (end)
+                *end = (char *)ptr;
+
+        return ret;
+}
diff --git a/arch/powerpc/boot/stdlib.h b/arch/powerpc/boot/stdlib.h
new file mode 100644
index 000000000000..1bf01ac73aba
--- /dev/null
+++ b/arch/powerpc/boot/stdlib.h
@@ -0,0 +1,6 @@
+#ifndef _PPC_BOOT_STDLIB_H_
+#define _PPC_BOOT_STDLIB_H_
+
+unsigned long long int strtoull(const char *ptr, char **end, int base);
+
+#endif
diff --git a/arch/powerpc/boot/string.S b/arch/powerpc/boot/string.S
index ac3d43b6a324..643e4cb2f11d 100644
--- a/arch/powerpc/boot/string.S
+++ b/arch/powerpc/boot/string.S
@@ -49,6 +49,17 @@ strcat:
         bne     1b
         blr
 
+        .globl  strchr
+strchr:
+        addi    r3,r3,-1
+1:      lbzu    r0,1(r3)
+        cmpw    0,r0,r4
+        beqlr
+        cmpwi   0,r0,0
+        bne     1b
+        li      r3,0
+        blr
+
         .globl  strcmp
 strcmp:
         addi    r5,r3,-1
@@ -61,6 +72,19 @@ strcmp:
         beq     1b
         blr
 
+        .globl  strncmp
+strncmp:
+        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
+
         .globl  strlen
 strlen:
         addi    r4,r3,-1
@@ -195,6 +219,19 @@ backwards_memcpy:
         mtctr   r7
         b       1b
 
+        .globl  memchr
+memchr:
+        cmpwi   0,r5,0
+        blelr
+        mtctr   r5
+        addi    r3,r3,-1
+1:      lbzu    r0,1(r3)
+        cmpw    r0,r4
+        beqlr
+        bdnz    1b
+        li      r3,0
+        blr
+
         .globl  memcmp
 memcmp:
         cmpwi   0,r5,0
diff --git a/arch/powerpc/boot/string.h b/arch/powerpc/boot/string.h
index 9fdff1cc0d70..50091cc0eed9 100644
--- a/arch/powerpc/boot/string.h
+++ b/arch/powerpc/boot/string.h
@@ -5,13 +5,16 @@
 extern char *strcpy(char *dest, const char *src);
 extern char *strncpy(char *dest, const char *src, size_t n);
 extern char *strcat(char *dest, const char *src);
+extern char *strchr(const char *s, int c);
 extern int strcmp(const char *s1, const char *s2);
+extern int strncmp(const char *s1, const char *s2, size_t n);
 extern size_t strlen(const char *s);
 extern size_t strnlen(const char *s, size_t count);
 
 extern void *memset(void *s, int c, size_t n);
 extern void *memmove(void *dest, const void *src, unsigned long n);
 extern void *memcpy(void *dest, const void *src, unsigned long n);
+extern void *memchr(const void *s, int c, size_t n);
 extern int memcmp(const void *s1, const void *s2, size_t n);
 
 #endif  /* _PPC_BOOT_STRING_H_ */
diff --git a/arch/powerpc/boot/treeboot-bamboo.c b/arch/powerpc/boot/treeboot-bamboo.c
new file mode 100644
index 000000000000..9eee48fc7114
--- /dev/null
+++ b/arch/powerpc/boot/treeboot-bamboo.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright IBM Corporation, 2007
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * Based on ebony wrapper:
+ * Copyright 2007 David Gibson, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2 of the License
+ */
+#include "ops.h"
+#include "stdio.h"
+#include "44x.h"
+#include "stdlib.h"
+
+BSS_STACK(4096);
+
+#define PIBS_MAC0 0xfffc0400
+#define PIBS_MAC1 0xfffc0500
+char pibs_mac0[6];
+char pibs_mac1[6];
+
+static void read_pibs_mac(void)
+{
+        unsigned long long mac64;
+
+        mac64 = strtoull((char *)PIBS_MAC0, 0, 16);
+        memcpy(&pibs_mac0, (char *)&mac64+2, 6);
+
+        mac64 = strtoull((char *)PIBS_MAC1, 0, 16);
+        memcpy(&pibs_mac1, (char *)&mac64+2, 6);
+}
+
+void platform_init(void)
+{
+        unsigned long end_of_ram = 0x8000000;
+        unsigned long avail_ram = end_of_ram - (unsigned long)_end;
+
+        simple_alloc_init(_end, avail_ram, 32, 64);
+        read_pibs_mac();
+        bamboo_init((u8 *)&pibs_mac0, (u8 *)&pibs_mac1);
+}
diff --git a/arch/powerpc/boot/treeboot-ebony.c b/arch/powerpc/boot/treeboot-ebony.c
index 8436a9c55192..21cc4834a384 100644
--- a/arch/powerpc/boot/treeboot-ebony.c
+++ b/arch/powerpc/boot/treeboot-ebony.c
@@ -16,8 +16,6 @@
 #include "stdio.h"
 #include "44x.h"
 
-extern char _end[];
-
 BSS_STACK(4096);
 
 #define OPENBIOS_MAC_BASE       0xfffffe0c
diff --git a/arch/powerpc/boot/treeboot-walnut.c b/arch/powerpc/boot/treeboot-walnut.c
new file mode 100644
index 000000000000..3adf2d08a230
--- /dev/null
+++ b/arch/powerpc/boot/treeboot-walnut.c
@@ -0,0 +1,131 @@
+/*
+ * Old U-boot compatibility for Walnut
+ *
+ * Author: Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * Copyright 2007 IBM Corporation
+ *   Based on cuboot-83xx.c, which is:
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+#include "dcr.h"
+#include "4xx.h"
+#include "io.h"
+
+BSS_STACK(4096);
+
+void ibm405gp_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)
+{
+        u32 pllmr = mfdcr(DCRN_CPC0_PLLMR);
+        u32 cpc0_cr0 = mfdcr(DCRN_405_CPC0_CR0);
+        u32 cpc0_cr1 = mfdcr(DCRN_405_CPC0_CR1);
+        u32 cpu, plb, opb, ebc, tb, uart0, uart1, m;
+        u32 fwdv, fbdv, cbdv, opdv, epdv, udiv;
+
+        fwdv = (8 - ((pllmr & 0xe0000000) >> 29));
+        fbdv = (pllmr & 0x1e000000) >> 25;
+        cbdv = ((pllmr & 0x00060000) >> 17) + 1;
+        opdv = ((pllmr & 0x00018000) >> 15) + 1;
+        epdv = ((pllmr & 0x00001800) >> 13) + 2;
+        udiv = ((cpc0_cr0 & 0x3e) >> 1) + 1;
+
+        m = fwdv * fbdv * cbdv;
+
+        cpu = sysclk * m / fwdv;
+        plb = cpu / cbdv;
+        opb = plb / opdv;
+        ebc = plb / epdv;
+
+        if (cpc0_cr0 & 0x80) {
+                /* uart0 uses the external clock */
+                uart0 = ser_clk;
+        } else {
+                uart0 = cpu / udiv;
+        }
+
+        if (cpc0_cr0 & 0x40) {
+                /* uart1 uses the external clock */
+                uart1 = ser_clk;
+        } else {
+                uart1 = cpu / udiv;
+        }
+
+        /* setup the timebase clock to tick at the cpu frequency */
+        cpc0_cr1 = cpc0_cr1 & ~ 0x00800000;
+        mtdcr(DCRN_CPC0_CR1, cpc0_cr1);
+        tb = cpu;
+
+        dt_fixup_cpu_clocks(cpu, tb, 0);
+        dt_fixup_clock("/plb", plb);
+        dt_fixup_clock("/plb/opb", opb);
+        dt_fixup_clock("/plb/ebc", ebc);
+        dt_fixup_clock("/plb/opb/serial@ef600300", uart0);
+        dt_fixup_clock("/plb/opb/serial@ef600400", uart1);
+}
+
+static void walnut_flashsel_fixup(void)
+{
+        void *devp, *sram;
+        u32 reg_flash[3] = {0x0, 0x0, 0x80000};
+        u32 reg_sram[3] = {0x0, 0x0, 0x80000};
+        u8 *fpga;
+        u8 fpga_brds1 = 0x0;
+
+        devp = finddevice("/plb/ebc/fpga");
+        if (!devp)
+                fatal("Couldn't locate FPGA node\n\r");
+
+        if (getprop(devp, "virtual-reg", &fpga, sizeof(fpga)) != sizeof(fpga))
+                fatal("no virtual-reg property\n\r");
+
+        fpga_brds1 = in_8(fpga);
+
+        devp = finddevice("/plb/ebc/flash");
+        if (!devp)
+                fatal("Couldn't locate flash node\n\r");
+
+        if (getprop(devp, "reg", reg_flash, sizeof(reg_flash)) != sizeof(reg_flash))
+                fatal("flash reg property has unexpected size\n\r");
+
+        sram = finddevice("/plb/ebc/sram");
+        if (!sram)
+                fatal("Couldn't locate sram node\n\r");
+
+        if (getprop(sram, "reg", reg_sram, sizeof(reg_sram)) != sizeof(reg_sram))
+                fatal("sram reg property has unexpected size\n\r");
+
+        if (fpga_brds1 & 0x1) {
+                reg_flash[1] ^= 0x80000;
+                reg_sram[1] ^= 0x80000;
+        }
+
+        setprop(devp, "reg", reg_flash, sizeof(reg_flash));
+        setprop(sram, "reg", reg_sram, sizeof(reg_sram));
+}
+
+static void walnut_fixups(void)
+{
+        ibm4xx_fixup_memsize();
+        ibm405gp_fixup_clocks(33330000, 0xa8c000);
+        ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
+        ibm4xx_fixup_ebc_ranges("/plb/ebc");
+        walnut_flashsel_fixup();
+}
+
+void platform_init(void)
+{
+        unsigned long end_of_ram = 0x2000000;
+        unsigned long avail_ram = end_of_ram - (unsigned long) _end;
+
+        simple_alloc_init(_end, avail_ram, 32, 32);
+        platform_ops.fixups = walnut_fixups;
+        platform_ops.exit = ibm40x_dbcr_reset;
+        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        serial_console_init();
+}
diff --git a/arch/powerpc/boot/uartlite.c b/arch/powerpc/boot/uartlite.c
new file mode 100644
index 000000000000..46bed69b4169
--- /dev/null
+++ b/arch/powerpc/boot/uartlite.c
@@ -0,0 +1,79 @@
+/*
+ * Xilinx UARTLITE bootloader driver
+ *
+ * Copyright (C) 2007 Secret Lab Technologies Ltd.
+ *
+ * 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 <stdarg.h>
+#include <stddef.h>
+#include "types.h"
+#include "string.h"
+#include "stdio.h"
+#include "io.h"
+#include "ops.h"
+
+#define ULITE_RX                0x00
+#define ULITE_TX                0x04
+#define ULITE_STATUS            0x08
+#define ULITE_CONTROL           0x0c
+
+#define ULITE_STATUS_RXVALID    0x01
+#define ULITE_STATUS_TXFULL     0x08
+
+#define ULITE_CONTROL_RST_RX    0x02
+
+static void * reg_base;
+
+static int uartlite_open(void)
+{
+        /* Clear the RX FIFO */
+        out_be32(reg_base + ULITE_CONTROL, ULITE_CONTROL_RST_RX);
+        return 0;
+}
+
+static void uartlite_putc(unsigned char c)
+{
+        u32 reg = ULITE_STATUS_TXFULL;
+        while (reg & ULITE_STATUS_TXFULL) /* spin on TXFULL bit */
+                reg = in_be32(reg_base + ULITE_STATUS);
+        out_be32(reg_base + ULITE_TX, c);
+}
+
+static unsigned char uartlite_getc(void)
+{
+        u32 reg = 0;
+        while (!(reg & ULITE_STATUS_RXVALID)) /* spin waiting for RXVALID bit */
+                reg = in_be32(reg_base + ULITE_STATUS);
+        return in_be32(reg_base + ULITE_RX);
+}
+
+static u8 uartlite_tstc(void)
+{
+        u32 reg = in_be32(reg_base + ULITE_STATUS);
+        return reg & ULITE_STATUS_RXVALID;
+}
+
+int uartlite_console_init(void *devp, struct serial_console_data *scdp)
+{
+        int n;
+        unsigned long reg_phys;
+
+        n = getprop(devp, "virtual-reg", &reg_base, sizeof(reg_base));
+        if (n != sizeof(reg_base)) {
+                if (!dt_xlate_reg(devp, 0, &reg_phys, NULL))
+                        return -1;
+
+                reg_base = (void *)reg_phys;
+        }
+
+        scdp->open = uartlite_open;
+        scdp->putc = uartlite_putc;
+        scdp->getc = uartlite_getc;
+        scdp->tstc = uartlite_tstc;
+        scdp->close = NULL;
+        return 0;
+}
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 65f685479175..39b27e5ef6c1 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -29,6 +29,7 @@ initrd=
 dtb=
 dts=
 cacheit=
+binary=
 gzip=.gz
 
 # cross-compilation prefix
@@ -142,17 +143,23 @@ miboot|uboot)
     isection=initrd
     ;;
 cuboot*)
+    binary=y
     gzip=
     ;;
 ps3)
     platformo="$object/ps3-head.o $object/ps3-hvcall.o $object/ps3.o"
     lds=$object/zImage.ps3.lds
+    binary=y
     gzip=
     ext=bin
     objflags="-O binary --set-section-flags=.bss=contents,alloc,load,data"
     ksection=.kernel:vmlinux.bin
     isection=.kernel:initrd
     ;;
+ep88xc)
+    platformo="$object/fixed-head.o $object/$platform.o"
+    binary=y
+    ;;
 esac
 
 vmz="$tmpdir/`basename \"$kernel\"`.$ext"
@@ -224,6 +231,11 @@ fi
 base=0x`${CROSS}nm "$ofile" | grep ' _start$' | cut -d' ' -f1`
 entry=`${CROSS}objdump -f "$ofile" | grep '^start address ' | cut -d' ' -f3`
 
+if [ -n "$binary" ]; then
+    mv "$ofile" "$ofile".elf
+    ${CROSS}objcopy -O binary "$ofile".elf "$ofile".bin
+fi
+
 # post-processing needed for some platforms
 case "$platform" in
 pseries|chrp)
@@ -234,8 +246,6 @@ coff)
     $object/hack-coff "$ofile"
     ;;
 cuboot*)
-    mv "$ofile" "$ofile".elf
-    ${CROSS}objcopy -O binary "$ofile".elf "$ofile".bin
     gzip -f -9 "$ofile".bin
     mkimage -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
             $uboot_version -d "$ofile".bin.gz "$ofile"
@@ -259,11 +269,11 @@ ps3)
     # then copied to offset 0x100.  At runtime the bootwrapper program
     # copies the 0x100 bytes at __system_reset_kernel to addr 0x100.
 
-    system_reset_overlay=0x`${CROSS}nm "$ofile" \
+    system_reset_overlay=0x`${CROSS}nm "$ofile".elf \
         | grep ' __system_reset_overlay$'       \
         | cut -d' ' -f1`
     system_reset_overlay=`printf "%d" $system_reset_overlay`
-    system_reset_kernel=0x`${CROSS}nm "$ofile" \
+    system_reset_kernel=0x`${CROSS}nm "$ofile".elf \
         | grep ' __system_reset_kernel$'       \
         | cut -d' ' -f1`
     system_reset_kernel=`printf "%d" $system_reset_kernel`
@@ -272,8 +282,6 @@ ps3)
 
     rm -f "$object/otheros.bld"
 
-    ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
-
     msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
         skip=$overlay_dest seek=$system_reset_kernel      \
         count=$overlay_size bs=1 2>&1)
diff --git a/arch/powerpc/configs/bamboo_defconfig b/arch/powerpc/configs/bamboo_defconfig
new file mode 100644
index 000000000000..b592dec4640f
--- /dev/null
+++ b/arch/powerpc/configs/bamboo_defconfig
@@ -0,0 +1,775 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-rc1
+# Fri Aug  3 10:46:53 2007
+#
+# 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_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+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_USER_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+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_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+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"
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+CONFIG_BAMBOO=y
+# CONFIG_EBONY is not set
+CONFIG_440EP=y
+CONFIG_IBM440EP_ERR42=y
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# 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_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_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_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_DEVICE_TREE="bamboo.dts"
+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_DEBUG is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# 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=0x80000000
+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_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
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_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_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_XILINX_SYSACE is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_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
+
+#
+# Fusion MPT device support
+#
+# 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=y
+# CONFIG_MAC_EMUMOUSEBTN is not set
+# CONFIG_WINDFARM 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_ARCNET is not set
+# CONFIG_NET_ETHERNET is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE 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_SHAPER 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
+
+#
+# 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_WATCHDOG 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_AGP is not set
+# CONFIG_DRM 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
+
+#
+# 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_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC 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
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# 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_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_RAMFS=y
+# 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_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+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
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+# CONFIG_UCC_SLOW 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
+
+#
+# Instrumentation Support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION 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_BDI_SWITCH is not set
+CONFIG_PPC_EARLY_DEBUG=y
+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
+# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
+# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
+CONFIG_PPC_EARLY_DEBUG_44x=y
+CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
+CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x0
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=y
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig
index ebb8167608b8..3a50467b1f75 100644
--- a/arch/powerpc/configs/ebony_defconfig
+++ b/arch/powerpc/configs/ebony_defconfig
@@ -313,7 +313,80 @@ CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
-# CONFIG_MTD is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS 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
+
+#
+# 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_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
 CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
@@ -607,6 +680,15 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
 CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -665,6 +747,7 @@ CONFIG_CRC32=y
 # CONFIG_CRC7 is not set
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
 CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
diff --git a/arch/powerpc/configs/ep88xc_defconfig b/arch/powerpc/configs/ep88xc_defconfig
new file mode 100644
index 000000000000..d8ee3c0dcadf
--- /dev/null
+++ b/arch/powerpc/configs/ep88xc_defconfig
@@ -0,0 +1,751 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-rc6
+# Fri Sep 14 14:59:56 2007
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+# CONFIG_PPC_85xx is not set
+CONFIG_PPC_8xx=y
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_8xx=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_NOT_COHERENT_CACHE=y
+CONFIG_PPC32=y
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+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 is not set
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_DEFAULT_UIMAGE is not set
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+# CONFIG_ELF_CORE is not set
+# CONFIG_BASE_FULL is not set
+# CONFIG_FUTEX is not set
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=1
+# CONFIG_MODULES is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+CONFIG_CPM1=y
+# CONFIG_MPC8XXFADS is not set
+# CONFIG_MPC86XADS is not set
+# CONFIG_MPC885ADS is not set
+CONFIG_PPC_EP88XC=y
+
+#
+# MPC8xx CPM Options
+#
+
+#
+# Generic MPC8xx Options
+#
+CONFIG_8xx_COPYBACK=y
+# CONFIG_8xx_CPU6 is not set
+CONFIG_8xx_CPU15=y
+CONFIG_NO_UCODE_PATCH=y
+# CONFIG_USB_SOF_UCODE_PATCH is not set
+# CONFIG_I2C_SPI_UCODE_PATCH is not set
+# CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
+CONFIG_PPC_CPM_NEW_BINDING=y
+# CONFIG_FSL_ULI1575 is not set
+CONFIG_CPM=y
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+CONFIG_HZ_100=y
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_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_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_HIBERNATION_UP_POSSIBLE=y
+# CONFIG_SECCOMP is not set
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE="ep88xc.dts"
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_FSL_SOC=y
+# CONFIG_PCI is not set
+# CONFIG_PCI_DOMAINS is not set
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_PCI_QSPAN is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# 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=0x80000000
+CONFIG_CONSISTENT_START=0xfd000000
+CONFIG_CONSISTENT_SIZE=0x00200000
+CONFIG_BOOT_LOAD=0x00400000
+
+#
+# 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=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET 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
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_PARTITIONS 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
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_CFI_FLAGADM is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_OF_DEVICE=y
+# CONFIG_PARPORT is not set
+# CONFIG_BLK_DEV is not set
+# CONFIG_MISC_DEVICES is not set
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+CONFIG_LXT_PHY=y
+# 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_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_FS_ENET=y
+# CONFIG_FS_ENET_HAS_SCC is not set
+CONFIG_FS_ENET_HAS_FEC=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER 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
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_CPM=y
+CONFIG_SERIAL_CPM_CONSOLE=y
+# CONFIG_SERIAL_CPM_SCC1 is not set
+# CONFIG_SERIAL_CPM_SCC2 is not set
+# CONFIG_SERIAL_CPM_SCC3 is not set
+# CONFIG_SERIAL_CPM_SCC4 is not set
+CONFIG_SERIAL_CPM_SMC1=y
+CONFIG_SERIAL_CPM_SMC2=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG 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 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_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_USB_SUPPORT 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
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS 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_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_INOTIFY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# 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=y
+# 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
+
+#
+# Network File Systems
+#
+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=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+# CONFIG_CRC32 is not set
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+
+#
+# Instrumentation Support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_FAULT_INJECTION 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_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_CRYPTO is not set
diff --git a/arch/powerpc/configs/kilauea_defconfig b/arch/powerpc/configs/kilauea_defconfig
new file mode 100644
index 000000000000..31790d329269
--- /dev/null
+++ b/arch/powerpc/configs/kilauea_defconfig
@@ -0,0 +1,768 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-rc9
+# Thu Oct 11 19:05:15 2007
+#
+# 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=y
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_4xx=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_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 is not set
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_PPC_DCR_NATIVE=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_USER_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+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=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+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_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+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"
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+CONFIG_KILAUEA=y
+# CONFIG_WALNUT is not set
+# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+# CONFIG_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_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_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_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_HIBERNATION_UP_POSSIBLE=y
+CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE="kilauea.dts"
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=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
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# 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=0x80000000
+CONFIG_CONSISTENT_START=0xff100000
+CONFIG_CONSISTENT_SIZE=0x00200000
+CONFIG_BOOT_LOAD=0x00400000
+
+#
+# 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_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
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_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=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# 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 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=35000
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# 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_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_NET_ETHERNET is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER 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
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+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_OF_PLATFORM=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG 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_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 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 is not set
+
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_USB_SUPPORT 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
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# 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_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_RAMFS=y
+# 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=y
+# 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
+
+#
+# Network File Systems
+#
+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
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+# CONFIG_UCC_SLOW 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
+
+#
+# Instrumentation Support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION 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_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_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=y
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 4b68032588ff..6b7951ec941a 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_ads_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23-rc4
-# Tue Aug 28 21:24:39 2007
+# Wed Sep  5 12:43:23 2007
 #
 # CONFIG_PPC64 is not set
 
@@ -52,7 +52,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_EXPERIMENTAL is not set
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION="powerpc8272"
+CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -71,7 +71,7 @@ CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -122,10 +122,11 @@ CONFIG_PPC_82xx=y
 # CONFIG_PPC_MPC5200 is not set
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
-CONFIG_MPC82xx_ADS=y
+CONFIG_MPC8272_ADS=y
 CONFIG_PQ2ADS=y
 CONFIG_8260=y
 CONFIG_8272=y
+CONFIG_PQ2_ADS_PCI_PIC=y
 # CONFIG_MPIC is not set
 # CONFIG_MPIC_WEIRD is not set
 # CONFIG_PPC_I8259 is not set
@@ -137,7 +138,9 @@ CONFIG_8272=y
 # 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
@@ -168,18 +171,25 @@ CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
-# CONFIG_WANT_DEVICE_TREE is not set
+CONFIG_WANT_DEVICE_TREE=y
+# CONFIG_BUILD_RAW_IMAGE is not set
+CONFIG_DEVICE_TREE="mpc8272ads.dts"
 CONFIG_ISA_DMA_API=y
 
 #
 # Bus options
 #
 CONFIG_ZONE_DMA=y
+CONFIG_PPC_INDIRECT_PCI=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_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCI_8260=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_DEBUG is not set
 
 #
 # PCCARD (PCMCIA/CardBus) support
@@ -313,43 +323,101 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
-# CONFIG_MTD is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_PARTITIONS 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
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set
+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 is not set
+# CONFIG_MTD_CFI_I2 is not set
+CONFIG_MTD_CFI_I4=y
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_SBC8240 is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
 CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
 # CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=y
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_RAM is not set
 # 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=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_BLK_DEV_IDECD 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 is not set
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
-# CONFIG_IDE_ARM is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_BLK_DEV_HD is not set
+# CONFIG_MISC_DEVICES is not set
+# CONFIG_IDE is not set
 
 #
 # SCSI device support
@@ -360,6 +428,21 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_SCSI_NETLINK is not set
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# An alternative FireWire stack is available with EXPERIMENTAL=y
+#
+# 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
@@ -367,6 +450,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_BONDING is not set
 # CONFIG_EQUALIZER is not set
 CONFIG_TUN=y
+# CONFIG_ARCNET is not set
 CONFIG_PHYLIB=y
 
 #
@@ -382,13 +466,42 @@ CONFIG_DAVICOM_PHY=y
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_FIXED_PHY is not set
+CONFIG_MDIO_BITBANG=y
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_PCI is not set
 CONFIG_FS_ENET=y
 # CONFIG_FS_ENET_HAS_SCC is not set
 CONFIG_FS_ENET_HAS_FCC=y
 CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
 CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TR is not set
 
 #
 # Wireless LAN
@@ -396,6 +509,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
 # CONFIG_WAN is not set
+# CONFIG_FDDI is not set
 CONFIG_PPP=y
 # CONFIG_PPP_FILTER is not set
 CONFIG_PPP_ASYNC=y
@@ -459,6 +573,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_SERIO=y
 # CONFIG_SERIO_I8042 is not set
 CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
 # CONFIG_GAMEPORT is not set
@@ -488,6 +603,7 @@ CONFIG_SERIAL_CPM_SCC1=y
 CONFIG_SERIAL_CPM_SCC4=y
 # CONFIG_SERIAL_CPM_SMC1 is not set
 # CONFIG_SERIAL_CPM_SMC2 is not set
+# CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -497,7 +613,11 @@ CONFIG_HW_RANDOM=y
 # CONFIG_NVRAM is not set
 # CONFIG_GEN_RTC is not set
 # CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
+CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
 
 #
@@ -531,7 +651,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -539,45 +659,11 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
 # Sound
 #
 # CONFIG_SOUND is not set
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-# CONFIG_HID_DEBUG 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'
-#
-
-#
-# USB Gadget Support
-#
-CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_PXA2XX is not set
-CONFIG_USB_GADGET_M66592=y
-CONFIG_USB_M66592=y
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
-# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
 # CONFIG_NEW_LEDS is not set
+# CONFIG_INFINIBAND is not set
 # CONFIG_RTC_CLASS is not set
 
 #
@@ -614,11 +700,7 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=y
-# CONFIG_XFS_QUOTA is not set
-# CONFIG_XFS_SECURITY is not set
-# CONFIG_XFS_POSIX_ACL is not set
-# CONFIG_XFS_RT is not set
+# CONFIG_XFS_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -659,6 +741,7 @@ CONFIG_RAMFS=y
 # Miscellaneous filesystems
 #
 # CONFIG_HFSPLUS_FS is not set
+# CONFIG_JFFS2_FS is not set
 CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -680,8 +763,7 @@ CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
-CONFIG_SMB_FS=y
-# CONFIG_SMB_NLS_DEFAULT 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
@@ -775,7 +857,7 @@ CONFIG_HAS_DMA=y
 #
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
@@ -793,7 +875,7 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_DEBUG_VM is not set
 # CONFIG_DEBUG_LIST is not set
@@ -845,4 +927,4 @@ CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
-CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/powerpc/configs/mpc8544_ds_defconfig b/arch/powerpc/configs/mpc8544_ds_defconfig
index 86582aefab93..150221f6f723 100644
--- a/arch/powerpc/configs/mpc8544_ds_defconfig
+++ b/arch/powerpc/configs/mpc8544_ds_defconfig
@@ -136,7 +136,7 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_MPC8560_ADS is not set
 # CONFIG_MPC85xx_CDS is not set
 # CONFIG_MPC85xx_MDS is not set
-CONFIG_MPC8544_DS=y
+CONFIG_MPC85xx_DS=y
 CONFIG_MPC85xx=y
 CONFIG_MPIC=y
 # CONFIG_MPIC_WEIRD is not set
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig
index 0fb54c775cf9..3d68c65212cf 100644
--- a/arch/powerpc/configs/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/mpc8560_ads_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc4
-# Tue Aug 28 21:24:43 2007
+# Linux kernel version: 2.6.23-rc9
+# Thu Oct 11 09:16:32 2007
 #
 # CONFIG_PPC64 is not set
 
@@ -22,8 +22,13 @@ CONFIG_FSL_BOOKE=y
 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_IRQ_PER_CPU=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -86,7 +91,6 @@ 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
@@ -128,7 +132,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
 CONFIG_MPC8560_ADS=y
 # CONFIG_MPC85xx_CDS is not set
 # CONFIG_MPC85xx_MDS is not set
-# CONFIG_MPC8544_DS is not set
+# CONFIG_MPC85xx_DS is not set
 CONFIG_MPC8560=y
 CONFIG_MPC85xx=y
 CONFIG_MPIC=y
@@ -142,12 +146,17 @@ CONFIG_MPIC=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 CONFIG_CPM2=y
+CONFIG_PPC_CPM_NEW_BINDING=y
 # CONFIG_FSL_ULI1575 is not set
+CONFIG_CPM=y
 
 #
 # Kernel options
 #
 # CONFIG_HIGHMEM is not set
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
@@ -158,7 +167,7 @@ CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT is not set
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=y
-# CONFIG_MATH_EMULATION is not set
+CONFIG_MATH_EMULATION=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -177,6 +186,8 @@ CONFIG_VIRT_TO_BUS=y
 # CONFIG_PROC_DEVICETREE is not set
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_HIBERNATION_UP_POSSIBLE=y
 # CONFIG_SECCOMP is not set
 CONFIG_WANT_DEVICE_TREE=y
 CONFIG_DEVICE_TREE=""
@@ -415,6 +426,7 @@ CONFIG_E1000_NAPI=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -807,3 +819,4 @@ CONFIG_FORCED_INLINING=y
 # CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
 # CONFIG_CRYPTO is not set
+# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/mpc8572_ds_defconfig b/arch/powerpc/configs/mpc8572_ds_defconfig
new file mode 100644
index 000000000000..7f1a3e987138
--- /dev/null
+++ b/arch/powerpc/configs/mpc8572_ds_defconfig
@@ -0,0 +1,1496 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-rc4
+# Tue Sep 11 01:19:35 2007
+#
+# 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_85xx=y
+CONFIG_E500=y
+CONFIG_BOOKE=y
+CONFIG_FSL_BOOKE=y
+# CONFIG_PHYS_64BIT is not set
+CONFIG_SPE=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_PPC32=y
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+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=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+CONFIG_AUDIT=y
+# CONFIG_AUDITSYSCALL is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+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=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+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_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+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=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+CONFIG_LBD=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# 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=y
+CONFIG_MPC85xx=y
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+CONFIG_PPC_I8259=y
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
+CONFIG_FSL_ULI1575=y
+
+#
+# Kernel options
+#
+CONFIG_HIGHMEM=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_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+CONFIG_MATH_EMULATION=y
+CONFIG_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_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE=""
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_FSL_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_DEBUG is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# 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=0x80000000
+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=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPGRE=y
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+CONFIG_OF_DEVICE=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_NBD=y
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=131072
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_SATA_AHCI=y
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_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=y
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS 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=y
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+CONFIG_VITESSE_PHY=y
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_FIXED_PHY is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_PCI is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+CONFIG_GIANFAR=y
+CONFIG_GFAR_NAPI=y
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET_MII is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER 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_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+CONFIG_NVRAM=y
+CONFIG_GEN_RTC=y
+CONFIG_GEN_RTC_X=y
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_CHARDEV is not set
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_MPC=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+# CONFIG_DS1682 is not set
+CONFIG_SENSORS_EEPROM=y
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_M41T00 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+CONFIG_DVB_CORE=m
+# CONFIG_DVB_CORE_ATTACH is not set
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+
+#
+# Supported USB Adapters
+#
+# CONFIG_DVB_USB is not set
+# CONFIG_DVB_TTUSB_BUDGET is not set
+# CONFIG_DVB_TTUSB_DEC is not set
+# CONFIG_DVB_CINERGYT2 is not set
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+# CONFIG_DVB_B2C2_FLEXCOP is not set
+
+#
+# Supported BT878 Adapters
+#
+
+#
+# Supported Pluto2 Adapters
+#
+# CONFIG_DVB_PLUTO2 is not set
+
+#
+# Supported DVB Frontends
+#
+
+#
+# Customise DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# DVB-S (satellite) frontends
+#
+# CONFIG_DVB_STV0299 is not set
+# CONFIG_DVB_CX24110 is not set
+# CONFIG_DVB_CX24123 is not set
+# CONFIG_DVB_TDA8083 is not set
+# CONFIG_DVB_MT312 is not set
+# CONFIG_DVB_VES1X93 is not set
+# CONFIG_DVB_S5H1420 is not set
+# CONFIG_DVB_TDA10086 is not set
+
+#
+# DVB-T (terrestrial) frontends
+#
+# CONFIG_DVB_SP8870 is not set
+# CONFIG_DVB_SP887X is not set
+# CONFIG_DVB_CX22700 is not set
+# CONFIG_DVB_CX22702 is not set
+# CONFIG_DVB_L64781 is not set
+# CONFIG_DVB_TDA1004X is not set
+# CONFIG_DVB_NXT6000 is not set
+# CONFIG_DVB_MT352 is not set
+# CONFIG_DVB_ZL10353 is not set
+# CONFIG_DVB_DIB3000MB is not set
+# CONFIG_DVB_DIB3000MC is not set
+# CONFIG_DVB_DIB7000M is not set
+# CONFIG_DVB_DIB7000P is not set
+
+#
+# DVB-C (cable) frontends
+#
+# CONFIG_DVB_VES1820 is not set
+# CONFIG_DVB_TDA10021 is not set
+# CONFIG_DVB_TDA10023 is not set
+# CONFIG_DVB_STV0297 is not set
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+# CONFIG_DVB_NXT200X is not set
+# CONFIG_DVB_OR51211 is not set
+# CONFIG_DVB_OR51132 is not set
+# CONFIG_DVB_BCM3510 is not set
+# CONFIG_DVB_LGDT330X is not set
+
+#
+# Tuners/PLL support
+#
+# CONFIG_DVB_PLL is not set
+# CONFIG_DVB_TDA826X is not set
+# CONFIG_DVB_TDA827X is not set
+# CONFIG_DVB_TUNER_QT1010 is not set
+# CONFIG_DVB_TUNER_MT2060 is not set
+
+#
+# Miscellaneous devices
+#
+# CONFIG_DVB_LNBP21 is not set
+# CONFIG_DVB_ISL6421 is not set
+# CONFIG_DVB_TUA6100 is not set
+CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+# CONFIG_FB is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_AC97_CODEC=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# PCI devices
+#
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+CONFIG_SND_INTEL8X0=y
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+
+#
+# ALSA PowerMac devices
+#
+
+#
+# ALSA PowerPC devices
+#
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# SoC Audio support for SuperH
+#
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=y
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# 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=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_CRAMFS=y
+CONFIG_VXFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+# CONFIG_NFSD_V3 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+# CONFIG_UCC_SLOW 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=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+
+#
+# Instrumentation Support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION 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_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_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_ECB is not set
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig
new file mode 100644
index 000000000000..de19b781937f
--- /dev/null
+++ b/arch/powerpc/configs/mpc8610_hpcd_defconfig
@@ -0,0 +1,1023 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-rc6
+# Tue Oct  2 11:42:56 2007
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
+CONFIG_PPC32=y
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+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 is not set
+# CONFIG_SWAP is not set
+# CONFIG_SYSVIPC is not set
+# 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_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+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=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+# CONFIG_ELF_CORE is not set
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_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 is not set
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+
+#
+# Platform support
+#
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+CONFIG_PPC_86xx=y
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_MPC8641_HPCN is not set
+CONFIG_MPC8610_HPCD=y
+CONFIG_MPC8610=y
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+CONFIG_HIGHMEM=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_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_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+CONFIG_SUSPEND_UP_POSSIBLE=y
+CONFIG_HIBERNATION_UP_POSSIBLE=y
+# CONFIG_SECCOMP is not set
+# CONFIG_WANT_DEVICE_TREE is not set
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_FSL_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_DEBUG=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# 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=0x80000000
+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=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# 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=y
+# 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=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES 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
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+CONFIG_OF_DEVICE=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=131072
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
+# CONFIG_BLK_DEV_IDE is not set
+# CONFIG_BLK_DEV_HD_ONLY is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=y
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR 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
+
+#
+# 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_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_SATA_AHCI=y
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_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=y
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+# CONFIG_FUSION_SAS 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=y
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_FIXED_PHY is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+CONFIG_NET_TULIP=y
+# CONFIG_DE2104X is not set
+CONFIG_TULIP=y
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+# CONFIG_DE4X5 is not set
+# CONFIG_WINBOND_840 is not set
+# CONFIG_DM9102 is not set
+# CONFIG_ULI526X is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+CONFIG_8139TOO=y
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_SC92031 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_GIANFAR is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE 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_NET_FC is not set
+# CONFIG_SHAPER 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_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG 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_AGP is not set
+# CONFIG_DRM 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
+
+#
+# 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_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+# CONFIG_FB is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC 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
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# 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 is not set
+# CONFIG_QUOTA is not set
+# CONFIG_DNOTIFY 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_RAMFS=y
+# 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 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
+
+#
+# Network File Systems
+#
+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=y
+# CONFIG_NFSD_V3 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG 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
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+# CONFIG_UCC_SLOW 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
+
+#
+# Instrumentation Support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_FAULT_INJECTION 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_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_CRYPTO is not set
diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig
index d27e1f8c38fa..482d99db6870 100644
--- a/arch/powerpc/configs/mpc885_ads_defconfig
+++ b/arch/powerpc/configs/mpc885_ads_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc4
-# Tue Aug 28 21:24:45 2007
+# Linux kernel version: 2.6.23-rc3
+# Mon Aug 27 15:23:16 2007
 #
 # CONFIG_PPC64 is not set
 
@@ -38,6 +38,7 @@ CONFIG_OF=y
 # CONFIG_PPC_UDBG_16550 is not set
 # CONFIG_GENERIC_TBSYNC is not set
 CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
 # CONFIG_DEFAULT_UIMAGE is not set
 # CONFIG_PPC_DCR_NATIVE is not set
 # CONFIG_PPC_DCR_MMIO is not set
@@ -69,24 +70,25 @@ CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 # CONFIG_SYSCTL_SYSCALL is not set
 CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
-# CONFIG_HOTPLUG is not set
+CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
-# CONFIG_BUG is not set
-CONFIG_ELF_CORE=y
+CONFIG_BUG=y
+# CONFIG_ELF_CORE is not set
 # CONFIG_BASE_FULL is not set
-CONFIG_FUTEX=y
+# CONFIG_FUTEX is not set
 CONFIG_ANON_INODES=y
-# CONFIG_EPOLL is not set
+CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 # CONFIG_VM_EVENT_COUNTERS is not set
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
-CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=1
 # CONFIG_MODULES is not set
@@ -100,14 +102,14 @@ CONFIG_BLOCK=y
 # IO Schedulers
 #
 CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
+# CONFIG_IOSCHED_AS is not set
 CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_DEFAULT_IOSCHED="deadline"
 
 #
 # Platform support
@@ -120,6 +122,7 @@ CONFIG_CPM1=y
 # CONFIG_MPC8XXFADS is not set
 # CONFIG_MPC86XADS is not set
 CONFIG_MPC885ADS=y
+# CONFIG_PPC_EP88XC is not set
 
 #
 # Freescale Ethernet driver platform-specific options
@@ -137,6 +140,7 @@ CONFIG_MPC8xx_SECOND_ETH_FEC2=y
 #
 CONFIG_8xx_COPYBACK=y
 # CONFIG_8xx_CPU6 is not set
+CONFIG_8xx_CPU15=y
 CONFIG_NO_UCODE_PATCH=y
 # CONFIG_USB_SOF_UCODE_PATCH is not set
 # CONFIG_I2C_SPI_UCODE_PATCH is not set
@@ -153,23 +157,23 @@ CONFIG_NO_UCODE_PATCH=y
 # CONFIG_GENERIC_IOMAP is not set
 # CONFIG_CPU_FREQ is not set
 # CONFIG_CPM2 is not set
-# CONFIG_FSL_ULI1575 is not set
+CONFIG_PPC_CPM_NEW_BINDING=y
 
 #
 # Kernel options
 #
 # CONFIG_HIGHMEM is not set
-# CONFIG_HZ_100 is not set
+CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
-CONFIG_MATH_EMULATION=y
+# CONFIG_MATH_EMULATION is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
@@ -185,11 +189,12 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
-# CONFIG_PROC_DEVICETREE is not set
+CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_PM is not set
 # CONFIG_SECCOMP is not set
-# CONFIG_WANT_DEVICE_TREE is not set
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE="mpc885ads.dts"
 CONFIG_ISA_DMA_API=y
 
 #
@@ -206,6 +211,7 @@ CONFIG_FSL_SOC=y
 #
 # PCCARD (PCMCIA/CardBus) support
 #
+# CONFIG_PCCARD is not set
 
 #
 # Advanced setup
@@ -234,10 +240,6 @@ CONFIG_NET=y
 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_NET_KEY is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
@@ -257,9 +259,9 @@ CONFIG_SYN_COOKIES=y
 # 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_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
@@ -319,22 +321,91 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 #
 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 is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_PARTITIONS 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
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set
+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 is not set
+# CONFIG_MTD_CFI_I2 is not set
+CONFIG_MTD_CFI_I4=y
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP 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 is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_BLK_DEV is not set
+# CONFIG_MISC_DEVICES is not set
 # CONFIG_IDE is not set
 
 #
@@ -368,16 +439,15 @@ CONFIG_DAVICOM_PHY=y
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
 # CONFIG_ICPLUS_PHY is not set
-CONFIG_FIXED_PHY=y
-CONFIG_FIXED_MII_10_FDX=y
-# CONFIG_FIXED_MII_100_FDX is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 CONFIG_FS_ENET=y
-CONFIG_FS_ENET_HAS_SCC=y
+# CONFIG_FS_ENET_HAS_SCC is not set
 CONFIG_FS_ENET_HAS_FEC=y
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEV_10000=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
 
 #
 # Wireless LAN
@@ -397,55 +467,12 @@ CONFIG_NETDEV_10000=y
 #
 # Input device support
 #
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
+# CONFIG_INPUT is not set
 
 #
 # Hardware I/O ports
 #
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=y
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -493,20 +520,7 @@ CONFIG_GEN_RTC=y
 # 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_ABITUGURU is not set
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_F71805F 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_HWMON is not set
 
 #
 # Multifunction device drivers
@@ -530,7 +544,7 @@ CONFIG_DAB=y
 #
 # CONFIG_DISPLAY_SUPPORT is not set
 # CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
 # CONFIG_FB is not set
 # CONFIG_FB_IBM_GXT4500 is not set
 
@@ -538,22 +552,7 @@ CONFIG_VIDEO_OUTPUT_CONTROL=y
 # Sound
 #
 # CONFIG_SOUND is not set
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-# CONFIG_HID_DEBUG 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'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_MMC is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_EDAC is not set
@@ -580,19 +579,9 @@ CONFIG_USB_SUPPORT=y
 #
 # File systems
 #
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-# CONFIG_EXT2_FS_POSIX_ACL is not set
-# CONFIG_EXT2_FS_SECURITY is not set
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS 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
@@ -601,10 +590,9 @@ CONFIG_FS_MBCACHE=y
 # 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_INOTIFY is not set
 # CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
+# CONFIG_DNOTIFY is not set
 # CONFIG_AUTOFS_FS is not set
 # CONFIG_AUTOFS4_FS is not set
 # CONFIG_FUSE_FS is not set
@@ -645,6 +633,7 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
 CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -711,15 +700,13 @@ CONFIG_MSDOS_PARTITION=y
 #
 # Library routines
 #
-CONFIG_BITREVERSE=y
-CONFIG_CRC_CCITT=y
+# CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
+# CONFIG_CRC32 is not set
 # 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
@@ -734,11 +721,33 @@ CONFIG_HAS_DMA=y
 #
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
 # CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
+CONFIG_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_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_FAULT_INJECTION 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_BDI_SWITCH is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
 #
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig
new file mode 100644
index 000000000000..a51fc39dea4e
--- /dev/null
+++ b/arch/powerpc/configs/pq2fads_defconfig
@@ -0,0 +1,1003 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-rc4
+# Thu Aug 30 11:58:17 2007
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
+CONFIG_PPC32=y
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+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 is not set
+# 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 is not set
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_MODULES is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=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"
+
+#
+# Platform support
+#
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_EMBEDDED6xx is not set
+CONFIG_PPC_82xx=y
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_MPC8272_ADS is not set
+CONFIG_PQ2FADS=y
+# CONFIG_EP8248E is not set
+CONFIG_PQ2ADS=y
+CONFIG_8260=y
+CONFIG_PQ2_ADS_PCI_PIC=y
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_CPM2=y
+CONFIG_PPC_CPM_NEW_BINDING=y
+# CONFIG_FSL_ULI1575 is not set
+CONFIG_CPM=y
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_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_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE="pq2fads.dts"
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCI_8260=y
+# CONFIG_8260_PCI9 is not set
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_DEBUG is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# 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=0x80000000
+CONFIG_BOOT_LOAD=0x00400000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+CONFIG_IPV6_SIT=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_NF_CONNTRACK_ENABLED is not set
+# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NETFILTER_XTABLES is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_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
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+# CONFIG_MTD_PARTITIONS 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
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+CONFIG_MTD_JEDECPROBE=y
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set
+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 is not set
+# CONFIG_MTD_CFI_I2 is not set
+CONFIG_MTD_CFI_I4=y
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_SBC8240 is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_OF_DEVICE=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+CONFIG_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=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDECD 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 is not set
+# CONFIG_BLK_DEV_IDEPCI is not set
+# CONFIG_IDEPCI_PCIBUS_ORDER is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# An alternative FireWire stack is available with EXPERIMENTAL=y
+#
+# 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_EQUALIZER is not set
+CONFIG_TUN=y
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+CONFIG_DAVICOM_PHY=y
+# 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_FIXED_PHY is not set
+CONFIG_MDIO_BITBANG=y
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_PCI is not set
+CONFIG_FS_ENET=y
+# CONFIG_FS_ENET_HAS_SCC is not set
+CONFIG_FS_ENET_HAS_FCC=y
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE 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_PPP=y
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=y
+CONFIG_PPP_SYNC_TTY=y
+CONFIG_PPP_DEFLATE=y
+# CONFIG_PPP_BSDCOMP is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=y
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_I8042 is not set
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT 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=y
+# CONFIG_SERIAL_CPM_SMC1 is not set
+# CONFIG_SERIAL_CPM_SMC2 is not set
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER 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
+
+#
+# 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_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+# CONFIG_FB is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_SELECTED=y
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_PXA2XX is not set
+CONFIG_USB_GADGET_M66592=y
+CONFIG_USB_M66592=y
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_AT91 is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+CONFIG_USB_GADGET_DUALSPEED=y
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_ETH=y
+# CONFIG_USB_GADGETFS is not set
+# CONFIG_USB_FILE_STORAGE is not set
+# CONFIG_USB_G_SERIAL is not set
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_RTC_CLASS is not set
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# 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_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=y
+# CONFIG_XFS_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=y
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_JFFS2_FS is not set
+CONFIG_CRAMFS=y
+# 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
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+# CONFIG_UCC_SLOW is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_FAULT_INJECTION 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_BDI_SWITCH=y
+# CONFIG_PPC_EARLY_DEBUG is not set
+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
+# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
+# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
+# CONFIG_PPC_EARLY_DEBUG_44x is not set
+# CONFIG_PPC_EARLY_DEBUG_CPM is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=y
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_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_HW=y
diff --git a/arch/powerpc/configs/sequoia_defconfig b/arch/powerpc/configs/sequoia_defconfig
new file mode 100644
index 000000000000..bc7f5089a894
--- /dev/null
+++ b/arch/powerpc/configs/sequoia_defconfig
@@ -0,0 +1,861 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-rc6
+# Fri Sep 14 13:20:06 2007
+#
+# 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_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+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_USER_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+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_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+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"
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 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=y
+CONFIG_440EPX=y
+CONFIG_440A=y
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# 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_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_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_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_DEVICE_TREE="sequoia.dts"
+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_DEBUG is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# 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=0x80000000
+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_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
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_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=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_BLKDEVS is not set
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# 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=y
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_OF_DEVICE=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP 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_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_XILINX_SYSACE is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_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
+
+#
+# Fusion MPT device support
+#
+# 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=y
+# CONFIG_MAC_EMUMOUSEBTN is not set
+# CONFIG_WINDFARM 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_ARCNET is not set
+# CONFIG_NET_ETHERNET is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_MLX4_CORE 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_SHAPER 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
+
+#
+# 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_WATCHDOG 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_AGP is not set
+# CONFIG_DRM 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
+
+#
+# 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_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC 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
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# 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_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_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_CRAMFS=y
+# 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
+
+#
+# Network File Systems
+#
+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
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+# CONFIG_UCC_SLOW is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+
+#
+# Instrumentation Support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION 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_BDI_SWITCH is not set
+CONFIG_PPC_EARLY_DEBUG=y
+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
+# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
+# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
+CONFIG_PPC_EARLY_DEBUG_44x=y
+CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
+CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=y
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/configs/walnut_defconfig b/arch/powerpc/configs/walnut_defconfig
new file mode 100644
index 000000000000..766bf840c18d
--- /dev/null
+++ b/arch/powerpc/configs/walnut_defconfig
@@ -0,0 +1,773 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.23-rc4
+# Wed Sep  5 12:06:37 2007
+#
+# 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=y
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_4xx=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_NOT_COHERENT_CACHE=y
+CONFIG_PPC32=y
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+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 is not set
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_PPC_DCR_NATIVE=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_USER_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+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=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+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_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+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"
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_MPC5200 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+CONFIG_WALNUT=y
+CONFIG_405GP=y
+CONFIG_IBM405_ERR77=y
+CONFIG_IBM405_ERR51=y
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# 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_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_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_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 is not set
+# CONFIG_PM is not set
+CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_DEVICE_TREE="walnut.dts"
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=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
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# 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=0x80000000
+CONFIG_CONSISTENT_START=0xff100000
+CONFIG_CONSISTENT_SIZE=0x00200000
+CONFIG_BOOT_LOAD=0x00400000
+
+#
+# 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_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
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_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=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+
+#
+# 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_WALNUT is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_OF_DEVICE=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP 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=35000
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_XILINX_SYSACE is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_NET_ETHERNET is not set
+CONFIG_NETDEV_1000=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_SHAPER 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
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+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_OF_PLATFORM=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_WATCHDOG 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_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 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 is not set
+
+#
+# Graphics support
+#
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND 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'
+#
+
+#
+# USB Gadget 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
+
+#
+# DMA Engine support
+#
+# CONFIG_DMA_ENGINE is not set
+
+#
+# DMA Clients
+#
+
+#
+# DMA Devices
+#
+
+#
+# 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_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_RAMFS=y
+# 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=y
+# 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
+
+#
+# Network File Systems
+#
+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
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+# CONFIG_UCC_SLOW 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
+
+#
+# Instrumentation Support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+CONFIG_FORCED_INLINING=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_FAULT_INJECTION 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_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_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=y
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+CONFIG_CRYPTO_HW=y
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index b0cb2e662c25..ca51f0cf27ab 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_PPC64)		+= vdso64/
 obj-$(CONFIG_ALTIVEC)           += vecemu.o vector.o
 obj-$(CONFIG_PPC_970_NAP)       += idle_power4.o
 obj-$(CONFIG_PPC_OF)            += of_device.o of_platform.o prom_parse.o
+obj-$(CONFIG_PPC_CLOCK)         += clock.o
 procfs-$(CONFIG_PPC64)          := proc_ppc64.o
 obj-$(CONFIG_PROC_FS)           += $(procfs-y)
 rtaspci-$(CONFIG_PPC64)-$(CONFIG_PCI)   := rtas_pci.o
@@ -37,25 +38,27 @@ obj-$(CONFIG_GENERIC_TBSYNC)	+= smp-tbsync.o
 obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
 obj-$(CONFIG_6xx)               += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
 obj-$(CONFIG_TAU)               += tau_6xx.o
-obj-$(CONFIG_HIBERNATION)       += swsusp.o suspend.o
-obj32-$(CONFIG_HIBERNATION) += swsusp_32.o
-obj64-$(CONFIG_HIBERNATION) += swsusp_64.o swsusp_asm64.o
-obj32-$(CONFIG_MODULES)         += module_32.o
+obj-$(CONFIG_HIBERNATION)       += swsusp.o suspend.o \
+                                   swsusp_$(CONFIG_WORD_SIZE).o
+obj64-$(CONFIG_HIBERNATION)     += swsusp_asm64.o
+obj-$(CONFIG_MODULES)           += module_$(CONFIG_WORD_SIZE).o
+obj-$(CONFIG_44x)               += cpu_setup_44x.o
 
 ifeq ($(CONFIG_PPC_MERGE),y)
 
 extra-$(CONFIG_PPC_STD_MMU)     := head_32.o
 extra-$(CONFIG_PPC64)           := head_64.o
-extra-$(CONFIG_40x)             := head_4xx.o
+extra-$(CONFIG_40x)             := head_40x.o
 extra-$(CONFIG_44x)             := head_44x.o
 extra-$(CONFIG_FSL_BOOKE)       := head_fsl_booke.o
 extra-$(CONFIG_8xx)             := head_8xx.o
 extra-y                         += vmlinux.lds
 
 obj-y                           += time.o prom.o traps.o setup-common.o \
-                                   udbg.o misc.o io.o
-obj-$(CONFIG_PPC32)             += entry_32.o setup_32.o misc_32.o
-obj-$(CONFIG_PPC64)             += misc_64.o dma_64.o iommu.o
+                                   udbg.o misc.o io.o \
+                                   misc_$(CONFIG_WORD_SIZE).o
+obj-$(CONFIG_PPC32)             += entry_32.o setup_32.o
+obj-$(CONFIG_PPC64)             += dma_64.o iommu.o
 obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o
 obj-$(CONFIG_MODULES)           += ppc_ksyms.o
 obj-$(CONFIG_BOOTX_TEXT)        += btext.o
@@ -63,37 +66,27 @@ obj-$(CONFIG_SMP)		+= smp.o
 obj-$(CONFIG_KPROBES)           += kprobes.o
 obj-$(CONFIG_PPC_UDBG_16550)    += legacy_serial.o udbg_16550.o
 
-module-$(CONFIG_PPC64)          += module_64.o
-obj-$(CONFIG_MODULES)           += $(module-y)
-
-pci64-$(CONFIG_PPC64)           += pci_64.o pci_dn.o isa-bridge.o
-pci32-$(CONFIG_PPC32)           := pci_32.o
-obj-$(CONFIG_PCI)               += $(pci64-y) $(pci32-y) pci-common.o
+pci64-$(CONFIG_PPC64)           += pci_dn.o isa-bridge.o
+obj-$(CONFIG_PCI)               += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
+                                   pci-common.o
 obj-$(CONFIG_PCI_MSI)           += msi.o
-kexec-$(CONFIG_PPC64)           := machine_kexec_64.o
-kexec-$(CONFIG_PPC32)           := machine_kexec_32.o
-obj-$(CONFIG_KEXEC)             += machine_kexec.o crash.o $(kexec-y)
+obj-$(CONFIG_KEXEC)             += machine_kexec.o crash.o \
+                                   machine_kexec_$(CONFIG_WORD_SIZE).o
 obj-$(CONFIG_AUDIT)             += audit.o
 obj64-$(CONFIG_AUDIT)           += compat_audit.o
 
+obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o
+
 ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
 obj-y                           += iomap.o
 endif
 
-ifeq ($(CONFIG_PPC_ISERIES),y)
-CFLAGS_lparmap.s                += -g0
-extra-y += lparmap.s
-$(obj)/head_64.o:       $(obj)/lparmap.s
-AFLAGS_head_64.o += -I$(obj)
-endif
-
 else
 # stuff used from here for ARCH=ppc
 smpobj-$(CONFIG_SMP)            += smp.o
 
 endif
 
-obj-$(CONFIG_PPC32)             += $(obj32-y)
 obj-$(CONFIG_PPC64)             += $(obj64-y)
 
 extra-$(CONFIG_PPC_FPU)         += fpu.o
diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c
index 5c9ff7f5c44e..e06f75daeba3 100644
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
@@ -38,7 +38,7 @@ struct aligninfo {
 /* Bits in the flags field */
 #define LD      0       /* load */
 #define ST      1       /* store */
-#define SE      2       /* sign-extend value */
+#define SE      2       /* sign-extend value, or FP ld/st as word */
 #define F       4       /* to/from fp regs */
 #define U       8       /* update index register */
 #define M       0x10    /* multiple load/store */
@@ -46,6 +46,8 @@ struct aligninfo {
 #define S       0x40    /* single-precision fp or... */
 #define SX      0x40    /* ... byte count in XER */
 #define HARD    0x80    /* string, stwcx. */
+#define E4      0x40    /* SPE endianness is word */
+#define E8      0x80    /* SPE endianness is double word */
 
 /* DSISR bits reported for a DCBZ instruction: */
 #define DCBZ    0x5f    /* 8xx/82xx dcbz faults when cache not enabled */
@@ -87,9 +89,9 @@ static struct aligninfo aligninfo[128] = {
         { 8, LD+F+U },          /* 00 1 1001: lfdu */
         { 4, ST+F+S+U },        /* 00 1 1010: stfsu */
         { 8, ST+F+U },          /* 00 1 1011: stfdu */
-        INVALID,                /* 00 1 1100 */
+        { 16, LD+F },           /* 00 1 1100: lfdp */
         INVALID,                /* 00 1 1101 */
-        INVALID,                /* 00 1 1110 */
+        { 16, ST+F },           /* 00 1 1110: stfdp */
         INVALID,                /* 00 1 1111 */
         { 8, LD },              /* 01 0 0000: ldx */
         INVALID,                /* 01 0 0001 */
@@ -167,10 +169,10 @@ static struct aligninfo aligninfo[128] = {
         { 8, LD+F },            /* 11 0 1001: lfdx */
         { 4, ST+F+S },          /* 11 0 1010: stfsx */
         { 8, ST+F },            /* 11 0 1011: stfdx */
-        INVALID,                /* 11 0 1100 */
-        { 8, LD+M },            /* 11 0 1101: lmd */
-        INVALID,                /* 11 0 1110 */
-        { 8, ST+M },            /* 11 0 1111: stmd */
+        { 16, LD+F },           /* 11 0 1100: lfdpx */
+        { 4, LD+F+SE },         /* 11 0 1101: lfiwax */
+        { 16, ST+F },           /* 11 0 1110: stfdpx */
+        { 4, ST+F },            /* 11 0 1111: stfiwx */
         { 4, LD+U },            /* 11 1 0000: lwzux */
         INVALID,                /* 11 1 0001 */
         { 4, ST+U },            /* 11 1 0010: stwux */
@@ -356,6 +358,284 @@ static int emulate_multiple(struct pt_regs *regs, unsigned char __user *addr,
         return 1;
 }
 
+/*
+ * Emulate floating-point pair loads and stores.
+ * Only POWER6 has these instructions, and it does true little-endian,
+ * so we don't need the address swizzling.
+ */
+static int emulate_fp_pair(struct pt_regs *regs, unsigned char __user *addr,
+                           unsigned int reg, unsigned int flags)
+{
+        char *ptr = (char *) &current->thread.fpr[reg];
+        int i, ret;
+
+        if (!(flags & F))
+                return 0;
+        if (reg & 1)
+                return 0;       /* invalid form: FRS/FRT must be even */
+        if (!(flags & SW)) {
+                /* not byte-swapped - easy */
+                if (!(flags & ST))
+                        ret = __copy_from_user(ptr, addr, 16);
+                else
+                        ret = __copy_to_user(addr, ptr, 16);
+        } else {
+                /* each FPR value is byte-swapped separately */
+                ret = 0;
+                for (i = 0; i < 16; ++i) {
+                        if (!(flags & ST))
+                                ret |= __get_user(ptr[i^7], addr + i);
+                        else
+                                ret |= __put_user(ptr[i^7], addr + i);
+                }
+        }
+        if (ret)
+                return -EFAULT;
+        return 1;       /* exception handled and fixed up */
+}
+
+#ifdef CONFIG_SPE
+
+static struct aligninfo spe_aligninfo[32] = {
+        { 8, LD+E8 },           /* 0 00 00: evldd[x] */
+        { 8, LD+E4 },           /* 0 00 01: evldw[x] */
+        { 8, LD },              /* 0 00 10: evldh[x] */
+        INVALID,                /* 0 00 11 */
+        { 2, LD },              /* 0 01 00: evlhhesplat[x] */
+        INVALID,                /* 0 01 01 */
+        { 2, LD },              /* 0 01 10: evlhhousplat[x] */
+        { 2, LD+SE },           /* 0 01 11: evlhhossplat[x] */
+        { 4, LD },              /* 0 10 00: evlwhe[x] */
+        INVALID,                /* 0 10 01 */
+        { 4, LD },              /* 0 10 10: evlwhou[x] */
+        { 4, LD+SE },           /* 0 10 11: evlwhos[x] */
+        { 4, LD+E4 },           /* 0 11 00: evlwwsplat[x] */
+        INVALID,                /* 0 11 01 */
+        { 4, LD },              /* 0 11 10: evlwhsplat[x] */
+        INVALID,                /* 0 11 11 */
+
+        { 8, ST+E8 },           /* 1 00 00: evstdd[x] */
+        { 8, ST+E4 },           /* 1 00 01: evstdw[x] */
+        { 8, ST },              /* 1 00 10: evstdh[x] */
+        INVALID,                /* 1 00 11 */
+        INVALID,                /* 1 01 00 */
+        INVALID,                /* 1 01 01 */
+        INVALID,                /* 1 01 10 */
+        INVALID,                /* 1 01 11 */
+        { 4, ST },              /* 1 10 00: evstwhe[x] */
+        INVALID,                /* 1 10 01 */
+        { 4, ST },              /* 1 10 10: evstwho[x] */
+        INVALID,                /* 1 10 11 */
+        { 4, ST+E4 },           /* 1 11 00: evstwwe[x] */
+        INVALID,                /* 1 11 01 */
+        { 4, ST+E4 },           /* 1 11 10: evstwwo[x] */
+        INVALID,                /* 1 11 11 */
+};
+
+#define EVLDD           0x00
+#define EVLDW           0x01
+#define EVLDH           0x02
+#define EVLHHESPLAT     0x04
+#define EVLHHOUSPLAT    0x06
+#define EVLHHOSSPLAT    0x07
+#define EVLWHE          0x08
+#define EVLWHOU         0x0A
+#define EVLWHOS         0x0B
+#define EVLWWSPLAT      0x0C
+#define EVLWHSPLAT      0x0E
+#define EVSTDD          0x10
+#define EVSTDW          0x11
+#define EVSTDH          0x12
+#define EVSTWHE         0x18
+#define EVSTWHO         0x1A
+#define EVSTWWE         0x1C
+#define EVSTWWO         0x1E
+
+/*
+ * Emulate SPE loads and stores.
+ * Only Book-E has these instructions, and it does true little-endian,
+ * so we don't need the address swizzling.
+ */
+static int emulate_spe(struct pt_regs *regs, unsigned int reg,
+                       unsigned int instr)
+{
+        int t, ret;
+        union {
+                u64 ll;
+                u32 w[2];
+                u16 h[4];
+                u8 v[8];
+        } data, temp;
+        unsigned char __user *p, *addr;
+        unsigned long *evr = &current->thread.evr[reg];
+        unsigned int nb, flags;
+
+        instr = (instr >> 1) & 0x1f;
+
+        /* DAR has the operand effective address */
+        addr = (unsigned char __user *)regs->dar;
+
+        nb = spe_aligninfo[instr].len;
+        flags = spe_aligninfo[instr].flags;
+
+        /* Verify the address of the operand */
+        if (unlikely(user_mode(regs) &&
+                     !access_ok((flags & ST ? VERIFY_WRITE : VERIFY_READ),
+                                addr, nb)))
+                return -EFAULT;
+
+        /* userland only */
+        if (unlikely(!user_mode(regs)))
+                return 0;
+
+        flush_spe_to_thread(current);
+
+        /* If we are loading, get the data from user space, else
+         * get it from register values
+         */
+        if (flags & ST) {
+                data.ll = 0;
+                switch (instr) {
+                case EVSTDD:
+                case EVSTDW:
+                case EVSTDH:
+                        data.w[0] = *evr;
+                        data.w[1] = regs->gpr[reg];
+                        break;
+                case EVSTWHE:
+                        data.h[2] = *evr >> 16;
+                        data.h[3] = regs->gpr[reg] >> 16;
+                        break;
+                case EVSTWHO:
+                        data.h[2] = *evr & 0xffff;
+                        data.h[3] = regs->gpr[reg] & 0xffff;
+                        break;
+                case EVSTWWE:
+                        data.w[1] = *evr;
+                        break;
+                case EVSTWWO:
+                        data.w[1] = regs->gpr[reg];
+                        break;
+                default:
+                        return -EINVAL;
+                }
+        } else {
+                temp.ll = data.ll = 0;
+                ret = 0;
+                p = addr;
+
+                switch (nb) {
+                case 8:
+                        ret |= __get_user_inatomic(temp.v[0], p++);
+                        ret |= __get_user_inatomic(temp.v[1], p++);
+                        ret |= __get_user_inatomic(temp.v[2], p++);
+                        ret |= __get_user_inatomic(temp.v[3], p++);
+                case 4:
+                        ret |= __get_user_inatomic(temp.v[4], p++);
+                        ret |= __get_user_inatomic(temp.v[5], p++);
+                case 2:
+                        ret |= __get_user_inatomic(temp.v[6], p++);
+                        ret |= __get_user_inatomic(temp.v[7], p++);
+                        if (unlikely(ret))
+                                return -EFAULT;
+                }
+
+                switch (instr) {
+                case EVLDD:
+                case EVLDW:
+                case EVLDH:
+                        data.ll = temp.ll;
+                        break;
+                case EVLHHESPLAT:
+                        data.h[0] = temp.h[3];
+                        data.h[2] = temp.h[3];
+                        break;
+                case EVLHHOUSPLAT:
+                case EVLHHOSSPLAT:
+                        data.h[1] = temp.h[3];
+                        data.h[3] = temp.h[3];
+                        break;
+                case EVLWHE:
+                        data.h[0] = temp.h[2];
+                        data.h[2] = temp.h[3];
+                        break;
+                case EVLWHOU:
+                case EVLWHOS:
+                        data.h[1] = temp.h[2];
+                        data.h[3] = temp.h[3];
+                        break;
+                case EVLWWSPLAT:
+                        data.w[0] = temp.w[1];
+                        data.w[1] = temp.w[1];
+                        break;
+                case EVLWHSPLAT:
+                        data.h[0] = temp.h[2];
+                        data.h[1] = temp.h[2];
+                        data.h[2] = temp.h[3];
+                        data.h[3] = temp.h[3];
+                        break;
+                default:
+                        return -EINVAL;
+                }
+        }
+
+        if (flags & SW) {
+                switch (flags & 0xf0) {
+                case E8:
+                        SWAP(data.v[0], data.v[7]);
+                        SWAP(data.v[1], data.v[6]);
+                        SWAP(data.v[2], data.v[5]);
+                        SWAP(data.v[3], data.v[4]);
+                        break;
+                case E4:
+
+                        SWAP(data.v[0], data.v[3]);
+                        SWAP(data.v[1], data.v[2]);
+                        SWAP(data.v[4], data.v[7]);
+                        SWAP(data.v[5], data.v[6]);
+                        break;
+                /* Its half word endian */
+                default:
+                        SWAP(data.v[0], data.v[1]);
+                        SWAP(data.v[2], data.v[3]);
+                        SWAP(data.v[4], data.v[5]);
+                        SWAP(data.v[6], data.v[7]);
+                        break;
+                }
+        }
+
+        if (flags & SE) {
+                data.w[0] = (s16)data.h[1];
+                data.w[1] = (s16)data.h[3];
+        }
+
+        /* Store result to memory or update registers */
+        if (flags & ST) {
+                ret = 0;
+                p = addr;
+                switch (nb) {
+                case 8:
+                        ret |= __put_user_inatomic(data.v[0], p++);
+                        ret |= __put_user_inatomic(data.v[1], p++);
+                        ret |= __put_user_inatomic(data.v[2], p++);
+                        ret |= __put_user_inatomic(data.v[3], p++);
+                case 4:
+                        ret |= __put_user_inatomic(data.v[4], p++);
+                        ret |= __put_user_inatomic(data.v[5], p++);
+                case 2:
+                        ret |= __put_user_inatomic(data.v[6], p++);
+                        ret |= __put_user_inatomic(data.v[7], p++);
+                }
+                if (unlikely(ret))
+                        return -EFAULT;
+        } else {
+                *evr = data.w[0];
+                regs->gpr[reg] = data.w[1];
+        }
+
+        return 1;
+}
+#endif /* CONFIG_SPE */
 
 /*
  * Called on alignment exception. Attempts to fixup
@@ -414,6 +694,12 @@ int fix_alignment(struct pt_regs *regs)
         /* extract the operation and registers from the dsisr */
         reg = (dsisr >> 5) & 0x1f;      /* source/dest register */
         areg = dsisr & 0x1f;            /* register to update */
+
+#ifdef CONFIG_SPE
+        if ((instr >> 26) == 0x4)
+                return emulate_spe(regs, reg, instr);
+#endif
+
         instr = (dsisr >> 10) & 0x7f;
         instr |= (dsisr >> 13) & 0x60;
 
@@ -471,6 +757,10 @@ int fix_alignment(struct pt_regs *regs)
                 flush_fp_to_thread(current);
         }
 
+        /* Special case for 16-byte FP loads and stores */
+        if (nb == 16)
+                return emulate_fp_pair(regs, addr, reg, flags);
+
         /* If we are loading, get the data from user space, else
          * get it from register values
          */
@@ -531,7 +821,8 @@ int fix_alignment(struct pt_regs *regs)
          * or floating point single precision conversion
          */
         switch (flags & ~(U|SW)) {
-        case LD+SE:     /* sign extend */
+        case LD+SE:     /* sign extending integer loads */
+        case LD+F+SE:   /* sign extend for lfiwax */
                 if ( nb == 2 )
                         data.ll = data.x16.low16;
                 else    /* nb must be 4 */
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 2cb1d9487796..0ae5d57b9368 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -312,5 +312,17 @@ int main(void)
 #ifdef CONFIG_BUG
         DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
 #endif
+
+#ifdef CONFIG_PPC_ISERIES
+        /* the assembler miscalculates the VSID values */
+        DEFINE(PAGE_OFFSET_ESID, GET_ESID(PAGE_OFFSET));
+        DEFINE(PAGE_OFFSET_VSID, KERNEL_VSID(PAGE_OFFSET));
+        DEFINE(VMALLOC_START_ESID, GET_ESID(VMALLOC_START));
+        DEFINE(VMALLOC_START_VSID, KERNEL_VSID(VMALLOC_START));
+#endif
+
+#ifdef CONFIG_PPC64
+        DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
+#endif
         return 0;
 }
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
index e7b684689e04..3ef51fb6f107 100644
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
@@ -11,7 +11,6 @@
 #include <asm/sections.h>
 #include <asm/prom.h>
 #include <asm/btext.h>
-#include <asm/prom.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
 #include <asm/pgtable.h>
diff --git a/arch/powerpc/kernel/clock.c b/arch/powerpc/kernel/clock.c
new file mode 100644
index 000000000000..ce668f545758
--- /dev/null
+++ b/arch/powerpc/kernel/clock.c
@@ -0,0 +1,82 @@
+/*
+ * Dummy clk implementations for powerpc.
+ * These need to be overridden in platform code.
+ */
+
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/errno.h>
+#include <linux/module.h>
+#include <asm/clk_interface.h>
+
+struct clk_interface clk_functions;
+
+struct clk *clk_get(struct device *dev, const char *id)
+{
+        if (clk_functions.clk_get)
+                return clk_functions.clk_get(dev, id);
+        return ERR_PTR(-ENOSYS);
+}
+EXPORT_SYMBOL(clk_get);
+
+void clk_put(struct clk *clk)
+{
+        if (clk_functions.clk_put)
+                clk_functions.clk_put(clk);
+}
+EXPORT_SYMBOL(clk_put);
+
+int clk_enable(struct clk *clk)
+{
+        if (clk_functions.clk_enable)
+                return clk_functions.clk_enable(clk);
+        return -ENOSYS;
+}
+EXPORT_SYMBOL(clk_enable);
+
+void clk_disable(struct clk *clk)
+{
+        if (clk_functions.clk_disable)
+                clk_functions.clk_disable(clk);
+}
+EXPORT_SYMBOL(clk_disable);
+
+unsigned long clk_get_rate(struct clk *clk)
+{
+        if (clk_functions.clk_get_rate)
+                return clk_functions.clk_get_rate(clk);
+        return 0;
+}
+EXPORT_SYMBOL(clk_get_rate);
+
+long clk_round_rate(struct clk *clk, unsigned long rate)
+{
+        if (clk_functions.clk_round_rate)
+                return clk_functions.clk_round_rate(clk, rate);
+        return -ENOSYS;
+}
+EXPORT_SYMBOL(clk_round_rate);
+
+int clk_set_rate(struct clk *clk, unsigned long rate)
+{
+        if (clk_functions.clk_set_rate)
+                return clk_functions.clk_set_rate(clk, rate);
+        return -ENOSYS;
+}
+EXPORT_SYMBOL(clk_set_rate);
+
+struct clk *clk_get_parent(struct clk *clk)
+{
+        if (clk_functions.clk_get_parent)
+                return clk_functions.clk_get_parent(clk);
+        return ERR_PTR(-ENOSYS);
+}
+EXPORT_SYMBOL(clk_get_parent);
+
+int clk_set_parent(struct clk *clk, struct clk *parent)
+{
+        if (clk_functions.clk_set_parent)
+                return clk_functions.clk_set_parent(clk, parent);
+        return -ENOSYS;
+}
+EXPORT_SYMBOL(clk_set_parent);
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S
new file mode 100644
index 000000000000..8e1812e2f3ee
--- /dev/null
+++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -0,0 +1,56 @@
+/*
+ * This file contains low level CPU setup functions.
+ * Valentine Barshak <vbarshak@ru.mvista.com>
+ * MontaVista Software, Inc (c) 2007
+ *
+ * Based on cpu_setup_6xx code by 
+ * Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ */
+
+#include <asm/processor.h>
+#include <asm/cputable.h>
+#include <asm/ppc_asm.h>
+
+_GLOBAL(__setup_cpu_440ep)
+        b       __init_fpu_44x
+_GLOBAL(__setup_cpu_440epx)
+        mflr    r4
+        bl      __init_fpu_44x
+        bl      __plb_disable_wrp
+        mtlr    r4
+        blr
+_GLOBAL(__setup_cpu_440grx)
+        b       __plb_disable_wrp
+
+
+/* enable APU between CPU and FPU */
+_GLOBAL(__init_fpu_44x)
+        mfspr   r3,SPRN_CCR0
+        /* Clear DAPUIB flag in CCR0 */
+        rlwinm  r3,r3,0,12,10
+        mtspr   SPRN_CCR0,r3
+        isync
+        blr
+
+/*
+ * Workaround for the incorrect write to DDR SDRAM errata.
+ * The write address can be corrupted during writes to
+ * DDR SDRAM when write pipelining is enabled on PLB0.
+ * Disable write pipelining here.
+ */
+#define DCRN_PLB4A0_ACR 0x81
+
+_GLOBAL(__plb_disable_wrp)
+        mfdcr   r3,DCRN_PLB4A0_ACR
+        /* clear WRP bit in PLB4A0_ACR */
+        rlwinm  r3,r3,0,8,6
+        mtdcr   DCRN_PLB4A0_ACR,r3
+        isync
+        blr
+
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index b1f8000952f3..d3fb7d0c6c1c 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -31,6 +31,9 @@ EXPORT_SYMBOL(cur_cpu_spec);
  * and ppc64
  */
 #ifdef CONFIG_PPC32
+extern void __setup_cpu_440ep(unsigned long offset, struct cpu_spec* spec);
+extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec);
+extern void __setup_cpu_440grx(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);
@@ -68,16 +71,7 @@ extern void __restore_cpu_ppc970(void);
 #define COMMON_USER_BOOKE       (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \
                                  PPC_FEATURE_BOOKE)
 
-/* We only set the spe features if the kernel was compiled with
- * spe support
- */
-#ifdef CONFIG_SPE
-#define PPC_FEATURE_SPE_COMP    PPC_FEATURE_HAS_SPE
-#else
-#define PPC_FEATURE_SPE_COMP    0
-#endif
-
-static struct cpu_spec cpu_specs[] = {
+static struct cpu_spec __initdata cpu_specs[] = {
 #ifdef CONFIG_PPC64
         {       /* Power3 */
                 .pvr_mask               = 0xffff0000,
@@ -333,14 +327,6 @@ static struct cpu_spec cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_POWER5_PLUS,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
-                .num_pmcs               = 6,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/power6",
-                .oprofile_type          = PPC_OPROFILE_POWER4,
-                .oprofile_mmcra_sihv    = POWER6_MMCRA_SIHV,
-                .oprofile_mmcra_sipr    = POWER6_MMCRA_SIPR,
-                .oprofile_mmcra_clear   = POWER6_MMCRA_THRM |
-                        POWER6_MMCRA_OTHER,
                 .platform               = "power5+",
         },
         {       /* Power6 */
@@ -370,14 +356,6 @@ static struct cpu_spec cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_POWER6,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
-                .num_pmcs               = 6,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/power6",
-                .oprofile_type          = PPC_OPROFILE_POWER4,
-                .oprofile_mmcra_sihv    = POWER6_MMCRA_SIHV,
-                .oprofile_mmcra_sipr    = POWER6_MMCRA_SIPR,
-                .oprofile_mmcra_clear   = POWER6_MMCRA_THRM |
-                        POWER6_MMCRA_OTHER,
                 .platform               = "power6",
         },
         {       /* Cell Broadband Engine */
@@ -1109,6 +1087,17 @@ static struct cpu_spec cpu_specs[] = {
                 .dcache_bsize           = 32,
                 .platform               = "ppc405",
         },
+        {       /* 405EX */
+                .pvr_mask               = 0xffff0000,
+                .pvr_value              = 0x12910000,
+                .cpu_name               = "405EX",
+                .cpu_features           = CPU_FTRS_40X,
+                .cpu_user_features      = PPC_FEATURE_32 |
+                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+                .platform               = "ppc405",
+        },
 
 #endif /* CONFIG_40x */
 #ifdef CONFIG_44x
@@ -1120,6 +1109,7 @@ static struct cpu_spec cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
+                .cpu_setup              = __setup_cpu_440ep,
                 .platform               = "ppc440",
         },
         {
@@ -1130,6 +1120,29 @@ static struct cpu_spec cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
+                .cpu_setup              = __setup_cpu_440ep,
+                .platform               = "ppc440",
+        },
+        { /* 440EPX */
+                .pvr_mask               = 0xf0000ffb,
+                .pvr_value              = 0x200008D0,
+                .cpu_name               = "440EPX",
+                .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_440epx,
+                .platform               = "ppc440",
+        },
+        { /* 440GRX */
+                .pvr_mask               = 0xf0000ffb,
+                .pvr_value              = 0x200008D8,
+                .cpu_name               = "440GRX",
+                .cpu_features           = CPU_FTRS_44X,
+                .cpu_user_features      = COMMON_USER_BOOKE,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+                .cpu_setup              = __setup_cpu_440grx,
                 .platform               = "ppc440",
         },
         {       /* 440GP Rev. B */
@@ -1243,8 +1256,8 @@ static struct cpu_spec cpu_specs[] = {
                 /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                 .cpu_features           = CPU_FTRS_E200,
                 .cpu_user_features      = COMMON_USER_BOOKE |
-                        PPC_FEATURE_SPE_COMP |
-                        PPC_FEATURE_HAS_EFP_SINGLE |
+                        PPC_FEATURE_HAS_SPE_COMP |
+                        PPC_FEATURE_HAS_EFP_SINGLE_COMP |
                         PPC_FEATURE_UNIFIED_CACHE,
                 .dcache_bsize           = 32,
                 .platform               = "ppc5554",
@@ -1256,8 +1269,8 @@ static struct cpu_spec cpu_specs[] = {
                 /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                 .cpu_features           = CPU_FTRS_E500,
                 .cpu_user_features      = COMMON_USER_BOOKE |
-                        PPC_FEATURE_SPE_COMP |
-                        PPC_FEATURE_HAS_EFP_SINGLE,
+                        PPC_FEATURE_HAS_SPE_COMP |
+                        PPC_FEATURE_HAS_EFP_SINGLE_COMP,
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
@@ -1272,9 +1285,9 @@ static struct cpu_spec cpu_specs[] = {
                 /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                 .cpu_features           = CPU_FTRS_E500_2,
                 .cpu_user_features      = COMMON_USER_BOOKE |
-                        PPC_FEATURE_SPE_COMP |
-                        PPC_FEATURE_HAS_EFP_SINGLE |
-                        PPC_FEATURE_HAS_EFP_DOUBLE,
+                        PPC_FEATURE_HAS_SPE_COMP |
+                        PPC_FEATURE_HAS_EFP_SINGLE_COMP |
+                        PPC_FEATURE_HAS_EFP_DOUBLE_COMP,
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
@@ -1298,29 +1311,49 @@ static struct cpu_spec cpu_specs[] = {
 #endif /* CONFIG_PPC32 */
 };
 
-struct cpu_spec *identify_cpu(unsigned long offset, unsigned int pvr)
+static struct cpu_spec the_cpu_spec;
+
+struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr)
 {
         struct cpu_spec *s = cpu_specs;
-        struct cpu_spec **cur = &cur_cpu_spec;
+        struct cpu_spec *t = &the_cpu_spec;
         int i;
 
         s = PTRRELOC(s);
-        cur = PTRRELOC(cur);
+        t = PTRRELOC(t);
 
         for (i = 0; i < ARRAY_SIZE(cpu_specs); i++,s++)
                 if ((pvr & s->pvr_mask) == s->pvr_value) {
-                        *cur = cpu_specs + i;
-#ifdef CONFIG_PPC64
-                        /* ppc64 expects identify_cpu to also call setup_cpu
-                         * for that processor. I will consolidate that at a
-                         * later time, for now, just use our friend #ifdef.
+                        /*
+                         * If we are overriding a previous value derived
+                         * from the real PVR with a new value obtained
+                         * using a logical PVR value, don't modify the
+                         * performance monitor fields.
+                         */
+                        if (t->num_pmcs && !s->num_pmcs) {
+                                t->cpu_name = s->cpu_name;
+                                t->cpu_features = s->cpu_features;
+                                t->cpu_user_features = s->cpu_user_features;
+                                t->icache_bsize = s->icache_bsize;
+                                t->dcache_bsize = s->dcache_bsize;
+                                t->cpu_setup = s->cpu_setup;
+                                t->cpu_restore = s->cpu_restore;
+                                t->platform = s->platform;
+                        } else
+                                *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 
+                         * 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
-                         * on ppc64 as we are running at 0 in real mode.
+                         * on ppc64 and booke as we are running at 0 in real
+                         * mode on ppc64 and reloc_offset is always 0 on booke.
                          */
                         if (s->cpu_setup) {
                                 s->cpu_setup(offset, s);
                         }
-#endif /* CONFIG_PPC64 */
+#endif /* CONFIG_PPC64 || CONFIG_BOOKE */
                         return s;
                 }
         BUG();
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 37658ea417fa..77c749a13378 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -24,7 +24,6 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/types.h>
-#include <linux/irq.h>
 
 #include <asm/processor.h>
 #include <asm/machdep.h>
diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c
index 2f6f5a7bc69e..29ff77c468ac 100644
--- a/arch/powerpc/kernel/crash_dump.c
+++ b/arch/powerpc/kernel/crash_dump.c
@@ -25,7 +25,7 @@
 #define DBG(fmt...)
 #endif
 
-void reserve_kdump_trampoline(void)
+void __init reserve_kdump_trampoline(void)
 {
         lmb_reserve(0, KDUMP_RESERVE_LIMIT);
 }
@@ -54,8 +54,10 @@ void __init setup_kdump_trampoline(void)
                 create_trampoline(i);
         }
 
+#ifdef CONFIG_PPC_PSERIES
         create_trampoline(__pa(system_reset_fwnmi) - PHYSICAL_START);
         create_trampoline(__pa(machine_check_fwnmi) - PHYSICAL_START);
+#endif /* CONFIG_PPC_PSERIES */
 
         DBG(" <- setup_kdump_trampoline()\n");
 }
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 4074c0b31453..21d889e63e87 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -504,9 +504,11 @@ BEGIN_FTR_SECTION
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #endif /* CONFIG_ALTIVEC */
 #ifdef CONFIG_SPE
+BEGIN_FTR_SECTION
         oris    r0,r0,MSR_SPE@h  /* Disable SPE */
         mfspr   r12,SPRN_SPEFSCR /* save spefscr register value */
         stw     r12,THREAD+THREAD_SPEFSCR(r2)
+END_FTR_SECTION_IFSET(CPU_FTR_SPE)
 #endif /* CONFIG_SPE */
         and.    r0,r0,r11       /* FP or altivec or SPE enabled? */
         beq+    1f
@@ -542,8 +544,10 @@ BEGIN_FTR_SECTION
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #endif /* CONFIG_ALTIVEC */
 #ifdef CONFIG_SPE
+BEGIN_FTR_SECTION
         lwz     r0,THREAD+THREAD_SPEFSCR(r2)
         mtspr   SPRN_SPEFSCR,r0         /* restore SPEFSCR reg */
+END_FTR_SECTION_IFSET(CPU_FTR_SPE)
 #endif /* CONFIG_SPE */
 
         lwz     r0,_CCR(r1)
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 952eba6701f4..0ec134034899 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -373,8 +373,16 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 
         ld      r8,KSP(r4)      /* new stack pointer */
 BEGIN_FTR_SECTION
+        b       2f
+END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
+BEGIN_FTR_SECTION
         clrrdi  r6,r8,28        /* get its ESID */
         clrrdi  r9,r1,28        /* get current sp ESID */
+END_FTR_SECTION_IFCLR(CPU_FTR_1T_SEGMENT)
+BEGIN_FTR_SECTION
+        clrrdi  r6,r8,40        /* get its 1T ESID */
+        clrrdi  r9,r1,40        /* get current sp 1T ESID */
+END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
         clrldi. r0,r6,2         /* is new ESID c00000000? */
         cmpd    cr1,r6,r9       /* or is new ESID the same as current ESID? */
         cror    eq,4*cr1+eq,eq
@@ -384,16 +392,21 @@ BEGIN_FTR_SECTION
         ld      r7,KSP_VSID(r4) /* Get new stack's VSID */
         oris    r0,r6,(SLB_ESID_V)@h
         ori     r0,r0,(SLB_NUM_BOLTED-1)@l
-
-        /* Update the last bolted SLB */
+BEGIN_FTR_SECTION
+        li      r9,MMU_SEGSIZE_1T       /* insert B field */
+        oris    r6,r6,(MMU_SEGSIZE_1T << SLBIE_SSIZE_SHIFT)@h
+        rldimi  r7,r9,SLB_VSID_SSIZE_SHIFT,0
+END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
+
+        /* Update the last bolted SLB.  No write barriers are needed
+         * here, provided we only update the current CPU's SLB shadow
+         * buffer.
+         */
         ld      r9,PACA_SLBSHADOWPTR(r13)
         li      r12,0
         std     r12,SLBSHADOW_STACKESID(r9) /* Clear ESID */
-        eieio
         std     r7,SLBSHADOW_STACKVSID(r9)  /* Save VSID */
-        eieio
         std     r0,SLBSHADOW_STACKESID(r9)  /* Save ESID */
-        eieio
 
         slbie   r6
         slbie   r6              /* Workaround POWER5 < DD2.1 issue */
@@ -401,7 +414,6 @@ BEGIN_FTR_SECTION
         isync
 
 2:
-END_FTR_SECTION_IFSET(CPU_FTR_SLB)
         clrrdi  r7,r8,THREAD_SHIFT      /* base of new stack */
         /* Note: this uses SWITCH_FRAME_SIZE rather than INT_FRAME_SIZE
            because we don't need to leave the 288-byte ABI gap at the
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 7d73a13450b0..a5b13ae7fd20 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -48,20 +48,17 @@
         mtspr   SPRN_DBAT##n##L,RB;     \
 1:
 
-        .text
+        .section        .text.head, "ax"
         .stabs  "arch/powerpc/kernel/",N_SO,0,0,0f
         .stabs  "head_32.S",N_SO,0,0,0f
 0:
-        .globl  _stext
-_stext:
+_ENTRY(_stext);
 
 /*
  * _start is defined this way because the XCOFF loader in the OpenFirmware
  * on the powermac expects the entry point to be a procedure descriptor.
  */
-        .text
-        .globl  _start
-_start:
+_ENTRY(_start);
         /*
          * These are here for legacy reasons, the kernel used to
          * need to look like a coff function entry for the pmac
@@ -152,6 +149,9 @@ __after_mmu_off:
 #if defined(CONFIG_BOOTX_TEXT)
         bl      setup_disp_bat
 #endif
+#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
+        bl      setup_cpm_bat
+#endif
 
 /*
  * Call setup_cpu for CPU 0 and initialize 6xx Idle
@@ -469,16 +469,16 @@ InstructionTLBMiss:
         mfctr   r0
         /* Get PTE (linux-style) and check access */
         mfspr   r3,SPRN_IMISS
-        lis     r1,KERNELBASE@h         /* check if kernel address */
-        cmplw   0,r3,r1
+        lis     r1,PAGE_OFFSET@h                /* check if kernel address */
+        cmplw   0,r1,r3
         mfspr   r2,SPRN_SPRG3
         li      r1,_PAGE_USER|_PAGE_PRESENT /* low addresses tested as user */
         lwz     r2,PGDIR(r2)
-        blt+    112f
+        bge-    112f
+        mfspr   r2,SPRN_SRR1            /* and MSR_PR bit from SRR1 */
+        rlwimi  r1,r2,32-12,29,29       /* shift MSR_PR to _PAGE_USER posn */
         lis     r2,swapper_pg_dir@ha    /* if kernel address, use */
         addi    r2,r2,swapper_pg_dir@l  /* kernel page table */
-        mfspr   r1,SPRN_SRR1            /* and MSR_PR bit from SRR1 */
-        rlwinm  r1,r1,32-12,29,29       /* shift MSR_PR to _PAGE_USER posn */
 112:    tophys(r2,r2)
         rlwimi  r2,r3,12,20,29          /* insert top 10 bits of address */
         lwz     r2,0(r2)                /* get pmd entry */
@@ -543,16 +543,16 @@ DataLoadTLBMiss:
         mfctr   r0
         /* Get PTE (linux-style) and check access */
         mfspr   r3,SPRN_DMISS
-        lis     r1,KERNELBASE@h         /* check if kernel address */
-        cmplw   0,r3,r1
+        lis     r1,PAGE_OFFSET@h                /* check if kernel address */
+        cmplw   0,r1,r3
         mfspr   r2,SPRN_SPRG3
         li      r1,_PAGE_USER|_PAGE_PRESENT /* low addresses tested as user */
         lwz     r2,PGDIR(r2)
-        blt+    112f
+        bge-    112f
+        mfspr   r2,SPRN_SRR1            /* and MSR_PR bit from SRR1 */
+        rlwimi  r1,r2,32-12,29,29       /* shift MSR_PR to _PAGE_USER posn */
         lis     r2,swapper_pg_dir@ha    /* if kernel address, use */
         addi    r2,r2,swapper_pg_dir@l  /* kernel page table */
-        mfspr   r1,SPRN_SRR1            /* and MSR_PR bit from SRR1 */
-        rlwinm  r1,r1,32-12,29,29       /* shift MSR_PR to _PAGE_USER posn */
 112:    tophys(r2,r2)
         rlwimi  r2,r3,12,20,29          /* insert top 10 bits of address */
         lwz     r2,0(r2)                /* get pmd entry */
@@ -615,16 +615,16 @@ DataStoreTLBMiss:
         mfctr   r0
         /* Get PTE (linux-style) and check access */
         mfspr   r3,SPRN_DMISS
-        lis     r1,KERNELBASE@h         /* check if kernel address */
-        cmplw   0,r3,r1
+        lis     r1,PAGE_OFFSET@h                /* check if kernel address */
+        cmplw   0,r1,r3
         mfspr   r2,SPRN_SPRG3
         li      r1,_PAGE_RW|_PAGE_USER|_PAGE_PRESENT /* access flags */
         lwz     r2,PGDIR(r2)
-        blt+    112f
+        bge-    112f
+        mfspr   r2,SPRN_SRR1            /* and MSR_PR bit from SRR1 */
+        rlwimi  r1,r2,32-12,29,29       /* shift MSR_PR to _PAGE_USER posn */
         lis     r2,swapper_pg_dir@ha    /* if kernel address, use */
         addi    r2,r2,swapper_pg_dir@l  /* kernel page table */
-        mfspr   r1,SPRN_SRR1            /* and MSR_PR bit from SRR1 */
-        rlwinm  r1,r1,32-12,29,29       /* shift MSR_PR to _PAGE_USER posn */
 112:    tophys(r2,r2)
         rlwimi  r2,r3,12,20,29          /* insert top 10 bits of address */
         lwz     r2,0(r2)                /* get pmd entry */
@@ -841,7 +841,7 @@ relocate_kernel:
  * r3 = dest addr, r4 = source addr, r5 = copy limit, r6 = start offset
  * on exit, r3, r4, r5 are unchanged, r6 is updated to be >= r5.
  */
-_GLOBAL(copy_and_flush)
+_ENTRY(copy_and_flush)
         addi    r5,r5,-4
         addi    r6,r6,-4
 4:      li      r0,L1_CACHE_BYTES/4
@@ -954,9 +954,9 @@ __secondary_start:
  * included in CONFIG_6xx
  */
 #if !defined(CONFIG_6xx)
-_GLOBAL(__save_cpu_setup)
+_ENTRY(__save_cpu_setup)
         blr
-_GLOBAL(__restore_cpu_setup)
+_ENTRY(__restore_cpu_setup)
         blr
 #endif /* !defined(CONFIG_6xx) */
 
@@ -1080,7 +1080,7 @@ start_here:
 /*
  * Set up the segment registers for a new context.
  */
-_GLOBAL(set_context)
+_ENTRY(set_context)
         mulli   r3,r3,897       /* multiply context by skew factor */
         rlwinm  r3,r3,4,8,27    /* VSID = (context & 0xfffff) << 4 */
         addis   r3,r3,0x6000    /* Set Ks, Ku bits */
@@ -1248,6 +1248,19 @@ setup_disp_bat:
         blr
 #endif /* CONFIG_BOOTX_TEXT */
 
+#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
+setup_cpm_bat:
+        lis     r8, 0xf000
+        ori     r8, r8, 0x002a
+        mtspr   SPRN_DBAT1L, r8
+
+        lis     r11, 0xf000
+        ori     r11, r11, (BL_1M << 2) | 2
+        mtspr   SPRN_DBAT1U, r11
+
+        blr
+#endif
+
 #ifdef CONFIG_8260
 /* Jump into the system reset for the rom.
  * We first disable the MMU, and then jump to the ROM reset address.
@@ -1300,14 +1313,6 @@ empty_zero_page:
 swapper_pg_dir:
         .space  4096
 
-/*
- * This space gets a copy of optional info passed to us by the bootstrap
- * Used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-        .globl  cmd_line
-cmd_line:
-        .space  512
-
         .globl intercept_table
 intercept_table:
         .long 0, 0, i0x200, i0x300, i0x400, 0, i0x600, i0x700
diff --git a/arch/powerpc/kernel/head_4xx.S b/arch/powerpc/kernel/head_40x.S
index adc7f8097cd4..cfefc2df8f2a 100644
--- a/arch/powerpc/kernel/head_4xx.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -35,7 +35,6 @@
 #include <asm/page.h>
 #include <asm/mmu.h>
 #include <asm/pgtable.h>
-#include <asm/ibm4xx.h>
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
@@ -53,9 +52,9 @@
  *
  * This is all going to change RSN when we add bi_recs.......  -- Dan
  */
-        .text
-_GLOBAL(_stext)
-_GLOBAL(_start)
+        .section        .text.head, "ax"
+_ENTRY(_stext);
+_ENTRY(_start);
 
         /* Save parameters we are passed.
         */
@@ -90,9 +89,9 @@ turn_on_mmu:
  */
         . = 0xc0
 crit_save:
-_GLOBAL(crit_r10)
+_ENTRY(crit_r10)
         .space  4
-_GLOBAL(crit_r11)
+_ENTRY(crit_r11)
         .space  4
 
 /*
@@ -290,7 +289,7 @@ label:
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
          */
-        lis     r11, TASK_SIZE@h
+        lis     r11, PAGE_OFFSET@h
         cmplw   r10, r11
         blt+    3f
         lis     r11, swapper_pg_dir@h
@@ -482,7 +481,7 @@ label:
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
          */
-        lis     r11, TASK_SIZE@h
+        lis     r11, PAGE_OFFSET@h
         cmplw   r10, r11
         blt+    3f
         lis     r11, swapper_pg_dir@h
@@ -582,7 +581,7 @@ label:
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
          */
-        lis     r11, TASK_SIZE@h
+        lis     r11, PAGE_OFFSET@h
         cmplw   r10, r11
         blt+    3f
         lis     r11, swapper_pg_dir@h
@@ -772,7 +771,7 @@ finish_tlb_load:
         */
         lwz     r9, tlb_4xx_index@l(0)
         addi    r9, r9, 1
-        andi.   r9, r9, (PPC4XX_TLB_SIZE-1)
+        andi.   r9, r9, (PPC40X_TLB_SIZE-1)
         stw     r9, tlb_4xx_index@l(0)
 
 6:
@@ -815,7 +814,7 @@ finish_tlb_load:
  * The PowerPC 4xx family of processors do not have an FPU, so this just
  * returns.
  */
-_GLOBAL(giveup_fpu)
+_ENTRY(giveup_fpu)
         blr
 
 /* This is where the main kernel code starts.
@@ -1007,13 +1006,6 @@ critical_stack_top:
         .globl  exception_stack_top
 exception_stack_top:
 
-/* This space gets a copy of optional info passed to us by the bootstrap
- * which is used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-        .globl  cmd_line
-cmd_line:
-        .space  512
-
 /* Room for two PTE pointers, usually the kernel and current user pointers
  * to their respective root page table.
  */
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index 88695963f587..409db6123924 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -50,9 +50,9 @@
  *   r7 - End of kernel command line string
  *
  */
-        .text
-_GLOBAL(_stext)
-_GLOBAL(_start)
+        .section        .text.head, "ax"
+_ENTRY(_stext);
+_ENTRY(_start);
         /*
          * Reserve a word at a fixed location to store the address
          * of abatron_pteptrs
@@ -217,16 +217,6 @@ skpinv:	addi	r4,r4,1				/* Increment */
         lis     r4,interrupt_base@h     /* IVPR only uses the high 16-bits */
         mtspr   SPRN_IVPR,r4
 
-#ifdef CONFIG_440EP
-        /* Clear DAPUIB flag in CCR0 (enable APU between CPU and FPU) */
-        mfspr   r2,SPRN_CCR0
-        lis     r3,0xffef
-        ori     r3,r3,0xffff
-        and     r2,r2,r3
-        mtspr   SPRN_CCR0,r2
-        isync
-#endif
-
         /*
          * This is where the main kernel code starts.
          */
@@ -329,7 +319,7 @@ interrupt_base:
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
          */
-        lis     r11, TASK_SIZE@h
+        lis     r11, PAGE_OFFSET@h
         cmplw   r10, r11
         blt+    3f
         lis     r11, swapper_pg_dir@h
@@ -468,7 +458,7 @@ interrupt_base:
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
          */
-        lis     r11, TASK_SIZE@h
+        lis     r11, PAGE_OFFSET@h
         cmplw   r10, r11
         blt+    3f
         lis     r11, swapper_pg_dir@h
@@ -538,7 +528,7 @@ interrupt_base:
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
          */
-        lis     r11, TASK_SIZE@h
+        lis     r11, PAGE_OFFSET@h
         cmplw   r10, r11
         blt+    3f
         lis     r11, swapper_pg_dir@h
@@ -744,14 +734,6 @@ exception_stack_bottom:
 exception_stack_top:
 
 /*
- * This space gets a copy of optional info passed to us by the bootstrap
- * which is used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-        .globl  cmd_line
-cmd_line:
-        .space  512
-
-/*
  * Room for two PTE pointers, usually the kernel and current user pointers
  * to their respective root page table.
  */
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 171800002ede..97c5857faf00 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -34,6 +34,8 @@
 #include <asm/iseries/lpar_map.h>
 #include <asm/thread_info.h>
 #include <asm/firmware.h>
+#include <asm/page_64.h>
+#include <asm/exception.h>
 
 #define DO_SOFT_DISABLE
 
@@ -144,344 +146,9 @@ exception_marker:
         .text
 
 /*
- * The following macros define the code that appears as
- * the prologue to each of the exception handlers.  They
- * are split into two parts to allow a single kernel binary
- * to be used for pSeries and iSeries.
- * LOL.  One day... - paulus
- */
-
-/*
- * We make as much of the exception code common between native
- * exception handlers (including pSeries LPAR) and iSeries LPAR
- * implementations as possible.
- */
-
-/*
  * This is the start of the interrupt handlers for pSeries
  * This code runs with relocation off.
  */
-#define EX_R9           0
-#define EX_R10          8
-#define EX_R11          16
-#define EX_R12          24
-#define EX_R13          32
-#define EX_SRR0         40
-#define EX_DAR          48
-#define EX_DSISR        56
-#define EX_CCR          60
-#define EX_R3           64
-#define EX_LR           72
-
-/*
- * We're short on space and time in the exception prolog, so we can't
- * use the normal SET_REG_IMMEDIATE macro. Normally we just need the
- * low halfword of the address, but for Kdump we need the whole low
- * word.
- */
-#ifdef CONFIG_CRASH_DUMP
-#define LOAD_HANDLER(reg, label)                                        \
-        oris    reg,reg,(label)@h;      /* virt addr of handler ... */  \
-        ori     reg,reg,(label)@l;      /* .. and the rest */
-#else
-#define LOAD_HANDLER(reg, label)                                        \
-        ori     reg,reg,(label)@l;      /* virt addr of handler ... */
-#endif
-
-/*
- * Equal to EXCEPTION_PROLOG_PSERIES, except that it forces 64bit mode.
- * The firmware calls the registered system_reset_fwnmi and
- * machine_check_fwnmi handlers in 32bit mode if the cpu happens to run
- * a 32bit application at the time of the event.
- * This firmware bug is present on POWER4 and JS20.
- */
-#define EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(area, label)               \
-        mfspr   r13,SPRN_SPRG3;         /* get paca address into r13 */ \
-        std     r9,area+EX_R9(r13);     /* save r9 - r12 */             \
-        std     r10,area+EX_R10(r13);                                   \
-        std     r11,area+EX_R11(r13);                                   \
-        std     r12,area+EX_R12(r13);                                   \
-        mfspr   r9,SPRN_SPRG1;                                          \
-        std     r9,area+EX_R13(r13);                                    \
-        mfcr    r9;                                                     \
-        clrrdi  r12,r13,32;             /* get high part of &label */   \
-        mfmsr   r10;                                                    \
-        /* force 64bit mode */                                          \
-        li      r11,5;                  /* MSR_SF_LG|MSR_ISF_LG */      \
-        rldimi  r10,r11,61,0;           /* insert into top 3 bits */    \
-        /* done 64bit mode */                                           \
-        mfspr   r11,SPRN_SRR0;          /* save SRR0 */                 \
-        LOAD_HANDLER(r12,label)                                         \
-        ori     r10,r10,MSR_IR|MSR_DR|MSR_RI;                           \
-        mtspr   SPRN_SRR0,r12;                                          \
-        mfspr   r12,SPRN_SRR1;          /* and SRR1 */                  \
-        mtspr   SPRN_SRR1,r10;                                          \
-        rfid;                                                           \
-        b       .       /* prevent speculative execution */
-
-#define EXCEPTION_PROLOG_PSERIES(area, label)                           \
-        mfspr   r13,SPRN_SPRG3;         /* get paca address into r13 */ \
-        std     r9,area+EX_R9(r13);     /* save r9 - r12 */             \
-        std     r10,area+EX_R10(r13);                                   \
-        std     r11,area+EX_R11(r13);                                   \
-        std     r12,area+EX_R12(r13);                                   \
-        mfspr   r9,SPRN_SPRG1;                                          \
-        std     r9,area+EX_R13(r13);                                    \
-        mfcr    r9;                                                     \
-        clrrdi  r12,r13,32;             /* get high part of &label */   \
-        mfmsr   r10;                                                    \
-        mfspr   r11,SPRN_SRR0;          /* save SRR0 */                 \
-        LOAD_HANDLER(r12,label)                                         \
-        ori     r10,r10,MSR_IR|MSR_DR|MSR_RI;                           \
-        mtspr   SPRN_SRR0,r12;                                          \
-        mfspr   r12,SPRN_SRR1;          /* and SRR1 */                  \
-        mtspr   SPRN_SRR1,r10;                                          \
-        rfid;                                                           \
-        b       .       /* prevent speculative execution */
-
-/*
- * This is the start of the interrupt handlers for iSeries
- * This code runs with relocation on.
- */
-#define EXCEPTION_PROLOG_ISERIES_1(area)                                \
-        mfspr   r13,SPRN_SPRG3;         /* get paca address into r13 */ \
-        std     r9,area+EX_R9(r13);     /* save r9 - r12 */             \
-        std     r10,area+EX_R10(r13);                                   \
-        std     r11,area+EX_R11(r13);                                   \
-        std     r12,area+EX_R12(r13);                                   \
-        mfspr   r9,SPRN_SPRG1;                                          \
-        std     r9,area+EX_R13(r13);                                    \
-        mfcr    r9
-
-#define EXCEPTION_PROLOG_ISERIES_2                                      \
-        mfmsr   r10;                                                    \
-        ld      r12,PACALPPACAPTR(r13);                                 \
-        ld      r11,LPPACASRR0(r12);                                    \
-        ld      r12,LPPACASRR1(r12);                                    \
-        ori     r10,r10,MSR_RI;                                         \
-        mtmsrd  r10,1
-
-/*
- * The common exception prolog is used for all except a few exceptions
- * such as a segment miss on a kernel address.  We have to be prepared
- * to take another exception from the point where we first touch the
- * kernel stack onwards.
- *
- * On entry r13 points to the paca, r9-r13 are saved in the paca,
- * r9 contains the saved CR, r11 and r12 contain the saved SRR0 and
- * SRR1, and relocation is on.
- */
-#define EXCEPTION_PROLOG_COMMON(n, area)                                   \
-        andi.   r10,r12,MSR_PR;         /* See if coming from user      */ \
-        mr      r10,r1;                 /* Save r1                      */ \
-        subi    r1,r1,INT_FRAME_SIZE;   /* alloc frame on kernel stack  */ \
-        beq-    1f;                                                        \
-        ld      r1,PACAKSAVE(r13);      /* kernel stack to use          */ \
-1:      cmpdi   cr1,r1,0;               /* check if r1 is in userspace  */ \
-        bge-    cr1,2f;                 /* abort if it is               */ \
-        b       3f;                                                        \
-2:      li      r1,(n);                 /* will be reloaded later       */ \
-        sth     r1,PACA_TRAP_SAVE(r13);                                    \
-        b       bad_stack;                                                 \
-3:      std     r9,_CCR(r1);            /* save CR in stackframe        */ \
-        std     r11,_NIP(r1);           /* save SRR0 in stackframe      */ \
-        std     r12,_MSR(r1);           /* save SRR1 in stackframe      */ \
-        std     r10,0(r1);              /* make stack chain pointer     */ \
-        std     r0,GPR0(r1);            /* save r0 in stackframe        */ \
-        std     r10,GPR1(r1);           /* save r1 in stackframe        */ \
-        ACCOUNT_CPU_USER_ENTRY(r9, r10);                                   \
-        std     r2,GPR2(r1);            /* save r2 in stackframe        */ \
-        SAVE_4GPRS(3, r1);              /* save r3 - r6 in stackframe   */ \
-        SAVE_2GPRS(7, r1);              /* save r7, r8 in stackframe    */ \
-        ld      r9,area+EX_R9(r13);     /* move r9, r10 to stackframe   */ \
-        ld      r10,area+EX_R10(r13);                                      \
-        std     r9,GPR9(r1);                                               \
-        std     r10,GPR10(r1);                                             \
-        ld      r9,area+EX_R11(r13);    /* move r11 - r13 to stackframe */ \
-        ld      r10,area+EX_R12(r13);                                      \
-        ld      r11,area+EX_R13(r13);                                      \
-        std     r9,GPR11(r1);                                              \
-        std     r10,GPR12(r1);                                             \
-        std     r11,GPR13(r1);                                             \
-        ld      r2,PACATOC(r13);        /* get kernel TOC into r2       */ \
-        mflr    r9;                     /* save LR in stackframe        */ \
-        std     r9,_LINK(r1);                                              \
-        mfctr   r10;                    /* save CTR in stackframe       */ \
-        std     r10,_CTR(r1);                                              \
-        lbz     r10,PACASOFTIRQEN(r13);                            \
-        mfspr   r11,SPRN_XER;           /* save XER in stackframe       */ \
-        std     r10,SOFTE(r1);                                             \
-        std     r11,_XER(r1);                                              \
-        li      r9,(n)+1;                                                  \
-        std     r9,_TRAP(r1);           /* set trap number              */ \
-        li      r10,0;                                                     \
-        ld      r11,exception_marker@toc(r2);                              \
-        std     r10,RESULT(r1);         /* clear regs->result           */ \
-        std     r11,STACK_FRAME_OVERHEAD-16(r1); /* mark the frame      */
-
-/*
- * Exception vectors.
- */
-#define STD_EXCEPTION_PSERIES(n, label)                 \
-        . = n;                                          \
-        .globl label##_pSeries;                         \
-label##_pSeries:                                        \
-        HMT_MEDIUM;                                     \
-        mtspr   SPRN_SPRG1,r13;         /* save r13 */  \
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common)
-
-#define HSTD_EXCEPTION_PSERIES(n, label)                \
-        . = n;                                          \
-        .globl label##_pSeries;                         \
-label##_pSeries:                                        \
-        HMT_MEDIUM;                                     \
-        mtspr   SPRN_SPRG1,r20;         /* save r20 */  \
-        mfspr   r20,SPRN_HSRR0;         /* copy HSRR0 to SRR0 */ \
-        mtspr   SPRN_SRR0,r20;                          \
-        mfspr   r20,SPRN_HSRR1;         /* copy HSRR0 to SRR0 */ \
-        mtspr   SPRN_SRR1,r20;                          \
-        mfspr   r20,SPRN_SPRG1;         /* restore r20 */ \
-        mtspr   SPRN_SPRG1,r13;         /* save r13 */  \
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common)
-
-
-#define MASKABLE_EXCEPTION_PSERIES(n, label)                            \
-        . = n;                                                          \
-        .globl label##_pSeries;                                         \
-label##_pSeries:                                                        \
-        HMT_MEDIUM;                                                     \
-        mtspr   SPRN_SPRG1,r13;         /* save r13 */                  \
-        mfspr   r13,SPRN_SPRG3;         /* get paca address into r13 */ \
-        std     r9,PACA_EXGEN+EX_R9(r13);       /* save r9, r10 */      \
-        std     r10,PACA_EXGEN+EX_R10(r13);                             \
-        lbz     r10,PACASOFTIRQEN(r13);                                 \
-        mfcr    r9;                                                     \
-        cmpwi   r10,0;                                                  \
-        beq     masked_interrupt;                                       \
-        mfspr   r10,SPRN_SPRG1;                                         \
-        std     r10,PACA_EXGEN+EX_R13(r13);                             \
-        std     r11,PACA_EXGEN+EX_R11(r13);                             \
-        std     r12,PACA_EXGEN+EX_R12(r13);                             \
-        clrrdi  r12,r13,32;             /* get high part of &label */   \
-        mfmsr   r10;                                                    \
-        mfspr   r11,SPRN_SRR0;          /* save SRR0 */                 \
-        LOAD_HANDLER(r12,label##_common)                                \
-        ori     r10,r10,MSR_IR|MSR_DR|MSR_RI;                           \
-        mtspr   SPRN_SRR0,r12;                                          \
-        mfspr   r12,SPRN_SRR1;          /* and SRR1 */                  \
-        mtspr   SPRN_SRR1,r10;                                          \
-        rfid;                                                           \
-        b       .       /* prevent speculative execution */
-
-#define STD_EXCEPTION_ISERIES(n, label, area)           \
-        .globl label##_iSeries;                         \
-label##_iSeries:                                        \
-        HMT_MEDIUM;                                     \
-        mtspr   SPRN_SPRG1,r13;         /* save r13 */  \
-        EXCEPTION_PROLOG_ISERIES_1(area);               \
-        EXCEPTION_PROLOG_ISERIES_2;                     \
-        b       label##_common
-
-#define MASKABLE_EXCEPTION_ISERIES(n, label)                            \
-        .globl label##_iSeries;                                         \
-label##_iSeries:                                                        \
-        HMT_MEDIUM;                                                     \
-        mtspr   SPRN_SPRG1,r13;         /* save r13 */                  \
-        EXCEPTION_PROLOG_ISERIES_1(PACA_EXGEN);                         \
-        lbz     r10,PACASOFTIRQEN(r13);                                 \
-        cmpwi   0,r10,0;                                                \
-        beq-    label##_iSeries_masked;                                 \
-        EXCEPTION_PROLOG_ISERIES_2;                                     \
-        b       label##_common;                                         \
-
-#ifdef CONFIG_PPC_ISERIES
-#define DISABLE_INTS                            \
-        li      r11,0;                          \
-        stb     r11,PACASOFTIRQEN(r13);         \
-BEGIN_FW_FTR_SECTION;                           \
-        stb     r11,PACAHARDIRQEN(r13);         \
-END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES);   \
-BEGIN_FW_FTR_SECTION;                           \
-        mfmsr   r10;                            \
-        ori     r10,r10,MSR_EE;                 \
-        mtmsrd  r10,1;                          \
-END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
-
-#else
-#define DISABLE_INTS                            \
-        li      r11,0;                          \
-        stb     r11,PACASOFTIRQEN(r13);         \
-        stb     r11,PACAHARDIRQEN(r13)
-
-#endif /* CONFIG_PPC_ISERIES */
-
-#define ENABLE_INTS                             \
-        ld      r12,_MSR(r1);                   \
-        mfmsr   r11;                            \
-        rlwimi  r11,r12,0,MSR_EE;               \
-        mtmsrd  r11,1
-
-#define STD_EXCEPTION_COMMON(trap, label, hdlr)         \
-        .align  7;                                      \
-        .globl label##_common;                          \
-label##_common:                                         \
-        EXCEPTION_PROLOG_COMMON(trap, PACA_EXGEN);      \
-        DISABLE_INTS;                                   \
-        bl      .save_nvgprs;                           \
-        addi    r3,r1,STACK_FRAME_OVERHEAD;             \
-        bl      hdlr;                                   \
-        b       .ret_from_except
-
-/*
- * Like STD_EXCEPTION_COMMON, but for exceptions that can occur
- * in the idle task and therefore need the special idle handling.
- */
-#define STD_EXCEPTION_COMMON_IDLE(trap, label, hdlr)    \
-        .align  7;                                      \
-        .globl label##_common;                          \
-label##_common:                                         \
-        EXCEPTION_PROLOG_COMMON(trap, PACA_EXGEN);      \
-        FINISH_NAP;                                     \
-        DISABLE_INTS;                                   \
-        bl      .save_nvgprs;                           \
-        addi    r3,r1,STACK_FRAME_OVERHEAD;             \
-        bl      hdlr;                                   \
-        b       .ret_from_except
-
-#define STD_EXCEPTION_COMMON_LITE(trap, label, hdlr)    \
-        .align  7;                                      \
-        .globl label##_common;                          \
-label##_common:                                         \
-        EXCEPTION_PROLOG_COMMON(trap, PACA_EXGEN);      \
-        FINISH_NAP;                                     \
-        DISABLE_INTS;                                   \
-        bl      .ppc64_runlatch_on;                     \
-        addi    r3,r1,STACK_FRAME_OVERHEAD;             \
-        bl      hdlr;                                   \
-        b       .ret_from_except_lite
-
-/*
- * When the idle code in power4_idle puts the CPU into NAP mode,
- * it has to do so in a loop, and relies on the external interrupt
- * and decrementer interrupt entry code to get it out of the loop.
- * It sets the _TLF_NAPPING bit in current_thread_info()->local_flags
- * to signal that it is in the loop and needs help to get out.
- */
-#ifdef CONFIG_PPC_970_NAP
-#define FINISH_NAP                              \
-BEGIN_FTR_SECTION                               \
-        clrrdi  r11,r1,THREAD_SHIFT;            \
-        ld      r9,TI_LOCAL_FLAGS(r11);         \
-        andi.   r10,r9,_TLF_NAPPING;            \
-        bnel    power4_fixup_nap;               \
-END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP)
-#else
-#define FINISH_NAP
-#endif
-
-/*
- * Start of pSeries system interrupt routines
- */
         . = 0x100
         .globl __start_interrupts
 __start_interrupts:
@@ -674,6 +341,7 @@ slb_miss_user_pseries:
         b       .                               /* prevent spec. execution */
 #endif /* __DISABLED__ */
 
+#ifdef CONFIG_PPC_PSERIES
 /*
  * Vectors for the FWNMI option.  Share common code.
  */
@@ -691,191 +359,7 @@ machine_check_fwnmi:
         mtspr   SPRN_SPRG1,r13          /* save r13 */
         EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXMC, machine_check_common)
 
-#ifdef CONFIG_PPC_ISERIES
-/***  ISeries-LPAR interrupt handlers ***/
-
-        STD_EXCEPTION_ISERIES(0x200, machine_check, PACA_EXMC)
-
-        .globl data_access_iSeries
-data_access_iSeries:
-        mtspr   SPRN_SPRG1,r13
-BEGIN_FTR_SECTION
-        mtspr   SPRN_SPRG2,r12
-        mfspr   r13,SPRN_DAR
-        mfspr   r12,SPRN_DSISR
-        srdi    r13,r13,60
-        rlwimi  r13,r12,16,0x20
-        mfcr    r12
-        cmpwi   r13,0x2c
-        beq     .do_stab_bolted_iSeries
-        mtcrf   0x80,r12
-        mfspr   r12,SPRN_SPRG2
-END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
-        EXCEPTION_PROLOG_ISERIES_1(PACA_EXGEN)
-        EXCEPTION_PROLOG_ISERIES_2
-        b       data_access_common
-
-.do_stab_bolted_iSeries:
-        mtcrf   0x80,r12
-        mfspr   r12,SPRN_SPRG2
-        EXCEPTION_PROLOG_ISERIES_1(PACA_EXSLB)
-        EXCEPTION_PROLOG_ISERIES_2
-        b       .do_stab_bolted
-
-        .globl  data_access_slb_iSeries
-data_access_slb_iSeries:
-        mtspr   SPRN_SPRG1,r13          /* save r13 */
-        mfspr   r13,SPRN_SPRG3          /* get paca address into r13 */
-        std     r3,PACA_EXSLB+EX_R3(r13)
-        mfspr   r3,SPRN_DAR
-        std     r9,PACA_EXSLB+EX_R9(r13)
-        mfcr    r9
-#ifdef __DISABLED__
-        cmpdi   r3,0
-        bge     slb_miss_user_iseries
-#endif
-        std     r10,PACA_EXSLB+EX_R10(r13)
-        std     r11,PACA_EXSLB+EX_R11(r13)
-        std     r12,PACA_EXSLB+EX_R12(r13)
-        mfspr   r10,SPRN_SPRG1
-        std     r10,PACA_EXSLB+EX_R13(r13)
-        ld      r12,PACALPPACAPTR(r13)
-        ld      r12,LPPACASRR1(r12)
-        b       .slb_miss_realmode
-
-        STD_EXCEPTION_ISERIES(0x400, instruction_access, PACA_EXGEN)
-
-        .globl  instruction_access_slb_iSeries
-instruction_access_slb_iSeries:
-        mtspr   SPRN_SPRG1,r13          /* save r13 */
-        mfspr   r13,SPRN_SPRG3          /* get paca address into r13 */
-        std     r3,PACA_EXSLB+EX_R3(r13)
-        ld      r3,PACALPPACAPTR(r13)
-        ld      r3,LPPACASRR0(r3)       /* get SRR0 value */
-        std     r9,PACA_EXSLB+EX_R9(r13)
-        mfcr    r9
-#ifdef __DISABLED__
-        cmpdi   r3,0
-        bge     .slb_miss_user_iseries
-#endif
-        std     r10,PACA_EXSLB+EX_R10(r13)
-        std     r11,PACA_EXSLB+EX_R11(r13)
-        std     r12,PACA_EXSLB+EX_R12(r13)
-        mfspr   r10,SPRN_SPRG1
-        std     r10,PACA_EXSLB+EX_R13(r13)
-        ld      r12,PACALPPACAPTR(r13)
-        ld      r12,LPPACASRR1(r12)
-        b       .slb_miss_realmode
-
-#ifdef __DISABLED__
-slb_miss_user_iseries:
-        std     r10,PACA_EXGEN+EX_R10(r13)
-        std     r11,PACA_EXGEN+EX_R11(r13)
-        std     r12,PACA_EXGEN+EX_R12(r13)
-        mfspr   r10,SPRG1
-        ld      r11,PACA_EXSLB+EX_R9(r13)
-        ld      r12,PACA_EXSLB+EX_R3(r13)
-        std     r10,PACA_EXGEN+EX_R13(r13)
-        std     r11,PACA_EXGEN+EX_R9(r13)
-        std     r12,PACA_EXGEN+EX_R3(r13)
-        EXCEPTION_PROLOG_ISERIES_2
-        b       slb_miss_user_common
-#endif
-
-        MASKABLE_EXCEPTION_ISERIES(0x500, hardware_interrupt)
-        STD_EXCEPTION_ISERIES(0x600, alignment, PACA_EXGEN)
-        STD_EXCEPTION_ISERIES(0x700, program_check, PACA_EXGEN)
-        STD_EXCEPTION_ISERIES(0x800, fp_unavailable, PACA_EXGEN)
-        MASKABLE_EXCEPTION_ISERIES(0x900, decrementer)
-        STD_EXCEPTION_ISERIES(0xa00, trap_0a, PACA_EXGEN)
-        STD_EXCEPTION_ISERIES(0xb00, trap_0b, PACA_EXGEN)
-
-        .globl  system_call_iSeries
-system_call_iSeries:
-        mr      r9,r13
-        mfspr   r13,SPRN_SPRG3
-        EXCEPTION_PROLOG_ISERIES_2
-        b       system_call_common
-
-        STD_EXCEPTION_ISERIES( 0xd00, single_step, PACA_EXGEN)
-        STD_EXCEPTION_ISERIES( 0xe00, trap_0e, PACA_EXGEN)
-        STD_EXCEPTION_ISERIES( 0xf00, performance_monitor, PACA_EXGEN)
-
-        .globl system_reset_iSeries
-system_reset_iSeries:
-        mfspr   r13,SPRN_SPRG3          /* Get paca address */
-        mfmsr   r24
-        ori     r24,r24,MSR_RI
-        mtmsrd  r24                     /* RI on */
-        lhz     r24,PACAPACAINDEX(r13)  /* Get processor # */
-        cmpwi   0,r24,0                 /* Are we processor 0? */
-        bne     1f
-        b       .__start_initialization_iSeries /* Start up the first processor */
-1:      mfspr   r4,SPRN_CTRLF
-        li      r5,CTRL_RUNLATCH        /* Turn off the run light */
-        andc    r4,r4,r5
-        mtspr   SPRN_CTRLT,r4
-
-1:
-        HMT_LOW
-#ifdef CONFIG_SMP
-        lbz     r23,PACAPROCSTART(r13)  /* Test if this processor
-                                         * should start */
-        sync
-        LOAD_REG_IMMEDIATE(r3,current_set)
-        sldi    r28,r24,3               /* get current_set[cpu#] */
-        ldx     r3,r3,r28
-        addi    r1,r3,THREAD_SIZE
-        subi    r1,r1,STACK_FRAME_OVERHEAD
-
-        cmpwi   0,r23,0
-        beq     iSeries_secondary_smp_loop      /* Loop until told to go */
-        bne     __secondary_start               /* Loop until told to go */
-iSeries_secondary_smp_loop:
-        /* Let the Hypervisor know we are alive */
-        /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
-        lis     r3,0x8002
-        rldicr  r3,r3,32,15             /* r0 = (r3 << 32) & 0xffff000000000000 */
-#else /* CONFIG_SMP */
-        /* Yield the processor.  This is required for non-SMP kernels
-                which are running on multi-threaded machines. */
-        lis     r3,0x8000
-        rldicr  r3,r3,32,15             /* r3 = (r3 << 32) & 0xffff000000000000 */
-        addi    r3,r3,18                /* r3 = 0x8000000000000012 which is "yield" */
-        li      r4,0                    /* "yield timed" */
-        li      r5,-1                   /* "yield forever" */
-#endif /* CONFIG_SMP */
-        li      r0,-1                   /* r0=-1 indicates a Hypervisor call */
-        sc                              /* Invoke the hypervisor via a system call */
-        mfspr   r13,SPRN_SPRG3          /* Put r13 back ???? */
-        b       1b                      /* If SMP not configured, secondaries
-                                         * loop forever */
-
-decrementer_iSeries_masked:
-        /* We may not have a valid TOC pointer in here. */
-        li      r11,1
-        ld      r12,PACALPPACAPTR(r13)
-        stb     r11,LPPACADECRINT(r12)
-        LOAD_REG_IMMEDIATE(r12, tb_ticks_per_jiffy)
-        lwz     r12,0(r12)
-        mtspr   SPRN_DEC,r12
-        /* fall through */
-
-hardware_interrupt_iSeries_masked:
-        mtcrf   0x80,r9         /* Restore regs */
-        ld      r12,PACALPPACAPTR(r13)
-        ld      r11,LPPACASRR0(r12)
-        ld      r12,LPPACASRR1(r12)
-        mtspr   SPRN_SRR0,r11
-        mtspr   SPRN_SRR1,r12
-        ld      r9,PACA_EXGEN+EX_R9(r13)
-        ld      r10,PACA_EXGEN+EX_R10(r13)
-        ld      r11,PACA_EXGEN+EX_R11(r13)
-        ld      r12,PACA_EXGEN+EX_R12(r13)
-        ld      r13,PACA_EXGEN+EX_R13(r13)
-        rfid
-        b       .       /* prevent speculative execution */
-#endif /* CONFIG_PPC_ISERIES */
+#endif /* CONFIG_PPC_PSERIES */
 
 /*** Common interrupt handlers ***/
 
@@ -1175,7 +659,9 @@ hardware_interrupt_common:
         FINISH_NAP
 hardware_interrupt_entry:
         DISABLE_INTS
+BEGIN_FTR_SECTION
         bl      .ppc64_runlatch_on
+END_FTR_SECTION_IFSET(CPU_FTR_CTRL)
         addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      .do_IRQ
         b       .ret_from_except_lite
@@ -1449,7 +935,7 @@ _GLOBAL(do_stab_bolted)
 
         /* Calculate VSID */
         /* This is a kernel address, so protovsid = ESID */
-        ASM_VSID_SCRAMBLE(r11, r9)
+        ASM_VSID_SCRAMBLE(r11, r9, 256M)
         rldic   r9,r11,12,16    /* r9 = vsid << 12 */
 
         /* Search the primary group for a free entry */
@@ -1519,8 +1005,8 @@ _GLOBAL(do_stab_bolted)
  * Space for CPU0's segment table.
  *
  * On iSeries, the hypervisor must fill in at least one entry before
- * we get control (with relocate on).  The address is give to the hv
- * as a page number (see xLparMap in lpardata.c), so this must be at a
+ * we get control (with relocate on).  The address is given to the hv
+ * as a page number (see xLparMap below), so this must be at a
  * fixed address (the linker can't compute (u64)&initial_stab >>
  * PAGE_SHIFT).
  */
@@ -1529,6 +1015,7 @@ _GLOBAL(do_stab_bolted)
 initial_stab:
         .space  4096
 
+#ifdef CONFIG_PPC_PSERIES
 /*
  * Data area reserved for FWNMI option.
  * This address (0x7000) is fixed by the RPA.
@@ -1536,21 +1023,34 @@ initial_stab:
         .= 0x7000
         .globl fwnmi_data_area
 fwnmi_data_area:
+#endif /* CONFIG_PPC_PSERIES */
 
         /* iSeries does not use the FWNMI stuff, so it is safe to put
          * this here, even if we later allow kernels that will boot on
          * both pSeries and iSeries */
 #ifdef CONFIG_PPC_ISERIES
         . = LPARMAP_PHYS
-#include "lparmap.s"
-/*
- * This ".text" is here for old compilers that generate a trailing
- * .note section when compiling .c files to .s
- */
-        .text
+        .globl xLparMap
+xLparMap:
+        .quad   HvEsidsToMap            /* xNumberEsids */
+        .quad   HvRangesToMap           /* xNumberRanges */
+        .quad   STAB0_PAGE              /* xSegmentTableOffs */
+        .zero   40                      /* xRsvd */
+        /* xEsids (HvEsidsToMap entries of 2 quads) */
+        .quad   PAGE_OFFSET_ESID        /* xKernelEsid */
+        .quad   PAGE_OFFSET_VSID        /* xKernelVsid */
+        .quad   VMALLOC_START_ESID      /* xKernelEsid */
+        .quad   VMALLOC_START_VSID      /* xKernelVsid */
+        /* xRanges (HvRangesToMap entries of 3 quads) */
+        .quad   HvPagesToMap            /* xPages */
+        .quad   0                       /* xOffset */
+        .quad   PAGE_OFFSET_VSID << (SID_SHIFT - HW_PAGE_SHIFT) /* xVPN */
+
 #endif /* CONFIG_PPC_ISERIES */
 
+#ifdef CONFIG_PPC_PSERIES
         . = 0x8000
+#endif /* CONFIG_PPC_PSERIES */
 
 /*
  * On pSeries and most other platforms, secondary processors spin
@@ -1611,39 +1111,6 @@ _GLOBAL(generic_secondary_smp_init)
         b       __secondary_start
 #endif
 
-#ifdef CONFIG_PPC_ISERIES
-_INIT_STATIC(__start_initialization_iSeries)
-        /* Clear out the BSS */
-        LOAD_REG_IMMEDIATE(r11,__bss_stop)
-        LOAD_REG_IMMEDIATE(r8,__bss_start)
-        sub     r11,r11,r8              /* bss size                     */
-        addi    r11,r11,7               /* round up to an even double word */
-        rldicl. r11,r11,61,3            /* shift right by 3             */
-        beq     4f
-        addi    r8,r8,-8
-        li      r0,0
-        mtctr   r11                     /* zero this many doublewords   */
-3:      stdu    r0,8(r8)
-        bdnz    3b
-4:
-        LOAD_REG_IMMEDIATE(r1,init_thread_union)
-        addi    r1,r1,THREAD_SIZE
-        li      r0,0
-        stdu    r0,-STACK_FRAME_OVERHEAD(r1)
-
-        LOAD_REG_IMMEDIATE(r2,__toc_start)
-        addi    r2,r2,0x4000
-        addi    r2,r2,0x4000
-
-        bl      .iSeries_early_setup
-        bl      .early_setup
-
-        /* relocation is on at this point */
-
-        b       .start_here_common
-#endif /* CONFIG_PPC_ISERIES */
-
-
 _STATIC(__mmu_off)
         mfmsr   r3
         andi.   r0,r3,MSR_IR|MSR_DR
@@ -1891,6 +1358,7 @@ _GLOBAL(pmac_secondary_start)
  *   r13   = paca virtual address
  *   SPRG3 = paca virtual address
  */
+        .globl  __secondary_start
 __secondary_start:
         /* Set thread priority to MEDIUM */
         HMT_MEDIUM
@@ -2021,7 +1489,7 @@ _INIT_STATIC(start_here_multiplatform)
         b       .       /* prevent speculative execution */
         
         /* This is where all platforms converge execution */
-_INIT_STATIC(start_here_common)
+_INIT_GLOBAL(start_here_common)
         /* relocation is on at this point */
 
         /* The following code sets up the SP and TOC now that we are */
@@ -2078,12 +1546,4 @@ empty_zero_page:
 
         .globl  swapper_pg_dir
 swapper_pg_dir:
-        .space  PAGE_SIZE
-
-/*
- * This space gets a copy of optional info passed to us by the bootstrap
- * Used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-        .globl  cmd_line
-cmd_line:
-        .space  COMMAND_LINE_SIZE
+        .space  PGD_TABLE_SIZE
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index 901be47a02a9..f7458396cd7c 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -38,12 +38,9 @@
 #else
 #define DO_8xx_CPU6(val, reg)
 #endif
-        .text
-        .globl  _stext
-_stext:
-        .text
-        .globl  _start
-_start:
+        .section        .text.head, "ax"
+_ENTRY(_stext);
+_ENTRY(_start);
 
 /* MPC8xx
  * This port was done on an MBX board with an 860.  Right now I only
@@ -301,6 +298,12 @@ InstructionTLBMiss:
         stw     r10, 0(r0)
         stw     r11, 4(r0)
         mfspr   r10, SPRN_SRR0  /* Get effective address of fault */
+#ifdef CONFIG_8xx_CPU15
+        addi    r11, r10, 0x1000
+        tlbie   r11
+        addi    r11, r10, -0x1000
+        tlbie   r11
+#endif
         DO_8xx_CPU6(0x3780, r3)
         mtspr   SPRN_MD_EPN, r10        /* Have to use MD_EPN for walk, MI_EPN can't */
         mfspr   r10, SPRN_M_TWB /* Get level 1 table entry address */
@@ -730,13 +733,13 @@ initial_mmu:
         mtspr   SPRN_MD_TWC, r9
         li      r11, MI_BOOTINIT        /* Create RPN for address 0 */
         addis   r11, r11, 0x0080        /* Add 8M */
-        mtspr   SPRN_MD_RPN, r8
+        mtspr   SPRN_MD_RPN, r11
 
         addis   r8, r8, 0x0080          /* Add 8M */
         mtspr   SPRN_MD_EPN, r8
         mtspr   SPRN_MD_TWC, r9
         addis   r11, r11, 0x0080        /* Add 8M */
-        mtspr   SPRN_MD_RPN, r8
+        mtspr   SPRN_MD_RPN, r11
 #endif
 
         /* Since the cache is enabled according to the information we
@@ -835,14 +838,6 @@ empty_zero_page:
 swapper_pg_dir:
         .space  4096
 
-/*
- * This space gets a copy of optional info passed to us by the bootstrap
- * Used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-        .globl  cmd_line
-cmd_line:
-        .space  512
-
 /* Room for two PTE table poiners, usually the kernel and current user
  * pointer to their respective root page table (pgdir).
  */
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 1f155d399d57..4b9822728aea 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -2,27 +2,27 @@
  * Kernel execution entry point code.
  *
  *    Copyright (c) 1995-1996 Gary Thomas <gdt@linuxppc.org>
- *      Initial PowerPC version.
+ *      Initial PowerPC version.
  *    Copyright (c) 1996 Cort Dougan <cort@cs.nmt.edu>
- *      Rewritten for PReP
+ *      Rewritten for PReP
  *    Copyright (c) 1996 Paul Mackerras <paulus@cs.anu.edu.au>
- *      Low-level exception handers, MMU support, and rewrite.
+ *      Low-level exception handers, MMU support, and rewrite.
  *    Copyright (c) 1997 Dan Malek <dmalek@jlc.net>
- *      PowerPC 8xx modifications.
+ *      PowerPC 8xx modifications.
  *    Copyright (c) 1998-1999 TiVo, Inc.
- *      PowerPC 403GCX modifications.
+ *      PowerPC 403GCX modifications.
  *    Copyright (c) 1999 Grant Erickson <grant@lcse.umn.edu>
- *      PowerPC 403GCX/405GP modifications.
+ *      PowerPC 403GCX/405GP modifications.
  *    Copyright 2000 MontaVista Software Inc.
  *      PPC405 modifications
- *      PowerPC 403GCX/405GP modifications.
- *      Author: MontaVista Software, Inc.
- *              frank_rowand@mvista.com or source@mvista.com
- *              debbie_chu@mvista.com
+ *      PowerPC 403GCX/405GP modifications.
+ *      Author: MontaVista Software, Inc.
+ *              frank_rowand@mvista.com or source@mvista.com
+ *              debbie_chu@mvista.com
  *    Copyright 2002-2004 MontaVista Software, Inc.
- *      PowerPC 44x support, Matt Porter <mporter@kernel.crashing.org>
+ *      PowerPC 44x support, Matt Porter <mporter@kernel.crashing.org>
  *    Copyright 2004 Freescale Semiconductor, Inc
- *      PowerPC e500 modifications, Kumar Gala <galak@kernel.crashing.org>
+ *      PowerPC e500 modifications, Kumar Gala <galak@kernel.crashing.org>
  *
  * 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
@@ -52,9 +52,9 @@
  *   r7 - End of kernel command line string
  *
  */
-        .text
-_GLOBAL(_stext)
-_GLOBAL(_start)
+        .section        .text.head, "ax"
+_ENTRY(_stext);
+_ENTRY(_start);
         /*
          * Reserve a word at a fixed location to store the address
          * of abatron_pteptrs
@@ -146,13 +146,13 @@ skpinv:	addi	r6,r6,1				/* Increment */
         bne     1b                              /* If not, repeat */
 
         /* Invalidate TLB0 */
-        li      r6,0x04
+        li      r6,0x04
         tlbivax 0,r6
 #ifdef CONFIG_SMP
         tlbsync
 #endif
         /* Invalidate TLB1 */
-        li      r6,0x0c
+        li      r6,0x0c
         tlbivax 0,r6
 #ifdef CONFIG_SMP
         tlbsync
@@ -211,7 +211,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
         mtspr   SPRN_MAS1,r6
         tlbwe
         /* Invalidate TLB1 */
-        li      r9,0x0c
+        li      r9,0x0c
         tlbivax 0,r9
 #ifdef CONFIG_SMP
         tlbsync
@@ -254,7 +254,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
         mtspr   SPRN_MAS1,r8
         tlbwe
         /* Invalidate TLB1 */
-        li      r9,0x0c
+        li      r9,0x0c
         tlbivax 0,r9
 #ifdef CONFIG_SMP
         tlbsync
@@ -294,7 +294,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
 #ifdef CONFIG_E200
         oris    r2,r2,MAS4_TLBSELD(1)@h
 #endif
-        mtspr   SPRN_MAS4, r2
+        mtspr   SPRN_MAS4, r2
 
 #if 0
         /* Enable DOZE */
@@ -305,7 +305,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
 #ifdef CONFIG_E200
         /* enable dedicated debug exception handling resources (Debug APU) */
         mfspr   r2,SPRN_HID0
-        ori     r2,r2,HID0_DAPUEN@l
+        ori     r2,r2,HID0_DAPUEN@l
         mtspr   SPRN_HID0,r2
 #endif
 
@@ -391,7 +391,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
 #ifdef CONFIG_PTE_64BIT
 #define PTE_FLAGS_OFFSET        4
 #define FIND_PTE        \
-        rlwinm  r12, r10, 13, 19, 29;   /* Compute pgdir/pmd offset */  \
+        rlwinm  r12, r10, 13, 19, 29;   /* Compute pgdir/pmd offset */  \
         lwzx    r11, r12, r11;          /* Get pgd/pmd entry */         \
         rlwinm. r12, r11, 0, 0, 20;     /* Extract pt base address */   \
         beq     2f;                     /* Bail if no table */          \
@@ -461,8 +461,7 @@ interrupt_base:
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
          */
-        lis     r11, TASK_SIZE@h
-        ori     r11, r11, TASK_SIZE@l
+        lis     r11, PAGE_OFFSET@h
         cmplw   0, r10, r11
         bge     2f
 
@@ -487,7 +486,7 @@ interrupt_base:
          */
         andi.   r11, r11, _PAGE_HWEXEC
         rlwimi  r11, r11, 31, 27, 27    /* SX <- _PAGE_HWEXEC */
-        ori     r11, r11, (MAS3_UW|MAS3_SW|MAS3_UR|MAS3_SR)@l /* set static perms */
+        ori     r11, r11, (MAS3_UW|MAS3_SW|MAS3_UR|MAS3_SR)@l /* set static perms */
 
         /* update search PID in MAS6, AS = 0 */
         mfspr   r12, SPRN_PID0
@@ -584,8 +583,7 @@ interrupt_base:
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
          */
-        lis     r11, TASK_SIZE@h
-        ori     r11, r11, TASK_SIZE@l
+        lis     r11, PAGE_OFFSET@h
         cmplw   5, r10, r11
         blt     5, 3f
         lis     r11, swapper_pg_dir@h
@@ -645,8 +643,7 @@ interrupt_base:
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
          */
-        lis     r11, TASK_SIZE@h
-        ori     r11, r11, TASK_SIZE@l
+        lis     r11, PAGE_OFFSET@h
         cmplw   5, r10, r11
         blt     5, 3f
         lis     r11, swapper_pg_dir@h
@@ -694,7 +691,7 @@ interrupt_base:
         START_EXCEPTION(SPEUnavailable)
         NORMAL_EXCEPTION_PROLOG
         bne     load_up_spe
-        addi    r3,r1,STACK_FRAME_OVERHEAD
+        addi    r3,r1,STACK_FRAME_OVERHEAD
         EXC_XFER_EE_LITE(0x2010, KernelSPE)
 #else
         EXCEPTION(0x2020, SPEUnavailable, unknown_exception, EXC_XFER_EE)
@@ -741,10 +738,10 @@ data_access:
 
  * Both the instruction and data TLB miss get to this
  * point to load the TLB.
- *      r10 - EA of fault
- *      r11 - TLB (info from Linux PTE)
- *      r12, r13 - available to use
- *      CR5 - results of addr < TASK_SIZE
+ *      r10 - EA of fault
+ *      r11 - TLB (info from Linux PTE)
+ *      r12, r13 - available to use
+ *      CR5 - results of addr >= PAGE_OFFSET
  *      MAS0, MAS1 - loaded with proper value when we get here
  *      MAS2, MAS3 - will need additional info from Linux PTE
  *      Upon exit, we reload everything and RFI.
@@ -813,7 +810,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_BIG_PHYS)
         lwz     r13, tlbcam_index@l(r13)
         rlwimi  r12, r13, 0, 20, 31
 7:
-        mtspr   SPRN_MAS0,r12
+        mtspr   SPRN_MAS0,r12
 #endif /* CONFIG_E200 */
 
         tlbwe
@@ -855,17 +852,17 @@ load_up_spe:
         beq     1f
         addi    r4,r4,THREAD    /* want THREAD of last_task_used_spe */
         SAVE_32EVRS(0,r10,r4)
-        evxor   evr10, evr10, evr10     /* clear out evr10 */
+        evxor   evr10, evr10, evr10     /* clear out evr10 */
         evmwumiaa evr10, evr10, evr10   /* evr10 <- ACC = 0 * 0 + ACC */
         li      r5,THREAD_ACC
-        evstddx evr10, r4, r5           /* save off accumulator */
+        evstddx evr10, r4, r5           /* save off accumulator */
         lwz     r5,PT_REGS(r4)
         lwz     r4,_MSR-STACK_FRAME_OVERHEAD(r5)
         lis     r10,MSR_SPE@h
         andc    r4,r4,r10       /* disable SPE for previous task */
         stw     r4,_MSR-STACK_FRAME_OVERHEAD(r5)
 1:
-#endif /* CONFIG_SMP */
+#endif /* !CONFIG_SMP */
         /* enable use of SPE after return */
         oris    r9,r9,MSR_SPE@h
         mfspr   r5,SPRN_SPRG3           /* current task's THREAD (phys) */
@@ -878,7 +875,7 @@ load_up_spe:
 #ifndef CONFIG_SMP
         subi    r4,r5,THREAD
         stw     r4,last_task_used_spe@l(r3)
-#endif /* CONFIG_SMP */
+#endif /* !CONFIG_SMP */
         /* restore registers and return */
 2:      REST_4GPRS(3, r11)
         lwz     r10,_CCR(r11)
@@ -963,10 +960,10 @@ _GLOBAL(giveup_spe)
         lwz     r5,PT_REGS(r3)
         cmpi    0,r5,0
         SAVE_32EVRS(0, r4, r3)
-        evxor   evr6, evr6, evr6        /* clear out evr6 */
+        evxor   evr6, evr6, evr6        /* clear out evr6 */
         evmwumiaa evr6, evr6, evr6      /* evr6 <- ACC = 0 * 0 + ACC */
         li      r4,THREAD_ACC
-        evstddx evr6, r4, r3            /* save off accumulator */
+        evstddx evr6, r4, r3            /* save off accumulator */
         mfspr   r6,SPRN_SPEFSCR
         stw     r6,THREAD_SPEFSCR(r3)   /* save spefscr register value */
         beq     1f
@@ -979,7 +976,7 @@ _GLOBAL(giveup_spe)
         li      r5,0
         lis     r4,last_task_used_spe@ha
         stw     r5,last_task_used_spe@l(r4)
-#endif /* CONFIG_SMP */
+#endif /* !CONFIG_SMP */
         blr
 #endif /* CONFIG_SPE */
 
@@ -1000,15 +997,15 @@ _GLOBAL(giveup_fpu)
  */
 _GLOBAL(abort)
         li      r13,0
-        mtspr   SPRN_DBCR0,r13          /* disable all debug events */
+        mtspr   SPRN_DBCR0,r13          /* disable all debug events */
         isync
         mfmsr   r13
         ori     r13,r13,MSR_DE@l        /* Enable Debug Events */
         mtmsr   r13
         isync
-        mfspr   r13,SPRN_DBCR0
-        lis     r13,(DBCR0_IDM|DBCR0_RST_CHIP)@h
-        mtspr   SPRN_DBCR0,r13
+        mfspr   r13,SPRN_DBCR0
+        lis     r13,(DBCR0_IDM|DBCR0_RST_CHIP)@h
+        mtspr   SPRN_DBCR0,r13
         isync
 
 _GLOBAL(set_context)
@@ -1043,21 +1040,13 @@ swapper_pg_dir:
 /* Reserved 4k for the critical exception stack & 4k for the machine
  * check stack per CPU for kernel mode exceptions */
         .section .bss
-        .align 12
+        .align 12
 exception_stack_bottom:
         .space  BOOKE_EXCEPTION_STACK_SIZE * NR_CPUS
         .globl  exception_stack_top
 exception_stack_top:
 
 /*
- * This space gets a copy of optional info passed to us by the bootstrap
- * which is used to pass parameters into the kernel like root=/dev/sda1, etc.
- */
-        .globl  cmd_line
-cmd_line:
-        .space  512
-
-/*
  * Room for two PTE pointers, usually the kernel and current user pointers
  * to their respective root page table.
  */
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index d6a38cd5018e..53bf64623bd8 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -371,7 +371,8 @@ static int ibmebus_match_path(struct device *dev, void *data)
 
 static char *ibmebus_chomp(const char *in, size_t count)
 {
-        char *out = (char*)kmalloc(count + 1, GFP_KERNEL);
+        char *out = kmalloc(count + 1, GFP_KERNEL);
+
         if (!out)
                 return NULL;
 
@@ -396,10 +397,10 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
                 return -ENOMEM;
 
         if (bus_find_device(&ibmebus_bus_type, NULL, path,
-                             ibmebus_match_path)) {
+                            ibmebus_match_path)) {
                 printk(KERN_WARNING "%s: %s has already been probed\n",
                        __FUNCTION__, path);
-                rc = -EINVAL;
+                rc = -EEXIST;
                 goto out;
         }
 
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c
index a9e9cbd32975..abd2957fe537 100644
--- a/arch/powerpc/kernel/idle.c
+++ b/arch/powerpc/kernel/idle.c
@@ -24,6 +24,7 @@
 #include <linux/smp.h>
 #include <linux/cpu.h>
 #include <linux/sysctl.h>
+#include <linux/tick.h>
 
 #include <asm/system.h>
 #include <asm/processor.h>
@@ -59,6 +60,7 @@ void cpu_idle(void)
 
         set_thread_flag(TIF_POLLING_NRFLAG);
         while (1) {
+                tick_nohz_stop_sched_tick();
                 while (!need_resched() && !cpu_should_die()) {
                         ppc64_runlatch_off();
 
@@ -90,6 +92,7 @@ void cpu_idle(void)
 
                 HMT_medium();
                 ppc64_runlatch_on();
+                tick_nohz_restart_sched_tick();
                 if (cpu_should_die())
                         cpu_die();
                 preempt_enable_no_resched();
diff --git a/arch/powerpc/kernel/iomap.c b/arch/powerpc/kernel/iomap.c
index 2a5cf8680370..1577434f4088 100644
--- a/arch/powerpc/kernel/iomap.c
+++ b/arch/powerpc/kernel/iomap.c
@@ -119,8 +119,8 @@ EXPORT_SYMBOL(ioport_unmap);
 
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
 {
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);
 
         if (!len)
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index c08ceca6277d..e4ec6eee81a8 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -30,7 +30,6 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/dma-mapping.h>
-#include <linux/init.h>
 #include <linux/bitops.h>
 #include <asm/io.h>
 #include <asm/prom.h>
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 24bea97c736c..2250f9e6c5ca 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -52,6 +52,7 @@
 #include <linux/mutex.h>
 #include <linux/bootmem.h>
 #include <linux/pci.h>
+#include <linux/debugfs.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
@@ -272,7 +273,7 @@ void do_IRQ(struct pt_regs *regs)
         struct thread_info *curtp, *irqtp;
 #endif
 
-        irq_enter();
+        irq_enter();
 
 #ifdef CONFIG_DEBUG_STACKOVERFLOW
         /* Debugging check for stack overflow: is there less than 2KB free? */
@@ -321,7 +322,7 @@ void do_IRQ(struct pt_regs *regs)
                 /* That's not SMP safe ... but who cares ? */
                 ppc_spurious_interrupts++;
 
-        irq_exit();
+        irq_exit();
         set_irq_regs(old_regs);
 
 #ifdef CONFIG_PPC_ISERIES
@@ -395,7 +396,6 @@ void do_softirq(void)
 
         local_irq_restore(flags);
 }
-EXPORT_SYMBOL(do_softirq);
 
 
 /*
@@ -418,10 +418,16 @@ irq_hw_number_t virq_to_hw(unsigned int virq)
 }
 EXPORT_SYMBOL_GPL(virq_to_hw);
 
-__init_refok struct irq_host *irq_alloc_host(unsigned int revmap_type,
-                                                unsigned int revmap_arg,
-                                                struct irq_host_ops *ops,
-                                                irq_hw_number_t inval_irq)
+static int default_irq_host_match(struct irq_host *h, struct device_node *np)
+{
+        return h->of_node != NULL && h->of_node == np;
+}
+
+struct irq_host *irq_alloc_host(struct device_node *of_node,
+                                unsigned int revmap_type,
+                                unsigned int revmap_arg,
+                                struct irq_host_ops *ops,
+                                irq_hw_number_t inval_irq)
 {
         struct irq_host *host;
         unsigned int size = sizeof(struct irq_host);
@@ -432,13 +438,7 @@ __init_refok struct irq_host *irq_alloc_host(unsigned int revmap_type,
         /* Allocate structure and revmap table if using linear mapping */
         if (revmap_type == IRQ_HOST_MAP_LINEAR)
                 size += revmap_arg * sizeof(unsigned int);
-        if (mem_init_done)
-                host = kzalloc(size, GFP_KERNEL);
-        else {
-                host = alloc_bootmem(size);
-                if (host)
-                        memset(host, 0, size);
-        }
+        host = zalloc_maybe_bootmem(size, GFP_KERNEL);
         if (host == NULL)
                 return NULL;
 
@@ -446,6 +446,10 @@ __init_refok struct irq_host *irq_alloc_host(unsigned int revmap_type,
         host->revmap_type = revmap_type;
         host->inval_irq = inval_irq;
         host->ops = ops;
+        host->of_node = of_node;
+
+        if (host->ops->match == NULL)
+                host->ops->match = default_irq_host_match;
 
         spin_lock_irqsave(&irq_big_lock, flags);
 
@@ -477,7 +481,7 @@ __init_refok struct irq_host *irq_alloc_host(unsigned int revmap_type,
                 host->inval_irq = 0;
                 /* setup us as the host for all legacy interrupts */
                 for (i = 1; i < NUM_ISA_INTERRUPTS; i++) {
-                        irq_map[i].hwirq = 0;
+                        irq_map[i].hwirq = i;
                         smp_wmb();
                         irq_map[i].host = host;
                         smp_wmb();
@@ -521,7 +525,7 @@ struct irq_host *irq_find_host(struct device_node *node)
          */
         spin_lock_irqsave(&irq_big_lock, flags);
         list_for_each_entry(h, &irq_hosts, link)
-                if (h->ops->match == NULL || h->ops->match(h, node)) {
+                if (h->ops->match(h, node)) {
                         found = h;
                         break;
                 }
@@ -996,6 +1000,68 @@ static int irq_late_init(void)
 }
 arch_initcall(irq_late_init);
 
+#ifdef CONFIG_VIRQ_DEBUG
+static int virq_debug_show(struct seq_file *m, void *private)
+{
+        unsigned long flags;
+        irq_desc_t *desc;
+        const char *p;
+        char none[] = "none";
+        int i;
+
+        seq_printf(m, "%-5s  %-7s  %-15s  %s\n", "virq", "hwirq",
+                      "chip name", "host name");
+
+        for (i = 1; i < NR_IRQS; i++) {
+                desc = get_irq_desc(i);
+                spin_lock_irqsave(&desc->lock, flags);
+
+                if (desc->action && desc->action->handler) {
+                        seq_printf(m, "%5d  ", i);
+                        seq_printf(m, "0x%05lx  ", virq_to_hw(i));
+
+                        if (desc->chip && desc->chip->typename)
+                                p = desc->chip->typename;
+                        else
+                                p = none;
+                        seq_printf(m, "%-15s  ", p);
+
+                        if (irq_map[i].host && irq_map[i].host->of_node)
+                                p = irq_map[i].host->of_node->full_name;
+                        else
+                                p = none;
+                        seq_printf(m, "%s\n", p);
+                }
+
+                spin_unlock_irqrestore(&desc->lock, flags);
+        }
+
+        return 0;
+}
+
+static int virq_debug_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, virq_debug_show, inode->i_private);
+}
+
+static const struct file_operations virq_debug_fops = {
+        .open = virq_debug_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
+};
+
+static int __init irq_debugfs_init(void)
+{
+        if (debugfs_create_file("virq_mapping", S_IRUGO, powerpc_debugfs_root,
+                                 NULL, &virq_debug_fops))
+                return -ENOMEM;
+
+        return 0;
+}
+__initcall(irq_debugfs_init);
+#endif /* CONFIG_VIRQ_DEBUG */
+
 #endif /* CONFIG_PPC_MERGE */
 
 #ifdef CONFIG_PPC64
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 90fa11c72e1c..4ed58875ee17 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -340,9 +340,10 @@ void __init find_legacy_serial_ports(void)
         }
 
         /* First fill our array with opb bus ports */
-        for (np = NULL; (np = of_find_compatible_node(np, "serial", "ns16750")) != NULL;) {
+        for (np = NULL; (np = of_find_compatible_node(np, "serial", "ns16550")) != NULL;) {
                 struct device_node *opb = of_get_parent(np);
-                if (opb && !strcmp(opb->type, "opb")) {
+                if (opb && (!strcmp(opb->type, "opb") ||
+                            of_device_is_compatible(opb, "ibm,opb"))) {
                         index = add_legacy_soc_port(np, np);
                         if (index >= 0 && np == stdout)
                                 legacy_serial_console = index;
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 6444eaa30a2f..ff781b2eddec 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -77,7 +77,7 @@ static int iseries_lparcfg_data(struct seq_file *m, void *v)
         int processors, max_processors;
         unsigned long purr = get_purr();
 
-        shared = (int)(get_lppaca()->shared_proc);
+        shared = (int)(local_paca->lppaca_ptr->shared_proc);
 
         seq_printf(m, "system_active_processors=%d\n",
                    (int)HvLpConfig_getSystemPhysicalProcessors());
diff --git a/arch/powerpc/kernel/lparmap.c b/arch/powerpc/kernel/lparmap.c
deleted file mode 100644
index af11285ffbd1..000000000000
--- a/arch/powerpc/kernel/lparmap.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2005  Stephen Rothwell  IBM Corp.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-#include <asm/mmu.h>
-#include <asm/pgtable.h>
-#include <asm/iseries/lpar_map.h>
-
-/* The # is to stop gcc trying to make .text nonexecutable */
-const struct LparMap __attribute__((__section__(".text #"))) xLparMap = {
-        .xNumberEsids = HvEsidsToMap,
-        .xNumberRanges = HvRangesToMap,
-        .xSegmentTableOffs = STAB0_PAGE,
-
-        .xEsids = {
-                { .xKernelEsid = GET_ESID(PAGE_OFFSET),
-                  .xKernelVsid = KERNEL_VSID(PAGE_OFFSET), },
-                { .xKernelEsid = GET_ESID(VMALLOC_START),
-                  .xKernelVsid = KERNEL_VSID(VMALLOC_START), },
-        },
-
-        .xRanges = {
-                { .xPages = HvPagesToMap,
-                  .xOffset = 0,
-                  .xVPN = KERNEL_VSID(PAGE_OFFSET) << (SID_SHIFT - HW_PAGE_SHIFT),
-                },
-        },
-};
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index f9676f52c6d8..0ed31f220482 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -34,21 +34,10 @@
 
 #undef DEBUG_NVRAM
 
-static int nvram_scan_partitions(void);
-static int nvram_setup_partition(void);
-static int nvram_create_os_partition(void);
-static int nvram_remove_os_partition(void);
-
 static struct nvram_partition * nvram_part;
 static long nvram_error_log_index = -1;
 static long nvram_error_log_size = 0;
 
-int no_logging = 1;     /* Until we initialize everything,
-                         * make sure we don't try logging
-                         * anything */
-
-extern volatile int error_log_cnt;
-
 struct err_log_info {
         int error_type;
         unsigned int seq_num;
@@ -636,16 +625,13 @@ void __exit nvram_cleanup(void)
  * sequence #: The unique sequence # for each event. (until it wraps)
  * error log: The error log from event_scan
  */
-int nvram_write_error_log(char * buff, int length, unsigned int err_type)
+int nvram_write_error_log(char * buff, int length,
+                          unsigned int err_type, unsigned int error_log_cnt)
 {
         int rc;
         loff_t tmp_index;
         struct err_log_info info;
         
-        if (no_logging) {
-                return -EPERM;
-        }
-
         if (nvram_error_log_index == -1) {
                 return -ESPIPE;
         }
@@ -678,7 +664,8 @@ int nvram_write_error_log(char * buff, int length, unsigned int err_type)
  *
  * Reads nvram for error log for at most 'length'
  */
-int nvram_read_error_log(char * buff, int length, unsigned int * err_type)
+int nvram_read_error_log(char * buff, int length,
+                         unsigned int * err_type, unsigned int * error_log_cnt)
 {
         int rc;
         loff_t tmp_index;
@@ -704,7 +691,7 @@ int nvram_read_error_log(char * buff, int length, unsigned int * err_type)
                 return rc;
         }
 
-        error_log_cnt = info.seq_num;
+        *error_log_cnt = info.seq_num;
         *err_type = info.error_type;
 
         return 0;
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index f70e787d556f..eca8ccc3fa12 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -19,11 +19,11 @@
 #include <linux/mod_devicetable.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
 
 #include <asm/errno.h>
 #include <asm/dcr.h>
-#include <asm/of_device.h>
-#include <asm/of_platform.h>
 #include <asm/topology.h>
 #include <asm/pci-bridge.h>
 #include <asm/ppc-pci.h>
@@ -70,7 +70,10 @@ postcore_initcall(of_bus_driver_init);
 int of_register_platform_driver(struct of_platform_driver *drv)
 {
         /* initialize common driver fields */
-        drv->driver.name = drv->name;
+        if (!drv->driver.name)
+                drv->driver.name = drv->name;
+        if (!drv->driver.owner)
+                drv->driver.owner = drv->owner;
         drv->driver.bus = &of_platform_bus_type;
 
         /* register with core */
@@ -385,9 +388,11 @@ static struct of_device_id of_pci_phb_ids[] = {
 };
 
 static struct of_platform_driver of_pci_phb_driver = {
-       .name = "of-pci",
-       .match_table = of_pci_phb_ids,
-       .probe = of_pci_phb_probe,
+        .match_table = of_pci_phb_ids,
+        .probe = of_pci_phb_probe,
+        .driver = {
+                .name = "of-pci",
+        },
 };
 
 static __init int of_pci_phb_init(void)
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 083cfbdbe0b2..2ae3b6f778a3 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -65,14 +65,11 @@ static void __devinit pci_setup_pci_controller(struct pci_controller *hose)
         spin_unlock(&hose_spinlock);
 }
 
-__init_refok struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
+struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
 {
         struct pci_controller *phb;
 
-        if (mem_init_done)
-                phb = kmalloc(sizeof(struct pci_controller), GFP_KERNEL);
-        else
-                phb = alloc_bootmem(sizeof (struct pci_controller));
+        phb = alloc_maybe_bootmem(sizeof(struct pci_controller), GFP_KERNEL);
         if (phb == NULL)
                 return NULL;
         pci_setup_pci_controller(phb);
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 04a3109ae3c6..0e2bee46304c 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -1457,8 +1457,8 @@ null_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
 
 static struct pci_ops null_pci_ops =
 {
-        null_read_config,
-        null_write_config
+        .read = null_read_config,
+        .write = null_write_config,
 };
 
 /*
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 291ffbc360c9..9f63bdcb0bdf 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -588,7 +588,7 @@ int pci_proc_domain(struct pci_bus *bus)
                 return 0;
         else {
                 struct pci_controller *hose = pci_bus_to_host(bus);
-                return hose->buid;
+                return hose->buid != 0;
         }
 }
 
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index d7d36df9c053..b4839038613d 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -23,8 +23,6 @@
 #include <linux/pci.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/bootmem.h>
 
 #include <asm/io.h>
 #include <asm/prom.h>
@@ -45,10 +43,7 @@ static void * __devinit update_dn_pci_info(struct device_node *dn, void *data)
         const u32 *regs;
         struct pci_dn *pdn;
 
-        if (mem_init_done)
-                pdn = kmalloc(sizeof(*pdn), GFP_KERNEL);
-        else
-                pdn = alloc_bootmem(sizeof(*pdn));
+        pdn = alloc_maybe_bootmem(sizeof(*pdn), GFP_KERNEL);
         if (pdn == NULL)
                 return NULL;
         memset(pdn, 0, sizeof(*pdn));
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index a20f1951a5ce..c6b1aa3efbb9 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -12,12 +12,12 @@
 #include <linux/irq.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
-#include <linux/ide.h>
 #include <linux/bitops.h>
 
 #include <asm/page.h>
 #include <asm/semaphore.h>
 #include <asm/processor.h>
+#include <asm/cacheflush.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/atomic.h>
@@ -95,10 +95,6 @@ EXPORT_SYMBOL(__strnlen_user);
 EXPORT_SYMBOL(copy_4K_page);
 #endif
 
-#if defined(CONFIG_PPC32) && (defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE))
-EXPORT_SYMBOL(ppc_ide_md);
-#endif
-
 #if defined(CONFIG_PCI) && defined(CONFIG_PPC32)
 EXPORT_SYMBOL(isa_io_base);
 EXPORT_SYMBOL(isa_mem_base);
@@ -180,7 +176,7 @@ EXPORT_SYMBOL(cacheable_memcpy);
 EXPORT_SYMBOL(cpm_install_handler);
 EXPORT_SYMBOL(cpm_free_handler);
 #endif /* CONFIG_8xx */
-#if defined(CONFIG_8xx) || defined(CONFIG_40x)
+#if defined(CONFIG_8xx)
 EXPORT_SYMBOL(__res);
 #endif
 
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 8a1b001d0b11..7949c203cb89 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -354,6 +354,14 @@ static void show_instructions(struct pt_regs *regs)
                 if (!(i % 8))
                         printk("\n");
 
+#if !defined(CONFIG_BOOKE)
+                /* If executing with the IMMU off, adjust pc rather
+                 * than print XXXXXXXX.
+                 */
+                if (!(regs->msr & MSR_IR))
+                        pc = (unsigned long)phys_to_virt(pc);
+#endif
+
                 /* We use __get_user here *only* to avoid an OOPS on a
                  * bad address because the pc *should* only be a
                  * kernel address.
@@ -556,10 +564,15 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
 
 #ifdef CONFIG_PPC64
         if (cpu_has_feature(CPU_FTR_SLB)) {
-                unsigned long sp_vsid = get_kernel_vsid(sp);
+                unsigned long sp_vsid;
                 unsigned long llp = mmu_psize_defs[mmu_linear_psize].sllp;
 
-                sp_vsid <<= SLB_VSID_SHIFT;
+                if (cpu_has_feature(CPU_FTR_1T_SEGMENT))
+                        sp_vsid = get_kernel_vsid(sp, MMU_SEGSIZE_1T)
+                                << SLB_VSID_SHIFT_1T;
+                else
+                        sp_vsid = get_kernel_vsid(sp, MMU_SEGSIZE_256M)
+                                << SLB_VSID_SHIFT;
                 sp_vsid |= SLB_VSID_KERNEL | llp;
                 p->thread.ksp_vsid = sp_vsid;
         }
@@ -676,9 +689,13 @@ int set_fpexc_mode(struct task_struct *tsk, unsigned int val)
          * mode (asyn, precise, disabled) for 'Classic' FP. */
         if (val & PR_FP_EXC_SW_ENABLE) {
 #ifdef CONFIG_SPE
-                tsk->thread.fpexc_mode = val &
-                        (PR_FP_EXC_SW_ENABLE | PR_FP_ALL_EXCEPT);
-                return 0;
+                if (cpu_has_feature(CPU_FTR_SPE)) {
+                        tsk->thread.fpexc_mode = val &
+                                (PR_FP_EXC_SW_ENABLE | PR_FP_ALL_EXCEPT);
+                        return 0;
+                } else {
+                        return -EINVAL;
+                }
 #else
                 return -EINVAL;
 #endif
@@ -704,7 +721,10 @@ int get_fpexc_mode(struct task_struct *tsk, unsigned long adr)
 
         if (tsk->thread.fpexc_mode & PR_FP_EXC_SW_ENABLE)
 #ifdef CONFIG_SPE
-                val = tsk->thread.fpexc_mode;
+                if (cpu_has_feature(CPU_FTR_SPE))
+                        val = tsk->thread.fpexc_mode;
+                else
+                        return -EINVAL;
 #else
                 return -EINVAL;
 #endif
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index a38197b12d3e..9f329a8928ea 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -52,7 +52,6 @@
 #include <asm/pSeries_reconfig.h>
 #include <asm/pci-bridge.h>
 #include <asm/kexec.h>
-#include <asm/system.h>
 
 #ifdef DEBUG
 #define DBG(fmt...) printk(KERN_ERR fmt)
@@ -431,9 +430,11 @@ static int __init early_parse_mem(char *p)
 }
 early_param("mem", early_parse_mem);
 
-/*
- * The device tree may be allocated below our memory limit, or inside the
- * crash kernel region for kdump. If so, move it out now.
+/**
+ * move_device_tree - move tree to an unused area, if needed.
+ *
+ * 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)
 {
@@ -530,10 +531,7 @@ static struct ibm_pa_feature {
         {CPU_FTR_CTRL, 0,               0, 3, 0},
         {CPU_FTR_NOEXECUTE, 0,          0, 6, 0},
         {CPU_FTR_NODSISRALIGN, 0,       1, 1, 1},
-#if 0
-        /* put this back once we know how to test if firmware does 64k IO */
         {CPU_FTR_CI_LARGE_PAGE, 0,      1, 2, 0},
-#endif
         {CPU_FTR_REAL_LE, PPC_FEATURE_TRUE_LE, 5, 0, 0},
 };
 
@@ -780,13 +778,13 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
 #endif
 
 #ifdef CONFIG_KEXEC
-       lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-base", NULL);
-       if (lprop)
-               crashk_res.start = *lprop;
+        lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-base", NULL);
+        if (lprop)
+                crashk_res.start = *lprop;
 
-       lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-size", NULL);
-       if (lprop)
-               crashk_res.end = crashk_res.start + *lprop - 1;
+        lprop = (u64*)of_get_flat_dt_prop(node, "linux,crashkernel-size", NULL);
+        if (lprop)
+                crashk_res.end = crashk_res.start + *lprop - 1;
 #endif
 
         early_init_dt_check_for_initrd(node);
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index a1d582e38627..1db10f70ae69 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -1199,7 +1199,7 @@ static void __init prom_initialize_tce_table(void)
                 if ((type[0] == 0) || (strstr(type, RELOC("pci")) == NULL))
                         continue;
 
-                /* Keep the old logic in tack to avoid regression. */
+                /* Keep the old logic intact to avoid regression. */
                 if (compatible[0] != 0) {
                         if ((strstr(compatible, RELOC("python")) == NULL) &&
                             (strstr(compatible, RELOC("Speedwagon")) == NULL) &&
@@ -2046,6 +2046,7 @@ static void __init fixup_device_tree_maple(void)
 /*
  * Pegasos and BriQ lacks the "ranges" property in the isa node
  * Pegasos needs decimal IRQ 14/15, not hexadecimal
+ * Pegasos has the IDE configured in legacy mode, but advertised as native
  */
 static void __init fixup_device_tree_chrp(void)
 {
@@ -2083,9 +2084,13 @@ static void __init fixup_device_tree_chrp(void)
                 prom_printf("Fixing up IDE interrupt on Pegasos...\n");
                 prop[0] = 14;
                 prop[1] = 0x0;
-                prop[2] = 15;
-                prop[3] = 0x0;
-                prom_setprop(ph, name, "interrupts", prop, 4*sizeof(u32));
+                prom_setprop(ph, name, "interrupts", prop, 2*sizeof(u32));
+                prom_printf("Fixing up IDE class-code on Pegasos...\n");
+                rc = prom_getprop(ph, "class-code", prop, sizeof(u32));
+                if (rc == sizeof(u32)) {
+                        prop[0] &= ~0x5;
+                        prom_setprop(ph, name, "class-code", prop, sizeof(u32));
+                }
         }
 }
 #else
@@ -2226,7 +2231,7 @@ static void __init fixup_device_tree(void)
 
 static void __init prom_find_boot_cpu(void)
 {
-        struct prom_t *_prom = &RELOC(prom);
+        struct prom_t *_prom = &RELOC(prom);
         u32 getprop_rval;
         ihandle prom_cpu;
         phandle cpu_pkg;
@@ -2246,7 +2251,7 @@ static void __init prom_find_boot_cpu(void)
 static void __init prom_check_initrd(unsigned long r3, unsigned long r4)
 {
 #ifdef CONFIG_BLK_DEV_INITRD
-        struct prom_t *_prom = &RELOC(prom);
+        struct prom_t *_prom = &RELOC(prom);
 
         if (r3 && r4 && r4 != 0xdeadbeef) {
                 unsigned long val;
@@ -2279,7 +2284,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
                                unsigned long pp,
                                unsigned long r6, unsigned long r7)
 {       
-        struct prom_t *_prom;
+        struct prom_t *_prom;
         unsigned long hdr;
         unsigned long offset = reloc_offset();
 
@@ -2338,8 +2343,8 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
         /*
          * Copy the CPU hold code
          */
-        if (RELOC(of_platform) != PLATFORM_POWERMAC)
-                copy_and_flush(0, KERNELBASE + offset, 0x100, 0);
+        if (RELOC(of_platform) != PLATFORM_POWERMAC)
+                copy_and_flush(0, KERNELBASE + offset, 0x100, 0);
 
         /*
          * Do early parsing of command line
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 8a177bd9eab4..cf7732cdd6c7 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -331,6 +331,7 @@ static long arch_ptrace_old(struct task_struct *child, long request, long addr,
                 unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
                 unsigned long __user *tmp = (unsigned long __user *)addr;
 
+                CHECK_FULL_REGS(child->thread.regs);
                 for (i = 0; i < 32; i++) {
                         ret = put_user(*reg, tmp);
                         if (ret)
@@ -346,6 +347,7 @@ static long arch_ptrace_old(struct task_struct *child, long request, long addr,
                 unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
                 unsigned long __user *tmp = (unsigned long __user *)addr;
 
+                CHECK_FULL_REGS(child->thread.regs);
                 for (i = 0; i < 32; i++) {
                         ret = get_user(*reg, tmp);
                         if (ret)
@@ -517,6 +519,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         ret = -EIO;
                         break;
                 }
+                CHECK_FULL_REGS(child->thread.regs);
                 ret = 0;
                 for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
                         ret |= __put_user(ptrace_get_reg(child, ui),
@@ -537,6 +540,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         ret = -EIO;
                         break;
                 }
+                CHECK_FULL_REGS(child->thread.regs);
                 ret = 0;
                 for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
                         ret = __get_user(tmp, (unsigned long __user *) data);
@@ -576,8 +580,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 #ifdef CONFIG_SPE
         case PTRACE_GETEVRREGS:
                 /* Get the child spe register state. */
-                if (child->thread.regs->msr & MSR_SPE)
-                        giveup_spe(child);
+                flush_spe_to_thread(child);
                 ret = get_evrregs((unsigned long __user *)data, child);
                 break;
 
@@ -585,8 +588,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 /* Set the child spe register state. */
                 /* this is to clear the MSR_SPE bit to force a reload
                  * of register state from memory */
-                if (child->thread.regs->msr & MSR_SPE)
-                        giveup_spe(child);
+                flush_spe_to_thread(child);
                 ret = set_evrregs(child, (unsigned long __user *)data);
                 break;
 #endif
diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c
index 9e6baeac0fb1..fea6206ff90f 100644
--- a/arch/powerpc/kernel/ptrace32.c
+++ b/arch/powerpc/kernel/ptrace32.c
@@ -53,6 +53,7 @@ static long compat_ptrace_old(struct task_struct *child, long request,
                 unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
                 unsigned int __user *tmp = (unsigned int __user *)addr;
 
+                CHECK_FULL_REGS(child->thread.regs);
                 for (i = 0; i < 32; i++) {
                         ret = put_user(*reg, tmp);
                         if (ret)
@@ -68,6 +69,7 @@ static long compat_ptrace_old(struct task_struct *child, long request,
                 unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
                 unsigned int __user *tmp = (unsigned int __user *)addr;
 
+                CHECK_FULL_REGS(child->thread.regs);
                 for (i = 0; i < 32; i++) {
                         ret = get_user(*reg, tmp);
                         if (ret)
@@ -164,6 +166,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                 if ((addr & 3) || (index > PT_FPSCR32))
                         break;
 
+                CHECK_FULL_REGS(child->thread.regs);
                 if (index < PT_FPR0) {
                         tmp = ptrace_get_reg(child, index);
                 } else {
@@ -210,6 +213,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                 if ((addr & 3) || numReg > PT_FPSCR)
                         break;
 
+                CHECK_FULL_REGS(child->thread.regs);
                 if (numReg >= PT_FPR0) {
                         flush_fp_to_thread(child);
                         tmp = ((unsigned long int *)child->thread.fpr)[numReg - PT_FPR0];
@@ -270,6 +274,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                 if ((addr & 3) || (index > PT_FPSCR32))
                         break;
 
+                CHECK_FULL_REGS(child->thread.regs);
                 if (index < PT_FPR0) {
                         ret = ptrace_put_reg(child, index, data);
                 } else {
@@ -307,6 +312,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                  */
                 if ((addr & 3) || (numReg > PT_FPSCR))
                         break;
+                CHECK_FULL_REGS(child->thread.regs);
                 if (numReg < PT_FPR0) {
                         unsigned long freg = ptrace_get_reg(child, numReg);
                         if (index % 2)
@@ -342,6 +348,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                         ret = -EIO;
                         break;
                 }
+                CHECK_FULL_REGS(child->thread.regs);
                 ret = 0;
                 for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
                         ret |= __put_user(ptrace_get_reg(child, ui),
@@ -359,6 +366,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                         ret = -EIO;
                         break;
                 }
+                CHECK_FULL_REGS(child->thread.regs);
                 ret = 0;
                 for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
                         ret = __get_user(tmp, (unsigned int __user *) data);
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index a5de6211b97a..21f14e57d1f3 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -171,8 +171,8 @@ static int rtas_pci_write_config(struct pci_bus *bus,
 }
 
 struct pci_ops rtas_pci_ops = {
-        rtas_pci_read_config,
-        rtas_pci_write_config
+        .read = rtas_pci_read_config,
+        .write = rtas_pci_write_config,
 };
 
 int is_python(struct device_node *dev)
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 50ef38cffdbf..36c90ba2d312 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -76,6 +76,8 @@ EXPORT_SYMBOL(machine_id);
 
 unsigned long klimit = (unsigned long) _end;
 
+char cmd_line[COMMAND_LINE_SIZE];
+
 /*
  * This still seems to be needed... -- paulus
  */ 
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 7ec6ba56d83d..cd870a823d18 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -10,7 +10,9 @@
 #include <linux/reboot.h>
 #include <linux/delay.h>
 #include <linux/initrd.h>
+#if defined(CONFIG_IDE) || defined(CONFIG_IDE_MODULE)
 #include <linux/ide.h>
+#endif
 #include <linux/tty.h>
 #include <linux/bootmem.h>
 #include <linux/seq_file.h>
@@ -18,13 +20,11 @@
 #include <linux/cpu.h>
 #include <linux/console.h>
 
-#include <asm/residual.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/processor.h>
 #include <asm/pgtable.h>
 #include <asm/setup.h>
-#include <asm/amigappc.h>
 #include <asm/smp.h>
 #include <asm/elf.h>
 #include <asm/cputable.h>
@@ -51,7 +51,10 @@
 
 extern void bootx_init(unsigned long r4, unsigned long phys);
 
+#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
 struct ide_machdep_calls ppc_ide_md;
+EXPORT_SYMBOL(ppc_ide_md);
+#endif
 
 int boot_cpuid;
 EXPORT_SYMBOL_GPL(boot_cpuid);
@@ -287,7 +290,8 @@ void __init setup_arch(char **cmdline_p)
         conswitchp = &dummy_con;
 #endif
 
-        ppc_md.setup_arch();
+        if (ppc_md.setup_arch)
+                ppc_md.setup_arch();
         if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab);
 
         paging_init();
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 6018178708a5..008ab6823b02 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -181,9 +181,9 @@ void __init early_setup(unsigned long dt_ptr)
         DBG(" -> early_setup(), dt_ptr: 0x%lx\n", dt_ptr);
 
         /*
-         * Do early initializations using the flattened device
-         * tree, like retreiving the physical memory map or
-         * calculating/retreiving the hash table size
+         * Do early initialization using the flattened device
+         * tree, such as retrieving the physical memory map or
+         * calculating/retrieving the hash table size.
          */
         early_init_devtree(__va(dt_ptr));
 
@@ -530,7 +530,8 @@ void __init setup_arch(char **cmdline_p)
         conswitchp = &dummy_con;
 #endif
 
-        ppc_md.setup_arch();
+        if (ppc_md.setup_arch)
+                ppc_md.setup_arch();
 
         paging_init();
         ppc64_boot_msg(0x15, "Setup Done");
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index c434d6c4e4e6..a65a44fbe523 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -16,6 +16,12 @@
 
 #include "signal.h"
 
+/* Log an error when sending an unhandled signal to a process. Controlled
+ * through debug.exception-trace sysctl.
+ */
+
+int show_unhandled_signals = 0;
+
 /*
  * Allocate space for the signal frame
  */
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 590057e9e987..6126bca8b70a 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -705,11 +705,13 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
 {
         struct rt_sigframe __user *rt_sf;
         struct mcontext __user *frame;
+        void __user *addr;
         unsigned long newsp = 0;
 
         /* Set up Signal Frame */
         /* Put a Real Time Context onto stack */
         rt_sf = get_sigframe(ka, regs, sizeof(*rt_sf));
+        addr = rt_sf;
         if (unlikely(rt_sf == NULL))
                 goto badframe;
 
@@ -728,6 +730,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
 
         /* Save user registers on the stack */
         frame = &rt_sf->uc.uc_mcontext;
+        addr = frame;
         if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
                 if (save_user_regs(regs, frame, 0))
                         goto badframe;
@@ -742,6 +745,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
 
         /* create a stack frame for the caller of the handler */
         newsp = ((unsigned long)rt_sf) - (__SIGNAL_FRAMESIZE + 16);
+        addr = (void __user *)regs->gpr[1];
         if (put_user(regs->gpr[1], (u32 __user *)newsp))
                 goto badframe;
 
@@ -762,6 +766,12 @@ badframe:
         printk("badframe in handle_rt_signal, regs=%p frame=%p newsp=%lx\n",
                regs, frame, newsp);
 #endif
+        if (show_unhandled_signals && printk_ratelimit())
+                printk(KERN_INFO "%s[%d]: bad frame in handle_rt_signal32: "
+                        "%p nip %08lx lr %08lx\n",
+                        current->comm, current->pid,
+                        addr, regs->nip, regs->link);
+
         force_sigsegv(sig, current);
         return 0;
 }
@@ -886,6 +896,12 @@ long sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
         return 0;
 
  bad:
+        if (show_unhandled_signals && printk_ratelimit())
+                printk(KERN_INFO "%s[%d]: bad frame in sys_rt_sigreturn: "
+                        "%p nip %08lx lr %08lx\n",
+                        current->comm, current->pid,
+                        rt_sf, regs->nip, regs->link);
+
         force_sig(SIGSEGV, current);
         return 0;
 }
@@ -967,6 +983,13 @@ int sys_debug_setcontext(struct ucontext __user *ctx,
          * We kill the task with a SIGSEGV in this situation.
          */
         if (do_setcontext(ctx, regs, 1)) {
+                if (show_unhandled_signals && printk_ratelimit())
+                        printk(KERN_INFO "%s[%d]: bad frame in "
+                                "sys_debug_setcontext: %p nip %08lx "
+                                "lr %08lx\n",
+                                current->comm, current->pid,
+                                ctx, regs->nip, regs->link);
+
                 force_sig(SIGSEGV, current);
                 goto out;
         }
@@ -1048,6 +1071,12 @@ badframe:
         printk("badframe in handle_signal, regs=%p frame=%p newsp=%lx\n",
                regs, frame, newsp);
 #endif
+        if (show_unhandled_signals && printk_ratelimit())
+                printk(KERN_INFO "%s[%d]: bad frame in handle_signal32: "
+                        "%p nip %08lx lr %08lx\n",
+                        current->comm, current->pid,
+                        frame, regs->nip, regs->link);
+
         force_sigsegv(sig, current);
         return 0;
 }
@@ -1061,12 +1090,14 @@ long sys_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
         struct sigcontext __user *sc;
         struct sigcontext sigctx;
         struct mcontext __user *sr;
+        void __user *addr;
         sigset_t set;
 
         /* Always make any pending restarted system calls return -EINTR */
         current_thread_info()->restart_block.fn = do_no_restart_syscall;
 
         sc = (struct sigcontext __user *)(regs->gpr[1] + __SIGNAL_FRAMESIZE);
+        addr = sc;
         if (copy_from_user(&sigctx, sc, sizeof(sigctx)))
                 goto badframe;
 
@@ -1083,6 +1114,7 @@ long sys_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
         restore_sigmask(&set);
 
         sr = (struct mcontext __user *)from_user_ptr(sigctx.regs);
+        addr = sr;
         if (!access_ok(VERIFY_READ, sr, sizeof(*sr))
             || restore_user_regs(regs, sr, 1))
                 goto badframe;
@@ -1091,6 +1123,12 @@ long sys_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8,
         return 0;
 
 badframe:
+        if (show_unhandled_signals && printk_ratelimit())
+                printk(KERN_INFO "%s[%d]: bad frame in sys_sigreturn: "
+                        "%p nip %08lx lr %08lx\n",
+                        current->comm, current->pid,
+                        addr, regs->nip, regs->link);
+
         force_sig(SIGSEGV, current);
         return 0;
 }
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index de895e6d8c62..faeb8f207ea4 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -64,6 +64,11 @@ struct rt_sigframe {
         char abigap[288];
 } __attribute__ ((aligned (16)));
 
+static const char fmt32[] = KERN_INFO \
+        "%s[%d]: bad frame in %s: %08lx nip %08lx lr %08lx\n";
+static const char fmt64[] = KERN_INFO \
+        "%s[%d]: bad frame in %s: %016lx nip %016lx lr %016lx\n";
+
 /*
  * Set up the sigcontext for the signal frame.
  */
@@ -315,6 +320,11 @@ badframe:
         printk("badframe in sys_rt_sigreturn, regs=%p uc=%p &uc->uc_mcontext=%p\n",
                regs, uc, &uc->uc_mcontext);
 #endif
+        if (show_unhandled_signals && printk_ratelimit())
+                printk(regs->msr & MSR_SF ? fmt64 : fmt32,
+                        current->comm, current->pid, "rt_sigreturn",
+                        (long)uc, regs->nip, regs->link);
+
         force_sig(SIGSEGV, current);
         return 0;
 }
@@ -398,6 +408,11 @@ badframe:
         printk("badframe in setup_rt_frame, regs=%p frame=%p newsp=%lx\n",
                regs, frame, newsp);
 #endif
+        if (show_unhandled_signals && printk_ratelimit())
+                printk(regs->msr & MSR_SF ? fmt64 : fmt32,
+                        current->comm, current->pid, "setup_rt_frame",
+                        (long)frame, regs->nip, regs->link);
+
         force_sigsegv(signr, current);
         return 0;
 }
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 1ea43160f543..d30f08fa0297 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -152,11 +152,6 @@ static void stop_this_cpu(void *dummy)
                 ;
 }
 
-void smp_send_stop(void)
-{
-        smp_call_function(stop_this_cpu, NULL, 1, 0);
-}
-
 /*
  * Structure and data for smp_call_function(). This is designed to minimise
  * static memory requirements. It also looks cleaner.
@@ -198,9 +193,6 @@ int smp_call_function_map(void (*func) (void *info), void *info, int nonatomic,
         int cpu;
         u64 timeout;
 
-        /* Can deadlock when called with interrupts disabled */
-        WARN_ON(irqs_disabled());
-
         if (unlikely(smp_ops == NULL))
                 return ret;
 
@@ -270,10 +262,19 @@ int smp_call_function_map(void (*func) (void *info), void *info, int nonatomic,
         return ret;
 }
 
+static int __smp_call_function(void (*func)(void *info), void *info,
+                               int nonatomic, int wait)
+{
+        return smp_call_function_map(func,info,nonatomic,wait,cpu_online_map);
+}
+
 int smp_call_function(void (*func) (void *info), void *info, int nonatomic,
                         int wait)
 {
-        return smp_call_function_map(func,info,nonatomic,wait,cpu_online_map);
+        /* Can deadlock when called with interrupts disabled */
+        WARN_ON(irqs_disabled());
+
+        return __smp_call_function(func, info, nonatomic, wait);
 }
 EXPORT_SYMBOL(smp_call_function);
 
@@ -283,6 +284,9 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, int
         cpumask_t map = CPU_MASK_NONE;
         int ret = 0;
 
+        /* Can deadlock when called with interrupts disabled */
+        WARN_ON(irqs_disabled());
+
         if (!cpu_online(cpu))
                 return -EINVAL;
 
@@ -299,6 +303,11 @@ int smp_call_function_single(int cpu, void (*func) (void *info), void *info, int
 }
 EXPORT_SYMBOL(smp_call_function_single);
 
+void smp_send_stop(void)
+{
+        __smp_call_function(stop_this_cpu, NULL, 1, 0);
+}
+
 void smp_call_function_interrupt(void)
 {
         void (*func) (void *info);
@@ -560,6 +569,8 @@ int __devinit start_secondary(void *unused)
         if (system_state > SYSTEM_BOOTING)
                 snapshot_timebase();
 
+        secondary_cpu_time_init();
+
         spin_lock(&call_lock);
         cpu_set(cpu, cpu_online_map);
         spin_unlock(&call_lock);
diff --git a/arch/powerpc/kernel/softemu8xx.c b/arch/powerpc/kernel/softemu8xx.c
new file mode 100644
index 000000000000..67d6f6890edc
--- /dev/null
+++ b/arch/powerpc/kernel/softemu8xx.c
@@ -0,0 +1,202 @@
+/*
+ * Software emulation of some PPC instructions for the 8xx core.
+ *
+ * Copyright (C) 1998 Dan Malek (dmalek@jlc.net)
+ *
+ * Software floating emuation for the MPC8xx processor.  I did this mostly
+ * because it was easier than trying to get the libraries compiled for
+ * software floating point.  The goal is still to get the libraries done,
+ * but I lost patience and needed some hacks to at least get init and
+ * shells running.  The first problem is the setjmp/longjmp that save
+ * and restore the floating point registers.
+ *
+ * For this emulation, our working registers are found on the register
+ * save area.
+ */
+
+#include <linux/errno.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/stddef.h>
+#include <linux/unistd.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/user.h>
+#include <linux/a.out.h>
+#include <linux/interrupt.h>
+
+#include <asm/pgtable.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+#include <asm/io.h>
+
+/* Eventually we may need a look-up table, but this works for now.
+*/
+#define LFS     48
+#define LFD     50
+#define LFDU    51
+#define STFD    54
+#define STFDU   55
+#define FMR     63
+
+void print_8xx_pte(struct mm_struct *mm, unsigned long addr)
+{
+        pgd_t *pgd;
+        pmd_t *pmd;
+        pte_t *pte;
+
+        printk(" pte @ 0x%8lx: ", addr);
+        pgd = pgd_offset(mm, addr & PAGE_MASK);
+        if (pgd) {
+                pmd = pmd_offset(pud_offset(pgd, addr & PAGE_MASK),
+                                 addr & PAGE_MASK);
+                if (pmd && pmd_present(*pmd)) {
+                        pte = pte_offset_kernel(pmd, addr & PAGE_MASK);
+                        if (pte) {
+                                printk(" (0x%08lx)->(0x%08lx)->0x%08lx\n",
+                                        (long)pgd, (long)pte, (long)pte_val(*pte));
+#define pp ((long)pte_val(*pte))
+                                printk(" RPN: %05lx PP: %lx SPS: %lx SH: %lx "
+                                       "CI: %lx v: %lx\n",
+                                       pp>>12,    /* rpn */
+                                       (pp>>10)&3, /* pp */
+                                       (pp>>3)&1, /* small */
+                                       (pp>>2)&1, /* shared */
+                                       (pp>>1)&1, /* cache inhibit */
+                                       pp&1       /* valid */
+                                       );
+#undef pp
+                        }
+                        else {
+                                printk("no pte\n");
+                        }
+                }
+                else {
+                        printk("no pmd\n");
+                }
+        }
+        else {
+                printk("no pgd\n");
+        }
+}
+
+int get_8xx_pte(struct mm_struct *mm, unsigned long addr)
+{
+        pgd_t *pgd;
+        pmd_t *pmd;
+        pte_t *pte;
+        int retval = 0;
+
+        pgd = pgd_offset(mm, addr & PAGE_MASK);
+        if (pgd) {
+                pmd = pmd_offset(pud_offset(pgd, addr & PAGE_MASK),
+                                 addr & PAGE_MASK);
+                if (pmd && pmd_present(*pmd)) {
+                        pte = pte_offset_kernel(pmd, addr & PAGE_MASK);
+                        if (pte) {
+                                retval = (int)pte_val(*pte);
+                        }
+                }
+        }
+        return retval;
+}
+
+/*
+ * We return 0 on success, 1 on unimplemented instruction, and EFAULT
+ * if a load/store faulted.
+ */
+int Soft_emulate_8xx(struct pt_regs *regs)
+{
+        u32 inst, instword;
+        u32 flreg, idxreg, disp;
+        int retval;
+        s16 sdisp;
+        u32 *ea, *ip;
+
+        retval = 0;
+
+        instword = *((u32 *)regs->nip);
+        inst = instword >> 26;
+
+        flreg = (instword >> 21) & 0x1f;
+        idxreg = (instword >> 16) & 0x1f;
+        disp = instword & 0xffff;
+
+        ea = (u32 *)(regs->gpr[idxreg] + disp);
+        ip = (u32 *)&current->thread.fpr[flreg];
+
+        switch ( inst )
+        {
+        case LFD:
+                /* this is a 16 bit quantity that is sign extended
+                 * so use a signed short here -- Cort
+                 */
+                sdisp = (instword & 0xffff);
+                ea = (u32 *)(regs->gpr[idxreg] + sdisp);
+                if (copy_from_user(ip, ea, sizeof(double)))
+                        retval = -EFAULT;
+                break;
+
+        case LFDU:
+                if (copy_from_user(ip, ea, sizeof(double)))
+                        retval = -EFAULT;
+                else
+                        regs->gpr[idxreg] = (u32)ea;
+                break;
+        case LFS:
+                sdisp = (instword & 0xffff);
+                ea = (u32 *)(regs->gpr[idxreg] + sdisp);
+                if (copy_from_user(ip, ea, sizeof(float)))
+                        retval = -EFAULT;
+                break;
+        case STFD:
+                /* this is a 16 bit quantity that is sign extended
+                 * so use a signed short here -- Cort
+                 */
+                sdisp = (instword & 0xffff);
+                ea = (u32 *)(regs->gpr[idxreg] + sdisp);
+                if (copy_to_user(ea, ip, sizeof(double)))
+                        retval = -EFAULT;
+                break;
+
+        case STFDU:
+                if (copy_to_user(ea, ip, sizeof(double)))
+                        retval = -EFAULT;
+                else
+                        regs->gpr[idxreg] = (u32)ea;
+                break;
+        case FMR:
+                /* assume this is a fp move -- Cort */
+                memcpy(ip, &current->thread.fpr[(instword>>11)&0x1f],
+                       sizeof(double));
+                break;
+        default:
+                retval = 1;
+                printk("Bad emulation %s/%d\n"
+                       " NIP: %08lx instruction: %08x opcode: %x "
+                       "A: %x B: %x C: %x code: %x rc: %x\n",
+                       current->comm,current->pid,
+                       regs->nip,
+                       instword,inst,
+                       (instword>>16)&0x1f,
+                       (instword>>11)&0x1f,
+                       (instword>>6)&0x1f,
+                       (instword>>1)&0x3ff,
+                       instword&1);
+                {
+                        int pa;
+                        print_8xx_pte(current->mm,regs->nip);
+                        pa = get_8xx_pte(current->mm,regs->nip) & PAGE_MASK;
+                        pa |= (regs->nip & ~PAGE_MASK);
+                        pa = (unsigned long)__va(pa);
+                        printk("Kernel VA for NIP %x ", pa);
+                        print_8xx_pte(current->mm,pa);
+                }
+        }
+
+        if (retval == 0)
+                regs->nip += 4;
+
+        return retval;
+}
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 55d29ed4b7a0..25d9a96484dd 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -197,6 +197,36 @@ SYSFS_PMCSETUP(pa6t_pmc3, SPRN_PA6T_PMC3);
 SYSFS_PMCSETUP(pa6t_pmc4, SPRN_PA6T_PMC4);
 SYSFS_PMCSETUP(pa6t_pmc5, SPRN_PA6T_PMC5);
 
+#ifdef CONFIG_DEBUG_KERNEL
+SYSFS_PMCSETUP(hid0, SPRN_HID0);
+SYSFS_PMCSETUP(hid1, SPRN_HID1);
+SYSFS_PMCSETUP(hid4, SPRN_HID4);
+SYSFS_PMCSETUP(hid5, SPRN_HID5);
+SYSFS_PMCSETUP(ima0, SPRN_PA6T_IMA0);
+SYSFS_PMCSETUP(ima1, SPRN_PA6T_IMA1);
+SYSFS_PMCSETUP(ima2, SPRN_PA6T_IMA2);
+SYSFS_PMCSETUP(ima3, SPRN_PA6T_IMA3);
+SYSFS_PMCSETUP(ima4, SPRN_PA6T_IMA4);
+SYSFS_PMCSETUP(ima5, SPRN_PA6T_IMA5);
+SYSFS_PMCSETUP(ima6, SPRN_PA6T_IMA6);
+SYSFS_PMCSETUP(ima7, SPRN_PA6T_IMA7);
+SYSFS_PMCSETUP(ima8, SPRN_PA6T_IMA8);
+SYSFS_PMCSETUP(ima9, SPRN_PA6T_IMA9);
+SYSFS_PMCSETUP(imaat, SPRN_PA6T_IMAAT);
+SYSFS_PMCSETUP(btcr, SPRN_PA6T_BTCR);
+SYSFS_PMCSETUP(pccr, SPRN_PA6T_PCCR);
+SYSFS_PMCSETUP(rpccr, SPRN_PA6T_RPCCR);
+SYSFS_PMCSETUP(der, SPRN_PA6T_DER);
+SYSFS_PMCSETUP(mer, SPRN_PA6T_MER);
+SYSFS_PMCSETUP(ber, SPRN_PA6T_BER);
+SYSFS_PMCSETUP(ier, SPRN_PA6T_IER);
+SYSFS_PMCSETUP(sier, SPRN_PA6T_SIER);
+SYSFS_PMCSETUP(siar, SPRN_PA6T_SIAR);
+SYSFS_PMCSETUP(tsr0, SPRN_PA6T_TSR0);
+SYSFS_PMCSETUP(tsr1, SPRN_PA6T_TSR1);
+SYSFS_PMCSETUP(tsr2, SPRN_PA6T_TSR2);
+SYSFS_PMCSETUP(tsr3, SPRN_PA6T_TSR3);
+#endif /* CONFIG_DEBUG_KERNEL */
 
 static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
 static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);
@@ -228,6 +258,36 @@ static struct sysdev_attribute pa6t_attrs[] = {
         _SYSDEV_ATTR(pmc3, 0600, show_pa6t_pmc3, store_pa6t_pmc3),
         _SYSDEV_ATTR(pmc4, 0600, show_pa6t_pmc4, store_pa6t_pmc4),
         _SYSDEV_ATTR(pmc5, 0600, show_pa6t_pmc5, store_pa6t_pmc5),
+#ifdef CONFIG_DEBUG_KERNEL
+        _SYSDEV_ATTR(hid0, 0600, show_hid0, store_hid0),
+        _SYSDEV_ATTR(hid1, 0600, show_hid1, store_hid1),
+        _SYSDEV_ATTR(hid4, 0600, show_hid4, store_hid4),
+        _SYSDEV_ATTR(hid5, 0600, show_hid5, store_hid5),
+        _SYSDEV_ATTR(ima0, 0600, show_ima0, store_ima0),
+        _SYSDEV_ATTR(ima1, 0600, show_ima1, store_ima1),
+        _SYSDEV_ATTR(ima2, 0600, show_ima2, store_ima2),
+        _SYSDEV_ATTR(ima3, 0600, show_ima3, store_ima3),
+        _SYSDEV_ATTR(ima4, 0600, show_ima4, store_ima4),
+        _SYSDEV_ATTR(ima5, 0600, show_ima5, store_ima5),
+        _SYSDEV_ATTR(ima6, 0600, show_ima6, store_ima6),
+        _SYSDEV_ATTR(ima7, 0600, show_ima7, store_ima7),
+        _SYSDEV_ATTR(ima8, 0600, show_ima8, store_ima8),
+        _SYSDEV_ATTR(ima9, 0600, show_ima9, store_ima9),
+        _SYSDEV_ATTR(imaat, 0600, show_imaat, store_imaat),
+        _SYSDEV_ATTR(btcr, 0600, show_btcr, store_btcr),
+        _SYSDEV_ATTR(pccr, 0600, show_pccr, store_pccr),
+        _SYSDEV_ATTR(rpccr, 0600, show_rpccr, store_rpccr),
+        _SYSDEV_ATTR(der, 0600, show_der, store_der),
+        _SYSDEV_ATTR(mer, 0600, show_mer, store_mer),
+        _SYSDEV_ATTR(ber, 0600, show_ber, store_ber),
+        _SYSDEV_ATTR(ier, 0600, show_ier, store_ier),
+        _SYSDEV_ATTR(sier, 0600, show_sier, store_sier),
+        _SYSDEV_ATTR(siar, 0600, show_siar, store_siar),
+        _SYSDEV_ATTR(tsr0, 0600, show_tsr0, store_tsr0),
+        _SYSDEV_ATTR(tsr1, 0600, show_tsr1, store_tsr1),
+        _SYSDEV_ATTR(tsr2, 0600, show_tsr2, store_tsr2),
+        _SYSDEV_ATTR(tsr3, 0600, show_tsr3, store_tsr3),
+#endif /* CONFIG_DEBUG_KERNEL */
 };
 
 
@@ -380,12 +440,14 @@ int cpu_add_sysdev_attr_group(struct attribute_group *attrs)
 {
         int cpu;
         struct sys_device *sysdev;
+        int ret;
 
         mutex_lock(&cpu_mutex);
 
         for_each_possible_cpu(cpu) {
                 sysdev = get_cpu_sysdev(cpu);
-                sysfs_create_group(&sysdev->kobj, attrs);
+                ret = sysfs_create_group(&sysdev->kobj, attrs);
+                WARN_ON(ret != 0);
         }
 
         mutex_unlock(&cpu_mutex);
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S
index 579de70e0b4d..93219c34af32 100644
--- a/arch/powerpc/kernel/systbl.S
+++ b/arch/powerpc/kernel/systbl.S
@@ -39,6 +39,8 @@
 #ifdef CONFIG_PPC64
 #define sys_sigpending  sys_ni_syscall
 #define sys_old_getrlimit sys_ni_syscall
+
+        .p2align        3
 #endif
 
 _GLOBAL(sys_call_table)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index c627cf86d1e3..9368da371f36 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -65,24 +65,68 @@
 #include <asm/div64.h>
 #include <asm/smp.h>
 #include <asm/vdso_datapage.h>
-#ifdef CONFIG_PPC64
 #include <asm/firmware.h>
-#endif
 #ifdef CONFIG_PPC_ISERIES
 #include <asm/iseries/it_lp_queue.h>
 #include <asm/iseries/hv_call_xm.h>
 #endif
-#include <asm/smp.h>
 
-/* keep track of when we need to update the rtc */
-time_t last_rtc_update;
+/* powerpc clocksource/clockevent code */
+
+#include <linux/clockchips.h>
+#include <linux/clocksource.h>
+
+static cycle_t rtc_read(void);
+static struct clocksource clocksource_rtc = {
+        .name         = "rtc",
+        .rating       = 400,
+        .flags        = CLOCK_SOURCE_IS_CONTINUOUS,
+        .mask         = CLOCKSOURCE_MASK(64),
+        .shift        = 22,
+        .mult         = 0,      /* To be filled in */
+        .read         = rtc_read,
+};
+
+static cycle_t timebase_read(void);
+static struct clocksource clocksource_timebase = {
+        .name         = "timebase",
+        .rating       = 400,
+        .flags        = CLOCK_SOURCE_IS_CONTINUOUS,
+        .mask         = CLOCKSOURCE_MASK(64),
+        .shift        = 22,
+        .mult         = 0,      /* To be filled in */
+        .read         = timebase_read,
+};
+
+#define DECREMENTER_MAX 0x7fffffff
+
+static int decrementer_set_next_event(unsigned long evt,
+                                      struct clock_event_device *dev);
+static void decrementer_set_mode(enum clock_event_mode mode,
+                                 struct clock_event_device *dev);
+
+static struct clock_event_device decrementer_clockevent = {
+       .name           = "decrementer",
+       .rating         = 200,
+       .shift          = 16,
+       .mult           = 0,     /* To be filled in */
+       .irq            = 0,
+       .set_next_event = decrementer_set_next_event,
+       .set_mode       = decrementer_set_mode,
+       .features       = CLOCK_EVT_FEAT_ONESHOT,
+};
+
+static DEFINE_PER_CPU(struct clock_event_device, decrementers);
+void init_decrementer_clockevent(void);
+static DEFINE_PER_CPU(u64, decrementer_next_tb);
+
 #ifdef CONFIG_PPC_ISERIES
 static unsigned long __initdata iSeries_recal_titan;
 static signed long __initdata iSeries_recal_tb;
-#endif
 
-/* The decrementer counts down by 128 every 128ns on a 601. */
-#define DECREMENTER_COUNT_601   (1000000000 / HZ)
+/* Forward declaration is only needed for iSereis compiles */
+void __init clocksource_init(void);
+#endif
 
 #define XSEC_PER_SEC (1024*1024)
 
@@ -349,98 +393,6 @@ void udelay(unsigned long usecs)
 }
 EXPORT_SYMBOL(udelay);
 
-static __inline__ void timer_check_rtc(void)
-{
-        /*
-         * update the rtc when needed, this should be performed on the
-         * right fraction of a second. Half or full second ?
-         * Full second works on mk48t59 clocks, others need testing.
-         * Note that this update is basically only used through 
-         * the adjtimex system calls. Setting the HW clock in
-         * any other way is a /dev/rtc and userland business.
-         * This is still wrong by -0.5/+1.5 jiffies because of the
-         * timer interrupt resolution and possible delay, but here we 
-         * hit a quantization limit which can only be solved by higher
-         * resolution timers and decoupling time management from timer
-         * interrupts. This is also wrong on the clocks
-         * which require being written at the half second boundary.
-         * We should have an rtc call that only sets the minutes and
-         * seconds like on Intel to avoid problems with non UTC clocks.
-         */
-        if (ppc_md.set_rtc_time && ntp_synced() &&
-            xtime.tv_sec - last_rtc_update >= 659 &&
-            abs((xtime.tv_nsec/1000) - (1000000-1000000/HZ)) < 500000/HZ) {
-                struct rtc_time tm;
-                to_tm(xtime.tv_sec + 1 + timezone_offset, &tm);
-                tm.tm_year -= 1900;
-                tm.tm_mon -= 1;
-                if (ppc_md.set_rtc_time(&tm) == 0)
-                        last_rtc_update = xtime.tv_sec + 1;
-                else
-                        /* Try again one minute later */
-                        last_rtc_update += 60;
-        }
-}
-
-/*
- * This version of gettimeofday has microsecond resolution.
- */
-static inline void __do_gettimeofday(struct timeval *tv)
-{
-        unsigned long sec, usec;
-        u64 tb_ticks, xsec;
-        struct gettimeofday_vars *temp_varp;
-        u64 temp_tb_to_xs, temp_stamp_xsec;
-
-        /*
-         * These calculations are faster (gets rid of divides)
-         * if done in units of 1/2^20 rather than microseconds.
-         * The conversion to microseconds at the end is done
-         * without a divide (and in fact, without a multiply)
-         */
-        temp_varp = do_gtod.varp;
-
-        /* Sampling the time base must be done after loading
-         * do_gtod.varp in order to avoid racing with update_gtod.
-         */
-        data_barrier(temp_varp);
-        tb_ticks = get_tb() - temp_varp->tb_orig_stamp;
-        temp_tb_to_xs = temp_varp->tb_to_xs;
-        temp_stamp_xsec = temp_varp->stamp_xsec;
-        xsec = temp_stamp_xsec + mulhdu(tb_ticks, temp_tb_to_xs);
-        sec = xsec / XSEC_PER_SEC;
-        usec = (unsigned long)xsec & (XSEC_PER_SEC - 1);
-        usec = SCALE_XSEC(usec, 1000000);
-
-        tv->tv_sec = sec;
-        tv->tv_usec = usec;
-}
-
-void do_gettimeofday(struct timeval *tv)
-{
-        if (__USE_RTC()) {
-                /* do this the old way */
-                unsigned long flags, seq;
-                unsigned int sec, nsec, usec;
-
-                do {
-                        seq = read_seqbegin_irqsave(&xtime_lock, flags);
-                        sec = xtime.tv_sec;
-                        nsec = xtime.tv_nsec + tb_ticks_since(tb_last_jiffy);
-                } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
-                usec = nsec / 1000;
-                while (usec >= 1000000) {
-                        usec -= 1000000;
-                        ++sec;
-                }
-                tv->tv_sec = sec;
-                tv->tv_usec = usec;
-                return;
-        }
-        __do_gettimeofday(tv);
-}
-
-EXPORT_SYMBOL(do_gettimeofday);
 
 /*
  * There are two copies of tb_to_xs and stamp_xsec so that no
@@ -486,56 +438,6 @@ static inline void update_gtod(u64 new_tb_stamp, u64 new_stamp_xsec,
         ++(vdso_data->tb_update_count);
 }
 
-/*
- * When the timebase - tb_orig_stamp gets too big, we do a manipulation
- * between tb_orig_stamp and stamp_xsec. The goal here is to keep the
- * difference tb - tb_orig_stamp small enough to always fit inside a
- * 32 bits number. This is a requirement of our fast 32 bits userland
- * implementation in the vdso. If we "miss" a call to this function
- * (interrupt latency, CPU locked in a spinlock, ...) and we end up
- * with a too big difference, then the vdso will fallback to calling
- * the syscall
- */
-static __inline__ void timer_recalc_offset(u64 cur_tb)
-{
-        unsigned long offset;
-        u64 new_stamp_xsec;
-        u64 tlen, t2x;
-        u64 tb, xsec_old, xsec_new;
-        struct gettimeofday_vars *varp;
-
-        if (__USE_RTC())
-                return;
-        tlen = current_tick_length();
-        offset = cur_tb - do_gtod.varp->tb_orig_stamp;
-        if (tlen == last_tick_len && offset < 0x80000000u)
-                return;
-        if (tlen != last_tick_len) {
-                t2x = mulhdu(tlen << TICKLEN_SHIFT, ticklen_to_xs);
-                last_tick_len = tlen;
-        } else
-                t2x = do_gtod.varp->tb_to_xs;
-        new_stamp_xsec = (u64) xtime.tv_nsec * XSEC_PER_SEC;
-        do_div(new_stamp_xsec, 1000000000);
-        new_stamp_xsec += (u64) xtime.tv_sec * XSEC_PER_SEC;
-
-        ++vdso_data->tb_update_count;
-        smp_mb();
-
-        /*
-         * Make sure time doesn't go backwards for userspace gettimeofday.
-         */
-        tb = get_tb();
-        varp = do_gtod.varp;
-        xsec_old = mulhdu(tb - varp->tb_orig_stamp, varp->tb_to_xs)
-                + varp->stamp_xsec;
-        xsec_new = mulhdu(tb - cur_tb, t2x) + new_stamp_xsec;
-        if (xsec_new < xsec_old)
-                new_stamp_xsec += xsec_old - xsec_new;
-
-        update_gtod(cur_tb, new_stamp_xsec, t2x);
-}
-
 #ifdef CONFIG_SMP
 unsigned long profile_pc(struct pt_regs *regs)
 {
@@ -607,6 +509,8 @@ static int __init iSeries_tb_recal(void)
         iSeries_recal_titan = titan;
         iSeries_recal_tb = tb;
 
+        /* Called here as now we know accurate values for the timebase */
+        clocksource_init();
         return 0;
 }
 late_initcall(iSeries_tb_recal);
@@ -636,20 +540,30 @@ void __init iSeries_time_init_early(void)
 void timer_interrupt(struct pt_regs * regs)
 {
         struct pt_regs *old_regs;
-        int next_dec;
         int cpu = smp_processor_id();
-        unsigned long ticks;
-        u64 tb_next_jiffy;
+        struct clock_event_device *evt = &per_cpu(decrementers, cpu);
+        u64 now;
+
+        /* Ensure a positive value is written to the decrementer, or else
+         * some CPUs will continuue to take decrementer exceptions */
+        set_dec(DECREMENTER_MAX);
 
 #ifdef CONFIG_PPC32
         if (atomic_read(&ppc_n_lost_interrupts) != 0)
                 do_IRQ(regs);
 #endif
 
+        now = get_tb_or_rtc();
+        if (now < per_cpu(decrementer_next_tb, cpu)) {
+                /* not time for this event yet */
+                now = per_cpu(decrementer_next_tb, cpu) - now;
+                if (now <= DECREMENTER_MAX)
+                        set_dec((unsigned int)now - 1);
+                return;
+        }
         old_regs = set_irq_regs(regs);
         irq_enter();
 
-        profile_tick(CPU_PROFILING);
         calculate_steal_time();
 
 #ifdef CONFIG_PPC_ISERIES
@@ -657,46 +571,20 @@ void timer_interrupt(struct pt_regs * regs)
                 get_lppaca()->int_dword.fields.decr_int = 0;
 #endif
 
-        while ((ticks = tb_ticks_since(per_cpu(last_jiffy, cpu)))
-               >= tb_ticks_per_jiffy) {
-                /* Update last_jiffy */
-                per_cpu(last_jiffy, cpu) += tb_ticks_per_jiffy;
-                /* Handle RTCL overflow on 601 */
-                if (__USE_RTC() && per_cpu(last_jiffy, cpu) >= 1000000000)
-                        per_cpu(last_jiffy, cpu) -= 1000000000;
-
-                /*
-                 * We cannot disable the decrementer, so in the period
-                 * between this cpu's being marked offline in cpu_online_map
-                 * and calling stop-self, it is taking timer interrupts.
-                 * Avoid calling into the scheduler rebalancing code if this
-                 * is the case.
-                 */
-                if (!cpu_is_offline(cpu))
-                        account_process_time(regs);
-
-                /*
-                 * No need to check whether cpu is offline here; boot_cpuid
-                 * should have been fixed up by now.
-                 */
-                if (cpu != boot_cpuid)
-                        continue;
+        /*
+         * We cannot disable the decrementer, so in the period
+         * between this cpu's being marked offline in cpu_online_map
+         * and calling stop-self, it is taking timer interrupts.
+         * Avoid calling into the scheduler rebalancing code if this
+         * is the case.
+         */
+        if (!cpu_is_offline(cpu))
+                account_process_time(regs);
 
-                write_seqlock(&xtime_lock);
-                tb_next_jiffy = tb_last_jiffy + tb_ticks_per_jiffy;
-                if (__USE_RTC() && tb_next_jiffy >= 1000000000)
-                        tb_next_jiffy -= 1000000000;
-                if (per_cpu(last_jiffy, cpu) >= tb_next_jiffy) {
-                        tb_last_jiffy = tb_next_jiffy;
-                        do_timer(1);
-                        timer_recalc_offset(tb_last_jiffy);
-                        timer_check_rtc();
-                }
-                write_sequnlock(&xtime_lock);
-        }
-        
-        next_dec = tb_ticks_per_jiffy - ticks;
-        set_dec(next_dec);
+        if (evt->event_handler)
+                evt->event_handler(evt);
+        else
+                evt->set_next_event(DECREMENTER_MAX, evt);
 
 #ifdef CONFIG_PPC_ISERIES
         if (firmware_has_feature(FW_FEATURE_ISERIES) && hvlpevent_is_pending())
@@ -762,71 +650,6 @@ unsigned long long sched_clock(void)
         return mulhdu(get_tb() - boot_tb, tb_to_ns_scale) << tb_to_ns_shift;
 }
 
-int do_settimeofday(struct timespec *tv)
-{
-        time_t wtm_sec, new_sec = tv->tv_sec;
-        long wtm_nsec, new_nsec = tv->tv_nsec;
-        unsigned long flags;
-        u64 new_xsec;
-        unsigned long tb_delta;
-
-        if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
-                return -EINVAL;
-
-        write_seqlock_irqsave(&xtime_lock, flags);
-
-        /*
-         * Updating the RTC is not the job of this code. If the time is
-         * stepped under NTP, the RTC will be updated after STA_UNSYNC
-         * is cleared.  Tools like clock/hwclock either copy the RTC
-         * to the system time, in which case there is no point in writing
-         * to the RTC again, or write to the RTC but then they don't call
-         * settimeofday to perform this operation.
-         */
-
-        /* Make userspace gettimeofday spin until we're done. */
-        ++vdso_data->tb_update_count;
-        smp_mb();
-
-        /*
-         * Subtract off the number of nanoseconds since the
-         * beginning of the last tick.
-         */
-        tb_delta = tb_ticks_since(tb_last_jiffy);
-        tb_delta = mulhdu(tb_delta, do_gtod.varp->tb_to_xs); /* in xsec */
-        new_nsec -= SCALE_XSEC(tb_delta, 1000000000);
-
-        wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - new_sec);
-        wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - new_nsec);
-
-        set_normalized_timespec(&xtime, new_sec, new_nsec);
-        set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
-
-        /* In case of a large backwards jump in time with NTP, we want the 
-         * clock to be updated as soon as the PLL is again in lock.
-         */
-        last_rtc_update = new_sec - 658;
-
-        ntp_clear();
-
-        new_xsec = xtime.tv_nsec;
-        if (new_xsec != 0) {
-                new_xsec *= XSEC_PER_SEC;
-                do_div(new_xsec, NSEC_PER_SEC);
-        }
-        new_xsec += (u64)xtime.tv_sec * XSEC_PER_SEC;
-        update_gtod(tb_last_jiffy, new_xsec, do_gtod.varp->tb_to_xs);
-
-        vdso_data->tz_minuteswest = sys_tz.tz_minuteswest;
-        vdso_data->tz_dsttime = sys_tz.tz_dsttime;
-
-        write_sequnlock_irqrestore(&xtime_lock, flags);
-        clock_was_set();
-        return 0;
-}
-
-EXPORT_SYMBOL(do_settimeofday);
-
 static int __init get_freq(char *name, int cells, unsigned long *val)
 {
         struct device_node *cpu;
@@ -869,7 +692,7 @@ void __init generic_calibrate_decr(void)
                                 "(not found)\n");
         }
 
-#ifdef CONFIG_BOOKE
+#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
         /* Set the time base to zero */
         mtspr(SPRN_TBWL, 0);
         mtspr(SPRN_TBWU, 0);
@@ -882,12 +705,35 @@ void __init generic_calibrate_decr(void)
 #endif
 }
 
-unsigned long get_boot_time(void)
+int update_persistent_clock(struct timespec now)
 {
         struct rtc_time tm;
 
-        if (ppc_md.get_boot_time)
-                return ppc_md.get_boot_time();
+        if (!ppc_md.set_rtc_time)
+                return 0;
+
+        to_tm(now.tv_sec + 1 + timezone_offset, &tm);
+        tm.tm_year -= 1900;
+        tm.tm_mon -= 1;
+
+        return ppc_md.set_rtc_time(&tm);
+}
+
+unsigned long read_persistent_clock(void)
+{
+        struct rtc_time tm;
+        static int first = 1;
+
+        /* XXX this is a litle fragile but will work okay in the short term */
+        if (first) {
+                first = 0;
+                if (ppc_md.time_init)
+                        timezone_offset = ppc_md.time_init();
+
+                /* get_boot_time() isn't guaranteed to be safe to call late */
+                if (ppc_md.get_boot_time)
+                        return ppc_md.get_boot_time() -timezone_offset;
+        }
         if (!ppc_md.get_rtc_time)
                 return 0;
         ppc_md.get_rtc_time(&tm);
@@ -895,18 +741,128 @@ unsigned long get_boot_time(void)
                       tm.tm_hour, tm.tm_min, tm.tm_sec);
 }
 
+/* clocksource code */
+static cycle_t rtc_read(void)
+{
+        return (cycle_t)get_rtc();
+}
+
+static cycle_t timebase_read(void)
+{
+        return (cycle_t)get_tb();
+}
+
+void update_vsyscall(struct timespec *wall_time, struct clocksource *clock)
+{
+        u64 t2x, stamp_xsec;
+
+        if (clock != &clocksource_timebase)
+                return;
+
+        /* Make userspace gettimeofday spin until we're done. */
+        ++vdso_data->tb_update_count;
+        smp_mb();
+
+        /* XXX this assumes clock->shift == 22 */
+        /* 4611686018 ~= 2^(20+64-22) / 1e9 */
+        t2x = (u64) clock->mult * 4611686018ULL;
+        stamp_xsec = (u64) xtime.tv_nsec * XSEC_PER_SEC;
+        do_div(stamp_xsec, 1000000000);
+        stamp_xsec += (u64) xtime.tv_sec * XSEC_PER_SEC;
+        update_gtod(clock->cycle_last, stamp_xsec, t2x);
+}
+
+void update_vsyscall_tz(void)
+{
+        /* Make userspace gettimeofday spin until we're done. */
+        ++vdso_data->tb_update_count;
+        smp_mb();
+        vdso_data->tz_minuteswest = sys_tz.tz_minuteswest;
+        vdso_data->tz_dsttime = sys_tz.tz_dsttime;
+        smp_mb();
+        ++vdso_data->tb_update_count;
+}
+
+void __init clocksource_init(void)
+{
+        struct clocksource *clock;
+
+        if (__USE_RTC())
+                clock = &clocksource_rtc;
+        else
+                clock = &clocksource_timebase;
+
+        clock->mult = clocksource_hz2mult(tb_ticks_per_sec, clock->shift);
+
+        if (clocksource_register(clock)) {
+                printk(KERN_ERR "clocksource: %s is already registered\n",
+                       clock->name);
+                return;
+        }
+
+        printk(KERN_INFO "clocksource: %s mult[%x] shift[%d] registered\n",
+               clock->name, clock->mult, clock->shift);
+}
+
+static int decrementer_set_next_event(unsigned long evt,
+                                      struct clock_event_device *dev)
+{
+        __get_cpu_var(decrementer_next_tb) = get_tb_or_rtc() + evt;
+        /* The decrementer interrupts on the 0 -> -1 transition */
+        if (evt)
+                --evt;
+        set_dec(evt);
+        return 0;
+}
+
+static void decrementer_set_mode(enum clock_event_mode mode,
+                                 struct clock_event_device *dev)
+{
+        if (mode != CLOCK_EVT_MODE_ONESHOT)
+                decrementer_set_next_event(DECREMENTER_MAX, dev);
+}
+
+static void register_decrementer_clockevent(int cpu)
+{
+        struct clock_event_device *dec = &per_cpu(decrementers, cpu);
+
+        *dec = decrementer_clockevent;
+        dec->cpumask = cpumask_of_cpu(cpu);
+
+        printk(KERN_ERR "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n",
+               dec->name, dec->mult, dec->shift, cpu);
+
+        clockevents_register_device(dec);
+}
+
+void init_decrementer_clockevent(void)
+{
+        int cpu = smp_processor_id();
+
+        decrementer_clockevent.mult = div_sc(ppc_tb_freq, NSEC_PER_SEC,
+                                             decrementer_clockevent.shift);
+        decrementer_clockevent.max_delta_ns =
+                clockevent_delta2ns(DECREMENTER_MAX, &decrementer_clockevent);
+        decrementer_clockevent.min_delta_ns = 1000;
+
+        register_decrementer_clockevent(cpu);
+}
+
+void secondary_cpu_time_init(void)
+{
+        /* FIME: Should make unrelatred change to move snapshot_timebase
+         * call here ! */
+        register_decrementer_clockevent(smp_processor_id());
+}
+
 /* This function is only called on the boot processor */
 void __init time_init(void)
 {
         unsigned long flags;
-        unsigned long tm = 0;
         struct div_result res;
         u64 scale, x;
         unsigned shift;
 
-        if (ppc_md.time_init != NULL)
-                timezone_offset = ppc_md.time_init();
-
         if (__USE_RTC()) {
                 /* 601 processor: dec counts down by 128 every 128ns */
                 ppc_tb_freq = 1000000000;
@@ -981,19 +937,14 @@ void __init time_init(void)
         /* Save the current timebase to pretty up CONFIG_PRINTK_TIME */
         boot_tb = get_tb_or_rtc();
 
-        tm = get_boot_time();
-
         write_seqlock_irqsave(&xtime_lock, flags);
 
         /* If platform provided a timezone (pmac), we correct the time */
         if (timezone_offset) {
                 sys_tz.tz_minuteswest = -timezone_offset / 60;
                 sys_tz.tz_dsttime = 0;
-                tm -= timezone_offset;
         }
 
-        xtime.tv_sec = tm;
-        xtime.tv_nsec = 0;
         do_gtod.varp = &do_gtod.vars[0];
         do_gtod.var_idx = 0;
         do_gtod.varp->tb_orig_stamp = tb_last_jiffy;
@@ -1011,13 +962,13 @@ void __init time_init(void)
 
         time_freq = 0;
 
-        last_rtc_update = xtime.tv_sec;
-        set_normalized_timespec(&wall_to_monotonic,
-                                -xtime.tv_sec, -xtime.tv_nsec);
         write_sequnlock_irqrestore(&xtime_lock, flags);
 
-        /* Not exact, but the timer interrupt takes care of this */
-        set_dec(tb_ticks_per_jiffy);
+        /* Register the clocksource, if we're not running on iSeries */
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                clocksource_init();
+
+        init_decrementer_clockevent();
 }
 
 
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index d8502e377518..bf9e39c6e296 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -172,11 +172,21 @@ int die(const char *str, struct pt_regs *regs, long err)
 void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
 {
         siginfo_t info;
+        const char fmt32[] = KERN_INFO "%s[%d]: unhandled signal %d " \
+                        "at %08lx nip %08lx lr %08lx code %x\n";
+        const char fmt64[] = KERN_INFO "%s[%d]: unhandled signal %d " \
+                        "at %016lx nip %016lx lr %016lx code %x\n";
 
         if (!user_mode(regs)) {
                 if (die("Exception in kernel mode", regs, signr))
                         return;
-        }
+        } else if (show_unhandled_signals &&
+                    unhandled_signal(current, signr) &&
+                    printk_ratelimit()) {
+                        printk(regs->msr & MSR_SF ? fmt64 : fmt32,
+                                current->comm, current->pid, signr,
+                                addr, regs->nip, regs->link, code);
+                }
 
         memset(&info, 0, sizeof(info));
         info.si_signo = signr;
@@ -324,47 +334,10 @@ static inline int check_io_access(struct pt_regs *regs)
 #define clear_single_step(regs) ((regs)->msr &= ~MSR_SE)
 #endif
 
-/*
- * This is "fall-back" implementation for configurations
- * which don't provide platform-specific machine check info
- */
-void __attribute__ ((weak))
-platform_machine_check(struct pt_regs *regs)
-{
-}
-
-void machine_check_exception(struct pt_regs *regs)
+static int generic_machine_check_exception(struct pt_regs *regs)
 {
-        int recover = 0;
         unsigned long reason = get_mc_reason(regs);
 
-        /* See if any machine dependent calls */
-        if (ppc_md.machine_check_exception)
-                recover = ppc_md.machine_check_exception(regs);
-
-        if (recover)
-                return;
-
-        if (user_mode(regs)) {
-                regs->msr |= MSR_RI;
-                _exception(SIGBUS, regs, BUS_ADRERR, regs->nip);
-                return;
-        }
-
-#if defined(CONFIG_8xx) && defined(CONFIG_PCI)
-        /* the qspan pci read routines can cause machine checks -- Cort */
-        bad_page_fault(regs, regs->dar, SIGBUS);
-        return;
-#endif
-
-        if (debugger_fault_handler(regs)) {
-                regs->msr |= MSR_RI;
-                return;
-        }
-
-        if (check_io_access(regs))
-                return;
-
 #if defined(CONFIG_4xx) && !defined(CONFIG_440A)
         if (reason & ESR_IMCP) {
                 printk("Instruction");
@@ -480,11 +453,41 @@ void machine_check_exception(struct pt_regs *regs)
         }
 #endif /* CONFIG_4xx */
 
-        /*
-         * Optional platform-provided routine to print out
-         * additional info, e.g. bus error registers.
-         */
-        platform_machine_check(regs);
+        return 0;
+}
+
+void machine_check_exception(struct pt_regs *regs)
+{
+        int recover = 0;
+
+        /* See if any machine dependent calls */
+        if (ppc_md.machine_check_exception)
+                recover = ppc_md.machine_check_exception(regs);
+        else
+                recover = generic_machine_check_exception(regs);
+
+        if (recover)
+                return;
+
+        if (user_mode(regs)) {
+                regs->msr |= MSR_RI;
+                _exception(SIGBUS, regs, BUS_ADRERR, regs->nip);
+                return;
+        }
+
+#if defined(CONFIG_8xx) && defined(CONFIG_PCI)
+        /* the qspan pci read routines can cause machine checks -- Cort */
+        bad_page_fault(regs, regs->dar, SIGBUS);
+        return;
+#endif
+
+        if (debugger_fault_handler(regs)) {
+                regs->msr |= MSR_RI;
+                return;
+        }
+
+        if (check_io_access(regs))
+                return;
 
         if (debugger_fault_handler(regs))
                 return;
@@ -913,7 +916,9 @@ void SoftwareEmulation(struct pt_regs *regs)
 {
         extern int do_mathemu(struct pt_regs *);
         extern int Soft_emulate_8xx(struct pt_regs *);
+#if defined(CONFIG_MATH_EMULATION) || defined(CONFIG_8XX_MINIMAL_FPEMU)
         int errcode;
+#endif
 
         CHECK_FULL_REGS(regs);
 
@@ -943,7 +948,7 @@ void SoftwareEmulation(struct pt_regs *regs)
                 return;
         }
 
-#else
+#elif defined(CONFIG_8XX_MINIMAL_FPEMU)
         errcode = Soft_emulate_8xx(regs);
         switch (errcode) {
         case 0:
@@ -956,6 +961,8 @@ void SoftwareEmulation(struct pt_regs *regs)
                 _exception(SIGSEGV, regs, SEGV_MAPERR, regs->nip);
                 return;
         }
+#else
+        _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
 #endif
 }
 #endif /* CONFIG_8xx */
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index 0f9b4eadfbcb..d723070c9a33 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -54,6 +54,8 @@ void __init udbg_early_init(void)
 #elif defined(CONFIG_PPC_EARLY_DEBUG_44x)
         /* PPC44x debug */
         udbg_init_44x_as1();
+#elif defined(CONFIG_PPC_EARLY_DEBUG_CPM)
+        udbg_init_cpm();
 #endif
 }
 
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c
index 7afab5bcd61a..833a3d0bcfa7 100644
--- a/arch/powerpc/kernel/udbg_16550.c
+++ b/arch/powerpc/kernel/udbg_16550.c
@@ -206,11 +206,22 @@ static void udbg_44x_as1_putc(char c)
         }
 }
 
+static int udbg_44x_as1_getc(void)
+{
+        if (udbg_comport) {
+                while ((as1_readb(&udbg_comport->lsr) & LSR_DR) == 0)
+                        ; /* wait for char */
+                return as1_readb(&udbg_comport->rbr);
+        }
+        return -1;
+}
+
 void __init udbg_init_44x_as1(void)
 {
         udbg_comport =
                 (volatile struct NS16550 __iomem *)PPC44x_EARLY_DEBUG_VIRTADDR;
 
         udbg_putc = udbg_44x_as1_putc;
+        udbg_getc = udbg_44x_as1_getc;
 }
 #endif /* CONFIG_PPC_EARLY_DEBUG_44x */
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index 213fa31ac537..2322ba5cce4c 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -766,7 +766,9 @@ static int __init vdso_init(void)
 
         return 0;
 }
+#ifdef CONFIG_PPC_MERGE
 arch_initcall(vdso_init);
+#endif
 
 int in_gate_area_no_task(unsigned long addr)
 {
diff --git a/arch/powerpc/kernel/vdso32/.gitignore b/arch/powerpc/kernel/vdso32/.gitignore
index e45fba9d0ced..fea5809857a5 100644
--- a/arch/powerpc/kernel/vdso32/.gitignore
+++ b/arch/powerpc/kernel/vdso32/.gitignore
@@ -1 +1,2 @@
 vdso32.lds
+vdso32.so.dbg
diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile
index 3726358faae8..c3d57bd01a88 100644
--- a/arch/powerpc/kernel/vdso32/Makefile
+++ b/arch/powerpc/kernel/vdso32/Makefile
@@ -9,11 +9,11 @@ ifeq ($(CONFIG_PPC32),y)
 CROSS32CC := $(CC)
 endif
 
-targets := $(obj-vdso32) vdso32.so
+targets := $(obj-vdso32) vdso32.so vdso32.so.dbg
 obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32))
 
 
-EXTRA_CFLAGS := -shared -s -fno-common -fno-builtin
+EXTRA_CFLAGS := -shared -fno-common -fno-builtin
 EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso32.so.1 \
                 $(call ld-option, -Wl$(comma)--hash-style=sysv)
 EXTRA_AFLAGS := -D__VDSO32__ -s
@@ -26,9 +26,14 @@ CPPFLAGS_vdso32.lds += -P -C -Upowerpc
 $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so
 
 # link rule for the .so file, .lds has to be first
-$(obj)/vdso32.so: $(src)/vdso32.lds $(obj-vdso32)
+$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32)
         $(call if_changed,vdso32ld)
 
+# strip rule for the .so file
+$(obj)/%.so: OBJCOPYFLAGS := -S
+$(obj)/%.so: $(obj)/%.so.dbg FORCE
+        $(call if_changed,objcopy)
+
 # assembly rules for the .S files
 $(obj-vdso32): %.o: %.S
         $(call if_changed_dep,vdso32as)
@@ -39,3 +44,12 @@ quiet_cmd_vdso32ld = VDSO32L $@
 quiet_cmd_vdso32as = VDSO32A $@
       cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $<
 
+# install commands for the unstripped file
+quiet_cmd_vdso_install = INSTALL $@
+      cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@
+
+vdso32.so: $(obj)/vdso32.so.dbg
+        @mkdir -p $(MODLIB)/vdso
+        $(call cmd,vdso_install)
+
+vdso_install: vdso32.so
diff --git a/arch/powerpc/kernel/vdso64/.gitignore b/arch/powerpc/kernel/vdso64/.gitignore
index 3fd18cf9fec2..77a0b423642c 100644
--- a/arch/powerpc/kernel/vdso64/.gitignore
+++ b/arch/powerpc/kernel/vdso64/.gitignore
@@ -1 +1,2 @@
 vdso64.lds
+vdso64.so.dbg
diff --git a/arch/powerpc/kernel/vdso64/Makefile b/arch/powerpc/kernel/vdso64/Makefile
index 43af9b2a6f3b..fa7f1b8f3e50 100644
--- a/arch/powerpc/kernel/vdso64/Makefile
+++ b/arch/powerpc/kernel/vdso64/Makefile
@@ -4,10 +4,10 @@ obj-vdso64 = sigtramp.o gettimeofday.o datapage.o cacheflush.o note.o
 
 # Build rules
 
-targets := $(obj-vdso64) vdso64.so
+targets := $(obj-vdso64) vdso64.so vdso64.so.dbg
 obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64))
 
-EXTRA_CFLAGS := -shared -s -fno-common -fno-builtin
+EXTRA_CFLAGS := -shared -fno-common -fno-builtin
 EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso64.so.1 \
                 $(call ld-option, -Wl$(comma)--hash-style=sysv)
 EXTRA_AFLAGS := -D__VDSO64__ -s
@@ -20,9 +20,14 @@ CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
 $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so
 
 # link rule for the .so file, .lds has to be first
-$(obj)/vdso64.so: $(src)/vdso64.lds $(obj-vdso64)
+$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64)
         $(call if_changed,vdso64ld)
 
+# strip rule for the .so file
+$(obj)/%.so: OBJCOPYFLAGS := -S
+$(obj)/%.so: $(obj)/%.so.dbg FORCE
+        $(call if_changed,objcopy)
+
 # assembly rules for the .S files
 $(obj-vdso64): %.o: %.S
         $(call if_changed_dep,vdso64as)
@@ -33,4 +38,12 @@ quiet_cmd_vdso64ld = VDSO64L $@
 quiet_cmd_vdso64as = VDSO64A $@
       cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<
 
+# install commands for the unstripped file
+quiet_cmd_vdso_install = INSTALL $@
+      cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@
+
+vdso64.so: $(obj)/vdso64.so.dbg
+        @mkdir -p $(MODLIB)/vdso
+        $(call cmd,vdso_install)
 
+vdso_install: vdso64.so
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 62c1bc12ea39..cb22a3557c4e 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -39,6 +39,8 @@
 
 extern struct kset devices_subsys; /* needed for vio_find_name() */
 
+static struct bus_type vio_bus_type;
+
 static struct vio_dev vio_bus_device  = { /* fake "parent" device */
         .name = vio_bus_device.dev.bus_id,
         .type = "",
@@ -46,60 +48,33 @@ static struct vio_dev vio_bus_device  = { /* fake "parent" device */
         .dev.bus = &vio_bus_type,
 };
 
-#ifdef CONFIG_PPC_ISERIES
-struct device *iSeries_vio_dev = &vio_bus_device.dev;
-EXPORT_SYMBOL(iSeries_vio_dev);
+static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
+{
+        const unsigned char *dma_window;
+        struct iommu_table *tbl;
+        unsigned long offset, size;
 
-static struct iommu_table veth_iommu_table;
-static struct iommu_table vio_iommu_table;
+        if (firmware_has_feature(FW_FEATURE_ISERIES))
+                return vio_build_iommu_table_iseries(dev);
 
-static void __init iommu_vio_init(void)
-{
-        iommu_table_getparms_iSeries(255, 0, 0xff, &veth_iommu_table);
-        veth_iommu_table.it_size /= 2;
-        vio_iommu_table = veth_iommu_table;
-        vio_iommu_table.it_offset += veth_iommu_table.it_size;
-
-        if (!iommu_init_table(&veth_iommu_table, -1))
-                printk("Virtual Bus VETH TCE table failed.\n");
-        if (!iommu_init_table(&vio_iommu_table, -1))
-                printk("Virtual Bus VIO TCE table failed.\n");
-}
-#endif
+        dma_window = of_get_property(dev->dev.archdata.of_node,
+                                  "ibm,my-dma-window", NULL);
+        if (!dma_window)
+                return NULL;
 
-static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
-{
-#ifdef CONFIG_PPC_ISERIES
-        if (firmware_has_feature(FW_FEATURE_ISERIES)) {
-                if (strcmp(dev->type, "network") == 0)
-                        return &veth_iommu_table;
-                return &vio_iommu_table;
-        } else
-#endif
-        {
-                const unsigned char *dma_window;
-                struct iommu_table *tbl;
-                unsigned long offset, size;
-
-                dma_window = of_get_property(dev->dev.archdata.of_node,
-                                          "ibm,my-dma-window", NULL);
-                if (!dma_window)
-                        return NULL;
-
-                tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);
-
-                of_parse_dma_window(dev->dev.archdata.of_node, dma_window,
-                                    &tbl->it_index, &offset, &size);
-
-                /* TCE table size - measured in tce entries */
-                tbl->it_size = size >> IOMMU_PAGE_SHIFT;
-                /* offset for VIO should always be 0 */
-                tbl->it_offset = offset >> IOMMU_PAGE_SHIFT;
-                tbl->it_busno = 0;
-                tbl->it_type = TCE_VB;
-
-                return iommu_init_table(tbl, -1);
-        }
+        tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);
+
+        of_parse_dma_window(dev->dev.archdata.of_node, dma_window,
+                            &tbl->it_index, &offset, &size);
+
+        /* TCE table size - measured in tce entries */
+        tbl->it_size = size >> IOMMU_PAGE_SHIFT;
+        /* offset for VIO should always be 0 */
+        tbl->it_offset = offset >> IOMMU_PAGE_SHIFT;
+        tbl->it_busno = 0;
+        tbl->it_type = TCE_VB;
+
+        return iommu_init_table(tbl, -1);
 }
 
 /**
@@ -160,16 +135,6 @@ static int vio_bus_remove(struct device *dev)
         return 1;
 }
 
-/* convert from struct device to struct vio_dev and pass to driver. */
-static void vio_bus_shutdown(struct device *dev)
-{
-        struct vio_dev *viodev = to_vio_dev(dev);
-        struct vio_driver *viodrv = to_vio_driver(dev->driver);
-
-        if (dev->driver && viodrv->shutdown)
-                viodrv->shutdown(viodev);
-}
-
 /**
  * vio_register_driver: - Register a new vio driver
  * @drv:        The vio_driver structure to be registered.
@@ -282,15 +247,6 @@ static int __init vio_bus_init(void)
         int err;
         struct device_node *node_vroot;
 
-#ifdef CONFIG_PPC_ISERIES
-        if (firmware_has_feature(FW_FEATURE_ISERIES)) {
-                iommu_vio_init();
-                vio_bus_device.dev.archdata.dma_ops = &dma_iommu_ops;
-                vio_bus_device.dev.archdata.dma_data = &vio_iommu_table;
-                iSeries_vio_dev = &vio_bus_device.dev;
-        }
-#endif /* CONFIG_PPC_ISERIES */
-
         err = bus_register(&vio_bus_type);
         if (err) {
                 printk(KERN_ERR "failed to register VIO bus\n");
@@ -317,11 +273,8 @@ static int __init vio_bus_init(void)
                  * the device tree. Drivers will associate with them later.
                  */
                 for (of_node = node_vroot->child; of_node != NULL;
-                                of_node = of_node->sibling) {
-                        printk(KERN_DEBUG "%s: processing %p\n",
-                                        __FUNCTION__, of_node);
+                                of_node = of_node->sibling)
                         vio_register_device_node(of_node);
-                }
                 of_node_put(node_vroot);
         }
 
@@ -391,14 +344,13 @@ static int vio_hotplug(struct device *dev, char **envp, int num_envp,
         return 0;
 }
 
-struct bus_type vio_bus_type = {
+static struct bus_type vio_bus_type = {
         .name = "vio",
         .dev_attrs = vio_dev_attrs,
         .uevent = vio_hotplug,
         .match = vio_bus_match,
         .probe = vio_bus_probe,
         .remove = vio_bus_remove,
-        .shutdown = vio_bus_shutdown,
 };
 
 /**
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 0c458556399f..823a8cbd60b5 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -34,6 +34,8 @@ SECTIONS
 
         /* Text and gots */
         .text : {
+                ALIGN_FUNCTION();
+                *(.text.head)
                 _text = .;
                 TEXT_TEXT
                 SCHED_TEXT
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 0a486d4b2547..65d492e316a6 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -7,11 +7,12 @@ EXTRA_CFLAGS		+= -mno-minimal-toc
 endif
 
 ifeq ($(CONFIG_PPC_MERGE),y)
-obj-y                   := string.o
-obj-$(CONFIG_PPC32)     += div64.o copy_32.o checksum_32.o
+obj-y                   := string.o alloc.o \
+                           checksum_$(CONFIG_WORD_SIZE).o
+obj-$(CONFIG_PPC32)     += div64.o copy_32.o
 endif
 
-obj-$(CONFIG_PPC64)     += checksum_64.o copypage_64.o copyuser_64.o \
+obj-$(CONFIG_PPC64)     += copypage_64.o copyuser_64.o \
                            memcpy_64.o usercopy_64.o mem_64.o string.o
 obj-$(CONFIG_QUICC_ENGINE) += rheap.o
 obj-$(CONFIG_XMON)      += sstep.o
diff --git a/arch/powerpc/lib/alloc.c b/arch/powerpc/lib/alloc.c
new file mode 100644
index 000000000000..f53e09c7dac7
--- /dev/null
+++ b/arch/powerpc/lib/alloc.c
@@ -0,0 +1,29 @@
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/bootmem.h>
+#include <linux/string.h>
+
+#include <asm/system.h>
+
+void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask)
+{
+        if (mem_init_done)
+                return kmalloc(size, mask);
+        else
+                return alloc_bootmem(size);
+}
+
+void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask)
+{
+        void *p;
+
+        if (mem_init_done)
+                p = kzalloc(size, mask);
+        else {
+                p = alloc_bootmem(size);
+                if (p)
+                        memset(p, 0, size);
+        }
+        return p;
+}
diff --git a/arch/powerpc/mm/4xx_mmu.c b/arch/powerpc/mm/40x_mmu.c
index 7ff2609b64d1..e067df836be2 100644
--- a/arch/powerpc/mm/4xx_mmu.c
+++ b/arch/powerpc/mm/40x_mmu.c
@@ -108,7 +108,7 @@ unsigned long __init mmu_mapin_ram(void)
                 pmd_t *pmdp;
                 unsigned long val = p | _PMD_SIZE_16M | _PAGE_HWEXEC | _PAGE_HWWRITE;
 
-                pmdp = pmd_offset(pgd_offset_k(v), v);
+                pmdp = pmd_offset(pud_offset(pgd_offset_k(v), v), v);
                 pmd_val(*pmdp++) = val;
                 pmd_val(*pmdp++) = val;
                 pmd_val(*pmdp++) = val;
@@ -123,7 +123,7 @@ unsigned long __init mmu_mapin_ram(void)
                 pmd_t *pmdp;
                 unsigned long val = p | _PMD_SIZE_4M | _PAGE_HWEXEC | _PAGE_HWWRITE;
 
-                pmdp = pmd_offset(pgd_offset_k(v), v);
+                pmdp = pmd_offset(pud_offset(pgd_offset_k(v), v), v);
                 pmd_val(*pmdp) = val;
 
                 v += LARGE_PAGE_SIZE_4M;
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile
index 7e4d27ad3dee..20629ae95c50 100644
--- a/arch/powerpc/mm/Makefile
+++ b/arch/powerpc/mm/Makefile
@@ -6,14 +6,17 @@ ifeq ($(CONFIG_PPC64),y)
 EXTRA_CFLAGS    += -mno-minimal-toc
 endif
 
-obj-y                           := fault.o mem.o lmb.o
-obj-$(CONFIG_PPC32)             += init_32.o pgtable_32.o mmu_context_32.o
+obj-y                           := fault.o mem.o lmb.o \
+                                   init_$(CONFIG_WORD_SIZE).o \
+                                   pgtable_$(CONFIG_WORD_SIZE).o \
+                                   mmu_context_$(CONFIG_WORD_SIZE).o
 hash-$(CONFIG_PPC_NATIVE)       := hash_native_64.o
-obj-$(CONFIG_PPC64)             += init_64.o pgtable_64.o mmu_context_64.o \
-                                   hash_utils_64.o hash_low_64.o tlb_64.o \
+obj-$(CONFIG_PPC64)             += hash_utils_64.o \
                                    slb_low.o slb.o stab.o mmap.o $(hash-y)
-obj-$(CONFIG_PPC_STD_MMU_32)    += ppc_mmu_32.o hash_low_32.o tlb_32.o
-obj-$(CONFIG_40x)               += 4xx_mmu.o
+obj-$(CONFIG_PPC_STD_MMU_32)    += ppc_mmu_32.o
+obj-$(CONFIG_PPC_STD_MMU)       += hash_low_$(CONFIG_WORD_SIZE).o \
+                                   tlb_$(CONFIG_WORD_SIZE).o
+obj-$(CONFIG_40x)               += 40x_mmu.o
 obj-$(CONFIG_44x)               += 44x_mmu.o
 obj-$(CONFIG_FSL_BOOKE)         += fsl_booke_mmu.o
 obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c
index afab247d472f..17139daeaff4 100644
--- a/arch/powerpc/mm/fsl_booke_mmu.c
+++ b/arch/powerpc/mm/fsl_booke_mmu.c
@@ -59,6 +59,7 @@ unsigned int num_tlbcam_entries;
 static unsigned long __cam0, __cam1, __cam2;
 extern unsigned long total_lowmem;
 extern unsigned long __max_low_memory;
+extern unsigned long __initial_memory_limit;
 #define MAX_LOW_MEM     CONFIG_LOWMEM_SIZE
 
 #define NUM_TLBCAMS     (16)
@@ -232,4 +233,5 @@ adjust_total_lowmem(void)
                         __cam0 >> 20, __cam1 >> 20, __cam2 >> 20,
                         (total_lowmem - __cam0 - __cam1 - __cam2) >> 20);
         __max_low_memory = max_low_mem = __cam0 + __cam1 + __cam2;
+        __initial_memory_limit = __max_low_memory;
 }
diff --git a/arch/powerpc/mm/hash_low_64.S b/arch/powerpc/mm/hash_low_64.S
index 35eabfb50723..ad253b959030 100644
--- a/arch/powerpc/mm/hash_low_64.S
+++ b/arch/powerpc/mm/hash_low_64.S
@@ -54,7 +54,7 @@
 
 /*
  * _hash_page_4K(unsigned long ea, unsigned long access, unsigned long vsid,
- *               pte_t *ptep, unsigned long trap, int local)
+ *               pte_t *ptep, unsigned long trap, int local, int ssize)
  *
  * Adds a 4K page to the hash table in a segment of 4K pages only
  */
@@ -66,6 +66,7 @@ _GLOBAL(__hash_page_4K)
         /* Save all params that we need after a function call */
         std     r6,STK_PARM(r6)(r1)
         std     r8,STK_PARM(r8)(r1)
+        std     r9,STK_PARM(r9)(r1)
         
         /* Add _PAGE_PRESENT to access */
         ori     r4,r4,_PAGE_PRESENT
@@ -117,6 +118,10 @@ _GLOBAL(__hash_page_4K)
          * r4 (access) is re-useable, we use it for the new HPTE flags
          */
 
+BEGIN_FTR_SECTION
+        cmpdi   r9,0                    /* check segment size */
+        bne     3f
+END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
         /* Calc va and put it in r29 */
         rldicr  r29,r5,28,63-28
         rldicl  r3,r3,0,36
@@ -126,9 +131,20 @@ _GLOBAL(__hash_page_4K)
         rldicl  r5,r5,0,25              /* vsid & 0x0000007fffffffff */
         rldicl  r0,r3,64-12,48          /* (ea >> 12) & 0xffff */
         xor     r28,r5,r0
+        b       4f
+
+3:      /* Calc VA and hash in r29 and r28 for 1T segment */
+        sldi    r29,r5,40               /* vsid << 40 */
+        clrldi  r3,r3,24                /* ea & 0xffffffffff */
+        rldic   r28,r5,25,25            /* (vsid << 25) & 0x7fffffffff */
+        clrldi  r5,r5,40                /* vsid & 0xffffff */
+        rldicl  r0,r3,64-12,36          /* (ea >> 12) & 0xfffffff */
+        xor     r28,r28,r5
+        or      r29,r3,r29              /* VA */
+        xor     r28,r28,r0              /* hash */
 
         /* Convert linux PTE bits into HW equivalents */
-        andi.   r3,r30,0x1fe            /* Get basic set of flags */
+4:      andi.   r3,r30,0x1fe            /* Get basic set of flags */
         xori    r3,r3,HPTE_R_N          /* _PAGE_EXEC -> NOEXEC */
         rlwinm  r0,r30,32-9+1,30,30     /* _PAGE_RW -> _PAGE_USER (r0) */
         rlwinm  r4,r30,32-7+1,30,30     /* _PAGE_DIRTY -> _PAGE_USER (r4) */
@@ -183,6 +199,7 @@ htab_insert_pte:
         mr      r4,r29                  /* Retreive va */
         li      r7,0                    /* !bolted, !secondary */
         li      r8,MMU_PAGE_4K          /* page size */
+        ld      r9,STK_PARM(r9)(r1)     /* segment size */
 _GLOBAL(htab_call_hpte_insert1)
         bl      .                       /* Patched by htab_finish_init() */
         cmpdi   0,r3,0
@@ -205,6 +222,7 @@ _GLOBAL(htab_call_hpte_insert1)
         mr      r4,r29                  /* Retreive va */
         li      r7,HPTE_V_SECONDARY     /* !bolted, secondary */
         li      r8,MMU_PAGE_4K          /* page size */
+        ld      r9,STK_PARM(r9)(r1)     /* segment size */
 _GLOBAL(htab_call_hpte_insert2)
         bl      .                       /* Patched by htab_finish_init() */
         cmpdi   0,r3,0
@@ -273,7 +291,8 @@ htab_modify_pte:
         /* Call ppc_md.hpte_updatepp */
         mr      r5,r29                  /* va */
         li      r6,MMU_PAGE_4K          /* page size */
-        ld      r7,STK_PARM(r8)(r1)     /* get "local" param */
+        ld      r7,STK_PARM(r9)(r1)     /* segment size */
+        ld      r8,STK_PARM(r8)(r1)     /* get "local" param */
 _GLOBAL(htab_call_hpte_updatepp)
         bl      .                       /* Patched by htab_finish_init() */
 
@@ -325,6 +344,7 @@ _GLOBAL(__hash_page_4K)
         /* Save all params that we need after a function call */
         std     r6,STK_PARM(r6)(r1)
         std     r8,STK_PARM(r8)(r1)
+        std     r9,STK_PARM(r9)(r1)
 
         /* Add _PAGE_PRESENT to access */
         ori     r4,r4,_PAGE_PRESENT
@@ -383,18 +403,33 @@ _GLOBAL(__hash_page_4K)
         /* Load the hidx index */
         rldicl  r25,r3,64-12,60
 
+BEGIN_FTR_SECTION
+        cmpdi   r9,0                    /* check segment size */
+        bne     3f
+END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
         /* Calc va and put it in r29 */
         rldicr  r29,r5,28,63-28         /* r29 = (vsid << 28) */
         rldicl  r3,r3,0,36              /* r3 = (ea & 0x0fffffff) */
-        or      r29,r3,r29              /* r29 = va
+        or      r29,r3,r29              /* r29 = va */
 
         /* Calculate hash value for primary slot and store it in r28 */
         rldicl  r5,r5,0,25              /* vsid & 0x0000007fffffffff */
         rldicl  r0,r3,64-12,48          /* (ea >> 12) & 0xffff */
         xor     r28,r5,r0
+        b       4f
+
+3:      /* Calc VA and hash in r29 and r28 for 1T segment */
+        sldi    r29,r5,40               /* vsid << 40 */
+        clrldi  r3,r3,24                /* ea & 0xffffffffff */
+        rldic   r28,r5,25,25            /* (vsid << 25) & 0x7fffffffff */
+        clrldi  r5,r5,40                /* vsid & 0xffffff */
+        rldicl  r0,r3,64-12,36          /* (ea >> 12) & 0xfffffff */
+        xor     r28,r28,r5
+        or      r29,r3,r29              /* VA */
+        xor     r28,r28,r0              /* hash */
 
         /* Convert linux PTE bits into HW equivalents */
-        andi.   r3,r30,0x1fe            /* Get basic set of flags */
+4:      andi.   r3,r30,0x1fe            /* Get basic set of flags */
         xori    r3,r3,HPTE_R_N          /* _PAGE_EXEC -> NOEXEC */
         rlwinm  r0,r30,32-9+1,30,30     /* _PAGE_RW -> _PAGE_USER (r0) */
         rlwinm  r4,r30,32-7+1,30,30     /* _PAGE_DIRTY -> _PAGE_USER (r4) */
@@ -462,6 +497,7 @@ htab_special_pfn:
         mr      r4,r29                  /* Retreive va */
         li      r7,0                    /* !bolted, !secondary */
         li      r8,MMU_PAGE_4K          /* page size */
+        ld      r9,STK_PARM(r9)(r1)     /* segment size */
 _GLOBAL(htab_call_hpte_insert1)
         bl      .                       /* patched by htab_finish_init() */
         cmpdi   0,r3,0
@@ -488,6 +524,7 @@ _GLOBAL(htab_call_hpte_insert1)
         mr      r4,r29                  /* Retreive va */
         li      r7,HPTE_V_SECONDARY     /* !bolted, secondary */
         li      r8,MMU_PAGE_4K          /* page size */
+        ld      r9,STK_PARM(r9)(r1)     /* segment size */
 _GLOBAL(htab_call_hpte_insert2)
         bl      .                       /* patched by htab_finish_init() */
         cmpdi   0,r3,0
@@ -586,7 +623,8 @@ htab_modify_pte:
         /* Call ppc_md.hpte_updatepp */
         mr      r5,r29                  /* va */
         li      r6,MMU_PAGE_4K          /* page size */
-        ld      r7,STK_PARM(r8)(r1)     /* get "local" param */
+        ld      r7,STK_PARM(r9)(r1)     /* segment size */
+        ld      r8,STK_PARM(r8)(r1)     /* get "local" param */
 _GLOBAL(htab_call_hpte_updatepp)
         bl      .                       /* patched by htab_finish_init() */
 
@@ -634,6 +672,7 @@ _GLOBAL(__hash_page_64K)
         /* Save all params that we need after a function call */
         std     r6,STK_PARM(r6)(r1)
         std     r8,STK_PARM(r8)(r1)
+        std     r9,STK_PARM(r9)(r1)
 
         /* Add _PAGE_PRESENT to access */
         ori     r4,r4,_PAGE_PRESENT
@@ -690,6 +729,10 @@ END_FTR_SECTION_IFCLR(CPU_FTR_CI_LARGE_PAGE)
          * r4 (access) is re-useable, we use it for the new HPTE flags
          */
 
+BEGIN_FTR_SECTION
+        cmpdi   r9,0                    /* check segment size */
+        bne     3f
+END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
         /* Calc va and put it in r29 */
         rldicr  r29,r5,28,63-28
         rldicl  r3,r3,0,36
@@ -699,9 +742,20 @@ END_FTR_SECTION_IFCLR(CPU_FTR_CI_LARGE_PAGE)
         rldicl  r5,r5,0,25              /* vsid & 0x0000007fffffffff */
         rldicl  r0,r3,64-16,52          /* (ea >> 16) & 0xfff */
         xor     r28,r5,r0
+        b       4f
+
+3:      /* Calc VA and hash in r29 and r28 for 1T segment */
+        sldi    r29,r5,40               /* vsid << 40 */
+        clrldi  r3,r3,24                /* ea & 0xffffffffff */
+        rldic   r28,r5,25,25            /* (vsid << 25) & 0x7fffffffff */
+        clrldi  r5,r5,40                /* vsid & 0xffffff */
+        rldicl  r0,r3,64-16,40          /* (ea >> 16) & 0xffffff */
+        xor     r28,r28,r5
+        or      r29,r3,r29              /* VA */
+        xor     r28,r28,r0              /* hash */
 
         /* Convert linux PTE bits into HW equivalents */
-        andi.   r3,r30,0x1fe            /* Get basic set of flags */
+4:      andi.   r3,r30,0x1fe            /* Get basic set of flags */
         xori    r3,r3,HPTE_R_N          /* _PAGE_EXEC -> NOEXEC */
         rlwinm  r0,r30,32-9+1,30,30     /* _PAGE_RW -> _PAGE_USER (r0) */
         rlwinm  r4,r30,32-7+1,30,30     /* _PAGE_DIRTY -> _PAGE_USER (r4) */
@@ -756,6 +810,7 @@ ht64_insert_pte:
         mr      r4,r29                  /* Retreive va */
         li      r7,0                    /* !bolted, !secondary */
         li      r8,MMU_PAGE_64K
+        ld      r9,STK_PARM(r9)(r1)     /* segment size */
 _GLOBAL(ht64_call_hpte_insert1)
         bl      .                       /* patched by htab_finish_init() */
         cmpdi   0,r3,0
@@ -778,6 +833,7 @@ _GLOBAL(ht64_call_hpte_insert1)
         mr      r4,r29                  /* Retreive va */
         li      r7,HPTE_V_SECONDARY     /* !bolted, secondary */
         li      r8,MMU_PAGE_64K
+        ld      r9,STK_PARM(r9)(r1)     /* segment size */
 _GLOBAL(ht64_call_hpte_insert2)
         bl      .                       /* patched by htab_finish_init() */
         cmpdi   0,r3,0
@@ -846,7 +902,8 @@ ht64_modify_pte:
         /* Call ppc_md.hpte_updatepp */
         mr      r5,r29                  /* va */
         li      r6,MMU_PAGE_64K
-        ld      r7,STK_PARM(r8)(r1)     /* get "local" param */
+        ld      r7,STK_PARM(r9)(r1)     /* segment size */
+        ld      r8,STK_PARM(r8)(r1)     /* get "local" param */
 _GLOBAL(ht64_call_hpte_updatepp)
         bl      .                       /* patched by htab_finish_init() */
 
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index 6ba9b47e55af..34e5c0b219b9 100644
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -38,7 +38,7 @@
 
 static DEFINE_SPINLOCK(native_tlbie_lock);
 
-static inline void __tlbie(unsigned long va, unsigned int psize)
+static inline void __tlbie(unsigned long va, int psize, int ssize)
 {
         unsigned int penc;
 
@@ -48,18 +48,20 @@ static inline void __tlbie(unsigned long va, unsigned int psize)
         switch (psize) {
         case MMU_PAGE_4K:
                 va &= ~0xffful;
+                va |= ssize << 8;
                 asm volatile("tlbie %0,0" : : "r" (va) : "memory");
                 break;
         default:
                 penc = mmu_psize_defs[psize].penc;
                 va &= ~((1ul << mmu_psize_defs[psize].shift) - 1);
                 va |= penc << 12;
+                va |= ssize << 8;
                 asm volatile("tlbie %0,1" : : "r" (va) : "memory");
                 break;
         }
 }
 
-static inline void __tlbiel(unsigned long va, unsigned int psize)
+static inline void __tlbiel(unsigned long va, int psize, int ssize)
 {
         unsigned int penc;
 
@@ -69,6 +71,7 @@ static inline void __tlbiel(unsigned long va, unsigned int psize)
         switch (psize) {
         case MMU_PAGE_4K:
                 va &= ~0xffful;
+                va |= ssize << 8;
                 asm volatile(".long 0x7c000224 | (%0 << 11) | (0 << 21)"
                              : : "r"(va) : "memory");
                 break;
@@ -76,6 +79,7 @@ static inline void __tlbiel(unsigned long va, unsigned int psize)
                 penc = mmu_psize_defs[psize].penc;
                 va &= ~((1ul << mmu_psize_defs[psize].shift) - 1);
                 va |= penc << 12;
+                va |= ssize << 8;
                 asm volatile(".long 0x7c000224 | (%0 << 11) | (1 << 21)"
                              : : "r"(va) : "memory");
                 break;
@@ -83,7 +87,7 @@ static inline void __tlbiel(unsigned long va, unsigned int psize)
 
 }
 
-static inline void tlbie(unsigned long va, int psize, int local)
+static inline void tlbie(unsigned long va, int psize, int ssize, int local)
 {
         unsigned int use_local = local && cpu_has_feature(CPU_FTR_TLBIEL);
         int lock_tlbie = !cpu_has_feature(CPU_FTR_LOCKLESS_TLBIE);
@@ -94,10 +98,10 @@ static inline void tlbie(unsigned long va, int psize, int local)
                 spin_lock(&native_tlbie_lock);
         asm volatile("ptesync": : :"memory");
         if (use_local) {
-                __tlbiel(va, psize);
+                __tlbiel(va, psize, ssize);
                 asm volatile("ptesync": : :"memory");
         } else {
-                __tlbie(va, psize);
+                __tlbie(va, psize, ssize);
                 asm volatile("eieio; tlbsync; ptesync": : :"memory");
         }
         if (lock_tlbie && !use_local)
@@ -126,7 +130,7 @@ static inline void native_unlock_hpte(struct hash_pte *hptep)
 
 static long native_hpte_insert(unsigned long hpte_group, unsigned long va,
                         unsigned long pa, unsigned long rflags,
-                        unsigned long vflags, int psize)
+                        unsigned long vflags, int psize, int ssize)
 {
         struct hash_pte *hptep = htab_address + hpte_group;
         unsigned long hpte_v, hpte_r;
@@ -153,7 +157,7 @@ static long native_hpte_insert(unsigned long hpte_group, unsigned long va,
         if (i == HPTES_PER_GROUP)
                 return -1;
 
-        hpte_v = hpte_encode_v(va, psize) | vflags | HPTE_V_VALID;
+        hpte_v = hpte_encode_v(va, psize, ssize) | vflags | HPTE_V_VALID;
         hpte_r = hpte_encode_r(pa, psize) | rflags;
 
         if (!(vflags & HPTE_V_BOLTED)) {
@@ -215,13 +219,14 @@ static long native_hpte_remove(unsigned long hpte_group)
 }
 
 static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,
-                                 unsigned long va, int psize, int local)
+                                 unsigned long va, int psize, int ssize,
+                                 int local)
 {
         struct hash_pte *hptep = htab_address + slot;
         unsigned long hpte_v, want_v;
         int ret = 0;
 
-        want_v = hpte_encode_v(va, psize);
+        want_v = hpte_encode_v(va, psize, ssize);
 
         DBG_LOW("    update(va=%016lx, avpnv=%016lx, hash=%016lx, newpp=%x)",
                 va, want_v & HPTE_V_AVPN, slot, newpp);
@@ -243,39 +248,32 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,
         native_unlock_hpte(hptep);
 
         /* Ensure it is out of the tlb too. */
-        tlbie(va, psize, local);
+        tlbie(va, psize, ssize, local);
 
         return ret;
 }
 
-static long native_hpte_find(unsigned long va, int psize)
+static long native_hpte_find(unsigned long va, int psize, int ssize)
 {
         struct hash_pte *hptep;
         unsigned long hash;
-        unsigned long i, j;
+        unsigned long i;
         long slot;
         unsigned long want_v, hpte_v;
 
-        hash = hpt_hash(va, mmu_psize_defs[psize].shift);
-        want_v = hpte_encode_v(va, psize);
+        hash = hpt_hash(va, mmu_psize_defs[psize].shift, ssize);
+        want_v = hpte_encode_v(va, psize, ssize);
 
-        for (j = 0; j < 2; j++) {
-                slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
-                for (i = 0; i < HPTES_PER_GROUP; i++) {
-                        hptep = htab_address + slot;
-                        hpte_v = hptep->v;
+        /* Bolted mappings are only ever in the primary group */
+        slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
+        for (i = 0; i < HPTES_PER_GROUP; i++) {
+                hptep = htab_address + slot;
+                hpte_v = hptep->v;
 
-                        if (HPTE_V_COMPARE(hpte_v, want_v)
-                            && (hpte_v & HPTE_V_VALID)
-                            && ( !!(hpte_v & HPTE_V_SECONDARY) == j)) {
-                                /* HPTE matches */
-                                if (j)
-                                        slot = -slot;
-                                return slot;
-                        }
-                        ++slot;
-                }
-                hash = ~hash;
+                if (HPTE_V_COMPARE(hpte_v, want_v) && (hpte_v & HPTE_V_VALID))
+                        /* HPTE matches */
+                        return slot;
+                ++slot;
         }
 
         return -1;
@@ -289,16 +287,16 @@ static long native_hpte_find(unsigned long va, int psize)
  * No need to lock here because we should be the only user.
  */
 static void native_hpte_updateboltedpp(unsigned long newpp, unsigned long ea,
-                                       int psize)
+                                       int psize, int ssize)
 {
         unsigned long vsid, va;
         long slot;
         struct hash_pte *hptep;
 
-        vsid = get_kernel_vsid(ea);
-        va = (vsid << 28) | (ea & 0x0fffffff);
+        vsid = get_kernel_vsid(ea, ssize);
+        va = hpt_va(ea, vsid, ssize);
 
-        slot = native_hpte_find(va, psize);
+        slot = native_hpte_find(va, psize, ssize);
         if (slot == -1)
                 panic("could not find page to bolt\n");
         hptep = htab_address + slot;
@@ -308,11 +306,11 @@ static void native_hpte_updateboltedpp(unsigned long newpp, unsigned long ea,
                 (newpp & (HPTE_R_PP | HPTE_R_N));
 
         /* Ensure it is out of the tlb too. */
-        tlbie(va, psize, 0);
+        tlbie(va, psize, ssize, 0);
 }
 
 static void native_hpte_invalidate(unsigned long slot, unsigned long va,
-                                   int psize, int local)
+                                   int psize, int ssize, int local)
 {
         struct hash_pte *hptep = htab_address + slot;
         unsigned long hpte_v;
@@ -323,7 +321,7 @@ static void native_hpte_invalidate(unsigned long slot, unsigned long va,
 
         DBG_LOW("    invalidate(va=%016lx, hash: %x)\n", va, slot);
 
-        want_v = hpte_encode_v(va, psize);
+        want_v = hpte_encode_v(va, psize, ssize);
         native_lock_hpte(hptep);
         hpte_v = hptep->v;
 
@@ -335,7 +333,7 @@ static void native_hpte_invalidate(unsigned long slot, unsigned long va,
                 hptep->v = 0;
 
         /* Invalidate the TLB */
-        tlbie(va, psize, local);
+        tlbie(va, psize, ssize, local);
 
         local_irq_restore(flags);
 }
@@ -345,7 +343,7 @@ static void native_hpte_invalidate(unsigned long slot, unsigned long va,
 #define LP_MASK(i)      ((0xFF >> (i)) << LP_SHIFT)
 
 static void hpte_decode(struct hash_pte *hpte, unsigned long slot,
-                        int *psize, unsigned long *va)
+                        int *psize, int *ssize, unsigned long *va)
 {
         unsigned long hpte_r = hpte->r;
         unsigned long hpte_v = hpte->v;
@@ -401,6 +399,7 @@ static void hpte_decode(struct hash_pte *hpte, unsigned long slot,
 
         *va = avpn;
         *psize = size;
+        *ssize = hpte_v >> HPTE_V_SSIZE_SHIFT;
 }
 
 /*
@@ -417,7 +416,7 @@ static void native_hpte_clear(void)
         struct hash_pte *hptep = htab_address;
         unsigned long hpte_v, va;
         unsigned long pteg_count;
-        int psize;
+        int psize, ssize;
 
         pteg_count = htab_hash_mask + 1;
 
@@ -443,9 +442,9 @@ static void native_hpte_clear(void)
                  * already hold the native_tlbie_lock.
                  */
                 if (hpte_v & HPTE_V_VALID) {
-                        hpte_decode(hptep, slot, &psize, &va);
+                        hpte_decode(hptep, slot, &psize, &ssize, &va);
                         hptep->v = 0;
-                        __tlbie(va, psize);
+                        __tlbie(va, psize, ssize);
                 }
         }
 
@@ -468,6 +467,7 @@ static void native_flush_hash_range(unsigned long number, int local)
         real_pte_t pte;
         struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
         unsigned long psize = batch->psize;
+        int ssize = batch->ssize;
         int i;
 
         local_irq_save(flags);
@@ -477,14 +477,14 @@ static void native_flush_hash_range(unsigned long number, int local)
                 pte = batch->pte[i];
 
                 pte_iterate_hashed_subpages(pte, psize, va, index, shift) {
-                        hash = hpt_hash(va, shift);
+                        hash = hpt_hash(va, shift, ssize);
                         hidx = __rpte_to_hidx(pte, index);
                         if (hidx & _PTEIDX_SECONDARY)
                                 hash = ~hash;
                         slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
                         slot += hidx & _PTEIDX_GROUP_IX;
                         hptep = htab_address + slot;
-                        want_v = hpte_encode_v(va, psize);
+                        want_v = hpte_encode_v(va, psize, ssize);
                         native_lock_hpte(hptep);
                         hpte_v = hptep->v;
                         if (!HPTE_V_COMPARE(hpte_v, want_v) ||
@@ -504,7 +504,7 @@ static void native_flush_hash_range(unsigned long number, int local)
 
                         pte_iterate_hashed_subpages(pte, psize, va, index,
                                                     shift) {
-                                __tlbiel(va, psize);
+                                __tlbiel(va, psize, ssize);
                         } pte_iterate_hashed_end();
                 }
                 asm volatile("ptesync":::"memory");
@@ -521,7 +521,7 @@ static void native_flush_hash_range(unsigned long number, int local)
 
                         pte_iterate_hashed_subpages(pte, psize, va, index,
                                                     shift) {
-                                __tlbie(va, psize);
+                                __tlbie(va, psize, ssize);
                         } pte_iterate_hashed_end();
                 }
                 asm volatile("eieio; tlbsync; ptesync":::"memory");
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index a47151e806ca..611ad084b7e7 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -49,7 +49,6 @@
 #include <asm/tlb.h>
 #include <asm/cacheflush.h>
 #include <asm/cputable.h>
-#include <asm/abs_addr.h>
 #include <asm/sections.h>
 #include <asm/spu.h>
 
@@ -94,6 +93,8 @@ int mmu_linear_psize = MMU_PAGE_4K;
 int mmu_virtual_psize = MMU_PAGE_4K;
 int mmu_vmalloc_psize = MMU_PAGE_4K;
 int mmu_io_psize = MMU_PAGE_4K;
+int mmu_kernel_ssize = MMU_SEGSIZE_256M;
+int mmu_highuser_ssize = MMU_SEGSIZE_256M;
 #ifdef CONFIG_HUGETLB_PAGE
 int mmu_huge_psize = MMU_PAGE_16M;
 unsigned int HPAGE_SHIFT;
@@ -146,7 +147,8 @@ struct mmu_psize_def mmu_psize_defaults_gp[] = {
 
 
 int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
-                      unsigned long pstart, unsigned long mode, int psize)
+                      unsigned long pstart, unsigned long mode,
+                      int psize, int ssize)
 {
         unsigned long vaddr, paddr;
         unsigned int step, shift;
@@ -159,8 +161,8 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
         for (vaddr = vstart, paddr = pstart; vaddr < vend;
              vaddr += step, paddr += step) {
                 unsigned long hash, hpteg;
-                unsigned long vsid = get_kernel_vsid(vaddr);
-                unsigned long va = (vsid << 28) | (vaddr & 0x0fffffff);
+                unsigned long vsid = get_kernel_vsid(vaddr, ssize);
+                unsigned long va = hpt_va(vaddr, vsid, ssize);
 
                 tmp_mode = mode;
                 
@@ -168,14 +170,14 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
                 if (!in_kernel_text(vaddr))
                         tmp_mode = mode | HPTE_R_N;
 
-                hash = hpt_hash(va, shift);
+                hash = hpt_hash(va, shift, ssize);
                 hpteg = ((hash & htab_hash_mask) * HPTES_PER_GROUP);
 
                 DBG("htab_bolt_mapping: calling %p\n", ppc_md.hpte_insert);
 
                 BUG_ON(!ppc_md.hpte_insert);
                 ret = ppc_md.hpte_insert(hpteg, va, paddr,
-                                tmp_mode, HPTE_V_BOLTED, psize);
+                                tmp_mode, HPTE_V_BOLTED, psize, ssize);
 
                 if (ret < 0)
                         break;
@@ -187,6 +189,37 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
         return ret < 0 ? ret : 0;
 }
 
+static int __init htab_dt_scan_seg_sizes(unsigned long node,
+                                         const char *uname, int depth,
+                                         void *data)
+{
+        char *type = of_get_flat_dt_prop(node, "device_type", NULL);
+        u32 *prop;
+        unsigned long size = 0;
+
+        /* We are scanning "cpu" nodes only */
+        if (type == NULL || strcmp(type, "cpu") != 0)
+                return 0;
+
+        prop = (u32 *)of_get_flat_dt_prop(node, "ibm,processor-segment-sizes",
+                                          &size);
+        if (prop == NULL)
+                return 0;
+        for (; size >= 4; size -= 4, ++prop) {
+                if (prop[0] == 40) {
+                        DBG("1T segment support detected\n");
+                        cur_cpu_spec->cpu_features |= CPU_FTR_1T_SEGMENT;
+                }
+                return 1;
+        }
+        return 0;
+}
+
+static void __init htab_init_seg_sizes(void)
+{
+        of_scan_flat_dt(htab_dt_scan_seg_sizes, NULL);
+}
+
 static int __init htab_dt_scan_page_sizes(unsigned long node,
                                           const char *uname, int depth,
                                           void *data)
@@ -266,7 +299,6 @@ static int __init htab_dt_scan_page_sizes(unsigned long node,
         return 0;
 }
 
-
 static void __init htab_init_page_sizes(void)
 {
         int rc;
@@ -399,7 +431,7 @@ void create_section_mapping(unsigned long start, unsigned long end)
 {
                 BUG_ON(htab_bolt_mapping(start, end, __pa(start),
                         _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX,
-                        mmu_linear_psize));
+                        mmu_linear_psize, mmu_kernel_ssize));
 }
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
@@ -450,9 +482,18 @@ void __init htab_initialize(void)
 
         DBG(" -> htab_initialize()\n");
 
+        /* Initialize segment sizes */
+        htab_init_seg_sizes();
+
         /* Initialize page sizes */
         htab_init_page_sizes();
 
+        if (cpu_has_feature(CPU_FTR_1T_SEGMENT)) {
+                mmu_kernel_ssize = MMU_SEGSIZE_1T;
+                mmu_highuser_ssize = MMU_SEGSIZE_1T;
+                printk(KERN_INFO "Using 1TB segments\n");
+        }
+
         /*
          * Calculate the required size of the htab.  We want the number of
          * PTEGs to equal one half the number of real pages.
@@ -524,18 +565,20 @@ void __init htab_initialize(void)
                         if (base != dart_tablebase)
                                 BUG_ON(htab_bolt_mapping(base, dart_tablebase,
                                                         __pa(base), mode_rw,
-                                                        mmu_linear_psize));
+                                                        mmu_linear_psize,
+                                                        mmu_kernel_ssize));
                         if ((base + size) > dart_table_end)
                                 BUG_ON(htab_bolt_mapping(dart_tablebase+16*MB,
                                                         base + size,
                                                         __pa(dart_table_end),
                                                          mode_rw,
-                                                         mmu_linear_psize));
+                                                         mmu_linear_psize,
+                                                         mmu_kernel_ssize));
                         continue;
                 }
 #endif /* CONFIG_U3_DART */
                 BUG_ON(htab_bolt_mapping(base, base + size, __pa(base),
-                                        mode_rw, mmu_linear_psize));
+                                mode_rw, mmu_linear_psize, mmu_kernel_ssize));
        }
 
         /*
@@ -554,7 +597,7 @@ void __init htab_initialize(void)
 
                 BUG_ON(htab_bolt_mapping(tce_alloc_start, tce_alloc_end,
                                          __pa(tce_alloc_start), mode_rw,
-                                         mmu_linear_psize));
+                                         mmu_linear_psize, mmu_kernel_ssize));
         }
 
         htab_finish_init();
@@ -602,13 +645,7 @@ static void demote_segment_4k(struct mm_struct *mm, unsigned long addr)
 {
         if (mm->context.user_psize == MMU_PAGE_4K)
                 return;
-#ifdef CONFIG_PPC_MM_SLICES
         slice_set_user_psize(mm, MMU_PAGE_4K);
-#else /* CONFIG_PPC_MM_SLICES */
-        mm->context.user_psize = MMU_PAGE_4K;
-        mm->context.sllp = SLB_VSID_USER | mmu_psize_defs[MMU_PAGE_4K].sllp;
-#endif /* CONFIG_PPC_MM_SLICES */
-
 #ifdef CONFIG_SPU_BASE
         spu_flush_all_slbs(mm);
 #endif
@@ -628,7 +665,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)
         pte_t *ptep;
         cpumask_t tmp;
         int rc, user_region = 0, local = 0;
-        int psize;
+        int psize, ssize;
 
         DBG_LOW("hash_page(ea=%016lx, access=%lx, trap=%lx\n",
                 ea, access, trap);
@@ -647,20 +684,22 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)
                         DBG_LOW(" user region with no mm !\n");
                         return 1;
                 }
-                vsid = get_vsid(mm->context.id, ea);
 #ifdef CONFIG_PPC_MM_SLICES
                 psize = get_slice_psize(mm, ea);
 #else
                 psize = mm->context.user_psize;
 #endif
+                ssize = user_segment_size(ea);
+                vsid = get_vsid(mm->context.id, ea, ssize);
                 break;
         case VMALLOC_REGION_ID:
                 mm = &init_mm;
-                vsid = get_kernel_vsid(ea);
+                vsid = get_kernel_vsid(ea, mmu_kernel_ssize);
                 if (ea < VMALLOC_END)
                         psize = mmu_vmalloc_psize;
                 else
                         psize = mmu_io_psize;
+                ssize = mmu_kernel_ssize;
                 break;
         default:
                 /* Not a valid range
@@ -765,10 +804,10 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)
 
 #ifdef CONFIG_PPC_HAS_HASH_64K
         if (psize == MMU_PAGE_64K)
-                rc = __hash_page_64K(ea, access, vsid, ptep, trap, local);
+                rc = __hash_page_64K(ea, access, vsid, ptep, trap, local, ssize);
         else
 #endif /* CONFIG_PPC_HAS_HASH_64K */
-                rc = __hash_page_4K(ea, access, vsid, ptep, trap, local);
+                rc = __hash_page_4K(ea, access, vsid, ptep, trap, local, ssize);
 
 #ifndef CONFIG_PPC_64K_PAGES
         DBG_LOW(" o-pte: %016lx\n", pte_val(*ptep));
@@ -790,6 +829,7 @@ void hash_preload(struct mm_struct *mm, unsigned long ea,
         cpumask_t mask;
         unsigned long flags;
         int local = 0;
+        int ssize;
 
         BUG_ON(REGION_ID(ea) != USER_REGION_ID);
 
@@ -822,7 +862,8 @@ void hash_preload(struct mm_struct *mm, unsigned long ea,
 #endif /* CONFIG_PPC_64K_PAGES */
 
         /* Get VSID */
-        vsid = get_vsid(mm->context.id, ea);
+        ssize = user_segment_size(ea);
+        vsid = get_vsid(mm->context.id, ea, ssize);
 
         /* Hash doesn't like irqs */
         local_irq_save(flags);
@@ -835,28 +876,29 @@ void hash_preload(struct mm_struct *mm, unsigned long ea,
         /* Hash it in */
 #ifdef CONFIG_PPC_HAS_HASH_64K
         if (mm->context.user_psize == MMU_PAGE_64K)
-                __hash_page_64K(ea, access, vsid, ptep, trap, local);
+                __hash_page_64K(ea, access, vsid, ptep, trap, local, ssize);
         else
 #endif /* CONFIG_PPC_HAS_HASH_64K */
-                __hash_page_4K(ea, access, vsid, ptep, trap, local);
+                __hash_page_4K(ea, access, vsid, ptep, trap, local, ssize);
 
         local_irq_restore(flags);
 }
 
-void flush_hash_page(unsigned long va, real_pte_t pte, int psize, int local)
+void flush_hash_page(unsigned long va, real_pte_t pte, int psize, int ssize,
+                     int local)
 {
         unsigned long hash, index, shift, hidx, slot;
 
         DBG_LOW("flush_hash_page(va=%016x)\n", va);
         pte_iterate_hashed_subpages(pte, psize, va, index, shift) {
-                hash = hpt_hash(va, shift);
+                hash = hpt_hash(va, shift, ssize);
                 hidx = __rpte_to_hidx(pte, index);
                 if (hidx & _PTEIDX_SECONDARY)
                         hash = ~hash;
                 slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
                 slot += hidx & _PTEIDX_GROUP_IX;
                 DBG_LOW(" sub %d: hash=%x, hidx=%x\n", index, slot, hidx);
-                ppc_md.hpte_invalidate(slot, va, psize, local);
+                ppc_md.hpte_invalidate(slot, va, psize, ssize, local);
         } pte_iterate_hashed_end();
 }
 
@@ -871,7 +913,7 @@ void flush_hash_range(unsigned long number, int local)
 
                 for (i = 0; i < number; i++)
                         flush_hash_page(batch->vaddr[i], batch->pte[i],
-                                        batch->psize, local);
+                                        batch->psize, batch->ssize, local);
         }
 }
 
@@ -897,17 +939,19 @@ void low_hash_fault(struct pt_regs *regs, unsigned long address)
 #ifdef CONFIG_DEBUG_PAGEALLOC
 static void kernel_map_linear_page(unsigned long vaddr, unsigned long lmi)
 {
-        unsigned long hash, hpteg, vsid = get_kernel_vsid(vaddr);
-        unsigned long va = (vsid << 28) | (vaddr & 0x0fffffff);
+        unsigned long hash, hpteg;
+        unsigned long vsid = get_kernel_vsid(vaddr, mmu_kernel_ssize);
+        unsigned long va = hpt_va(vaddr, vsid, mmu_kernel_ssize);
         unsigned long mode = _PAGE_ACCESSED | _PAGE_DIRTY |
                 _PAGE_COHERENT | PP_RWXX | HPTE_R_N;
         int ret;
 
-        hash = hpt_hash(va, PAGE_SHIFT);
+        hash = hpt_hash(va, PAGE_SHIFT, mmu_kernel_ssize);
         hpteg = ((hash & htab_hash_mask) * HPTES_PER_GROUP);
 
         ret = ppc_md.hpte_insert(hpteg, va, __pa(vaddr),
-                                 mode, HPTE_V_BOLTED, mmu_linear_psize);
+                                 mode, HPTE_V_BOLTED,
+                                 mmu_linear_psize, mmu_kernel_ssize);
         BUG_ON (ret < 0);
         spin_lock(&linear_map_hash_lock);
         BUG_ON(linear_map_hash_slots[lmi] & 0x80);
@@ -917,10 +961,11 @@ static void kernel_map_linear_page(unsigned long vaddr, unsigned long lmi)
 
 static void kernel_unmap_linear_page(unsigned long vaddr, unsigned long lmi)
 {
-        unsigned long hash, hidx, slot, vsid = get_kernel_vsid(vaddr);
-        unsigned long va = (vsid << 28) | (vaddr & 0x0fffffff);
+        unsigned long hash, hidx, slot;
+        unsigned long vsid = get_kernel_vsid(vaddr, mmu_kernel_ssize);
+        unsigned long va = hpt_va(vaddr, vsid, mmu_kernel_ssize);
 
-        hash = hpt_hash(va, PAGE_SHIFT);
+        hash = hpt_hash(va, PAGE_SHIFT, mmu_kernel_ssize);
         spin_lock(&linear_map_hash_lock);
         BUG_ON(!(linear_map_hash_slots[lmi] & 0x80));
         hidx = linear_map_hash_slots[lmi] & 0x7f;
@@ -930,7 +975,7 @@ static void kernel_unmap_linear_page(unsigned long vaddr, unsigned long lmi)
                 hash = ~hash;
         slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
         slot += hidx & _PTEIDX_GROUP_IX;
-        ppc_md.hpte_invalidate(slot, va, mmu_linear_psize, 0);
+        ppc_md.hpte_invalidate(slot, va, mmu_linear_psize, mmu_kernel_ssize, 0);
 }
 
 void kernel_map_pages(struct page *page, int numpages, int enable)
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 4835f73af304..08f0d9ff7712 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -22,11 +22,8 @@
 #include <asm/mmu_context.h>
 #include <asm/machdep.h>
 #include <asm/cputable.h>
-#include <asm/tlb.h>
 #include <asm/spu.h>
 
-#include <linux/sysctl.h>
-
 #define NUM_LOW_AREAS   (0x100000000UL >> SID_SHIFT)
 #define NUM_HIGH_AREAS  (PGTABLE_RANGE >> HTLB_AREA_SHIFT)
 
@@ -406,11 +403,12 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access,
         unsigned long va, rflags, pa;
         long slot;
         int err = 1;
+        int ssize = user_segment_size(ea);
 
         ptep = huge_pte_offset(mm, ea);
 
         /* Search the Linux page table for a match with va */
-        va = (vsid << 28) | (ea & 0x0fffffff);
+        va = hpt_va(ea, vsid, ssize);
 
         /*
          * If no pte found or not present, send the problem up to
@@ -461,19 +459,19 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access,
                 /* There MIGHT be an HPTE for this pte */
                 unsigned long hash, slot;
 
-                hash = hpt_hash(va, HPAGE_SHIFT);
+                hash = hpt_hash(va, HPAGE_SHIFT, ssize);
                 if (old_pte & _PAGE_F_SECOND)
                         hash = ~hash;
                 slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
                 slot += (old_pte & _PAGE_F_GIX) >> 12;
 
                 if (ppc_md.hpte_updatepp(slot, rflags, va, mmu_huge_psize,
-                                         local) == -1)
+                                         ssize, local) == -1)
                         old_pte &= ~_PAGE_HPTEFLAGS;
         }
 
         if (likely(!(old_pte & _PAGE_HASHPTE))) {
-                unsigned long hash = hpt_hash(va, HPAGE_SHIFT);
+                unsigned long hash = hpt_hash(va, HPAGE_SHIFT, ssize);
                 unsigned long hpte_group;
 
                 pa = pte_pfn(__pte(old_pte)) << PAGE_SHIFT;
@@ -492,7 +490,7 @@ repeat:
 
                 /* Insert into the hash table, primary slot */
                 slot = ppc_md.hpte_insert(hpte_group, va, pa, rflags, 0,
-                                          mmu_huge_psize);
+                                          mmu_huge_psize, ssize);
 
                 /* Primary is full, try the secondary */
                 if (unlikely(slot == -1)) {
@@ -500,7 +498,7 @@ repeat:
                                       HPTES_PER_GROUP) & ~0x7UL; 
                         slot = ppc_md.hpte_insert(hpte_group, va, pa, rflags,
                                                   HPTE_V_SECONDARY,
-                                                  mmu_huge_psize);
+                                                  mmu_huge_psize, ssize);
                         if (slot == -1) {
                                 if (mftb() & 0x1)
                                         hpte_group = ((hash & htab_hash_mask) *
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index e1f5ded851f6..977cb1ee5e72 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -41,7 +41,6 @@
 #include <asm/machdep.h>
 #include <asm/btext.h>
 #include <asm/tlb.h>
-#include <asm/prom.h>
 #include <asm/lmb.h>
 #include <asm/sections.h>
 
@@ -133,6 +132,9 @@ void __init MMU_init(void)
         /* 601 can only access 16MB at the moment */
         if (PVR_VER(mfspr(SPRN_PVR)) == 1)
                 __initial_memory_limit = 0x01000000;
+        /* 8xx can only access 8MB at the moment */
+        if (PVR_VER(mfspr(SPRN_PVR)) == 0x50)
+                __initial_memory_limit = 0x00800000;
 
         /* parse args from command line */
         MMU_setup();
@@ -256,3 +258,40 @@ void free_initrd_mem(unsigned long start, unsigned long end)
         }
 }
 #endif
+
+#ifdef CONFIG_PROC_KCORE
+static struct kcore_list kcore_vmem;
+
+static int __init setup_kcore(void)
+{
+        int i;
+
+        for (i = 0; i < lmb.memory.cnt; i++) {
+                unsigned long base;
+                unsigned long size;
+                struct kcore_list *kcore_mem;
+
+                base = lmb.memory.region[i].base;
+                size = lmb.memory.region[i].size;
+
+                kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
+                if (!kcore_mem)
+                        panic("%s: kmalloc failed\n", __FUNCTION__);
+
+                /* must stay under 32 bits */
+                if ( 0xfffffffful - (unsigned long)__va(base) < size) {
+                        size = 0xfffffffful - (unsigned long)(__va(base));
+                        printk(KERN_DEBUG "setup_kcore: restrict size=%lx\n",
+                                                size);
+                }
+
+                kclist_add(kcore_mem, __va(base), size);
+        }
+
+        kclist_add(&kcore_vmem, (void *)VMALLOC_START,
+                VMALLOC_END-VMALLOC_START);
+
+        return 0;
+}
+module_init(setup_kcore);
+#endif
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 9f27bb56a61d..fa90f6561b9f 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -113,6 +113,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 }
 #endif
 
+#ifdef CONFIG_PROC_KCORE
 static struct kcore_list kcore_vmem;
 
 static int __init setup_kcore(void)
@@ -139,6 +140,7 @@ static int __init setup_kcore(void)
         return 0;
 }
 module_init(setup_kcore);
+#endif
 
 static void zero_ctor(void *addr, struct kmem_cache *cache, unsigned long flags)
 {
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index f0e7eedb1ba3..32dcfc9b0082 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -42,7 +42,6 @@
 #include <asm/machdep.h>
 #include <asm/btext.h>
 #include <asm/tlb.h>
-#include <asm/prom.h>
 #include <asm/lmb.h>
 #include <asm/sections.h>
 #include <asm/vdso.h>
diff --git a/arch/powerpc/mm/mmu_context_64.c b/arch/powerpc/mm/mmu_context_64.c
index 7a78cdc0515a..1db38ba1f544 100644
--- a/arch/powerpc/mm/mmu_context_64.c
+++ b/arch/powerpc/mm/mmu_context_64.c
@@ -28,7 +28,6 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 {
         int index;
         int err;
-        int new_context = (mm->context.id == 0);
 
 again:
         if (!idr_pre_get(&mmu_context_idr, GFP_KERNEL))
@@ -50,19 +49,13 @@ again:
                 return -ENOMEM;
         }
 
-        mm->context.id = index;
-#ifdef CONFIG_PPC_MM_SLICES
         /* The old code would re-promote on fork, we don't do that
          * when using slices as it could cause problem promoting slices
          * that have been forced down to 4K
          */
-        if (new_context)
+        if (slice_mm_new_context(mm))
                 slice_set_user_psize(mm, mmu_virtual_psize);
-#else
-        mm->context.user_psize = mmu_virtual_psize;
-        mm->context.sllp = SLB_VSID_USER |
-                mmu_psize_defs[mmu_virtual_psize].sllp;
-#endif
+        mm->context.id = index;
 
         return 0;
 }
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index 3dfd10db931a..3ef0ad2f9ca0 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -87,8 +87,8 @@ static int map_io_page(unsigned long ea, unsigned long pa, int flags)
                  * entry in the hardware page table.
                  *
                  */
-                if (htab_bolt_mapping(ea, (unsigned long)ea + PAGE_SIZE,
-                                      pa, flags, mmu_io_psize)) {
+                if (htab_bolt_mapping(ea, ea + PAGE_SIZE, pa, flags,
+                                      mmu_io_psize, mmu_kernel_ssize)) {
                         printk(KERN_ERR "Failed to do bolted mapping IO "
                                "memory at %016lx !\n", pa);
                         return -ENOMEM;
@@ -228,5 +228,7 @@ void iounmap(volatile void __iomem *token)
 EXPORT_SYMBOL(ioremap);
 EXPORT_SYMBOL(ioremap_flags);
 EXPORT_SYMBOL(__ioremap);
+EXPORT_SYMBOL(__ioremap_at);
 EXPORT_SYMBOL(iounmap);
 EXPORT_SYMBOL(__iounmap);
+EXPORT_SYMBOL(__iounmap_at);
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index ff1811ac6c81..6c164cec9d2c 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -43,30 +43,37 @@ static void slb_allocate(unsigned long ea)
         slb_allocate_realmode(ea);
 }
 
-static inline unsigned long mk_esid_data(unsigned long ea, unsigned long slot)
+static inline unsigned long mk_esid_data(unsigned long ea, int ssize,
+                                         unsigned long slot)
 {
-        return (ea & ESID_MASK) | SLB_ESID_V | slot;
+        unsigned long mask;
+
+        mask = (ssize == MMU_SEGSIZE_256M)? ESID_MASK: ESID_MASK_1T;
+        return (ea & mask) | SLB_ESID_V | slot;
 }
 
-static inline unsigned long mk_vsid_data(unsigned long ea, unsigned long flags)
+#define slb_vsid_shift(ssize)   \
+        ((ssize) == MMU_SEGSIZE_256M? SLB_VSID_SHIFT: SLB_VSID_SHIFT_1T)
+
+static inline unsigned long mk_vsid_data(unsigned long ea, int ssize,
+                                         unsigned long flags)
 {
-        return (get_kernel_vsid(ea) << SLB_VSID_SHIFT) | flags;
+        return (get_kernel_vsid(ea, ssize) << slb_vsid_shift(ssize)) | flags |
+                ((unsigned long) ssize << SLB_VSID_SSIZE_SHIFT);
 }
 
-static inline void slb_shadow_update(unsigned long ea,
+static inline void slb_shadow_update(unsigned long ea, int ssize,
                                      unsigned long flags,
                                      unsigned long entry)
 {
         /*
          * Clear the ESID first so the entry is not valid while we are
-         * updating it.
+         * updating it.  No write barriers are needed here, provided
+         * we only update the current CPU's SLB shadow buffer.
          */
         get_slb_shadow()->save_area[entry].esid = 0;
-        smp_wmb();
-        get_slb_shadow()->save_area[entry].vsid = mk_vsid_data(ea, flags);
-        smp_wmb();
-        get_slb_shadow()->save_area[entry].esid = mk_esid_data(ea, entry);
-        smp_wmb();
+        get_slb_shadow()->save_area[entry].vsid = mk_vsid_data(ea, ssize, flags);
+        get_slb_shadow()->save_area[entry].esid = mk_esid_data(ea, ssize, entry);
 }
 
 static inline void slb_shadow_clear(unsigned long entry)
@@ -74,7 +81,8 @@ static inline void slb_shadow_clear(unsigned long entry)
         get_slb_shadow()->save_area[entry].esid = 0;
 }
 
-static inline void create_shadowed_slbe(unsigned long ea, unsigned long flags,
+static inline void create_shadowed_slbe(unsigned long ea, int ssize,
+                                        unsigned long flags,
                                         unsigned long entry)
 {
         /*
@@ -82,11 +90,11 @@ static inline void create_shadowed_slbe(unsigned long ea, unsigned long flags,
          * we don't get a stale entry here if we get preempted by PHYP
          * between these two statements.
          */
-        slb_shadow_update(ea, flags, entry);
+        slb_shadow_update(ea, ssize, flags, entry);
 
         asm volatile("slbmte  %0,%1" :
-                     : "r" (mk_vsid_data(ea, flags)),
-                       "r" (mk_esid_data(ea, entry))
+                     : "r" (mk_vsid_data(ea, ssize, flags)),
+                       "r" (mk_esid_data(ea, ssize, entry))
                      : "memory" );
 }
 
@@ -95,7 +103,7 @@ void slb_flush_and_rebolt(void)
         /* If you change this make sure you change SLB_NUM_BOLTED
          * appropriately too. */
         unsigned long linear_llp, vmalloc_llp, lflags, vflags;
-        unsigned long ksp_esid_data;
+        unsigned long ksp_esid_data, ksp_vsid_data;
 
         WARN_ON(!irqs_disabled());
 
@@ -104,13 +112,15 @@ void slb_flush_and_rebolt(void)
         lflags = SLB_VSID_KERNEL | linear_llp;
         vflags = SLB_VSID_KERNEL | vmalloc_llp;
 
-        ksp_esid_data = mk_esid_data(get_paca()->kstack, 2);
-        if ((ksp_esid_data & ESID_MASK) == PAGE_OFFSET) {
+        ksp_esid_data = mk_esid_data(get_paca()->kstack, mmu_kernel_ssize, 2);
+        if ((ksp_esid_data & ~0xfffffffUL) <= PAGE_OFFSET) {
                 ksp_esid_data &= ~SLB_ESID_V;
+                ksp_vsid_data = 0;
                 slb_shadow_clear(2);
         } else {
                 /* Update stack entry; others don't change */
-                slb_shadow_update(get_paca()->kstack, lflags, 2);
+                slb_shadow_update(get_paca()->kstack, mmu_kernel_ssize, lflags, 2);
+                ksp_vsid_data = get_slb_shadow()->save_area[2].vsid;
         }
 
         /* We need to do this all in asm, so we're sure we don't touch
@@ -122,9 +132,9 @@ void slb_flush_and_rebolt(void)
                      /* Slot 2 - kernel stack */
                      "slbmte    %2,%3\n"
                      "isync"
-                     :: "r"(mk_vsid_data(VMALLOC_START, vflags)),
-                        "r"(mk_esid_data(VMALLOC_START, 1)),
-                        "r"(mk_vsid_data(ksp_esid_data, lflags)),
+                     :: "r"(mk_vsid_data(VMALLOC_START, mmu_kernel_ssize, vflags)),
+                        "r"(mk_esid_data(VMALLOC_START, mmu_kernel_ssize, 1)),
+                        "r"(ksp_vsid_data),
                         "r"(ksp_esid_data)
                      : "memory");
 }
@@ -134,7 +144,7 @@ void slb_vmalloc_update(void)
         unsigned long vflags;
 
         vflags = SLB_VSID_KERNEL | mmu_psize_defs[mmu_vmalloc_psize].sllp;
-        slb_shadow_update(VMALLOC_START, vflags, 1);
+        slb_shadow_update(VMALLOC_START, mmu_kernel_ssize, vflags, 1);
         slb_flush_and_rebolt();
 }
 
@@ -142,7 +152,7 @@ void slb_vmalloc_update(void)
 void switch_slb(struct task_struct *tsk, struct mm_struct *mm)
 {
         unsigned long offset = get_paca()->slb_cache_ptr;
-        unsigned long esid_data = 0;
+        unsigned long slbie_data = 0;
         unsigned long pc = KSTK_EIP(tsk);
         unsigned long stack = KSTK_ESP(tsk);
         unsigned long unmapped_base;
@@ -151,9 +161,12 @@ void switch_slb(struct task_struct *tsk, struct mm_struct *mm)
                 int i;
                 asm volatile("isync" : : : "memory");
                 for (i = 0; i < offset; i++) {
-                        esid_data = ((unsigned long)get_paca()->slb_cache[i]
-                                << SID_SHIFT) | SLBIE_C;
-                        asm volatile("slbie %0" : : "r" (esid_data));
+                        slbie_data = (unsigned long)get_paca()->slb_cache[i]
+                                << SID_SHIFT; /* EA */
+                        slbie_data |= user_segment_size(slbie_data)
+                                << SLBIE_SSIZE_SHIFT;
+                        slbie_data |= SLBIE_C; /* C set for user addresses */
+                        asm volatile("slbie %0" : : "r" (slbie_data));
                 }
                 asm volatile("isync" : : : "memory");
         } else {
@@ -162,7 +175,7 @@ void switch_slb(struct task_struct *tsk, struct mm_struct *mm)
 
         /* Workaround POWER5 < DD2.1 issue */
         if (offset == 1 || offset > SLB_CACHE_ENTRIES)
-                asm volatile("slbie %0" : : "r" (esid_data));
+                asm volatile("slbie %0" : : "r" (slbie_data));
 
         get_paca()->slb_cache_ptr = 0;
         get_paca()->context = mm->context;
@@ -245,9 +258,9 @@ void slb_initialize(void)
         asm volatile("isync":::"memory");
         asm volatile("slbmte  %0,%0"::"r" (0) : "memory");
         asm volatile("isync; slbia; isync":::"memory");
-        create_shadowed_slbe(PAGE_OFFSET, lflags, 0);
+        create_shadowed_slbe(PAGE_OFFSET, mmu_kernel_ssize, lflags, 0);
 
-        create_shadowed_slbe(VMALLOC_START, vflags, 1);
+        create_shadowed_slbe(VMALLOC_START, mmu_kernel_ssize, vflags, 1);
 
         /* We don't bolt the stack for the time being - we're in boot,
          * so the stack is in the bolted segment.  By the time it goes
diff --git a/arch/powerpc/mm/slb_low.S b/arch/powerpc/mm/slb_low.S
index cd1a93d4948c..1328a81a84aa 100644
--- a/arch/powerpc/mm/slb_low.S
+++ b/arch/powerpc/mm/slb_low.S
@@ -57,7 +57,10 @@ _GLOBAL(slb_allocate_realmode)
          */
 _GLOBAL(slb_miss_kernel_load_linear)
         li      r11,0
+BEGIN_FTR_SECTION
         b       slb_finish_load
+END_FTR_SECTION_IFCLR(CPU_FTR_1T_SEGMENT)
+        b       slb_finish_load_1T
 
 1:      /* vmalloc/ioremap mapping encoding bits, the "li" instructions below
          * will be patched by the kernel at boot
@@ -68,13 +71,16 @@ BEGIN_FTR_SECTION
         cmpldi  r11,(VMALLOC_SIZE >> 28) - 1
         bgt     5f
         lhz     r11,PACAVMALLOCSLLP(r13)
-        b       slb_finish_load
+        b       6f
 5:
 END_FTR_SECTION_IFCLR(CPU_FTR_CI_LARGE_PAGE)
 _GLOBAL(slb_miss_kernel_load_io)
         li      r11,0
+6:
+BEGIN_FTR_SECTION
         b       slb_finish_load
-
+END_FTR_SECTION_IFCLR(CPU_FTR_1T_SEGMENT)
+        b       slb_finish_load_1T
 
 0:      /* user address: proto-VSID = context << 15 | ESID. First check
          * if the address is within the boundaries of the user region
@@ -122,7 +128,13 @@ _GLOBAL(slb_miss_kernel_load_io)
 #endif /* CONFIG_PPC_MM_SLICES */
 
         ld      r9,PACACONTEXTID(r13)
+BEGIN_FTR_SECTION
+        cmpldi  r10,0x1000
+END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
         rldimi  r10,r9,USER_ESID_BITS,0
+BEGIN_FTR_SECTION
+        bge     slb_finish_load_1T
+END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
         b       slb_finish_load
 
 8:      /* invalid EA */
@@ -188,7 +200,7 @@ _GLOBAL(slb_allocate_user)
  * r3 = EA, r10 = proto-VSID, r11 = flags, clobbers r9, cr7 = <> PAGE_OFFSET
  */
 slb_finish_load:
-        ASM_VSID_SCRAMBLE(r10,r9)
+        ASM_VSID_SCRAMBLE(r10,r9,256M)
         rldimi  r11,r10,SLB_VSID_SHIFT,16       /* combine VSID and flags */
 
         /* r3 = EA, r11 = VSID data */
@@ -213,7 +225,7 @@ BEGIN_FW_FTR_SECTION
 END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
 #endif /* CONFIG_PPC_ISERIES */
 
-        ld      r10,PACASTABRR(r13)
+7:      ld      r10,PACASTABRR(r13)
         addi    r10,r10,1
         /* use a cpu feature mask if we ever change our slb size */
         cmpldi  r10,SLB_NUM_ENTRIES
@@ -259,3 +271,20 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
         crclr   4*cr0+eq                /* set result to "success" */
         blr
 
+/*
+ * Finish loading of a 1T SLB entry (for the kernel linear mapping) and return.
+ * We assume legacy iSeries will never have 1T segments.
+ *
+ * r3 = EA, r10 = proto-VSID, r11 = flags, clobbers r9
+ */
+slb_finish_load_1T:
+        srdi    r10,r10,40-28           /* get 1T ESID */
+        ASM_VSID_SCRAMBLE(r10,r9,1T)
+        rldimi  r11,r10,SLB_VSID_SHIFT_1T,16    /* combine VSID and flags */
+        li      r10,MMU_SEGSIZE_1T
+        rldimi  r11,r10,SLB_VSID_SSIZE_SHIFT,0  /* insert segment size */
+
+        /* r3 = EA, r11 = VSID data */
+        clrrdi  r3,r3,SID_SHIFT_1T      /* clear out non-ESID bits */
+        b       7b
+
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index d5fd3909d13a..319826ef1645 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -551,6 +551,7 @@ EXPORT_SYMBOL_GPL(get_slice_psize);
  *
  * This is also called in init_new_context() to change back the user
  * psize from whatever the parent context had it set to
+ * N.B. This may be called before mm->context.id has been set.
  *
  * This function will only change the content of the {low,high)_slice_psize
  * masks, it will not flush SLBs as this shall be handled lazily by the
diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c
index 28492bbdee8e..9e85bda76216 100644
--- a/arch/powerpc/mm/stab.c
+++ b/arch/powerpc/mm/stab.c
@@ -122,12 +122,12 @@ static int __ste_allocate(unsigned long ea, struct mm_struct *mm)
 
         /* Kernel or user address? */
         if (is_kernel_addr(ea)) {
-                vsid = get_kernel_vsid(ea);
+                vsid = get_kernel_vsid(ea, MMU_SEGSIZE_256M);
         } else {
                 if ((ea >= TASK_SIZE_USER64) || (! mm))
                         return 1;
 
-                vsid = get_vsid(mm->context.id, ea);
+                vsid = get_vsid(mm->context.id, ea, MMU_SEGSIZE_256M);
         }
 
         stab_entry = make_ste(get_paca()->stab_addr, GET_ESID(ea), vsid);
@@ -261,7 +261,7 @@ void __init stabs_alloc(void)
  */
 void stab_initialize(unsigned long stab)
 {
-        unsigned long vsid = get_kernel_vsid(PAGE_OFFSET);
+        unsigned long vsid = get_kernel_vsid(PAGE_OFFSET, MMU_SEGSIZE_256M);
         unsigned long stabreal;
 
         asm volatile("isync; slbia; isync":::"memory");
diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c
index cbd34fc813ee..eafbca52bff9 100644
--- a/arch/powerpc/mm/tlb_64.c
+++ b/arch/powerpc/mm/tlb_64.c
@@ -132,6 +132,7 @@ void hpte_need_flush(struct mm_struct *mm, unsigned long addr,
         struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
         unsigned long vsid, vaddr;
         unsigned int psize;
+        int ssize;
         real_pte_t rpte;
         int i;
 
@@ -161,11 +162,14 @@ void hpte_need_flush(struct mm_struct *mm, unsigned long addr,
 
         /* Build full vaddr */
         if (!is_kernel_addr(addr)) {
-                vsid = get_vsid(mm->context.id, addr);
+                ssize = user_segment_size(addr);
+                vsid = get_vsid(mm->context.id, addr, ssize);
                 WARN_ON(vsid == 0);
-        } else
-                vsid = get_kernel_vsid(addr);
-        vaddr = (vsid << 28 ) | (addr & 0x0fffffff);
+        } else {
+                vsid = get_kernel_vsid(addr, mmu_kernel_ssize);
+                ssize = mmu_kernel_ssize;
+        }
+        vaddr = hpt_va(addr, vsid, ssize);
         rpte = __real_pte(__pte(pte), ptep);
 
         /*
@@ -175,7 +179,7 @@ void hpte_need_flush(struct mm_struct *mm, unsigned long addr,
          * and decide to use local invalidates instead...
          */
         if (!batch->active) {
-                flush_hash_page(vaddr, rpte, psize, 0);
+                flush_hash_page(vaddr, rpte, psize, ssize, 0);
                 return;
         }
 
@@ -189,13 +193,15 @@ void hpte_need_flush(struct mm_struct *mm, unsigned long addr,
          * We also need to ensure only one page size is present in a given
          * batch
          */
-        if (i != 0 && (mm != batch->mm || batch->psize != psize)) {
+        if (i != 0 && (mm != batch->mm || batch->psize != psize ||
+                       batch->ssize != ssize)) {
                 __flush_tlb_pending(batch);
                 i = 0;
         }
         if (i == 0) {
                 batch->mm = mm;
                 batch->psize = psize;
+                batch->ssize = ssize;
         }
         batch->pte[i] = rpte;
         batch->vaddr[i] = vaddr;
@@ -222,7 +228,7 @@ void __flush_tlb_pending(struct ppc64_tlb_batch *batch)
                 local = 1;
         if (i == 1)
                 flush_hash_page(batch->vaddr[0], batch->pte[0],
-                                batch->psize, local);
+                                batch->psize, batch->ssize, local);
         else
                 flush_hash_range(i, local);
         batch->index = 0;
diff --git a/arch/powerpc/oprofile/cell/pr_util.h b/arch/powerpc/oprofile/cell/pr_util.h
index e5704f00c8b4..22e4e8d4eb2c 100644
--- a/arch/powerpc/oprofile/cell/pr_util.h
+++ b/arch/powerpc/oprofile/cell/pr_util.h
@@ -17,10 +17,9 @@
 #include <linux/cpumask.h>
 #include <linux/oprofile.h>
 #include <asm/cell-pmu.h>
+#include <asm/cell-regs.h>
 #include <asm/spu.h>
 
-#include "../../platforms/cell/cbe_regs.h"
-
 /* Defines used for sync_start */
 #define SKIP_GENERIC_SYNC 0
 #define SYNC_START_ERROR -1
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c
index d928b54f3a0f..bb6bff51ce48 100644
--- a/arch/powerpc/oprofile/op_model_cell.c
+++ b/arch/powerpc/oprofile/op_model_cell.c
@@ -35,9 +35,9 @@
 #include <asm/reg.h>
 #include <asm/rtas.h>
 #include <asm/system.h>
+#include <asm/cell-regs.h>
 
 #include "../platforms/cell/interrupt.h"
-#include "../platforms/cell/cbe_regs.h"
 #include "cell/pr_util.h"
 
 static void cell_global_stop_spu(void);
diff --git a/arch/powerpc/platforms/4xx/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index ded357c17414..47b3b0a3864a 100644
--- a/arch/powerpc/platforms/4xx/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -1,16 +1,3 @@
-config 4xx
-        bool
-        depends on 40x || 44x
-        default y
-
-config BOOKE
-        bool
-        depends on 44x
-        default y
-
-menu "AMCC 40x options"
-        depends on 40x
-
 #config BUBINGA
 #       bool "Bubinga"
 #       depends on 40x
@@ -42,6 +29,13 @@ menu "AMCC 40x options"
 #       help
 #         This option enables support for the extra features of the EP405PC board.
 
+config KILAUEA
+        bool "Kilauea"
+        depends on 40x
+        default n
+        help
+          This option enables support for the AMCC PPC405EX evaluation board.
+
 #config REDWOOD_5
 #       bool "Redwood-5"
 #       depends on 40x
@@ -66,23 +60,30 @@ menu "AMCC 40x options"
 #       help
 #         This option enables support for the IBM PPC405GPr evaluation board.
 
-#config WALNUT
-#       bool "Walnut"
-#       depends on 40x
-#       default y
-#       select 405GP
-#       help
-#         This option enables support for the IBM PPC405GP evaluation board.
+config WALNUT
+        bool "Walnut"
+        depends on 40x
+        default y
+        select 405GP
+        help
+          This option enables support for the IBM PPC405GP evaluation board.
 
-#config XILINX_ML300
-#       bool "Xilinx-ML300"
-#       depends on 40x
-#       default y
-#       select VIRTEX_II_PRO
-#       help
-#         This option enables support for the Xilinx ML300 evaluation board.
+config XILINX_VIRTEX_GENERIC_BOARD
+        bool "Generic Xilinx Virtex board"
+        depends on 40x
+        default n
+        select XILINX_VIRTEX_II_PRO
+        select XILINX_VIRTEX_4_FX
+        help
+          This option enables generic support for Xilinx Virtex based boards.
+
+          The generic virtex board support matches any device tree which
+          specifies 'xilinx,virtex' in its compatible field.  This includes
+          the Xilinx ML3xx and ML4xx reference designs using the powerpc
+          core.
 
-endmenu
+          Most Virtex designs should use this unless it needs to do some
+          special configuration at board probe time.
 
 # 40x specific CPU modules, selected based on the board above.
 config NP405H
@@ -106,11 +107,19 @@ config 405EP
 config 405GPR
         bool
 
-config VIRTEX_II_PRO
+config XILINX_VIRTEX
+        bool
+
+config XILINX_VIRTEX_II_PRO
         bool
+        select XILINX_VIRTEX
         select IBM405_ERR77
         select IBM405_ERR51
 
+config XILINX_VIRTEX_4_FX
+        bool
+        select XILINX_VIRTEX
+
 config STB03xxx
         bool
         select IBM405_ERR77
@@ -126,73 +135,6 @@ config IBM405_ERR77
 config IBM405_ERR51
         bool
 
-menu "AMCC 44x options"
-        depends on 44x
-
-#config BAMBOO
-#       bool "Bamboo"
-#       depends on 44x
-#       default n
-#       select 440EP
-#       help
-#         This option enables support for the IBM PPC440EP evaluation board.
-
-config EBONY
-        bool "Ebony"
-        depends on 44x
-        default y
-        select 440GP
-        help
-          This option enables support for the IBM PPC440GP evaluation board.
-
-#config LUAN
-#       bool "Luan"
-#       depends on 44x
-#       default n
-#       select 440SP
-#       help
-#         This option enables support for the IBM PPC440SP evaluation board.
-
-#config OCOTEA
-#       bool "Ocotea"
-#       depends on 44x
-#       default n
-#       select 440GX
-#       help
-#         This option enables support for the IBM PPC440GX evaluation board.
-
-endmenu
-
-# 44x specific CPU modules, selected based on the board above.
-config 440EP
-        bool
-        select PPC_FPU
-        select IBM440EP_ERR42
-
-config 440GP
-        bool
-        select IBM_NEW_EMAC_ZMII
-
-config 440GX
-        bool
-
-config 440SP
-        bool
-
-config 440A
-        bool
-        depends on 440GX
-        default y
-
-# 44x errata/workaround config symbols, selected by the CPU models above
-config IBM440EP_ERR42
-        bool
-
-#config XILINX_OCP
-#       bool
-#       depends on XILINX_ML300
-#       default y
-
 #config BIOS_FIXUP
 #       bool
 #       depends on BUBINGA || EP405 || SYCAMORE || WALNUT
diff --git a/arch/powerpc/platforms/40x/Makefile b/arch/powerpc/platforms/40x/Makefile
new file mode 100644
index 000000000000..51dadeee6fc6
--- /dev/null
+++ b/arch/powerpc/platforms/40x/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_KILAUEA)                           += kilauea.o
+obj-$(CONFIG_WALNUT)                            += walnut.o
+obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD)       += virtex.o
diff --git a/arch/powerpc/platforms/40x/kilauea.c b/arch/powerpc/platforms/40x/kilauea.c
new file mode 100644
index 000000000000..1bffdbdd21b1
--- /dev/null
+++ b/arch/powerpc/platforms/40x/kilauea.c
@@ -0,0 +1,58 @@
+/*
+ * Kilauea board specific routines
+ *
+ * Copyright 2007 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ *
+ * Based on the Walnut code by
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ * Copyright 2007 IBM Corporation
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <linux/init.h>
+#include <linux/of_platform.h>
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/time.h>
+#include <asm/uic.h>
+
+static struct of_device_id kilauea_of_bus[] = {
+        { .compatible = "ibm,plb4", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
+        {},
+};
+
+static int __init kilauea_device_probe(void)
+{
+        if (!machine_is(kilauea))
+                return 0;
+
+        of_platform_bus_probe(NULL, kilauea_of_bus, NULL);
+
+        return 0;
+}
+device_initcall(kilauea_device_probe);
+
+static int __init kilauea_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "amcc,kilauea"))
+                return 0;
+
+        return 1;
+}
+
+define_machine(kilauea) {
+        .name                           = "Kilauea",
+        .probe                          = kilauea_probe,
+        .progress                       = udbg_progress,
+        .init_IRQ                       = uic_init_tree,
+        .get_irq                        = uic_get_irq,
+        .calibrate_decr                 = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/40x/virtex.c b/arch/powerpc/platforms/40x/virtex.c
new file mode 100644
index 000000000000..14bbc328170f
--- /dev/null
+++ b/arch/powerpc/platforms/40x/virtex.c
@@ -0,0 +1,45 @@
+/*
+ * Xilinx Virtex (IIpro & 4FX) based board support
+ *
+ * Copyright 2007 Secret Lab Technologies Ltd.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/init.h>
+#include <linux/of_platform.h>
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/time.h>
+#include <asm/xilinx_intc.h>
+
+static int __init virtex_device_probe(void)
+{
+        if (!machine_is(virtex))
+                return 0;
+
+        of_platform_bus_probe(NULL, NULL, NULL);
+
+        return 0;
+}
+device_initcall(virtex_device_probe);
+
+static int __init virtex_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "xilinx,virtex"))
+                return 0;
+
+        return 1;
+}
+
+define_machine(virtex) {
+        .name                   = "Xilinx Virtex",
+        .probe                  = virtex_probe,
+        .init_IRQ               = xilinx_intc_init_tree,
+        .get_irq                = xilinx_intc_get_irq,
+        .calibrate_decr         = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/40x/walnut.c b/arch/powerpc/platforms/40x/walnut.c
new file mode 100644
index 000000000000..eb0c136b1c44
--- /dev/null
+++ b/arch/powerpc/platforms/40x/walnut.c
@@ -0,0 +1,63 @@
+/*
+ * Architecture- / platform-specific boot-time initialization code for
+ * IBM PowerPC 4xx based boards. Adapted from original
+ * code by Gary Thomas, Cort Dougan <cort@fsmlabs.com>, and Dan Malek
+ * <dan@net4x.com>.
+ *
+ * Copyright(c) 1999-2000 Grant Erickson <grant@lcse.umn.edu>
+ *
+ * Rewritten and ported to the merged powerpc tree:
+ * Copyright 2007 IBM Corporation
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * 2002 (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/init.h>
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/time.h>
+#include <asm/uic.h>
+#include <asm/of_platform.h>
+
+static struct of_device_id walnut_of_bus[] = {
+        { .compatible = "ibm,plb3", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
+        {},
+};
+
+static int __init walnut_device_probe(void)
+{
+        if (!machine_is(walnut))
+                return 0;
+
+        /* FIXME: do bus probe here */
+        of_platform_bus_probe(NULL, walnut_of_bus, NULL);
+
+        return 0;
+}
+device_initcall(walnut_device_probe);
+
+static int __init walnut_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "ibm,walnut"))
+                return 0;
+
+        return 1;
+}
+
+define_machine(walnut) {
+        .name                   = "Walnut",
+        .probe                  = walnut_probe,
+        .progress               = udbg_progress,
+        .init_IRQ               = uic_init_tree,
+        .get_irq                = uic_get_irq,
+        .calibrate_decr = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 1b3e008fd148..51f3ea40a285 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -1,10 +1,10 @@
-#config BAMBOO
-#       bool "Bamboo"
-#       depends on 44x
-#       default n
-#       select 440EP
-#       help
-#         This option enables support for the IBM PPC440EP evaluation board.
+config BAMBOO
+        bool "Bamboo"
+        depends on 44x
+        default n
+        select 440EP
+        help
+          This option enables support for the IBM PPC440EP evaluation board.
 
 config EBONY
         bool "Ebony"
@@ -14,6 +14,14 @@ config EBONY
         help
           This option enables support for the IBM PPC440GP evaluation board.
 
+config SEQUOIA
+        bool "Sequoia"
+        depends on 44x
+        default n
+        select 440EPX
+        help
+          This option enables support for the AMCC PPC440EPX evaluation board.
+
 #config LUAN
 #       bool "Luan"
 #       depends on 44x
@@ -35,12 +43,19 @@ config 440EP
         bool
         select PPC_FPU
         select IBM440EP_ERR42
+#       select IBM_NEW_EMAC_ZMII
 
-config 440GP
+config 440EPX
         bool
+        select PPC_FPU
 # Disabled until the new EMAC Driver is merged.
+#       select IBM_NEW_EMAC_EMAC4
 #       select IBM_NEW_EMAC_ZMII
 
+config 440GP
+        bool
+        select IBM_NEW_EMAC_ZMII
+
 config 440GX
         bool
 
@@ -49,7 +64,7 @@ config 440SP
 
 config 440A
         bool
-        depends on 440GX
+        depends on 440GX || 440EPX
         default y
 
 # 44x errata/workaround config symbols, selected by the CPU models above
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index 41d0a18a0e44..10ce6740cc7d 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -1,2 +1,4 @@
 obj-$(CONFIG_44x)       := misc_44x.o
 obj-$(CONFIG_EBONY)     += ebony.o
+obj-$(CONFIG_BAMBOO) += bamboo.o
+obj-$(CONFIG_SEQUOIA)   += sequoia.o
diff --git a/arch/powerpc/platforms/44x/bamboo.c b/arch/powerpc/platforms/44x/bamboo.c
new file mode 100644
index 000000000000..470e1a3fd755
--- /dev/null
+++ b/arch/powerpc/platforms/44x/bamboo.c
@@ -0,0 +1,61 @@
+/*
+ * Bamboo board specific routines
+ *
+ * Wade Farnsworth <wfarnsworth@mvista.com>
+ * Copyright 2004 MontaVista Software Inc.
+ *
+ * Rewritten and ported to the merged powerpc tree:
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ * Copyright 2007 IBM Corporation
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <linux/init.h>
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/time.h>
+#include <asm/uic.h>
+#include <asm/of_platform.h>
+#include "44x.h"
+
+static struct of_device_id bamboo_of_bus[] = {
+        { .compatible = "ibm,plb4", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
+        {},
+};
+
+static int __init bamboo_device_probe(void)
+{
+        if (!machine_is(bamboo))
+                return 0;
+
+        of_platform_bus_probe(NULL, bamboo_of_bus, NULL);
+
+        return 0;
+}
+device_initcall(bamboo_device_probe);
+
+static int __init bamboo_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "amcc,bamboo"))
+                return 0;
+
+        return 1;
+}
+
+define_machine(bamboo) {
+        .name                           = "Bamboo",
+        .probe                          = bamboo_probe,
+        .progress                       = udbg_progress,
+        .init_IRQ                       = uic_init_tree,
+        .get_irq                        = uic_get_irq,
+        .restart                        = ppc44x_reset_system,
+        .calibrate_decr         = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index 5a7fec8d10d3..40e18fcb666c 100644
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -57,14 +57,9 @@ static int __init ebony_probe(void)
         return 1;
 }
 
-static void __init ebony_setup_arch(void)
-{
-}
-
 define_machine(ebony) {
         .name                   = "Ebony",
         .probe                  = ebony_probe,
-        .setup_arch             = ebony_setup_arch,
         .progress               = udbg_progress,
         .init_IRQ               = uic_init_tree,
         .get_irq                = uic_get_irq,
diff --git a/arch/powerpc/platforms/44x/sequoia.c b/arch/powerpc/platforms/44x/sequoia.c
new file mode 100644
index 000000000000..30700b31d43b
--- /dev/null
+++ b/arch/powerpc/platforms/44x/sequoia.c
@@ -0,0 +1,61 @@
+/*
+ * Sequoia board specific routines
+ *
+ * Valentine Barshak <vbarshak@ru.mvista.com>
+ * Copyright 2007 MontaVista Software Inc.
+ *
+ * Based on the Bamboo code by
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ * Copyright 2007 IBM Corporation
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <linux/init.h>
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/time.h>
+#include <asm/uic.h>
+#include <asm/of_platform.h>
+#include "44x.h"
+
+static struct of_device_id sequoia_of_bus[] = {
+        { .compatible = "ibm,plb4", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
+        {},
+};
+
+static int __init sequoia_device_probe(void)
+{
+        if (!machine_is(sequoia))
+                return 0;
+
+        of_platform_bus_probe(NULL, sequoia_of_bus, NULL);
+
+        return 0;
+}
+device_initcall(sequoia_device_probe);
+
+static int __init sequoia_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "amcc,sequoia"))
+                return 0;
+
+        return 1;
+}
+
+define_machine(sequoia) {
+        .name                           = "Sequoia",
+        .probe                          = sequoia_probe,
+        .progress                       = udbg_progress,
+        .init_IRQ                       = uic_init_tree,
+        .get_irq                        = uic_get_irq,
+        .restart                        = ppc44x_reset_system,
+        .calibrate_decr                 = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/4xx/Makefile b/arch/powerpc/platforms/4xx/Makefile
deleted file mode 100644
index 79ff6b1e887c..000000000000
--- a/arch/powerpc/platforms/4xx/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-# empty makefile so make clean works
\ No newline at end of file
diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig
index 3ffaa066c2c8..2938d4927b83 100644
--- a/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@ -1,6 +1,7 @@
 config PPC_MPC52xx
         bool
         select FSL_SOC
+        select PPC_CLOCK
         default n
 
 config PPC_MPC5200
@@ -30,6 +31,7 @@ config PPC_EFIKA
 config PPC_LITE5200
         bool "Freescale Lite5200 Eval Board"
         depends on PPC_MULTIPLATFORM && PPC32
+        select WANT_DEVICE_TREE
         select PPC_MPC5200
         default n
 
diff --git a/arch/powerpc/platforms/52xx/Makefile b/arch/powerpc/platforms/52xx/Makefile
index b91e39c84d46..307dbc178091 100644
--- a/arch/powerpc/platforms/52xx/Makefile
+++ b/arch/powerpc/platforms/52xx/Makefile
@@ -10,3 +10,6 @@ obj-$(CONFIG_PPC_EFIKA)		+= efika.o
 obj-$(CONFIG_PPC_LITE5200)      += lite5200.o
 
 obj-$(CONFIG_PM)                += mpc52xx_sleep.o mpc52xx_pm.o
+ifeq ($(CONFIG_PPC_LITE5200),y)
+        obj-$(CONFIG_PM)        += lite5200_sleep.o lite5200_pm.o
+endif
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c
index 4be6e7a17b66..a0da70c8b502 100644
--- a/arch/powerpc/platforms/52xx/efika.c
+++ b/arch/powerpc/platforms/52xx/efika.c
@@ -9,33 +9,16 @@
  * kind, whether express or implied.
  */
 
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/utsrelease.h>
-#include <linux/seq_file.h>
-#include <linux/string.h>
-#include <linux/root_dev.h>
-#include <linux/initrd.h>
-#include <linux/timer.h>
 #include <linux/pci.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/sections.h>
-#include <asm/pci-bridge.h>
-#include <asm/pgtable.h>
+#include <linux/of.h>
 #include <asm/prom.h>
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/rtas.h>
-#include <asm/of_device.h>
-#include <asm/of_platform.h>
 #include <asm/mpc52xx.h>
 
-
 #define EFIKA_PLATFORM_NAME "Efika"
 
 
@@ -78,8 +61,8 @@ static int rtas_write_config(struct pci_bus *bus, unsigned int devfn,
 }
 
 static struct pci_ops rtas_pci_ops = {
-        rtas_read_config,
-        rtas_write_config
+        .read = rtas_read_config,
+        .write = rtas_write_config,
 };
 
 
@@ -197,15 +180,6 @@ static void __init efika_setup_arch(void)
 {
         rtas_initialize();
 
-#ifdef CONFIG_BLK_DEV_INITRD
-        initrd_below_start_ok = 1;
-
-        if (initrd_start)
-                ROOT_DEV = Root_RAM0;
-        else
-#endif
-                ROOT_DEV = Root_SDA2;   /* sda2 (sda1 is for the kernel) */
-
         efika_pcisetup();
 
 #ifdef CONFIG_PM
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 5c46e898fd45..0caa3d955c3b 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -15,33 +15,13 @@
 
 #undef DEBUG
 
-#include <linux/stddef.h>
-#include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/reboot.h>
 #include <linux/pci.h>
-#include <linux/kdev_t.h>
-#include <linux/major.h>
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/seq_file.h>
-#include <linux/root_dev.h>
-#include <linux/initrd.h>
-
-#include <asm/system.h>
-#include <asm/atomic.h>
+#include <linux/of.h>
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/ipic.h>
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
 #include <asm/prom.h>
-#include <asm/udbg.h>
-#include <sysdev/fsl_soc.h>
-#include <asm/of_platform.h>
-
 #include <asm/mpc52xx.h>
 
 /* ************************************************************************
@@ -50,19 +30,56 @@
  *
  */
 
+/*
+ * Fix clock configuration.
+ *
+ * Firmware is supposed to be responsible for this.  If you are creating a
+ * new board port, do *NOT* duplicate this code.  Fix your boot firmware
+ * to set it correctly in the first place
+ */
+static void __init
+lite5200_fix_clock_config(void)
+{
+        struct mpc52xx_cdm  __iomem *cdm;
+
+        /* Map zones */
+        cdm = mpc52xx_find_and_map("mpc5200-cdm");
+        if (!cdm) {
+                printk(KERN_ERR "%s() failed; expect abnormal behaviour\n",
+                       __FUNCTION__);
+                return;
+        }
+
+        /* Use internal 48 Mhz */
+        out_8(&cdm->ext_48mhz_en, 0x00);
+        out_8(&cdm->fd_enable, 0x01);
+        if (in_be32(&cdm->rstcfg) & 0x40)       /* Assumes 33Mhz clock */
+                out_be16(&cdm->fd_counters, 0x0001);
+        else
+                out_be16(&cdm->fd_counters, 0x5555);
+
+        /* Unmap the regs */
+        iounmap(cdm);
+}
+
+/*
+ * Fix setting of port_config register.
+ *
+ * Firmware is supposed to be responsible for this.  If you are creating a
+ * new board port, do *NOT* duplicate this code.  Fix your boot firmware
+ * to set it correctly in the first place
+ */
 static void __init
-lite5200_setup_cpu(void)
+lite5200_fix_port_config(void)
 {
         struct mpc52xx_gpio __iomem *gpio;
         u32 port_config;
 
-        /* Map zones */
         gpio = mpc52xx_find_and_map("mpc5200-gpio");
         if (!gpio) {
-                printk(KERN_ERR __FILE__ ": "
-                        "Error while mapping GPIO register for port config. "
-                        "Expect some abnormal behavior\n");
-                goto error;
+                printk(KERN_ERR "%s() failed. expect abnormal behavior\n",
+                       __FUNCTION__);
+                return;
         }
 
         /* Set port config */
@@ -81,12 +98,10 @@ lite5200_setup_cpu(void)
         out_be32(&gpio->port_config, port_config);
 
         /* Unmap zone */
-error:
         iounmap(gpio);
 }
 
 #ifdef CONFIG_PM
-static u32 descr_a;
 static void lite5200_suspend_prepare(void __iomem *mbar)
 {
         u8 pin = 1;     /* GPIO_WKUP_1 (GPIO_PSC2_4) */
@@ -97,42 +112,41 @@ static void lite5200_suspend_prepare(void __iomem *mbar)
          * power down usb port
          * this needs to be called before of-ohci suspend code
          */
-        descr_a = in_be32(mbar + 0x1048);
-        out_be32(mbar + 0x1048, (descr_a & ~0x200) | 0x100);
+
+        /* set ports to "power switched" and "powered at the same time"
+         * USB Rh descriptor A: NPS = 0, PSM = 0 */
+        out_be32(mbar + 0x1048, in_be32(mbar + 0x1048) & ~0x300);
+        /* USB Rh status: LPS = 1 - turn off power */
+        out_be32(mbar + 0x1050, 0x00000001);
 }
 
 static void lite5200_resume_finish(void __iomem *mbar)
 {
-        out_be32(mbar + 0x1048, descr_a);
+        /* USB Rh status: LPSC = 1 - turn on power */
+        out_be32(mbar + 0x1050, 0x00010000);
 }
 #endif
 
 static void __init lite5200_setup_arch(void)
 {
+#ifdef CONFIG_PCI
         struct device_node *np;
+#endif
 
         if (ppc_md.progress)
                 ppc_md.progress("lite5200_setup_arch()", 0);
 
-        np = of_find_node_by_type(NULL, "cpu");
-        if (np) {
-                const unsigned int *fp =
-                        of_get_property(np, "clock-frequency", NULL);
-                if (fp != 0)
-                        loops_per_jiffy = *fp / HZ;
-                else
-                        loops_per_jiffy = 50000000 / HZ;
-                of_node_put(np);
-        }
+        /* Fix things that firmware should have done. */
+        lite5200_fix_clock_config();
+        lite5200_fix_port_config();
 
-        /* CPU & Port mux setup */
-        mpc52xx_setup_cpu();    /* Generic */
-        lite5200_setup_cpu();   /* Platorm specific */
+        /* Some mpc5200 & mpc5200b related configuration */
+        mpc5200_setup_xlb_arbiter();
 
 #ifdef CONFIG_PM
         mpc52xx_suspend.board_suspend_prepare = lite5200_suspend_prepare;
         mpc52xx_suspend.board_resume_finish = lite5200_resume_finish;
-        mpc52xx_pm_init();
+        lite5200_pm_init();
 #endif
 
 #ifdef CONFIG_PCI
@@ -156,20 +170,6 @@ static void __init lite5200_setup_arch(void)
 
 }
 
-static void lite5200_show_cpuinfo(struct seq_file *m)
-{
-        struct device_node* np = of_find_all_nodes(NULL);
-        const char *model = NULL;
-
-        if (np)
-                model = of_get_property(np, "model", NULL);
-
-        seq_printf(m, "vendor\t\t:      Freescale Semiconductor\n");
-        seq_printf(m, "machine\t\t:     %s\n", model ? model : "unknown");
-
-        of_node_put(np);
-}
-
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
  */
@@ -193,6 +193,5 @@ define_machine(lite5200) {
         .init           = mpc52xx_declare_of_platform_devices,
         .init_IRQ       = mpc52xx_init_irq,
         .get_irq        = mpc52xx_get_irq,
-        .show_cpuinfo   = lite5200_show_cpuinfo,
         .calibrate_decr = generic_calibrate_decr,
 };
diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c
new file mode 100644
index 000000000000..f26afcd41757
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/lite5200_pm.c
@@ -0,0 +1,213 @@
+#include <linux/init.h>
+#include <linux/pm.h>
+#include <asm/io.h>
+#include <asm/time.h>
+#include <asm/mpc52xx.h>
+#include "mpc52xx_pic.h"
+
+/* defined in lite5200_sleep.S and only used here */
+extern void lite5200_low_power(void __iomem *sram, void __iomem *mbar);
+
+static struct mpc52xx_cdm __iomem *cdm;
+static struct mpc52xx_intr __iomem *pic;
+static struct mpc52xx_sdma __iomem *bes;
+static struct mpc52xx_xlb __iomem *xlb;
+static struct mpc52xx_gpio __iomem *gps;
+static struct mpc52xx_gpio_wkup __iomem *gpw;
+static void __iomem *sram;
+static const int sram_size = 0x4000;    /* 16 kBytes */
+static void __iomem *mbar;
+
+static int lite5200_pm_valid(suspend_state_t state)
+{
+        switch (state) {
+        case PM_SUSPEND_STANDBY:
+        case PM_SUSPEND_MEM:
+                return 1;
+        default:
+                return 0;
+        }
+}
+
+static int lite5200_pm_prepare(suspend_state_t state)
+{
+        /* deep sleep? let mpc52xx code handle that */
+        if (state == PM_SUSPEND_STANDBY)
+                return mpc52xx_pm_prepare(state);
+
+        if (state != PM_SUSPEND_MEM)
+                return -EINVAL;
+
+        /* map registers */
+        mbar = mpc52xx_find_and_map("mpc5200");
+        if (!mbar) {
+                printk(KERN_ERR "%s:%i Error mapping registers\n", __func__, __LINE__);
+                return -ENOSYS;
+        }
+
+        cdm = mbar + 0x200;
+        pic = mbar + 0x500;
+        gps = mbar + 0xb00;
+        gpw = mbar + 0xc00;
+        bes = mbar + 0x1200;
+        xlb = mbar + 0x1f00;
+        sram = mbar + 0x8000;
+
+        return 0;
+}
+
+/* save and restore registers not bound to any real devices */
+static struct mpc52xx_cdm scdm;
+static struct mpc52xx_intr spic;
+static struct mpc52xx_sdma sbes;
+static struct mpc52xx_xlb sxlb;
+static struct mpc52xx_gpio sgps;
+static struct mpc52xx_gpio_wkup sgpw;
+
+static void lite5200_save_regs(void)
+{
+        _memcpy_fromio(&spic, pic, sizeof(*pic));
+        _memcpy_fromio(&sbes, bes, sizeof(*bes));
+        _memcpy_fromio(&scdm, cdm, sizeof(*cdm));
+        _memcpy_fromio(&sxlb, xlb, sizeof(*xlb));
+        _memcpy_fromio(&sgps, gps, sizeof(*gps));
+        _memcpy_fromio(&sgpw, gpw, sizeof(*gpw));
+
+        _memcpy_fromio(saved_sram, sram, sram_size);
+}
+
+static void lite5200_restore_regs(void)
+{
+        int i;
+        _memcpy_toio(sram, saved_sram, sram_size);
+
+
+        /*
+         * GPIOs. Interrupt Master Enable has higher address then other
+         * registers, so just memcpy is ok.
+         */
+        _memcpy_toio(gpw, &sgpw, sizeof(*gpw));
+        _memcpy_toio(gps, &sgps, sizeof(*gps));
+
+
+        /* XLB Arbitrer */
+        out_be32(&xlb->snoop_window, sxlb.snoop_window);
+        out_be32(&xlb->master_priority, sxlb.master_priority);
+        out_be32(&xlb->master_pri_enable, sxlb.master_pri_enable);
+
+        /* enable */
+        out_be32(&xlb->int_enable, sxlb.int_enable);
+        out_be32(&xlb->config, sxlb.config);
+
+
+        /* CDM - Clock Distribution Module */
+        out_8(&cdm->ipb_clk_sel, scdm.ipb_clk_sel);
+        out_8(&cdm->pci_clk_sel, scdm.pci_clk_sel);
+
+        out_8(&cdm->ext_48mhz_en, scdm.ext_48mhz_en);
+        out_8(&cdm->fd_enable, scdm.fd_enable);
+        out_be16(&cdm->fd_counters, scdm.fd_counters);
+
+        out_be32(&cdm->clk_enables, scdm.clk_enables);
+
+        out_8(&cdm->osc_disable, scdm.osc_disable);
+
+        out_be16(&cdm->mclken_div_psc1, scdm.mclken_div_psc1);
+        out_be16(&cdm->mclken_div_psc2, scdm.mclken_div_psc2);
+        out_be16(&cdm->mclken_div_psc3, scdm.mclken_div_psc3);
+        out_be16(&cdm->mclken_div_psc6, scdm.mclken_div_psc6);
+
+
+        /* BESTCOMM */
+        out_be32(&bes->taskBar, sbes.taskBar);
+        out_be32(&bes->currentPointer, sbes.currentPointer);
+        out_be32(&bes->endPointer, sbes.endPointer);
+        out_be32(&bes->variablePointer, sbes.variablePointer);
+
+        out_8(&bes->IntVect1, sbes.IntVect1);
+        out_8(&bes->IntVect2, sbes.IntVect2);
+        out_be16(&bes->PtdCntrl, sbes.PtdCntrl);
+
+        for (i=0; i<32; i++)
+                out_8(&bes->ipr[i], sbes.ipr[i]);
+
+        out_be32(&bes->cReqSelect, sbes.cReqSelect);
+        out_be32(&bes->task_size0, sbes.task_size0);
+        out_be32(&bes->task_size1, sbes.task_size1);
+        out_be32(&bes->MDEDebug, sbes.MDEDebug);
+        out_be32(&bes->ADSDebug, sbes.ADSDebug);
+        out_be32(&bes->Value1, sbes.Value1);
+        out_be32(&bes->Value2, sbes.Value2);
+        out_be32(&bes->Control, sbes.Control);
+        out_be32(&bes->Status, sbes.Status);
+        out_be32(&bes->PTDDebug, sbes.PTDDebug);
+
+        /* restore tasks */
+        for (i=0; i<16; i++)
+                out_be16(&bes->tcr[i], sbes.tcr[i]);
+
+        /* enable interrupts */
+        out_be32(&bes->IntPend, sbes.IntPend);
+        out_be32(&bes->IntMask, sbes.IntMask);
+
+
+        /* PIC */
+        out_be32(&pic->per_pri1, spic.per_pri1);
+        out_be32(&pic->per_pri2, spic.per_pri2);
+        out_be32(&pic->per_pri3, spic.per_pri3);
+
+        out_be32(&pic->main_pri1, spic.main_pri1);
+        out_be32(&pic->main_pri2, spic.main_pri2);
+
+        out_be32(&pic->enc_status, spic.enc_status);
+
+        /* unmask and enable interrupts */
+        out_be32(&pic->per_mask, spic.per_mask);
+        out_be32(&pic->main_mask, spic.main_mask);
+        out_be32(&pic->ctrl, spic.ctrl);
+}
+
+static int lite5200_pm_enter(suspend_state_t state)
+{
+        /* deep sleep? let mpc52xx code handle that */
+        if (state == PM_SUSPEND_STANDBY) {
+                return mpc52xx_pm_enter(state);
+        }
+
+        lite5200_save_regs();
+
+        /* effectively save FP regs */
+        enable_kernel_fp();
+
+        lite5200_low_power(sram, mbar);
+
+        lite5200_restore_regs();
+
+        /* restart jiffies */
+        wakeup_decrementer();
+
+        iounmap(mbar);
+        return 0;
+}
+
+static int lite5200_pm_finish(suspend_state_t state)
+{
+        /* deep sleep? let mpc52xx code handle that */
+        if (state == PM_SUSPEND_STANDBY) {
+                return mpc52xx_pm_finish(state);
+        }
+        return 0;
+}
+
+static struct pm_ops lite5200_pm_ops = {
+        .valid          = lite5200_pm_valid,
+        .prepare        = lite5200_pm_prepare,
+        .enter          = lite5200_pm_enter,
+        .finish         = lite5200_pm_finish,
+};
+
+int __init lite5200_pm_init(void)
+{
+        pm_set_ops(&lite5200_pm_ops);
+        return 0;
+}
diff --git a/arch/powerpc/platforms/52xx/lite5200_sleep.S b/arch/powerpc/platforms/52xx/lite5200_sleep.S
new file mode 100644
index 000000000000..08ab6fefcf7a
--- /dev/null
+++ b/arch/powerpc/platforms/52xx/lite5200_sleep.S
@@ -0,0 +1,412 @@
+#include <asm/reg.h>
+#include <asm/ppc_asm.h>
+#include <asm/processor.h>
+#include <asm/cache.h>
+
+
+#define SDRAM_CTRL      0x104
+#define SC_MODE_EN      (1<<31)
+#define SC_CKE          (1<<30)
+#define SC_REF_EN       (1<<28)
+#define SC_SOFT_PRE     (1<<1)
+
+#define GPIOW_GPIOE     0xc00
+#define GPIOW_DDR       0xc08
+#define GPIOW_DVO       0xc0c
+
+#define CDM_CE          0x214
+#define CDM_SDRAM       (1<<3)
+
+
+/* helpers... beware: r10 and r4 are overwritten */
+#define SAVE_SPRN(reg, addr)            \
+        mfspr   r10, SPRN_##reg;        \
+        stw     r10, ((addr)*4)(r4);
+
+#define LOAD_SPRN(reg, addr)            \
+        lwz     r10, ((addr)*4)(r4);    \
+        mtspr   SPRN_##reg, r10;        \
+        sync;                           \
+        isync;
+
+
+        .data
+registers:
+        .space 0x5c*4
+        .text
+
+/* ---------------------------------------------------------------------- */
+/* low-power mode with help of M68HLC908QT1 */
+
+        .globl lite5200_low_power
+lite5200_low_power:
+
+        mr      r7, r3  /* save SRAM va */
+        mr      r8, r4  /* save MBAR va */
+
+        /* setup wakeup address for u-boot at physical location 0x0 */
+        lis     r3, CONFIG_KERNEL_START@h
+        lis     r4, lite5200_wakeup@h
+        ori     r4, r4, lite5200_wakeup@l
+        sub     r4, r4, r3
+        stw     r4, 0(r3)
+
+
+        /*
+         * save stuff BDI overwrites
+         * 0xf0 (0xe0->0x100 gets overwritten when BDI connected;
+         *   even when CONFIG_BDI* is disabled and MMU XLAT commented; heisenbug?))
+         * WARNING: self-refresh doesn't seem to work when BDI2000 is connected,
+         *   possibly because BDI sets SDRAM registers before wakeup code does
+         */
+        lis     r4, registers@h
+        ori     r4, r4, registers@l
+        lwz     r10, 0xf0(r3)
+        stw     r10, (0x1d*4)(r4)
+
+        /* save registers to r4 [destroys r10] */
+        SAVE_SPRN(LR, 0x1c)
+        bl      save_regs
+
+        /* flush caches [destroys r3, r4] */
+        bl      flush_data_cache
+
+
+        /* copy code to sram */
+        mr      r4, r7
+        li      r3, (sram_code_end - sram_code)/4
+        mtctr   r3
+        lis     r3, sram_code@h
+        ori     r3, r3, sram_code@l
+1:
+        lwz     r5, 0(r3)
+        stw     r5, 0(r4)
+        addi    r3, r3, 4
+        addi    r4, r4, 4
+        bdnz    1b
+
+        /* get tb_ticks_per_usec */
+        lis     r3, tb_ticks_per_usec@h
+        lwz     r11, tb_ticks_per_usec@l(r3)
+
+        /* disable I and D caches */
+        mfspr   r3, SPRN_HID0
+        ori     r3, r3, HID0_ICE | HID0_DCE
+        xori    r3, r3, HID0_ICE | HID0_DCE
+        sync; isync;
+        mtspr   SPRN_HID0, r3
+        sync; isync;
+
+        /* jump to sram */
+        mtlr    r7
+        blrl
+        /* doesn't return */
+
+
+sram_code:
+        /* self refresh */
+        lwz     r4, SDRAM_CTRL(r8)
+
+        /* send NOP (precharge) */
+        oris    r4, r4, SC_MODE_EN@h    /* mode_en */
+        stw     r4, SDRAM_CTRL(r8)
+        sync
+
+        ori     r4, r4, SC_SOFT_PRE     /* soft_pre */
+        stw     r4, SDRAM_CTRL(r8)
+        sync
+        xori    r4, r4, SC_SOFT_PRE
+
+        xoris   r4, r4, SC_MODE_EN@h    /* !mode_en */
+        stw     r4, SDRAM_CTRL(r8)
+        sync
+
+        /* delay (for NOP to finish) */
+        li      r12, 1
+        bl      udelay
+
+        /*
+         * mode_en must not be set when enabling self-refresh
+         * send AR with CKE low (self-refresh)
+         */
+        oris    r4, r4, (SC_REF_EN | SC_CKE)@h
+        xoris   r4, r4, (SC_CKE)@h      /* ref_en !cke */
+        stw     r4, SDRAM_CTRL(r8)
+        sync
+
+        /* delay (after !CKE there should be two cycles) */
+        li      r12, 1
+        bl      udelay
+
+        /* disable clock */
+        lwz     r4, CDM_CE(r8)
+        ori     r4, r4, CDM_SDRAM
+        xori    r4, r4, CDM_SDRAM
+        stw     r4, CDM_CE(r8)
+        sync
+
+        /* delay a bit */
+        li      r12, 1
+        bl      udelay
+
+
+        /* turn off with QT chip */
+        li      r4, 0x02
+        stb     r4, GPIOW_GPIOE(r8)     /* enable gpio_wkup1 */
+        sync
+
+        stb     r4, GPIOW_DVO(r8)       /* "output" high */
+        sync
+        stb     r4, GPIOW_DDR(r8)       /* output */
+        sync
+        stb     r4, GPIOW_DVO(r8)       /* output high */
+        sync
+
+        /* 10uS delay */
+        li      r12, 10
+        bl      udelay
+
+        /* turn off */
+        li      r4, 0
+        stb     r4, GPIOW_DVO(r8)       /* output low */
+        sync
+
+        /* wait until we're offline */
+  1:
+        b       1b
+
+
+        /* local udelay in sram is needed */
+  udelay: /* r11 - tb_ticks_per_usec, r12 - usecs, overwrites r13 */
+        mullw   r12, r12, r11
+        mftb    r13     /* start */
+        addi    r12, r13, r12 /* end */
+    1:
+        mftb    r13     /* current */
+        cmp     cr0, r13, r12
+        blt     1b
+        blr
+
+sram_code_end:
+
+
+
+/* uboot jumps here on resume */
+lite5200_wakeup:
+        bl      restore_regs
+
+
+        /* HIDs, MSR */
+        LOAD_SPRN(HID1, 0x19)
+        LOAD_SPRN(HID2, 0x1a)
+
+
+        /* address translation is tricky (see turn_on_mmu) */
+        mfmsr   r10
+        ori     r10, r10, MSR_DR | MSR_IR
+
+
+        mtspr   SPRN_SRR1, r10
+        lis     r10, mmu_on@h
+        ori     r10, r10, mmu_on@l
+        mtspr   SPRN_SRR0, r10
+        sync
+        rfi
+mmu_on:
+        /* kernel offset (r4 is still set from restore_registers) */
+        addis   r4, r4, CONFIG_KERNEL_START@h
+
+
+        /* restore MSR */
+        lwz     r10, (4*0x1b)(r4)
+        mtmsr   r10
+        sync; isync;
+
+        /* invalidate caches */
+        mfspr   r10, SPRN_HID0
+        ori     r5, r10, HID0_ICFI | HID0_DCI
+        mtspr   SPRN_HID0, r5   /* invalidate caches */
+        sync; isync;
+        mtspr   SPRN_HID0, r10
+        sync; isync;
+
+        /* enable caches */
+        lwz     r10, (4*0x18)(r4)
+        mtspr   SPRN_HID0, r10  /* restore (enable caches, DPM) */
+        /* ^ this has to be after address translation set in MSR */
+        sync
+        isync
+
+
+        /* restore 0xf0 (BDI2000) */
+        lis     r3, CONFIG_KERNEL_START@h
+        lwz     r10, (0x1d*4)(r4)
+        stw     r10, 0xf0(r3)
+
+        LOAD_SPRN(LR, 0x1c)
+
+
+        blr
+
+
+/* ---------------------------------------------------------------------- */
+/* boring code: helpers */
+
+/* save registers */
+#define SAVE_BAT(n, addr)               \
+        SAVE_SPRN(DBAT##n##L, addr);    \
+        SAVE_SPRN(DBAT##n##U, addr+1);  \
+        SAVE_SPRN(IBAT##n##L, addr+2);  \
+        SAVE_SPRN(IBAT##n##U, addr+3);
+
+#define SAVE_SR(n, addr)                \
+        mfsr    r10, n;                 \
+        stw     r10, ((addr)*4)(r4);
+
+#define SAVE_4SR(n, addr)       \
+        SAVE_SR(n, addr);       \
+        SAVE_SR(n+1, addr+1);   \
+        SAVE_SR(n+2, addr+2);   \
+        SAVE_SR(n+3, addr+3);
+
+save_regs:
+        stw     r0, 0(r4)
+        stw     r1, 0x4(r4)
+        stw     r2, 0x8(r4)
+        stmw    r11, 0xc(r4) /* 0xc -> 0x5f, (0x18*4-1) */
+
+        SAVE_SPRN(HID0, 0x18)
+        SAVE_SPRN(HID1, 0x19)
+        SAVE_SPRN(HID2, 0x1a)
+        mfmsr   r10
+        stw     r10, (4*0x1b)(r4)
+        /*SAVE_SPRN(LR, 0x1c) have to save it before the call */
+        /* 0x1d reserved by 0xf0 */
+        SAVE_SPRN(RPA,   0x1e)
+        SAVE_SPRN(SDR1,  0x1f)
+
+        /* save MMU regs */
+        SAVE_BAT(0, 0x20)
+        SAVE_BAT(1, 0x24)
+        SAVE_BAT(2, 0x28)
+        SAVE_BAT(3, 0x2c)
+        SAVE_BAT(4, 0x30)
+        SAVE_BAT(5, 0x34)
+        SAVE_BAT(6, 0x38)
+        SAVE_BAT(7, 0x3c)
+
+        SAVE_4SR(0, 0x40)
+        SAVE_4SR(4, 0x44)
+        SAVE_4SR(8, 0x48)
+        SAVE_4SR(12, 0x4c)
+
+        SAVE_SPRN(SPRG0, 0x50)
+        SAVE_SPRN(SPRG1, 0x51)
+        SAVE_SPRN(SPRG2, 0x52)
+        SAVE_SPRN(SPRG3, 0x53)
+        SAVE_SPRN(SPRG4, 0x54)
+        SAVE_SPRN(SPRG5, 0x55)
+        SAVE_SPRN(SPRG6, 0x56)
+        SAVE_SPRN(SPRG7, 0x57)
+
+        SAVE_SPRN(IABR,  0x58)
+        SAVE_SPRN(DABR,  0x59)
+        SAVE_SPRN(TBRL,  0x5a)
+        SAVE_SPRN(TBRU,  0x5b)
+
+        blr
+
+
+/* restore registers */
+#define LOAD_BAT(n, addr)               \
+        LOAD_SPRN(DBAT##n##L, addr);    \
+        LOAD_SPRN(DBAT##n##U, addr+1);  \
+        LOAD_SPRN(IBAT##n##L, addr+2);  \
+        LOAD_SPRN(IBAT##n##U, addr+3);
+
+#define LOAD_SR(n, addr)                \
+        lwz     r10, ((addr)*4)(r4);    \
+        mtsr    n, r10;
+
+#define LOAD_4SR(n, addr)       \
+        LOAD_SR(n, addr);       \
+        LOAD_SR(n+1, addr+1);   \
+        LOAD_SR(n+2, addr+2);   \
+        LOAD_SR(n+3, addr+3);
+
+restore_regs:
+        lis     r4, registers@h
+        ori     r4, r4, registers@l
+
+        /* MMU is not up yet */
+        subis   r4, r4, CONFIG_KERNEL_START@h
+
+        lwz     r0, 0(r4)
+        lwz     r1, 0x4(r4)
+        lwz     r2, 0x8(r4)
+        lmw     r11, 0xc(r4)
+
+        /*
+         * these are a bit tricky
+         *
+         * 0x18 - HID0
+         * 0x19 - HID1
+         * 0x1a - HID2
+         * 0x1b - MSR
+         * 0x1c - LR
+         * 0x1d - reserved by 0xf0 (BDI2000)
+         */
+        LOAD_SPRN(RPA,   0x1e);
+        LOAD_SPRN(SDR1,  0x1f);
+
+        /* restore MMU regs */
+        LOAD_BAT(0, 0x20)
+        LOAD_BAT(1, 0x24)
+        LOAD_BAT(2, 0x28)
+        LOAD_BAT(3, 0x2c)
+        LOAD_BAT(4, 0x30)
+        LOAD_BAT(5, 0x34)
+        LOAD_BAT(6, 0x38)
+        LOAD_BAT(7, 0x3c)
+
+        LOAD_4SR(0, 0x40)
+        LOAD_4SR(4, 0x44)
+        LOAD_4SR(8, 0x48)
+        LOAD_4SR(12, 0x4c)
+
+        /* rest of regs */
+        LOAD_SPRN(SPRG0, 0x50);
+        LOAD_SPRN(SPRG1, 0x51);
+        LOAD_SPRN(SPRG2, 0x52);
+        LOAD_SPRN(SPRG3, 0x53);
+        LOAD_SPRN(SPRG4, 0x54);
+        LOAD_SPRN(SPRG5, 0x55);
+        LOAD_SPRN(SPRG6, 0x56);
+        LOAD_SPRN(SPRG7, 0x57);
+
+        LOAD_SPRN(IABR,  0x58);
+        LOAD_SPRN(DABR,  0x59);
+        LOAD_SPRN(TBWL,  0x5a); /* these two have separate R/W regs */
+        LOAD_SPRN(TBWU,  0x5b);
+
+        blr
+
+
+
+/* cache flushing code. copied from arch/ppc/boot/util.S */
+#define NUM_CACHE_LINES (128*8)
+
+/*
+ * Flush data cache
+ * Do this by just reading lots of stuff into the cache.
+ */
+flush_data_cache:
+        lis     r3,CONFIG_KERNEL_START@h
+        ori     r3,r3,CONFIG_KERNEL_START@l
+        li      r4,NUM_CACHE_LINES
+        mtctr   r4
+1:
+        lwz     r4,0(r3)
+        addi    r3,r3,L1_CACHE_BYTES    /* Next line, please */
+        bdnz    1b
+        blr
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index 2dd415ff55a9..3bc201e07e6b 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -13,10 +13,9 @@
 #undef DEBUG
 
 #include <linux/kernel.h>
-
+#include <linux/of_platform.h>
 #include <asm/io.h>
 #include <asm/prom.h>
-#include <asm/of_platform.h>
 #include <asm/mpc52xx.h>
 
 
@@ -76,44 +75,33 @@ mpc52xx_find_ipb_freq(struct device_node *node)
 EXPORT_SYMBOL(mpc52xx_find_ipb_freq);
 
 
+/*
+ * Configure the XLB arbiter settings to match what Linux expects.
+ */
 void __init
-mpc52xx_setup_cpu(void)
+mpc5200_setup_xlb_arbiter(void)
 {
-        struct mpc52xx_cdm  __iomem *cdm;
         struct mpc52xx_xlb  __iomem *xlb;
 
-        /* Map zones */
-        cdm = mpc52xx_find_and_map("mpc5200-cdm");
         xlb = mpc52xx_find_and_map("mpc5200-xlb");
-
-        if (!cdm || !xlb) {
+        if (!xlb) {
                 printk(KERN_ERR __FILE__ ": "
-                        "Error while mapping CDM/XLB during mpc52xx_setup_cpu. "
+                        "Error mapping XLB in mpc52xx_setup_cpu().  "
                         "Expect some abnormal behavior\n");
-                goto unmap_regs;
+                return;
         }
 
-        /* Use internal 48 Mhz */
-        out_8(&cdm->ext_48mhz_en, 0x00);
-        out_8(&cdm->fd_enable, 0x01);
-        if (in_be32(&cdm->rstcfg) & 0x40)       /* Assumes 33Mhz clock */
-                out_be16(&cdm->fd_counters, 0x0001);
-        else
-                out_be16(&cdm->fd_counters, 0x5555);
-
         /* Configure the XLB Arbiter priorities */
         out_be32(&xlb->master_pri_enable, 0xff);
         out_be32(&xlb->master_priority, 0x11111111);
 
-        /* Disable XLB pipelining */
-        /* (cfr errate 292. We could do this only just before ATA PIO
-            transaction and re-enable it afterwards ...) */
+        /* Disable XLB pipelining
+         * (cfr errate 292. We could do this only just before ATA PIO
+         *  transaction and re-enable it afterwards ...)
+         */
         out_be32(&xlb->config, in_be32(&xlb->config) | MPC52xx_XLB_CFG_PLDIS);
 
-        /* Unmap zones */
-unmap_regs:
-        if (cdm) iounmap(cdm);
-        if (xlb) iounmap(xlb);
+        iounmap(xlb);
 }
 
 void __init
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index fbfff95b4437..61100f270c68 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -18,19 +18,9 @@
 
 #undef DEBUG
 
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/signal.h>
-#include <linux/stddef.h>
-#include <linux/delay.h>
 #include <linux/irq.h>
-#include <linux/hardirq.h>
-
+#include <linux/of.h>
 #include <asm/io.h>
-#include <asm/processor.h>
-#include <asm/system.h>
-#include <asm/irq.h>
 #include <asm/prom.h>
 #include <asm/mpc52xx.h>
 #include "mpc52xx_pic.h"
@@ -242,12 +232,6 @@ static struct irq_chip mpc52xx_sdma_irqchip = {
  * irq_host
 */
 
-static int mpc52xx_irqhost_match(struct irq_host *h, struct device_node *node)
-{
-        pr_debug("%s: node=%p\n", __func__, node);
-        return mpc52xx_irqhost->host_data == node;
-}
-
 static int mpc52xx_irqhost_xlate(struct irq_host *h, struct device_node *ct,
                                  u32 * intspec, unsigned int intsize,
                                  irq_hw_number_t * out_hwirq,
@@ -368,7 +352,6 @@ static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
 }
 
 static struct irq_host_ops mpc52xx_irqhost_ops = {
-        .match = mpc52xx_irqhost_match,
         .xlate = mpc52xx_irqhost_xlate,
         .map = mpc52xx_irqhost_map,
 };
@@ -420,14 +403,13 @@ void __init mpc52xx_init_irq(void)
          * hw irq information provided by the ofw to linux virq
          */
 
-        mpc52xx_irqhost = irq_alloc_host(IRQ_HOST_MAP_LINEAR,
+        mpc52xx_irqhost = irq_alloc_host(picnode, IRQ_HOST_MAP_LINEAR,
                                          MPC52xx_IRQ_HIGHTESTHWIRQ,
                                          &mpc52xx_irqhost_ops, -1);
 
         if (!mpc52xx_irqhost)
                 panic(__FILE__ ": Cannot allocate the IRQ host\n");
 
-        mpc52xx_irqhost->host_data = picnode;
         printk(KERN_INFO "MPC52xx PIC is up and running!\n");
 }
 
diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 89fde43895c5..541fbb815631 100644
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -1,17 +1,30 @@
 choice
         prompt "82xx Board Type"
         depends on PPC_82xx
-        default MPC82xx_ADS
+        default MPC8272_ADS
 
-config MPC82xx_ADS
-        bool "Freescale MPC82xx ADS"
+config MPC8272_ADS
+        bool "Freescale MPC8272 ADS"
         select DEFAULT_UIMAGE
         select PQ2ADS
         select 8272
         select 8260
         select FSL_SOC
+        select PQ2_ADS_PCI_PIC if PCI
+        select PPC_CPM_NEW_BINDING
         help
-        This option enables support for the MPC8272 ADS board
+          This option enables support for the MPC8272 ADS board
+
+config PQ2FADS
+        bool "Freescale PQ2FADS"
+        select DEFAULT_UIMAGE
+        select PQ2ADS
+        select 8260
+        select FSL_SOC
+        select PQ2_ADS_PCI_PIC if PCI
+        select PPC_CPM_NEW_BINDING
+        help
+          This option enables support for the PQ2FADS board
 
 endchoice
 
@@ -34,3 +47,6 @@ config 8272
         help
           The MPC8272 CPM has a different internal dpram setup than other CPM2
           devices
+
+config PQ2_ADS_PCI_PIC
+        bool
diff --git a/arch/powerpc/platforms/82xx/Makefile b/arch/powerpc/platforms/82xx/Makefile
index d9fd4c84d2e0..68c8b0c9772b 100644
--- a/arch/powerpc/platforms/82xx/Makefile
+++ b/arch/powerpc/platforms/82xx/Makefile
@@ -1,5 +1,7 @@
 #
 # Makefile for the PowerPC 82xx linux kernel.
 #
-obj-$(CONFIG_PPC_82xx) += mpc82xx.o
-obj-$(CONFIG_MPC82xx_ADS) += mpc82xx_ads.o
+obj-$(CONFIG_MPC8272_ADS) += mpc8272_ads.o
+obj-$(CONFIG_CPM2) += pq2.o
+obj-$(CONFIG_PQ2_ADS_PCI_PIC) += pq2ads-pci-pic.o
+obj-$(CONFIG_PQ2FADS) += pq2fads.o
diff --git a/arch/powerpc/platforms/82xx/m82xx_pci.h b/arch/powerpc/platforms/82xx/m82xx_pci.h
index 9cd8893b5a32..65e38a7ff48f 100644
--- a/arch/powerpc/platforms/82xx/m82xx_pci.h
+++ b/arch/powerpc/platforms/82xx/m82xx_pci.h
@@ -8,8 +8,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <asm/m8260_pci.h>
-
 #define SIU_INT_IRQ1   ((uint)0x13 + CPM_IRQ_OFFSET)
 
 #ifndef _IO_BASE
diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c
new file mode 100644
index 000000000000..fd83440eb287
--- /dev/null
+++ b/arch/powerpc/platforms/82xx/mpc8272_ads.c
@@ -0,0 +1,196 @@
+/*
+ * MPC8272 ADS board support
+ *
+ * Copyright 2007 Freescale Semiconductor, Inc.
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Based on code by Vitaly Bordug <vbordug@ru.mvista.com>
+ * Copyright (c) 2006 MontaVista Software, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/fsl_devices.h>
+#include <linux/of_platform.h>
+#include <linux/io.h>
+
+#include <asm/cpm2.h>
+#include <asm/udbg.h>
+#include <asm/machdep.h>
+#include <asm/time.h>
+
+#include <platforms/82xx/pq2.h>
+
+#include <sysdev/fsl_soc.h>
+#include <sysdev/cpm2_pic.h>
+
+#include "pq2ads.h"
+#include "pq2.h"
+
+static void __init mpc8272_ads_pic_init(void)
+{
+        struct device_node *np = of_find_compatible_node(NULL, NULL,
+                                                         "fsl,cpm2-pic");
+        if (!np) {
+                printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");
+                return;
+        }
+
+        cpm2_pic_init(np);
+        of_node_put(np);
+
+        /* Initialize stuff for the 82xx CPLD IC and install demux  */
+        pq2ads_pci_init_irq();
+}
+
+struct cpm_pin {
+        int port, pin, flags;
+};
+
+static struct cpm_pin mpc8272_ads_pins[] = {
+        /* SCC1 */
+        {3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+
+        /* SCC4 */
+        {3, 21, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {3, 22, 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, 21, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 22, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+
+        /* FCC2 */
+        {1, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 20, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 21, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 22, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 23, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 24, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 25, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 26, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 27, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {1, 30, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 31, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {2, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+};
+
+static void __init init_ioports(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(mpc8272_ads_pins); i++) {
+                struct cpm_pin *pin = &mpc8272_ads_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_SCC4, CPM_BRG4, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_SCC4, CPM_BRG4, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK11, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK10, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK15, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK16, CPM_CLK_TX);
+}
+
+static void __init mpc8272_ads_setup_arch(void)
+{
+        struct device_node *np;
+        __be32 __iomem *bcsr;
+
+        if (ppc_md.progress)
+                ppc_md.progress("mpc8272_ads_setup_arch()", 0);
+
+        cpm2_reset();
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,mpc8272ads-bcsr");
+        if (!np) {
+                printk(KERN_ERR "No bcsr in device tree\n");
+                return;
+        }
+
+        bcsr = of_iomap(np, 0);
+        if (!bcsr) {
+                printk(KERN_ERR "Cannot map BCSR registers\n");
+                return;
+        }
+
+        of_node_put(np);
+
+        clrbits32(&bcsr[1], BCSR1_RS232_EN1 | BCSR1_RS232_EN2 | BCSR1_FETHIEN);
+        setbits32(&bcsr[1], BCSR1_FETH_RST);
+
+        clrbits32(&bcsr[3], BCSR3_FETHIEN2);
+        setbits32(&bcsr[3], BCSR3_FETH2_RST);
+
+        iounmap(bcsr);
+
+        init_ioports();
+        pq2_init_pci();
+
+        if (ppc_md.progress)
+                ppc_md.progress("mpc8272_ads_setup_arch(), finish", 0);
+}
+
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .name = "soc", },
+        { .name = "cpm", },
+        { .name = "localbus", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        if (!machine_is(mpc8272_ads))
+                return 0;
+
+        /* Publish the QE devices */
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        return 0;
+}
+device_initcall(declare_of_platform_devices);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init mpc8272_ads_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        return of_flat_dt_is_compatible(root, "fsl,mpc8272ads");
+}
+
+define_machine(mpc8272_ads)
+{
+        .name = "Freescale MPC8272 ADS",
+        .probe = mpc8272_ads_probe,
+        .setup_arch = mpc8272_ads_setup_arch,
+        .init_IRQ = mpc8272_ads_pic_init,
+        .get_irq = cpm2_get_irq,
+        .calibrate_decr = generic_calibrate_decr,
+        .restart = pq2_restart,
+        .progress = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/82xx/mpc82xx.c b/arch/powerpc/platforms/82xx/mpc82xx.c
deleted file mode 100644
index cc9900d2e5ee..000000000000
--- a/arch/powerpc/platforms/82xx/mpc82xx.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * MPC82xx setup and early boot code plus other random bits.
- *
- * Author: Vitaly Bordug <vbordug@ru.mvista.com>
- *
- * Copyright (c) 2006 MontaVista Software, Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License 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/reboot.h>
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/kdev_t.h>
-#include <linux/major.h>
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/seq_file.h>
-#include <linux/root_dev.h>
-#include <linux/initrd.h>
-#include <linux/module.h>
-#include <linux/fsl_devices.h>
-#include <linux/fs_uart_pd.h>
-
-#include <asm/system.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/atomic.h>
-#include <asm/time.h>
-#include <asm/io.h>
-#include <asm/machdep.h>
-#include <asm/bootinfo.h>
-#include <asm/pci-bridge.h>
-#include <asm/mpc8260.h>
-#include <asm/irq.h>
-#include <mm/mmu_decl.h>
-#include <asm/prom.h>
-#include <asm/cpm2.h>
-#include <asm/udbg.h>
-#include <asm/i8259.h>
-#include <linux/fs_enet_pd.h>
-
-#include <sysdev/fsl_soc.h>
-#include <sysdev/cpm2_pic.h>
-
-#include "pq2ads.h"
-
-static int __init get_freq(char *name, unsigned long *val)
-{
-        struct device_node *cpu;
-        const unsigned int *fp;
-        int found = 0;
-
-        /* The cpu node should have timebase and clock frequency properties */
-        cpu = of_find_node_by_type(NULL, "cpu");
-
-        if (cpu) {
-                fp = of_get_property(cpu, name, NULL);
-                if (fp) {
-                        found = 1;
-                        *val = *fp;
-                }
-
-                of_node_put(cpu);
-        }
-
-        return found;
-}
-
-void __init m82xx_calibrate_decr(void)
-{
-        ppc_tb_freq = 125000000;
-        if (!get_freq("bus-frequency", &ppc_tb_freq)) {
-                printk(KERN_ERR "WARNING: Estimating decrementer frequency "
-                                "(not found)\n");
-        }
-        ppc_tb_freq /= 4;
-        ppc_proc_freq = 1000000000;
-        if (!get_freq("clock-frequency", &ppc_proc_freq))
-                printk(KERN_ERR "WARNING: Estimating processor frequency"
-                                "(not found)\n");
-}
-
-void mpc82xx_ads_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: Freescale Semiconductor\n");
-        seq_printf(m, "Machine\t\t: %s\n", CPUINFO_MACHINE);
-        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));
-}
diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
deleted file mode 100644
index 2d1b05b9f8ef..000000000000
--- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c
+++ /dev/null
@@ -1,641 +0,0 @@
-/*
- * MPC82xx_ads setup and early boot code plus other random bits.
- *
- * Author: Vitaly Bordug <vbordug@ru.mvista.com>
- * m82xx_restart fix by Wade Farnsworth <wfarnsworth@mvista.com>
- *
- * Copyright (c) 2006 MontaVista Software, Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License 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/reboot.h>
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/kdev_t.h>
-#include <linux/major.h>
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/seq_file.h>
-#include <linux/root_dev.h>
-#include <linux/initrd.h>
-#include <linux/module.h>
-#include <linux/fsl_devices.h>
-#include <linux/fs_uart_pd.h>
-
-#include <asm/system.h>
-#include <asm/pgtable.h>
-#include <asm/page.h>
-#include <asm/atomic.h>
-#include <asm/time.h>
-#include <asm/io.h>
-#include <asm/machdep.h>
-#include <asm/bootinfo.h>
-#include <asm/pci-bridge.h>
-#include <asm/mpc8260.h>
-#include <asm/irq.h>
-#include <mm/mmu_decl.h>
-#include <asm/prom.h>
-#include <asm/cpm2.h>
-#include <asm/udbg.h>
-#include <asm/i8259.h>
-#include <linux/fs_enet_pd.h>
-
-#include <sysdev/fsl_soc.h>
-#include <sysdev/cpm2_pic.h>
-
-#include "pq2ads.h"
-
-#ifdef CONFIG_PCI
-static uint pci_clk_frq;
-static struct {
-        unsigned long *pci_int_stat_reg;
-        unsigned long *pci_int_mask_reg;
-} pci_regs;
-
-static unsigned long pci_int_base;
-static struct irq_host *pci_pic_host;
-static struct device_node *pci_pic_node;
-#endif
-
-static void __init mpc82xx_ads_pic_init(void)
-{
-        struct device_node *np = of_find_compatible_node(NULL, "cpm-pic", "CPM2");
-        struct resource r;
-        cpm2_map_t *cpm_reg;
-
-        if (np == NULL) {
-                printk(KERN_ERR "PIC init: can not find cpm-pic node\n");
-                return;
-        }
-        if (of_address_to_resource(np, 0, &r)) {
-                printk(KERN_ERR "PIC init: invalid resource\n");
-                of_node_put(np);
-                return;
-        }
-        cpm2_pic_init(np);
-        of_node_put(np);
-
-        /* Initialize the default interrupt mapping priorities,
-         * in case the boot rom changed something on us.
-         */
-        cpm_reg = (cpm2_map_t *) ioremap(get_immrbase(), sizeof(cpm2_map_t));
-        cpm_reg->im_intctl.ic_siprr = 0x05309770;
-        iounmap(cpm_reg);
-#ifdef CONFIG_PCI
-        /* Initialize stuff for the 82xx CPLD IC and install demux  */
-        m82xx_pci_init_irq();
-#endif
-}
-
-static void init_fcc1_ioports(struct fs_platform_info *fpi)
-{
-        struct io_port *io;
-        u32 tempval;
-        cpm2_map_t *immap = ioremap(get_immrbase(), sizeof(cpm2_map_t));
-        struct device_node *np;
-        struct resource r;
-        u32 *bcsr;
-
-        np = of_find_node_by_type(NULL, "memory");
-        if (!np) {
-                printk(KERN_INFO "No memory node in device tree\n");
-                return;
-        }
-        if (of_address_to_resource(np, 1, &r)) {
-                printk(KERN_INFO "No memory reg property [1] in devicetree\n");
-                return;
-        }
-        of_node_put(np);
-        bcsr = ioremap(r.start + 4, sizeof(u32));
-        io = &immap->im_ioport;
-
-        /* Enable the PHY */
-        clrbits32(bcsr, BCSR1_FETHIEN);
-        setbits32(bcsr, BCSR1_FETH_RST);
-
-        /* FCC1 pins are on port A/C. */
-        /* Configure port A and C pins for FCC1 Ethernet. */
-
-        tempval = in_be32(&io->iop_pdira);
-        tempval &= ~PA1_DIRA0;
-        tempval |= PA1_DIRA1;
-        out_be32(&io->iop_pdira, tempval);
-
-        tempval = in_be32(&io->iop_psora);
-        tempval &= ~PA1_PSORA0;
-        tempval |= PA1_PSORA1;
-        out_be32(&io->iop_psora, tempval);
-
-        setbits32(&io->iop_ppara, PA1_DIRA0 | PA1_DIRA1);
-
-        /* Alter clocks */
-        tempval = PC_CLK(fpi->clk_tx - 8) | PC_CLK(fpi->clk_rx - 8);
-
-        clrbits32(&io->iop_psorc, tempval);
-        clrbits32(&io->iop_pdirc, tempval);
-        setbits32(&io->iop_pparc, tempval);
-
-        cpm2_clk_setup(CPM_CLK_FCC1, fpi->clk_rx, CPM_CLK_RX);
-        cpm2_clk_setup(CPM_CLK_FCC1, fpi->clk_tx, CPM_CLK_TX);
-
-        iounmap(bcsr);
-        iounmap(immap);
-}
-
-static void init_fcc2_ioports(struct fs_platform_info *fpi)
-{
-        cpm2_map_t *immap = ioremap(get_immrbase(), sizeof(cpm2_map_t));
-        struct device_node *np;
-        struct resource r;
-        u32 *bcsr;
-
-        struct io_port *io;
-        u32 tempval;
-
-        np = of_find_node_by_type(NULL, "memory");
-        if (!np) {
-                printk(KERN_INFO "No memory node in device tree\n");
-                return;
-        }
-        if (of_address_to_resource(np, 1, &r)) {
-                printk(KERN_INFO "No memory reg property [1] in devicetree\n");
-                return;
-        }
-        of_node_put(np);
-        io = &immap->im_ioport;
-        bcsr = ioremap(r.start + 12, sizeof(u32));
-
-        /* Enable the PHY */
-        clrbits32(bcsr, BCSR3_FETHIEN2);
-        setbits32(bcsr, BCSR3_FETH2_RST);
-
-        /* FCC2 are port B/C. */
-        /* Configure port A and C pins for FCC2 Ethernet. */
-
-        tempval = in_be32(&io->iop_pdirb);
-        tempval &= ~PB2_DIRB0;
-        tempval |= PB2_DIRB1;
-        out_be32(&io->iop_pdirb, tempval);
-
-        tempval = in_be32(&io->iop_psorb);
-        tempval &= ~PB2_PSORB0;
-        tempval |= PB2_PSORB1;
-        out_be32(&io->iop_psorb, tempval);
-
-        setbits32(&io->iop_pparb, PB2_DIRB0 | PB2_DIRB1);
-
-        tempval = PC_CLK(fpi->clk_tx - 8) | PC_CLK(fpi->clk_rx - 8);
-
-        /* Alter clocks */
-        clrbits32(&io->iop_psorc, tempval);
-        clrbits32(&io->iop_pdirc, tempval);
-        setbits32(&io->iop_pparc, tempval);
-
-        cpm2_clk_setup(CPM_CLK_FCC2, fpi->clk_rx, CPM_CLK_RX);
-        cpm2_clk_setup(CPM_CLK_FCC2, fpi->clk_tx, CPM_CLK_TX);
-
-        iounmap(bcsr);
-        iounmap(immap);
-}
-
-void init_fcc_ioports(struct fs_platform_info *fpi)
-{
-        int fcc_no = fs_get_fcc_index(fpi->fs_no);
-
-        switch (fcc_no) {
-        case 0:
-                init_fcc1_ioports(fpi);
-                break;
-        case 1:
-                init_fcc2_ioports(fpi);
-                break;
-        default:
-                printk(KERN_ERR "init_fcc_ioports: invalid FCC number\n");
-                return;
-        }
-}
-
-static void init_scc1_uart_ioports(struct fs_uart_platform_info *data)
-{
-        cpm2_map_t *immap = ioremap(get_immrbase(), sizeof(cpm2_map_t));
-
-        /* SCC1 is only on port D */
-        setbits32(&immap->im_ioport.iop_ppard, 0x00000003);
-        clrbits32(&immap->im_ioport.iop_psord, 0x00000001);
-        setbits32(&immap->im_ioport.iop_psord, 0x00000002);
-        clrbits32(&immap->im_ioport.iop_pdird, 0x00000001);
-        setbits32(&immap->im_ioport.iop_pdird, 0x00000002);
-
-        clrbits32(&immap->im_cpmux.cmx_scr, (0x00000007 << (4 - data->clk_tx)));
-        clrbits32(&immap->im_cpmux.cmx_scr, (0x00000038 << (4 - data->clk_rx)));
-        setbits32(&immap->im_cpmux.cmx_scr,
-                  ((data->clk_tx - 1) << (4 - data->clk_tx)));
-        setbits32(&immap->im_cpmux.cmx_scr,
-                  ((data->clk_rx - 1) << (4 - data->clk_rx)));
-
-        iounmap(immap);
-}
-
-static void init_scc4_uart_ioports(struct fs_uart_platform_info *data)
-{
-        cpm2_map_t *immap = ioremap(get_immrbase(), sizeof(cpm2_map_t));
-
-        setbits32(&immap->im_ioport.iop_ppard, 0x00000600);
-        clrbits32(&immap->im_ioport.iop_psord, 0x00000600);
-        clrbits32(&immap->im_ioport.iop_pdird, 0x00000200);
-        setbits32(&immap->im_ioport.iop_pdird, 0x00000400);
-
-        clrbits32(&immap->im_cpmux.cmx_scr, (0x00000007 << (4 - data->clk_tx)));
-        clrbits32(&immap->im_cpmux.cmx_scr, (0x00000038 << (4 - data->clk_rx)));
-        setbits32(&immap->im_cpmux.cmx_scr,
-                  ((data->clk_tx - 1) << (4 - data->clk_tx)));
-        setbits32(&immap->im_cpmux.cmx_scr,
-                  ((data->clk_rx - 1) << (4 - data->clk_rx)));
-
-        iounmap(immap);
-}
-
-void init_scc_ioports(struct fs_uart_platform_info *data)
-{
-        int scc_no = fs_get_scc_index(data->fs_no);
-
-        switch (scc_no) {
-        case 0:
-                init_scc1_uart_ioports(data);
-                data->brg = data->clk_rx;
-                break;
-        case 3:
-                init_scc4_uart_ioports(data);
-                data->brg = data->clk_rx;
-                break;
-        default:
-                printk(KERN_ERR "init_scc_ioports: invalid SCC number\n");
-                return;
-        }
-}
-
-void __init m82xx_board_setup(void)
-{
-        cpm2_map_t *immap = ioremap(get_immrbase(), sizeof(cpm2_map_t));
-        struct device_node *np;
-        struct resource r;
-        u32 *bcsr;
-
-        np = of_find_node_by_type(NULL, "memory");
-        if (!np) {
-                printk(KERN_INFO "No memory node in device tree\n");
-                return;
-        }
-        if (of_address_to_resource(np, 1, &r)) {
-                printk(KERN_INFO "No memory reg property [1] in devicetree\n");
-                return;
-        }
-        of_node_put(np);
-        bcsr = ioremap(r.start + 4, sizeof(u32));
-        /* Enable the 2nd UART port */
-        clrbits32(bcsr, BCSR1_RS232_EN2);
-
-#ifdef CONFIG_SERIAL_CPM_SCC1
-        clrbits32((u32 *) & immap->im_scc[0].scc_sccm,
-                  UART_SCCM_TX | UART_SCCM_RX);
-        clrbits32((u32 *) & immap->im_scc[0].scc_gsmrl,
-                  SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC2
-        clrbits32((u32 *) & immap->im_scc[1].scc_sccm,
-                  UART_SCCM_TX | UART_SCCM_RX);
-        clrbits32((u32 *) & immap->im_scc[1].scc_gsmrl,
-                  SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC3
-        clrbits32((u32 *) & immap->im_scc[2].scc_sccm,
-                  UART_SCCM_TX | UART_SCCM_RX);
-        clrbits32((u32 *) & immap->im_scc[2].scc_gsmrl,
-                  SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SCC4
-        clrbits32((u32 *) & immap->im_scc[3].scc_sccm,
-                  UART_SCCM_TX | UART_SCCM_RX);
-        clrbits32((u32 *) & immap->im_scc[3].scc_gsmrl,
-                  SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-#endif
-
-        iounmap(bcsr);
-        iounmap(immap);
-}
-
-#ifdef CONFIG_PCI
-static void m82xx_pci_mask_irq(unsigned int irq)
-{
-        int bit = irq - pci_int_base;
-
-        *pci_regs.pci_int_mask_reg |= (1 << (31 - bit));
-        return;
-}
-
-static void m82xx_pci_unmask_irq(unsigned int irq)
-{
-        int bit = irq - pci_int_base;
-
-        *pci_regs.pci_int_mask_reg &= ~(1 << (31 - bit));
-        return;
-}
-
-static void m82xx_pci_mask_and_ack(unsigned int irq)
-{
-        int bit = irq - pci_int_base;
-
-        *pci_regs.pci_int_mask_reg |= (1 << (31 - bit));
-        return;
-}
-
-static void m82xx_pci_end_irq(unsigned int irq)
-{
-        int bit = irq - pci_int_base;
-
-        *pci_regs.pci_int_mask_reg &= ~(1 << (31 - bit));
-        return;
-}
-
-struct hw_interrupt_type m82xx_pci_ic = {
-        .typename = "MPC82xx ADS PCI",
-        .name = "MPC82xx ADS PCI",
-        .enable = m82xx_pci_unmask_irq,
-        .disable = m82xx_pci_mask_irq,
-        .ack = m82xx_pci_mask_and_ack,
-        .end = m82xx_pci_end_irq,
-        .mask = m82xx_pci_mask_irq,
-        .mask_ack = m82xx_pci_mask_and_ack,
-        .unmask = m82xx_pci_unmask_irq,
-        .eoi = m82xx_pci_end_irq,
-};
-
-static void
-m82xx_pci_irq_demux(unsigned int irq, struct irq_desc *desc)
-{
-        unsigned long stat, mask, pend;
-        int bit;
-
-        for (;;) {
-                stat = *pci_regs.pci_int_stat_reg;
-                mask = *pci_regs.pci_int_mask_reg;
-                pend = stat & ~mask & 0xf0000000;
-                if (!pend)
-                        break;
-                for (bit = 0; pend != 0; ++bit, pend <<= 1) {
-                        if (pend & 0x80000000)
-                                __do_IRQ(pci_int_base + bit);
-                }
-        }
-}
-
-static int pci_pic_host_match(struct irq_host *h, struct device_node *node)
-{
-        return node == pci_pic_node;
-}
-
-static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
-                            irq_hw_number_t hw)
-{
-        get_irq_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip(virq, &m82xx_pci_ic);
-        return 0;
-}
-
-static void pci_host_unmap(struct irq_host *h, unsigned int virq)
-{
-        /* remove chip and handler */
-        set_irq_chip(virq, NULL);
-}
-
-static struct irq_host_ops pci_pic_host_ops = {
-        .match = pci_pic_host_match,
-        .map = pci_pic_host_map,
-        .unmap = pci_host_unmap,
-};
-
-void m82xx_pci_init_irq(void)
-{
-        int irq;
-        cpm2_map_t *immap;
-        struct device_node *np;
-        struct resource r;
-        const u32 *regs;
-        unsigned int size;
-        const u32 *irq_map;
-        int i;
-        unsigned int irq_max, irq_min;
-
-        if ((np = of_find_node_by_type(NULL, "soc")) == NULL) {
-                printk(KERN_INFO "No SOC node in device tree\n");
-                return;
-        }
-        memset(&r, 0, sizeof(r));
-        if (of_address_to_resource(np, 0, &r)) {
-                printk(KERN_INFO "No SOC reg property in device tree\n");
-                return;
-        }
-        immap = ioremap(r.start, sizeof(*immap));
-        of_node_put(np);
-
-        /* install the demultiplexer for the PCI cascade interrupt */
-        np = of_find_node_by_type(NULL, "pci");
-        if (!np) {
-                printk(KERN_INFO "No pci node on device tree\n");
-                iounmap(immap);
-                return;
-        }
-        irq_map = of_get_property(np, "interrupt-map", &size);
-        if ((!irq_map) || (size <= 7)) {
-                printk(KERN_INFO "No interrupt-map property of pci node\n");
-                iounmap(immap);
-                return;
-        }
-        size /= sizeof(irq_map[0]);
-        for (i = 0, irq_max = 0, irq_min = 512; i < size; i += 7, irq_map += 7) {
-                if (irq_map[5] < irq_min)
-                        irq_min = irq_map[5];
-                if (irq_map[5] > irq_max)
-                        irq_max = irq_map[5];
-        }
-        pci_int_base = irq_min;
-        irq = irq_of_parse_and_map(np, 0);
-        set_irq_chained_handler(irq, m82xx_pci_irq_demux);
-        of_node_put(np);
-        np = of_find_node_by_type(NULL, "pci-pic");
-        if (!np) {
-                printk(KERN_INFO "No pci pic node on device tree\n");
-                iounmap(immap);
-                return;
-        }
-        pci_pic_node = of_node_get(np);
-        /* PCI interrupt controller registers: status and mask */
-        regs = of_get_property(np, "reg", &size);
-        if ((!regs) || (size <= 2)) {
-                printk(KERN_INFO "No reg property in pci pic node\n");
-                iounmap(immap);
-                return;
-        }
-        pci_regs.pci_int_stat_reg =
-            ioremap(regs[0], sizeof(*pci_regs.pci_int_stat_reg));
-        pci_regs.pci_int_mask_reg =
-            ioremap(regs[1], sizeof(*pci_regs.pci_int_mask_reg));
-        of_node_put(np);
-        /* configure chip select for PCI interrupt controller */
-        immap->im_memctl.memc_br3 = regs[0] | 0x00001801;
-        immap->im_memctl.memc_or3 = 0xffff8010;
-        /* make PCI IRQ level sensitive */
-        immap->im_intctl.ic_siexr &= ~(1 << (14 - (irq - SIU_INT_IRQ1)));
-
-        /* mask all PCI interrupts */
-        *pci_regs.pci_int_mask_reg |= 0xfff00000;
-        iounmap(immap);
-        pci_pic_host =
-            irq_alloc_host(IRQ_HOST_MAP_LINEAR, irq_max - irq_min + 1,
-                           &pci_pic_host_ops, irq_max + 1);
-        return;
-}
-
-static int m82xx_pci_exclude_device(struct pci_controller *hose,
-                                    u_char bus, u_char devfn)
-{
-        if (bus == 0 && PCI_SLOT(devfn) == 0)
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        else
-                return PCIBIOS_SUCCESSFUL;
-}
-
-static void __init mpc82xx_add_bridge(struct device_node *np)
-{
-        int len;
-        struct pci_controller *hose;
-        struct resource r;
-        const int *bus_range;
-        const uint *ptr;
-
-        memset(&r, 0, sizeof(r));
-        if (of_address_to_resource(np, 0, &r)) {
-                printk(KERN_INFO "No PCI reg property in device tree\n");
-                return;
-        }
-        if (!(ptr = of_get_property(np, "clock-frequency", NULL))) {
-                printk(KERN_INFO "No clock-frequency property in PCI node");
-                return;
-        }
-        pci_clk_frq = *ptr;
-        of_node_put(np);
-        bus_range = of_get_property(np, "bus-range", &len);
-        if (bus_range == NULL || len < 2 * sizeof(int)) {
-                printk(KERN_WARNING "Can't get bus-range for %s, assume"
-                       " bus 0\n", np->full_name);
-        }
-
-        pci_assign_all_buses = 1;
-
-        hose = pcibios_alloc_controller(np);
-
-        if (!hose)
-                return;
-
-        hose->first_busno = bus_range ? bus_range[0] : 0;
-        hose->last_busno = bus_range ? bus_range[1] : 0xff;
-
-        setup_indirect_pci(hose,
-                           r.start + offsetof(pci_cpm2_t, pci_cfg_addr),
-                           r.start + offsetof(pci_cpm2_t, pci_cfg_data),
-                           0);
-
-        pci_process_bridge_OF_ranges(hose, np, 1);
-}
-#endif
-
-/*
- * Setup the architecture
- */
-static void __init mpc82xx_ads_setup_arch(void)
-{
-#ifdef CONFIG_PCI
-        struct device_node *np;
-#endif
-
-        if (ppc_md.progress)
-                ppc_md.progress("mpc82xx_ads_setup_arch()", 0);
-        cpm2_reset();
-
-        /* Map I/O region to a 256MB BAT */
-
-        m82xx_board_setup();
-
-#ifdef CONFIG_PCI
-        ppc_md.pci_exclude_device = m82xx_pci_exclude_device;
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                mpc82xx_add_bridge(np);
-
-        of_node_put(np);
-#endif
-
-#ifdef  CONFIG_ROOT_NFS
-        ROOT_DEV = Root_NFS;
-#else
-        ROOT_DEV = Root_HDA1;
-#endif
-
-        if (ppc_md.progress)
-                ppc_md.progress("mpc82xx_ads_setup_arch(), finish", 0);
-}
-
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mpc82xx_ads_probe(void)
-{
-        /* We always match for now, eventually we should look at
-         * the flat dev tree to ensure this is the board we are
-         * supposed to run on
-         */
-        return 1;
-}
-
-#define RMR_CSRE 0x00000001
-static void m82xx_restart(char *cmd)
-{
-        __volatile__ unsigned char dummy;
-
-        local_irq_disable();
-        ((cpm2_map_t *) cpm2_immr)->im_clkrst.car_rmr |= RMR_CSRE;
-
-        /* Clear the ME,EE,IR & DR bits in MSR to cause checkstop */
-        mtmsr(mfmsr() & ~(MSR_ME | MSR_EE | MSR_IR | MSR_DR));
-        dummy = ((cpm2_map_t *) cpm2_immr)->im_clkrst.res[0];
-        printk("Restart failed\n");
-        while (1) ;
-}
-
-static void m82xx_halt(void)
-{
-        local_irq_disable();
-        while (1) ;
-}
-
-define_machine(mpc82xx_ads)
-{
-        .name = "MPC82xx ADS",
-        .probe = mpc82xx_ads_probe,
-        .setup_arch =    mpc82xx_ads_setup_arch,
-        .init_IRQ =    mpc82xx_ads_pic_init,
-        .show_cpuinfo =    mpc82xx_ads_show_cpuinfo,
-        .get_irq =    cpm2_get_irq,
-        .calibrate_decr =    m82xx_calibrate_decr,
-        .restart = m82xx_restart,.halt = m82xx_halt,
-};
diff --git a/arch/powerpc/platforms/82xx/pq2.c b/arch/powerpc/platforms/82xx/pq2.c
new file mode 100644
index 000000000000..a497cbaa1ac5
--- /dev/null
+++ b/arch/powerpc/platforms/82xx/pq2.c
@@ -0,0 +1,82 @@
+/*
+ * Common PowerQUICC II code.
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ * Copyright (c) 2007 Freescale Semiconductor
+ *
+ * Based on code by Vitaly Bordug <vbordug@ru.mvista.com>
+ * pq2_restart fix by Wade Farnsworth <wfarnsworth@mvista.com>
+ * Copyright (c) 2006 MontaVista Software, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <asm/cpm2.h>
+#include <asm/io.h>
+#include <asm/pci-bridge.h>
+#include <asm/system.h>
+
+#include <platforms/82xx/pq2.h>
+
+#define RMR_CSRE 0x00000001
+
+void pq2_restart(char *cmd)
+{
+        local_irq_disable();
+        setbits32(&cpm2_immr->im_clkrst.car_rmr, RMR_CSRE);
+
+        /* Clear the ME,EE,IR & DR bits in MSR to cause checkstop */
+        mtmsr(mfmsr() & ~(MSR_ME | MSR_EE | MSR_IR | MSR_DR));
+        in_8(&cpm2_immr->im_clkrst.res[0]);
+
+        panic("Restart failed\n");
+}
+
+#ifdef CONFIG_PCI
+static int pq2_pci_exclude_device(struct pci_controller *hose,
+                                  u_char bus, u8 devfn)
+{
+        if (bus == 0 && PCI_SLOT(devfn) == 0)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        else
+                return PCIBIOS_SUCCESSFUL;
+}
+
+static void __init pq2_pci_add_bridge(struct device_node *np)
+{
+        struct pci_controller *hose;
+        struct resource r;
+
+        if (of_address_to_resource(np, 0, &r) || r.end - r.start < 0x10b)
+                goto err;
+
+        pci_assign_all_buses = 1;
+
+        hose = pcibios_alloc_controller(np);
+        if (!hose)
+                return;
+
+        hose->arch_data = np;
+
+        setup_indirect_pci(hose, r.start + 0x100, r.start + 0x104, 0);
+        pci_process_bridge_OF_ranges(hose, np, 1);
+
+        return;
+
+err:
+        printk(KERN_ERR "No valid PCI reg property in device tree\n");
+}
+
+void __init pq2_init_pci(void)
+{
+        struct device_node *np = NULL;
+
+        ppc_md.pci_exclude_device = pq2_pci_exclude_device;
+
+        while ((np = of_find_compatible_node(np, NULL, "fsl,pq2-pci")))
+                pq2_pci_add_bridge(np);
+}
+#endif
diff --git a/arch/powerpc/platforms/82xx/pq2.h b/arch/powerpc/platforms/82xx/pq2.h
new file mode 100644
index 000000000000..a41f84ae2325
--- /dev/null
+++ b/arch/powerpc/platforms/82xx/pq2.h
@@ -0,0 +1,20 @@
+#ifndef _PQ2_H
+#define _PQ2_H
+
+void pq2_restart(char *cmd);
+
+#ifdef CONFIG_PCI
+int pq2ads_pci_init_irq(void);
+void pq2_init_pci(void);
+#else
+static inline int pq2ads_pci_init_irq(void)
+{
+        return 0;
+}
+
+static inline void pq2_init_pci(void)
+{
+}
+#endif
+
+#endif
diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
new file mode 100644
index 000000000000..a8013816125c
--- /dev/null
+++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
@@ -0,0 +1,195 @@
+/*
+ * PQ2 ADS-style PCI interrupt controller
+ *
+ * Copyright 2007 Freescale Semiconductor, Inc.
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Loosely based on mpc82xx ADS support by Vitaly Bordug <vbordug@ru.mvista.com>
+ * Copyright (c) 2006 MontaVista Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/irq.h>
+#include <linux/types.h>
+#include <linux/bootmem.h>
+
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/cpm2.h>
+
+#include "pq2.h"
+
+static DEFINE_SPINLOCK(pci_pic_lock);
+
+struct pq2ads_pci_pic {
+        struct device_node *node;
+        struct irq_host *host;
+
+        struct {
+                u32 stat;
+                u32 mask;
+        } __iomem *regs;
+};
+
+#define NUM_IRQS 32
+
+static void pq2ads_pci_mask_irq(unsigned int virq)
+{
+        struct pq2ads_pci_pic *priv = get_irq_chip_data(virq);
+        int irq = NUM_IRQS - virq_to_hw(virq) - 1;
+
+        if (irq != -1) {
+                unsigned long flags;
+                spin_lock_irqsave(&pci_pic_lock, flags);
+
+                setbits32(&priv->regs->mask, 1 << irq);
+                mb();
+
+                spin_unlock_irqrestore(&pci_pic_lock, flags);
+        }
+}
+
+static void pq2ads_pci_unmask_irq(unsigned int virq)
+{
+        struct pq2ads_pci_pic *priv = get_irq_chip_data(virq);
+        int irq = NUM_IRQS - virq_to_hw(virq) - 1;
+
+        if (irq != -1) {
+                unsigned long flags;
+
+                spin_lock_irqsave(&pci_pic_lock, flags);
+                clrbits32(&priv->regs->mask, 1 << irq);
+                spin_unlock_irqrestore(&pci_pic_lock, flags);
+        }
+}
+
+static struct irq_chip pq2ads_pci_ic = {
+        .typename = "PQ2 ADS PCI",
+        .name = "PQ2 ADS PCI",
+        .end = pq2ads_pci_unmask_irq,
+        .mask = pq2ads_pci_mask_irq,
+        .mask_ack = pq2ads_pci_mask_irq,
+        .ack = pq2ads_pci_mask_irq,
+        .unmask = pq2ads_pci_unmask_irq,
+        .enable = pq2ads_pci_unmask_irq,
+        .disable = pq2ads_pci_mask_irq
+};
+
+static void pq2ads_pci_irq_demux(unsigned int irq, struct irq_desc *desc)
+{
+        struct pq2ads_pci_pic *priv = desc->handler_data;
+        u32 stat, mask, pend;
+        int bit;
+
+        for (;;) {
+                stat = in_be32(&priv->regs->stat);
+                mask = in_be32(&priv->regs->mask);
+
+                pend = stat & ~mask;
+
+                if (!pend)
+                        break;
+
+                for (bit = 0; pend != 0; ++bit, pend <<= 1) {
+                        if (pend & 0x80000000) {
+                                int virq = irq_linear_revmap(priv->host, bit);
+                                generic_handle_irq(virq);
+                        }
+                }
+        }
+}
+
+static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
+                            irq_hw_number_t hw)
+{
+        get_irq_desc(virq)->status |= IRQ_LEVEL;
+        set_irq_chip_data(virq, h->host_data);
+        set_irq_chip(virq, &pq2ads_pci_ic);
+        return 0;
+}
+
+static void pci_host_unmap(struct irq_host *h, unsigned int virq)
+{
+        /* remove chip and handler */
+        set_irq_chip_data(virq, NULL);
+        set_irq_chip(virq, NULL);
+}
+
+static struct irq_host_ops pci_pic_host_ops = {
+        .map = pci_pic_host_map,
+        .unmap = pci_host_unmap,
+};
+
+int __init pq2ads_pci_init_irq(void)
+{
+        struct pq2ads_pci_pic *priv;
+        struct irq_host *host;
+        struct device_node *np;
+        int ret = -ENODEV;
+        int irq;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,pq2ads-pci-pic");
+        if (!np) {
+                printk(KERN_ERR "No pci pic node in device tree.\n");
+                of_node_put(np);
+                goto out;
+        }
+
+        irq = irq_of_parse_and_map(np, 0);
+        if (irq == NO_IRQ) {
+                printk(KERN_ERR "No interrupt in pci pic node.\n");
+                of_node_put(np);
+                goto out;
+        }
+
+        priv = alloc_bootmem(sizeof(struct pq2ads_pci_pic));
+        if (!priv) {
+                of_node_put(np);
+                ret = -ENOMEM;
+                goto out_unmap_irq;
+        }
+
+        /* PCI interrupt controller registers: status and mask */
+        priv->regs = of_iomap(np, 0);
+        if (!priv->regs) {
+                printk(KERN_ERR "Cannot map PCI PIC registers.\n");
+                goto out_free_bootmem;
+        }
+
+        /* mask all PCI interrupts */
+        out_be32(&priv->regs->mask, ~0);
+        mb();
+
+        host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, NUM_IRQS,
+                              &pci_pic_host_ops, NUM_IRQS);
+        if (!host) {
+                ret = -ENOMEM;
+                goto out_unmap_regs;
+        }
+
+        host->host_data = priv;
+
+        priv->host = host;
+        host->host_data = priv;
+        set_irq_data(irq, priv);
+        set_irq_chained_handler(irq, pq2ads_pci_irq_demux);
+
+        of_node_put(np);
+        return 0;
+
+out_unmap_regs:
+        iounmap(priv->regs);
+out_free_bootmem:
+        free_bootmem((unsigned long)priv,
+                     sizeof(sizeof(struct pq2ads_pci_pic)));
+        of_node_put(np);
+out_unmap_irq:
+        irq_dispose_mapping(irq);
+out:
+        return ret;
+}
diff --git a/arch/powerpc/platforms/82xx/pq2ads.h b/arch/powerpc/platforms/82xx/pq2ads.h
index 5b5cca6c8c88..984db42cc8e7 100644
--- a/arch/powerpc/platforms/82xx/pq2ads.h
+++ b/arch/powerpc/platforms/82xx/pq2ads.h
@@ -23,11 +23,6 @@
 #define __MACH_ADS8260_DEFS
 
 #include <linux/seq_file.h>
-#include <asm/ppcboot.h>
-
-/* For our show_cpuinfo hooks. */
-#define CPUINFO_VENDOR          "Freescale Semiconductor"
-#define CPUINFO_MACHINE         "PQ2 ADS PowerPC"
 
 /* Backword-compatibility stuff for the drivers */
 #define CPM_MAP_ADDR            ((uint)0xf0000000)
@@ -58,9 +53,5 @@
 #define SIU_INT_SCC3            ((uint)0x2a+CPM_IRQ_OFFSET)
 #define SIU_INT_SCC4            ((uint)0x2b+CPM_IRQ_OFFSET)
 
-void m82xx_pci_init_irq(void);
-void mpc82xx_ads_show_cpuinfo(struct seq_file*);
-void m82xx_calibrate_decr(void);
-
 #endif /* __MACH_ADS8260_DEFS */
 #endif /* __KERNEL__ */
diff --git a/arch/powerpc/platforms/82xx/pq2fads.c b/arch/powerpc/platforms/82xx/pq2fads.c
new file mode 100644
index 000000000000..4f457a9c79ae
--- /dev/null
+++ b/arch/powerpc/platforms/82xx/pq2fads.c
@@ -0,0 +1,198 @@
+/*
+ * PQ2FADS board support
+ *
+ * Copyright 2007 Freescale Semiconductor, Inc.
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Loosely based on mp82xx ADS support by Vitaly Bordug <vbordug@ru.mvista.com>
+ * Copyright (c) 2006 MontaVista Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/fsl_devices.h>
+
+#include <asm/io.h>
+#include <asm/cpm2.h>
+#include <asm/udbg.h>
+#include <asm/machdep.h>
+#include <asm/of_platform.h>
+#include <asm/time.h>
+
+#include <sysdev/fsl_soc.h>
+#include <sysdev/cpm2_pic.h>
+
+#include "pq2ads.h"
+#include "pq2.h"
+
+static void __init pq2fads_pic_init(void)
+{
+        struct device_node *np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");
+        if (!np) {
+                printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");
+                return;
+        }
+
+        cpm2_pic_init(np);
+        of_node_put(np);
+
+        /* Initialize stuff for the 82xx CPLD IC and install demux  */
+        pq2ads_pci_init_irq();
+}
+
+struct cpm_pin {
+        int port, pin, flags;
+};
+
+static struct cpm_pin pq2fads_pins[] = {
+        /* SCC1 */
+        {3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+
+        /* SCC2 */
+        {3, 27, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {3, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+
+        /* FCC2 */
+        {1, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 20, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 21, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 22, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 23, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 24, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 25, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 26, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 27, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {1, 30, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 31, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {2, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+
+        /* FCC3 */
+        {1, 4, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 5, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 6, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 7, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 9, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 10, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 11, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 12, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 13, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 14, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 15, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+};
+
+static void __init init_ioports(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(pq2fads_pins); i++) {
+                struct cpm_pin *pin = &pq2fads_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_FCC2, CPM_CLK13, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK14, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_FCC3, CPM_CLK15, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_FCC3, CPM_CLK16, CPM_CLK_TX);
+}
+
+static void __init pq2fads_setup_arch(void)
+{
+        struct device_node *np;
+        __be32 __iomem *bcsr;
+
+        if (ppc_md.progress)
+                ppc_md.progress("pq2fads_setup_arch()", 0);
+
+        cpm2_reset();
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,pq2fads-bcsr");
+        if (!np) {
+                printk(KERN_ERR "No fsl,pq2fads-bcsr in device tree\n");
+                return;
+        }
+
+        bcsr = of_iomap(np, 0);
+        if (!bcsr) {
+                printk(KERN_ERR "Cannot map BCSR registers\n");
+                return;
+        }
+
+        of_node_put(np);
+
+        /* Enable the serial and ethernet ports */
+
+        clrbits32(&bcsr[1], BCSR1_RS232_EN1 | BCSR1_RS232_EN2 | BCSR1_FETHIEN);
+        setbits32(&bcsr[1], BCSR1_FETH_RST);
+
+        clrbits32(&bcsr[3], BCSR3_FETHIEN2);
+        setbits32(&bcsr[3], BCSR3_FETH2_RST);
+
+        iounmap(bcsr);
+
+        init_ioports();
+
+        /* Enable external IRQs */
+        clrbits32(&cpm2_immr->im_siu_conf.siu_82xx.sc_siumcr, 0x0c000000);
+
+        pq2_init_pci();
+
+        if (ppc_md.progress)
+                ppc_md.progress("pq2fads_setup_arch(), finish", 0);
+}
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init pq2fads_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        return of_flat_dt_is_compatible(root, "fsl,pq2fads");
+}
+
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .name = "soc", },
+        { .name = "cpm", },
+        { .name = "localbus", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        if (!machine_is(pq2fads))
+                return 0;
+
+        /* Publish the QE devices */
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        return 0;
+}
+device_initcall(declare_of_platform_devices);
+
+define_machine(pq2fads)
+{
+        .name = "Freescale PQ2FADS",
+        .probe = pq2fads_probe,
+        .setup_arch = pq2fads_setup_arch,
+        .init_IRQ = pq2fads_pic_init,
+        .get_irq = cpm2_get_irq,
+        .calibrate_decr = generic_calibrate_decr,
+        .restart = pq2_restart,
+        .progress = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/83xx/mpc8313_rdb.c b/arch/powerpc/platforms/83xx/mpc8313_rdb.c
index 3edfe170a03b..33766b8f2594 100644
--- a/arch/powerpc/platforms/83xx/mpc8313_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc8313_rdb.c
@@ -43,10 +43,8 @@ static void __init mpc8313_rdb_setup_arch(void)
                 ppc_md.progress("mpc8313_rdb_setup_arch()", 0);
 
 #ifdef CONFIG_PCI
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
                 mpc83xx_add_bridge(np);
-
-        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
         mpc831x_usb_cfg();
 }
diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 2c8e641a739b..972fa8528a8c 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -32,7 +32,6 @@
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
-#include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
@@ -74,9 +73,8 @@ static void __init mpc832x_sys_setup_arch(void)
         }
 
 #ifdef CONFIG_PCI
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
                 mpc83xx_add_bridge(np);
-        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
 
 #ifdef CONFIG_QUICC_ENGINE
@@ -142,7 +140,7 @@ static void __init mpc832x_sys_init_IRQ(void)
         if (!np)
                 return;
 
-        qe_ic_init(np, 0);
+        qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
         of_node_put(np);
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index 090906170a41..fbca336aa0ae 100644
--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/pci.h>
+#include <linux/spi/spi.h>
 
 #include <asm/of_platform.h>
 #include <asm/time.h>
@@ -22,6 +23,7 @@
 #include <asm/udbg.h>
 #include <asm/qe.h>
 #include <asm/qe_ic.h>
+#include <sysdev/fsl_soc.h>
 
 #include "mpc83xx.h"
 
@@ -32,6 +34,50 @@
 #define DBG(fmt...)
 #endif
 
+static void mpc83xx_spi_activate_cs(u8 cs, u8 polarity)
+{
+        pr_debug("%s %d %d\n", __func__, cs, polarity);
+        par_io_data_set(3, 13, polarity);
+}
+
+static void mpc83xx_spi_deactivate_cs(u8 cs, u8 polarity)
+{
+        pr_debug("%s %d %d\n", __func__, cs, polarity);
+        par_io_data_set(3, 13, !polarity);
+}
+
+static struct spi_board_info mpc832x_spi_boardinfo = {
+        .bus_num = 0x4c0,
+        .chip_select = 0,
+        .max_speed_hz = 50000000,
+        /*
+         * XXX: This is spidev (spi in userspace) stub, should
+         * be replaced by "mmc_spi" when mmc_spi will hit mainline.
+         */
+        .modalias = "spidev",
+};
+
+static int __init mpc832x_spi_init(void)
+{
+        if (!machine_is(mpc832x_rdb))
+                return 0;
+
+        par_io_config_pin(3,  0, 3, 0, 1, 0); /* SPI1 MOSI, I/O */
+        par_io_config_pin(3,  1, 3, 0, 1, 0); /* SPI1 MISO, I/O */
+        par_io_config_pin(3,  2, 3, 0, 1, 0); /* SPI1 CLK,  I/O */
+        par_io_config_pin(3,  3, 2, 0, 1, 0); /* SPI1 SEL,  I   */
+
+        par_io_config_pin(3, 13, 1, 0, 0, 0); /* !SD_CS,    O */
+        par_io_config_pin(3, 14, 2, 0, 0, 0); /* SD_INSERT, I */
+        par_io_config_pin(3, 15, 2, 0, 0, 0); /* SD_PROTECT,I */
+
+        return fsl_spi_init(&mpc832x_spi_boardinfo, 1,
+                            mpc83xx_spi_activate_cs,
+                            mpc83xx_spi_deactivate_cs);
+}
+
+device_initcall(mpc832x_spi_init);
+
 /* ************************************************************************
  *
  * Setup the architecture
@@ -47,10 +93,8 @@ static void __init mpc832x_rdb_setup_arch(void)
                 ppc_md.progress("mpc832x_rdb_setup_arch()", 0);
 
 #ifdef CONFIG_PCI
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
                 mpc83xx_add_bridge(np);
-
-        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
 
 #ifdef CONFIG_QUICC_ENGINE
@@ -107,7 +151,7 @@ void __init mpc832x_rdb_init_IRQ(void)
         if (!np)
                 return;
 
-        qe_ic_init(np, 0);
+        qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
         of_node_put(np);
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index 47ba5446f63c..aa768199432d 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -30,7 +30,6 @@
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
-#include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
@@ -53,10 +52,8 @@ static void __init mpc834x_itx_setup_arch(void)
                 ppc_md.progress("mpc834x_itx_setup_arch()", 0);
 
 #ifdef CONFIG_PCI
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
                 mpc83xx_add_bridge(np);
-
-        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
 
         mpc834x_usb_cfg();
diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 4c9ff9cadfe4..00aed7c2269e 100644
--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -30,7 +30,6 @@
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
-#include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
@@ -84,10 +83,8 @@ static void __init mpc834x_mds_setup_arch(void)
                 ppc_md.progress("mpc834x_mds_setup_arch()", 0);
 
 #ifdef CONFIG_PCI
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
                 mpc83xx_add_bridge(np);
-
-        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
 
         mpc834xemds_usb_cfg();
diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index 84b58934aafd..0f3855c95ff5 100644
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -38,7 +38,6 @@
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
-#include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
@@ -80,9 +79,8 @@ static void __init mpc836x_mds_setup_arch(void)
         }
 
 #ifdef CONFIG_PCI
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
                 mpc83xx_add_bridge(np);
-        ppc_md.pci_exclude_device = mpc83xx_exclude_device;
 #endif
 
 #ifdef CONFIG_QUICC_ENGINE
@@ -149,7 +147,7 @@ static void __init mpc836x_mds_init_IRQ(void)
         if (!np)
                 return;
 
-        qe_ic_init(np, 0);
+        qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
         of_node_put(np);
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h
index 589ee55730f3..b778cb4f3fb5 100644
--- a/arch/powerpc/platforms/83xx/mpc83xx.h
+++ b/arch/powerpc/platforms/83xx/mpc83xx.h
@@ -49,8 +49,6 @@
  */
 
 extern int mpc83xx_add_bridge(struct device_node *dev);
-extern int mpc83xx_exclude_device(struct pci_controller *hose,
-                                  u_char bus, u_char devfn);
 extern void mpc83xx_restart(char *cmd);
 extern long mpc83xx_time_init(void);
 extern int mpc834x_usb_cfg(void);
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c
index 92069469de20..80425d7b14f8 100644
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
@@ -33,13 +33,6 @@
 #define DBG(x...)
 #endif
 
-int mpc83xx_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn)
-{
-        if ((bus == hose->first_busno) && PCI_SLOT(devfn) == 0)
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        return PCIBIOS_SUCCESSFUL;
-}
-
 int __init mpc83xx_add_bridge(struct device_node *dev)
 {
         int len;
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index f620171ad6b1..7748a3a426db 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -12,6 +12,7 @@ config MPC8540_ADS
 config MPC8560_ADS
         bool "Freescale MPC8560 ADS"
         select DEFAULT_UIMAGE
+        select PPC_CPM_NEW_BINDING
         help
           This option enables support for the MPC 8560 ADS board
 
@@ -25,17 +26,17 @@ config MPC85xx_CDS
 config MPC85xx_MDS
         bool "Freescale MPC85xx MDS"
         select DEFAULT_UIMAGE
-#       select QUICC_ENGINE
+        select QUICC_ENGINE
         help
           This option enables support for the MPC85xx MDS board
 
-config MPC8544_DS
-        bool "Freescale MPC8544 DS"
+config MPC85xx_DS
+        bool "Freescale MPC85xx DS"
         select PPC_I8259
         select DEFAULT_UIMAGE
         select FSL_ULI1575
         help
-          This option enables support for the MPC8544 DS board
+          This option enables support for the MPC85xx DS (MPC8544 DS) board
 
 endchoice
 
@@ -58,4 +59,4 @@ config MPC85xx
         select FSL_PCI if PCI
         select SERIAL_8250_SHARE_IRQ if SERIAL_8250
         default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \
-                || MPC85xx_MDS || MPC8544_DS
+                || MPC85xx_MDS || MPC85xx_DS
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index d70f2d0f9d36..5eca92023ec8 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -1,9 +1,8 @@
 #
 # Makefile for the PowerPC 85xx linux kernel.
 #
-obj-$(CONFIG_PPC_85xx)  += misc.o
 obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o
-obj-$(CONFIG_MPC8544_DS)  += mpc8544_ds.o
+obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_ds.o
 obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o
diff --git a/arch/powerpc/platforms/85xx/misc.c b/arch/powerpc/platforms/85xx/misc.c
deleted file mode 100644
index 4fe376e9c3b6..000000000000
--- a/arch/powerpc/platforms/85xx/misc.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * MPC85xx generic code.
- *
- * Maintained by Kumar Gala (see MAINTAINERS for contact information)
- *
- * Copyright 2005 Freescale Semiconductor Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-#include <linux/irq.h>
-#include <linux/module.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/prom.h>
-#include <sysdev/fsl_soc.h>
-
-static __be32 __iomem *rstcr;
-
-extern void abort(void);
-
-static int __init mpc85xx_rstcr(void)
-{
-        struct device_node *np;
-        np = of_find_node_by_name(NULL, "global-utilities");
-        if ((np && of_get_property(np, "fsl,has-rstcr", NULL))) {
-                const u32 *prop = of_get_property(np, "reg", NULL);
-                if (prop) {
-                        /* map reset control register
-                         * 0xE00B0 is offset of reset control register
-                         */
-                        rstcr = ioremap(get_immrbase() + *prop + 0xB0, 0xff);
-                        if (!rstcr)
-                                printk (KERN_EMERG "Error: reset control "
-                                                "register not mapped!\n");
-                }
-        } else
-                printk (KERN_INFO "rstcr compatible register does not exist!\n");
-        if (np)
-                of_node_put(np);
-        return 0;
-}
-
-arch_initcall(mpc85xx_rstcr);
-
-void mpc85xx_restart(char *cmd)
-{
-        local_irq_disable();
-        if (rstcr)
-                /* set reset control register */
-                out_be32(rstcr, 0x2);   /* HRESET_REQ */
-        abort();
-}
diff --git a/arch/powerpc/platforms/85xx/mpc8540_ads.h b/arch/powerpc/platforms/85xx/mpc8540_ads.h
deleted file mode 100644
index da82f4c0fdac..000000000000
--- a/arch/powerpc/platforms/85xx/mpc8540_ads.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/powerpc/platforms/85xx/mpc8540_ads.h
- *
- * MPC8540ADS board definitions
- *
- * Maintainer: Kumar Gala <kumar.gala@freescale.com>
- *
- * Copyright 2004 Freescale Semiconductor Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef __MACH_MPC8540ADS_H__
-#define __MACH_MPC8540ADS_H__
-
-#include <linux/initrd.h>
-
-#define BOARD_CCSRBAR           ((uint)0xe0000000)
-#define BCSR_ADDR               ((uint)0xf8000000)
-#define BCSR_SIZE               ((uint)(32 * 1024))
-
-/* PCI interrupt controller */
-#define PIRQA           MPC85xx_IRQ_EXT1
-#define PIRQB           MPC85xx_IRQ_EXT2
-#define PIRQC           MPC85xx_IRQ_EXT3
-#define PIRQD           MPC85xx_IRQ_EXT4
-
-/* Offset of CPM register space */
-#define CPM_MAP_ADDR    (CCSRBAR + MPC85xx_CPM_OFFSET)
-
-#endif                          /* __MACH_MPC8540ADS_H__ */
diff --git a/arch/powerpc/platforms/85xx/mpc85xx.h b/arch/powerpc/platforms/85xx/mpc85xx.h
deleted file mode 100644
index 5b34deef12b5..000000000000
--- a/arch/powerpc/platforms/85xx/mpc85xx.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * arch/powerpc/platforms/85xx/mpc85xx.h
- *
- * MPC85xx soc definitions/function decls
- *
- * Maintainer: Kumar Gala <kumar.gala@freescale.com>
- *
- * Copyright 2005 Freescale Semiconductor Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-extern void mpc85xx_restart(char *);
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index 40a828675c7b..bccdc25f83a2 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -17,26 +17,22 @@
 #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/mpc85xx.h>
-#include <asm/prom.h>
 #include <asm/mpic.h>
 #include <mm/mmu_decl.h>
 #include <asm/udbg.h>
 
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
-#include "mpc85xx.h"
 
 #ifdef CONFIG_CPM2
-#include <linux/fs_enet_pd.h>
 #include <asm/cpm2.h>
 #include <sysdev/cpm2_pic.h>
-#include <asm/fs_pd.h>
 #endif
 
 #ifdef CONFIG_PCI
@@ -96,10 +92,10 @@ static void __init mpc85xx_ads_pic_init(void)
 
 #ifdef CONFIG_CPM2
         /* Setup CPM2 PIC */
-        np = of_find_node_by_type(NULL, "cpm-pic");
+        np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");
         if (np == NULL) {
-                printk(KERN_ERR "PIC init: can not find cpm-pic node\n");
-                return;
+                printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");
+                return;
         }
         irq = irq_of_parse_and_map(np, 0);
 
@@ -112,87 +108,80 @@ static void __init mpc85xx_ads_pic_init(void)
  * Setup the architecture
  */
 #ifdef CONFIG_CPM2
-void init_fcc_ioports(struct fs_platform_info *fpi)
+struct cpm_pin {
+        int port, pin, flags;
+};
+
+static struct cpm_pin mpc8560_ads_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},
+
+        /* FCC2 */
+        {1, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 20, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 21, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 22, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 23, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 24, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 25, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 26, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 27, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {1, 30, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 31, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {2, 18, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK14 */
+        {2, 19, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK13 */
+
+        /* FCC3 */
+        {1, 4, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 5, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 6, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 7, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 9, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 10, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 11, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 12, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 13, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 14, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 15, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {1, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 16, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* CLK16 */
+        {2, 17, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* CLK15 */
+};
+
+static void __init init_ioports(void)
 {
-        struct io_port *io = cpm2_map(im_ioport);
-        int fcc_no = fs_get_fcc_index(fpi->fs_no);
-        int target;
-        u32 tempval;
-
-        switch(fcc_no) {
-        case 1:
-                tempval = in_be32(&io->iop_pdirb);
-                tempval &= ~PB2_DIRB0;
-                tempval |= PB2_DIRB1;
-                out_be32(&io->iop_pdirb, tempval);
-
-                tempval = in_be32(&io->iop_psorb);
-                tempval &= ~PB2_PSORB0;
-                tempval |= PB2_PSORB1;
-                out_be32(&io->iop_psorb, tempval);
-
-                tempval = in_be32(&io->iop_pparb);
-                tempval |= (PB2_DIRB0 | PB2_DIRB1);
-                out_be32(&io->iop_pparb, tempval);
-
-                target = CPM_CLK_FCC2;
-                break;
-        case 2:
-                tempval = in_be32(&io->iop_pdirb);
-                tempval &= ~PB3_DIRB0;
-                tempval |= PB3_DIRB1;
-                out_be32(&io->iop_pdirb, tempval);
-
-                tempval = in_be32(&io->iop_psorb);
-                tempval &= ~PB3_PSORB0;
-                tempval |= PB3_PSORB1;
-                out_be32(&io->iop_psorb, tempval);
-
-                tempval = in_be32(&io->iop_pparb);
-                tempval |= (PB3_DIRB0 | PB3_DIRB1);
-                out_be32(&io->iop_pparb, tempval);
-
-                tempval = in_be32(&io->iop_pdirc);
-                tempval |= PC3_DIRC1;
-                out_be32(&io->iop_pdirc, tempval);
-
-                tempval = in_be32(&io->iop_pparc);
-                tempval |= PC3_DIRC1;
-                out_be32(&io->iop_pparc, tempval);
-
-                target = CPM_CLK_FCC3;
-                break;
-        default:
-                printk(KERN_ERR "init_fcc_ioports: invalid FCC number\n");
-                return;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(mpc8560_ads_pins); i++) {
+                struct cpm_pin *pin = &mpc8560_ads_pins[i];
+                cpm2_set_pin(pin->port, pin->pin, pin->flags);
         }
 
-        /* Port C has clocks......  */
-        tempval = in_be32(&io->iop_psorc);
-        tempval &= ~(PC_CLK(fpi->clk_rx - 8) | PC_CLK(fpi->clk_tx - 8));
-        out_be32(&io->iop_psorc, tempval);
-
-        tempval = in_be32(&io->iop_pdirc);
-        tempval &= ~(PC_CLK(fpi->clk_rx - 8) | PC_CLK(fpi->clk_tx - 8));
-        out_be32(&io->iop_pdirc, tempval);
-        tempval = in_be32(&io->iop_pparc);
-        tempval |= (PC_CLK(fpi->clk_rx - 8) | PC_CLK(fpi->clk_tx - 8));
-        out_be32(&io->iop_pparc, tempval);
-
-        cpm2_unmap(io);
-
-        /* Configure Serial Interface clock routing.
-         * First,  clear FCC bits to zero,
-         * then set the ones we want.
-         */
-        cpm2_clk_setup(target, fpi->clk_rx, CPM_CLK_RX);
-        cpm2_clk_setup(target, fpi->clk_tx, CPM_CLK_TX);
+        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_FCC2, CPM_CLK13, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_FCC2, CPM_CLK14, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_FCC3, CPM_CLK15, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_FCC3, CPM_CLK16, CPM_CLK_TX);
 }
 #endif
 
 static void __init mpc85xx_ads_setup_arch(void)
 {
-        struct device_node *cpu;
 #ifdef CONFIG_PCI
         struct device_node *np;
 #endif
@@ -200,25 +189,15 @@ static void __init mpc85xx_ads_setup_arch(void)
         if (ppc_md.progress)
                 ppc_md.progress("mpc85xx_ads_setup_arch()", 0);
 
-        cpu = of_find_node_by_type(NULL, "cpu");
-        if (cpu != 0) {
-                const unsigned int *fp;
-
-                fp = of_get_property(cpu, "clock-frequency", NULL);
-                if (fp != 0)
-                        loops_per_jiffy = *fp / HZ;
-                else
-                        loops_per_jiffy = 50000000 / HZ;
-                of_node_put(cpu);
-        }
-
 #ifdef CONFIG_CPM2
         cpm2_reset();
+        init_ioports();
 #endif
 
 #ifdef CONFIG_PCI
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+        for_each_compatible_node(np, "pci", "fsl,mpc8540-pci")
                 fsl_add_bridge(np, 1);
+
         ppc_md.pci_exclude_device = mpc85xx_exclude_device;
 #endif
 }
@@ -244,6 +223,24 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
         seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
 
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .name = "soc", },
+        { .type = "soc", },
+        { .name = "cpm", },
+        { .name = "localbus", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        if (!machine_is(mpc85xx_ads))
+                return 0;
+
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        return 0;
+}
+device_initcall(declare_of_platform_devices);
+
 /*
  * Called very early, device-tree isn't unflattened
  */
@@ -261,7 +258,7 @@ define_machine(mpc85xx_ads) {
         .init_IRQ               = mpc85xx_ads_pic_init,
         .show_cpuinfo           = mpc85xx_ads_show_cpuinfo,
         .get_irq                = mpic_get_irq,
-        .restart                = mpc85xx_restart,
+        .restart                = fsl_rstcr_restart,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
 };
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.h b/arch/powerpc/platforms/85xx/mpc85xx_ads.h
deleted file mode 100644
index 46c3532992aa..000000000000
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * MPC85xx ADS board definitions
- *
- * Maintainer: Kumar Gala <galak@kernel.crashing.org>
- *
- * Copyright 2004 Freescale Semiconductor Inc.
- *
- * 2006 (c) MontaVista Software, Inc.
- * Vitaly Bordug <vbordug@ru.mvista.com>
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef __MACH_MPC85XXADS_H
-#define __MACH_MPC85XXADS_H
-
-#include <linux/initrd.h>
-#include <sysdev/fsl_soc.h>
-
-#define BCSR_ADDR               ((uint)0xf8000000)
-#define BCSR_SIZE               ((uint)(32 * 1024))
-
-#ifdef CONFIG_CPM2
-
-#define MPC85xx_CPM_OFFSET      (0x80000)
-
-#define CPM_MAP_ADDR            (get_immrbase() + MPC85xx_CPM_OFFSET)
-#define CPM_IRQ_OFFSET          60
-
-#define SIU_INT_SMC1            ((uint)0x04+CPM_IRQ_OFFSET)
-#define SIU_INT_SMC2            ((uint)0x05+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC1            ((uint)0x28+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC2            ((uint)0x29+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC3            ((uint)0x2a+CPM_IRQ_OFFSET)
-#define SIU_INT_SCC4            ((uint)0x2b+CPM_IRQ_OFFSET)
-
-/* FCC1 Clock Source Configuration.  These can be
- * redefined in the board specific file.
- *    Can only choose from CLK9-12 */
-#define F1_RXCLK       12
-#define F1_TXCLK       11
-
-/* FCC2 Clock Source Configuration.  These can be
- * redefined in the board specific file.
- *    Can only choose from CLK13-16 */
-#define F2_RXCLK       13
-#define F2_TXCLK       14
-
-/* FCC3 Clock Source Configuration.  These can be
- * redefined in the board specific file.
- *    Can only choose from CLK13-16 */
-#define F3_RXCLK       15
-#define F3_TXCLK       16
-
-#endif  /* CONFIG_CPM2 */
-#endif  /* __MACH_MPC85XXADS_H */
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 2d4cb7847604..4d063eec6210 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -35,9 +35,7 @@
 #include <asm/io.h>
 #include <asm/machdep.h>
 #include <asm/ipic.h>
-#include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc85xx.h>
 #include <asm/irq.h>
 #include <mm/mmu_decl.h>
 #include <asm/prom.h>
@@ -47,7 +45,15 @@
 
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
-#include "mpc85xx.h"
+
+/* CADMUS info */
+/* xxx - galak, move into device tree */
+#define CADMUS_BASE (0xf8004000)
+#define CADMUS_SIZE (256)
+#define CM_VER  (0)
+#define CM_CSR  (1)
+#define CM_RST  (2)
+
 
 static int cds_pci_slot = 2;
 static volatile u8 *cadmus;
@@ -97,7 +103,7 @@ static void mpc85xx_cds_restart(char *cmd)
          *  If we can't find the VIA chip (maybe the P2P bridge is disabled)
          *  or the VIA chip reset didn't work, just use the default reset.
          */
-        mpc85xx_restart(NULL);
+        fsl_rstcr_restart(NULL);
 }
 
 static void __init mpc85xx_cds_pci_irq_fixup(struct pci_dev *dev)
@@ -266,7 +272,6 @@ device_initcall(mpc85xx_cds_8259_attach);
  */
 static void __init mpc85xx_cds_setup_arch(void)
 {
-        struct device_node *cpu;
 #ifdef CONFIG_PCI
         struct device_node *np;
 #endif
@@ -274,18 +279,6 @@ static void __init mpc85xx_cds_setup_arch(void)
         if (ppc_md.progress)
                 ppc_md.progress("mpc85xx_cds_setup_arch()", 0);
 
-        cpu = of_find_node_by_type(NULL, "cpu");
-        if (cpu != 0) {
-                const unsigned int *fp;
-
-                fp = of_get_property(cpu, "clock-frequency", NULL);
-                if (fp != 0)
-                        loops_per_jiffy = *fp / HZ;
-                else
-                        loops_per_jiffy = 500000000 / HZ;
-                of_node_put(cpu);
-        }
-
         cadmus = ioremap(CADMUS_BASE, CADMUS_SIZE);
         cds_pci_slot = ((cadmus[CM_CSR] >> 6) & 0x3) + 1;
 
@@ -297,14 +290,18 @@ static void __init mpc85xx_cds_setup_arch(void)
         }
 
 #ifdef CONFIG_PCI
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) {
-                struct resource rsrc;
-                of_address_to_resource(np, 0, &rsrc);
-                if ((rsrc.start & 0xfffff) == 0x8000)
-                        fsl_add_bridge(np, 1);
-                else
-                        fsl_add_bridge(np, 0);
+        for_each_node_by_type(np, "pci") {
+                if (of_device_is_compatible(np, "fsl,mpc8540-pci") ||
+                    of_device_is_compatible(np, "fsl,mpc8548-pcie")) {
+                        struct resource rsrc;
+                        of_address_to_resource(np, 0, &rsrc);
+                        if ((rsrc.start & 0xfffff) == 0x8000)
+                                fsl_add_bridge(np, 1);
+                        else
+                                fsl_add_bridge(np, 0);
+                }
         }
+
         ppc_md.pci_irq_fixup = mpc85xx_cds_pci_irq_fixup;
         ppc_md.pci_exclude_device = mpc85xx_exclude_device;
 #endif
@@ -353,7 +350,7 @@ define_machine(mpc85xx_cds) {
         .restart        = mpc85xx_cds_restart,
         .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 #else
-        .restart        = mpc85xx_restart,
+        .restart        = fsl_rstcr_restart,
 #endif
         .calibrate_decr = generic_calibrate_decr,
         .progress       = udbg_progress,
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.h b/arch/powerpc/platforms/85xx/mpc85xx_cds.h
deleted file mode 100644
index b251c9feb3dc..000000000000
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * arch/powerpc/platforms/85xx/mpc85xx_cds.h
- *
- * MPC85xx CDS board definitions
- *
- * Maintainer: Kumar Gala <galak@kernel.crashing.org>
- *
- * Copyright 2004 Freescale Semiconductor, Inc
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef __MACH_MPC85XX_CDS_H__
-#define __MACH_MPC85XX_CDS_H__
-
-/* CADMUS info */
-#define CADMUS_BASE (0xf8004000)
-#define CADMUS_SIZE (256)
-#define CM_VER  (0)
-#define CM_CSR  (1)
-#define CM_RST  (2)
-
-/* CDS NVRAM/RTC */
-#define CDS_RTC_ADDR    (0xf8000000)
-#define CDS_RTC_SIZE    (8 * 1024)
-
-/* PCI interrupt controller */
-#define PIRQ0A                  MPC85xx_IRQ_EXT0
-#define PIRQ0B                  MPC85xx_IRQ_EXT1
-#define PIRQ0C                  MPC85xx_IRQ_EXT2
-#define PIRQ0D                  MPC85xx_IRQ_EXT3
-#define PIRQ1A                  MPC85xx_IRQ_EXT11
-
-#define NR_8259_INTS            16
-#define CPM_IRQ_OFFSET          NR_8259_INTS
-
-#define MPC85xx_OPENPIC_IRQ_OFFSET      80
-
-#endif /* __MACH_MPC85XX_CDS_H__ */
diff --git a/arch/powerpc/platforms/85xx/mpc8544_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index 48983bc56d46..59c121a97ac7 100644
--- a/arch/powerpc/platforms/85xx/mpc8544_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -1,5 +1,5 @@
 /*
- * MPC8544 DS Board Setup
+ * MPC85xx DS Board Setup
  *
  * Author Xianghua Xiao (x.xiao@freescale.com)
  * Roy Zang <tie-fei.zang@freescale.com>
@@ -24,7 +24,6 @@
 #include <asm/time.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc85xx.h>
 #include <mm/mmu_decl.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
@@ -33,7 +32,6 @@
 
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
-#include "mpc85xx.h"
 
 #undef DEBUG
 
@@ -44,7 +42,7 @@
 #endif
 
 #ifdef CONFIG_PPC_I8259
-static void mpc8544_8259_cascade(unsigned int irq, struct irq_desc *desc)
+static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int cascade_irq = i8259_irq();
 
@@ -55,7 +53,7 @@ static void mpc8544_8259_cascade(unsigned int irq, struct irq_desc *desc)
 }
 #endif  /* CONFIG_PPC_I8259 */
 
-void __init mpc8544_ds_pic_init(void)
+void __init mpc85xx_ds_pic_init(void)
 {
         struct mpic *mpic;
         struct resource r;
@@ -104,16 +102,17 @@ void __init mpc8544_ds_pic_init(void)
                 return;
         }
 
-        DBG("mpc8544ds: cascade mapped to irq %d\n", cascade_irq);
+        DBG("mpc85xxds: cascade mapped to irq %d\n", cascade_irq);
 
         i8259_init(cascade_node, 0);
         of_node_put(cascade_node);
 
-        set_irq_chained_handler(cascade_irq, mpc8544_8259_cascade);
+        set_irq_chained_handler(cascade_irq, mpc85xx_8259_cascade);
 #endif  /* CONFIG_PPC_I8259 */
 }
 
 #ifdef CONFIG_PCI
+static int primary_phb_addr;
 extern int uses_fsl_uli_m1575;
 extern int uli_exclude_device(struct pci_controller *hose,
                                 u_char bus, u_char devfn);
@@ -121,13 +120,13 @@ extern int uli_exclude_device(struct pci_controller *hose,
 static int mpc85xx_exclude_device(struct pci_controller *hose,
                                    u_char bus, u_char devfn)
 {
-        struct device_node* node;       
+        struct device_node* node;
         struct resource rsrc;
 
         node = (struct device_node *)hose->arch_data;
         of_address_to_resource(node, 0, &rsrc);
 
-        if ((rsrc.start & 0xfffff) == 0xb000) {
+        if ((rsrc.start & 0xfffff) == primary_phb_addr) {
                 return uli_exclude_device(hose, bus, devfn);
         }
 
@@ -138,29 +137,33 @@ static int mpc85xx_exclude_device(struct pci_controller *hose,
 /*
  * Setup the architecture
  */
-static void __init mpc8544_ds_setup_arch(void)
+static void __init mpc85xx_ds_setup_arch(void)
 {
 #ifdef CONFIG_PCI
         struct device_node *np;
 #endif
 
         if (ppc_md.progress)
-                ppc_md.progress("mpc8544_ds_setup_arch()", 0);
+                ppc_md.progress("mpc85xx_ds_setup_arch()", 0);
 
 #ifdef CONFIG_PCI
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) {
-                struct resource rsrc;
-                of_address_to_resource(np, 0, &rsrc);
-                if ((rsrc.start & 0xfffff) == 0xb000)
-                        fsl_add_bridge(np, 1);
-                else
-                        fsl_add_bridge(np, 0);
+        for_each_node_by_type(np, "pci") {
+                if (of_device_is_compatible(np, "fsl,mpc8540-pci") ||
+                    of_device_is_compatible(np, "fsl,mpc8548-pcie")) {
+                        struct resource rsrc;
+                        of_address_to_resource(np, 0, &rsrc);
+                        if ((rsrc.start & 0xfffff) == primary_phb_addr)
+                                fsl_add_bridge(np, 1);
+                        else
+                                fsl_add_bridge(np, 0);
+                }
         }
+
         uses_fsl_uli_m1575 = 1;
         ppc_md.pci_exclude_device = mpc85xx_exclude_device;
 #endif
 
-        printk("MPC8544 DS board from Freescale Semiconductor\n");
+        printk("MPC85xx DS board from Freescale Semiconductor\n");
 }
 
 /*
@@ -170,19 +173,57 @@ static int __init mpc8544_ds_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
 
-        return of_flat_dt_is_compatible(root, "MPC8544DS");
+        if (of_flat_dt_is_compatible(root, "MPC8544DS")) {
+#ifdef CONFIG_PCI
+                primary_phb_addr = 0xb000;
+#endif
+                return 1;
+        } else {
+                return 0;
+        }
+}
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init mpc8572_ds_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (of_flat_dt_is_compatible(root, "fsl,MPC8572DS")) {
+#ifdef CONFIG_PCI
+                primary_phb_addr = 0x8000;
+#endif
+                return 1;
+        } else {
+                return 0;
+        }
 }
 
 define_machine(mpc8544_ds) {
         .name                   = "MPC8544 DS",
         .probe                  = mpc8544_ds_probe,
-        .setup_arch             = mpc8544_ds_setup_arch,
-        .init_IRQ               = mpc8544_ds_pic_init,
+        .setup_arch             = mpc85xx_ds_setup_arch,
+        .init_IRQ               = mpc85xx_ds_pic_init,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
+
+define_machine(mpc8572_ds) {
+        .name                   = "MPC8572 DS",
+        .probe                  = mpc8572_ds_probe,
+        .setup_arch             = mpc85xx_ds_setup_arch,
+        .init_IRQ               = mpc85xx_ds_pic_init,
 #ifdef CONFIG_PCI
         .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 #endif
         .get_irq                = mpic_get_irq,
-        .restart                = mpc85xx_restart,
+        .restart                = fsl_rstcr_restart,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
 };
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 7ca7e676f1c4..61b3eedf41b9 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -38,9 +38,7 @@
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
-#include <asm/mpc85xx.h>
 #include <asm/irq.h>
 #include <mm/mmu_decl.h>
 #include <asm/prom.h>
@@ -51,8 +49,6 @@
 #include <asm/qe_ic.h>
 #include <asm/mpic.h>
 
-#include "mpc85xx.h"
-
 #undef DEBUG
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
@@ -73,17 +69,6 @@ static void __init mpc85xx_mds_setup_arch(void)
         if (ppc_md.progress)
                 ppc_md.progress("mpc85xx_mds_setup_arch()", 0);
 
-        np = of_find_node_by_type(NULL, "cpu");
-        if (np != NULL) {
-                const unsigned int *fp =
-                    of_get_property(np, "clock-frequency", NULL);
-                if (fp != NULL)
-                        loops_per_jiffy = *fp / HZ;
-                else
-                        loops_per_jiffy = 50000000 / HZ;
-                of_node_put(np);
-        }
-
         /* Map BCSR area */
         np = of_find_node_by_name(NULL, "bcsr");
         if (np != NULL) {
@@ -95,9 +80,17 @@ static void __init mpc85xx_mds_setup_arch(void)
         }
 
 #ifdef CONFIG_PCI
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-                fsl_add_bridge(np, 1);
-        of_node_put(np);
+        for_each_node_by_type(np, "pci") {
+                if (of_device_is_compatible(np, "fsl,mpc8540-pci") ||
+                    of_device_is_compatible(np, "fsl,mpc8548-pcie")) {
+                        struct resource rsrc;
+                        of_address_to_resource(np, 0, &rsrc);
+                        if ((rsrc.start & 0xfffff) == 0x8000)
+                                fsl_add_bridge(np, 1);
+                        else
+                                fsl_add_bridge(np, 0);
+                }
+        }
 #endif
 
 #ifdef CONFIG_QUICC_ENGINE
@@ -119,18 +112,22 @@ static void __init mpc85xx_mds_setup_arch(void)
         }
 
         if (bcsr_regs) {
-                u8 bcsr_phy;
+#define BCSR_UCC1_GETH_EN       (0x1 << 7)
+#define BCSR_UCC2_GETH_EN       (0x1 << 7)
+#define BCSR_UCC1_MODE_MSK      (0x3 << 4)
+#define BCSR_UCC2_MODE_MSK      (0x3 << 0)
 
-                /* Reset the Ethernet PHY */
-                bcsr_phy = in_be8(&bcsr_regs[9]);
-                bcsr_phy &= ~0x20;
-                out_be8(&bcsr_regs[9], bcsr_phy);
+                /* Turn off UCC1 & UCC2 */
+                clrbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
+                clrbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
 
-                udelay(1000);
+                /* Mode is RGMII, all bits clear */
+                clrbits8(&bcsr_regs[11], BCSR_UCC1_MODE_MSK |
+                                         BCSR_UCC2_MODE_MSK);
 
-                bcsr_phy = in_be8(&bcsr_regs[9]);
-                bcsr_phy |= 0x20;
-                out_be8(&bcsr_regs[9], bcsr_phy);
+                /* Turn UCC1 & UCC2 on */
+                setbits8(&bcsr_regs[8], BCSR_UCC1_GETH_EN);
+                setbits8(&bcsr_regs[9], BCSR_UCC2_GETH_EN);
 
                 iounmap(bcsr_regs);
         }
@@ -186,7 +183,7 @@ static void __init mpc85xx_mds_pic_init(void)
         if (!np)
                 return;
 
-        qe_ic_init(np, 0);
+        qe_ic_init(np, 0, qe_ic_cascade_muxed_mpic, NULL);
         of_node_put(np);
 #endif                          /* CONFIG_QUICC_ENGINE */
 }
@@ -204,7 +201,7 @@ define_machine(mpc85xx_mds) {
         .setup_arch     = mpc85xx_mds_setup_arch,
         .init_IRQ       = mpc85xx_mds_pic_init,
         .get_irq        = mpic_get_irq,
-        .restart        = mpc85xx_restart,
+        .restart        = fsl_rstcr_restart,
         .calibrate_decr = generic_calibrate_decr,
         .progress       = udbg_progress,
 #ifdef CONFIG_PCI
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 685b2fbbbe00..21d113536b86 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -11,6 +11,12 @@ config MPC8641_HPCN
         help
           This option enables support for the MPC8641 HPCN board.
 
+config MPC8610_HPCD
+        bool "Freescale MPC8610 HPCD"
+        select DEFAULT_UIMAGE
+        help
+          This option enables support for the MPC8610 HPCD board.
+
 endchoice
 
 config MPC8641
@@ -19,3 +25,10 @@ config MPC8641
         select PPC_UDBG_16550
         select MPIC
         default y if MPC8641_HPCN
+
+config MPC8610
+        bool
+        select FSL_PCI if PCI
+        select PPC_UDBG_16550
+        select MPIC
+        default y if MPC8610_HPCD
diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile
index 3376c7767f2d..c96706327eaa 100644
--- a/arch/powerpc/platforms/86xx/Makefile
+++ b/arch/powerpc/platforms/86xx/Makefile
@@ -4,3 +4,4 @@
 
 obj-$(CONFIG_SMP)               += mpc86xx_smp.o
 obj-$(CONFIG_MPC8641_HPCN)      += mpc86xx_hpcn.o
+obj-$(CONFIG_MPC8610_HPCD)      += mpc8610_hpcd.o
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
new file mode 100644
index 000000000000..6390895e5e92
--- /dev/null
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -0,0 +1,216 @@
+/*
+ * MPC8610 HPCD board specific routines
+ *
+ * Initial author: Xianghua Xiao <x.xiao@freescale.com>
+ * Recode: Jason Jin <jason.jin@freescale.com>
+ *
+ * Rewrite the interrupt routing. remove the 8259PIC support,
+ * All the integrated device in ULI use sideband interrupt.
+ *
+ * Copyright 2007 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#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.h>
+
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/mpc86xx.h>
+#include <asm/prom.h>
+#include <mm/mmu_decl.h>
+#include <asm/udbg.h>
+
+#include <asm/mpic.h>
+
+#include <sysdev/fsl_pci.h>
+#include <sysdev/fsl_soc.h>
+
+void __init
+mpc86xx_hpcd_init_irq(void)
+{
+        struct mpic *mpic1;
+        struct device_node *np;
+        struct resource res;
+
+        /* Determine PIC address. */
+        np = of_find_node_by_type(NULL, "open-pic");
+        if (np == NULL)
+                return;
+        of_address_to_resource(np, 0, &res);
+
+        /* Alloc mpic structure and per isu has 16 INT entries. */
+        mpic1 = mpic_alloc(np, res.start,
+                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
+                        0, 256, " MPIC     ");
+        BUG_ON(mpic1 == NULL);
+
+        mpic_init(mpic1);
+}
+
+#ifdef CONFIG_PCI
+static void __devinit quirk_uli1575(struct pci_dev *dev)
+{
+        u32 temp32;
+
+        /* Disable INTx */
+        pci_read_config_dword(dev, 0x48, &temp32);
+        pci_write_config_dword(dev, 0x48, (temp32 | 1<<26));
+
+        /* Enable sideband interrupt */
+        pci_read_config_dword(dev, 0x90, &temp32);
+        pci_write_config_dword(dev, 0x90, (temp32 | 1<<22));
+}
+
+static void __devinit quirk_uli5288(struct pci_dev *dev)
+{
+        unsigned char c;
+        unsigned short temp;
+
+        /* Interrupt Disable, Needed when SATA disabled */
+        pci_read_config_word(dev, PCI_COMMAND, &temp);
+        temp |= 1<<10;
+        pci_write_config_word(dev, PCI_COMMAND, temp);
+
+        pci_read_config_byte(dev, 0x83, &c);
+        c |= 0x80;
+        pci_write_config_byte(dev, 0x83, c);
+
+        pci_write_config_byte(dev, PCI_CLASS_PROG, 0x01);
+        pci_write_config_byte(dev, PCI_CLASS_DEVICE, 0x06);
+
+        pci_read_config_byte(dev, 0x83, &c);
+        c &= 0x7f;
+        pci_write_config_byte(dev, 0x83, c);
+}
+
+/*
+ * Since 8259PIC was disabled on the board, the IDE device can not
+ * use the legacy IRQ, we need to let the IDE device work under
+ * native mode and use the interrupt line like other PCI devices.
+ * IRQ14 is a sideband interrupt from IDE device to CPU and we use this
+ * as the interrupt for IDE device.
+ */
+static void __devinit quirk_uli5229(struct pci_dev *dev)
+{
+        unsigned char c;
+
+        pci_read_config_byte(dev, 0x4b, &c);
+        c |= 0x10;
+        pci_write_config_byte(dev, 0x4b, c);
+}
+
+/*
+ * SATA interrupt pin bug fix
+ * There's a chip bug for 5288, The interrupt pin should be 2,
+ * not the read only value 1, So it use INTB#, not INTA# which
+ * actually used by the IDE device 5229.
+ * As of this bug, during the PCI initialization, 5288 read the
+ * irq of IDE device from the device tree, this function fix this
+ * bug by re-assigning a correct irq to 5288.
+ *
+ */
+static void __devinit final_uli5288(struct pci_dev *dev)
+{
+        struct pci_controller *hose = pci_bus_to_host(dev->bus);
+        struct device_node *hosenode = hose ? hose->arch_data : NULL;
+        struct of_irq oirq;
+        int virq, pin = 2;
+        u32 laddr[3];
+
+        if (!hosenode)
+                return;
+
+        laddr[0] = (hose->first_busno << 16) | (PCI_DEVFN(31, 0) << 8);
+        laddr[1] = laddr[2] = 0;
+        of_irq_map_raw(hosenode, &pin, 1, laddr, &oirq);
+        virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
+                                     oirq.size);
+        dev->irq = virq;
+}
+
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x1575, quirk_uli1575);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5288, quirk_uli5288);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5229, quirk_uli5229);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, 0x5288, final_uli5288);
+#endif /* CONFIG_PCI */
+
+static void __init
+mpc86xx_hpcd_setup_arch(void)
+{
+#ifdef CONFIG_PCI
+        struct device_node *np;
+#endif
+        if (ppc_md.progress)
+                ppc_md.progress("mpc86xx_hpcd_setup_arch()", 0);
+
+#ifdef CONFIG_PCI
+        for_each_node_by_type(np, "pci") {
+                if (of_device_is_compatible(np, "fsl,mpc8610-pci")
+                    || of_device_is_compatible(np, "fsl,mpc8641-pcie")) {
+                        struct resource rsrc;
+                        of_address_to_resource(np, 0, &rsrc);
+                        if ((rsrc.start & 0xfffff) == 0xa000)
+                                fsl_add_bridge(np, 1);
+                        else
+                                fsl_add_bridge(np, 0);
+                }
+        }
+#endif
+
+        printk("MPC86xx HPCD board from Freescale Semiconductor\n");
+}
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init mpc86xx_hpcd_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (of_flat_dt_is_compatible(root, "fsl,MPC8610HPCD"))
+                return 1;       /* Looks good */
+
+        return 0;
+}
+
+long __init
+mpc86xx_time_init(void)
+{
+        unsigned int temp;
+
+        /* Set the time base to zero */
+        mtspr(SPRN_TBWL, 0);
+        mtspr(SPRN_TBWU, 0);
+
+        temp = mfspr(SPRN_HID0);
+        temp |= HID0_TBEN;
+        mtspr(SPRN_HID0, temp);
+        asm volatile("isync");
+
+        return 0;
+}
+
+define_machine(mpc86xx_hpcd) {
+        .name                   = "MPC86xx HPCD",
+        .probe                  = mpc86xx_hpcd_probe,
+        .setup_arch             = mpc86xx_hpcd_setup_arch,
+        .init_IRQ               = mpc86xx_hpcd_init_irq,
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .time_init              = mpc86xx_time_init,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+};
diff --git a/arch/powerpc/platforms/86xx/mpc8641_hpcn.h b/arch/powerpc/platforms/86xx/mpc8641_hpcn.h
deleted file mode 100644
index 41e554c4af94..000000000000
--- a/arch/powerpc/platforms/86xx/mpc8641_hpcn.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * MPC8641 HPCN board definitions
- *
- * Copyright 2006 Freescale Semiconductor Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- *
- * Author: Xianghua Xiao <x.xiao@freescale.com>
- */
-
-#ifndef __MPC8641_HPCN_H__
-#define __MPC8641_HPCN_H__
-
-#include <linux/init.h>
-
-#define MPC86XX_RSTCR_OFFSET    (0xe00b0)       /* Reset Control Register */
-
-#endif  /* __MPC8641_HPCN_H__ */
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 47aafa76c933..32a531aebcb7 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -35,7 +35,6 @@
 #include <sysdev/fsl_soc.h>
 
 #include "mpc86xx.h"
-#include "mpc8641_hpcn.h"
 
 #undef DEBUG
 
@@ -132,25 +131,15 @@ static int mpc86xx_exclude_device(struct pci_controller *hose,
 static void __init
 mpc86xx_hpcn_setup_arch(void)
 {
+#ifdef CONFIG_PCI
         struct device_node *np;
+#endif
 
         if (ppc_md.progress)
                 ppc_md.progress("mpc86xx_hpcn_setup_arch()", 0);
 
-        np = of_find_node_by_type(NULL, "cpu");
-        if (np != 0) {
-                const unsigned int *fp;
-
-                fp = of_get_property(np, "clock-frequency", NULL);
-                if (fp != 0)
-                        loops_per_jiffy = *fp / HZ;
-                else
-                        loops_per_jiffy = 50000000 / HZ;
-                of_node_put(np);
-        }
-
 #ifdef CONFIG_PCI
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) {
+        for_each_compatible_node(np, "pci", "fsl,mpc8641-pcie") {
                 struct resource rsrc;
                 of_address_to_resource(np, 0, &rsrc);
                 if ((rsrc.start & 0xfffff) == 0x8000)
@@ -158,6 +147,7 @@ mpc86xx_hpcn_setup_arch(void)
                 else
                         fsl_add_bridge(np, 0);
         }
+
         uses_fsl_uli_m1575 = 1;
         ppc_md.pci_exclude_device = mpc86xx_exclude_device;
 
@@ -205,23 +195,6 @@ static int __init mpc86xx_hpcn_probe(void)
         return 0;
 }
 
-
-void
-mpc86xx_restart(char *cmd)
-{
-        void __iomem *rstcr;
-
-        rstcr = ioremap(get_immrbase() + MPC86XX_RSTCR_OFFSET, 0x100);
-
-        local_irq_disable();
-
-        /* Assert reset request to Reset Control Register */
-        out_be32(rstcr, 0x2);
-
-        /* not reached */
-}
-
-
 long __init
 mpc86xx_time_init(void)
 {
@@ -246,7 +219,7 @@ define_machine(mpc86xx_hpcn) {
         .init_IRQ               = mpc86xx_hpcn_init_irq,
         .show_cpuinfo           = mpc86xx_hpcn_show_cpuinfo,
         .get_irq                = mpic_get_irq,
-        .restart                = mpc86xx_restart,
+        .restart                = fsl_rstcr_restart,
         .time_init              = mpc86xx_time_init,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index 39bb8c5ebe70..bd28655043a0 100644
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -3,6 +3,7 @@ config FADS
 
 config CPM1
         bool
+        select CPM
 
 choice
         prompt "8xx Machine Type"
@@ -25,12 +26,23 @@ config MPC86XADS
 config MPC885ADS
         bool "MPC885ADS"
         select CPM1
+        select PPC_CPM_NEW_BINDING
         help
           Freescale Semiconductor MPC885 Application Development System (ADS).
           Also known as DUET.
           The MPC885ADS is meant to serve as a platform for s/w and h/w
           development around the MPC885 processor family.
 
+config PPC_EP88XC
+        bool "Embedded Planet EP88xC (a.k.a. CWH-PPC-885XN-VE)"
+        select CPM1
+        select PPC_CPM_NEW_BINDING
+        help
+          This enables support for the Embedded Planet EP88xC board.
+
+          This board is also resold by Freescale as the QUICCStart
+          MPC885 Evaluation System and/or the CWH-PPC-885XN-VE.
+
 endchoice
 
 menu "Freescale Ethernet driver platform-specific options"
@@ -99,6 +111,22 @@ config 8xx_CPU6
 
           If in doubt, say N here.
 
+config 8xx_CPU15
+        bool "CPU15 Silicon Errata"
+        default y
+        help
+          This enables a workaround for erratum CPU15 on MPC8xx chips.
+          This bug can cause incorrect code execution under certain
+          circumstances.  This workaround adds some overhead (a TLB miss
+          every time execution crosses a page boundary), and you may wish
+          to disable it if you have worked around the bug in the compiler
+          (by not placing conditional branches or branches to LR or CTR
+          in the last word of a page, with a target of the last cache
+          line in the next page), or if you have used some other
+          workaround.
+
+          If in doubt, say Y here.
+
 choice
         prompt "Microcode patch selection"
         default NO_UCODE_PATCH
diff --git a/arch/powerpc/platforms/8xx/Makefile b/arch/powerpc/platforms/8xx/Makefile
index 5e2dae3afd2f..8b7098018b59 100644
--- a/arch/powerpc/platforms/8xx/Makefile
+++ b/arch/powerpc/platforms/8xx/Makefile
@@ -4,3 +4,4 @@
 obj-$(CONFIG_PPC_8xx)     += m8xx_setup.o
 obj-$(CONFIG_MPC885ADS)   += mpc885ads_setup.o
 obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o
+obj-$(CONFIG_PPC_EP88XC)  += ep88xc.o
diff --git a/arch/powerpc/platforms/8xx/ep88xc.c b/arch/powerpc/platforms/8xx/ep88xc.c
new file mode 100644
index 000000000000..c518b6cc5fab
--- /dev/null
+++ b/arch/powerpc/platforms/8xx/ep88xc.c
@@ -0,0 +1,176 @@
+/*
+ * Platform setup for the Embedded Planet EP88xC board
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ * Copyright 2007 Freescale Semiconductor, Inc.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/init.h>
+#include <linux/of_platform.h>
+
+#include <asm/machdep.h>
+#include <asm/io.h>
+#include <asm/udbg.h>
+#include <asm/commproc.h>
+
+#include <sysdev/commproc.h>
+
+struct cpm_pin {
+        int port, pin, flags;
+};
+
+static struct cpm_pin ep88xc_pins[] = {
+        /* SMC1 */
+        {1, 24, CPM_PIN_INPUT}, /* RX */
+        {1, 25, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */
+
+        /* SCC2 */
+        {0, 12, CPM_PIN_INPUT}, /* TX */
+        {0, 13, CPM_PIN_INPUT}, /* RX */
+        {2, 8, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO}, /* CD */
+        {2, 9, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO}, /* CTS */
+        {2, 14, CPM_PIN_INPUT}, /* RTS */
+
+        /* MII1 */
+        {0, 0, CPM_PIN_INPUT},
+        {0, 1, CPM_PIN_INPUT},
+        {0, 2, CPM_PIN_INPUT},
+        {0, 3, CPM_PIN_INPUT},
+        {0, 4, CPM_PIN_OUTPUT},
+        {0, 10, CPM_PIN_OUTPUT},
+        {0, 11, CPM_PIN_OUTPUT},
+        {1, 19, CPM_PIN_INPUT},
+        {1, 31, CPM_PIN_INPUT},
+        {2, 12, CPM_PIN_INPUT},
+        {2, 13, CPM_PIN_INPUT},
+        {3, 8, CPM_PIN_INPUT},
+        {4, 30, CPM_PIN_OUTPUT},
+        {4, 31, CPM_PIN_OUTPUT},
+
+        /* MII2 */
+        {4, 14, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {4, 15, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {4, 16, CPM_PIN_OUTPUT},
+        {4, 17, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {4, 18, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {4, 19, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {4, 20, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {4, 21, CPM_PIN_OUTPUT},
+        {4, 22, CPM_PIN_OUTPUT},
+        {4, 23, CPM_PIN_OUTPUT},
+        {4, 24, CPM_PIN_OUTPUT},
+        {4, 25, CPM_PIN_OUTPUT},
+        {4, 26, CPM_PIN_OUTPUT},
+        {4, 27, CPM_PIN_OUTPUT},
+        {4, 28, CPM_PIN_OUTPUT},
+        {4, 29, CPM_PIN_OUTPUT},
+
+        /* USB */
+        {0, 6, CPM_PIN_INPUT},  /* CLK2 */
+        {0, 14, CPM_PIN_INPUT}, /* USBOE */
+        {0, 15, CPM_PIN_INPUT}, /* USBRXD */
+        {2, 6, CPM_PIN_OUTPUT}, /* USBTXN */
+        {2, 7, CPM_PIN_OUTPUT}, /* USBTXP */
+        {2, 10, CPM_PIN_INPUT}, /* USBRXN */
+        {2, 11, CPM_PIN_INPUT}, /* USBRXP */
+
+        /* Misc */
+        {1, 26, CPM_PIN_INPUT}, /* BRGO2 */
+        {1, 27, CPM_PIN_INPUT}, /* BRGO1 */
+};
+
+static void __init init_ioports(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(ep88xc_pins); i++) {
+                struct cpm_pin *pin = &ep88xc_pins[i];
+                cpm1_set_pin(pin->port, pin->pin, pin->flags);
+        }
+
+        cpm1_clk_setup(CPM_CLK_SMC1, CPM_BRG1, CPM_CLK_RTX);
+        cpm1_clk_setup(CPM_CLK_SCC1, CPM_CLK2, CPM_CLK_TX); /* USB */
+        cpm1_clk_setup(CPM_CLK_SCC1, CPM_CLK2, CPM_CLK_RX);
+        cpm1_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_TX);
+        cpm1_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_RX);
+}
+
+static u8 __iomem *ep88xc_bcsr;
+
+#define BCSR7_SCC2_ENABLE 0x10
+
+#define BCSR8_PHY1_ENABLE 0x80
+#define BCSR8_PHY1_POWER  0x40
+#define BCSR8_PHY2_ENABLE 0x20
+#define BCSR8_PHY2_POWER  0x10
+
+#define BCSR9_USB_ENABLE  0x80
+#define BCSR9_USB_POWER   0x40
+#define BCSR9_USB_HOST    0x20
+#define BCSR9_USB_FULL_SPEED_TARGET 0x10
+
+static void __init ep88xc_setup_arch(void)
+{
+        struct device_node *np;
+
+        cpm_reset();
+        init_ioports();
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,ep88xc-bcsr");
+        if (!np) {
+                printk(KERN_CRIT "Could not find fsl,ep88xc-bcsr node\n");
+                return;
+        }
+
+        ep88xc_bcsr = of_iomap(np, 0);
+        of_node_put(np);
+
+        if (!ep88xc_bcsr) {
+                printk(KERN_CRIT "Could not remap BCSR\n");
+                return;
+        }
+
+        setbits8(&ep88xc_bcsr[7], BCSR7_SCC2_ENABLE);
+        setbits8(&ep88xc_bcsr[8], BCSR8_PHY1_ENABLE | BCSR8_PHY1_POWER |
+                                  BCSR8_PHY2_ENABLE | BCSR8_PHY2_POWER);
+}
+
+static int __init ep88xc_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        return of_flat_dt_is_compatible(root, "fsl,ep88xc");
+}
+
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .name = "soc", },
+        { .name = "cpm", },
+        { .name = "localbus", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        /* Publish the QE devices */
+        if (machine_is(ep88xc))
+                of_platform_bus_probe(NULL, of_bus_ids, NULL);
+
+        return 0;
+}
+device_initcall(declare_of_platform_devices);
+
+define_machine(ep88xc) {
+        .name = "Embedded Planet EP88xC",
+        .probe = ep88xc_probe,
+        .setup_arch = ep88xc_setup_arch,
+        .init_IRQ = m8xx_pic_init,
+        .get_irq        = mpc8xx_get_irq,
+        .restart = mpc8xx_restart,
+        .calibrate_decr = mpc8xx_calibrate_decr,
+        .set_rtc_time = mpc8xx_set_rtc_time,
+        .get_rtc_time = mpc8xx_get_rtc_time,
+        .progress = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index f1693550c70c..d35eda80e9e6 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -10,57 +10,33 @@
  * bootup setup stuff..
  */
 
-#include <linux/errno.h>
-#include <linux/sched.h>
 #include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/stddef.h>
-#include <linux/unistd.h>
-#include <linux/ptrace.h>
 #include <linux/slab.h>
-#include <linux/user.h>
-#include <linux/a.out.h>
-#include <linux/tty.h>
-#include <linux/major.h>
 #include <linux/interrupt.h>
-#include <linux/reboot.h>
 #include <linux/init.h>
-#include <linux/initrd.h>
-#include <linux/ioport.h>
-#include <linux/bootmem.h>
-#include <linux/seq_file.h>
-#include <linux/root_dev.h>
 #include <linux/time.h>
 #include <linux/rtc.h>
-#include <linux/fsl_devices.h>
 
-#include <asm/mmu.h>
-#include <asm/reg.h>
-#include <asm/residual.h>
 #include <asm/io.h>
-#include <asm/pgtable.h>
 #include <asm/mpc8xx.h>
 #include <asm/8xx_immap.h>
-#include <asm/machdep.h>
-#include <asm/bootinfo.h>
-#include <asm/time.h>
 #include <asm/prom.h>
 #include <asm/fs_pd.h>
 #include <mm/mmu_decl.h>
 
-#include "sysdev/mpc8xx_pic.h"
+#include <sysdev/mpc8xx_pic.h>
+#include <sysdev/commproc.h>
 
 #ifdef CONFIG_PCMCIA_M8XX
 struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
 #endif
 
 void m8xx_calibrate_decr(void);
-extern void m8xx_wdt_handler_install(bd_t *bp);
 extern int cpm_pic_init(void);
 extern int cpm_get_irq(void);
 
 /* A place holder for time base interrupts, if they are ever enabled. */
-irqreturn_t timebase_interrupt(int irq, void * dev)
+static irqreturn_t timebase_interrupt(int irq, void *dev)
 {
         printk ("timebase_interrupt()\n");
 
@@ -77,7 +53,7 @@ static struct irqaction tbint_irqaction = {
 void __init __attribute__ ((weak))
 init_internal_rtc(void)
 {
-        sit8xx_t *sys_tmr = (sit8xx_t *) immr_map(im_sit);
+        sit8xx_t __iomem *sys_tmr = immr_map(im_sit);
 
         /* Disable the RTC one second and alarm interrupts. */
         clrbits16(&sys_tmr->sit_rtcsc, (RTCSC_SIE | RTCSC_ALE));
@@ -89,24 +65,24 @@ init_internal_rtc(void)
 
 static int __init get_freq(char *name, unsigned long *val)
 {
-        struct device_node *cpu;
-        const unsigned int *fp;
-        int found = 0;
+        struct device_node *cpu;
+        const unsigned int *fp;
+        int found = 0;
 
-        /* The cpu node should have timebase and clock frequency properties */
-        cpu = of_find_node_by_type(NULL, "cpu");
+        /* The cpu node should have timebase and clock frequency properties */
+        cpu = of_find_node_by_type(NULL, "cpu");
 
-        if (cpu) {
-                fp = of_get_property(cpu, name, NULL);
-                if (fp) {
-                        found = 1;
-                        *val = *fp;
-                }
+        if (cpu) {
+                fp = of_get_property(cpu, name, NULL);
+                if (fp) {
+                        found = 1;
+                        *val = *fp;
+                }
 
-                of_node_put(cpu);
-        }
+                of_node_put(cpu);
+        }
 
-        return found;
+        return found;
 }
 
 /* The decrementer counts at the system (internal) clock frequency divided by
@@ -116,13 +92,13 @@ static int __init get_freq(char *name, unsigned long *val)
 void __init mpc8xx_calibrate_decr(void)
 {
         struct device_node *cpu;
-        cark8xx_t *clk_r1;
-        car8xx_t *clk_r2;
-        sitk8xx_t *sys_tmr1;
-        sit8xx_t *sys_tmr2;
+        cark8xx_t __iomem *clk_r1;
+        car8xx_t __iomem *clk_r2;
+        sitk8xx_t __iomem *sys_tmr1;
+        sit8xx_t __iomem *sys_tmr2;
         int irq, virq;
 
-        clk_r1 = (cark8xx_t *) immr_map(im_clkrstk);
+        clk_r1 = immr_map(im_clkrstk);
 
         /* Unlock the SCCR. */
         out_be32(&clk_r1->cark_sccrk, ~KAPWR_KEY);
@@ -130,24 +106,24 @@ void __init mpc8xx_calibrate_decr(void)
         immr_unmap(clk_r1);
 
         /* Force all 8xx processors to use divide by 16 processor clock. */
-        clk_r2 = (car8xx_t *) immr_map(im_clkrst);
+        clk_r2 = immr_map(im_clkrst);
         setbits32(&clk_r2->car_sccr, 0x02000000);
         immr_unmap(clk_r2);
 
         /* 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");
-
-        printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
+        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");
+
+        printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
 
         /* Perform some more timer/timebase initialization.  This used
          * to be done elsewhere, but other changes caused it to get
@@ -164,7 +140,7 @@ void __init mpc8xx_calibrate_decr(void)
          * we guarantee the registers are locked, then we unlock them
          * for our use.
          */
-        sys_tmr1 = (sitk8xx_t *) immr_map(im_sitk);
+        sys_tmr1 = immr_map(im_sitk);
         out_be32(&sys_tmr1->sitk_tbscrk, ~KAPWR_KEY);
         out_be32(&sys_tmr1->sitk_rtcsck, ~KAPWR_KEY);
         out_be32(&sys_tmr1->sitk_tbk, ~KAPWR_KEY);
@@ -180,24 +156,17 @@ void __init mpc8xx_calibrate_decr(void)
          * we have to enable the timebase).  The decrementer interrupt
          * is wired into the vector table, nothing to do here for that.
          */
-        cpu = of_find_node_by_type(NULL, "cpu");
-        virq= irq_of_parse_and_map(cpu, 0);
+        cpu = of_find_node_by_type(NULL, "cpu");
+        virq= irq_of_parse_and_map(cpu, 0);
         irq = irq_map[virq].hwirq;
 
-        sys_tmr2 = (sit8xx_t *) immr_map(im_sit);
+        sys_tmr2 = immr_map(im_sit);
         out_be16(&sys_tmr2->sit_tbscr, ((1 << (7 - (irq/2))) << 8) |
                                         (TBSCR_TBF | TBSCR_TBE));
         immr_unmap(sys_tmr2);
 
         if (setup_irq(virq, &tbint_irqaction))
                 panic("Could not allocate timer IRQ!");
-
-#ifdef CONFIG_8xx_WDT
-        /* Install watchdog timer handler early because it might be
-         * already enabled by the bootloader
-         */
-        m8xx_wdt_handler_install(binfo);
-#endif
 }
 
 /* The RTC on the MPC8xx is an internal register.
@@ -207,14 +176,14 @@ void __init mpc8xx_calibrate_decr(void)
 
 int mpc8xx_set_rtc_time(struct rtc_time *tm)
 {
-        sitk8xx_t *sys_tmr1;
-        sit8xx_t *sys_tmr2;
+        sitk8xx_t __iomem *sys_tmr1;
+        sit8xx_t __iomem *sys_tmr2;
         int time;
 
-        sys_tmr1 = (sitk8xx_t *) immr_map(im_sitk);
-        sys_tmr2 = (sit8xx_t *) immr_map(im_sit);
+        sys_tmr1 = immr_map(im_sitk);
+        sys_tmr2 = immr_map(im_sit);
         time = mktime(tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
-                      tm->tm_hour, tm->tm_min, tm->tm_sec);
+                      tm->tm_hour, tm->tm_min, tm->tm_sec);
 
         out_be32(&sys_tmr1->sitk_rtck, KAPWR_KEY);
         out_be32(&sys_tmr2->sit_rtc, time);
@@ -228,21 +197,20 @@ int mpc8xx_set_rtc_time(struct rtc_time *tm)
 void mpc8xx_get_rtc_time(struct rtc_time *tm)
 {
         unsigned long data;
-        sit8xx_t *sys_tmr = (sit8xx_t *) immr_map(im_sit);
+        sit8xx_t __iomem *sys_tmr = immr_map(im_sit);
 
         /* Get time from the RTC. */
         data = in_be32(&sys_tmr->sit_rtc);
         to_tm(data, tm);
-        tm->tm_year -= 1900;
-        tm->tm_mon -= 1;
+        tm->tm_year -= 1900;
+        tm->tm_mon -= 1;
         immr_unmap(sys_tmr);
         return;
 }
 
 void mpc8xx_restart(char *cmd)
 {
-        __volatile__ unsigned char dummy;
-        car8xx_t * clk_r = (car8xx_t *) immr_map(im_clkrst);
+        car8xx_t __iomem *clk_r = immr_map(im_clkrst);
 
 
         local_irq_disable();
@@ -252,26 +220,8 @@ void mpc8xx_restart(char *cmd)
         */
         mtmsr(mfmsr() & ~0x1000);
 
-        dummy = in_8(&clk_r->res[0]);
-        printk("Restart failed\n");
-        while(1);
-}
-
-void mpc8xx_show_cpuinfo(struct seq_file *m)
-{
-        struct device_node *root;
-        uint memsize = total_memory;
-        const char *model = "";
-
-        seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
-
-        root = of_find_node_by_path("/");
-        if (root)
-                model = of_get_property(root, "model", NULL);
-        seq_printf(m, "Machine\t\t: %s\n", model);
-        of_node_put(root);
-
-        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
+        in_8(&clk_r->res[0]);
+        panic("Restart failed\n");
 }
 
 static void cpm_cascade(unsigned int irq, struct irq_desc *desc)
@@ -298,7 +248,7 @@ void __init m8xx_pic_init(void)
         int irq;
 
         if (mpc8xx_pic_init()) {
-                printk(KERN_ERR "Failed interrupt 8xx controller  initialization\n");
+                printk(KERN_ERR "Failed interrupt 8xx controller  initialization\n");
                 return;
         }
 
diff --git a/arch/powerpc/platforms/8xx/mpc86xads.h b/arch/powerpc/platforms/8xx/mpc86xads.h
index 59bad2f9ae51..cffa194ccf1f 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads.h
+++ b/arch/powerpc/platforms/8xx/mpc86xads.h
@@ -15,7 +15,6 @@
 #ifndef __ASM_MPC86XADS_H__
 #define __ASM_MPC86XADS_H__
 
-#include <asm/ppcboot.h>
 #include <sysdev/fsl_soc.h>
 
 /* U-Boot maps BCSR to 0xff080000 */
@@ -30,9 +29,6 @@
 #define CFG_PHYDEV_ADDR         ((uint)0xff0a0000)
 #define BCSR5                   ((uint)(CFG_PHYDEV_ADDR + 0x300))
 
-#define IMAP_ADDR               (get_immrbase())
-#define IMAP_SIZE               ((uint)(64 * 1024))
-
 #define MPC8xx_CPM_OFFSET       (0x9c0)
 #define CPM_MAP_ADDR            (get_immrbase() + MPC8xx_CPM_OFFSET)
 #define CPM_IRQ_OFFSET          16     // for compability with cpm_uart driver
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
index cf0e7bc8c2e7..49012835f453 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -31,21 +31,13 @@
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/ppcboot.h>
 #include <asm/mpc8xx.h>
 #include <asm/8xx_immap.h>
 #include <asm/commproc.h>
 #include <asm/fs_pd.h>
 #include <asm/prom.h>
 
-extern void cpm_reset(void);
-extern void mpc8xx_show_cpuinfo(struct seq_file*);
-extern void mpc8xx_restart(char *cmd);
-extern void mpc8xx_calibrate_decr(void);
-extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
-extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
-extern void m8xx_pic_init(void);
-extern unsigned int mpc8xx_get_irq(void);
+#include <sysdev/commproc.h>
 
 static void init_smc1_uart_ioports(struct fs_uart_platform_info* fpi);
 static void init_smc2_uart_ioports(struct fs_uart_platform_info* fpi);
@@ -254,20 +246,6 @@ int platform_device_skip(const char *model, int id)
 
 static void __init mpc86xads_setup_arch(void)
 {
-        struct device_node *cpu;
-
-        cpu = of_find_node_by_type(NULL, "cpu");
-        if (cpu != 0) {
-                const unsigned int *fp;
-
-                fp = of_get_property(cpu, "clock-frequency", NULL);
-                if (fp != 0)
-                        loops_per_jiffy = *fp / HZ;
-                else
-                        loops_per_jiffy = 50000000 / HZ;
-                of_node_put(cpu);
-        }
-
         cpm_reset();
 
         mpc86xads_board_setup();
@@ -292,7 +270,6 @@ define_machine(mpc86x_ads) {
         .probe                  = mpc86xads_probe,
         .setup_arch             = mpc86xads_setup_arch,
         .init_IRQ               = m8xx_pic_init,
-        .show_cpuinfo           = mpc8xx_show_cpuinfo,
         .get_irq                = mpc8xx_get_irq,
         .restart                = mpc8xx_restart,
         .calibrate_decr         = mpc8xx_calibrate_decr,
diff --git a/arch/powerpc/platforms/8xx/mpc885ads.h b/arch/powerpc/platforms/8xx/mpc885ads.h
index 7c31aec284c2..a5076668bad6 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads.h
+++ b/arch/powerpc/platforms/8xx/mpc885ads.h
@@ -15,31 +15,12 @@
 #ifndef __ASM_MPC885ADS_H__
 #define __ASM_MPC885ADS_H__
 
-#include <asm/ppcboot.h>
 #include <sysdev/fsl_soc.h>
 
-/* U-Boot maps BCSR to 0xff080000 */
-#define BCSR_ADDR               ((uint)0xff080000)
-#define BCSR_SIZE               ((uint)32)
-#define BCSR0                   ((uint)(BCSR_ADDR + 0x00))
-#define BCSR1                   ((uint)(BCSR_ADDR + 0x04))
-#define BCSR2                   ((uint)(BCSR_ADDR + 0x08))
-#define BCSR3                   ((uint)(BCSR_ADDR + 0x0c))
-#define BCSR4                   ((uint)(BCSR_ADDR + 0x10))
-
-#define CFG_PHYDEV_ADDR         ((uint)0xff0a0000)
-#define BCSR5                   ((uint)(CFG_PHYDEV_ADDR + 0x300))
-
-#define IMAP_ADDR               (get_immrbase())
-#define IMAP_SIZE               ((uint)(64 * 1024))
-
 #define MPC8xx_CPM_OFFSET       (0x9c0)
 #define CPM_MAP_ADDR            (get_immrbase() + MPC8xx_CPM_OFFSET)
 #define CPM_IRQ_OFFSET          16     // for compability with cpm_uart driver
 
-#define PCMCIA_MEM_ADDR         ((uint)0xff020000)
-#define PCMCIA_MEM_SIZE         ((uint)(64 * 1024))
-
 /* Bits of interest in the BCSRs.
  */
 #define BCSR1_ETHEN             ((uint)0x20000000)
@@ -68,28 +49,5 @@
 #define BCSR5_MII1_EN           0x02
 #define BCSR5_MII1_RST          0x01
 
-/* Interrupt level assignments */
-#define PHY_INTERRUPT   SIU_IRQ7        /* PHY link change interrupt */
-#define SIU_INT_FEC1    SIU_LEVEL1      /* FEC1 interrupt */
-#define SIU_INT_FEC2    SIU_LEVEL3      /* FEC2 interrupt */
-#define FEC_INTERRUPT   SIU_INT_FEC1    /* FEC interrupt */
-
-/* We don't use the 8259 */
-#define NR_8259_INTS    0
-
-/* CPM Ethernet through SCC3 */
-#define PA_ENET_RXD     ((ushort)0x0040)
-#define PA_ENET_TXD     ((ushort)0x0080)
-#define PE_ENET_TCLK    ((uint)0x00004000)
-#define PE_ENET_RCLK    ((uint)0x00008000)
-#define PE_ENET_TENA    ((uint)0x00000010)
-#define PC_ENET_CLSN    ((ushort)0x0400)
-#define PC_ENET_RENA    ((ushort)0x0800)
-
-/* Control bits in the SICR to route TCLK (CLK5) and RCLK (CLK6) to
- * SCC3.  Also, make sure GR3 (bit 8) and SC3 (bit 9) are zero */
-#define SICR_ENET_MASK  ((uint)0x00ff0000)
-#define SICR_ENET_CLKRT ((uint)0x002c0000)
-
 #endif /* __ASM_MPC885ADS_H__ */
 #endif /* __KERNEL__ */
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index 5a808d611ae3..2cf1b6a75173 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -1,11 +1,13 @@
-/*arch/powerpc/platforms/8xx/mpc885ads_setup.c
- *
+/*
  * Platform setup for the Freescale mpc885ads board
  *
  * Vitaly Bordug <vbordug@ru.mvista.com>
  *
  * Copyright 2005 MontaVista Software Inc.
  *
+ * Heavily modified by Scott Wood <scottwood@freescale.com>
+ * Copyright 2007 Freescale Semiconductor, 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.
@@ -18,12 +20,12 @@
 #include <linux/ioport.h>
 #include <linux/device.h>
 #include <linux/delay.h>
-#include <linux/root_dev.h>
 
 #include <linux/fs_enet_pd.h>
 #include <linux/fs_uart_pd.h>
 #include <linux/fsl_devices.h>
 #include <linux/mii.h>
+#include <linux/of_platform.h>
 
 #include <asm/delay.h>
 #include <asm/io.h>
@@ -32,46 +34,28 @@
 #include <asm/processor.h>
 #include <asm/system.h>
 #include <asm/time.h>
-#include <asm/ppcboot.h>
 #include <asm/mpc8xx.h>
 #include <asm/8xx_immap.h>
 #include <asm/commproc.h>
 #include <asm/fs_pd.h>
-#include <asm/prom.h>
+#include <asm/udbg.h>
 
-extern void cpm_reset(void);
-extern void mpc8xx_show_cpuinfo(struct seq_file *);
-extern void mpc8xx_restart(char *cmd);
-extern void mpc8xx_calibrate_decr(void);
-extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
-extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
-extern void m8xx_pic_init(void);
-extern unsigned int mpc8xx_get_irq(void);
+#include <sysdev/commproc.h>
 
-static void init_smc1_uart_ioports(struct fs_uart_platform_info *fpi);
-static void init_smc2_uart_ioports(struct fs_uart_platform_info *fpi);
-static void init_scc3_ioports(struct fs_platform_info *ptr);
+static u32 __iomem *bcsr, *bcsr5;
 
 #ifdef CONFIG_PCMCIA_M8XX
 static void pcmcia_hw_setup(int slot, int enable)
 {
-        unsigned *bcsr_io;
-
-        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
         if (enable)
-                clrbits32(bcsr_io, BCSR1_PCCEN);
+                clrbits32(&bcsr[1], BCSR1_PCCEN);
         else
-                setbits32(bcsr_io, BCSR1_PCCEN);
-
-        iounmap(bcsr_io);
+                setbits32(&bcsr[1], BCSR1_PCCEN);
 }
 
 static int pcmcia_set_voltage(int slot, int vcc, int vpp)
 {
         u32 reg = 0;
-        unsigned *bcsr_io;
-
-        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
 
         switch (vcc) {
         case 0:
@@ -106,344 +90,196 @@ static int pcmcia_set_voltage(int slot, int vcc, int vpp)
         }
 
         /* first, turn off all power */
-        clrbits32(bcsr_io, 0x00610000);
+        clrbits32(&bcsr[1], 0x00610000);
 
         /* enable new powersettings */
-        setbits32(bcsr_io, reg);
+        setbits32(&bcsr[1], reg);
 
-        iounmap(bcsr_io);
         return 0;
 }
 #endif
 
-void __init mpc885ads_board_setup(void)
-{
-        cpm8xx_t *cp;
-        unsigned int *bcsr_io;
-        u8 tmpval8;
-
-#ifdef CONFIG_FS_ENET
-        iop8xx_t *io_port;
-#endif
-
-        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
-        cp = (cpm8xx_t *) immr_map(im_cpm);
-
-        if (bcsr_io == NULL) {
-                printk(KERN_CRIT "Could not remap BCSR\n");
-                return;
-        }
-#ifdef CONFIG_SERIAL_CPM_SMC1
-        clrbits32(bcsr_io, BCSR1_RS232EN_1);
-        clrbits32(&cp->cp_simode, 0xe0000000 >> 17);    /* brg1 */
-        tmpval8 = in_8(&(cp->cp_smc[0].smc_smcm)) | (SMCM_RX | SMCM_TX);
-        out_8(&(cp->cp_smc[0].smc_smcm), tmpval8);
-        clrbits16(&cp->cp_smc[0].smc_smcmr, SMCMR_REN | SMCMR_TEN);     /* brg1 */
-#else
-        setbits32(bcsr_io, BCSR1_RS232EN_1);
-        out_be16(&cp->cp_smc[0].smc_smcmr, 0);
-        out_8(&cp->cp_smc[0].smc_smce, 0);
-#endif
-
-#ifdef CONFIG_SERIAL_CPM_SMC2
-        clrbits32(bcsr_io, BCSR1_RS232EN_2);
-        clrbits32(&cp->cp_simode, 0xe0000000 >> 1);
-        setbits32(&cp->cp_simode, 0x20000000 >> 1);     /* brg2 */
-        tmpval8 = in_8(&(cp->cp_smc[1].smc_smcm)) | (SMCM_RX | SMCM_TX);
-        out_8(&(cp->cp_smc[1].smc_smcm), tmpval8);
-        clrbits16(&cp->cp_smc[1].smc_smcmr, SMCMR_REN | SMCMR_TEN);
+struct cpm_pin {
+        int port, pin, flags;
+};
 
-        init_smc2_uart_ioports(0);
-#else
-        setbits32(bcsr_io, BCSR1_RS232EN_2);
-        out_be16(&cp->cp_smc[1].smc_smcmr, 0);
-        out_8(&cp->cp_smc[1].smc_smce, 0);
-#endif
-        immr_unmap(cp);
-        iounmap(bcsr_io);
-
-#ifdef CONFIG_FS_ENET
-        /* use MDC for MII (common) */
-        io_port = (iop8xx_t *) immr_map(im_ioport);
-        setbits16(&io_port->iop_pdpar, 0x0080);
-        clrbits16(&io_port->iop_pddir, 0x0080);
-
-        bcsr_io = ioremap(BCSR5, sizeof(unsigned long));
-        clrbits32(bcsr_io, BCSR5_MII1_EN);
-        clrbits32(bcsr_io, BCSR5_MII1_RST);
-#ifndef CONFIG_FC_ENET_HAS_SCC
-        clrbits32(bcsr_io, BCSR5_MII2_EN);
-        clrbits32(bcsr_io, BCSR5_MII2_RST);
+static struct cpm_pin mpc885ads_pins[] = {
+        /* SMC1 */
+        {CPM_PORTB, 24, CPM_PIN_INPUT}, /* RX */
+        {CPM_PORTB, 25, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */
 
+        /* SMC2 */
+#ifndef CONFIG_MPC8xx_SECOND_ETH_FEC2
+        {CPM_PORTE, 21, CPM_PIN_INPUT}, /* RX */
+        {CPM_PORTE, 20, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */
 #endif
-        iounmap(bcsr_io);
-        immr_unmap(io_port);
 
+        /* SCC3 */
+        {CPM_PORTA, 9, CPM_PIN_INPUT}, /* RX */
+        {CPM_PORTA, 8, CPM_PIN_INPUT}, /* TX */
+        {CPM_PORTC, 4, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO}, /* RENA */
+        {CPM_PORTC, 5, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_GPIO}, /* CLSN */
+        {CPM_PORTE, 27, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TENA */
+        {CPM_PORTE, 17, CPM_PIN_INPUT}, /* CLK5 */
+        {CPM_PORTE, 16, CPM_PIN_INPUT}, /* CLK6 */
+
+        /* MII1 */
+        {CPM_PORTA, 0, CPM_PIN_INPUT},
+        {CPM_PORTA, 1, CPM_PIN_INPUT},
+        {CPM_PORTA, 2, CPM_PIN_INPUT},
+        {CPM_PORTA, 3, CPM_PIN_INPUT},
+        {CPM_PORTA, 4, CPM_PIN_OUTPUT},
+        {CPM_PORTA, 10, CPM_PIN_OUTPUT},
+        {CPM_PORTA, 11, CPM_PIN_OUTPUT},
+        {CPM_PORTB, 19, CPM_PIN_INPUT},
+        {CPM_PORTB, 31, CPM_PIN_INPUT},
+        {CPM_PORTC, 12, CPM_PIN_INPUT},
+        {CPM_PORTC, 13, CPM_PIN_INPUT},
+        {CPM_PORTE, 30, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 31, CPM_PIN_OUTPUT},
+
+        /* MII2 */
+#ifdef CONFIG_MPC8xx_SECOND_ETH_FEC2
+        {CPM_PORTE, 14, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {CPM_PORTE, 15, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {CPM_PORTE, 16, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 17, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {CPM_PORTE, 18, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {CPM_PORTE, 19, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {CPM_PORTE, 20, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {CPM_PORTE, 21, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 22, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 23, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 24, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 25, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 26, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 27, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 28, CPM_PIN_OUTPUT},
+        {CPM_PORTE, 29, CPM_PIN_OUTPUT},
 #endif
+};
 
-#ifdef CONFIG_PCMCIA_M8XX
-        /*Set up board specific hook-ups */
-        m8xx_pcmcia_ops.hw_ctrl = pcmcia_hw_setup;
-        m8xx_pcmcia_ops.voltage_set = pcmcia_set_voltage;
-#endif
-}
-
-static void init_fec1_ioports(struct fs_platform_info *ptr)
+static void __init init_ioports(void)
 {
-        cpm8xx_t *cp = (cpm8xx_t *) immr_map(im_cpm);
-        iop8xx_t *io_port = (iop8xx_t *) immr_map(im_ioport);
-
-        /* configure FEC1 pins  */
-        setbits16(&io_port->iop_papar, 0xf830);
-        setbits16(&io_port->iop_padir, 0x0830);
-        clrbits16(&io_port->iop_padir, 0xf000);
+        int i;
 
-        setbits32(&cp->cp_pbpar, 0x00001001);
-        clrbits32(&cp->cp_pbdir, 0x00001001);
-
-        setbits16(&io_port->iop_pcpar, 0x000c);
-        clrbits16(&io_port->iop_pcdir, 0x000c);
+        for (i = 0; i < ARRAY_SIZE(mpc885ads_pins); i++) {
+                struct cpm_pin *pin = &mpc885ads_pins[i];
+                cpm1_set_pin(pin->port, pin->pin, pin->flags);
+        }
 
-        setbits32(&cp->cp_pepar, 0x00000003);
-        setbits32(&cp->cp_pedir, 0x00000003);
-        clrbits32(&cp->cp_peso, 0x00000003);
-        clrbits32(&cp->cp_cptr, 0x00000100);
+        cpm1_clk_setup(CPM_CLK_SMC1, CPM_BRG1, CPM_CLK_RTX);
+        cpm1_clk_setup(CPM_CLK_SMC2, CPM_BRG2, CPM_CLK_RTX);
+        cpm1_clk_setup(CPM_CLK_SCC3, CPM_CLK5, CPM_CLK_TX);
+        cpm1_clk_setup(CPM_CLK_SCC3, CPM_CLK6, CPM_CLK_RX);
 
-        immr_unmap(io_port);
-        immr_unmap(cp);
+        /* Set FEC1 and FEC2 to MII mode */
+        clrbits32(&mpc8xx_immr->im_cpm.cp_cptr, 0x00000180);
 }
 
-static void init_fec2_ioports(struct fs_platform_info *ptr)
+static void __init mpc885ads_setup_arch(void)
 {
-        cpm8xx_t *cp = (cpm8xx_t *) immr_map(im_cpm);
-        iop8xx_t *io_port = (iop8xx_t *) immr_map(im_ioport);
-
-        /* configure FEC2 pins */
-        setbits32(&cp->cp_pepar, 0x0003fffc);
-        setbits32(&cp->cp_pedir, 0x0003fffc);
-        clrbits32(&cp->cp_peso, 0x000087fc);
-        setbits32(&cp->cp_peso, 0x00037800);
-        clrbits32(&cp->cp_cptr, 0x00000080);
-
-        immr_unmap(io_port);
-        immr_unmap(cp);
-}
+        struct device_node *np;
 
-void init_fec_ioports(struct fs_platform_info *fpi)
-{
-        int fec_no = fs_get_fec_index(fpi->fs_no);
+        cpm_reset();
+        init_ioports();
 
-        switch (fec_no) {
-        case 0:
-                init_fec1_ioports(fpi);
-                break;
-        case 1:
-                init_fec2_ioports(fpi);
-                break;
-        default:
-                printk(KERN_ERR "init_fec_ioports: invalid FEC number\n");
+        np = of_find_compatible_node(NULL, NULL, "fsl,mpc885ads-bcsr");
+        if (!np) {
+                printk(KERN_CRIT "Could not find fsl,mpc885ads-bcsr node\n");
                 return;
         }
-}
-
-static void init_scc3_ioports(struct fs_platform_info *fpi)
-{
-        unsigned *bcsr_io;
-        iop8xx_t *io_port;
-        cpm8xx_t *cp;
 
-        bcsr_io = ioremap(BCSR_ADDR, BCSR_SIZE);
-        io_port = (iop8xx_t *) immr_map(im_ioport);
-        cp = (cpm8xx_t *) immr_map(im_cpm);
+        bcsr = of_iomap(np, 0);
+        bcsr5 = of_iomap(np, 1);
+        of_node_put(np);
 
-        if (bcsr_io == NULL) {
+        if (!bcsr || !bcsr5) {
                 printk(KERN_CRIT "Could not remap BCSR\n");
                 return;
         }
 
-        /* Enable the PHY.
-         */
-        clrbits32(bcsr_io + 4, BCSR4_ETH10_RST);
-        udelay(1000);
-        setbits32(bcsr_io + 4, BCSR4_ETH10_RST);
-        /* Configure port A pins for Txd and Rxd.
-         */
-        setbits16(&io_port->iop_papar, PA_ENET_RXD | PA_ENET_TXD);
-        clrbits16(&io_port->iop_padir, PA_ENET_RXD | PA_ENET_TXD);
+        clrbits32(&bcsr[1], BCSR1_RS232EN_1);
+#ifdef CONFIG_MPC8xx_SECOND_ETH_FEC2
+        setbits32(&bcsr[1], BCSR1_RS232EN_2);
+#else
+        clrbits32(&bcsr[1], BCSR1_RS232EN_2);
+#endif
 
-        /* Configure port C pins to enable CLSN and RENA.
-         */
-        clrbits16(&io_port->iop_pcpar, PC_ENET_CLSN | PC_ENET_RENA);
-        clrbits16(&io_port->iop_pcdir, PC_ENET_CLSN | PC_ENET_RENA);
-        setbits16(&io_port->iop_pcso, PC_ENET_CLSN | PC_ENET_RENA);
+        clrbits32(bcsr5, BCSR5_MII1_EN);
+        setbits32(bcsr5, BCSR5_MII1_RST);
+        udelay(1000);
+        clrbits32(bcsr5, BCSR5_MII1_RST);
 
-        /* Configure port E for TCLK and RCLK.
-         */
-        setbits32(&cp->cp_pepar, PE_ENET_TCLK | PE_ENET_RCLK);
-        clrbits32(&cp->cp_pepar, PE_ENET_TENA);
-        clrbits32(&cp->cp_pedir, PE_ENET_TCLK | PE_ENET_RCLK | PE_ENET_TENA);
-        clrbits32(&cp->cp_peso, PE_ENET_TCLK | PE_ENET_RCLK);
-        setbits32(&cp->cp_peso, PE_ENET_TENA);
-
-        /* Configure Serial Interface clock routing.
-         * First, clear all SCC bits to zero, then set the ones we want.
-         */
-        clrbits32(&cp->cp_sicr, SICR_ENET_MASK);
-        setbits32(&cp->cp_sicr, SICR_ENET_CLKRT);
+#ifdef CONFIG_MPC8xx_SECOND_ETH_FEC2
+        clrbits32(bcsr5, BCSR5_MII2_EN);
+        setbits32(bcsr5, BCSR5_MII2_RST);
+        udelay(1000);
+        clrbits32(bcsr5, BCSR5_MII2_RST);
+#else
+        setbits32(bcsr5, BCSR5_MII2_EN);
+#endif
 
-        /* Disable Rx and Tx. SMC1 sshould be stopped if SCC3 eternet are used.
-         */
-        clrbits16(&cp->cp_smc[0].smc_smcmr, SMCMR_REN | SMCMR_TEN);
-        /* On the MPC885ADS SCC ethernet PHY is initialized in the full duplex mode
-         * by H/W setting after reset. SCC ethernet controller support only half duplex.
-         * This discrepancy of modes causes a lot of carrier lost errors.
-         */
+#ifdef CONFIG_MPC8xx_SECOND_ETH_SCC3
+        clrbits32(&bcsr[4], BCSR4_ETH10_RST);
+        udelay(1000);
+        setbits32(&bcsr[4], BCSR4_ETH10_RST);
 
-        /* In the original SCC enet driver the following code is placed at
-           the end of the initialization */
-        setbits32(&cp->cp_pepar, PE_ENET_TENA);
-        clrbits32(&cp->cp_pedir, PE_ENET_TENA);
-        setbits32(&cp->cp_peso, PE_ENET_TENA);
+        setbits32(&bcsr[1], BCSR1_ETHEN);
 
-        setbits32(bcsr_io + 4, BCSR1_ETHEN);
-        iounmap(bcsr_io);
-        immr_unmap(io_port);
-        immr_unmap(cp);
-}
+        np = of_find_node_by_path("/soc@ff000000/cpm@9c0/serial@a80");
+#else
+        np = of_find_node_by_path("/soc@ff000000/cpm@9c0/ethernet@a40");
+#endif
 
-void init_scc_ioports(struct fs_platform_info *fpi)
-{
-        int scc_no = fs_get_scc_index(fpi->fs_no);
+        /* The SCC3 enet registers overlap the SMC1 registers, so
+         * one of the two must be removed from the device tree.
+         */
 
-        switch (scc_no) {
-        case 2:
-                init_scc3_ioports(fpi);
-                break;
-        default:
-                printk(KERN_ERR "init_scc_ioports: invalid SCC number\n");
-                return;
+        if (np) {
+                of_detach_node(np);
+                of_node_put(np);
         }
-}
 
-static void init_smc1_uart_ioports(struct fs_uart_platform_info *ptr)
-{
-        unsigned *bcsr_io;
-        cpm8xx_t *cp;
-
-        cp = (cpm8xx_t *) immr_map(im_cpm);
-        setbits32(&cp->cp_pepar, 0x000000c0);
-        clrbits32(&cp->cp_pedir, 0x000000c0);
-        clrbits32(&cp->cp_peso, 0x00000040);
-        setbits32(&cp->cp_peso, 0x00000080);
-        immr_unmap(cp);
-
-        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
-
-        if (bcsr_io == NULL) {
-                printk(KERN_CRIT "Could not remap BCSR1\n");
-                return;
-        }
-        clrbits32(bcsr_io, BCSR1_RS232EN_1);
-        iounmap(bcsr_io);
+#ifdef CONFIG_PCMCIA_M8XX
+        /* Set up board specific hook-ups.*/
+        m8xx_pcmcia_ops.hw_ctrl = pcmcia_hw_setup;
+        m8xx_pcmcia_ops.voltage_set = pcmcia_set_voltage;
+#endif
 }
 
-static void init_smc2_uart_ioports(struct fs_uart_platform_info *fpi)
+static int __init mpc885ads_probe(void)
 {
-        unsigned *bcsr_io;
-        cpm8xx_t *cp;
-
-        cp = (cpm8xx_t *) immr_map(im_cpm);
-        setbits32(&cp->cp_pepar, 0x00000c00);
-        clrbits32(&cp->cp_pedir, 0x00000c00);
-        clrbits32(&cp->cp_peso, 0x00000400);
-        setbits32(&cp->cp_peso, 0x00000800);
-        immr_unmap(cp);
-
-        bcsr_io = ioremap(BCSR1, sizeof(unsigned long));
-
-        if (bcsr_io == NULL) {
-                printk(KERN_CRIT "Could not remap BCSR1\n");
-                return;
-        }
-        clrbits32(bcsr_io, BCSR1_RS232EN_2);
-        iounmap(bcsr_io);
+        unsigned long root = of_get_flat_dt_root();
+        return of_flat_dt_is_compatible(root, "fsl,mpc885ads");
 }
 
-void init_smc_ioports(struct fs_uart_platform_info *data)
-{
-        int smc_no = fs_uart_id_fsid2smc(data->fs_no);
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .name = "soc", },
+        { .name = "cpm", },
+        { .name = "localbus", },
+        {},
+};
 
-        switch (smc_no) {
-        case 0:
-                init_smc1_uart_ioports(data);
-                data->brg = data->clk_rx;
-                break;
-        case 1:
-                init_smc2_uart_ioports(data);
-                data->brg = data->clk_rx;
-                break;
-        default:
-                printk(KERN_ERR "init_scc_ioports: invalid SCC number\n");
-                return;
-        }
-}
-
-int platform_device_skip(const char *model, int id)
+static int __init declare_of_platform_devices(void)
 {
-#ifdef CONFIG_MPC8xx_SECOND_ETH_SCC3
-        const char *dev = "FEC";
-        int n = 2;
-#else
-        const char *dev = "SCC";
-        int n = 3;
-#endif
-
-        if (!strcmp(model, dev) && n == id)
-                return 1;
+        /* Publish the QE devices */
+        if (machine_is(mpc885_ads))
+                of_platform_bus_probe(NULL, of_bus_ids, NULL);
 
         return 0;
 }
-
-static void __init mpc885ads_setup_arch(void)
-{
-        struct device_node *cpu;
-
-        cpu = of_find_node_by_type(NULL, "cpu");
-        if (cpu != 0) {
-                const unsigned int *fp;
-
-                fp = of_get_property(cpu, "clock-frequency", NULL);
-                if (fp != 0)
-                        loops_per_jiffy = *fp / HZ;
-                else
-                        loops_per_jiffy = 50000000 / HZ;
-                of_node_put(cpu);
-        }
-
-        cpm_reset();
-
-        mpc885ads_board_setup();
-
-        ROOT_DEV = Root_NFS;
-}
-
-static int __init mpc885ads_probe(void)
-{
-        char *model = of_get_flat_dt_prop(of_get_flat_dt_root(),
-                                          "model", NULL);
-        if (model == NULL)
-                return 0;
-        if (strcmp(model, "MPC885ADS"))
-                return 0;
-
-        return 1;
-}
-
-define_machine(mpc885_ads)
-{
-.name = "MPC885 ADS",.probe = mpc885ads_probe,.setup_arch =
-            mpc885ads_setup_arch,.init_IRQ =
-            m8xx_pic_init,.show_cpuinfo = mpc8xx_show_cpuinfo,.get_irq =
-            mpc8xx_get_irq,.restart = mpc8xx_restart,.calibrate_decr =
-            mpc8xx_calibrate_decr,.set_rtc_time =
-            mpc8xx_set_rtc_time,.get_rtc_time = mpc8xx_get_rtc_time,};
+device_initcall(declare_of_platform_devices);
+
+define_machine(mpc885_ads) {
+        .name                   = "Freescale MPC885 ADS",
+        .probe                  = mpc885ads_probe,
+        .setup_arch             = mpc885ads_setup_arch,
+        .init_IRQ               = m8xx_pic_init,
+        .get_irq                = mpc8xx_get_irq,
+        .restart                = mpc8xx_restart,
+        .calibrate_decr         = mpc8xx_calibrate_decr,
+        .set_rtc_time           = mpc8xx_set_rtc_time,
+        .get_rtc_time           = mpc8xx_get_rtc_time,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 19d4628edf79..cc6013ffc29a 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -12,13 +12,10 @@ config PPC_MULTIPLATFORM
           RS/6000 machine, an Apple machine, or a PReP, CHRP,
           Maple or Cell-based machine.
 
-config EMBEDDED6xx
-        bool "Embedded 6xx/7xx/7xxx-based board"
-        depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
-
 config PPC_82xx
         bool "Freescale 82xx"
         depends on 6xx
+        select WANT_DEVICE_TREE
 
 config PPC_83xx
         bool "Freescale 83xx"
@@ -58,7 +55,7 @@ source "arch/powerpc/platforms/85xx/Kconfig"
 source "arch/powerpc/platforms/86xx/Kconfig"
 source "arch/powerpc/platforms/embedded6xx/Kconfig"
 source "arch/powerpc/platforms/44x/Kconfig"
-#source "arch/powerpc/platforms/4xx/Kconfig
+source "arch/powerpc/platforms/40x/Kconfig"
 
 config PPC_NATIVE
         bool
@@ -136,6 +133,16 @@ config MPIC_U3_HT_IRQS
         depends on PPC_MAPLE
         default y
 
+config MPIC_BROKEN_REGREAD
+        bool
+        depends on MPIC
+        help
+          This option enables a MPIC driver workaround for some chips
+          that have a bug that causes some interrupt source information
+          to not read back properly. It is safe to use on other chips as
+          well, but enabling it uses about 8KB of memory to keep copies
+          of the register contents in software.
+
 config IBMVIO
         depends on PPC_PSERIES || PPC_ISERIES
         bool
@@ -266,12 +273,24 @@ config QUICC_ENGINE
 config CPM2
         bool
         default n
+        select CPM
         help
           The CPM2 (Communications Processor Module) is a coprocessor on
           embedded CPUs made by Freescale.  Selecting this option means that
           you wish to build a kernel for a machine with a CPM2 coprocessor
           on it (826x, 827x, 8560).
 
+config PPC_CPM_NEW_BINDING
+        bool
+        depends on CPM1 || CPM2
+        help
+          Select this if your board has been converted to use the new
+          device tree bindings for CPM, and no longer needs the
+          ioport callbacks or the platform device glue code.
+
+          The fs_enet and cpm_uart drivers will be built as
+          of_platform devices.
+
 config AXON_RAM
         tristate "Axon DDR2 memory device driver"
         depends on PPC_IBM_CELL_BLADE
@@ -291,4 +310,7 @@ config FSL_ULI1575
           Freescale reference boards. The boards all use the ULI in pretty
           much the same way.
 
+config CPM
+        bool
+
 endmenu
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index e4b2aee53a73..4c315be25015 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -36,10 +36,12 @@ config PPC_8xx
         bool "Freescale 8xx"
         select FSL_SOC
         select 8xx
+        select WANT_DEVICE_TREE
 
 config 40x
         bool "AMCC 40x"
         select PPC_DCR_NATIVE
+        select WANT_DEVICE_TREE
 
 config 44x
         bool "AMCC 44x"
@@ -69,6 +71,18 @@ config POWER4
         depends on PPC64
         def_bool y
 
+config TUNE_CELL
+        bool "Optimize for Cell Broadband Engine"
+        depends on PPC64
+        help
+          Cause the compiler to optimize for the PPE of the Cell Broadband
+          Engine. This will make the code run considerably faster on Cell
+          but somewhat slower on other machines. This option only changes
+          the scheduling of instructions, not the selection of instructions
+          itself, so the resulting kernel will keep running on all other
+          machines. When building a kernel that is supposed to run only
+          on Cell, you should also select the POWER4_ONLY option.
+
 config 6xx
         bool
 
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index d44e832b01f2..6d9079da5f5a 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_PPC_PMAC)		+= powermac/
 endif
 endif
 obj-$(CONFIG_PPC_CHRP)          += chrp/
-#obj-$(CONFIG_4xx)              += 4xx/
+obj-$(CONFIG_40x)               += 40x/
 obj-$(CONFIG_44x)               += 44x/
 obj-$(CONFIG_PPC_MPC52xx)       += 52xx/
 obj-$(CONFIG_PPC_8xx)           += 8xx/
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index ac8032034fb8..e1e2f6a43019 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -10,6 +10,10 @@ config PPC_CELL_NATIVE
         select PPC_INDIRECT_IO
         select PPC_NATIVE
         select MPIC
+        select IBM_NEW_EMAC_EMAC4
+        select IBM_NEW_EMAC_RGMII
+        select IBM_NEW_EMAC_ZMII #test only
+        select IBM_NEW_EMAC_TAH  #test only
         default n
 
 config PPC_IBM_CELL_BLADE
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index f88a7c76f296..61d12f183036 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -13,15 +13,13 @@ obj-$(CONFIG_PPC_CELL_NATIVE)		+= smp.o
 endif
 
 # needed only when building loadable spufs.ko
-spufs-modular-$(CONFIG_SPU_FS)          += spu_syscalls.o
 spu-priv1-$(CONFIG_PPC_CELL_NATIVE)     += spu_priv1_mmio.o
 
 spu-manage-$(CONFIG_PPC_CELLEB)         += spu_manage.o
 spu-manage-$(CONFIG_PPC_CELL_NATIVE)    += spu_manage.o
 
 obj-$(CONFIG_SPU_BASE)                  += spu_callbacks.o spu_base.o \
-                                           spu_coredump.o \
-                                           $(spufs-modular-m) \
+                                           spu_syscalls.o \
                                            $(spu-priv1-y) \
                                            $(spu-manage-y) \
                                            spufs/
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 4c9ab5b70bae..1245b2f517bb 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -64,13 +64,11 @@
 
 
 struct axon_msic {
-        struct device_node *dn;
         struct irq_host *irq_host;
         __le32 *fifo;
         dcr_host_t dcr_host;
         struct list_head list;
         u32 read_offset;
-        u32 dcr_base;
 };
 
 static LIST_HEAD(axon_msic_list);
@@ -79,12 +77,12 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)
 {
         pr_debug("axon_msi: dcr_write(0x%x, 0x%x)\n", val, dcr_n);
 
-        dcr_write(msic->dcr_host, msic->dcr_base + dcr_n, val);
+        dcr_write(msic->dcr_host, msic->dcr_host.base + dcr_n, val);
 }
 
 static u32 msic_dcr_read(struct axon_msic *msic, unsigned int dcr_n)
 {
-        return dcr_read(msic->dcr_host, msic->dcr_base + dcr_n);
+        return dcr_read(msic->dcr_host, msic->dcr_host.base + dcr_n);
 }
 
 static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
@@ -126,7 +124,7 @@ static struct axon_msic *find_msi_translator(struct pci_dev *dev)
         const phandle *ph;
         struct axon_msic *msic = NULL;
 
-        dn = pci_device_to_OF_node(dev);
+        dn = of_node_get(pci_device_to_OF_node(dev));
         if (!dn) {
                 dev_dbg(&dev->dev, "axon_msi: no pci_dn found\n");
                 return NULL;
@@ -183,7 +181,7 @@ static int setup_msi_msg_address(struct pci_dev *dev, struct msi_msg *msg)
         int len;
         const u32 *prop;
 
-        dn = pci_device_to_OF_node(dev);
+        dn = of_node_get(pci_device_to_OF_node(dev));
         if (!dn) {
                 dev_dbg(&dev->dev, "axon_msi: no pci_dn found\n");
                 return -ENODEV;
@@ -295,15 +293,7 @@ static int msic_host_map(struct irq_host *h, unsigned int virq,
         return 0;
 }
 
-static int msic_host_match(struct irq_host *host, struct device_node *dn)
-{
-        struct axon_msic *msic = host->host_data;
-
-        return msic->dn == dn;
-}
-
 static struct irq_host_ops msic_host_ops = {
-        .match  = msic_host_match,
         .map    = msic_host_map,
 };
 
@@ -314,7 +304,8 @@ static int axon_msi_notify_reboot(struct notifier_block *nb,
         u32 tmp;
 
         list_for_each_entry(msic, &axon_msic_list, list) {
-                pr_debug("axon_msi: disabling %s\n", msic->dn->full_name);
+                pr_debug("axon_msi: disabling %s\n",
+                          msic->irq_host->of_node->full_name);
                 tmp  = msic_dcr_read(msic, MSIC_CTRL_REG);
                 tmp &= ~MSIC_CTRL_ENABLE & ~MSIC_CTRL_IRQ_ENABLE;
                 msic_dcr_write(msic, MSIC_CTRL_REG, tmp);
@@ -332,7 +323,7 @@ static int axon_msi_setup_one(struct device_node *dn)
         struct page *page;
         struct axon_msic *msic;
         unsigned int virq;
-        int dcr_len;
+        int dcr_base, dcr_len;
 
         pr_debug("axon_msi: setting up dn %s\n", dn->full_name);
 
@@ -343,17 +334,17 @@ static int axon_msi_setup_one(struct device_node *dn)
                 goto out;
         }
 
-        msic->dcr_base = dcr_resource_start(dn, 0);
+        dcr_base = dcr_resource_start(dn, 0);
         dcr_len = dcr_resource_len(dn, 0);
 
-        if (msic->dcr_base == 0 || dcr_len == 0) {
+        if (dcr_base == 0 || dcr_len == 0) {
                 printk(KERN_ERR
                        "axon_msi: couldn't parse dcr properties on %s\n",
                         dn->full_name);
                 goto out;
         }
 
-        msic->dcr_host = dcr_map(dn, msic->dcr_base, dcr_len);
+        msic->dcr_host = dcr_map(dn, dcr_base, dcr_len);
         if (!DCR_MAP_OK(msic->dcr_host)) {
                 printk(KERN_ERR "axon_msi: dcr_map failed for %s\n",
                        dn->full_name);
@@ -370,8 +361,8 @@ static int axon_msi_setup_one(struct device_node *dn)
 
         msic->fifo = page_address(page);
 
-        msic->irq_host = irq_alloc_host(IRQ_HOST_MAP_NOMAP, NR_IRQS,
-                                        &msic_host_ops, 0);
+        msic->irq_host = irq_alloc_host(of_node_get(dn), IRQ_HOST_MAP_NOMAP,
+                                        NR_IRQS, &msic_host_ops, 0);
         if (!msic->irq_host) {
                 printk(KERN_ERR "axon_msi: couldn't allocate irq_host for %s\n",
                        dn->full_name);
@@ -387,8 +378,6 @@ static int axon_msi_setup_one(struct device_node *dn)
                 goto out_free_host;
         }
 
-        msic->dn = of_node_get(dn);
-
         set_irq_data(virq, msic);
         set_irq_chained_handler(virq, axon_msi_cascade);
         pr_debug("axon_msi: irq 0x%x setup for axon_msi\n", virq);
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.c b/arch/powerpc/platforms/cell/cbe_cpufreq.c
index c50ad22bf73e..5123e9d4164b 100644
--- a/arch/powerpc/platforms/cell/cbe_cpufreq.c
+++ b/arch/powerpc/platforms/cell/cbe_cpufreq.c
@@ -24,7 +24,7 @@
 #include <asm/machdep.h>
 #include <asm/of_platform.h>
 #include <asm/prom.h>
-#include "cbe_regs.h"
+#include <asm/cell-regs.h>
 #include "cbe_cpufreq.h"
 
 static DEFINE_MUTEX(cbe_switch_mutex);
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c b/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
index 163263b3e1cd..70fa7aef5edd 100644
--- a/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
+++ b/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
@@ -28,8 +28,8 @@
 #include <linux/time.h>
 #include <asm/machdep.h>
 #include <asm/hw_irq.h>
+#include <asm/cell-regs.h>
 
-#include "cbe_regs.h"
 #include "cbe_cpufreq.h"
 
 /* to write to MIC register */
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c b/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
index fc6f38982ff4..6a2c1b0a9a94 100644
--- a/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
+++ b/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
@@ -27,12 +27,12 @@
 #include <asm/processor.h>
 #include <asm/prom.h>
 #include <asm/pmi.h>
+#include <asm/cell-regs.h>
 
 #ifdef DEBUG
 #include <asm/time.h>
 #endif
 
-#include "cbe_regs.h"
 #include "cbe_cpufreq.h"
 
 static u8 pmi_slow_mode_limit[MAX_CBE];
diff --git a/arch/powerpc/platforms/cell/cbe_regs.c b/arch/powerpc/platforms/cell/cbe_regs.c
index c8f7f0007422..16a9b07e7b0c 100644
--- a/arch/powerpc/platforms/cell/cbe_regs.c
+++ b/arch/powerpc/platforms/cell/cbe_regs.c
@@ -16,8 +16,7 @@
 #include <asm/ptrace.h>
 #include <asm/of_device.h>
 #include <asm/of_platform.h>
-
-#include "cbe_regs.h"
+#include <asm/cell-regs.h>
 
 /*
  * Current implementation uses "cpu" nodes. We build our own mapping
diff --git a/arch/powerpc/platforms/cell/cbe_regs.h b/arch/powerpc/platforms/cell/cbe_regs.h
deleted file mode 100644
index b24025f2ac7a..000000000000
--- a/arch/powerpc/platforms/cell/cbe_regs.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * cbe_regs.h
- *
- * This file is intended to hold the various register definitions for CBE
- * on-chip system devices (memory controller, IO controller, etc...)
- *
- * (C) Copyright IBM Corporation 2001,2006
- *
- * Authors: Maximino Aguilar (maguilar@us.ibm.com)
- *          David J. Erb (djerb@us.ibm.com)
- *
- * (c) 2006 Benjamin Herrenschmidt <benh@kernel.crashing.org>, IBM Corp.
- */
-
-#ifndef CBE_REGS_H
-#define CBE_REGS_H
-
-#include <asm/cell-pmu.h>
-
-/*
- *
- * Some HID register definitions
- *
- */
-
-/* CBE specific HID0 bits */
-#define HID0_CBE_THERM_WAKEUP   0x0000020000000000ul
-#define HID0_CBE_SYSERR_WAKEUP  0x0000008000000000ul
-#define HID0_CBE_THERM_INT_EN   0x0000000400000000ul
-#define HID0_CBE_SYSERR_INT_EN  0x0000000200000000ul
-
-#define MAX_CBE         2
-
-/*
- *
- * Pervasive unit register definitions
- *
- */
-
-union spe_reg {
-        u64 val;
-        u8 spe[8];
-};
-
-union ppe_spe_reg {
-        u64 val;
-        struct {
-                u32 ppe;
-                u32 spe;
-        };
-};
-
-
-struct cbe_pmd_regs {
-        /* Debug Bus Control */
-        u64     pad_0x0000;                                     /* 0x0000 */
-
-        u64     group_control;                                  /* 0x0008 */
-
-        u8      pad_0x0010_0x00a8 [0x00a8 - 0x0010];            /* 0x0010 */
-
-        u64     debug_bus_control;                              /* 0x00a8 */
-
-        u8      pad_0x00b0_0x0100 [0x0100 - 0x00b0];            /* 0x00b0 */
-
-        u64     trace_aux_data;                                 /* 0x0100 */
-        u64     trace_buffer_0_63;                              /* 0x0108 */
-        u64     trace_buffer_64_127;                            /* 0x0110 */
-        u64     trace_address;                                  /* 0x0118 */
-        u64     ext_tr_timer;                                   /* 0x0120 */
-
-        u8      pad_0x0128_0x0400 [0x0400 - 0x0128];            /* 0x0128 */
-
-        /* Performance Monitor */
-        u64     pm_status;                                      /* 0x0400 */
-        u64     pm_control;                                     /* 0x0408 */
-        u64     pm_interval;                                    /* 0x0410 */
-        u64     pm_ctr[4];                                      /* 0x0418 */
-        u64     pm_start_stop;                                  /* 0x0438 */
-        u64     pm07_control[8];                                /* 0x0440 */
-
-        u8      pad_0x0480_0x0800 [0x0800 - 0x0480];            /* 0x0480 */
-
-        /* Thermal Sensor Registers */
-        union   spe_reg ts_ctsr1;                               /* 0x0800 */
-        u64     ts_ctsr2;                                       /* 0x0808 */
-        union   spe_reg ts_mtsr1;                               /* 0x0810 */
-        u64     ts_mtsr2;                                       /* 0x0818 */
-        union   spe_reg ts_itr1;                                /* 0x0820 */
-        u64     ts_itr2;                                        /* 0x0828 */
-        u64     ts_gitr;                                        /* 0x0830 */
-        u64     ts_isr;                                         /* 0x0838 */
-        u64     ts_imr;                                         /* 0x0840 */
-        union   spe_reg tm_cr1;                                 /* 0x0848 */
-        u64     tm_cr2;                                         /* 0x0850 */
-        u64     tm_simr;                                        /* 0x0858 */
-        union   ppe_spe_reg tm_tpr;                             /* 0x0860 */
-        union   spe_reg tm_str1;                                /* 0x0868 */
-        u64     tm_str2;                                        /* 0x0870 */
-        union   ppe_spe_reg tm_tsr;                             /* 0x0878 */
-
-        /* Power Management */
-        u64     pmcr;                                           /* 0x0880 */
-#define CBE_PMD_PAUSE_ZERO_CONTROL      0x10000
-        u64     pmsr;                                           /* 0x0888 */
-
-        /* Time Base Register */
-        u64     tbr;                                            /* 0x0890 */
-
-        u8      pad_0x0898_0x0c00 [0x0c00 - 0x0898];            /* 0x0898 */
-
-        /* Fault Isolation Registers */
-        u64     checkstop_fir;                                  /* 0x0c00 */
-        u64     recoverable_fir;                                /* 0x0c08 */
-        u64     spec_att_mchk_fir;                              /* 0x0c10 */
-        u32     fir_mode_reg;                                   /* 0x0c18 */
-        u8      pad_0x0c1c_0x0c20 [4];                          /* 0x0c1c */
-#define CBE_PMD_FIR_MODE_M8             0x00800
-        u64     fir_enable_mask;                                /* 0x0c20 */
-
-        u8      pad_0x0c28_0x0ca8 [0x0ca8 - 0x0c28];            /* 0x0c28 */
-        u64     ras_esc_0;                                      /* 0x0ca8 */
-        u8      pad_0x0cb0_0x1000 [0x1000 - 0x0cb0];            /* 0x0cb0 */
-};
-
-extern struct cbe_pmd_regs __iomem *cbe_get_pmd_regs(struct device_node *np);
-extern struct cbe_pmd_regs __iomem *cbe_get_cpu_pmd_regs(int cpu);
-
-/*
- * PMU shadow registers
- *
- * Many of the registers in the performance monitoring unit are write-only,
- * so we need to save a copy of what we write to those registers.
- *
- * The actual data counters are read/write. However, writing to the counters
- * only takes effect if the PMU is enabled. Otherwise the value is stored in
- * a hardware latch until the next time the PMU is enabled. So we save a copy
- * of the counter values if we need to read them back while the PMU is
- * disabled. The counter_value_in_latch field is a bitmap indicating which
- * counters currently have a value waiting to be written.
- */
-
-struct cbe_pmd_shadow_regs {
-        u32 group_control;
-        u32 debug_bus_control;
-        u32 trace_address;
-        u32 ext_tr_timer;
-        u32 pm_status;
-        u32 pm_control;
-        u32 pm_interval;
-        u32 pm_start_stop;
-        u32 pm07_control[NR_CTRS];
-
-        u32 pm_ctr[NR_PHYS_CTRS];
-        u32 counter_value_in_latch;
-};
-
-extern struct cbe_pmd_shadow_regs *cbe_get_pmd_shadow_regs(struct device_node *np);
-extern struct cbe_pmd_shadow_regs *cbe_get_cpu_pmd_shadow_regs(int cpu);
-
-/*
- *
- * IIC unit register definitions
- *
- */
-
-struct cbe_iic_pending_bits {
-        u32 data;
-        u8 flags;
-        u8 class;
-        u8 source;
-        u8 prio;
-};
-
-#define CBE_IIC_IRQ_VALID       0x80
-#define CBE_IIC_IRQ_IPI         0x40
-
-struct cbe_iic_thread_regs {
-        struct cbe_iic_pending_bits pending;
-        struct cbe_iic_pending_bits pending_destr;
-        u64 generate;
-        u64 prio;
-};
-
-struct cbe_iic_regs {
-        u8      pad_0x0000_0x0400[0x0400 - 0x0000];             /* 0x0000 */
-
-        /* IIC interrupt registers */
-        struct  cbe_iic_thread_regs thread[2];                  /* 0x0400 */
-
-        u64     iic_ir;                                         /* 0x0440 */
-#define CBE_IIC_IR_PRIO(x)      (((x) & 0xf) << 12)
-#define CBE_IIC_IR_DEST_NODE(x) (((x) & 0xf) << 4)
-#define CBE_IIC_IR_DEST_UNIT(x) ((x) & 0xf)
-#define CBE_IIC_IR_IOC_0        0x0
-#define CBE_IIC_IR_IOC_1S       0xb
-#define CBE_IIC_IR_PT_0         0xe
-#define CBE_IIC_IR_PT_1         0xf
-
-        u64     iic_is;                                         /* 0x0448 */
-#define CBE_IIC_IS_PMI          0x2
-
-        u8      pad_0x0450_0x0500[0x0500 - 0x0450];             /* 0x0450 */
-
-        /* IOC FIR */
-        u64     ioc_fir_reset;                                  /* 0x0500 */
-        u64     ioc_fir_set;                                    /* 0x0508 */
-        u64     ioc_checkstop_enable;                           /* 0x0510 */
-        u64     ioc_fir_error_mask;                             /* 0x0518 */
-        u64     ioc_syserr_enable;                              /* 0x0520 */
-        u64     ioc_fir;                                        /* 0x0528 */
-
-        u8      pad_0x0530_0x1000[0x1000 - 0x0530];             /* 0x0530 */
-};
-
-extern struct cbe_iic_regs __iomem *cbe_get_iic_regs(struct device_node *np);
-extern struct cbe_iic_regs __iomem *cbe_get_cpu_iic_regs(int cpu);
-
-
-struct cbe_mic_tm_regs {
-        u8      pad_0x0000_0x0040[0x0040 - 0x0000];             /* 0x0000 */
-
-        u64     mic_ctl_cnfg2;                                  /* 0x0040 */
-#define CBE_MIC_ENABLE_AUX_TRC          0x8000000000000000LL
-#define CBE_MIC_DISABLE_PWR_SAV_2       0x0200000000000000LL
-#define CBE_MIC_DISABLE_AUX_TRC_WRAP    0x0100000000000000LL
-#define CBE_MIC_ENABLE_AUX_TRC_INT      0x0080000000000000LL
-
-        u64     pad_0x0048;                                     /* 0x0048 */
-
-        u64     mic_aux_trc_base;                               /* 0x0050 */
-        u64     mic_aux_trc_max_addr;                           /* 0x0058 */
-        u64     mic_aux_trc_cur_addr;                           /* 0x0060 */
-        u64     mic_aux_trc_grf_addr;                           /* 0x0068 */
-        u64     mic_aux_trc_grf_data;                           /* 0x0070 */
-
-        u64     pad_0x0078;                                     /* 0x0078 */
-
-        u64     mic_ctl_cnfg_0;                                 /* 0x0080 */
-#define CBE_MIC_DISABLE_PWR_SAV_0       0x8000000000000000LL
-
-        u64     pad_0x0088;                                     /* 0x0088 */
-
-        u64     slow_fast_timer_0;                              /* 0x0090 */
-        u64     slow_next_timer_0;                              /* 0x0098 */
-
-        u8      pad_0x00a0_0x01c0[0x01c0 - 0x0a0];              /* 0x00a0 */
-
-        u64     mic_ctl_cnfg_1;                                 /* 0x01c0 */
-#define CBE_MIC_DISABLE_PWR_SAV_1       0x8000000000000000LL
-        u64     pad_0x01c8;                                     /* 0x01c8 */
-
-        u64     slow_fast_timer_1;                              /* 0x01d0 */
-        u64     slow_next_timer_1;                              /* 0x01d8 */
-
-        u8      pad_0x01e0_0x1000[0x1000 - 0x01e0];             /* 0x01e0 */
-};
-
-extern struct cbe_mic_tm_regs __iomem *cbe_get_mic_tm_regs(struct device_node *np);
-extern struct cbe_mic_tm_regs __iomem *cbe_get_cpu_mic_tm_regs(int cpu);
-
-/* some utility functions to deal with SMT */
-extern u32 cbe_get_hw_thread_id(int cpu);
-extern u32 cbe_cpu_to_node(int cpu);
-extern u32 cbe_node_to_cpu(int node);
-
-/* Init this module early */
-extern void cbe_regs_init(void);
-
-
-#endif /* CBE_REGS_H */
diff --git a/arch/powerpc/platforms/cell/cbe_thermal.c b/arch/powerpc/platforms/cell/cbe_thermal.c
index fb5eda48467d..4852bf312d83 100644
--- a/arch/powerpc/platforms/cell/cbe_thermal.c
+++ b/arch/powerpc/platforms/cell/cbe_thermal.c
@@ -52,8 +52,8 @@
 #include <asm/spu.h>
 #include <asm/io.h>
 #include <asm/prom.h>
+#include <asm/cell-regs.h>
 
-#include "cbe_regs.h"
 #include "spu_priv1_mmio.h"
 
 #define TEMP_MIN 65
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 47264e722029..151fd8b82d63 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -41,9 +41,9 @@
 #include <asm/prom.h>
 #include <asm/ptrace.h>
 #include <asm/machdep.h>
+#include <asm/cell-regs.h>
 
 #include "interrupt.h"
-#include "cbe_regs.h"
 
 struct iic {
         struct cbe_iic_thread_regs __iomem *regs;
@@ -381,7 +381,7 @@ static int __init setup_iic(void)
 void __init iic_init_IRQ(void)
 {
         /* Setup an irq host data structure */
-        iic_host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, IIC_SOURCE_COUNT,
+        iic_host = irq_alloc_host(NULL, IRQ_HOST_MAP_LINEAR, IIC_SOURCE_COUNT,
                                   &iic_host_ops, IIC_IRQ_INVALID);
         BUG_ON(iic_host == NULL);
         irq_set_default_host(iic_host);
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 760caa76841a..faabc3fdc130 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -34,8 +34,8 @@
 #include <asm/udbg.h>
 #include <asm/of_platform.h>
 #include <asm/lmb.h>
+#include <asm/cell-regs.h>
 
-#include "cbe_regs.h"
 #include "interrupt.h"
 
 /* Define CELL_IOMMU_REAL_UNMAP to actually unmap non-used pages
diff --git a/arch/powerpc/platforms/cell/pervasive.c b/arch/powerpc/platforms/cell/pervasive.c
index 4ede22d363fa..0304589c0a80 100644
--- a/arch/powerpc/platforms/cell/pervasive.c
+++ b/arch/powerpc/platforms/cell/pervasive.c
@@ -34,9 +34,9 @@
 #include <asm/prom.h>
 #include <asm/pgtable.h>
 #include <asm/reg.h>
+#include <asm/cell-regs.h>
 
 #include "pervasive.h"
-#include "cbe_regs.h"
 
 static int sysreset_hack;
 
diff --git a/arch/powerpc/platforms/cell/pmu.c b/arch/powerpc/platforms/cell/pmu.c
index 66ca4b5a1dbc..1ed303678887 100644
--- a/arch/powerpc/platforms/cell/pmu.c
+++ b/arch/powerpc/platforms/cell/pmu.c
@@ -30,8 +30,8 @@
 #include <asm/pmc.h>
 #include <asm/reg.h>
 #include <asm/spu.h>
+#include <asm/cell-regs.h>
 
-#include "cbe_regs.h"
 #include "interrupt.h"
 
 /*
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index 3961a085b432..b2494ebcdbe9 100644
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -10,9 +10,9 @@
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/rtas.h>
+#include <asm/cell-regs.h>
 
 #include "ras.h"
-#include "cbe_regs.h"
 
 
 static void dump_fir(int cpu)
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index db6654272e13..98e7ef8e6fc6 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -52,9 +52,9 @@
 #include <asm/udbg.h>
 #include <asm/mpic.h>
 #include <asm/of_platform.h>
+#include <asm/cell-regs.h>
 
 #include "interrupt.h"
-#include "cbe_regs.h"
 #include "pervasive.h"
 #include "ras.h"
 
@@ -83,12 +83,22 @@ static void cell_progress(char *s, unsigned short hex)
 
 static int __init cell_publish_devices(void)
 {
+        int node;
+
         if (!machine_is(cell))
                 return 0;
 
         /* Publish OF platform devices for southbridge IOs */
         of_platform_bus_probe(NULL, NULL, NULL);
 
+        /* There is no device for the MIC memory controller, thus we create
+         * a platform device for it to attach the EDAC driver to.
+         */
+        for_each_online_node(node) {
+                if (cbe_get_cpu_mic_tm_regs(cbe_node_to_cpu(node)) == NULL)
+                        continue;
+                platform_device_register_simple("cbe-mic", node, NULL, 0);
+        }
         return 0;
 }
 device_initcall(cell_publish_devices);
@@ -161,11 +171,6 @@ static void __init cell_setup_arch(void)
         /* init to some ~sane value until calibrate_delay() runs */
         loops_per_jiffy = 50000000;
 
-        if (ROOT_DEV == 0) {
-                printk("No ramdisk, default root is /dev/hda2\n");
-                ROOT_DEV = Root_HDA2;
-        }
-
         /* Find and initialize PCI host bridges */
         init_pci_config_tokens();
         find_and_init_phbs();
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index 05f4b3d3d756..3f4b4aef756d 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -63,7 +63,6 @@ enum {
 
 struct spider_pic {
         struct irq_host         *host;
-        struct device_node      *of_node;
         void __iomem            *regs;
         unsigned int            node_id;
 };
@@ -176,12 +175,6 @@ static struct irq_chip spider_pic = {
         .set_type = spider_set_irq_type,
 };
 
-static int spider_host_match(struct irq_host *h, struct device_node *node)
-{
-        struct spider_pic *pic = h->host_data;
-        return node == pic->of_node;
-}
-
 static int spider_host_map(struct irq_host *h, unsigned int virq,
                         irq_hw_number_t hw)
 {
@@ -208,7 +201,6 @@ static int spider_host_xlate(struct irq_host *h, struct device_node *ct,
 }
 
 static struct irq_host_ops spider_host_ops = {
-        .match = spider_host_match,
         .map = spider_host_map,
         .xlate = spider_host_xlate,
 };
@@ -247,18 +239,18 @@ static unsigned int __init spider_find_cascade_and_node(struct spider_pic *pic)
          * tree in case the device-tree is ever fixed
          */
         struct of_irq oirq;
-        if (of_irq_map_one(pic->of_node, 0, &oirq) == 0) {
+        if (of_irq_map_one(pic->host->of_node, 0, &oirq) == 0) {
                 virq = irq_create_of_mapping(oirq.controller, oirq.specifier,
                                              oirq.size);
                 return virq;
         }
 
         /* Now do the horrible hacks */
-        tmp = of_get_property(pic->of_node, "#interrupt-cells", NULL);
+        tmp = of_get_property(pic->host->of_node, "#interrupt-cells", NULL);
         if (tmp == NULL)
                 return NO_IRQ;
         intsize = *tmp;
-        imap = of_get_property(pic->of_node, "interrupt-map", &imaplen);
+        imap = of_get_property(pic->host->of_node, "interrupt-map", &imaplen);
         if (imap == NULL || imaplen < (intsize + 1))
                 return NO_IRQ;
         iic = of_find_node_by_phandle(imap[intsize]);
@@ -308,15 +300,13 @@ static void __init spider_init_one(struct device_node *of_node, int chip,
                 panic("spider_pic: can't map registers !");
 
         /* Allocate a host */
-        pic->host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, SPIDER_SRC_COUNT,
-                                   &spider_host_ops, SPIDER_IRQ_INVALID);
+        pic->host = irq_alloc_host(of_node_get(of_node), IRQ_HOST_MAP_LINEAR,
+                                   SPIDER_SRC_COUNT, &spider_host_ops,
+                                   SPIDER_IRQ_INVALID);
         if (pic->host == NULL)
                 panic("spider_pic: can't allocate irq host !");
         pic->host->host_data = pic;
 
-        /* Fill out other bits */
-        pic->of_node = of_node_get(of_node);
-
         /* Go through all sources and disable them */
         for (i = 0; i < SPIDER_SRC_COUNT; i++) {
                 void __iomem *cfg = pic->regs + TIR_CFGA + 8 * i;
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 106d2921e2d9..c83c3e3f5178 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -168,7 +168,7 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
 #else
                 psize = mm->context.user_psize;
 #endif
-                vsid = (get_vsid(mm->context.id, ea) << SLB_VSID_SHIFT) |
+                vsid = (get_vsid(mm->context.id, ea, MMU_SEGSIZE_256M) << SLB_VSID_SHIFT) |
                                 SLB_VSID_USER;
                 break;
         case VMALLOC_REGION_ID:
@@ -176,12 +176,12 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
                         psize = mmu_vmalloc_psize;
                 else
                         psize = mmu_io_psize;
-                vsid = (get_kernel_vsid(ea) << SLB_VSID_SHIFT) |
+                vsid = (get_kernel_vsid(ea, MMU_SEGSIZE_256M) << SLB_VSID_SHIFT) |
                         SLB_VSID_KERNEL;
                 break;
         case KERNEL_REGION_ID:
                 psize = mmu_linear_psize;
-                vsid = (get_kernel_vsid(ea) << SLB_VSID_SHIFT) |
+                vsid = (get_kernel_vsid(ea, MMU_SEGSIZE_256M) << SLB_VSID_SHIFT) |
                         SLB_VSID_KERNEL;
                 break;
         default:
@@ -458,7 +458,7 @@ static int spu_shutdown(struct sys_device *sysdev)
         return 0;
 }
 
-struct sysdev_class spu_sysdev_class = {
+static struct sysdev_class spu_sysdev_class = {
         set_kset_name("spu"),
         .shutdown = spu_shutdown,
 };
diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c
index 47ec3be3edcd..dceb8b6a9382 100644
--- a/arch/powerpc/platforms/cell/spu_callbacks.c
+++ b/arch/powerpc/platforms/cell/spu_callbacks.c
@@ -2,7 +2,7 @@
  * System call callback functions for SPUs
  */
 
-#define DEBUG
+#undef DEBUG
 
 #include <linux/kallsyms.h>
 #include <linux/module.h>
@@ -33,7 +33,7 @@
  *      mbind, mq_open, ipc, ...
  */
 
-void *spu_syscall_table[] = {
+static void *spu_syscall_table[] = {
 #define SYSCALL(func)           sys_ni_syscall,
 #define COMPAT_SYS(func)        sys_ni_syscall,
 #define PPC_SYS(func)           sys_ni_syscall,
diff --git a/arch/powerpc/platforms/cell/spu_coredump.c b/arch/powerpc/platforms/cell/spu_coredump.c
deleted file mode 100644
index 4fd37ff1e210..000000000000
--- a/arch/powerpc/platforms/cell/spu_coredump.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * SPU core dump code
- *
- * (C) Copyright 2006 IBM Corp.
- *
- * Author: Dwayne Grant McConnell <decimal@us.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/file.h>
-#include <linux/module.h>
-#include <linux/syscalls.h>
-
-#include <asm/spu.h>
-
-static struct spu_coredump_calls *spu_coredump_calls;
-static DEFINE_MUTEX(spu_coredump_mutex);
-
-int arch_notes_size(void)
-{
-        long ret;
-
-        ret = -ENOSYS;
-        mutex_lock(&spu_coredump_mutex);
-        if (spu_coredump_calls && try_module_get(spu_coredump_calls->owner)) {
-                ret = spu_coredump_calls->arch_notes_size();
-                module_put(spu_coredump_calls->owner);
-        }
-        mutex_unlock(&spu_coredump_mutex);
-        return ret;
-}
-
-void arch_write_notes(struct file *file)
-{
-        mutex_lock(&spu_coredump_mutex);
-        if (spu_coredump_calls && try_module_get(spu_coredump_calls->owner)) {
-                spu_coredump_calls->arch_write_notes(file);
-                module_put(spu_coredump_calls->owner);
-        }
-        mutex_unlock(&spu_coredump_mutex);
-}
-
-int register_arch_coredump_calls(struct spu_coredump_calls *calls)
-{
-        int ret = 0;
-
-
-        mutex_lock(&spu_coredump_mutex);
-        if (spu_coredump_calls)
-                ret = -EBUSY;
-        else
-                spu_coredump_calls = calls;
-        mutex_unlock(&spu_coredump_mutex);
-        return ret;
-}
-EXPORT_SYMBOL_GPL(register_arch_coredump_calls);
-
-void unregister_arch_coredump_calls(struct spu_coredump_calls *calls)
-{
-        BUG_ON(spu_coredump_calls != calls);
-
-        mutex_lock(&spu_coredump_mutex);
-        spu_coredump_calls = NULL;
-        mutex_unlock(&spu_coredump_mutex);
-}
-EXPORT_SYMBOL_GPL(unregister_arch_coredump_calls);
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index 0e14f532500e..1b010707488d 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -377,10 +377,10 @@ static int qs20_reg_memory[QS20_SPES_PER_BE] = { 1, 1, 0, 0, 0, 0, 0, 0 };
 static struct spu *spu_lookup_reg(int node, u32 reg)
 {
         struct spu *spu;
-        u32 *spu_reg;
+        const u32 *spu_reg;
 
         list_for_each_entry(spu, &cbe_spu_info[node].spus, cbe_list) {
-                spu_reg = (u32*)of_get_property(spu_devnode(spu), "reg", NULL);
+                spu_reg = of_get_property(spu_devnode(spu), "reg", NULL);
                 if (*spu_reg == reg)
                         return spu;
         }
diff --git a/arch/powerpc/platforms/cell/spu_syscalls.c b/arch/powerpc/platforms/cell/spu_syscalls.c
index 027ac32cc636..a9438b719fe8 100644
--- a/arch/powerpc/platforms/cell/spu_syscalls.c
+++ b/arch/powerpc/platforms/cell/spu_syscalls.c
@@ -2,6 +2,7 @@
  * SPU file system -- system call stubs
  *
  * (C) Copyright IBM Deutschland Entwicklung GmbH 2005
+ * (C) Copyright 2006-2007, IBM Corporation
  *
  * Author: Arnd Bergmann <arndb@de.ibm.com>
  *
@@ -20,44 +21,73 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 #include <linux/file.h>
+#include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/syscalls.h>
+#include <linux/rcupdate.h>
 
 #include <asm/spu.h>
 
-struct spufs_calls spufs_calls = {
-        .owner = NULL,
-};
+/* protected by rcu */
+static struct spufs_calls *spufs_calls;
 
-/* These stub syscalls are needed to have the actual implementation
- * within a loadable module. When spufs is built into the kernel,
- * this file is not used and the syscalls directly enter the fs code */
+#ifdef CONFIG_SPU_FS_MODULE
+
+static inline struct spufs_calls *spufs_calls_get(void)
+{
+        struct spufs_calls *calls = NULL;
+
+        rcu_read_lock();
+        calls = rcu_dereference(spufs_calls);
+        if (calls && !try_module_get(calls->owner))
+                calls = NULL;
+        rcu_read_unlock();
+
+        return calls;
+}
+
+static inline void spufs_calls_put(struct spufs_calls *calls)
+{
+        BUG_ON(calls != spufs_calls);
+
+        /* we don't need to rcu this, as we hold a reference to the module */
+        module_put(spufs_calls->owner);
+}
+
+#else /* !defined CONFIG_SPU_FS_MODULE */
+
+static inline struct spufs_calls *spufs_calls_get(void)
+{
+        return spufs_calls;
+}
+
+static inline void spufs_calls_put(struct spufs_calls *calls) { }
+
+#endif /* CONFIG_SPU_FS_MODULE */
 
 asmlinkage long sys_spu_create(const char __user *name,
                 unsigned int flags, mode_t mode, int neighbor_fd)
 {
         long ret;
-        struct module *owner = spufs_calls.owner;
         struct file *neighbor;
         int fput_needed;
+        struct spufs_calls *calls;
 
-        ret = -ENOSYS;
-        if (owner && try_module_get(owner)) {
-                if (flags & SPU_CREATE_AFFINITY_SPU) {
-                        neighbor = fget_light(neighbor_fd, &fput_needed);
-                        ret = -EBADF;
-                        if (neighbor) {
-                                ret = spufs_calls.create_thread(name, flags,
-                                                                mode, neighbor);
-                                fput_light(neighbor, fput_needed);
-                        }
-                }
-                else {
-                        ret = spufs_calls.create_thread(name, flags,
-                                                        mode, NULL);
+        calls = spufs_calls_get();
+        if (!calls)
+                return -ENOSYS;
+
+        if (flags & SPU_CREATE_AFFINITY_SPU) {
+                ret = -EBADF;
+                neighbor = fget_light(neighbor_fd, &fput_needed);
+                if (neighbor) {
+                        ret = calls->create_thread(name, flags, mode, neighbor);
+                        fput_light(neighbor, fput_needed);
                 }
-                module_put(owner);
-        }
+        } else
+                ret = calls->create_thread(name, flags, mode, NULL);
+
+        spufs_calls_put(calls);
         return ret;
 }
 
@@ -66,37 +96,69 @@ asmlinkage long sys_spu_run(int fd, __u32 __user *unpc, __u32 __user *ustatus)
         long ret;
         struct file *filp;
         int fput_needed;
-        struct module *owner = spufs_calls.owner;
+        struct spufs_calls *calls;
 
-        ret = -ENOSYS;
-        if (owner && try_module_get(owner)) {
-                ret = -EBADF;
-                filp = fget_light(fd, &fput_needed);
-                if (filp) {
-                        ret = spufs_calls.spu_run(filp, unpc, ustatus);
-                        fput_light(filp, fput_needed);
-                }
-                module_put(owner);
+        calls = spufs_calls_get();
+        if (!calls)
+                return -ENOSYS;
+
+        ret = -EBADF;
+        filp = fget_light(fd, &fput_needed);
+        if (filp) {
+                ret = calls->spu_run(filp, unpc, ustatus);
+                fput_light(filp, fput_needed);
         }
+
+        spufs_calls_put(calls);
+        return ret;
+}
+
+int elf_coredump_extra_notes_size(void)
+{
+        struct spufs_calls *calls;
+        int ret;
+
+        calls = spufs_calls_get();
+        if (!calls)
+                return 0;
+
+        ret = calls->coredump_extra_notes_size();
+
+        spufs_calls_put(calls);
+
+        return ret;
+}
+
+int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset)
+{
+        struct spufs_calls *calls;
+        int ret;
+
+        calls = spufs_calls_get();
+        if (!calls)
+                return 0;
+
+        ret = calls->coredump_extra_notes_write(file, foffset);
+
+        spufs_calls_put(calls);
+
         return ret;
 }
 
 int register_spu_syscalls(struct spufs_calls *calls)
 {
-        if (spufs_calls.owner)
+        if (spufs_calls)
                 return -EBUSY;
 
-        spufs_calls.create_thread = calls->create_thread;
-        spufs_calls.spu_run = calls->spu_run;
-        smp_mb();
-        spufs_calls.owner = calls->owner;
+        rcu_assign_pointer(spufs_calls, calls);
         return 0;
 }
 EXPORT_SYMBOL_GPL(register_spu_syscalls);
 
 void unregister_spu_syscalls(struct spufs_calls *calls)
 {
-        BUG_ON(spufs_calls.owner != calls->owner);
-        spufs_calls.owner = NULL;
+        BUG_ON(spufs_calls->owner != calls->owner);
+        rcu_assign_pointer(spufs_calls, NULL);
+        synchronize_rcu();
 }
 EXPORT_SYMBOL_GPL(unregister_spu_syscalls);
diff --git a/arch/powerpc/platforms/cell/spufs/coredump.c b/arch/powerpc/platforms/cell/spufs/coredump.c
index 5e31799b1e3f..80f62363e1ce 100644
--- a/arch/powerpc/platforms/cell/spufs/coredump.c
+++ b/arch/powerpc/platforms/cell/spufs/coredump.c
@@ -31,16 +31,7 @@
 
 #include "spufs.h"
 
-struct spufs_ctx_info {
-        struct list_head list;
-        int dfd;
-        int memsize; /* in bytes */
-        struct spu_context *ctx;
-};
-
-static LIST_HEAD(ctx_info_list);
-
-static ssize_t do_coredump_read(int num, struct spu_context *ctx, void __user *buffer,
+static ssize_t do_coredump_read(int num, struct spu_context *ctx, void *buffer,
                                 size_t size, loff_t *off)
 {
         u64 data;
@@ -50,49 +41,57 @@ static ssize_t do_coredump_read(int num, struct spu_context *ctx, void __user *b
                 return spufs_coredump_read[num].read(ctx, buffer, size, off);
 
         data = spufs_coredump_read[num].get(ctx);
-        ret = copy_to_user(buffer, &data, 8);
-        return ret ? -EFAULT : 8;
+        ret = snprintf(buffer, size, "0x%.16lx", data);
+        if (ret >= size)
+                return size;
+        return ++ret; /* count trailing NULL */
 }
 
 /*
  * These are the only things you should do on a core-file: use only these
  * functions to write out all the necessary info.
  */
-static int spufs_dump_write(struct file *file, const void *addr, int nr)
+static int spufs_dump_write(struct file *file, const void *addr, int nr, loff_t *foffset)
 {
-        return file->f_op->write(file, addr, nr, &file->f_pos) == nr;
-}
+        unsigned long limit = current->signal->rlim[RLIMIT_CORE].rlim_cur;
+        ssize_t written;
 
-static int spufs_dump_seek(struct file *file, loff_t off)
-{
-        if (file->f_op->llseek) {
-                if (file->f_op->llseek(file, off, 0) != off)
-                        return 0;
-        } else
-                file->f_pos = off;
-        return 1;
+        if (*foffset + nr > limit)
+                return -EIO;
+
+        written = file->f_op->write(file, addr, nr, &file->f_pos);
+        *foffset += written;
+
+        if (written != nr)
+                return -EIO;
+
+        return 0;
 }
 
-static void spufs_fill_memsize(struct spufs_ctx_info *ctx_info)
+static int spufs_dump_align(struct file *file, char *buf, loff_t new_off,
+                            loff_t *foffset)
 {
-        struct spu_context *ctx;
-        unsigned long long lslr;
+        int rc, size;
+
+        size = min((loff_t)PAGE_SIZE, new_off - *foffset);
+        memset(buf, 0, size);
+
+        rc = 0;
+        while (rc == 0 && new_off > *foffset) {
+                size = min((loff_t)PAGE_SIZE, new_off - *foffset);
+                rc = spufs_dump_write(file, buf, size, foffset);
+        }
 
-        ctx = ctx_info->ctx;
-        lslr = ctx->csa.priv2.spu_lslr_RW;
-        ctx_info->memsize = lslr + 1;
+        return rc;
 }
 
-static int spufs_ctx_note_size(struct spufs_ctx_info *ctx_info)
+static int spufs_ctx_note_size(struct spu_context *ctx, int dfd)
 {
-        int dfd, memsize, i, sz, total = 0;
+        int i, sz, total = 0;
         char *name;
         char fullname[80];
 
-        dfd = ctx_info->dfd;
-        memsize = ctx_info->memsize;
-
-        for (i = 0; spufs_coredump_read[i].name; i++) {
+        for (i = 0; spufs_coredump_read[i].name != NULL; i++) {
                 name = spufs_coredump_read[i].name;
                 sz = spufs_coredump_read[i].size;
 
@@ -100,39 +99,12 @@ static int spufs_ctx_note_size(struct spufs_ctx_info *ctx_info)
 
                 total += sizeof(struct elf_note);
                 total += roundup(strlen(fullname) + 1, 4);
-                if (!strcmp(name, "mem"))
-                        total += roundup(memsize, 4);
-                else
-                        total += roundup(sz, 4);
+                total += roundup(sz, 4);
         }
 
         return total;
 }
 
-static int spufs_add_one_context(struct file *file, int dfd)
-{
-        struct spu_context *ctx;
-        struct spufs_ctx_info *ctx_info;
-        int size;
-
-        ctx = SPUFS_I(file->f_dentry->d_inode)->i_ctx;
-        if (ctx->flags & SPU_CREATE_NOSCHED)
-                return 0;
-
-        ctx_info = kzalloc(sizeof(*ctx_info), GFP_KERNEL);
-        if (unlikely(!ctx_info))
-                return -ENOMEM;
-
-        ctx_info->dfd = dfd;
-        ctx_info->ctx = ctx;
-
-        spufs_fill_memsize(ctx_info);
-
-        size = spufs_ctx_note_size(ctx_info);
-        list_add(&ctx_info->list, &ctx_info_list);
-        return size;
-}
-
 /*
  * The additional architecture-specific notes for Cell are various
  * context files in the spu context.
@@ -142,33 +114,57 @@ static int spufs_add_one_context(struct file *file, int dfd)
  * internal functionality to dump them without needing to actually
  * open the files.
  */
-static int spufs_arch_notes_size(void)
+static struct spu_context *coredump_next_context(int *fd)
 {
         struct fdtable *fdt = files_fdtable(current->files);
-        int size = 0, fd;
+        struct file *file;
+        struct spu_context *ctx = NULL;
 
-        for (fd = 0; fd < fdt->max_fds; fd++) {
-                if (FD_ISSET(fd, fdt->open_fds)) {
-                        struct file *file = fcheck(fd);
+        for (; *fd < fdt->max_fds; (*fd)++) {
+                if (!FD_ISSET(*fd, fdt->open_fds))
+                        continue;
 
-                        if (file && file->f_op == &spufs_context_fops) {
-                                int rval = spufs_add_one_context(file, fd);
-                                if (rval < 0)
-                                        break;
-                                size += rval;
-                        }
-                }
+                file = fcheck(*fd);
+
+                if (!file || file->f_op != &spufs_context_fops)
+                        continue;
+
+                ctx = SPUFS_I(file->f_dentry->d_inode)->i_ctx;
+                if (ctx->flags & SPU_CREATE_NOSCHED)
+                        continue;
+
+                /* start searching the next fd next time we're called */
+                (*fd)++;
+                break;
         }
 
-        return size;
+        return ctx;
 }
 
-static void spufs_arch_write_note(struct spufs_ctx_info *ctx_info, int i,
-                                struct file *file)
+int spufs_coredump_extra_notes_size(void)
 {
         struct spu_context *ctx;
+        int size = 0, rc, fd;
+
+        fd = 0;
+        while ((ctx = coredump_next_context(&fd)) != NULL) {
+                spu_acquire_saved(ctx);
+                rc = spufs_ctx_note_size(ctx, fd);
+                spu_release_saved(ctx);
+                if (rc < 0)
+                        break;
+
+                size += rc;
+        }
+
+        return size;
+}
+
+static int spufs_arch_write_note(struct spu_context *ctx, int i,
+                                  struct file *file, int dfd, loff_t *foffset)
+{
         loff_t pos = 0;
-        int sz, dfd, rc, total = 0;
+        int sz, rc, nread, total = 0;
         const int bufsz = PAGE_SIZE;
         char *name;
         char fullname[80], *buf;
@@ -176,64 +172,70 @@ static void spufs_arch_write_note(struct spufs_ctx_info *ctx_info, int i,
 
         buf = (void *)get_zeroed_page(GFP_KERNEL);
         if (!buf)
-                return;
+                return -ENOMEM;
 
-        dfd = ctx_info->dfd;
         name = spufs_coredump_read[i].name;
-
-        if (!strcmp(name, "mem"))
-                sz = ctx_info->memsize;
-        else
-                sz = spufs_coredump_read[i].size;
-
-        ctx = ctx_info->ctx;
-        if (!ctx)
-                goto out;
+        sz = spufs_coredump_read[i].size;
 
         sprintf(fullname, "SPU/%d/%s", dfd, name);
         en.n_namesz = strlen(fullname) + 1;
         en.n_descsz = sz;
         en.n_type = NT_SPU;
 
-        if (!spufs_dump_write(file, &en, sizeof(en)))
+        rc = spufs_dump_write(file, &en, sizeof(en), foffset);
+        if (rc)
                 goto out;
-        if (!spufs_dump_write(file, fullname, en.n_namesz))
+
+        rc = spufs_dump_write(file, fullname, en.n_namesz, foffset);
+        if (rc)
                 goto out;
-        if (!spufs_dump_seek(file, roundup((unsigned long)file->f_pos, 4)))
+
+        rc = spufs_dump_align(file, buf, roundup(*foffset, 4), foffset);
+        if (rc)
                 goto out;
 
         do {
-                rc = do_coredump_read(i, ctx, buf, bufsz, &pos);
-                if (rc > 0) {
-                        if (!spufs_dump_write(file, buf, rc))
+                nread = do_coredump_read(i, ctx, buf, bufsz, &pos);
+                if (nread > 0) {
+                        rc = spufs_dump_write(file, buf, nread, foffset);
+                        if (rc)
                                 goto out;
-                        total += rc;
+                        total += nread;
                 }
-        } while (rc == bufsz && total < sz);
+        } while (nread == bufsz && total < sz);
+
+        if (nread < 0) {
+                rc = nread;
+                goto out;
+        }
+
+        rc = spufs_dump_align(file, buf, roundup(*foffset - total + sz, 4),
+                              foffset);
 
-        spufs_dump_seek(file, roundup((unsigned long)file->f_pos
-                                                - total + sz, 4));
 out:
         free_page((unsigned long)buf);
+        return rc;
 }
 
-static void spufs_arch_write_notes(struct file *file)
+int spufs_coredump_extra_notes_write(struct file *file, loff_t *foffset)
 {
-        int j;
-        struct spufs_ctx_info *ctx_info, *next;
-
-        list_for_each_entry_safe(ctx_info, next, &ctx_info_list, list) {
-                spu_acquire_saved(ctx_info->ctx);
-                for (j = 0; j < spufs_coredump_num_notes; j++)
-                        spufs_arch_write_note(ctx_info, j, file);
-                spu_release_saved(ctx_info->ctx);
-                list_del(&ctx_info->list);
-                kfree(ctx_info);
+        struct spu_context *ctx;
+        int fd, j, rc;
+
+        fd = 0;
+        while ((ctx = coredump_next_context(&fd)) != NULL) {
+                spu_acquire_saved(ctx);
+
+                for (j = 0; spufs_coredump_read[j].name != NULL; j++) {
+                        rc = spufs_arch_write_note(ctx, j, file, fd, foffset);
+                        if (rc) {
+                                spu_release_saved(ctx);
+                                return rc;
+                        }
+                }
+
+                spu_release_saved(ctx);
         }
-}
 
-struct spu_coredump_calls spufs_coredump_calls = {
-        .arch_notes_size = spufs_arch_notes_size,
-        .arch_write_notes = spufs_arch_write_notes,
-        .owner = THIS_MODULE,
-};
+        return 0;
+}
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 7de4e919687b..d72b16d6816e 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -199,9 +199,9 @@ static int spufs_mem_mmap(struct file *file, struct vm_area_struct *vma)
 }
 
 #ifdef CONFIG_SPU_FS_64K_LS
-unsigned long spufs_get_unmapped_area(struct file *file, unsigned long addr,
-                                      unsigned long len, unsigned long pgoff,
-                                      unsigned long flags)
+static unsigned long spufs_get_unmapped_area(struct file *file,
+                unsigned long addr, unsigned long len, unsigned long pgoff,
+                unsigned long flags)
 {
         struct spu_context      *ctx = file->private_data;
         struct spu_state        *csa = &ctx->csa;
@@ -1076,6 +1076,36 @@ static const struct file_operations spufs_signal2_nosched_fops = {
         .mmap = spufs_signal2_mmap,
 };
 
+/*
+ * This is a wrapper around DEFINE_SIMPLE_ATTRIBUTE which does the
+ * work of acquiring (or not) the SPU context before calling through
+ * to the actual get routine. The set routine is called directly.
+ */
+#define SPU_ATTR_NOACQUIRE      0
+#define SPU_ATTR_ACQUIRE        1
+#define SPU_ATTR_ACQUIRE_SAVED  2
+
+#define DEFINE_SPUFS_ATTRIBUTE(__name, __get, __set, __fmt, __acquire)  \
+static u64 __##__get(void *data)                                        \
+{                                                                       \
+        struct spu_context *ctx = data;                                 \
+        u64 ret;                                                        \
+                                                                        \
+        if (__acquire == SPU_ATTR_ACQUIRE) {                            \
+                spu_acquire(ctx);                                       \
+                ret = __get(ctx);                                       \
+                spu_release(ctx);                                       \
+        } else if (__acquire == SPU_ATTR_ACQUIRE_SAVED) {               \
+                spu_acquire_saved(ctx);                                 \
+                ret = __get(ctx);                                       \
+                spu_release_saved(ctx);                                 \
+        } else                                                          \
+                ret = __get(ctx);                                       \
+                                                                        \
+        return ret;                                                     \
+}                                                                       \
+DEFINE_SIMPLE_ATTRIBUTE(__name, __##__get, __set, __fmt);
+
 static void spufs_signal1_type_set(void *data, u64 val)
 {
         struct spu_context *ctx = data;
@@ -1085,25 +1115,13 @@ static void spufs_signal1_type_set(void *data, u64 val)
         spu_release(ctx);
 }
 
-static u64 __spufs_signal1_type_get(void *data)
+static u64 spufs_signal1_type_get(struct spu_context *ctx)
 {
-        struct spu_context *ctx = data;
         return ctx->ops->signal1_type_get(ctx);
 }
+DEFINE_SPUFS_ATTRIBUTE(spufs_signal1_type, spufs_signal1_type_get,
+                       spufs_signal1_type_set, "%llu", SPU_ATTR_ACQUIRE);
 
-static u64 spufs_signal1_type_get(void *data)
-{
-        struct spu_context *ctx = data;
-        u64 ret;
-
-        spu_acquire(ctx);
-        ret = __spufs_signal1_type_get(data);
-        spu_release(ctx);
-
-        return ret;
-}
-DEFINE_SIMPLE_ATTRIBUTE(spufs_signal1_type, spufs_signal1_type_get,
-                                        spufs_signal1_type_set, "%llu");
 
 static void spufs_signal2_type_set(void *data, u64 val)
 {
@@ -1114,25 +1132,12 @@ static void spufs_signal2_type_set(void *data, u64 val)
         spu_release(ctx);
 }
 
-static u64 __spufs_signal2_type_get(void *data)
+static u64 spufs_signal2_type_get(struct spu_context *ctx)
 {
-        struct spu_context *ctx = data;
         return ctx->ops->signal2_type_get(ctx);
 }
-
-static u64 spufs_signal2_type_get(void *data)
-{
-        struct spu_context *ctx = data;
-        u64 ret;
-
-        spu_acquire(ctx);
-        ret = __spufs_signal2_type_get(data);
-        spu_release(ctx);
-
-        return ret;
-}
-DEFINE_SIMPLE_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,
-                                        spufs_signal2_type_set, "%llu");
+DEFINE_SPUFS_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,
+                       spufs_signal2_type_set, "%llu", SPU_ATTR_ACQUIRE);
 
 #if SPUFS_MMAP_4K
 static unsigned long spufs_mss_mmap_nopfn(struct vm_area_struct *vma,
@@ -1608,17 +1613,12 @@ static void spufs_npc_set(void *data, u64 val)
         spu_release(ctx);
 }
 
-static u64 spufs_npc_get(void *data)
+static u64 spufs_npc_get(struct spu_context *ctx)
 {
-        struct spu_context *ctx = data;
-        u64 ret;
-        spu_acquire(ctx);
-        ret = ctx->ops->npc_read(ctx);
-        spu_release(ctx);
-        return ret;
+        return ctx->ops->npc_read(ctx);
 }
-DEFINE_SIMPLE_ATTRIBUTE(spufs_npc_ops, spufs_npc_get, spufs_npc_set,
-                        "0x%llx\n")
+DEFINE_SPUFS_ATTRIBUTE(spufs_npc_ops, spufs_npc_get, spufs_npc_set,
+                       "0x%llx\n", SPU_ATTR_ACQUIRE);
 
 static void spufs_decr_set(void *data, u64 val)
 {
@@ -1629,24 +1629,13 @@ static void spufs_decr_set(void *data, u64 val)
         spu_release_saved(ctx);
 }
 
-static u64 __spufs_decr_get(void *data)
+static u64 spufs_decr_get(struct spu_context *ctx)
 {
-        struct spu_context *ctx = data;
         struct spu_lscsa *lscsa = ctx->csa.lscsa;
         return lscsa->decr.slot[0];
 }
-
-static u64 spufs_decr_get(void *data)
-{
-        struct spu_context *ctx = data;
-        u64 ret;
-        spu_acquire_saved(ctx);
-        ret = __spufs_decr_get(data);
-        spu_release_saved(ctx);
-        return ret;
-}
-DEFINE_SIMPLE_ATTRIBUTE(spufs_decr_ops, spufs_decr_get, spufs_decr_set,
-                        "0x%llx\n")
+DEFINE_SPUFS_ATTRIBUTE(spufs_decr_ops, spufs_decr_get, spufs_decr_set,
+                       "0x%llx\n", SPU_ATTR_ACQUIRE_SAVED);
 
 static void spufs_decr_status_set(void *data, u64 val)
 {
@@ -1659,26 +1648,16 @@ static void spufs_decr_status_set(void *data, u64 val)
         spu_release_saved(ctx);
 }
 
-static u64 __spufs_decr_status_get(void *data)
+static u64 spufs_decr_status_get(struct spu_context *ctx)
 {
-        struct spu_context *ctx = data;
         if (ctx->csa.priv2.mfc_control_RW & MFC_CNTL_DECREMENTER_RUNNING)
                 return SPU_DECR_STATUS_RUNNING;
         else
                 return 0;
 }
-
-static u64 spufs_decr_status_get(void *data)
-{
-        struct spu_context *ctx = data;
-        u64 ret;
-        spu_acquire_saved(ctx);
-        ret = __spufs_decr_status_get(data);
-        spu_release_saved(ctx);
-        return ret;
-}
-DEFINE_SIMPLE_ATTRIBUTE(spufs_decr_status_ops, spufs_decr_status_get,
-                        spufs_decr_status_set, "0x%llx\n")
+DEFINE_SPUFS_ATTRIBUTE(spufs_decr_status_ops, spufs_decr_status_get,
+                       spufs_decr_status_set, "0x%llx\n",
+                       SPU_ATTR_ACQUIRE_SAVED);
 
 static void spufs_event_mask_set(void *data, u64 val)
 {
@@ -1689,28 +1668,18 @@ static void spufs_event_mask_set(void *data, u64 val)
         spu_release_saved(ctx);
 }
 
-static u64 __spufs_event_mask_get(void *data)
+static u64 spufs_event_mask_get(struct spu_context *ctx)
 {
-        struct spu_context *ctx = data;
         struct spu_lscsa *lscsa = ctx->csa.lscsa;
         return lscsa->event_mask.slot[0];
 }
 
-static u64 spufs_event_mask_get(void *data)
-{
-        struct spu_context *ctx = data;
-        u64 ret;
-        spu_acquire_saved(ctx);
-        ret = __spufs_event_mask_get(data);
-        spu_release_saved(ctx);
-        return ret;
-}
-DEFINE_SIMPLE_ATTRIBUTE(spufs_event_mask_ops, spufs_event_mask_get,
-                        spufs_event_mask_set, "0x%llx\n")
+DEFINE_SPUFS_ATTRIBUTE(spufs_event_mask_ops, spufs_event_mask_get,
+                       spufs_event_mask_set, "0x%llx\n",
+                       SPU_ATTR_ACQUIRE_SAVED);
 
-static u64 __spufs_event_status_get(void *data)
+static u64 spufs_event_status_get(struct spu_context *ctx)
 {
-        struct spu_context *ctx = data;
         struct spu_state *state = &ctx->csa;
         u64 stat;
         stat = state->spu_chnlcnt_RW[0];
@@ -1718,19 +1687,8 @@ static u64 __spufs_event_status_get(void *data)
                 return state->spu_chnldata_RW[0];
         return 0;
 }
-
-static u64 spufs_event_status_get(void *data)
-{
-        struct spu_context *ctx = data;
-        u64 ret = 0;
-
-        spu_acquire_saved(ctx);
-        ret = __spufs_event_status_get(data);
-        spu_release_saved(ctx);
-        return ret;
-}
-DEFINE_SIMPLE_ATTRIBUTE(spufs_event_status_ops, spufs_event_status_get,
-                        NULL, "0x%llx\n")
+DEFINE_SPUFS_ATTRIBUTE(spufs_event_status_ops, spufs_event_status_get,
+                       NULL, "0x%llx\n", SPU_ATTR_ACQUIRE_SAVED)
 
 static void spufs_srr0_set(void *data, u64 val)
 {
@@ -1741,45 +1699,32 @@ static void spufs_srr0_set(void *data, u64 val)
         spu_release_saved(ctx);
 }
 
-static u64 spufs_srr0_get(void *data)
+static u64 spufs_srr0_get(struct spu_context *ctx)
 {
-        struct spu_context *ctx = data;
         struct spu_lscsa *lscsa = ctx->csa.lscsa;
-        u64 ret;
-        spu_acquire_saved(ctx);
-        ret = lscsa->srr0.slot[0];
-        spu_release_saved(ctx);
-        return ret;
+        return lscsa->srr0.slot[0];
 }
-DEFINE_SIMPLE_ATTRIBUTE(spufs_srr0_ops, spufs_srr0_get, spufs_srr0_set,
-                        "0x%llx\n")
+DEFINE_SPUFS_ATTRIBUTE(spufs_srr0_ops, spufs_srr0_get, spufs_srr0_set,
+                       "0x%llx\n", SPU_ATTR_ACQUIRE_SAVED)
 
-static u64 spufs_id_get(void *data)
+static u64 spufs_id_get(struct spu_context *ctx)
 {
-        struct spu_context *ctx = data;
         u64 num;
 
-        spu_acquire(ctx);
         if (ctx->state == SPU_STATE_RUNNABLE)
                 num = ctx->spu->number;
         else
                 num = (unsigned int)-1;
-        spu_release(ctx);
 
         return num;
 }
-DEFINE_SIMPLE_ATTRIBUTE(spufs_id_ops, spufs_id_get, NULL, "0x%llx\n")
-
-static u64 __spufs_object_id_get(void *data)
-{
-        struct spu_context *ctx = data;
-        return ctx->object_id;
-}
+DEFINE_SPUFS_ATTRIBUTE(spufs_id_ops, spufs_id_get, NULL, "0x%llx\n",
+                       SPU_ATTR_ACQUIRE)
 
-static u64 spufs_object_id_get(void *data)
+static u64 spufs_object_id_get(struct spu_context *ctx)
 {
         /* FIXME: Should there really be no locking here? */
-        return __spufs_object_id_get(data);
+        return ctx->object_id;
 }
 
 static void spufs_object_id_set(void *data, u64 id)
@@ -1788,27 +1733,15 @@ static void spufs_object_id_set(void *data, u64 id)
         ctx->object_id = id;
 }
 
-DEFINE_SIMPLE_ATTRIBUTE(spufs_object_id_ops, spufs_object_id_get,
-                spufs_object_id_set, "0x%llx\n");
+DEFINE_SPUFS_ATTRIBUTE(spufs_object_id_ops, spufs_object_id_get,
+                       spufs_object_id_set, "0x%llx\n", SPU_ATTR_NOACQUIRE);
 
-static u64 __spufs_lslr_get(void *data)
+static u64 spufs_lslr_get(struct spu_context *ctx)
 {
-        struct spu_context *ctx = data;
         return ctx->csa.priv2.spu_lslr_RW;
 }
-
-static u64 spufs_lslr_get(void *data)
-{
-        struct spu_context *ctx = data;
-        u64 ret;
-
-        spu_acquire_saved(ctx);
-        ret = __spufs_lslr_get(data);
-        spu_release_saved(ctx);
-
-        return ret;
-}
-DEFINE_SIMPLE_ATTRIBUTE(spufs_lslr_ops, spufs_lslr_get, NULL, "0x%llx\n")
+DEFINE_SPUFS_ATTRIBUTE(spufs_lslr_ops, spufs_lslr_get, NULL, "0x%llx\n",
+                       SPU_ATTR_ACQUIRE_SAVED);
 
 static int spufs_info_open(struct inode *inode, struct file *file)
 {
@@ -2231,25 +2164,25 @@ struct tree_descr spufs_dir_nosched_contents[] = {
 };
 
 struct spufs_coredump_reader spufs_coredump_read[] = {
-        { "regs", __spufs_regs_read, NULL, 128 * 16 },
-        { "fpcr", __spufs_fpcr_read, NULL, 16 },
-        { "lslr", NULL, __spufs_lslr_get, 11 },
-        { "decr", NULL, __spufs_decr_get, 11 },
-        { "decr_status", NULL, __spufs_decr_status_get, 11 },
-        { "mem", __spufs_mem_read, NULL, 256 * 1024, },
-        { "signal1", __spufs_signal1_read, NULL, 4 },
-        { "signal1_type", NULL, __spufs_signal1_type_get, 2 },
-        { "signal2", __spufs_signal2_read, NULL, 4 },
-        { "signal2_type", NULL, __spufs_signal2_type_get, 2 },
-        { "event_mask", NULL, __spufs_event_mask_get, 8 },
-        { "event_status", NULL, __spufs_event_status_get, 8 },
-        { "mbox_info", __spufs_mbox_info_read, NULL, 4 },
-        { "ibox_info", __spufs_ibox_info_read, NULL, 4 },
-        { "wbox_info", __spufs_wbox_info_read, NULL, 16 },
-        { "dma_info", __spufs_dma_info_read, NULL, 69 * 8 },
-        { "proxydma_info", __spufs_proxydma_info_read, NULL, 35 * 8 },
-        { "object-id", NULL, __spufs_object_id_get, 19 },
-        { },
+        { "regs", __spufs_regs_read, NULL, sizeof(struct spu_reg128[128])},
+        { "fpcr", __spufs_fpcr_read, NULL, sizeof(struct spu_reg128) },
+        { "lslr", NULL, spufs_lslr_get, 19 },
+        { "decr", NULL, spufs_decr_get, 19 },
+        { "decr_status", NULL, spufs_decr_status_get, 19 },
+        { "mem", __spufs_mem_read, NULL, LS_SIZE, },
+        { "signal1", __spufs_signal1_read, NULL, sizeof(u32) },
+        { "signal1_type", NULL, spufs_signal1_type_get, 19 },
+        { "signal2", __spufs_signal2_read, NULL, sizeof(u32) },
+        { "signal2_type", NULL, spufs_signal2_type_get, 19 },
+        { "event_mask", NULL, spufs_event_mask_get, 19 },
+        { "event_status", NULL, spufs_event_status_get, 19 },
+        { "mbox_info", __spufs_mbox_info_read, NULL, sizeof(u32) },
+        { "ibox_info", __spufs_ibox_info_read, NULL, sizeof(u32) },
+        { "wbox_info", __spufs_wbox_info_read, NULL, 4 * sizeof(u32)},
+        { "dma_info", __spufs_dma_info_read, NULL, sizeof(struct spu_dma_info)},
+        { "proxydma_info", __spufs_proxydma_info_read,
+                           NULL, sizeof(struct spu_proxydma_info)},
+        { "object-id", NULL, spufs_object_id_get, 19 },
+        { "npc", NULL, spufs_npc_get, 19 },
+        { NULL },
 };
-int spufs_coredump_num_notes = ARRAY_SIZE(spufs_coredump_read) - 1;
-
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index b3d0dd118dd0..11098747d09b 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -43,6 +43,7 @@
 
 static struct kmem_cache *spufs_inode_cache;
 char *isolated_loader;
+static int isolated_loader_size;
 
 static struct inode *
 spufs_alloc_inode(struct super_block *sb)
@@ -667,7 +668,8 @@ spufs_parse_options(char *options, struct inode *root)
 
 static void spufs_exit_isolated_loader(void)
 {
-        kfree(isolated_loader);
+        free_pages((unsigned long) isolated_loader,
+                        get_order(isolated_loader_size));
 }
 
 static void
@@ -685,11 +687,12 @@ spufs_init_isolated_loader(void)
         if (!loader)
                 return;
 
-        /* kmalloc should align on a 16 byte boundary..* */
-        isolated_loader = kmalloc(size, GFP_KERNEL);
+        /* the loader must be align on a 16 byte boundary */
+        isolated_loader = (char *)__get_free_pages(GFP_KERNEL, get_order(size));
         if (!isolated_loader)
                 return;
 
+        isolated_loader_size = size;
         memcpy(isolated_loader, loader, size);
         printk(KERN_INFO "spufs: SPU isolation mode enabled\n");
 }
@@ -787,16 +790,11 @@ static int __init spufs_init(void)
         ret = register_spu_syscalls(&spufs_calls);
         if (ret)
                 goto out_fs;
-        ret = register_arch_coredump_calls(&spufs_coredump_calls);
-        if (ret)
-                goto out_syscalls;
 
         spufs_init_isolated_loader();
 
         return 0;
 
-out_syscalls:
-        unregister_spu_syscalls(&spufs_calls);
 out_fs:
         unregister_filesystem(&spufs_type);
 out_sched:
@@ -812,7 +810,6 @@ static void __exit spufs_exit(void)
 {
         spu_sched_exit();
         spufs_exit_isolated_loader();
-        unregister_arch_coredump_calls(&spufs_coredump_calls);
         unregister_spu_syscalls(&spufs_calls);
         unregister_filesystem(&spufs_type);
         kmem_cache_destroy(spufs_inode_cache);
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index 958f10e90fdd..1ce5e22ea5f4 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -205,7 +205,7 @@ static int spu_reacquire_runnable(struct spu_context *ctx, u32 *npc,
  * This means we can only do a very rough approximation of POSIX
  * signal semantics.
  */
-int spu_handle_restartsys(struct spu_context *ctx, long *spu_ret,
+static int spu_handle_restartsys(struct spu_context *ctx, long *spu_ret,
                           unsigned int *npc)
 {
         int ret;
@@ -241,7 +241,7 @@ int spu_handle_restartsys(struct spu_context *ctx, long *spu_ret,
         return ret;
 }
 
-int spu_process_callback(struct spu_context *ctx)
+static int spu_process_callback(struct spu_context *ctx)
 {
         struct spu_syscall_block s;
         u32 ls_pointer, npc;
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 5bebe7fbe056..4d257b3f9336 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -230,8 +230,6 @@ static void spu_bind_context(struct spu *spu, struct spu_context *ctx)
 
         if (ctx->flags & SPU_CREATE_NOSCHED)
                 atomic_inc(&cbe_spu_info[spu->node].reserved_spus);
-        if (!list_empty(&ctx->aff_list))
-                atomic_inc(&ctx->gang->aff_sched_count);
 
         ctx->stats.slb_flt_base = spu->stats.slb_flt;
         ctx->stats.class2_intr_base = spu->stats.class2_intr;
@@ -392,7 +390,6 @@ static int has_affinity(struct spu_context *ctx)
         if (list_empty(&ctx->aff_list))
                 return 0;
 
-        mutex_lock(&gang->aff_mutex);
         if (!gang->aff_ref_spu) {
                 if (!(gang->aff_flags & AFF_MERGED))
                         aff_merge_remaining_ctxs(gang);
@@ -400,7 +397,6 @@ static int has_affinity(struct spu_context *ctx)
                         aff_set_offsets(gang);
                 aff_set_ref_point_location(gang);
         }
-        mutex_unlock(&gang->aff_mutex);
 
         return gang->aff_ref_spu != NULL;
 }
@@ -418,9 +414,16 @@ static void spu_unbind_context(struct spu *spu, struct spu_context *ctx)
 
         if (spu->ctx->flags & SPU_CREATE_NOSCHED)
                 atomic_dec(&cbe_spu_info[spu->node].reserved_spus);
-        if (!list_empty(&ctx->aff_list))
-                if (atomic_dec_and_test(&ctx->gang->aff_sched_count))
-                        ctx->gang->aff_ref_spu = NULL;
+
+        if (ctx->gang){
+                mutex_lock(&ctx->gang->aff_mutex);
+                if (has_affinity(ctx)) {
+                        if (atomic_dec_and_test(&ctx->gang->aff_sched_count))
+                                ctx->gang->aff_ref_spu = NULL;
+                }
+                mutex_unlock(&ctx->gang->aff_mutex);
+        }
+
         spu_switch_notify(spu, NULL);
         spu_unmap_mappings(ctx);
         spu_save(&ctx->csa, spu);
@@ -511,20 +514,32 @@ static void spu_prio_wait(struct spu_context *ctx)
 
 static struct spu *spu_get_idle(struct spu_context *ctx)
 {
-        struct spu *spu;
+        struct spu *spu, *aff_ref_spu;
         int node, n;
 
-        if (has_affinity(ctx)) {
-                node = ctx->gang->aff_ref_spu->node;
+        if (ctx->gang) {
+                mutex_lock(&ctx->gang->aff_mutex);
+                if (has_affinity(ctx)) {
+                        aff_ref_spu = ctx->gang->aff_ref_spu;
+                        atomic_inc(&ctx->gang->aff_sched_count);
+                        mutex_unlock(&ctx->gang->aff_mutex);
+                        node = aff_ref_spu->node;
 
-                mutex_lock(&cbe_spu_info[node].list_mutex);
-                spu = ctx_location(ctx->gang->aff_ref_spu, ctx->aff_offset, node);
-                if (spu && spu->alloc_state == SPU_FREE)
-                        goto found;
-                mutex_unlock(&cbe_spu_info[node].list_mutex);
-                return NULL;
-        }
+                        mutex_lock(&cbe_spu_info[node].list_mutex);
+                        spu = ctx_location(aff_ref_spu, ctx->aff_offset, node);
+                        if (spu && spu->alloc_state == SPU_FREE)
+                                goto found;
+                        mutex_unlock(&cbe_spu_info[node].list_mutex);
 
+                        mutex_lock(&ctx->gang->aff_mutex);
+                        if (atomic_dec_and_test(&ctx->gang->aff_sched_count))
+                                ctx->gang->aff_ref_spu = NULL;
+                        mutex_unlock(&ctx->gang->aff_mutex);
+
+                        return NULL;
+                }
+                mutex_unlock(&ctx->gang->aff_mutex);
+        }
         node = cpu_to_node(raw_smp_processor_id());
         for (n = 0; n < MAX_NUMNODES; n++, node++) {
                 node = (node < MAX_NUMNODES) ? node : 0;
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index 2bfdeb8ea8bd..ca47b991bda5 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -200,9 +200,14 @@ extern struct tree_descr spufs_dir_contents[];
 extern struct tree_descr spufs_dir_nosched_contents[];
 
 /* system call implementation */
+extern struct spufs_calls spufs_calls;
 long spufs_run_spu(struct spu_context *ctx, u32 *npc, u32 *status);
 long spufs_create(struct nameidata *nd, unsigned int flags,
                         mode_t mode, struct file *filp);
+/* ELF coredump callbacks for writing SPU ELF notes */
+extern int spufs_coredump_extra_notes_size(void);
+extern int spufs_coredump_extra_notes_write(struct file *file, loff_t *foffset);
+
 extern const struct file_operations spufs_context_fops;
 
 /* gang management */
@@ -295,7 +300,7 @@ struct spufs_coredump_reader {
         char *name;
         ssize_t (*read)(struct spu_context *ctx,
                         char __user *buffer, size_t size, loff_t *pos);
-        u64 (*get)(void *data);
+        u64 (*get)(struct spu_context *ctx);
         size_t size;
 };
 extern struct spufs_coredump_reader spufs_coredump_read[];
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index 27ffdae98e5a..3d64c81cc6e2 100644
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -699,7 +699,7 @@ static inline void get_kernel_slb(u64 ea, u64 slb[2])
                 llp = mmu_psize_defs[mmu_linear_psize].sllp;
         else
                 llp = mmu_psize_defs[mmu_virtual_psize].sllp;
-        slb[0] = (get_kernel_vsid(ea) << SLB_VSID_SHIFT) |
+        slb[0] = (get_kernel_vsid(ea, MMU_SEGSIZE_256M) << SLB_VSID_SHIFT) |
                 SLB_VSID_KERNEL | llp;
         slb[1] = (ea & ESID_MASK) | SLB_ESID_V;
 }
@@ -1559,15 +1559,15 @@ static inline void restore_decr_wrapped(struct spu_state *csa, struct spu *spu)
          *     "wrapped" flag is set, OR in a '1' to
          *     CSA.SPU_Event_Status[Tm].
          */
-        if (csa->lscsa->decr_status.slot[0] & SPU_DECR_STATUS_WRAPPED) {
-                csa->spu_chnldata_RW[0] |= 0x20;
-        }
-        if ((csa->lscsa->decr_status.slot[0] & SPU_DECR_STATUS_WRAPPED) &&
-            (csa->spu_chnlcnt_RW[0] == 0 &&
-             ((csa->spu_chnldata_RW[2] & 0x20) == 0x0) &&
-             ((csa->spu_chnldata_RW[0] & 0x20) != 0x1))) {
+        if (!(csa->lscsa->decr_status.slot[0] & SPU_DECR_STATUS_WRAPPED))
+                return;
+
+        if ((csa->spu_chnlcnt_RW[0] == 0) &&
+            (csa->spu_chnldata_RW[1] & 0x20) &&
+            !(csa->spu_chnldata_RW[0] & 0x20))
                 csa->spu_chnlcnt_RW[0] = 1;
-        }
+
+        csa->spu_chnldata_RW[0] |= 0x20;
 }
 
 static inline void restore_ch_part1(struct spu_state *csa, struct spu *spu)
@@ -2146,19 +2146,6 @@ int spu_restore(struct spu_state *new, struct spu *spu)
 }
 EXPORT_SYMBOL_GPL(spu_restore);
 
-/**
- * spu_harvest - SPU harvest (reset) operation
- * @spu: pointer to SPU iomem structure.
- *
- * Perform SPU harvest (reset) operation.
- */
-void spu_harvest(struct spu *spu)
-{
-        acquire_spu_lock(spu);
-        harvest(NULL, spu);
-        release_spu_lock(spu);
-}
-
 static void init_prob(struct spu_state *csa)
 {
         csa->spu_chnlcnt_RW[9] = 1;
diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c
index 43f0fb88abbc..2c34f7170190 100644
--- a/arch/powerpc/platforms/cell/spufs/syscalls.c
+++ b/arch/powerpc/platforms/cell/spufs/syscalls.c
@@ -58,26 +58,8 @@ out:
         return ret;
 }
 
-#ifndef MODULE
-asmlinkage long sys_spu_run(int fd, __u32 __user *unpc, __u32 __user *ustatus)
-{
-        int fput_needed;
-        struct file *filp;
-        long ret;
-
-        ret = -EBADF;
-        filp = fget_light(fd, &fput_needed);
-        if (filp) {
-                ret = do_spu_run(filp, unpc, ustatus);
-                fput_light(filp, fput_needed);
-        }
-
-        return ret;
-}
-#endif
-
-asmlinkage long do_spu_create(const char __user *pathname, unsigned int flags,
-                                mode_t mode, struct file *neighbor)
+static long do_spu_create(const char __user *pathname, unsigned int flags,
+                mode_t mode, struct file *neighbor)
 {
         char *tmp;
         int ret;
@@ -99,32 +81,10 @@ asmlinkage long do_spu_create(const char __user *pathname, unsigned int flags,
         return ret;
 }
 
-#ifndef MODULE
-asmlinkage long sys_spu_create(const char __user *pathname, unsigned int flags,
-                                mode_t mode, int neighbor_fd)
-{
-        int fput_needed;
-        struct file *neighbor;
-        long ret;
-
-        if (flags & SPU_CREATE_AFFINITY_SPU) {
-                ret = -EBADF;
-                neighbor = fget_light(neighbor_fd, &fput_needed);
-                if (neighbor) {
-                        ret = do_spu_create(pathname, flags, mode, neighbor);
-                        fput_light(neighbor, fput_needed);
-                }
-        }
-        else {
-                ret = do_spu_create(pathname, flags, mode, NULL);
-        }
-
-        return ret;
-}
-#endif
-
 struct spufs_calls spufs_calls = {
         .create_thread = do_spu_create,
         .spu_run = do_spu_run,
+        .coredump_extra_notes_size = spufs_coredump_extra_notes_size,
+        .coredump_extra_notes_write = spufs_coredump_extra_notes_write,
         .owner = THIS_MODULE,
 };
diff --git a/arch/powerpc/platforms/celleb/Kconfig b/arch/powerpc/platforms/celleb/Kconfig
index 2db1e293433e..04748d410fc9 100644
--- a/arch/powerpc/platforms/celleb/Kconfig
+++ b/arch/powerpc/platforms/celleb/Kconfig
@@ -2,6 +2,7 @@ config PPC_CELLEB
         bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
         depends on PPC_MULTIPLATFORM && PPC64
         select PPC_CELL
+        select PPC_INDIRECT_IO
         select PPC_OF_PLATFORM_PCI
         select HAS_TXX9_SERIAL
         select PPC_UDBG_BEAT
diff --git a/arch/powerpc/platforms/celleb/Makefile b/arch/powerpc/platforms/celleb/Makefile
index 5240046d8671..889d43f715ea 100644
--- a/arch/powerpc/platforms/celleb/Makefile
+++ b/arch/powerpc/platforms/celleb/Makefile
@@ -1,6 +1,7 @@
 obj-y                           += interrupt.o iommu.o setup.o \
-                                   htab.o beat.o pci.o \
-                                   scc_epci.o scc_uhc.o hvCall.o
+                                   htab.o beat.o hvCall.o pci.o \
+                                   scc_epci.o scc_uhc.o \
+                                   io-workarounds.o
 
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_PPC_UDBG_BEAT)     += udbg_beat.o
diff --git a/arch/powerpc/platforms/celleb/beat.c b/arch/powerpc/platforms/celleb/beat.c
index 99341ce8a697..93ebb7d85120 100644
--- a/arch/powerpc/platforms/celleb/beat.c
+++ b/arch/powerpc/platforms/celleb/beat.c
@@ -22,16 +22,24 @@
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/rtc.h>
+#include <linux/interrupt.h>
+#include <linux/irqreturn.h>
+#include <linux/reboot.h>
 
 #include <asm/hvconsole.h>
 #include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/firmware.h>
 
 #include "beat_wrapper.h"
 #include "beat.h"
+#include "interrupt.h"
+
+static int beat_pm_poweroff_flag;
 
 void beat_restart(char *cmd)
 {
-        beat_shutdown_logical_partition(1);
+        beat_shutdown_logical_partition(!beat_pm_poweroff_flag);
 }
 
 void beat_power_off(void)
@@ -158,6 +166,102 @@ int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 t2)
         return beat_put_characters_to_console(vterm, len, (u8*)db);
 }
 
+void beat_power_save(void)
+{
+        beat_pause(0);
+}
+
+#ifdef CONFIG_KEXEC
+void beat_kexec_cpu_down(int crash, int secondary)
+{
+        beatic_deinit_IRQ();
+}
+#endif
+
+static irqreturn_t beat_power_event(int virq, void *arg)
+{
+        printk(KERN_DEBUG "Beat: power button pressed\n");
+        beat_pm_poweroff_flag = 1;
+        ctrl_alt_del();
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t beat_reset_event(int virq, void *arg)
+{
+        printk(KERN_DEBUG "Beat: reset button pressed\n");
+        beat_pm_poweroff_flag = 0;
+        ctrl_alt_del();
+        return IRQ_HANDLED;
+}
+
+static struct beat_event_list {
+        const char *typecode;
+        irq_handler_t handler;
+        unsigned int virq;
+} beat_event_list[] = {
+        { "power", beat_power_event, 0 },
+        { "reset", beat_reset_event, 0 },
+};
+
+static int __init beat_register_event(void)
+{
+        u64 path[4], data[2];
+        int rc, i;
+        unsigned int virq;
+
+        for (i = 0; i < ARRAY_SIZE(beat_event_list); i++) {
+                struct beat_event_list *ev = &beat_event_list[i];
+
+                if (beat_construct_event_receive_port(data) != 0) {
+                        printk(KERN_ERR "Beat: "
+                               "cannot construct event receive port for %s\n",
+                               ev->typecode);
+                        return -EINVAL;
+                }
+
+                virq = irq_create_mapping(NULL, data[0]);
+                if (virq == NO_IRQ) {
+                        printk(KERN_ERR "Beat: failed to get virtual IRQ"
+                               " for event receive port for %s\n",
+                               ev->typecode);
+                        beat_destruct_event_receive_port(data[0]);
+                        return -EIO;
+                }
+                ev->virq = virq;
+
+                rc = request_irq(virq, ev->handler, IRQF_DISABLED,
+                                      ev->typecode, NULL);
+                if (rc != 0) {
+                        printk(KERN_ERR "Beat: failed to request virtual IRQ"
+                               " for event receive port for %s\n",
+                               ev->typecode);
+                        beat_destruct_event_receive_port(data[0]);
+                        return rc;
+                }
+
+                path[0] = 0x1000000065780000ul; /* 1,ex */
+                path[1] = 0x627574746f6e0000ul; /* button */
+                path[2] = 0;
+                strncpy((char *)&path[2], ev->typecode, 8);
+                path[3] = 0;
+                data[1] = 0;
+
+                beat_create_repository_node(path, data);
+        }
+        return 0;
+}
+
+static int __init beat_event_init(void)
+{
+        if (!firmware_has_feature(FW_FEATURE_BEAT))
+                return -EINVAL;
+
+        beat_pm_poweroff_flag = 0;
+        return beat_register_event();
+}
+
+device_initcall(beat_event_init);
+
 EXPORT_SYMBOL(beat_get_term_char);
 EXPORT_SYMBOL(beat_put_term_char);
 EXPORT_SYMBOL(beat_halt_code);
diff --git a/arch/powerpc/platforms/celleb/beat.h b/arch/powerpc/platforms/celleb/beat.h
index 2b16bf3bee89..b2e292df13ca 100644
--- a/arch/powerpc/platforms/celleb/beat.h
+++ b/arch/powerpc/platforms/celleb/beat.h
@@ -36,5 +36,7 @@ ssize_t beat_nvram_get_size(void);
 ssize_t beat_nvram_read(char *, size_t, loff_t *);
 ssize_t beat_nvram_write(char *, size_t, loff_t *);
 int beat_set_xdabr(unsigned long);
+void beat_power_save(void);
+void beat_kexec_cpu_down(int, int);
 
 #endif /* _CELLEB_BEAT_H */
diff --git a/arch/powerpc/platforms/celleb/beat_syscall.h b/arch/powerpc/platforms/celleb/beat_syscall.h
index 14e16974773f..8580dc7e1798 100644
--- a/arch/powerpc/platforms/celleb/beat_syscall.h
+++ b/arch/powerpc/platforms/celleb/beat_syscall.h
@@ -157,4 +157,8 @@
 #define HV_rtc_write __BEAT_ADD_VENDOR_ID(0x191, 1)
 #define HV_eeprom_read __BEAT_ADD_VENDOR_ID(0x192, 1)
 #define HV_eeprom_write __BEAT_ADD_VENDOR_ID(0x193, 1)
+#define HV_insert_htab_entry3 __BEAT_ADD_VENDOR_ID(0x104, 1)
+#define HV_invalidate_htab_entry3 __BEAT_ADD_VENDOR_ID(0x105, 1)
+#define HV_update_htab_permission3 __BEAT_ADD_VENDOR_ID(0x106, 1)
+#define HV_clear_htab3 __BEAT_ADD_VENDOR_ID(0x107, 1)
 #endif
diff --git a/arch/powerpc/platforms/celleb/beat_wrapper.h b/arch/powerpc/platforms/celleb/beat_wrapper.h
index 76ea0a6a9011..cbc1487df7de 100644
--- a/arch/powerpc/platforms/celleb/beat_wrapper.h
+++ b/arch/powerpc/platforms/celleb/beat_wrapper.h
@@ -98,6 +98,37 @@ static inline s64 beat_write_htab_entry(u64 htab_id, u64 slot,
         return ret;
 }
 
+static inline s64 beat_insert_htab_entry3(u64 htab_id, u64 group,
+        u64 hpte_v, u64 hpte_r, u64 mask_v, u64 value_v, u64 *slot)
+{
+        u64 dummy[1];
+        s64 ret;
+
+        ret = beat_hcall1(HV_insert_htab_entry3, dummy, htab_id, group,
+                hpte_v, hpte_r, mask_v, value_v);
+        *slot = dummy[0];
+        return ret;
+}
+
+static inline s64 beat_invalidate_htab_entry3(u64 htab_id, u64 group,
+        u64 va, u64 pss)
+{
+        return beat_hcall_norets(HV_invalidate_htab_entry3,
+                htab_id, group, va, pss);
+}
+
+static inline s64 beat_update_htab_permission3(u64 htab_id, u64 group,
+        u64 va, u64 pss, u64 ptel_mask, u64 ptel_value)
+{
+        return beat_hcall_norets(HV_update_htab_permission3,
+                htab_id, group, va, pss, ptel_mask, ptel_value);
+}
+
+static inline s64 beat_clear_htab3(u64 htab_id)
+{
+        return beat_hcall_norets(HV_clear_htab3, htab_id);
+}
+
 static inline void beat_shutdown_logical_partition(u64 code)
 {
         (void)beat_hcall_norets(HV_shutdown_logical_partition, code);
@@ -217,4 +248,41 @@ static inline s64 beat_put_iopte(u64 ioas_id, u64 io_addr, u64 real_addr,
                 ioid, flags);
 }
 
+static inline s64 beat_construct_event_receive_port(u64 *port)
+{
+        u64 dummy[1];
+        s64 ret;
+
+        ret = beat_hcall1(HV_construct_event_receive_port, dummy);
+        *port = dummy[0];
+        return ret;
+}
+
+static inline s64 beat_destruct_event_receive_port(u64 port)
+{
+        s64 ret;
+
+        ret = beat_hcall_norets(HV_destruct_event_receive_port, port);
+        return ret;
+}
+
+static inline s64 beat_create_repository_node(u64 path[4], u64 data[2])
+{
+        s64 ret;
+
+        ret = beat_hcall_norets(HV_create_repository_node2,
+                path[0], path[1], path[2], path[3], data[0], data[1]);
+        return ret;
+}
+
+static inline s64 beat_get_repository_node_value(u64 lpid, u64 path[4],
+        u64 data[2])
+{
+        s64 ret;
+
+        ret = beat_hcall2(HV_get_repository_node_value2, data,
+                lpid, path[0], path[1], path[2], path[3]);
+        return ret;
+}
+
 #endif
diff --git a/arch/powerpc/platforms/celleb/htab.c b/arch/powerpc/platforms/celleb/htab.c
index 279d7339e170..fbf27c74ebda 100644
--- a/arch/powerpc/platforms/celleb/htab.c
+++ b/arch/powerpc/platforms/celleb/htab.c
@@ -90,7 +90,7 @@ static inline unsigned int beat_read_mask(unsigned hpte_group)
 static long beat_lpar_hpte_insert(unsigned long hpte_group,
                                   unsigned long va, unsigned long pa,
                                   unsigned long rflags, unsigned long vflags,
-                                  int psize)
+                                  int psize, int ssize)
 {
         unsigned long lpar_rc;
         unsigned long slot;
@@ -105,7 +105,8 @@ static long beat_lpar_hpte_insert(unsigned long hpte_group,
                         "rflags=%lx, vflags=%lx, psize=%d)\n",
                 hpte_group, va, pa, rflags, vflags, psize);
 
-        hpte_v = hpte_encode_v(va, psize) | vflags | HPTE_V_VALID;
+        hpte_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M) |
+                vflags | HPTE_V_VALID;
         hpte_r = hpte_encode_r(pa, psize) | rflags;
 
         if (!(vflags & HPTE_V_BOLTED))
@@ -184,12 +185,12 @@ static void beat_lpar_hptab_clear(void)
 static long beat_lpar_hpte_updatepp(unsigned long slot,
                                     unsigned long newpp,
                                     unsigned long va,
-                                    int psize, int local)
+                                    int psize, int ssize, int local)
 {
         unsigned long lpar_rc;
         unsigned long dummy0, dummy1, want_v;
 
-        want_v = hpte_encode_v(va, psize);
+        want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M);
 
         DBG_LOW("    update: "
                 "avpnv=%016lx, slot=%016lx, psize: %d, newpp %016lx ... ",
@@ -225,8 +226,8 @@ static long beat_lpar_hpte_find(unsigned long va, int psize)
         long slot;
         unsigned long want_v, hpte_v;
 
-        hash = hpt_hash(va, mmu_psize_defs[psize].shift);
-        want_v = hpte_encode_v(va, psize);
+        hash = hpt_hash(va, mmu_psize_defs[psize].shift, MMU_SEGSIZE_256M);
+        want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M);
 
         for (j = 0; j < 2; j++) {
                 slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
@@ -251,11 +252,11 @@ static long beat_lpar_hpte_find(unsigned long va, int psize)
 
 static void beat_lpar_hpte_updateboltedpp(unsigned long newpp,
                                           unsigned long ea,
-                                          int psize)
+                                          int psize, int ssize)
 {
         unsigned long lpar_rc, slot, vsid, va, dummy0, dummy1;
 
-        vsid = get_kernel_vsid(ea);
+        vsid = get_kernel_vsid(ea, MMU_SEGSIZE_256M);
         va = (vsid << 28) | (ea & 0x0fffffff);
 
         spin_lock(&beat_htab_lock);
@@ -270,7 +271,7 @@ static void beat_lpar_hpte_updateboltedpp(unsigned long newpp,
 }
 
 static void beat_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
-                                         int psize, int local)
+                                         int psize, int ssize, int local)
 {
         unsigned long want_v;
         unsigned long lpar_rc;
@@ -279,7 +280,7 @@ static void beat_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
 
         DBG_LOW("    inval : slot=%lx, va=%016lx, psize: %d, local: %d\n",
                 slot, va, psize, local);
-        want_v = hpte_encode_v(va, psize);
+        want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M);
 
         spin_lock_irqsave(&beat_htab_lock, flags);
         dummy1 = beat_lpar_hpte_getword0(slot);
@@ -306,3 +307,134 @@ void __init hpte_init_beat(void)
         ppc_md.hpte_remove      = beat_lpar_hpte_remove;
         ppc_md.hpte_clear_all   = beat_lpar_hptab_clear;
 }
+
+static long beat_lpar_hpte_insert_v3(unsigned long hpte_group,
+                                  unsigned long va, unsigned long pa,
+                                  unsigned long rflags, unsigned long vflags,
+                                  int psize, int ssize)
+{
+        unsigned long lpar_rc;
+        unsigned long slot;
+        unsigned long hpte_v, hpte_r;
+
+        /* same as iseries */
+        if (vflags & HPTE_V_SECONDARY)
+                return -1;
+
+        if (!(vflags & HPTE_V_BOLTED))
+                DBG_LOW("hpte_insert(group=%lx, va=%016lx, pa=%016lx, "
+                        "rflags=%lx, vflags=%lx, psize=%d)\n",
+                hpte_group, va, pa, rflags, vflags, psize);
+
+        hpte_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M) |
+                vflags | HPTE_V_VALID;
+        hpte_r = hpte_encode_r(pa, psize) | rflags;
+
+        if (!(vflags & HPTE_V_BOLTED))
+                DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
+
+        if (rflags & (_PAGE_GUARDED|_PAGE_NO_CACHE))
+                hpte_r &= ~_PAGE_COHERENT;
+
+        /* insert into not-volted entry */
+        lpar_rc = beat_insert_htab_entry3(0, hpte_group, hpte_v, hpte_r,
+                HPTE_V_BOLTED, 0, &slot);
+        /*
+         * Since we try and ioremap PHBs we don't own, the pte insert
+         * will fail. However we must catch the failure in hash_page
+         * or we will loop forever, so return -2 in this case.
+         */
+        if (unlikely(lpar_rc != 0)) {
+                if (!(vflags & HPTE_V_BOLTED))
+                        DBG_LOW(" lpar err %lx\n", lpar_rc);
+                return -2;
+        }
+        if (!(vflags & HPTE_V_BOLTED))
+                DBG_LOW(" -> slot: %lx\n", slot);
+
+        /* We have to pass down the secondary bucket bit here as well */
+        return (slot ^ hpte_group) & 15;
+}
+
+/*
+ * NOTE: for updatepp ops we are fortunate that the linux "newpp" bits and
+ * the low 3 bits of flags happen to line up.  So no transform is needed.
+ * We can probably optimize here and assume the high bits of newpp are
+ * already zero.  For now I am paranoid.
+ */
+static long beat_lpar_hpte_updatepp_v3(unsigned long slot,
+                                    unsigned long newpp,
+                                    unsigned long va,
+                                    int psize, int ssize, int local)
+{
+        unsigned long lpar_rc;
+        unsigned long want_v;
+        unsigned long pss;
+
+        want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M);
+        pss = (psize == MMU_PAGE_4K) ? -1UL : mmu_psize_defs[psize].penc;
+
+        DBG_LOW("    update: "
+                "avpnv=%016lx, slot=%016lx, psize: %d, newpp %016lx ... ",
+                want_v & HPTE_V_AVPN, slot, psize, newpp);
+
+        lpar_rc = beat_update_htab_permission3(0, slot, want_v, pss, 7, newpp);
+
+        if (lpar_rc == 0xfffffff7) {
+                DBG_LOW("not found !\n");
+                return -1;
+        }
+
+        DBG_LOW("ok\n");
+
+        BUG_ON(lpar_rc != 0);
+
+        return 0;
+}
+
+static void beat_lpar_hpte_invalidate_v3(unsigned long slot, unsigned long va,
+                                         int psize, int ssize, int local)
+{
+        unsigned long want_v;
+        unsigned long lpar_rc;
+        unsigned long pss;
+
+        DBG_LOW("    inval : slot=%lx, va=%016lx, psize: %d, local: %d\n",
+                slot, va, psize, local);
+        want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M);
+        pss = (psize == MMU_PAGE_4K) ? -1UL : mmu_psize_defs[psize].penc;
+
+        lpar_rc = beat_invalidate_htab_entry3(0, slot, want_v, pss);
+
+        /* E_busy can be valid output: page may be already replaced */
+        BUG_ON(lpar_rc != 0 && lpar_rc != 0xfffffff7);
+}
+
+static int64_t _beat_lpar_hptab_clear_v3(void)
+{
+        return beat_clear_htab3(0);
+}
+
+static void beat_lpar_hptab_clear_v3(void)
+{
+        _beat_lpar_hptab_clear_v3();
+}
+
+void __init hpte_init_beat_v3(void)
+{
+        if (_beat_lpar_hptab_clear_v3() == 0) {
+                ppc_md.hpte_invalidate  = beat_lpar_hpte_invalidate_v3;
+                ppc_md.hpte_updatepp    = beat_lpar_hpte_updatepp_v3;
+                ppc_md.hpte_updateboltedpp = beat_lpar_hpte_updateboltedpp;
+                ppc_md.hpte_insert      = beat_lpar_hpte_insert_v3;
+                ppc_md.hpte_remove      = beat_lpar_hpte_remove;
+                ppc_md.hpte_clear_all   = beat_lpar_hptab_clear_v3;
+        } else {
+                ppc_md.hpte_invalidate  = beat_lpar_hpte_invalidate;
+                ppc_md.hpte_updatepp    = beat_lpar_hpte_updatepp;
+                ppc_md.hpte_updateboltedpp = beat_lpar_hpte_updateboltedpp;
+                ppc_md.hpte_insert      = beat_lpar_hpte_insert;
+                ppc_md.hpte_remove      = beat_lpar_hpte_remove;
+                ppc_md.hpte_clear_all   = beat_lpar_hptab_clear;
+        }
+}
diff --git a/arch/powerpc/platforms/celleb/interrupt.c b/arch/powerpc/platforms/celleb/interrupt.c
index 98e6665681d3..c7c68ca70c82 100644
--- a/arch/powerpc/platforms/celleb/interrupt.c
+++ b/arch/powerpc/platforms/celleb/interrupt.c
@@ -175,11 +175,18 @@ static int beatic_pic_host_xlate(struct irq_host *h, struct device_node *ct,
         return 0;
 }
 
+static int beatic_pic_host_match(struct irq_host *h, struct device_node *np)
+{
+        /* Match all */
+        return 1;
+}
+
 static struct irq_host_ops beatic_pic_host_ops = {
         .map = beatic_pic_host_map,
         .remap = beatic_pic_host_remap,
         .unmap = beatic_pic_host_unmap,
         .xlate = beatic_pic_host_xlate,
+        .match = beatic_pic_host_match,
 };
 
 /*
@@ -242,7 +249,7 @@ void __init beatic_init_IRQ(void)
         ppc_md.get_irq = beatic_get_irq;
 
         /* Allocate an irq host */
-        beatic_host = irq_alloc_host(IRQ_HOST_MAP_NOMAP, 0,
+        beatic_host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0,
                                          &beatic_pic_host_ops,
                                          0);
         BUG_ON(beatic_host == NULL);
diff --git a/arch/powerpc/platforms/celleb/io-workarounds.c b/arch/powerpc/platforms/celleb/io-workarounds.c
new file mode 100644
index 000000000000..2b912140bcbb
--- /dev/null
+++ b/arch/powerpc/platforms/celleb/io-workarounds.c
@@ -0,0 +1,279 @@
+/*
+ * Support for Celleb io workarounds
+ *
+ * (C) Copyright 2006-2007 TOSHIBA CORPORATION
+ *
+ * This file is based to arch/powerpc/platform/cell/io-workarounds.c
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#undef DEBUG
+
+#include <linux/of_device.h>
+#include <linux/irq.h>
+
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/ppc-pci.h>
+
+#include "pci.h"
+
+#define MAX_CELLEB_PCI_BUS      4
+
+void *celleb_dummy_page_va;
+
+static struct celleb_pci_bus {
+        struct pci_controller *phb;
+        void (*dummy_read)(struct pci_controller *);
+} celleb_pci_busses[MAX_CELLEB_PCI_BUS];
+
+static int celleb_pci_count = 0;
+
+static struct celleb_pci_bus *celleb_pci_find(unsigned long vaddr,
+                                              unsigned long paddr)
+{
+        int i, j;
+        struct resource *res;
+
+        for (i = 0; i < celleb_pci_count; i++) {
+                struct celleb_pci_bus *bus = &celleb_pci_busses[i];
+                struct pci_controller *phb = bus->phb;
+                if (paddr)
+                        for (j = 0; j < 3; j++) {
+                                res = &phb->mem_resources[j];
+                                if (paddr >= res->start && paddr <= res->end)
+                                        return bus;
+                        }
+                res = &phb->io_resource;
+                if (vaddr && vaddr >= res->start && vaddr <= res->end)
+                        return bus;
+        }
+        return NULL;
+}
+
+static void celleb_io_flush(const PCI_IO_ADDR addr)
+{
+        struct celleb_pci_bus *bus;
+        int token;
+
+        token = PCI_GET_ADDR_TOKEN(addr);
+
+        if (token && token <= celleb_pci_count)
+                bus = &celleb_pci_busses[token - 1];
+        else {
+                unsigned long vaddr, paddr;
+                pte_t *ptep;
+
+                vaddr = (unsigned long)PCI_FIX_ADDR(addr);
+                if (vaddr < PHB_IO_BASE || vaddr >= PHB_IO_END)
+                        return;
+
+                ptep = find_linux_pte(init_mm.pgd, vaddr);
+                if (ptep == NULL)
+                        paddr = 0;
+                else
+                        paddr = pte_pfn(*ptep) << PAGE_SHIFT;
+                bus = celleb_pci_find(vaddr, paddr);
+
+                if (bus == NULL)
+                        return;
+        }
+
+        if (bus->dummy_read)
+                bus->dummy_read(bus->phb);
+}
+
+static u8 celleb_readb(const PCI_IO_ADDR addr)
+{
+        u8 val;
+        val = __do_readb(addr);
+        celleb_io_flush(addr);
+        return val;
+}
+
+static u16 celleb_readw(const PCI_IO_ADDR addr)
+{
+        u16 val;
+        val = __do_readw(addr);
+        celleb_io_flush(addr);
+        return val;
+}
+
+static u32 celleb_readl(const PCI_IO_ADDR addr)
+{
+        u32 val;
+        val = __do_readl(addr);
+        celleb_io_flush(addr);
+        return val;
+}
+
+static u64 celleb_readq(const PCI_IO_ADDR addr)
+{
+        u64 val;
+        val = __do_readq(addr);
+        celleb_io_flush(addr);
+        return val;
+}
+
+static u16 celleb_readw_be(const PCI_IO_ADDR addr)
+{
+        u16 val;
+        val = __do_readw_be(addr);
+        celleb_io_flush(addr);
+        return val;
+}
+
+static u32 celleb_readl_be(const PCI_IO_ADDR addr)
+{
+        u32 val;
+        val = __do_readl_be(addr);
+        celleb_io_flush(addr);
+        return val;
+}
+
+static u64 celleb_readq_be(const PCI_IO_ADDR addr)
+{
+        u64 val;
+        val = __do_readq_be(addr);
+        celleb_io_flush(addr);
+        return val;
+}
+
+static void celleb_readsb(const PCI_IO_ADDR addr,
+                          void *buf, unsigned long count)
+{
+        __do_readsb(addr, buf, count);
+        celleb_io_flush(addr);
+}
+
+static void celleb_readsw(const PCI_IO_ADDR addr,
+                          void *buf, unsigned long count)
+{
+        __do_readsw(addr, buf, count);
+        celleb_io_flush(addr);
+}
+
+static void celleb_readsl(const PCI_IO_ADDR addr,
+                          void *buf, unsigned long count)
+{
+        __do_readsl(addr, buf, count);
+        celleb_io_flush(addr);
+}
+
+static void celleb_memcpy_fromio(void *dest,
+                                 const PCI_IO_ADDR src,
+                                 unsigned long n)
+{
+        __do_memcpy_fromio(dest, src, n);
+        celleb_io_flush(src);
+}
+
+static void __iomem *celleb_ioremap(unsigned long addr,
+                                     unsigned long size,
+                                     unsigned long flags)
+{
+        struct celleb_pci_bus *bus;
+        void __iomem *res = __ioremap(addr, size, flags);
+        int busno;
+
+        bus = celleb_pci_find(0, addr);
+        if (bus != NULL) {
+                busno = bus - celleb_pci_busses;
+                PCI_SET_ADDR_TOKEN(res, busno + 1);
+        }
+        return res;
+}
+
+static void celleb_iounmap(volatile void __iomem *addr)
+{
+        return __iounmap(PCI_FIX_ADDR(addr));
+}
+
+static struct ppc_pci_io celleb_pci_io __initdata = {
+        .readb = celleb_readb,
+        .readw = celleb_readw,
+        .readl = celleb_readl,
+        .readq = celleb_readq,
+        .readw_be = celleb_readw_be,
+        .readl_be = celleb_readl_be,
+        .readq_be = celleb_readq_be,
+        .readsb = celleb_readsb,
+        .readsw = celleb_readsw,
+        .readsl = celleb_readsl,
+        .memcpy_fromio = celleb_memcpy_fromio,
+};
+
+void __init celleb_pci_add_one(struct pci_controller *phb,
+                               void (*dummy_read)(struct pci_controller *))
+{
+        struct celleb_pci_bus *bus = &celleb_pci_busses[celleb_pci_count];
+        struct device_node *np = phb->arch_data;
+
+        if (celleb_pci_count >= MAX_CELLEB_PCI_BUS) {
+                printk(KERN_ERR "Too many pci bridges, workarounds"
+                       " disabled for %s\n", np->full_name);
+                return;
+        }
+
+        celleb_pci_count++;
+
+        bus->phb = phb;
+        bus->dummy_read = dummy_read;
+}
+
+static struct of_device_id celleb_pci_workaround_match[] __initdata = {
+        {
+                .name = "pci-pseudo",
+                .data = fake_pci_workaround_init,
+        }, {
+                .name = "epci",
+                .data = epci_workaround_init,
+        }, {
+        },
+};
+
+int __init celleb_pci_workaround_init(void)
+{
+        struct pci_controller *phb;
+        struct device_node *node;
+        const struct  of_device_id *match;
+        void (*init_func)(struct pci_controller *);
+
+        celleb_dummy_page_va = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        if (!celleb_dummy_page_va) {
+                printk(KERN_ERR "Celleb: dummy read disabled."
+                        "Alloc celleb_dummy_page_va failed\n");
+                return 1;
+        }
+
+        list_for_each_entry(phb, &hose_list, list_node) {
+                node = phb->arch_data;
+                match = of_match_node(celleb_pci_workaround_match, node);
+
+                if (match) {
+                        init_func = match->data;
+                        (*init_func)(phb);
+                }
+        }
+
+        ppc_pci_io = celleb_pci_io;
+        ppc_md.ioremap = celleb_ioremap;
+        ppc_md.iounmap = celleb_iounmap;
+
+        return 0;
+}
diff --git a/arch/powerpc/platforms/celleb/pci.c b/arch/powerpc/platforms/celleb/pci.c
index e9ac19c4bba4..6bc32fda7a6b 100644
--- a/arch/powerpc/platforms/celleb/pci.c
+++ b/arch/powerpc/platforms/celleb/pci.c
@@ -31,6 +31,7 @@
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <linux/pci_regs.h>
+#include <linux/of_device.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -242,8 +243,8 @@ static int celleb_fake_pci_write_config(struct pci_bus *bus,
 }
 
 static struct pci_ops celleb_fake_pci_ops = {
-        celleb_fake_pci_read_config,
-        celleb_fake_pci_write_config
+        .read = celleb_fake_pci_read_config,
+        .write = celleb_fake_pci_write_config,
 };
 
 static inline void celleb_setup_pci_base_addrs(struct pci_controller *hose,
@@ -288,8 +289,8 @@ static inline void celleb_setup_pci_base_addrs(struct pci_controller *hose,
         celleb_config_write_fake(config, PCI_COMMAND, 2, val);
 }
 
-static int __devinit celleb_setup_fake_pci_device(struct device_node *node,
-                                                  struct pci_controller *hose)
+static int __init celleb_setup_fake_pci_device(struct device_node *node,
+                                               struct pci_controller *hose)
 {
         unsigned int rlen;
         int num_base_addr = 0;
@@ -327,10 +328,7 @@ static int __devinit celleb_setup_fake_pci_device(struct device_node *node,
 
         size = 256;
         config = &private->fake_config[devno][fn];
-        if (mem_init_done)
-                *config = kzalloc(size, GFP_KERNEL);
-        else
-                *config = alloc_bootmem(size);
+        *config = alloc_maybe_bootmem(size, GFP_KERNEL);
         if (*config == NULL) {
                 printk(KERN_ERR "PCI: "
                        "not enough memory for fake configuration space\n");
@@ -341,10 +339,7 @@ static int __devinit celleb_setup_fake_pci_device(struct device_node *node,
 
         size = sizeof(struct celleb_pci_resource);
         res = &private->res[devno][fn];
-        if (mem_init_done)
-                *res = kzalloc(size, GFP_KERNEL);
-        else
-                *res = alloc_bootmem(size);
+        *res = alloc_maybe_bootmem(size, GFP_KERNEL);
         if (*res == NULL) {
                 printk(KERN_ERR
                        "PCI: not enough memory for resource data space\n");
@@ -418,8 +413,8 @@ error:
         return 1;
 }
 
-static int __devinit phb_set_bus_ranges(struct device_node *dev,
-                                        struct pci_controller *phb)
+static int __init phb_set_bus_ranges(struct device_node *dev,
+                                     struct pci_controller *phb)
 {
         const int *bus_range;
         unsigned int len;
@@ -434,46 +429,65 @@ static int __devinit phb_set_bus_ranges(struct device_node *dev,
         return 0;
 }
 
-static void __devinit celleb_alloc_private_mem(struct pci_controller *hose)
+static void __init celleb_alloc_private_mem(struct pci_controller *hose)
 {
-        if (mem_init_done)
-                hose->private_data =
-                        kzalloc(sizeof(struct celleb_pci_private), GFP_KERNEL);
-        else
-                hose->private_data =
-                        alloc_bootmem(sizeof(struct celleb_pci_private));
+        hose->private_data =
+                alloc_maybe_bootmem(sizeof(struct celleb_pci_private),
+                        GFP_KERNEL);
 }
 
-int __devinit celleb_setup_phb(struct pci_controller *phb)
+static int __init celleb_setup_fake_pci(struct device_node *dev,
+                                        struct pci_controller *phb)
 {
-        const char *name;
-        struct device_node *dev = phb->arch_data;
         struct device_node *node;
-        unsigned int rlen;
 
-        name = of_get_property(dev, "name", &rlen);
-        if (!name)
-                return 1;
+        phb->ops = &celleb_fake_pci_ops;
+        celleb_alloc_private_mem(phb);
 
-        pr_debug("PCI: celleb_setup_phb() %s\n", name);
-        phb_set_bus_ranges(dev, phb);
-        phb->buid = 1;
+        for (node = of_get_next_child(dev, NULL);
+             node != NULL; node = of_get_next_child(dev, node))
+                celleb_setup_fake_pci_device(node, phb);
+
+        return 0;
+}
 
-        if (strcmp(name, "epci") == 0) {
-                phb->ops = &celleb_epci_ops;
-                return celleb_setup_epci(dev, phb);
+void __init fake_pci_workaround_init(struct pci_controller *phb)
+{
+        /**
+         *  We will add fake pci bus to scc_pci_bus for the purpose to improve
+         *  I/O Macro performance. But device-tree and device drivers
+         *  are not ready to use address with a token.
+         */
+
+        /* celleb_pci_add_one(phb, NULL); */
+}
 
-        } else if (strcmp(name, "pci-pseudo") == 0) {
-                phb->ops = &celleb_fake_pci_ops;
-                celleb_alloc_private_mem(phb);
-                for (node = of_get_next_child(dev, NULL);
-                     node != NULL; node = of_get_next_child(dev, node))
-                        celleb_setup_fake_pci_device(node, phb);
+static struct of_device_id celleb_phb_match[] __initdata = {
+        {
+                .name = "pci-pseudo",
+                .data = celleb_setup_fake_pci,
+        }, {
+                .name = "epci",
+                .data = celleb_setup_epci,
+        }, {
+        },
+};
 
-        } else
+int __init celleb_setup_phb(struct pci_controller *phb)
+{
+        struct device_node *dev = phb->arch_data;
+        const struct of_device_id *match;
+        int (*setup_func)(struct device_node *, struct pci_controller *);
+
+        match = of_match_node(celleb_phb_match, dev);
+        if (!match)
                 return 1;
 
-        return 0;
+        phb_set_bus_ranges(dev, phb);
+        phb->buid = 1;
+
+        setup_func = match->data;
+        return (*setup_func)(dev, phb);
 }
 
 int celleb_pci_probe_mode(struct pci_bus *bus)
diff --git a/arch/powerpc/platforms/celleb/pci.h b/arch/powerpc/platforms/celleb/pci.h
index 5340e348e297..5d5544ffeddb 100644
--- a/arch/powerpc/platforms/celleb/pci.h
+++ b/arch/powerpc/platforms/celleb/pci.h
@@ -25,11 +25,18 @@
 
 #include <asm/pci-bridge.h>
 #include <asm/prom.h>
+#include <asm/ppc-pci.h>
 
 extern int celleb_setup_phb(struct pci_controller *);
 extern int celleb_pci_probe_mode(struct pci_bus *);
 
-extern struct pci_ops celleb_epci_ops;
 extern int celleb_setup_epci(struct device_node *, struct pci_controller *);
 
+extern void *celleb_dummy_page_va;
+extern int __init celleb_pci_workaround_init(void);
+extern void __init celleb_pci_add_one(struct pci_controller *,
+                                      void (*)(struct pci_controller *));
+extern void fake_pci_workaround_init(struct pci_controller *);
+extern void epci_workaround_init(struct pci_controller *);
+
 #endif /* _CELLEB_PCI_H */
diff --git a/arch/powerpc/platforms/celleb/scc.h b/arch/powerpc/platforms/celleb/scc.h
index e9ce8a7c1882..6be1542a6e66 100644
--- a/arch/powerpc/platforms/celleb/scc.h
+++ b/arch/powerpc/platforms/celleb/scc.h
@@ -53,7 +53,7 @@
 #define SCC_EPCI_STATUS         0x808
 #define SCC_EPCI_ABTSET         0x80c
 #define SCC_EPCI_WATRP          0x810
-#define SCC_EPCI_DUMMYRADR      0x814
+#define SCC_EPCI_DUMYRADR       0x814
 #define SCC_EPCI_SWRESP         0x818
 #define SCC_EPCI_CNTOPT         0x81c
 #define SCC_EPCI_ECMODE         0xf00
diff --git a/arch/powerpc/platforms/celleb/scc_epci.c b/arch/powerpc/platforms/celleb/scc_epci.c
index c4b011094bd6..9d076426676c 100644
--- a/arch/powerpc/platforms/celleb/scc_epci.c
+++ b/arch/powerpc/platforms/celleb/scc_epci.c
@@ -43,7 +43,11 @@
 
 #define iob()  __asm__ __volatile__("eieio; sync":::"memory")
 
-static inline volatile void __iomem *celleb_epci_get_epci_base(
+struct epci_private {
+        dma_addr_t      dummy_page_da;
+};
+
+static inline PCI_IO_ADDR celleb_epci_get_epci_base(
                                         struct pci_controller *hose)
 {
         /*
@@ -55,7 +59,7 @@ static inline volatile void __iomem *celleb_epci_get_epci_base(
         return hose->cfg_addr;
 }
 
-static inline volatile void __iomem *celleb_epci_get_epci_cfg(
+static inline PCI_IO_ADDR celleb_epci_get_epci_cfg(
                                         struct pci_controller *hose)
 {
         /*
@@ -67,20 +71,11 @@ static inline volatile void __iomem *celleb_epci_get_epci_cfg(
         return hose->cfg_data;
 }
 
-#if 0 /* test code for epci dummy read */
-static void celleb_epci_dummy_read(struct pci_dev *dev)
+static void scc_epci_dummy_read(struct pci_controller *hose)
 {
-        volatile void __iomem *epci_base;
-        struct device_node *node;
-        struct pci_controller *hose;
+        PCI_IO_ADDR epci_base;
         u32 val;
 
-        node = (struct device_node *)dev->bus->sysdata;
-        hose = pci_find_hose_for_OF_device(node);
-
-        if (!hose)
-                return;
-
         epci_base = celleb_epci_get_epci_base(hose);
 
         val = in_be32(epci_base + SCC_EPCI_WATRP);
@@ -88,21 +83,45 @@ static void celleb_epci_dummy_read(struct pci_dev *dev)
 
         return;
 }
-#endif
+
+void __init epci_workaround_init(struct pci_controller *hose)
+{
+        PCI_IO_ADDR epci_base;
+        PCI_IO_ADDR reg;
+        struct epci_private *private = hose->private_data;
+
+        BUG_ON(!private);
+
+        private->dummy_page_da = dma_map_single(hose->parent,
+                celleb_dummy_page_va, PAGE_SIZE, DMA_FROM_DEVICE);
+        if (private->dummy_page_da == DMA_ERROR_CODE) {
+                printk(KERN_ERR "EPCI: dummy read disabled."
+                       "Map dummy page failed.\n");
+                return;
+        }
+
+        celleb_pci_add_one(hose, scc_epci_dummy_read);
+        epci_base = celleb_epci_get_epci_base(hose);
+
+        reg = epci_base + SCC_EPCI_DUMYRADR;
+        out_be32(reg, private->dummy_page_da);
+}
 
 static inline void clear_and_disable_master_abort_interrupt(
                                         struct pci_controller *hose)
 {
-        volatile void __iomem *epci_base, *reg;
+        PCI_IO_ADDR epci_base;
+        PCI_IO_ADDR reg;
         epci_base = celleb_epci_get_epci_base(hose);
         reg = epci_base + PCI_COMMAND;
         out_be32(reg, in_be32(reg) | (PCI_STATUS_REC_MASTER_ABORT << 16));
 }
 
 static int celleb_epci_check_abort(struct pci_controller *hose,
-                                   volatile void __iomem *addr)
+                                   PCI_IO_ADDR addr)
 {
-        volatile void __iomem *reg, *epci_base;
+        PCI_IO_ADDR reg;
+        PCI_IO_ADDR epci_base;
         u32 val;
 
         iob();
@@ -132,12 +151,12 @@ static int celleb_epci_check_abort(struct pci_controller *hose,
         return PCIBIOS_SUCCESSFUL;
 }
 
-static volatile void __iomem *celleb_epci_make_config_addr(
+static PCI_IO_ADDR celleb_epci_make_config_addr(
                                         struct pci_bus *bus,
                                         struct pci_controller *hose,
                                         unsigned int devfn, int where)
 {
-        volatile void __iomem *addr;
+        PCI_IO_ADDR addr;
 
         if (bus != hose->bus)
                 addr = celleb_epci_get_epci_cfg(hose) +
@@ -157,7 +176,8 @@ static volatile void __iomem *celleb_epci_make_config_addr(
 static int celleb_epci_read_config(struct pci_bus *bus,
                         unsigned int devfn, int where, int size, u32 * val)
 {
-        volatile void __iomem *epci_base, *addr;
+        PCI_IO_ADDR epci_base;
+        PCI_IO_ADDR addr;
         struct device_node *node;
         struct pci_controller *hose;
 
@@ -220,7 +240,8 @@ static int celleb_epci_read_config(struct pci_bus *bus,
 static int celleb_epci_write_config(struct pci_bus *bus,
                         unsigned int devfn, int where, int size, u32 val)
 {
-        volatile void __iomem *epci_base, *addr;
+        PCI_IO_ADDR epci_base;
+        PCI_IO_ADDR addr;
         struct device_node *node;
         struct pci_controller *hose;
 
@@ -278,15 +299,16 @@ static int celleb_epci_write_config(struct pci_bus *bus,
 }
 
 struct pci_ops celleb_epci_ops = {
-        celleb_epci_read_config,
-        celleb_epci_write_config,
+        .read = celleb_epci_read_config,
+        .write = celleb_epci_write_config,
 };
 
 /* to be moved in FW */
-static int __devinit celleb_epci_init(struct pci_controller *hose)
+static int __init celleb_epci_init(struct pci_controller *hose)
 {
         u32 val;
-        volatile void __iomem *reg, *epci_base;
+        PCI_IO_ADDR reg;
+        PCI_IO_ADDR epci_base;
         int hwres = 0;
 
         epci_base = celleb_epci_get_epci_base(hose);
@@ -403,7 +425,7 @@ static int __devinit celleb_epci_init(struct pci_controller *hose)
         return 0;
 }
 
-int __devinit celleb_setup_epci(struct device_node *node,
+int __init celleb_setup_epci(struct device_node *node,
                                 struct pci_controller *hose)
 {
         struct resource r;
@@ -440,10 +462,24 @@ int __devinit celleb_setup_epci(struct device_node *node,
                  r.start, (unsigned long)hose->cfg_data,
                 (r.end - r.start + 1));
 
+        hose->private_data = kzalloc(sizeof(struct epci_private), GFP_KERNEL);
+        if (hose->private_data == NULL) {
+                printk(KERN_ERR "EPCI: no memory for private data.\n");
+                goto error;
+        }
+
+        hose->ops = &celleb_epci_ops;
         celleb_epci_init(hose);
 
         return 0;
 
 error:
+        kfree(hose->private_data);
+
+        if (hose->cfg_addr)
+                iounmap(hose->cfg_addr);
+
+        if (hose->cfg_data)
+                iounmap(hose->cfg_data);
         return 1;
 }
diff --git a/arch/powerpc/platforms/celleb/scc_sio.c b/arch/powerpc/platforms/celleb/scc_sio.c
index bcd25f54d986..610008211ca1 100644
--- a/arch/powerpc/platforms/celleb/scc_sio.c
+++ b/arch/powerpc/platforms/celleb/scc_sio.c
@@ -1,7 +1,7 @@
 /*
  * setup serial port in SCC
  *
- * (C) Copyright 2006 TOSHIBA CORPORATION
+ * (C) Copyright 2006-2007 TOSHIBA 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
@@ -28,58 +28,58 @@
 
 /* sio irq0=0xb00010022 irq0=0xb00010023 irq2=0xb00010024
     mmio=0xfff000-0x1000,0xff2000-0x1000 */
-static int txx9_serial_bitmap = 0;
+static int txx9_serial_bitmap __initdata = 0;
 
 static struct {
         uint32_t offset;
         uint32_t index;
-} txx9_scc_tab[3] = {
+} txx9_scc_tab[3] __initdata = {
         { 0x300, 0 },   /* 0xFFF300 */
         { 0x400, 0 },   /* 0xFFF400 */
         { 0x800, 1 }    /* 0xFF2800 */
 };
 
-static int txx9_serial_init(void)
+static int __init txx9_serial_init(void)
 {
         extern int early_serial_txx9_setup(struct uart_port *port);
-        struct device_node *node;
+        struct device_node *node = NULL;
         int i;
         struct uart_port req;
         struct of_irq irq;
         struct resource res;
 
-        node = of_find_node_by_path("/ioif1/sio");
-        if (!node)
-                return 0;
+        while ((node = of_find_compatible_node(node,
+                                "serial", "toshiba,sio-scc")) != NULL) {
+                for (i = 0; i < ARRAY_SIZE(txx9_scc_tab); i++) {
+                        if (!(txx9_serial_bitmap & (1<<i)))
+                                continue;
 
-        for(i = 0; i < sizeof(txx9_scc_tab)/sizeof(txx9_scc_tab[0]); i++) {
-                if (!(txx9_serial_bitmap & (1<<i)))
-                        continue;
+                        if (of_irq_map_one(node, i, &irq))
+                                continue;
+                        if (of_address_to_resource(node,
+                                txx9_scc_tab[i].index, &res))
+                                continue;
 
-                if (of_irq_map_one(node, i, &irq))
-                        continue;
-                if (of_address_to_resource(node, txx9_scc_tab[i].index, &res))
-                        continue;
-
-                memset(&req, 0, sizeof(req));
-                req.line = i;
-                req.iotype = UPIO_MEM;
-                req.mapbase = res.start + txx9_scc_tab[i].offset;
+                        memset(&req, 0, sizeof(req));
+                        req.line = i;
+                        req.iotype = UPIO_MEM;
+                        req.mapbase = res.start + txx9_scc_tab[i].offset;
 #ifdef CONFIG_SERIAL_TXX9_CONSOLE
-                req.membase = ioremap(req.mapbase, 0x24);
+                        req.membase = ioremap(req.mapbase, 0x24);
 #endif
-                req.irq = irq_create_of_mapping(irq.controller,
-                        irq.specifier, irq.size);
-                req.flags |= UPF_IOREMAP | UPF_BUGGY_UART /*HAVE_CTS_LINE*/;
-                req.uartclk = 83300000;
-                early_serial_txx9_setup(&req);
+                        req.irq = irq_create_of_mapping(irq.controller,
+                                irq.specifier, irq.size);
+                        req.flags |= UPF_IOREMAP | UPF_BUGGY_UART
+                                /*HAVE_CTS_LINE*/;
+                        req.uartclk = 83300000;
+                        early_serial_txx9_setup(&req);
+                }
         }
 
-        of_node_put(node);
         return 0;
 }
 
-static int txx9_serial_config(char *ptr)
+static int __init txx9_serial_config(char *ptr)
 {
         int     i;
 
diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/celleb/setup.c
index 5e9f7f163571..1769d755eff3 100644
--- a/arch/powerpc/platforms/celleb/setup.c
+++ b/arch/powerpc/platforms/celleb/setup.c
@@ -73,7 +73,7 @@ static void celleb_show_cpuinfo(struct seq_file *m)
         of_node_put(root);
 }
 
-static int celleb_machine_type_hack(char *ptr)
+static int __init celleb_machine_type_hack(char *ptr)
 {
         strncpy(celleb_machine_type, ptr, sizeof(celleb_machine_type));
         celleb_machine_type[sizeof(celleb_machine_type)-1] = 0;
@@ -101,21 +101,11 @@ static void __init celleb_setup_arch(void)
         /* init to some ~sane value until calibrate_delay() runs */
         loops_per_jiffy = 50000000;
 
-        if (ROOT_DEV == 0) {
-                printk("No ramdisk, default root is /dev/hda2\n");
-                ROOT_DEV = Root_HDA2;
-        }
-
 #ifdef CONFIG_DUMMY_CONSOLE
         conswitchp = &dummy_con;
 #endif
 }
 
-static void beat_power_save(void)
-{
-        beat_pause(0);
-}
-
 static int __init celleb_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
@@ -124,18 +114,11 @@ static int __init celleb_probe(void)
                 return 0;
 
         powerpc_firmware_features |= FW_FEATURE_CELLEB_POSSIBLE;
-        hpte_init_beat();
+        hpte_init_beat_v3();
         return 1;
 }
 
-#ifdef CONFIG_KEXEC
-static void celleb_kexec_cpu_down(int crash, int secondary)
-{
-        beatic_deinit_IRQ();
-}
-#endif
-
-static struct of_device_id celleb_bus_ids[] = {
+static struct of_device_id celleb_bus_ids[] __initdata = {
         { .type = "scc", },
         { .type = "ioif", },    /* old style */
         {},
@@ -149,6 +132,8 @@ static int __init celleb_publish_devices(void)
         /* Publish OF platform devices for southbridge IOs */
         of_platform_bus_probe(NULL, celleb_bus_ids, NULL);
 
+        celleb_pci_workaround_init();
+
         return 0;
 }
 device_initcall(celleb_publish_devices);
@@ -175,7 +160,7 @@ define_machine(celleb) {
         .pci_probe_mode         = celleb_pci_probe_mode,
         .pci_setup_phb          = celleb_setup_phb,
 #ifdef CONFIG_KEXEC
-        .kexec_cpu_down         = celleb_kexec_cpu_down,
+        .kexec_cpu_down         = beat_kexec_cpu_down,
         .machine_kexec          = default_machine_kexec,
         .machine_kexec_prepare  = default_machine_kexec_prepare,
         .machine_crash_shutdown = default_machine_crash_shutdown,
diff --git a/arch/powerpc/platforms/chrp/gg2.h b/arch/powerpc/platforms/chrp/gg2.h
new file mode 100644
index 000000000000..341ae55b99fb
--- /dev/null
+++ b/arch/powerpc/platforms/chrp/gg2.h
@@ -0,0 +1,61 @@
+/*
+ *  include/asm-ppc/gg2.h -- VLSI VAS96011/12 `Golden Gate 2' register definitions
+ *
+ *  Copyright (C) 1997 Geert Uytterhoeven
+ *
+ *  This file is based on the following documentation:
+ *
+ *      The VAS96011/12 Chipset, Data Book, Edition 1.0
+ *      VLSI Technology, Inc.
+ *
+ *  This file is subject to the terms and conditions of the GNU General Public
+ *  License.  See the file COPYING in the main directory of this archive
+ *  for more details.
+ */
+
+#ifndef _ASMPPC_GG2_H
+#define _ASMPPC_GG2_H
+
+    /*
+     *  Memory Map (CHRP mode)
+     */
+
+#define GG2_PCI_MEM_BASE        0xc0000000      /* Peripheral memory space */
+#define GG2_ISA_MEM_BASE        0xf7000000      /* Peripheral memory alias */
+#define GG2_ISA_IO_BASE         0xf8000000      /* Peripheral I/O space */
+#define GG2_PCI_CONFIG_BASE     0xfec00000      /* PCI configuration space */
+#define GG2_INT_ACK_SPECIAL     0xfec80000      /* Interrupt acknowledge and */
+                                                /* special PCI cycles */
+#define GG2_ROM_BASE0           0xff000000      /* ROM bank 0 */
+#define GG2_ROM_BASE1           0xff800000      /* ROM bank 1 */
+
+
+    /*
+     *  GG2 specific PCI Registers
+     */
+
+extern void __iomem *gg2_pci_config_base;       /* kernel virtual address */
+
+#define GG2_PCI_BUSNO           0x40    /* Bus number */
+#define GG2_PCI_SUBBUSNO        0x41    /* Subordinate bus number */
+#define GG2_PCI_DISCCTR         0x42    /* Disconnect counter */
+#define GG2_PCI_PPC_CTRL        0x50    /* PowerPC interface control register */
+#define GG2_PCI_ADDR_MAP        0x5c    /* Address map */
+#define GG2_PCI_PCI_CTRL        0x60    /* PCI interface control register */
+#define GG2_PCI_ROM_CTRL        0x70    /* ROM interface control register */
+#define GG2_PCI_ROM_TIME        0x74    /* ROM timing */
+#define GG2_PCI_CC_CTRL         0x80    /* Cache controller control register */
+#define GG2_PCI_DRAM_BANK0      0x90    /* Control register for DRAM bank #0 */
+#define GG2_PCI_DRAM_BANK1      0x94    /* Control register for DRAM bank #1 */
+#define GG2_PCI_DRAM_BANK2      0x98    /* Control register for DRAM bank #2 */
+#define GG2_PCI_DRAM_BANK3      0x9c    /* Control register for DRAM bank #3 */
+#define GG2_PCI_DRAM_BANK4      0xa0    /* Control register for DRAM bank #4 */
+#define GG2_PCI_DRAM_BANK5      0xa4    /* Control register for DRAM bank #5 */
+#define GG2_PCI_DRAM_TIME0      0xb0    /* Timing parameters set #0 */
+#define GG2_PCI_DRAM_TIME1      0xb4    /* Timing parameters set #1 */
+#define GG2_PCI_DRAM_CTRL       0xc0    /* DRAM control */
+#define GG2_PCI_ERR_CTRL        0xd0    /* Error control register */
+#define GG2_PCI_ERR_STATUS      0xd4    /* Error status register */
+                                        /* Cleared when read */
+
+#endif /* _ASMPPC_GG2_H */
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index 28d1647b204e..e43465d34d29 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -13,7 +13,6 @@
 #include <asm/irq.h>
 #include <asm/hydra.h>
 #include <asm/prom.h>
-#include <asm/gg2.h>
 #include <asm/machdep.h>
 #include <asm/sections.h>
 #include <asm/pci-bridge.h>
@@ -21,6 +20,7 @@
 #include <asm/rtas.h>
 
 #include "chrp.h"
+#include "gg2.h"
 
 /* LongTrail */
 void __iomem *gg2_pci_config_base;
@@ -86,8 +86,8 @@ int gg2_write_config(struct pci_bus *bus, unsigned int devfn, int off,
 
 static struct pci_ops gg2_pci_ops =
 {
-        gg2_read_config,
-        gg2_write_config
+        .read = gg2_read_config,
+        .write = gg2_write_config,
 };
 
 /*
@@ -124,8 +124,8 @@ int rtas_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
 
 static struct pci_ops rtas_pci_ops =
 {
-        rtas_read_config,
-        rtas_write_config
+        .read = rtas_read_config,
+        .write = rtas_write_config,
 };
 
 volatile struct Hydra __iomem *Hydra = NULL;
@@ -338,3 +338,32 @@ void chrp_pci_fixup_winbond_ata(struct pci_dev *sl82c105)
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105,
                 chrp_pci_fixup_winbond_ata);
+
+/* Pegasos2 firmware version 20040810 configures the built-in IDE controller
+ * in legacy mode, but sets the PCI registers to PCI native mode.
+ * The chip can only operate in legacy mode, so force the PCI class into legacy
+ * mode as well. The same fixup must be done to the class-code property in
+ * the IDE node /pci@80000000/ide@C,1
+ */
+static void chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
+{
+        u8 progif;
+        struct pci_dev *viaisa;
+
+        if (!machine_is(chrp) || _chrp_type != _CHRP_Pegasos)
+                return;
+        if (viaide->irq != 14)
+                return;
+
+        viaisa = pci_get_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8231, NULL);
+        if (!viaisa)
+                return;
+        printk("Fixing VIA IDE, force legacy mode on '%s'\n", viaide->dev.bus_id);
+
+        pci_read_config_byte(viaide, PCI_CLASS_PROG, &progif);
+        pci_write_config_byte(viaide, PCI_CLASS_PROG, progif & ~0x5);
+        viaide->class &= ~0x5;
+
+        pci_dev_put(viaisa);
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 373de4c063db..59306261f5b2 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -32,13 +32,11 @@
 #include <linux/seq_file.h>
 #include <linux/root_dev.h>
 #include <linux/initrd.h>
-#include <linux/module.h>
 #include <linux/timer.h>
 
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/prom.h>
-#include <asm/gg2.h>
 #include <asm/pci-bridge.h>
 #include <asm/dma.h>
 #include <asm/machdep.h>
@@ -52,6 +50,7 @@
 #include <asm/xmon.h>
 
 #include "chrp.h"
+#include "gg2.h"
 
 void rtas_indicator_progress(char *, unsigned short);
 
@@ -291,16 +290,6 @@ void __init chrp_setup_arch(void)
                 ppc_md.set_rtc_time     = rtas_set_rtc_time;
         }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-        /* this is fine for chrp */
-        initrd_below_start_ok = 1;
-
-        if (initrd_start)
-                ROOT_DEV = Root_RAM0;
-        else
-#endif
-                ROOT_DEV = Root_SDA2; /* sda2 (sda1 is for the kernel) */
-
         /* On pegasos, enable the L2 cache if not already done by OF */
         pegasos_set_l2cr();
 
diff --git a/arch/powerpc/platforms/chrp/smp.c b/arch/powerpc/platforms/chrp/smp.c
index 3ea0eb78568e..10a4a4d063b6 100644
--- a/arch/powerpc/platforms/chrp/smp.c
+++ b/arch/powerpc/platforms/chrp/smp.c
@@ -26,10 +26,8 @@
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/smp.h>
-#include <asm/residual.h>
 #include <asm/time.h>
 #include <asm/machdep.h>
-#include <asm/smp.h>
 #include <asm/mpic.h>
 #include <asm/rtas.h>
 
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 2d12f77e46bc..8924095a7928 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -1,9 +1,10 @@
-choice
-        prompt "Machine Type"
-        depends on EMBEDDED6xx
+config EMBEDDED6xx
+        bool "Embedded 6xx/7xx/7xxx-based boards"
+        depends on PPC32 && BROKEN_ON_SMP && PPC_MULTIPLATFORM
 
 config LINKSTATION
         bool "Linkstation / Kurobox(HG) from Buffalo"
+        depends on EMBEDDED6xx
         select MPIC
         select FSL_SOC
         select PPC_UDBG_16550 if SERIAL_8250
@@ -17,15 +18,18 @@ config LINKSTATION
 
 config MPC7448HPC2
         bool "Freescale MPC7448HPC2(Taiga)"
+        depends on EMBEDDED6xx
         select TSI108_BRIDGE
         select DEFAULT_UIMAGE
         select PPC_UDBG_16550
+        select WANT_DEVICE_TREE
         help
           Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
           platform
 
 config PPC_HOLLY
         bool "PPC750GX/CL with TSI10x bridge (Hickory/Holly)"
+        depends on EMBEDDED6xx
         select TSI108_BRIDGE
         select PPC_UDBG_16550
         select WANT_DEVICE_TREE
@@ -35,12 +39,12 @@ config PPC_HOLLY
 
 config PPC_PRPMC2800
         bool "Motorola-PrPMC2800"
+        depends on EMBEDDED6xx
         select MV64X60
         select NOT_COHERENT_CACHE
         select WANT_DEVICE_TREE
         help
           This option enables support for the Motorola PrPMC2800 board
-endchoice
 
 config TSI108_BRIDGE
         bool
diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c
index 6292e36dc577..b6de2b5223dd 100644
--- a/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/arch/powerpc/platforms/embedded6xx/holly.c
@@ -113,23 +113,11 @@ static void holly_remap_bridge(void)
 
 static void __init holly_setup_arch(void)
 {
-        struct device_node *cpu;
         struct device_node *np;
 
         if (ppc_md.progress)
                 ppc_md.progress("holly_setup_arch():set_bridge", 0);
 
-        cpu = of_find_node_by_type(NULL, "cpu");
-        if (cpu) {
-                const unsigned int *fp;
-
-                fp = of_get_property(cpu, "clock-frequency", NULL);
-                if (fp)
-                        loops_per_jiffy = *fp / HZ;
-                else
-                        loops_per_jiffy = 50000000 / HZ;
-                of_node_put(cpu);
-        }
         tsi108_csr_vir_base = get_vir_csrbase();
 
         /* setup PCI host bridge */
@@ -147,7 +135,7 @@ static void __init holly_setup_arch(void)
 }
 
 /*
- * Interrupt setup and service.  Interrrupts on the holly come
+ * Interrupt setup and service.  Interrupts on the holly come
  * from the four external INT pins, PCI interrupts are routed via
  * PCI interrupt control registers, it generates internal IRQ23
  *
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index bd5ca58345a1..eb5d74e26fe9 100644
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -11,16 +11,16 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/pci.h>
 #include <linux/initrd.h>
 #include <linux/mtd/physmap.h>
 
 #include <asm/time.h>
 #include <asm/prom.h>
 #include <asm/mpic.h>
-#include <asm/mpc10x.h>
 #include <asm/pci-bridge.h>
 
+#include "mpc10x.h"
+
 static struct mtd_partition linkstation_physmap_partitions[] = {
         {
                 .name   = "mtd_firmimg",
@@ -91,7 +91,7 @@ static void __init linkstation_setup_arch(void)
 #endif
 
         /* Lookup PCI host bridges */
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+        for_each_compatible_node(np, "pci", "mpc10x-pci")
                 linkstation_add_bridge(np);
 
         printk(KERN_INFO "BUFFALO Network Attached Storage Series\n");
@@ -99,7 +99,7 @@ static void __init linkstation_setup_arch(void)
 }
 
 /*
- * Interrupt setup and service.  Interrrupts on the linkstation come
+ * Interrupt setup and service.  Interrupts on the linkstation come
  * from the four PCI slots plus onboard 8241 devices: I2C, DUART.
  */
 static void __init linkstation_init_IRQ(void)
diff --git a/arch/powerpc/platforms/embedded6xx/ls_uart.c b/arch/powerpc/platforms/embedded6xx/ls_uart.c
index d0bee9f19e4e..c99264cedda5 100644
--- a/arch/powerpc/platforms/embedded6xx/ls_uart.c
+++ b/arch/powerpc/platforms/embedded6xx/ls_uart.c
@@ -1,14 +1,25 @@
+/*
+ * AVR power-management chip interface for the Buffalo Linkstation /
+ * Kurobox Platform.
+ *
+ * Author: 2006 (c) G. Liakhovetski
+ *       g.liakhovetski@gmx.de
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of
+ * any kind, whether express or implied.
+ */
 #include <linux/workqueue.h>
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/serial_reg.h>
 #include <linux/serial_8250.h>
 #include <asm/io.h>
-#include <asm/mpc10x.h>
-#include <asm/ppc_sys.h>
 #include <asm/prom.h>
 #include <asm/termbits.h>
 
+#include "mpc10x.h"
+
 static void __iomem *avr_addr;
 static unsigned long avr_clock;
 
@@ -106,6 +117,9 @@ static int __init ls_uarts_init(void)
         phys_addr_t phys_addr;
         int len;
 
+        if (!machine_is(linkstation))
+                return 0;
+
         avr = of_find_node_by_path("/soc10x/serial@80004500");
         if (!avr)
                 return -EINVAL;
diff --git a/arch/powerpc/platforms/embedded6xx/mpc10x.h b/arch/powerpc/platforms/embedded6xx/mpc10x.h
new file mode 100644
index 000000000000..b30a6a3b5bd2
--- /dev/null
+++ b/arch/powerpc/platforms/embedded6xx/mpc10x.h
@@ -0,0 +1,180 @@
+/*
+ * Common routines for the Motorola SPS MPC106/8240/107 Host bridge/Mem
+ * ctlr/EPIC/etc.
+ *
+ * Author: Mark A. Greer
+ *         mgreer@mvista.com
+ *
+ * 2001 (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.
+ */
+#ifndef __PPC_KERNEL_MPC10X_H
+#define __PPC_KERNEL_MPC10X_H
+
+#include <linux/pci_ids.h>
+#include <asm/pci-bridge.h>
+
+/*
+ * The values here don't completely map everything but should work in most
+ * cases.
+ *
+ * MAP A (PReP Map)
+ *   Processor: 0x80000000 - 0x807fffff -> PCI I/O: 0x00000000 - 0x007fffff
+ *   Processor: 0xc0000000 - 0xdfffffff -> PCI MEM: 0x00000000 - 0x1fffffff
+ *   PCI MEM:   0x80000000 -> Processor System Memory: 0x00000000
+ *   EUMB mapped to: ioremap_base - 0x00100000 (ioremap_base - 1 MB)
+ *
+ * MAP B (CHRP Map)
+ *   Processor: 0xfe000000 - 0xfebfffff -> PCI I/O: 0x00000000 - 0x00bfffff
+ *   Processor: 0x80000000 - 0xbfffffff -> PCI MEM: 0x80000000 - 0xbfffffff
+ *   PCI MEM:   0x00000000 -> Processor System Memory: 0x00000000
+ *   EUMB mapped to: ioremap_base - 0x00100000 (ioremap_base - 1 MB)
+ */
+
+/*
+ * Define the vendor/device IDs for the various bridges--should be added to
+ * <linux/pci_ids.h>
+ */
+#define MPC10X_BRIDGE_106       ((PCI_DEVICE_ID_MOTOROLA_MPC106 << 16) |  \
+                                  PCI_VENDOR_ID_MOTOROLA)
+#define MPC10X_BRIDGE_8240      ((0x0003 << 16) | PCI_VENDOR_ID_MOTOROLA)
+#define MPC10X_BRIDGE_107       ((0x0004 << 16) | PCI_VENDOR_ID_MOTOROLA)
+#define MPC10X_BRIDGE_8245      ((0x0006 << 16) | PCI_VENDOR_ID_MOTOROLA)
+
+/* Define the type of map to use */
+#define MPC10X_MEM_MAP_A                1
+#define MPC10X_MEM_MAP_B                2
+
+/* Map A (PReP Map) Defines */
+#define MPC10X_MAPA_CNFG_ADDR           0x80000cf8
+#define MPC10X_MAPA_CNFG_DATA           0x80000cfc
+
+#define MPC10X_MAPA_ISA_IO_BASE         0x80000000
+#define MPC10X_MAPA_ISA_MEM_BASE        0xc0000000
+#define MPC10X_MAPA_DRAM_OFFSET         0x80000000
+
+#define MPC10X_MAPA_PCI_INTACK_ADDR     0xbffffff0
+#define MPC10X_MAPA_PCI_IO_START        0x00000000
+#define MPC10X_MAPA_PCI_IO_END         (0x00800000 - 1)
+#define MPC10X_MAPA_PCI_MEM_START       0x00000000
+#define MPC10X_MAPA_PCI_MEM_END        (0x20000000 - 1)
+
+#define MPC10X_MAPA_PCI_MEM_OFFSET      (MPC10X_MAPA_ISA_MEM_BASE -     \
+                                         MPC10X_MAPA_PCI_MEM_START)
+
+/* Map B (CHRP Map) Defines */
+#define MPC10X_MAPB_CNFG_ADDR           0xfec00000
+#define MPC10X_MAPB_CNFG_DATA           0xfee00000
+
+#define MPC10X_MAPB_ISA_IO_BASE         0xfe000000
+#define MPC10X_MAPB_ISA_MEM_BASE        0x80000000
+#define MPC10X_MAPB_DRAM_OFFSET         0x00000000
+
+#define MPC10X_MAPB_PCI_INTACK_ADDR     0xfef00000
+#define MPC10X_MAPB_PCI_IO_START        0x00000000
+#define MPC10X_MAPB_PCI_IO_END         (0x00c00000 - 1)
+#define MPC10X_MAPB_PCI_MEM_START       0x80000000
+#define MPC10X_MAPB_PCI_MEM_END        (0xc0000000 - 1)
+
+#define MPC10X_MAPB_PCI_MEM_OFFSET      (MPC10X_MAPB_ISA_MEM_BASE -     \
+                                         MPC10X_MAPB_PCI_MEM_START)
+
+/* Set hose members to values appropriate for the mem map used */
+#define MPC10X_SETUP_HOSE(hose, map) {                                  \
+        (hose)->pci_mem_offset = MPC10X_MAP##map##_PCI_MEM_OFFSET;      \
+        (hose)->io_space.start = MPC10X_MAP##map##_PCI_IO_START;        \
+        (hose)->io_space.end = MPC10X_MAP##map##_PCI_IO_END;            \
+        (hose)->mem_space.start = MPC10X_MAP##map##_PCI_MEM_START;      \
+        (hose)->mem_space.end = MPC10X_MAP##map##_PCI_MEM_END;          \
+        (hose)->io_base_virt = (void *)MPC10X_MAP##map##_ISA_IO_BASE;   \
+}
+
+
+/* Miscellaneous Configuration register offsets */
+#define MPC10X_CFG_PIR_REG              0x09
+#define MPC10X_CFG_PIR_HOST_BRIDGE      0x00
+#define MPC10X_CFG_PIR_AGENT            0x01
+
+#define MPC10X_CFG_EUMBBAR              0x78
+
+#define MPC10X_CFG_PICR1_REG            0xa8
+#define MPC10X_CFG_PICR1_ADDR_MAP_MASK  0x00010000
+#define MPC10X_CFG_PICR1_ADDR_MAP_A     0x00010000
+#define MPC10X_CFG_PICR1_ADDR_MAP_B     0x00000000
+#define MPC10X_CFG_PICR1_SPEC_PCI_RD    0x00000004
+#define MPC10X_CFG_PICR1_ST_GATH_EN     0x00000040
+
+#define MPC10X_CFG_PICR2_REG            0xac
+#define MPC10X_CFG_PICR2_COPYBACK_OPT   0x00000001
+
+#define MPC10X_CFG_MAPB_OPTIONS_REG     0xe0
+#define MPC10X_CFG_MAPB_OPTIONS_CFAE    0x80    /* CPU_FD_ALIAS_EN */
+#define MPC10X_CFG_MAPB_OPTIONS_PFAE    0x40    /* PCI_FD_ALIAS_EN */
+#define MPC10X_CFG_MAPB_OPTIONS_DR      0x20    /* DLL_RESET */
+#define MPC10X_CFG_MAPB_OPTIONS_PCICH   0x08    /* PCI_COMPATIBILITY_HOLE */
+#define MPC10X_CFG_MAPB_OPTIONS_PROCCH  0x04    /* PROC_COMPATIBILITY_HOLE */
+
+/* Define offsets for the memory controller registers in the config space */
+#define MPC10X_MCTLR_MEM_START_1        0x80    /* Banks 0-3 */
+#define MPC10X_MCTLR_MEM_START_2        0x84    /* Banks 4-7 */
+#define MPC10X_MCTLR_EXT_MEM_START_1    0x88    /* Banks 0-3 */
+#define MPC10X_MCTLR_EXT_MEM_START_2    0x8c    /* Banks 4-7 */
+
+#define MPC10X_MCTLR_MEM_END_1          0x90    /* Banks 0-3 */
+#define MPC10X_MCTLR_MEM_END_2          0x94    /* Banks 4-7 */
+#define MPC10X_MCTLR_EXT_MEM_END_1      0x98    /* Banks 0-3 */
+#define MPC10X_MCTLR_EXT_MEM_END_2      0x9c    /* Banks 4-7 */
+
+#define MPC10X_MCTLR_MEM_BANK_ENABLES   0xa0
+
+/* Define some offset in the EUMB */
+#define MPC10X_EUMB_SIZE                0x00100000 /* Total EUMB size (1MB) */
+
+#define MPC10X_EUMB_MU_OFFSET           0x00000000 /* Msg Unit reg offset */
+#define MPC10X_EUMB_MU_SIZE             0x00001000 /* Msg Unit reg size */
+#define MPC10X_EUMB_DMA_OFFSET          0x00001000 /* DMA Unit reg offset */
+#define MPC10X_EUMB_DMA_SIZE            0x00001000 /* DMA Unit reg size  */
+#define MPC10X_EUMB_ATU_OFFSET          0x00002000 /* Addr xlate reg offset */
+#define MPC10X_EUMB_ATU_SIZE            0x00001000 /* Addr xlate reg size  */
+#define MPC10X_EUMB_I2C_OFFSET          0x00003000 /* I2C Unit reg offset */
+#define MPC10X_EUMB_I2C_SIZE            0x00001000 /* I2C Unit reg size  */
+#define MPC10X_EUMB_DUART_OFFSET        0x00004000 /* DUART Unit reg offset (8245) */
+#define MPC10X_EUMB_DUART_SIZE          0x00001000 /* DUART Unit reg size (8245) */
+#define MPC10X_EUMB_EPIC_OFFSET         0x00040000 /* EPIC offset in EUMB */
+#define MPC10X_EUMB_EPIC_SIZE           0x00030000 /* EPIC size */
+#define MPC10X_EUMB_PM_OFFSET           0x000fe000 /* Performance Monitor reg offset (8245) */
+#define MPC10X_EUMB_PM_SIZE             0x00001000 /* Performance Monitor reg size (8245) */
+#define MPC10X_EUMB_WP_OFFSET           0x000ff000 /* Data path diagnostic, watchpoint reg offset */
+#define MPC10X_EUMB_WP_SIZE             0x00001000 /* Data path diagnostic, watchpoint reg size */
+
+/*
+ * Define some recommended places to put the EUMB regs.
+ * For both maps, recommend putting the EUMB from 0xeff00000 to 0xefffffff.
+ */
+extern unsigned long                    ioremap_base;
+#define MPC10X_MAPA_EUMB_BASE           (ioremap_base - MPC10X_EUMB_SIZE)
+#define MPC10X_MAPB_EUMB_BASE           MPC10X_MAPA_EUMB_BASE
+
+enum ppc_sys_devices {
+        MPC10X_IIC1,
+        MPC10X_DMA0,
+        MPC10X_DMA1,
+        MPC10X_UART0,
+        MPC10X_UART1,
+        NUM_PPC_SYS_DEVS,
+};
+
+int mpc10x_bridge_init(struct pci_controller *hose,
+                       uint current_map,
+                       uint new_map,
+                       uint phys_eumb_base);
+unsigned long mpc10x_get_mem_size(uint mem_map);
+int mpc10x_enable_store_gathering(struct pci_controller *hose);
+int mpc10x_disable_store_gathering(struct pci_controller *hose);
+
+/* For MPC107 boards that use the built-in openpic */
+void mpc10x_set_openpic(void);
+
+#endif  /* __PPC_KERNEL_MPC10X_H */
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index 1e3cc69487b5..a2c04b9d42b1 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -40,7 +40,6 @@
 #include <asm/pci-bridge.h>
 #include <asm/reg.h>
 #include <mm/mmu_decl.h>
-#include "mpc7448_hpc2.h"
 #include <asm/tsi108_pci.h>
 #include <asm/tsi108_irq.h>
 #include <asm/mpic.h>
@@ -75,7 +74,7 @@ static void __init mpc7448_hpc2_setup_arch(void)
 
         /* setup PCI host bridge */
 #ifdef CONFIG_PCI
-        for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+        for_each_compatible_node(np, "pci", "tsi108-pci")
                 tsi108_setup_pci(np, MPC7448HPC2_PCI_CFG_PHYS, 0);
 
         ppc_md.pci_exclude_device = mpc7448_hpc2_exclude_device;
@@ -91,7 +90,7 @@ static void __init mpc7448_hpc2_setup_arch(void)
 }
 
 /*
- * Interrupt setup and service.  Interrrupts on the mpc7448_hpc2 come
+ * Interrupt setup and service.  Interrupts on the mpc7448_hpc2 come
  * from the four external INT pins, PCI interrupts are routed via
  * PCI interrupt control registers, it generates internal IRQ23
  *
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h
deleted file mode 100644
index f7e0e0c7f8d8..000000000000
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * mpc7448_hpc2.h
- *
- * Definitions for Freescale MPC7448_HPC2 platform
- *
- * Author: Jacob Pan
- *         jacob.pan@freescale.com
- * Maintainer: Roy Zang <roy.zang@freescale.com>
- *
- * 2006 (c) Freescale Semiconductor, 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.
- */
-
-#ifndef __PPC_PLATFORMS_MPC7448_HPC2_H
-#define __PPC_PLATFORMS_MPC7448_HPC2_H
-
-#include <asm/ppcboot.h>
-
-#endif                          /* __PPC_PLATFORMS_MPC7448_HPC2_H */
diff --git a/arch/powerpc/platforms/embedded6xx/prpmc2800.c b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
index 53420951dc53..e484cac75095 100644
--- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
+++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
@@ -44,7 +44,6 @@ static void __init prpmc2800_setup_arch(void)
         struct device_node *np;
         phys_addr_t paddr;
         const unsigned int *reg;
-        const unsigned int *prop;
 
         /*
          * ioremap mpp and gpp registers in case they are later
@@ -62,12 +61,6 @@ static void __init prpmc2800_setup_arch(void)
         of_node_put(np);
         mv64x60_gpp_reg_base = ioremap(paddr, reg[1]);
 
-        np = of_find_node_by_type(NULL, "cpu");
-        prop = of_get_property(np, "clock-frequency", NULL);
-        if (prop)
-                loops_per_jiffy = *prop / HZ;
-        of_node_put(np);
-
 #ifdef CONFIG_PCI
         mv64x60_pci_init();
 #endif
@@ -158,6 +151,7 @@ define_machine(prpmc2800){
         .name                   = prpmc2800_platform_name,
         .probe                  = prpmc2800_probe,
         .setup_arch             = prpmc2800_setup_arch,
+        .init_early             = mv64x60_init_early,
         .show_cpuinfo           = prpmc2800_show_cpuinfo,
         .init_IRQ               = mv64x60_init_irq,
         .get_irq                = mv64x60_get_irq,
diff --git a/arch/powerpc/platforms/iseries/Makefile b/arch/powerpc/platforms/iseries/Makefile
index 13ac3015d91c..a65f1b44abf8 100644
--- a/arch/powerpc/platforms/iseries/Makefile
+++ b/arch/powerpc/platforms/iseries/Makefile
@@ -2,11 +2,12 @@ EXTRA_CFLAGS	+= -mno-minimal-toc
 
 extra-y += dt.o
 
+obj-y += exception.o
 obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o dt_mod.o mf.o lpevents.o \
         hvcall.o proc.o htab.o iommu.o misc.o irq.o
 obj-$(CONFIG_PCI) += pci.o vpdinfo.o
 obj-$(CONFIG_SMP) += smp.o
-obj-$(CONFIG_VIOPATH) += viopath.o
+obj-$(CONFIG_VIOPATH) += viopath.o vio.o
 obj-$(CONFIG_MODULES) += ksyms.o
 
 quiet_cmd_dt_strings = DT_STR  $@
diff --git a/arch/powerpc/platforms/iseries/dt.c b/arch/powerpc/platforms/iseries/dt.c
index 9e8a334a518a..4543c4bc3a56 100644
--- a/arch/powerpc/platforms/iseries/dt.c
+++ b/arch/powerpc/platforms/iseries/dt.c
@@ -72,8 +72,6 @@ static char __initdata device_type_cpu[] = "cpu";
 static char __initdata device_type_memory[] = "memory";
 static char __initdata device_type_serial[] = "serial";
 static char __initdata device_type_network[] = "network";
-static char __initdata device_type_block[] = "block";
-static char __initdata device_type_byte[] = "byte";
 static char __initdata device_type_pci[] = "pci";
 static char __initdata device_type_vdevice[] = "vdevice";
 static char __initdata device_type_vscsi[] = "vscsi";
@@ -375,21 +373,6 @@ static void __init dt_vdevices(struct iseries_flat_dt *dt)
 
                 dt_end_node(dt);
         }
-        reg += HVMAXARCHITECTEDVIRTUALLANS;
-
-        for (i = 0; i < HVMAXARCHITECTEDVIRTUALDISKS; i++)
-                dt_do_vdevice(dt, "viodasd", reg, i, device_type_block,
-                                "IBM,iSeries-viodasd", 1);
-        reg += HVMAXARCHITECTEDVIRTUALDISKS;
-
-        for (i = 0; i < HVMAXARCHITECTEDVIRTUALCDROMS; i++)
-                dt_do_vdevice(dt, "viocd", reg, i, device_type_block,
-                                "IBM,iSeries-viocd", 1);
-        reg += HVMAXARCHITECTEDVIRTUALCDROMS;
-
-        for (i = 0; i < HVMAXARCHITECTEDVIRTUALTAPES; i++)
-                dt_do_vdevice(dt, "viotape", reg, i, device_type_byte,
-                                "IBM,iSeries-viotape", 1);
 
         dt_end_node(dt);
 }
diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S
new file mode 100644
index 000000000000..5381038f0881
--- /dev/null
+++ b/arch/powerpc/platforms/iseries/exception.S
@@ -0,0 +1,251 @@
+/*
+ *  Low level routines for legacy iSeries support.
+ *
+ *  Extracted from head_64.S
+ *
+ *  PowerPC version
+ *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
+ *
+ *  Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP
+ *    Copyright (C) 1996 Cort Dougan <cort@cs.nmt.edu>
+ *  Adapted for Power Macintosh by Paul Mackerras.
+ *  Low-level exception handlers and MMU support
+ *  rewritten by Paul Mackerras.
+ *    Copyright (C) 1996 Paul Mackerras.
+ *
+ *  Adapted for 64bit PowerPC by Dave Engebretsen, Peter Bergner, and
+ *    Mike Corrigan {engebret|bergner|mikejc}@us.ibm.com
+ *
+ *  This file contains the low-level support and setup for the
+ *  PowerPC-64 platform, including trap and interrupt dispatch.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+
+#include <asm/reg.h>
+#include <asm/ppc_asm.h>
+#include <asm/asm-offsets.h>
+#include <asm/thread_info.h>
+#include <asm/ptrace.h>
+#include <asm/cputable.h>
+
+#include "exception.h"
+
+        .text
+
+        .globl system_reset_iSeries
+system_reset_iSeries:
+        mfspr   r13,SPRN_SPRG3          /* Get paca address */
+        mfmsr   r24
+        ori     r24,r24,MSR_RI
+        mtmsrd  r24                     /* RI on */
+        lhz     r24,PACAPACAINDEX(r13)  /* Get processor # */
+        cmpwi   0,r24,0                 /* Are we processor 0? */
+        bne     1f
+        b       .__start_initialization_iSeries /* Start up the first processor */
+1:      mfspr   r4,SPRN_CTRLF
+        li      r5,CTRL_RUNLATCH        /* Turn off the run light */
+        andc    r4,r4,r5
+        mtspr   SPRN_CTRLT,r4
+
+1:
+        HMT_LOW
+#ifdef CONFIG_SMP
+        lbz     r23,PACAPROCSTART(r13)  /* Test if this processor
+                                         * should start */
+        sync
+        LOAD_REG_IMMEDIATE(r3,current_set)
+        sldi    r28,r24,3               /* get current_set[cpu#] */
+        ldx     r3,r3,r28
+        addi    r1,r3,THREAD_SIZE
+        subi    r1,r1,STACK_FRAME_OVERHEAD
+
+        cmpwi   0,r23,0
+        beq     iSeries_secondary_smp_loop      /* Loop until told to go */
+        b       __secondary_start               /* Loop until told to go */
+iSeries_secondary_smp_loop:
+        /* Let the Hypervisor know we are alive */
+        /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
+        lis     r3,0x8002
+        rldicr  r3,r3,32,15             /* r0 = (r3 << 32) & 0xffff000000000000 */
+#else /* CONFIG_SMP */
+        /* Yield the processor.  This is required for non-SMP kernels
+                which are running on multi-threaded machines. */
+        lis     r3,0x8000
+        rldicr  r3,r3,32,15             /* r3 = (r3 << 32) & 0xffff000000000000 */
+        addi    r3,r3,18                /* r3 = 0x8000000000000012 which is "yield" */
+        li      r4,0                    /* "yield timed" */
+        li      r5,-1                   /* "yield forever" */
+#endif /* CONFIG_SMP */
+        li      r0,-1                   /* r0=-1 indicates a Hypervisor call */
+        sc                              /* Invoke the hypervisor via a system call */
+        mfspr   r13,SPRN_SPRG3          /* Put r13 back ???? */
+        b       1b                      /* If SMP not configured, secondaries
+                                         * loop forever */
+
+/***  ISeries-LPAR interrupt handlers ***/
+
+        STD_EXCEPTION_ISERIES(machine_check, PACA_EXMC)
+
+        .globl data_access_iSeries
+data_access_iSeries:
+        mtspr   SPRN_SPRG1,r13
+BEGIN_FTR_SECTION
+        mtspr   SPRN_SPRG2,r12
+        mfspr   r13,SPRN_DAR
+        mfspr   r12,SPRN_DSISR
+        srdi    r13,r13,60
+        rlwimi  r13,r12,16,0x20
+        mfcr    r12
+        cmpwi   r13,0x2c
+        beq     .do_stab_bolted_iSeries
+        mtcrf   0x80,r12
+        mfspr   r12,SPRN_SPRG2
+END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
+        EXCEPTION_PROLOG_1(PACA_EXGEN)
+        EXCEPTION_PROLOG_ISERIES_1
+        b       data_access_common
+
+.do_stab_bolted_iSeries:
+        mtcrf   0x80,r12
+        mfspr   r12,SPRN_SPRG2
+        EXCEPTION_PROLOG_1(PACA_EXSLB)
+        EXCEPTION_PROLOG_ISERIES_1
+        b       .do_stab_bolted
+
+        .globl  data_access_slb_iSeries
+data_access_slb_iSeries:
+        mtspr   SPRN_SPRG1,r13          /* save r13 */
+        mfspr   r13,SPRN_SPRG3          /* get paca address into r13 */
+        std     r3,PACA_EXSLB+EX_R3(r13)
+        mfspr   r3,SPRN_DAR
+        std     r9,PACA_EXSLB+EX_R9(r13)
+        mfcr    r9
+#ifdef __DISABLED__
+        cmpdi   r3,0
+        bge     slb_miss_user_iseries
+#endif
+        std     r10,PACA_EXSLB+EX_R10(r13)
+        std     r11,PACA_EXSLB+EX_R11(r13)
+        std     r12,PACA_EXSLB+EX_R12(r13)
+        mfspr   r10,SPRN_SPRG1
+        std     r10,PACA_EXSLB+EX_R13(r13)
+        ld      r12,PACALPPACAPTR(r13)
+        ld      r12,LPPACASRR1(r12)
+        b       .slb_miss_realmode
+
+        STD_EXCEPTION_ISERIES(instruction_access, PACA_EXGEN)
+
+        .globl  instruction_access_slb_iSeries
+instruction_access_slb_iSeries:
+        mtspr   SPRN_SPRG1,r13          /* save r13 */
+        mfspr   r13,SPRN_SPRG3          /* get paca address into r13 */
+        std     r3,PACA_EXSLB+EX_R3(r13)
+        ld      r3,PACALPPACAPTR(r13)
+        ld      r3,LPPACASRR0(r3)       /* get SRR0 value */
+        std     r9,PACA_EXSLB+EX_R9(r13)
+        mfcr    r9
+#ifdef __DISABLED__
+        cmpdi   r3,0
+        bge     slb_miss_user_iseries
+#endif
+        std     r10,PACA_EXSLB+EX_R10(r13)
+        std     r11,PACA_EXSLB+EX_R11(r13)
+        std     r12,PACA_EXSLB+EX_R12(r13)
+        mfspr   r10,SPRN_SPRG1
+        std     r10,PACA_EXSLB+EX_R13(r13)
+        ld      r12,PACALPPACAPTR(r13)
+        ld      r12,LPPACASRR1(r12)
+        b       .slb_miss_realmode
+
+#ifdef __DISABLED__
+slb_miss_user_iseries:
+        std     r10,PACA_EXGEN+EX_R10(r13)
+        std     r11,PACA_EXGEN+EX_R11(r13)
+        std     r12,PACA_EXGEN+EX_R12(r13)
+        mfspr   r10,SPRG1
+        ld      r11,PACA_EXSLB+EX_R9(r13)
+        ld      r12,PACA_EXSLB+EX_R3(r13)
+        std     r10,PACA_EXGEN+EX_R13(r13)
+        std     r11,PACA_EXGEN+EX_R9(r13)
+        std     r12,PACA_EXGEN+EX_R3(r13)
+        EXCEPTION_PROLOG_ISERIES_1
+        b       slb_miss_user_common
+#endif
+
+        MASKABLE_EXCEPTION_ISERIES(hardware_interrupt)
+        STD_EXCEPTION_ISERIES(alignment, PACA_EXGEN)
+        STD_EXCEPTION_ISERIES(program_check, PACA_EXGEN)
+        STD_EXCEPTION_ISERIES(fp_unavailable, PACA_EXGEN)
+        MASKABLE_EXCEPTION_ISERIES(decrementer)
+        STD_EXCEPTION_ISERIES(trap_0a, PACA_EXGEN)
+        STD_EXCEPTION_ISERIES(trap_0b, PACA_EXGEN)
+
+        .globl  system_call_iSeries
+system_call_iSeries:
+        mr      r9,r13
+        mfspr   r13,SPRN_SPRG3
+        EXCEPTION_PROLOG_ISERIES_1
+        b       system_call_common
+
+        STD_EXCEPTION_ISERIES(single_step, PACA_EXGEN)
+        STD_EXCEPTION_ISERIES(trap_0e, PACA_EXGEN)
+        STD_EXCEPTION_ISERIES(performance_monitor, PACA_EXGEN)
+
+decrementer_iSeries_masked:
+        /* We may not have a valid TOC pointer in here. */
+        li      r11,1
+        ld      r12,PACALPPACAPTR(r13)
+        stb     r11,LPPACADECRINT(r12)
+        LOAD_REG_IMMEDIATE(r12, tb_ticks_per_jiffy)
+        lwz     r12,0(r12)
+        mtspr   SPRN_DEC,r12
+        /* fall through */
+
+hardware_interrupt_iSeries_masked:
+        mtcrf   0x80,r9         /* Restore regs */
+        ld      r12,PACALPPACAPTR(r13)
+        ld      r11,LPPACASRR0(r12)
+        ld      r12,LPPACASRR1(r12)
+        mtspr   SPRN_SRR0,r11
+        mtspr   SPRN_SRR1,r12
+        ld      r9,PACA_EXGEN+EX_R9(r13)
+        ld      r10,PACA_EXGEN+EX_R10(r13)
+        ld      r11,PACA_EXGEN+EX_R11(r13)
+        ld      r12,PACA_EXGEN+EX_R12(r13)
+        ld      r13,PACA_EXGEN+EX_R13(r13)
+        rfid
+        b       .       /* prevent speculative execution */
+
+_INIT_STATIC(__start_initialization_iSeries)
+        /* Clear out the BSS */
+        LOAD_REG_IMMEDIATE(r11,__bss_stop)
+        LOAD_REG_IMMEDIATE(r8,__bss_start)
+        sub     r11,r11,r8              /* bss size                     */
+        addi    r11,r11,7               /* round up to an even double word */
+        rldicl. r11,r11,61,3            /* shift right by 3             */
+        beq     4f
+        addi    r8,r8,-8
+        li      r0,0
+        mtctr   r11                     /* zero this many doublewords   */
+3:      stdu    r0,8(r8)
+        bdnz    3b
+4:
+        LOAD_REG_IMMEDIATE(r1,init_thread_union)
+        addi    r1,r1,THREAD_SIZE
+        li      r0,0
+        stdu    r0,-STACK_FRAME_OVERHEAD(r1)
+
+        LOAD_REG_IMMEDIATE(r2,__toc_start)
+        addi    r2,r2,0x4000
+        addi    r2,r2,0x4000
+
+        bl      .iSeries_early_setup
+        bl      .early_setup
+
+        /* relocation is on at this point */
+
+        b       .start_here_common
diff --git a/arch/powerpc/platforms/iseries/exception.h b/arch/powerpc/platforms/iseries/exception.h
new file mode 100644
index 000000000000..ced45a8fa1aa
--- /dev/null
+++ b/arch/powerpc/platforms/iseries/exception.h
@@ -0,0 +1,58 @@
+#ifndef _ASM_POWERPC_ISERIES_EXCEPTION_H
+#define _ASM_POWERPC_ISERIES_EXCEPTION_H
+/*
+ * Extracted from head_64.S
+ *
+ *  PowerPC version
+ *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
+ *
+ *  Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP
+ *    Copyright (C) 1996 Cort Dougan <cort@cs.nmt.edu>
+ *  Adapted for Power Macintosh by Paul Mackerras.
+ *  Low-level exception handlers and MMU support
+ *  rewritten by Paul Mackerras.
+ *    Copyright (C) 1996 Paul Mackerras.
+ *
+ *  Adapted for 64bit PowerPC by Dave Engebretsen, Peter Bergner, and
+ *    Mike Corrigan {engebret|bergner|mikejc}@us.ibm.com
+ *
+ *  This file contains the low-level support and setup for the
+ *  PowerPC-64 platform, including trap and interrupt dispatch.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+#include <asm/exception.h>
+
+#define EXCEPTION_PROLOG_ISERIES_1                                      \
+        mfmsr   r10;                                                    \
+        ld      r12,PACALPPACAPTR(r13);                                 \
+        ld      r11,LPPACASRR0(r12);                                    \
+        ld      r12,LPPACASRR1(r12);                                    \
+        ori     r10,r10,MSR_RI;                                         \
+        mtmsrd  r10,1
+
+#define STD_EXCEPTION_ISERIES(label, area)                              \
+        .globl label##_iSeries;                                         \
+label##_iSeries:                                                        \
+        HMT_MEDIUM;                                                     \
+        mtspr   SPRN_SPRG1,r13;         /* save r13 */                  \
+        EXCEPTION_PROLOG_1(area);                                       \
+        EXCEPTION_PROLOG_ISERIES_1;                                     \
+        b       label##_common
+
+#define MASKABLE_EXCEPTION_ISERIES(label)                               \
+        .globl label##_iSeries;                                         \
+label##_iSeries:                                                        \
+        HMT_MEDIUM;                                                     \
+        mtspr   SPRN_SPRG1,r13;         /* save r13 */                  \
+        EXCEPTION_PROLOG_1(PACA_EXGEN);                                 \
+        lbz     r10,PACASOFTIRQEN(r13);                                 \
+        cmpwi   0,r10,0;                                                \
+        beq-    label##_iSeries_masked;                                 \
+        EXCEPTION_PROLOG_ISERIES_1;                                     \
+        b       label##_common;                                         \
+
+#endif  /* _ASM_POWERPC_ISERIES_EXCEPTION_H */
diff --git a/arch/powerpc/platforms/iseries/htab.c b/arch/powerpc/platforms/iseries/htab.c
index b4e2c7a038e1..15a7097e5dd7 100644
--- a/arch/powerpc/platforms/iseries/htab.c
+++ b/arch/powerpc/platforms/iseries/htab.c
@@ -86,7 +86,8 @@ long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va,
         }
 
 
-        lhpte.v = hpte_encode_v(va, MMU_PAGE_4K) | vflags | HPTE_V_VALID;
+        lhpte.v = hpte_encode_v(va, MMU_PAGE_4K, MMU_SEGSIZE_256M) |
+                vflags | HPTE_V_VALID;
         lhpte.r = hpte_encode_r(phys_to_abs(pa), MMU_PAGE_4K) | rflags;
 
         /* Now fill in the actual HPTE */
@@ -142,7 +143,7 @@ static long iSeries_hpte_remove(unsigned long hpte_group)
  *      bits 61..63 : PP2,PP1,PP0
  */
 static long iSeries_hpte_updatepp(unsigned long slot, unsigned long newpp,
-                                  unsigned long va, int psize, int local)
+                        unsigned long va, int psize, int ssize, int local)
 {
         struct hash_pte hpte;
         unsigned long want_v;
@@ -150,7 +151,7 @@ static long iSeries_hpte_updatepp(unsigned long slot, unsigned long newpp,
         iSeries_hlock(slot);
 
         HvCallHpt_get(&hpte, slot);
-        want_v = hpte_encode_v(va, MMU_PAGE_4K);
+        want_v = hpte_encode_v(va, MMU_PAGE_4K, MMU_SEGSIZE_256M);
 
         if (HPTE_V_COMPARE(hpte.v, want_v) && (hpte.v & HPTE_V_VALID)) {
                 /*
@@ -205,14 +206,14 @@ static long iSeries_hpte_find(unsigned long vpn)
  * No need to lock here because we should be the only user.
  */
 static void iSeries_hpte_updateboltedpp(unsigned long newpp, unsigned long ea,
-                                        int psize)
+                                        int psize, int ssize)
 {
         unsigned long vsid,va,vpn;
         long slot;
 
         BUG_ON(psize != MMU_PAGE_4K);
 
-        vsid = get_kernel_vsid(ea);
+        vsid = get_kernel_vsid(ea, MMU_SEGSIZE_256M);
         va = (vsid << 28) | (ea & 0x0fffffff);
         vpn = va >> HW_PAGE_SHIFT;
         slot = iSeries_hpte_find(vpn);
@@ -222,7 +223,7 @@ static void iSeries_hpte_updateboltedpp(unsigned long newpp, unsigned long ea,
 }
 
 static void iSeries_hpte_invalidate(unsigned long slot, unsigned long va,
-                                    int psize, int local)
+                                    int psize, int ssize, int local)
 {
         unsigned long hpte_v;
         unsigned long avpn = va >> 23;
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
index 3b6a9666c2c0..49e9c664ea89 100644
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
@@ -28,14 +28,17 @@
 #include <linux/dma-mapping.h>
 #include <linux/list.h>
 #include <linux/pci.h>
+#include <linux/module.h>
 
 #include <asm/iommu.h>
+#include <asm/vio.h>
 #include <asm/tce.h>
 #include <asm/machdep.h>
 #include <asm/abs_addr.h>
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #include <asm/iseries/hv_call_xm.h>
+#include <asm/iseries/hv_call_event.h>
 #include <asm/iseries/iommu.h>
 
 static void tce_build_iSeries(struct iommu_table *tbl, long index, long npages,
@@ -189,6 +192,55 @@ void iommu_devnode_init_iSeries(struct pci_dev *pdev, struct device_node *dn)
 }
 #endif
 
+static struct iommu_table veth_iommu_table;
+static struct iommu_table vio_iommu_table;
+
+void *iseries_hv_alloc(size_t size, dma_addr_t *dma_handle, gfp_t flag)
+{
+        return iommu_alloc_coherent(&vio_iommu_table, size, dma_handle,
+                                DMA_32BIT_MASK, flag, -1);
+}
+EXPORT_SYMBOL_GPL(iseries_hv_alloc);
+
+void iseries_hv_free(size_t size, void *vaddr, dma_addr_t dma_handle)
+{
+        iommu_free_coherent(&vio_iommu_table, size, vaddr, dma_handle);
+}
+EXPORT_SYMBOL_GPL(iseries_hv_free);
+
+dma_addr_t iseries_hv_map(void *vaddr, size_t size,
+                        enum dma_data_direction direction)
+{
+        return iommu_map_single(&vio_iommu_table, vaddr, size,
+                                DMA_32BIT_MASK, direction);
+}
+
+void iseries_hv_unmap(dma_addr_t dma_handle, size_t size,
+                        enum dma_data_direction direction)
+{
+        iommu_unmap_single(&vio_iommu_table, dma_handle, size, direction);
+}
+
+void __init iommu_vio_init(void)
+{
+        iommu_table_getparms_iSeries(255, 0, 0xff, &veth_iommu_table);
+        veth_iommu_table.it_size /= 2;
+        vio_iommu_table = veth_iommu_table;
+        vio_iommu_table.it_offset += veth_iommu_table.it_size;
+
+        if (!iommu_init_table(&veth_iommu_table, -1))
+                printk("Virtual Bus VETH TCE table failed.\n");
+        if (!iommu_init_table(&vio_iommu_table, -1))
+                printk("Virtual Bus VIO TCE table failed.\n");
+}
+
+struct iommu_table *vio_build_iommu_table_iseries(struct vio_dev *dev)
+{
+        if (strcmp(dev->type, "network") == 0)
+                return &veth_iommu_table;
+        return &vio_iommu_table;
+}
+
 void iommu_init_early_iSeries(void)
 {
         ppc_md.tce_build = tce_build_iSeries;
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 63b33675848b..701d9297c207 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -346,8 +346,15 @@ static int iseries_irq_host_map(struct irq_host *h, unsigned int virq,
         return 0;
 }
 
+static int iseries_irq_host_match(struct irq_host *h, struct device_node *np)
+{
+        /* Match all */
+        return 1;
+}
+
 static struct irq_host_ops iseries_irq_host_ops = {
         .map = iseries_irq_host_map,
+        .match = iseries_irq_host_match,
 };
 
 /*
@@ -369,7 +376,8 @@ void __init iSeries_init_IRQ(void)
         /* Create irq host. No need for a revmap since HV will give us
          * back our virtual irq number
          */
-        host = irq_alloc_host(IRQ_HOST_MAP_NOMAP, 0, &iseries_irq_host_ops, 0);
+        host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0,
+                              &iseries_irq_host_ops, 0);
         BUG_ON(host == NULL);
         irq_set_default_host(host);
 
diff --git a/arch/powerpc/platforms/iseries/it_lp_naca.h b/arch/powerpc/platforms/iseries/it_lp_naca.h
index 9bbf58986819..cf6dcf6ef07b 100644
--- a/arch/powerpc/platforms/iseries/it_lp_naca.h
+++ b/arch/powerpc/platforms/iseries/it_lp_naca.h
@@ -60,7 +60,7 @@ struct ItLpNaca {
         u8      xRsvd2_0[128];          // Reserved                     x00-x7F
 
 // CACHE_LINE_3-6 0x0100 - 0x02FF Contains LP Queue indicators
-// NB: Padding required to keep xInterrruptHdlr at x300 which is required
+// NB: Padding required to keep xInterruptHdlr at x300 which is required
 // for v4r4 PLIC.
         u8      xOldLpQueue[128];       // LP Queue needed for v4r4     100-17F
         u8      xRsvd3_0[384];          // Reserved                     180-2FF
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index b1187d95e3b2..c0f2433bc16e 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -39,9 +39,9 @@
 #include <asm/paca.h>
 #include <asm/abs_addr.h>
 #include <asm/firmware.h>
-#include <asm/iseries/vio.h>
 #include <asm/iseries/mf.h>
 #include <asm/iseries/hv_lp_config.h>
+#include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/it_lp_queue.h>
 
 #include "setup.h"
@@ -870,8 +870,7 @@ static int proc_mf_dump_cmdline(char *page, char **start, off_t off,
         if ((off + count) > 256)
                 count = 256 - off;
 
-        dma_addr = dma_map_single(iSeries_vio_dev, page, off + count,
-                        DMA_FROM_DEVICE);
+        dma_addr = iseries_hv_map(page, off + count, DMA_FROM_DEVICE);
         if (dma_mapping_error(dma_addr))
                 return -ENOMEM;
         memset(page, 0, off + count);
@@ -883,8 +882,7 @@ static int proc_mf_dump_cmdline(char *page, char **start, off_t off,
         vsp_cmd.sub_data.kern.length = off + count;
         mb();
         rc = signal_vsp_instruction(&vsp_cmd);
-        dma_unmap_single(iSeries_vio_dev, dma_addr, off + count,
-                        DMA_FROM_DEVICE);
+        iseries_hv_unmap(dma_addr, off + count, DMA_FROM_DEVICE);
         if (rc)
                 return rc;
         if (vsp_cmd.result_code != 0)
@@ -919,8 +917,7 @@ static int mf_getVmlinuxChunk(char *buffer, int *size, int offset, u64 side)
         int len = *size;
         dma_addr_t dma_addr;
 
-        dma_addr = dma_map_single(iSeries_vio_dev, buffer, len,
-                        DMA_FROM_DEVICE);
+        dma_addr = iseries_hv_map(buffer, len, DMA_FROM_DEVICE);
         memset(buffer, 0, len);
         memset(&vsp_cmd, 0, sizeof(vsp_cmd));
         vsp_cmd.cmd = 32;
@@ -938,7 +935,7 @@ static int mf_getVmlinuxChunk(char *buffer, int *size, int offset, u64 side)
                         rc = -ENOMEM;
         }
 
-        dma_unmap_single(iSeries_vio_dev, dma_addr, len, DMA_FROM_DEVICE);
+        iseries_hv_unmap(dma_addr, len, DMA_FROM_DEVICE);
 
         return rc;
 }
@@ -1149,8 +1146,7 @@ static int proc_mf_change_cmdline(struct file *file, const char __user *buffer,
                 goto out;
 
         dma_addr = 0;
-        page = dma_alloc_coherent(iSeries_vio_dev, count, &dma_addr,
-                        GFP_ATOMIC);
+        page = iseries_hv_alloc(count, &dma_addr, GFP_ATOMIC);
         ret = -ENOMEM;
         if (page == NULL)
                 goto out;
@@ -1170,7 +1166,7 @@ static int proc_mf_change_cmdline(struct file *file, const char __user *buffer,
         ret = count;
 
 out_free:
-        dma_free_coherent(iSeries_vio_dev, count, page, dma_addr);
+        iseries_hv_free(count, page, dma_addr);
 out:
         return ret;
 }
@@ -1190,8 +1186,7 @@ static ssize_t proc_mf_change_vmlinux(struct file *file,
                 goto out;
 
         dma_addr = 0;
-        page = dma_alloc_coherent(iSeries_vio_dev, count, &dma_addr,
-                        GFP_ATOMIC);
+        page = iseries_hv_alloc(count, &dma_addr, GFP_ATOMIC);
         rc = -ENOMEM;
         if (page == NULL) {
                 printk(KERN_ERR "mf.c: couldn't allocate memory to set vmlinux chunk\n");
@@ -1219,7 +1214,7 @@ static ssize_t proc_mf_change_vmlinux(struct file *file,
         *ppos += count;
         rc = count;
 out_free:
-        dma_free_coherent(iSeries_vio_dev, count, page, dma_addr);
+        iseries_hv_free(count, page, dma_addr);
 out:
         return rc;
 }
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 13a8b1908ded..37ae07ee54a9 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -26,6 +26,8 @@
 #include <linux/major.h>
 #include <linux/root_dev.h>
 #include <linux/kernel.h>
+#include <linux/hrtimer.h>
+#include <linux/tick.h>
 
 #include <asm/processor.h>
 #include <asm/machdep.h>
@@ -41,7 +43,6 @@
 #include <asm/time.h>
 #include <asm/paca.h>
 #include <asm/cache.h>
-#include <asm/sections.h>
 #include <asm/abs_addr.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/hv_call_event.h>
@@ -562,6 +563,7 @@ static void yield_shared_processor(void)
 static void iseries_shared_idle(void)
 {
         while (1) {
+                tick_nohz_stop_sched_tick();
                 while (!need_resched() && !hvlpevent_is_pending()) {
                         local_irq_disable();
                         ppc64_runlatch_off();
@@ -575,6 +577,7 @@ static void iseries_shared_idle(void)
                 }
 
                 ppc64_runlatch_on();
+                tick_nohz_restart_sched_tick();
 
                 if (hvlpevent_is_pending())
                         process_iSeries_events();
@@ -590,6 +593,7 @@ static void iseries_dedicated_idle(void)
         set_thread_flag(TIF_POLLING_NRFLAG);
 
         while (1) {
+                tick_nohz_stop_sched_tick();
                 if (!need_resched()) {
                         while (!need_resched()) {
                                 ppc64_runlatch_off();
@@ -606,6 +610,7 @@ static void iseries_dedicated_idle(void)
                 }
 
                 ppc64_runlatch_on();
+                tick_nohz_restart_sched_tick();
                 preempt_enable_no_resched();
                 schedule();
                 preempt_disable();
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c
new file mode 100644
index 000000000000..910b00b4703e
--- /dev/null
+++ b/arch/powerpc/platforms/iseries/vio.c
@@ -0,0 +1,553 @@
+/*
+ * Legacy iSeries specific vio initialisation
+ * that needs to be built in (not a module).
+ *
+ * © Copyright 2007 IBM Corporation
+ *      Author: Stephen Rothwell
+ *      Some parts collected from various other files
+ *
+ * This program is free software;  you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/of.h>
+#include <linux/init.h>
+#include <linux/gfp.h>
+#include <linux/completion.h>
+#include <linux/proc_fs.h>
+#include <linux/module.h>
+
+#include <asm/firmware.h>
+#include <asm/vio.h>
+#include <asm/iseries/vio.h>
+#include <asm/iseries/iommu.h>
+#include <asm/iseries/hv_types.h>
+#include <asm/iseries/hv_lp_event.h>
+
+#define FIRST_VTY       0
+#define NUM_VTYS        1
+#define FIRST_VSCSI     (FIRST_VTY + NUM_VTYS)
+#define NUM_VSCSIS      1
+#define FIRST_VLAN      (FIRST_VSCSI + NUM_VSCSIS)
+#define NUM_VLANS       HVMAXARCHITECTEDVIRTUALLANS
+#define FIRST_VIODASD   (FIRST_VLAN + NUM_VLANS)
+#define NUM_VIODASDS    HVMAXARCHITECTEDVIRTUALDISKS
+#define FIRST_VIOCD     (FIRST_VIODASD + NUM_VIODASDS)
+#define NUM_VIOCDS      HVMAXARCHITECTEDVIRTUALCDROMS
+#define FIRST_VIOTAPE   (FIRST_VIOCD + NUM_VIOCDS)
+#define NUM_VIOTAPES    HVMAXARCHITECTEDVIRTUALTAPES
+
+struct vio_waitevent {
+        struct completion       com;
+        int                     rc;
+        u16                     sub_result;
+};
+
+struct vio_resource {
+        char    rsrcname[10];
+        char    type[4];
+        char    model[3];
+};
+
+static struct property *new_property(const char *name, int length,
+                const void *value)
+{
+        struct property *np = kzalloc(sizeof(*np) + strlen(name) + 1 + length,
+                        GFP_KERNEL);
+
+        if (!np)
+                return NULL;
+        np->name = (char *)(np + 1);
+        np->value = np->name + strlen(name) + 1;
+        strcpy(np->name, name);
+        memcpy(np->value, value, length);
+        np->length = length;
+        return np;
+}
+
+static void __init free_property(struct property *np)
+{
+        kfree(np);
+}
+
+static struct device_node *new_node(const char *path,
+                struct device_node *parent)
+{
+        struct device_node *np = kzalloc(sizeof(*np), GFP_KERNEL);
+
+        if (!np)
+                return NULL;
+        np->full_name = kmalloc(strlen(path) + 1, GFP_KERNEL);
+        if (!np->full_name) {
+                kfree(np);
+                return NULL;
+        }
+        strcpy(np->full_name, path);
+        of_node_set_flag(np, OF_DYNAMIC);
+        kref_init(&np->kref);
+        np->parent = of_node_get(parent);
+        return np;
+}
+
+static void free_node(struct device_node *np)
+{
+        struct property *next;
+        struct property *prop;
+
+        next = np->properties;
+        while (next) {
+                prop = next;
+                next = prop->next;
+                free_property(prop);
+        }
+        of_node_put(np->parent);
+        kfree(np->full_name);
+        kfree(np);
+}
+
+static int add_string_property(struct device_node *np, const char *name,
+                const char *value)
+{
+        struct property *nprop = new_property(name, strlen(value) + 1, value);
+
+        if (!nprop)
+                return 0;
+        prom_add_property(np, nprop);
+        return 1;
+}
+
+static int add_raw_property(struct device_node *np, const char *name,
+                int length, const void *value)
+{
+        struct property *nprop = new_property(name, length, value);
+
+        if (!nprop)
+                return 0;
+        prom_add_property(np, nprop);
+        return 1;
+}
+
+static struct device_node *do_device_node(struct device_node *parent,
+                const char *name, u32 reg, u32 unit, const char *type,
+                const char *compat, struct vio_resource *res)
+{
+        struct device_node *np;
+        char path[32];
+
+        snprintf(path, sizeof(path), "/vdevice/%s@%08x", name, reg);
+        np = new_node(path, parent);
+        if (!np)
+                return NULL;
+        if (!add_string_property(np, "name", name) ||
+                !add_string_property(np, "device_type", type) ||
+                !add_string_property(np, "compatible", compat) ||
+                !add_raw_property(np, "reg", sizeof(reg), &reg) ||
+                !add_raw_property(np, "linux,unit_address",
+                        sizeof(unit), &unit)) {
+                goto node_free;
+        }
+        if (res) {
+                if (!add_raw_property(np, "linux,vio_rsrcname",
+                                sizeof(res->rsrcname), res->rsrcname) ||
+                        !add_raw_property(np, "linux,vio_type",
+                                sizeof(res->type), res->type) ||
+                        !add_raw_property(np, "linux,vio_model",
+                                sizeof(res->model), res->model))
+                        goto node_free;
+        }
+        np->name = of_get_property(np, "name", NULL);
+        np->type = of_get_property(np, "device_type", NULL);
+        of_attach_node(np);
+#ifdef CONFIG_PROC_DEVICETREE
+        if (parent->pde) {
+                struct proc_dir_entry *ent;
+
+                ent = proc_mkdir(strrchr(np->full_name, '/') + 1, parent->pde);
+                if (ent)
+                        proc_device_tree_add_node(np, ent);
+        }
+#endif
+        return np;
+
+ node_free:
+        free_node(np);
+        return NULL;
+}
+
+/*
+ * This is here so that we can dynamically add viodasd
+ * devices without exposing all the above infrastructure.
+ */
+struct vio_dev *vio_create_viodasd(u32 unit)
+{
+        struct device_node *vio_root;
+        struct device_node *np;
+        struct vio_dev *vdev = NULL;
+
+        vio_root = of_find_node_by_path("/vdevice");
+        if (!vio_root)
+                return NULL;
+        np = do_device_node(vio_root, "viodasd", FIRST_VIODASD + unit, unit,
+                        "block", "IBM,iSeries-viodasd", NULL);
+        of_node_put(vio_root);
+        if (np) {
+                vdev = vio_register_device_node(np);
+                if (!vdev)
+                        free_node(np);
+        }
+        return vdev;
+}
+EXPORT_SYMBOL_GPL(vio_create_viodasd);
+
+static void __init handle_block_event(struct HvLpEvent *event)
+{
+        struct vioblocklpevent *bevent = (struct vioblocklpevent *)event;
+        struct vio_waitevent *pwe;
+
+        if (event == NULL)
+                /* Notification that a partition went away! */
+                return;
+        /* First, we should NEVER get an int here...only acks */
+        if (hvlpevent_is_int(event)) {
+                printk(KERN_WARNING "handle_viod_request: "
+                       "Yikes! got an int in viodasd event handler!\n");
+                if (hvlpevent_need_ack(event)) {
+                        event->xRc = HvLpEvent_Rc_InvalidSubtype;
+                        HvCallEvent_ackLpEvent(event);
+                }
+                return;
+        }
+
+        switch (event->xSubtype & VIOMINOR_SUBTYPE_MASK) {
+        case vioblockopen:
+                /*
+                 * Handle a response to an open request.  We get all the
+                 * disk information in the response, so update it.  The
+                 * correlation token contains a pointer to a waitevent
+                 * structure that has a completion in it.  update the
+                 * return code in the waitevent structure and post the
+                 * completion to wake up the guy who sent the request
+                 */
+                pwe = (struct vio_waitevent *)event->xCorrelationToken;
+                pwe->rc = event->xRc;
+                pwe->sub_result = bevent->sub_result;
+                complete(&pwe->com);
+                break;
+        case vioblockclose:
+                break;
+        default:
+                printk(KERN_WARNING "handle_viod_request: unexpected subtype!");
+                if (hvlpevent_need_ack(event)) {
+                        event->xRc = HvLpEvent_Rc_InvalidSubtype;
+                        HvCallEvent_ackLpEvent(event);
+                }
+        }
+}
+
+static void __init probe_disk(struct device_node *vio_root, u32 unit)
+{
+        HvLpEvent_Rc hvrc;
+        struct vio_waitevent we;
+        u16 flags = 0;
+
+retry:
+        init_completion(&we.com);
+
+        /* Send the open event to OS/400 */
+        hvrc = HvCallEvent_signalLpEventFast(viopath_hostLp,
+                        HvLpEvent_Type_VirtualIo,
+                        viomajorsubtype_blockio | vioblockopen,
+                        HvLpEvent_AckInd_DoAck, HvLpEvent_AckType_ImmediateAck,
+                        viopath_sourceinst(viopath_hostLp),
+                        viopath_targetinst(viopath_hostLp),
+                        (u64)(unsigned long)&we, VIOVERSION << 16,
+                        ((u64)unit << 48) | ((u64)flags<< 32),
+                        0, 0, 0);
+        if (hvrc != 0) {
+                printk(KERN_WARNING "probe_disk: bad rc on HV open %d\n",
+                        (int)hvrc);
+                return;
+        }
+
+        wait_for_completion(&we.com);
+
+        if (we.rc != 0) {
+                if (flags != 0)
+                        return;
+                /* try again with read only flag set */
+                flags = vioblockflags_ro;
+                goto retry;
+        }
+
+        /* Send the close event to OS/400.  We DON'T expect a response */
+        hvrc = HvCallEvent_signalLpEventFast(viopath_hostLp,
+                        HvLpEvent_Type_VirtualIo,
+                        viomajorsubtype_blockio | vioblockclose,
+                        HvLpEvent_AckInd_NoAck, HvLpEvent_AckType_ImmediateAck,
+                        viopath_sourceinst(viopath_hostLp),
+                        viopath_targetinst(viopath_hostLp),
+                        0, VIOVERSION << 16,
+                        ((u64)unit << 48) | ((u64)flags << 32),
+                        0, 0, 0);
+        if (hvrc != 0) {
+                printk(KERN_WARNING "probe_disk: "
+                       "bad rc sending event to OS/400 %d\n", (int)hvrc);
+                return;
+        }
+
+        do_device_node(vio_root, "viodasd", FIRST_VIODASD + unit, unit,
+                        "block", "IBM,iSeries-viodasd", NULL);
+}
+
+static void __init get_viodasd_info(struct device_node *vio_root)
+{
+        int rc;
+        u32 unit;
+
+        rc = viopath_open(viopath_hostLp, viomajorsubtype_blockio, 2);
+        if (rc) {
+                printk(KERN_WARNING "get_viodasd_info: "
+                       "error opening path to host partition %d\n",
+                       viopath_hostLp);
+                return;
+        }
+
+        /* Initialize our request handler */
+        vio_setHandler(viomajorsubtype_blockio, handle_block_event);
+
+        for (unit = 0; unit < HVMAXARCHITECTEDVIRTUALDISKS; unit++)
+                probe_disk(vio_root, unit);
+
+        vio_clearHandler(viomajorsubtype_blockio);
+        viopath_close(viopath_hostLp, viomajorsubtype_blockio, 2);
+}
+
+static void __init handle_cd_event(struct HvLpEvent *event)
+{
+        struct viocdlpevent *bevent;
+        struct vio_waitevent *pwe;
+
+        if (!event)
+                /* Notification that a partition went away! */
+                return;
+
+        /* First, we should NEVER get an int here...only acks */
+        if (hvlpevent_is_int(event)) {
+                printk(KERN_WARNING "handle_cd_event: got an unexpected int\n");
+                if (hvlpevent_need_ack(event)) {
+                        event->xRc = HvLpEvent_Rc_InvalidSubtype;
+                        HvCallEvent_ackLpEvent(event);
+                }
+                return;
+        }
+
+        bevent = (struct viocdlpevent *)event;
+
+        switch (event->xSubtype & VIOMINOR_SUBTYPE_MASK) {
+        case viocdgetinfo:
+                pwe = (struct vio_waitevent *)event->xCorrelationToken;
+                pwe->rc = event->xRc;
+                pwe->sub_result = bevent->sub_result;
+                complete(&pwe->com);
+                break;
+
+        default:
+                printk(KERN_WARNING "handle_cd_event: "
+                        "message with unexpected subtype %0x04X!\n",
+                        event->xSubtype & VIOMINOR_SUBTYPE_MASK);
+                if (hvlpevent_need_ack(event)) {
+                        event->xRc = HvLpEvent_Rc_InvalidSubtype;
+                        HvCallEvent_ackLpEvent(event);
+                }
+        }
+}
+
+static void __init get_viocd_info(struct device_node *vio_root)
+{
+        HvLpEvent_Rc hvrc;
+        u32 unit;
+        struct vio_waitevent we;
+        struct vio_resource *unitinfo;
+        dma_addr_t unitinfo_dmaaddr;
+        int ret;
+
+        ret = viopath_open(viopath_hostLp, viomajorsubtype_cdio, 2);
+        if (ret) {
+                printk(KERN_WARNING
+                        "get_viocd_info: error opening path to host partition %d\n",
+                        viopath_hostLp);
+                return;
+        }
+
+        /* Initialize our request handler */
+        vio_setHandler(viomajorsubtype_cdio, handle_cd_event);
+
+        unitinfo = iseries_hv_alloc(
+                        sizeof(*unitinfo) * HVMAXARCHITECTEDVIRTUALCDROMS,
+                        &unitinfo_dmaaddr, GFP_ATOMIC);
+        if (!unitinfo) {
+                printk(KERN_WARNING
+                        "get_viocd_info: error allocating unitinfo\n");
+                goto clear_handler;
+        }
+
+        memset(unitinfo, 0, sizeof(*unitinfo) * HVMAXARCHITECTEDVIRTUALCDROMS);
+
+        init_completion(&we.com);
+
+        hvrc = HvCallEvent_signalLpEventFast(viopath_hostLp,
+                        HvLpEvent_Type_VirtualIo,
+                        viomajorsubtype_cdio | viocdgetinfo,
+                        HvLpEvent_AckInd_DoAck, HvLpEvent_AckType_ImmediateAck,
+                        viopath_sourceinst(viopath_hostLp),
+                        viopath_targetinst(viopath_hostLp),
+                        (u64)&we, VIOVERSION << 16, unitinfo_dmaaddr, 0,
+                        sizeof(*unitinfo) * HVMAXARCHITECTEDVIRTUALCDROMS, 0);
+        if (hvrc != HvLpEvent_Rc_Good) {
+                printk(KERN_WARNING
+                        "get_viocd_info: cdrom error sending event. rc %d\n",
+                        (int)hvrc);
+                goto hv_free;
+        }
+
+        wait_for_completion(&we.com);
+
+        if (we.rc) {
+                printk(KERN_WARNING "get_viocd_info: bad rc %d:0x%04X\n",
+                        we.rc, we.sub_result);
+                goto hv_free;
+        }
+
+        for (unit = 0; (unit < HVMAXARCHITECTEDVIRTUALCDROMS) &&
+                        unitinfo[unit].rsrcname[0]; unit++) {
+                if (!do_device_node(vio_root, "viocd", FIRST_VIOCD + unit, unit,
+                                "block", "IBM,iSeries-viocd", &unitinfo[unit]))
+                        break;
+        }
+
+ hv_free:
+        iseries_hv_free(sizeof(*unitinfo) * HVMAXARCHITECTEDVIRTUALCDROMS,
+                        unitinfo, unitinfo_dmaaddr);
+ clear_handler:
+        vio_clearHandler(viomajorsubtype_cdio);
+        viopath_close(viopath_hostLp, viomajorsubtype_cdio, 2);
+}
+
+/* Handle interrupt events for tape */
+static void __init handle_tape_event(struct HvLpEvent *event)
+{
+        struct vio_waitevent *we;
+        struct viotapelpevent *tevent = (struct viotapelpevent *)event;
+
+        if (event == NULL)
+                /* Notification that a partition went away! */
+                return;
+
+        we = (struct vio_waitevent *)event->xCorrelationToken;
+        switch (event->xSubtype & VIOMINOR_SUBTYPE_MASK) {
+        case viotapegetinfo:
+                we->rc = tevent->sub_type_result;
+                complete(&we->com);
+                break;
+        default:
+                printk(KERN_WARNING "handle_tape_event: weird ack\n");
+        }
+}
+
+static void __init get_viotape_info(struct device_node *vio_root)
+{
+        HvLpEvent_Rc hvrc;
+        u32 unit;
+        struct vio_resource *unitinfo;
+        dma_addr_t unitinfo_dmaaddr;
+        size_t len = sizeof(*unitinfo) * HVMAXARCHITECTEDVIRTUALTAPES;
+        struct vio_waitevent we;
+        int ret;
+
+        ret = viopath_open(viopath_hostLp, viomajorsubtype_tape, 2);
+        if (ret) {
+                printk(KERN_WARNING "get_viotape_info: "
+                        "error on viopath_open to hostlp %d\n", ret);
+                return;
+        }
+
+        vio_setHandler(viomajorsubtype_tape, handle_tape_event);
+
+        unitinfo = iseries_hv_alloc(len, &unitinfo_dmaaddr, GFP_ATOMIC);
+        if (!unitinfo)
+                goto clear_handler;
+
+        memset(unitinfo, 0, len);
+
+        hvrc = HvCallEvent_signalLpEventFast(viopath_hostLp,
+                        HvLpEvent_Type_VirtualIo,
+                        viomajorsubtype_tape | viotapegetinfo,
+                        HvLpEvent_AckInd_DoAck, HvLpEvent_AckType_ImmediateAck,
+                        viopath_sourceinst(viopath_hostLp),
+                        viopath_targetinst(viopath_hostLp),
+                        (u64)(unsigned long)&we, VIOVERSION << 16,
+                        unitinfo_dmaaddr, len, 0, 0);
+        if (hvrc != HvLpEvent_Rc_Good) {
+                printk(KERN_WARNING "get_viotape_info: hv error on op %d\n",
+                                (int)hvrc);
+                goto hv_free;
+        }
+
+        wait_for_completion(&we.com);
+
+        for (unit = 0; (unit < HVMAXARCHITECTEDVIRTUALTAPES) &&
+                        unitinfo[unit].rsrcname[0]; unit++) {
+                if (!do_device_node(vio_root, "viotape", FIRST_VIOTAPE + unit,
+                                unit, "byte", "IBM,iSeries-viotape",
+                                &unitinfo[unit]))
+                        break;
+        }
+
+ hv_free:
+        iseries_hv_free(len, unitinfo, unitinfo_dmaaddr);
+ clear_handler:
+        vio_clearHandler(viomajorsubtype_tape);
+        viopath_close(viopath_hostLp, viomajorsubtype_tape, 2);
+}
+
+static int __init iseries_vio_init(void)
+{
+        struct device_node *vio_root;
+
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
+
+        iommu_vio_init();
+
+        vio_root = of_find_node_by_path("/vdevice");
+        if (!vio_root)
+                return -ENODEV;
+
+        if (viopath_hostLp == HvLpIndexInvalid) {
+                vio_set_hostlp();
+                /* If we don't have a host, bail out */
+                if (viopath_hostLp == HvLpIndexInvalid)
+                        goto put_node;
+        }
+
+        get_viodasd_info(vio_root);
+        get_viocd_info(vio_root);
+        get_viotape_info(vio_root);
+
+        return 0;
+
+ put_node:
+        of_node_put(vio_root);
+        return -ENODEV;
+}
+arch_initcall(iseries_vio_init);
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index 6a0060a5f2ec..df23331eb25c 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -124,8 +124,7 @@ static int proc_viopath_show(struct seq_file *m, void *v)
         if (!buf)
                 return 0;
 
-        handle = dma_map_single(iSeries_vio_dev, buf, HW_PAGE_SIZE,
-                                DMA_FROM_DEVICE);
+        handle = iseries_hv_map(buf, HW_PAGE_SIZE, DMA_FROM_DEVICE);
 
         hvrc = HvCallEvent_signalLpEventFast(viopath_hostLp,
                         HvLpEvent_Type_VirtualIo,
@@ -146,8 +145,7 @@ static int proc_viopath_show(struct seq_file *m, void *v)
         buf[HW_PAGE_SIZE-1] = '\0';
         seq_printf(m, "%s", buf);
 
-        dma_unmap_single(iSeries_vio_dev, handle, HW_PAGE_SIZE,
-                         DMA_FROM_DEVICE);
+        iseries_hv_unmap(handle, HW_PAGE_SIZE, DMA_FROM_DEVICE);
         kfree(buf);
 
         seq_printf(m, "AVAILABLE_VETH=%x\n", vlanMap);
@@ -596,7 +594,7 @@ int viopath_close(HvLpIndex remoteLp, int subtype, int numReq)
                 numOpen += viopathStatus[remoteLp].users[i];
 
         if ((viopathStatus[remoteLp].isOpen) && (numOpen == 0)) {
-                printk(VIOPATH_KERN_INFO "closing connection to partition %d",
+                printk(VIOPATH_KERN_INFO "closing connection to partition %d\n",
                                 remoteLp);
 
                 HvCallEvent_closeLpEventPath(remoteLp,
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 2542403288f9..771ed0cf29a5 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -169,15 +169,12 @@ static int u3_agp_write_config(struct pci_bus *bus, unsigned int devfn,
         switch (len) {
         case 1:
                 out_8(addr, val);
-                (void) in_8(addr);
                 break;
         case 2:
                 out_le16(addr, val);
-                (void) in_le16(addr);
                 break;
         default:
                 out_le32(addr, val);
-                (void) in_le32(addr);
                 break;
         }
         return PCIBIOS_SUCCESSFUL;
@@ -185,8 +182,8 @@ static int u3_agp_write_config(struct pci_bus *bus, unsigned int devfn,
 
 static struct pci_ops u3_agp_pci_ops =
 {
-        u3_agp_read_config,
-        u3_agp_write_config
+        .read = u3_agp_read_config,
+        .write = u3_agp_write_config,
 };
 
 static unsigned long u3_ht_cfa0(u8 devfn, u8 off)
@@ -268,15 +265,12 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,
         switch (len) {
         case 1:
                 out_8(addr, val);
-                (void) in_8(addr);
                 break;
         case 2:
                 out_le16(addr, val);
-                (void) in_le16(addr);
                 break;
         default:
                 out_le32(addr, val);
-                (void) in_le32(addr);
                 break;
         }
         return PCIBIOS_SUCCESSFUL;
@@ -284,8 +278,8 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,
 
 static struct pci_ops u3_ht_pci_ops =
 {
-        u3_ht_read_config,
-        u3_ht_write_config
+        .read = u3_ht_read_config,
+        .write = u3_ht_write_config,
 };
 
 static unsigned int u4_pcie_cfa0(unsigned int devfn, unsigned int off)
@@ -376,15 +370,12 @@ static int u4_pcie_write_config(struct pci_bus *bus, unsigned int devfn,
         switch (len) {
         case 1:
                 out_8(addr, val);
-                (void) in_8(addr);
                 break;
         case 2:
                 out_le16(addr, val);
-                (void) in_le16(addr);
                 break;
         default:
                 out_le32(addr, val);
-                (void) in_le32(addr);
                 break;
         }
         return PCIBIOS_SUCCESSFUL;
@@ -392,8 +383,8 @@ static int u4_pcie_write_config(struct pci_bus *bus, unsigned int devfn,
 
 static struct pci_ops u4_pcie_pci_ops =
 {
-        u4_pcie_read_config,
-        u4_pcie_write_config
+        .read = u4_pcie_read_config,
+        .write = u4_pcie_write_config,
 };
 
 static void __init setup_u3_agp(struct pci_controller* hose)
diff --git a/arch/powerpc/platforms/pasemi/Kconfig b/arch/powerpc/platforms/pasemi/Kconfig
index 95cd90fd81c7..735e1536cbfc 100644
--- a/arch/powerpc/platforms/pasemi/Kconfig
+++ b/arch/powerpc/platforms/pasemi/Kconfig
@@ -5,6 +5,7 @@ config PPC_PASEMI
         select MPIC
         select PPC_UDBG_16550
         select PPC_NATIVE
+        select MPIC_BROKEN_REGREAD
         help
           This option enables support for PA Semi's PWRficient line
           of SoC processors, including PA6T-1682M
@@ -18,6 +19,16 @@ config PPC_PASEMI_IOMMU
         help
           IOMMU support for PA6T-1682M
 
+config PPC_PASEMI_IOMMU_DMA_FORCE
+        bool "Force DMA engine to use IOMMU"
+        depends on PPC_PASEMI_IOMMU
+        help
+          This option forces the use of the IOMMU also for the
+          DMA engine. Otherwise the kernel will use it only when
+          running under a hypervisor.
+
+          If in doubt, say "N".
+
 config PPC_PASEMI_MDIO
         depends on PHYLIB
         tristate "MDIO support via GPIO"
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index c91a33593bb8..dae9f658122e 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -320,10 +320,12 @@ static struct of_device_id gpio_mdio_match[] =
 
 static struct of_platform_driver gpio_mdio_driver =
 {
-        .name           = "gpio-mdio-bitbang",
         .match_table    = gpio_mdio_match,
         .probe          = gpio_mdio_probe,
         .remove         = gpio_mdio_remove,
+        .driver         = {
+                .name   = "gpio-mdio-bitbang",
+        },
 };
 
 int gpio_mdio_init(void)
diff --git a/arch/powerpc/platforms/pasemi/idle.c b/arch/powerpc/platforms/pasemi/idle.c
index 3c962d5757be..d8e1fcc78513 100644
--- a/arch/powerpc/platforms/pasemi/idle.c
+++ b/arch/powerpc/platforms/pasemi/idle.c
@@ -72,8 +72,11 @@ static int pasemi_system_reset_exception(struct pt_regs *regs)
         return 1;
 }
 
-void __init pasemi_idle_init(void)
+static int __init pasemi_idle_init(void)
 {
+        if (!machine_is(pasemi))
+                return -ENODEV;
+
 #ifndef CONFIG_PPC_PASEMI_CPUFREQ
         printk(KERN_WARNING "No cpufreq driver, powersavings modes disabled\n");
         current_mode = 0;
@@ -82,7 +85,10 @@ void __init pasemi_idle_init(void)
         ppc_md.system_reset_exception = pasemi_system_reset_exception;
         ppc_md.power_save = modes[current_mode].entry;
         printk(KERN_INFO "Using PA6T idle loop (%s)\n", modes[current_mode].name);
+
+        return 0;
 }
+late_initcall(pasemi_idle_init);
 
 static int __init idle_param(char *p)
 {
diff --git a/arch/powerpc/platforms/pasemi/iommu.c b/arch/powerpc/platforms/pasemi/iommu.c
index 9014d55c717b..9916a0f3e431 100644
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -25,6 +25,7 @@
 #include <asm/iommu.h>
 #include <asm/machdep.h>
 #include <asm/abs_addr.h>
+#include <asm/firmware.h>
 
 
 #define IOBMAP_PAGE_SHIFT       12
@@ -175,19 +176,23 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)
 {
         pr_debug("pci_dma_dev_setup, dev %p (%s)\n", dev, pci_name(dev));
 
-        /* DMA device is untranslated, but all other PCI-e goes through
-         * the IOMMU
+#if !defined(CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE)
+        /* For non-LPAR environment, don't translate anything for the DMA
+         * engine. The exception to this is if the user has enabled
+         * CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE at build time.
          */
-        if (dev->vendor == 0x1959 && dev->device == 0xa007)
+        if (dev->vendor == 0x1959 && dev->device == 0xa007 &&
+            !firmware_has_feature(FW_FEATURE_LPAR))
                 dev->dev.archdata.dma_ops = &dma_direct_ops;
-        else
-                dev->dev.archdata.dma_data = &iommu_table_iobmap;
+#endif
+
+        dev->dev.archdata.dma_data = &iommu_table_iobmap;
 }
 
 static void pci_dma_bus_setup_null(struct pci_bus *b) { }
 static void pci_dma_dev_setup_null(struct pci_dev *d) { }
 
-int iob_init(struct device_node *dn)
+int __init iob_init(struct device_node *dn)
 {
         unsigned long tmp;
         u32 regword;
@@ -233,7 +238,7 @@ int iob_init(struct device_node *dn)
 
 
 /* These are called very early. */
-void iommu_init_early_pasemi(void)
+void __init iommu_init_early_pasemi(void)
 {
         int iommu_off;
 
diff --git a/arch/powerpc/platforms/pasemi/pasemi.h b/arch/powerpc/platforms/pasemi/pasemi.h
index be8495497611..516acabb4e96 100644
--- a/arch/powerpc/platforms/pasemi/pasemi.h
+++ b/arch/powerpc/platforms/pasemi/pasemi.h
@@ -6,9 +6,9 @@ extern void pas_pci_init(void);
 extern void __devinit pas_pci_irq_fixup(struct pci_dev *dev);
 extern void __devinit pas_pci_dma_dev_setup(struct pci_dev *dev);
 
-extern void __init alloc_iobmap_l2(void);
+extern void __iomem *pasemi_pci_getcfgaddr(struct pci_dev *dev, int offset);
 
-extern void __init pasemi_idle_init(void);
+extern void __init alloc_iobmap_l2(void);
 
 /* Power savings modes, implemented in asm */
 extern void idle_spin(void);
diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c
index ab1f5f62bcd8..b6a0ec45c695 100644
--- a/arch/powerpc/platforms/pasemi/pci.c
+++ b/arch/powerpc/platforms/pasemi/pci.c
@@ -51,6 +51,61 @@ static void volatile __iomem *pa_pxp_cfg_addr(struct pci_controller *hose,
         return hose->cfg_data + PA_PXP_CFA(bus, devfn, offset);
 }
 
+static inline int is_root_port(int busno, int devfn)
+{
+        return ((busno == 0) && (PCI_FUNC(devfn) < 4) &&
+                 ((PCI_SLOT(devfn) == 16) || (PCI_SLOT(devfn) == 17)));
+}
+
+static inline int is_5945_reg(int reg)
+{
+        return (((reg >= 0x18) && (reg < 0x34)) ||
+                ((reg >= 0x158) && (reg < 0x178)));
+}
+
+static int workaround_5945(struct pci_bus *bus, unsigned int devfn,
+                           int offset, int len, u32 *val)
+{
+        struct pci_controller *hose;
+        void volatile __iomem *addr, *dummy;
+        int byte;
+        u32 tmp;
+
+        if (!is_root_port(bus->number, devfn) || !is_5945_reg(offset))
+                return 0;
+
+        hose = pci_bus_to_host(bus);
+
+        addr = pa_pxp_cfg_addr(hose, bus->number, devfn, offset & ~0x3);
+        byte = offset & 0x3;
+
+        /* Workaround bug 5945: write 0 to a dummy register before reading,
+         * and write back what we read. We must read/write the full 32-bit
+         * contents so we need to shift and mask by hand.
+         */
+        dummy = pa_pxp_cfg_addr(hose, bus->number, devfn, 0x10);
+        out_le32(dummy, 0);
+        tmp = in_le32(addr);
+        out_le32(addr, tmp);
+
+        switch (len) {
+        case 1:
+                *val = (tmp >> (8*byte)) & 0xff;
+                break;
+        case 2:
+                if (byte == 0)
+                        *val = tmp & 0xffff;
+                else
+                        *val = (tmp >> 16) & 0xffff;
+                break;
+        default:
+                *val = tmp;
+                break;
+        }
+
+        return 1;
+}
+
 static int pa_pxp_read_config(struct pci_bus *bus, unsigned int devfn,
                               int offset, int len, u32 *val)
 {
@@ -64,6 +119,9 @@ static int pa_pxp_read_config(struct pci_bus *bus, unsigned int devfn,
         if (!pa_pxp_offset_valid(bus->number, devfn, offset))
                 return PCIBIOS_BAD_REGISTER_NUMBER;
 
+        if (workaround_5945(bus, devfn, offset, len, val))
+                return PCIBIOS_SUCCESSFUL;
+
         addr = pa_pxp_cfg_addr(hose, bus->number, devfn, offset);
 
         /*
@@ -107,23 +165,20 @@ static int pa_pxp_write_config(struct pci_bus *bus, unsigned int devfn,
         switch (len) {
         case 1:
                 out_8(addr, val);
-                (void) in_8(addr);
                 break;
         case 2:
                 out_le16(addr, val);
-                (void) in_le16(addr);
                 break;
         default:
                 out_le32(addr, val);
-                (void) in_le32(addr);
                 break;
         }
         return PCIBIOS_SUCCESSFUL;
 }
 
 static struct pci_ops pa_pxp_ops = {
-        pa_pxp_read_config,
-        pa_pxp_write_config,
+        .read = pa_pxp_read_config,
+        .write = pa_pxp_write_config,
 };
 
 static void __init setup_pa_pxp(struct pci_controller *hose)
@@ -178,3 +233,12 @@ void __init pas_pci_init(void)
         /* Use the common resource allocation mechanism */
         pci_probe_only = 1;
 }
+
+void __iomem *pasemi_pci_getcfgaddr(struct pci_dev *dev, int offset)
+{
+        struct pci_controller *hose;
+
+        hose = pci_bus_to_host(dev->bus);
+
+        return (void __iomem *)pa_pxp_cfg_addr(hose, dev->bus->number, dev->devfn, offset);
+}
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index ffe6528048b5..5ddf40a66ae8 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -39,8 +39,21 @@
 
 #include "pasemi.h"
 
+/* SDC reset register, must be pre-mapped at reset time */
 static void __iomem *reset_reg;
 
+/* Various error status registers, must be pre-mapped at MCE time */
+
+#define MAX_MCE_REGS    32
+struct mce_regs {
+        char *name;
+        void __iomem *addr;
+};
+
+static struct mce_regs mce_regs[MAX_MCE_REGS];
+static int num_mce_regs;
+
+
 static void pas_restart(char *cmd)
 {
         printk("Restarting...\n");
@@ -50,26 +63,30 @@ static void pas_restart(char *cmd)
 
 #ifdef CONFIG_SMP
 static DEFINE_SPINLOCK(timebase_lock);
+static unsigned long timebase;
 
 static void __devinit pas_give_timebase(void)
 {
-        unsigned long tb;
-
         spin_lock(&timebase_lock);
         mtspr(SPRN_TBCTL, TBCTL_FREEZE);
-        tb = mftb();
-        mtspr(SPRN_TBCTL, TBCTL_UPDATE_LOWER | (tb & 0xffffffff));
-        mtspr(SPRN_TBCTL, TBCTL_UPDATE_UPPER | (tb >> 32));
-        mtspr(SPRN_TBCTL, TBCTL_RESTART);
+        isync();
+        timebase = get_tb();
         spin_unlock(&timebase_lock);
-        pr_debug("pas_give_timebase: cpu %d gave tb %lx\n",
-                 smp_processor_id(), tb);
+
+        while (timebase)
+                barrier();
+        mtspr(SPRN_TBCTL, TBCTL_RESTART);
 }
 
 static void __devinit pas_take_timebase(void)
 {
-        pr_debug("pas_take_timebase: cpu %d has tb %lx\n",
-                 smp_processor_id(), mftb());
+        while (!timebase)
+                smp_rmb();
+
+        spin_lock(&timebase_lock);
+        set_tb(timebase >> 32, timebase & 0xffffffff);
+        timebase = 0;
+        spin_unlock(&timebase_lock);
 }
 
 struct smp_ops_t pas_smp_ops = {
@@ -98,9 +115,60 @@ void __init pas_setup_arch(void)
         /* Remap SDC register for doing reset */
         /* XXXOJN This should maybe come out of the device tree */
         reset_reg = ioremap(0xfc101100, 4);
+}
+
+static int __init pas_setup_mce_regs(void)
+{
+        struct pci_dev *dev;
+        int reg;
+
+        if (!machine_is(pasemi))
+                return -ENODEV;
+
+        /* Remap various SoC status registers for use by the MCE handler */
+
+        reg = 0;
+
+        dev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa00a, NULL);
+        while (dev && reg < MAX_MCE_REGS) {
+                mce_regs[reg].name = kasprintf(GFP_KERNEL,
+                                                "mc%d_mcdebug_errsta", reg);
+                mce_regs[reg].addr = pasemi_pci_getcfgaddr(dev, 0x730);
+                dev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa00a, dev);
+                reg++;
+        }
+
+        dev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa001, NULL);
+        if (dev && reg+4 < MAX_MCE_REGS) {
+                mce_regs[reg].name = "iobdbg_IntStatus1";
+                mce_regs[reg].addr = pasemi_pci_getcfgaddr(dev, 0x438);
+                reg++;
+                mce_regs[reg].name = "iobdbg_IOCTbusIntDbgReg";
+                mce_regs[reg].addr = pasemi_pci_getcfgaddr(dev, 0x454);
+                reg++;
+                mce_regs[reg].name = "iobiom_IntStatus";
+                mce_regs[reg].addr = pasemi_pci_getcfgaddr(dev, 0xc10);
+                reg++;
+                mce_regs[reg].name = "iobiom_IntDbgReg";
+                mce_regs[reg].addr = pasemi_pci_getcfgaddr(dev, 0xc1c);
+                reg++;
+        }
+
+        dev = pci_get_device(PCI_VENDOR_ID_PASEMI, 0xa009, NULL);
+        if (dev && reg+2 < MAX_MCE_REGS) {
+                mce_regs[reg].name = "l2csts_IntStatus";
+                mce_regs[reg].addr = pasemi_pci_getcfgaddr(dev, 0x200);
+                reg++;
+                mce_regs[reg].name = "l2csts_Cnt";
+                mce_regs[reg].addr = pasemi_pci_getcfgaddr(dev, 0x214);
+                reg++;
+        }
 
-        pasemi_idle_init();
+        num_mce_regs = reg;
+
+        return 0;
 }
+device_initcall(pas_setup_mce_regs);
 
 static __init void pas_init_IRQ(void)
 {
@@ -162,25 +230,34 @@ static int pas_machine_check_handler(struct pt_regs *regs)
 {
         int cpu = smp_processor_id();
         unsigned long srr0, srr1, dsisr;
+        int dump_slb = 0;
+        int i;
 
         srr0 = regs->nip;
         srr1 = regs->msr;
         dsisr = mfspr(SPRN_DSISR);
         printk(KERN_ERR "Machine Check on CPU %d\n", cpu);
-        printk(KERN_ERR "SRR0 0x%016lx SRR1 0x%016lx\n", srr0, srr1);
-        printk(KERN_ERR "DSISR 0x%016lx DAR 0x%016lx\n", dsisr, regs->dar);
+        printk(KERN_ERR "SRR0  0x%016lx SRR1 0x%016lx\n", srr0, srr1);
+        printk(KERN_ERR "DSISR 0x%016lx DAR  0x%016lx\n", dsisr, regs->dar);
+        printk(KERN_ERR "BER   0x%016lx MER  0x%016lx\n", mfspr(SPRN_PA6T_BER),
+                mfspr(SPRN_PA6T_MER));
+        printk(KERN_ERR "IER   0x%016lx DER  0x%016lx\n", mfspr(SPRN_PA6T_IER),
+                mfspr(SPRN_PA6T_DER));
         printk(KERN_ERR "Cause:\n");
 
         if (srr1 & 0x200000)
                 printk(KERN_ERR "Signalled by SDC\n");
+
         if (srr1 & 0x100000) {
                 printk(KERN_ERR "Load/Store detected error:\n");
                 if (dsisr & 0x8000)
                         printk(KERN_ERR "D-cache ECC double-bit error or bus error\n");
                 if (dsisr & 0x4000)
                         printk(KERN_ERR "LSU snoop response error\n");
-                if (dsisr & 0x2000)
+                if (dsisr & 0x2000) {
                         printk(KERN_ERR "MMU SLB multi-hit or invalid B field\n");
+                        dump_slb = 1;
+                }
                 if (dsisr & 0x1000)
                         printk(KERN_ERR "Recoverable Duptags\n");
                 if (dsisr & 0x800)
@@ -188,13 +265,40 @@ static int pas_machine_check_handler(struct pt_regs *regs)
                 if (dsisr & 0x400)
                         printk(KERN_ERR "TLB parity error count overflow\n");
         }
+
         if (srr1 & 0x80000)
                 printk(KERN_ERR "Bus Error\n");
-        if (srr1 & 0x40000)
+
+        if (srr1 & 0x40000) {
                 printk(KERN_ERR "I-side SLB multiple hit\n");
+                dump_slb = 1;
+        }
+
         if (srr1 & 0x20000)
                 printk(KERN_ERR "I-cache parity error hit\n");
 
+        if (num_mce_regs == 0)
+                printk(KERN_ERR "No MCE registers mapped yet, can't dump\n");
+        else
+                printk(KERN_ERR "SoC debug registers:\n");
+
+        for (i = 0; i < num_mce_regs; i++)
+                printk(KERN_ERR "%s: 0x%08x\n", mce_regs[i].name,
+                        in_le32(mce_regs[i].addr));
+
+        if (dump_slb) {
+                unsigned long e, v;
+                int i;
+
+                printk(KERN_ERR "slb contents:\n");
+                for (i = 0; i < SLB_NUM_ENTRIES; i++) {
+                        asm volatile("slbmfee  %0,%1" : "=r" (e) : "r" (i));
+                        asm volatile("slbmfev  %0,%1" : "=r" (v) : "r" (i));
+                        printk(KERN_ERR "%02d %016lx %016lx\n", i, e, v);
+                }
+        }
+
+
         /* SRR1[62] is from MSR[62] if recoverable, so pass that back */
         return !!(srr1 & 0x2);
 }
diff --git a/arch/powerpc/platforms/powermac/bootx_init.c b/arch/powerpc/platforms/powermac/bootx_init.c
index 9d73d0234c5d..cf660916ae0b 100644
--- a/arch/powerpc/platforms/powermac/bootx_init.c
+++ b/arch/powerpc/platforms/powermac/bootx_init.c
@@ -17,7 +17,6 @@
 #include <asm/prom.h>
 #include <asm/page.h>
 #include <asm/bootx.h>
-#include <asm/bootinfo.h>
 #include <asm/btext.h>
 #include <asm/io.h>
 
diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index efdf5eb81ecc..da2007e3db0e 100644
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -40,7 +40,6 @@
 #include <linux/completion.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
-#include <linux/completion.h>
 #include <linux/timer.h>
 #include <linux/mutex.h>
 #include <asm/keylargo.h>
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 92586db19754..ec49099830d5 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -209,15 +209,12 @@ static int macrisc_write_config(struct pci_bus *bus, unsigned int devfn,
         switch (len) {
         case 1:
                 out_8(addr, val);
-                (void) in_8(addr);
                 break;
         case 2:
                 out_le16(addr, val);
-                (void) in_le16(addr);
                 break;
         default:
                 out_le32(addr, val);
-                (void) in_le32(addr);
                 break;
         }
         return PCIBIOS_SUCCESSFUL;
@@ -225,8 +222,8 @@ static int macrisc_write_config(struct pci_bus *bus, unsigned int devfn,
 
 static struct pci_ops macrisc_pci_ops =
 {
-        macrisc_read_config,
-        macrisc_write_config
+        .read = macrisc_read_config,
+        .write = macrisc_write_config,
 };
 
 #ifdef CONFIG_PPC32
@@ -280,8 +277,8 @@ chaos_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
 
 static struct pci_ops chaos_pci_ops =
 {
-        chaos_read_config,
-        chaos_write_config
+        .read = chaos_read_config,
+        .write = chaos_write_config,
 };
 
 static void __init setup_chaos(struct pci_controller *hose,
@@ -440,15 +437,12 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,
         switch (len) {
         case 1:
                 out_8(addr, val);
-                (void) in_8(addr);
                 break;
         case 2:
                 out_le16(addr, val);
-                (void) in_le16(addr);
                 break;
         default:
                 out_le32((u32 __iomem *)addr, val);
-                (void) in_le32(addr);
                 break;
         }
         return PCIBIOS_SUCCESSFUL;
@@ -456,8 +450,8 @@ static int u3_ht_write_config(struct pci_bus *bus, unsigned int devfn,
 
 static struct pci_ops u3_ht_pci_ops =
 {
-        u3_ht_read_config,
-        u3_ht_write_config
+        .read = u3_ht_read_config,
+        .write = u3_ht_write_config,
 };
 
 #define U4_PCIE_CFA0(devfn, off)        \
@@ -545,15 +539,12 @@ static int u4_pcie_write_config(struct pci_bus *bus, unsigned int devfn,
         switch (len) {
         case 1:
                 out_8(addr, val);
-                (void) in_8(addr);
                 break;
         case 2:
                 out_le16(addr, val);
-                (void) in_le16(addr);
                 break;
         default:
                 out_le32(addr, val);
-                (void) in_le32(addr);
                 break;
         }
         return PCIBIOS_SUCCESSFUL;
@@ -561,8 +552,8 @@ static int u4_pcie_write_config(struct pci_bus *bus, unsigned int devfn,
 
 static struct pci_ops u4_pcie_pci_ops =
 {
-        u4_pcie_read_config,
-        u4_pcie_write_config
+        .read = u4_pcie_read_config,
+        .write = u4_pcie_write_config,
 };
 
 #endif /* CONFIG_PPC64 */
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 87cd6805171a..999f5e160897 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -384,7 +384,7 @@ static void __init pmac_pic_probe_oldstyle(void)
         /*
          * Allocate an irq host
          */
-        pmac_pic_host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, max_irqs,
+        pmac_pic_host = irq_alloc_host(master, IRQ_HOST_MAP_LINEAR, max_irqs,
                                        &pmac_pic_host_ops,
                                        max_irqs);
         BUG_ON(pmac_pic_host == NULL);
diff --git a/arch/powerpc/platforms/powermac/pmac.h b/arch/powerpc/platforms/powermac/pmac.h
index 6e090a7dea83..fcde070f7054 100644
--- a/arch/powerpc/platforms/powermac/pmac.h
+++ b/arch/powerpc/platforms/powermac/pmac.h
@@ -22,9 +22,6 @@ extern void pmac_read_rtc_time(void);
 extern void pmac_calibrate_decr(void);
 extern void pmac_pci_irq_fixup(struct pci_dev *);
 extern void pmac_pci_init(void);
-extern unsigned long pmac_ide_get_base(int index);
-extern void pmac_ide_init_hwif_ports(hw_regs_t *hw,
-        unsigned long data_port, unsigned long ctrl_port, int *irq);
 
 extern void pmac_nvram_update(void);
 extern unsigned char pmac_nvram_read_byte(int addr);
@@ -33,7 +30,6 @@ extern int pmac_pci_enable_device_hook(struct pci_dev *dev, int initial);
 extern void pmac_pcibios_after_init(void);
 extern int of_show_percpuinfo(struct seq_file *m, int i);
 
-extern void pmac_pci_init(void);
 extern void pmac_setup_pci_dma(void);
 extern void pmac_check_ht_link(void);
 
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 7ccb9236e8b4..02c533096627 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -387,69 +387,13 @@ static void __init pmac_setup_arch(void)
 #endif /* CONFIG_ADB */
 }
 
-char *bootpath;
-char *bootdevice;
-void *boot_host;
-int boot_target;
-int boot_part;
-static dev_t boot_dev;
-
 #ifdef CONFIG_SCSI
 void note_scsi_host(struct device_node *node, void *host)
 {
-        int l;
-        char *p;
-
-        l = strlen(node->full_name);
-        if (bootpath != NULL && bootdevice != NULL
-            && strncmp(node->full_name, bootdevice, l) == 0
-            && (bootdevice[l] == '/' || bootdevice[l] == 0)) {
-                boot_host = host;
-                /*
-                 * There's a bug in OF 1.0.5.  (Why am I not surprised.)
-                 * If you pass a path like scsi/sd@1:0 to canon, it returns
-                 * something like /bandit@F2000000/gc@10/53c94@10000/sd@0,0
-                 * That is, the scsi target number doesn't get preserved.
-                 * So we pick the target number out of bootpath and use that.
-                 */
-                p = strstr(bootpath, "/sd@");
-                if (p != NULL) {
-                        p += 4;
-                        boot_target = simple_strtoul(p, NULL, 10);
-                        p = strchr(p, ':');
-                        if (p != NULL)
-                                boot_part = simple_strtoul(p + 1, NULL, 10);
-                }
-        }
 }
 EXPORT_SYMBOL(note_scsi_host);
 #endif
 
-#if defined(CONFIG_BLK_DEV_IDE) && defined(CONFIG_BLK_DEV_IDE_PMAC)
-static dev_t __init find_ide_boot(void)
-{
-        char *p;
-        int n;
-        dev_t __init pmac_find_ide_boot(char *bootdevice, int n);
-
-        if (bootdevice == NULL)
-                return 0;
-        p = strrchr(bootdevice, '/');
-        if (p == NULL)
-                return 0;
-        n = p - bootdevice;
-
-        return pmac_find_ide_boot(bootdevice, n);
-}
-#endif /* CONFIG_BLK_DEV_IDE && CONFIG_BLK_DEV_IDE_PMAC */
-
-static void __init find_boot_device(void)
-{
-#if defined(CONFIG_BLK_DEV_IDE) && defined(CONFIG_BLK_DEV_IDE_PMAC)
-        boot_dev = find_ide_boot();
-#endif
-}
-
 static int initializing = 1;
 
 static int pmac_late_init(void)
@@ -466,10 +410,14 @@ static int pmac_late_init(void)
 
 late_initcall(pmac_late_init);
 
-/* can't be __init - can be called whenever a disk is first accessed */
-void note_bootable_part(dev_t dev, int part, int goodness)
+/*
+ * This is __init_refok because we check for "initializing" before
+ * touching any of the __init sensitive things and "initializing"
+ * will be false after __init time. This can't be __init because it
+ * can be called whenever a disk is first accessed.
+ */
+void __init_refok note_bootable_part(dev_t dev, int part, int goodness)
 {
-        static int found_boot = 0;
         char *p;
 
         if (!initializing)
@@ -481,15 +429,8 @@ void note_bootable_part(dev_t dev, int part, int goodness)
         if (p != NULL && (p == boot_command_line || p[-1] == ' '))
                 return;
 
-        if (!found_boot) {
-                find_boot_device();
-                found_boot = 1;
-        }
-        if (!boot_dev || dev == boot_dev) {
-                ROOT_DEV = dev + part;
-                boot_dev = 0;
-                current_root_goodness = goodness;
-        }
+        ROOT_DEV = dev + part;
+        current_root_goodness = goodness;
 }
 
 #ifdef CONFIG_ADB_CUDA
diff --git a/arch/powerpc/platforms/powermac/udbg_adb.c b/arch/powerpc/platforms/powermac/udbg_adb.c
index 6124e59e1038..44e0b55a2a02 100644
--- a/arch/powerpc/platforms/powermac/udbg_adb.c
+++ b/arch/powerpc/platforms/powermac/udbg_adb.c
@@ -12,7 +12,6 @@
 #include <asm/xmon.h>
 #include <asm/prom.h>
 #include <asm/bootx.h>
-#include <asm/machdep.h>
 #include <asm/errno.h>
 #include <asm/pmac_feature.h>
 #include <asm/processor.h>
@@ -150,7 +149,7 @@ static void udbg_adb_putc(char c)
                 return udbg_adb_old_putc(c);
 }
 
-void udbg_adb_init_early(void)
+void __init udbg_adb_init_early(void)
 {
 #ifdef CONFIG_BOOTX_TEXT
         if (btext_find_display(1) == 0) {
@@ -160,7 +159,7 @@ void udbg_adb_init_early(void)
 #endif
 }
 
-int udbg_adb_init(int force_btext)
+int __init udbg_adb_init(int force_btext)
 {
         struct device_node *np;
 
diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
index ce15cada88d4..fd063fe0c9b3 100644
--- a/arch/powerpc/platforms/ps3/device-init.c
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -297,8 +297,8 @@ static int ps3_storage_wait_for_device(const struct ps3_repository_device *repo)
                 u64 dev_port;
         } *notify_event;
 
-        pr_debug(" -> %s:%u: bus_id %u, dev_id %u, dev_type %u\n", __func__,
-                 __LINE__, repo->bus_id, repo->dev_id, repo->dev_type);
+        pr_debug(" -> %s:%u: (%u:%u:%u)\n", __func__, __LINE__, repo->bus_id,
+                 repo->dev_id, repo->dev_type);
 
         buf = kzalloc(512, GFP_KERNEL);
         if (!buf)
@@ -359,6 +359,11 @@ static int ps3_storage_wait_for_device(const struct ps3_repository_device *repo)
                         break;
                 }
 
+                pr_debug("%s:%d: notify event (%u:%u:%u): event_type 0x%lx, "
+                         "port %lu\n", __func__, __LINE__, repo->bus_index,
+                         repo->dev_index, repo->dev_type,
+                         notify_event->event_type, notify_event->dev_port);
+
                 if (notify_event->event_type != notify_region_probe ||
                     notify_event->bus_id != repo->bus_id) {
                         pr_debug("%s:%u: bad notify_event: event %lu, "
@@ -370,8 +375,9 @@ static int ps3_storage_wait_for_device(const struct ps3_repository_device *repo)
 
                 if (notify_event->dev_id == repo->dev_id &&
                     notify_event->dev_type == repo->dev_type) {
-                        pr_debug("%s:%u: device ready: dev_id %u\n", __func__,
-                                 __LINE__, repo->dev_id);
+                        pr_debug("%s:%u: device ready (%u:%u:%u)\n", __func__,
+                                 __LINE__, repo->bus_index, repo->dev_index,
+                                 repo->dev_type);
                         error = 0;
                         break;
                 }
@@ -412,9 +418,10 @@ static int ps3_setup_storage_dev(const struct ps3_repository_device *repo,
                 return -ENODEV;
         }
 
-        pr_debug("%s:%u: index %u:%u: port %lu blk_size %lu num_blocks %lu "
+        pr_debug("%s:%u: (%u:%u:%u): port %lu blk_size %lu num_blocks %lu "
                  "num_regions %u\n", __func__, __LINE__, repo->bus_index,
-                 repo->dev_index, port, blk_size, num_blocks, num_regions);
+                 repo->dev_index, repo->dev_type, port, blk_size, num_blocks,
+                 num_regions);
 
         p = kzalloc(sizeof(struct ps3_storage_device) +
                     num_regions * sizeof(struct ps3_storage_region),
@@ -681,8 +688,9 @@ static int ps3_probe_thread(void *data)
                                 pr_debug("%s:%u: find device error.\n",
                                         __func__, __LINE__);
                         else {
-                                pr_debug("%s:%u: found device\n", __func__,
-                                        __LINE__);
+                                pr_debug("%s:%u: found device (%u:%u:%u)\n",
+                                         __func__, __LINE__, repo->bus_index,
+                                         repo->dev_index, repo->dev_type);
                                 ps3_register_repository_device(repo);
                                 ps3_repository_bump_device(repo);
                                 ms = 250;
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index 5d2e176a1b18..7382f195c4f8 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -60,7 +60,8 @@ static void _debug_dump_hpte(unsigned long pa, unsigned long va,
 }
 
 static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va,
-        unsigned long pa, unsigned long rflags, unsigned long vflags, int psize)
+        unsigned long pa, unsigned long rflags, unsigned long vflags,
+        int psize, int ssize)
 {
         unsigned long slot;
         struct hash_pte lhpte;
@@ -72,7 +73,8 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va,
 
         vflags &= ~HPTE_V_SECONDARY; /* this bit is ignored */
 
-        lhpte.v = hpte_encode_v(va, psize) | vflags | HPTE_V_VALID;
+        lhpte.v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M) |
+                vflags | HPTE_V_VALID;
         lhpte.r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize) | rflags;
 
         p_pteg = hpte_group / HPTES_PER_GROUP;
@@ -167,14 +169,14 @@ static long ps3_hpte_remove(unsigned long hpte_group)
 }
 
 static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp,
-        unsigned long va, int psize, int local)
+        unsigned long va, int psize, int ssize, int local)
 {
         unsigned long flags;
         unsigned long result;
         unsigned long pteg, bit;
         unsigned long hpte_v, want_v;
 
-        want_v = hpte_encode_v(va, psize);
+        want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M);
 
         spin_lock_irqsave(&ps3_bolttab_lock, flags);
 
@@ -205,13 +207,13 @@ static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp,
 }
 
 static void ps3_hpte_updateboltedpp(unsigned long newpp, unsigned long ea,
-        int psize)
+        int psize, int ssize)
 {
         panic("ps3_hpte_updateboltedpp() not implemented");
 }
 
 static void ps3_hpte_invalidate(unsigned long slot, unsigned long va,
-        int psize, int local)
+        int psize, int ssize, int local)
 {
         unsigned long flags;
         unsigned long result;
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index 67e32ec9b37e..3a6db04aa940 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -673,9 +673,16 @@ static int ps3_host_map(struct irq_host *h, unsigned int virq,
         return 0;
 }
 
+static int ps3_host_match(struct irq_host *h, struct device_node *np)
+{
+        /* Match all */
+        return 1;
+}
+
 static struct irq_host_ops ps3_host_ops = {
         .map = ps3_host_map,
         .unmap = ps3_host_unmap,
+        .match = ps3_host_match,
 };
 
 void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq)
@@ -726,7 +733,7 @@ void __init ps3_init_IRQ(void)
         unsigned cpu;
         struct irq_host *host;
 
-        host = irq_alloc_host(IRQ_HOST_MAP_NOMAP, 0, &ps3_host_ops,
+        host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0, &ps3_host_ops,
                 PS3_INVALID_OUTLET);
         irq_set_default_host(host);
         irq_set_virq_count(PS3_PLUG_MAX + 1);
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index b70e474014f0..766685ab26f8 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -1,5 +1,5 @@
 /*
- *  PS3 'Other OS' area data.
+ *  PS3 flash memory os area.
  *
  *  Copyright (C) 2006 Sony Computer Entertainment Inc.
  *  Copyright 2006 Sony Corp.
@@ -20,6 +20,9 @@
 
 #include <linux/kernel.h>
 #include <linux/io.h>
+#include <linux/workqueue.h>
+#include <linux/fs.h>
+#include <linux/syscalls.h>
 
 #include <asm/lmb.h>
 
@@ -29,7 +32,7 @@ enum {
         OS_AREA_SEGMENT_SIZE = 0X200,
 };
 
-enum {
+enum os_area_ldr_format {
         HEADER_LDR_FORMAT_RAW = 0,
         HEADER_LDR_FORMAT_GZIP = 1,
 };
@@ -38,7 +41,7 @@ enum {
  * struct os_area_header - os area header segment.
  * @magic_num: Always 'cell_ext_os_area'.
  * @hdr_version: Header format version number.
- * @os_area_offset: Starting segment number of os image area.
+ * @db_area_offset: Starting segment number of other os database area.
  * @ldr_area_offset: Starting segment number of bootloader image area.
  * @ldr_format: HEADER_LDR_FORMAT flag.
  * @ldr_size: Size of bootloader image in bytes.
@@ -50,9 +53,9 @@ enum {
  */
 
 struct os_area_header {
-        s8 magic_num[16];
+        u8 magic_num[16];
         u32 hdr_version;
-        u32 os_area_offset;
+        u32 db_area_offset;
         u32 ldr_area_offset;
         u32 _reserved_1;
         u32 ldr_format;
@@ -60,12 +63,12 @@ struct os_area_header {
         u32 _reserved_2[6];
 };
 
-enum {
+enum os_area_boot_flag {
         PARAM_BOOT_FLAG_GAME_OS = 0,
         PARAM_BOOT_FLAG_OTHER_OS = 1,
 };
 
-enum {
+enum os_area_ctrl_button {
         PARAM_CTRL_BUTTON_O_IS_YES = 0,
         PARAM_CTRL_BUTTON_X_IS_YES = 1,
 };
@@ -84,6 +87,9 @@ enum {
  * @dns_primary: User preference of static primary dns server.
  * @dns_secondary: User preference of static secondary dns server.
  *
+ * The ps3 rtc maintains a read-only value that approximates seconds since
+ * 2000-01-01 00:00:00 UTC.
+ *
  * User preference of zero for static_ip_addr means use dhcp.
  */
 
@@ -108,45 +114,172 @@ struct os_area_params {
         u8 _reserved_5[8];
 };
 
+enum {
+        OS_AREA_DB_MAGIC_NUM = 0x2d64622dU,
+};
+
 /**
- * struct saved_params - Static working copies of data from the 'Other OS' area.
+ * struct os_area_db - Shared flash memory database.
+ * @magic_num: Always '-db-' = 0x2d64622d.
+ * @version: os_area_db format version number.
+ * @index_64: byte offset of the database id index for 64 bit variables.
+ * @count_64: number of usable 64 bit index entries
+ * @index_32: byte offset of the database id index for 32 bit variables.
+ * @count_32: number of usable 32 bit index entries
+ * @index_16: byte offset of the database id index for 16 bit variables.
+ * @count_16: number of usable 16 bit index entries
  *
- * For the convinience of the guest, the HV makes a copy of the 'Other OS' area
- * in flash to a high address in the boot memory region and then puts that RAM
- * address and the byte count into the repository for retreval by the guest.
- * We copy the data we want into a static variable and allow the memory setup
- * by the HV to be claimed by the lmb manager.
+ * Flash rom storage for exclusive use by guests running in the other os lpar.
+ * The current system configuration allocates 1K (two segments) for other os
+ * use.
+ */
+
+struct os_area_db {
+        u32 magic_num;
+        u16 version;
+        u16 _reserved_1;
+        u16 index_64;
+        u16 count_64;
+        u16 index_32;
+        u16 count_32;
+        u16 index_16;
+        u16 count_16;
+        u32 _reserved_2;
+        u8 _db_data[1000];
+};
+
+/**
+ * enum os_area_db_owner - Data owners.
+ */
+
+enum os_area_db_owner {
+        OS_AREA_DB_OWNER_ANY = -1,
+        OS_AREA_DB_OWNER_NONE = 0,
+        OS_AREA_DB_OWNER_PROTOTYPE = 1,
+        OS_AREA_DB_OWNER_LINUX = 2,
+        OS_AREA_DB_OWNER_PETITBOOT = 3,
+        OS_AREA_DB_OWNER_MAX = 32,
+};
+
+enum os_area_db_key {
+        OS_AREA_DB_KEY_ANY = -1,
+        OS_AREA_DB_KEY_NONE = 0,
+        OS_AREA_DB_KEY_RTC_DIFF = 1,
+        OS_AREA_DB_KEY_VIDEO_MODE = 2,
+        OS_AREA_DB_KEY_MAX = 8,
+};
+
+struct os_area_db_id {
+        int owner;
+        int key;
+};
+
+static const struct os_area_db_id os_area_db_id_empty = {
+        .owner = OS_AREA_DB_OWNER_NONE,
+        .key = OS_AREA_DB_KEY_NONE
+};
+
+static const struct os_area_db_id os_area_db_id_any = {
+        .owner = OS_AREA_DB_OWNER_ANY,
+        .key = OS_AREA_DB_KEY_ANY
+};
+
+static const struct os_area_db_id os_area_db_id_rtc_diff = {
+        .owner = OS_AREA_DB_OWNER_LINUX,
+        .key = OS_AREA_DB_KEY_RTC_DIFF
+};
+
+static const struct os_area_db_id os_area_db_id_video_mode = {
+        .owner = OS_AREA_DB_OWNER_LINUX,
+        .key = OS_AREA_DB_KEY_VIDEO_MODE
+};
+
+#define SECONDS_FROM_1970_TO_2000 946684800LL
+
+/**
+ * struct saved_params - Static working copies of data from the PS3 'os area'.
+ *
+ * The order of preference we use for the rtc_diff source:
+ *  1) The database value.
+ *  2) The game os value.
+ *  3) The number of seconds from 1970 to 2000.
  */
 
 struct saved_params {
-        /* param 0 */
+        unsigned int valid;
         s64 rtc_diff;
         unsigned int av_multi_out;
-        unsigned int ctrl_button;
-        /* param 1 */
-        u8 static_ip_addr[4];
-        u8 network_mask[4];
-        u8 default_gateway[4];
-        /* param 2 */
-        u8 dns_primary[4];
-        u8 dns_secondary[4];
 } static saved_params;
 
+static struct property property_rtc_diff = {
+        .name = "linux,rtc_diff",
+        .length = sizeof(saved_params.rtc_diff),
+        .value = &saved_params.rtc_diff,
+};
+
+static struct property property_av_multi_out = {
+        .name = "linux,av_multi_out",
+        .length = sizeof(saved_params.av_multi_out),
+        .value = &saved_params.av_multi_out,
+};
+
+/**
+ * os_area_set_property - Add or overwrite a saved_params value to the device tree.
+ *
+ * Overwrites an existing property.
+ */
+
+static void os_area_set_property(struct device_node *node,
+        struct property *prop)
+{
+        int result;
+        struct property *tmp = of_find_property(node, prop->name, NULL);
+
+        if (tmp) {
+                pr_debug("%s:%d found %s\n", __func__, __LINE__, prop->name);
+                prom_remove_property(node, tmp);
+        }
+
+        result = prom_add_property(node, prop);
+
+        if (result)
+                pr_debug("%s:%d prom_set_property failed\n", __func__,
+                        __LINE__);
+}
+
+/**
+ * os_area_get_property - Get a saved_params value from the device tree.
+ *
+ */
+
+static void __init os_area_get_property(struct device_node *node,
+        struct property *prop)
+{
+        const struct property *tmp = of_find_property(node, prop->name, NULL);
+
+        if (tmp) {
+                BUG_ON(prop->length != tmp->length);
+                memcpy(prop->value, tmp->value, prop->length);
+        } else
+                pr_debug("%s:%d not found %s\n", __func__, __LINE__,
+                        prop->name);
+}
+
 #define dump_header(_a) _dump_header(_a, __func__, __LINE__)
 static void _dump_header(const struct os_area_header *h, const char *func,
         int line)
 {
-        pr_debug("%s:%d: h.magic_num:         '%s'\n", func, line,
+        pr_debug("%s:%d: h.magic_num:       '%s'\n", func, line,
                 h->magic_num);
-        pr_debug("%s:%d: h.hdr_version:       %u\n", func, line,
+        pr_debug("%s:%d: h.hdr_version:     %u\n", func, line,
                 h->hdr_version);
-        pr_debug("%s:%d: h.os_area_offset:   %u\n", func, line,
-                h->os_area_offset);
+        pr_debug("%s:%d: h.db_area_offset:  %u\n", func, line,
+                h->db_area_offset);
         pr_debug("%s:%d: h.ldr_area_offset: %u\n", func, line,
                 h->ldr_area_offset);
-        pr_debug("%s:%d: h.ldr_format:        %u\n", func, line,
+        pr_debug("%s:%d: h.ldr_format:      %u\n", func, line,
                 h->ldr_format);
-        pr_debug("%s:%d: h.ldr_size:          %xh\n", func, line,
+        pr_debug("%s:%d: h.ldr_size:        %xh\n", func, line,
                 h->ldr_size);
 }
 
@@ -176,7 +309,7 @@ static void _dump_params(const struct os_area_params *p, const char *func,
                 p->dns_secondary[2], p->dns_secondary[3]);
 }
 
-static int __init verify_header(const struct os_area_header *header)
+static int verify_header(const struct os_area_header *header)
 {
         if (memcmp(header->magic_num, "cell_ext_os_area", 16)) {
                 pr_debug("%s:%d magic_num failed\n", __func__, __LINE__);
@@ -188,7 +321,7 @@ static int __init verify_header(const struct os_area_header *header)
                 return -1;
         }
 
-        if (header->os_area_offset > header->ldr_area_offset) {
+        if (header->db_area_offset > header->ldr_area_offset) {
                 pr_debug("%s:%d offsets failed\n", __func__, __LINE__);
                 return -1;
         }
@@ -196,58 +329,477 @@ static int __init verify_header(const struct os_area_header *header)
         return 0;
 }
 
-int __init ps3_os_area_init(void)
+static int db_verify(const struct os_area_db *db)
+{
+        if (db->magic_num != OS_AREA_DB_MAGIC_NUM) {
+                pr_debug("%s:%d magic_num failed\n", __func__, __LINE__);
+                return -1;
+        }
+
+        if (db->version != 1) {
+                pr_debug("%s:%d version failed\n", __func__, __LINE__);
+                return -1;
+        }
+
+        return 0;
+}
+
+struct db_index {
+       uint8_t owner:5;
+       uint8_t key:3;
+};
+
+struct db_iterator {
+        const struct os_area_db *db;
+        struct os_area_db_id match_id;
+        struct db_index *idx;
+        struct db_index *last_idx;
+        union {
+                uint64_t *value_64;
+                uint32_t *value_32;
+                uint16_t *value_16;
+        };
+};
+
+static unsigned int db_align_up(unsigned int val, unsigned int size)
+{
+        return (val + (size - 1)) & (~(size - 1));
+}
+
+/**
+ * db_for_each_64 - Iterator for 64 bit entries.
+ *
+ * A NULL value for id can be used to match all entries.
+ * OS_AREA_DB_OWNER_ANY and OS_AREA_DB_KEY_ANY can be used to match all.
+ */
+
+static int db_for_each_64(const struct os_area_db *db,
+        const struct os_area_db_id *match_id, struct db_iterator *i)
+{
+next:
+        if (!i->db) {
+                i->db = db;
+                i->match_id = match_id ? *match_id : os_area_db_id_any;
+                i->idx = (void *)db + db->index_64;
+                i->last_idx = i->idx + db->count_64;
+                i->value_64 = (void *)db + db->index_64
+                        + db_align_up(db->count_64, 8);
+        } else {
+                i->idx++;
+                i->value_64++;
+        }
+
+        if (i->idx >= i->last_idx) {
+                pr_debug("%s:%d: reached end\n", __func__, __LINE__);
+                return 0;
+        }
+
+        if (i->match_id.owner != OS_AREA_DB_OWNER_ANY
+                && i->match_id.owner != (int)i->idx->owner)
+                goto next;
+        if (i->match_id.key != OS_AREA_DB_KEY_ANY
+                && i->match_id.key != (int)i->idx->key)
+                goto next;
+
+        return 1;
+}
+
+static int db_delete_64(struct os_area_db *db, const struct os_area_db_id *id)
+{
+        struct db_iterator i;
+
+        for (i.db = NULL; db_for_each_64(db, id, &i); ) {
+
+                pr_debug("%s:%d: got (%d:%d) %llxh\n", __func__, __LINE__,
+                        i.idx->owner, i.idx->key,
+                        (unsigned long long)*i.value_64);
+
+                i.idx->owner = 0;
+                i.idx->key = 0;
+                *i.value_64 = 0;
+        }
+        return 0;
+}
+
+static int db_set_64(struct os_area_db *db, const struct os_area_db_id *id,
+        uint64_t value)
+{
+        struct db_iterator i;
+
+        pr_debug("%s:%d: (%d:%d) <= %llxh\n", __func__, __LINE__,
+                id->owner, id->key, (unsigned long long)value);
+
+        if (!id->owner || id->owner == OS_AREA_DB_OWNER_ANY
+                || id->key == OS_AREA_DB_KEY_ANY) {
+                pr_debug("%s:%d: bad id: (%d:%d)\n", __func__,
+                        __LINE__, id->owner, id->key);
+                return -1;
+        }
+
+        db_delete_64(db, id);
+
+        i.db = NULL;
+        if (db_for_each_64(db, &os_area_db_id_empty, &i)) {
+
+                pr_debug("%s:%d: got (%d:%d) %llxh\n", __func__, __LINE__,
+                        i.idx->owner, i.idx->key,
+                        (unsigned long long)*i.value_64);
+
+                i.idx->owner = id->owner;
+                i.idx->key = id->key;
+                *i.value_64 = value;
+
+                pr_debug("%s:%d: set (%d:%d) <= %llxh\n", __func__, __LINE__,
+                        i.idx->owner, i.idx->key,
+                        (unsigned long long)*i.value_64);
+                return 0;
+        }
+        pr_debug("%s:%d: database full.\n",
+                __func__, __LINE__);
+        return -1;
+}
+
+static int db_get_64(const struct os_area_db *db,
+        const struct os_area_db_id *id, uint64_t *value)
+{
+        struct db_iterator i;
+
+        i.db = NULL;
+        if (db_for_each_64(db, id, &i)) {
+                *value = *i.value_64;
+                pr_debug("%s:%d: found %lld\n", __func__, __LINE__,
+                                (long long int)*i.value_64);
+                return 0;
+        }
+        pr_debug("%s:%d: not found\n", __func__, __LINE__);
+        return -1;
+}
+
+static int db_get_rtc_diff(const struct os_area_db *db, int64_t *rtc_diff)
+{
+        return db_get_64(db, &os_area_db_id_rtc_diff, (uint64_t*)rtc_diff);
+}
+
+#define dump_db(a) _dump_db(a, __func__, __LINE__)
+static void _dump_db(const struct os_area_db *db, const char *func,
+        int line)
+{
+        pr_debug("%s:%d: db.magic_num:      '%s'\n", func, line,
+                (const char*)&db->magic_num);
+        pr_debug("%s:%d: db.version:         %u\n", func, line,
+                db->version);
+        pr_debug("%s:%d: db.index_64:        %u\n", func, line,
+                db->index_64);
+        pr_debug("%s:%d: db.count_64:        %u\n", func, line,
+                db->count_64);
+        pr_debug("%s:%d: db.index_32:        %u\n", func, line,
+                db->index_32);
+        pr_debug("%s:%d: db.count_32:        %u\n", func, line,
+                db->count_32);
+        pr_debug("%s:%d: db.index_16:        %u\n", func, line,
+                db->index_16);
+        pr_debug("%s:%d: db.count_16:        %u\n", func, line,
+                db->count_16);
+}
+
+static void os_area_db_init(struct os_area_db *db)
+{
+        enum {
+                HEADER_SIZE = offsetof(struct os_area_db, _db_data),
+                INDEX_64_COUNT = 64,
+                VALUES_64_COUNT = 57,
+                INDEX_32_COUNT = 64,
+                VALUES_32_COUNT = 57,
+                INDEX_16_COUNT = 64,
+                VALUES_16_COUNT = 57,
+        };
+
+        memset(db, 0, sizeof(struct os_area_db));
+
+        db->magic_num = OS_AREA_DB_MAGIC_NUM;
+        db->version = 1;
+        db->index_64 = HEADER_SIZE;
+        db->count_64 = VALUES_64_COUNT;
+        db->index_32 = HEADER_SIZE
+                        + INDEX_64_COUNT * sizeof(struct db_index)
+                        + VALUES_64_COUNT * sizeof(u64);
+        db->count_32 = VALUES_32_COUNT;
+        db->index_16 = HEADER_SIZE
+                        + INDEX_64_COUNT * sizeof(struct db_index)
+                        + VALUES_64_COUNT * sizeof(u64)
+                        + INDEX_32_COUNT * sizeof(struct db_index)
+                        + VALUES_32_COUNT * sizeof(u32);
+        db->count_16 = VALUES_16_COUNT;
+
+        /* Rules to check db layout. */
+
+        BUILD_BUG_ON(sizeof(struct db_index) != 1);
+        BUILD_BUG_ON(sizeof(struct os_area_db) != 2 * OS_AREA_SEGMENT_SIZE);
+        BUILD_BUG_ON(INDEX_64_COUNT & 0x7);
+        BUILD_BUG_ON(VALUES_64_COUNT > INDEX_64_COUNT);
+        BUILD_BUG_ON(INDEX_32_COUNT & 0x7);
+        BUILD_BUG_ON(VALUES_32_COUNT > INDEX_32_COUNT);
+        BUILD_BUG_ON(INDEX_16_COUNT & 0x7);
+        BUILD_BUG_ON(VALUES_16_COUNT > INDEX_16_COUNT);
+        BUILD_BUG_ON(HEADER_SIZE
+                        + INDEX_64_COUNT * sizeof(struct db_index)
+                        + VALUES_64_COUNT * sizeof(u64)
+                        + INDEX_32_COUNT * sizeof(struct db_index)
+                        + VALUES_32_COUNT * sizeof(u32)
+                        + INDEX_16_COUNT * sizeof(struct db_index)
+                        + VALUES_16_COUNT * sizeof(u16)
+                        > sizeof(struct os_area_db));
+}
+
+/**
+ * update_flash_db - Helper for os_area_queue_work_handler.
+ *
+ */
+
+static void update_flash_db(void)
+{
+        int result;
+        int file;
+        off_t offset;
+        ssize_t count;
+        static const unsigned int buf_len = 8 * OS_AREA_SEGMENT_SIZE;
+        const struct os_area_header *header;
+        struct os_area_db* db;
+
+        /* Read in header and db from flash. */
+
+        file = sys_open("/dev/ps3flash", O_RDWR, 0);
+
+        if (file < 0) {
+                pr_debug("%s:%d sys_open failed\n", __func__, __LINE__);
+                goto fail_open;
+        }
+
+        header = kmalloc(buf_len, GFP_KERNEL);
+
+        if (!header) {
+                pr_debug("%s:%d kmalloc failed\n", __func__, __LINE__);
+                goto fail_malloc;
+        }
+
+        offset = sys_lseek(file, 0, SEEK_SET);
+
+        if (offset != 0) {
+                pr_debug("%s:%d sys_lseek failed\n", __func__, __LINE__);
+                goto fail_header_seek;
+        }
+
+        count = sys_read(file, (char __user *)header, buf_len);
+
+        result = count < OS_AREA_SEGMENT_SIZE || verify_header(header)
+                || count < header->db_area_offset * OS_AREA_SEGMENT_SIZE;
+
+        if (result) {
+                pr_debug("%s:%d verify_header failed\n", __func__, __LINE__);
+                dump_header(header);
+                goto fail_header;
+        }
+
+        /* Now got a good db offset and some maybe good db data. */
+
+        db = (void*)header + header->db_area_offset * OS_AREA_SEGMENT_SIZE;
+
+        result = db_verify(db);
+
+        if (result) {
+                printk(KERN_NOTICE "%s:%d: Verify of flash database failed, "
+                        "formatting.\n", __func__, __LINE__);
+                dump_db(db);
+                os_area_db_init(db);
+        }
+
+        /* Now got good db data. */
+
+        db_set_64(db, &os_area_db_id_rtc_diff, saved_params.rtc_diff);
+
+        offset = sys_lseek(file, header->db_area_offset * OS_AREA_SEGMENT_SIZE,
+                SEEK_SET);
+
+        if (offset != header->db_area_offset * OS_AREA_SEGMENT_SIZE) {
+                pr_debug("%s:%d sys_lseek failed\n", __func__, __LINE__);
+                goto fail_db_seek;
+        }
+
+        count = sys_write(file, (const char __user *)db,
+                sizeof(struct os_area_db));
+
+        if (count < sizeof(struct os_area_db)) {
+                pr_debug("%s:%d sys_write failed\n", __func__, __LINE__);
+        }
+
+fail_db_seek:
+fail_header:
+fail_header_seek:
+        kfree(header);
+fail_malloc:
+        sys_close(file);
+fail_open:
+        return;
+}
+
+/**
+ * os_area_queue_work_handler - Asynchronous write handler.
+ *
+ * An asynchronous write for flash memory and the device tree.  Do not
+ * call directly, use os_area_queue_work().
+ */
+
+static void os_area_queue_work_handler(struct work_struct *work)
+{
+        struct device_node *node;
+
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+
+        node = of_find_node_by_path("/");
+
+        if (node) {
+                os_area_set_property(node, &property_rtc_diff);
+                of_node_put(node);
+        } else
+                pr_debug("%s:%d of_find_node_by_path failed\n",
+                        __func__, __LINE__);
+
+#if defined(CONFIG_PS3_FLASH) || defined(CONFIG_PS3_FLASH_MODULE)
+        update_flash_db();
+#else
+        printk(KERN_WARNING "%s:%d: No flash rom driver configured.\n",
+                __func__, __LINE__);
+#endif
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+}
+
+static void os_area_queue_work(void)
+{
+        static DECLARE_WORK(q, os_area_queue_work_handler);
+
+        wmb();
+        schedule_work(&q);
+}
+
+/**
+ * ps3_os_area_save_params - Copy data from os area mirror to @saved_params.
+ *
+ * For the convenience of the guest the HV makes a copy of the os area in
+ * flash to a high address in the boot memory region and then puts that RAM
+ * address and the byte count into the repository for retrieval by the guest.
+ * We copy the data we want into a static variable and allow the memory setup
+ * by the HV to be claimed by the lmb manager.
+ *
+ * The os area mirror will not be available to a second stage kernel, and
+ * the header verify will fail.  In this case, the saved_params values will
+ * be set from flash memory or the passed in device tree in ps3_os_area_init().
+ */
+
+void __init ps3_os_area_save_params(void)
 {
         int result;
         u64 lpar_addr;
         unsigned int size;
         struct os_area_header *header;
         struct os_area_params *params;
+        struct os_area_db *db;
+
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
 
         result = ps3_repository_read_boot_dat_info(&lpar_addr, &size);
 
         if (result) {
                 pr_debug("%s:%d ps3_repository_read_boot_dat_info failed\n",
                         __func__, __LINE__);
-                return result;
+                return;
         }
 
         header = (struct os_area_header *)__va(lpar_addr);
-        params = (struct os_area_params *)__va(lpar_addr + OS_AREA_SEGMENT_SIZE);
+        params = (struct os_area_params *)__va(lpar_addr
+                + OS_AREA_SEGMENT_SIZE);
 
         result = verify_header(header);
 
         if (result) {
+                /* Second stage kernels exit here. */
                 pr_debug("%s:%d verify_header failed\n", __func__, __LINE__);
                 dump_header(header);
-                return -EIO;
+                return;
         }
 
+        db = (struct os_area_db *)__va(lpar_addr
+                + header->db_area_offset * OS_AREA_SEGMENT_SIZE);
+
         dump_header(header);
         dump_params(params);
+        dump_db(db);
 
-        saved_params.rtc_diff = params->rtc_diff;
+        result = db_verify(db) || db_get_rtc_diff(db, &saved_params.rtc_diff);
+        if (result)
+                saved_params.rtc_diff = params->rtc_diff ? params->rtc_diff
+                        : SECONDS_FROM_1970_TO_2000;
         saved_params.av_multi_out = params->av_multi_out;
-        saved_params.ctrl_button = params->ctrl_button;
-        memcpy(saved_params.static_ip_addr, params->static_ip_addr, 4);
-        memcpy(saved_params.network_mask, params->network_mask, 4);
-        memcpy(saved_params.default_gateway, params->default_gateway, 4);
-        memcpy(saved_params.dns_secondary, params->dns_secondary, 4);
+        saved_params.valid = 1;
+
+        memset(header, 0, sizeof(*header));
 
-        return result;
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
 }
 
 /**
- * ps3_os_area_rtc_diff - Returns the ps3 rtc diff value.
+ * ps3_os_area_init - Setup os area device tree properties as needed.
+ */
+
+void __init ps3_os_area_init(void)
+{
+        struct device_node *node;
+
+        pr_debug(" -> %s:%d\n", __func__, __LINE__);
+
+        node = of_find_node_by_path("/");
+
+        if (!saved_params.valid && node) {
+                /* Second stage kernels should have a dt entry. */
+                os_area_get_property(node, &property_rtc_diff);
+                os_area_get_property(node, &property_av_multi_out);
+        }
+
+        if(!saved_params.rtc_diff)
+                saved_params.rtc_diff = SECONDS_FROM_1970_TO_2000;
+
+        if (node) {
+                os_area_set_property(node, &property_rtc_diff);
+                os_area_set_property(node, &property_av_multi_out);
+                of_node_put(node);
+        } else
+                pr_debug("%s:%d of_find_node_by_path failed\n",
+                        __func__, __LINE__);
+
+        pr_debug(" <- %s:%d\n", __func__, __LINE__);
+}
+
+/**
+ * ps3_os_area_get_rtc_diff - Returns the rtc diff value.
+ */
+
+u64 ps3_os_area_get_rtc_diff(void)
+{
+        return saved_params.rtc_diff;
+}
+
+/**
+ * ps3_os_area_set_rtc_diff - Set the rtc diff value.
  *
- * The ps3 rtc maintains a value that approximates seconds since
- * 2000-01-01 00:00:00 UTC.  Returns the exact number of seconds from 1970 to
- * 2000 when saved_params.rtc_diff has not been properly set up.
+ * An asynchronous write is needed to support writing updates from
+ * the timer interrupt context.
  */
 
-u64 ps3_os_area_rtc_diff(void)
+void ps3_os_area_set_rtc_diff(u64 rtc_diff)
 {
-        return saved_params.rtc_diff ? saved_params.rtc_diff : 946684800UL;
+        if (saved_params.rtc_diff != rtc_diff) {
+                saved_params.rtc_diff = rtc_diff;
+                os_area_queue_work();
+        }
 }
 
 /**
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 2eb8f92704b4..01f0c9506e11 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -47,7 +47,11 @@ void __init ps3_register_ipi_debug_brk(unsigned int cpu, unsigned int virq);
 /* smp */
 
 void smp_init_ps3(void);
+#ifdef CONFIG_SMP
 void ps3_smp_cleanup_cpu(int cpu);
+#else
+static inline void ps3_smp_cleanup_cpu(int cpu) { }
+#endif
 
 /* time */
 
@@ -58,8 +62,10 @@ int ps3_set_rtc_time(struct rtc_time *time);
 
 /* os area */
 
-int __init ps3_os_area_init(void);
-u64 ps3_os_area_rtc_diff(void);
+void __init ps3_os_area_save_params(void);
+void __init ps3_os_area_init(void);
+u64 ps3_os_area_get_rtc_diff(void);
+void ps3_os_area_set_rtc_diff(u64 rtc_diff);
 
 /* spu */
 
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 609945dbe394..5c2cbb08eb52 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -206,6 +206,7 @@ static void __init ps3_setup_arch(void)
         prealloc_ps3flash_bounce_buffer();
 
         ppc_md.power_save = ps3_power_save;
+        ps3_os_area_init();
 
         DBG(" <- %s:%d\n", __func__, __LINE__);
 }
@@ -228,7 +229,7 @@ static int __init ps3_probe(void)
 
         powerpc_firmware_features |= FW_FEATURE_PS3_POSSIBLE;
 
-        ps3_os_area_init();
+        ps3_os_area_save_params();
         ps3_mm_init();
         ps3_mm_vas_create(&htab_size);
         ps3_hpte_init(htab_size);
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
index 802a9ccacb5e..d0daf7d6d3b2 100644
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -50,12 +50,6 @@ static void __maybe_unused _dump_time(int time, const char *func,
         _dump_tm(&tm, func, line);
 }
 
-/**
- * rtc_shift - Difference in seconds between 1970 and the ps3 rtc value.
- */
-
-static s64 rtc_shift;
-
 void __init ps3_calibrate_decr(void)
 {
         int result;
@@ -66,8 +60,6 @@ void __init ps3_calibrate_decr(void)
 
         ppc_tb_freq = tmp;
         ppc_proc_freq = ppc_tb_freq * 40;
-
-        rtc_shift = ps3_os_area_rtc_diff();
 }
 
 static u64 read_rtc(void)
@@ -87,18 +79,18 @@ int ps3_set_rtc_time(struct rtc_time *tm)
         u64 now = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
                 tm->tm_hour, tm->tm_min, tm->tm_sec);
 
-        rtc_shift = now - read_rtc();
+        ps3_os_area_set_rtc_diff(now - read_rtc());
         return 0;
 }
 
 void ps3_get_rtc_time(struct rtc_time *tm)
 {
-        to_tm(read_rtc() + rtc_shift, tm);
+        to_tm(read_rtc() + ps3_os_area_get_rtc_diff(), tm);
         tm->tm_year -= 1900;
         tm->tm_mon -= 1;
 }
 
 unsigned long __init ps3_get_boot_time(void)
 {
-        return read_rtc() + rtc_shift;
+        return read_rtc() + ps3_os_area_get_rtc_diff();
 }
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index b8770395013d..22322b35a0ff 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -169,6 +169,8 @@ static void rtas_slot_error_detail(struct pci_dn *pdn, int severity,
  */
 static size_t gather_pci_data(struct pci_dn *pdn, char * buf, size_t len)
 {
+        struct device_node *dn;
+        struct pci_dev *dev = pdn->pcidev;
         u32 cfg;
         int cap, i;
         int n = 0;
@@ -184,6 +186,17 @@ static size_t gather_pci_data(struct pci_dn *pdn, char * buf, size_t len)
         n += scnprintf(buf+n, len-n, "cmd/stat:%x\n", cfg);
         printk(KERN_WARNING "EEH: PCI cmd/status register: %08x\n", cfg);
 
+        /* Gather bridge-specific registers */
+        if (dev->class >> 16 == PCI_BASE_CLASS_BRIDGE) {
+                rtas_read_config(pdn, PCI_SEC_STATUS, 2, &cfg);
+                n += scnprintf(buf+n, len-n, "sec stat:%x\n", cfg);
+                printk(KERN_WARNING "EEH: Bridge secondary status: %04x\n", cfg);
+
+                rtas_read_config(pdn, PCI_BRIDGE_CONTROL, 2, &cfg);
+                n += scnprintf(buf+n, len-n, "brdg ctl:%x\n", cfg);
+                printk(KERN_WARNING "EEH: Bridge control: %04x\n", cfg);
+        }
+
         /* Dump out the PCI-X command and status regs */
         cap = pci_find_capability(pdn->pcidev, PCI_CAP_ID_PCIX);
         if (cap) {
@@ -209,7 +222,7 @@ static size_t gather_pci_data(struct pci_dn *pdn, char * buf, size_t len)
                         printk(KERN_WARNING "EEH: PCI-E %02x: %08x\n", i, cfg);
                 }
 
-                cap = pci_find_ext_capability(pdn->pcidev,PCI_EXT_CAP_ID_ERR);
+                cap = pci_find_ext_capability(pdn->pcidev, PCI_EXT_CAP_ID_ERR);
                 if (cap) {
                         n += scnprintf(buf+n, len-n, "pci-e AER:\n");
                         printk(KERN_WARNING
@@ -222,6 +235,18 @@ static size_t gather_pci_data(struct pci_dn *pdn, char * buf, size_t len)
                         }
                 }
         }
+
+        /* Gather status on devices under the bridge */
+        if (dev->class >> 16 == PCI_BASE_CLASS_BRIDGE) {
+                dn = pdn->node->child;
+                while (dn) {
+                        pdn = PCI_DN(dn);
+                        if (pdn)
+                                n += gather_pci_data(pdn, buf+n, len-n);
+                        dn = dn->sibling;
+                }
+        }
+
         return n;
 }
 
@@ -750,12 +775,12 @@ int rtas_set_slot_reset(struct pci_dn *pdn)
                         return 0;
 
                 if (rc < 0) {
-                        printk (KERN_ERR "EEH: unrecoverable slot failure %s\n",
-                                pdn->node->full_name);
+                        printk(KERN_ERR "EEH: unrecoverable slot failure %s\n",
+                               pdn->node->full_name);
                         return -1;
                 }
-                printk (KERN_ERR "EEH: bus reset %d failed on slot %s\n",
-                        i+1, pdn->node->full_name);
+                printk(KERN_ERR "EEH: bus reset %d failed on slot %s, rc=%d\n",
+                       i+1, pdn->node->full_name, rc);
         }
 
         return -1;
@@ -930,7 +955,7 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
         pdn->eeh_freeze_count = 0;
         pdn->eeh_false_positives = 0;
 
-        if (status && strcmp(status, "ok") != 0)
+        if (status && strncmp(status, "ok", 2) != 0)
                 return NULL;    /* ignore devices with bad status */
 
         /* Ignore bad nodes. */
@@ -944,23 +969,6 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
         }
         pdn->class_code = *class_code;
 
-        /*
-         * Now decide if we are going to "Disable" EEH checking
-         * for this device.  We still run with the EEH hardware active,
-         * but we won't be checking for ff's.  This means a driver
-         * could return bad data (very bad!), an interrupt handler could
-         * hang waiting on status bits that won't change, etc.
-         * But there are a few cases like display devices that make sense.
-         */
-        enable = 1;     /* i.e. we will do checking */
-#if 0
-        if ((*class_code >> 16) == PCI_BASE_CLASS_DISPLAY)
-                enable = 0;
-#endif
-
-        if (!enable)
-                pdn->eeh_mode |= EEH_MODE_NOCHECK;
-
         /* Ok... see if this device supports EEH.  Some do, some don't,
          * and the only way to find out is to check each and every one. */
         regs = of_get_property(dn, "reg", NULL);
diff --git a/arch/powerpc/platforms/pseries/eeh_cache.c b/arch/powerpc/platforms/pseries/eeh_cache.c
index e49c815eae23..1e83fcd0df31 100644
--- a/arch/powerpc/platforms/pseries/eeh_cache.c
+++ b/arch/powerpc/platforms/pseries/eeh_cache.c
@@ -225,6 +225,10 @@ void pci_addr_cache_insert_device(struct pci_dev *dev)
 {
         unsigned long flags;
 
+        /* Ignore PCI bridges */
+        if ((dev->class >> 16) == PCI_BASE_CLASS_BRIDGE)
+                return;
+
         spin_lock_irqsave(&pci_io_addr_cache_root.piar_lock, flags);
         __pci_addr_cache_insert_device(dev);
         spin_unlock_irqrestore(&pci_io_addr_cache_root.piar_lock, flags);
@@ -285,16 +289,13 @@ void __init pci_addr_cache_build(void)
         spin_lock_init(&pci_io_addr_cache_root.piar_lock);
 
         while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-                /* Ignore PCI bridges */
-                if ((dev->class >> 16) == PCI_BASE_CLASS_BRIDGE)
-                        continue;
 
                 pci_addr_cache_insert_device(dev);
 
                 dn = pci_device_to_OF_node(dev);
                 if (!dn)
                         continue;
-                pci_dev_get (dev);  /* matching put is in eeh_remove_device() */
+                pci_dev_get(dev);  /* matching put is in eeh_remove_device() */
                 PCI_DN(dn)->pcidev = dev;
 
                 eeh_sysfs_add_device(dev);
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 9711eb0d5496..fc48b96c81bf 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -252,6 +252,20 @@ static struct notifier_block pseries_smp_nb = {
 
 static int __init pseries_cpu_hotplug_init(void)
 {
+        struct device_node *np;
+        const char *typep;
+
+        for_each_node_by_name(np, "interrupt-controller") {
+                typep = of_get_property(np, "compatible", NULL);
+                if (strstr(typep, "open-pic")) {
+                        of_node_put(np);
+
+                        printk(KERN_INFO "CPU Hotplug not supported on "
+                                "systems using MPIC\n");
+                        return 0;
+                }
+        }
+
         rtas_stop_self_args.token = rtas_token("stop-self");
         qcss_tok = rtas_token("query-cpu-stopped-state");
 
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 8cc6eeeaae2f..9a455d46379d 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -35,7 +35,6 @@
 #include <asm/tlbflush.h>
 #include <asm/tlb.h>
 #include <asm/prom.h>
-#include <asm/abs_addr.h>
 #include <asm/cputable.h>
 #include <asm/udbg.h>
 #include <asm/smp.h>
@@ -285,7 +284,7 @@ void vpa_init(int cpu)
 static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
                               unsigned long va, unsigned long pa,
                               unsigned long rflags, unsigned long vflags,
-                              int psize)
+                              int psize, int ssize)
 {
         unsigned long lpar_rc;
         unsigned long flags;
@@ -297,7 +296,7 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
                         "rflags=%lx, vflags=%lx, psize=%d)\n",
                 hpte_group, va, pa, rflags, vflags, psize);
 
-        hpte_v = hpte_encode_v(va, psize) | vflags | HPTE_V_VALID;
+        hpte_v = hpte_encode_v(va, psize, ssize) | vflags | HPTE_V_VALID;
         hpte_r = hpte_encode_r(pa, psize) | rflags;
 
         if (!(vflags & HPTE_V_BOLTED))
@@ -393,6 +392,22 @@ static void pSeries_lpar_hptab_clear(void)
 }
 
 /*
+ * This computes the AVPN and B fields of the first dword of a HPTE,
+ * for use when we want to match an existing PTE.  The bottom 7 bits
+ * of the returned value are zero.
+ */
+static inline unsigned long hpte_encode_avpn(unsigned long va, int psize,
+                                             int ssize)
+{
+        unsigned long v;
+
+        v = (va >> 23) & ~(mmu_psize_defs[psize].avpnm);
+        v <<= HPTE_V_AVPN_SHIFT;
+        v |= ((unsigned long) ssize) << HPTE_V_SSIZE_SHIFT;
+        return v;
+}
+
+/*
  * NOTE: for updatepp ops we are fortunate that the linux "newpp" bits and
  * the low 3 bits of flags happen to line up.  So no transform is needed.
  * We can probably optimize here and assume the high bits of newpp are
@@ -401,18 +416,18 @@ static void pSeries_lpar_hptab_clear(void)
 static long pSeries_lpar_hpte_updatepp(unsigned long slot,
                                        unsigned long newpp,
                                        unsigned long va,
-                                       int psize, int local)
+                                       int psize, int ssize, int local)
 {
         unsigned long lpar_rc;
         unsigned long flags = (newpp & 7) | H_AVPN;
         unsigned long want_v;
 
-        want_v = hpte_encode_v(va, psize);
+        want_v = hpte_encode_avpn(va, psize, ssize);
 
         DBG_LOW("    update: avpnv=%016lx, hash=%016lx, f=%x, psize: %d ... ",
-                want_v & HPTE_V_AVPN, slot, flags, psize);
+                want_v, slot, flags, psize);
 
-        lpar_rc = plpar_pte_protect(flags, slot, want_v & HPTE_V_AVPN);
+        lpar_rc = plpar_pte_protect(flags, slot, want_v);
 
         if (lpar_rc == H_NOT_FOUND) {
                 DBG_LOW("not found !\n");
@@ -445,32 +460,25 @@ static unsigned long pSeries_lpar_hpte_getword0(unsigned long slot)
         return dword0;
 }
 
-static long pSeries_lpar_hpte_find(unsigned long va, int psize)
+static long pSeries_lpar_hpte_find(unsigned long va, int psize, int ssize)
 {
         unsigned long hash;
-        unsigned long i, j;
+        unsigned long i;
         long slot;
         unsigned long want_v, hpte_v;
 
-        hash = hpt_hash(va, mmu_psize_defs[psize].shift);
-        want_v = hpte_encode_v(va, psize);
-
-        for (j = 0; j < 2; j++) {
-                slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
-                for (i = 0; i < HPTES_PER_GROUP; i++) {
-                        hpte_v = pSeries_lpar_hpte_getword0(slot);
-
-                        if (HPTE_V_COMPARE(hpte_v, want_v)
-                            && (hpte_v & HPTE_V_VALID)
-                            && (!!(hpte_v & HPTE_V_SECONDARY) == j)) {
-                                /* HPTE matches */
-                                if (j)
-                                        slot = -slot;
-                                return slot;
-                        }
-                        ++slot;
-                }
-                hash = ~hash;
+        hash = hpt_hash(va, mmu_psize_defs[psize].shift, ssize);
+        want_v = hpte_encode_avpn(va, psize, ssize);
+
+        /* Bolted entries are always in the primary group */
+        slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
+        for (i = 0; i < HPTES_PER_GROUP; i++) {
+                hpte_v = pSeries_lpar_hpte_getword0(slot);
+
+                if (HPTE_V_COMPARE(hpte_v, want_v) && (hpte_v & HPTE_V_VALID))
+                        /* HPTE matches */
+                        return slot;
+                ++slot;
         }
 
         return -1;
@@ -478,14 +486,14 @@ static long pSeries_lpar_hpte_find(unsigned long va, int psize)
 
 static void pSeries_lpar_hpte_updateboltedpp(unsigned long newpp,
                                              unsigned long ea,
-                                             int psize)
+                                             int psize, int ssize)
 {
         unsigned long lpar_rc, slot, vsid, va, flags;
 
-        vsid = get_kernel_vsid(ea);
-        va = (vsid << 28) | (ea & 0x0fffffff);
+        vsid = get_kernel_vsid(ea, ssize);
+        va = hpt_va(ea, vsid, ssize);
 
-        slot = pSeries_lpar_hpte_find(va, psize);
+        slot = pSeries_lpar_hpte_find(va, psize, ssize);
         BUG_ON(slot == -1);
 
         flags = newpp & 7;
@@ -495,7 +503,7 @@ static void pSeries_lpar_hpte_updateboltedpp(unsigned long newpp,
 }
 
 static void pSeries_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
-                                         int psize, int local)
+                                         int psize, int ssize, int local)
 {
         unsigned long want_v;
         unsigned long lpar_rc;
@@ -504,9 +512,8 @@ static void pSeries_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
         DBG_LOW("    inval : slot=%lx, va=%016lx, psize: %d, local: %d",
                 slot, va, psize, local);
 
-        want_v = hpte_encode_v(va, psize);
-        lpar_rc = plpar_pte_remove(H_AVPN, slot, want_v & HPTE_V_AVPN,
-                                   &dummy1, &dummy2);
+        want_v = hpte_encode_avpn(va, psize, ssize);
+        lpar_rc = plpar_pte_remove(H_AVPN, slot, want_v, &dummy1, &dummy2);
         if (lpar_rc == H_NOT_FOUND)
                 return;
 
@@ -534,18 +541,19 @@ static void pSeries_lpar_flush_hash_range(unsigned long number, int local)
         unsigned long va;
         unsigned long hash, index, shift, hidx, slot;
         real_pte_t pte;
-        int psize;
+        int psize, ssize;
 
         if (lock_tlbie)
                 spin_lock_irqsave(&pSeries_lpar_tlbie_lock, flags);
 
         psize = batch->psize;
+        ssize = batch->ssize;
         pix = 0;
         for (i = 0; i < number; i++) {
                 va = batch->vaddr[i];
                 pte = batch->pte[i];
                 pte_iterate_hashed_subpages(pte, psize, va, index, shift) {
-                        hash = hpt_hash(va, shift);
+                        hash = hpt_hash(va, shift, ssize);
                         hidx = __rpte_to_hidx(pte, index);
                         if (hidx & _PTEIDX_SECONDARY)
                                 hash = ~hash;
@@ -553,11 +561,11 @@ static void pSeries_lpar_flush_hash_range(unsigned long number, int local)
                         slot += hidx & _PTEIDX_GROUP_IX;
                         if (!firmware_has_feature(FW_FEATURE_BULK_REMOVE)) {
                                 pSeries_lpar_hpte_invalidate(slot, va, psize,
-                                                             local);
+                                                             ssize, local);
                         } else {
                                 param[pix] = HBR_REQUEST | HBR_AVPN | slot;
-                                param[pix+1] = hpte_encode_v(va, psize) &
-                                        HPTE_V_AVPN;
+                                param[pix+1] = hpte_encode_avpn(va, psize,
+                                                                ssize);
                                 pix += 2;
                                 if (pix == 8) {
                                         rc = plpar_hcall9(H_BULK_REMOVE, param,
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index 6063ea2f67ad..2793a1b100e6 100644
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -70,11 +70,15 @@ static int rtas_change_msi(struct pci_dn *pdn, u32 func, u32 num_irqs)
                 seq_num = rtas_ret[1];
         } while (rtas_busy_delay(rc));
 
-        if (rc == 0) /* Success */
-                rc = rtas_ret[0];
+        /*
+         * If the RTAS call succeeded, check the number of irqs is actually
+         * what we asked for. If not, return an error.
+         */
+        if (rc == 0 && rtas_ret[0] != num_irqs)
+                rc = -ENOSPC;
 
-        pr_debug("rtas_msi: ibm,change_msi(func=%d,num=%d) = (%d)\n",
-                 func, num_irqs, rc);
+        pr_debug("rtas_msi: ibm,change_msi(func=%d,num=%d), got %d rc = %d\n",
+                 func, num_irqs, rtas_ret[0], rc);
 
         return rc;
 }
@@ -87,7 +91,7 @@ static void rtas_disable_msi(struct pci_dev *pdev)
         if (!pdn)
                 return;
 
-        if (rtas_change_msi(pdn, RTAS_CHANGE_FN, 0) != 0)
+        if (rtas_change_msi(pdn, RTAS_CHANGE_FN, 0))
                 pr_debug("rtas_msi: Setting MSIs to 0 failed!\n");
 }
 
@@ -180,38 +184,31 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
         if (type == PCI_CAP_ID_MSI) {
                 rc = rtas_change_msi(pdn, RTAS_CHANGE_MSI_FN, nvec);
 
-                if (rc != nvec) {
+                if (rc) {
                         pr_debug("rtas_msi: trying the old firmware call.\n");
                         rc = rtas_change_msi(pdn, RTAS_CHANGE_FN, nvec);
                 }
         } else
                 rc = rtas_change_msi(pdn, RTAS_CHANGE_MSIX_FN, nvec);
 
-        if (rc != nvec) {
+        if (rc) {
                 pr_debug("rtas_msi: rtas_change_msi() failed\n");
-
-                /*
-                 * In case of an error it's not clear whether the device is
-                 * left with MSI enabled or not, so we explicitly disable.
-                 */
-                goto out_free;
+                return rc;
         }
 
         i = 0;
         list_for_each_entry(entry, &pdev->msi_list, list) {
                 hwirq = rtas_query_irq_number(pdn, i);
                 if (hwirq < 0) {
-                        rc = hwirq;
                         pr_debug("rtas_msi: error (%d) getting hwirq\n", rc);
-                        goto out_free;
+                        return hwirq;
                 }
 
                 virq = irq_create_mapping(NULL, hwirq);
 
                 if (virq == NO_IRQ) {
                         pr_debug("rtas_msi: Failed mapping hwirq %d\n", hwirq);
-                        rc = -ENOSPC;
-                        goto out_free;
+                        return -ENOSPC;
                 }
 
                 dev_dbg(&pdev->dev, "rtas_msi: allocated virq %d\n", virq);
@@ -220,10 +217,6 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
         }
 
         return 0;
-
- out_free:
-        rtas_teardown_msi_irqs(pdev);
-        return rc;
 }
 
 static void rtas_msi_pci_irq_fixup(struct pci_dev *pdev)
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index 9797b10b2935..73401c820110 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -44,15 +44,20 @@ static unsigned long rtas_log_start;
 static unsigned long rtas_log_size;
 
 static int surveillance_timeout = -1;
-static unsigned int rtas_event_scan_rate;
 static unsigned int rtas_error_log_max;
 static unsigned int rtas_error_log_buffer_max;
 
-static int full_rtas_msgs = 0;
+/* RTAS service tokens */
+static unsigned int event_scan;
+static unsigned int rtas_event_scan_rate;
 
-extern int no_logging;
+static int full_rtas_msgs = 0;
 
-volatile int error_log_cnt = 0;
+/* Stop logging to nvram after first fatal error */
+static int logging_enabled; /* Until we initialize everything,
+                             * make sure we don't try logging
+                             * anything */
+static int error_log_cnt;
 
 /*
  * Since we use 32 bit RTAS, the physical address of this must be below
@@ -61,8 +66,6 @@ volatile int error_log_cnt = 0;
  */
 static unsigned char logdata[RTAS_ERROR_LOG_MAX];
 
-static int get_eventscan_parms(void);
-
 static char *rtas_type[] = {
         "Unknown", "Retry", "TCE Error", "Internal Device Failure",
         "Timeout", "Data Parity", "Address Parity", "Cache Parity",
@@ -166,9 +169,9 @@ static int log_rtas_len(char * buf)
                 len += err->extended_log_length;
         }
 
-        if (rtas_error_log_max == 0) {
-                get_eventscan_parms();
-        }
+        if (rtas_error_log_max == 0)
+                rtas_error_log_max = rtas_get_error_log_max();
+
         if (len > rtas_error_log_max)
                 len = rtas_error_log_max;
 
@@ -215,8 +218,8 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
         }
 
         /* Write error to NVRAM */
-        if (!no_logging && !(err_type & ERR_FLAG_BOOT))
-                nvram_write_error_log(buf, len, err_type);
+        if (logging_enabled && !(err_type & ERR_FLAG_BOOT))
+                nvram_write_error_log(buf, len, err_type, error_log_cnt);
 
         /*
          * rtas errors can occur during boot, and we do want to capture
@@ -227,8 +230,8 @@ void pSeries_log_error(char *buf, unsigned int err_type, int fatal)
                 printk_log_rtas(buf, len);
 
         /* Check to see if we need to or have stopped logging */
-        if (fatal || no_logging) {
-                no_logging = 1;
+        if (fatal || !logging_enabled) {
+                logging_enabled = 0;
                 spin_unlock_irqrestore(&rtasd_log_lock, s);
                 return;
         }
@@ -300,7 +303,7 @@ static ssize_t rtas_log_read(struct file * file, char __user * buf,
 
         spin_lock_irqsave(&rtasd_log_lock, s);
         /* if it's 0, then we know we got the last one (the one in NVRAM) */
-        if (rtas_log_size == 0 && !no_logging)
+        if (rtas_log_size == 0 && logging_enabled)
                 nvram_clear_error_log();
         spin_unlock_irqrestore(&rtasd_log_lock, s);
 
@@ -356,32 +359,7 @@ static int enable_surveillance(int timeout)
         return -1;
 }
 
-static int get_eventscan_parms(void)
-{
-        struct device_node *node;
-        const int *ip;
-
-        node = of_find_node_by_path("/rtas");
-
-        ip = of_get_property(node, "rtas-event-scan-rate", NULL);
-        if (ip == NULL) {
-                printk(KERN_ERR "rtasd: no rtas-event-scan-rate\n");
-                of_node_put(node);
-                return -1;
-        }
-        rtas_event_scan_rate = *ip;
-        DEBUG("rtas-event-scan-rate %d\n", rtas_event_scan_rate);
-
-        /* Make room for the sequence number */
-        rtas_error_log_max = rtas_get_error_log_max();
-        rtas_error_log_buffer_max = rtas_error_log_max + sizeof(int);
-
-        of_node_put(node);
-
-        return 0;
-}
-
-static void do_event_scan(int event_scan)
+static void do_event_scan(void)
 {
         int error;
         do {
@@ -408,7 +386,7 @@ static void do_event_scan_all_cpus(long delay)
         cpu = first_cpu(cpu_online_map);
         for (;;) {
                 set_cpus_allowed(current, cpumask_of_cpu(cpu));
-                do_event_scan(rtas_token("event-scan"));
+                do_event_scan();
                 set_cpus_allowed(current, CPU_MASK_ALL);
 
                 /* Drop hotplug lock, and sleep for the specified delay */
@@ -426,31 +404,19 @@ static void do_event_scan_all_cpus(long delay)
 static int rtasd(void *unused)
 {
         unsigned int err_type;
-        int event_scan = rtas_token("event-scan");
         int rc;
 
         daemonize("rtasd");
 
-        if (event_scan == RTAS_UNKNOWN_SERVICE || get_eventscan_parms() == -1)
-                goto error;
-
-        rtas_log_buf = vmalloc(rtas_error_log_buffer_max*LOG_NUMBER);
-        if (!rtas_log_buf) {
-                printk(KERN_ERR "rtasd: no memory\n");
-                goto error;
-        }
-
         printk(KERN_DEBUG "RTAS daemon started\n");
-
         DEBUG("will sleep for %d milliseconds\n", (30000/rtas_event_scan_rate));
 
         /* See if we have any error stored in NVRAM */
         memset(logdata, 0, rtas_error_log_max);
-
-        rc = nvram_read_error_log(logdata, rtas_error_log_max, &err_type);
-
+        rc = nvram_read_error_log(logdata, rtas_error_log_max,
+                                  &err_type, &error_log_cnt);
         /* We can use rtas_log_buf now */
-        no_logging = 0;
+        logging_enabled = 1;
 
         if (!rc) {
                 if (err_type != ERR_FLAG_ALREADY_LOGGED) {
@@ -473,8 +439,6 @@ static int rtasd(void *unused)
         for (;;)
                 do_event_scan_all_cpus(30000/rtas_event_scan_rate);
 
-error:
-        /* Should delete proc entries */
         return -EINVAL;
 }
 
@@ -486,11 +450,28 @@ static int __init rtas_init(void)
                 return 0;
 
         /* No RTAS */
-        if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {
+        event_scan = rtas_token("event-scan");
+        if (event_scan == RTAS_UNKNOWN_SERVICE) {
                 printk(KERN_DEBUG "rtasd: no event-scan on system\n");
                 return -ENODEV;
         }
 
+        rtas_event_scan_rate = rtas_token("rtas-event-scan-rate");
+        if (rtas_event_scan_rate == RTAS_UNKNOWN_SERVICE) {
+                printk(KERN_ERR "rtasd: no rtas-event-scan-rate on system\n");
+                return -ENODEV;
+        }
+
+        /* Make room for the sequence number */
+        rtas_error_log_max = rtas_get_error_log_max();
+        rtas_error_log_buffer_max = rtas_error_log_max + sizeof(int);
+
+        rtas_log_buf = vmalloc(rtas_error_log_buffer_max*LOG_NUMBER);
+        if (!rtas_log_buf) {
+                printk(KERN_ERR "rtasd: no memory\n");
+                return -ENOMEM;
+        }
+
         entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);
         if (entry)
                 entry->proc_fops = &proc_rtas_log_operations;
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index f0b7146a110f..fdb9b1c8f977 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -257,11 +257,6 @@ static void __init pSeries_setup_arch(void)
         /* init to some ~sane value until calibrate_delay() runs */
         loops_per_jiffy = 50000000;
 
-        if (ROOT_DEV == 0) {
-                printk("No ramdisk, default root is /dev/sda2\n");
-                ROOT_DEV = Root_SDA2;
-        }
-
         fwnmi_init();
 
         /* Find and initialize PCI host bridges */
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index f0b5ff17d860..66e7d68ffeb1 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -540,7 +540,7 @@ static void __init xics_init_host(void)
                 ops = &xics_host_lpar_ops;
         else
                 ops = &xics_host_direct_ops;
-        xics_host = irq_alloc_host(IRQ_HOST_MAP_TREE, 0, ops,
+        xics_host = irq_alloc_host(NULL, IRQ_HOST_MAP_TREE, 0, ops,
                                    XICS_IRQ_SPURIOUS);
         BUG_ON(xics_host == NULL);
         irq_set_default_host(xics_host);
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 08ce31e612c2..1a6f5641ebc8 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -6,7 +6,6 @@ mpic-msi-obj-$(CONFIG_PCI_MSI)	+= mpic_msi.o mpic_u3msi.o
 obj-$(CONFIG_MPIC)              += mpic.o $(mpic-msi-obj-y)
 
 obj-$(CONFIG_PPC_MPC106)        += grackle.o
-obj-$(CONFIG_PPC_DCR)           += dcr.o
 obj-$(CONFIG_PPC_DCR_NATIVE)    += dcr-low.o
 obj-$(CONFIG_PPC_PMI)           += pmi.o
 obj-$(CONFIG_U3_DART)           += dart_iommu.o
@@ -16,25 +15,24 @@ obj-$(CONFIG_FSL_PCI)		+= fsl_pci.o
 obj-$(CONFIG_TSI108_BRIDGE)     += tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)      += qe_lib/
 mv64x60-$(CONFIG_PCI)           += mv64x60_pci.o
-obj-$(CONFIG_MV64X60)           += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o
+obj-$(CONFIG_MV64X60)           += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o \
+                                   mv64x60_udbg.o
 obj-$(CONFIG_RTC_DRV_CMOS)      += rtc_cmos_setup.o
 obj-$(CONFIG_AXON_RAM)          += axonram.o
 
-# contains only the suspend handler for time
-ifeq ($(CONFIG_RTC_CLASS),)
-obj-$(CONFIG_PM)                += timer.o
-endif
-
 ifeq ($(CONFIG_PPC_MERGE),y)
 obj-$(CONFIG_PPC_INDIRECT_PCI)  += indirect_pci.o
 obj-$(CONFIG_PPC_I8259)         += i8259.o
 obj-$(CONFIG_PPC_83xx)          += ipic.o
 obj-$(CONFIG_4xx)               += uic.o
+obj-$(CONFIG_XILINX_VIRTEX)     += xilinx_intc.o
 endif
 
 # Temporary hack until we have migrated to asm-powerpc
 ifeq ($(ARCH),powerpc)
+obj-$(CONFIG_CPM)               += cpm_common.o
 obj-$(CONFIG_CPM2)              += cpm2_common.o cpm2_pic.o
+obj-$(CONFIG_PPC_DCR)           += dcr.o
 obj-$(CONFIG_8xx)               += mpc8xx_pic.o commproc.o
 obj-$(CONFIG_UCODE_PATCH)       += micropatch.o
 endif
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index ab037a3a40db..5eaf3e3f4b8b 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -117,7 +117,7 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio)
         transfered = 0;
         bio_for_each_segment(vec, bio, idx) {
                 if (unlikely(phys_mem + vec->bv_len > phys_end)) {
-                        bio_io_error(bio, bio->bi_size);
+                        bio_io_error(bio);
                         rc = -ERANGE;
                         break;
                 }
@@ -131,7 +131,7 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio)
                 phys_mem += vec->bv_len;
                 transfered += vec->bv_len;
         }
-        bio_endio(bio, transfered, 0);
+        bio_endio(bio, 0);
 
         return rc;
 }
@@ -324,11 +324,13 @@ static struct of_device_id axon_ram_device_id[] = {
 };
 
 static struct of_platform_driver axon_ram_driver = {
-        .owner          = THIS_MODULE,
-        .name           = AXON_RAM_MODULE_NAME,
         .match_table    = axon_ram_device_id,
         .probe          = axon_ram_probe,
-        .remove         = axon_ram_remove
+        .remove         = axon_ram_remove,
+        .driver         = {
+                .owner  = THIS_MODULE,
+                .name   = AXON_RAM_MODULE_NAME,
+        },
 };
 
 /**
diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/commproc.c
index dd5417aec1b4..f6a63780bbde 100644
--- a/arch/powerpc/sysdev/commproc.c
+++ b/arch/powerpc/sysdev/commproc.c
@@ -39,18 +39,21 @@
 #include <asm/tlbflush.h>
 #include <asm/rheap.h>
 #include <asm/prom.h>
+#include <asm/cpm.h>
 
 #include <asm/fs_pd.h>
 
 #define CPM_MAP_SIZE    (0x4000)
 
+#ifndef CONFIG_PPC_CPM_NEW_BINDING
 static void m8xx_cpm_dpinit(void);
-static  uint    host_buffer;    /* One page of host buffer */
-static  uint    host_end;       /* end + 1 */
-cpm8xx_t        *cpmp;          /* Pointer to comm processor space */
-cpic8xx_t       *cpic_reg;
+#endif
+static uint host_buffer; /* One page of host buffer */
+static uint host_end;    /* end + 1 */
+cpm8xx_t __iomem *cpmp;  /* Pointer to comm processor space */
+immap_t __iomem *mpc8xx_immr;
+static cpic8xx_t __iomem *cpic_reg;
 
-static struct device_node *cpm_pic_node;
 static struct irq_host *cpm_pic_host;
 
 static void cpm_mask_irq(unsigned int irq)
@@ -95,11 +98,6 @@ int cpm_get_irq(void)
         return irq_linear_revmap(cpm_pic_host, cpm_vec);
 }
 
-static int cpm_pic_host_match(struct irq_host *h, struct device_node *node)
-{
-        return cpm_pic_node == node;
-}
-
 static int cpm_pic_host_map(struct irq_host *h, unsigned int virq,
                           irq_hw_number_t hw)
 {
@@ -115,7 +113,7 @@ static int cpm_pic_host_map(struct irq_host *h, unsigned int virq,
  * and return.  This is a no-op function so we don't need any special
  * tests in the interrupt handler.
  */
-static  irqreturn_t cpm_error_interrupt(int irq, void *dev)
+static irqreturn_t cpm_error_interrupt(int irq, void *dev)
 {
         return IRQ_HANDLED;
 }
@@ -127,7 +125,6 @@ static struct irqaction cpm_error_irqaction = {
 };
 
 static struct irq_host_ops cpm_pic_host_ops = {
-        .match = cpm_pic_host_match,
         .map = cpm_pic_host_map,
 };
 
@@ -140,16 +137,19 @@ unsigned int cpm_pic_init(void)
 
         pr_debug("cpm_pic_init\n");
 
-        np = of_find_compatible_node(NULL, "cpm-pic", "CPM");
+        np = of_find_compatible_node(NULL, NULL, "fsl,cpm1-pic");
+        if (np == NULL)
+                np = of_find_compatible_node(NULL, "cpm-pic", "CPM");
         if (np == NULL) {
                 printk(KERN_ERR "CPM PIC init: can not find cpm-pic node\n");
                 return sirq;
         }
+
         ret = of_address_to_resource(np, 0, &res);
         if (ret)
                 goto end;
 
-        cpic_reg = (void *)ioremap(res.start, res.end - res.start + 1);
+        cpic_reg = ioremap(res.start, res.end - res.start + 1);
         if (cpic_reg == NULL)
                 goto end;
 
@@ -165,23 +165,24 @@ unsigned int cpm_pic_init(void)
 
         out_be32(&cpic_reg->cpic_cimr, 0);
 
-        cpm_pic_node = of_node_get(np);
-
-        cpm_pic_host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, 64, &cpm_pic_host_ops, 64);
+        cpm_pic_host = irq_alloc_host(of_node_get(np), IRQ_HOST_MAP_LINEAR,
+                                      64, &cpm_pic_host_ops, 64);
         if (cpm_pic_host == NULL) {
                 printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n");
                 sirq = NO_IRQ;
                 goto end;
         }
-        of_node_put(np);
 
         /* Install our own error handler. */
-        np = of_find_node_by_type(NULL, "cpm");
+        np = of_find_compatible_node(NULL, NULL, "fsl,cpm1");
+        if (np == NULL)
+                np = of_find_node_by_type(NULL, "cpm");
         if (np == NULL) {
                 printk(KERN_ERR "CPM PIC init: can not find cpm node\n");
                 goto end;
         }
-        eirq= irq_of_parse_and_map(np, 0);
+
+        eirq = irq_of_parse_and_map(np, 0);
         if (eirq == NO_IRQ)
                 goto end;
 
@@ -195,23 +196,30 @@ end:
         return sirq;
 }
 
-void cpm_reset(void)
+void __init cpm_reset(void)
 {
-        cpm8xx_t        *commproc;
-        sysconf8xx_t    *siu_conf;
+        sysconf8xx_t __iomem *siu_conf;
 
-        commproc = (cpm8xx_t *)ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE);
+        mpc8xx_immr = ioremap(get_immrbase(), 0x4000);
+        if (!mpc8xx_immr) {
+                printk(KERN_CRIT "Could not map IMMR\n");
+                return;
+        }
 
-#ifdef CONFIG_UCODE_PATCH
+        cpmp = &mpc8xx_immr->im_cpm;
+
+#ifndef CONFIG_PPC_EARLY_DEBUG_CPM
         /* Perform a reset.
         */
-        out_be16(&commproc->cp_cpcr,  CPM_CR_RST | CPM_CR_FLG);
+        out_be16(&cpmp->cp_cpcr, CPM_CR_RST | CPM_CR_FLG);
 
         /* Wait for it.
         */
-        while (in_be16(&commproc->cp_cpcr) & CPM_CR_FLG);
+        while (in_be16(&cpmp->cp_cpcr) & CPM_CR_FLG);
+#endif
 
-        cpm_load_patch(commproc);
+#ifdef CONFIG_UCODE_PATCH
+        cpm_load_patch(cpmp);
 #endif
 
         /* Set SDMA Bus Request priority 5.
@@ -220,16 +228,16 @@ void cpm_reset(void)
          * manual recommends it.
          * Bit 25, FAM can also be set to use FEC aggressive mode (860T).
          */
-        siu_conf = (sysconf8xx_t*)immr_map(im_siu_conf);
+        siu_conf = immr_map(im_siu_conf);
         out_be32(&siu_conf->sc_sdcr, 1);
         immr_unmap(siu_conf);
 
+#ifdef CONFIG_PPC_CPM_NEW_BINDING
+        cpm_muram_init();
+#else
         /* Reclaim the DP memory for our use. */
         m8xx_cpm_dpinit();
-
-        /* Tell everyone where the comm processor resides.
-        */
-        cpmp = commproc;
+#endif
 }
 
 /* We used to do this earlier, but have to postpone as long as possible
@@ -279,22 +287,23 @@ m8xx_cpm_hostalloc(uint size)
 void
 cpm_setbrg(uint brg, uint rate)
 {
-        volatile uint   *bp;
+        u32 __iomem *bp;
 
         /* This is good enough to get SMCs running.....
         */
-        bp = (uint *)&cpmp->cp_brgc1;
+        bp = &cpmp->cp_brgc1;
         bp += brg;
         /* The BRG has a 12-bit counter.  For really slow baud rates (or
          * really fast processors), we may have to further divide by 16.
          */
         if (((BRG_UART_CLK / rate) - 1) < 4096)
-                *bp = (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN;
+                out_be32(bp, (((BRG_UART_CLK / rate) - 1) << 1) | CPM_BRG_EN);
         else
-                *bp = (((BRG_UART_CLK_DIV16 / rate) - 1) << 1) |
-                                                CPM_BRG_EN | CPM_BRG_DIV16;
+                out_be32(bp, (((BRG_UART_CLK_DIV16 / rate) - 1) << 1) |
+                             CPM_BRG_EN | CPM_BRG_DIV16);
 }
 
+#ifndef CONFIG_PPC_CPM_NEW_BINDING
 /*
  * dpalloc / dpfree bits.
  */
@@ -307,15 +316,15 @@ static rh_block_t cpm_boot_dpmem_rh_block[16];
 static rh_info_t cpm_dpmem_info;
 
 #define CPM_DPMEM_ALIGNMENT     8
-static u8* dpram_vbase;
-static uint dpram_pbase;
+static u8 __iomem *dpram_vbase;
+static phys_addr_t dpram_pbase;
 
-void m8xx_cpm_dpinit(void)
+static void m8xx_cpm_dpinit(void)
 {
         spin_lock_init(&cpm_dpmem_lock);
 
-        dpram_vbase = immr_map_size(im_cpm.cp_dpmem, CPM_DATAONLY_BASE + CPM_DATAONLY_SIZE);
-        dpram_pbase = (uint)&((immap_t *)IMAP_ADDR)->im_cpm.cp_dpmem;
+        dpram_vbase = cpmp->cp_dpmem;
+        dpram_pbase = get_immrbase() + offsetof(immap_t, im_cpm.cp_dpmem);
 
         /* Initialize the info header */
         rh_init(&cpm_dpmem_info, CPM_DPMEM_ALIGNMENT,
@@ -391,8 +400,210 @@ void *cpm_dpram_addr(unsigned long offset)
 }
 EXPORT_SYMBOL(cpm_dpram_addr);
 
-uint cpm_dpram_phys(u8* addr)
+uint cpm_dpram_phys(u8 *addr)
 {
         return (dpram_pbase + (uint)(addr - dpram_vbase));
 }
 EXPORT_SYMBOL(cpm_dpram_phys);
+#endif /* !CONFIG_PPC_CPM_NEW_BINDING */
+
+struct cpm_ioport16 {
+        __be16 dir, par, sor, dat, intr;
+        __be16 res[3];
+};
+
+struct cpm_ioport32 {
+        __be32 dir, par, sor;
+};
+
+static void cpm1_set_pin32(int port, int pin, int flags)
+{
+        struct cpm_ioport32 __iomem *iop;
+        pin = 1 << (31 - pin);
+
+        if (port == CPM_PORTB)
+                iop = (struct cpm_ioport32 __iomem *)
+                      &mpc8xx_immr->im_cpm.cp_pbdir;
+        else
+                iop = (struct cpm_ioport32 __iomem *)
+                      &mpc8xx_immr->im_cpm.cp_pedir;
+
+        if (flags & CPM_PIN_OUTPUT)
+                setbits32(&iop->dir, pin);
+        else
+                clrbits32(&iop->dir, pin);
+
+        if (!(flags & CPM_PIN_GPIO))
+                setbits32(&iop->par, pin);
+        else
+                clrbits32(&iop->par, pin);
+
+        if (port == CPM_PORTE) {
+                if (flags & CPM_PIN_SECONDARY)
+                        setbits32(&iop->sor, pin);
+                else
+                        clrbits32(&iop->sor, pin);
+
+                if (flags & CPM_PIN_OPENDRAIN)
+                        setbits32(&mpc8xx_immr->im_cpm.cp_peodr, pin);
+                else
+                        clrbits32(&mpc8xx_immr->im_cpm.cp_peodr, pin);
+        }
+}
+
+static void cpm1_set_pin16(int port, int pin, int flags)
+{
+        struct cpm_ioport16 __iomem *iop =
+                (struct cpm_ioport16 __iomem *)&mpc8xx_immr->im_ioport;
+
+        pin = 1 << (15 - pin);
+
+        if (port != 0)
+                iop += port - 1;
+
+        if (flags & CPM_PIN_OUTPUT)
+                setbits16(&iop->dir, pin);
+        else
+                clrbits16(&iop->dir, pin);
+
+        if (!(flags & CPM_PIN_GPIO))
+                setbits16(&iop->par, pin);
+        else
+                clrbits16(&iop->par, pin);
+
+        if (port == CPM_PORTC) {
+                if (flags & CPM_PIN_SECONDARY)
+                        setbits16(&iop->sor, pin);
+                else
+                        clrbits16(&iop->sor, pin);
+        }
+}
+
+void cpm1_set_pin(enum cpm_port port, int pin, int flags)
+{
+        if (port == CPM_PORTB || port == CPM_PORTE)
+                cpm1_set_pin32(port, pin, flags);
+        else
+                cpm1_set_pin16(port, pin, flags);
+}
+
+int cpm1_clk_setup(enum cpm_clk_target target, int clock, int mode)
+{
+        int shift;
+        int i, bits = 0;
+        u32 __iomem *reg;
+        u32 mask = 7;
+
+        u8 clk_map[][3] = {
+                {CPM_CLK_SCC1, CPM_BRG1, 0},
+                {CPM_CLK_SCC1, CPM_BRG2, 1},
+                {CPM_CLK_SCC1, CPM_BRG3, 2},
+                {CPM_CLK_SCC1, CPM_BRG4, 3},
+                {CPM_CLK_SCC1, CPM_CLK1, 4},
+                {CPM_CLK_SCC1, CPM_CLK2, 5},
+                {CPM_CLK_SCC1, CPM_CLK3, 6},
+                {CPM_CLK_SCC1, CPM_CLK4, 7},
+
+                {CPM_CLK_SCC2, CPM_BRG1, 0},
+                {CPM_CLK_SCC2, CPM_BRG2, 1},
+                {CPM_CLK_SCC2, CPM_BRG3, 2},
+                {CPM_CLK_SCC2, CPM_BRG4, 3},
+                {CPM_CLK_SCC2, CPM_CLK1, 4},
+                {CPM_CLK_SCC2, CPM_CLK2, 5},
+                {CPM_CLK_SCC2, CPM_CLK3, 6},
+                {CPM_CLK_SCC2, CPM_CLK4, 7},
+
+                {CPM_CLK_SCC3, CPM_BRG1, 0},
+                {CPM_CLK_SCC3, CPM_BRG2, 1},
+                {CPM_CLK_SCC3, CPM_BRG3, 2},
+                {CPM_CLK_SCC3, CPM_BRG4, 3},
+                {CPM_CLK_SCC3, CPM_CLK5, 4},
+                {CPM_CLK_SCC3, CPM_CLK6, 5},
+                {CPM_CLK_SCC3, CPM_CLK7, 6},
+                {CPM_CLK_SCC3, CPM_CLK8, 7},
+
+                {CPM_CLK_SCC4, CPM_BRG1, 0},
+                {CPM_CLK_SCC4, CPM_BRG2, 1},
+                {CPM_CLK_SCC4, CPM_BRG3, 2},
+                {CPM_CLK_SCC4, CPM_BRG4, 3},
+                {CPM_CLK_SCC4, CPM_CLK5, 4},
+                {CPM_CLK_SCC4, CPM_CLK6, 5},
+                {CPM_CLK_SCC4, CPM_CLK7, 6},
+                {CPM_CLK_SCC4, CPM_CLK8, 7},
+
+                {CPM_CLK_SMC1, CPM_BRG1, 0},
+                {CPM_CLK_SMC1, CPM_BRG2, 1},
+                {CPM_CLK_SMC1, CPM_BRG3, 2},
+                {CPM_CLK_SMC1, CPM_BRG4, 3},
+                {CPM_CLK_SMC1, CPM_CLK1, 4},
+                {CPM_CLK_SMC1, CPM_CLK2, 5},
+                {CPM_CLK_SMC1, CPM_CLK3, 6},
+                {CPM_CLK_SMC1, CPM_CLK4, 7},
+
+                {CPM_CLK_SMC2, CPM_BRG1, 0},
+                {CPM_CLK_SMC2, CPM_BRG2, 1},
+                {CPM_CLK_SMC2, CPM_BRG3, 2},
+                {CPM_CLK_SMC2, CPM_BRG4, 3},
+                {CPM_CLK_SMC2, CPM_CLK5, 4},
+                {CPM_CLK_SMC2, CPM_CLK6, 5},
+                {CPM_CLK_SMC2, CPM_CLK7, 6},
+                {CPM_CLK_SMC2, CPM_CLK8, 7},
+        };
+
+        switch (target) {
+        case CPM_CLK_SCC1:
+                reg = &mpc8xx_immr->im_cpm.cp_sicr;
+                shift = 0;
+                break;
+
+        case CPM_CLK_SCC2:
+                reg = &mpc8xx_immr->im_cpm.cp_sicr;
+                shift = 8;
+                break;
+
+        case CPM_CLK_SCC3:
+                reg = &mpc8xx_immr->im_cpm.cp_sicr;
+                shift = 16;
+                break;
+
+        case CPM_CLK_SCC4:
+                reg = &mpc8xx_immr->im_cpm.cp_sicr;
+                shift = 24;
+                break;
+
+        case CPM_CLK_SMC1:
+                reg = &mpc8xx_immr->im_cpm.cp_simode;
+                shift = 12;
+                break;
+
+        case CPM_CLK_SMC2:
+                reg = &mpc8xx_immr->im_cpm.cp_simode;
+                shift = 28;
+                break;
+
+        default:
+                printk(KERN_ERR "cpm1_clock_setup: invalid clock target\n");
+                return -EINVAL;
+        }
+
+        if (reg == &mpc8xx_immr->im_cpm.cp_sicr && mode == CPM_CLK_RX)
+                shift += 3;
+
+        for (i = 0; i < ARRAY_SIZE(clk_map); i++) {
+                if (clk_map[i][0] == target && clk_map[i][1] == clock) {
+                        bits = clk_map[i][2];
+                        break;
+                }
+        }
+
+        if (i == ARRAY_SIZE(clk_map)) {
+                printk(KERN_ERR "cpm1_clock_setup: invalid clock combination\n");
+                return -EINVAL;
+        }
+
+        bits <<= shift;
+        mask <<= shift;
+        out_be32(reg, (in_be32(reg) & ~mask) | bits);
+
+        return 0;
+}
diff --git a/arch/powerpc/sysdev/commproc.h b/arch/powerpc/sysdev/commproc.h
new file mode 100644
index 000000000000..9155ba467274
--- /dev/null
+++ b/arch/powerpc/sysdev/commproc.h
@@ -0,0 +1,12 @@
+#ifndef _POWERPC_SYSDEV_COMMPROC_H
+#define _POWERPC_SYSDEV_COMMPROC_H
+
+extern void cpm_reset(void);
+extern void mpc8xx_restart(char *cmd);
+extern void mpc8xx_calibrate_decr(void);
+extern int mpc8xx_set_rtc_time(struct rtc_time *tm);
+extern void mpc8xx_get_rtc_time(struct rtc_time *tm);
+extern void m8xx_pic_init(void);
+extern unsigned int mpc8xx_get_irq(void);
+
+#endif
diff --git a/arch/powerpc/sysdev/cpm2_common.c b/arch/powerpc/sysdev/cpm2_common.c
index c827715a5090..859362fecb7c 100644
--- a/arch/powerpc/sysdev/cpm2_common.c
+++ b/arch/powerpc/sysdev/cpm2_common.c
@@ -33,6 +33,8 @@
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
+#include <linux/of.h>
+
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mpc8260.h>
@@ -44,14 +46,16 @@
 
 #include <sysdev/fsl_soc.h>
 
+#ifndef CONFIG_PPC_CPM_NEW_BINDING
 static void cpm2_dpinit(void);
-cpm_cpm2_t      *cpmp;          /* Pointer to comm processor space */
+#endif
+
+cpm_cpm2_t __iomem *cpmp; /* Pointer to comm processor space */
 
 /* We allocate this here because it is used almost exclusively for
  * the communication processor devices.
  */
-cpm2_map_t *cpm2_immr;
-intctl_cpm2_t *cpm2_intctl;
+cpm2_map_t __iomem *cpm2_immr;
 
 #define CPM_MAP_SIZE    (0x40000)       /* 256k - the PQ3 reserve this amount
                                            of space for CPM as it is larger
@@ -60,12 +64,19 @@ intctl_cpm2_t *cpm2_intctl;
 void
 cpm2_reset(void)
 {
-        cpm2_immr = (cpm2_map_t *)ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE);
-        cpm2_intctl = cpm2_map(im_intctl);
+#ifdef CONFIG_PPC_85xx
+        cpm2_immr = ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE);
+#else
+        cpm2_immr = ioremap(get_immrbase(), CPM_MAP_SIZE);
+#endif
 
         /* Reclaim the DP memory for our use.
          */
+#ifdef CONFIG_PPC_CPM_NEW_BINDING
+        cpm_muram_init();
+#else
         cpm2_dpinit();
+#endif
 
         /* Tell everyone where the comm processor resides.
          */
@@ -91,7 +102,7 @@ cpm2_reset(void)
 void
 cpm_setbrg(uint brg, uint rate)
 {
-        volatile uint   *bp;
+        u32 __iomem *bp;
 
         /* This is good enough to get SMCs running.....
         */
@@ -113,7 +124,8 @@ cpm_setbrg(uint brg, uint rate)
 void
 cpm2_fastbrg(uint brg, uint rate, int div16)
 {
-        volatile uint   *bp;
+        u32 __iomem *bp;
+        u32 val;
 
         if (brg < 4) {
                 bp = cpm2_map_size(im_brgc1, 16);
@@ -123,10 +135,11 @@ cpm2_fastbrg(uint brg, uint rate, int div16)
                 brg -= 4;
         }
         bp += brg;
-        *bp = ((BRG_INT_CLK / rate) << 1) | CPM_BRG_EN;
+        val = ((BRG_INT_CLK / rate) << 1) | CPM_BRG_EN;
         if (div16)
-                *bp |= CPM_BRG_DIV16;
+                val |= CPM_BRG_DIV16;
 
+        out_be32(bp, val);
         cpm2_unmap(bp);
 }
 
@@ -135,10 +148,11 @@ int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
         int ret = 0;
         int shift;
         int i, bits = 0;
-        cpmux_t *im_cpmux;
-        u32 *reg;
+        cpmux_t __iomem *im_cpmux;
+        u32 __iomem *reg;
         u32 mask = 7;
-        u8 clk_map [24][3] = {
+
+        u8 clk_map[][3] = {
                 {CPM_CLK_FCC1, CPM_BRG5, 0},
                 {CPM_CLK_FCC1, CPM_BRG6, 1},
                 {CPM_CLK_FCC1, CPM_BRG7, 2},
@@ -162,8 +176,40 @@ int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
                 {CPM_CLK_FCC3, CPM_CLK13, 4},
                 {CPM_CLK_FCC3, CPM_CLK14, 5},
                 {CPM_CLK_FCC3, CPM_CLK15, 6},
-                {CPM_CLK_FCC3, CPM_CLK16, 7}
-                };
+                {CPM_CLK_FCC3, CPM_CLK16, 7},
+                {CPM_CLK_SCC1, CPM_BRG1, 0},
+                {CPM_CLK_SCC1, CPM_BRG2, 1},
+                {CPM_CLK_SCC1, CPM_BRG3, 2},
+                {CPM_CLK_SCC1, CPM_BRG4, 3},
+                {CPM_CLK_SCC1, CPM_CLK11, 4},
+                {CPM_CLK_SCC1, CPM_CLK12, 5},
+                {CPM_CLK_SCC1, CPM_CLK3, 6},
+                {CPM_CLK_SCC1, CPM_CLK4, 7},
+                {CPM_CLK_SCC2, CPM_BRG1, 0},
+                {CPM_CLK_SCC2, CPM_BRG2, 1},
+                {CPM_CLK_SCC2, CPM_BRG3, 2},
+                {CPM_CLK_SCC2, CPM_BRG4, 3},
+                {CPM_CLK_SCC2, CPM_CLK11, 4},
+                {CPM_CLK_SCC2, CPM_CLK12, 5},
+                {CPM_CLK_SCC2, CPM_CLK3, 6},
+                {CPM_CLK_SCC2, CPM_CLK4, 7},
+                {CPM_CLK_SCC3, CPM_BRG1, 0},
+                {CPM_CLK_SCC3, CPM_BRG2, 1},
+                {CPM_CLK_SCC3, CPM_BRG3, 2},
+                {CPM_CLK_SCC3, CPM_BRG4, 3},
+                {CPM_CLK_SCC3, CPM_CLK5, 4},
+                {CPM_CLK_SCC3, CPM_CLK6, 5},
+                {CPM_CLK_SCC3, CPM_CLK7, 6},
+                {CPM_CLK_SCC3, CPM_CLK8, 7},
+                {CPM_CLK_SCC4, CPM_BRG1, 0},
+                {CPM_CLK_SCC4, CPM_BRG2, 1},
+                {CPM_CLK_SCC4, CPM_BRG3, 2},
+                {CPM_CLK_SCC4, CPM_BRG4, 3},
+                {CPM_CLK_SCC4, CPM_CLK5, 4},
+                {CPM_CLK_SCC4, CPM_CLK6, 5},
+                {CPM_CLK_SCC4, CPM_CLK7, 6},
+                {CPM_CLK_SCC4, CPM_CLK8, 7},
+        };
 
         im_cpmux = cpm2_map(im_cpmux);
 
@@ -201,25 +247,83 @@ int cpm2_clk_setup(enum cpm_clk_target target, int clock, int mode)
         }
 
         if (mode == CPM_CLK_RX)
-                shift +=3;
+                shift += 3;
 
-        for (i=0; i<24; i++) {
+        for (i = 0; i < ARRAY_SIZE(clk_map); i++) {
                 if (clk_map[i][0] == target && clk_map[i][1] == clock) {
                         bits = clk_map[i][2];
                         break;
                 }
         }
-        if (i == sizeof(clk_map)/3)
+        if (i == ARRAY_SIZE(clk_map))
             ret = -EINVAL;
 
         bits <<= shift;
         mask <<= shift;
+
         out_be32(reg, (in_be32(reg) & ~mask) | bits);
 
         cpm2_unmap(im_cpmux);
         return ret;
 }
 
+int cpm2_smc_clk_setup(enum cpm_clk_target target, int clock)
+{
+        int ret = 0;
+        int shift;
+        int i, bits = 0;
+        cpmux_t __iomem *im_cpmux;
+        u8 __iomem *reg;
+        u8 mask = 3;
+
+        u8 clk_map[][3] = {
+                {CPM_CLK_SMC1, CPM_BRG1, 0},
+                {CPM_CLK_SMC1, CPM_BRG7, 1},
+                {CPM_CLK_SMC1, CPM_CLK7, 2},
+                {CPM_CLK_SMC1, CPM_CLK9, 3},
+                {CPM_CLK_SMC2, CPM_BRG2, 0},
+                {CPM_CLK_SMC2, CPM_BRG8, 1},
+                {CPM_CLK_SMC2, CPM_CLK4, 2},
+                {CPM_CLK_SMC2, CPM_CLK15, 3},
+        };
+
+        im_cpmux = cpm2_map(im_cpmux);
+
+        switch (target) {
+        case CPM_CLK_SMC1:
+                reg = &im_cpmux->cmx_smr;
+                mask = 3;
+                shift = 4;
+                break;
+        case CPM_CLK_SMC2:
+                reg = &im_cpmux->cmx_smr;
+                mask = 3;
+                shift = 0;
+                break;
+        default:
+                printk(KERN_ERR "cpm2_smc_clock_setup: invalid clock target\n");
+                return -EINVAL;
+        }
+
+        for (i = 0; i < ARRAY_SIZE(clk_map); i++) {
+                if (clk_map[i][0] == target && clk_map[i][1] == clock) {
+                        bits = clk_map[i][2];
+                        break;
+                }
+        }
+        if (i == ARRAY_SIZE(clk_map))
+            ret = -EINVAL;
+
+        bits <<= shift;
+        mask <<= shift;
+
+        out_8(reg, (in_8(reg) & ~mask) | bits);
+
+        cpm2_unmap(im_cpmux);
+        return ret;
+}
+
+#ifndef CONFIG_PPC_CPM_NEW_BINDING
 /*
  * dpalloc / dpfree bits.
  */
@@ -228,20 +332,20 @@ static spinlock_t cpm_dpmem_lock;
  * until the memory subsystem goes up... */
 static rh_block_t cpm_boot_dpmem_rh_block[16];
 static rh_info_t cpm_dpmem_info;
-static u8* im_dprambase;
+static u8 __iomem *im_dprambase;
 
 static void cpm2_dpinit(void)
 {
         spin_lock_init(&cpm_dpmem_lock);
 
-        im_dprambase = ioremap(CPM_MAP_ADDR, CPM_DATAONLY_BASE + CPM_DATAONLY_SIZE);
-
         /* initialize the info header */
         rh_init(&cpm_dpmem_info, 1,
                         sizeof(cpm_boot_dpmem_rh_block) /
                         sizeof(cpm_boot_dpmem_rh_block[0]),
                         cpm_boot_dpmem_rh_block);
 
+        im_dprambase = cpm2_immr;
+
         /* Attach the usable dpmem area */
         /* XXX: This is actually crap. CPM_DATAONLY_BASE and
          * CPM_DATAONLY_SIZE is only a subset of the available dpram. It
@@ -306,3 +410,37 @@ void *cpm_dpram_addr(unsigned long offset)
         return (void *)(im_dprambase + offset);
 }
 EXPORT_SYMBOL(cpm_dpram_addr);
+#endif /* !CONFIG_PPC_CPM_NEW_BINDING */
+
+struct cpm2_ioports {
+        u32 dir, par, sor, odr, dat;
+        u32 res[3];
+};
+
+void cpm2_set_pin(int port, int pin, int flags)
+{
+        struct cpm2_ioports __iomem *iop =
+                (struct cpm2_ioports __iomem *)&cpm2_immr->im_ioport;
+
+        pin = 1 << (31 - pin);
+
+        if (flags & CPM_PIN_OUTPUT)
+                setbits32(&iop[port].dir, pin);
+        else
+                clrbits32(&iop[port].dir, pin);
+
+        if (!(flags & CPM_PIN_GPIO))
+                setbits32(&iop[port].par, pin);
+        else
+                clrbits32(&iop[port].par, pin);
+
+        if (flags & CPM_PIN_SECONDARY)
+                setbits32(&iop[port].sor, pin);
+        else
+                clrbits32(&iop[port].sor, pin);
+
+        if (flags & CPM_PIN_OPENDRAIN)
+                setbits32(&iop[port].odr, pin);
+        else
+                clrbits32(&iop[port].odr, pin);
+}
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
index eabfe06fe05c..5fe65b2f8f3a 100644
--- a/arch/powerpc/sysdev/cpm2_pic.c
+++ b/arch/powerpc/sysdev/cpm2_pic.c
@@ -48,9 +48,8 @@
 #define CPM2_IRQ_PORTC15        48
 #define CPM2_IRQ_PORTC0         63
 
-static intctl_cpm2_t *cpm2_intctl;
+static intctl_cpm2_t __iomem *cpm2_intctl;
 
-static struct device_node *cpm2_pic_node;
 static struct irq_host *cpm2_pic_host;
 #define NR_MASK_WORDS   ((NR_IRQS + 31) / 32)
 static unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];
@@ -206,11 +205,6 @@ unsigned int cpm2_get_irq(void)
         return irq_linear_revmap(cpm2_pic_host, irq);
 }
 
-static int cpm2_pic_host_match(struct irq_host *h, struct device_node *node)
-{
-        return cpm2_pic_node == node;
-}
-
 static int cpm2_pic_host_map(struct irq_host *h, unsigned int virq,
                           irq_hw_number_t hw)
 {
@@ -234,7 +228,6 @@ static int cpm2_pic_host_xlate(struct irq_host *h, struct device_node *ct,
 }
 
 static struct irq_host_ops cpm2_pic_host_ops = {
-        .match = cpm2_pic_host_match,
         .map = cpm2_pic_host_map,
         .xlate = cpm2_pic_host_xlate,
 };
@@ -273,8 +266,8 @@ void cpm2_pic_init(struct device_node *node)
         out_be32(&cpm2_intctl->ic_scprrl, 0x05309770);
 
         /* create a legacy host */
-        cpm2_pic_node = of_node_get(node);
-        cpm2_pic_host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, 64, &cpm2_pic_host_ops, 64);
+        cpm2_pic_host = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+                                       64, &cpm2_pic_host_ops, 64);
         if (cpm2_pic_host == NULL) {
                 printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n");
                 return;
diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c
new file mode 100644
index 000000000000..66c8ad4cfce6
--- /dev/null
+++ b/arch/powerpc/sysdev/cpm_common.c
@@ -0,0 +1,205 @@
+/*
+ * Common CPM code
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright 2007 Freescale Semiconductor, Inc.
+ *
+ * Some parts derived from commproc.c/cpm2_common.c, which is:
+ * Copyright (c) 1997 Dan error_act (dmalek@jlc.net)
+ * Copyright (c) 1999-2001 Dan Malek <dan@embeddedalley.com>
+ * Copyright (c) 2000 MontaVista Software, Inc (source@mvista.com)
+ * 2006 (c) MontaVista Software, Inc.
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/of_device.h>
+
+#include <asm/udbg.h>
+#include <asm/io.h>
+#include <asm/system.h>
+#include <asm/rheap.h>
+#include <asm/cpm.h>
+
+#include <mm/mmu_decl.h>
+
+#ifdef CONFIG_PPC_EARLY_DEBUG_CPM
+static u32 __iomem *cpm_udbg_txdesc =
+        (u32 __iomem __force *)CONFIG_PPC_EARLY_DEBUG_CPM_ADDR;
+
+static void udbg_putc_cpm(char c)
+{
+        u8 __iomem *txbuf = (u8 __iomem __force *)in_be32(&cpm_udbg_txdesc[1]);
+
+        if (c == '\n')
+                udbg_putc('\r');
+
+        while (in_be32(&cpm_udbg_txdesc[0]) & 0x80000000)
+                ;
+
+        out_8(txbuf, c);
+        out_be32(&cpm_udbg_txdesc[0], 0xa0000001);
+}
+
+void __init udbg_init_cpm(void)
+{
+        if (cpm_udbg_txdesc) {
+#ifdef CONFIG_CPM2
+                setbat(1, 0xf0000000, 0xf0000000, 1024*1024, _PAGE_IO);
+#endif
+                udbg_putc = udbg_putc_cpm;
+                udbg_putc('X');
+        }
+}
+#endif
+
+#ifdef CONFIG_PPC_CPM_NEW_BINDING
+static spinlock_t cpm_muram_lock;
+static rh_block_t cpm_boot_muram_rh_block[16];
+static rh_info_t cpm_muram_info;
+static u8 __iomem *muram_vbase;
+static phys_addr_t muram_pbase;
+
+/* Max address size we deal with */
+#define OF_MAX_ADDR_CELLS       4
+
+int __init cpm_muram_init(void)
+{
+        struct device_node *np;
+        struct resource r;
+        u32 zero[OF_MAX_ADDR_CELLS] = {};
+        resource_size_t max = 0;
+        int i = 0;
+        int ret = 0;
+
+        printk("cpm_muram_init\n");
+
+        spin_lock_init(&cpm_muram_lock);
+        /* initialize the info header */
+        rh_init(&cpm_muram_info, 1,
+                sizeof(cpm_boot_muram_rh_block) /
+                sizeof(cpm_boot_muram_rh_block[0]),
+                cpm_boot_muram_rh_block);
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,cpm-muram-data");
+        if (!np) {
+                printk(KERN_ERR "Cannot find CPM muram data node");
+                ret = -ENODEV;
+                goto out;
+        }
+
+        muram_pbase = of_translate_address(np, zero);
+        if (muram_pbase == (phys_addr_t)OF_BAD_ADDR) {
+                printk(KERN_ERR "Cannot translate zero through CPM muram node");
+                ret = -ENODEV;
+                goto out;
+        }
+
+        while (of_address_to_resource(np, i++, &r) == 0) {
+                if (r.end > max)
+                        max = r.end;
+
+                rh_attach_region(&cpm_muram_info, r.start - muram_pbase,
+                                 r.end - r.start + 1);
+        }
+
+        muram_vbase = ioremap(muram_pbase, max - muram_pbase + 1);
+        if (!muram_vbase) {
+                printk(KERN_ERR "Cannot map CPM muram");
+                ret = -ENOMEM;
+        }
+
+out:
+        of_node_put(np);
+        return ret;
+}
+
+/**
+ * cpm_muram_alloc - allocate the requested size worth of multi-user ram
+ * @size: number of bytes to allocate
+ * @align: requested alignment, in bytes
+ *
+ * This function returns an offset into the muram area.
+ * Use cpm_dpram_addr() to get the virtual address of the area.
+ * Use cpm_muram_free() to free the allocation.
+ */
+unsigned long cpm_muram_alloc(unsigned long size, unsigned long align)
+{
+        unsigned long start;
+        unsigned long flags;
+
+        spin_lock_irqsave(&cpm_muram_lock, flags);
+        cpm_muram_info.alignment = align;
+        start = rh_alloc(&cpm_muram_info, size, "commproc");
+        spin_unlock_irqrestore(&cpm_muram_lock, flags);
+
+        return start;
+}
+EXPORT_SYMBOL(cpm_muram_alloc);
+
+/**
+ * cpm_muram_free - free a chunk of multi-user ram
+ * @offset: The beginning of the chunk as returned by cpm_muram_alloc().
+ */
+int cpm_muram_free(unsigned long offset)
+{
+        int ret;
+        unsigned long flags;
+
+        spin_lock_irqsave(&cpm_muram_lock, flags);
+        ret = rh_free(&cpm_muram_info, offset);
+        spin_unlock_irqrestore(&cpm_muram_lock, flags);
+
+        return ret;
+}
+EXPORT_SYMBOL(cpm_muram_free);
+
+/**
+ * cpm_muram_alloc_fixed - reserve a specific region of multi-user ram
+ * @offset: the offset into the muram area to reserve
+ * @size: the number of bytes to reserve
+ *
+ * This function returns "start" on success, -ENOMEM on failure.
+ * Use cpm_dpram_addr() to get the virtual address of the area.
+ * Use cpm_muram_free() to free the allocation.
+ */
+unsigned long cpm_muram_alloc_fixed(unsigned long offset, unsigned long size)
+{
+        unsigned long start;
+        unsigned long flags;
+
+        spin_lock_irqsave(&cpm_muram_lock, flags);
+        cpm_muram_info.alignment = 1;
+        start = rh_alloc_fixed(&cpm_muram_info, offset, size, "commproc");
+        spin_unlock_irqrestore(&cpm_muram_lock, flags);
+
+        return start;
+}
+EXPORT_SYMBOL(cpm_muram_alloc_fixed);
+
+/**
+ * cpm_muram_addr - turn a muram offset into a virtual address
+ * @offset: muram offset to convert
+ */
+void __iomem *cpm_muram_addr(unsigned long offset)
+{
+        return muram_vbase + offset;
+}
+EXPORT_SYMBOL(cpm_muram_addr);
+
+/**
+ * cpm_muram_phys - turn a muram virtual address into a DMA address
+ * @offset: virtual address from cpm_muram_addr() to convert
+ */
+dma_addr_t cpm_muram_dma(void __iomem *addr)
+{
+        return muram_pbase + ((u8 __iomem *)addr - muram_vbase);
+}
+EXPORT_SYMBOL(cpm_muram_dma);
+
+#endif /* CONFIG_PPC_CPM_NEW_BINDING */
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index a1d2042bb304..e0e24b01e3a6 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -204,7 +204,7 @@ static void dart_free(struct iommu_table *tbl, long index, long npages)
 }
 
 
-static int dart_init(struct device_node *dart_node)
+static int __init dart_init(struct device_node *dart_node)
 {
         unsigned int i;
         unsigned long tmp, base, size;
@@ -313,7 +313,7 @@ static void pci_dma_bus_setup_dart(struct pci_bus *bus)
                 PCI_DN(dn)->iommu_table = &iommu_table_dart;
 }
 
-void iommu_init_early_dart(void)
+void __init iommu_init_early_dart(void)
 {
         struct device_node *dn;
 
diff --git a/arch/powerpc/sysdev/dcr.c b/arch/powerpc/sysdev/dcr.c
index 574b6ef44e0b..ab11c0b29024 100644
--- a/arch/powerpc/sysdev/dcr.c
+++ b/arch/powerpc/sysdev/dcr.c
@@ -33,6 +33,7 @@ unsigned int dcr_resource_start(struct device_node *np, unsigned int index)
 
         return dr[index * 2];
 }
+EXPORT_SYMBOL_GPL(dcr_resource_start);
 
 unsigned int dcr_resource_len(struct device_node *np, unsigned int index)
 {
@@ -44,6 +45,7 @@ unsigned int dcr_resource_len(struct device_node *np, unsigned int index)
 
         return dr[index * 2 + 1];
 }
+EXPORT_SYMBOL_GPL(dcr_resource_len);
 
 #ifndef CONFIG_PPC_DCR_NATIVE
 
@@ -102,7 +104,7 @@ u64 of_translate_dcr_address(struct device_node *dev,
 dcr_host_t dcr_map(struct device_node *dev, unsigned int dcr_n,
                    unsigned int dcr_c)
 {
-        dcr_host_t ret = { .token = NULL, .stride = 0 };
+        dcr_host_t ret = { .token = NULL, .stride = 0, .base = dcr_n };
         u64 addr;
 
         pr_debug("dcr_map(%s, 0x%x, 0x%x)\n",
@@ -122,6 +124,7 @@ dcr_host_t dcr_map(struct device_node *dev, unsigned int dcr_n,
         ret.token -= dcr_n * ret.stride;
         return ret;
 }
+EXPORT_SYMBOL_GPL(dcr_map);
 
 void dcr_unmap(dcr_host_t host, unsigned int dcr_n, unsigned int dcr_c)
 {
@@ -133,5 +136,6 @@ void dcr_unmap(dcr_host_t host, unsigned int dcr_n, unsigned int dcr_c)
         iounmap(h.token);
         h.token = NULL;
 }
+EXPORT_SYMBOL_GPL(dcr_unmap);
 
 #endif /* !defined(CONFIG_PPC_DCR_NATIVE) */
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 114c90f8f560..af090c93be10 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -160,8 +160,8 @@ static void __init quirk_fsl_pcie_transparent(struct pci_dev *dev)
 
 int __init fsl_pcie_check_link(struct pci_controller *hose)
 {
-        u16 val;
-        early_read_config_word(hose, 0, 0, PCIE_LTSSM, &val);
+        u32 val;
+        early_read_config_dword(hose, 0, 0, PCIE_LTSSM, &val);
         if (val < PCIE_LTSSM_L0)
                 return 1;
         return 0;
@@ -255,5 +255,8 @@ DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533E, quirk_fsl_pcie_transpare
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544E, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544, quirk_fsl_pcie_transparent);
+DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8572E, quirk_fsl_pcie_transparent)
+DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8572, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_transparent);
+DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_transparent);
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 1cf29c9d4408..3ace7474809e 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -24,6 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/of_platform.h>
 #include <linux/phy.h>
+#include <linux/spi/spi.h>
 #include <linux/fsl_devices.h>
 #include <linux/fs_enet_pd.h>
 #include <linux/fs_uart_pd.h>
@@ -52,13 +53,13 @@ phys_addr_t get_immrbase(void)
 
         soc = of_find_node_by_type(NULL, "soc");
         if (soc) {
-                unsigned int size;
+                int size;
                 const void *prop = of_get_property(soc, "reg", &size);
 
                 if (prop)
                         immrbase = of_translate_address(soc, prop);
                 of_node_put(soc);
-        };
+        }
 
         return immrbase;
 }
@@ -72,20 +73,31 @@ static u32 brgfreq = -1;
 u32 get_brgfreq(void)
 {
         struct device_node *node;
+        const unsigned int *prop;
+        int size;
 
         if (brgfreq != -1)
                 return brgfreq;
 
-        node = of_find_node_by_type(NULL, "cpm");
+        node = of_find_compatible_node(NULL, NULL, "fsl,cpm-brg");
         if (node) {
-                unsigned int size;
-                const unsigned int *prop = of_get_property(node,
-                                        "brg-frequency", &size);
+                prop = of_get_property(node, "clock-frequency", &size);
+                if (prop && size == 4)
+                        brgfreq = *prop;
 
-                if (prop)
+                of_node_put(node);
+                return brgfreq;
+        }
+
+        /* Legacy device binding -- will go away when no users are left. */
+        node = of_find_node_by_type(NULL, "cpm");
+        if (node) {
+                prop = of_get_property(node, "brg-frequency", &size);
+                if (prop && size == 4)
                         brgfreq = *prop;
+
                 of_node_put(node);
-        };
+        }
 
         return brgfreq;
 }
@@ -103,14 +115,14 @@ u32 get_baudrate(void)
 
         node = of_find_node_by_type(NULL, "serial");
         if (node) {
-                unsigned int size;
+                int size;
                 const unsigned int *prop = of_get_property(node,
                                 "current-speed", &size);
 
                 if (prop)
                         fs_baudrate = *prop;
                 of_node_put(node);
-        };
+        }
 
         return fs_baudrate;
 }
@@ -319,34 +331,46 @@ static struct i2c_driver_device i2c_devices[] __initdata = {
         {"ricoh,rs5c372b", "rtc-rs5c372", "rs5c372b",},
         {"ricoh,rv5c386",  "rtc-rs5c372", "rv5c386",},
         {"ricoh,rv5c387a", "rtc-rs5c372", "rv5c387a",},
+        {"dallas,ds1307",  "rtc-ds1307",  "ds1307",},
+        {"dallas,ds1337",  "rtc-ds1307",  "ds1337",},
+        {"dallas,ds1338",  "rtc-ds1307",  "ds1338",},
+        {"dallas,ds1339",  "rtc-ds1307",  "ds1339",},
+        {"dallas,ds1340",  "rtc-ds1307",  "ds1340",},
+        {"stm,m41t00",     "rtc-ds1307",  "m41t00"},
+        {"dallas,ds1374",  "rtc-ds1374",  "rtc-ds1374",},
 };
 
-static int __init of_find_i2c_driver(struct device_node *node, struct i2c_board_info *info)
+static int __init of_find_i2c_driver(struct device_node *node,
+                                     struct i2c_board_info *info)
 {
         int i;
 
         for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
                 if (!of_device_is_compatible(node, i2c_devices[i].of_device))
                         continue;
-                strncpy(info->driver_name, i2c_devices[i].i2c_driver, KOBJ_NAME_LEN);
-                strncpy(info->type, i2c_devices[i].i2c_type, I2C_NAME_SIZE);
+                if (strlcpy(info->driver_name, i2c_devices[i].i2c_driver,
+                            KOBJ_NAME_LEN) >= KOBJ_NAME_LEN ||
+                    strlcpy(info->type, i2c_devices[i].i2c_type,
+                            I2C_NAME_SIZE) >= I2C_NAME_SIZE)
+                        return -ENOMEM;
                 return 0;
         }
         return -ENODEV;
 }
 
-static void __init of_register_i2c_devices(struct device_node *adap_node, int bus_num)
+static void __init of_register_i2c_devices(struct device_node *adap_node,
+                                           int bus_num)
 {
         struct device_node *node = NULL;
 
         while ((node = of_get_next_child(adap_node, node))) {
-                struct i2c_board_info info;
+                struct i2c_board_info info = {};
                 const u32 *addr;
                 int len;
 
                 addr = of_get_property(node, "reg", &len);
                 if (!addr || len < sizeof(int) || *addr > (1 << 10) - 1) {
-                        printk(KERN_WARNING "fsl_ioc.c: invalid i2c device entry\n");
+                        printk(KERN_WARNING "fsl_soc.c: invalid i2c device entry\n");
                         continue;
                 }
 
@@ -357,7 +381,6 @@ static void __init of_register_i2c_devices(struct device_node *adap_node, int bu
                 if (of_find_i2c_driver(node, &info) < 0)
                         continue;
 
-                info.platform_data = NULL;
                 info.addr = *addr;
 
                 i2c_register_board_info(bus_num, &info, 1);
@@ -648,6 +671,7 @@ err:
 
 arch_initcall(fsl_usb_of_init);
 
+#ifndef CONFIG_PPC_CPM_NEW_BINDING
 #ifdef CONFIG_CPM2
 
 extern void init_scc_ioports(struct fs_uart_platform_info*);
@@ -1187,3 +1211,132 @@ err:
 arch_initcall(cpm_smc_uart_of_init);
 
 #endif /* CONFIG_8xx */
+#endif /* CONFIG_PPC_CPM_NEW_BINDING */
+
+int __init fsl_spi_init(struct spi_board_info *board_infos,
+                        unsigned int num_board_infos,
+                        void (*activate_cs)(u8 cs, u8 polarity),
+                        void (*deactivate_cs)(u8 cs, u8 polarity))
+{
+        struct device_node *np;
+        unsigned int i;
+        const u32 *sysclk;
+
+        /* SPI controller is either clocked from QE or SoC clock */
+        np = of_find_node_by_type(NULL, "qe");
+        if (!np)
+                np = of_find_node_by_type(NULL, "soc");
+
+        if (!np)
+                return -ENODEV;
+
+        sysclk = of_get_property(np, "bus-frequency", NULL);
+        if (!sysclk)
+                return -ENODEV;
+
+        for (np = NULL, i = 1;
+             (np = of_find_compatible_node(np, "spi", "fsl_spi")) != NULL;
+             i++) {
+                int ret = 0;
+                unsigned int j;
+                const void *prop;
+                struct resource res[2];
+                struct platform_device *pdev;
+                struct fsl_spi_platform_data pdata = {
+                        .activate_cs = activate_cs,
+                        .deactivate_cs = deactivate_cs,
+                };
+
+                memset(res, 0, sizeof(res));
+
+                pdata.sysclk = *sysclk;
+
+                prop = of_get_property(np, "reg", NULL);
+                if (!prop)
+                        goto err;
+                pdata.bus_num = *(u32 *)prop;
+
+                prop = of_get_property(np, "mode", NULL);
+                if (prop && !strcmp(prop, "cpu-qe"))
+                        pdata.qe_mode = 1;
+
+                for (j = 0; j < num_board_infos; j++) {
+                        if (board_infos[j].bus_num == pdata.bus_num)
+                                pdata.max_chipselect++;
+                }
+
+                if (!pdata.max_chipselect)
+                        goto err;
+
+                ret = of_address_to_resource(np, 0, &res[0]);
+                if (ret)
+                        goto err;
+
+                ret = of_irq_to_resource(np, 0, &res[1]);
+                if (ret == NO_IRQ)
+                        goto err;
+
+                pdev = platform_device_alloc("mpc83xx_spi", i);
+                if (!pdev)
+                        goto err;
+
+                ret = platform_device_add_data(pdev, &pdata, sizeof(pdata));
+                if (ret)
+                        goto unreg;
+
+                ret = platform_device_add_resources(pdev, res,
+                                                    ARRAY_SIZE(res));
+                if (ret)
+                        goto unreg;
+
+                ret = platform_device_register(pdev);
+                if (ret)
+                        goto unreg;
+
+                continue;
+unreg:
+                platform_device_del(pdev);
+err:
+                continue;
+        }
+
+        return spi_register_board_info(board_infos, num_board_infos);
+}
+
+#if defined(CONFIG_PPC_85xx) || defined(CONFIG_PPC_86xx)
+static __be32 __iomem *rstcr;
+
+static int __init setup_rstcr(void)
+{
+        struct device_node *np;
+        np = of_find_node_by_name(NULL, "global-utilities");
+        if ((np && of_get_property(np, "fsl,has-rstcr", NULL))) {
+                const u32 *prop = of_get_property(np, "reg", NULL);
+                if (prop) {
+                        /* map reset control register
+                         * 0xE00B0 is offset of reset control register
+                         */
+                        rstcr = ioremap(get_immrbase() + *prop + 0xB0, 0xff);
+                        if (!rstcr)
+                                printk (KERN_EMERG "Error: reset control "
+                                                "register not mapped!\n");
+                }
+        } else
+                printk (KERN_INFO "rstcr compatible register does not exist!\n");
+        if (np)
+                of_node_put(np);
+        return 0;
+}
+
+arch_initcall(setup_rstcr);
+
+void fsl_rstcr_restart(char *cmd)
+{
+        local_irq_disable();
+        if (rstcr)
+                /* set reset control register */
+                out_be32(rstcr, 0x2);   /* HRESET_REQ */
+
+        while (1) ;
+}
+#endif
diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h
index 04e145b5fc32..63e7db30a4cd 100644
--- a/arch/powerpc/sysdev/fsl_soc.h
+++ b/arch/powerpc/sysdev/fsl_soc.h
@@ -8,5 +8,13 @@ extern phys_addr_t get_immrbase(void);
 extern u32 get_brgfreq(void);
 extern u32 get_baudrate(void);
 
+struct spi_board_info;
+
+extern int fsl_spi_init(struct spi_board_info *board_infos,
+                        unsigned int num_board_infos,
+                        void (*activate_cs)(u8 cs, u8 polarity),
+                        void (*deactivate_cs)(u8 cs, u8 polarity));
+
+extern void fsl_rstcr_restart(char *cmd);
 #endif
 #endif
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index ad87adc975bc..7c1b27ac7d3c 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -25,7 +25,6 @@ static unsigned char cached_8259[2] = { 0xff, 0xff };
 
 static DEFINE_SPINLOCK(i8259_lock);
 
-static struct device_node *i8259_node;
 static struct irq_host *i8259_host;
 
 /*
@@ -165,7 +164,7 @@ static struct resource pic_edgectrl_iores = {
 
 static int i8259_host_match(struct irq_host *h, struct device_node *node)
 {
-        return i8259_node == NULL || i8259_node == node;
+        return h->of_node == NULL || h->of_node == node;
 }
 
 static int i8259_host_map(struct irq_host *h, unsigned int virq,
@@ -276,9 +275,8 @@ void i8259_init(struct device_node *node, unsigned long intack_addr)
         spin_unlock_irqrestore(&i8259_lock, flags);
 
         /* create a legacy host */
-        if (node)
-                i8259_node = of_node_get(node);
-        i8259_host = irq_alloc_host(IRQ_HOST_MAP_LEGACY, 0, &i8259_host_ops, 0);
+        i8259_host = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LEGACY,
+                                    0, &i8259_host_ops, 0);
         if (i8259_host == NULL) {
                 printk(KERN_ERR "i8259: failed to allocate irq host !\n");
                 return;
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c
index 5294560c7b00..cfbd2aae93e8 100644
--- a/arch/powerpc/sysdev/indirect_pci.c
+++ b/arch/powerpc/sysdev/indirect_pci.c
@@ -144,14 +144,16 @@ indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
 
 static struct pci_ops indirect_pci_ops =
 {
-        indirect_read_config,
-        indirect_write_config
+        .read = indirect_read_config,
+        .write = indirect_write_config,
 };
 
 void __init
-setup_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data, u32 flags)
+setup_indirect_pci(struct pci_controller* hose,
+                   resource_size_t cfg_addr,
+                   resource_size_t cfg_data, u32 flags)
 {
-        unsigned long base = cfg_addr & PAGE_MASK;
+        resource_size_t base = cfg_addr & PAGE_MASK;
         void __iomem *mbase;
 
         mbase = ioremap(base, PAGE_SIZE);
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index 473c415e9e25..05a56e55804c 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -511,10 +511,8 @@ static struct irq_chip ipic_irq_chip = {
 
 static int ipic_host_match(struct irq_host *h, struct device_node *node)
 {
-        struct ipic *ipic = h->host_data;
-
         /* Exact match, unless ipic node is NULL */
-        return ipic->of_node == NULL || ipic->of_node == node;
+        return h->of_node == NULL || h->of_node == node;
 }
 
 static int ipic_host_map(struct irq_host *h, unsigned int virq,
@@ -568,9 +566,8 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
                 return NULL;
 
         memset(ipic, 0, sizeof(struct ipic));
-        ipic->of_node = of_node_get(node);
 
-        ipic->irqhost = irq_alloc_host(IRQ_HOST_MAP_LINEAR,
+        ipic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
                                        NR_IPIC_INTS,
                                        &ipic_host_ops, 0);
         if (ipic->irqhost == NULL) {
diff --git a/arch/powerpc/sysdev/ipic.h b/arch/powerpc/sysdev/ipic.h
index c28e589877eb..bb309a501b2d 100644
--- a/arch/powerpc/sysdev/ipic.h
+++ b/arch/powerpc/sysdev/ipic.h
@@ -48,9 +48,6 @@ struct ipic {
 
         /* The "linux" controller struct */
         struct irq_chip         hc_irq;
-
-        /* The device node of the interrupt controller */
-        struct device_node      *of_node;
 };
 
 struct ipic_info {
diff --git a/arch/powerpc/sysdev/mpc8xx_pic.c b/arch/powerpc/sysdev/mpc8xx_pic.c
index 2fc2bcd79b5e..7aa4ff5f5ec8 100644
--- a/arch/powerpc/sysdev/mpc8xx_pic.c
+++ b/arch/powerpc/sysdev/mpc8xx_pic.c
@@ -19,11 +19,10 @@
 
 extern int cpm_get_irq(struct pt_regs *regs);
 
-static struct device_node *mpc8xx_pic_node;
 static struct irq_host *mpc8xx_pic_host;
 #define NR_MASK_WORDS   ((NR_IRQS + 31) / 32)
 static unsigned long ppc_cached_irq_mask[NR_MASK_WORDS];
-static sysconf8xx_t     *siu_reg;
+static sysconf8xx_t __iomem *siu_reg;
 
 int cpm_get_irq(struct pt_regs *regs);
 
@@ -120,11 +119,6 @@ unsigned int mpc8xx_get_irq(void)
 
 }
 
-static int mpc8xx_pic_host_match(struct irq_host *h, struct device_node *node)
-{
-        return mpc8xx_pic_node == node;
-}
-
 static int mpc8xx_pic_host_map(struct irq_host *h, unsigned int virq,
                           irq_hw_number_t hw)
 {
@@ -158,7 +152,6 @@ static int mpc8xx_pic_host_xlate(struct irq_host *h, struct device_node *ct,
 
 
 static struct irq_host_ops mpc8xx_pic_host_ops = {
-        .match = mpc8xx_pic_host_match,
         .map = mpc8xx_pic_host_map,
         .xlate = mpc8xx_pic_host_xlate,
 };
@@ -166,32 +159,33 @@ static struct irq_host_ops mpc8xx_pic_host_ops = {
 int mpc8xx_pic_init(void)
 {
         struct resource res;
-        struct device_node *np = NULL;
+        struct device_node *np;
         int ret;
 
-        np = of_find_node_by_type(np, "mpc8xx-pic");
-
+        np = of_find_compatible_node(NULL, NULL, "fsl,pq1-pic");
+        if (np == NULL)
+                np = of_find_node_by_type(NULL, "mpc8xx-pic");
         if (np == NULL) {
-                printk(KERN_ERR "Could not find open-pic node\n");
+                printk(KERN_ERR "Could not find fsl,pq1-pic node\n");
                 return -ENOMEM;
         }
 
-        mpc8xx_pic_node = of_node_get(np);
-
         ret = of_address_to_resource(np, 0, &res);
-        of_node_put(np);
         if (ret)
-                return ret;
+                goto out;
 
-        siu_reg = (void *)ioremap(res.start, res.end - res.start + 1);
+        siu_reg = ioremap(res.start, res.end - res.start + 1);
         if (siu_reg == NULL)
                 return -EINVAL;
 
-        mpc8xx_pic_host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, 64, &mpc8xx_pic_host_ops, 64);
+        mpc8xx_pic_host = irq_alloc_host(of_node_get(np), IRQ_HOST_MAP_LINEAR,
+                                         64, &mpc8xx_pic_host_ops, 64);
         if (mpc8xx_pic_host == NULL) {
                 printk(KERN_ERR "MPC8xx PIC: failed to allocate irq host!\n");
                 ret = -ENOMEM;
         }
 
+out:
+        of_node_put(np);
         return ret;
 }
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 74c64c0d3b71..893e65439e85 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -156,8 +156,7 @@ static inline u32 _mpic_read(enum mpic_reg_type type,
         switch(type) {
 #ifdef CONFIG_PPC_DCR
         case mpic_access_dcr:
-                return dcr_read(rb->dhost,
-                                rb->dbase + reg + rb->doff);
+                return dcr_read(rb->dhost, rb->dhost.base + reg);
 #endif
         case mpic_access_mmio_be:
                 return in_be32(rb->base + (reg >> 2));
@@ -174,8 +173,7 @@ 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,
-                                 rb->dbase + reg + rb->doff, value);
+                return dcr_write(rb->dhost, rb->dhost.base + reg, value);
 #endif
         case mpic_access_mmio_be:
                 return out_be32(rb->base + (reg >> 2), value);
@@ -228,8 +226,13 @@ static inline u32 _mpic_irq_read(struct mpic *mpic, unsigned int src_no, unsigne
         unsigned int    isu = src_no >> mpic->isu_shift;
         unsigned int    idx = src_no & mpic->isu_mask;
 
-        return _mpic_read(mpic->reg_type, &mpic->isus[isu],
-                          reg + (idx * MPIC_INFO(IRQ_STRIDE)));
+#ifdef CONFIG_MPIC_BROKEN_REGREAD
+        if (reg == 0)
+                return mpic->isu_reg0_shadow[idx];
+        else
+#endif
+                return _mpic_read(mpic->reg_type, &mpic->isus[isu],
+                                  reg + (idx * MPIC_INFO(IRQ_STRIDE)));
 }
 
 static inline void _mpic_irq_write(struct mpic *mpic, unsigned int src_no,
@@ -240,6 +243,11 @@ static inline void _mpic_irq_write(struct mpic *mpic, unsigned int src_no,
 
         _mpic_write(mpic->reg_type, &mpic->isus[isu],
                     reg + (idx * MPIC_INFO(IRQ_STRIDE)), value);
+
+#ifdef CONFIG_MPIC_BROKEN_REGREAD
+        if (reg == 0)
+                mpic->isu_reg0_shadow[idx] = value;
+#endif
 }
 
 #define mpic_read(b,r)          _mpic_read(mpic->reg_type,&(b),(r))
@@ -269,9 +277,11 @@ static void _mpic_map_mmio(struct mpic *mpic, unsigned long phys_addr,
 static void _mpic_map_dcr(struct mpic *mpic, struct mpic_reg_bank *rb,
                           unsigned int offset, unsigned int size)
 {
-        rb->dbase = mpic->dcr_base;
-        rb->doff = offset;
-        rb->dhost = dcr_map(mpic->of_node, rb->dbase + rb->doff, size);
+        const u32 *dbasep;
+
+        dbasep = of_get_property(mpic->irqhost->of_node, "dcr-reg", NULL);
+
+        rb->dhost = dcr_map(mpic->irqhost->of_node, *dbasep + offset, size);
         BUG_ON(!DCR_MAP_OK(rb->dhost));
 }
 
@@ -758,7 +768,7 @@ static void mpic_end_ipi(unsigned int irq)
 
 #endif /* CONFIG_SMP */
 
-static void mpic_set_affinity(unsigned int irq, cpumask_t cpumask)
+void mpic_set_affinity(unsigned int irq, cpumask_t cpumask)
 {
         struct mpic *mpic = mpic_from_irq(irq);
         unsigned int src = mpic_irq_to_hw(irq);
@@ -861,10 +871,8 @@ static struct irq_chip mpic_irq_ht_chip = {
 
 static int mpic_host_match(struct irq_host *h, struct device_node *node)
 {
-        struct mpic *mpic = h->host_data;
-
         /* Exact match, unless mpic node is NULL */
-        return mpic->of_node == NULL || mpic->of_node == node;
+        return h->of_node == NULL || h->of_node == node;
 }
 
 static int mpic_host_map(struct irq_host *h, unsigned int virq,
@@ -985,10 +993,9 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         
         memset(mpic, 0, sizeof(struct mpic));
         mpic->name = name;
-        mpic->of_node = of_node_get(node);
 
-        mpic->irqhost = irq_alloc_host(IRQ_HOST_MAP_LINEAR, isu_size,
-                                       &mpic_host_ops,
+        mpic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+                                       isu_size, &mpic_host_ops,
                                        flags & MPIC_LARGE_VECTORS ? 2048 : 256);
         if (mpic->irqhost == NULL) {
                 of_node_put(node);
@@ -1068,20 +1075,14 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         BUG_ON(paddr == 0 && node == NULL);
 
         /* If no physical address passed in, check if it's dcr based */
-        if (paddr == 0 && of_get_property(node, "dcr-reg", NULL) != NULL)
-                mpic->flags |= MPIC_USES_DCR;
-
+        if (paddr == 0 && of_get_property(node, "dcr-reg", NULL) != NULL) {
 #ifdef CONFIG_PPC_DCR
-        if (mpic->flags & MPIC_USES_DCR) {
-                const u32 *dbasep;
-                dbasep = of_get_property(node, "dcr-reg", NULL);
-                BUG_ON(dbasep == NULL);
-                mpic->dcr_base = *dbasep;
+                mpic->flags |= MPIC_USES_DCR;
                 mpic->reg_type = mpic_access_dcr;
-        }
 #else
-        BUG_ON (mpic->flags & MPIC_USES_DCR);
+                BUG();
 #endif /* CONFIG_PPC_DCR */
+        }
 
         /* If the MPIC is not DCR based, and no physical address was passed
          * in, try to obtain one
diff --git a/arch/powerpc/sysdev/mpic.h b/arch/powerpc/sysdev/mpic.h
index 3a1c3d2c594d..1cb6bd841027 100644
--- a/arch/powerpc/sysdev/mpic.h
+++ b/arch/powerpc/sysdev/mpic.h
@@ -34,5 +34,6 @@ extern int mpic_set_irq_type(unsigned int virq, unsigned int flow_type);
 extern void mpic_end_irq(unsigned int irq);
 extern void mpic_mask_irq(unsigned int irq);
 extern void mpic_unmask_irq(unsigned int irq);
+extern void mpic_set_affinity(unsigned int irq, cpumask_t cpumask);
 
 #endif /* _POWERPC_SYSDEV_MPIC_H */
diff --git a/arch/powerpc/sysdev/mpic_msi.c b/arch/powerpc/sysdev/mpic_msi.c
index b076793033c2..d272a52ecd24 100644
--- a/arch/powerpc/sysdev/mpic_msi.c
+++ b/arch/powerpc/sysdev/mpic_msi.c
@@ -9,7 +9,6 @@
  */
 
 #include <linux/irq.h>
-#include <linux/bootmem.h>
 #include <linux/bitmap.h>
 #include <linux/msi.h>
 #include <asm/mpic.h>
@@ -117,16 +116,17 @@ static int mpic_msi_reserve_dt_hwirqs(struct mpic *mpic)
         int i, len;
         const u32 *p;
 
-        p = of_get_property(mpic->of_node, "msi-available-ranges", &len);
+        p = of_get_property(mpic->irqhost->of_node,
+                            "msi-available-ranges", &len);
         if (!p) {
                 pr_debug("mpic: no msi-available-ranges property found on %s\n",
-                          mpic->of_node->full_name);
+                          mpic->irqhost->of_node->full_name);
                 return -ENODEV;
         }
 
         if (len % 8 != 0) {
                 printk(KERN_WARNING "mpic: Malformed msi-available-ranges "
-                       "property on %s\n", mpic->of_node->full_name);
+                       "property on %s\n", mpic->irqhost->of_node->full_name);
                 return -EINVAL;
         }
 
@@ -151,10 +151,7 @@ int mpic_msi_init_allocator(struct mpic *mpic)
         size = BITS_TO_LONGS(mpic->irq_count) * sizeof(long);
         pr_debug("mpic: allocator bitmap size is 0x%x bytes\n", size);
 
-        if (mem_init_done)
-                mpic->hwirq_bitmap = kmalloc(size, GFP_KERNEL);
-        else
-                mpic->hwirq_bitmap = alloc_bootmem(size);
+        mpic->hwirq_bitmap = alloc_maybe_bootmem(size, GFP_KERNEL);
 
         if (!mpic->hwirq_bitmap) {
                 pr_debug("mpic: ENOMEM allocating allocator bitmap!\n");
diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c
index 305b864c25d9..1d5a40899b74 100644
--- a/arch/powerpc/sysdev/mpic_u3msi.c
+++ b/arch/powerpc/sysdev/mpic_u3msi.c
@@ -40,6 +40,7 @@ static struct irq_chip mpic_u3msi_chip = {
         .unmask         = mpic_u3msi_unmask_irq,
         .eoi            = mpic_end_irq,
         .set_type       = mpic_set_irq_type,
+        .set_affinity   = mpic_set_affinity,
         .typename       = "MPIC-U3MSI",
 };
 
@@ -107,59 +108,46 @@ static void u3msi_teardown_msi_irqs(struct pci_dev *pdev)
         return;
 }
 
-static void u3msi_compose_msi_msg(struct pci_dev *pdev, int virq,
-                                  struct msi_msg *msg)
-{
-        u64 addr;
-
-        addr = find_ht_magic_addr(pdev);
-        msg->address_lo = addr & 0xFFFFFFFF;
-        msg->address_hi = addr >> 32;
-        msg->data = virq_to_hw(virq);
-
-        pr_debug("u3msi: allocated virq 0x%x (hw 0x%lx) at address 0x%lx\n",
-                 virq, virq_to_hw(virq), addr);
-}
-
 static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 {
         irq_hw_number_t hwirq;
-        int rc;
         unsigned int virq;
         struct msi_desc *entry;
         struct msi_msg msg;
+        u64 addr;
+
+        addr = find_ht_magic_addr(pdev);
+        msg.address_lo = addr & 0xFFFFFFFF;
+        msg.address_hi = addr >> 32;
 
         list_for_each_entry(entry, &pdev->msi_list, list) {
                 hwirq = mpic_msi_alloc_hwirqs(msi_mpic, 1);
                 if (hwirq < 0) {
-                        rc = hwirq;
                         pr_debug("u3msi: failed allocating hwirq\n");
-                        goto out_free;
+                        return hwirq;
                 }
 
                 virq = irq_create_mapping(msi_mpic->irqhost, hwirq);
                 if (virq == NO_IRQ) {
                         pr_debug("u3msi: failed mapping hwirq 0x%lx\n", hwirq);
                         mpic_msi_free_hwirqs(msi_mpic, hwirq, 1);
-                        rc = -ENOSPC;
-                        goto out_free;
+                        return -ENOSPC;
                 }
 
                 set_irq_msi(virq, entry);
                 set_irq_chip(virq, &mpic_u3msi_chip);
                 set_irq_type(virq, IRQ_TYPE_EDGE_RISING);
 
-                u3msi_compose_msi_msg(pdev, virq, &msg);
+                pr_debug("u3msi: allocated virq 0x%x (hw 0x%lx) addr 0x%lx\n",
+                          virq, hwirq, addr);
+
+                msg.data = hwirq;
                 write_msi_msg(virq, &msg);
 
                 hwirq++;
         }
 
         return 0;
-
- out_free:
-        u3msi_teardown_msi_irqs(pdev);
-        return rc;
 }
 
 int mpic_u3msi_init(struct mpic *mpic)
diff --git a/arch/powerpc/sysdev/mv64x60.h b/arch/powerpc/sysdev/mv64x60.h
index 2ff0b4ef2681..4f618fa465c0 100644
--- a/arch/powerpc/sysdev/mv64x60.h
+++ b/arch/powerpc/sysdev/mv64x60.h
@@ -7,5 +7,6 @@ extern void __init mv64x60_init_irq(void);
 extern unsigned int mv64x60_get_irq(void);
 
 extern void __init mv64x60_pci_init(void);
+extern void __init mv64x60_init_early(void);
 
 #endif /* __MV64X60_H__ */
diff --git a/arch/powerpc/sysdev/mv64x60_pic.c b/arch/powerpc/sysdev/mv64x60_pic.c
index 01d316287772..19e6ef263797 100644
--- a/arch/powerpc/sysdev/mv64x60_pic.c
+++ b/arch/powerpc/sysdev/mv64x60_pic.c
@@ -202,11 +202,6 @@ static struct irq_chip mv64x60_chip_gpp = {
  * mv64x60_host_ops functions
  */
 
-static int mv64x60_host_match(struct irq_host *h, struct device_node *np)
-{
-        return mv64x60_irq_host->host_data == np;
-}
-
 static struct irq_chip *mv64x60_chips[] = {
         [MV64x60_LEVEL1_LOW]  = &mv64x60_chip_low,
         [MV64x60_LEVEL1_HIGH] = &mv64x60_chip_high,
@@ -228,7 +223,6 @@ static int mv64x60_host_map(struct irq_host *h, unsigned int virq,
 }
 
 static struct irq_host_ops mv64x60_host_ops = {
-        .match = mv64x60_host_match,
         .map   = mv64x60_host_map,
 };
 
@@ -253,14 +247,12 @@ void __init mv64x60_init_irq(void)
         np = of_find_compatible_node(NULL, NULL, "marvell,mv64x60-pic");
         reg = of_get_property(np, "reg", &size);
         paddr = of_translate_address(np, reg);
-        of_node_put(np);
         mv64x60_irq_reg_base = ioremap(paddr, reg[1]);
 
-        mv64x60_irq_host = irq_alloc_host(IRQ_HOST_MAP_LINEAR, MV64x60_NUM_IRQS,
+        mv64x60_irq_host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR,
+                                          MV64x60_NUM_IRQS,
                                           &mv64x60_host_ops, MV64x60_NUM_IRQS);
 
-        mv64x60_irq_host->host_data = np;
-
         spin_lock_irqsave(&mv64x60_lock, flags);
         out_le32(mv64x60_gpp_reg_base + MV64x60_GPP_INTR_MASK,
                  mv64x60_cached_gpp_mask);
diff --git a/arch/powerpc/sysdev/mv64x60_udbg.c b/arch/powerpc/sysdev/mv64x60_udbg.c
new file mode 100644
index 000000000000..367e7b13ec00
--- /dev/null
+++ b/arch/powerpc/sysdev/mv64x60_udbg.c
@@ -0,0 +1,152 @@
+/*
+ * udbg serial input/output routines for the Marvell MV64x60 (Discovery).
+ *
+ * Author: Dale Farnsworth <dale@farnsworth.org>
+ *
+ * 2007 (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 <asm/io.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+
+#include <sysdev/mv64x60.h>
+
+#define MPSC_0_CR1_OFFSET       0x000c
+
+#define MPSC_0_CR2_OFFSET       0x0010
+#define MPSC_CHR_2_TCS          (1 << 9)
+
+#define MPSC_0_CHR_10_OFFSET    0x0030
+
+#define MPSC_INTR_CAUSE_OFF_0   0x0004
+#define MPSC_INTR_CAUSE_OFF_1   0x000c
+#define MPSC_INTR_CAUSE_RCC     (1<<6)
+
+static void __iomem *mpsc_base;
+static void __iomem *mpsc_intr_cause;
+
+static void mv64x60_udbg_putc(char c)
+{
+        if (c == '\n')
+                mv64x60_udbg_putc('\r');
+
+        while(in_le32(mpsc_base + MPSC_0_CR2_OFFSET) & MPSC_CHR_2_TCS)
+                ;
+        out_le32(mpsc_base + MPSC_0_CR1_OFFSET, c);
+        out_le32(mpsc_base + MPSC_0_CR2_OFFSET, MPSC_CHR_2_TCS);
+}
+
+static int mv64x60_udbg_testc(void)
+{
+        return (in_le32(mpsc_intr_cause) & MPSC_INTR_CAUSE_RCC) != 0;
+}
+
+static int mv64x60_udbg_getc(void)
+{
+        int cause = 0;
+        int c;
+
+        while (!mv64x60_udbg_testc())
+                ;
+
+        c = in_8(mpsc_base + MPSC_0_CHR_10_OFFSET + 2);
+        out_8(mpsc_base + MPSC_0_CHR_10_OFFSET + 2, c);
+        out_le32(mpsc_intr_cause, cause & ~MPSC_INTR_CAUSE_RCC);
+        return c;
+}
+
+static int mv64x60_udbg_getc_poll(void)
+{
+        if (!mv64x60_udbg_testc())
+                return -1;
+
+        return mv64x60_udbg_getc();
+}
+
+static void mv64x60_udbg_init(void)
+{
+        struct device_node *np, *mpscintr, *stdout = NULL;
+        const char *path;
+        const phandle *ph;
+        struct resource r[2];
+        const int *block_index;
+        int intr_cause_offset;
+        int err;
+
+        path = of_get_property(of_chosen, "linux,stdout-path", NULL);
+        if (!path)
+                return;
+
+        stdout = of_find_node_by_path(path);
+        if (!stdout)
+                return;
+
+        for (np = NULL;
+             (np = of_find_compatible_node(np, "serial", "marvell,mpsc")); )
+                if (np == stdout)
+                        break;
+
+        of_node_put(stdout);
+        if (!np)
+                return;
+
+        block_index = of_get_property(np, "block-index", NULL);
+        if (!block_index)
+                goto error;
+
+        switch (*block_index) {
+        case 0:
+                intr_cause_offset = MPSC_INTR_CAUSE_OFF_0;
+                break;
+        case 1:
+                intr_cause_offset = MPSC_INTR_CAUSE_OFF_1;
+                break;
+        default:
+                goto error;
+        }
+
+        err = of_address_to_resource(np, 0, &r[0]);
+        if (err)
+                goto error;
+
+        ph = of_get_property(np, "mpscintr", NULL);
+        mpscintr = of_find_node_by_phandle(*ph);
+        if (!mpscintr)
+                goto error;
+
+        err = of_address_to_resource(mpscintr, 0, &r[1]);
+        of_node_put(mpscintr);
+        if (err)
+                goto error;
+
+        of_node_put(np);
+
+        mpsc_base = ioremap(r[0].start, r[0].end - r[0].start + 1);
+        if (!mpsc_base)
+                return;
+
+        mpsc_intr_cause = ioremap(r[1].start, r[1].end - r[1].start + 1);
+        if (!mpsc_intr_cause) {
+                iounmap(mpsc_base);
+                return;
+        }
+        mpsc_intr_cause += intr_cause_offset;
+
+        udbg_putc = mv64x60_udbg_putc;
+        udbg_getc = mv64x60_udbg_getc;
+        udbg_getc_poll = mv64x60_udbg_getc_poll;
+
+        return;
+
+error:
+        of_node_put(np);
+}
+
+void mv64x60_init_early(void)
+{
+        mv64x60_udbg_init();
+}
diff --git a/arch/powerpc/sysdev/pmi.c b/arch/powerpc/sysdev/pmi.c
index 2f91b55b7754..20edd1e94eff 100644
--- a/arch/powerpc/sysdev/pmi.c
+++ b/arch/powerpc/sysdev/pmi.c
@@ -205,10 +205,12 @@ static int pmi_of_remove(struct of_device *dev)
 }
 
 static struct of_platform_driver pmi_of_platform_driver = {
-        .name           = "pmi",
         .match_table    = pmi_match,
         .probe          = pmi_of_probe,
-        .remove         = pmi_of_remove
+        .remove         = pmi_of_remove,
+        .driver         = {
+                .name   = "pmi",
+        },
 };
 
 static int __init pmi_module_init(void)
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c
index 90f87408b5d5..3d57d3835b04 100644
--- a/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/arch/powerpc/sysdev/qe_lib/qe.c
@@ -141,7 +141,7 @@ EXPORT_SYMBOL(qe_issue_cmd);
  * 16 BRGs, which can be connected to the QE channels or output
  * as clocks. The BRGs are in two different block of internal
  * memory mapped space.
- * The baud rate clock is the system clock divided by something.
+ * The BRG clock is the QE clock divided by 2.
  * It was set up long ago during the initial boot phase and is
  * is given to us.
  * Baud rate clocks are zero-based in the driver code (as that maps
@@ -165,28 +165,38 @@ unsigned int get_brg_clk(void)
         return brg_clk;
 }
 
-/* This function is used by UARTS, or anything else that uses a 16x
- * oversampled clock.
+/* Program the BRG to the given sampling rate and multiplier
+ *
+ * @brg: the BRG, 1-16
+ * @rate: the desired sampling rate
+ * @multiplier: corresponds to the value programmed in GUMR_L[RDCR] or
+ * GUMR_L[TDCR].  E.g., if this BRG is the RX clock, and GUMR_L[RDCR]=01,
+ * then 'multiplier' should be 8.
+ *
+ * Also note that the value programmed into the BRGC register must be even.
  */
-void qe_setbrg(u32 brg, u32 rate)
+void qe_setbrg(unsigned int brg, unsigned int rate, unsigned int multiplier)
 {
-        volatile u32 *bp;
         u32 divisor, tempval;
-        int div16 = 0;
+        u32 div16 = 0;
 
-        bp = &qe_immr->brg.brgc[brg];
+        divisor = get_brg_clk() / (rate * multiplier);
 
-        divisor = (get_brg_clk() / rate);
         if (divisor > QE_BRGC_DIVISOR_MAX + 1) {
-                div16 = 1;
+                div16 = QE_BRGC_DIV16;
                 divisor /= 16;
         }
 
-        tempval = ((divisor - 1) << QE_BRGC_DIVISOR_SHIFT) | QE_BRGC_ENABLE;
-        if (div16)
-                tempval |= QE_BRGC_DIV16;
+        /* Errata QE_General4, which affects some MPC832x and MPC836x SOCs, says
+           that the BRG divisor must be even if you're not using divide-by-16
+           mode. */
+        if (!div16 && (divisor & 1))
+                divisor++;
+
+        tempval = ((divisor - 1) << QE_BRGC_DIVISOR_SHIFT) |
+                QE_BRGC_ENABLE | div16;
 
-        out_be32(bp, tempval);
+        out_be32(&qe_immr->brg.brgc[brg - 1], tempval);
 }
 
 /* Initialize SNUMs (thread serial numbers) according to
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c
index 4d1dcb45963d..e1c0fd6dbc1a 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -245,10 +245,8 @@ static struct irq_chip qe_ic_irq_chip = {
 
 static int qe_ic_host_match(struct irq_host *h, struct device_node *node)
 {
-        struct qe_ic *qe_ic = h->host_data;
-
         /* Exact match, unless qe_ic node is NULL */
-        return qe_ic->of_node == NULL || qe_ic->of_node == node;
+        return h->of_node == NULL || h->of_node == node;
 }
 
 static int qe_ic_host_map(struct irq_host *h, unsigned int virq,
@@ -323,25 +321,9 @@ unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic)
         return irq_linear_revmap(qe_ic->irqhost, irq);
 }
 
-void qe_ic_cascade_low(unsigned int irq, struct irq_desc *desc)
-{
-        struct qe_ic *qe_ic = desc->handler_data;
-        unsigned int cascade_irq = qe_ic_get_low_irq(qe_ic);
-
-        if (cascade_irq != NO_IRQ)
-                generic_handle_irq(cascade_irq);
-}
-
-void qe_ic_cascade_high(unsigned int irq, struct irq_desc *desc)
-{
-        struct qe_ic *qe_ic = desc->handler_data;
-        unsigned int cascade_irq = qe_ic_get_high_irq(qe_ic);
-
-        if (cascade_irq != NO_IRQ)
-                generic_handle_irq(cascade_irq);
-}
-
-void __init qe_ic_init(struct device_node *node, unsigned int flags)
+void __init qe_ic_init(struct device_node *node, unsigned int flags,
+                void (*low_handler)(unsigned int irq, struct irq_desc *desc),
+                void (*high_handler)(unsigned int irq, struct irq_desc *desc))
 {
         struct qe_ic *qe_ic;
         struct resource res;
@@ -352,9 +334,8 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags)
                 return;
 
         memset(qe_ic, 0, sizeof(struct qe_ic));
-        qe_ic->of_node = of_node_get(node);
 
-        qe_ic->irqhost = irq_alloc_host(IRQ_HOST_MAP_LINEAR,
+        qe_ic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
                                         NR_QE_IC_INTS, &qe_ic_host_ops, 0);
         if (qe_ic->irqhost == NULL) {
                 of_node_put(node);
@@ -402,14 +383,13 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags)
         qe_ic_write(qe_ic->regs, QEIC_CICR, temp);
 
         set_irq_data(qe_ic->virq_low, qe_ic);
-        set_irq_chained_handler(qe_ic->virq_low, qe_ic_cascade_low);
+        set_irq_chained_handler(qe_ic->virq_low, low_handler);
 
-        if (qe_ic->virq_high != NO_IRQ) {
+        if (qe_ic->virq_high != NO_IRQ &&
+                        qe_ic->virq_high != qe_ic->virq_low) {
                 set_irq_data(qe_ic->virq_high, qe_ic);
-                set_irq_chained_handler(qe_ic->virq_high, qe_ic_cascade_high);
+                set_irq_chained_handler(qe_ic->virq_high, high_handler);
         }
-
-        printk("QEIC (%d IRQ sources) at %p\n", NR_QE_IC_INTS, qe_ic->regs);
 }
 
 void qe_ic_set_highest_priority(unsigned int virq, int high)
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.h b/arch/powerpc/sysdev/qe_lib/qe_ic.h
index 9a631adb189d..c1361d005a8a 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.h
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.h
@@ -84,9 +84,6 @@ struct qe_ic {
         /* The "linux" controller struct */
         struct irq_chip hc_irq;
 
-        /* The device node of the interrupt controller */
-        struct device_node *of_node;
-
         /* VIRQ numbers of QE high/low irqs */
         unsigned int virq_high;
         unsigned int virq_low;
diff --git a/arch/powerpc/sysdev/qe_lib/qe_io.c b/arch/powerpc/sysdev/qe_lib/qe_io.c
index e32b45bf9ff5..e53ea4d374a0 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_io.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_io.c
@@ -36,6 +36,9 @@ struct port_regs {
         __be32  cpdir2;         /* Direction register */
         __be32  cppar1;         /* Pin assignment register */
         __be32  cppar2;         /* Pin assignment register */
+#ifdef CONFIG_PPC_85xx
+        u8      pad[8];
+#endif
 };
 
 static struct port_regs *par_io = NULL;
@@ -195,29 +198,22 @@ EXPORT_SYMBOL(par_io_of_config);
 #ifdef DEBUG
 static void dump_par_io(void)
 {
-        int i;
+        unsigned int i;
 
-        printk(KERN_INFO "PAR IO registars:\n");
-        printk(KERN_INFO "Base address: 0x%08x\n", (u32) par_io);
+        printk(KERN_INFO "%s: par_io=%p\n", __FUNCTION__, par_io);
         for (i = 0; i < num_par_io_ports; i++) {
-                printk(KERN_INFO "cpodr[%d] : addr - 0x%08x, val - 0x%08x\n",
-                       i, (u32) & par_io[i].cpodr,
-                       in_be32(&par_io[i].cpodr));
-                printk(KERN_INFO "cpdata[%d]: addr - 0x%08x, val - 0x%08x\n",
-                       i, (u32) & par_io[i].cpdata,
-                       in_be32(&par_io[i].cpdata));
-                printk(KERN_INFO "cpdir1[%d]: addr - 0x%08x, val - 0x%08x\n",
-                       i, (u32) & par_io[i].cpdir1,
-                       in_be32(&par_io[i].cpdir1));
-                printk(KERN_INFO "cpdir2[%d]: addr - 0x%08x, val - 0x%08x\n",
-                       i, (u32) & par_io[i].cpdir2,
-                       in_be32(&par_io[i].cpdir2));
-                printk(KERN_INFO "cppar1[%d]: addr - 0x%08x, val - 0x%08x\n",
-                       i, (u32) & par_io[i].cppar1,
-                       in_be32(&par_io[i].cppar1));
-                printk(KERN_INFO "cppar2[%d]: addr - 0x%08x, val - 0x%08x\n",
-                       i, (u32) & par_io[i].cppar2,
-                       in_be32(&par_io[i].cppar2));
+                printk(KERN_INFO "      cpodr[%u]=%08x\n", i,
+                        in_be32(&par_io[i].cpodr));
+                printk(KERN_INFO "      cpdata[%u]=%08x\n", i,
+                        in_be32(&par_io[i].cpdata));
+                printk(KERN_INFO "      cpdir1[%u]=%08x\n", i,
+                        in_be32(&par_io[i].cpdir1));
+                printk(KERN_INFO "      cpdir2[%u]=%08x\n", i,
+                        in_be32(&par_io[i].cpdir2));
+                printk(KERN_INFO "      cppar1[%u]=%08x\n", i,
+                        in_be32(&par_io[i].cppar1));
+                printk(KERN_INFO "      cppar2[%u]=%08x\n", i,
+                        in_be32(&par_io[i].cppar2));
         }
 
 }
diff --git a/arch/powerpc/sysdev/qe_lib/ucc.c b/arch/powerpc/sysdev/qe_lib/ucc.c
index f970e5415ac0..0e348d9af8a6 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc.c
@@ -28,228 +28,188 @@
 
 static DEFINE_SPINLOCK(ucc_lock);
 
-int ucc_set_qe_mux_mii_mng(int ucc_num)
+int ucc_set_qe_mux_mii_mng(unsigned int ucc_num)
 {
         unsigned long flags;
 
+        if (ucc_num > UCC_MAX_NUM - 1)
+                return -EINVAL;
+
         spin_lock_irqsave(&ucc_lock, flags);
-        out_be32(&qe_immr->qmx.cmxgcr,
-                 ((in_be32(&qe_immr->qmx.cmxgcr) &
-                   ~QE_CMXGCR_MII_ENET_MNG) |
-                  (ucc_num << QE_CMXGCR_MII_ENET_MNG_SHIFT)));
+        clrsetbits_be32(&qe_immr->qmx.cmxgcr, QE_CMXGCR_MII_ENET_MNG,
+                ucc_num << QE_CMXGCR_MII_ENET_MNG_SHIFT);
         spin_unlock_irqrestore(&ucc_lock, flags);
 
         return 0;
 }
 EXPORT_SYMBOL(ucc_set_qe_mux_mii_mng);
 
-int ucc_set_type(int ucc_num, struct ucc_common *regs,
-                 enum ucc_speed_type speed)
-{
-        u8 guemr = 0;
-
-        /* check if the UCC number is in range. */
-        if ((ucc_num > UCC_MAX_NUM - 1) || (ucc_num < 0))
-                return -EINVAL;
-
-        guemr = regs->guemr;
-        guemr &= ~(UCC_GUEMR_MODE_MASK_RX | UCC_GUEMR_MODE_MASK_TX);
-        switch (speed) {
-        case UCC_SPEED_TYPE_SLOW:
-                guemr |= (UCC_GUEMR_MODE_SLOW_RX | UCC_GUEMR_MODE_SLOW_TX);
-                break;
-        case UCC_SPEED_TYPE_FAST:
-                guemr |= (UCC_GUEMR_MODE_FAST_RX | UCC_GUEMR_MODE_FAST_TX);
-                break;
-        default:
-                return -EINVAL;
-        }
-        regs->guemr = guemr;
-
-        return 0;
-}
-
-int ucc_init_guemr(struct ucc_common *regs)
+/* Configure the UCC to either Slow or Fast.
+ *
+ * A given UCC can be figured to support either "slow" devices (e.g. UART)
+ * or "fast" devices (e.g. Ethernet).
+ *
+ * 'ucc_num' is the UCC number, from 0 - 7.
+ *
+ * This function also sets the UCC_GUEMR_SET_RESERVED3 bit because that bit
+ * must always be set to 1.
+ */
+int ucc_set_type(unsigned int ucc_num, enum ucc_speed_type speed)
 {
-        u8 guemr = 0;
-
-        if (!regs)
-                return -EINVAL;
-
-        /* Set bit 3 (which is reserved in the GUEMR register) to 1 */
-        guemr = UCC_GUEMR_SET_RESERVED3;
-
-        regs->guemr = guemr;
-
-        return 0;
-}
+        u8 __iomem *guemr;
 
-static void get_cmxucr_reg(int ucc_num, volatile u32 ** p_cmxucr, u8 * reg_num,
-                           u8 * shift)
-{
+        /* The GUEMR register is at the same location for both slow and fast
+           devices, so we just use uccX.slow.guemr. */
         switch (ucc_num) {
-        case 0: *p_cmxucr = &(qe_immr->qmx.cmxucr1);
-                *reg_num = 1;
-                *shift = 16;
+        case 0: guemr = &qe_immr->ucc1.slow.guemr;
                 break;
-        case 2: *p_cmxucr = &(qe_immr->qmx.cmxucr1);
-                *reg_num = 1;
-                *shift = 0;
+        case 1: guemr = &qe_immr->ucc2.slow.guemr;
                 break;
-        case 4: *p_cmxucr = &(qe_immr->qmx.cmxucr2);
-                *reg_num = 2;
-                *shift = 16;
+        case 2: guemr = &qe_immr->ucc3.slow.guemr;
                 break;
-        case 6: *p_cmxucr = &(qe_immr->qmx.cmxucr2);
-                *reg_num = 2;
-                *shift = 0;
+        case 3: guemr = &qe_immr->ucc4.slow.guemr;
                 break;
-        case 1: *p_cmxucr = &(qe_immr->qmx.cmxucr3);
-                *reg_num = 3;
-                *shift = 16;
+        case 4: guemr = &qe_immr->ucc5.slow.guemr;
                 break;
-        case 3: *p_cmxucr = &(qe_immr->qmx.cmxucr3);
-                *reg_num = 3;
-                *shift = 0;
+        case 5: guemr = &qe_immr->ucc6.slow.guemr;
                 break;
-        case 5: *p_cmxucr = &(qe_immr->qmx.cmxucr4);
-                *reg_num = 4;
-                *shift = 16;
+        case 6: guemr = &qe_immr->ucc7.slow.guemr;
                 break;
-        case 7: *p_cmxucr = &(qe_immr->qmx.cmxucr4);
-                *reg_num = 4;
-                *shift = 0;
+        case 7: guemr = &qe_immr->ucc8.slow.guemr;
                 break;
         default:
-                break;
+                return -EINVAL;
         }
+
+        clrsetbits_8(guemr, UCC_GUEMR_MODE_MASK,
+                UCC_GUEMR_SET_RESERVED3 | speed);
+
+        return 0;
+}
+
+static void get_cmxucr_reg(unsigned int ucc_num, __be32 **cmxucr,
+        unsigned int *reg_num, unsigned int *shift)
+{
+        unsigned int cmx = ((ucc_num & 1) << 1) + (ucc_num > 3);
+
+        *reg_num = cmx + 1;
+        *cmxucr = &qe_immr->qmx.cmxucr[cmx];
+        *shift = 16 - 8 * (ucc_num & 2);
 }
 
-int ucc_mux_set_grant_tsa_bkpt(int ucc_num, int set, u32 mask)
+int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask)
 {
-        volatile u32 *p_cmxucr;
-        u8 reg_num;
-        u8 shift;
+        __be32 *cmxucr;
+        unsigned int reg_num;
+        unsigned int shift;
 
         /* check if the UCC number is in range. */
-        if ((ucc_num > UCC_MAX_NUM - 1) || (ucc_num < 0))
+        if (ucc_num > UCC_MAX_NUM - 1)
                 return -EINVAL;
 
-        get_cmxucr_reg(ucc_num, &p_cmxucr, &reg_num, &shift);
+        get_cmxucr_reg(ucc_num, &cmxucr, &reg_num, &shift);
 
         if (set)
-                out_be32(p_cmxucr, in_be32(p_cmxucr) | (mask << shift));
+                setbits32(cmxucr, mask << shift);
         else
-                out_be32(p_cmxucr, in_be32(p_cmxucr) & ~(mask << shift));
+                clrbits32(cmxucr, mask << shift);
 
         return 0;
 }
 
-int ucc_set_qe_mux_rxtx(int ucc_num, enum qe_clock clock, enum comm_dir mode)
+int ucc_set_qe_mux_rxtx(unsigned int ucc_num, enum qe_clock clock,
+        enum comm_dir mode)
 {
-        volatile u32 *p_cmxucr;
-        u8 reg_num;
-        u8 shift;
-        u32 clock_bits;
-        u32 clock_mask;
-        int source = -1;
+        __be32 *cmxucr;
+        unsigned int reg_num;
+        unsigned int shift;
+        u32 clock_bits = 0;
 
         /* check if the UCC number is in range. */
-        if ((ucc_num > UCC_MAX_NUM - 1) || (ucc_num < 0))
+        if (ucc_num > UCC_MAX_NUM - 1)
                 return -EINVAL;
 
-        if (!((mode == COMM_DIR_RX) || (mode == COMM_DIR_TX))) {
-                printk(KERN_ERR
-                       "ucc_set_qe_mux_rxtx: bad comm mode type passed.");
+        /* The communications direction must be RX or TX */
+        if (!((mode == COMM_DIR_RX) || (mode == COMM_DIR_TX)))
                 return -EINVAL;
-        }
 
-        get_cmxucr_reg(ucc_num, &p_cmxucr, &reg_num, &shift);
+        get_cmxucr_reg(ucc_num, &cmxucr, &reg_num, &shift);
 
         switch (reg_num) {
         case 1:
                 switch (clock) {
-                case QE_BRG1:   source = 1; break;
-                case QE_BRG2:   source = 2; break;
-                case QE_BRG7:   source = 3; break;
-                case QE_BRG8:   source = 4; break;
-                case QE_CLK9:   source = 5; break;
-                case QE_CLK10:  source = 6; break;
-                case QE_CLK11:  source = 7; break;
-                case QE_CLK12:  source = 8; break;
-                case QE_CLK15:  source = 9; break;
-                case QE_CLK16:  source = 10; break;
-                default:        source = -1; break;
+                case QE_BRG1:   clock_bits = 1; break;
+                case QE_BRG2:   clock_bits = 2; break;
+                case QE_BRG7:   clock_bits = 3; break;
+                case QE_BRG8:   clock_bits = 4; break;
+                case QE_CLK9:   clock_bits = 5; break;
+                case QE_CLK10:  clock_bits = 6; break;
+                case QE_CLK11:  clock_bits = 7; break;
+                case QE_CLK12:  clock_bits = 8; break;
+                case QE_CLK15:  clock_bits = 9; break;
+                case QE_CLK16:  clock_bits = 10; break;
+                default: break;
                 }
                 break;
         case 2:
                 switch (clock) {
-                case QE_BRG5:   source = 1; break;
-                case QE_BRG6:   source = 2; break;
-                case QE_BRG7:   source = 3; break;
-                case QE_BRG8:   source = 4; break;
-                case QE_CLK13:  source = 5; break;
-                case QE_CLK14:  source = 6; break;
-                case QE_CLK19:  source = 7; break;
-                case QE_CLK20:  source = 8; break;
-                case QE_CLK15:  source = 9; break;
-                case QE_CLK16:  source = 10; break;
-                default:        source = -1; break;
+                case QE_BRG5:   clock_bits = 1; break;
+                case QE_BRG6:   clock_bits = 2; break;
+                case QE_BRG7:   clock_bits = 3; break;
+                case QE_BRG8:   clock_bits = 4; break;
+                case QE_CLK13:  clock_bits = 5; break;
+                case QE_CLK14:  clock_bits = 6; break;
+                case QE_CLK19:  clock_bits = 7; break;
+                case QE_CLK20:  clock_bits = 8; break;
+                case QE_CLK15:  clock_bits = 9; break;
+                case QE_CLK16:  clock_bits = 10; break;
+                default: break;
                 }
                 break;
         case 3:
                 switch (clock) {
-                case QE_BRG9:   source = 1; break;
-                case QE_BRG10:  source = 2; break;
-                case QE_BRG15:  source = 3; break;
-                case QE_BRG16:  source = 4; break;
-                case QE_CLK3:   source = 5; break;
-                case QE_CLK4:   source = 6; break;
-                case QE_CLK17:  source = 7; break;
-                case QE_CLK18:  source = 8; break;
-                case QE_CLK7:   source = 9; break;
-                case QE_CLK8:   source = 10; break;
-                case QE_CLK16:  source = 11; break;
-                default:        source = -1; break;
+                case QE_BRG9:   clock_bits = 1; break;
+                case QE_BRG10:  clock_bits = 2; break;
+                case QE_BRG15:  clock_bits = 3; break;
+                case QE_BRG16:  clock_bits = 4; break;
+                case QE_CLK3:   clock_bits = 5; break;
+                case QE_CLK4:   clock_bits = 6; break;
+                case QE_CLK17:  clock_bits = 7; break;
+                case QE_CLK18:  clock_bits = 8; break;
+                case QE_CLK7:   clock_bits = 9; break;
+                case QE_CLK8:   clock_bits = 10; break;
+                case QE_CLK16:  clock_bits = 11; break;
+                default: break;
                 }
                 break;
         case 4:
                 switch (clock) {
-                case QE_BRG13:  source = 1; break;
-                case QE_BRG14:  source = 2; break;
-                case QE_BRG15:  source = 3; break;
-                case QE_BRG16:  source = 4; break;
-                case QE_CLK5:   source = 5; break;
-                case QE_CLK6:   source = 6; break;
-                case QE_CLK21:  source = 7; break;
-                case QE_CLK22:  source = 8; break;
-                case QE_CLK7:   source = 9; break;
-                case QE_CLK8:   source = 10; break;
-                case QE_CLK16:  source = 11; break;
-                default:        source = -1; break;
+                case QE_BRG13:  clock_bits = 1; break;
+                case QE_BRG14:  clock_bits = 2; break;
+                case QE_BRG15:  clock_bits = 3; break;
+                case QE_BRG16:  clock_bits = 4; break;
+                case QE_CLK5:   clock_bits = 5; break;
+                case QE_CLK6:   clock_bits = 6; break;
+                case QE_CLK21:  clock_bits = 7; break;
+                case QE_CLK22:  clock_bits = 8; break;
+                case QE_CLK7:   clock_bits = 9; break;
+                case QE_CLK8:   clock_bits = 10; break;
+                case QE_CLK16:  clock_bits = 11; break;
+                default: break;
                 }
                 break;
-        default:
-                source = -1;
-                break;
+        default: break;
         }
 
-        if (source == -1) {
-                printk(KERN_ERR
-                     "ucc_set_qe_mux_rxtx: Bad combination of clock and UCC.");
+        /* Check for invalid combination of clock and UCC number */
+        if (!clock_bits)
                 return -ENOENT;
-        }
 
-        clock_bits = (u32) source;
-        clock_mask = QE_CMXUCR_TX_CLK_SRC_MASK;
-        if (mode == COMM_DIR_RX) {
-                clock_bits <<= 4;  /* Rx field is 4 bits to left of Tx field */
-                clock_mask <<= 4;  /* Rx field is 4 bits to left of Tx field */
-        }
-        clock_bits <<= shift;
-        clock_mask <<= shift;
+        if (mode == COMM_DIR_RX)
+                shift += 4;
 
-        out_be32(p_cmxucr, (in_be32(p_cmxucr) & ~clock_mask) | clock_bits);
+        clrsetbits_be32(cmxucr, QE_CMXUCR_TX_CLK_SRC_MASK << shift,
+                clock_bits << shift);
 
         return 0;
 }
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
index 3df202e8d332..3223acbc39e5 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
@@ -30,46 +30,45 @@
 
 void ucc_fast_dump_regs(struct ucc_fast_private * uccf)
 {
-        printk(KERN_INFO "UCC%d Fast registers:", uccf->uf_info->ucc_num);
-        printk(KERN_INFO "Base address: 0x%08x", (u32) uccf->uf_regs);
-
-        printk(KERN_INFO "gumr  : addr - 0x%08x, val - 0x%08x",
-                  (u32) & uccf->uf_regs->gumr, in_be32(&uccf->uf_regs->gumr));
-        printk(KERN_INFO "upsmr : addr - 0x%08x, val - 0x%08x",
-                  (u32) & uccf->uf_regs->upsmr, in_be32(&uccf->uf_regs->upsmr));
-        printk(KERN_INFO "utodr : addr - 0x%08x, val - 0x%04x",
-                  (u32) & uccf->uf_regs->utodr, in_be16(&uccf->uf_regs->utodr));
-        printk(KERN_INFO "udsr  : addr - 0x%08x, val - 0x%04x",
-                  (u32) & uccf->uf_regs->udsr, in_be16(&uccf->uf_regs->udsr));
-        printk(KERN_INFO "ucce  : addr - 0x%08x, val - 0x%08x",
-                  (u32) & uccf->uf_regs->ucce, in_be32(&uccf->uf_regs->ucce));
-        printk(KERN_INFO "uccm  : addr - 0x%08x, val - 0x%08x",
-                  (u32) & uccf->uf_regs->uccm, in_be32(&uccf->uf_regs->uccm));
-        printk(KERN_INFO "uccs  : addr - 0x%08x, val - 0x%02x",
-                  (u32) & uccf->uf_regs->uccs, uccf->uf_regs->uccs);
-        printk(KERN_INFO "urfb  : addr - 0x%08x, val - 0x%08x",
-                  (u32) & uccf->uf_regs->urfb, in_be32(&uccf->uf_regs->urfb));
-        printk(KERN_INFO "urfs  : addr - 0x%08x, val - 0x%04x",
-                  (u32) & uccf->uf_regs->urfs, in_be16(&uccf->uf_regs->urfs));
-        printk(KERN_INFO "urfet : addr - 0x%08x, val - 0x%04x",
-                  (u32) & uccf->uf_regs->urfet, in_be16(&uccf->uf_regs->urfet));
-        printk(KERN_INFO "urfset: addr - 0x%08x, val - 0x%04x",
-                  (u32) & uccf->uf_regs->urfset,
-                  in_be16(&uccf->uf_regs->urfset));
-        printk(KERN_INFO "utfb  : addr - 0x%08x, val - 0x%08x",
-                  (u32) & uccf->uf_regs->utfb, in_be32(&uccf->uf_regs->utfb));
-        printk(KERN_INFO "utfs  : addr - 0x%08x, val - 0x%04x",
-                  (u32) & uccf->uf_regs->utfs, in_be16(&uccf->uf_regs->utfs));
-        printk(KERN_INFO "utfet : addr - 0x%08x, val - 0x%04x",
-                  (u32) & uccf->uf_regs->utfet, in_be16(&uccf->uf_regs->utfet));
-        printk(KERN_INFO "utftt : addr - 0x%08x, val - 0x%04x",
-                  (u32) & uccf->uf_regs->utftt, in_be16(&uccf->uf_regs->utftt));
-        printk(KERN_INFO "utpt  : addr - 0x%08x, val - 0x%04x",
-                  (u32) & uccf->uf_regs->utpt, in_be16(&uccf->uf_regs->utpt));
-        printk(KERN_INFO "urtry : addr - 0x%08x, val - 0x%08x",
-                  (u32) & uccf->uf_regs->urtry, in_be32(&uccf->uf_regs->urtry));
-        printk(KERN_INFO "guemr : addr - 0x%08x, val - 0x%02x",
-                  (u32) & uccf->uf_regs->guemr, uccf->uf_regs->guemr);
+        printk(KERN_INFO "UCC%u Fast registers:\n", uccf->uf_info->ucc_num);
+        printk(KERN_INFO "Base address: 0x%p\n", uccf->uf_regs);
+
+        printk(KERN_INFO "gumr  : addr=0x%p, val=0x%08x\n",
+                  &uccf->uf_regs->gumr, in_be32(&uccf->uf_regs->gumr));
+        printk(KERN_INFO "upsmr : addr=0x%p, val=0x%08x\n",
+                  &uccf->uf_regs->upsmr, in_be32(&uccf->uf_regs->upsmr));
+        printk(KERN_INFO "utodr : addr=0x%p, val=0x%04x\n",
+                  &uccf->uf_regs->utodr, in_be16(&uccf->uf_regs->utodr));
+        printk(KERN_INFO "udsr  : addr=0x%p, val=0x%04x\n",
+                  &uccf->uf_regs->udsr, in_be16(&uccf->uf_regs->udsr));
+        printk(KERN_INFO "ucce  : addr=0x%p, val=0x%08x\n",
+                  &uccf->uf_regs->ucce, in_be32(&uccf->uf_regs->ucce));
+        printk(KERN_INFO "uccm  : addr=0x%p, val=0x%08x\n",
+                  &uccf->uf_regs->uccm, in_be32(&uccf->uf_regs->uccm));
+        printk(KERN_INFO "uccs  : addr=0x%p, val=0x%02x\n",
+                  &uccf->uf_regs->uccs, uccf->uf_regs->uccs);
+        printk(KERN_INFO "urfb  : addr=0x%p, val=0x%08x\n",
+                  &uccf->uf_regs->urfb, in_be32(&uccf->uf_regs->urfb));
+        printk(KERN_INFO "urfs  : addr=0x%p, val=0x%04x\n",
+                  &uccf->uf_regs->urfs, in_be16(&uccf->uf_regs->urfs));
+        printk(KERN_INFO "urfet : addr=0x%p, val=0x%04x\n",
+                  &uccf->uf_regs->urfet, in_be16(&uccf->uf_regs->urfet));
+        printk(KERN_INFO "urfset: addr=0x%p, val=0x%04x\n",
+                  &uccf->uf_regs->urfset, in_be16(&uccf->uf_regs->urfset));
+        printk(KERN_INFO "utfb  : addr=0x%p, val=0x%08x\n",
+                  &uccf->uf_regs->utfb, in_be32(&uccf->uf_regs->utfb));
+        printk(KERN_INFO "utfs  : addr=0x%p, val=0x%04x\n",
+                  &uccf->uf_regs->utfs, in_be16(&uccf->uf_regs->utfs));
+        printk(KERN_INFO "utfet : addr=0x%p, val=0x%04x\n",
+                  &uccf->uf_regs->utfet, in_be16(&uccf->uf_regs->utfet));
+        printk(KERN_INFO "utftt : addr=0x%p, val=0x%04x\n",
+                  &uccf->uf_regs->utftt, in_be16(&uccf->uf_regs->utftt));
+        printk(KERN_INFO "utpt  : addr=0x%p, val=0x%04x\n",
+                  &uccf->uf_regs->utpt, in_be16(&uccf->uf_regs->utpt));
+        printk(KERN_INFO "urtry : addr=0x%p, val=0x%08x\n",
+                  &uccf->uf_regs->urtry, in_be32(&uccf->uf_regs->urtry));
+        printk(KERN_INFO "guemr : addr=0x%p, val=0x%02x\n",
+                  &uccf->uf_regs->guemr, uccf->uf_regs->guemr);
 }
 EXPORT_SYMBOL(ucc_fast_dump_regs);
 
@@ -149,55 +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", __FUNCTION__);
+                printk(KERN_ERR "%s: illegal UCC number\n", __FUNCTION__);
                 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", __FUNCTION__);
+                printk(KERN_ERR "%s: max_rx_buf_length not aligned\n",
+                        __FUNCTION__);
                 return -EINVAL;
         }
 
         /* Validate Virtual Fifo register values */
         if (uf_info->urfs < UCC_FAST_URFS_MIN_VAL) {
-                printk(KERN_ERR "%s: urfs is too small", __FUNCTION__);
+                printk(KERN_ERR "%s: urfs is too small\n", __FUNCTION__);
                 return -EINVAL;
         }
 
         if (uf_info->urfs & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
-                printk(KERN_ERR "%s: urfs is not aligned", __FUNCTION__);
+                printk(KERN_ERR "%s: urfs is not aligned\n", __FUNCTION__);
                 return -EINVAL;
         }
 
         if (uf_info->urfet & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
-                printk(KERN_ERR "%s: urfet is not aligned.", __FUNCTION__);
+                printk(KERN_ERR "%s: urfet is not aligned.\n", __FUNCTION__);
                 return -EINVAL;
         }
 
         if (uf_info->urfset & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
-                printk(KERN_ERR "%s: urfset is not aligned", __FUNCTION__);
+                printk(KERN_ERR "%s: urfset is not aligned\n", __FUNCTION__);
                 return -EINVAL;
         }
 
         if (uf_info->utfs & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
-                printk(KERN_ERR "%s: utfs is not aligned", __FUNCTION__);
+                printk(KERN_ERR "%s: utfs is not aligned\n", __FUNCTION__);
                 return -EINVAL;
         }
 
         if (uf_info->utfet & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
-                printk(KERN_ERR "%s: utfet is not aligned", __FUNCTION__);
+                printk(KERN_ERR "%s: utfet is not aligned\n", __FUNCTION__);
                 return -EINVAL;
         }
 
         if (uf_info->utftt & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
-                printk(KERN_ERR "%s: utftt is not aligned", __FUNCTION__);
+                printk(KERN_ERR "%s: utftt is not aligned\n", __FUNCTION__);
                 return -EINVAL;
         }
 
         uccf = kzalloc(sizeof(struct ucc_fast_private), GFP_KERNEL);
         if (!uccf) {
-                printk(KERN_ERR "%s: Cannot allocate private data", __FUNCTION__);
+                printk(KERN_ERR "%s: Cannot allocate private data\n",
+                        __FUNCTION__);
                 return -ENOMEM;
         }
 
@@ -206,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", __FUNCTION__);
+                printk(KERN_ERR "%s: Cannot map UCC registers\n", __FUNCTION__);
                 return -ENOMEM;
         }
 
@@ -226,18 +227,10 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
         uccf->rx_discarded = 0;
 #endif                          /* STATISTICS */
 
-        /* Init Guemr register */
-        if ((ret = ucc_init_guemr((struct ucc_common *) (uf_regs)))) {
-                printk(KERN_ERR "%s: cannot init GUEMR", __FUNCTION__);
-                ucc_fast_free(uccf);
-                return ret;
-        }
-
         /* Set UCC to fast type */
-        if ((ret = ucc_set_type(uf_info->ucc_num,
-                                (struct ucc_common *) (uf_regs),
-                                UCC_SPEED_TYPE_FAST))) {
-                printk(KERN_ERR "%s: cannot set UCC type", __FUNCTION__);
+        ret = ucc_set_type(uf_info->ucc_num, UCC_SPEED_TYPE_FAST);
+        if (ret) {
+                printk(KERN_ERR "%s: cannot set UCC type\n", __FUNCTION__);
                 ucc_fast_free(uccf);
                 return ret;
         }
@@ -276,7 +269,8 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
         uccf->ucc_fast_tx_virtual_fifo_base_offset =
             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", __FUNCTION__);
+                printk(KERN_ERR "%s: cannot allocate MURAM for TX FIFO\n",
+                        __FUNCTION__);
                 uccf->ucc_fast_tx_virtual_fifo_base_offset = 0;
                 ucc_fast_free(uccf);
                 return -ENOMEM;
@@ -288,7 +282,8 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
                            UCC_FAST_RECEIVE_VIRTUAL_FIFO_SIZE_FUDGE_FACTOR,
                            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", __FUNCTION__);
+                printk(KERN_ERR "%s: cannot allocate MURAM for RX FIFO\n",
+                        __FUNCTION__);
                 uccf->ucc_fast_rx_virtual_fifo_base_offset = 0;
                 ucc_fast_free(uccf);
                 return -ENOMEM;
@@ -318,7 +313,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
                 if ((uf_info->rx_clock != QE_CLK_NONE) &&
                     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",
+                        printk(KERN_ERR "%s: illegal value for RX clock\n",
                                __FUNCTION__);
                         ucc_fast_free(uccf);
                         return -EINVAL;
@@ -327,7 +322,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
                 if ((uf_info->tx_clock != QE_CLK_NONE) &&
                     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",
+                        printk(KERN_ERR "%s: illegal value for TX clock\n",
                                __FUNCTION__);
                         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 1f65c26ce63f..0174b3aeef8f 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
@@ -115,11 +115,15 @@ void ucc_slow_disable(struct ucc_slow_private * uccs, enum comm_dir mode)
         out_be32(&us_regs->gumr_l, gumr_l);
 }
 
+/* Initialize the UCC for Slow operations
+ *
+ * The caller should initialize the following us_info
+ */
 int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** uccs_ret)
 {
         struct ucc_slow_private *uccs;
         u32 i;
-        struct ucc_slow *us_regs;
+        struct ucc_slow __iomem *us_regs;
         u32 gumr;
         struct qe_bd *bd;
         u32 id;
@@ -131,7 +135,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", __FUNCTION__);
+                printk(KERN_ERR "%s: illegal UCC number\n", __FUNCTION__);
                 return -EINVAL;
         }
 
@@ -143,13 +147,14 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
          */
         if ((!us_info->rfw) &&
                 (us_info->max_rx_buf_length & (UCC_SLOW_MRBLR_ALIGNMENT - 1))) {
-                printk(KERN_ERR "max_rx_buf_length not aligned.");
+                printk(KERN_ERR "max_rx_buf_length not aligned.\n");
                 return -EINVAL;
         }
 
         uccs = kzalloc(sizeof(struct ucc_slow_private), GFP_KERNEL);
         if (!uccs) {
-                printk(KERN_ERR "%s: Cannot allocate private data", __FUNCTION__);
+                printk(KERN_ERR "%s: Cannot allocate private data\n",
+                        __FUNCTION__);
                 return -ENOMEM;
         }
 
@@ -158,7 +163,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", __FUNCTION__);
+                printk(KERN_ERR "%s: Cannot map UCC registers\n", __FUNCTION__);
                 return -ENOMEM;
         }
 
@@ -182,22 +187,14 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
                 return -ENOMEM;
         }
         id = ucc_slow_get_qe_cr_subblock(us_info->ucc_num);
-        qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, id, QE_CR_PROTOCOL_UNSPECIFIED,
+        qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, id, us_info->protocol,
                      uccs->us_pram_offset);
 
         uccs->us_pram = qe_muram_addr(uccs->us_pram_offset);
 
-        /* Init Guemr register */
-        if ((ret = ucc_init_guemr((struct ucc_common *) us_regs))) {
-                printk(KERN_ERR "%s: cannot init GUEMR", __FUNCTION__);
-                ucc_slow_free(uccs);
-                return ret;
-        }
-
         /* Set UCC to slow type */
-        if ((ret = ucc_set_type(us_info->ucc_num,
-                                (struct ucc_common *) us_regs,
-                                UCC_SPEED_TYPE_SLOW))) {
+        ret = ucc_set_type(us_info->ucc_num, UCC_SPEED_TYPE_SLOW);
+        if (ret) {
                 printk(KERN_ERR "%s: cannot set UCC type", __FUNCTION__);
                 ucc_slow_free(uccs);
                 return ret;
@@ -212,7 +209,8 @@ 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 RX BDs", __FUNCTION__);
+                printk(KERN_ERR "%s: cannot allocate %u RX BDs\n", __FUNCTION__,
+                        us_info->rx_bd_ring_len);
                 uccs->rx_base_offset = 0;
                 ucc_slow_free(uccs);
                 return -ENOMEM;
@@ -292,12 +290,12 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
 
         /* if the data is in cachable memory, the 'global' */
         /* in the function code should be set. */
-        uccs->us_pram->tfcr = uccs->us_pram->rfcr =
-                us_info->data_mem_part | QE_BMR_BYTE_ORDER_BO_MOT;
+        uccs->us_pram->tbmr = UCC_BMR_BO_BE;
+        uccs->us_pram->rbmr = UCC_BMR_BO_BE;
 
         /* rbase, tbase are offsets from MURAM base */
-        out_be16(&uccs->us_pram->rbase, uccs->us_pram_offset);
-        out_be16(&uccs->us_pram->tbase, uccs->us_pram_offset);
+        out_be16(&uccs->us_pram->rbase, uccs->rx_base_offset);
+        out_be16(&uccs->us_pram->tbase, uccs->tx_base_offset);
 
         /* Mux clocking */
         /* Grant Support */
@@ -311,7 +309,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
                 /* Rx clock routing */
                 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",
+                        printk(KERN_ERR "%s: illegal value for RX clock\n",
                                __FUNCTION__);
                         ucc_slow_free(uccs);
                         return -EINVAL;
@@ -319,7 +317,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
                 /* Tx clock routing */
                 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",
+                        printk(KERN_ERR "%s: illegal value for TX clock\n",
                                __FUNCTION__);
                         ucc_slow_free(uccs);
                         return -EINVAL;
@@ -343,8 +341,8 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
                 command = QE_INIT_TX;
         else
                 command = QE_INIT_RX;   /* We know at least one is TRUE */
-        id = ucc_slow_get_qe_cr_subblock(us_info->ucc_num);
-        qe_issue_cmd(command, id, QE_CR_PROTOCOL_UNSPECIFIED, 0);
+
+        qe_issue_cmd(command, id, us_info->protocol, 0);
 
         *uccs_ret = uccs;
         return 0;
diff --git a/arch/powerpc/sysdev/timer.c b/arch/powerpc/sysdev/timer.c
deleted file mode 100644
index e81e7ec2e799..000000000000
--- a/arch/powerpc/sysdev/timer.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Common code to keep time when machine suspends.
- *
- * Copyright 2007       Johannes Berg <johannes@sipsolutions.net>
- *
- * GPLv2
- */
-
-#include <linux/time.h>
-#include <linux/sysdev.h>
-#include <asm/rtc.h>
-
-static unsigned long suspend_rtc_time;
-
-/*
- * Reset the time after a sleep.
- */
-static int timer_resume(struct sys_device *dev)
-{
-        struct timeval tv;
-        struct timespec ts;
-        struct rtc_time cur_rtc_tm;
-        unsigned long cur_rtc_time, diff;
-
-        /* get current RTC time and convert to seconds */
-        get_rtc_time(&cur_rtc_tm);
-        cur_rtc_time = mktime(cur_rtc_tm.tm_year + 1900,
-                              cur_rtc_tm.tm_mon + 1,
-                              cur_rtc_tm.tm_mday,
-                              cur_rtc_tm.tm_hour,
-                              cur_rtc_tm.tm_min,
-                              cur_rtc_tm.tm_sec);
-
-        diff = cur_rtc_time - suspend_rtc_time;
-
-        /* adjust time of day by seconds that elapsed while
-         * we were suspended */
-        do_gettimeofday(&tv);
-        ts.tv_sec = tv.tv_sec + diff;
-        ts.tv_nsec = tv.tv_usec * NSEC_PER_USEC;
-        do_settimeofday(&ts);
-
-        return 0;
-}
-
-static int timer_suspend(struct sys_device *dev, pm_message_t state)
-{
-        struct rtc_time suspend_rtc_tm;
-        WARN_ON(!ppc_md.get_rtc_time);
-
-        get_rtc_time(&suspend_rtc_tm);
-        suspend_rtc_time = mktime(suspend_rtc_tm.tm_year + 1900,
-                                  suspend_rtc_tm.tm_mon + 1,
-                                  suspend_rtc_tm.tm_mday,
-                                  suspend_rtc_tm.tm_hour,
-                                  suspend_rtc_tm.tm_min,
-                                  suspend_rtc_tm.tm_sec);
-
-        return 0;
-}
-
-static struct sysdev_class timer_sysclass = {
-        .resume = timer_resume,
-        .suspend = timer_suspend,
-        set_kset_name("timer"),
-};
-
-static struct sys_device device_timer = {
-        .id = 0,
-        .cls = &timer_sysclass,
-};
-
-static int time_init_device(void)
-{
-        int error = sysdev_class_register(&timer_sysclass);
-        if (!error)
-                error = sysdev_register(&device_timer);
-        return error;
-}
-
-device_initcall(time_init_device);
diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index 90db8a720fed..31d3d33d91fc 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -52,7 +52,6 @@
 u32 tsi108_pci_cfg_base;
 static u32 tsi108_pci_cfg_phys;
 u32 tsi108_csr_vir_base;
-static struct device_node *pci_irq_node;
 static struct irq_host *pci_irq_host;
 
 extern u32 get_vir_csrbase(void);
@@ -193,8 +192,8 @@ void tsi108_clear_pci_cfg_error(void)
 }
 
 static struct pci_ops tsi108_direct_pci_ops = {
-        tsi108_direct_read_config,
-        tsi108_direct_write_config
+        .read = tsi108_direct_read_config,
+        .write = tsi108_direct_write_config,
 };
 
 int __init tsi108_setup_pci(struct device_node *dev, u32 cfg_phys, int primary)
@@ -405,13 +404,7 @@ static int pci_irq_host_map(struct irq_host *h, unsigned int virq,
         return 0;
 }
 
-static int pci_irq_host_match(struct irq_host *h, struct device_node *node)
-{
-        return pci_irq_node == node;
-}
-
 static struct irq_host_ops pci_irq_host_ops = {
-        .match = pci_irq_host_match,
         .map = pci_irq_host_map,
         .xlate = pci_irq_host_xlate,
 };
@@ -433,10 +426,11 @@ void __init tsi108_pci_int_init(struct device_node *node)
 {
         DBG("Tsi108_pci_int_init: initializing PCI interrupts\n");
 
-        pci_irq_node = of_node_get(node);
-        pci_irq_host = irq_alloc_host(IRQ_HOST_MAP_LEGACY, 0, &pci_irq_host_ops, 0);
+        pci_irq_host = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LEGACY,
+                                      0, &pci_irq_host_ops, 0);
         if (pci_irq_host == NULL) {
                 printk(KERN_ERR "pci_irq_host: failed to allocate irq host !\n");
+                of_node_put(node);
                 return;
         }
 
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index 89059895a20d..5149716c734d 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -24,6 +24,7 @@
 #include <linux/spinlock.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/kernel_stat.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/prom.h>
@@ -55,9 +56,6 @@ struct uic {
 
         /* For secondary UICs, the cascade interrupt's irqaction */
         struct irqaction cascade;
-
-        /* The device node of the interrupt controller */
-        struct device_node *of_node;
 };
 
 static void uic_unmask_irq(unsigned int virq)
@@ -142,7 +140,7 @@ static int uic_set_irq_type(unsigned int virq, unsigned int flow_type)
 
         desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
         desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
-        if (trigger)
+        if (!trigger)
                 desc->status |= IRQ_LEVEL;
 
         spin_unlock_irqrestore(&uic->lock, flags);
@@ -159,10 +157,62 @@ static struct irq_chip uic_irq_chip = {
         .set_type       = uic_set_irq_type,
 };
 
-static int uic_host_match(struct irq_host *h, struct device_node *node)
+/**
+ *      handle_uic_irq - irq flow handler for UIC
+ *      @irq:   the interrupt number
+ *      @desc:  the interrupt description structure for this irq
+ *
+ * This is modified version of the generic handle_level_irq() suitable
+ * for the UIC.  On the UIC, acking (i.e. clearing the SR bit) a level
+ * irq will have no effect if the interrupt is still asserted by the
+ * device, even if the interrupt is already masked.  Therefore, unlike
+ * the standard handle_level_irq(), we must ack the interrupt *after*
+ * invoking the ISR (which should have de-asserted the interrupt in
+ * the external source).  For edge interrupts we ack at the beginning
+ * instead of the end, to keep the window in which we can miss an
+ * interrupt as small as possible.
+ */
+void fastcall handle_uic_irq(unsigned int irq, struct irq_desc *desc)
 {
-        struct uic *uic = h->host_data;
-        return uic->of_node == node;
+        unsigned int cpu = smp_processor_id();
+        struct irqaction *action;
+        irqreturn_t action_ret;
+
+        spin_lock(&desc->lock);
+        if (desc->status & IRQ_LEVEL)
+                desc->chip->mask(irq);
+        else
+                desc->chip->mask_ack(irq);
+
+        if (unlikely(desc->status & IRQ_INPROGRESS))
+                goto out_unlock;
+        desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
+        kstat_cpu(cpu).irqs[irq]++;
+
+        /*
+         * If its disabled or no action available
+         * keep it masked and get out of here
+         */
+        action = desc->action;
+        if (unlikely(!action || (desc->status & IRQ_DISABLED))) {
+                desc->status |= IRQ_PENDING;
+                goto out_unlock;
+        }
+
+        desc->status |= IRQ_INPROGRESS;
+        desc->status &= ~IRQ_PENDING;
+        spin_unlock(&desc->lock);
+
+        action_ret = handle_IRQ_event(irq, action);
+
+        spin_lock(&desc->lock);
+        desc->status &= ~IRQ_INPROGRESS;
+        if (desc->status & IRQ_LEVEL)
+                desc->chip->ack(irq);
+        if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)
+                desc->chip->unmask(irq);
+out_unlock:
+        spin_unlock(&desc->lock);
 }
 
 static int uic_host_map(struct irq_host *h, unsigned int virq,
@@ -173,7 +223,7 @@ static int uic_host_map(struct irq_host *h, unsigned int virq,
         set_irq_chip_data(virq, uic);
         /* Despite the name, handle_level_irq() works for both level
          * and edge irqs on UIC.  FIXME: check this is correct */
-        set_irq_chip_and_handler(virq, &uic_irq_chip, handle_level_irq);
+        set_irq_chip_and_handler(virq, &uic_irq_chip, handle_uic_irq);
 
         /* Set default irq type */
         set_irq_type(virq, IRQ_TYPE_NONE);
@@ -194,7 +244,6 @@ static int uic_host_xlate(struct irq_host *h, struct device_node *ct,
 }
 
 static struct irq_host_ops uic_host_ops = {
-        .match  = uic_host_match,
         .map    = uic_host_map,
         .xlate  = uic_host_xlate,
 };
@@ -207,6 +256,9 @@ irqreturn_t uic_cascade(int virq, void *data)
         int subvirq;
 
         msr = mfdcr(uic->dcrbase + UIC_MSR);
+        if (!msr) /* spurious interrupt */
+                return IRQ_HANDLED;
+
         src = 32 - ffs(msr);
 
         subvirq = irq_linear_revmap(uic->irqhost, src);
@@ -229,7 +281,6 @@ static struct uic * __init uic_init_one(struct device_node *node)
 
         memset(uic, 0, sizeof(*uic));
         spin_lock_init(&uic->lock);
-        uic->of_node = of_node_get(node);
         indexp = of_get_property(node, "cell-index", &len);
         if (!indexp || (len != sizeof(u32))) {
                 printk(KERN_ERR "uic: Device node %s has missing or invalid "
@@ -246,8 +297,8 @@ static struct uic * __init uic_init_one(struct device_node *node)
         }
         uic->dcrbase = *dcrreg;
 
-        uic->irqhost = irq_alloc_host(IRQ_HOST_MAP_LINEAR, NR_UIC_INTS,
-                                      &uic_host_ops, -1);
+        uic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+                                      NR_UIC_INTS, &uic_host_ops, -1);
         if (! uic->irqhost) {
                 of_node_put(node);
                 return NULL; /* FIXME: panic? */
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c
new file mode 100644
index 000000000000..c2f17cc43dfa
--- /dev/null
+++ b/arch/powerpc/sysdev/xilinx_intc.c
@@ -0,0 +1,151 @@
+/*
+ * Interrupt controller driver for Xilinx Virtex FPGAs
+ *
+ * Copyright (C) 2007 Secret Lab Technologies Ltd.
+ *
+ * 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.
+ *
+ */
+
+/*
+ * This is a driver for the interrupt controller typically found in
+ * Xilinx Virtex FPGA designs.
+ *
+ * The interrupt sense levels are hard coded into the FPGA design with
+ * typically a 1:1 relationship between irq lines and devices (no shared
+ * irq lines).  Therefore, this driver does not attempt to handle edge
+ * and level interrupts differently.
+ */
+#undef DEBUG
+
+#include <linux/kernel.h>
+#include <linux/irq.h>
+#include <linux/of.h>
+#include <asm/io.h>
+#include <asm/processor.h>
+#include <asm/irq.h>
+
+/*
+ * INTC Registers
+ */
+#define XINTC_ISR       0       /* Interrupt Status */
+#define XINTC_IPR       4       /* Interrupt Pending */
+#define XINTC_IER       8       /* Interrupt Enable */
+#define XINTC_IAR       12      /* Interrupt Acknowledge */
+#define XINTC_SIE       16      /* Set Interrupt Enable bits */
+#define XINTC_CIE       20      /* Clear Interrupt Enable bits */
+#define XINTC_IVR       24      /* Interrupt Vector */
+#define XINTC_MER       28      /* Master Enable */
+
+static struct irq_host *master_irqhost;
+
+/*
+ * IRQ Chip operations
+ */
+static void xilinx_intc_mask(unsigned int virq)
+{
+        int irq = virq_to_hw(virq);
+        void * regs = get_irq_chip_data(virq);
+        pr_debug("mask: %d\n", irq);
+        out_be32(regs + XINTC_CIE, 1 << irq);
+}
+
+static void xilinx_intc_unmask(unsigned int virq)
+{
+        int irq = virq_to_hw(virq);
+        void * regs = get_irq_chip_data(virq);
+        pr_debug("unmask: %d\n", irq);
+        out_be32(regs + XINTC_SIE, 1 << irq);
+}
+
+static void xilinx_intc_ack(unsigned int virq)
+{
+        int irq = virq_to_hw(virq);
+        void * regs = get_irq_chip_data(virq);
+        pr_debug("ack: %d\n", irq);
+        out_be32(regs + XINTC_IAR, 1 << irq);
+}
+
+static struct irq_chip xilinx_intc_irqchip = {
+        .typename = "Xilinx INTC",
+        .mask = xilinx_intc_mask,
+        .unmask = xilinx_intc_unmask,
+        .ack = xilinx_intc_ack,
+};
+
+/*
+ * IRQ Host operations
+ */
+static int xilinx_intc_map(struct irq_host *h, unsigned int virq,
+                                  irq_hw_number_t irq)
+{
+        set_irq_chip_data(virq, h->host_data);
+        set_irq_chip_and_handler(virq, &xilinx_intc_irqchip, handle_level_irq);
+        set_irq_type(virq, IRQ_TYPE_NONE);
+        return 0;
+}
+
+static struct irq_host_ops xilinx_intc_ops = {
+        .map = xilinx_intc_map,
+};
+
+struct irq_host * __init
+xilinx_intc_init(struct device_node *np)
+{
+        struct irq_host * irq;
+        struct resource res;
+        void * regs;
+        int rc;
+
+        /* Find and map the intc registers */
+        rc = of_address_to_resource(np, 0, &res);
+        if (rc) {
+                printk(KERN_ERR __FILE__ ": of_address_to_resource() failed\n");
+                return NULL;
+        }
+        regs = ioremap(res.start, 32);
+
+        printk(KERN_INFO "Xilinx intc at 0x%08X mapped to 0x%p\n",
+                res.start, regs);
+
+        /* Setup interrupt controller */
+        out_be32(regs + XINTC_IER, 0); /* disable all irqs */
+        out_be32(regs + XINTC_IAR, ~(u32) 0); /* Acknowledge pending irqs */
+        out_be32(regs + XINTC_MER, 0x3UL); /* Turn on the Master Enable. */
+
+        /* Allocate and initialize an irq_host structure. */
+        irq = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, 32, &xilinx_intc_ops, -1);
+        if (!irq)
+                panic(__FILE__ ": Cannot allocate IRQ host\n");
+        irq->host_data = regs;
+        return irq;
+}
+
+int xilinx_intc_get_irq(void)
+{
+        void * regs = master_irqhost->host_data;
+        pr_debug("get_irq:\n");
+        return irq_linear_revmap(master_irqhost, in_be32(regs + XINTC_IVR));
+}
+
+void __init xilinx_intc_init_tree(void)
+{
+        struct device_node *np;
+
+        /* find top level interrupt controller */
+        for_each_compatible_node(np, NULL, "xilinx,intc") {
+                if (!of_get_property(np, "interrupts", NULL))
+                        break;
+        }
+
+        /* xilinx interrupt controller needs to be top level */
+        BUG_ON(!np);
+
+        master_irqhost = xilinx_intc_init(np);
+        BUG_ON(!master_irqhost);
+
+        irq_set_default_host(master_irqhost);
+        of_node_put(np);
+}
diff --git a/arch/ppc/.gitignore b/arch/ppc/.gitignore
index a1a869c8c840..1e79a0ae4473 100644
--- a/arch/ppc/.gitignore
+++ b/arch/ppc/.gitignore
@@ -1 +1 @@
-include
+/include
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c
index 703d47eee436..eace3bc118d2 100644
--- a/arch/ppc/8xx_io/enet.c
+++ b/arch/ppc/8xx_io/enet.c
@@ -44,6 +44,7 @@
 #include <asm/mpc8xx.h>
 #include <asm/uaccess.h>
 #include <asm/commproc.h>
+#include <asm/cacheflush.h>
 
 /*
  *                              Theory of Operation
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 6bdeeb70b157..20dce4681259 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -4,6 +4,10 @@
 
 mainmenu "Linux/PowerPC Kernel Configuration"
 
+config WORD_SIZE
+        int
+        default 32
+
 config MMU
         bool
         default y
@@ -573,24 +577,9 @@ choice
 
           Select PReP if configuring for a PReP machine.
 
-          Select Gemini if configuring for a Synergy Microsystems' Gemini
-          series Single Board Computer.  More information is available at:
-          <http://www.synergymicro.com/PressRel/97_10_15.html>.
-
-          Select APUS if configuring for a PowerUP Amiga.  More information is
-          available at: <http://linux-apus.sourceforge.net/>.
-
 config PPC_PREP
         bool "PReP"
 
-config APUS
-        bool "Amiga-APUS"
-        depends on BROKEN
-        help
-          Select APUS if configuring for a PowerUP Amiga.
-          More information is available at:
-          <http://linux-apus.sourceforge.net/>.
-
 config KATANA
         bool "Artesyn-Katana"
         help
@@ -1027,133 +1016,7 @@ config CMDLINE
           some command-line options at build time by entering them here.  In
           most cases you will need to specify the root device here.
 
-config AMIGA
-        bool
-        depends on APUS
-        default y
-        help
-          This option enables support for the Amiga series of computers.
-
-config ZORRO
-        bool
-        depends on APUS
-        default y
-        help
-          This enables support for the Zorro bus in the Amiga. If you have
-          expansion cards in your Amiga that conform to the Amiga
-          AutoConfig(tm) specification, say Y, otherwise N. Note that even
-          expansion cards that do not fit in the Zorro slots but fit in e.g.
-          the CPU slot may fall in this category, so you have to say Y to let
-          Linux use these.
-
-config ABSTRACT_CONSOLE
-        bool
-        depends on APUS
-        default y
-
-config APUS_FAST_EXCEPT
-        bool
-        depends on APUS
-        default y
-
-config AMIGA_PCMCIA
-        bool "Amiga 1200/600 PCMCIA support"
-        depends on APUS && EXPERIMENTAL
-        help
-          Include support in the kernel for pcmcia on Amiga 1200 and Amiga
-          600. If you intend to use pcmcia cards say Y; otherwise say N.
-
-config AMIGA_BUILTIN_SERIAL
-        tristate "Amiga builtin serial support"
-        depends on APUS
-        help
-          If you want to use your Amiga's built-in serial port in Linux,
-          answer Y.
-
-          To compile this driver as a module, choose M here.
-
-config GVPIOEXT
-        tristate "GVP IO-Extender support"
-        depends on APUS
-        help
-          If you want to use a GVP IO-Extender serial card in Linux, say Y.
-          Otherwise, say N.
-
-config GVPIOEXT_LP
-        tristate "GVP IO-Extender parallel printer support"
-        depends on GVPIOEXT
-        help
-          Say Y to enable driving a printer from the parallel port on your
-          GVP IO-Extender card, N otherwise.
-
-config GVPIOEXT_PLIP
-        tristate "GVP IO-Extender PLIP support"
-        depends on GVPIOEXT
-        help
-          Say Y to enable doing IP over the parallel port on your GVP
-          IO-Extender card, N otherwise.
-
-config MULTIFACE_III_TTY
-        tristate "Multiface Card III serial support"
-        depends on APUS
-        help
-          If you want to use a Multiface III card's serial port in Linux,
-          answer Y.
-
-          To compile this driver as a module, choose M here.
-
-config A2232
-        tristate "Commodore A2232 serial support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && APUS
-        ---help---
-          This option supports the 2232 7-port serial card shipped with the
-          Amiga 2000 and other Zorro-bus machines, dating from 1989.  At
-          a max of 19,200 bps, the ports are served by a 6551 ACIA UART chip
-          each, plus a 8520 CIA, and a master 6502 CPU and buffer as well. The
-          ports were connected with 8 pin DIN connectors on the card bracket,
-          for which 8 pin to DB25 adapters were supplied. The card also had
-          jumpers internally to toggle various pinning configurations.
-
-          This driver can be built as a module; but then "generic_serial"
-          will also be built as a module. This has to be loaded before
-          "ser_a2232". If you want to do this, answer M here.
-
-config WHIPPET_SERIAL
-        tristate "Hisoft Whippet PCMCIA serial support"
-        depends on AMIGA_PCMCIA
-        help
-          HiSoft has a web page at <http://www.hisoft.co.uk/>, but there
-          is no listing for the Whippet in their Amiga section.
-
-config APNE
-        tristate "PCMCIA NE2000 support"
-        depends on AMIGA_PCMCIA
-        help
-          If you have a PCMCIA NE2000 compatible adapter, say Y.  Otherwise,
-          say N.
-
-          To compile this driver as a module, choose M here: the
-          module will be called apne.
-
-config SERIAL_CONSOLE
-        bool "Support for serial port console"
-        depends on APUS && (AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y)
-
-config HEARTBEAT
-        bool "Use power LED as a heartbeat"
-        depends on APUS
-        help
-          Use the power-on LED on your machine as a load meter.  The exact
-          behavior is platform-dependent, but normally the flash frequency is
-          a hyperbolic function of the 5-minute load average.
-
-config PROC_HARDWARE
-        bool "/proc/hardware support"
-        depends on APUS
-
-source "drivers/zorro/Kconfig"
-
-if !44x || BROKEN
+if BROKEN
 source kernel/power/Kconfig
 endif
 
@@ -1227,8 +1090,7 @@ config MCA
 
 config PCI
         bool "PCI support" if 40x || CPM2 || 83xx || 85xx || PPC_MPC52xx
-        default y if !40x && !CPM2 && !8xx && !APUS && !83xx && !85xx
-        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS
+        default y if !40x && !CPM2 && !8xx && !83xx && !85xx
         default PCI_QSPAN if !4xx && !CPM2 && 8xx
         help
           Find out whether your system includes a PCI bus. PCI is the name of
@@ -1284,10 +1146,6 @@ config 8260_PCI9_IDMA4
 
 endchoice
 
-config PCI_PERMEDIA
-        bool "PCI for Permedia2"
-        depends on !4xx && !8xx && APUS
-
 source "drivers/pci/Kconfig"
 
 source "drivers/pcmcia/Kconfig"
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 0db66dcf0723..eee6264e8a04 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -69,7 +69,6 @@ core-$(CONFIG_83xx)		+= arch/ppc/platforms/83xx/
 core-$(CONFIG_85xx)             += arch/ppc/platforms/85xx/
 core-$(CONFIG_MATH_EMULATION)   += arch/powerpc/math-emu/
 core-$(CONFIG_XMON)             += arch/ppc/xmon/
-core-$(CONFIG_APUS)             += arch/ppc/amiga/
 drivers-$(CONFIG_8xx)           += arch/ppc/8xx_io/
 drivers-$(CONFIG_4xx)           += arch/ppc/4xx_io/
 drivers-$(CONFIG_CPM2)          += arch/ppc/8260_io/
diff --git a/arch/ppc/amiga/Makefile b/arch/ppc/amiga/Makefile
deleted file mode 100644
index 59fec0a3ac8e..000000000000
--- a/arch/ppc/amiga/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for Linux arch/m68k/amiga source directory
-#
-
-obj-y           := config.o amiints.o cia.o time.o bootinfo.o amisound.o \
-                        chipram.o amiga_ksyms.o
-
-obj-$(CONFIG_AMIGA_PCMCIA) += pcmcia.o
diff --git a/arch/ppc/amiga/amiga_ksyms.c b/arch/ppc/amiga/amiga_ksyms.c
deleted file mode 100644
index ec74e5b7a1ce..000000000000
--- a/arch/ppc/amiga/amiga_ksyms.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../m68k/amiga/amiga_ksyms.c"
diff --git a/arch/ppc/amiga/amiints.c b/arch/ppc/amiga/amiints.c
deleted file mode 100644
index 265fcd3c6ab2..000000000000
--- a/arch/ppc/amiga/amiints.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * Amiga Linux interrupt handling code
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
- *
- * 11/07/96: rewritten interrupt handling, irq lists are exists now only for
- *           this sources where it makes sense (VERTB/PORTS/EXTER) and you must
- *           be careful that dev_id for this sources is unique since this the
- *           only possibility to distinguish between different handlers for
- *           free_irq. irq lists also have different irq flags:
- *           - IRQ_FLG_FAST: handler is inserted at top of list (after other
- *                           fast handlers)
- *           - IRQ_FLG_SLOW: handler is inserted at bottom of list and before
- *                           they're executed irq level is set to the previous
- *                           one, but handlers don't need to be reentrant, if
- *                           reentrance occurred, slow handlers will be just
- *                           called again.
- *           The whole interrupt handling for CIAs is moved to cia.c
- *           /Roman Zippel
- *
- * 07/08/99: rewamp of the interrupt handling - we now have two types of
- *           interrupts, normal and fast handlers, fast handlers being
- *           marked with SA_INTERRUPT and runs with all other interrupts
- *           disabled. Normal interrupts disable their own source but
- *           run with all other interrupt sources enabled.
- *           PORTS and EXTER interrupts are always shared even if the
- *           drivers do not explicitly mark this when calling
- *           request_irq which they really should do.
- *           This is similar to the way interrupts are handled on all
- *           other architectures and makes a ton of sense besides
- *           having the advantage of making it easier to share
- *           drivers.
- *           /Jes
- */
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/kernel_stat.h>
-#include <linux/init.h>
-
-#include <asm/system.h>
-#include <asm/irq.h>
-#include <asm/traps.h>
-#include <asm/amigahw.h>
-#include <asm/amigaints.h>
-#include <asm/amipcmcia.h>
-
-#ifdef CONFIG_APUS
-#include <asm/amigappc.h>
-#endif
-
-extern void cia_init_IRQ(struct ciabase *base);
-
-unsigned short ami_intena_vals[AMI_STD_IRQS] = {
-        IF_VERTB, IF_COPER, IF_AUD0, IF_AUD1, IF_AUD2, IF_AUD3, IF_BLIT,
-        IF_DSKSYN, IF_DSKBLK, IF_RBF, IF_TBE, IF_SOFT, IF_PORTS, IF_EXTER
-};
-static const unsigned char ami_servers[AMI_STD_IRQS] = {
-        1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1
-};
-
-static short ami_ablecount[AMI_IRQS];
-
-static void ami_badint(int irq, void *dev_id, struct pt_regs *fp)
-{
-/*      num_spurious += 1;*/
-}
-
-/*
- * void amiga_init_IRQ(void)
- *
- * Parameters:  None
- *
- * Returns:     Nothing
- *
- * This function should be called during kernel startup to initialize
- * the amiga IRQ handling routines.
- */
-
-__init
-void amiga_init_IRQ(void)
-{
-        int i;
-
-        for (i = 0; i < AMI_IRQS; i++)
-                ami_ablecount[i] = 0;
-
-        /* turn off PCMCIA interrupts */
-        if (AMIGAHW_PRESENT(PCMCIA))
-                gayle.inten = GAYLE_IRQ_IDE;
-
-        /* turn off all interrupts... */
-        amiga_custom.intena = 0x7fff;
-        amiga_custom.intreq = 0x7fff;
-
-#ifdef CONFIG_APUS
-        /* Clear any inter-CPU interrupt requests. Circumvents bug in
-           Blizzard IPL emulation HW (or so it appears). */
-        APUS_WRITE(APUS_INT_LVL, INTLVL_SETRESET | INTLVL_MASK);
-
-        /* Init IPL emulation. */
-        APUS_WRITE(APUS_REG_INT, REGINT_INTMASTER | REGINT_ENABLEIPL);
-        APUS_WRITE(APUS_IPL_EMU, IPLEMU_DISABLEINT);
-        APUS_WRITE(APUS_IPL_EMU, IPLEMU_SETRESET | IPLEMU_IPLMASK);
-#endif
-        /* ... and enable the master interrupt bit */
-        amiga_custom.intena = IF_SETCLR | IF_INTEN;
-
-        cia_init_IRQ(&ciaa_base);
-        cia_init_IRQ(&ciab_base);
-}
-
-/*
- * Enable/disable a particular machine specific interrupt source.
- * Note that this may affect other interrupts in case of a shared interrupt.
- * This function should only be called for a _very_ short time to change some
- * internal data, that may not be changed by the interrupt at the same time.
- * ami_(enable|disable)_irq calls may also be nested.
- */
-
-void amiga_enable_irq(unsigned int irq)
-{
-        if (irq >= AMI_IRQS) {
-                printk("%s: Unknown IRQ %d\n", __FUNCTION__, irq);
-                return;
-        }
-
-        ami_ablecount[irq]--;
-        if (ami_ablecount[irq]<0)
-                ami_ablecount[irq]=0;
-        else if (ami_ablecount[irq])
-                return;
-
-        /* No action for auto-vector interrupts */
-        if (irq >= IRQ_AMIGA_AUTO){
-                printk("%s: Trying to enable auto-vector IRQ %i\n",
-                       __FUNCTION__, irq - IRQ_AMIGA_AUTO);
-                return;
-        }
-
-        if (irq >= IRQ_AMIGA_CIAA) {
-                cia_set_irq(irq, 0);
-                cia_able_irq(irq, 1);
-                return;
-        }
-
-        /* enable the interrupt */
-        amiga_custom.intena = IF_SETCLR | ami_intena_vals[irq];
-}
-
-void amiga_disable_irq(unsigned int irq)
-{
-        if (irq >= AMI_IRQS) {
-                printk("%s: Unknown IRQ %d\n", __FUNCTION__, irq);
-                return;
-        }
-
-        if (ami_ablecount[irq]++)
-                return;
-
-        /* No action for auto-vector interrupts */
-        if (irq >= IRQ_AMIGA_AUTO) {
-                printk("%s: Trying to disable auto-vector IRQ %i\n",
-                       __FUNCTION__, irq - IRQ_AMIGA_AUTO);
-                return;
-        }
-
-        if (irq >= IRQ_AMIGA_CIAA) {
-                cia_able_irq(irq, 0);
-                return;
-        }
-
-        /* disable the interrupt */
-        amiga_custom.intena = ami_intena_vals[irq];
-}
-
-inline void amiga_do_irq(int irq, struct pt_regs *fp)
-{
-        irq_desc_t *desc = irq_desc + irq;
-        struct irqaction *action = desc->action;
-
-        kstat_cpu(0).irqs[irq]++;
-        action->handler(irq, action->dev_id, fp);
-}
-
-void amiga_do_irq_list(int irq, struct pt_regs *fp)
-{
-        irq_desc_t *desc = irq_desc + irq;
-        struct irqaction *action;
-
-        kstat_cpu(0).irqs[irq]++;
-
-        amiga_custom.intreq = ami_intena_vals[irq];
-
-        for (action = desc->action; action; action = action->next)
-                action->handler(irq, action->dev_id, fp);
-}
-
-/*
- * The builtin Amiga hardware interrupt handlers.
- */
-
-static void ami_int1(int irq, void *dev_id, struct pt_regs *fp)
-{
-        unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
-
-        /* if serial transmit buffer empty, interrupt */
-        if (ints & IF_TBE) {
-                amiga_custom.intreq = IF_TBE;
-                amiga_do_irq(IRQ_AMIGA_TBE, fp);
-        }
-
-        /* if floppy disk transfer complete, interrupt */
-        if (ints & IF_DSKBLK) {
-                amiga_custom.intreq = IF_DSKBLK;
-                amiga_do_irq(IRQ_AMIGA_DSKBLK, fp);
-        }
-
-        /* if software interrupt set, interrupt */
-        if (ints & IF_SOFT) {
-                amiga_custom.intreq = IF_SOFT;
-                amiga_do_irq(IRQ_AMIGA_SOFT, fp);
-        }
-}
-
-static void ami_int3(int irq, void *dev_id, struct pt_regs *fp)
-{
-        unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
-
-        /* if a blitter interrupt */
-        if (ints & IF_BLIT) {
-                amiga_custom.intreq = IF_BLIT;
-                amiga_do_irq(IRQ_AMIGA_BLIT, fp);
-        }
-
-        /* if a copper interrupt */
-        if (ints & IF_COPER) {
-                amiga_custom.intreq = IF_COPER;
-                amiga_do_irq(IRQ_AMIGA_COPPER, fp);
-        }
-
-        /* if a vertical blank interrupt */
-        if (ints & IF_VERTB)
-                amiga_do_irq_list(IRQ_AMIGA_VERTB, fp);
-}
-
-static void ami_int4(int irq, void *dev_id, struct pt_regs *fp)
-{
-        unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
-
-        /* if audio 0 interrupt */
-        if (ints & IF_AUD0) {
-                amiga_custom.intreq = IF_AUD0;
-                amiga_do_irq(IRQ_AMIGA_AUD0, fp);
-        }
-
-        /* if audio 1 interrupt */
-        if (ints & IF_AUD1) {
-                amiga_custom.intreq = IF_AUD1;
-                amiga_do_irq(IRQ_AMIGA_AUD1, fp);
-        }
-
-        /* if audio 2 interrupt */
-        if (ints & IF_AUD2) {
-                amiga_custom.intreq = IF_AUD2;
-                amiga_do_irq(IRQ_AMIGA_AUD2, fp);
-        }
-
-        /* if audio 3 interrupt */
-        if (ints & IF_AUD3) {
-                amiga_custom.intreq = IF_AUD3;
-                amiga_do_irq(IRQ_AMIGA_AUD3, fp);
-        }
-}
-
-static void ami_int5(int irq, void *dev_id, struct pt_regs *fp)
-{
-        unsigned short ints = amiga_custom.intreqr & amiga_custom.intenar;
-
-        /* if serial receive buffer full interrupt */
-        if (ints & IF_RBF) {
-                /* acknowledge of IF_RBF must be done by the serial interrupt */
-                amiga_do_irq(IRQ_AMIGA_RBF, fp);
-        }
-
-        /* if a disk sync interrupt */
-        if (ints & IF_DSKSYN) {
-                amiga_custom.intreq = IF_DSKSYN;
-                amiga_do_irq(IRQ_AMIGA_DSKSYN, fp);
-        }
-}
-
-static void ami_int7(int irq, void *dev_id, struct pt_regs *fp)
-{
-        panic ("level 7 interrupt received\n");
-}
-
-#ifdef CONFIG_APUS
-/* The PPC irq handling links all handlers requested on the same vector
-   and executes them in a loop. Having ami_badint at the end of the chain
-   is a bad idea. */
-struct irqaction amiga_sys_irqaction[AUTO_IRQS] = {
-        { .handler = ami_badint, .name = "spurious int" },
-        { .handler = ami_int1, .name = "int1 handler" },
-        { 0, /* CIAA */ },
-        { .handler = ami_int3, .name = "int3 handler" },
-        { .handler = ami_int4, .name = "int4 handler" },
-        { .handler = ami_int5, .name = "int5 handler" },
-        { 0, /* CIAB */ },
-        { .handler = ami_int7, .name = "int7 handler" },
-};
-#else
-void (*amiga_default_handler[SYS_IRQS])(int, void *, struct pt_regs *) = {
-        ami_badint, ami_int1, ami_badint, ami_int3,
-        ami_int4, ami_int5, ami_badint, ami_int7
-};
-#endif
diff --git a/arch/ppc/amiga/amisound.c b/arch/ppc/amiga/amisound.c
deleted file mode 100644
index 2b86cbef79f6..000000000000
--- a/arch/ppc/amiga/amisound.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../m68k/amiga/amisound.c"
diff --git a/arch/ppc/amiga/bootinfo.c b/arch/ppc/amiga/bootinfo.c
deleted file mode 100644
index efd869a3ed9b..000000000000
--- a/arch/ppc/amiga/bootinfo.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- *  Extracted from arch/m68k/kernel/setup.c.
- *  Should be properly generalized and put somewhere else.
- *                              Jesper
- */
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/init.h>
-
-#include <asm/setup.h>
-#include <asm/bootinfo.h>
-
-extern char cmd_line[CL_SIZE];
-
-extern int num_memory;
-extern int m68k_realnum_memory;
-extern struct mem_info memory[NUM_MEMINFO];
-extern struct mem_info m68k_memory[NUM_MEMINFO];
-extern struct mem_info ramdisk;
-
-extern int amiga_parse_bootinfo(const struct bi_record *);
-extern int atari_parse_bootinfo(const struct bi_record *);
-extern int mac_parse_bootinfo(const struct bi_record *);
-
-void __init parse_bootinfo(const struct bi_record *record)
-{
-    while (record->tag != BI_LAST) {
-        int unknown = 0;
-        const u_long *data = record->data;
-        switch (record->tag) {
-            case BI_MACHTYPE:
-            case BI_CPUTYPE:
-            case BI_FPUTYPE:
-            case BI_MMUTYPE:
-                /* Already set up by head.S */
-                break;
-
-            case BI_MEMCHUNK:
-                if (num_memory < NUM_MEMINFO) {
-                    memory[num_memory].addr = data[0];
-                    memory[num_memory].size = data[1];
-                    num_memory++;
-
-                    /* FIXME: duplicate for m68k drivers. */
-                    m68k_memory[m68k_realnum_memory].addr = data[0];
-                    m68k_memory[m68k_realnum_memory].size = data[1];
-                    m68k_realnum_memory++;
-                } else
-                    printk("parse_bootinfo: too many memory chunks\n");
-                break;
-
-            case BI_RAMDISK:
-                ramdisk.addr = data[0];
-                ramdisk.size = data[1];
-                break;
-
-            case BI_COMMAND_LINE:
-                strlcpy(cmd_line, (const char *)data, sizeof(cmd_line));
-                break;
-
-            default:
-                if (MACH_IS_AMIGA)
-                    unknown = amiga_parse_bootinfo(record);
-                else if (MACH_IS_ATARI)
-                    unknown = atari_parse_bootinfo(record);
-                else if (MACH_IS_MAC)
-                    unknown = mac_parse_bootinfo(record);
-                else
-                    unknown = 1;
-        }
-        if (unknown)
-            printk("parse_bootinfo: unknown tag 0x%04x ignored\n",
-                   record->tag);
-        record = (struct bi_record *)((u_long)record+record->size);
-    }
-}
diff --git a/arch/ppc/amiga/chipram.c b/arch/ppc/amiga/chipram.c
deleted file mode 100644
index e6ab3c6b223c..000000000000
--- a/arch/ppc/amiga/chipram.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../m68k/amiga/chipram.c"
diff --git a/arch/ppc/amiga/cia.c b/arch/ppc/amiga/cia.c
deleted file mode 100644
index 9558f2f40e64..000000000000
--- a/arch/ppc/amiga/cia.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *  Copyright (C) 1996 Roman Zippel
- *
- *  The concept of some functions bases on the original Amiga OS function
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
- */
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/kernel_stat.h>
-#include <linux/init.h>
-
-#include <asm/irq.h>
-#include <asm/amigahw.h>
-#include <asm/amigaints.h>
-
-struct ciabase {
-        volatile struct CIA *cia;
-        u_char icr_mask, icr_data;
-        u_short int_mask;
-        int handler_irq, cia_irq, server_irq;
-        char *name;
-} ciaa_base = {
-        &ciaa, 0, 0, IF_PORTS,
-        IRQ_AMIGA_AUTO_2, IRQ_AMIGA_CIAA,
-        IRQ_AMIGA_PORTS,
-        "CIAA handler"
-}, ciab_base = {
-        &ciab, 0, 0, IF_EXTER,
-        IRQ_AMIGA_AUTO_6, IRQ_AMIGA_CIAB,
-        IRQ_AMIGA_EXTER,
-        "CIAB handler"
-};
-
-#define CIA_SET_BASE_ADJUST_IRQ(base, irq)      \
-do {                                            \
-        if (irq >= IRQ_AMIGA_CIAB) {            \
-                base = &ciab_base;              \
-                irq -= IRQ_AMIGA_CIAB;          \
-        } else {                                \
-                base = &ciaa_base;              \
-                irq -= IRQ_AMIGA_CIAA;          \
-        }                                       \
-} while (0)
-
-/*
- *  Cause or clear CIA interrupts, return old interrupt status.
- */
-
-static unsigned char cia_set_irq_private(struct ciabase *base,
-                                         unsigned char mask)
-{
-        u_char old;
-
-        old = (base->icr_data |= base->cia->icr);
-        if (mask & CIA_ICR_SETCLR)
-                base->icr_data |= mask;
-        else
-                base->icr_data &= ~mask;
-        if (base->icr_data & base->icr_mask)
-                amiga_custom.intreq = IF_SETCLR | base->int_mask;
-        return old & base->icr_mask;
-}
-
-unsigned char cia_set_irq(unsigned int irq, int set)
-{
-        struct ciabase *base;
-        unsigned char mask;
-
-        if (irq >= IRQ_AMIGA_CIAB)
-                mask = (1 << (irq - IRQ_AMIGA_CIAB));
-        else
-                mask = (1 << (irq - IRQ_AMIGA_CIAA));
-        mask |= (set) ? CIA_ICR_SETCLR : 0;
-
-        CIA_SET_BASE_ADJUST_IRQ(base, irq);
-
-        return cia_set_irq_private(base, mask);
-}
-
-unsigned char cia_get_irq_mask(unsigned int irq)
-{
-        struct ciabase *base;
-
-        CIA_SET_BASE_ADJUST_IRQ(base, irq);
-
-        return base->cia->icr;
-}
-
-/*
- *  Enable or disable CIA interrupts, return old interrupt mask.
- */
-
-static unsigned char cia_able_irq_private(struct ciabase *base,
-                                          unsigned char mask)
-{
-        u_char old;
-
-        old = base->icr_mask;
-        base->icr_data |= base->cia->icr;
-        base->cia->icr = mask;
-        if (mask & CIA_ICR_SETCLR)
-                base->icr_mask |= mask;
-        else
-                base->icr_mask &= ~mask;
-        base->icr_mask &= CIA_ICR_ALL;
-
-        if (base->icr_data & base->icr_mask)
-                amiga_custom.intreq = IF_SETCLR | base->int_mask;
-        return old;
-}
-
-unsigned char cia_able_irq(unsigned int irq, int enable)
-{
-        struct ciabase *base;
-        unsigned char mask;
-
-        if (irq >= IRQ_AMIGA_CIAB)
-                mask = (1 << (irq - IRQ_AMIGA_CIAB));
-        else
-                mask = (1 << (irq - IRQ_AMIGA_CIAA));
-        mask |= (enable) ? CIA_ICR_SETCLR : 0;
-
-        CIA_SET_BASE_ADJUST_IRQ(base, irq);
-
-        return cia_able_irq_private(base, mask);
-}
-
-static void cia_handler(int irq, void *dev_id, struct pt_regs *fp)
-{
-        struct ciabase *base = (struct ciabase *)dev_id;
-        irq_desc_t *desc;
-        struct irqaction *action;
-        int i;
-        unsigned char ints;
-
-        irq = base->cia_irq;
-        desc = irq_desc + irq;
-        ints = cia_set_irq_private(base, CIA_ICR_ALL);
-        amiga_custom.intreq = base->int_mask;
-        for (i = 0; i < CIA_IRQS; i++, irq++) {
-                if (ints & 1) {
-                        kstat_cpu(0).irqs[irq]++;
-                        action = desc->action;
-                        action->handler(irq, action->dev_id, fp);
-                }
-                ints >>= 1;
-                desc++;
-        }
-        amiga_do_irq_list(base->server_irq, fp);
-}
-
-void __init cia_init_IRQ(struct ciabase *base)
-{
-        extern struct irqaction amiga_sys_irqaction[AUTO_IRQS];
-        struct irqaction *action;
-
-        /* clear any pending interrupt and turn off all interrupts */
-        cia_set_irq_private(base, CIA_ICR_ALL);
-        cia_able_irq_private(base, CIA_ICR_ALL);
-
-        /* install CIA handler */
-        action = &amiga_sys_irqaction[base->handler_irq-IRQ_AMIGA_AUTO];
-        action->handler = cia_handler;
-        action->dev_id = base;
-        action->name = base->name;
-        setup_irq(base->handler_irq, &amiga_sys_irqaction[base->handler_irq-IRQ_AMIGA_AUTO]);
-
-        amiga_custom.intena = IF_SETCLR | base->int_mask;
-}
diff --git a/arch/ppc/amiga/config.c b/arch/ppc/amiga/config.c
deleted file mode 100644
index bc50ed11957d..000000000000
--- a/arch/ppc/amiga/config.c
+++ /dev/null
@@ -1,953 +0,0 @@
-#define m68k_debug_device debug_device
-
-/*
- *  Copyright (C) 1993 Hamish Macdonald
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
- * for more details.
- */
-
-/*
- * Miscellaneous Amiga stuff
- */
-
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/kd.h>
-#include <linux/tty.h>
-#include <linux/console.h>
-#include <linux/init.h>
-#ifdef CONFIG_ZORRO
-#include <linux/zorro.h>
-#endif
-
-#include <asm/bootinfo.h>
-#include <asm/setup.h>
-#include <asm/system.h>
-#include <asm/pgtable.h>
-#include <asm/amigahw.h>
-#include <asm/amigaints.h>
-#include <asm/irq.h>
-#include <asm/machdep.h>
-#include <asm/io.h>
-
-unsigned long powerup_PCI_present;
-unsigned long powerup_BPPCPLUS_present;
-unsigned long amiga_model;
-unsigned long amiga_eclock;
-unsigned long amiga_masterclock;
-unsigned long amiga_colorclock;
-unsigned long amiga_chipset;
-unsigned char amiga_vblank;
-unsigned char amiga_psfreq;
-struct amiga_hw_present amiga_hw_present;
-
-static char s_a500[] __initdata = "A500";
-static char s_a500p[] __initdata = "A500+";
-static char s_a600[] __initdata = "A600";
-static char s_a1000[] __initdata = "A1000";
-static char s_a1200[] __initdata = "A1200";
-static char s_a2000[] __initdata = "A2000";
-static char s_a2500[] __initdata = "A2500";
-static char s_a3000[] __initdata = "A3000";
-static char s_a3000t[] __initdata = "A3000T";
-static char s_a3000p[] __initdata = "A3000+";
-static char s_a4000[] __initdata = "A4000";
-static char s_a4000t[] __initdata = "A4000T";
-static char s_cdtv[] __initdata = "CDTV";
-static char s_cd32[] __initdata = "CD32";
-static char s_draco[] __initdata = "Draco";
-static char *amiga_models[] __initdata = {
-    s_a500, s_a500p, s_a600, s_a1000, s_a1200, s_a2000, s_a2500, s_a3000,
-    s_a3000t, s_a3000p, s_a4000, s_a4000t, s_cdtv, s_cd32, s_draco,
-};
-
-static char amiga_model_name[13] = "Amiga ";
-
-extern char m68k_debug_device[];
-
-static void amiga_sched_init(irqreturn_t (*handler)(int, void *, struct pt_regs *));
-/* amiga specific irq functions */
-extern void amiga_init_IRQ (void);
-extern void (*amiga_default_handler[]) (int, void *, struct pt_regs *);
-extern int amiga_request_irq (unsigned int irq,
-                              void (*handler)(int, void *, struct pt_regs *),
-                              unsigned long flags, const char *devname,
-                              void *dev_id);
-extern void amiga_free_irq (unsigned int irq, void *dev_id);
-extern void amiga_enable_irq (unsigned int);
-extern void amiga_disable_irq (unsigned int);
-static void amiga_get_model(char *model);
-static int amiga_get_hardware_list(char *buffer);
-/* amiga specific timer functions */
-static unsigned long amiga_gettimeoffset (void);
-static void a3000_gettod (int *, int *, int *, int *, int *, int *);
-static void a2000_gettod (int *, int *, int *, int *, int *, int *);
-static int amiga_hwclk (int, struct hwclk_time *);
-static int amiga_set_clock_mmss (unsigned long);
-static void amiga_reset (void);
-extern void amiga_init_sound(void);
-static void amiga_savekmsg_init(void);
-static void amiga_mem_console_write(struct console *co, const char *b,
-                                    unsigned int count);
-void amiga_serial_console_write(struct console *co, const char *s,
-                                unsigned int count);
-static void amiga_debug_init(void);
-#ifdef CONFIG_HEARTBEAT
-static void amiga_heartbeat(int on);
-#endif
-
-static struct console amiga_console_driver = {
-        .name =         "debug",
-        .flags =        CON_PRINTBUFFER,
-        .index =        -1,
-};
-
-
-    /*
-     *  Motherboard Resources present in all Amiga models
-     */
-
-static struct {
-    struct resource _ciab, _ciaa, _custom, _kickstart;
-} mb_resources = {
-//    { "Ranger Memory", 0x00c00000, 0x00c7ffff },
-    ._ciab =      { "CIA B", 0x00bfd000, 0x00bfdfff },
-    ._ciaa =      { "CIA A", 0x00bfe000, 0x00bfefff },
-    ._custom =    { "Custom I/O", 0x00dff000, 0x00dfffff },
-    ._kickstart = { "Kickstart ROM", 0x00f80000, 0x00ffffff }
-};
-
-static struct resource rtc_resource = {
-    NULL, 0x00dc0000, 0x00dcffff
-};
-
-static struct resource ram_resource[NUM_MEMINFO];
-
-
-    /*
-     *  Parse an Amiga-specific record in the bootinfo
-     */
-
-int amiga_parse_bootinfo(const struct bi_record *record)
-{
-    int unknown = 0;
-    const unsigned long *data = record->data;
-
-    switch (record->tag) {
-        case BI_AMIGA_MODEL:
-        {
-                unsigned long d = *data;
-
-                powerup_PCI_present = d & 0x100;
-                amiga_model = d & 0xff;
-        }
-        break;
-
-        case BI_AMIGA_ECLOCK:
-            amiga_eclock = *data;
-            break;
-
-        case BI_AMIGA_CHIPSET:
-            amiga_chipset = *data;
-            break;
-
-        case BI_AMIGA_CHIP_SIZE:
-            amiga_chip_size = *(const int *)data;
-            break;
-
-        case BI_AMIGA_VBLANK:
-            amiga_vblank = *(const unsigned char *)data;
-            break;
-
-        case BI_AMIGA_PSFREQ:
-            amiga_psfreq = *(const unsigned char *)data;
-            break;
-
-        case BI_AMIGA_AUTOCON:
-#ifdef CONFIG_ZORRO
-            if (zorro_num_autocon < ZORRO_NUM_AUTO) {
-                const struct ConfigDev *cd = (struct ConfigDev *)data;
-                struct zorro_dev *dev = &zorro_autocon[zorro_num_autocon++];
-                dev->rom = cd->cd_Rom;
-                dev->slotaddr = cd->cd_SlotAddr;
-                dev->slotsize = cd->cd_SlotSize;
-                dev->resource.start = (unsigned long)cd->cd_BoardAddr;
-                dev->resource.end = dev->resource.start+cd->cd_BoardSize-1;
-            } else
-                printk("amiga_parse_bootinfo: too many AutoConfig devices\n");
-#endif /* CONFIG_ZORRO */
-            break;
-
-        case BI_AMIGA_SERPER:
-            /* serial port period: ignored here */
-            break;
-
-        case BI_AMIGA_PUP_BRIDGE:
-            powerup_PCI_present = *(const unsigned short *)data;
-            break;
-
-        case BI_AMIGA_BPPC_SCSI:
-            powerup_BPPCPLUS_present = *(const unsigned short *)data;
-            break;
-
-        default:
-            unknown = 1;
-    }
-    return(unknown);
-}
-
-    /*
-     *  Identify builtin hardware
-     */
-
-static void __init amiga_identify(void)
-{
-  /* Fill in some default values, if necessary */
-  if (amiga_eclock == 0)
-    amiga_eclock = 709379;
-
-  memset(&amiga_hw_present, 0, sizeof(amiga_hw_present));
-
-  printk("Amiga hardware found: ");
-  if (amiga_model >= AMI_500 && amiga_model <= AMI_DRACO) {
-    printk("[%s] ", amiga_models[amiga_model-AMI_500]);
-    strcat(amiga_model_name, amiga_models[amiga_model-AMI_500]);
-  }
-
-  switch(amiga_model) {
-  case AMI_UNKNOWN:
-    goto Generic;
-
-  case AMI_600:
-  case AMI_1200:
-    AMIGAHW_SET(A1200_IDE);
-    AMIGAHW_SET(PCMCIA);
-  case AMI_500:
-  case AMI_500PLUS:
-  case AMI_1000:
-  case AMI_2000:
-  case AMI_2500:
-    AMIGAHW_SET(A2000_CLK);     /* Is this correct for all models? */
-    goto Generic;
-
-  case AMI_3000:
-  case AMI_3000T:
-    AMIGAHW_SET(AMBER_FF);
-    AMIGAHW_SET(MAGIC_REKICK);
-    /* fall through */
-  case AMI_3000PLUS:
-    AMIGAHW_SET(A3000_SCSI);
-    AMIGAHW_SET(A3000_CLK);
-    AMIGAHW_SET(ZORRO3);
-    goto Generic;
-
-  case AMI_4000T:
-    AMIGAHW_SET(A4000_SCSI);
-    /* fall through */
-  case AMI_4000:
-    AMIGAHW_SET(A4000_IDE);
-    AMIGAHW_SET(A3000_CLK);
-    AMIGAHW_SET(ZORRO3);
-    goto Generic;
-
-  case AMI_CDTV:
-  case AMI_CD32:
-    AMIGAHW_SET(CD_ROM);
-    AMIGAHW_SET(A2000_CLK);             /* Is this correct? */
-    goto Generic;
-
-  Generic:
-    AMIGAHW_SET(AMI_VIDEO);
-    AMIGAHW_SET(AMI_BLITTER);
-    AMIGAHW_SET(AMI_AUDIO);
-    AMIGAHW_SET(AMI_FLOPPY);
-    AMIGAHW_SET(AMI_KEYBOARD);
-    AMIGAHW_SET(AMI_MOUSE);
-    AMIGAHW_SET(AMI_SERIAL);
-    AMIGAHW_SET(AMI_PARALLEL);
-    AMIGAHW_SET(CHIP_RAM);
-    AMIGAHW_SET(PAULA);
-
-    switch(amiga_chipset) {
-    case CS_OCS:
-    case CS_ECS:
-    case CS_AGA:
-      switch (amiga_custom.deniseid & 0xf) {
-      case 0x0c:
-        AMIGAHW_SET(DENISE_HR);
-        break;
-      case 0x08:
-        AMIGAHW_SET(LISA);
-        break;
-      }
-      break;
-    default:
-      AMIGAHW_SET(DENISE);
-      break;
-    }
-    switch ((amiga_custom.vposr>>8) & 0x7f) {
-    case 0x00:
-      AMIGAHW_SET(AGNUS_PAL);
-      break;
-    case 0x10:
-      AMIGAHW_SET(AGNUS_NTSC);
-      break;
-    case 0x20:
-    case 0x21:
-      AMIGAHW_SET(AGNUS_HR_PAL);
-      break;
-    case 0x30:
-    case 0x31:
-      AMIGAHW_SET(AGNUS_HR_NTSC);
-      break;
-    case 0x22:
-    case 0x23:
-      AMIGAHW_SET(ALICE_PAL);
-      break;
-    case 0x32:
-    case 0x33:
-      AMIGAHW_SET(ALICE_NTSC);
-      break;
-    }
-    AMIGAHW_SET(ZORRO);
-    break;
-
-  case AMI_DRACO:
-    panic("No support for Draco yet");
-
-  default:
-    panic("Unknown Amiga Model");
-  }
-
-#define AMIGAHW_ANNOUNCE(name, str)                     \
-  if (AMIGAHW_PRESENT(name))                            \
-    printk(str)
-
-  AMIGAHW_ANNOUNCE(AMI_VIDEO, "VIDEO ");
-  AMIGAHW_ANNOUNCE(AMI_BLITTER, "BLITTER ");
-  AMIGAHW_ANNOUNCE(AMBER_FF, "AMBER_FF ");
-  AMIGAHW_ANNOUNCE(AMI_AUDIO, "AUDIO ");
-  AMIGAHW_ANNOUNCE(AMI_FLOPPY, "FLOPPY ");
-  AMIGAHW_ANNOUNCE(A3000_SCSI, "A3000_SCSI ");
-  AMIGAHW_ANNOUNCE(A4000_SCSI, "A4000_SCSI ");
-  AMIGAHW_ANNOUNCE(A1200_IDE, "A1200_IDE ");
-  AMIGAHW_ANNOUNCE(A4000_IDE, "A4000_IDE ");
-  AMIGAHW_ANNOUNCE(CD_ROM, "CD_ROM ");
-  AMIGAHW_ANNOUNCE(AMI_KEYBOARD, "KEYBOARD ");
-  AMIGAHW_ANNOUNCE(AMI_MOUSE, "MOUSE ");
-  AMIGAHW_ANNOUNCE(AMI_SERIAL, "SERIAL ");
-  AMIGAHW_ANNOUNCE(AMI_PARALLEL, "PARALLEL ");
-  AMIGAHW_ANNOUNCE(A2000_CLK, "A2000_CLK ");
-  AMIGAHW_ANNOUNCE(A3000_CLK, "A3000_CLK ");
-  AMIGAHW_ANNOUNCE(CHIP_RAM, "CHIP_RAM ");
-  AMIGAHW_ANNOUNCE(PAULA, "PAULA ");
-  AMIGAHW_ANNOUNCE(DENISE, "DENISE ");
-  AMIGAHW_ANNOUNCE(DENISE_HR, "DENISE_HR ");
-  AMIGAHW_ANNOUNCE(LISA, "LISA ");
-  AMIGAHW_ANNOUNCE(AGNUS_PAL, "AGNUS_PAL ");
-  AMIGAHW_ANNOUNCE(AGNUS_NTSC, "AGNUS_NTSC ");
-  AMIGAHW_ANNOUNCE(AGNUS_HR_PAL, "AGNUS_HR_PAL ");
-  AMIGAHW_ANNOUNCE(AGNUS_HR_NTSC, "AGNUS_HR_NTSC ");
-  AMIGAHW_ANNOUNCE(ALICE_PAL, "ALICE_PAL ");
-  AMIGAHW_ANNOUNCE(ALICE_NTSC, "ALICE_NTSC ");
-  AMIGAHW_ANNOUNCE(MAGIC_REKICK, "MAGIC_REKICK ");
-  AMIGAHW_ANNOUNCE(PCMCIA, "PCMCIA ");
-  if (AMIGAHW_PRESENT(ZORRO))
-    printk("ZORRO%s ", AMIGAHW_PRESENT(ZORRO3) ? "3" : "");
-  printk("\n");
-
-#undef AMIGAHW_ANNOUNCE
-}
-
-    /*
-     *  Setup the Amiga configuration info
-     */
-
-void __init config_amiga(void)
-{
-  int i;
-
-  amiga_debug_init();
-  amiga_identify();
-
-  /* Some APUS boxes may have PCI memory, but ... */
-  iomem_resource.name = "Memory";
-  for (i = 0; i < 4; i++)
-    request_resource(&iomem_resource, &((struct resource *)&mb_resources)[i]);
-
-  mach_sched_init      = amiga_sched_init;
-  mach_init_IRQ        = amiga_init_IRQ;
-#ifndef CONFIG_APUS
-  mach_default_handler = &amiga_default_handler;
-  mach_request_irq     = amiga_request_irq;
-  mach_free_irq        = amiga_free_irq;
-  enable_irq           = amiga_enable_irq;
-  disable_irq          = amiga_disable_irq;
-#endif
-  mach_get_model       = amiga_get_model;
-  mach_get_hardware_list = amiga_get_hardware_list;
-  mach_gettimeoffset   = amiga_gettimeoffset;
-  if (AMIGAHW_PRESENT(A3000_CLK)){
-    mach_gettod  = a3000_gettod;
-    rtc_resource.name = "A3000 RTC";
-    request_resource(&iomem_resource, &rtc_resource);
-  }
-  else{ /* if (AMIGAHW_PRESENT(A2000_CLK)) */
-    mach_gettod  = a2000_gettod;
-    rtc_resource.name = "A2000 RTC";
-    request_resource(&iomem_resource, &rtc_resource);
-  }
-
-  mach_max_dma_address = 0xffffffff; /*
-                                      * default MAX_DMA=0xffffffff
-                                      * on all machines. If we don't
-                                      * do so, the SCSI code will not
-                                      * be able to allocate any mem
-                                      * for transfers, unless we are
-                                      * dealing with a Z2 mem only
-                                      * system.                  /Jes
-                                      */
-
-  mach_hwclk           = amiga_hwclk;
-  mach_set_clock_mmss  = amiga_set_clock_mmss;
-  mach_reset           = amiga_reset;
-#ifdef CONFIG_HEARTBEAT
-  mach_heartbeat = amiga_heartbeat;
-#endif
-
-  /* Fill in the clock values (based on the 700 kHz E-Clock) */
-  amiga_masterclock = 40*amiga_eclock;  /* 28 MHz */
-  amiga_colorclock = 5*amiga_eclock;    /* 3.5 MHz */
-
-  /* clear all DMA bits */
-  amiga_custom.dmacon = DMAF_ALL;
-  /* ensure that the DMA master bit is set */
-  amiga_custom.dmacon = DMAF_SETCLR | DMAF_MASTER;
-
-  /* request all RAM */
-  for (i = 0; i < m68k_num_memory; i++) {
-    ram_resource[i].name =
-      (m68k_memory[i].addr >= 0x01000000) ? "32-bit Fast RAM" :
-      (m68k_memory[i].addr < 0x00c00000) ? "16-bit Fast RAM" :
-      "16-bit Slow RAM";
-    ram_resource[i].start = m68k_memory[i].addr;
-    ram_resource[i].end = m68k_memory[i].addr+m68k_memory[i].size-1;
-    request_resource(&iomem_resource, &ram_resource[i]);
-  }
-
-  /* initialize chipram allocator */
-  amiga_chip_init ();
-
-  /* debugging using chipram */
-  if (!strcmp( m68k_debug_device, "mem" )){
-          if (!AMIGAHW_PRESENT(CHIP_RAM))
-                  printk("Warning: no chipram present for debugging\n");
-          else {
-                  amiga_savekmsg_init();
-                  amiga_console_driver.write = amiga_mem_console_write;
-                  register_console(&amiga_console_driver);
-          }
-  }
-
-  /* our beloved beeper */
-  if (AMIGAHW_PRESENT(AMI_AUDIO))
-          amiga_init_sound();
-
-  /*
-   * if it is an A3000, set the magic bit that forces
-   * a hard rekick
-   */
-  if (AMIGAHW_PRESENT(MAGIC_REKICK))
-          *(unsigned char *)ZTWO_VADDR(0xde0002) |= 0x80;
-}
-
-static unsigned short jiffy_ticks;
-
-static void __init amiga_sched_init(irqreturn_t (*timer_routine)(int, void *,
-                                                struct pt_regs *))
-{
-        static struct resource sched_res = {
-            "timer", 0x00bfd400, 0x00bfd5ff,
-        };
-        jiffy_ticks = (amiga_eclock+HZ/2)/HZ;
-
-        if (request_resource(&mb_resources._ciab, &sched_res))
-            printk("Cannot allocate ciab.ta{lo,hi}\n");
-        ciab.cra &= 0xC0;   /* turn off timer A, continuous mode, from Eclk */
-        ciab.talo = jiffy_ticks % 256;
-        ciab.tahi = jiffy_ticks / 256;
-
-        /* install interrupt service routine for CIAB Timer A
-         *
-         * Please don't change this to use ciaa, as it interferes with the
-         * SCSI code. We'll have to take a look at this later
-         */
-        request_irq(IRQ_AMIGA_CIAB_TA, timer_routine, 0, "timer", NULL);
-        /* start timer */
-        ciab.cra |= 0x11;
-}
-
-#define TICK_SIZE 10000
-
-extern unsigned char cia_get_irq_mask(unsigned int irq);
-
-/* This is always executed with interrupts disabled.  */
-static unsigned long amiga_gettimeoffset (void)
-{
-        unsigned short hi, lo, hi2;
-        unsigned long ticks, offset = 0;
-
-        /* read CIA B timer A current value */
-        hi  = ciab.tahi;
-        lo  = ciab.talo;
-        hi2 = ciab.tahi;
-
-        if (hi != hi2) {
-                lo = ciab.talo;
-                hi = hi2;
-        }
-
-        ticks = hi << 8 | lo;
-
-        if (ticks > jiffy_ticks / 2)
-                /* check for pending interrupt */
-                if (cia_get_irq_mask(IRQ_AMIGA_CIAB) & CIA_ICR_TA)
-                        offset = 10000;
-
-        ticks = jiffy_ticks - ticks;
-        ticks = (10000 * ticks) / jiffy_ticks;
-
-        return ticks + offset;
-}
-
-static void a3000_gettod (int *yearp, int *monp, int *dayp,
-                          int *hourp, int *minp, int *secp)
-{
-        volatile struct tod3000 *tod = TOD_3000;
-
-        tod->cntrl1 = TOD3000_CNTRL1_HOLD;
-
-        *secp  = tod->second1 * 10 + tod->second2;
-        *minp  = tod->minute1 * 10 + tod->minute2;
-        *hourp = tod->hour1   * 10 + tod->hour2;
-        *dayp  = tod->day1    * 10 + tod->day2;
-        *monp  = tod->month1  * 10 + tod->month2;
-        *yearp = tod->year1   * 10 + tod->year2;
-
-        tod->cntrl1 = TOD3000_CNTRL1_FREE;
-}
-
-static void a2000_gettod (int *yearp, int *monp, int *dayp,
-                          int *hourp, int *minp, int *secp)
-{
-        volatile struct tod2000 *tod = TOD_2000;
-
-        tod->cntrl1 = TOD2000_CNTRL1_HOLD;
-
-        while (tod->cntrl1 & TOD2000_CNTRL1_BUSY)
-                ;
-
-        *secp  = tod->second1     * 10 + tod->second2;
-        *minp  = tod->minute1     * 10 + tod->minute2;
-        *hourp = (tod->hour1 & 3) * 10 + tod->hour2;
-        *dayp  = tod->day1        * 10 + tod->day2;
-        *monp  = tod->month1      * 10 + tod->month2;
-        *yearp = tod->year1       * 10 + tod->year2;
-
-        if (!(tod->cntrl3 & TOD2000_CNTRL3_24HMODE)){
-                if (!(tod->hour1 & TOD2000_HOUR1_PM) && *hourp == 12)
-                        *hourp = 0;
-                else if ((tod->hour1 & TOD2000_HOUR1_PM) && *hourp != 12)
-                        *hourp += 12;
-        }
-
-        tod->cntrl1 &= ~TOD2000_CNTRL1_HOLD;
-}
-
-static int amiga_hwclk(int op, struct hwclk_time *t)
-{
-        if (AMIGAHW_PRESENT(A3000_CLK)) {
-                volatile struct tod3000 *tod = TOD_3000;
-
-                tod->cntrl1 = TOD3000_CNTRL1_HOLD;
-
-                if (!op) { /* read */
-                        t->sec  = tod->second1 * 10 + tod->second2;
-                        t->min  = tod->minute1 * 10 + tod->minute2;
-                        t->hour = tod->hour1   * 10 + tod->hour2;
-                        t->day  = tod->day1    * 10 + tod->day2;
-                        t->wday = tod->weekday;
-                        t->mon  = tod->month1  * 10 + tod->month2 - 1;
-                        t->year = tod->year1   * 10 + tod->year2;
-                        if (t->year <= 69)
-                                t->year += 100;
-                } else {
-                        tod->second1 = t->sec / 10;
-                        tod->second2 = t->sec % 10;
-                        tod->minute1 = t->min / 10;
-                        tod->minute2 = t->min % 10;
-                        tod->hour1   = t->hour / 10;
-                        tod->hour2   = t->hour % 10;
-                        tod->day1    = t->day / 10;
-                        tod->day2    = t->day % 10;
-                        if (t->wday != -1)
-                                tod->weekday = t->wday;
-                        tod->month1  = (t->mon + 1) / 10;
-                        tod->month2  = (t->mon + 1) % 10;
-                        if (t->year >= 100)
-                                t->year -= 100;
-                        tod->year1   = t->year / 10;
-                        tod->year2   = t->year % 10;
-                }
-
-                tod->cntrl1 = TOD3000_CNTRL1_FREE;
-        } else /* if (AMIGAHW_PRESENT(A2000_CLK)) */ {
-                volatile struct tod2000 *tod = TOD_2000;
-
-                tod->cntrl1 = TOD2000_CNTRL1_HOLD;
-        
-                while (tod->cntrl1 & TOD2000_CNTRL1_BUSY)
-                        ;
-
-                if (!op) { /* read */
-                        t->sec  = tod->second1     * 10 + tod->second2;
-                        t->min  = tod->minute1     * 10 + tod->minute2;
-                        t->hour = (tod->hour1 & 3) * 10 + tod->hour2;
-                        t->day  = tod->day1        * 10 + tod->day2;
-                        t->wday = tod->weekday;
-                        t->mon  = tod->month1      * 10 + tod->month2 - 1;
-                        t->year = tod->year1       * 10 + tod->year2;
-                        if (t->year <= 69)
-                                t->year += 100;
-
-                        if (!(tod->cntrl3 & TOD2000_CNTRL3_24HMODE)){
-                                if (!(tod->hour1 & TOD2000_HOUR1_PM) && t->hour == 12)
-                                        t->hour = 0;
-                                else if ((tod->hour1 & TOD2000_HOUR1_PM) && t->hour != 12)
-                                        t->hour += 12;
-                        }
-                } else {
-                        tod->second1 = t->sec / 10;
-                        tod->second2 = t->sec % 10;
-                        tod->minute1 = t->min / 10;
-                        tod->minute2 = t->min % 10;
-                        if (tod->cntrl3 & TOD2000_CNTRL3_24HMODE)
-                                tod->hour1 = t->hour / 10;
-                        else if (t->hour >= 12)
-                                tod->hour1 = TOD2000_HOUR1_PM +
-                                        (t->hour - 12) / 10;
-                        else
-                                tod->hour1 = t->hour / 10;
-                        tod->hour2   = t->hour % 10;
-                        tod->day1    = t->day / 10;
-                        tod->day2    = t->day % 10;
-                        if (t->wday != -1)
-                                tod->weekday = t->wday;
-                        tod->month1  = (t->mon + 1) / 10;
-                        tod->month2  = (t->mon + 1) % 10;
-                        if (t->year >= 100)
-                                t->year -= 100;
-                        tod->year1   = t->year / 10;
-                        tod->year2   = t->year % 10;
-                }
-
-                tod->cntrl1 &= ~TOD2000_CNTRL1_HOLD;
-        }
-
-        return 0;
-}
-
-static int amiga_set_clock_mmss (unsigned long nowtime)
-{
-        short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;
-
-        if (AMIGAHW_PRESENT(A3000_CLK)) {
-                volatile struct tod3000 *tod = TOD_3000;
-
-                tod->cntrl1 = TOD3000_CNTRL1_HOLD;
-
-                tod->second1 = real_seconds / 10;
-                tod->second2 = real_seconds % 10;
-                tod->minute1 = real_minutes / 10;
-                tod->minute2 = real_minutes % 10;
-
-                tod->cntrl1 = TOD3000_CNTRL1_FREE;
-        } else /* if (AMIGAHW_PRESENT(A2000_CLK)) */ {
-                volatile struct tod2000 *tod = TOD_2000;
-
-                tod->cntrl1 = TOD2000_CNTRL1_HOLD;
-        
-                while (tod->cntrl1 & TOD2000_CNTRL1_BUSY)
-                        ;
-
-                tod->second1 = real_seconds / 10;
-                tod->second2 = real_seconds % 10;
-                tod->minute1 = real_minutes / 10;
-                tod->minute2 = real_minutes % 10;
-
-                tod->cntrl1 &= ~TOD2000_CNTRL1_HOLD;
-        }
-
-        return 0;
-}
-
-static NORET_TYPE void amiga_reset( void )
-    ATTRIB_NORET;
-
-static void amiga_reset (void)
-{
-  for (;;);
-}
-
-
-    /*
-     *  Debugging
-     */
-
-#define SAVEKMSG_MAXMEM         128*1024
-
-#define SAVEKMSG_MAGIC1         0x53415645      /* 'SAVE' */
-#define SAVEKMSG_MAGIC2         0x4B4D5347      /* 'KMSG' */
-
-struct savekmsg {
-    unsigned long magic1;               /* SAVEKMSG_MAGIC1 */
-    unsigned long magic2;               /* SAVEKMSG_MAGIC2 */
-    unsigned long magicptr;             /* address of magic1 */
-    unsigned long size;
-    char data[0];
-};
-
-static struct savekmsg *savekmsg = NULL;
-
-static void amiga_mem_console_write(struct console *co, const char *s,
-                                    unsigned int count)
-{
-    if (savekmsg->size+count <= SAVEKMSG_MAXMEM-sizeof(struct savekmsg)) {
-        memcpy(savekmsg->data+savekmsg->size, s, count);
-        savekmsg->size += count;
-    }
-}
-
-static void amiga_savekmsg_init(void)
-{
-    static struct resource debug_res = { "Debug" };
-
-    savekmsg = amiga_chip_alloc_res(SAVEKMSG_MAXMEM, &debug_res);
-    savekmsg->magic1 = SAVEKMSG_MAGIC1;
-    savekmsg->magic2 = SAVEKMSG_MAGIC2;
-    savekmsg->magicptr = virt_to_phys(savekmsg);
-    savekmsg->size = 0;
-}
-
-static void amiga_serial_putc(char c)
-{
-    amiga_custom.serdat = (unsigned char)c | 0x100;
-    mb();
-    while (!(amiga_custom.serdatr & 0x2000))
-       ;
-}
-
-void amiga_serial_console_write(struct console *co, const char *s,
-                                       unsigned int count)
-{
-#if 0 /* def CONFIG_KGDB */
-        /* FIXME:APUS GDB doesn't seem to like O-packages before it is
-           properly connected with the target. */
-        __gdb_output_string (s, count);
-#else
-        while (count--) {
-                if (*s == '\n')
-                        amiga_serial_putc('\r');
-                amiga_serial_putc(*s++);
-        }
-#endif
-}
-
-#ifdef CONFIG_SERIAL_CONSOLE
-void amiga_serial_puts(const char *s)
-{
-    amiga_serial_console_write(NULL, s, strlen(s));
-}
-
-int amiga_serial_console_wait_key(struct console *co)
-{
-    int ch;
-
-    while (!(amiga_custom.intreqr & IF_RBF))
-        barrier();
-    ch = amiga_custom.serdatr & 0xff;
-    /* clear the interrupt, so that another character can be read */
-    amiga_custom.intreq = IF_RBF;
-    return ch;
-}
-
-void amiga_serial_gets(struct console *co, char *s, int len)
-{
-    int ch, cnt = 0;
-
-    while (1) {
-        ch = amiga_serial_console_wait_key(co);
-
-        /* Check for backspace. */
-        if (ch == 8 || ch == 127) {
-            if (cnt == 0) {
-                amiga_serial_putc('\007');
-                continue;
-            }
-            cnt--;
-            amiga_serial_puts("\010 \010");
-            continue;
-        }
-
-        /* Check for enter. */
-        if (ch == 10 || ch == 13)
-            break;
-
-        /* See if line is too long. */
-        if (cnt >= len + 1) {
-            amiga_serial_putc(7);
-            cnt--;
-            continue;
-        }
-
-        /* Store and echo character. */
-        s[cnt++] = ch;
-        amiga_serial_putc(ch);
-    }
-    /* Print enter. */
-    amiga_serial_puts("\r\n");
-    s[cnt] = 0;
-}
-#endif
-
-static void __init amiga_debug_init(void)
-{
-        if (!strcmp( m68k_debug_device, "ser" )) {
-                /* no initialization required (?) */
-                amiga_console_driver.write = amiga_serial_console_write;
-                register_console(&amiga_console_driver);
-        }
-}
-
-#ifdef CONFIG_HEARTBEAT
-static void amiga_heartbeat(int on)
-{
-    if (on)
-        ciaa.pra &= ~2;
-    else
-        ciaa.pra |= 2;
-}
-#endif
-
-    /*
-     *  Amiga specific parts of /proc
-     */
-
-static void amiga_get_model(char *model)
-{
-    strcpy(model, amiga_model_name);
-}
-
-
-static int amiga_get_hardware_list(char *buffer)
-{
-    int len = 0;
-
-    if (AMIGAHW_PRESENT(CHIP_RAM))
-        len += sprintf(buffer+len, "Chip RAM:\t%ldK\n", amiga_chip_size>>10);
-    len += sprintf(buffer+len, "PS Freq:\t%dHz\nEClock Freq:\t%ldHz\n",
-                   amiga_psfreq, amiga_eclock);
-    if (AMIGAHW_PRESENT(AMI_VIDEO)) {
-        char *type;
-        switch(amiga_chipset) {
-            case CS_OCS:
-                type = "OCS";
-                break;
-            case CS_ECS:
-                type = "ECS";
-                break;
-            case CS_AGA:
-                type = "AGA";
-                break;
-            default:
-                type = "Old or Unknown";
-                break;
-        }
-        len += sprintf(buffer+len, "Graphics:\t%s\n", type);
-    }
-
-#define AMIGAHW_ANNOUNCE(name, str)                     \
-    if (AMIGAHW_PRESENT(name))                          \
-        len += sprintf (buffer+len, "\t%s\n", str)
-
-    len += sprintf (buffer + len, "Detected hardware:\n");
-
-    AMIGAHW_ANNOUNCE(AMI_VIDEO, "Amiga Video");
-    AMIGAHW_ANNOUNCE(AMI_BLITTER, "Blitter");
-    AMIGAHW_ANNOUNCE(AMBER_FF, "Amber Flicker Fixer");
-    AMIGAHW_ANNOUNCE(AMI_AUDIO, "Amiga Audio");
-    AMIGAHW_ANNOUNCE(AMI_FLOPPY, "Floppy Controller");
-    AMIGAHW_ANNOUNCE(A3000_SCSI, "SCSI Controller WD33C93 (A3000 style)");
-    AMIGAHW_ANNOUNCE(A4000_SCSI, "SCSI Controller NCR53C710 (A4000T style)");
-    AMIGAHW_ANNOUNCE(A1200_IDE, "IDE Interface (A1200 style)");
-    AMIGAHW_ANNOUNCE(A4000_IDE, "IDE Interface (A4000 style)");
-    AMIGAHW_ANNOUNCE(CD_ROM, "Internal CD ROM drive");
-    AMIGAHW_ANNOUNCE(AMI_KEYBOARD, "Keyboard");
-    AMIGAHW_ANNOUNCE(AMI_MOUSE, "Mouse Port");
-    AMIGAHW_ANNOUNCE(AMI_SERIAL, "Serial Port");
-    AMIGAHW_ANNOUNCE(AMI_PARALLEL, "Parallel Port");
-    AMIGAHW_ANNOUNCE(A2000_CLK, "Hardware Clock (A2000 style)");
-    AMIGAHW_ANNOUNCE(A3000_CLK, "Hardware Clock (A3000 style)");
-    AMIGAHW_ANNOUNCE(CHIP_RAM, "Chip RAM");
-    AMIGAHW_ANNOUNCE(PAULA, "Paula 8364");
-    AMIGAHW_ANNOUNCE(DENISE, "Denise 8362");
-    AMIGAHW_ANNOUNCE(DENISE_HR, "Denise 8373");
-    AMIGAHW_ANNOUNCE(LISA, "Lisa 8375");
-    AMIGAHW_ANNOUNCE(AGNUS_PAL, "Normal/Fat PAL Agnus 8367/8371");
-    AMIGAHW_ANNOUNCE(AGNUS_NTSC, "Normal/Fat NTSC Agnus 8361/8370");
-    AMIGAHW_ANNOUNCE(AGNUS_HR_PAL, "Fat Hires PAL Agnus 8372");
-    AMIGAHW_ANNOUNCE(AGNUS_HR_NTSC, "Fat Hires NTSC Agnus 8372");
-    AMIGAHW_ANNOUNCE(ALICE_PAL, "PAL Alice 8374");
-    AMIGAHW_ANNOUNCE(ALICE_NTSC, "NTSC Alice 8374");
-    AMIGAHW_ANNOUNCE(MAGIC_REKICK, "Magic Hard Rekick");
-    AMIGAHW_ANNOUNCE(PCMCIA, "PCMCIA Slot");
-    if (AMIGAHW_PRESENT(ZORRO))
-        len += sprintf(buffer+len, "\tZorro II%s AutoConfig: %d Expansion "
-                                   "Device%s\n",
-                       AMIGAHW_PRESENT(ZORRO3) ? "I" : "",
-                       zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
-
-#undef AMIGAHW_ANNOUNCE
-
-    return(len);
-}
-
-#ifdef CONFIG_APUS
-int get_hardware_list(char *buffer)
-{
-        extern int get_cpuinfo(char *buffer);
-        int len = 0;
-        char model[80];
-        u_long mem;
-        int i;
-
-        if (mach_get_model)
-                mach_get_model(model);
-        else
-                strcpy(model, "Unknown PowerPC");
-
-        len += sprintf(buffer+len, "Model:\t\t%s\n", model);
-        len += get_cpuinfo(buffer+len);
-        for (mem = 0, i = 0; i < m68k_realnum_memory; i++)
-                mem += m68k_memory[i].size;
-        len += sprintf(buffer+len, "System Memory:\t%ldK\n", mem>>10);
-
-        if (mach_get_hardware_list)
-                len += mach_get_hardware_list(buffer+len);
-
-        return(len);
-}
-#endif
diff --git a/arch/ppc/amiga/ints.c b/arch/ppc/amiga/ints.c
deleted file mode 100644
index 083a17462190..000000000000
--- a/arch/ppc/amiga/ints.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- *  Linux/m68k general interrupt handling code from arch/m68k/kernel/ints.c
- *  Needed to drive the m68k emulating IRQ hardware on the PowerUp boards.
- */
-
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/kernel_stat.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/seq_file.h>
-
-#include <asm/setup.h>
-#include <asm/system.h>
-#include <asm/irq.h>
-#include <asm/traps.h>
-#include <asm/page.h>
-#include <asm/machdep.h>
-
-/* table for system interrupt handlers */
-static irq_handler_t irq_list[SYS_IRQS];
-
-static const char *default_names[SYS_IRQS] = {
-        "spurious int", "int1 handler", "int2 handler", "int3 handler",
-        "int4 handler", "int5 handler", "int6 handler", "int7 handler"
-};
-
-/* The number of spurious interrupts */
-volatile unsigned int num_spurious;
-
-#define NUM_IRQ_NODES 100
-static irq_node_t nodes[NUM_IRQ_NODES];
-
-
-/*
- * void init_IRQ(void)
- *
- * Parameters:  None
- *
- * Returns:     Nothing
- *
- * This function should be called during kernel startup to initialize
- * the IRQ handling routines.
- */
-
-__init
-void m68k_init_IRQ(void)
-{
-        int i;
-
-        for (i = 0; i < SYS_IRQS; i++) {
-                if (mach_default_handler)
-                        irq_list[i].handler = (*mach_default_handler)[i];
-                irq_list[i].flags   = 0;
-                irq_list[i].dev_id  = NULL;
-                irq_list[i].devname = default_names[i];
-        }
-
-        for (i = 0; i < NUM_IRQ_NODES; i++)
-                nodes[i].handler = NULL;
-
-        mach_init_IRQ ();
-}
-
-irq_node_t *new_irq_node(void)
-{
-        irq_node_t *node;
-        short i;
-
-        for (node = nodes, i = NUM_IRQ_NODES-1; i >= 0; node++, i--)
-                if (!node->handler)
-                        return node;
-
-        printk ("new_irq_node: out of nodes\n");
-        return NULL;
-}
-
-int sys_request_irq(unsigned int irq,
-                    void (*handler)(int, void *, struct pt_regs *),
-                    unsigned long flags, const char *devname, void *dev_id)
-{
-        if (irq < IRQ1 || irq > IRQ7) {
-                printk("%s: Incorrect IRQ %d from %s\n",
-                       __FUNCTION__, irq, devname);
-                return -ENXIO;
-        }
-
-#if 0
-        if (!(irq_list[irq].flags & IRQ_FLG_STD)) {
-                if (irq_list[irq].flags & IRQ_FLG_LOCK) {
-                        printk("%s: IRQ %d from %s is not replaceable\n",
-                               __FUNCTION__, irq, irq_list[irq].devname);
-                        return -EBUSY;
-                }
-                if (!(flags & IRQ_FLG_REPLACE)) {
-                        printk("%s: %s can't replace IRQ %d from %s\n",
-                               __FUNCTION__, devname, irq, irq_list[irq].devname);
-                        return -EBUSY;
-                }
-        }
-#endif
-
-        irq_list[irq].handler = handler;
-        irq_list[irq].flags   = flags;
-        irq_list[irq].dev_id  = dev_id;
-        irq_list[irq].devname = devname;
-        return 0;
-}
-
-void sys_free_irq(unsigned int irq, void *dev_id)
-{
-        if (irq < IRQ1 || irq > IRQ7) {
-                printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
-                return;
-        }
-
-        if (irq_list[irq].dev_id != dev_id)
-                printk("%s: Removing probably wrong IRQ %d from %s\n",
-                       __FUNCTION__, irq, irq_list[irq].devname);
-
-        irq_list[irq].handler = (*mach_default_handler)[irq];
-        irq_list[irq].flags   = 0;
-        irq_list[irq].dev_id  = NULL;
-        irq_list[irq].devname = default_names[irq];
-}
-
-asmlinkage void process_int(unsigned long vec, struct pt_regs *fp)
-{
-        if (vec >= VEC_INT1 && vec <= VEC_INT7 && !MACH_IS_BVME6000) {
-                vec -= VEC_SPUR;
-                kstat_cpu(0).irqs[vec]++;
-                irq_list[vec].handler(vec, irq_list[vec].dev_id, fp);
-        } else {
-                if (mach_process_int)
-                        mach_process_int(vec, fp);
-                else
-                        panic("Can't process interrupt vector %ld\n", vec);
-                return;
-        }
-}
-
-int m68k_get_irq_list(struct seq_file *p, void *v)
-{
-        int i;
-
-        /* autovector interrupts */
-        if (mach_default_handler) {
-                for (i = 0; i < SYS_IRQS; i++) {
-                        seq_printf(p, "auto %2d: %10u ", i,
-                                       i ? kstat_cpu(0).irqs[i] : num_spurious);
-                        seq_puts(p, "  ");
-                        seq_printf(p, "%s\n", irq_list[i].devname);
-                }
-        }
-
-        mach_get_irq_list(p, v);
-        return 0;
-}
diff --git a/arch/ppc/amiga/pcmcia.c b/arch/ppc/amiga/pcmcia.c
deleted file mode 100644
index 5d29dc65093c..000000000000
--- a/arch/ppc/amiga/pcmcia.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../m68k/amiga/pcmcia.c"
diff --git a/arch/ppc/amiga/time.c b/arch/ppc/amiga/time.c
deleted file mode 100644
index 8c880c0ca380..000000000000
--- a/arch/ppc/amiga/time.c
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/param.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-
-#include <asm/machdep.h>
-#include <asm/io.h>
-
-#include <linux/timex.h>
-
-unsigned long m68k_get_rtc_time(void)
-{
-        unsigned int year, mon, day, hour, min, sec;
-
-        extern void arch_gettod(int *year, int *mon, int *day, int *hour,
-                                int *min, int *sec);
-
-        arch_gettod (&year, &mon, &day, &hour, &min, &sec);
-
-        if ((year += 1900) < 1970)
-                year += 100;
-
-        return mktime(year, mon, day, hour, min, sec);
-}
-
-int m68k_set_rtc_time(unsigned long nowtime)
-{
-  if (mach_set_clock_mmss)
-    return mach_set_clock_mmss (nowtime);
-  return -1;
-}
-
-void apus_heartbeat (void)
-{
-#ifdef CONFIG_HEARTBEAT
-        static unsigned cnt = 0, period = 0, dist = 0;
-
-        if (cnt == 0 || cnt == dist)
-                mach_heartbeat( 1 );
-        else if (cnt == 7 || cnt == dist+7)
-                mach_heartbeat( 0 );
-
-        if (++cnt > period) {
-                cnt = 0;
-                /* The hyperbolic function below modifies the heartbeat period
-                 * length in dependency of the current (5min) load. It goes
-                 * through the points f(0)=126, f(1)=86, f(5)=51,
-                 * f(inf)->30. */
-                period = ((672<<FSHIFT)/(5*avenrun[0]+(7<<FSHIFT))) + 30;
-                dist = period / 4;
-        }
-#endif
-        /* should be made smarter */
-        ppc_md.heartbeat_count = 1;
-}
diff --git a/arch/ppc/boot/simple/embed_config.c b/arch/ppc/boot/simple/embed_config.c
index 840bff2a45fb..3b46792d7b8b 100644
--- a/arch/ppc/boot/simple/embed_config.c
+++ b/arch/ppc/boot/simple/embed_config.c
@@ -752,7 +752,9 @@ embed_config(bd_t ** bdp)
         static const unsigned long congruence_classes = 256;
         unsigned long addr;
         unsigned long dccr;
+        uint8_t* cp;
         bd_t *bd;
+        int i;
 
         /*
          * Invalidate the data cache if the data cache is turned off.
@@ -778,6 +780,12 @@ embed_config(bd_t ** bdp)
         bd->bi_intfreq = XPAR_CORE_CLOCK_FREQ_HZ;
         bd->bi_busfreq = XPAR_PLB_CLOCK_FREQ_HZ;
         bd->bi_pci_busfreq = XPAR_PCI_0_CLOCK_FREQ_HZ;
+
+        /* Copy the default ethernet address */
+        cp = (u_char *)def_enet_addr;
+        for (i=0; i<6; i++)
+                bd->bi_enetaddr[i] = *cp++;
+
         timebase_period_ns = 1000000000 / bd->bi_tbfreq;
         /* see bi_tbfreq definition in arch/ppc/platforms/4xx/xilinx_ml300.h */
 }
diff --git a/arch/ppc/boot/simple/misc-embedded.c b/arch/ppc/boot/simple/misc-embedded.c
index 8a08ad397ed5..d5a00eb0e4eb 100644
--- a/arch/ppc/boot/simple/misc-embedded.c
+++ b/arch/ppc/boot/simple/misc-embedded.c
@@ -89,7 +89,9 @@ load_kernel(unsigned long load_addr, int num_words, unsigned long cksum, bd_t *b
          * initialize the serial console port.
          */
         embed_config(&bp);
-#if defined(CONFIG_SERIAL_CPM_CONSOLE) || defined(CONFIG_SERIAL_8250_CONSOLE)
+#if defined(CONFIG_SERIAL_CPM_CONSOLE) || \
+    defined(CONFIG_SERIAL_8250_CONSOLE) || \
+    defined(CONFIG_SERIAL_UARTLITE_CONSOLE)
         com_port = serial_init(0, bp);
 #endif
 
diff --git a/arch/ppc/boot/simple/uartlite_tty.c b/arch/ppc/boot/simple/uartlite_tty.c
index 0eae1eab38d4..ca1743e3e912 100644
--- a/arch/ppc/boot/simple/uartlite_tty.c
+++ b/arch/ppc/boot/simple/uartlite_tty.c
@@ -16,6 +16,14 @@
 
 #define UARTLITE_BASEADDR ((void*)(XPAR_UARTLITE_0_BASEADDR))
 
+unsigned long
+serial_init(int chan, void *ignored)
+{
+        /* Clear the RX FIFO */
+        out_be32(UARTLITE_BASEADDR + 0x0C, 0x2);
+        return 0;
+}
+
 void
 serial_putc(unsigned long com_port, unsigned char c)
 {
diff --git a/arch/ppc/configs/apus_defconfig b/arch/ppc/configs/apus_defconfig
deleted file mode 100644
index e2245252d31f..000000000000
--- a/arch/ppc/configs/apus_defconfig
+++ /dev/null
@@ -1,920 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_MMU=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_HAVE_DEC_LOCK=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-
-#
-# General setup
-#
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_SYSCTL=y
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_EMBEDDED is not set
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-CONFIG_KMOD=y
-
-#
-# Platform support
-#
-CONFIG_PPC=y
-CONFIG_PPC32=y
-CONFIG_6xx=y
-# CONFIG_40x is not set
-# CONFIG_POWER3 is not set
-# CONFIG_8xx is not set
-
-#
-# IBM 4xx options
-#
-# CONFIG_8260 is not set
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_PPC_STD_MMU=y
-CONFIG_SERIAL_CONSOLE=y
-# CONFIG_PPC_MULTIPLATFORM is not set
-CONFIG_APUS=y
-# CONFIG_WILLOW_2 is not set
-# CONFIG_PCORE is not set
-# CONFIG_POWERPMC250 is not set
-# CONFIG_EV64260 is not set
-# CONFIG_SPRUCE is not set
-# CONFIG_LOPEC is not set
-# CONFIG_MCPN765 is not set
-# CONFIG_MVME5100 is not set
-# CONFIG_PPLUS is not set
-# CONFIG_PRPMC750 is not set
-# CONFIG_PRPMC800 is not set
-# CONFIG_SANDPOINT is not set
-# CONFIG_ADIR is not set
-# CONFIG_K2 is not set
-# CONFIG_PAL4 is not set
-# CONFIG_GEMINI is not set
-# CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
-# CONFIG_ALTIVEC is not set
-# CONFIG_TAU is not set
-# CONFIG_CPU_FREQ is not set
-
-#
-# General setup
-#
-# CONFIG_HIGHMEM is not set
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_PERMEDIA=y
-CONFIG_KCORE_ELF=y
-CONFIG_BINFMT_ELF=y
-CONFIG_KERNEL_ELF=y
-CONFIG_BINFMT_MISC=m
-CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
-# CONFIG_HOTPLUG is not set
-
-#
-# Parallel port support
-#
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARPORT_AMIGA=m
-# CONFIG_PARPORT_MFC3 is not set
-# CONFIG_PARPORT_OTHER is not set
-# CONFIG_PARPORT_1284 is not set
-CONFIG_PPC601_SYNC_FIX=y
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_AMIGA=y
-CONFIG_ZORRO=y
-CONFIG_ABSTRACT_CONSOLE=y
-CONFIG_APUS_FAST_EXCEPT=y
-CONFIG_AMIGA_PCMCIA=y
-CONFIG_AMIGA_BUILTIN_SERIAL=y
-CONFIG_GVPIOEXT=y
-CONFIG_GVPIOEXT_LP=m
-CONFIG_GVPIOEXT_PLIP=m
-CONFIG_MULTIFACE_III_TTY=y
-CONFIG_A2232=y
-CONFIG_WHIPPET_SERIAL=y
-CONFIG_APNE=y
-CONFIG_HEARTBEAT=y
-CONFIG_PROC_HARDWARE=y
-CONFIG_ZORRO_NAMES=y
-
-#
-# 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=0x80000000
-CONFIG_BOOT_LOAD=0x00800000
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Plug and Play support
-#
-# CONFIG_PNP is not set
-
-#
-# Block devices
-#
-# CONFIG_BLK_DEV_FD is not set
-CONFIG_AMIGA_FLOPPY=y
-CONFIG_AMIGA_Z2RAM=m
-# CONFIG_PARIDE 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_LOOP=y
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID5=m
-# CONFIG_MD_MULTIPATH is not set
-CONFIG_BLK_DEV_DM=m
-
-#
-# ATA/IDE/MFM/RLL support
-#
-CONFIG_IDE=y
-
-#
-# IDE, ATA and ATAPI Block devices
-#
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDISK_STROKE is not set
-CONFIG_BLK_DEV_IDECD=y
-CONFIG_BLK_DEV_IDEFLOPPY=y
-CONFIG_BLK_DEV_IDESCSI=m
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_BLK_DEV_IDEPCI is not set
-CONFIG_BLK_DEV_GAYLE=y
-CONFIG_BLK_DEV_IDEDOUBLER=y
-CONFIG_BLK_DEV_BUDDHA=y
-
-#
-# SCSI support
-#
-CONFIG_SCSI=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_REPORT_LUNS is not set
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_BLK_DEV_3W_XXXX_RAID 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_DPT_I2O is not set
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_MEGARAID is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CPQFCTS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-# CONFIG_SCSI_NCR53C7xx is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_NCR53C8XX is not set
-# CONFIG_SCSI_SYM53C8XX is not set
-# CONFIG_SCSI_PCI2000 is not set
-# CONFIG_SCSI_PCI2220I is not set
-# CONFIG_SCSI_QLOGIC_ISP is not set
-# CONFIG_SCSI_QLOGIC_FC is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_A3000_SCSI=y
-CONFIG_A4000T_SCSI=y
-CONFIG_A2091_SCSI=y
-CONFIG_GVP11_SCSI=y
-CONFIG_CYBERSTORM_SCSI=y
-CONFIG_CYBERSTORMII_SCSI=y
-CONFIG_BLZ2060_SCSI=y
-CONFIG_BLZ1230_SCSI=y
-CONFIG_FASTLANE_SCSI=y
-CONFIG_A4091_SCSI=y
-CONFIG_WARPENGINE_SCSI=y
-CONFIG_BLZ603EPLUS_SCSI=y
-CONFIG_OKTAGON_SCSI=y
-
-#
-# Fusion MPT device support
-#
-# CONFIG_FUSION is not set
-
-#
-# IEEE 1394 (FireWire) support (EXPERIMENTAL)
-#
-# CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK_DEV=m
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG 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_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_INET_ECN 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
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_MAC=m
-# CONFIG_IP_NF_MATCH_PKTTYPE is not set
-CONFIG_IP_NF_MATCH_MARK=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_DSCP is not set
-# CONFIG_IP_NF_MATCH_AH_ESP is not set
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_STATE=m
-CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_UNCLEAN=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_MIRROR=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_COMPAT_IPCHAINS=m
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-# CONFIG_IPV6 is not set
-# CONFIG_XFRM_USER is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-CONFIG_IPV6_SCTP__=y
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_LLC is not set
-# CONFIG_DECNET is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-CONFIG_NETDEVICES=y
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-CONFIG_DUMMY=m
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
-# CONFIG_ETHERTAP is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
-# CONFIG_OAKNET is not set
-CONFIG_ARIADNE=y
-# CONFIG_ZORRO8390 is not set
-CONFIG_A2065=y
-CONFIG_HYDRA=y
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_NET_VENDOR_3COM is not set
-
-#
-# Tulip family network device support
-#
-# CONFIG_NET_TULIP is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_PCI is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-# CONFIG_ACENIC is not set
-# CONFIG_DL2K is not set
-# CONFIG_E1000 is not set
-# CONFIG_NS83820 is not set
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_R8169 is not set
-# CONFIG_SK98LIN is not set
-# CONFIG_TIGON3 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-# CONFIG_IXGB is not set
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=y
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=y
-CONFIG_PPP_SYNC_TTY=y
-CONFIG_PPP_DEFLATE=y
-CONFIG_PPP_BSDCOMP=y
-CONFIG_PPPOE=y
-CONFIG_SLIP=y
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Token Ring devices (depends on LLC=y)
-#
-# CONFIG_NET_FC is not set
-# CONFIG_RCPCI is not set
-# CONFIG_SHAPER is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-
-#
-# Amateur Radio support
-#
-# CONFIG_HAMRADIO is not set
-
-#
-# IrDA (infrared) support
-#
-# CONFIG_IRDA is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN_BOOL is not set
-
-#
-# Graphics support
-#
-CONFIG_FB=y
-# CONFIG_FB_CIRRUS is not set
-CONFIG_FB_PM2=y
-# CONFIG_FB_PM2_FIFO_DISCONNECT is not set
-# CONFIG_FB_PM2_PCI is not set
-CONFIG_FB_PM2_CVPPC=y
-CONFIG_FB_CYBER2000=y
-CONFIG_FB_AMIGA=y
-CONFIG_FB_AMIGA_OCS=y
-CONFIG_FB_AMIGA_ECS=y
-CONFIG_FB_AMIGA_AGA=y
-CONFIG_FB_CYBER=y
-CONFIG_FB_VIRGE=y
-CONFIG_FB_RETINAZ3=y
-CONFIG_FB_FM2=y
-# CONFIG_FB_CT65550 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_S3TRIO is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-# CONFIG_INPUT_TSDEV is not set
-CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
-
-#
-# Input I/O drivers
-#
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-CONFIG_SERIO=y
-# CONFIG_SERIO_I8042 is not set
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_CT82C710 is not set
-# CONFIG_SERIO_PARKBD is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=m
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_AMIGA=m
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_SERIAL=m
-CONFIG_MOUSE_AMIGA=m
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_PCSPKR is not set
-CONFIG_INPUT_UINPUT=m
-
-#
-# Macintosh device drivers
-#
-
-#
-# Character devices
-#
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-# CONFIG_PPDEV is not set
-# CONFIG_TIPAR is not set
-
-#
-# I2C support
-#
-# CONFIG_I2C is not set
-
-#
-# I2C Hardware Sensors Mainboard support
-#
-
-#
-# I2C Hardware Sensors Chip support
-#
-# CONFIG_I2C_SENSOR is not set
-
-#
-# Mice
-#
-CONFIG_BUSMOUSE=y
-# CONFIG_QIC02_TAPE is not set
-
-#
-# IPMI
-#
-# CONFIG_IPMI_HANDLER is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_NVRAM is not set
-CONFIG_GEN_RTC=y
-# CONFIG_GEN_RTC_X is not set
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-# CONFIG_AGP is not set
-# CONFIG_DRM is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_HANGCHECK_TIMER is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Digital Video Broadcasting Devices
-#
-# CONFIG_DVB is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR 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_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_XFS_FS is not set
-CONFIG_MINIX_FS=y
-CONFIG_ROMFS_FS=y
-# CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-# CONFIG_ZISOFS is not set
-# CONFIG_UDF_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-# CONFIG_DEVFS_FS is not set
-CONFIG_DEVPTS_FS=y
-# CONFIG_DEVPTS_FS_XATTR is not set
-CONFIG_TMPFS=y
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-CONFIG_AFFS_FS=y
-CONFIG_HFS_FS=y
-# 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_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V4 is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-# CONFIG_NFSD_V4 is not set
-# CONFIG_NFSD_TCP is not set
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
-CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_GSS is not set
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-CONFIG_CODA_FS=m
-# CONFIG_INTERMEZZO_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=y
-CONFIG_ATARI_PARTITION=y
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_NEC98_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-CONFIG_SMB_NLS=y
-CONFIG_NLS=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-# CONFIG_NLS_CODEPAGE_1250 is not set
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-
-#
-# Sound
-#
-CONFIG_SOUND=y
-CONFIG_DMASOUND_PAULA=m
-CONFIG_DMASOUND=m
-
-#
-# Advanced Linux Sound Architecture
-#
-# CONFIG_SND is not set
-
-#
-# Open Sound System
-#
-CONFIG_SOUND_PRIME=m
-# CONFIG_SOUND_BT878 is not set
-# CONFIG_SOUND_CMPCI is not set
-# CONFIG_SOUND_EMU10K1 is not set
-# CONFIG_SOUND_FUSION is not set
-# CONFIG_SOUND_CS4281 is not set
-# CONFIG_SOUND_ES1370 is not set
-# CONFIG_SOUND_ES1371 is not set
-# CONFIG_SOUND_ESSSOLO1 is not set
-# CONFIG_SOUND_MAESTRO is not set
-# CONFIG_SOUND_MAESTRO3 is not set
-# CONFIG_SOUND_ICH is not set
-# CONFIG_SOUND_RME96XX is not set
-# CONFIG_SOUND_SONICVIBES is not set
-# CONFIG_SOUND_TRIDENT is not set
-# CONFIG_SOUND_MSNDCLAS is not set
-# CONFIG_SOUND_MSNDPIN is not set
-# CONFIG_SOUND_VIA82CXXX is not set
-CONFIG_SOUND_OSS=m
-CONFIG_SOUND_TRACEINIT=y
-CONFIG_SOUND_DMAP=y
-# CONFIG_SOUND_AD1816 is not set
-# CONFIG_SOUND_SGALAXY is not set
-# CONFIG_SOUND_ADLIB is not set
-# CONFIG_SOUND_ACI_MIXER is not set
-# CONFIG_SOUND_CS4232 is not set
-# CONFIG_SOUND_SSCAPE is not set
-# CONFIG_SOUND_GUS is not set
-CONFIG_SOUND_VMIDI=m
-# CONFIG_SOUND_TRIX is not set
-# CONFIG_SOUND_MSS is not set
-# CONFIG_SOUND_MPU401 is not set
-# CONFIG_SOUND_NM256 is not set
-# CONFIG_SOUND_MAD16 is not set
-# CONFIG_SOUND_PAS is not set
-# CONFIG_SOUND_PSS is not set
-# CONFIG_SOUND_SB is not set
-# CONFIG_SOUND_AWE32_SYNTH is not set
-# CONFIG_SOUND_WAVEFRONT is not set
-# CONFIG_SOUND_MAUI is not set
-# CONFIG_SOUND_YM3812 is not set
-# CONFIG_SOUND_OPL3SA1 is not set
-# CONFIG_SOUND_OPL3SA2 is not set
-# CONFIG_SOUND_YMFPCI is not set
-# CONFIG_SOUND_UART6850 is not set
-# CONFIG_SOUND_AEDSP16 is not set
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-# CONFIG_USB_GADGET is not set
-
-#
-# Bluetooth support
-#
-# CONFIG_BT is not set
-
-#
-# Library routines
-#
-# CONFIG_CRC32 is not set
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
-
-#
-# Kernel hacking
-#
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_KALLSYMS is not set
-
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-
-#
-# Cryptographic options
-#
-# CONFIG_CRYPTO is not set
diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S
index c7cb9d5f24a3..1b0ec7202dd5 100644
--- a/arch/ppc/kernel/head.S
+++ b/arch/ppc/kernel/head.S
@@ -32,10 +32,6 @@
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
 
-#ifdef CONFIG_APUS
-#include <asm/amigappc.h>
-#endif
-
 /* 601 only have IBAT; cr0.eq is set on 601 when using this macro */
 #define LOAD_BAT(n, reg, RA, RB)        \
         /* see the comment for clear_bats() -- Cort */ \
@@ -128,14 +124,6 @@ __start:
  */
         bl      early_init
 
-#ifdef CONFIG_APUS
-/* On APUS the __va/__pa constants need to be set to the correct
- * values before continuing.
- */
-        mr      r4,r30
-        bl      fix_mem_constants
-#endif /* CONFIG_APUS */
-
 /* Switch MMU off, clear BATs and flush TLB. At this point, r3 contains
  * the physical address we are running at, returned by early_init()
  */
@@ -145,7 +133,7 @@ __after_mmu_off:
         bl      flush_tlbs
 
         bl      initial_bats
-#if !defined(CONFIG_APUS) && defined(CONFIG_BOOTX_TEXT)
+#ifdef CONFIG_BOOTX_TEXT
         bl      setup_disp_bat
 #endif
 
@@ -161,7 +149,6 @@ __after_mmu_off:
 #endif /* CONFIG_6xx */
 
 
-#ifndef CONFIG_APUS
 /*
  * We need to run with _start at physical address 0.
  * If the MMU is already turned on, we copy stuff to KERNELBASE,
@@ -172,7 +159,7 @@ __after_mmu_off:
         addis   r4,r3,KERNELBASE@h      /* current address of _start */
         cmpwi   0,r4,0                  /* are we already running at 0? */
         bne     relocate_kernel
-#endif /* CONFIG_APUS */
+
 /*
  * we now have the 1st 16M of ram mapped with the bats.
  * prep needs the mmu to be turned on here, but pmac already has it on.
@@ -812,85 +799,6 @@ copy_and_flush:
         addi    r6,r6,4
         blr
 
-#ifdef CONFIG_APUS
-/*
- * On APUS the physical base address of the kernel is not known at compile
- * time, which means the __pa/__va constants used are incorrect. In the
- * __init section is recorded the virtual addresses of instructions using
- * these constants, so all that has to be done is fix these before
- * continuing the kernel boot.
- *
- * r4 = The physical address of the kernel base.
- */
-fix_mem_constants:
-        mr      r10,r4
-        addis   r10,r10,-KERNELBASE@h    /* virt_to_phys constant */
-        neg     r11,r10                  /* phys_to_virt constant */
-
-        lis     r12,__vtop_table_begin@h
-        ori     r12,r12,__vtop_table_begin@l
-        add     r12,r12,r10              /* table begin phys address */
-        lis     r13,__vtop_table_end@h
-        ori     r13,r13,__vtop_table_end@l
-        add     r13,r13,r10              /* table end phys address */
-        subi    r12,r12,4
-        subi    r13,r13,4
-1:      lwzu    r14,4(r12)               /* virt address of instruction */
-        add     r14,r14,r10              /* phys address of instruction */
-        lwz     r15,0(r14)               /* instruction, now insert top */
-        rlwimi  r15,r10,16,16,31         /* half of vp const in low half */
-        stw     r15,0(r14)               /* of instruction and restore. */
-        dcbst   r0,r14                   /* write it to memory */
-        sync
-        icbi    r0,r14                   /* flush the icache line */
-        cmpw    r12,r13
-        bne     1b
-        sync                            /* additional sync needed on g4 */
-        isync
-
-/*
- * Map the memory where the exception handlers will
- * be copied to when hash constants have been patched.
- */
-#ifdef CONFIG_APUS_FAST_EXCEPT
-        lis     r8,0xfff0
-#else
-        lis     r8,0
-#endif
-        ori     r8,r8,0x2               /* 128KB, supervisor */
-        mtspr   SPRN_DBAT3U,r8
-        mtspr   SPRN_DBAT3L,r8
-
-        lis     r12,__ptov_table_begin@h
-        ori     r12,r12,__ptov_table_begin@l
-        add     r12,r12,r10              /* table begin phys address */
-        lis     r13,__ptov_table_end@h
-        ori     r13,r13,__ptov_table_end@l
-        add     r13,r13,r10              /* table end phys address */
-        subi    r12,r12,4
-        subi    r13,r13,4
-1:      lwzu    r14,4(r12)               /* virt address of instruction */
-        add     r14,r14,r10              /* phys address of instruction */
-        lwz     r15,0(r14)               /* instruction, now insert top */
-        rlwimi  r15,r11,16,16,31         /* half of pv const in low half*/
-        stw     r15,0(r14)               /* of instruction and restore. */
-        dcbst   r0,r14                   /* write it to memory */
-        sync
-        icbi    r0,r14                   /* flush the icache line */
-        cmpw    r12,r13
-        bne     1b
-
-        sync                            /* additional sync needed on g4 */
-        isync                           /* No speculative loading until now */
-        blr
-
-/***********************************************************************
- *  Please note that on APUS the exception handlers are located at the
- *  physical address 0xfff0000. For this reason, the exception handlers
- *  cannot use relative branches to access the code below.
- ***********************************************************************/
-#endif /* CONFIG_APUS */
-
 #ifdef CONFIG_SMP
         .globl  __secondary_start_pmac_0
 __secondary_start_pmac_0:
@@ -1043,19 +951,6 @@ start_here:
         bl      machine_init
         bl      MMU_init
 
-#ifdef CONFIG_APUS
-        /* Copy exception code to exception vector base on APUS. */
-        lis     r4,KERNELBASE@h
-#ifdef CONFIG_APUS_FAST_EXCEPT
-        lis     r3,0xfff0               /* Copy to 0xfff00000 */
-#else
-        lis     r3,0                    /* Copy to 0x00000000 */
-#endif
-        li      r5,0x4000               /* # bytes of memory to copy */
-        li      r6,0
-        bl      copy_and_flush          /* copy the first 0x4000 bytes */
-#endif  /* CONFIG_APUS */
-
 /*
  * Go back to running unmapped so we can load up new values
  * for SDR1 (hash table pointer) and the segment registers
@@ -1232,11 +1127,7 @@ initial_bats:
 #else
         ori     r8,r8,2                 /* R/W access */
 #endif /* CONFIG_SMP */
-#ifdef CONFIG_APUS
-        ori     r11,r11,BL_8M<<2|0x2    /* set up 8MB BAT registers for 604 */
-#else
         ori     r11,r11,BL_256M<<2|0x2  /* set up BAT registers for 604 */
-#endif /* CONFIG_APUS */
 
         mtspr   SPRN_DBAT0L,r8          /* N.B. 6xx (not 601) have valid */
         mtspr   SPRN_DBAT0U,r11         /* bit in upper BAT register */
@@ -1245,7 +1136,7 @@ initial_bats:
         isync
         blr
 
-#if !defined(CONFIG_APUS) && defined(CONFIG_BOOTX_TEXT)
+#ifdef CONFIG_BOOTX_TEXT
 setup_disp_bat:
         /*
          * setup the display bat prepared for us in prom.c
@@ -1268,7 +1159,7 @@ setup_disp_bat:
         mtspr   SPRN_IBAT3U,r11
         blr
 
-#endif /* !defined(CONFIG_APUS) && defined(CONFIG_BOOTX_TEXT) */
+#endif /* defined(CONFIG_BOOTX_TEXT) */
 
 #ifdef CONFIG_8260
 /* Jump into the system reset for the rom.
diff --git a/arch/ppc/kernel/head_44x.S b/arch/ppc/kernel/head_44x.S
index 7e44de5a26db..75bbc937ed73 100644
--- a/arch/ppc/kernel/head_44x.S
+++ b/arch/ppc/kernel/head_44x.S
@@ -227,16 +227,6 @@ skpinv:	addi	r4,r4,1				/* Increment */
         lis     r4,interrupt_base@h     /* IVPR only uses the high 16-bits */
         mtspr   SPRN_IVPR,r4
 
-#ifdef CONFIG_440EP
-        /* Clear DAPUIB flag in CCR0 (enable APU between CPU and FPU) */
-        mfspr   r2,SPRN_CCR0
-        lis     r3,0xffef
-        ori     r3,r3,0xffff
-        and     r2,r2,r3
-        mtspr   SPRN_CCR0,r2
-        isync
-#endif
-
         /*
          * This is where the main kernel code starts.
          */
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index 63f0a987139b..22494ec123ea 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -60,8 +60,6 @@ long long __ashrdi3(long long, int);
 long long __ashldi3(long long, int);
 long long __lshrdi3(long long, int);
 
-extern unsigned long mm_ptov (unsigned long paddr);
-
 EXPORT_SYMBOL(clear_pages);
 EXPORT_SYMBOL(clear_user_page);
 EXPORT_SYMBOL(transfer_to_handler);
@@ -118,7 +116,6 @@ EXPORT_SYMBOL(_outsw_ns);
 EXPORT_SYMBOL(_insl_ns);
 EXPORT_SYMBOL(_outsl_ns);
 EXPORT_SYMBOL(iopa);
-EXPORT_SYMBOL(mm_ptov);
 EXPORT_SYMBOL(ioremap);
 #ifdef CONFIG_44x
 EXPORT_SYMBOL(ioremap64);
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index 967c1ef59a6b..aac88c2f3db9 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -25,7 +25,6 @@
 #include <asm/pgtable.h>
 #include <asm/bootinfo.h>
 #include <asm/setup.h>
-#include <asm/amigappc.h>
 #include <asm/smp.h>
 #include <asm/elf.h>
 #include <asm/cputable.h>
diff --git a/arch/ppc/kernel/vmlinux.lds.S b/arch/ppc/kernel/vmlinux.lds.S
index c0aac3ff9e91..98c1212674f6 100644
--- a/arch/ppc/kernel/vmlinux.lds.S
+++ b/arch/ppc/kernel/vmlinux.lds.S
@@ -91,6 +91,8 @@ SECTIONS
   . = ALIGN(8192);
   .data.init_task : { *(.data.init_task) }
 
+  NOTES
+
   . = ALIGN(4096);
   __init_begin = .;
   .init.text : {
diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c
index 35ebb6395ae3..1f51e6c94507 100644
--- a/arch/ppc/mm/pgtable.c
+++ b/arch/ppc/mm/pgtable.c
@@ -426,41 +426,3 @@ unsigned long iopa(unsigned long addr)
         return(pa);
 }
 
-/* This is will find the virtual address for a physical one....
- * Swiped from APUS, could be dangerous :-).
- * This is only a placeholder until I really find a way to make this
- * work.  -- Dan
- */
-unsigned long
-mm_ptov (unsigned long paddr)
-{
-        unsigned long ret;
-#if 0
-        if (paddr < 16*1024*1024)
-                ret = ZTWO_VADDR(paddr);
-        else {
-                int i;
-
-                for (i = 0; i < kmap_chunk_count;){
-                        unsigned long phys = kmap_chunks[i++];
-                        unsigned long size = kmap_chunks[i++];
-                        unsigned long virt = kmap_chunks[i++];
-                        if (paddr >= phys
-                            && paddr < (phys + size)){
-                                ret = virt + paddr - phys;
-                                goto exit;
-                        }
-                }
-        
-                ret = (unsigned long) __va(paddr);
-        }
-exit:
-#ifdef DEBUGPV
-        printk ("PTOV(%lx)=%lx\n", paddr, ret);
-#endif
-#else
-        ret = (unsigned long)paddr + KERNELBASE;
-#endif
-        return ret;
-}
-
diff --git a/arch/ppc/platforms/Makefile b/arch/ppc/platforms/Makefile
index e17fad470621..40f53fbe6d35 100644
--- a/arch/ppc/platforms/Makefile
+++ b/arch/ppc/platforms/Makefile
@@ -2,10 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-obj-$(CONFIG_APUS)              += apus_setup.o
-ifeq ($(CONFIG_APUS),y)
-obj-$(CONFIG_PCI)               += apus_pci.o
-endif
 obj-$(CONFIG_PPC_PREP)          += prep_pci.o prep_setup.o
 obj-$(CONFIG_PREP_RESIDUAL)     += residual.o
 obj-$(CONFIG_PQ2ADS)            += pq2ads.o
diff --git a/arch/ppc/platforms/apus_pci.c b/arch/ppc/platforms/apus_pci.c
deleted file mode 100644
index dc165f0c8908..000000000000
--- a/arch/ppc/platforms/apus_pci.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright (C) Michel Dänzer <michdaen@iiic.ethz.ch>
- *
- * APUS PCI routines.
- *
- * Currently, only B/CVisionPPC cards (Permedia2) are supported.
- *
- * Thanks to Geert Uytterhoeven for the idea:
- * Read values from given config space(s) for the first devices, -1 otherwise
- *
- */
-
-#ifdef CONFIG_AMIGA
-
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/string.h>
-#include <linux/init.h>
-
-#include <asm/io.h>
-#include <asm/pci-bridge.h>
-#include <asm/machdep.h>
-
-#include "apus_pci.h"
-
-
-/* These definitions are mostly adapted from pm2fb.c */
-
-#undef APUS_PCI_MASTER_DEBUG
-#ifdef APUS_PCI_MASTER_DEBUG
-#define DPRINTK(a,b...) printk(KERN_DEBUG "apus_pci: %s: " a, __FUNCTION__ , ## b)
-#else
-#define DPRINTK(a,b...)
-#endif
-
-/*
- * The _DEFINITIVE_ memory mapping/unmapping functions.
- * This is due to the fact that they're changing soooo often...
- */
-#define DEFW()          wmb()
-#define DEFR()          rmb()
-#define DEFRW()         mb()
-
-#define DEVNO(d)        ((d)>>3)
-#define FNNO(d)         ((d)&7)
-
-
-extern unsigned long powerup_PCI_present;
-
-static struct pci_controller *apus_hose;
-
-
-void *pci_io_base(unsigned int bus)
-{
-        return 0;
-}
-
-
-int
-apus_pcibios_read_config(struct pci_bus *bus, int devfn, int offset,
-                         int len, u32 *val)
-{
-        int fnno = FNNO(devfn);
-        int devno = DEVNO(devfn);
-        volatile unsigned char *cfg_data;
-
-        if (bus->number > 0 || devno != 1) {
-                *val = ~0;
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        }
-        /* base address + function offset + offset ^ endianness conversion */
-        /* XXX the fnno<<5 bit seems wacky  -- paulus */
-        cfg_data = apus_hose->cfg_data + (fnno<<5) + (offset ^ (len - 1));
-        switch (len) {
-        case 1:
-                *val = readb(cfg_data);
-                break;
-        case 2:
-                *val = readw(cfg_data);
-                break;
-        default:
-                *val = readl(cfg_data);
-                break;
-        }
-
-        DPRINTK("read b: 0x%x, d: 0x%x, f: 0x%x, o: 0x%x, l: %d, v: 0x%x\n",
-                bus->number, devfn>>3, devfn&7, offset, len, *val);
-        return PCIBIOS_SUCCESSFUL;
-}
-
-int
-apus_pcibios_write_config(struct pci_bus *bus, int devfn, int offset,
-                          int len, u32 *val)
-{
-        int fnno = FNNO(devfn);
-        int devno = DEVNO(devfn);
-        volatile unsigned char *cfg_data;
-
-        if (bus->number > 0 || devno != 1) {
-                return PCIBIOS_DEVICE_NOT_FOUND;
-        }
-        /* base address + function offset + offset ^ endianness conversion */
-        /* XXX the fnno<<5 bit seems wacky  -- paulus */
-        cfg_data = apus_hose->cfg_data + (fnno<<5) + (offset ^ (len - 1));
-        switch (len) {
-        case 1:
-                writeb(val, cfg_data); DEFW();
-                break;
-        case 2:
-                writew(val, cfg_data); DEFW();
-                break;
-        default:
-                writel(val, cfg_data); DEFW();
-                break;
-        }
-
-        DPRINTK("write b: 0x%x, d: 0x%x, f: 0x%x, o: 0x%x, l: %d, v: 0x%x\n",
-                bus->number, devfn>>3, devfn&7, offset, len, val);
-        return PCIBIOS_SUCCESSFUL;
-}
-
-static struct pci_ops apus_pci_ops = {
-        apus_pcibios_read_config,
-        apus_pcibios_write_config
-};
-
-static struct resource pci_mem = { "B/CVisionPPC PCI mem", CVPPC_FB_APERTURE_ONE, CVPPC_PCI_CONFIG, IORESOURCE_MEM };
-
-void __init
-apus_pcibios_fixup(void)
-{
-/*      struct pci_dev *dev = pci_find_slot(0, 1<<3);
-        unsigned int reg, val, offset;*/
-
-        /* FIXME: interrupt? */
-        /*dev->interrupt = xxx;*/
-
-        request_resource(&iomem_resource, &pci_mem);
-        printk("%s: PCI mem resource requested\n", __FUNCTION__);
-}
-
-static void __init apus_pcibios_fixup_bus(struct pci_bus *bus)
-{
-        bus->resource[1] = &pci_mem;
-}
-
-
-/*
- * This is from pm2fb.c again
- *
- * Check if PCI (B/CVisionPPC) is available, initialize it and set up
- * the pcibios_* pointers
- */
-
-
-void __init
-apus_setup_pci_ptrs(void)
-{
-        if (!powerup_PCI_present) {
-                DPRINTK("no PCI bridge detected\n");
-                return;
-        }
-        DPRINTK("Phase5 B/CVisionPPC PCI bridge detected.\n");
-
-        apus_hose = pcibios_alloc_controller();
-        if (!apus_hose) {
-                printk("apus_pci: Can't allocate PCI controller structure\n");
-                return;
-        }
-
-        if (!(apus_hose->cfg_data = ioremap(CVPPC_PCI_CONFIG, 256))) {
-                printk("apus_pci: unable to map PCI config region\n");
-                return;
-        }
-
-        if (!(apus_hose->cfg_addr = ioremap(CSPPC_PCI_BRIDGE, 256))) {
-                printk("apus_pci: unable to map PCI bridge\n");
-                return;
-        }
-
-        writel(CSPPCF_BRIDGE_BIG_ENDIAN, apus_hose->cfg_addr + CSPPC_BRIDGE_ENDIAN);
-        DEFW();
-
-        writel(CVPPC_REGS_REGION,  apus_hose->cfg_data+ PCI_BASE_ADDRESS_0);
-        DEFW();
-        writel(CVPPC_FB_APERTURE_ONE, apus_hose->cfg_data + PCI_BASE_ADDRESS_1);
-        DEFW();
-        writel(CVPPC_FB_APERTURE_TWO, apus_hose->cfg_data + PCI_BASE_ADDRESS_2);
-        DEFW();
-        writel(CVPPC_ROM_ADDRESS, apus_hose->cfg_data + PCI_ROM_ADDRESS);
-        DEFW();
-
-        writel(0xef000000 | PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
-                PCI_COMMAND_MASTER, apus_hose->cfg_data + PCI_COMMAND);
-        DEFW();
-
-        apus_hose->first_busno = 0;
-        apus_hose->last_busno = 0;
-        apus_hose->ops = &apus_pci_ops;
-        ppc_md.pcibios_fixup = apus_pcibios_fixup;
-        ppc_md.pcibios_fixup_bus = apus_pcibios_fixup_bus;
-
-        return;
-}
-
-#endif /* CONFIG_AMIGA */
diff --git a/arch/ppc/platforms/apus_pci.h b/arch/ppc/platforms/apus_pci.h
deleted file mode 100644
index f15974ae0189..000000000000
--- a/arch/ppc/platforms/apus_pci.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Phase5 CybervisionPPC (TVP4020) definitions for the Permedia2 framebuffer
- * driver.
- *
- * Copyright (c) 1998-1999 Ilario Nardinocchi (nardinoc@CS.UniBO.IT)
- * --------------------------------------------------------------------------
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file README.legal in the main directory of this archive
- * for more details.
- */
-
-#ifndef APUS_PCI_H
-#define APUS_PCI_H
-
-
-#define CSPPC_PCI_BRIDGE                0xfffe0000
-#define CSPPC_BRIDGE_ENDIAN             0x0000
-#define CSPPC_BRIDGE_INT                0x0010
-
-#define CVPPC_PCI_CONFIG                0xfffc0000
-#define CVPPC_ROM_ADDRESS               0xe2000001
-#define CVPPC_REGS_REGION               0xef000000
-#define CVPPC_FB_APERTURE_ONE           0xe0000000
-#define CVPPC_FB_APERTURE_TWO           0xe1000000
-#define CVPPC_FB_SIZE                   0x00800000
-
-/* CVPPC_BRIDGE_ENDIAN */
-#define CSPPCF_BRIDGE_BIG_ENDIAN        0x02
-
-/* CVPPC_BRIDGE_INT */
-#define CSPPCF_BRIDGE_ACTIVE_INT2       0x01
-
-
-#endif  /* APUS_PCI_H */
diff --git a/arch/ppc/platforms/apus_setup.c b/arch/ppc/platforms/apus_setup.c
deleted file mode 100644
index 063274d2c503..000000000000
--- a/arch/ppc/platforms/apus_setup.c
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
- *  Copyright (C) 1998, 1999  Jesper Skov
- *
- *  Basically what is needed to replace functionality found in
- *  arch/m68k allowing Amiga drivers to work under APUS.
- *  Bits of code and/or ideas from arch/m68k and arch/ppc files.
- *
- * TODO:
- *  This file needs a *really* good cleanup. Restructure and optimize.
- *  Make sure it can be compiled for non-APUS configs. Begin to move
- *  Amiga specific stuff into mach/amiga.
- */
-
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <linux/initrd.h>
-#include <linux/seq_file.h>
-
-/* Needs INITSERIAL call in head.S! */
-#undef APUS_DEBUG
-
-#include <asm/bootinfo.h>
-#include <asm/setup.h>
-#include <asm/amigahw.h>
-#include <asm/amigaints.h>
-#include <asm/amigappc.h>
-#include <asm/pgtable.h>
-#include <asm/dma.h>
-#include <asm/machdep.h>
-#include <asm/time.h>
-
-unsigned long m68k_machtype;
-char debug_device[6] = "";
-
-extern void amiga_init_IRQ(void);
-
-extern void apus_setup_pci_ptrs(void);
-
-void (*mach_sched_init) (void (*handler)(int, void *, struct pt_regs *)) __initdata = NULL;
-/* machine dependent irq functions */
-void (*mach_init_IRQ) (void) __initdata = NULL;
-void (*(*mach_default_handler)[]) (int, void *, struct pt_regs *) = NULL;
-void (*mach_get_model) (char *model) = NULL;
-int (*mach_get_hardware_list) (char *buffer) = NULL;
-int (*mach_get_irq_list) (struct seq_file *, void *) = NULL;
-void (*mach_process_int) (int, struct pt_regs *) = NULL;
-/* machine dependent timer functions */
-unsigned long (*mach_gettimeoffset) (void);
-void (*mach_gettod) (int*, int*, int*, int*, int*, int*);
-int (*mach_hwclk) (int, struct hwclk_time*) = NULL;
-int (*mach_set_clock_mmss) (unsigned long) = NULL;
-void (*mach_reset)( void );
-long mach_max_dma_address = 0x00ffffff; /* default set to the lower 16MB */
-#ifdef CONFIG_HEARTBEAT
-void (*mach_heartbeat) (int) = NULL;
-extern void apus_heartbeat (void);
-#endif
-
-extern unsigned long amiga_model;
-extern unsigned decrementer_count;/* count value for 1e6/HZ microseconds */
-extern unsigned count_period_num; /* 1 decrementer count equals */
-extern unsigned count_period_den; /* count_period_num / count_period_den us */
-
-int num_memory = 0;
-struct mem_info memory[NUM_MEMINFO];/* memory description */
-/* FIXME: Duplicate memory data to avoid conflicts with m68k shared code. */
-int m68k_realnum_memory = 0;
-struct mem_info m68k_memory[NUM_MEMINFO];/* memory description */
-
-struct mem_info ramdisk;
-
-extern void config_amiga(void);
-
-static int __60nsram = 0;
-
-/* for cpuinfo */
-static int __bus_speed = 0;
-static int __speed_test_failed = 0;
-
-/********************************************** COMPILE PROTECTION */
-/* Provide some stubs that links to Amiga specific functions.
- * This allows CONFIG_APUS to be removed from generic PPC files while
- * preventing link errors for other PPC targets.
- */
-unsigned long apus_get_rtc_time(void)
-{
-#ifdef CONFIG_APUS
-        extern unsigned long m68k_get_rtc_time(void);
-
-        return m68k_get_rtc_time ();
-#else
-        return 0;
-#endif
-}
-
-int apus_set_rtc_time(unsigned long nowtime)
-{
-#ifdef CONFIG_APUS
-        extern int m68k_set_rtc_time(unsigned long nowtime);
-
-        return m68k_set_rtc_time (nowtime);
-#else
-        return 0;
-#endif
-}
-
-/*********************************************************** SETUP */
-/* From arch/m68k/kernel/setup.c. */
-void __init apus_setup_arch(void)
-{
-#ifdef CONFIG_APUS
-        extern char cmd_line[];
-        int i;
-        char *p, *q;
-
-        /* Let m68k-shared code know it should do the Amiga thing. */
-        m68k_machtype = MACH_AMIGA;
-
-        /* Parse the command line for arch-specific options.
-         * For the m68k, this is currently only "debug=xxx" to enable printing
-         * certain kernel messages to some machine-specific device.  */
-        for( p = cmd_line; p && *p; ) {
-            i = 0;
-            if (!strncmp( p, "debug=", 6 )) {
-                    strlcpy( debug_device, p+6, sizeof(debug_device) );
-                    if ((q = strchr( debug_device, ' ' ))) *q = 0;
-                    i = 1;
-            } else if (!strncmp( p, "60nsram", 7 )) {
-                    APUS_WRITE (APUS_REG_WAITSTATE,
-                                REGWAITSTATE_SETRESET
-                                |REGWAITSTATE_PPCR
-                                |REGWAITSTATE_PPCW);
-                    __60nsram = 1;
-                    i = 1;
-            }
-
-            if (i) {
-                /* option processed, delete it */
-                if ((q = strchr( p, ' ' )))
-                    strcpy( p, q+1 );
-                else
-                    *p = 0;
-            } else {
-                if ((p = strchr( p, ' ' ))) ++p;
-            }
-        }
-
-        config_amiga();
-
-#if 0 /* Enable for logging - also include logging.o in Makefile rule */
-        {
-#define LOG_SIZE 4096
-                void* base;
-
-                /* Throw away some memory - the P5 firmare stomps on top
-                 * of CHIP memory during bootup.
-                 */
-                amiga_chip_alloc(0x1000);
-
-                base = amiga_chip_alloc(LOG_SIZE+sizeof(klog_data_t));
-                LOG_INIT(base, base+sizeof(klog_data_t), LOG_SIZE);
-        }
-#endif
-#endif
-}
-
-int
-apus_show_cpuinfo(struct seq_file *m)
-{
-        extern int __map_without_bats;
-        extern unsigned long powerup_PCI_present;
-
-        seq_printf(m, "machine\t\t: Amiga\n");
-        seq_printf(m, "bus speed\t: %d%s", __bus_speed,
-                   (__speed_test_failed) ? " [failed]\n" : "\n");
-        seq_printf(m, "using BATs\t: %s\n",
-                   (__map_without_bats) ? "No" : "Yes");
-        seq_printf(m, "ram speed\t: %dns\n", (__60nsram) ? 60 : 70);
-        seq_printf(m, "PCI bridge\t: %s\n",
-                   (powerup_PCI_present) ? "Yes" : "No");
-        return 0;
-}
-
-static void get_current_tb(unsigned long long *time)
-{
-        __asm __volatile ("1:mftbu 4      \n\t"
-                          "  mftb  5      \n\t"
-                          "  mftbu 6      \n\t"
-                          "  cmpw  4,6    \n\t"
-                          "  bne   1b     \n\t"
-                          "  stw   4,0(%0)\n\t"
-                          "  stw   5,4(%0)\n\t"
-                          :
-                          : "r" (time)
-                          : "r4", "r5", "r6");
-}
-
-
-void apus_calibrate_decr(void)
-{
-#ifdef CONFIG_APUS
-        unsigned long freq;
-
-        /* This algorithm for determining the bus speed was
-           contributed by Ralph Schmidt. */
-        unsigned long long start, stop;
-        int bus_speed;
-        int speed_test_failed = 0;
-
-        {
-                unsigned long loop = amiga_eclock / 10;
-
-                get_current_tb (&start);
-                while (loop--) {
-                        unsigned char tmp;
-
-                        tmp = ciaa.pra;
-                }
-                get_current_tb (&stop);
-        }
-
-        bus_speed = (((unsigned long)(stop-start))*10*4) / 1000000;
-        if (AMI_1200 == amiga_model)
-                bus_speed /= 2;
-
-        if ((bus_speed >= 47) && (bus_speed < 53)) {
-                bus_speed = 50;
-                freq = 12500000;
-        } else if ((bus_speed >= 57) && (bus_speed < 63)) {
-                bus_speed = 60;
-                freq = 15000000;
-        } else if ((bus_speed >= 63) && (bus_speed < 69)) {
-                bus_speed = 67;
-                freq = 16666667;
-        } else {
-                printk ("APUS: Unable to determine bus speed (%d). "
-                        "Defaulting to 50MHz", bus_speed);
-                bus_speed = 50;
-                freq = 12500000;
-                speed_test_failed = 1;
-        }
-
-        /* Ease diagnostics... */
-        {
-                extern int __map_without_bats;
-                extern unsigned long powerup_PCI_present;
-
-                printk ("APUS: BATs=%d, BUS=%dMHz",
-                        (__map_without_bats) ? 0 : 1,
-                        bus_speed);
-                if (speed_test_failed)
-                        printk ("[FAILED - please report]");
-
-                printk (", RAM=%dns, PCI bridge=%d\n",
-                        (__60nsram) ? 60 : 70,
-                        (powerup_PCI_present) ? 1 : 0);
-
-                /* print a bit more if asked politely... */
-                if (!(ciaa.pra & 0x40)){
-                        extern unsigned int bat_addrs[4][3];
-                        int b;
-                        for (b = 0; b < 4; ++b) {
-                                printk ("APUS: BAT%d ", b);
-                                printk ("%08x-%08x -> %08x\n",
-                                        bat_addrs[b][0],
-                                        bat_addrs[b][1],
-                                        bat_addrs[b][2]);
-                        }
-                }
-
-        }
-
-        printk("time_init: decrementer frequency = %lu.%.6lu MHz\n",
-               freq/1000000, freq%1000000);
-        tb_ticks_per_jiffy = freq / HZ;
-        tb_to_us = mulhwu_scale_factor(freq, 1000000);
-
-        __bus_speed = bus_speed;
-        __speed_test_failed = speed_test_failed;
-#endif
-}
-
-void arch_gettod(int *year, int *mon, int *day, int *hour,
-                 int *min, int *sec)
-{
-#ifdef CONFIG_APUS
-        if (mach_gettod)
-                mach_gettod(year, mon, day, hour, min, sec);
-        else
-                *year = *mon = *day = *hour = *min = *sec = 0;
-#endif
-}
-
-/* for "kbd-reset" cmdline param */
-__init
-void kbd_reset_setup(char *str, int *ints)
-{
-}
-
-/*********************************************************** MEMORY */
-#define KMAP_MAX 32
-unsigned long kmap_chunks[KMAP_MAX*3];
-int kmap_chunk_count = 0;
-
-/* From pgtable.h */
-static __inline__ pte_t *my_find_pte(struct mm_struct *mm,unsigned long va)
-{
-        pgd_t *dir = 0;
-        pmd_t *pmd = 0;
-        pte_t *pte = 0;
-
-        va &= PAGE_MASK;
-
-        dir = pgd_offset( mm, va );
-        if (dir)
-        {
-                pmd = pmd_offset(dir, va & PAGE_MASK);
-                if (pmd && pmd_present(*pmd))
-                {
-                        pte = pte_offset(pmd, va);
-                }
-        }
-        return pte;
-}
-
-
-/* Again simulating an m68k/mm/kmap.c function. */
-void kernel_set_cachemode( unsigned long address, unsigned long size,
-                           unsigned int cmode )
-{
-        unsigned long mask, flags;
-
-        switch (cmode)
-        {
-        case IOMAP_FULL_CACHING:
-                mask = ~(_PAGE_NO_CACHE | _PAGE_GUARDED);
-                flags = 0;
-                break;
-        case IOMAP_NOCACHE_SER:
-                mask = ~0;
-                flags = (_PAGE_NO_CACHE | _PAGE_GUARDED);
-                break;
-        default:
-                panic ("kernel_set_cachemode() doesn't support mode %d\n",
-                       cmode);
-                break;
-        }
-
-        size /= PAGE_SIZE;
-        address &= PAGE_MASK;
-        while (size--)
-        {
-                pte_t *pte;
-
-                pte = my_find_pte(&init_mm, address);
-                if ( !pte )
-                {
-                        printk("pte NULL in kernel_set_cachemode()\n");
-                        return;
-                }
-
-                pte_val (*pte) &= mask;
-                pte_val (*pte) |= flags;
-                flush_tlb_page(find_vma(&init_mm,address),address);
-
-                address += PAGE_SIZE;
-        }
-}
-
-unsigned long mm_ptov (unsigned long paddr)
-{
-        unsigned long ret;
-        if (paddr < 16*1024*1024)
-                ret = ZTWO_VADDR(paddr);
-        else {
-                int i;
-
-                for (i = 0; i < kmap_chunk_count;){
-                        unsigned long phys = kmap_chunks[i++];
-                        unsigned long size = kmap_chunks[i++];
-                        unsigned long virt = kmap_chunks[i++];
-                        if (paddr >= phys
-                            && paddr < (phys + size)){
-                                ret = virt + paddr - phys;
-                                goto exit;
-                        }
-                }
-
-                ret = (unsigned long) __va(paddr);
-        }
-exit:
-#ifdef DEBUGPV
-        printk ("PTOV(%lx)=%lx\n", paddr, ret);
-#endif
-        return ret;
-}
-
-int mm_end_of_chunk (unsigned long addr, int len)
-{
-        if (memory[0].addr + memory[0].size == addr + len)
-                return 1;
-        return 0;
-}
-
-/*********************************************************** CACHE */
-
-#define L1_CACHE_BYTES 32
-#define MAX_CACHE_SIZE 8192
-void cache_push(__u32 addr, int length)
-{
-        addr = mm_ptov(addr);
-
-        if (MAX_CACHE_SIZE < length)
-                length = MAX_CACHE_SIZE;
-
-        while(length > 0){
-                __asm ("dcbf 0,%0\n\t"
-                       : : "r" (addr));
-                addr += L1_CACHE_BYTES;
-                length -= L1_CACHE_BYTES;
-        }
-        /* Also flush trailing block */
-        __asm ("dcbf 0,%0\n\t"
-               "sync \n\t"
-               : : "r" (addr));
-}
-
-void cache_clear(__u32 addr, int length)
-{
-        if (MAX_CACHE_SIZE < length)
-                length = MAX_CACHE_SIZE;
-
-        addr = mm_ptov(addr);
-
-        __asm ("dcbf 0,%0\n\t"
-               "sync \n\t"
-               "icbi 0,%0 \n\t"
-               "isync \n\t"
-               : : "r" (addr));
-
-        addr += L1_CACHE_BYTES;
-        length -= L1_CACHE_BYTES;
-
-        while(length > 0){
-                __asm ("dcbf 0,%0\n\t"
-                       "sync \n\t"
-                       "icbi 0,%0 \n\t"
-                       "isync \n\t"
-                       : : "r" (addr));
-                addr += L1_CACHE_BYTES;
-                length -= L1_CACHE_BYTES;
-        }
-
-        __asm ("dcbf 0,%0\n\t"
-               "sync \n\t"
-               "icbi 0,%0 \n\t"
-               "isync \n\t"
-               : : "r" (addr));
-}
-
-/****************************************************** from setup.c */
-void
-apus_restart(char *cmd)
-{
-        local_irq_disable();
-
-        APUS_WRITE(APUS_REG_LOCK,
-                   REGLOCK_BLACKMAGICK1|REGLOCK_BLACKMAGICK2);
-        APUS_WRITE(APUS_REG_LOCK,
-                   REGLOCK_BLACKMAGICK1|REGLOCK_BLACKMAGICK3);
-        APUS_WRITE(APUS_REG_LOCK,
-                   REGLOCK_BLACKMAGICK2|REGLOCK_BLACKMAGICK3);
-        APUS_WRITE(APUS_REG_SHADOW, REGSHADOW_SELFRESET);
-        APUS_WRITE(APUS_REG_RESET, REGRESET_AMIGARESET);
-        for(;;);
-}
-
-void
-apus_power_off(void)
-{
-        for (;;);
-}
-
-void
-apus_halt(void)
-{
-   apus_restart(NULL);
-}
-
-/****************************************************** IRQ stuff */
-
-static unsigned char last_ipl[8];
-
-int apus_get_irq(void)
-{
-        unsigned char ipl_emu, mask;
-        unsigned int level;
-
-        APUS_READ(APUS_IPL_EMU, ipl_emu);
-        level = (ipl_emu >> 3) & IPLEMU_IPLMASK;
-        mask = IPLEMU_SETRESET|IPLEMU_DISABLEINT|level;
-        level ^= 7;
-
-        /* Save previous IPL value */
-        if (last_ipl[level])
-                return -2;
-        last_ipl[level] = ipl_emu;
-
-        /* Set to current IPL value */
-        APUS_WRITE(APUS_IPL_EMU, mask);
-        APUS_WRITE(APUS_IPL_EMU, IPLEMU_DISABLEINT|level);
-
-
-#ifdef __INTERRUPT_DEBUG
-        printk("<%d:%d>", level, ~ipl_emu & IPLEMU_IPLMASK);
-#endif
-        return level + IRQ_AMIGA_AUTO;
-}
-
-void apus_end_irq(unsigned int irq)
-{
-        unsigned char ipl_emu;
-        unsigned int level = irq - IRQ_AMIGA_AUTO;
-#ifdef __INTERRUPT_DEBUG
-        printk("{%d}", ~last_ipl[level] & IPLEMU_IPLMASK);
-#endif
-        /* Restore IPL to the previous value */
-        ipl_emu = last_ipl[level] & IPLEMU_IPLMASK;
-        APUS_WRITE(APUS_IPL_EMU, IPLEMU_SETRESET|IPLEMU_DISABLEINT|ipl_emu);
-        last_ipl[level] = 0;
-        ipl_emu ^= 7;
-        APUS_WRITE(APUS_IPL_EMU, IPLEMU_DISABLEINT|ipl_emu);
-}
-
-/****************************************************** debugging */
-
-/* some serial hardware definitions */
-#define SDR_OVRUN   (1<<15)
-#define SDR_RBF     (1<<14)
-#define SDR_TBE     (1<<13)
-#define SDR_TSRE    (1<<12)
-
-#define AC_SETCLR   (1<<15)
-#define AC_UARTBRK  (1<<11)
-
-#define SER_DTR     (1<<7)
-#define SER_RTS     (1<<6)
-#define SER_DCD     (1<<5)
-#define SER_CTS     (1<<4)
-#define SER_DSR     (1<<3)
-
-static __inline__ void ser_RTSon(void)
-{
-    ciab.pra &= ~SER_RTS; /* active low */
-}
-
-int __debug_ser_out( unsigned char c )
-{
-        amiga_custom.serdat = c | 0x100;
-        mb();
-        while (!(amiga_custom.serdatr & 0x2000))
-                barrier();
-        return 1;
-}
-
-unsigned char __debug_ser_in( void )
-{
-        unsigned char c;
-
-        /* XXX: is that ok?? derived from amiga_ser.c... */
-        while( !(amiga_custom.intreqr & IF_RBF) )
-                barrier();
-        c = amiga_custom.serdatr;
-        /* clear the interrupt, so that another character can be read */
-        amiga_custom.intreq = IF_RBF;
-        return c;
-}
-
-int __debug_serinit( void )
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-
-        /* turn off Rx and Tx interrupts */
-        amiga_custom.intena = IF_RBF | IF_TBE;
-
-        /* clear any pending interrupt */
-        amiga_custom.intreq = IF_RBF | IF_TBE;
-
-        local_irq_restore(flags);
-
-        /*
-         * set the appropriate directions for the modem control flags,
-         * and clear RTS and DTR
-         */
-        ciab.ddra |= (SER_DTR | SER_RTS);   /* outputs */
-        ciab.ddra &= ~(SER_DCD | SER_CTS | SER_DSR);  /* inputs */
-
-#ifdef CONFIG_KGDB
-        /* turn Rx interrupts on for GDB */
-        amiga_custom.intena = IF_SETCLR | IF_RBF;
-        ser_RTSon();
-#endif
-
-        return 0;
-}
-
-void __debug_print_hex(unsigned long x)
-{
-        int i;
-        char hexchars[] = "0123456789ABCDEF";
-
-        for (i = 0; i < 8; i++) {
-                __debug_ser_out(hexchars[(x >> 28) & 15]);
-                x <<= 4;
-        }
-        __debug_ser_out('\n');
-        __debug_ser_out('\r');
-}
-
-void __debug_print_string(char* s)
-{
-        unsigned char c;
-        while((c = *s++))
-                __debug_ser_out(c);
-        __debug_ser_out('\n');
-        __debug_ser_out('\r');
-}
-
-static void apus_progress(char *s, unsigned short value)
-{
-        __debug_print_string(s);
-}
-
-/****************************************************** init */
-
-/* The number of spurious interrupts */
-volatile unsigned int num_spurious;
-
-extern struct irqaction amiga_sys_irqaction[AUTO_IRQS];
-
-
-extern void amiga_enable_irq(unsigned int irq);
-extern void amiga_disable_irq(unsigned int irq);
-
-struct hw_interrupt_type amiga_sys_irqctrl = {
-        .typename = "Amiga IPL",
-        .end = apus_end_irq,
-};
-
-struct hw_interrupt_type amiga_irqctrl = {
-        .typename = "Amiga    ",
-        .enable = amiga_enable_irq,
-        .disable = amiga_disable_irq,
-};
-
-#define HARDWARE_MAPPED_SIZE (512*1024)
-unsigned long __init apus_find_end_of_memory(void)
-{
-        int shadow = 0;
-        unsigned long total;
-
-        /* The memory size reported by ADOS excludes the 512KB
-           reserved for PPC exception registers and possibly 512KB
-           containing a shadow of the ADOS ROM. */
-        {
-                unsigned long size = memory[0].size;
-
-                /* If 2MB aligned, size was probably user
-                   specified. We can't tell anything about shadowing
-                   in this case so skip shadow assignment. */
-                if (0 != (size & 0x1fffff)){
-                        /* Align to 512KB to ensure correct handling
-                           of both memfile and system specified
-                           sizes. */
-                        size = ((size+0x0007ffff) & 0xfff80000);
-                        /* If memory is 1MB aligned, assume
-                           shadowing. */
-                        shadow = !(size & 0x80000);
-                }
-
-                /* Add the chunk that ADOS does not see. by aligning
-                   the size to the nearest 2MB limit upwards.  */
-                memory[0].size = ((size+0x001fffff) & 0xffe00000);
-        }
-
-        ppc_memstart = memory[0].addr;
-        ppc_memoffset = PAGE_OFFSET - PPC_MEMSTART;
-        total = memory[0].size;
-
-        /* Remove the memory chunks that are controlled by special
-           Phase5 hardware. */
-
-        /* Remove the upper 512KB if it contains a shadow of
-           the ADOS ROM. FIXME: It might be possible to
-           disable this shadow HW. Check the booter
-           (ppc_boot.c) */
-        if (shadow)
-                total -= HARDWARE_MAPPED_SIZE;
-
-        /* Remove the upper 512KB where the PPC exception
-           vectors are mapped. */
-        total -= HARDWARE_MAPPED_SIZE;
-
-        /* Linux/APUS only handles one block of memory -- the one on
-           the PowerUP board. Other system memory is horrible slow in
-           comparison. The user can use other memory for swapping
-           using the z2ram device. */
-        return total;
-}
-
-static void __init
-apus_map_io(void)
-{
-        /* Map PPC exception vectors. */
-        io_block_mapping(0xfff00000, 0xfff00000, 0x00020000, _PAGE_KERNEL);
-        /* Map chip and ZorroII memory */
-        io_block_mapping(zTwoBase,   0x00000000, 0x01000000, _PAGE_IO);
-}
-
-__init
-void apus_init_IRQ(void)
-{
-        struct irqaction *action;
-        int i;
-
-#ifdef CONFIG_PCI
-        apus_setup_pci_ptrs();
-#endif
-
-        for ( i = 0 ; i < AMI_IRQS; i++ ) {
-                irq_desc[i].status = IRQ_LEVEL;
-                if (i < IRQ_AMIGA_AUTO) {
-                        irq_desc[i].chip = &amiga_irqctrl;
-                } else {
-                        irq_desc[i].chip = &amiga_sys_irqctrl;
-                        action = &amiga_sys_irqaction[i-IRQ_AMIGA_AUTO];
-                        if (action->name)
-                                setup_irq(i, action);
-                }
-        }
-
-        amiga_init_IRQ();
-
-}
-
-__init
-void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-                   unsigned long r6, unsigned long r7)
-{
-        extern int parse_bootinfo(const struct bi_record *);
-        extern char _end[];
-
-        /* Parse bootinfo. The bootinfo is located right after
-           the kernel bss */
-        parse_bootinfo((const struct bi_record *)&_end);
-#ifdef CONFIG_BLK_DEV_INITRD
-        /* Take care of initrd if we have one. Use data from
-           bootinfo to avoid the need to initialize PPC
-           registers when kernel is booted via a PPC reset. */
-        if ( ramdisk.addr ) {
-                initrd_start = (unsigned long) __va(ramdisk.addr);
-                initrd_end = (unsigned long)
-                        __va(ramdisk.size + ramdisk.addr);
-        }
-#endif /* CONFIG_BLK_DEV_INITRD */
-
-        ISA_DMA_THRESHOLD = 0x00ffffff;
-
-        ppc_md.setup_arch     = apus_setup_arch;
-        ppc_md.show_cpuinfo   = apus_show_cpuinfo;
-        ppc_md.init_IRQ       = apus_init_IRQ;
-        ppc_md.get_irq        = apus_get_irq;
-
-#ifdef CONFIG_HEARTBEAT
-        ppc_md.heartbeat      = apus_heartbeat;
-        ppc_md.heartbeat_count = 1;
-#endif
-#ifdef APUS_DEBUG
-        __debug_serinit();
-        ppc_md.progress       = apus_progress;
-#endif
-        ppc_md.init           = NULL;
-
-        ppc_md.restart        = apus_restart;
-        ppc_md.power_off      = apus_power_off;
-        ppc_md.halt           = apus_halt;
-
-        ppc_md.time_init      = NULL;
-        ppc_md.set_rtc_time   = apus_set_rtc_time;
-        ppc_md.get_rtc_time   = apus_get_rtc_time;
-        ppc_md.calibrate_decr = apus_calibrate_decr;
-
-        ppc_md.find_end_of_memory = apus_find_end_of_memory;
-        ppc_md.setup_io_mappings = apus_map_io;
-}
diff --git a/arch/ppc/platforms/ev64360.c b/arch/ppc/platforms/ev64360.c
index f8baf05f16ce..6765676a5c6b 100644
--- a/arch/ppc/platforms/ev64360.c
+++ b/arch/ppc/platforms/ev64360.c
@@ -23,9 +23,6 @@
 #include <linux/mtd/physmap.h>
 #include <linux/mv643xx.h>
 #include <linux/platform_device.h>
-#ifdef CONFIG_BOOTIMG
-#include <linux/bootimg.h>
-#endif
 #include <asm/page.h>
 #include <asm/time.h>
 #include <asm/smp.h>
diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c
index c289e9f1b251..52f63e6f0856 100644
--- a/arch/ppc/platforms/katana.c
+++ b/arch/ppc/platforms/katana.c
@@ -27,9 +27,6 @@
 #include <linux/mtd/physmap.h>
 #include <linux/mv643xx.h>
 #include <linux/platform_device.h>
-#ifdef CONFIG_BOOTIMG
-#include <linux/bootimg.h>
-#endif
 #include <asm/io.h>
 #include <asm/unistd.h>
 #include <asm/page.h>
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c
index 491fe9a57229..3f5be2c5ce99 100644
--- a/arch/ppc/syslib/ocp.c
+++ b/arch/ppc/syslib/ocp.c
@@ -44,11 +44,11 @@
 #include <linux/pm.h>
 #include <linux/bootmem.h>
 #include <linux/device.h>
+#include <linux/rwsem.h>
 
 #include <asm/io.h>
 #include <asm/ocp.h>
 #include <asm/errno.h>
-#include <asm/rwsem.h>
 #include <asm/semaphore.h>
 
 //#define DBG(x)        printk x
diff --git a/arch/ppc/syslib/virtex_devices.h b/arch/ppc/syslib/virtex_devices.h
index 9f38d92ae536..6ebd9b4b8f1c 100644
--- a/arch/ppc/syslib/virtex_devices.h
+++ b/arch/ppc/syslib/virtex_devices.h
@@ -12,13 +12,7 @@
 #define __ASM_VIRTEX_DEVICES_H__
 
 #include <linux/platform_device.h>
-
-/* ML300/403 reference design framebuffer driver platform data struct */
-struct xilinxfb_platform_data {
-        u32 rotate_screen;
-        u32 screen_height_mm;
-        u32 screen_width_mm;
-};
+#include <linux/xilinxfb.h>
 
 void __init virtex_early_serial_map(void);
 
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 62391fb1f61f..ac61cf43a7d9 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -547,8 +547,7 @@ static void __cpuinit appldata_online_cpu(int cpu)
         spin_unlock(&appldata_timer_lock);
 }
 
-static void
-appldata_offline_cpu(int cpu)
+static void __cpuinit appldata_offline_cpu(int cpu)
 {
         del_virt_timer(&per_cpu(appldata_timer, cpu));
         if (atomic_dec_and_test(&appldata_expire_count)) {
@@ -560,9 +559,9 @@ appldata_offline_cpu(int cpu)
         spin_unlock(&appldata_timer_lock);
 }
 
-static int __cpuinit
-appldata_cpu_notify(struct notifier_block *self,
-                    unsigned long action, void *hcpu)
+static int __cpuinit appldata_cpu_notify(struct notifier_block *self,
+                                         unsigned long action,
+                                         void *hcpu)
 {
         switch (action) {
         case CPU_ONLINE:
@@ -608,63 +607,15 @@ static int __init appldata_init(void)
         register_hotcpu_notifier(&appldata_nb);
 
         appldata_sysctl_header = register_sysctl_table(appldata_dir_table);
-#ifdef MODULE
-        appldata_dir_table[0].de->owner = THIS_MODULE;
-        appldata_table[0].de->owner = THIS_MODULE;
-        appldata_table[1].de->owner = THIS_MODULE;
-#endif
 
         P_DEBUG("Base interface initialized.\n");
         return 0;
 }
 
-/*
- * appldata_exit()
- *
- * stop timer, unregister /proc entries
- */
-static void __exit appldata_exit(void)
-{
-        struct list_head *lh;
-        struct appldata_ops *ops;
-        int rc, i;
+__initcall(appldata_init);
 
-        P_DEBUG("Unloading module ...\n");
-        /*
-         * ops list should be empty, but just in case something went wrong...
-         */
-        spin_lock(&appldata_ops_lock);
-        list_for_each(lh, &appldata_ops_list) {
-                ops = list_entry(lh, struct appldata_ops, list);
-                rc = appldata_diag(ops->record_nr, APPLDATA_STOP_REC,
-                                (unsigned long) ops->data, ops->size,
-                                ops->mod_lvl);
-                if (rc != 0) {
-                        P_ERROR("STOP DIAG 0xDC for %s failed, "
-                                "return code: %d\n", ops->name, rc);
-                }
-        }
-        spin_unlock(&appldata_ops_lock);
-
-        for_each_online_cpu(i)
-                appldata_offline_cpu(i);
-
-        appldata_timer_active = 0;
-
-        unregister_sysctl_table(appldata_sysctl_header);
-
-        destroy_workqueue(appldata_wq);
-        P_DEBUG("... module unloaded!\n");
-}
 /**************************** init / exit <END> ******************************/
 
-
-module_init(appldata_init);
-module_exit(appldata_exit);
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Gerald Schaefer");
-MODULE_DESCRIPTION("Linux-VM Monitor Stream, base infrastructure");
-
 EXPORT_SYMBOL_GPL(appldata_register_ops);
 EXPORT_SYMBOL_GPL(appldata_unregister_ops);
 EXPORT_SYMBOL_GPL(appldata_diag);
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c
index 2180ac105b05..6c1815a47714 100644
--- a/arch/s390/appldata/appldata_net_sum.c
+++ b/arch/s390/appldata/appldata_net_sum.c
@@ -16,6 +16,7 @@
 #include <linux/errno.h>
 #include <linux/kernel_stat.h>
 #include <linux/netdevice.h>
+#include <net/net_namespace.h>
 
 #include "appldata.h"
 
@@ -107,7 +108,7 @@ static void appldata_get_net_sum_data(void *data)
         tx_dropped = 0;
         collisions = 0;
         read_lock(&dev_base_lock);
-        for_each_netdev(dev) {
+        for_each_netdev(&init_net, dev) {
                 stats = dev->get_stats(dev);
                 rx_packets += stats->rx_packets;
                 tx_packets += stats->tx_packets;
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index 3660ca6a3306..512669691ad0 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -7,7 +7,7 @@
  *   Copyright IBM Corp. 2005,2007
  *   Author(s): Jan Glauber (jang@de.ibm.com)
  *
- * Derived from "crypto/aes.c"
+ * Derived from "crypto/aes_generic.c"
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
index af4460ec381f..5a834f6578ab 100644
--- a/arch/s390/crypto/sha1_s390.c
+++ b/arch/s390/crypto/sha1_s390.c
@@ -12,7 +12,7 @@
  *   Author(s): Thomas Spatzier
  *              Jan Glauber (jan.glauber@de.ibm.com)
  *
- * Derived from "crypto/sha1.c"
+ * Derived from "crypto/sha1_generic.c"
  *   Copyright (c) Alan Smithee.
  *   Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
  *   Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
@@ -26,12 +26,10 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/crypto.h>
+#include <crypto/sha.h>
 
 #include "crypt_s390.h"
 
-#define SHA1_DIGEST_SIZE        20
-#define SHA1_BLOCK_SIZE         64
-
 struct s390_sha1_ctx {
         u64 count;              /* message length */
         u32 state[5];
@@ -42,11 +40,11 @@ static void sha1_init(struct crypto_tfm *tfm)
 {
         struct s390_sha1_ctx *sctx = crypto_tfm_ctx(tfm);
 
-        sctx->state[0] = 0x67452301;
-        sctx->state[1] = 0xEFCDAB89;
-        sctx->state[2] = 0x98BADCFE;
-        sctx->state[3] = 0x10325476;
-        sctx->state[4] = 0xC3D2E1F0;
+        sctx->state[0] = SHA1_H0;
+        sctx->state[1] = SHA1_H1;
+        sctx->state[2] = SHA1_H2;
+        sctx->state[3] = SHA1_H3;
+        sctx->state[4] = SHA1_H4;
         sctx->count = 0;
 }
 
diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index 2ced3330bce0..ccf8633c4f65 100644
--- a/arch/s390/crypto/sha256_s390.c
+++ b/arch/s390/crypto/sha256_s390.c
@@ -7,7 +7,7 @@
  *   Copyright IBM Corp. 2005,2007
  *   Author(s): Jan Glauber (jang@de.ibm.com)
  *
- * Derived from "crypto/sha256.c"
+ * Derived from "crypto/sha256_generic.c"
  * and "arch/s390/crypto/sha1_s390.c"
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -19,12 +19,10 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/crypto.h>
+#include <crypto/sha.h>
 
 #include "crypt_s390.h"
 
-#define SHA256_DIGEST_SIZE      32
-#define SHA256_BLOCK_SIZE       64
-
 struct s390_sha256_ctx {
         u64 count;              /* message length */
         u32 state[8];
@@ -35,14 +33,14 @@ static void sha256_init(struct crypto_tfm *tfm)
 {
         struct s390_sha256_ctx *sctx = crypto_tfm_ctx(tfm);
 
-        sctx->state[0] = 0x6a09e667;
-        sctx->state[1] = 0xbb67ae85;
-        sctx->state[2] = 0x3c6ef372;
-        sctx->state[3] = 0xa54ff53a;
-        sctx->state[4] = 0x510e527f;
-        sctx->state[5] = 0x9b05688c;
-        sctx->state[6] = 0x1f83d9ab;
-        sctx->state[7] = 0x5be0cd19;
+        sctx->state[0] = SHA256_H0;
+        sctx->state[1] = SHA256_H1;
+        sctx->state[2] = SHA256_H2;
+        sctx->state[3] = SHA256_H3;
+        sctx->state[4] = SHA256_H4;
+        sctx->state[5] = SHA256_H5;
+        sctx->state[6] = SHA256_H6;
+        sctx->state[7] = SHA256_H7;
         sctx->count = 0;
 }
 
diff --git a/arch/s390/kernel/audit.c b/arch/s390/kernel/audit.c
index d1c76fe10f29..f4932c22ebe4 100644
--- a/arch/s390/kernel/audit.c
+++ b/arch/s390/kernel/audit.c
@@ -2,6 +2,7 @@
 #include <linux/types.h>
 #include <linux/audit.h>
 #include <asm/unistd.h>
+#include "audit.h"
 
 static unsigned dir_class[] = {
 #include <asm-generic/audit_dir_write.h>
@@ -40,7 +41,6 @@ int audit_classify_arch(int arch)
 int audit_classify_syscall(int abi, unsigned syscall)
 {
 #ifdef CONFIG_COMPAT
-        extern int s390_classify_syscall(unsigned);
         if (abi == AUDIT_ARCH_S390)
                 return s390_classify_syscall(syscall);
 #endif
@@ -61,11 +61,6 @@ int audit_classify_syscall(int abi, unsigned syscall)
 static int __init audit_classes_init(void)
 {
 #ifdef CONFIG_COMPAT
-        extern __u32 s390_dir_class[];
-        extern __u32 s390_write_class[];
-        extern __u32 s390_read_class[];
-        extern __u32 s390_chattr_class[];
-        extern __u32 s390_signal_class[];
         audit_register_class(AUDIT_CLASS_WRITE_32, s390_write_class);
         audit_register_class(AUDIT_CLASS_READ_32, s390_read_class);
         audit_register_class(AUDIT_CLASS_DIR_WRITE_32, s390_dir_class);
diff --git a/arch/s390/kernel/audit.h b/arch/s390/kernel/audit.h
new file mode 100644
index 000000000000..12b56f4b5a73
--- /dev/null
+++ b/arch/s390/kernel/audit.h
@@ -0,0 +1,15 @@
+#ifndef __ARCH_S390_KERNEL_AUDIT_H
+#define __ARCH_S390_KERNEL_AUDIT_H
+
+#include <linux/types.h>
+
+#ifdef CONFIG_COMPAT
+extern int s390_classify_syscall(unsigned);
+extern __u32 s390_dir_class[];
+extern __u32 s390_write_class[];
+extern __u32 s390_read_class[];
+extern __u32 s390_chattr_class[];
+extern __u32 s390_signal_class[];
+#endif /* CONFIG_COMPAT */
+
+#endif /* __ARCH_S390_KERNEL_AUDIT_H */
diff --git a/arch/s390/kernel/compat_audit.c b/arch/s390/kernel/compat_audit.c
index 0569f5126e49..d6487bf879e5 100644
--- a/arch/s390/kernel/compat_audit.c
+++ b/arch/s390/kernel/compat_audit.c
@@ -1,5 +1,6 @@
 #undef __s390x__
 #include <asm/unistd.h>
+#include "audit.h"
 
 unsigned s390_dir_class[] = {
 #include <asm-generic/audit_dir_write.h>
diff --git a/arch/s390/kernel/cpcmd.c b/arch/s390/kernel/cpcmd.c
index 6c89f30c8e31..d8c1131e0815 100644
--- a/arch/s390/kernel/cpcmd.c
+++ b/arch/s390/kernel/cpcmd.c
@@ -2,7 +2,7 @@
  *  arch/s390/kernel/cpcmd.c
  *
  *  S390 version
- *    Copyright (C) 1999,2005 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Copyright IBM Corp. 1999,2007
  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
  *               Christian Borntraeger (cborntra@de.ibm.com),
  */
@@ -21,6 +21,49 @@
 static DEFINE_SPINLOCK(cpcmd_lock);
 static char cpcmd_buf[241];
 
+static int diag8_noresponse(int cmdlen)
+{
+        register unsigned long reg2 asm ("2") = (addr_t) cpcmd_buf;
+        register unsigned long reg3 asm ("3") = cmdlen;
+
+        asm volatile(
+#ifndef CONFIG_64BIT
+                "       diag    %1,%0,0x8\n"
+#else /* CONFIG_64BIT */
+                "       sam31\n"
+                "       diag    %1,%0,0x8\n"
+                "       sam64\n"
+#endif /* CONFIG_64BIT */
+                : "+d" (reg3) : "d" (reg2) : "cc");
+        return reg3;
+}
+
+static int diag8_response(int cmdlen, char *response, int *rlen)
+{
+        register unsigned long reg2 asm ("2") = (addr_t) cpcmd_buf;
+        register unsigned long reg3 asm ("3") = (addr_t) response;
+        register unsigned long reg4 asm ("4") = cmdlen | 0x40000000L;
+        register unsigned long reg5 asm ("5") = *rlen;
+
+        asm volatile(
+#ifndef CONFIG_64BIT
+                "       diag    %2,%0,0x8\n"
+                "       brc     8,1f\n"
+                "       ar      %1,%4\n"
+#else /* CONFIG_64BIT */
+                "       sam31\n"
+                "       diag    %2,%0,0x8\n"
+                "       sam64\n"
+                "       brc     8,1f\n"
+                "       agr     %1,%4\n"
+#endif /* CONFIG_64BIT */
+                "1:\n"
+                : "+d" (reg4), "+d" (reg5)
+                : "d" (reg2), "d" (reg3), "d" (*rlen) : "cc");
+        *rlen = reg5;
+        return reg4;
+}
+
 /*
  * __cpcmd has some restrictions over cpcmd
  *  - the response buffer must reside below 2GB (if any)
@@ -28,59 +71,27 @@ static char cpcmd_buf[241];
  */
 int  __cpcmd(const char *cmd, char *response, int rlen, int *response_code)
 {
-        unsigned cmdlen;
-        int return_code, return_len;
+        int cmdlen;
+        int rc;
+        int response_len;
 
         cmdlen = strlen(cmd);
         BUG_ON(cmdlen > 240);
         memcpy(cpcmd_buf, cmd, cmdlen);
         ASCEBC(cpcmd_buf, cmdlen);
 
-        if (response != NULL && rlen > 0) {
-                register unsigned long reg2 asm ("2") = (addr_t) cpcmd_buf;
-                register unsigned long reg3 asm ("3") = (addr_t) response;
-                register unsigned long reg4 asm ("4") = cmdlen | 0x40000000L;
-                register unsigned long reg5 asm ("5") = rlen;
-
+        if (response) {
                 memset(response, 0, rlen);
-                asm volatile(
-#ifndef CONFIG_64BIT
-                        "       diag    %2,%0,0x8\n"
-                        "       brc     8,1f\n"
-                        "       ar      %1,%4\n"
-#else /* CONFIG_64BIT */
-                        "       sam31\n"
-                        "       diag    %2,%0,0x8\n"
-                        "       sam64\n"
-                        "       brc     8,1f\n"
-                        "       agr     %1,%4\n"
-#endif /* CONFIG_64BIT */
-                        "1:\n"
-                        : "+d" (reg4), "+d" (reg5)
-                        : "d" (reg2), "d" (reg3), "d" (rlen) : "cc");
-                return_code = (int) reg4;
-                return_len = (int) reg5;
-                EBCASC(response, rlen);
+                response_len = rlen;
+                rc = diag8_response(cmdlen, response, &rlen);
+                EBCASC(response, response_len);
         } else {
-                register unsigned long reg2 asm ("2") = (addr_t) cpcmd_buf;
-                register unsigned long reg3 asm ("3") = cmdlen;
-                return_len = 0;
-                asm volatile(
-#ifndef CONFIG_64BIT
-                        "       diag    %1,%0,0x8\n"
-#else /* CONFIG_64BIT */
-                        "       sam31\n"
-                        "       diag    %1,%0,0x8\n"
-                        "       sam64\n"
-#endif /* CONFIG_64BIT */
-                        : "+d" (reg3) : "d" (reg2) : "cc");
-                return_code = (int) reg3;
+                rc = diag8_noresponse(cmdlen);
         }
-        if (response_code != NULL)
-                *response_code = return_code;
-        return return_len;
+        if (response_code)
+                *response_code = rc;
+        return rlen;
 }
-
 EXPORT_SYMBOL(__cpcmd);
 
 int cpcmd(const char *cmd, char *response, int rlen, int *response_code)
@@ -109,5 +120,4 @@ int cpcmd(const char *cmd, char *response, int rlen, int *response_code)
         }
         return len;
 }
-
 EXPORT_SYMBOL(cpcmd);
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index 50d2235df732..c14a336f6300 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -1162,6 +1162,7 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)
         unsigned int value;
         char separator;
         char *ptr;
+        int i;
 
         ptr = buffer;
         insn = find_insn(code);
@@ -1169,7 +1170,8 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)
                 ptr += sprintf(ptr, "%.5s\t", insn->name);
                 /* Extract the operands. */
                 separator = 0;
-                for (ops = formats[insn->format] + 1; *ops != 0; ops++) {
+                for (ops = formats[insn->format] + 1, i = 0;
+                     *ops != 0 && i < 6; ops++, i++) {
                         operand = operands + *ops;
                         value = extract_operand(code, operand);
                         if ((operand->flags & OPERAND_INDEX)  && value == 0)
@@ -1241,7 +1243,6 @@ void show_code(struct pt_regs *regs)
         }
         /* Find a starting point for the disassembly. */
         while (start < 32) {
-                hops = 0;
                 for (i = 0, hops = 0; start + i < 32 && hops < 3; hops++) {
                         if (!find_insn(code + start + i))
                                 break;
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 8b8f136d9cc7..66b51901c87d 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -735,10 +735,10 @@ void do_reipl(void)
         case REIPL_METHOD_CCW_VM:
                 reipl_get_ascii_loadparm(loadparm);
                 if (strlen(loadparm) == 0)
-                        sprintf(buf, "IPL %X",
+                        sprintf(buf, "IPL %X CLEAR",
                                 reipl_block_ccw->ipl_info.ccw.devno);
                 else
-                        sprintf(buf, "IPL %X LOADPARM '%s'",
+                        sprintf(buf, "IPL %X CLEAR LOADPARM '%s'",
                                 reipl_block_ccw->ipl_info.ccw.devno, loadparm);
                 __cpcmd(buf, NULL, 0, NULL);
                 break;
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 8f0cbca31203..c36d8123ca14 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -95,7 +95,6 @@ asmlinkage void do_softirq(void)
 
         local_irq_restore(flags);
 }
-EXPORT_SYMBOL(do_softirq);
 
 void init_irq_proc(void)
 {
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index b4622a3889b0..849120e3e28a 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -2,6 +2,7 @@
  * Written by Martin Schwidefsky (schwidefsky@de.ibm.com)
  */
 
+#include <asm/page.h>
 #include <asm-generic/vmlinux.lds.h>
 
 #ifndef CONFIG_64BIT
@@ -18,121 +19,142 @@ jiffies = jiffies_64;
 
 SECTIONS
 {
-  . = 0x00000000;
-  _text = .;                    /* Text and read-only data */
-  .text : {
-        *(.text.head)
+        . = 0x00000000;
+        .text : {
+        _text = .;              /* Text and read-only data */
+                *(.text.head)
         TEXT_TEXT
-        SCHED_TEXT
-        LOCK_TEXT
-        KPROBES_TEXT
-        *(.fixup)
-        *(.gnu.warning)
+                SCHED_TEXT
+                LOCK_TEXT
+                KPROBES_TEXT
+                *(.fixup)
+                *(.gnu.warning)
         } = 0x0700
 
-  _etext = .;                   /* End of text section */
+        _etext = .;             /* End of text section */
 
-  RODATA
+        RODATA
 
 #ifdef CONFIG_SHARED_KERNEL
-  . = ALIGN(1048576);           /* VM shared segments are 1MB aligned */
+        . = ALIGN(0x100000);    /* VM shared segments are 1MB aligned */
 #endif
 
-  . = ALIGN(4096);
-  _eshared = .;                 /* End of shareable data */
-
-  . = ALIGN(16);                /* Exception table */
-  __start___ex_table = .;
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
-
-  NOTES
-
-  BUG_TABLE
-
-  .data : {                     /* Data */
-        DATA_DATA
-        CONSTRUCTORS
-        }
-
-  . = ALIGN(4096);
-  __nosave_begin = .;
-  .data_nosave : { *(.data.nosave) }
-  . = ALIGN(4096);
-  __nosave_end = .;
-
-  . = ALIGN(4096);
-  .data.page_aligned : { *(.data.idt) }
-
-  . = ALIGN(256);
-  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
-
-  . = ALIGN(256);
-  .data.read_mostly : { *(.data.read_mostly) }
-  _edata = .;                   /* End of data section */
-
-  . = ALIGN(8192);              /* init_task */
-  .data.init_task : { *(.data.init_task) }
-
-  /* will be freed after init */
-  . = ALIGN(4096);              /* Init code and data */
-  __init_begin = .;
-  .init.text : { 
-        _sinittext = .;
-        *(.init.text)
-        _einittext = .;
-  }
-  /*
-   * .exit.text is discarded at runtime, not link time,
-   * to deal with references from __bug_table
-   */
-  .exit.text :   { *(.exit.text) }
-
-  .init.data : { *(.init.data) }
-  . = ALIGN(256);
-  __setup_start = .;
-  .init.setup : { *(.init.setup) }
-  __setup_end = .;
-  __initcall_start = .;
-  .initcall.init : {
-        INITCALLS
-  }
-  __initcall_end = .;
-  __con_initcall_start = .;
-  .con_initcall.init : { *(.con_initcall.init) }
-  __con_initcall_end = .;
-  SECURITY_INIT
+        . = ALIGN(PAGE_SIZE);
+        _eshared = .;           /* End of shareable data */
+
+        . = ALIGN(16);          /* Exception table */
+        __ex_table : {
+                __start___ex_table = .;
+                *(__ex_table)
+                __stop___ex_table = .;
+        }
+
+        NOTES
+        BUG_TABLE
+
+        .data : {               /* Data */
+                DATA_DATA
+                CONSTRUCTORS
+        }
+
+        . = ALIGN(PAGE_SIZE);
+        .data_nosave : {
+        __nosave_begin = .;
+                *(.data.nosave)
+        }
+        . = ALIGN(PAGE_SIZE);
+        __nosave_end = .;
+
+        . = ALIGN(PAGE_SIZE);
+        .data.page_aligned : {
+                *(.data.idt)
+        }
+
+        . = ALIGN(0x100);
+        .data.cacheline_aligned : {
+                *(.data.cacheline_aligned)
+        }
+
+        . = ALIGN(0x100);
+        .data.read_mostly : {
+                *(.data.read_mostly)
+        }
+        _edata = .;             /* End of data section */
+
+        . = ALIGN(2 * PAGE_SIZE);       /* init_task */
+        .data.init_task : {
+                *(.data.init_task)
+        }
+
+        /* will be freed after init */
+        . = ALIGN(PAGE_SIZE);   /* Init code and data */
+        __init_begin = .;
+        .init.text : {
+                _sinittext = .;
+                *(.init.text)
+                _einittext = .;
+        }
+        /*
+         * .exit.text is discarded at runtime, not link time,
+         * to deal with references from __bug_table
+        */
+        .exit.text : {
+                *(.exit.text)
+        }
+
+        .init.data : {
+                *(.init.data)
+        }
+        . = ALIGN(0x100);
+        .init.setup : {
+                __setup_start = .;
+                *(.init.setup)
+                __setup_end = .;
+        }
+        .initcall.init : {
+                __initcall_start = .;
+                INITCALLS
+                __initcall_end = .;
+        }
+
+        .con_initcall.init : {
+                __con_initcall_start = .;
+                *(.con_initcall.init)
+                __con_initcall_end = .;
+        }
+        SECURITY_INIT
 
 #ifdef CONFIG_BLK_DEV_INITRD
-  . = ALIGN(256);
-  __initramfs_start = .;
-  .init.ramfs : { *(.init.initramfs) }
-  . = ALIGN(2);
-  __initramfs_end = .;
+        . = ALIGN(0x100);
+        .init.ramfs : {
+                __initramfs_start = .;
+                *(.init.ramfs)
+                . = ALIGN(2);
+                __initramfs_end = .;
+        }
 #endif
-  PERCPU(4096)
-  . = ALIGN(4096);
-  __init_end = .;
-  /* freed after init ends here */
-
-  __bss_start = .;              /* BSS */
-  .bss : { *(.bss) }
-  . = ALIGN(2);
-  __bss_stop = .;
-
-  _end = . ;
-
-  /* Sections to be discarded */
-  /DISCARD/ : {
-        *(.exit.data) *(.exitcall.exit)
-        }
-
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
+
+        PERCPU(PAGE_SIZE)
+        . = ALIGN(PAGE_SIZE);
+        __init_end = .;         /* freed after init ends here */
+
+        /* BSS */
+        .bss : {
+                __bss_start = .;
+                *(.bss)
+                . = ALIGN(2);
+                __bss_stop = .;
+        }
+
+        _end = . ;
+
+        /* Sections to be discarded */
+        /DISCARD/ : {
+                *(.exit.data)
+                *(.exitcall.exit)
+        }
+
+        /* Debugging sections.  */
+        STABS_DEBUG
+        DWARF_DEBUG
 }
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 54055194e9af..4c1ac341ec80 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -468,7 +468,7 @@ typedef struct {
         __u64 refselmk;
         __u64 refcmpmk;
         __u64 reserved;
-} __attribute__ ((packed)) pfault_refbk_t;
+} __attribute__ ((packed, aligned(8))) pfault_refbk_t;
 
 int pfault_init(void)
 {
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index 03404987528d..4b49d03ffbd2 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -245,7 +245,6 @@ asmlinkage void do_softirq(void)
 
         local_irq_restore(flags);
 }
-EXPORT_SYMBOL(do_softirq);
 #endif
 
 void __init init_IRQ(void)
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c
index 2f61c4b12596..c76bfbb7da08 100644
--- a/arch/sparc64/kernel/pci_common.c
+++ b/arch/sparc64/kernel/pci_common.c
@@ -264,7 +264,7 @@ static int sun4v_read_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
         unsigned int func = PCI_FUNC(devfn);
         unsigned long ret;
 
-        if (bus_dev == pbm->pci_bus && devfn == 0x00)
+        if (!bus && devfn == 0x00)
                 return pci_host_bridge_read_pci_cfg(bus_dev, devfn, where,
                                                     size, value);
         if (config_out_of_range(pbm, bus, devfn, where)) {
@@ -300,7 +300,7 @@ static int sun4v_write_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
         unsigned int func = PCI_FUNC(devfn);
         unsigned long ret;
 
-        if (bus_dev == pbm->pci_bus && devfn == 0x00)
+        if (!bus && devfn == 0x00)
                 return pci_host_bridge_write_pci_cfg(bus_dev, devfn, where,
                                                      size, value);
         if (config_out_of_range(pbm, bus, devfn, where)) {
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index 0614dff63d7c..a246e962e5a7 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -1046,7 +1046,8 @@ static void __init irq_trans_init(struct device_node *dp)
         if (!strcmp(dp->name, "fhc") &&
             !strcmp(dp->parent->name, "central"))
                 return central_irq_trans_init(dp);
-        if (!strcmp(dp->name, "virtual-devices"))
+        if (!strcmp(dp->name, "virtual-devices") ||
+            !strcmp(dp->name, "niu"))
                 return sun4v_vdev_irq_trans_init(dp);
 }
 
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index b84c49e3697c..c73b7a48b036 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -353,6 +353,8 @@ static int __devinit smp_boot_one_cpu(unsigned int cpu)
         int timeout, ret;
 
         p = fork_idle(cpu);
+        if (IS_ERR(p))
+                return PTR_ERR(p);
         callin_flag = 0;
         cpu_new_thread = task_thread_info(p);
 
diff --git a/arch/sparc64/kernel/vio.c b/arch/sparc64/kernel/vio.c
index 1550ac5673da..0c1ee619d814 100644
--- a/arch/sparc64/kernel/vio.c
+++ b/arch/sparc64/kernel/vio.c
@@ -292,7 +292,7 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
         }
         vdev->dp = dp;
 
-        printk(KERN_ERR "VIO: Adding device %s\n", vdev->dev.bus_id);
+        printk(KERN_INFO "VIO: Adding device %s\n", vdev->dev.bus_id);
 
         err = device_register(&vdev->dev);
         if (err) {
@@ -342,8 +342,33 @@ static struct mdesc_notifier_client vio_device_notifier = {
         .node_name      = "virtual-device-port",
 };
 
+/* We are only interested in domain service ports under the
+ * "domain-services" node.  On control nodes there is another port
+ * under "openboot" that we should not mess with as aparently that is
+ * reserved exclusively for OBP use.
+ */
+static void vio_add_ds(struct mdesc_handle *hp, u64 node)
+{
+        int found;
+        u64 a;
+
+        found = 0;
+        mdesc_for_each_arc(a, hp, node, MDESC_ARC_TYPE_BACK) {
+                u64 target = mdesc_arc_target(hp, a);
+                const char *name = mdesc_node_name(hp, target);
+
+                if (!strcmp(name, "domain-services")) {
+                        found = 1;
+                        break;
+                }
+        }
+
+        if (found)
+                (void) vio_create_one(hp, node, &root_vdev->dev);
+}
+
 static struct mdesc_notifier_client vio_ds_notifier = {
-        .add            = vio_add,
+        .add            = vio_add_ds,
         .remove         = vio_remove,
         .node_name      = "domain-services-port",
 };
diff --git a/arch/sparc64/lib/NGmemcpy.S b/arch/sparc64/lib/NGmemcpy.S
index 605cb3f09900..96a14caf6966 100644
--- a/arch/sparc64/lib/NGmemcpy.S
+++ b/arch/sparc64/lib/NGmemcpy.S
@@ -321,11 +321,11 @@ FUNC_NAME:	/* %i0=dst, %i1=src, %i2=len */
         andn            %i2, 0xf, %i4
         and             %i2, 0xf, %i2
 1:      subcc           %i4, 0x10, %i4
-        EX_LD(LOAD(ldx, %i1, %i5))
+        EX_LD(LOAD(ldx, %i1, %o4))
         add             %i1, 0x08, %i1
         EX_LD(LOAD(ldx, %i1, %g1))
         sub             %i1, 0x08, %i1
-        EX_ST(STORE(stx, %i5, %i1 + %i3))
+        EX_ST(STORE(stx, %o4, %i1 + %i3))
         add             %i1, 0x8, %i1
         EX_ST(STORE(stx, %g1, %i1 + %i3))
         bgu,pt          %XCC, 1b
@@ -334,8 +334,8 @@ FUNC_NAME:	/* %i0=dst, %i1=src, %i2=len */
         be,pt           %XCC, 1f
          nop
         sub             %i2, 0x8, %i2
-        EX_LD(LOAD(ldx, %i1, %i5))
-        EX_ST(STORE(stx, %i5, %i1 + %i3))
+        EX_LD(LOAD(ldx, %i1, %o4))
+        EX_ST(STORE(stx, %o4, %i1 + %i3))
         add             %i1, 0x8, %i1
 1:      andcc           %i2, 0x4, %g0
         be,pt           %XCC, 1f
diff --git a/arch/sparc64/solaris/ioctl.c b/arch/sparc64/solaris/ioctl.c
index 18352a498628..8ad10a6d993b 100644
--- a/arch/sparc64/solaris/ioctl.c
+++ b/arch/sparc64/solaris/ioctl.c
@@ -28,6 +28,7 @@
 #include <linux/compat.h>
 
 #include <net/sock.h>
+#include <net/net_namespace.h>
 
 #include <asm/uaccess.h>
 #include <asm/termios.h>
@@ -686,7 +687,7 @@ static inline int solaris_i(unsigned int fd, unsigned int cmd, u32 arg)
                         int i = 0;
                         
                         read_lock_bh(&dev_base_lock);
-                        for_each_netdev(d)
+                        for_each_netdev(&init_net, d)
                                 i++;
                         read_unlock_bh(&dev_base_lock);
 
diff --git a/arch/um/sys-i386/sys_call_table.S b/arch/um/sys-i386/sys_call_table.S
index 2497554b7b95..12d4148dba39 100644
--- a/arch/um/sys-i386/sys_call_table.S
+++ b/arch/um/sys-i386/sys_call_table.S
@@ -9,4 +9,4 @@
 
 #define old_mmap old_mmap_i386
 
-#include "../../i386/kernel/syscall_table.S"
+#include "../../x86/kernel/syscall_table_32.S"
diff --git a/arch/um/sys-x86_64/syscall_table.c b/arch/um/sys-x86_64/syscall_table.c
index 5133988d3610..71b2ae4ad5de 100644
--- a/arch/um/sys-x86_64/syscall_table.c
+++ b/arch/um/sys-x86_64/syscall_table.c
@@ -36,7 +36,7 @@
 
 #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
 #undef _ASM_X86_64_UNISTD_H_
-#include <asm-x86_64/unistd.h>
+#include <asm-x86/unistd_64.h>
 
 #undef __SYSCALL
 #define __SYSCALL(nr, sym) [ nr ] = sym,
@@ -49,5 +49,5 @@ extern void sys_ni_syscall(void);
 sys_call_ptr_t sys_call_table[UM_NR_syscall_max+1] __cacheline_aligned = {
         /* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */
         [0 ... UM_NR_syscall_max] = &sys_ni_syscall,
-#include <asm-x86_64/unistd.h>
+#include <asm-x86/unistd_64.h>
 };
diff --git a/arch/i386/boot/.gitignore b/arch/x86/boot/.gitignore
index 18465143cfa2..18465143cfa2 100644
--- a/arch/i386/boot/.gitignore
+++ b/arch/x86/boot/.gitignore
diff --git a/arch/i386/boot/Makefile b/arch/x86/boot/Makefile
index 93386a4e40b4..cb1035f2b7e9 100644
--- a/arch/i386/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -1,5 +1,5 @@
 #
-# arch/i386/boot/Makefile
+# arch/x86/boot/Makefile
 #
 # This file is subject to the terms and conditions of the GNU General Public
 # License.  See the file "COPYING" in the main directory of this archive
diff --git a/arch/i386/boot/a20.c b/arch/x86/boot/a20.c
index 31348d054fca..31348d054fca 100644
--- a/arch/i386/boot/a20.c
+++ b/arch/x86/boot/a20.c
diff --git a/arch/i386/boot/apm.c b/arch/x86/boot/apm.c
index eab50c55a3a5..eab50c55a3a5 100644
--- a/arch/i386/boot/apm.c
+++ b/arch/x86/boot/apm.c
diff --git a/arch/i386/boot/bitops.h b/arch/x86/boot/bitops.h
index 8dcc8dc7db88..8dcc8dc7db88 100644
--- a/arch/i386/boot/bitops.h
+++ b/arch/x86/boot/bitops.h
diff --git a/arch/i386/boot/boot.h b/arch/x86/boot/boot.h
index 20bab9431acb..20bab9431acb 100644
--- a/arch/i386/boot/boot.h
+++ b/arch/x86/boot/boot.h
diff --git a/arch/i386/boot/cmdline.c b/arch/x86/boot/cmdline.c
index 34bb778c4357..34bb778c4357 100644
--- a/arch/i386/boot/cmdline.c
+++ b/arch/x86/boot/cmdline.c
diff --git a/arch/i386/boot/code16gcc.h b/arch/x86/boot/code16gcc.h
index d93e48010b61..d93e48010b61 100644
--- a/arch/i386/boot/code16gcc.h
+++ b/arch/x86/boot/code16gcc.h
diff --git a/arch/i386/boot/compressed/.gitignore b/arch/x86/boot/compressed/.gitignore
index be0ed065249b..be0ed065249b 100644
--- a/arch/i386/boot/compressed/.gitignore
+++ b/arch/x86/boot/compressed/.gitignore
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
new file mode 100644
index 000000000000..52c1db854520
--- /dev/null
+++ b/arch/x86/boot/compressed/Makefile
@@ -0,0 +1,5 @@
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/x86/boot/compressed/Makefile_32
+else
+include ${srctree}/arch/x86/boot/compressed/Makefile_64
+endif
diff --git a/arch/i386/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile_32
index 189fa1dbefcc..22613c652d22 100644
--- a/arch/i386/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile_32
@@ -1,10 +1,10 @@
 #
-# linux/arch/i386/boot/compressed/Makefile
+# linux/arch/x86/boot/compressed/Makefile
 #
 # create a compressed vmlinux image from the original vmlinux
 #
 
-targets         := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o \
+targets         := vmlinux vmlinux.bin vmlinux.bin.gz head_32.o misc_32.o piggy.o \
                         vmlinux.bin.all vmlinux.relocs
 EXTRA_AFLAGS    := -traditional
 
@@ -17,7 +17,7 @@ CFLAGS  := -m32 -D__KERNEL__ $(LINUX_INCLUDE) -O2 \
            $(call cc-option,-fno-stack-protector)
 LDFLAGS := -m elf_i386
 
-$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
+$(obj)/vmlinux: $(src)/vmlinux_32.lds $(obj)/head_32.o $(obj)/misc_32.o $(obj)/piggy.o FORCE
         $(call if_changed,ld)
         @:
 
@@ -46,5 +46,5 @@ endif
 
 LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T
 
-$(obj)/piggy.o: $(src)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
+$(obj)/piggy.o: $(src)/vmlinux_32.scr $(obj)/vmlinux.bin.gz FORCE
         $(call if_changed,ld)
diff --git a/arch/x86_64/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile_64
index 877c0bdbbc67..dc6b3380cc45 100644
--- a/arch/x86_64/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile_64
@@ -1,10 +1,10 @@
 #
-# linux/arch/x86_64/boot/compressed/Makefile
+# linux/arch/x86/boot/compressed/Makefile
 #
 # create a compressed vmlinux image from the original vmlinux
 #
 
-targets         := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
+targets         := vmlinux vmlinux.bin vmlinux.bin.gz head_64.o misc_64.o piggy.o
 
 CFLAGS := -m64 -D__KERNEL__ $(LINUXINCLUDE) -O2  \
           -fno-strict-aliasing -fPIC -mcmodel=small \
@@ -14,7 +14,7 @@ AFLAGS  := $(CFLAGS) -D__ASSEMBLY__
 LDFLAGS := -m elf_x86_64
 
 LDFLAGS_vmlinux := -T
-$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
+$(obj)/vmlinux: $(src)/vmlinux_64.lds $(obj)/head_64.o $(obj)/misc_64.o $(obj)/piggy.o FORCE
         $(call if_changed,ld)
         @:
 
@@ -26,5 +26,5 @@ $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
 
 LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T
 
-$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
+$(obj)/piggy.o: $(obj)/vmlinux_64.scr $(obj)/vmlinux.bin.gz FORCE
         $(call if_changed,ld)
diff --git a/arch/i386/boot/compressed/head.S b/arch/x86/boot/compressed/head_32.S
index f35ea2237522..f35ea2237522 100644
--- a/arch/i386/boot/compressed/head.S
+++ b/arch/x86/boot/compressed/head_32.S
diff --git a/arch/x86_64/boot/compressed/head.S b/arch/x86/boot/compressed/head_64.S
index 9fd8030cc54f..49467640751f 100644
--- a/arch/x86_64/boot/compressed/head.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -174,7 +174,7 @@ no_longmode:
         hlt
         jmp     1b
 
-#include "../../kernel/verify_cpu.S"
+#include "../../kernel/verify_cpu_64.S"
 
         /* Be careful here startup_64 needs to be at a predictable
          * address so I can export it in an ELF header.  Bootloaders
diff --git a/arch/i386/boot/compressed/misc.c b/arch/x86/boot/compressed/misc_32.c
index b28505c544c9..b28505c544c9 100644
--- a/arch/i386/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc_32.c
diff --git a/arch/x86_64/boot/compressed/misc.c b/arch/x86/boot/compressed/misc_64.c
index f932b0e89096..f932b0e89096 100644
--- a/arch/x86_64/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc_64.c
diff --git a/arch/i386/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
index 2d77ee728f92..2d77ee728f92 100644
--- a/arch/i386/boot/compressed/relocs.c
+++ b/arch/x86/boot/compressed/relocs.c
diff --git a/arch/i386/boot/compressed/vmlinux.lds b/arch/x86/boot/compressed/vmlinux_32.lds
index cc4854f6c6c1..cc4854f6c6c1 100644
--- a/arch/i386/boot/compressed/vmlinux.lds
+++ b/arch/x86/boot/compressed/vmlinux_32.lds
diff --git a/arch/i386/boot/compressed/vmlinux.scr b/arch/x86/boot/compressed/vmlinux_32.scr
index 707a88f7f29e..707a88f7f29e 100644
--- a/arch/i386/boot/compressed/vmlinux.scr
+++ b/arch/x86/boot/compressed/vmlinux_32.scr
diff --git a/arch/x86_64/boot/compressed/vmlinux.lds b/arch/x86/boot/compressed/vmlinux_64.lds
index 94c13e557fb4..94c13e557fb4 100644
--- a/arch/x86_64/boot/compressed/vmlinux.lds
+++ b/arch/x86/boot/compressed/vmlinux_64.lds
diff --git a/arch/x86_64/boot/compressed/vmlinux.scr b/arch/x86/boot/compressed/vmlinux_64.scr
index bd1429ce193e..bd1429ce193e 100644
--- a/arch/x86_64/boot/compressed/vmlinux.scr
+++ b/arch/x86/boot/compressed/vmlinux_64.scr
diff --git a/arch/i386/boot/copy.S b/arch/x86/boot/copy.S
index ef127e56a3cf..ef127e56a3cf 100644
--- a/arch/i386/boot/copy.S
+++ b/arch/x86/boot/copy.S
diff --git a/arch/i386/boot/cpu.c b/arch/x86/boot/cpu.c
index 2a5c32da5852..2a5c32da5852 100644
--- a/arch/i386/boot/cpu.c
+++ b/arch/x86/boot/cpu.c
diff --git a/arch/i386/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
index e655a89c5510..e655a89c5510 100644
--- a/arch/i386/boot/cpucheck.c
+++ b/arch/x86/boot/cpucheck.c
diff --git a/arch/i386/boot/edd.c b/arch/x86/boot/edd.c
index bd138e442ec2..bd138e442ec2 100644
--- a/arch/i386/boot/edd.c
+++ b/arch/x86/boot/edd.c
diff --git a/arch/i386/boot/header.S b/arch/x86/boot/header.S
index f3140e596d40..f3140e596d40 100644
--- a/arch/i386/boot/header.S
+++ b/arch/x86/boot/header.S
diff --git a/arch/i386/boot/install.sh b/arch/x86/boot/install.sh
index 88d77761d01b..88d77761d01b 100644
--- a/arch/i386/boot/install.sh
+++ b/arch/x86/boot/install.sh
diff --git a/arch/i386/boot/main.c b/arch/x86/boot/main.c
index 0eeef3989a17..0eeef3989a17 100644
--- a/arch/i386/boot/main.c
+++ b/arch/x86/boot/main.c
diff --git a/arch/i386/boot/mca.c b/arch/x86/boot/mca.c
index 68222f2d4b67..68222f2d4b67 100644
--- a/arch/i386/boot/mca.c
+++ b/arch/x86/boot/mca.c
diff --git a/arch/i386/boot/memory.c b/arch/x86/boot/memory.c
index 378353956b5d..378353956b5d 100644
--- a/arch/i386/boot/memory.c
+++ b/arch/x86/boot/memory.c
diff --git a/arch/i386/boot/mtools.conf.in b/arch/x86/boot/mtools.conf.in
index efd6d2490c1d..efd6d2490c1d 100644
--- a/arch/i386/boot/mtools.conf.in
+++ b/arch/x86/boot/mtools.conf.in
diff --git a/arch/i386/boot/pm.c b/arch/x86/boot/pm.c
index 09fb342cc62e..09fb342cc62e 100644
--- a/arch/i386/boot/pm.c
+++ b/arch/x86/boot/pm.c
diff --git a/arch/i386/boot/pmjump.S b/arch/x86/boot/pmjump.S
index 2e559233725a..2e559233725a 100644
--- a/arch/i386/boot/pmjump.S
+++ b/arch/x86/boot/pmjump.S
diff --git a/arch/i386/boot/printf.c b/arch/x86/boot/printf.c
index 1a09f9309d3c..1a09f9309d3c 100644
--- a/arch/i386/boot/printf.c
+++ b/arch/x86/boot/printf.c
diff --git a/arch/i386/boot/setup.ld b/arch/x86/boot/setup.ld
index df9234b3a5e0..df9234b3a5e0 100644
--- a/arch/i386/boot/setup.ld
+++ b/arch/x86/boot/setup.ld
diff --git a/arch/i386/boot/string.c b/arch/x86/boot/string.c
index 481a22097781..481a22097781 100644
--- a/arch/i386/boot/string.c
+++ b/arch/x86/boot/string.c
diff --git a/arch/i386/boot/tools/.gitignore b/arch/x86/boot/tools/.gitignore
index 378eac25d311..378eac25d311 100644
--- a/arch/i386/boot/tools/.gitignore
+++ b/arch/x86/boot/tools/.gitignore
diff --git a/arch/i386/boot/tools/build.c b/arch/x86/boot/tools/build.c
index b4248740ff0d..b4248740ff0d 100644
--- a/arch/i386/boot/tools/build.c
+++ b/arch/x86/boot/tools/build.c
diff --git a/arch/i386/boot/tty.c b/arch/x86/boot/tty.c
index f3f14bd26371..f3f14bd26371 100644
--- a/arch/i386/boot/tty.c
+++ b/arch/x86/boot/tty.c
diff --git a/arch/i386/boot/version.c b/arch/x86/boot/version.c
index c61462f7d9a7..c61462f7d9a7 100644
--- a/arch/i386/boot/version.c
+++ b/arch/x86/boot/version.c
diff --git a/arch/i386/boot/vesa.h b/arch/x86/boot/vesa.h
index ff5b73cd406f..ff5b73cd406f 100644
--- a/arch/i386/boot/vesa.h
+++ b/arch/x86/boot/vesa.h
diff --git a/arch/i386/boot/video-bios.c b/arch/x86/boot/video-bios.c
index 68e65d95cdfd..68e65d95cdfd 100644
--- a/arch/i386/boot/video-bios.c
+++ b/arch/x86/boot/video-bios.c
diff --git a/arch/i386/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
index 192190710710..192190710710 100644
--- a/arch/i386/boot/video-vesa.c
+++ b/arch/x86/boot/video-vesa.c
diff --git a/arch/i386/boot/video-vga.c b/arch/x86/boot/video-vga.c
index aef02f9ec0c1..aef02f9ec0c1 100644
--- a/arch/i386/boot/video-vga.c
+++ b/arch/x86/boot/video-vga.c
diff --git a/arch/i386/boot/video.c b/arch/x86/boot/video.c
index e4ba897bf9a3..e4ba897bf9a3 100644
--- a/arch/i386/boot/video.c
+++ b/arch/x86/boot/video.c
diff --git a/arch/i386/boot/video.h b/arch/x86/boot/video.h
index b92447d51213..b92447d51213 100644
--- a/arch/i386/boot/video.h
+++ b/arch/x86/boot/video.h
diff --git a/arch/i386/boot/voyager.c b/arch/x86/boot/voyager.c
index 61c8fe0453be..61c8fe0453be 100644
--- a/arch/i386/boot/voyager.c
+++ b/arch/x86/boot/voyager.c
diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile
new file mode 100644
index 000000000000..18dcdc6fb7aa
--- /dev/null
+++ b/arch/x86/crypto/Makefile
@@ -0,0 +1,5 @@
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/x86/crypto/Makefile_32
+else
+include ${srctree}/arch/x86/crypto/Makefile_64
+endif
diff --git a/arch/i386/crypto/Makefile b/arch/x86/crypto/Makefile_32
index 3fd19af18e34..2d873a2388ed 100644
--- a/arch/i386/crypto/Makefile
+++ b/arch/x86/crypto/Makefile_32
@@ -1,5 +1,5 @@
 # 
-# i386/crypto/Makefile 
+# x86/crypto/Makefile 
 # 
 # Arch-specific CryptoAPI modules.
 # 
@@ -7,6 +7,6 @@
 obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
 obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
 
-aes-i586-y := aes-i586-asm.o aes.o
-twofish-i586-y := twofish-i586-asm.o twofish.o
+aes-i586-y := aes-i586-asm_32.o aes_32.o
+twofish-i586-y := twofish-i586-asm_32.o twofish_32.o
 
diff --git a/arch/x86_64/crypto/Makefile b/arch/x86/crypto/Makefile_64
index 15b538a8b7f7..b40896276e93 100644
--- a/arch/x86_64/crypto/Makefile
+++ b/arch/x86/crypto/Makefile_64
@@ -1,5 +1,5 @@
 # 
-# x86_64/crypto/Makefile 
+# x86/crypto/Makefile 
 # 
 # Arch-specific CryptoAPI modules.
 # 
@@ -7,6 +7,6 @@
 obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o
 obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o
 
-aes-x86_64-y := aes-x86_64-asm.o aes.o
-twofish-x86_64-y := twofish-x86_64-asm.o twofish.o
+aes-x86_64-y := aes-x86_64-asm_64.o aes_64.o
+twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_64.o
 
diff --git a/arch/i386/crypto/aes-i586-asm.S b/arch/x86/crypto/aes-i586-asm_32.S
index f942f0c8f630..f942f0c8f630 100644
--- a/arch/i386/crypto/aes-i586-asm.S
+++ b/arch/x86/crypto/aes-i586-asm_32.S
diff --git a/arch/x86_64/crypto/aes-x86_64-asm.S b/arch/x86/crypto/aes-x86_64-asm_64.S
index 26b40de4d0b0..26b40de4d0b0 100644
--- a/arch/x86_64/crypto/aes-x86_64-asm.S
+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
diff --git a/arch/i386/crypto/aes.c b/arch/x86/crypto/aes_32.c
index 49aad9397f10..49aad9397f10 100644
--- a/arch/i386/crypto/aes.c
+++ b/arch/x86/crypto/aes_32.c
diff --git a/arch/x86_64/crypto/aes.c b/arch/x86/crypto/aes_64.c
index 5cdb13ea5cc2..5cdb13ea5cc2 100644
--- a/arch/x86_64/crypto/aes.c
+++ b/arch/x86/crypto/aes_64.c
diff --git a/arch/i386/crypto/twofish-i586-asm.S b/arch/x86/crypto/twofish-i586-asm_32.S
index 39b98ed2c1b9..39b98ed2c1b9 100644
--- a/arch/i386/crypto/twofish-i586-asm.S
+++ b/arch/x86/crypto/twofish-i586-asm_32.S
diff --git a/arch/x86_64/crypto/twofish-x86_64-asm.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
index 35974a586615..35974a586615 100644
--- a/arch/x86_64/crypto/twofish-x86_64-asm.S
+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
diff --git a/arch/i386/crypto/twofish.c b/arch/x86/crypto/twofish_32.c
index e3004dfe9c7a..e3004dfe9c7a 100644
--- a/arch/i386/crypto/twofish.c
+++ b/arch/x86/crypto/twofish_32.c
diff --git a/arch/x86_64/crypto/twofish.c b/arch/x86/crypto/twofish_64.c
index 182d91d5cfb9..182d91d5cfb9 100644
--- a/arch/x86_64/crypto/twofish.c
+++ b/arch/x86/crypto/twofish_64.c
diff --git a/arch/x86_64/ia32/Makefile b/arch/x86/ia32/Makefile
index cdae36435e21..cdae36435e21 100644
--- a/arch/x86_64/ia32/Makefile
+++ b/arch/x86/ia32/Makefile
diff --git a/arch/x86_64/ia32/audit.c b/arch/x86/ia32/audit.c
index 8850fe40ea34..91b7b5922dfa 100644
--- a/arch/x86_64/ia32/audit.c
+++ b/arch/x86/ia32/audit.c
@@ -1,4 +1,4 @@
-#include <asm-i386/unistd.h>
+#include <asm/unistd_32.h>
 
 unsigned ia32_dir_class[] = {
 #include <asm-generic/audit_dir_write.h>
diff --git a/arch/x86_64/ia32/fpu32.c b/arch/x86/ia32/fpu32.c
index 2c8209a3605a..2c8209a3605a 100644
--- a/arch/x86_64/ia32/fpu32.c
+++ b/arch/x86/ia32/fpu32.c
diff --git a/arch/x86_64/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
index 08781370256d..08781370256d 100644
--- a/arch/x86_64/ia32/ia32_aout.c
+++ b/arch/x86/ia32/ia32_aout.c
diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86/ia32/ia32_binfmt.c
index dffd2ac72747..dffd2ac72747 100644
--- a/arch/x86_64/ia32/ia32_binfmt.c
+++ b/arch/x86/ia32/ia32_binfmt.c
diff --git a/arch/x86_64/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index 6ea19c25f90d..6ea19c25f90d 100644
--- a/arch/x86_64/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 18b231810908..18b231810908 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
diff --git a/arch/x86_64/ia32/ipc32.c b/arch/x86/ia32/ipc32.c
index 369151dc3213..2e1869ec4db4 100644
--- a/arch/x86_64/ia32/ipc32.c
+++ b/arch/x86/ia32/ipc32.c
@@ -9,7 +9,7 @@
 #include <linux/ipc.h>
 #include <linux/compat.h>
 
-#include <asm-i386/ipc.h>
+#include <asm/ipc.h>
 
 asmlinkage long
 sys32_ipc(u32 call, int first, int second, int third,
diff --git a/arch/x86_64/ia32/mmap32.c b/arch/x86/ia32/mmap32.c
index e4b84b4a417a..e4b84b4a417a 100644
--- a/arch/x86_64/ia32/mmap32.c
+++ b/arch/x86/ia32/mmap32.c
diff --git a/arch/x86_64/ia32/ptrace32.c b/arch/x86/ia32/ptrace32.c
index 4a233ad6269c..4a233ad6269c 100644
--- a/arch/x86_64/ia32/ptrace32.c
+++ b/arch/x86/ia32/ptrace32.c
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
index bee96d614432..bee96d614432 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86/ia32/sys_ia32.c
diff --git a/arch/x86_64/ia32/syscall32.c b/arch/x86/ia32/syscall32.c
index 15013bac181c..15013bac181c 100644
--- a/arch/x86_64/ia32/syscall32.c
+++ b/arch/x86/ia32/syscall32.c
diff --git a/arch/x86_64/ia32/syscall32_syscall.S b/arch/x86/ia32/syscall32_syscall.S
index 8f8271bdf135..933f0f08b1cf 100644
--- a/arch/x86_64/ia32/syscall32_syscall.S
+++ b/arch/x86/ia32/syscall32_syscall.S
@@ -6,12 +6,12 @@
         .globl syscall32_syscall_end
 
 syscall32_syscall:
-        .incbin "arch/x86_64/ia32/vsyscall-syscall.so"
+        .incbin "arch/x86/ia32/vsyscall-syscall.so"
 syscall32_syscall_end:
 
         .globl syscall32_sysenter
         .globl syscall32_sysenter_end
 
 syscall32_sysenter:
-        .incbin "arch/x86_64/ia32/vsyscall-sysenter.so"
+        .incbin "arch/x86/ia32/vsyscall-sysenter.so"
 syscall32_sysenter_end:
diff --git a/arch/x86_64/ia32/tls32.c b/arch/x86/ia32/tls32.c
index 1cc4340de3ca..1cc4340de3ca 100644
--- a/arch/x86_64/ia32/tls32.c
+++ b/arch/x86/ia32/tls32.c
diff --git a/arch/x86_64/ia32/vsyscall-sigreturn.S b/arch/x86/ia32/vsyscall-sigreturn.S
index 1384367cdbe1..b383be00baec 100644
--- a/arch/x86_64/ia32/vsyscall-sigreturn.S
+++ b/arch/x86/ia32/vsyscall-sigreturn.S
@@ -139,5 +139,5 @@ __kernel_rt_sigreturn:
         .align 4
 .LENDFDE3:
 
-#include "../../i386/kernel/vsyscall-note.S"
+#include "../../x86/kernel/vsyscall-note_32.S"
 
diff --git a/arch/x86_64/ia32/vsyscall-syscall.S b/arch/x86/ia32/vsyscall-syscall.S
index cf9ef678de3e..cf9ef678de3e 100644
--- a/arch/x86_64/ia32/vsyscall-syscall.S
+++ b/arch/x86/ia32/vsyscall-syscall.S
diff --git a/arch/x86_64/ia32/vsyscall-sysenter.S b/arch/x86/ia32/vsyscall-sysenter.S
index ae056e553d13..ae056e553d13 100644
--- a/arch/x86_64/ia32/vsyscall-sysenter.S
+++ b/arch/x86/ia32/vsyscall-sysenter.S
diff --git a/arch/x86_64/ia32/vsyscall.lds b/arch/x86/ia32/vsyscall.lds
index 1dc86ff5bcb9..1dc86ff5bcb9 100644
--- a/arch/x86_64/ia32/vsyscall.lds
+++ b/arch/x86/ia32/vsyscall.lds
diff --git a/arch/i386/kernel/.gitignore b/arch/x86/kernel/.gitignore
index 40836ad9079c..40836ad9079c 100644
--- a/arch/i386/kernel/.gitignore
+++ b/arch/x86/kernel/.gitignore
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
new file mode 100644
index 000000000000..45855c97923e
--- /dev/null
+++ b/arch/x86/kernel/Makefile
@@ -0,0 +1,5 @@
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/x86/kernel/Makefile_32
+else
+include ${srctree}/arch/x86/kernel/Makefile_64
+endif
diff --git a/arch/x86/kernel/Makefile_32 b/arch/x86/kernel/Makefile_32
new file mode 100644
index 000000000000..7ff02063b858
--- /dev/null
+++ b/arch/x86/kernel/Makefile_32
@@ -0,0 +1,86 @@
+#
+# Makefile for the linux kernel.
+#
+
+extra-y := head_32.o init_task_32.o vmlinux.lds
+
+obj-y   := process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \
+                ptrace_32.o time_32.o ioport_32.o ldt_32.o setup_32.o i8259_32.o sys_i386_32.o \
+                pci-dma_32.o i386_ksyms_32.o i387_32.o bootflag.o e820_32.o\
+                quirks.o i8237.o topology.o alternative.o i8253.o tsc_32.o
+
+obj-$(CONFIG_STACKTRACE)        += stacktrace.o
+obj-y                           += cpu/
+obj-y                           += acpi/
+obj-$(CONFIG_X86_BIOS_REBOOT)   += reboot_32.o
+obj-$(CONFIG_MCA)               += mca_32.o
+obj-$(CONFIG_X86_MSR)           += msr.o
+obj-$(CONFIG_X86_CPUID)         += cpuid.o
+obj-$(CONFIG_MICROCODE)         += microcode.o
+obj-$(CONFIG_APM)               += apm_32.o
+obj-$(CONFIG_X86_SMP)           += smp_32.o smpboot_32.o tsc_sync.o
+obj-$(CONFIG_SMP)               += smpcommon_32.o
+obj-$(CONFIG_X86_TRAMPOLINE)    += trampoline_32.o
+obj-$(CONFIG_X86_MPPARSE)       += mpparse_32.o
+obj-$(CONFIG_X86_LOCAL_APIC)    += apic_32.o nmi_32.o
+obj-$(CONFIG_X86_IO_APIC)       += io_apic_32.o
+obj-$(CONFIG_X86_REBOOTFIXUPS)  += reboot_fixups_32.o
+obj-$(CONFIG_KEXEC)             += machine_kexec_32.o relocate_kernel_32.o crash_32.o
+obj-$(CONFIG_CRASH_DUMP)        += crash_dump_32.o
+obj-$(CONFIG_X86_NUMAQ)         += numaq_32.o
+obj-$(CONFIG_X86_SUMMIT_NUMA)   += summit_32.o
+obj-$(CONFIG_KPROBES)           += kprobes_32.o
+obj-$(CONFIG_MODULES)           += module_32.o
+obj-y                           += sysenter_32.o vsyscall_32.o
+obj-$(CONFIG_ACPI_SRAT)         += srat_32.o
+obj-$(CONFIG_EFI)               += efi_32.o efi_stub_32.o
+obj-$(CONFIG_DOUBLEFAULT)       += doublefault_32.o
+obj-$(CONFIG_VM86)              += vm86_32.o
+obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
+obj-$(CONFIG_HPET_TIMER)        += hpet.o
+obj-$(CONFIG_K8_NB)             += k8.o
+obj-$(CONFIG_MGEODE_LX)         += geode_32.o mfgpt_32.o
+
+obj-$(CONFIG_VMI)               += vmi_32.o vmiclock_32.o
+obj-$(CONFIG_PARAVIRT)          += paravirt_32.o
+obj-y                           += pcspeaker.o
+
+obj-$(CONFIG_SCx200)            += scx200_32.o
+
+# vsyscall_32.o contains the vsyscall DSO images as __initdata.
+# We must build both images before we can assemble it.
+# Note: kbuild does not track this dependency due to usage of .incbin
+$(obj)/vsyscall_32.o: $(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so
+targets += $(foreach F,int80 sysenter,vsyscall-$F.o vsyscall-$F.so)
+targets += vsyscall-note_32.o vsyscall_32.lds
+
+# The DSO images are built using a special linker script.
+quiet_cmd_syscall = SYSCALL $@
+      cmd_syscall = $(CC) -m elf_i386 -nostdlib $(SYSCFLAGS_$(@F)) \
+                          -Wl,-T,$(filter-out FORCE,$^) -o $@
+
+export CPPFLAGS_vsyscall_32.lds += -P -C -U$(ARCH)
+
+vsyscall-flags = -shared -s -Wl,-soname=linux-gate.so.1 \
+                 $(call ld-option, -Wl$(comma)--hash-style=sysv)
+SYSCFLAGS_vsyscall-sysenter_32.so       = $(vsyscall-flags)
+SYSCFLAGS_vsyscall-int80_32.so  = $(vsyscall-flags)
+
+$(obj)/vsyscall-int80_32.so $(obj)/vsyscall-sysenter_32.so: \
+$(obj)/vsyscall-%.so: $(src)/vsyscall_32.lds \
+                      $(obj)/vsyscall-%.o $(obj)/vsyscall-note_32.o FORCE
+        $(call if_changed,syscall)
+
+# We also create a special relocatable object that should mirror the symbol
+# table and layout of the linked DSO.  With ld -R we can then refer to
+# these symbols in the kernel code rather than hand-coded addresses.
+extra-y += vsyscall-syms.o
+$(obj)/built-in.o: $(obj)/vsyscall-syms.o
+$(obj)/built-in.o: ld_flags += -R $(obj)/vsyscall-syms.o
+
+SYSCFLAGS_vsyscall-syms.o = -r
+$(obj)/vsyscall-syms.o: $(src)/vsyscall_32.lds \
+                        $(obj)/vsyscall-sysenter_32.o $(obj)/vsyscall-note_32.o FORCE
+        $(call if_changed,syscall)
+
+
diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64
new file mode 100644
index 000000000000..43da66213a47
--- /dev/null
+++ b/arch/x86/kernel/Makefile_64
@@ -0,0 +1,54 @@
+#
+# Makefile for the linux kernel.
+#
+
+extra-y         := head_64.o head64.o init_task_64.o vmlinux.lds
+EXTRA_AFLAGS    := -traditional
+obj-y   := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \
+                ptrace_64.o time_64.o ioport_64.o ldt_64.o setup_64.o i8259_64.o sys_x86_64.o \
+                x8664_ksyms_64.o i387_64.o syscall_64.o vsyscall_64.o \
+                setup64.o bootflag.o e820_64.o reboot_64.o quirks.o i8237.o \
+                pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \
+                perfctr-watchdog.o i8253.o
+
+obj-$(CONFIG_STACKTRACE)        += stacktrace.o
+obj-$(CONFIG_X86_MCE)           += mce_64.o therm_throt.o
+obj-$(CONFIG_X86_MCE_INTEL)     += mce_intel_64.o
+obj-$(CONFIG_X86_MCE_AMD)       += mce_amd_64.o
+obj-$(CONFIG_MTRR)              += cpu/mtrr/
+obj-$(CONFIG_ACPI)              += acpi/
+obj-$(CONFIG_X86_MSR)           += msr.o
+obj-$(CONFIG_MICROCODE)         += microcode.o
+obj-$(CONFIG_X86_CPUID)         += cpuid.o
+obj-$(CONFIG_SMP)               += smp_64.o smpboot_64.o trampoline_64.o tsc_sync.o
+obj-y                           += apic_64.o  nmi_64.o
+obj-y                           += io_apic_64.o mpparse_64.o genapic_64.o genapic_flat_64.o
+obj-$(CONFIG_KEXEC)             += machine_kexec_64.o relocate_kernel_64.o crash_64.o
+obj-$(CONFIG_CRASH_DUMP)        += crash_dump_64.o
+obj-$(CONFIG_PM)                += suspend_64.o
+obj-$(CONFIG_HIBERNATION)       += suspend_asm_64.o
+obj-$(CONFIG_CPU_FREQ)          += cpu/cpufreq/
+obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
+obj-$(CONFIG_IOMMU)             += pci-gart_64.o aperture_64.o
+obj-$(CONFIG_CALGARY_IOMMU)     += pci-calgary_64.o tce_64.o
+obj-$(CONFIG_SWIOTLB)           += pci-swiotlb_64.o
+obj-$(CONFIG_KPROBES)           += kprobes_64.o
+obj-$(CONFIG_X86_PM_TIMER)      += pmtimer_64.o
+obj-$(CONFIG_X86_VSMP)          += vsmp_64.o
+obj-$(CONFIG_K8_NB)             += k8.o
+obj-$(CONFIG_AUDIT)             += audit_64.o
+
+obj-$(CONFIG_MODULES)           += module_64.o
+obj-$(CONFIG_PCI)               += early-quirks_64.o
+
+obj-y                           += topology.o
+obj-y                           += intel_cacheinfo.o
+obj-y                           += addon_cpuid_features.o
+obj-y                           += pcspeaker.o
+
+CFLAGS_vsyscall_64.o            := $(PROFILING) -g0
+
+therm_throt-y                   += cpu/mcheck/therm_throt.o
+intel_cacheinfo-y               += cpu/intel_cacheinfo.o
+addon_cpuid_features-y          += cpu/addon_cpuid_features.o
+perfctr-watchdog-y              += cpu/perfctr-watchdog.o
diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile
new file mode 100644
index 000000000000..3d5671939542
--- /dev/null
+++ b/arch/x86/kernel/acpi/Makefile
@@ -0,0 +1,5 @@
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/x86/kernel/acpi/Makefile_32
+else
+include ${srctree}/arch/x86/kernel/acpi/Makefile_64
+endif
diff --git a/arch/i386/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile_32
index 7f7be01f44e6..a4852a2e9190 100644
--- a/arch/i386/kernel/acpi/Makefile
+++ b/arch/x86/kernel/acpi/Makefile_32
@@ -1,8 +1,8 @@
 obj-$(CONFIG_ACPI)              += boot.o
 ifneq ($(CONFIG_PCI),)
-obj-$(CONFIG_X86_IO_APIC)       += earlyquirk.o
+obj-$(CONFIG_X86_IO_APIC)       += earlyquirk_32.o
 endif
-obj-$(CONFIG_ACPI_SLEEP)        += sleep.o wakeup.o
+obj-$(CONFIG_ACPI_SLEEP)        += sleep_32.o wakeup_32.o
 
 ifneq ($(CONFIG_ACPI_PROCESSOR),)
 obj-y                           += cstate.o processor.o
diff --git a/arch/x86/kernel/acpi/Makefile_64 b/arch/x86/kernel/acpi/Makefile_64
new file mode 100644
index 000000000000..629425bc002d
--- /dev/null
+++ b/arch/x86/kernel/acpi/Makefile_64
@@ -0,0 +1,7 @@
+obj-y                   := boot.o
+obj-$(CONFIG_ACPI_SLEEP)        += sleep_64.o wakeup_64.o
+
+ifneq ($(CONFIG_ACPI_PROCESSOR),)
+obj-y                   += processor.o cstate.o
+endif
+
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index cacdd883bf2b..afd2afe9102d 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -907,7 +907,7 @@ static void __init acpi_process_madt(void)
 
 #ifdef __i386__
 
-static int __init disable_acpi_irq(struct dmi_system_id *d)
+static int __init disable_acpi_irq(const struct dmi_system_id *d)
 {
         if (!acpi_force) {
                 printk(KERN_NOTICE "%s detected: force use of acpi=noirq\n",
@@ -917,7 +917,7 @@ static int __init disable_acpi_irq(struct dmi_system_id *d)
         return 0;
 }
 
-static int __init disable_acpi_pci(struct dmi_system_id *d)
+static int __init disable_acpi_pci(const struct dmi_system_id *d)
 {
         if (!acpi_force) {
                 printk(KERN_NOTICE "%s detected: force use of pci=noacpi\n",
@@ -927,7 +927,7 @@ static int __init disable_acpi_pci(struct dmi_system_id *d)
         return 0;
 }
 
-static int __init dmi_disable_acpi(struct dmi_system_id *d)
+static int __init dmi_disable_acpi(const struct dmi_system_id *d)
 {
         if (!acpi_force) {
                 printk(KERN_NOTICE "%s detected: acpi off\n", d->ident);
@@ -942,7 +942,7 @@ static int __init dmi_disable_acpi(struct dmi_system_id *d)
 /*
  * Limit ACPI to CPU enumeration for HT
  */
-static int __init force_acpi_ht(struct dmi_system_id *d)
+static int __init force_acpi_ht(const struct dmi_system_id *d)
 {
         if (!acpi_force) {
                 printk(KERN_NOTICE "%s detected: force use of acpi=ht\n",
diff --git a/arch/i386/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c
index 2d39f55d29a8..2d39f55d29a8 100644
--- a/arch/i386/kernel/acpi/cstate.c
+++ b/arch/x86/kernel/acpi/cstate.c
diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/x86/kernel/acpi/earlyquirk_32.c
index 23f78efc577d..23f78efc577d 100644
--- a/arch/i386/kernel/acpi/earlyquirk.c
+++ b/arch/x86/kernel/acpi/earlyquirk_32.c
diff --git a/arch/i386/kernel/acpi/processor.c b/arch/x86/kernel/acpi/processor.c
index b54fded49834..b54fded49834 100644
--- a/arch/i386/kernel/acpi/processor.c
+++ b/arch/x86/kernel/acpi/processor.c
diff --git a/arch/i386/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep_32.c
index c42b5ab49deb..10699489cfe7 100644
--- a/arch/i386/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep_32.c
@@ -84,7 +84,7 @@ __setup("acpi_sleep=", acpi_sleep_setup);
 
 /* Ouch, we want to delete this. We already have better version in userspace, in
    s2ram from suspend.sf.net project */
-static __init int reset_videomode_after_s3(struct dmi_system_id *d)
+static __init int reset_videomode_after_s3(const struct dmi_system_id *d)
 {
         acpi_realmode_flags |= 2;
         return 0;
diff --git a/arch/x86_64/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep_64.c
index 79475d237071..79475d237071 100644
--- a/arch/x86_64/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep_64.c
diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/x86/kernel/acpi/wakeup_32.S
index f22ba8534d26..f22ba8534d26 100644
--- a/arch/i386/kernel/acpi/wakeup.S
+++ b/arch/x86/kernel/acpi/wakeup_32.S
diff --git a/arch/x86_64/kernel/acpi/wakeup.S b/arch/x86/kernel/acpi/wakeup_64.S
index a06f2bcabef9..8b4357e1efe0 100644
--- a/arch/x86_64/kernel/acpi/wakeup.S
+++ b/arch/x86/kernel/acpi/wakeup_64.S
@@ -269,7 +269,7 @@ no_longmode:
         movb    $0xbc,%al       ;  outb %al,$0x80
         jmp no_longmode
 
-#include "../verify_cpu.S"
+#include "../verify_cpu_64.S"
         
 /* This code uses an extended set of video mode numbers. These include:
  * Aliases for standard modes
diff --git a/arch/i386/kernel/alternative.c b/arch/x86/kernel/alternative.c
index bd72d94e713e..bd72d94e713e 100644
--- a/arch/i386/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
diff --git a/arch/x86_64/kernel/aperture.c b/arch/x86/kernel/aperture_64.c
index 8f681cae7bf7..8f681cae7bf7 100644
--- a/arch/x86_64/kernel/aperture.c
+++ b/arch/x86/kernel/aperture_64.c
diff --git a/arch/i386/kernel/apic.c b/arch/x86/kernel/apic_32.c
index 3d67ae18d762..3d67ae18d762 100644
--- a/arch/i386/kernel/apic.c
+++ b/arch/x86/kernel/apic_32.c
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86/kernel/apic_64.c
index 925758dbca0c..395928de28ea 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86/kernel/apic_64.c
@@ -25,6 +25,7 @@
 #include <linux/sysdev.h>
 #include <linux/module.h>
 #include <linux/ioport.h>
+#include <linux/clockchips.h>
 
 #include <asm/atomic.h>
 #include <asm/smp.h>
@@ -39,12 +40,9 @@
 #include <asm/hpet.h>
 #include <asm/apic.h>
 
-int apic_mapped;
 int apic_verbosity;
-int apic_runs_main_timer;
-int apic_calibrate_pmtmr __initdata;
-
-int disable_apic_timer __initdata;
+int disable_apic_timer __cpuinitdata;
+static int apic_calibrate_pmtmr __initdata;
 
 /* Local APIC timer works in C2? */
 int local_apic_timer_c2_ok;
@@ -56,14 +54,78 @@ static struct resource lapic_resource = {
         .flags = IORESOURCE_MEM | IORESOURCE_BUSY,
 };
 
+static unsigned int calibration_result;
+
+static int lapic_next_event(unsigned long delta,
+                            struct clock_event_device *evt);
+static void lapic_timer_setup(enum clock_event_mode mode,
+                              struct clock_event_device *evt);
+
+static void lapic_timer_broadcast(cpumask_t mask);
+
+static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen);
+
+static struct clock_event_device lapic_clockevent = {
+        .name           = "lapic",
+        .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT
+                        | CLOCK_EVT_FEAT_C3STOP | CLOCK_EVT_FEAT_DUMMY,
+        .shift          = 32,
+        .set_mode       = lapic_timer_setup,
+        .set_next_event = lapic_next_event,
+        .broadcast      = lapic_timer_broadcast,
+        .rating         = 100,
+        .irq            = -1,
+};
+static DEFINE_PER_CPU(struct clock_event_device, lapic_events);
+
+static int lapic_next_event(unsigned long delta,
+                            struct clock_event_device *evt)
+{
+        apic_write(APIC_TMICT, delta);
+        return 0;
+}
+
+static void lapic_timer_setup(enum clock_event_mode mode,
+                              struct clock_event_device *evt)
+{
+        unsigned long flags;
+        unsigned int v;
+
+        /* Lapic used as dummy for broadcast ? */
+        if (evt->features & CLOCK_EVT_FEAT_DUMMY)
+                return;
+
+        local_irq_save(flags);
+
+        switch (mode) {
+        case CLOCK_EVT_MODE_PERIODIC:
+        case CLOCK_EVT_MODE_ONESHOT:
+                __setup_APIC_LVTT(calibration_result,
+                                  mode != CLOCK_EVT_MODE_PERIODIC, 1);
+                break;
+        case CLOCK_EVT_MODE_UNUSED:
+        case CLOCK_EVT_MODE_SHUTDOWN:
+                v = apic_read(APIC_LVTT);
+                v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
+                apic_write(APIC_LVTT, v);
+                break;
+        case CLOCK_EVT_MODE_RESUME:
+                /* Nothing to do here */
+                break;
+        }
+
+        local_irq_restore(flags);
+}
+
 /*
- * cpu_mask that denotes the CPUs that needs timer interrupt coming in as
- * IPIs in place of local APIC timers
+ * Local APIC timer broadcast function
  */
-static cpumask_t timer_interrupt_broadcast_ipi_mask;
-
-/* Using APIC to generate smp_local_timer_interrupt? */
-int using_apic_timer __read_mostly = 0;
+static void lapic_timer_broadcast(cpumask_t mask)
+{
+#ifdef CONFIG_SMP
+        send_IPI_mask(mask, LOCAL_TIMER_VECTOR);
+#endif
+}
 
 static void apic_pm_activate(void);
 
@@ -184,7 +246,10 @@ void disconnect_bsp_APIC(int virt_wire_setup)
         apic_write(APIC_SPIV, value);
 
         if (!virt_wire_setup) {
-                /* For LVT0 make it edge triggered, active high, external and enabled */
+                /*
+                 * For LVT0 make it edge triggered, active high,
+                 * external and enabled
+                 */
                 value = apic_read(APIC_LVT0);
                 value &= ~(APIC_MODE_MASK | APIC_SEND_PENDING |
                         APIC_INPUT_POLARITY | APIC_LVT_REMOTE_IRR |
@@ -420,10 +485,12 @@ void __cpuinit setup_local_APIC (void)
         value = apic_read(APIC_LVT0) & APIC_LVT_MASKED;
         if (!smp_processor_id() && !value) {
                 value = APIC_DM_EXTINT;
-                apic_printk(APIC_VERBOSE, "enabled ExtINT on CPU#%d\n", smp_processor_id());
+                apic_printk(APIC_VERBOSE, "enabled ExtINT on CPU#%d\n",
+                            smp_processor_id());
         } else {
                 value = APIC_DM_EXTINT | APIC_LVT_MASKED;
-                apic_printk(APIC_VERBOSE, "masked ExtINT on CPU#%d\n", smp_processor_id());
+                apic_printk(APIC_VERBOSE, "masked ExtINT on CPU#%d\n",
+                            smp_processor_id());
         }
         apic_write(APIC_LVT0, value);
 
@@ -706,8 +773,8 @@ void __init init_apic_mappings(void)
                 apic_phys = mp_lapic_addr;
 
         set_fixmap_nocache(FIX_APIC_BASE, apic_phys);
-        apic_mapped = 1;
-        apic_printk(APIC_VERBOSE,"mapped APIC to %16lx (%16lx)\n", APIC_BASE, apic_phys);
+        apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",
+                                APIC_BASE, apic_phys);
 
         /* Put local APIC into the resource map. */
         lapic_resource.start = apic_phys;
@@ -730,12 +797,14 @@ void __init init_apic_mappings(void)
                         if (smp_found_config) {
                                 ioapic_phys = mp_ioapics[i].mpc_apicaddr;
                         } else {
-                                ioapic_phys = (unsigned long) alloc_bootmem_pages(PAGE_SIZE);
+                                ioapic_phys = (unsigned long)
+                                        alloc_bootmem_pages(PAGE_SIZE);
                                 ioapic_phys = __pa(ioapic_phys);
                         }
                         set_fixmap_nocache(idx, ioapic_phys);
-                        apic_printk(APIC_VERBOSE,"mapped IOAPIC to %016lx (%016lx)\n",
-                                        __fix_to_virt(idx), ioapic_phys);
+                        apic_printk(APIC_VERBOSE,
+                                    "mapped IOAPIC to %016lx (%016lx)\n",
+                                    __fix_to_virt(idx), ioapic_phys);
                         idx++;
 
                         if (ioapic_res != NULL) {
@@ -758,16 +827,14 @@ void __init init_apic_mappings(void)
  * P5 APIC double write bug.
  */
 
-#define APIC_DIVISOR 16
-
-static void __setup_APIC_LVTT(unsigned int clocks)
+static void __setup_APIC_LVTT(unsigned int clocks, int oneshot, int irqen)
 {
         unsigned int lvtt_value, tmp_value;
-        int cpu = smp_processor_id();
 
-        lvtt_value = APIC_LVT_TIMER_PERIODIC | LOCAL_TIMER_VECTOR;
-
-        if (cpu_isset(cpu, timer_interrupt_broadcast_ipi_mask))
+        lvtt_value = LOCAL_TIMER_VECTOR;
+        if (!oneshot)
+                lvtt_value |= APIC_LVT_TIMER_PERIODIC;
+        if (!irqen)
                 lvtt_value |= APIC_LVT_MASKED;
 
         apic_write(APIC_LVTT, lvtt_value);
@@ -780,44 +847,18 @@ static void __setup_APIC_LVTT(unsigned int clocks)
                                 & ~(APIC_TDR_DIV_1 | APIC_TDR_DIV_TMBASE))
                                 | APIC_TDR_DIV_16);
 
-        apic_write(APIC_TMICT, clocks/APIC_DIVISOR);
+        if (!oneshot)
+                apic_write(APIC_TMICT, clocks);
 }
 
-static void setup_APIC_timer(unsigned int clocks)
+static void setup_APIC_timer(void)
 {
-        unsigned long flags;
+        struct clock_event_device *levt = &__get_cpu_var(lapic_events);
 
-        local_irq_save(flags);
+        memcpy(levt, &lapic_clockevent, sizeof(*levt));
+        levt->cpumask = cpumask_of_cpu(smp_processor_id());
 
-        /* wait for irq slice */
-        if (hpet_address && hpet_use_timer) {
-                u32 trigger = hpet_readl(HPET_T0_CMP);
-                while (hpet_readl(HPET_T0_CMP) == trigger)
-                        /* do nothing */ ;
-        } else {
-                int c1, c2;
-                outb_p(0x00, 0x43);
-                c2 = inb_p(0x40);
-                c2 |= inb_p(0x40) << 8;
-                do {
-                        c1 = c2;
-                        outb_p(0x00, 0x43);
-                        c2 = inb_p(0x40);
-                        c2 |= inb_p(0x40) << 8;
-                } while (c2 - c1 < 300);
-        }
-        __setup_APIC_LVTT(clocks);
-        /* Turn off PIT interrupt if we use APIC timer as main timer.
-           Only works with the PM timer right now
-           TBD fix it for HPET too. */
-        if ((pmtmr_ioport != 0) &&
-                smp_processor_id() == boot_cpu_id &&
-                apic_runs_main_timer == 1 &&
-                !cpu_isset(boot_cpu_id, timer_interrupt_broadcast_ipi_mask)) {
-                stop_timer_interrupt();
-                apic_runs_main_timer++;
-        }
-        local_irq_restore(flags);
+        clockevents_register_device(levt);
 }
 
 /*
@@ -835,17 +876,22 @@ static void setup_APIC_timer(unsigned int clocks)
 
 #define TICK_COUNT 100000000
 
-static int __init calibrate_APIC_clock(void)
+static void __init calibrate_APIC_clock(void)
 {
         unsigned apic, apic_start;
         unsigned long tsc, tsc_start;
         int result;
+
+        local_irq_disable();
+
         /*
          * Put whatever arbitrary (but long enough) timeout
          * value into the APIC clock, we just want to get the
          * counter running for calibration.
+         *
+         * No interrupt enable !
          */
-        __setup_APIC_LVTT(4000000000);
+        __setup_APIC_LVTT(250000000, 0, 0);
 
         apic_start = apic_read(APIC_TMCCT);
 #ifdef CONFIG_X86_PM_TIMER
@@ -867,123 +913,62 @@ static int __init calibrate_APIC_clock(void)
                 result = (apic_start - apic) * 1000L * tsc_khz /
                                         (tsc - tsc_start);
         }
-        printk("result %d\n", result);
 
+        local_irq_enable();
+
+        printk(KERN_DEBUG "APIC timer calibration result %d\n", result);
 
         printk(KERN_INFO "Detected %d.%03d MHz APIC timer.\n",
                 result / 1000 / 1000, result / 1000 % 1000);
 
-        return result * APIC_DIVISOR / HZ;
-}
+        /* Calculate the scaled math multiplication factor */
+        lapic_clockevent.mult = div_sc(result, NSEC_PER_SEC, 32);
+        lapic_clockevent.max_delta_ns =
+                clockevent_delta2ns(0x7FFFFF, &lapic_clockevent);
+        lapic_clockevent.min_delta_ns =
+                clockevent_delta2ns(0xF, &lapic_clockevent);
 
-static unsigned int calibration_result;
+        calibration_result = result / HZ;
+}
 
 void __init setup_boot_APIC_clock (void)
 {
+        /*
+         * The local apic timer can be disabled via the kernel commandline.
+         * Register the lapic timer as a dummy clock event source on SMP
+         * systems, so the broadcast mechanism is used. On UP systems simply
+         * ignore it.
+         */
         if (disable_apic_timer) {
                 printk(KERN_INFO "Disabling APIC timer\n");
+                /* No broadcast on UP ! */
+                if (num_possible_cpus() > 1)
+                        setup_APIC_timer();
                 return;
         }
 
         printk(KERN_INFO "Using local APIC timer interrupts.\n");
-        using_apic_timer = 1;
-
-        local_irq_disable();
+        calibrate_APIC_clock();
 
-        calibration_result = calibrate_APIC_clock();
         /*
-         * Now set up the timer for real.
+         * If nmi_watchdog is set to IO_APIC, we need the
+         * PIT/HPET going.  Otherwise register lapic as a dummy
+         * device.
          */
-        setup_APIC_timer(calibration_result);
+        if (nmi_watchdog != NMI_IO_APIC)
+                lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
+        else
+                printk(KERN_WARNING "APIC timer registered as dummy,"
+                       " due to nmi_watchdog=1!\n");
 
-        local_irq_enable();
+        setup_APIC_timer();
 }
 
 void __cpuinit setup_secondary_APIC_clock(void)
 {
-        local_irq_disable(); /* FIXME: Do we need this? --RR */
-        setup_APIC_timer(calibration_result);
-        local_irq_enable();
+        setup_APIC_timer();
 }
 
-void disable_APIC_timer(void)
-{
-        if (using_apic_timer) {
-                unsigned long v;
-
-                v = apic_read(APIC_LVTT);
-                /*
-                 * When an illegal vector value (0-15) is written to an LVT
-                 * entry and delivery mode is Fixed, the APIC may signal an
-                 * illegal vector error, with out regard to whether the mask
-                 * bit is set or whether an interrupt is actually seen on input.
-                 *
-                 * Boot sequence might call this function when the LVTT has
-                 * '0' vector value. So make sure vector field is set to
-                 * valid value.
-                 */
-                v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
-                apic_write(APIC_LVTT, v);
-        }
-}
-
-void enable_APIC_timer(void)
-{
-        int cpu = smp_processor_id();
-
-        if (using_apic_timer &&
-            !cpu_isset(cpu, timer_interrupt_broadcast_ipi_mask)) {
-                unsigned long v;
-
-                v = apic_read(APIC_LVTT);
-                apic_write(APIC_LVTT, v & ~APIC_LVT_MASKED);
-        }
-}
-
-void switch_APIC_timer_to_ipi(void *cpumask)
-{
-        cpumask_t mask = *(cpumask_t *)cpumask;
-        int cpu = smp_processor_id();
-
-        if (cpu_isset(cpu, mask) &&
-            !cpu_isset(cpu, timer_interrupt_broadcast_ipi_mask)) {
-                disable_APIC_timer();
-                cpu_set(cpu, timer_interrupt_broadcast_ipi_mask);
-        }
-}
-EXPORT_SYMBOL(switch_APIC_timer_to_ipi);
-
-void smp_send_timer_broadcast_ipi(void)
-{
-        int cpu = smp_processor_id();
-        cpumask_t mask;
-
-        cpus_and(mask, cpu_online_map, timer_interrupt_broadcast_ipi_mask);
-
-        if (cpu_isset(cpu, mask)) {
-                cpu_clear(cpu, mask);
-                add_pda(apic_timer_irqs, 1);
-                smp_local_timer_interrupt();
-        }
-
-        if (!cpus_empty(mask)) {
-                send_IPI_mask(mask, LOCAL_TIMER_VECTOR);
-        }
-}
-
-void switch_ipi_to_APIC_timer(void *cpumask)
-{
-        cpumask_t mask = *(cpumask_t *)cpumask;
-        int cpu = smp_processor_id();
-
-        if (cpu_isset(cpu, mask) &&
-            cpu_isset(cpu, timer_interrupt_broadcast_ipi_mask)) {
-                cpu_clear(cpu, timer_interrupt_broadcast_ipi_mask);
-                enable_APIC_timer();
-        }
-}
-EXPORT_SYMBOL(switch_ipi_to_APIC_timer);
-
 int setup_profiling_timer(unsigned int multiplier)
 {
         return -EINVAL;
@@ -997,8 +982,6 @@ void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector,
         apic_write(reg, v);
 }
 
-#undef APIC_DIVISOR
-
 /*
  * Local timer interrupt handler. It does both profiling and
  * process statistics/rescheduling.
@@ -1011,22 +994,34 @@ void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector,
 
 void smp_local_timer_interrupt(void)
 {
-        profile_tick(CPU_PROFILING);
-#ifdef CONFIG_SMP
-        update_process_times(user_mode(get_irq_regs()));
-#endif
-        if (apic_runs_main_timer > 1 && smp_processor_id() == boot_cpu_id)
-                main_timer_handler();
+        int cpu = smp_processor_id();
+        struct clock_event_device *evt = &per_cpu(lapic_events, cpu);
+
         /*
-         * We take the 'long' return path, and there every subsystem
-         * grabs the appropriate locks (kernel lock/ irq lock).
+         * Normally we should not be here till LAPIC has been initialized but
+         * in some cases like kdump, its possible that there is a pending LAPIC
+         * timer interrupt from previous kernel's context and is delivered in
+         * new kernel the moment interrupts are enabled.
          *
-         * We might want to decouple profiling from the 'long path',
-         * and do the profiling totally in assembly.
-         *
-         * Currently this isn't too much of an issue (performance wise),
-         * we can take more than 100K local irqs per second on a 100 MHz P5.
+         * Interrupts are enabled early and LAPIC is setup much later, hence
+         * its possible that when we get here evt->event_handler is NULL.
+         * Check for event_handler being NULL and discard the interrupt as
+         * spurious.
+         */
+        if (!evt->event_handler) {
+                printk(KERN_WARNING
+                       "Spurious LAPIC timer interrupt on cpu %d\n", cpu);
+                /* Switch it off */
+                lapic_timer_setup(CLOCK_EVT_MODE_SHUTDOWN, evt);
+                return;
+        }
+
+        /*
+         * the NMI deadlock-detector uses this.
          */
+        add_pda(apic_timer_irqs, 1);
+
+        evt->event_handler(evt);
 }
 
 /*
@@ -1042,11 +1037,6 @@ void smp_apic_timer_interrupt(struct pt_regs *regs)
         struct pt_regs *old_regs = set_irq_regs(regs);
 
         /*
-         * the NMI deadlock-detector uses this.
-         */
-        add_pda(apic_timer_irqs, 1);
-
-        /*
          * NOTE! We'd better ACK the irq immediately,
          * because timer handling can be slow.
          */
@@ -1225,29 +1215,13 @@ static __init int setup_noapictimer(char *str)
         disable_apic_timer = 1;
         return 1;
 }
-
-static __init int setup_apicmaintimer(char *str)
-{
-        apic_runs_main_timer = 1;
-        nohpet = 1;
-        return 1;
-}
-__setup("apicmaintimer", setup_apicmaintimer);
-
-static __init int setup_noapicmaintimer(char *str)
-{
-        apic_runs_main_timer = -1;
-        return 1;
-}
-__setup("noapicmaintimer", setup_noapicmaintimer);
+__setup("noapictimer", setup_noapictimer);
 
 static __init int setup_apicpmtimer(char *s)
 {
         apic_calibrate_pmtmr = 1;
         notsc_setup(NULL);
-        return setup_apicmaintimer(NULL);
+        return 0;
 }
 __setup("apicpmtimer", setup_apicpmtimer);
 
-__setup("noapictimer", setup_noapictimer);
-
diff --git a/arch/i386/kernel/apm.c b/arch/x86/kernel/apm_32.c
index f02a8aca826b..32f2365c26ed 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1869,7 +1869,7 @@ static struct miscdevice apm_device = {
 
 
 /* Simple "print if true" callback */
-static int __init print_if_true(struct dmi_system_id *d)
+static int __init print_if_true(const struct dmi_system_id *d)
 {
         printk("%s\n", d->ident);
         return 0;
@@ -1879,14 +1879,14 @@ static int __init print_if_true(struct dmi_system_id *d)
  * Some Bioses enable the PS/2 mouse (touchpad) at resume, even if it was
  * disabled before the suspend. Linux used to get terribly confused by that.
  */
-static int __init broken_ps2_resume(struct dmi_system_id *d)
+static int __init broken_ps2_resume(const struct dmi_system_id *d)
 {
         printk(KERN_INFO "%s machine detected. Mousepad Resume Bug workaround hopefully not needed.\n", d->ident);
         return 0;
 }
 
 /* Some bioses have a broken protected mode poweroff and need to use realmode */
-static int __init set_realmode_power_off(struct dmi_system_id *d)
+static int __init set_realmode_power_off(const struct dmi_system_id *d)
 {
         if (apm_info.realmode_power_off == 0) {
                 apm_info.realmode_power_off = 1;
@@ -1896,7 +1896,7 @@ static int __init set_realmode_power_off(struct dmi_system_id *d)
 }
 
 /* Some laptops require interrupts to be enabled during APM calls */
-static int __init set_apm_ints(struct dmi_system_id *d)
+static int __init set_apm_ints(const struct dmi_system_id *d)
 {
         if (apm_info.allow_ints == 0) {
                 apm_info.allow_ints = 1;
@@ -1906,7 +1906,7 @@ static int __init set_apm_ints(struct dmi_system_id *d)
 }
 
 /* Some APM bioses corrupt memory or just plain do not work */
-static int __init apm_is_horked(struct dmi_system_id *d)
+static int __init apm_is_horked(const struct dmi_system_id *d)
 {
         if (apm_info.disabled == 0) {
                 apm_info.disabled = 1;
@@ -1915,7 +1915,7 @@ static int __init apm_is_horked(struct dmi_system_id *d)
         return 0;
 }
 
-static int __init apm_is_horked_d850md(struct dmi_system_id *d)
+static int __init apm_is_horked_d850md(const struct dmi_system_id *d)
 {
         if (apm_info.disabled == 0) {
                 apm_info.disabled = 1;
@@ -1927,7 +1927,7 @@ static int __init apm_is_horked_d850md(struct dmi_system_id *d)
 }
 
 /* Some APM bioses hang on APM idle calls */
-static int __init apm_likes_to_melt(struct dmi_system_id *d)
+static int __init apm_likes_to_melt(const struct dmi_system_id *d)
 {
         if (apm_info.forbid_idle == 0) {
                 apm_info.forbid_idle = 1;
@@ -1951,7 +1951,7 @@ static int __init apm_likes_to_melt(struct dmi_system_id *d)
  *      Phoenix A04  08/24/2000 is known bad (Dell Inspiron 5000e)
  *      Phoenix A07  09/29/2000 is known good (Dell Inspiron 5000)
  */
-static int __init broken_apm_power(struct dmi_system_id *d)
+static int __init broken_apm_power(const struct dmi_system_id *d)
 {
         apm_info.get_power_status_broken = 1;
         printk(KERN_WARNING "BIOS strings suggest APM bugs, disabling power status reporting.\n");
@@ -1962,7 +1962,7 @@ static int __init broken_apm_power(struct dmi_system_id *d)
  * This bios swaps the APM minute reporting bytes over (Many sony laptops
  * have this problem).
  */
-static int __init swab_apm_power_in_minutes(struct dmi_system_id *d)
+static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
 {
         apm_info.get_power_status_swabinminutes = 1;
         printk(KERN_WARNING "BIOS strings suggest APM reports battery life in minutes and wrong byte order.\n");
diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
new file mode 100644
index 000000000000..cfa82c899f47
--- /dev/null
+++ b/arch/x86/kernel/asm-offsets.c
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "asm-offsets_32.c"
+#else
+# include "asm-offsets_64.c"
+#endif
diff --git a/arch/i386/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets_32.c
index 7288ac88d746..8029742c0fc1 100644
--- a/arch/i386/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -10,7 +10,7 @@
 #include <linux/personality.h>
 #include <linux/suspend.h>
 #include <asm/ucontext.h>
-#include "sigframe.h"
+#include "sigframe_32.h"
 #include <asm/pgtable.h>
 #include <asm/fixmap.h>
 #include <asm/processor.h>
diff --git a/arch/x86_64/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets_64.c
index 778953bc636c..778953bc636c 100644
--- a/arch/x86_64/kernel/asm-offsets.c
+++ b/arch/x86/kernel/asm-offsets_64.c
diff --git a/arch/x86_64/kernel/audit.c b/arch/x86/kernel/audit_64.c
index 06d3e5a14d9d..06d3e5a14d9d 100644
--- a/arch/x86_64/kernel/audit.c
+++ b/arch/x86/kernel/audit_64.c
diff --git a/arch/i386/kernel/bootflag.c b/arch/x86/kernel/bootflag.c
index 0b9860530a6b..0b9860530a6b 100644
--- a/arch/i386/kernel/bootflag.c
+++ b/arch/x86/kernel/bootflag.c
diff --git a/arch/x86_64/kernel/bugs.c b/arch/x86/kernel/bugs_64.c
index 4e5e9d364d63..4e5e9d364d63 100644
--- a/arch/x86_64/kernel/bugs.c
+++ b/arch/x86/kernel/bugs_64.c
diff --git a/arch/i386/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 778396c78d65..778396c78d65 100644
--- a/arch/i386/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
diff --git a/arch/i386/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c
index 3e91d3ee26ec..3e91d3ee26ec 100644
--- a/arch/i386/kernel/cpu/addon_cpuid_features.c
+++ b/arch/x86/kernel/cpu/addon_cpuid_features.c
diff --git a/arch/i386/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index dcf6bbb1c7c0..dcf6bbb1c7c0 100644
--- a/arch/i386/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
diff --git a/arch/i386/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 59266f03d1cd..59266f03d1cd 100644
--- a/arch/i386/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
diff --git a/arch/i386/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c
index 473eac883c7b..473eac883c7b 100644
--- a/arch/i386/kernel/cpu/centaur.c
+++ b/arch/x86/kernel/cpu/centaur.c
diff --git a/arch/i386/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index d506201d397c..d506201d397c 100644
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
diff --git a/arch/i386/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h
index 2f6432cef6ff..2f6432cef6ff 100644
--- a/arch/i386/kernel/cpu/cpu.h
+++ b/arch/x86/kernel/cpu/cpu.h
diff --git a/arch/i386/kernel/cpu/cpufreq/Kconfig b/arch/x86/kernel/cpu/cpufreq/Kconfig
index d8c6f132dc7a..d8c6f132dc7a 100644
--- a/arch/i386/kernel/cpu/cpufreq/Kconfig
+++ b/arch/x86/kernel/cpu/cpufreq/Kconfig
diff --git a/arch/i386/kernel/cpu/cpufreq/Makefile b/arch/x86/kernel/cpu/cpufreq/Makefile
index 560f7760dae5..560f7760dae5 100644
--- a/arch/i386/kernel/cpu/cpufreq/Makefile
+++ b/arch/x86/kernel/cpu/cpufreq/Makefile
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index 42115b609f63..ffd01e5dcb52 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -533,13 +533,13 @@ static int __init acpi_cpufreq_early_init(void)
  */
 static int bios_with_sw_any_bug;
 
-static int sw_any_bug_found(struct dmi_system_id *d)
+static int sw_any_bug_found(const struct dmi_system_id *d)
 {
         bios_with_sw_any_bug = 1;
         return 0;
 }
 
-static struct dmi_system_id sw_any_bug_dmi_table[] = {
+static const struct dmi_system_id sw_any_bug_dmi_table[] = {
         {
                 .callback = sw_any_bug_found,
                 .ident = "Supermicro Server X6DLP",
diff --git a/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
index 32f0bda3fc95..32f0bda3fc95 100644
--- a/arch/i386/kernel/cpu/cpufreq/cpufreq-nforce2.c
+++ b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
diff --git a/arch/i386/kernel/cpu/cpufreq/e_powersaver.c b/arch/x86/kernel/cpu/cpufreq/e_powersaver.c
index c11baaf9f2b4..c11baaf9f2b4 100644
--- a/arch/i386/kernel/cpu/cpufreq/e_powersaver.c
+++ b/arch/x86/kernel/cpu/cpufreq/e_powersaver.c
diff --git a/arch/i386/kernel/cpu/cpufreq/elanfreq.c b/arch/x86/kernel/cpu/cpufreq/elanfreq.c
index 1e7ae7dafcf6..1e7ae7dafcf6 100644
--- a/arch/i386/kernel/cpu/cpufreq/elanfreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/elanfreq.c
diff --git a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c b/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c
index ed2bda127c44..ed2bda127c44 100644
--- a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c
+++ b/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/x86/kernel/cpu/cpufreq/longhaul.c
index a2fbfd912a08..5045f5d583c8 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/x86/kernel/cpu/cpufreq/longhaul.c
@@ -76,6 +76,7 @@ static unsigned int longhaul_index;
 /* Module parameters */
 static int scale_voltage;
 static int disable_acpi_c3;
+static int revid_errata;
 
 #define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "longhaul", msg)
 
@@ -168,7 +169,10 @@ static void do_powersaver(int cx_address, unsigned int clock_ratio_index,
 
         rdmsrl(MSR_VIA_LONGHAUL, longhaul.val);
         /* Setup new frequency */
-        longhaul.bits.RevisionKey = longhaul.bits.RevisionID;
+        if (!revid_errata)
+                longhaul.bits.RevisionKey = longhaul.bits.RevisionID;
+        else
+                longhaul.bits.RevisionKey = 0;
         longhaul.bits.SoftBusRatio = clock_ratio_index & 0xf;
         longhaul.bits.SoftBusRatio4 = (clock_ratio_index & 0x10) >> 4;
         /* Setup new voltage */
@@ -272,7 +276,7 @@ static void longhaul_setstate(unsigned int table_index)
 
         dprintk ("Setting to FSB:%dMHz Mult:%d.%dx (%s)\n",
                         fsb, mult/10, mult%10, print_speed(speed/1000));
-
+retry_loop:
         preempt_disable();
         local_irq_save(flags);
 
@@ -344,6 +348,47 @@ static void longhaul_setstate(unsigned int table_index)
         preempt_enable();
 
         freqs.new = calc_speed(longhaul_get_cpu_mult());
+        /* Check if requested frequency is set. */
+        if (unlikely(freqs.new != speed)) {
+                printk(KERN_INFO PFX "Failed to set requested frequency!\n");
+                /* Revision ID = 1 but processor is expecting revision key
+                 * equal to 0. Jumpers at the bottom of processor will change
+                 * multiplier and FSB, but will not change bits in Longhaul
+                 * MSR nor enable voltage scaling. */
+                if (!revid_errata) {
+                        printk(KERN_INFO PFX "Enabling \"Ignore Revision ID\" "
+                                                "option.\n");
+                        revid_errata = 1;
+                        msleep(200);
+                        goto retry_loop;
+                }
+                /* Why ACPI C3 sometimes doesn't work is a mystery for me.
+                 * But it does happen. Processor is entering ACPI C3 state,
+                 * but it doesn't change frequency. I tried poking various
+                 * bits in northbridge registers, but without success. */
+                if (longhaul_flags & USE_ACPI_C3) {
+                        printk(KERN_INFO PFX "Disabling ACPI C3 support.\n");
+                        longhaul_flags &= ~USE_ACPI_C3;
+                        if (revid_errata) {
+                                printk(KERN_INFO PFX "Disabling \"Ignore "
+                                                "Revision ID\" option.\n");
+                                revid_errata = 0;
+                        }
+                        msleep(200);
+                        goto retry_loop;
+                }
+                /* This shouldn't happen. Longhaul ver. 2 was reported not
+                 * working on processors without voltage scaling, but with
+                 * RevID = 1. RevID errata will make things right. Just
+                 * to be 100% sure. */
+                if (longhaul_version == TYPE_LONGHAUL_V2) {
+                        printk(KERN_INFO PFX "Switching to Longhaul ver. 1\n");
+                        longhaul_version = TYPE_LONGHAUL_V1;
+                        msleep(200);
+                        goto retry_loop;
+                }
+        }
+        /* Report true CPU frequency */
         cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
 
         if (!bm_timeout)
@@ -959,11 +1004,20 @@ static void __exit longhaul_exit(void)
         kfree(longhaul_table);
 }
 
+/* Even if BIOS is exporting ACPI C3 state, and it is used
+ * with success when CPU is idle, this state doesn't
+ * trigger frequency transition in some cases. */
 module_param (disable_acpi_c3, int, 0644);
 MODULE_PARM_DESC(disable_acpi_c3, "Don't use ACPI C3 support");
-
+/* Change CPU voltage with frequency. Very usefull to save
+ * power, but most VIA C3 processors aren't supporting it. */
 module_param (scale_voltage, int, 0644);
 MODULE_PARM_DESC(scale_voltage, "Scale voltage of processor");
+/* Force revision key to 0 for processors which doesn't
+ * support voltage scaling, but are introducing itself as
+ * such. */
+module_param(revid_errata, int, 0644);
+MODULE_PARM_DESC(revid_errata, "Ignore CPU Revision ID");
 
 MODULE_AUTHOR ("Dave Jones <davej@codemonkey.org.uk>");
 MODULE_DESCRIPTION ("Longhaul driver for VIA Cyrix processors.");
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.h b/arch/x86/kernel/cpu/cpufreq/longhaul.h
index 4fcc320997df..4fcc320997df 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.h
+++ b/arch/x86/kernel/cpu/cpufreq/longhaul.h
diff --git a/arch/i386/kernel/cpu/cpufreq/longrun.c b/arch/x86/kernel/cpu/cpufreq/longrun.c
index b2689514295a..b2689514295a 100644
--- a/arch/i386/kernel/cpu/cpufreq/longrun.c
+++ b/arch/x86/kernel/cpu/cpufreq/longrun.c
diff --git a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
index 8eb414b906d2..8eb414b906d2 100644
--- a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k6.c b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
index 6d0285339317..6d0285339317 100644
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k6.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
index 7decd6a50ffa..7decd6a50ffa 100644
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k7.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k7.h b/arch/x86/kernel/cpu/cpufreq/powernow-k7.h
index f8a63b3664e3..f8a63b3664e3 100644
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k7.h
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k7.h
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index b273b69cfddf..b273b69cfddf 100644
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.h b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h
index b06c812208ca..b06c812208ca 100644
--- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.h
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h
diff --git a/arch/i386/kernel/cpu/cpufreq/sc520_freq.c b/arch/x86/kernel/cpu/cpufreq/sc520_freq.c
index d9f3e90a7ae0..d9f3e90a7ae0 100644
--- a/arch/i386/kernel/cpu/cpufreq/sc520_freq.c
+++ b/arch/x86/kernel/cpu/cpufreq/sc520_freq.c
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
index 811d47438546..811d47438546 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
index 36685e8f7be1..36685e8f7be1 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-ich.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
index b1acc8ce3167..b1acc8ce3167 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.h b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.h
index b11bcc608cac..b11bcc608cac 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.h
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.h
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c b/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c
index f2b5a621d27b..f2b5a621d27b 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c
diff --git a/arch/i386/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index 122d2d75aa9f..122d2d75aa9f 100644
--- a/arch/i386/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
diff --git a/arch/i386/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index dc4e08147b1f..dc4e08147b1f 100644
--- a/arch/i386/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
diff --git a/arch/i386/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index db6c25aa5776..db6c25aa5776 100644
--- a/arch/i386/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
diff --git a/arch/i386/kernel/cpu/mcheck/Makefile b/arch/x86/kernel/cpu/mcheck/Makefile
index f1ebe1c1c17a..f1ebe1c1c17a 100644
--- a/arch/i386/kernel/cpu/mcheck/Makefile
+++ b/arch/x86/kernel/cpu/mcheck/Makefile
diff --git a/arch/i386/kernel/cpu/mcheck/k7.c b/arch/x86/kernel/cpu/mcheck/k7.c
index eef63e3630c2..eef63e3630c2 100644
--- a/arch/i386/kernel/cpu/mcheck/k7.c
+++ b/arch/x86/kernel/cpu/mcheck/k7.c
diff --git a/arch/i386/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 34c781eddee4..34c781eddee4 100644
--- a/arch/i386/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
diff --git a/arch/i386/kernel/cpu/mcheck/mce.h b/arch/x86/kernel/cpu/mcheck/mce.h
index 81fb6e2d35f3..81fb6e2d35f3 100644
--- a/arch/i386/kernel/cpu/mcheck/mce.h
+++ b/arch/x86/kernel/cpu/mcheck/mce.h
diff --git a/arch/i386/kernel/cpu/mcheck/non-fatal.c b/arch/x86/kernel/cpu/mcheck/non-fatal.c
index bf39409b3838..bf39409b3838 100644
--- a/arch/i386/kernel/cpu/mcheck/non-fatal.c
+++ b/arch/x86/kernel/cpu/mcheck/non-fatal.c
diff --git a/arch/i386/kernel/cpu/mcheck/p4.c b/arch/x86/kernel/cpu/mcheck/p4.c
index 1509edfb2313..1509edfb2313 100644
--- a/arch/i386/kernel/cpu/mcheck/p4.c
+++ b/arch/x86/kernel/cpu/mcheck/p4.c
diff --git a/arch/i386/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
index 94bc43d950cf..94bc43d950cf 100644
--- a/arch/i386/kernel/cpu/mcheck/p5.c
+++ b/arch/x86/kernel/cpu/mcheck/p5.c
diff --git a/arch/i386/kernel/cpu/mcheck/p6.c b/arch/x86/kernel/cpu/mcheck/p6.c
index deeae42ce199..deeae42ce199 100644
--- a/arch/i386/kernel/cpu/mcheck/p6.c
+++ b/arch/x86/kernel/cpu/mcheck/p6.c
diff --git a/arch/i386/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 1203dc5ab87a..1203dc5ab87a 100644
--- a/arch/i386/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
diff --git a/arch/i386/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
index 9e424b6c293d..9e424b6c293d 100644
--- a/arch/i386/kernel/cpu/mcheck/winchip.c
+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
diff --git a/arch/i386/kernel/cpu/mtrr/Makefile b/arch/x86/kernel/cpu/mtrr/Makefile
index 191fc0533649..191fc0533649 100644
--- a/arch/i386/kernel/cpu/mtrr/Makefile
+++ b/arch/x86/kernel/cpu/mtrr/Makefile
diff --git a/arch/i386/kernel/cpu/mtrr/amd.c b/arch/x86/kernel/cpu/mtrr/amd.c
index 0949cdbf848a..0949cdbf848a 100644
--- a/arch/i386/kernel/cpu/mtrr/amd.c
+++ b/arch/x86/kernel/cpu/mtrr/amd.c
diff --git a/arch/i386/kernel/cpu/mtrr/centaur.c b/arch/x86/kernel/cpu/mtrr/centaur.c
index cb9aa3a7a7ab..cb9aa3a7a7ab 100644
--- a/arch/i386/kernel/cpu/mtrr/centaur.c
+++ b/arch/x86/kernel/cpu/mtrr/centaur.c
diff --git a/arch/i386/kernel/cpu/mtrr/cyrix.c b/arch/x86/kernel/cpu/mtrr/cyrix.c
index 2287d4863a8a..2287d4863a8a 100644
--- a/arch/i386/kernel/cpu/mtrr/cyrix.c
+++ b/arch/x86/kernel/cpu/mtrr/cyrix.c
diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 56f64e34829f..56f64e34829f 100644
--- a/arch/i386/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
diff --git a/arch/i386/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
index c7d8f1756745..c7d8f1756745 100644
--- a/arch/i386/kernel/cpu/mtrr/if.c
+++ b/arch/x86/kernel/cpu/mtrr/if.c
diff --git a/arch/i386/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index c48b6fea5ab4..c48b6fea5ab4 100644
--- a/arch/i386/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
diff --git a/arch/i386/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
index 289dfe6030e3..289dfe6030e3 100644
--- a/arch/i386/kernel/cpu/mtrr/mtrr.h
+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
diff --git a/arch/i386/kernel/cpu/mtrr/state.c b/arch/x86/kernel/cpu/mtrr/state.c
index c9014ca4a575..49e20c2afcdf 100644
--- a/arch/i386/kernel/cpu/mtrr/state.c
+++ b/arch/x86/kernel/cpu/mtrr/state.c
@@ -3,7 +3,7 @@
 #include <asm/io.h>
 #include <asm/mtrr.h>
 #include <asm/msr.h>
-#include <asm-i386/processor-cyrix.h>
+#include <asm/processor-cyrix.h>
 #include "mtrr.h"
 
 
diff --git a/arch/i386/kernel/cpu/nexgen.c b/arch/x86/kernel/cpu/nexgen.c
index 961fbe1a748f..961fbe1a748f 100644
--- a/arch/i386/kernel/cpu/nexgen.c
+++ b/arch/x86/kernel/cpu/nexgen.c
diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
index 93fecd4b03de..93fecd4b03de 100644
--- a/arch/i386/kernel/cpu/perfctr-watchdog.c
+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
diff --git a/arch/i386/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index 1e31b6caffb1..1e31b6caffb1 100644
--- a/arch/i386/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
diff --git a/arch/i386/kernel/cpu/transmeta.c b/arch/x86/kernel/cpu/transmeta.c
index 200fb3f9ebfb..200fb3f9ebfb 100644
--- a/arch/i386/kernel/cpu/transmeta.c
+++ b/arch/x86/kernel/cpu/transmeta.c
diff --git a/arch/i386/kernel/cpu/umc.c b/arch/x86/kernel/cpu/umc.c
index a7a4e75bdcd7..a7a4e75bdcd7 100644
--- a/arch/i386/kernel/cpu/umc.c
+++ b/arch/x86/kernel/cpu/umc.c
diff --git a/arch/x86_64/kernel/cpufreq/Kconfig b/arch/x86/kernel/cpufreq/Kconfig
index a3fd51926cbd..a3fd51926cbd 100644
--- a/arch/x86_64/kernel/cpufreq/Kconfig
+++ b/arch/x86/kernel/cpufreq/Kconfig
diff --git a/arch/i386/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 5c2faa10e9fa..5c2faa10e9fa 100644
--- a/arch/i386/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
diff --git a/arch/i386/kernel/crash.c b/arch/x86/kernel/crash_32.c
index 53589d1b1a05..53589d1b1a05 100644
--- a/arch/i386/kernel/crash.c
+++ b/arch/x86/kernel/crash_32.c
diff --git a/arch/x86_64/kernel/crash.c b/arch/x86/kernel/crash_64.c
index 13432a1ae904..13432a1ae904 100644
--- a/arch/x86_64/kernel/crash.c
+++ b/arch/x86/kernel/crash_64.c
diff --git a/arch/i386/kernel/crash_dump.c b/arch/x86/kernel/crash_dump_32.c
index 3f532df488bc..3f532df488bc 100644
--- a/arch/i386/kernel/crash_dump.c
+++ b/arch/x86/kernel/crash_dump_32.c
diff --git a/arch/x86_64/kernel/crash_dump.c b/arch/x86/kernel/crash_dump_64.c
index 942deac4d43a..942deac4d43a 100644
--- a/arch/x86_64/kernel/crash_dump.c
+++ b/arch/x86/kernel/crash_dump_64.c
diff --git a/arch/i386/kernel/doublefault.c b/arch/x86/kernel/doublefault_32.c
index 40978af630e7..40978af630e7 100644
--- a/arch/i386/kernel/doublefault.c
+++ b/arch/x86/kernel/doublefault_32.c
diff --git a/arch/i386/kernel/e820.c b/arch/x86/kernel/e820_32.c
index 3c86b979a40a..3c86b979a40a 100644
--- a/arch/i386/kernel/e820.c
+++ b/arch/x86/kernel/e820_32.c
diff --git a/arch/x86_64/kernel/e820.c b/arch/x86/kernel/e820_64.c
index 0f4d5e209e9b..0f4d5e209e9b 100644
--- a/arch/x86_64/kernel/e820.c
+++ b/arch/x86/kernel/e820_64.c
diff --git a/arch/x86_64/kernel/early-quirks.c b/arch/x86/kernel/early-quirks_64.c
index 13aa4fd728f3..13aa4fd728f3 100644
--- a/arch/x86_64/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks_64.c
diff --git a/arch/x86_64/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index fd9aff3f3890..fd9aff3f3890 100644
--- a/arch/x86_64/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
diff --git a/arch/i386/kernel/efi.c b/arch/x86/kernel/efi_32.c
index 2452c6fbe992..2452c6fbe992 100644
--- a/arch/i386/kernel/efi.c
+++ b/arch/x86/kernel/efi_32.c
diff --git a/arch/i386/kernel/efi_stub.S b/arch/x86/kernel/efi_stub_32.S
index ef00bb77d7e4..ef00bb77d7e4 100644
--- a/arch/i386/kernel/efi_stub.S
+++ b/arch/x86/kernel/efi_stub_32.S
diff --git a/arch/i386/kernel/entry.S b/arch/x86/kernel/entry_32.S
index a714d6b43506..290b7bc82da3 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1107,6 +1107,6 @@ ENDPROC(xen_failsafe_callback)
 #endif  /* CONFIG_XEN */
 
 .section .rodata,"a"
-#include "syscall_table.S"
+#include "syscall_table_32.S"
 
 syscall_table_size=(.-sys_call_table)
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86/kernel/entry_64.S
index 1d232e5f5658..1d232e5f5658 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86/kernel/entry_64.S
diff --git a/arch/x86_64/kernel/genapic.c b/arch/x86/kernel/genapic_64.c
index 47496a40e84f..47496a40e84f 100644
--- a/arch/x86_64/kernel/genapic.c
+++ b/arch/x86/kernel/genapic_64.c
diff --git a/arch/x86_64/kernel/genapic_flat.c b/arch/x86/kernel/genapic_flat_64.c
index ecb01eefdd27..ecb01eefdd27 100644
--- a/arch/x86_64/kernel/genapic_flat.c
+++ b/arch/x86/kernel/genapic_flat_64.c
diff --git a/arch/i386/kernel/geode.c b/arch/x86/kernel/geode_32.c
index 41e8aec4c61d..f12d8c5d9809 100644
--- a/arch/i386/kernel/geode.c
+++ b/arch/x86/kernel/geode_32.c
@@ -145,10 +145,14 @@ EXPORT_SYMBOL_GPL(geode_gpio_setup_event);
 
 static int __init geode_southbridge_init(void)
 {
+        int timers;
+
         if (!is_geode())
                 return -ENODEV;
 
         init_lbars();
+        timers = geode_mfgpt_detect();
+        printk(KERN_INFO "geode:  %d MFGPT timers available.\n", timers);
         return 0;
 }
 
diff --git a/arch/x86_64/kernel/head64.c b/arch/x86/kernel/head64.c
index 6c34bdd22e26..6c34bdd22e26 100644
--- a/arch/x86_64/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
diff --git a/arch/i386/kernel/head.S b/arch/x86/kernel/head_32.S
index 8f0382161c91..9150ca9b5f80 100644
--- a/arch/i386/kernel/head.S
+++ b/arch/x86/kernel/head_32.S
@@ -537,7 +537,7 @@ fault_msg:
         .ascii "Int %d: CR2 %p  err %p  EIP %p  CS %p  flags %p\n"
         .asciz "Stack: %p %p %p %p %p %p %p %p\n"
 
-#include "../xen/xen-head.S"
+#include "../../x86/xen/xen-head.S"
 
 /*
  * The IDT and GDT 'descriptors' are a strange 48-bit object
diff --git a/arch/x86_64/kernel/head.S b/arch/x86/kernel/head_64.S
index b6167fe3330e..b6167fe3330e 100644
--- a/arch/x86_64/kernel/head.S
+++ b/arch/x86/kernel/head_64.S
diff --git a/arch/i386/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 533d4932bc79..f8367074da0d 100644
--- a/arch/i386/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -1,5 +1,6 @@
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
+#include <linux/delay.h>
 #include <linux/errno.h>
 #include <linux/hpet.h>
 #include <linux/init.h>
@@ -7,11 +8,11 @@
 #include <linux/pm.h>
 #include <linux/delay.h>
 
+#include <asm/fixmap.h>
 #include <asm/hpet.h>
+#include <asm/i8253.h>
 #include <asm/io.h>
 
-extern struct clock_event_device *global_clock_event;
-
 #define HPET_MASK       CLOCKSOURCE_MASK(32)
 #define HPET_SHIFT      22
 
@@ -22,9 +23,9 @@ extern struct clock_event_device *global_clock_event;
  * HPET address is set in acpi/boot.c, when an ACPI entry exists
  */
 unsigned long hpet_address;
-static void __iomem * hpet_virt_address;
+static void __iomem *hpet_virt_address;
 
-static inline unsigned long hpet_readl(unsigned long a)
+unsigned long hpet_readl(unsigned long a)
 {
         return readl(hpet_virt_address + a);
 }
@@ -34,6 +35,36 @@ static inline void hpet_writel(unsigned long d, unsigned long a)
         writel(d, hpet_virt_address + a);
 }
 
+#ifdef CONFIG_X86_64
+
+#include <asm/pgtable.h>
+
+static inline void hpet_set_mapping(void)
+{
+        set_fixmap_nocache(FIX_HPET_BASE, hpet_address);
+        __set_fixmap(VSYSCALL_HPET, hpet_address, PAGE_KERNEL_VSYSCALL_NOCACHE);
+        hpet_virt_address = (void __iomem *)fix_to_virt(FIX_HPET_BASE);
+}
+
+static inline void hpet_clear_mapping(void)
+{
+        hpet_virt_address = NULL;
+}
+
+#else
+
+static inline void hpet_set_mapping(void)
+{
+        hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);
+}
+
+static inline void hpet_clear_mapping(void)
+{
+        iounmap(hpet_virt_address);
+        hpet_virt_address = NULL;
+}
+#endif
+
 /*
  * HPET command line enable / disable
  */
@@ -49,6 +80,13 @@ static int __init hpet_setup(char* str)
 }
 __setup("hpet=", hpet_setup);
 
+static int __init disable_hpet(char *str)
+{
+        boot_hpet_disable = 1;
+        return 1;
+}
+__setup("nohpet", disable_hpet);
+
 static inline int is_hpet_capable(void)
 {
         return (!boot_hpet_disable && hpet_address);
@@ -83,7 +121,7 @@ static void hpet_reserve_platform_timers(unsigned long id)
 
         memset(&hd, 0, sizeof (hd));
         hd.hd_phys_address = hpet_address;
-        hd.hd_address = hpet_virt_address;
+        hd.hd_address = hpet;
         hd.hd_nirqs = nrtimers;
         hd.hd_flags = HPET_DATA_PLATFORM;
         hpet_reserve_timer(&hd, 0);
@@ -111,9 +149,9 @@ static void hpet_reserve_platform_timers(unsigned long id) { }
  */
 static unsigned long hpet_period;
 
-static void hpet_set_mode(enum clock_event_mode mode,
+static void hpet_legacy_set_mode(enum clock_event_mode mode,
                           struct clock_event_device *evt);
-static int hpet_next_event(unsigned long delta,
+static int hpet_legacy_next_event(unsigned long delta,
                            struct clock_event_device *evt);
 
 /*
@@ -122,10 +160,11 @@ static int hpet_next_event(unsigned long delta,
 static struct clock_event_device hpet_clockevent = {
         .name           = "hpet",
         .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-        .set_mode       = hpet_set_mode,
-        .set_next_event = hpet_next_event,
+        .set_mode       = hpet_legacy_set_mode,
+        .set_next_event = hpet_legacy_next_event,
         .shift          = 32,
         .irq            = 0,
+        .rating         = 50,
 };
 
 static void hpet_start_counter(void)
@@ -140,7 +179,18 @@ static void hpet_start_counter(void)
         hpet_writel(cfg, HPET_CFG);
 }
 
-static void hpet_enable_int(void)
+static void hpet_resume_device(void)
+{
+        force_hpet_resume();
+}
+
+static void hpet_restart_counter(void)
+{
+        hpet_resume_device();
+        hpet_start_counter();
+}
+
+static void hpet_enable_legacy_int(void)
 {
         unsigned long cfg = hpet_readl(HPET_CFG);
 
@@ -149,7 +199,39 @@ static void hpet_enable_int(void)
         hpet_legacy_int_enabled = 1;
 }
 
-static void hpet_set_mode(enum clock_event_mode mode,
+static void hpet_legacy_clockevent_register(void)
+{
+        uint64_t hpet_freq;
+
+        /* Start HPET legacy interrupts */
+        hpet_enable_legacy_int();
+
+        /*
+         * The period is a femto seconds value. We need to calculate the
+         * scaled math multiplication factor for nanosecond to hpet tick
+         * conversion.
+         */
+        hpet_freq = 1000000000000000ULL;
+        do_div(hpet_freq, hpet_period);
+        hpet_clockevent.mult = div_sc((unsigned long) hpet_freq,
+                                      NSEC_PER_SEC, 32);
+        /* Calculate the min / max delta */
+        hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF,
+                                                           &hpet_clockevent);
+        hpet_clockevent.min_delta_ns = clockevent_delta2ns(0x30,
+                                                           &hpet_clockevent);
+
+        /*
+         * Start hpet with the boot cpu mask and make it
+         * global after the IO_APIC has been initialized.
+         */
+        hpet_clockevent.cpumask = cpumask_of_cpu(smp_processor_id());
+        clockevents_register_device(&hpet_clockevent);
+        global_clock_event = &hpet_clockevent;
+        printk(KERN_DEBUG "hpet clockevent registered\n");
+}
+
+static void hpet_legacy_set_mode(enum clock_event_mode mode,
                           struct clock_event_device *evt)
 {
         unsigned long cfg, cmp, now;
@@ -190,12 +272,12 @@ static void hpet_set_mode(enum clock_event_mode mode,
                 break;
 
         case CLOCK_EVT_MODE_RESUME:
-                hpet_enable_int();
+                hpet_enable_legacy_int();
                 break;
         }
 }
 
-static int hpet_next_event(unsigned long delta,
+static int hpet_legacy_next_event(unsigned long delta,
                            struct clock_event_device *evt)
 {
         unsigned long cnt;
@@ -215,6 +297,13 @@ static cycle_t read_hpet(void)
         return (cycle_t)hpet_readl(HPET_COUNTER);
 }
 
+#ifdef CONFIG_X86_64
+static cycle_t __vsyscall_fn vread_hpet(void)
+{
+        return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0);
+}
+#endif
+
 static struct clocksource clocksource_hpet = {
         .name           = "hpet",
         .rating         = 250,
@@ -222,61 +311,17 @@ static struct clocksource clocksource_hpet = {
         .mask           = HPET_MASK,
         .shift          = HPET_SHIFT,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-        .resume         = hpet_start_counter,
+        .resume         = hpet_restart_counter,
+#ifdef CONFIG_X86_64
+        .vread          = vread_hpet,
+#endif
 };
 
-/*
- * Try to setup the HPET timer
- */
-int __init hpet_enable(void)
+static int hpet_clocksource_register(void)
 {
-        unsigned long id;
-        uint64_t hpet_freq;
         u64 tmp, start, now;
         cycle_t t1;
 
-        if (!is_hpet_capable())
-                return 0;
-
-        hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);
-
-        /*
-         * Read the period and check for a sane value:
-         */
-        hpet_period = hpet_readl(HPET_PERIOD);
-        if (hpet_period < HPET_MIN_PERIOD || hpet_period > HPET_MAX_PERIOD)
-                goto out_nohpet;
-
-        /*
-         * The period is a femto seconds value. We need to calculate the
-         * scaled math multiplication factor for nanosecond to hpet tick
-         * conversion.
-         */
-        hpet_freq = 1000000000000000ULL;
-        do_div(hpet_freq, hpet_period);
-        hpet_clockevent.mult = div_sc((unsigned long) hpet_freq,
-                                      NSEC_PER_SEC, 32);
-        /* Calculate the min / max delta */
-        hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF,
-                                                           &hpet_clockevent);
-        hpet_clockevent.min_delta_ns = clockevent_delta2ns(0x30,
-                                                           &hpet_clockevent);
-
-        /*
-         * Read the HPET ID register to retrieve the IRQ routing
-         * information and the number of channels
-         */
-        id = hpet_readl(HPET_ID);
-
-#ifdef CONFIG_HPET_EMULATE_RTC
-        /*
-         * The legacy routing mode needs at least two channels, tick timer
-         * and the rtc emulation channel.
-         */
-        if (!(id & HPET_ID_NUMBER))
-                goto out_nohpet;
-#endif
-
         /* Start the counter */
         hpet_start_counter();
 
@@ -298,7 +343,7 @@ int __init hpet_enable(void)
         if (t1 == read_hpet()) {
                 printk(KERN_WARNING
                        "HPET counter not counting. HPET disabled\n");
-                goto out_nohpet;
+                return -ENODEV;
         }
 
         /* Initialize and register HPET clocksource
@@ -319,27 +364,84 @@ int __init hpet_enable(void)
 
         clocksource_register(&clocksource_hpet);
 
+        return 0;
+}
+
+/*
+ * Try to setup the HPET timer
+ */
+int __init hpet_enable(void)
+{
+        unsigned long id;
+
+        if (!is_hpet_capable())
+                return 0;
+
+        hpet_set_mapping();
+
+        /*
+         * Read the period and check for a sane value:
+         */
+        hpet_period = hpet_readl(HPET_PERIOD);
+        if (hpet_period < HPET_MIN_PERIOD || hpet_period > HPET_MAX_PERIOD)
+                goto out_nohpet;
+
+        /*
+         * Read the HPET ID register to retrieve the IRQ routing
+         * information and the number of channels
+         */
+        id = hpet_readl(HPET_ID);
+
+#ifdef CONFIG_HPET_EMULATE_RTC
+        /*
+         * The legacy routing mode needs at least two channels, tick timer
+         * and the rtc emulation channel.
+         */
+        if (!(id & HPET_ID_NUMBER))
+                goto out_nohpet;
+#endif
+
+        if (hpet_clocksource_register())
+                goto out_nohpet;
+
         if (id & HPET_ID_LEGSUP) {
-                hpet_enable_int();
-                hpet_reserve_platform_timers(id);
-                /*
-                 * Start hpet with the boot cpu mask and make it
-                 * global after the IO_APIC has been initialized.
-                 */
-                hpet_clockevent.cpumask = cpumask_of_cpu(smp_processor_id());
-                clockevents_register_device(&hpet_clockevent);
-                global_clock_event = &hpet_clockevent;
+                hpet_legacy_clockevent_register();
                 return 1;
         }
         return 0;
 
 out_nohpet:
-        iounmap(hpet_virt_address);
-        hpet_virt_address = NULL;
+        hpet_clear_mapping();
         boot_hpet_disable = 1;
         return 0;
 }
 
+/*
+ * Needs to be late, as the reserve_timer code calls kalloc !
+ *
+ * Not a problem on i386 as hpet_enable is called from late_time_init,
+ * but on x86_64 it is necessary !
+ */
+static __init int hpet_late_init(void)
+{
+        if (boot_hpet_disable)
+                return -ENODEV;
+
+        if (!hpet_address) {
+                if (!force_hpet_address)
+                        return -ENODEV;
+
+                hpet_address = force_hpet_address;
+                hpet_enable();
+                if (!hpet_virt_address)
+                        return -ENODEV;
+        }
+
+        hpet_reserve_platform_timers(hpet_readl(HPET_ID));
+
+        return 0;
+}
+fs_initcall(hpet_late_init);
 
 #ifdef CONFIG_HPET_EMULATE_RTC
 
diff --git a/arch/i386/kernel/i386_ksyms.c b/arch/x86/kernel/i386_ksyms_32.c
index e3d4b73bfdb0..e3d4b73bfdb0 100644
--- a/arch/i386/kernel/i386_ksyms.c
+++ b/arch/x86/kernel/i386_ksyms_32.c
diff --git a/arch/i386/kernel/i387.c b/arch/x86/kernel/i387_32.c
index 665847281ed2..665847281ed2 100644
--- a/arch/i386/kernel/i387.c
+++ b/arch/x86/kernel/i387_32.c
diff --git a/arch/x86_64/kernel/i387.c b/arch/x86/kernel/i387_64.c
index 1d58c13bc6bc..1d58c13bc6bc 100644
--- a/arch/x86_64/kernel/i387.c
+++ b/arch/x86/kernel/i387_64.c
diff --git a/arch/i386/kernel/i8237.c b/arch/x86/kernel/i8237.c
index 6f508e8d7c57..6f508e8d7c57 100644
--- a/arch/i386/kernel/i8237.c
+++ b/arch/x86/kernel/i8237.c
diff --git a/arch/i386/kernel/i8253.c b/arch/x86/kernel/i8253.c
index 6d839f2f1b1a..ac15e4cbd9c1 100644
--- a/arch/i386/kernel/i8253.c
+++ b/arch/x86/kernel/i8253.c
@@ -13,7 +13,6 @@
 #include <asm/delay.h>
 #include <asm/i8253.h>
 #include <asm/io.h>
-#include <asm/timer.h>
 
 DEFINE_SPINLOCK(i8253_lock);
 EXPORT_SYMBOL(i8253_lock);
@@ -120,6 +119,7 @@ void __init setup_pit_timer(void)
         global_clock_event = &pit_clockevent;
 }
 
+#ifndef CONFIG_X86_64
 /*
  * Since the PIT overflows every tick, its not very useful
  * to just read by itself. So use jiffies to emulate a free
@@ -204,3 +204,5 @@ static int __init init_pit_clocksource(void)
         return clocksource_register(&clocksource_pit);
 }
 arch_initcall(init_pit_clocksource);
+
+#endif
diff --git a/arch/i386/kernel/i8259.c b/arch/x86/kernel/i8259_32.c
index 0499cbe9871a..679bb33acbf1 100644
--- a/arch/i386/kernel/i8259.c
+++ b/arch/x86/kernel/i8259_32.c
@@ -10,7 +10,6 @@
 #include <linux/sysdev.h>
 #include <linux/bitops.h>
 
-#include <asm/8253pit.h>
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/io.h>
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86/kernel/i8259_64.c
index 948cae646099..eb72976cc13c 100644
--- a/arch/x86_64/kernel/i8259.c
+++ b/arch/x86/kernel/i8259_64.c
@@ -444,46 +444,6 @@ void __init init_ISA_irqs (void)
         }
 }
 
-static void setup_timer_hardware(void)
-{
-        outb_p(0x34,0x43);              /* binary, mode 2, LSB/MSB, ch 0 */
-        udelay(10);
-        outb_p(LATCH & 0xff , 0x40);    /* LSB */
-        udelay(10);
-        outb(LATCH >> 8 , 0x40);        /* MSB */
-}
-
-static int timer_resume(struct sys_device *dev)
-{
-        setup_timer_hardware();
-        return 0;
-}
-
-void i8254_timer_resume(void)
-{
-        setup_timer_hardware();
-}
-
-static struct sysdev_class timer_sysclass = {
-        set_kset_name("timer_pit"),
-        .resume         = timer_resume,
-};
-
-static struct sys_device device_timer = {
-        .id             = 0,
-        .cls            = &timer_sysclass,
-};
-
-static int __init init_timer_sysfs(void)
-{
-        int error = sysdev_class_register(&timer_sysclass);
-        if (!error)
-                error = sysdev_register(&device_timer);
-        return error;
-}
-
-device_initcall(init_timer_sysfs);
-
 void __init init_IRQ(void)
 {
         int i;
@@ -533,12 +493,6 @@ void __init init_IRQ(void)
         set_intr_gate(SPURIOUS_APIC_VECTOR, spurious_interrupt);
         set_intr_gate(ERROR_APIC_VECTOR, error_interrupt);
 
-        /*
-         * Set the clock to HZ Hz, we already have a valid
-         * vector now:
-         */
-        setup_timer_hardware();
-
         if (!acpi_ioapic)
                 setup_irq(2, &irq2);
 }
diff --git a/arch/i386/kernel/init_task.c b/arch/x86/kernel/init_task_32.c
index d26fc063a760..d26fc063a760 100644
--- a/arch/i386/kernel/init_task.c
+++ b/arch/x86/kernel/init_task_32.c
diff --git a/arch/x86_64/kernel/init_task.c b/arch/x86/kernel/init_task_64.c
index 4ff33d4f8551..4ff33d4f8551 100644
--- a/arch/x86_64/kernel/init_task.c
+++ b/arch/x86/kernel/init_task_64.c
diff --git a/arch/i386/kernel/io_apic.c b/arch/x86/kernel/io_apic_32.c
index e2f4a1c68547..e2f4a1c68547 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic_32.c
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86/kernel/io_apic_64.c
index 966fa1062491..966fa1062491 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic_64.c
diff --git a/arch/i386/kernel/ioport.c b/arch/x86/kernel/ioport_32.c
index 3d310a946d76..3d310a946d76 100644
--- a/arch/i386/kernel/ioport.c
+++ b/arch/x86/kernel/ioport_32.c
diff --git a/arch/x86_64/kernel/ioport.c b/arch/x86/kernel/ioport_64.c
index 653efa30b0f4..653efa30b0f4 100644
--- a/arch/x86_64/kernel/ioport.c
+++ b/arch/x86/kernel/ioport_64.c
diff --git a/arch/i386/kernel/irq.c b/arch/x86/kernel/irq_32.c
index dd2b97fc00b2..4f681bcdb1fc 100644
--- a/arch/i386/kernel/irq.c
+++ b/arch/x86/kernel/irq_32.c
@@ -231,8 +231,6 @@ asmlinkage void do_softirq(void)
 
         local_irq_restore(flags);
 }
-
-EXPORT_SYMBOL(do_softirq);
 #endif
 
 /*
diff --git a/arch/x86_64/kernel/irq.c b/arch/x86/kernel/irq_64.c
index 39cb3fa83ebb..bd11e42b22bf 100644
--- a/arch/x86_64/kernel/irq.c
+++ b/arch/x86/kernel/irq_64.c
@@ -210,4 +210,3 @@ asmlinkage void do_softirq(void)
         }
         local_irq_restore(flags);
 }
-EXPORT_SYMBOL(do_softirq);
diff --git a/arch/x86_64/kernel/k8.c b/arch/x86/kernel/k8.c
index 7377ccb21335..7377ccb21335 100644
--- a/arch/x86_64/kernel/k8.c
+++ b/arch/x86/kernel/k8.c
diff --git a/arch/i386/kernel/kprobes.c b/arch/x86/kernel/kprobes_32.c
index 448a50b1324c..448a50b1324c 100644
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes_32.c
diff --git a/arch/x86_64/kernel/kprobes.c b/arch/x86/kernel/kprobes_64.c
index a30e004682e2..a30e004682e2 100644
--- a/arch/x86_64/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes_64.c
diff --git a/arch/i386/kernel/ldt.c b/arch/x86/kernel/ldt_32.c
index e0b2d17f4f10..e0b2d17f4f10 100644
--- a/arch/i386/kernel/ldt.c
+++ b/arch/x86/kernel/ldt_32.c
diff --git a/arch/x86_64/kernel/ldt.c b/arch/x86/kernel/ldt_64.c
index bc9ffd5c19cc..bc9ffd5c19cc 100644
--- a/arch/x86_64/kernel/ldt.c
+++ b/arch/x86/kernel/ldt_64.c
diff --git a/arch/i386/kernel/machine_kexec.c b/arch/x86/kernel/machine_kexec_32.c
index 91966bafb3dc..91966bafb3dc 100644
--- a/arch/i386/kernel/machine_kexec.c
+++ b/arch/x86/kernel/machine_kexec_32.c
diff --git a/arch/x86_64/kernel/machine_kexec.c b/arch/x86/kernel/machine_kexec_64.c
index c3a554703672..c3a554703672 100644
--- a/arch/x86_64/kernel/machine_kexec.c
+++ b/arch/x86/kernel/machine_kexec_64.c
diff --git a/arch/i386/kernel/mca.c b/arch/x86/kernel/mca_32.c
index b83672b89527..b83672b89527 100644
--- a/arch/i386/kernel/mca.c
+++ b/arch/x86/kernel/mca_32.c
diff --git a/arch/x86_64/kernel/mce.c b/arch/x86/kernel/mce_64.c
index a66d607f5b92..a66d607f5b92 100644
--- a/arch/x86_64/kernel/mce.c
+++ b/arch/x86/kernel/mce_64.c
diff --git a/arch/x86_64/kernel/mce_amd.c b/arch/x86/kernel/mce_amd_64.c
index 2f8a7f18b0fe..2f8a7f18b0fe 100644
--- a/arch/x86_64/kernel/mce_amd.c
+++ b/arch/x86/kernel/mce_amd_64.c
diff --git a/arch/x86_64/kernel/mce_intel.c b/arch/x86/kernel/mce_intel_64.c
index 6551505d8a2c..6551505d8a2c 100644
--- a/arch/x86_64/kernel/mce_intel.c
+++ b/arch/x86/kernel/mce_intel_64.c
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c
new file mode 100644
index 000000000000..0ab680f2d9db
--- /dev/null
+++ b/arch/x86/kernel/mfgpt_32.c
@@ -0,0 +1,362 @@
+/*
+ * Driver/API for AMD Geode Multi-Function General Purpose Timers (MFGPT)
+ *
+ * Copyright (C) 2006, Advanced Micro Devices, Inc.
+ * Copyright (C) 2007, Andres Salomon <dilinger@debian.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public License
+ * as published by the Free Software Foundation.
+ *
+ * The MFGPTs are documented in AMD Geode CS5536 Companion Device Data Book.
+ */
+
+/*
+ * We are using the 32Khz input clock - its the only one that has the
+ * ranges we find desirable.  The following table lists the suitable
+ * divisors and the associated hz, minimum interval
+ * and the maximum interval:
+ *
+ *  Divisor   Hz      Min Delta (S) Max Delta (S)
+ *   1        32000     .0005          2.048
+ *   2        16000      .001          4.096
+ *   4         8000      .002          8.192
+ *   8         4000      .004         16.384
+ *   16        2000      .008         32.768
+ *   32        1000      .016         65.536
+ *   64         500      .032        131.072
+ *  128         250      .064        262.144
+ *  256         125      .128        524.288
+ */
+
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <asm/geode.h>
+
+#define F_AVAIL    0x01
+
+static struct mfgpt_timer_t {
+        int flags;
+        struct module *owner;
+} mfgpt_timers[MFGPT_MAX_TIMERS];
+
+/* Selected from the table above */
+
+#define MFGPT_DIVISOR 16
+#define MFGPT_SCALE  4     /* divisor = 2^(scale) */
+#define MFGPT_HZ  (32000 / MFGPT_DIVISOR)
+#define MFGPT_PERIODIC (MFGPT_HZ / HZ)
+
+#ifdef CONFIG_GEODE_MFGPT_TIMER
+static int __init mfgpt_timer_setup(void);
+#else
+#define mfgpt_timer_setup() (0)
+#endif
+
+/* Allow for disabling of MFGPTs */
+static int disable;
+static int __init mfgpt_disable(char *s)
+{
+        disable = 1;
+        return 1;
+}
+__setup("nomfgpt", mfgpt_disable);
+
+/*
+ * Check whether any MFGPTs are available for the kernel to use.  In most
+ * cases, firmware that uses AMD's VSA code will claim all timers during
+ * bootup; we certainly don't want to take them if they're already in use.
+ * In other cases (such as with VSAless OpenFirmware), the system firmware
+ * leaves timers available for us to use.
+ */
+int __init geode_mfgpt_detect(void)
+{
+        int count = 0, i;
+        u16 val;
+
+        if (disable) {
+                printk(KERN_INFO "geode-mfgpt:  Skipping MFGPT setup\n");
+                return 0;
+        }
+
+        for (i = 0; i < MFGPT_MAX_TIMERS; i++) {
+                val = geode_mfgpt_read(i, MFGPT_REG_SETUP);
+                if (!(val & MFGPT_SETUP_SETUP)) {
+                        mfgpt_timers[i].flags = F_AVAIL;
+                        count++;
+                }
+        }
+
+        /* set up clock event device, if desired */
+        i = mfgpt_timer_setup();
+
+        return count;
+}
+
+int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable)
+{
+        u32 msr, mask, value, dummy;
+        int shift = (cmp == MFGPT_CMP1) ? 0 : 8;
+
+        if (timer < 0 || timer >= MFGPT_MAX_TIMERS)
+                return -EIO;
+
+        /*
+         * The register maps for these are described in sections 6.17.1.x of
+         * the AMD Geode CS5536 Companion Device Data Book.
+         */
+        switch (event) {
+        case MFGPT_EVENT_RESET:
+                /*
+                 * XXX: According to the docs, we cannot reset timers above
+                 * 6; that is, resets for 7 and 8 will be ignored.  Is this
+                 * a problem?   -dilinger
+                 */
+                msr = MFGPT_NR_MSR;
+                mask = 1 << (timer + 24);
+                break;
+
+        case MFGPT_EVENT_NMI:
+                msr = MFGPT_NR_MSR;
+                mask = 1 << (timer + shift);
+                break;
+
+        case MFGPT_EVENT_IRQ:
+                msr = MFGPT_IRQ_MSR;
+                mask = 1 << (timer + shift);
+                break;
+
+        default:
+                return -EIO;
+        }
+
+        rdmsr(msr, value, dummy);
+
+        if (enable)
+                value |= mask;
+        else
+                value &= ~mask;
+
+        wrmsr(msr, value, dummy);
+        return 0;
+}
+
+int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable)
+{
+        u32 val, dummy;
+        int offset;
+
+        if (timer < 0 || timer >= MFGPT_MAX_TIMERS)
+                return -EIO;
+
+        if (geode_mfgpt_toggle_event(timer, cmp, MFGPT_EVENT_IRQ, enable))
+                return -EIO;
+
+        rdmsr(MSR_PIC_ZSEL_LOW, val, dummy);
+
+        offset = (timer % 4) * 4;
+
+        val &= ~((0xF << offset) | (0xF << (offset + 16)));
+
+        if (enable) {
+                val |= (irq & 0x0F) << (offset);
+                val |= (irq & 0x0F) << (offset + 16);
+        }
+
+        wrmsr(MSR_PIC_ZSEL_LOW, val, dummy);
+        return 0;
+}
+
+static int mfgpt_get(int timer, struct module *owner)
+{
+        mfgpt_timers[timer].flags &= ~F_AVAIL;
+        mfgpt_timers[timer].owner = owner;
+        printk(KERN_INFO "geode-mfgpt:  Registered timer %d\n", timer);
+        return timer;
+}
+
+int geode_mfgpt_alloc_timer(int timer, int domain, struct module *owner)
+{
+        int i;
+
+        if (!geode_get_dev_base(GEODE_DEV_MFGPT))
+                return -ENODEV;
+        if (timer >= MFGPT_MAX_TIMERS)
+                return -EIO;
+
+        if (timer < 0) {
+                /* Try to find an available timer */
+                for (i = 0; i < MFGPT_MAX_TIMERS; i++) {
+                        if (mfgpt_timers[i].flags & F_AVAIL)
+                                return mfgpt_get(i, owner);
+
+                        if (i == 5 && domain == MFGPT_DOMAIN_WORKING)
+                                break;
+                }
+        } else {
+                /* If they requested a specific timer, try to honor that */
+                if (mfgpt_timers[timer].flags & F_AVAIL)
+                        return mfgpt_get(timer, owner);
+        }
+
+        /* No timers available - too bad */
+        return -1;
+}
+
+
+#ifdef CONFIG_GEODE_MFGPT_TIMER
+
+/*
+ * The MFPGT timers on the CS5536 provide us with suitable timers to use
+ * as clock event sources - not as good as a HPET or APIC, but certainly
+ * better then the PIT.  This isn't a general purpose MFGPT driver, but
+ * a simplified one designed specifically to act as a clock event source.
+ * For full details about the MFGPT, please consult the CS5536 data sheet.
+ */
+
+#include <linux/clocksource.h>
+#include <linux/clockchips.h>
+
+static unsigned int mfgpt_tick_mode = CLOCK_EVT_MODE_SHUTDOWN;
+static u16 mfgpt_event_clock;
+
+static int irq = 7;
+static int __init mfgpt_setup(char *str)
+{
+        get_option(&str, &irq);
+        return 1;
+}
+__setup("mfgpt_irq=", mfgpt_setup);
+
+static inline void mfgpt_disable_timer(u16 clock)
+{
+        u16 val = geode_mfgpt_read(clock, MFGPT_REG_SETUP);
+        geode_mfgpt_write(clock, MFGPT_REG_SETUP, val & ~MFGPT_SETUP_CNTEN);
+}
+
+static int mfgpt_next_event(unsigned long, struct clock_event_device *);
+static void mfgpt_set_mode(enum clock_event_mode, struct clock_event_device *);
+
+static struct clock_event_device mfgpt_clockevent = {
+        .name = "mfgpt-timer",
+        .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+        .set_mode = mfgpt_set_mode,
+        .set_next_event = mfgpt_next_event,
+        .rating = 250,
+        .cpumask = CPU_MASK_ALL,
+        .shift = 32
+};
+
+static inline void mfgpt_start_timer(u16 clock, u16 delta)
+{
+        geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_CMP2, (u16) delta);
+        geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_COUNTER, 0);
+
+        geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP,
+                          MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
+}
+
+static void mfgpt_set_mode(enum clock_event_mode mode,
+                           struct clock_event_device *evt)
+{
+        mfgpt_disable_timer(mfgpt_event_clock);
+
+        if (mode == CLOCK_EVT_MODE_PERIODIC)
+                mfgpt_start_timer(mfgpt_event_clock, MFGPT_PERIODIC);
+
+        mfgpt_tick_mode = mode;
+}
+
+static int mfgpt_next_event(unsigned long delta, struct clock_event_device *evt)
+{
+        mfgpt_start_timer(mfgpt_event_clock, delta);
+        return 0;
+}
+
+/* Assume (foolishly?), that this interrupt was due to our tick */
+
+static irqreturn_t mfgpt_tick(int irq, void *dev_id)
+{
+        if (mfgpt_tick_mode == CLOCK_EVT_MODE_SHUTDOWN)
+                return IRQ_HANDLED;
+
+        /* Turn off the clock */
+        mfgpt_disable_timer(mfgpt_event_clock);
+
+        /* Clear the counter */
+        geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_COUNTER, 0);
+
+        /* Restart the clock in periodic mode */
+
+        if (mfgpt_tick_mode == CLOCK_EVT_MODE_PERIODIC) {
+                geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP,
+                                  MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
+        }
+
+        mfgpt_clockevent.event_handler(&mfgpt_clockevent);
+        return IRQ_HANDLED;
+}
+
+static struct irqaction mfgptirq  = {
+        .handler = mfgpt_tick,
+        .flags = IRQF_DISABLED | IRQF_NOBALANCING,
+        .mask = CPU_MASK_NONE,
+        .name = "mfgpt-timer"
+};
+
+static int __init mfgpt_timer_setup(void)
+{
+        int timer, ret;
+        u16 val;
+
+        timer = geode_mfgpt_alloc_timer(MFGPT_TIMER_ANY, MFGPT_DOMAIN_WORKING,
+                        THIS_MODULE);
+        if (timer < 0) {
+                printk(KERN_ERR
+                       "mfgpt-timer:  Could not allocate a MFPGT timer\n");
+                return -ENODEV;
+        }
+
+        mfgpt_event_clock = timer;
+        /* Set the clock scale and enable the event mode for CMP2 */
+        val = MFGPT_SCALE | (3 << 8);
+
+        geode_mfgpt_write(mfgpt_event_clock, MFGPT_REG_SETUP, val);
+
+        /* Set up the IRQ on the MFGPT side */
+        if (geode_mfgpt_setup_irq(mfgpt_event_clock, MFGPT_CMP2, irq)) {
+                printk(KERN_ERR "mfgpt-timer:  Could not set up IRQ %d\n", irq);
+                return -EIO;
+        }
+
+        /* And register it with the kernel */
+        ret = setup_irq(irq, &mfgptirq);
+
+        if (ret) {
+                printk(KERN_ERR
+                       "mfgpt-timer:  Unable to set up the interrupt.\n");
+                goto err;
+        }
+
+        /* Set up the clock event */
+        mfgpt_clockevent.mult = div_sc(MFGPT_HZ, NSEC_PER_SEC, 32);
+        mfgpt_clockevent.min_delta_ns = clockevent_delta2ns(0xF,
+                        &mfgpt_clockevent);
+        mfgpt_clockevent.max_delta_ns = clockevent_delta2ns(0xFFFE,
+                        &mfgpt_clockevent);
+
+        printk(KERN_INFO
+               "mfgpt-timer:  registering the MFGT timer as a clock event.\n");
+        clockevents_register_device(&mfgpt_clockevent);
+
+        return 0;
+
+err:
+        geode_mfgpt_release_irq(mfgpt_event_clock, MFGPT_CMP2, irq);
+        printk(KERN_ERR
+               "mfgpt-timer:  Unable to set up the MFGPT clock source\n");
+        return -EIO;
+}
+
+#endif
diff --git a/arch/i386/kernel/microcode.c b/arch/x86/kernel/microcode.c
index 09cf78110358..09cf78110358 100644
--- a/arch/i386/kernel/microcode.c
+++ b/arch/x86/kernel/microcode.c
diff --git a/arch/i386/kernel/module.c b/arch/x86/kernel/module_32.c
index 3db0a5442eb1..3db0a5442eb1 100644
--- a/arch/i386/kernel/module.c
+++ b/arch/x86/kernel/module_32.c
diff --git a/arch/x86_64/kernel/module.c b/arch/x86/kernel/module_64.c
index a888e67f5874..a888e67f5874 100644
--- a/arch/x86_64/kernel/module.c
+++ b/arch/x86/kernel/module_64.c
diff --git a/arch/i386/kernel/mpparse.c b/arch/x86/kernel/mpparse_32.c
index 13abb4ebfb79..13abb4ebfb79 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse_32.c
diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86/kernel/mpparse_64.c
index 8bf0ca03ac8e..8bf0ca03ac8e 100644
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse_64.c
diff --git a/arch/i386/kernel/msr.c b/arch/x86/kernel/msr.c
index 0c1069b8d638..0c1069b8d638 100644
--- a/arch/i386/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
diff --git a/arch/i386/kernel/nmi.c b/arch/x86/kernel/nmi_32.c
index c7227e2180f8..95d3fc203cf7 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/x86/kernel/nmi_32.c
@@ -353,7 +353,8 @@ __kprobes int nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
          * Take the local apic timer and PIT/HPET into account. We don't
          * know which one is active, when we have highres/dyntick on
          */
-        sum = per_cpu(irq_stat, cpu).apic_timer_irqs + kstat_cpu(cpu).irqs[0];
+        sum = per_cpu(irq_stat, cpu).apic_timer_irqs +
+                per_cpu(irq_stat, cpu).irq0_irqs;
 
         /* if the none of the timers isn't firing, this cpu isn't doing much */
         if (!touched && last_irq_sums[cpu] == sum) {
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86/kernel/nmi_64.c
index 0ec6d2ddb931..e60ac0da5283 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86/kernel/nmi_64.c
@@ -329,7 +329,7 @@ int __kprobes nmi_watchdog_tick(struct pt_regs * regs, unsigned reason)
                 touched = 1;
         }
 
-        sum = read_pda(apic_timer_irqs);
+        sum = read_pda(apic_timer_irqs) + read_pda(irq0_irqs);
         if (__get_cpu_var(nmi_touch)) {
                 __get_cpu_var(nmi_touch) = 0;
                 touched = 1;
diff --git a/arch/i386/kernel/numaq.c b/arch/x86/kernel/numaq_32.c
index 9000d82c6dc0..9000d82c6dc0 100644
--- a/arch/i386/kernel/numaq.c
+++ b/arch/x86/kernel/numaq_32.c
diff --git a/arch/i386/kernel/paravirt.c b/arch/x86/kernel/paravirt_32.c
index 739cfb207dd7..739cfb207dd7 100644
--- a/arch/i386/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt_32.c
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86/kernel/pci-calgary_64.c
index 71da01e73f03..71da01e73f03 100644
--- a/arch/x86_64/kernel/pci-calgary.c
+++ b/arch/x86/kernel/pci-calgary_64.c
diff --git a/arch/i386/kernel/pci-dma.c b/arch/x86/kernel/pci-dma_32.c
index 048f09b62553..048f09b62553 100644
--- a/arch/i386/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma_32.c
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86/kernel/pci-dma_64.c
index 29711445c818..29711445c818 100644
--- a/arch/x86_64/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma_64.c
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86/kernel/pci-gart_64.c
index 4918c575d582..4918c575d582 100644
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86/kernel/pci-gart_64.c
diff --git a/arch/x86_64/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu_64.c
index 2a34c6c025a9..2a34c6c025a9 100644
--- a/arch/x86_64/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu_64.c
diff --git a/arch/x86_64/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb_64.c
index b2f405ea7c85..b2f405ea7c85 100644
--- a/arch/x86_64/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb_64.c
diff --git a/arch/i386/kernel/pcspeaker.c b/arch/x86/kernel/pcspeaker.c
index bc1f2d3ea277..bc1f2d3ea277 100644
--- a/arch/i386/kernel/pcspeaker.c
+++ b/arch/x86/kernel/pcspeaker.c
diff --git a/arch/x86_64/kernel/pmtimer.c b/arch/x86/kernel/pmtimer_64.c
index ae8f91214f15..ae8f91214f15 100644
--- a/arch/x86_64/kernel/pmtimer.c
+++ b/arch/x86/kernel/pmtimer_64.c
diff --git a/arch/i386/kernel/process.c b/arch/x86/kernel/process_32.c
index 84664710b784..84664710b784 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/x86/kernel/process_32.c
diff --git a/arch/x86_64/kernel/process.c b/arch/x86/kernel/process_64.c
index 98956555450b..6f9dbbe65eef 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86/kernel/process_64.c
@@ -38,6 +38,7 @@
 #include <linux/notifier.h>
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
+#include <linux/tick.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -208,6 +209,8 @@ void cpu_idle (void)
                         if (__get_cpu_var(cpu_idle_state))
                                 __get_cpu_var(cpu_idle_state) = 0;
 
+                        tick_nohz_stop_sched_tick();
+
                         rmb();
                         idle = pm_idle;
                         if (!idle)
@@ -228,6 +231,7 @@ void cpu_idle (void)
                         __exit_idle();
                 }
 
+                tick_nohz_restart_sched_tick();
                 preempt_enable_no_resched();
                 schedule();
                 preempt_disable();
diff --git a/arch/i386/kernel/ptrace.c b/arch/x86/kernel/ptrace_32.c
index 7c1b92522e95..7c1b92522e95 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace_32.c
diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86/kernel/ptrace_64.c
index eea3702427b4..eea3702427b4 100644
--- a/arch/x86_64/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace_64.c
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
new file mode 100644
index 000000000000..d769e204f942
--- /dev/null
+++ b/arch/x86/kernel/quirks.c
@@ -0,0 +1,254 @@
+/*
+ * This file contains work-arounds for x86 and x86_64 platform bugs.
+ */
+#include <linux/pci.h>
+#include <linux/irq.h>
+
+#include <asm/hpet.h>
+
+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI)
+
+static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
+{
+        u8 config, rev;
+        u32 word;
+
+        /* BIOS may enable hardware IRQ balancing for
+         * E7520/E7320/E7525(revision ID 0x9 and below)
+         * based platforms.
+         * Disable SW irqbalance/affinity on those platforms.
+         */
+        pci_read_config_byte(dev, PCI_CLASS_REVISION, &rev);
+        if (rev > 0x9)
+                return;
+
+        /* enable access to config space*/
+        pci_read_config_byte(dev, 0xf4, &config);
+        pci_write_config_byte(dev, 0xf4, config|0x2);
+
+        /* read xTPR register */
+        raw_pci_ops->read(0, 0, 0x40, 0x4c, 2, &word);
+
+        if (!(word & (1 << 13))) {
+                printk(KERN_INFO "Intel E7520/7320/7525 detected. "
+                        "Disabling irq balancing and affinity\n");
+#ifdef CONFIG_IRQBALANCE
+                irqbalance_disable("");
+#endif
+                noirqdebug_setup("");
+#ifdef CONFIG_PROC_FS
+                no_irq_affinity = 1;
+#endif
+        }
+
+        /* put back the original value for config space*/
+        if (!(config & 0x2))
+                pci_write_config_byte(dev, 0xf4, config);
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_E7320_MCH,  quirk_intel_irqbalance);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_E7525_MCH,  quirk_intel_irqbalance);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_E7520_MCH,  quirk_intel_irqbalance);
+#endif
+
+#if defined(CONFIG_HPET_TIMER)
+unsigned long force_hpet_address;
+
+static enum {
+        NONE_FORCE_HPET_RESUME,
+        OLD_ICH_FORCE_HPET_RESUME,
+        ICH_FORCE_HPET_RESUME
+} force_hpet_resume_type;
+
+static void __iomem *rcba_base;
+
+static void ich_force_hpet_resume(void)
+{
+        u32 val;
+
+        if (!force_hpet_address)
+                return;
+
+        if (rcba_base == NULL)
+                BUG();
+
+        /* read the Function Disable register, dword mode only */
+        val = readl(rcba_base + 0x3404);
+        if (!(val & 0x80)) {
+                /* HPET disabled in HPTC. Trying to enable */
+                writel(val | 0x80, rcba_base + 0x3404);
+        }
+
+        val = readl(rcba_base + 0x3404);
+        if (!(val & 0x80))
+                BUG();
+        else
+                printk(KERN_DEBUG "Force enabled HPET at resume\n");
+
+        return;
+}
+
+static void ich_force_enable_hpet(struct pci_dev *dev)
+{
+        u32 val;
+        u32 uninitialized_var(rcba);
+        int err = 0;
+
+        if (hpet_address || force_hpet_address)
+                return;
+
+        pci_read_config_dword(dev, 0xF0, &rcba);
+        rcba &= 0xFFFFC000;
+        if (rcba == 0) {
+                printk(KERN_DEBUG "RCBA disabled. Cannot force enable HPET\n");
+                return;
+        }
+
+        /* use bits 31:14, 16 kB aligned */
+        rcba_base = ioremap_nocache(rcba, 0x4000);
+        if (rcba_base == NULL) {
+                printk(KERN_DEBUG "ioremap failed. Cannot force enable HPET\n");
+                return;
+        }
+
+        /* read the Function Disable register, dword mode only */
+        val = readl(rcba_base + 0x3404);
+
+        if (val & 0x80) {
+                /* HPET is enabled in HPTC. Just not reported by BIOS */
+                val = val & 0x3;
+                force_hpet_address = 0xFED00000 | (val << 12);
+                printk(KERN_DEBUG "Force enabled HPET at base address 0x%lx\n",
+                               force_hpet_address);
+                iounmap(rcba_base);
+                return;
+        }
+
+        /* HPET disabled in HPTC. Trying to enable */
+        writel(val | 0x80, rcba_base + 0x3404);
+
+        val = readl(rcba_base + 0x3404);
+        if (!(val & 0x80)) {
+                err = 1;
+        } else {
+                val = val & 0x3;
+                force_hpet_address = 0xFED00000 | (val << 12);
+        }
+
+        if (err) {
+                force_hpet_address = 0;
+                iounmap(rcba_base);
+                printk(KERN_DEBUG "Failed to force enable HPET\n");
+        } else {
+                force_hpet_resume_type = ICH_FORCE_HPET_RESUME;
+                printk(KERN_DEBUG "Force enabled HPET at base address 0x%lx\n",
+                               force_hpet_address);
+        }
+}
+
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0,
+                         ich_force_enable_hpet);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,
+                         ich_force_enable_hpet);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0,
+                         ich_force_enable_hpet);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1,
+                         ich_force_enable_hpet);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31,
+                         ich_force_enable_hpet);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_1,
+                         ich_force_enable_hpet);
+
+
+static struct pci_dev *cached_dev;
+
+static void old_ich_force_hpet_resume(void)
+{
+        u32 val;
+        u32 uninitialized_var(gen_cntl);
+
+        if (!force_hpet_address || !cached_dev)
+                return;
+
+        pci_read_config_dword(cached_dev, 0xD0, &gen_cntl);
+        gen_cntl &= (~(0x7 << 15));
+        gen_cntl |= (0x4 << 15);
+
+        pci_write_config_dword(cached_dev, 0xD0, gen_cntl);
+        pci_read_config_dword(cached_dev, 0xD0, &gen_cntl);
+        val = gen_cntl >> 15;
+        val &= 0x7;
+        if (val == 0x4)
+                printk(KERN_DEBUG "Force enabled HPET at resume\n");
+        else
+                BUG();
+}
+
+static void old_ich_force_enable_hpet(struct pci_dev *dev)
+{
+        u32 val;
+        u32 uninitialized_var(gen_cntl);
+
+        if (hpet_address || force_hpet_address)
+                return;
+
+        pci_read_config_dword(dev, 0xD0, &gen_cntl);
+        /*
+         * Bit 17 is HPET enable bit.
+         * Bit 16:15 control the HPET base address.
+         */
+        val = gen_cntl >> 15;
+        val &= 0x7;
+        if (val & 0x4) {
+                val &= 0x3;
+                force_hpet_address = 0xFED00000 | (val << 12);
+                printk(KERN_DEBUG "HPET at base address 0x%lx\n",
+                               force_hpet_address);
+                return;
+        }
+
+        /*
+         * HPET is disabled. Trying enabling at FED00000 and check
+         * whether it sticks
+         */
+        gen_cntl &= (~(0x7 << 15));
+        gen_cntl |= (0x4 << 15);
+        pci_write_config_dword(dev, 0xD0, gen_cntl);
+
+        pci_read_config_dword(dev, 0xD0, &gen_cntl);
+
+        val = gen_cntl >> 15;
+        val &= 0x7;
+        if (val & 0x4) {
+                /* HPET is enabled in HPTC. Just not reported by BIOS */
+                val &= 0x3;
+                force_hpet_address = 0xFED00000 | (val << 12);
+                printk(KERN_DEBUG "Force enabled HPET at base address 0x%lx\n",
+                               force_hpet_address);
+                cached_dev = dev;
+                force_hpet_resume_type = OLD_ICH_FORCE_HPET_RESUME;
+                return;
+        }
+
+        printk(KERN_DEBUG "Failed to force enable HPET\n");
+}
+
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0,
+                         old_ich_force_enable_hpet);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_12,
+                         old_ich_force_enable_hpet);
+
+void force_hpet_resume(void)
+{
+        switch (force_hpet_resume_type) {
+            case ICH_FORCE_HPET_RESUME:
+                return ich_force_hpet_resume();
+
+            case OLD_ICH_FORCE_HPET_RESUME:
+                return old_ich_force_hpet_resume();
+
+            default:
+                break;
+        }
+}
+
+#endif
diff --git a/arch/i386/kernel/reboot.c b/arch/x86/kernel/reboot_32.c
index 0d796248866c..b37ed226830a 100644
--- a/arch/i386/kernel/reboot.c
+++ b/arch/x86/kernel/reboot_32.c
@@ -79,7 +79,7 @@ __setup("reboot=", reboot_setup);
 /*
  * Some machines require the "reboot=b"  commandline option, this quirk makes that automatic.
  */
-static int __init set_bios_reboot(struct dmi_system_id *d)
+static int __init set_bios_reboot(const struct dmi_system_id *d)
 {
         if (!reboot_thru_bios) {
                 reboot_thru_bios = 1;
diff --git a/arch/x86_64/kernel/reboot.c b/arch/x86/kernel/reboot_64.c
index 368db2b9c5ac..368db2b9c5ac 100644
--- a/arch/x86_64/kernel/reboot.c
+++ b/arch/x86/kernel/reboot_64.c
diff --git a/arch/i386/kernel/reboot_fixups.c b/arch/x86/kernel/reboot_fixups_32.c
index 03e1cce58f49..03e1cce58f49 100644
--- a/arch/i386/kernel/reboot_fixups.c
+++ b/arch/x86/kernel/reboot_fixups_32.c
diff --git a/arch/i386/kernel/relocate_kernel.S b/arch/x86/kernel/relocate_kernel_32.S
index f151d6fae462..f151d6fae462 100644
--- a/arch/i386/kernel/relocate_kernel.S
+++ b/arch/x86/kernel/relocate_kernel_32.S
diff --git a/arch/x86_64/kernel/relocate_kernel.S b/arch/x86/kernel/relocate_kernel_64.S
index 14e95872c6a3..14e95872c6a3 100644
--- a/arch/x86_64/kernel/relocate_kernel.S
+++ b/arch/x86/kernel/relocate_kernel_64.S
diff --git a/arch/i386/kernel/scx200.c b/arch/x86/kernel/scx200_32.c
index c7d3df23f589..c7d3df23f589 100644
--- a/arch/i386/kernel/scx200.c
+++ b/arch/x86/kernel/scx200_32.c
diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86/kernel/setup64.c
index 1200aaac403e..1200aaac403e 100644
--- a/arch/x86_64/kernel/setup64.c
+++ b/arch/x86/kernel/setup64.c
diff --git a/arch/i386/kernel/setup.c b/arch/x86/kernel/setup_32.c
index d474cd639bcb..d474cd639bcb 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/x86/kernel/setup_32.c
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86/kernel/setup_64.c
index af838f6b0b7f..32054bf5ba40 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86/kernel/setup_64.c
@@ -546,6 +546,37 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
 #endif
 }
 
+#define ENABLE_C1E_MASK         0x18000000
+#define CPUID_PROCESSOR_SIGNATURE       1
+#define CPUID_XFAM              0x0ff00000
+#define CPUID_XFAM_K8           0x00000000
+#define CPUID_XFAM_10H          0x00100000
+#define CPUID_XFAM_11H          0x00200000
+#define CPUID_XMOD              0x000f0000
+#define CPUID_XMOD_REV_F        0x00040000
+
+/* AMD systems with C1E don't have a working lAPIC timer. Check for that. */
+static __cpuinit int amd_apic_timer_broken(void)
+{
+        u32 lo, hi;
+        u32 eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE);
+        switch (eax & CPUID_XFAM) {
+        case CPUID_XFAM_K8:
+                if ((eax & CPUID_XMOD) < CPUID_XMOD_REV_F)
+                        break;
+        case CPUID_XFAM_10H:
+        case CPUID_XFAM_11H:
+                rdmsr(MSR_K8_ENABLE_C1E, lo, hi);
+                if (lo & ENABLE_C1E_MASK)
+                        return 1;
+                break;
+        default:
+                /* err on the side of caution */
+                return 1;
+        }
+        return 0;
+}
+
 static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 {
         unsigned level;
@@ -617,6 +648,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
         /* Family 10 doesn't support C states in MWAIT so don't use it */
         if (c->x86 == 0x10 && !force_mwait)
                 clear_bit(X86_FEATURE_MWAIT, &c->x86_capability);
+
+        if (amd_apic_timer_broken())
+                disable_apic_timer = 1;
 }
 
 static void __cpuinit detect_ht(struct cpuinfo_x86 *c)
diff --git a/arch/i386/kernel/sigframe.h b/arch/x86/kernel/sigframe_32.h
index 0b2221711dad..0b2221711dad 100644
--- a/arch/i386/kernel/sigframe.h
+++ b/arch/x86/kernel/sigframe_32.h
diff --git a/arch/i386/kernel/signal.c b/arch/x86/kernel/signal_32.c
index f5dd85656c18..c03570f7fe8e 100644
--- a/arch/i386/kernel/signal.c
+++ b/arch/x86/kernel/signal_32.c
@@ -25,7 +25,7 @@
 #include <asm/ucontext.h>
 #include <asm/uaccess.h>
 #include <asm/i387.h>
-#include "sigframe.h"
+#include "sigframe_32.h"
 
 #define DEBUG_SIG 0
 
diff --git a/arch/x86_64/kernel/signal.c b/arch/x86/kernel/signal_64.c
index 739175b01e06..739175b01e06 100644
--- a/arch/x86_64/kernel/signal.c
+++ b/arch/x86/kernel/signal_64.c
diff --git a/arch/i386/kernel/smp.c b/arch/x86/kernel/smp_32.c
index 2d35d8502029..2d35d8502029 100644
--- a/arch/i386/kernel/smp.c
+++ b/arch/x86/kernel/smp_32.c
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86/kernel/smp_64.c
index df4a82812adb..df4a82812adb 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86/kernel/smp_64.c
diff --git a/arch/i386/kernel/smpboot.c b/arch/x86/kernel/smpboot_32.c
index e4f61d1c6248..e4f61d1c6248 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot_32.c
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86/kernel/smpboot_64.c
index 32f50783edc8..57ccf7cb6b91 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -223,8 +223,6 @@ void __cpuinit smp_callin(void)
         local_irq_disable();
         Dprintk("Stack at about %p\n",&cpuid);
 
-        disable_APIC_timer();
-
         /*
          * Save our processor parameters
          */
@@ -348,8 +346,6 @@ void __cpuinit start_secondary(void)
                 enable_8259A_irq(0);
         }
 
-        enable_APIC_timer();
-
         /*
          * The sibling maps must be set before turing the online map on for
          * this cpu
diff --git a/arch/i386/kernel/smpcommon.c b/arch/x86/kernel/smpcommon_32.c
index bbfe85a0f699..bbfe85a0f699 100644
--- a/arch/i386/kernel/smpcommon.c
+++ b/arch/x86/kernel/smpcommon_32.c
diff --git a/arch/i386/kernel/srat.c b/arch/x86/kernel/srat_32.c
index 2a8713ec0f9a..2a8713ec0f9a 100644
--- a/arch/i386/kernel/srat.c
+++ b/arch/x86/kernel/srat_32.c
diff --git a/arch/x86_64/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index cb9109113584..cb9109113584 100644
--- a/arch/x86_64/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
diff --git a/arch/i386/kernel/summit.c b/arch/x86/kernel/summit_32.c
index d0e01a3acf35..d0e01a3acf35 100644
--- a/arch/i386/kernel/summit.c
+++ b/arch/x86/kernel/summit_32.c
diff --git a/arch/x86_64/kernel/suspend.c b/arch/x86/kernel/suspend_64.c
index 573c0a6e0ac6..573c0a6e0ac6 100644
--- a/arch/x86_64/kernel/suspend.c
+++ b/arch/x86/kernel/suspend_64.c
diff --git a/arch/x86_64/kernel/suspend_asm.S b/arch/x86/kernel/suspend_asm_64.S
index 16d183f67bc1..16d183f67bc1 100644
--- a/arch/x86_64/kernel/suspend_asm.S
+++ b/arch/x86/kernel/suspend_asm_64.S
diff --git a/arch/i386/kernel/sys_i386.c b/arch/x86/kernel/sys_i386_32.c
index 42147304de88..42147304de88 100644
--- a/arch/i386/kernel/sys_i386.c
+++ b/arch/x86/kernel/sys_i386_32.c
diff --git a/arch/x86_64/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
index 4770b7a2052c..4770b7a2052c 100644
--- a/arch/x86_64/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
diff --git a/arch/x86_64/kernel/syscall.c b/arch/x86/kernel/syscall_64.c
index 63d592c276cc..9d498c2f8eea 100644
--- a/arch/x86_64/kernel/syscall.c
+++ b/arch/x86/kernel/syscall_64.c
@@ -9,7 +9,7 @@
 
 #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ; 
 #undef _ASM_X86_64_UNISTD_H_
-#include <asm-x86_64/unistd.h>
+#include <asm/unistd_64.h>
 
 #undef __SYSCALL
 #define __SYSCALL(nr, sym) [ nr ] = sym, 
@@ -22,5 +22,5 @@ extern void sys_ni_syscall(void);
 const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {
         /* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */ 
         [0 ... __NR_syscall_max] = &sys_ni_syscall,
-#include <asm-x86_64/unistd.h>
+#include <asm/unistd_64.h>
 };
diff --git a/arch/i386/kernel/syscall_table.S b/arch/x86/kernel/syscall_table_32.S
index 8344c70adf61..8344c70adf61 100644
--- a/arch/i386/kernel/syscall_table.S
+++ b/arch/x86/kernel/syscall_table_32.S
diff --git a/arch/i386/kernel/sysenter.c b/arch/x86/kernel/sysenter_32.c
index 4eb2e408764f..4eb2e408764f 100644
--- a/arch/i386/kernel/sysenter.c
+++ b/arch/x86/kernel/sysenter_32.c
diff --git a/arch/x86_64/kernel/tce.c b/arch/x86/kernel/tce_64.c
index e3f2569b2c44..e3f2569b2c44 100644
--- a/arch/x86_64/kernel/tce.c
+++ b/arch/x86/kernel/tce_64.c
diff --git a/arch/i386/kernel/time.c b/arch/x86/kernel/time_32.c
index 19a6c678d02e..56dadfc2f41c 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/x86/kernel/time_32.c
@@ -157,6 +157,9 @@ EXPORT_SYMBOL(profile_pc);
  */
 irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
+        /* Keep nmi watchdog up to date */
+        per_cpu(irq_stat, smp_processor_id()).irq0_irqs++;
+
 #ifdef CONFIG_X86_IO_APIC
         if (timer_ack) {
                 /*
diff --git a/arch/x86_64/kernel/time.c b/arch/x86/kernel/time_64.c
index 6d48a4e826d9..e0134d6c88da 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86/kernel/time_64.c
@@ -28,11 +28,12 @@
 #include <linux/cpu.h>
 #include <linux/kallsyms.h>
 #include <linux/acpi.h>
+#include <linux/clockchips.h>
+
 #ifdef CONFIG_ACPI
 #include <acpi/achware.h>       /* for PM timer frequency */
 #include <acpi/acpi_bus.h>
 #endif
-#include <asm/8253pit.h>
 #include <asm/i8253.h>
 #include <asm/pgtable.h>
 #include <asm/vsyscall.h>
@@ -47,12 +48,8 @@
 #include <asm/nmi.h>
 #include <asm/vgtod.h>
 
-static char *timename = NULL;
-
 DEFINE_SPINLOCK(rtc_lock);
 EXPORT_SYMBOL(rtc_lock);
-DEFINE_SPINLOCK(i8253_lock);
-EXPORT_SYMBOL(i8253_lock);
 
 volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
 
@@ -153,45 +150,12 @@ int update_persistent_clock(struct timespec now)
         return set_rtc_mmss(now.tv_sec);
 }
 
-void main_timer_handler(void)
+static irqreturn_t timer_event_interrupt(int irq, void *dev_id)
 {
-/*
- * Here we are in the timer irq handler. We have irqs locally disabled (so we
- * don't need spin_lock_irqsave()) but we don't know if the timer_bh is running
- * on the other CPU, so we need a lock. We also need to lock the vsyscall
- * variables, because both do_timer() and us change them -arca+vojtech
- */
-
-        write_seqlock(&xtime_lock);
+        add_pda(irq0_irqs, 1);
 
-/*
- * Do the timer stuff.
- */
-
-        do_timer(1);
-#ifndef CONFIG_SMP
-        update_process_times(user_mode(get_irq_regs()));
-#endif
+        global_clock_event->event_handler(global_clock_event);
 
-/*
- * In the SMP case we use the local APIC timer interrupt to do the profiling,
- * except when we simulate SMP mode on a uniprocessor system, in that case we
- * have to call the local interrupt handler.
- */
-
-        if (!using_apic_timer)
-                smp_local_timer_interrupt();
-
-        write_sequnlock(&xtime_lock);
-}
-
-static irqreturn_t timer_interrupt(int irq, void *dev_id)
-{
-        if (apic_runs_main_timer > 1)
-                return IRQ_HANDLED;
-        main_timer_handler();
-        if (using_apic_timer)
-                smp_send_timer_broadcast_ipi();
         return IRQ_HANDLED;
 }
 
@@ -292,97 +256,21 @@ static unsigned int __init tsc_calibrate_cpu_khz(void)
         return pmc_now * tsc_khz / (tsc_now - tsc_start);
 }
 
-/*
- * pit_calibrate_tsc() uses the speaker output (channel 2) of
- * the PIT. This is better than using the timer interrupt output,
- * because we can read the value of the speaker with just one inb(),
- * where we need three i/o operations for the interrupt channel.
- * We count how many ticks the TSC does in 50 ms.
- */
-
-static unsigned int __init pit_calibrate_tsc(void)
-{
-        unsigned long start, end;
-        unsigned long flags;
-
-        spin_lock_irqsave(&i8253_lock, flags);
-
-        outb((inb(0x61) & ~0x02) | 0x01, 0x61);
-
-        outb(0xb0, 0x43);
-        outb((PIT_TICK_RATE / (1000 / 50)) & 0xff, 0x42);
-        outb((PIT_TICK_RATE / (1000 / 50)) >> 8, 0x42);
-        start = get_cycles_sync();
-        while ((inb(0x61) & 0x20) == 0);
-        end = get_cycles_sync();
-
-        spin_unlock_irqrestore(&i8253_lock, flags);
-
-        return (end - start) / 50;
-}
-
-#define PIT_MODE 0x43
-#define PIT_CH0  0x40
-
-static void __pit_init(int val, u8 mode)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&i8253_lock, flags);
-        outb_p(mode, PIT_MODE);
-        outb_p(val & 0xff, PIT_CH0);    /* LSB */
-        outb_p(val >> 8, PIT_CH0);      /* MSB */
-        spin_unlock_irqrestore(&i8253_lock, flags);
-}
-
-void __init pit_init(void)
-{
-        __pit_init(LATCH, 0x34); /* binary, mode 2, LSB/MSB, ch 0 */
-}
-
-void pit_stop_interrupt(void)
-{
-        __pit_init(0, 0x30); /* mode 0 */
-}
-
-void stop_timer_interrupt(void)
-{
-        char *name;
-        if (hpet_address) {
-                name = "HPET";
-                hpet_timer_stop_set_go(0);
-        } else {
-                name = "PIT";
-                pit_stop_interrupt();
-        }
-        printk(KERN_INFO "timer: %s interrupt stopped.\n", name);
-}
-
 static struct irqaction irq0 = {
-        .handler        = timer_interrupt,
-        .flags          = IRQF_DISABLED | IRQF_IRQPOLL,
+        .handler        = timer_event_interrupt,
+        .flags          = IRQF_DISABLED | IRQF_IRQPOLL | IRQF_NOBALANCING,
         .mask           = CPU_MASK_NONE,
         .name           = "timer"
 };
 
 void __init time_init(void)
 {
-        if (nohpet)
-                hpet_address = 0;
+        if (!hpet_enable())
+                setup_pit_timer();
 
-        if (hpet_arch_init())
-                hpet_address = 0;
+        setup_irq(0, &irq0);
 
-        if (hpet_use_timer) {
-                /* set tick_nsec to use the proper rate for HPET */
-                tick_nsec = TICK_NSEC_HPET;
-                tsc_khz = hpet_calibrate_tsc();
-                timename = "HPET";
-        } else {
-                pit_init();
-                tsc_khz = pit_calibrate_tsc();
-                timename = "PIT";
-        }
+        tsc_calibrate();
 
         cpu_khz = tsc_khz;
         if (cpu_has(&boot_cpu_data, X86_FEATURE_CONSTANT_TSC) &&
@@ -398,50 +286,7 @@ void __init time_init(void)
         else
                 vgetcpu_mode = VGETCPU_LSL;
 
-        set_cyc2ns_scale(tsc_khz);
         printk(KERN_INFO "time.c: Detected %d.%03d MHz processor.\n",
                 cpu_khz / 1000, cpu_khz % 1000);
         init_tsc_clocksource();
-
-        setup_irq(0, &irq0);
-}
-
-/*
- * sysfs support for the timer.
- */
-
-static int timer_suspend(struct sys_device *dev, pm_message_t state)
-{
-        return 0;
-}
-
-static int timer_resume(struct sys_device *dev)
-{
-        if (hpet_address)
-                hpet_reenable();
-        else
-                i8254_timer_resume();
-        return 0;
 }
-
-static struct sysdev_class timer_sysclass = {
-        .resume = timer_resume,
-        .suspend = timer_suspend,
-        set_kset_name("timer"),
-};
-
-/* XXX this sysfs stuff should probably go elsewhere later -john */
-static struct sys_device device_timer = {
-        .id     = 0,
-        .cls    = &timer_sysclass,
-};
-
-static int time_init_device(void)
-{
-        int error = sysdev_class_register(&timer_sysclass);
-        if (!error)
-                error = sysdev_register(&device_timer);
-        return error;
-}
-
-device_initcall(time_init_device);
diff --git a/arch/i386/kernel/topology.c b/arch/x86/kernel/topology.c
index 45782356a618..45782356a618 100644
--- a/arch/i386/kernel/topology.c
+++ b/arch/x86/kernel/topology.c
diff --git a/arch/i386/kernel/trampoline.S b/arch/x86/kernel/trampoline_32.S
index f62815f8d06a..f62815f8d06a 100644
--- a/arch/i386/kernel/trampoline.S
+++ b/arch/x86/kernel/trampoline_32.S
diff --git a/arch/x86_64/kernel/trampoline.S b/arch/x86/kernel/trampoline_64.S
index e7e2764c461b..607983b0d27b 100644
--- a/arch/x86_64/kernel/trampoline.S
+++ b/arch/x86/kernel/trampoline_64.S
@@ -126,7 +126,7 @@ startup_64:
 no_longmode:
         hlt
         jmp no_longmode
-#include "verify_cpu.S"
+#include "verify_cpu_64.S"
 
         # Careful these need to be in the same 64K segment as the above;
 tidt:
diff --git a/arch/i386/kernel/traps.c b/arch/x86/kernel/traps_32.c
index 47b0bef335bd..47b0bef335bd 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/x86/kernel/traps_32.c
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86/kernel/traps_64.c
index 03888420775d..03888420775d 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86/kernel/traps_64.c
diff --git a/arch/i386/kernel/tsc.c b/arch/x86/kernel/tsc_32.c
index a39280b4dd3a..3ed0ae8c918d 100644
--- a/arch/i386/kernel/tsc.c
+++ b/arch/x86/kernel/tsc_32.c
@@ -305,7 +305,7 @@ void mark_tsc_unstable(char *reason)
 }
 EXPORT_SYMBOL_GPL(mark_tsc_unstable);
 
-static int __init dmi_mark_tsc_unstable(struct dmi_system_id *d)
+static int __init dmi_mark_tsc_unstable(const struct dmi_system_id *d)
 {
         printk(KERN_NOTICE "%s detected: marking TSC unstable.\n",
                        d->ident);
diff --git a/arch/x86_64/kernel/tsc.c b/arch/x86/kernel/tsc_64.c
index 2a59bde663f2..9f22e542c374 100644
--- a/arch/x86_64/kernel/tsc.c
+++ b/arch/x86/kernel/tsc_64.c
@@ -6,7 +6,9 @@
 #include <linux/time.h>
 #include <linux/acpi.h>
 #include <linux/cpufreq.h>
+#include <linux/acpi_pmtmr.h>
 
+#include <asm/hpet.h>
 #include <asm/timex.h>
 
 static int notsc __initdata = 0;
@@ -18,7 +20,7 @@ EXPORT_SYMBOL(tsc_khz);
 
 static unsigned int cyc2ns_scale __read_mostly;
 
-void set_cyc2ns_scale(unsigned long khz)
+static inline void set_cyc2ns_scale(unsigned long khz)
 {
         cyc2ns_scale = (NSEC_PER_MSEC << NS_SCALE) / khz;
 }
@@ -118,6 +120,95 @@ core_initcall(cpufreq_tsc);
 
 #endif
 
+#define MAX_RETRIES     5
+#define SMI_TRESHOLD    50000
+
+/*
+ * Read TSC and the reference counters. Take care of SMI disturbance
+ */
+static unsigned long __init tsc_read_refs(unsigned long *pm,
+                                          unsigned long *hpet)
+{
+        unsigned long t1, t2;
+        int i;
+
+        for (i = 0; i < MAX_RETRIES; i++) {
+                t1 = get_cycles_sync();
+                if (hpet)
+                        *hpet = hpet_readl(HPET_COUNTER) & 0xFFFFFFFF;
+                else
+                        *pm = acpi_pm_read_early();
+                t2 = get_cycles_sync();
+                if ((t2 - t1) < SMI_TRESHOLD)
+                        return t2;
+        }
+        return ULONG_MAX;
+}
+
+/**
+ * tsc_calibrate - calibrate the tsc on boot
+ */
+void __init tsc_calibrate(void)
+{
+        unsigned long flags, tsc1, tsc2, tr1, tr2, pm1, pm2, hpet1, hpet2;
+        int hpet = is_hpet_enabled();
+
+        local_irq_save(flags);
+
+        tsc1 = tsc_read_refs(&pm1, hpet ? &hpet1 : NULL);
+
+        outb((inb(0x61) & ~0x02) | 0x01, 0x61);
+
+        outb(0xb0, 0x43);
+        outb((CLOCK_TICK_RATE / (1000 / 50)) & 0xff, 0x42);
+        outb((CLOCK_TICK_RATE / (1000 / 50)) >> 8, 0x42);
+        tr1 = get_cycles_sync();
+        while ((inb(0x61) & 0x20) == 0);
+        tr2 = get_cycles_sync();
+
+        tsc2 = tsc_read_refs(&pm2, hpet ? &hpet2 : NULL);
+
+        local_irq_restore(flags);
+
+        /*
+         * Preset the result with the raw and inaccurate PIT
+         * calibration value
+         */
+        tsc_khz = (tr2 - tr1) / 50;
+
+        /* hpet or pmtimer available ? */
+        if (!hpet && !pm1 && !pm2) {
+                printk(KERN_INFO "TSC calibrated against PIT\n");
+                return;
+        }
+
+        /* Check, whether the sampling was disturbed by an SMI */
+        if (tsc1 == ULONG_MAX || tsc2 == ULONG_MAX) {
+                printk(KERN_WARNING "TSC calibration disturbed by SMI, "
+                       "using PIT calibration result\n");
+                return;
+        }
+
+        tsc2 = (tsc2 - tsc1) * 1000000L;
+
+        if (hpet) {
+                printk(KERN_INFO "TSC calibrated against HPET\n");
+                if (hpet2 < hpet1)
+                        hpet2 += 0x100000000;
+                hpet2 -= hpet1;
+                tsc1 = (hpet2 * hpet_readl(HPET_PERIOD)) / 1000000;
+        } else {
+                printk(KERN_INFO "TSC calibrated against PM_TIMER\n");
+                if (pm2 < pm1)
+                        pm2 += ACPI_PM_OVRRUN;
+                pm2 -= pm1;
+                tsc1 = (pm2 * 1000000000) / PMTMR_TICKS_PER_SEC;
+        }
+
+        tsc_khz = tsc2 / tsc1;
+        set_cyc2ns_scale(tsc_khz);
+}
+
 /*
  * Make an educated guess if the TSC is trustworthy and synchronized
  * over all CPUs.
diff --git a/arch/x86_64/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index 355f5f506c81..355f5f506c81 100644
--- a/arch/x86_64/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
diff --git a/arch/x86_64/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu_64.S
index 45b6f8a975a1..45b6f8a975a1 100644
--- a/arch/x86_64/kernel/verify_cpu.S
+++ b/arch/x86/kernel/verify_cpu_64.S
diff --git a/arch/i386/kernel/vm86.c b/arch/x86/kernel/vm86_32.c
index f2dcd1d27c0a..f2dcd1d27c0a 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/x86/kernel/vm86_32.c
diff --git a/arch/i386/kernel/vmi.c b/arch/x86/kernel/vmi_32.c
index 18673e0f193b..18673e0f193b 100644
--- a/arch/i386/kernel/vmi.c
+++ b/arch/x86/kernel/vmi_32.c
diff --git a/arch/i386/kernel/vmiclock.c b/arch/x86/kernel/vmiclock_32.c
index b1b5ab08b26e..b1b5ab08b26e 100644
--- a/arch/i386/kernel/vmiclock.c
+++ b/arch/x86/kernel/vmiclock_32.c
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
new file mode 100644
index 000000000000..849ee611f013
--- /dev/null
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "vmlinux_32.lds.S"
+#else
+# include "vmlinux_64.lds.S"
+#endif
diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux_32.lds.S
index 7d72cce00529..7d72cce00529 100644
--- a/arch/i386/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux_32.lds.S
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux_64.lds.S
index ba8ea97abd21..ba8ea97abd21 100644
--- a/arch/x86_64/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux_64.lds.S
diff --git a/arch/x86_64/kernel/vsmp.c b/arch/x86/kernel/vsmp_64.c
index 414caf0c5f9a..414caf0c5f9a 100644
--- a/arch/x86_64/kernel/vsmp.c
+++ b/arch/x86/kernel/vsmp_64.c
diff --git a/arch/i386/kernel/vsyscall-int80.S b/arch/x86/kernel/vsyscall-int80_32.S
index 530d0525e5e2..103cab6aa7c0 100644
--- a/arch/i386/kernel/vsyscall-int80.S
+++ b/arch/x86/kernel/vsyscall-int80_32.S
@@ -50,4 +50,4 @@ __kernel_vsyscall:
 /*
  * Get the common code for the sigreturn entry points.
  */
-#include "vsyscall-sigreturn.S"
+#include "vsyscall-sigreturn_32.S"
diff --git a/arch/i386/kernel/vsyscall-note.S b/arch/x86/kernel/vsyscall-note_32.S
index 07c0daf78237..fcf376a37f79 100644
--- a/arch/i386/kernel/vsyscall-note.S
+++ b/arch/x86/kernel/vsyscall-note_32.S
@@ -33,7 +33,7 @@ ELFNOTE_END
  * at boot time we set VDSO_NOTE_NONEGSEG_BIT if running under Xen.
  */
 
-#include "../xen/vdso.h"        /* Defines VDSO_NOTE_NONEGSEG_BIT.  */
+#include "../../x86/xen/vdso.h" /* Defines VDSO_NOTE_NONEGSEG_BIT.  */
 
         .globl VDSO_NOTE_MASK
 ELFNOTE_START(GNU, 2, "a")
diff --git a/arch/i386/kernel/vsyscall-sigreturn.S b/arch/x86/kernel/vsyscall-sigreturn_32.S
index a92262f41659..a92262f41659 100644
--- a/arch/i386/kernel/vsyscall-sigreturn.S
+++ b/arch/x86/kernel/vsyscall-sigreturn_32.S
diff --git a/arch/i386/kernel/vsyscall-sysenter.S b/arch/x86/kernel/vsyscall-sysenter_32.S
index 1a36d26e15eb..ed879bf42995 100644
--- a/arch/i386/kernel/vsyscall-sysenter.S
+++ b/arch/x86/kernel/vsyscall-sysenter_32.S
@@ -119,4 +119,4 @@ SYSENTER_RETURN:
 /*
  * Get the common code for the sigreturn entry points.
  */
-#include "vsyscall-sigreturn.S"
+#include "vsyscall-sigreturn_32.S"
diff --git a/arch/i386/kernel/vsyscall.S b/arch/x86/kernel/vsyscall_32.S
index b403890fe39b..a5ab3dc4fd25 100644
--- a/arch/i386/kernel/vsyscall.S
+++ b/arch/x86/kernel/vsyscall_32.S
@@ -4,12 +4,12 @@ __INITDATA
 
         .globl vsyscall_int80_start, vsyscall_int80_end
 vsyscall_int80_start:
-        .incbin "arch/i386/kernel/vsyscall-int80.so"
+        .incbin "arch/x86/kernel/vsyscall-int80_32.so"
 vsyscall_int80_end:
 
         .globl vsyscall_sysenter_start, vsyscall_sysenter_end
 vsyscall_sysenter_start:
-        .incbin "arch/i386/kernel/vsyscall-sysenter.so"
+        .incbin "arch/x86/kernel/vsyscall-sysenter_32.so"
 vsyscall_sysenter_end:
 
 __FINIT
diff --git a/arch/i386/kernel/vsyscall.lds.S b/arch/x86/kernel/vsyscall_32.lds.S
index 4a8b0ed9b8fb..4a8b0ed9b8fb 100644
--- a/arch/i386/kernel/vsyscall.lds.S
+++ b/arch/x86/kernel/vsyscall_32.lds.S
diff --git a/arch/x86_64/kernel/vsyscall.c b/arch/x86/kernel/vsyscall_64.c
index 06c34949bfdc..06c34949bfdc 100644
--- a/arch/x86_64/kernel/vsyscall.c
+++ b/arch/x86/kernel/vsyscall_64.c
diff --git a/arch/x86_64/kernel/x8664_ksyms.c b/arch/x86/kernel/x8664_ksyms_64.c
index 77c25b307635..77c25b307635 100644
--- a/arch/x86_64/kernel/x8664_ksyms.c
+++ b/arch/x86/kernel/x8664_ksyms_64.c
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
new file mode 100644
index 000000000000..329da276c6f1
--- /dev/null
+++ b/arch/x86/lib/Makefile
@@ -0,0 +1,5 @@
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/x86/lib/Makefile_32
+else
+include ${srctree}/arch/x86/lib/Makefile_64
+endif
diff --git a/arch/x86/lib/Makefile_32 b/arch/x86/lib/Makefile_32
new file mode 100644
index 000000000000..98d1f1e2e2ef
--- /dev/null
+++ b/arch/x86/lib/Makefile_32
@@ -0,0 +1,11 @@
+#
+# Makefile for i386-specific library files..
+#
+
+
+lib-y = checksum_32.o delay_32.o usercopy_32.o getuser_32.o putuser_32.o memcpy_32.o strstr_32.o \
+        bitops_32.o semaphore_32.o string_32.o
+
+lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o
+
+obj-$(CONFIG_SMP)       += msr-on-cpu.o
diff --git a/arch/x86/lib/Makefile_64 b/arch/x86/lib/Makefile_64
new file mode 100644
index 000000000000..bbabad3c9335
--- /dev/null
+++ b/arch/x86/lib/Makefile_64
@@ -0,0 +1,13 @@
+#
+# Makefile for x86_64-specific library files.
+#
+
+CFLAGS_csum-partial_64.o := -funroll-loops
+
+obj-y := io_64.o iomap_copy_64.o
+obj-$(CONFIG_SMP)       += msr-on-cpu.o
+
+lib-y := csum-partial_64.o csum-copy_64.o csum-wrappers_64.o delay_64.o \
+        usercopy_64.o getuser_64.o putuser_64.o  \
+        thunk_64.o clear_page_64.o copy_page_64.o bitstr_64.o bitops_64.o
+lib-y += memcpy_64.o memmove_64.o memset_64.o copy_user_64.o rwlock_64.o copy_user_nocache_64.o
diff --git a/arch/i386/lib/bitops.c b/arch/x86/lib/bitops_32.c
index afd0045595d4..afd0045595d4 100644
--- a/arch/i386/lib/bitops.c
+++ b/arch/x86/lib/bitops_32.c
diff --git a/arch/x86_64/lib/bitops.c b/arch/x86/lib/bitops_64.c
index 95b6d9639fba..95b6d9639fba 100644
--- a/arch/x86_64/lib/bitops.c
+++ b/arch/x86/lib/bitops_64.c
diff --git a/arch/x86_64/lib/bitstr.c b/arch/x86/lib/bitstr_64.c
index 24676609a6ac..24676609a6ac 100644
--- a/arch/x86_64/lib/bitstr.c
+++ b/arch/x86/lib/bitstr_64.c
diff --git a/arch/i386/lib/checksum.S b/arch/x86/lib/checksum_32.S
index adbccd0bbb78..adbccd0bbb78 100644
--- a/arch/i386/lib/checksum.S
+++ b/arch/x86/lib/checksum_32.S
diff --git a/arch/x86_64/lib/clear_page.S b/arch/x86/lib/clear_page_64.S
index 9a10a78bb4a4..9a10a78bb4a4 100644
--- a/arch/x86_64/lib/clear_page.S
+++ b/arch/x86/lib/clear_page_64.S
diff --git a/arch/x86_64/lib/copy_page.S b/arch/x86/lib/copy_page_64.S
index 727a5d46d2fc..727a5d46d2fc 100644
--- a/arch/x86_64/lib/copy_page.S
+++ b/arch/x86/lib/copy_page_64.S
diff --git a/arch/x86_64/lib/copy_user.S b/arch/x86/lib/copy_user_64.S
index 70bebd310408..70bebd310408 100644
--- a/arch/x86_64/lib/copy_user.S
+++ b/arch/x86/lib/copy_user_64.S
diff --git a/arch/x86_64/lib/copy_user_nocache.S b/arch/x86/lib/copy_user_nocache_64.S
index 4620efb12f13..4620efb12f13 100644
--- a/arch/x86_64/lib/copy_user_nocache.S
+++ b/arch/x86/lib/copy_user_nocache_64.S
diff --git a/arch/x86_64/lib/csum-copy.S b/arch/x86/lib/csum-copy_64.S
index f0dba36578ea..f0dba36578ea 100644
--- a/arch/x86_64/lib/csum-copy.S
+++ b/arch/x86/lib/csum-copy_64.S
diff --git a/arch/x86_64/lib/csum-partial.c b/arch/x86/lib/csum-partial_64.c
index bc503f506903..bc503f506903 100644
--- a/arch/x86_64/lib/csum-partial.c
+++ b/arch/x86/lib/csum-partial_64.c
diff --git a/arch/x86_64/lib/csum-wrappers.c b/arch/x86/lib/csum-wrappers_64.c
index fd42a4a095fc..fd42a4a095fc 100644
--- a/arch/x86_64/lib/csum-wrappers.c
+++ b/arch/x86/lib/csum-wrappers_64.c
diff --git a/arch/i386/lib/delay.c b/arch/x86/lib/delay_32.c
index f6edb11364df..f6edb11364df 100644
--- a/arch/i386/lib/delay.c
+++ b/arch/x86/lib/delay_32.c
diff --git a/arch/x86_64/lib/delay.c b/arch/x86/lib/delay_64.c
index 2dbebd308347..2dbebd308347 100644
--- a/arch/x86_64/lib/delay.c
+++ b/arch/x86/lib/delay_64.c
diff --git a/arch/i386/lib/getuser.S b/arch/x86/lib/getuser_32.S
index 6d84b53f12a2..6d84b53f12a2 100644
--- a/arch/i386/lib/getuser.S
+++ b/arch/x86/lib/getuser_32.S
diff --git a/arch/x86_64/lib/getuser.S b/arch/x86/lib/getuser_64.S
index 5448876261f8..5448876261f8 100644
--- a/arch/x86_64/lib/getuser.S
+++ b/arch/x86/lib/getuser_64.S
diff --git a/arch/x86_64/lib/io.c b/arch/x86/lib/io_64.c
index 87b4a4e18039..87b4a4e18039 100644
--- a/arch/x86_64/lib/io.c
+++ b/arch/x86/lib/io_64.c
diff --git a/arch/x86_64/lib/iomap_copy.S b/arch/x86/lib/iomap_copy_64.S
index 05a95e713da8..05a95e713da8 100644
--- a/arch/x86_64/lib/iomap_copy.S
+++ b/arch/x86/lib/iomap_copy_64.S
diff --git a/arch/i386/lib/memcpy.c b/arch/x86/lib/memcpy_32.c
index 8ac51b82a632..8ac51b82a632 100644
--- a/arch/i386/lib/memcpy.c
+++ b/arch/x86/lib/memcpy_32.c
diff --git a/arch/x86_64/lib/memcpy.S b/arch/x86/lib/memcpy_64.S
index c22981fa2f3a..c22981fa2f3a 100644
--- a/arch/x86_64/lib/memcpy.S
+++ b/arch/x86/lib/memcpy_64.S
diff --git a/arch/x86_64/lib/memmove.c b/arch/x86/lib/memmove_64.c
index 751ebae8ec42..751ebae8ec42 100644
--- a/arch/x86_64/lib/memmove.c
+++ b/arch/x86/lib/memmove_64.c
diff --git a/arch/x86_64/lib/memset.S b/arch/x86/lib/memset_64.S
index 2c5948116bd2..2c5948116bd2 100644
--- a/arch/x86_64/lib/memset.S
+++ b/arch/x86/lib/memset_64.S
diff --git a/arch/i386/lib/mmx.c b/arch/x86/lib/mmx_32.c
index 28084d2e8dd4..28084d2e8dd4 100644
--- a/arch/i386/lib/mmx.c
+++ b/arch/x86/lib/mmx_32.c
diff --git a/arch/i386/lib/msr-on-cpu.c b/arch/x86/lib/msr-on-cpu.c
index 7767962f25d3..7767962f25d3 100644
--- a/arch/i386/lib/msr-on-cpu.c
+++ b/arch/x86/lib/msr-on-cpu.c
diff --git a/arch/i386/lib/putuser.S b/arch/x86/lib/putuser_32.S
index f58fba109d18..f58fba109d18 100644
--- a/arch/i386/lib/putuser.S
+++ b/arch/x86/lib/putuser_32.S
diff --git a/arch/x86_64/lib/putuser.S b/arch/x86/lib/putuser_64.S
index 4989f5a8fa9b..4989f5a8fa9b 100644
--- a/arch/x86_64/lib/putuser.S
+++ b/arch/x86/lib/putuser_64.S
diff --git a/arch/x86_64/lib/rwlock.S b/arch/x86/lib/rwlock_64.S
index 0cde1f807314..0cde1f807314 100644
--- a/arch/x86_64/lib/rwlock.S
+++ b/arch/x86/lib/rwlock_64.S
diff --git a/arch/i386/lib/semaphore.S b/arch/x86/lib/semaphore_32.S
index c01eb39c0b43..c01eb39c0b43 100644
--- a/arch/i386/lib/semaphore.S
+++ b/arch/x86/lib/semaphore_32.S
diff --git a/arch/i386/lib/string.c b/arch/x86/lib/string_32.c
index 2c773fefa3dd..2c773fefa3dd 100644
--- a/arch/i386/lib/string.c
+++ b/arch/x86/lib/string_32.c
diff --git a/arch/i386/lib/strstr.c b/arch/x86/lib/strstr_32.c
index a3dafbf59dae..a3dafbf59dae 100644
--- a/arch/i386/lib/strstr.c
+++ b/arch/x86/lib/strstr_32.c
diff --git a/arch/x86_64/lib/thunk.S b/arch/x86/lib/thunk_64.S
index 55e586d352d3..55e586d352d3 100644
--- a/arch/x86_64/lib/thunk.S
+++ b/arch/x86/lib/thunk_64.S
diff --git a/arch/i386/lib/usercopy.c b/arch/x86/lib/usercopy_32.c
index 9f38b12b4af1..9f38b12b4af1 100644
--- a/arch/i386/lib/usercopy.c
+++ b/arch/x86/lib/usercopy_32.c
diff --git a/arch/x86_64/lib/usercopy.c b/arch/x86/lib/usercopy_64.c
index 893d43f838cc..893d43f838cc 100644
--- a/arch/x86_64/lib/usercopy.c
+++ b/arch/x86/lib/usercopy_64.c
diff --git a/arch/i386/mach-default/Makefile b/arch/x86/mach-default/Makefile
index 012fe34459e6..012fe34459e6 100644
--- a/arch/i386/mach-default/Makefile
+++ b/arch/x86/mach-default/Makefile
diff --git a/arch/i386/mach-default/setup.c b/arch/x86/mach-default/setup.c
index 7f635c7a2381..7f635c7a2381 100644
--- a/arch/i386/mach-default/setup.c
+++ b/arch/x86/mach-default/setup.c
diff --git a/arch/i386/mach-es7000/Makefile b/arch/x86/mach-es7000/Makefile
index 69dd4da218dc..69dd4da218dc 100644
--- a/arch/i386/mach-es7000/Makefile
+++ b/arch/x86/mach-es7000/Makefile
diff --git a/arch/i386/mach-es7000/es7000.h b/arch/x86/mach-es7000/es7000.h
index c8d5aa132fa0..c8d5aa132fa0 100644
--- a/arch/i386/mach-es7000/es7000.h
+++ b/arch/x86/mach-es7000/es7000.h
diff --git a/arch/i386/mach-es7000/es7000plat.c b/arch/x86/mach-es7000/es7000plat.c
index ab99072d3f9a..ab99072d3f9a 100644
--- a/arch/i386/mach-es7000/es7000plat.c
+++ b/arch/x86/mach-es7000/es7000plat.c
diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile
new file mode 100644
index 000000000000..19d6d407737b
--- /dev/null
+++ b/arch/x86/mach-generic/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the generic architecture
+#
+
+EXTRA_CFLAGS    := -Iarch/x86/kernel
+
+obj-y           := probe.o summit.o bigsmp.o es7000.o default.o 
+obj-y           += ../../x86/mach-es7000/
diff --git a/arch/i386/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c
index 58a477baec30..292a225edabe 100644
--- a/arch/i386/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@ -21,7 +21,7 @@
 
 static int dmi_bigsmp; /* can be set by dmi scanners */
 
-static int hp_ht_bigsmp(struct dmi_system_id *d)
+static int hp_ht_bigsmp(const struct dmi_system_id *d)
 {
 #ifdef CONFIG_X86_GENERICARCH
         printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident);
@@ -31,7 +31,7 @@ static int hp_ht_bigsmp(struct dmi_system_id *d)
 }
 
 
-static struct dmi_system_id bigsmp_dmi_table[] = {
+static const struct dmi_system_id bigsmp_dmi_table[] = {
         { hp_ht_bigsmp, "HP ProLiant DL760 G2", {
                 DMI_MATCH(DMI_BIOS_VENDOR, "HP"),
                 DMI_MATCH(DMI_BIOS_VERSION, "P44-"),
diff --git a/arch/i386/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 8685208d8512..8685208d8512 100644
--- a/arch/i386/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
diff --git a/arch/i386/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c
index 4742626f08c4..4742626f08c4 100644
--- a/arch/i386/mach-generic/es7000.c
+++ b/arch/x86/mach-generic/es7000.c
diff --git a/arch/i386/mach-generic/probe.c b/arch/x86/mach-generic/probe.c
index 74f3da634423..74f3da634423 100644
--- a/arch/i386/mach-generic/probe.c
+++ b/arch/x86/mach-generic/probe.c
diff --git a/arch/i386/mach-generic/summit.c b/arch/x86/mach-generic/summit.c
index 74883ccb8f73..74883ccb8f73 100644
--- a/arch/i386/mach-generic/summit.c
+++ b/arch/x86/mach-generic/summit.c
diff --git a/arch/i386/mach-visws/Makefile b/arch/x86/mach-visws/Makefile
index 835fd96ad768..835fd96ad768 100644
--- a/arch/i386/mach-visws/Makefile
+++ b/arch/x86/mach-visws/Makefile
diff --git a/arch/i386/mach-visws/mpparse.c b/arch/x86/mach-visws/mpparse.c
index f3c74fab8b95..f3c74fab8b95 100644
--- a/arch/i386/mach-visws/mpparse.c
+++ b/arch/x86/mach-visws/mpparse.c
diff --git a/arch/i386/mach-visws/reboot.c b/arch/x86/mach-visws/reboot.c
index 99332abfad42..99332abfad42 100644
--- a/arch/i386/mach-visws/reboot.c
+++ b/arch/x86/mach-visws/reboot.c
diff --git a/arch/i386/mach-visws/setup.c b/arch/x86/mach-visws/setup.c
index 1f81f10e03a0..1f81f10e03a0 100644
--- a/arch/i386/mach-visws/setup.c
+++ b/arch/x86/mach-visws/setup.c
diff --git a/arch/i386/mach-visws/traps.c b/arch/x86/mach-visws/traps.c
index 843b67acf43b..843b67acf43b 100644
--- a/arch/i386/mach-visws/traps.c
+++ b/arch/x86/mach-visws/traps.c
diff --git a/arch/i386/mach-visws/visws_apic.c b/arch/x86/mach-visws/visws_apic.c
index 710faf71a650..710faf71a650 100644
--- a/arch/i386/mach-visws/visws_apic.c
+++ b/arch/x86/mach-visws/visws_apic.c
diff --git a/arch/i386/mach-voyager/Makefile b/arch/x86/mach-voyager/Makefile
index 33b74cf0dd22..15c250b371d3 100644
--- a/arch/i386/mach-voyager/Makefile
+++ b/arch/x86/mach-voyager/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-EXTRA_CFLAGS    := -Iarch/i386/kernel
+EXTRA_CFLAGS    := -Iarch/x86/kernel
 obj-y                   := setup.o voyager_basic.o voyager_thread.o
 
 obj-$(CONFIG_SMP)       += voyager_smp.o voyager_cat.o
diff --git a/arch/i386/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c
index 2b55694e6400..2b55694e6400 100644
--- a/arch/i386/mach-voyager/setup.c
+++ b/arch/x86/mach-voyager/setup.c
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/x86/mach-voyager/voyager_basic.c
index 9b77b39b71a6..9b77b39b71a6 100644
--- a/arch/i386/mach-voyager/voyager_basic.c
+++ b/arch/x86/mach-voyager/voyager_basic.c
diff --git a/arch/i386/mach-voyager/voyager_cat.c b/arch/x86/mach-voyager/voyager_cat.c
index 26a2d4c54b68..26a2d4c54b68 100644
--- a/arch/i386/mach-voyager/voyager_cat.c
+++ b/arch/x86/mach-voyager/voyager_cat.c
diff --git a/arch/i386/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
index b87f8548e75a..b87f8548e75a 100644
--- a/arch/i386/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
diff --git a/arch/i386/mach-voyager/voyager_thread.c b/arch/x86/mach-voyager/voyager_thread.c
index f9d595338159..f9d595338159 100644
--- a/arch/i386/mach-voyager/voyager_thread.c
+++ b/arch/x86/mach-voyager/voyager_thread.c
diff --git a/arch/i386/math-emu/Makefile b/arch/x86/math-emu/Makefile
index 9c943fa6ce6b..9c943fa6ce6b 100644
--- a/arch/i386/math-emu/Makefile
+++ b/arch/x86/math-emu/Makefile
diff --git a/arch/i386/math-emu/README b/arch/x86/math-emu/README
index e6235491d6eb..e6235491d6eb 100644
--- a/arch/i386/math-emu/README
+++ b/arch/x86/math-emu/README
diff --git a/arch/i386/math-emu/control_w.h b/arch/x86/math-emu/control_w.h
index ae2274dbd305..ae2274dbd305 100644
--- a/arch/i386/math-emu/control_w.h
+++ b/arch/x86/math-emu/control_w.h
diff --git a/arch/i386/math-emu/div_Xsig.S b/arch/x86/math-emu/div_Xsig.S
index f77ba3058b31..f77ba3058b31 100644
--- a/arch/i386/math-emu/div_Xsig.S
+++ b/arch/x86/math-emu/div_Xsig.S
diff --git a/arch/i386/math-emu/div_small.S b/arch/x86/math-emu/div_small.S
index 47099628fa4c..47099628fa4c 100644
--- a/arch/i386/math-emu/div_small.S
+++ b/arch/x86/math-emu/div_small.S
diff --git a/arch/i386/math-emu/errors.c b/arch/x86/math-emu/errors.c
index a1b0d22f6978..a1b0d22f6978 100644
--- a/arch/i386/math-emu/errors.c
+++ b/arch/x86/math-emu/errors.c
diff --git a/arch/i386/math-emu/exception.h b/arch/x86/math-emu/exception.h
index b463f21a811e..b463f21a811e 100644
--- a/arch/i386/math-emu/exception.h
+++ b/arch/x86/math-emu/exception.h
diff --git a/arch/i386/math-emu/fpu_arith.c b/arch/x86/math-emu/fpu_arith.c
index 6972dec01af6..6972dec01af6 100644
--- a/arch/i386/math-emu/fpu_arith.c
+++ b/arch/x86/math-emu/fpu_arith.c
diff --git a/arch/i386/math-emu/fpu_asm.h b/arch/x86/math-emu/fpu_asm.h
index 9ba12416df12..9ba12416df12 100644
--- a/arch/i386/math-emu/fpu_asm.h
+++ b/arch/x86/math-emu/fpu_asm.h
diff --git a/arch/i386/math-emu/fpu_aux.c b/arch/x86/math-emu/fpu_aux.c
index 20886cfb9f76..20886cfb9f76 100644
--- a/arch/i386/math-emu/fpu_aux.c
+++ b/arch/x86/math-emu/fpu_aux.c
diff --git a/arch/i386/math-emu/fpu_emu.h b/arch/x86/math-emu/fpu_emu.h
index 65120f523853..65120f523853 100644
--- a/arch/i386/math-emu/fpu_emu.h
+++ b/arch/x86/math-emu/fpu_emu.h
diff --git a/arch/i386/math-emu/fpu_entry.c b/arch/x86/math-emu/fpu_entry.c
index 1853524c8b57..1853524c8b57 100644
--- a/arch/i386/math-emu/fpu_entry.c
+++ b/arch/x86/math-emu/fpu_entry.c
diff --git a/arch/i386/math-emu/fpu_etc.c b/arch/x86/math-emu/fpu_etc.c
index e3b5d465587f..e3b5d465587f 100644
--- a/arch/i386/math-emu/fpu_etc.c
+++ b/arch/x86/math-emu/fpu_etc.c
diff --git a/arch/i386/math-emu/fpu_proto.h b/arch/x86/math-emu/fpu_proto.h
index 37a8a7fe7e2b..37a8a7fe7e2b 100644
--- a/arch/i386/math-emu/fpu_proto.h
+++ b/arch/x86/math-emu/fpu_proto.h
diff --git a/arch/i386/math-emu/fpu_system.h b/arch/x86/math-emu/fpu_system.h
index a3ae28c49ddd..a3ae28c49ddd 100644
--- a/arch/i386/math-emu/fpu_system.h
+++ b/arch/x86/math-emu/fpu_system.h
diff --git a/arch/i386/math-emu/fpu_tags.c b/arch/x86/math-emu/fpu_tags.c
index cb436fe20e4c..cb436fe20e4c 100644
--- a/arch/i386/math-emu/fpu_tags.c
+++ b/arch/x86/math-emu/fpu_tags.c
diff --git a/arch/i386/math-emu/fpu_trig.c b/arch/x86/math-emu/fpu_trig.c
index 403cbde1d425..403cbde1d425 100644
--- a/arch/i386/math-emu/fpu_trig.c
+++ b/arch/x86/math-emu/fpu_trig.c
diff --git a/arch/i386/math-emu/get_address.c b/arch/x86/math-emu/get_address.c
index 2e2c51a8bd3a..2e2c51a8bd3a 100644
--- a/arch/i386/math-emu/get_address.c
+++ b/arch/x86/math-emu/get_address.c
diff --git a/arch/i386/math-emu/load_store.c b/arch/x86/math-emu/load_store.c
index eebd6fb1c8a8..eebd6fb1c8a8 100644
--- a/arch/i386/math-emu/load_store.c
+++ b/arch/x86/math-emu/load_store.c
diff --git a/arch/i386/math-emu/mul_Xsig.S b/arch/x86/math-emu/mul_Xsig.S
index 717785a53eb4..717785a53eb4 100644
--- a/arch/i386/math-emu/mul_Xsig.S
+++ b/arch/x86/math-emu/mul_Xsig.S
diff --git a/arch/i386/math-emu/poly.h b/arch/x86/math-emu/poly.h
index 4db798114923..4db798114923 100644
--- a/arch/i386/math-emu/poly.h
+++ b/arch/x86/math-emu/poly.h
diff --git a/arch/i386/math-emu/poly_2xm1.c b/arch/x86/math-emu/poly_2xm1.c
index 9766ad5e9743..9766ad5e9743 100644
--- a/arch/i386/math-emu/poly_2xm1.c
+++ b/arch/x86/math-emu/poly_2xm1.c
diff --git a/arch/i386/math-emu/poly_atan.c b/arch/x86/math-emu/poly_atan.c
index 82f702952f69..82f702952f69 100644
--- a/arch/i386/math-emu/poly_atan.c
+++ b/arch/x86/math-emu/poly_atan.c
diff --git a/arch/i386/math-emu/poly_l2.c b/arch/x86/math-emu/poly_l2.c
index dd00e1d5b074..dd00e1d5b074 100644
--- a/arch/i386/math-emu/poly_l2.c
+++ b/arch/x86/math-emu/poly_l2.c
diff --git a/arch/i386/math-emu/poly_sin.c b/arch/x86/math-emu/poly_sin.c
index a36313fb06f1..a36313fb06f1 100644
--- a/arch/i386/math-emu/poly_sin.c
+++ b/arch/x86/math-emu/poly_sin.c
diff --git a/arch/i386/math-emu/poly_tan.c b/arch/x86/math-emu/poly_tan.c
index 8df3e03b6e6f..8df3e03b6e6f 100644
--- a/arch/i386/math-emu/poly_tan.c
+++ b/arch/x86/math-emu/poly_tan.c
diff --git a/arch/i386/math-emu/polynom_Xsig.S b/arch/x86/math-emu/polynom_Xsig.S
index 17315c89ff3d..17315c89ff3d 100644
--- a/arch/i386/math-emu/polynom_Xsig.S
+++ b/arch/x86/math-emu/polynom_Xsig.S
diff --git a/arch/i386/math-emu/reg_add_sub.c b/arch/x86/math-emu/reg_add_sub.c
index 7cd3b37ac084..7cd3b37ac084 100644
--- a/arch/i386/math-emu/reg_add_sub.c
+++ b/arch/x86/math-emu/reg_add_sub.c
diff --git a/arch/i386/math-emu/reg_compare.c b/arch/x86/math-emu/reg_compare.c
index f37c5b5a35ad..f37c5b5a35ad 100644
--- a/arch/i386/math-emu/reg_compare.c
+++ b/arch/x86/math-emu/reg_compare.c
diff --git a/arch/i386/math-emu/reg_constant.c b/arch/x86/math-emu/reg_constant.c
index a85015801969..a85015801969 100644
--- a/arch/i386/math-emu/reg_constant.c
+++ b/arch/x86/math-emu/reg_constant.c
diff --git a/arch/i386/math-emu/reg_constant.h b/arch/x86/math-emu/reg_constant.h
index 1bffaec3a134..1bffaec3a134 100644
--- a/arch/i386/math-emu/reg_constant.h
+++ b/arch/x86/math-emu/reg_constant.h
diff --git a/arch/i386/math-emu/reg_convert.c b/arch/x86/math-emu/reg_convert.c
index 45a258752703..45a258752703 100644
--- a/arch/i386/math-emu/reg_convert.c
+++ b/arch/x86/math-emu/reg_convert.c
diff --git a/arch/i386/math-emu/reg_divide.c b/arch/x86/math-emu/reg_divide.c
index 5cee7ff920d9..5cee7ff920d9 100644
--- a/arch/i386/math-emu/reg_divide.c
+++ b/arch/x86/math-emu/reg_divide.c
diff --git a/arch/i386/math-emu/reg_ld_str.c b/arch/x86/math-emu/reg_ld_str.c
index e976caef6498..e976caef6498 100644
--- a/arch/i386/math-emu/reg_ld_str.c
+++ b/arch/x86/math-emu/reg_ld_str.c
diff --git a/arch/i386/math-emu/reg_mul.c b/arch/x86/math-emu/reg_mul.c
index 40f50b61bc67..40f50b61bc67 100644
--- a/arch/i386/math-emu/reg_mul.c
+++ b/arch/x86/math-emu/reg_mul.c
diff --git a/arch/i386/math-emu/reg_norm.S b/arch/x86/math-emu/reg_norm.S
index 8b6352efceef..8b6352efceef 100644
--- a/arch/i386/math-emu/reg_norm.S
+++ b/arch/x86/math-emu/reg_norm.S
diff --git a/arch/i386/math-emu/reg_round.S b/arch/x86/math-emu/reg_round.S
index d1d4e48b4f67..d1d4e48b4f67 100644
--- a/arch/i386/math-emu/reg_round.S
+++ b/arch/x86/math-emu/reg_round.S
diff --git a/arch/i386/math-emu/reg_u_add.S b/arch/x86/math-emu/reg_u_add.S
index 47c4c2434d85..47c4c2434d85 100644
--- a/arch/i386/math-emu/reg_u_add.S
+++ b/arch/x86/math-emu/reg_u_add.S
diff --git a/arch/i386/math-emu/reg_u_div.S b/arch/x86/math-emu/reg_u_div.S
index cc00654b6f9a..cc00654b6f9a 100644
--- a/arch/i386/math-emu/reg_u_div.S
+++ b/arch/x86/math-emu/reg_u_div.S
diff --git a/arch/i386/math-emu/reg_u_mul.S b/arch/x86/math-emu/reg_u_mul.S
index 973f12af97df..973f12af97df 100644
--- a/arch/i386/math-emu/reg_u_mul.S
+++ b/arch/x86/math-emu/reg_u_mul.S
diff --git a/arch/i386/math-emu/reg_u_sub.S b/arch/x86/math-emu/reg_u_sub.S
index 1b6c24801d22..1b6c24801d22 100644
--- a/arch/i386/math-emu/reg_u_sub.S
+++ b/arch/x86/math-emu/reg_u_sub.S
diff --git a/arch/i386/math-emu/round_Xsig.S b/arch/x86/math-emu/round_Xsig.S
index bbe0e87718e4..bbe0e87718e4 100644
--- a/arch/i386/math-emu/round_Xsig.S
+++ b/arch/x86/math-emu/round_Xsig.S
diff --git a/arch/i386/math-emu/shr_Xsig.S b/arch/x86/math-emu/shr_Xsig.S
index 31cdd118e918..31cdd118e918 100644
--- a/arch/i386/math-emu/shr_Xsig.S
+++ b/arch/x86/math-emu/shr_Xsig.S
diff --git a/arch/i386/math-emu/status_w.h b/arch/x86/math-emu/status_w.h
index 59e73302aa60..59e73302aa60 100644
--- a/arch/i386/math-emu/status_w.h
+++ b/arch/x86/math-emu/status_w.h
diff --git a/arch/i386/math-emu/version.h b/arch/x86/math-emu/version.h
index a0d73a1d2b67..a0d73a1d2b67 100644
--- a/arch/i386/math-emu/version.h
+++ b/arch/x86/math-emu/version.h
diff --git a/arch/i386/math-emu/wm_shrx.S b/arch/x86/math-emu/wm_shrx.S
index 518428317985..518428317985 100644
--- a/arch/i386/math-emu/wm_shrx.S
+++ b/arch/x86/math-emu/wm_shrx.S
diff --git a/arch/i386/math-emu/wm_sqrt.S b/arch/x86/math-emu/wm_sqrt.S
index d258f59564e1..d258f59564e1 100644
--- a/arch/i386/math-emu/wm_sqrt.S
+++ b/arch/x86/math-emu/wm_sqrt.S
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
new file mode 100644
index 000000000000..983291096848
--- /dev/null
+++ b/arch/x86/mm/Makefile
@@ -0,0 +1,5 @@
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/x86/mm/Makefile_32
+else
+include ${srctree}/arch/x86/mm/Makefile_64
+endif
diff --git a/arch/x86/mm/Makefile_32 b/arch/x86/mm/Makefile_32
new file mode 100644
index 000000000000..362b4ad082de
--- /dev/null
+++ b/arch/x86/mm/Makefile_32
@@ -0,0 +1,10 @@
+#
+# Makefile for the linux i386-specific parts of the memory manager.
+#
+
+obj-y   := init_32.o pgtable_32.o fault_32.o ioremap_32.o extable_32.o pageattr_32.o mmap_32.o
+
+obj-$(CONFIG_NUMA) += discontig_32.o
+obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
+obj-$(CONFIG_HIGHMEM) += highmem_32.o
+obj-$(CONFIG_BOOT_IOREMAP) += boot_ioremap_32.o
diff --git a/arch/x86/mm/Makefile_64 b/arch/x86/mm/Makefile_64
new file mode 100644
index 000000000000..6bcb47945b87
--- /dev/null
+++ b/arch/x86/mm/Makefile_64
@@ -0,0 +1,10 @@
+#
+# Makefile for the linux x86_64-specific parts of the memory manager.
+#
+
+obj-y    := init_64.o fault_64.o ioremap_64.o extable_64.o pageattr_64.o mmap_64.o
+obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
+obj-$(CONFIG_NUMA) += numa_64.o
+obj-$(CONFIG_K8_NUMA) += k8topology_64.o
+obj-$(CONFIG_ACPI_NUMA) += srat_64.o
+
diff --git a/arch/i386/mm/boot_ioremap.c b/arch/x86/mm/boot_ioremap_32.c
index 4de95a17a7d4..4de95a17a7d4 100644
--- a/arch/i386/mm/boot_ioremap.c
+++ b/arch/x86/mm/boot_ioremap_32.c
diff --git a/arch/i386/mm/discontig.c b/arch/x86/mm/discontig_32.c
index 860e912a3fbb..860e912a3fbb 100644
--- a/arch/i386/mm/discontig.c
+++ b/arch/x86/mm/discontig_32.c
diff --git a/arch/i386/mm/extable.c b/arch/x86/mm/extable_32.c
index 0ce4f22a2635..0ce4f22a2635 100644
--- a/arch/i386/mm/extable.c
+++ b/arch/x86/mm/extable_32.c
diff --git a/arch/x86_64/mm/extable.c b/arch/x86/mm/extable_64.c
index 79ac6e7100af..79ac6e7100af 100644
--- a/arch/x86_64/mm/extable.c
+++ b/arch/x86/mm/extable_64.c
diff --git a/arch/i386/mm/fault.c b/arch/x86/mm/fault_32.c
index fcb38e7f3543..fcb38e7f3543 100644
--- a/arch/i386/mm/fault.c
+++ b/arch/x86/mm/fault_32.c
diff --git a/arch/x86_64/mm/fault.c b/arch/x86/mm/fault_64.c
index 54816adb8e93..54816adb8e93 100644
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86/mm/fault_64.c
diff --git a/arch/i386/mm/highmem.c b/arch/x86/mm/highmem_32.c
index 1c3bf95f7356..1c3bf95f7356 100644
--- a/arch/i386/mm/highmem.c
+++ b/arch/x86/mm/highmem_32.c
diff --git a/arch/i386/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
index 6c06d9c0488e..6c06d9c0488e 100644
--- a/arch/i386/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
diff --git a/arch/i386/mm/init.c b/arch/x86/mm/init_32.c
index 730a5b177b1f..730a5b177b1f 100644
--- a/arch/i386/mm/init.c
+++ b/arch/x86/mm/init_32.c
diff --git a/arch/x86_64/mm/init.c b/arch/x86/mm/init_64.c
index 458893b376f8..458893b376f8 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86/mm/init_64.c
diff --git a/arch/i386/mm/ioremap.c b/arch/x86/mm/ioremap_32.c
index 0b278315d737..0b278315d737 100644
--- a/arch/i386/mm/ioremap.c
+++ b/arch/x86/mm/ioremap_32.c
diff --git a/arch/x86_64/mm/ioremap.c b/arch/x86/mm/ioremap_64.c
index 6cac90aa5032..6cac90aa5032 100644
--- a/arch/x86_64/mm/ioremap.c
+++ b/arch/x86/mm/ioremap_64.c
diff --git a/arch/x86_64/mm/k8topology.c b/arch/x86/mm/k8topology_64.c
index a96006f7ae0c..a96006f7ae0c 100644
--- a/arch/x86_64/mm/k8topology.c
+++ b/arch/x86/mm/k8topology_64.c
diff --git a/arch/i386/mm/mmap.c b/arch/x86/mm/mmap_32.c
index 552e08473755..552e08473755 100644
--- a/arch/i386/mm/mmap.c
+++ b/arch/x86/mm/mmap_32.c
diff --git a/arch/x86_64/mm/mmap.c b/arch/x86/mm/mmap_64.c
index 80bba0dc000e..80bba0dc000e 100644
--- a/arch/x86_64/mm/mmap.c
+++ b/arch/x86/mm/mmap_64.c
diff --git a/arch/x86_64/mm/numa.c b/arch/x86/mm/numa_64.c
index 6da235522269..6da235522269 100644
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86/mm/numa_64.c
diff --git a/arch/i386/mm/pageattr.c b/arch/x86/mm/pageattr_32.c
index 4241a74d16c8..4241a74d16c8 100644
--- a/arch/i386/mm/pageattr.c
+++ b/arch/x86/mm/pageattr_32.c
diff --git a/arch/x86_64/mm/pageattr.c b/arch/x86/mm/pageattr_64.c
index 10b9809ce821..10b9809ce821 100644
--- a/arch/x86_64/mm/pageattr.c
+++ b/arch/x86/mm/pageattr_64.c
diff --git a/arch/i386/mm/pgtable.c b/arch/x86/mm/pgtable_32.c
index 01437c46baae..01437c46baae 100644
--- a/arch/i386/mm/pgtable.c
+++ b/arch/x86/mm/pgtable_32.c
diff --git a/arch/x86_64/mm/srat.c b/arch/x86/mm/srat_64.c
index acdf03e19146..acdf03e19146 100644
--- a/arch/x86_64/mm/srat.c
+++ b/arch/x86/mm/srat_64.c
diff --git a/arch/i386/oprofile/Kconfig b/arch/x86/oprofile/Kconfig
index d8a84088471a..d8a84088471a 100644
--- a/arch/i386/oprofile/Kconfig
+++ b/arch/x86/oprofile/Kconfig
diff --git a/arch/i386/oprofile/Makefile b/arch/x86/oprofile/Makefile
index 30f3eb366667..30f3eb366667 100644
--- a/arch/i386/oprofile/Makefile
+++ b/arch/x86/oprofile/Makefile
diff --git a/arch/i386/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
index c049ce414f01..c049ce414f01 100644
--- a/arch/i386/oprofile/backtrace.c
+++ b/arch/x86/oprofile/backtrace.c
diff --git a/arch/i386/oprofile/init.c b/arch/x86/oprofile/init.c
index 5341d481d92f..5341d481d92f 100644
--- a/arch/i386/oprofile/init.c
+++ b/arch/x86/oprofile/init.c
diff --git a/arch/i386/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 11b7a51566a8..11b7a51566a8 100644
--- a/arch/i386/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
diff --git a/arch/i386/oprofile/nmi_timer_int.c b/arch/x86/oprofile/nmi_timer_int.c
index 1418e36ae7ab..1418e36ae7ab 100644
--- a/arch/i386/oprofile/nmi_timer_int.c
+++ b/arch/x86/oprofile/nmi_timer_int.c
diff --git a/arch/i386/oprofile/op_counter.h b/arch/x86/oprofile/op_counter.h
index 2880b15c4675..2880b15c4675 100644
--- a/arch/i386/oprofile/op_counter.h
+++ b/arch/x86/oprofile/op_counter.h
diff --git a/arch/i386/oprofile/op_model_athlon.c b/arch/x86/oprofile/op_model_athlon.c
index 3057a19e4641..3057a19e4641 100644
--- a/arch/i386/oprofile/op_model_athlon.c
+++ b/arch/x86/oprofile/op_model_athlon.c
diff --git a/arch/i386/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
index 47925927b12f..47925927b12f 100644
--- a/arch/i386/oprofile/op_model_p4.c
+++ b/arch/x86/oprofile/op_model_p4.c
diff --git a/arch/i386/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
index c554f52cb808..c554f52cb808 100644
--- a/arch/i386/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
diff --git a/arch/i386/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
index abb1aa95b979..abb1aa95b979 100644
--- a/arch/i386/oprofile/op_x86_model.h
+++ b/arch/x86/oprofile/op_x86_model.h
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
new file mode 100644
index 000000000000..c5c8e485fc44
--- /dev/null
+++ b/arch/x86/pci/Makefile
@@ -0,0 +1,5 @@
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/x86/pci/Makefile_32
+else
+include ${srctree}/arch/x86/pci/Makefile_64
+endif
diff --git a/arch/i386/pci/Makefile b/arch/x86/pci/Makefile_32
index 44650e03308b..cdd6828b5abb 100644
--- a/arch/i386/pci/Makefile
+++ b/arch/x86/pci/Makefile_32
@@ -1,7 +1,7 @@
 obj-y                           := i386.o init.o
 
 obj-$(CONFIG_PCI_BIOS)          += pcbios.o
-obj-$(CONFIG_PCI_MMCONFIG)      += mmconfig.o direct.o mmconfig-shared.o
+obj-$(CONFIG_PCI_MMCONFIG)      += mmconfig_32.o direct.o mmconfig-shared.o
 obj-$(CONFIG_PCI_DIRECT)        += direct.o
 
 pci-y                           := fixup.o
diff --git a/arch/x86/pci/Makefile_64 b/arch/x86/pci/Makefile_64
new file mode 100644
index 000000000000..7d8c467bf143
--- /dev/null
+++ b/arch/x86/pci/Makefile_64
@@ -0,0 +1,17 @@
+#
+# Makefile for X86_64 specific PCI routines
+#
+# Reuse the i386 PCI subsystem
+#
+EXTRA_CFLAGS += -Iarch/x86/pci
+
+obj-y           := i386.o
+obj-$(CONFIG_PCI_DIRECT)+= direct.o
+obj-y           += fixup.o init.o
+obj-$(CONFIG_ACPI)      += acpi.o
+obj-y                   += legacy.o irq.o common.o early.o
+# mmconfig has a 64bit special
+obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o
+
+obj-$(CONFIG_NUMA)      += k8-bus_64.o
+
diff --git a/arch/i386/pci/acpi.c b/arch/x86/pci/acpi.c
index bc8a44bddaa7..bc8a44bddaa7 100644
--- a/arch/i386/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
diff --git a/arch/i386/pci/common.c b/arch/x86/pci/common.c
index ebc6f3c66340..07d5223442bf 100644
--- a/arch/i386/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -123,7 +123,7 @@ void __devinit  pcibios_fixup_bus(struct pci_bus *b)
  * on the kernel command line (which was parsed earlier).
  */
 
-static int __devinit set_bf_sort(struct dmi_system_id *d)
+static int __devinit set_bf_sort(const struct dmi_system_id *d)
 {
         if (pci_bf_sort == pci_bf_sort_default) {
                 pci_bf_sort = pci_dmi_bf;
@@ -136,7 +136,7 @@ static int __devinit set_bf_sort(struct dmi_system_id *d)
  * Enable renumbering of PCI bus# ranges to reach all PCI busses (Cardbus)
  */
 #ifdef __i386__
-static int __devinit assign_all_busses(struct dmi_system_id *d)
+static int __devinit assign_all_busses(const struct dmi_system_id *d)
 {
         pci_probe |= PCI_ASSIGN_ALL_BUSSES;
         printk(KERN_INFO "%s detected: enabling PCI bus# renumbering"
diff --git a/arch/i386/pci/direct.c b/arch/x86/pci/direct.c
index 431c9a51b157..431c9a51b157 100644
--- a/arch/i386/pci/direct.c
+++ b/arch/x86/pci/direct.c
diff --git a/arch/i386/pci/early.c b/arch/x86/pci/early.c
index 42df4b6606df..42df4b6606df 100644
--- a/arch/i386/pci/early.c
+++ b/arch/x86/pci/early.c
diff --git a/arch/i386/pci/fixup.c b/arch/x86/pci/fixup.c
index c82cbf4c7226..c82cbf4c7226 100644
--- a/arch/i386/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
diff --git a/arch/i386/pci/i386.c b/arch/x86/pci/i386.c
index bcd2f94b732c..bcd2f94b732c 100644
--- a/arch/i386/pci/i386.c
+++ b/arch/x86/pci/i386.c
diff --git a/arch/i386/pci/init.c b/arch/x86/pci/init.c
index 3de9f9ba2da6..3de9f9ba2da6 100644
--- a/arch/i386/pci/init.c
+++ b/arch/x86/pci/init.c
diff --git a/arch/i386/pci/irq.c b/arch/x86/pci/irq.c
index 8434f2323b87..d98c6b096f8e 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -1010,7 +1010,7 @@ static void __init pcibios_fixup_irqs(void)
  * Work around broken HP Pavilion Notebooks which assign USB to
  * IRQ 9 even though it is actually wired to IRQ 11
  */
-static int __init fix_broken_hp_bios_irq9(struct dmi_system_id *d)
+static int __init fix_broken_hp_bios_irq9(const struct dmi_system_id *d)
 {
         if (!broken_hp_bios_irq9) {
                 broken_hp_bios_irq9 = 1;
@@ -1023,7 +1023,7 @@ static int __init fix_broken_hp_bios_irq9(struct dmi_system_id *d)
  * Work around broken Acer TravelMate 360 Notebooks which assign
  * Cardbus to IRQ 11 even though it is actually wired to IRQ 10
  */
-static int __init fix_acer_tm360_irqrouting(struct dmi_system_id *d)
+static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
 {
         if (!acer_tm360_irqrouting) {
                 acer_tm360_irqrouting = 1;
diff --git a/arch/x86_64/pci/k8-bus.c b/arch/x86/pci/k8-bus_64.c
index 9cc813e29706..9cc813e29706 100644
--- a/arch/x86_64/pci/k8-bus.c
+++ b/arch/x86/pci/k8-bus_64.c
diff --git a/arch/i386/pci/legacy.c b/arch/x86/pci/legacy.c
index 5565d7016b75..5565d7016b75 100644
--- a/arch/i386/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
diff --git a/arch/i386/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 4df637e34f81..4df637e34f81 100644
--- a/arch/i386/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
diff --git a/arch/i386/pci/mmconfig.c b/arch/x86/pci/mmconfig_32.c
index 1bf5816d34c8..1bf5816d34c8 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/x86/pci/mmconfig_32.c
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86/pci/mmconfig_64.c
index 4095e4d66a1d..4095e4d66a1d 100644
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86/pci/mmconfig_64.c
diff --git a/arch/i386/pci/numa.c b/arch/x86/pci/numa.c
index f5f165f69e0c..f5f165f69e0c 100644
--- a/arch/i386/pci/numa.c
+++ b/arch/x86/pci/numa.c
diff --git a/arch/i386/pci/pcbios.c b/arch/x86/pci/pcbios.c
index 10ac8c316c46..10ac8c316c46 100644
--- a/arch/i386/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
diff --git a/arch/i386/pci/pci.h b/arch/x86/pci/pci.h
index 8c66f275756f..8c66f275756f 100644
--- a/arch/i386/pci/pci.h
+++ b/arch/x86/pci/pci.h
diff --git a/arch/i386/pci/visws.c b/arch/x86/pci/visws.c
index 8ecb1c722594..8ecb1c722594 100644
--- a/arch/i386/pci/visws.c
+++ b/arch/x86/pci/visws.c
diff --git a/arch/i386/power/Makefile b/arch/x86/power/Makefile
index d764ec950065..d764ec950065 100644
--- a/arch/i386/power/Makefile
+++ b/arch/x86/power/Makefile
diff --git a/arch/i386/power/cpu.c b/arch/x86/power/cpu.c
index 998fd3ec0d68..998fd3ec0d68 100644
--- a/arch/i386/power/cpu.c
+++ b/arch/x86/power/cpu.c
diff --git a/arch/i386/power/suspend.c b/arch/x86/power/suspend.c
index a0020b913f31..a0020b913f31 100644
--- a/arch/i386/power/suspend.c
+++ b/arch/x86/power/suspend.c
diff --git a/arch/i386/power/swsusp.S b/arch/x86/power/swsusp.S
index 53662e05b393..53662e05b393 100644
--- a/arch/i386/power/swsusp.S
+++ b/arch/x86/power/swsusp.S
diff --git a/arch/x86_64/vdso/.gitignore b/arch/x86/vdso/.gitignore
index f8b69d84238e..f8b69d84238e 100644
--- a/arch/x86_64/vdso/.gitignore
+++ b/arch/x86/vdso/.gitignore
diff --git a/arch/x86_64/vdso/Makefile b/arch/x86/vdso/Makefile
index 8d03de029d9b..8d03de029d9b 100644
--- a/arch/x86_64/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
diff --git a/arch/x86_64/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
index 5b54cdfb2b07..5b54cdfb2b07 100644
--- a/arch/x86_64/vdso/vclock_gettime.c
+++ b/arch/x86/vdso/vclock_gettime.c
diff --git a/arch/x86_64/vdso/vdso-note.S b/arch/x86/vdso/vdso-note.S
index 79a071e4357e..79a071e4357e 100644
--- a/arch/x86_64/vdso/vdso-note.S
+++ b/arch/x86/vdso/vdso-note.S
diff --git a/arch/x86_64/vdso/vdso-start.S b/arch/x86/vdso/vdso-start.S
index 2dc2cdb84d67..2dc2cdb84d67 100644
--- a/arch/x86_64/vdso/vdso-start.S
+++ b/arch/x86/vdso/vdso-start.S
diff --git a/arch/x86/vdso/vdso.S b/arch/x86/vdso/vdso.S
new file mode 100644
index 000000000000..4b1620a1529e
--- /dev/null
+++ b/arch/x86/vdso/vdso.S
@@ -0,0 +1,2 @@
+        .section ".vdso","a"
+        .incbin "arch/x86/vdso/vdso.so"
diff --git a/arch/x86_64/vdso/vdso.lds.S b/arch/x86/vdso/vdso.lds.S
index b9a60e665d08..b9a60e665d08 100644
--- a/arch/x86_64/vdso/vdso.lds.S
+++ b/arch/x86/vdso/vdso.lds.S
diff --git a/arch/x86_64/vdso/vextern.h b/arch/x86/vdso/vextern.h
index 1683ba2ae3e8..1683ba2ae3e8 100644
--- a/arch/x86_64/vdso/vextern.h
+++ b/arch/x86/vdso/vextern.h
diff --git a/arch/x86_64/vdso/vgetcpu.c b/arch/x86/vdso/vgetcpu.c
index 91f6e85d0fc2..91f6e85d0fc2 100644
--- a/arch/x86_64/vdso/vgetcpu.c
+++ b/arch/x86/vdso/vgetcpu.c
diff --git a/arch/x86_64/vdso/vma.c b/arch/x86/vdso/vma.c
index ff9333e5fb08..ff9333e5fb08 100644
--- a/arch/x86_64/vdso/vma.c
+++ b/arch/x86/vdso/vma.c
diff --git a/arch/x86_64/vdso/voffset.h b/arch/x86/vdso/voffset.h
index 4af67c79085f..4af67c79085f 100644
--- a/arch/x86_64/vdso/voffset.h
+++ b/arch/x86/vdso/voffset.h
diff --git a/arch/x86_64/vdso/vvar.c b/arch/x86/vdso/vvar.c
index 6fc22219a472..6fc22219a472 100644
--- a/arch/x86_64/vdso/vvar.c
+++ b/arch/x86/vdso/vvar.c
diff --git a/arch/i386/video/Makefile b/arch/x86/video/Makefile
index 2c447c94adcc..2c447c94adcc 100644
--- a/arch/i386/video/Makefile
+++ b/arch/x86/video/Makefile
diff --git a/arch/i386/video/fbdev.c b/arch/x86/video/fbdev.c
index 48fb38d7d2c0..48fb38d7d2c0 100644
--- a/arch/i386/video/fbdev.c
+++ b/arch/x86/video/fbdev.c
diff --git a/arch/i386/xen/Kconfig b/arch/x86/xen/Kconfig
index 9df99e1885a4..9df99e1885a4 100644
--- a/arch/i386/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
diff --git a/arch/i386/xen/Makefile b/arch/x86/xen/Makefile
index 343df246bd3e..343df246bd3e 100644
--- a/arch/i386/xen/Makefile
+++ b/arch/x86/xen/Makefile
diff --git a/arch/i386/xen/enlighten.c b/arch/x86/xen/enlighten.c
index f01bfcd4bdee..f01bfcd4bdee 100644
--- a/arch/i386/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
diff --git a/arch/i386/xen/events.c b/arch/x86/xen/events.c
index da1b173547a1..da1b173547a1 100644
--- a/arch/i386/xen/events.c
+++ b/arch/x86/xen/events.c
diff --git a/arch/i386/xen/features.c b/arch/x86/xen/features.c
index 0707714e40d6..0707714e40d6 100644
--- a/arch/i386/xen/features.c
+++ b/arch/x86/xen/features.c
diff --git a/arch/i386/xen/manage.c b/arch/x86/xen/manage.c
index aa7af9e6abc0..aa7af9e6abc0 100644
--- a/arch/i386/xen/manage.c
+++ b/arch/x86/xen/manage.c
diff --git a/arch/i386/xen/mmu.c b/arch/x86/xen/mmu.c
index 874db0cd1d2a..874db0cd1d2a 100644
--- a/arch/i386/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
diff --git a/arch/i386/xen/mmu.h b/arch/x86/xen/mmu.h
index c9ff27f3ac3a..c9ff27f3ac3a 100644
--- a/arch/i386/xen/mmu.h
+++ b/arch/x86/xen/mmu.h
diff --git a/arch/i386/xen/multicalls.c b/arch/x86/xen/multicalls.c
index c837e8e463db..c837e8e463db 100644
--- a/arch/i386/xen/multicalls.c
+++ b/arch/x86/xen/multicalls.c
diff --git a/arch/i386/xen/multicalls.h b/arch/x86/xen/multicalls.h
index e6f7530b156c..e6f7530b156c 100644
--- a/arch/i386/xen/multicalls.h
+++ b/arch/x86/xen/multicalls.h
diff --git a/arch/i386/xen/setup.c b/arch/x86/xen/setup.c
index f84e77226646..f84e77226646 100644
--- a/arch/i386/xen/setup.c
+++ b/arch/x86/xen/setup.c
diff --git a/arch/i386/xen/smp.c b/arch/x86/xen/smp.c
index 557b8e24706a..557b8e24706a 100644
--- a/arch/i386/xen/smp.c
+++ b/arch/x86/xen/smp.c
diff --git a/arch/i386/xen/time.c b/arch/x86/xen/time.c
index dfd6db69ead5..dfd6db69ead5 100644
--- a/arch/i386/xen/time.c
+++ b/arch/x86/xen/time.c
diff --git a/arch/i386/xen/vdso.h b/arch/x86/xen/vdso.h
index 861fedfe5230..861fedfe5230 100644
--- a/arch/i386/xen/vdso.h
+++ b/arch/x86/xen/vdso.h
diff --git a/arch/i386/xen/xen-asm.S b/arch/x86/xen/xen-asm.S
index 1a43b60c0c62..1a43b60c0c62 100644
--- a/arch/i386/xen/xen-asm.S
+++ b/arch/x86/xen/xen-asm.S
diff --git a/arch/i386/xen/xen-head.S b/arch/x86/xen/xen-head.S
index f8d6937db2ec..f8d6937db2ec 100644
--- a/arch/i386/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
diff --git a/arch/i386/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index b9aaea45f07f..b9aaea45f07f 100644
--- a/arch/i386/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index b4d9089a6a06..eb80f5aca54e 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -36,6 +36,18 @@ config GENERIC_CMOS_UPDATE
         bool
         default y
 
+config CLOCKSOURCE_WATCHDOG
+        bool
+        default y
+
+config GENERIC_CLOCKEVENTS
+        bool
+        default y
+
+config GENERIC_CLOCKEVENTS_BROADCAST
+        bool
+        default y
+
 config ZONE_DMA32
         bool
         default y
@@ -130,6 +142,8 @@ source "init/Kconfig"
 
 menu "Processor type and features"
 
+source "kernel/time/Kconfig"
+
 choice
         prompt "Subarchitecture Type"
         default X86_PC
@@ -704,7 +718,7 @@ source kernel/power/Kconfig
 
 source "drivers/acpi/Kconfig"
 
-source "arch/x86_64/kernel/cpufreq/Kconfig"
+source "arch/x86/kernel/cpufreq/Kconfig"
 
 endmenu
 
@@ -778,7 +792,7 @@ source fs/Kconfig
 menu "Instrumentation Support"
         depends on EXPERIMENTAL
 
-source "arch/x86_64/oprofile/Kconfig"
+source "arch/x86/oprofile/Kconfig"
 
 config KPROBES
         bool "Kprobes"
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index b024e4a86895..8bffb94c71b5 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -21,6 +21,9 @@
 #
 # $Id: Makefile,v 1.31 2002/03/22 15:56:07 ak Exp $
 
+# Fill in SRCARCH
+SRCARCH := x86
+
 LDFLAGS         := -m elf_x86_64
 OBJCOPYFLAGS    := -O binary -R .note -R .comment -S
 LDFLAGS_vmlinux :=
@@ -71,18 +74,18 @@ CFLAGS += $(cflags-y)
 CFLAGS_KERNEL += $(cflags-kernel-y)
 AFLAGS += -m64
 
-head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task.o
+head-y := arch/x86/kernel/head_64.o arch/x86/kernel/head64.o arch/x86/kernel/init_task_64.o
 
-libs-y                                  += arch/x86_64/lib/
-core-y                                  += arch/x86_64/kernel/ \
-                                           arch/x86_64/mm/ \
-                                           arch/x86_64/crypto/ \
-                                           arch/x86_64/vdso/
-core-$(CONFIG_IA32_EMULATION)           += arch/x86_64/ia32/
-drivers-$(CONFIG_PCI)                   += arch/x86_64/pci/
-drivers-$(CONFIG_OPROFILE)              += arch/x86_64/oprofile/
+libs-y                                  += arch/x86/lib/
+core-y                                  += arch/x86/kernel/ \
+                                           arch/x86/mm/ \
+                                           arch/x86/crypto/ \
+                                           arch/x86/vdso/
+core-$(CONFIG_IA32_EMULATION)           += arch/x86/ia32/
+drivers-$(CONFIG_PCI)                   += arch/x86/pci/
+drivers-$(CONFIG_OPROFILE)              += arch/x86/oprofile/
 
-boot := arch/x86_64/boot
+boot := arch/x86/boot
 
 PHONY += bzImage bzlilo install archmrproper \
          fdimage fdimage144 fdimage288 isoimage archclean
@@ -90,10 +93,12 @@ PHONY += bzImage bzlilo install archmrproper \
 #Default target when executing "make"
 all: bzImage
 
-BOOTIMAGE                     := arch/x86_64/boot/bzImage
+BOOTIMAGE                     := arch/x86/boot/bzImage
 KBUILD_IMAGE                  := $(BOOTIMAGE)
 
 bzImage: vmlinux
+        $(Q)mkdir -p $(objtree)/arch/x86_64/boot
+        $(Q)ln -fsn $(objtree)/arch/x86/boot/bzImage $(objtree)/arch/x86_64/boot/bzImage
         $(Q)$(MAKE) $(build)=$(boot) $(BOOTIMAGE)
 
 bzlilo: vmlinux
@@ -109,6 +114,7 @@ install:
         $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@ 
 
 archclean:
+        $(Q)rm -rf $(objtree)/arch/x86_64/boot
         $(Q)$(MAKE) $(clean)=$(boot)
 
 define archhelp
diff --git a/arch/x86_64/boot/.gitignore b/arch/x86_64/boot/.gitignore
deleted file mode 100644
index 18465143cfa2..000000000000
--- a/arch/x86_64/boot/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bootsect
-bzImage
-setup
-setup.bin
-setup.elf
diff --git a/arch/x86_64/boot/Makefile b/arch/x86_64/boot/Makefile
deleted file mode 100644
index 67096389de1f..000000000000
--- a/arch/x86_64/boot/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# arch/x86_64/boot/Makefile
-#
-# The actual boot code is shared with i386 including the Makefile.
-# So tell kbuild that we fetch the code from i386 and include the
-# Makefile from i386 too.
-
-src := arch/i386/boot
-include $(src)/Makefile
diff --git a/arch/x86_64/boot/tools/.gitignore b/arch/x86_64/boot/tools/.gitignore
deleted file mode 100644
index 378eac25d311..000000000000
--- a/arch/x86_64/boot/tools/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
deleted file mode 100644
index ff5d8c9b96d9..000000000000
--- a/arch/x86_64/kernel/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-extra-y         := head.o head64.o init_task.o vmlinux.lds
-EXTRA_AFLAGS    := -traditional
-obj-y   := process.o signal.o entry.o traps.o irq.o \
-                ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
-                x8664_ksyms.o i387.o syscall.o vsyscall.o \
-                setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
-                pci-dma.o pci-nommu.o alternative.o hpet.o tsc.o bugs.o \
-                perfctr-watchdog.o
-
-obj-$(CONFIG_STACKTRACE)        += stacktrace.o
-obj-$(CONFIG_X86_MCE)           += mce.o therm_throt.o
-obj-$(CONFIG_X86_MCE_INTEL)     += mce_intel.o
-obj-$(CONFIG_X86_MCE_AMD)       += mce_amd.o
-obj-$(CONFIG_MTRR)              += ../../i386/kernel/cpu/mtrr/
-obj-$(CONFIG_ACPI)              += acpi/
-obj-$(CONFIG_X86_MSR)           += msr.o
-obj-$(CONFIG_MICROCODE)         += microcode.o
-obj-$(CONFIG_X86_CPUID)         += cpuid.o
-obj-$(CONFIG_SMP)               += smp.o smpboot.o trampoline.o tsc_sync.o
-obj-y                           += apic.o  nmi.o
-obj-y                           += io_apic.o mpparse.o genapic.o genapic_flat.o
-obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o crash.o
-obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
-obj-$(CONFIG_PM)                += suspend.o
-obj-$(CONFIG_HIBERNATION)       += suspend_asm.o
-obj-$(CONFIG_CPU_FREQ)          += cpufreq/
-obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
-obj-$(CONFIG_IOMMU)             += pci-gart.o aperture.o
-obj-$(CONFIG_CALGARY_IOMMU)     += pci-calgary.o tce.o
-obj-$(CONFIG_SWIOTLB)           += pci-swiotlb.o
-obj-$(CONFIG_KPROBES)           += kprobes.o
-obj-$(CONFIG_X86_PM_TIMER)      += pmtimer.o
-obj-$(CONFIG_X86_VSMP)          += vsmp.o
-obj-$(CONFIG_K8_NB)             += k8.o
-obj-$(CONFIG_AUDIT)             += audit.o
-
-obj-$(CONFIG_MODULES)           += module.o
-obj-$(CONFIG_PCI)               += early-quirks.o
-
-obj-y                           += topology.o
-obj-y                           += intel_cacheinfo.o
-obj-y                           += addon_cpuid_features.o
-obj-y                           += pcspeaker.o
-
-CFLAGS_vsyscall.o               := $(PROFILING) -g0
-
-therm_throt-y                   += ../../i386/kernel/cpu/mcheck/therm_throt.o
-bootflag-y                      += ../../i386/kernel/bootflag.o
-cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
-topology-y                     += ../../i386/kernel/topology.o
-microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
-intel_cacheinfo-y               += ../../i386/kernel/cpu/intel_cacheinfo.o
-addon_cpuid_features-y          += ../../i386/kernel/cpu/addon_cpuid_features.o
-quirks-y                        += ../../i386/kernel/quirks.o
-i8237-y                         += ../../i386/kernel/i8237.o
-msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.o
-alternative-y                   += ../../i386/kernel/alternative.o
-pcspeaker-y                     += ../../i386/kernel/pcspeaker.o
-perfctr-watchdog-y              += ../../i386/kernel/cpu/perfctr-watchdog.o
diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile
deleted file mode 100644
index 080b9963f1bc..000000000000
--- a/arch/x86_64/kernel/acpi/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-obj-y                   := boot.o
-boot-y                  := ../../../i386/kernel/acpi/boot.o
-obj-$(CONFIG_ACPI_SLEEP)        += sleep.o wakeup.o
-
-ifneq ($(CONFIG_ACPI_PROCESSOR),)
-obj-y                   += processor.o
-processor-y             := ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o
-endif
-
diff --git a/arch/x86_64/kernel/cpufreq/Makefile b/arch/x86_64/kernel/cpufreq/Makefile
deleted file mode 100644
index 753ce1dd418e..000000000000
--- a/arch/x86_64/kernel/cpufreq/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Reuse the i386 cpufreq drivers
-#
-
-SRCDIR := ../../../i386/kernel/cpu/cpufreq
-
-obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o
-obj-$(CONFIG_X86_ACPI_CPUFREQ) += acpi-cpufreq.o
-obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO) += speedstep-centrino.o
-obj-$(CONFIG_X86_P4_CLOCKMOD) += p4-clockmod.o
-obj-$(CONFIG_X86_SPEEDSTEP_LIB) += speedstep-lib.o
-
-powernow-k8-objs := ${SRCDIR}/powernow-k8.o
-speedstep-centrino-objs := ${SRCDIR}/speedstep-centrino.o
-acpi-cpufreq-objs := ${SRCDIR}/acpi-cpufreq.o
-p4-clockmod-objs := ${SRCDIR}/p4-clockmod.o
-speedstep-lib-objs := ${SRCDIR}/speedstep-lib.o
diff --git a/arch/x86_64/kernel/hpet.c b/arch/x86_64/kernel/hpet.c
deleted file mode 100644
index e2d1b912e154..000000000000
--- a/arch/x86_64/kernel/hpet.c
+++ /dev/null
@@ -1,493 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <linux/mc146818rtc.h>
-#include <linux/time.h>
-#include <linux/clocksource.h>
-#include <linux/ioport.h>
-#include <linux/acpi.h>
-#include <linux/hpet.h>
-#include <asm/pgtable.h>
-#include <asm/vsyscall.h>
-#include <asm/timex.h>
-#include <asm/hpet.h>
-
-#define HPET_MASK       0xFFFFFFFF
-#define HPET_SHIFT      22
-
-/* FSEC = 10^-15 NSEC = 10^-9 */
-#define FSEC_PER_NSEC   1000000
-
-int nohpet __initdata;
-
-unsigned long hpet_address;
-unsigned long hpet_period;      /* fsecs / HPET clock */
-unsigned long hpet_tick;        /* HPET clocks / interrupt */
-
-int hpet_use_timer;             /* Use counter of hpet for time keeping,
-                                 * otherwise PIT
-                                 */
-
-#ifdef  CONFIG_HPET
-static __init int late_hpet_init(void)
-{
-        struct hpet_data        hd;
-        unsigned int            ntimer;
-
-        if (!hpet_address)
-                return 0;
-
-        memset(&hd, 0, sizeof(hd));
-
-        ntimer = hpet_readl(HPET_ID);
-        ntimer = (ntimer & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT;
-        ntimer++;
-
-        /*
-         * Register with driver.
-         * Timer0 and Timer1 is used by platform.
-         */
-        hd.hd_phys_address = hpet_address;
-        hd.hd_address = (void __iomem *)fix_to_virt(FIX_HPET_BASE);
-        hd.hd_nirqs = ntimer;
-        hd.hd_flags = HPET_DATA_PLATFORM;
-        hpet_reserve_timer(&hd, 0);
-#ifdef  CONFIG_HPET_EMULATE_RTC
-        hpet_reserve_timer(&hd, 1);
-#endif
-        hd.hd_irq[0] = HPET_LEGACY_8254;
-        hd.hd_irq[1] = HPET_LEGACY_RTC;
-        if (ntimer > 2) {
-                struct hpet             *hpet;
-                struct hpet_timer       *timer;
-                int                     i;
-
-                hpet = (struct hpet *) fix_to_virt(FIX_HPET_BASE);
-                timer = &hpet->hpet_timers[2];
-                for (i = 2; i < ntimer; timer++, i++)
-                        hd.hd_irq[i] = (timer->hpet_config &
-                                        Tn_INT_ROUTE_CNF_MASK) >>
-                                Tn_INT_ROUTE_CNF_SHIFT;
-
-        }
-
-        hpet_alloc(&hd);
-        return 0;
-}
-fs_initcall(late_hpet_init);
-#endif
-
-int hpet_timer_stop_set_go(unsigned long tick)
-{
-        unsigned int cfg;
-
-/*
- * Stop the timers and reset the main counter.
- */
-
-        cfg = hpet_readl(HPET_CFG);
-        cfg &= ~(HPET_CFG_ENABLE | HPET_CFG_LEGACY);
-        hpet_writel(cfg, HPET_CFG);
-        hpet_writel(0, HPET_COUNTER);
-        hpet_writel(0, HPET_COUNTER + 4);
-
-/*
- * Set up timer 0, as periodic with first interrupt to happen at hpet_tick,
- * and period also hpet_tick.
- */
-        if (hpet_use_timer) {
-                hpet_writel(HPET_TN_ENABLE | HPET_TN_PERIODIC | HPET_TN_SETVAL |
-                    HPET_TN_32BIT, HPET_T0_CFG);
-                hpet_writel(hpet_tick, HPET_T0_CMP); /* next interrupt */
-                hpet_writel(hpet_tick, HPET_T0_CMP); /* period */
-                cfg |= HPET_CFG_LEGACY;
-        }
-/*
- * Go!
- */
-
-        cfg |= HPET_CFG_ENABLE;
-        hpet_writel(cfg, HPET_CFG);
-
-        return 0;
-}
-
-static cycle_t read_hpet(void)
-{
-        return (cycle_t)hpet_readl(HPET_COUNTER);
-}
-
-static cycle_t __vsyscall_fn vread_hpet(void)
-{
-        return readl((void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0);
-}
-
-struct clocksource clocksource_hpet = {
-        .name           = "hpet",
-        .rating         = 250,
-        .read           = read_hpet,
-        .mask           = (cycle_t)HPET_MASK,
-        .mult           = 0, /* set below */
-        .shift          = HPET_SHIFT,
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-        .vread          = vread_hpet,
-};
-
-int __init hpet_arch_init(void)
-{
-        unsigned int id;
-        u64 tmp;
-
-        if (!hpet_address)
-                return -1;
-        set_fixmap_nocache(FIX_HPET_BASE, hpet_address);
-        __set_fixmap(VSYSCALL_HPET, hpet_address, PAGE_KERNEL_VSYSCALL_NOCACHE);
-
-/*
- * Read the period, compute tick and quotient.
- */
-
-        id = hpet_readl(HPET_ID);
-
-        if (!(id & HPET_ID_VENDOR) || !(id & HPET_ID_NUMBER))
-                return -1;
-
-        hpet_period = hpet_readl(HPET_PERIOD);
-        if (hpet_period < 100000 || hpet_period > 100000000)
-                return -1;
-
-        hpet_tick = (FSEC_PER_TICK + hpet_period / 2) / hpet_period;
-
-        hpet_use_timer = (id & HPET_ID_LEGSUP);
-
-        /*
-         * hpet period is in femto seconds per cycle
-         * so we need to convert this to ns/cyc units
-         * aproximated by mult/2^shift
-         *
-         *  fsec/cyc * 1nsec/1000000fsec = nsec/cyc = mult/2^shift
-         *  fsec/cyc * 1ns/1000000fsec * 2^shift = mult
-         *  fsec/cyc * 2^shift * 1nsec/1000000fsec = mult
-         *  (fsec/cyc << shift)/1000000 = mult
-         *  (hpet_period << shift)/FSEC_PER_NSEC = mult
-         */
-        tmp = (u64)hpet_period << HPET_SHIFT;
-        do_div(tmp, FSEC_PER_NSEC);
-        clocksource_hpet.mult = (u32)tmp;
-        clocksource_register(&clocksource_hpet);
-
-        return hpet_timer_stop_set_go(hpet_tick);
-}
-
-int hpet_reenable(void)
-{
-        return hpet_timer_stop_set_go(hpet_tick);
-}
-
-/*
- * calibrate_tsc() calibrates the processor TSC in a very simple way, comparing
- * it to the HPET timer of known frequency.
- */
-
-#define TICK_COUNT 100000000
-#define SMI_THRESHOLD 50000
-#define MAX_TRIES  5
-
-/*
- * Some platforms take periodic SMI interrupts with 5ms duration. Make sure none
- * occurs between the reads of the hpet & TSC.
- */
-static void __init read_hpet_tsc(int *hpet, int *tsc)
-{
-        int tsc1, tsc2, hpet1, i;
-
-        for (i = 0; i < MAX_TRIES; i++) {
-                tsc1 = get_cycles_sync();
-                hpet1 = hpet_readl(HPET_COUNTER);
-                tsc2 = get_cycles_sync();
-                if ((tsc2 - tsc1) < SMI_THRESHOLD)
-                        break;
-        }
-        *hpet = hpet1;
-        *tsc = tsc2;
-}
-
-unsigned int __init hpet_calibrate_tsc(void)
-{
-        int tsc_start, hpet_start;
-        int tsc_now, hpet_now;
-        unsigned long flags;
-
-        local_irq_save(flags);
-
-        read_hpet_tsc(&hpet_start, &tsc_start);
-
-        do {
-                local_irq_disable();
-                read_hpet_tsc(&hpet_now, &tsc_now);
-                local_irq_restore(flags);
-        } while ((tsc_now - tsc_start) < TICK_COUNT &&
-                (hpet_now - hpet_start) < TICK_COUNT);
-
-        return (tsc_now - tsc_start) * 1000000000L
-                / ((hpet_now - hpet_start) * hpet_period / 1000);
-}
-
-#ifdef CONFIG_HPET_EMULATE_RTC
-/* HPET in LegacyReplacement Mode eats up RTC interrupt line. When, HPET
- * is enabled, we support RTC interrupt functionality in software.
- * RTC has 3 kinds of interrupts:
- * 1) Update Interrupt - generate an interrupt, every sec, when RTC clock
- *    is updated
- * 2) Alarm Interrupt - generate an interrupt at a specific time of day
- * 3) Periodic Interrupt - generate periodic interrupt, with frequencies
- *    2Hz-8192Hz (2Hz-64Hz for non-root user) (all freqs in powers of 2)
- * (1) and (2) above are implemented using polling at a frequency of
- * 64 Hz. The exact frequency is a tradeoff between accuracy and interrupt
- * overhead. (DEFAULT_RTC_INT_FREQ)
- * For (3), we use interrupts at 64Hz or user specified periodic
- * frequency, whichever is higher.
- */
-#include <linux/rtc.h>
-
-#define DEFAULT_RTC_INT_FREQ    64
-#define RTC_NUM_INTS            1
-
-static unsigned long UIE_on;
-static unsigned long prev_update_sec;
-
-static unsigned long AIE_on;
-static struct rtc_time alarm_time;
-
-static unsigned long PIE_on;
-static unsigned long PIE_freq = DEFAULT_RTC_INT_FREQ;
-static unsigned long PIE_count;
-
-static unsigned long hpet_rtc_int_freq; /* RTC interrupt frequency */
-static unsigned int hpet_t1_cmp; /* cached comparator register */
-
-int is_hpet_enabled(void)
-{
-        return hpet_address != 0;
-}
-
-/*
- * Timer 1 for RTC, we do not use periodic interrupt feature,
- * even if HPET supports periodic interrupts on Timer 1.
- * The reason being, to set up a periodic interrupt in HPET, we need to
- * stop the main counter. And if we do that everytime someone diables/enables
- * RTC, we will have adverse effect on main kernel timer running on Timer 0.
- * So, for the time being, simulate the periodic interrupt in software.
- *
- * hpet_rtc_timer_init() is called for the first time and during subsequent
- * interuppts reinit happens through hpet_rtc_timer_reinit().
- */
-int hpet_rtc_timer_init(void)
-{
-        unsigned int cfg, cnt;
-        unsigned long flags;
-
-        if (!is_hpet_enabled())
-                return 0;
-        /*
-         * Set the counter 1 and enable the interrupts.
-         */
-        if (PIE_on && (PIE_freq > DEFAULT_RTC_INT_FREQ))
-                hpet_rtc_int_freq = PIE_freq;
-        else
-                hpet_rtc_int_freq = DEFAULT_RTC_INT_FREQ;
-
-        local_irq_save(flags);
-
-        cnt = hpet_readl(HPET_COUNTER);
-        cnt += ((hpet_tick*HZ)/hpet_rtc_int_freq);
-        hpet_writel(cnt, HPET_T1_CMP);
-        hpet_t1_cmp = cnt;
-
-        cfg = hpet_readl(HPET_T1_CFG);
-        cfg &= ~HPET_TN_PERIODIC;
-        cfg |= HPET_TN_ENABLE | HPET_TN_32BIT;
-        hpet_writel(cfg, HPET_T1_CFG);
-
-        local_irq_restore(flags);
-
-        return 1;
-}
-
-static void hpet_rtc_timer_reinit(void)
-{
-        unsigned int cfg, cnt, ticks_per_int, lost_ints;
-
-        if (unlikely(!(PIE_on | AIE_on | UIE_on))) {
-                cfg = hpet_readl(HPET_T1_CFG);
-                cfg &= ~HPET_TN_ENABLE;
-                hpet_writel(cfg, HPET_T1_CFG);
-                return;
-        }
-
-        if (PIE_on && (PIE_freq > DEFAULT_RTC_INT_FREQ))
-                hpet_rtc_int_freq = PIE_freq;
-        else
-                hpet_rtc_int_freq = DEFAULT_RTC_INT_FREQ;
-
-        /* It is more accurate to use the comparator value than current count.*/
-        ticks_per_int = hpet_tick * HZ / hpet_rtc_int_freq;
-        hpet_t1_cmp += ticks_per_int;
-        hpet_writel(hpet_t1_cmp, HPET_T1_CMP);
-
-        /*
-         * If the interrupt handler was delayed too long, the write above tries
-         * to schedule the next interrupt in the past and the hardware would
-         * not interrupt until the counter had wrapped around.
-         * So we have to check that the comparator wasn't set to a past time.
-         */
-        cnt = hpet_readl(HPET_COUNTER);
-        if (unlikely((int)(cnt - hpet_t1_cmp) > 0)) {
-                lost_ints = (cnt - hpet_t1_cmp) / ticks_per_int + 1;
-                /* Make sure that, even with the time needed to execute
-                 * this code, the next scheduled interrupt has been moved
-                 * back to the future: */
-                lost_ints++;
-
-                hpet_t1_cmp += lost_ints * ticks_per_int;
-                hpet_writel(hpet_t1_cmp, HPET_T1_CMP);
-
-                if (PIE_on)
-                        PIE_count += lost_ints;
-
-                if (printk_ratelimit())
-                        printk(KERN_WARNING "rtc: lost some interrupts at %ldHz.\n",
-                               hpet_rtc_int_freq);
-        }
-}
-
-/*
- * The functions below are called from rtc driver.
- * Return 0 if HPET is not being used.
- * Otherwise do the necessary changes and return 1.
- */
-int hpet_mask_rtc_irq_bit(unsigned long bit_mask)
-{
-        if (!is_hpet_enabled())
-                return 0;
-
-        if (bit_mask & RTC_UIE)
-                UIE_on = 0;
-        if (bit_mask & RTC_PIE)
-                PIE_on = 0;
-        if (bit_mask & RTC_AIE)
-                AIE_on = 0;
-
-        return 1;
-}
-
-int hpet_set_rtc_irq_bit(unsigned long bit_mask)
-{
-        int timer_init_reqd = 0;
-
-        if (!is_hpet_enabled())
-                return 0;
-
-        if (!(PIE_on | AIE_on | UIE_on))
-                timer_init_reqd = 1;
-
-        if (bit_mask & RTC_UIE) {
-                UIE_on = 1;
-        }
-        if (bit_mask & RTC_PIE) {
-                PIE_on = 1;
-                PIE_count = 0;
-        }
-        if (bit_mask & RTC_AIE) {
-                AIE_on = 1;
-        }
-
-        if (timer_init_reqd)
-                hpet_rtc_timer_init();
-
-        return 1;
-}
-
-int hpet_set_alarm_time(unsigned char hrs, unsigned char min, unsigned char sec)
-{
-        if (!is_hpet_enabled())
-                return 0;
-
-        alarm_time.tm_hour = hrs;
-        alarm_time.tm_min = min;
-        alarm_time.tm_sec = sec;
-
-        return 1;
-}
-
-int hpet_set_periodic_freq(unsigned long freq)
-{
-        if (!is_hpet_enabled())
-                return 0;
-
-        PIE_freq = freq;
-        PIE_count = 0;
-
-        return 1;
-}
-
-int hpet_rtc_dropped_irq(void)
-{
-        if (!is_hpet_enabled())
-                return 0;
-
-        return 1;
-}
-
-irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id)
-{
-        struct rtc_time curr_time;
-        unsigned long rtc_int_flag = 0;
-        int call_rtc_interrupt = 0;
-
-        hpet_rtc_timer_reinit();
-
-        if (UIE_on | AIE_on) {
-                rtc_get_rtc_time(&curr_time);
-        }
-        if (UIE_on) {
-                if (curr_time.tm_sec != prev_update_sec) {
-                        /* Set update int info, call real rtc int routine */
-                        call_rtc_interrupt = 1;
-                        rtc_int_flag = RTC_UF;
-                        prev_update_sec = curr_time.tm_sec;
-                }
-        }
-        if (PIE_on) {
-                PIE_count++;
-                if (PIE_count >= hpet_rtc_int_freq/PIE_freq) {
-                        /* Set periodic int info, call real rtc int routine */
-                        call_rtc_interrupt = 1;
-                        rtc_int_flag |= RTC_PF;
-                        PIE_count = 0;
-                }
-        }
-        if (AIE_on) {
-                if ((curr_time.tm_sec == alarm_time.tm_sec) &&
-                    (curr_time.tm_min == alarm_time.tm_min) &&
-                    (curr_time.tm_hour == alarm_time.tm_hour)) {
-                        /* Set alarm int info, call real rtc int routine */
-                        call_rtc_interrupt = 1;
-                        rtc_int_flag |= RTC_AF;
-                }
-        }
-        if (call_rtc_interrupt) {
-                rtc_int_flag |= (RTC_IRQF | (RTC_NUM_INTS << 8));
-                rtc_interrupt(rtc_int_flag, dev_id);
-        }
-        return IRQ_HANDLED;
-}
-#endif
-
-static int __init nohpet_setup(char *s)
-{
-        nohpet = 1;
-        return 1;
-}
-
-__setup("nohpet", nohpet_setup);
diff --git a/arch/x86_64/lib/Makefile b/arch/x86_64/lib/Makefile
deleted file mode 100644
index c94327178398..000000000000
--- a/arch/x86_64/lib/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Makefile for x86_64-specific library files.
-#
-
-CFLAGS_csum-partial.o := -funroll-loops
-
-obj-y := io.o iomap_copy.o
-obj-$(CONFIG_SMP)       += msr-on-cpu.o
-
-lib-y := csum-partial.o csum-copy.o csum-wrappers.o delay.o \
-        usercopy.o getuser.o putuser.o  \
-        thunk.o clear_page.o copy_page.o bitstr.o bitops.o
-lib-y += memcpy.o memmove.o memset.o copy_user.o rwlock.o copy_user_nocache.o
diff --git a/arch/x86_64/lib/msr-on-cpu.c b/arch/x86_64/lib/msr-on-cpu.c
deleted file mode 100644
index 47e0ec47c376..000000000000
--- a/arch/x86_64/lib/msr-on-cpu.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../i386/lib/msr-on-cpu.c"
diff --git a/arch/x86_64/mm/Makefile b/arch/x86_64/mm/Makefile
deleted file mode 100644
index d25ac86fe27a..000000000000
--- a/arch/x86_64/mm/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Makefile for the linux x86_64-specific parts of the memory manager.
-#
-
-obj-y    := init.o fault.o ioremap.o extable.o pageattr.o mmap.o
-obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
-obj-$(CONFIG_NUMA) += numa.o
-obj-$(CONFIG_K8_NUMA) += k8topology.o
-obj-$(CONFIG_ACPI_NUMA) += srat.o
-
-hugetlbpage-y = ../../i386/mm/hugetlbpage.o
diff --git a/arch/x86_64/oprofile/Kconfig b/arch/x86_64/oprofile/Kconfig
deleted file mode 100644
index d8a84088471a..000000000000
--- a/arch/x86_64/oprofile/Kconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-config PROFILING
-        bool "Profiling support (EXPERIMENTAL)"
-        help
-          Say Y here to enable the extended profiling support mechanisms used
-          by profilers such as OProfile.
-          
-
-config OPROFILE
-        tristate "OProfile system profiling (EXPERIMENTAL)"
-        depends on PROFILING
-        help
-          OProfile is a profiling system capable of profiling the
-          whole system, include the kernel, kernel modules, libraries,
-          and applications.
-
-          If unsure, say N.
-
diff --git a/arch/x86_64/oprofile/Makefile b/arch/x86_64/oprofile/Makefile
deleted file mode 100644
index 6be32683e1bc..000000000000
--- a/arch/x86_64/oprofile/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# oprofile for x86-64.
-# Just reuse the one from i386. 
-#
-
-obj-$(CONFIG_OPROFILE) += oprofile.o
- 
-DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
-        oprof.o cpu_buffer.o buffer_sync.o \
-        event_buffer.o oprofile_files.o \
-        oprofilefs.o oprofile_stats.o \
-        timer_int.o )
-
-OPROFILE-y := init.o backtrace.o
-OPROFILE-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o op_model_p4.o \
-                                     op_model_ppro.o
-OPROFILE-$(CONFIG_X86_IO_APIC)    += nmi_timer_int.o 
-
-oprofile-y = $(DRIVER_OBJS) $(addprefix ../../i386/oprofile/, $(OPROFILE-y))
diff --git a/arch/x86_64/pci/Makefile b/arch/x86_64/pci/Makefile
deleted file mode 100644
index c9eddc8859c0..000000000000
--- a/arch/x86_64/pci/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Makefile for X86_64 specific PCI routines
-#
-# Reuse the i386 PCI subsystem
-#
-EXTRA_CFLAGS += -Iarch/i386/pci
-
-obj-y           := i386.o
-obj-$(CONFIG_PCI_DIRECT)+= direct.o
-obj-y           += fixup.o init.o
-obj-$(CONFIG_ACPI)      += acpi.o
-obj-y                   += legacy.o irq.o common.o early.o
-# mmconfig has a 64bit special
-obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o direct.o mmconfig-shared.o
-
-obj-$(CONFIG_NUMA)      += k8-bus.o
-
-direct-y += ../../i386/pci/direct.o
-acpi-y   += ../../i386/pci/acpi.o
-legacy-y += ../../i386/pci/legacy.o
-irq-y    += ../../i386/pci/irq.o
-common-y += ../../i386/pci/common.o
-fixup-y  += ../../i386/pci/fixup.o
-i386-y  += ../../i386/pci/i386.o
-init-y += ../../i386/pci/init.o
-early-y += ../../i386/pci/early.o
-mmconfig-shared-y += ../../i386/pci/mmconfig-shared.o
diff --git a/arch/x86_64/vdso/vdso.S b/arch/x86_64/vdso/vdso.S
deleted file mode 100644
index 92e80c1972a7..000000000000
--- a/arch/x86_64/vdso/vdso.S
+++ /dev/null
@@ -1,2 +0,0 @@
-        .section ".vdso","a"
-        .incbin "arch/x86_64/vdso/vdso.so"