1704 files changed, 53335 insertions, 55133 deletions

diff --git a/arch/Kconfig b/arch/Kconfig
index f78c2be4242b..26b0e2397a57 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -144,9 +144,6 @@ config HAVE_CLK
 config HAVE_DMA_API_DEBUG
         bool
 
-config HAVE_DEFAULT_NO_SPIN_MUTEXES
-        bool
-
 config HAVE_HW_BREAKPOINT
         bool
         depends on PERF_EVENTS
@@ -178,4 +175,7 @@ config HAVE_ARCH_JUMP_LABEL
 config HAVE_ARCH_MUTEX_CPU_RELAX
         bool
 
+config HAVE_RCU_TABLE_FREE
+        bool
+
 source "kernel/gcov/Kconfig"
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 9808998cc073..e3a82775f9da 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -12,6 +12,7 @@ config ALPHA
         select GENERIC_IRQ_PROBE
         select AUTO_IRQ_AFFINITY if SMP
         select GENERIC_IRQ_SHOW
+        select ARCH_WANT_OPTIONAL_GPIOLIB
         help
           The Alpha is a 64-bit general-purpose processor designed and
           marketed by the Digital Equipment Corporation of blessed memory,
@@ -51,6 +52,9 @@ config GENERIC_CALIBRATE_DELAY
 config GENERIC_CMOS_UPDATE
         def_bool y
 
+config GENERIC_GPIO
+        def_bool y
+
 config ZONE_DMA
         bool
         default y
diff --git a/arch/alpha/include/asm/gpio.h b/arch/alpha/include/asm/gpio.h
new file mode 100644
index 000000000000..7dc6a6343c06
--- /dev/null
+++ b/arch/alpha/include/asm/gpio.h
@@ -0,0 +1,55 @@
+/*
+ * Generic GPIO API implementation for Alpha.
+ *
+ * A stright copy of that for PowerPC which was:
+ *
+ * Copyright (c) 2007-2008  MontaVista Software, Inc.
+ *
+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef _ASM_ALPHA_GPIO_H
+#define _ASM_ALPHA_GPIO_H
+
+#include <linux/errno.h>
+#include <asm-generic/gpio.h>
+
+#ifdef CONFIG_GPIOLIB
+
+/*
+ * We don't (yet) implement inlined/rapid versions for on-chip gpios.
+ * Just call gpiolib.
+ */
+static inline int gpio_get_value(unsigned int gpio)
+{
+        return __gpio_get_value(gpio);
+}
+
+static inline void gpio_set_value(unsigned int gpio, int value)
+{
+        __gpio_set_value(gpio, value);
+}
+
+static inline int gpio_cansleep(unsigned int gpio)
+{
+        return __gpio_cansleep(gpio);
+}
+
+static inline int gpio_to_irq(unsigned int gpio)
+{
+        return __gpio_to_irq(gpio);
+}
+
+static inline int irq_to_gpio(unsigned int irq)
+{
+        return -EINVAL;
+}
+
+#endif /* CONFIG_GPIOLIB */
+
+#endif /* _ASM_ALPHA_GPIO_H */
diff --git a/arch/alpha/include/asm/smp.h b/arch/alpha/include/asm/smp.h
index 3f390e8cc0b3..c46e714aa3e0 100644
--- a/arch/alpha/include/asm/smp.h
+++ b/arch/alpha/include/asm/smp.h
@@ -39,8 +39,6 @@ struct cpuinfo_alpha {
 
 extern struct cpuinfo_alpha cpu_data[NR_CPUS];
 
-#define PROC_CHANGE_PENALTY     20
-
 #define hard_smp_processor_id() __hard_smp_processor_id()
 #define raw_smp_processor_id()  (current_thread_info()->cpu)
 
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index 3ec35066f1dc..838eac128409 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -121,7 +121,7 @@ common_shutdown_1(void *generic_ptr)
         /* Wait for the secondaries to halt. */
         set_cpu_present(boot_cpuid, false);
         set_cpu_possible(boot_cpuid, false);
-        while (cpus_weight(cpu_present_map))
+        while (cpumask_weight(cpu_present_mask))
                 barrier();
 #endif
 
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index edbddcbd5bc6..cc0fd862cf26 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -1257,7 +1257,7 @@ show_cpuinfo(struct seq_file *f, void *slot)
 #ifdef CONFIG_SMP
         seq_printf(f, "cpus active\t\t: %u\n"
                       "cpu active mask\t\t: %016lx\n",
-                       num_online_cpus(), cpus_addr(cpu_possible_map)[0]);
+                       num_online_cpus(), cpumask_bits(cpu_possible_mask)[0]);
 #endif
 
         show_cache_size (f, "L1 Icache", alpha_l1i_cacheshape);
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 42aa078a5e4d..d739703608fc 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -451,7 +451,7 @@ setup_smp(void)
         }
 
         printk(KERN_INFO "SMP: %d CPUs probed -- cpu_present_map = %lx\n",
-               smp_num_probed, cpu_present_map.bits[0]);
+               smp_num_probed, cpumask_bits(cpu_present_mask)[0]);
 }
 
 /*
@@ -585,8 +585,7 @@ handle_ipi(struct pt_regs *regs)
 
                 switch (which) {
                 case IPI_RESCHEDULE:
-                        /* Reschedule callback.  Everything to be done
-                           is done by the interrupt return path.  */
+                        scheduler_ipi();
                         break;
 
                 case IPI_CALL_FUNC:
@@ -630,8 +629,9 @@ smp_send_reschedule(int cpu)
 void
 smp_send_stop(void)
 {
-        cpumask_t to_whom = cpu_possible_map;
-        cpu_clear(smp_processor_id(), to_whom);
+        cpumask_t to_whom;
+        cpumask_copy(&to_whom, cpu_possible_mask);
+        cpumask_clear_cpu(smp_processor_id(), &to_whom);
 #ifdef DEBUG_IPI_MSG
         if (hard_smp_processor_id() != boot_cpu_id)
                 printk(KERN_WARNING "smp_send_stop: Not on boot cpu.\n");
diff --git a/arch/alpha/kernel/sys_dp264.c b/arch/alpha/kernel/sys_dp264.c
index 5ac00fd4cd0c..f8856829c22a 100644
--- a/arch/alpha/kernel/sys_dp264.c
+++ b/arch/alpha/kernel/sys_dp264.c
@@ -140,7 +140,7 @@ cpu_set_irq_affinity(unsigned int irq, cpumask_t affinity)
 
         for (cpu = 0; cpu < 4; cpu++) {
                 unsigned long aff = cpu_irq_affinity[cpu];
-                if (cpu_isset(cpu, affinity))
+                if (cpumask_test_cpu(cpu, &affinity))
                         aff |= 1UL << irq;
                 else
                         aff &= ~(1UL << irq);
diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c
index fea0e4620994..6994407e242a 100644
--- a/arch/alpha/kernel/sys_titan.c
+++ b/arch/alpha/kernel/sys_titan.c
@@ -65,10 +65,11 @@ titan_update_irq_hw(unsigned long mask)
         register int bcpu = boot_cpuid;
 
 #ifdef CONFIG_SMP
-        cpumask_t cpm = cpu_present_map;
+        cpumask_t cpm;
         volatile unsigned long *dim0, *dim1, *dim2, *dim3;
         unsigned long mask0, mask1, mask2, mask3, dummy;
 
+        cpumask_copy(&cpm, cpu_present_mask);
         mask &= ~isa_enable;
         mask0 = mask & titan_cpu_irq_affinity[0];
         mask1 = mask & titan_cpu_irq_affinity[1];
@@ -84,10 +85,10 @@ titan_update_irq_hw(unsigned long mask)
         dim1 = &cchip->dim1.csr;
         dim2 = &cchip->dim2.csr;
         dim3 = &cchip->dim3.csr;
-        if (!cpu_isset(0, cpm)) dim0 = &dummy;
-        if (!cpu_isset(1, cpm)) dim1 = &dummy;
-        if (!cpu_isset(2, cpm)) dim2 = &dummy;
-        if (!cpu_isset(3, cpm)) dim3 = &dummy;
+        if (!cpumask_test_cpu(0, &cpm)) dim0 = &dummy;
+        if (!cpumask_test_cpu(1, &cpm)) dim1 = &dummy;
+        if (!cpumask_test_cpu(2, &cpm)) dim2 = &dummy;
+        if (!cpumask_test_cpu(3, &cpm)) dim3 = &dummy;
 
         *dim0 = mask0;
         *dim1 = mask1;
@@ -137,7 +138,7 @@ titan_cpu_set_irq_affinity(unsigned int irq, cpumask_t affinity)
         int cpu;
 
         for (cpu = 0; cpu < 4; cpu++) {
-                if (cpu_isset(cpu, affinity))
+                if (cpumask_test_cpu(cpu, &affinity))
                         titan_cpu_irq_affinity[cpu] |= 1UL << irq;
                 else
                         titan_cpu_irq_affinity[cpu] &= ~(1UL << irq);
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index 433be2a24f31..f937ad123852 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -39,13 +39,14 @@ SECTIONS
         __init_begin = ALIGN(PAGE_SIZE);
         INIT_TEXT_SECTION(PAGE_SIZE)
         INIT_DATA_SECTION(16)
-        PERCPU(L1_CACHE_BYTES, PAGE_SIZE)
+        PERCPU_SECTION(L1_CACHE_BYTES)
         /* Align to THREAD_SIZE rather than PAGE_SIZE here so any padding page
            needed for the THREAD_SIZE aligned init_task gets freed after init */
         . = ALIGN(THREAD_SIZE);
         __init_end = .;
         /* Freed after init ends here */
 
+        _sdata = .;     /* Start of rw data section */
         _data = .;
         RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
 
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 86425ab53bf5..69d0c5761e2f 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -32,8 +32,6 @@
 #include <asm/console.h>
 #include <asm/tlb.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 extern void die_if_kernel(char *,struct pt_regs *,long);
 
 static struct pcb_struct original_pcb;
diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
index 7b2c56d8f930..3973ae395772 100644
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
@@ -313,6 +313,7 @@ void __init paging_init(void)
                         zones_size[ZONE_DMA] = dma_local_pfn;
                         zones_size[ZONE_NORMAL] = (end_pfn - start_pfn) - dma_local_pfn;
                 }
+                node_set_state(nid, N_NORMAL_MEMORY);
                 free_area_init_node(nid, zones_size, start_pfn, NULL);
         }
 
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 377a7a595b08..7275009686e6 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -197,15 +197,21 @@ config ARM_PATCH_PHYS_VIRT
         depends on !XIP_KERNEL && MMU
         depends on !ARCH_REALVIEW || !SPARSEMEM
         help
-          Patch phys-to-virt translation functions at runtime according to
-          the position of the kernel in system memory.
+          Patch phys-to-virt and virt-to-phys translation functions at
+          boot and module load time according to the position of the
+          kernel in system memory.
 
-          This can only be used with non-XIP with MMU kernels where
-          the base of physical memory is at a 16MB boundary.
+          This can only be used with non-XIP MMU kernels where the base
+          of physical memory is at a 16MB boundary, or theoretically 64K
+          for the MSM machine class.
 
 config ARM_PATCH_PHYS_VIRT_16BIT
         def_bool y
         depends on ARM_PATCH_PHYS_VIRT && ARCH_MSM
+        help
+          This option extends the physical to virtual translation patching
+          to allow physical memory down to a theoretical minimum of 64K
+          boundaries.
 
 source "init/Kconfig"
 
@@ -297,6 +303,7 @@ config ARCH_BCMRING
         depends on MMU
         select CPU_V6
         select ARM_AMBA
+        select ARM_TIMER_SP804
         select CLKDEV_LOOKUP
         select GENERIC_CLOCKEVENTS
         select ARCH_WANT_OPTIONAL_GPIOLIB
@@ -366,6 +373,7 @@ config ARCH_MXC
         select GENERIC_CLOCKEVENTS
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
         select HAVE_SCHED_CLOCK
         help
           Support for Freescale MXC/iMX-based family of processors
@@ -375,21 +383,13 @@ config ARCH_MXS
         select GENERIC_CLOCKEVENTS
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
         help
           Support for Freescale MXS-based family of processors
 
-config ARCH_STMP3XXX
-        bool "Freescale STMP3xxx"
-        select CPU_ARM926T
-        select CLKDEV_LOOKUP
-        select ARCH_REQUIRE_GPIOLIB
-        select GENERIC_CLOCKEVENTS
-        select USB_ARCH_HAS_EHCI
-        help
-          Support for systems based on the Freescale 3xxx CPUs.
-
 config ARCH_NETX
         bool "Hilscher NetX based"
+        select CLKSRC_MMIO
         select CPU_ARM926T
         select ARM_VIC
         select GENERIC_CLOCKEVENTS
@@ -457,6 +457,7 @@ config ARCH_IXP2000
 config ARCH_IXP4XX
         bool "IXP4xx-based"
         depends on MMU
+        select CLKSRC_MMIO
         select CPU_XSCALE
         select GENERIC_GPIO
         select GENERIC_CLOCKEVENTS
@@ -468,7 +469,7 @@ config ARCH_IXP4XX
 
 config ARCH_DOVE
         bool "Marvell Dove"
-        select CPU_V6K
+        select CPU_V7
         select PCI
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_CLOCKEVENTS
@@ -497,6 +498,7 @@ config ARCH_LOKI
 
 config ARCH_LPC32XX
         bool "NXP LPC32XX"
+        select CLKSRC_MMIO
         select CPU_ARM926T
         select ARCH_REQUIRE_GPIOLIB
         select HAVE_IDE
@@ -554,23 +556,12 @@ config ARCH_KS8695
           Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
           System-on-Chip devices.
 
-config ARCH_NS9XXX
-        bool "NetSilicon NS9xxx"
-        select CPU_ARM926T
-        select GENERIC_GPIO
-        select GENERIC_CLOCKEVENTS
-        select HAVE_CLK
-        help
-          Say Y here if you intend to run this kernel on a NetSilicon NS9xxx
-          System.
-
-          <http://www.digi.com/products/microprocessors/index.jsp>
-
 config ARCH_W90X900
         bool "Nuvoton W90X900 CPU"
         select CPU_ARM926T
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
         select GENERIC_CLOCKEVENTS
         help
           Support for Nuvoton (Winbond logic dept.) ARM9 processor,
@@ -592,6 +583,7 @@ config ARCH_NUC93X
 config ARCH_TEGRA
         bool "NVIDIA Tegra"
         select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
         select GENERIC_TIME
         select GENERIC_CLOCKEVENTS
         select GENERIC_GPIO
@@ -617,6 +609,7 @@ config ARCH_PXA
         select ARCH_MTD_XIP
         select ARCH_HAS_CPUFREQ
         select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
         select ARCH_REQUIRE_GPIOLIB
         select GENERIC_CLOCKEVENTS
         select HAVE_SCHED_CLOCK
@@ -667,6 +660,7 @@ config ARCH_RPC
 
 config ARCH_SA1100
         bool "SA1100-based"
+        select CLKSRC_MMIO
         select CPU_SA1100
         select ISA
         select ARCH_SPARSEMEM_ENABLE
@@ -803,6 +797,7 @@ config ARCH_SHARK
 
 config ARCH_TCC_926
         bool "Telechips TCC ARM926-based systems"
+        select CLKSRC_MMIO
         select CPU_ARM926T
         select HAVE_CLK
         select CLKDEV_LOOKUP
@@ -813,6 +808,7 @@ config ARCH_TCC_926
 config ARCH_U300
         bool "ST-Ericsson U300 Series"
         depends on MMU
+        select CLKSRC_MMIO
         select CPU_ARM926T
         select HAVE_SCHED_CLOCK
         select HAVE_TCM
@@ -854,6 +850,7 @@ config ARCH_DAVINCI
         select HAVE_IDE
         select CLKDEV_LOOKUP
         select GENERIC_ALLOCATOR
+        select GENERIC_IRQ_CHIP
         select ARCH_HAS_HOLES_MEMORYMODEL
         help
           Support for TI's DaVinci platform.
@@ -874,6 +871,7 @@ config PLAT_SPEAR
         select ARM_AMBA
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
         select GENERIC_CLOCKEVENTS
         select HAVE_CLK
         help
@@ -951,8 +949,6 @@ source "arch/arm/mach-netx/Kconfig"
 source "arch/arm/mach-nomadik/Kconfig"
 source "arch/arm/plat-nomadik/Kconfig"
 
-source "arch/arm/mach-ns9xxx/Kconfig"
-
 source "arch/arm/mach-nuc93x/Kconfig"
 
 source "arch/arm/plat-omap/Kconfig"
@@ -1005,8 +1001,6 @@ source "arch/arm/mach-exynos4/Kconfig"
 
 source "arch/arm/mach-shmobile/Kconfig"
 
-source "arch/arm/plat-stmp3xxx/Kconfig"
-
 source "arch/arm/mach-tegra/Kconfig"
 
 source "arch/arm/mach-u300/Kconfig"
@@ -1033,6 +1027,8 @@ config PLAT_IOP
 
 config PLAT_ORION
         bool
+        select CLKSRC_MMIO
+        select GENERIC_IRQ_CHIP
         select HAVE_SCHED_CLOCK
 
 config PLAT_PXA
@@ -1043,6 +1039,7 @@ config PLAT_VERSATILE
 
 config ARM_TIMER_SP804
         bool
+        select CLKSRC_MMIO
 
 source arch/arm/mm/Kconfig
 
@@ -1318,8 +1315,7 @@ menu "Kernel Features"
 source "kernel/time/Kconfig"
 
 config SMP
-        bool "Symmetric Multi-Processing (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        bool "Symmetric Multi-Processing"
         depends on CPU_V6K || CPU_V7
         depends on GENERIC_CLOCKEVENTS
         depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \
@@ -1521,8 +1517,8 @@ config ARCH_SELECT_MEMORY_MODEL
         def_bool ARCH_SPARSEMEM_ENABLE
 
 config HIGHMEM
-        bool "High Memory Support (EXPERIMENTAL)"
-        depends on MMU && EXPERIMENTAL
+        bool "High Memory Support"
+        depends on MMU
         help
           The address space of ARM processors is only 4 Gigabytes large
           and it has to accommodate user address space, kernel address
@@ -1742,16 +1738,31 @@ config CMDLINE
           time by entering them here. As a minimum, you should specify the
           memory size and the root device (e.g., mem=64M root=/dev/nfs).
 
+choice
+        prompt "Kernel command line type" if CMDLINE != ""
+        default CMDLINE_FROM_BOOTLOADER
+
+config CMDLINE_FROM_BOOTLOADER
+        bool "Use bootloader kernel arguments if available"
+        help
+          Uses the command-line options passed by the boot loader. If
+          the boot loader doesn't provide any, the default kernel command
+          string provided in CMDLINE will be used.
+
+config CMDLINE_EXTEND
+        bool "Extend bootloader kernel arguments"
+        help
+          The command-line arguments provided by the boot loader will be
+          appended to the default kernel command string.
+
 config CMDLINE_FORCE
         bool "Always use the default kernel command string"
-        depends on CMDLINE != ""
         help
           Always use the default kernel command string, even if the boot
           loader passes other arguments to the kernel.
           This is useful if you cannot or don't want to change the
           command-line options your boot loader passes to the kernel.
-
-          If unsure, say N.
+endchoice
 
 config XIP_KERNEL
         bool "Kernel Execute-In-Place from ROM"
@@ -2010,7 +2021,7 @@ menu "Power management options"
 source "kernel/power/Kconfig"
 
 config ARCH_SUSPEND_POSSIBLE
-        depends on !ARCH_S5P64X0 && !ARCH_S5P6442
+        depends on !ARCH_S5P64X0 && !ARCH_S5P6442 && !ARCH_S5PC100
         depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \
                 CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE
         def_bool y
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 03d01d783e3b..81cbe40c159c 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -63,13 +63,6 @@ config DEBUG_USER
               8 - SIGSEGV faults
              16 - SIGBUS faults
 
-config DEBUG_STACK_USAGE
-        bool "Enable stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        help
-          Enables the display of the minimum amount of free stack which each
-          task has ever had available in the sysrq-T output.
-
 # These options are only for real kernel hackers who want to get their hands dirty.
 config DEBUG_LL
         bool "Kernel low-level debugging functions"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index c7d321a3d95d..25750bcb3397 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -158,13 +158,11 @@ machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0
 machine-$(CONFIG_ARCH_MX1)              := imx
 machine-$(CONFIG_ARCH_MX2)              := imx
 machine-$(CONFIG_ARCH_MX25)             := imx
-machine-$(CONFIG_ARCH_MX3)              := mx3
+machine-$(CONFIG_ARCH_MX3)              := imx
 machine-$(CONFIG_ARCH_MX5)              := mx5
-machine-$(CONFIG_ARCH_MXC91231)         := mxc91231
 machine-$(CONFIG_ARCH_MXS)              := mxs
 machine-$(CONFIG_ARCH_NETX)             := netx
 machine-$(CONFIG_ARCH_NOMADIK)          := nomadik
-machine-$(CONFIG_ARCH_NS9XXX)           := ns9xxx
 machine-$(CONFIG_ARCH_OMAP1)            := omap1
 machine-$(CONFIG_ARCH_OMAP2)            := omap2
 machine-$(CONFIG_ARCH_OMAP3)            := omap2
@@ -185,8 +183,6 @@ machine-$(CONFIG_ARCH_EXYNOS4)		:= exynos4
 machine-$(CONFIG_ARCH_SA1100)           := sa1100
 machine-$(CONFIG_ARCH_SHARK)            := shark
 machine-$(CONFIG_ARCH_SHMOBILE)         := shmobile
-machine-$(CONFIG_ARCH_STMP378X)         := stmp378x
-machine-$(CONFIG_ARCH_STMP37XX)         := stmp37xx
 machine-$(CONFIG_ARCH_TCC8K)            := tcc8k
 machine-$(CONFIG_ARCH_TEGRA)            := tegra
 machine-$(CONFIG_ARCH_U300)             := u300
@@ -207,7 +203,6 @@ machine-$(CONFIG_MACH_SPEAR600)		:= spear6xx
 plat-$(CONFIG_ARCH_MXC)         := mxc
 plat-$(CONFIG_ARCH_OMAP)        := omap
 plat-$(CONFIG_ARCH_S3C64XX)     := samsung
-plat-$(CONFIG_ARCH_STMP3XXX)    := stmp3xxx
 plat-$(CONFIG_ARCH_TCC_926)     := tcc
 plat-$(CONFIG_PLAT_IOP)         := iop
 plat-$(CONFIG_PLAT_NOMADIK)     := nomadik
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 0c6852d93506..23aad0722303 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -98,8 +98,6 @@ endif
 ccflags-y := -fpic -fno-builtin
 asflags-y := -Wa,-march=all
 
-# Provide size of uncompressed kernel to the decompressor via a linker symbol.
-LDFLAGS_vmlinux = --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image)
 # Supply ZRELADDR to the decompressor via a linker symbol.
 ifneq ($(CONFIG_AUTO_ZRELADDR),y)
 LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR)
@@ -122,10 +120,23 @@ lib1funcs = $(obj)/lib1funcs.o
 $(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S FORCE
         $(call cmd,shipped)
 
+# We need to prevent any GOTOFF relocs being used with references
+# to symbols in the .bss section since we cannot relocate them
+# independently from the rest at run time.  This can be achieved by
+# ensuring that no private .bss symbols exist, as global symbols
+# always have a GOT entry which is what we need.
+# The .data section is already discarded by the linker script so no need
+# to bother about it here.
+check_for_bad_syms = \
+bad_syms=$$($(CROSS_COMPILE)nm $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \
+[ -z "$$bad_syms" ] || \
+  ( echo "following symbols must have non local/private scope:" >&2; \
+    echo "$$bad_syms" >&2; rm -f $@; false )
+
 $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \
                 $(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE
         $(call if_changed,ld)
-        @:
+        @$(check_for_bad_syms)
 
 $(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE
         $(call if_changed,$(suffix_y))
diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c
index 4c72a97bc3e1..07be5a2f8302 100644
--- a/arch/arm/boot/compressed/decompress.c
+++ b/arch/arm/boot/compressed/decompress.c
@@ -44,7 +44,7 @@ extern void error(char *);
 #include "../../../../lib/decompress_unlzma.c"
 #endif
 
-void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))
+int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))
 {
-        decompress(input, len, NULL, NULL, output, NULL, error);
+        return decompress(input, len, NULL, NULL, output, NULL, error);
 }
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 49f5b2eaaa87..f9da41921c52 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -179,7 +179,7 @@ not_angel:
                 bl      cache_on
 
 restart:        adr     r0, LC0
-                ldmia   r0, {r1, r2, r3, r6, r9, r11, r12}
+                ldmia   r0, {r1, r2, r3, r6, r10, r11, r12}
                 ldr     sp, [r0, #28]
 
                 /*
@@ -188,6 +188,20 @@ restart:	adr	r0, LC0
                  */
                 sub     r0, r0, r1              @ calculate the delta offset
                 add     r6, r6, r0              @ _edata
+                add     r10, r10, r0            @ inflated kernel size location
+
+                /*
+                 * The kernel build system appends the size of the
+                 * decompressed kernel at the end of the compressed data
+                 * in little-endian form.
+                 */
+                ldrb    r9, [r10, #0]
+                ldrb    lr, [r10, #1]
+                orr     r9, r9, lr, lsl #8
+                ldrb    lr, [r10, #2]
+                ldrb    r10, [r10, #3]
+                orr     r9, r9, lr, lsl #16
+                orr     r9, r9, r10, lsl #24
 
 #ifndef CONFIG_ZBOOT_ROM
                 /* malloc space is above the relocated stack (64k max) */
@@ -347,10 +361,10 @@ LC0:		.word	LC0			@ r1
                 .word   __bss_start             @ r2
                 .word   _end                    @ r3
                 .word   _edata                  @ r6
-                .word   _image_size             @ r9
+                .word   input_data_end - 4      @ r10 (inflated size location)
                 .word   _got_start              @ r11
                 .word   _got_end                @ ip
-                .word   user_stack_end          @ sp
+                .word   .L_user_stack_end       @ sp
                 .size   LC0, . - LC0
 
 #ifdef CONFIG_ARCH_RPC
@@ -459,7 +473,11 @@ __setup_mmu:	sub	r3, r4, #16384		@ Page directory size
                 orr     r1, r1, #3 << 10
                 add     r2, r3, #16384
 1:              cmp     r1, r9                  @ if virt > start of RAM
+#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
+                orrhs   r1, r1, #0x08           @ set cacheable
+#else
                 orrhs   r1, r1, #0x0c           @ set cacheable, bufferable
+#endif
                 cmp     r1, r10                 @ if virt > end of RAM
                 bichs   r1, r1, #0x0c           @ clear cacheable, bufferable
                 str     r1, [r0], #4            @ 1:1 mapping
@@ -484,6 +502,12 @@ __setup_mmu:	sub	r3, r4, #16384		@ Page directory size
                 mov     pc, lr
 ENDPROC(__setup_mmu)
 
+__arm926ejs_mmu_cache_on:
+#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
+                mov     r0, #4                  @ put dcache in WT mode
+                mcr     p15, 7, r0, c15, c0, 0
+#endif
+
 __armv4_mmu_cache_on:
                 mov     r12, lr
 #ifdef CONFIG_MMU
@@ -665,6 +689,12 @@ proc_types:
                 W(b)    __armv4_mpu_cache_off
                 W(b)    __armv4_mpu_cache_flush
 
+                .word   0x41069260              @ ARM926EJ-S (v5TEJ)
+                .word   0xff0ffff0
+                b       __arm926ejs_mmu_cache_on
+                b       __armv4_mmu_cache_off
+                b       __armv5tej_mmu_cache_flush
+
                 .word   0x00007000              @ ARM7 IDs
                 .word   0x0000f000
                 mov     pc, lr
@@ -747,12 +777,6 @@ proc_types:
                 W(b)    __armv4_mmu_cache_off
                 W(b)    __armv6_mmu_cache_flush
 
-                .word   0x560f5810              @ Marvell PJ4 ARMv6
-                .word   0xff0ffff0
-                W(b)    __armv4_mmu_cache_on
-                W(b)    __armv4_mmu_cache_off
-                W(b)    __armv6_mmu_cache_flush
-
                 .word   0x000f0000              @ new CPU Id
                 .word   0x000f0000
                 W(b)    __armv7_mmu_cache_on
@@ -1078,5 +1102,5 @@ reloc_code_end:
 
                 .align
                 .section ".stack", "aw", %nobits
-user_stack:     .space  4096
-user_stack_end:
+.L_user_stack:  .space  4096
+.L_user_stack_end:
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index 2df38263124c..832d37236c59 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -26,8 +26,6 @@ unsigned int __machine_arch_type;
 #include <linux/linkage.h>
 #include <asm/string.h>
 
-#include <asm/unaligned.h>
-
 
 static void putstr(const char *ptr);
 extern void error(char *x);
@@ -139,13 +137,12 @@ void *memcpy(void *__dest, __const void *__src, size_t __n)
 }
 
 /*
- * gzip delarations
+ * gzip declarations
  */
 extern char input_data[];
 extern char input_data_end[];
 
 unsigned char *output_data;
-unsigned long output_ptr;
 
 unsigned long free_mem_ptr;
 unsigned long free_mem_end_ptr;
@@ -170,15 +167,15 @@ asmlinkage void __div0(void)
         error("Attempting division by 0!");
 }
 
-extern void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x));
+extern int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x));
 
 
-unsigned long
+void
 decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,
                 unsigned long free_mem_ptr_end_p,
                 int arch_id)
 {
-        unsigned char *tmp;
+        int ret;
 
         output_data             = (unsigned char *)output_start;
         free_mem_ptr            = free_mem_ptr_p;
@@ -187,12 +184,11 @@ decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p,
 
         arch_decomp_setup();
 
-        tmp = (unsigned char *) (((unsigned long)input_data_end) - 4);
-        output_ptr = get_unaligned_le32(tmp);
-
         putstr("Uncompressing Linux...");
-        do_decompress(input_data, input_data_end - input_data,
-                        output_data, error);
-        putstr(" done, booting the kernel.\n");
-        return output_ptr;
+        ret = do_decompress(input_data, input_data_end - input_data,
+                            output_data, error);
+        if (ret)
+                error("decompressor returned an error");
+        else
+                putstr(" done, booting the kernel.\n");
 }
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index f70ec7dadebb..4ddd0a6ac7ff 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -49,7 +49,7 @@ struct gic_chip_data {
  * Default make them NULL.
  */
 struct irq_chip gic_arch_extn = {
-        .irq_ack        = NULL,
+        .irq_eoi        = NULL,
         .irq_mask       = NULL,
         .irq_unmask     = NULL,
         .irq_retrigger  = NULL,
@@ -84,21 +84,12 @@ static inline unsigned int gic_irq(struct irq_data *d)
 /*
  * Routines to acknowledge, disable and enable interrupts
  */
-static void gic_ack_irq(struct irq_data *d)
-{
-        spin_lock(&irq_controller_lock);
-        if (gic_arch_extn.irq_ack)
-                gic_arch_extn.irq_ack(d);
-        writel(gic_irq(d), gic_cpu_base(d) + GIC_CPU_EOI);
-        spin_unlock(&irq_controller_lock);
-}
-
 static void gic_mask_irq(struct irq_data *d)
 {
         u32 mask = 1 << (d->irq % 32);
 
         spin_lock(&irq_controller_lock);
-        writel(mask, gic_dist_base(d) + GIC_DIST_ENABLE_CLEAR + (gic_irq(d) / 32) * 4);
+        writel_relaxed(mask, gic_dist_base(d) + GIC_DIST_ENABLE_CLEAR + (gic_irq(d) / 32) * 4);
         if (gic_arch_extn.irq_mask)
                 gic_arch_extn.irq_mask(d);
         spin_unlock(&irq_controller_lock);
@@ -111,10 +102,21 @@ static void gic_unmask_irq(struct irq_data *d)
         spin_lock(&irq_controller_lock);
         if (gic_arch_extn.irq_unmask)
                 gic_arch_extn.irq_unmask(d);
-        writel(mask, gic_dist_base(d) + GIC_DIST_ENABLE_SET + (gic_irq(d) / 32) * 4);
+        writel_relaxed(mask, gic_dist_base(d) + GIC_DIST_ENABLE_SET + (gic_irq(d) / 32) * 4);
         spin_unlock(&irq_controller_lock);
 }
 
+static void gic_eoi_irq(struct irq_data *d)
+{
+        if (gic_arch_extn.irq_eoi) {
+                spin_lock(&irq_controller_lock);
+                gic_arch_extn.irq_eoi(d);
+                spin_unlock(&irq_controller_lock);
+        }
+
+        writel_relaxed(gic_irq(d), gic_cpu_base(d) + GIC_CPU_EOI);
+}
+
 static int gic_set_type(struct irq_data *d, unsigned int type)
 {
         void __iomem *base = gic_dist_base(d);
@@ -138,7 +140,7 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
         if (gic_arch_extn.irq_set_type)
                 gic_arch_extn.irq_set_type(d, type);
 
-        val = readl(base + GIC_DIST_CONFIG + confoff);
+        val = readl_relaxed(base + GIC_DIST_CONFIG + confoff);
         if (type == IRQ_TYPE_LEVEL_HIGH)
                 val &= ~confmask;
         else if (type == IRQ_TYPE_EDGE_RISING)
@@ -148,15 +150,15 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
          * As recommended by the spec, disable the interrupt before changing
          * the configuration
          */
-        if (readl(base + GIC_DIST_ENABLE_SET + enableoff) & enablemask) {
-                writel(enablemask, base + GIC_DIST_ENABLE_CLEAR + enableoff);
+        if (readl_relaxed(base + GIC_DIST_ENABLE_SET + enableoff) & enablemask) {
+                writel_relaxed(enablemask, base + GIC_DIST_ENABLE_CLEAR + enableoff);
                 enabled = true;
         }
 
-        writel(val, base + GIC_DIST_CONFIG + confoff);
+        writel_relaxed(val, base + GIC_DIST_CONFIG + confoff);
 
         if (enabled)
-                writel(enablemask, base + GIC_DIST_ENABLE_SET + enableoff);
+                writel_relaxed(enablemask, base + GIC_DIST_ENABLE_SET + enableoff);
 
         spin_unlock(&irq_controller_lock);
 
@@ -188,8 +190,8 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val,
 
         spin_lock(&irq_controller_lock);
         d->node = cpu;
-        val = readl(reg) & ~mask;
-        writel(val | bit, reg);
+        val = readl_relaxed(reg) & ~mask;
+        writel_relaxed(val | bit, reg);
         spin_unlock(&irq_controller_lock);
 
         return 0;
@@ -218,11 +220,10 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
         unsigned int cascade_irq, gic_irq;
         unsigned long status;
 
-        /* primary controller ack'ing */
-        chip->irq_ack(&desc->irq_data);
+        chained_irq_enter(chip, desc);
 
         spin_lock(&irq_controller_lock);
-        status = readl(chip_data->cpu_base + GIC_CPU_INTACK);
+        status = readl_relaxed(chip_data->cpu_base + GIC_CPU_INTACK);
         spin_unlock(&irq_controller_lock);
 
         gic_irq = (status & 0x3ff);
@@ -236,15 +237,14 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
                 generic_handle_irq(cascade_irq);
 
  out:
-        /* primary controller unmasking */
-        chip->irq_unmask(&desc->irq_data);
+        chained_irq_exit(chip, desc);
 }
 
 static struct irq_chip gic_chip = {
         .name                   = "GIC",
-        .irq_ack                = gic_ack_irq,
         .irq_mask               = gic_mask_irq,
         .irq_unmask             = gic_unmask_irq,
+        .irq_eoi                = gic_eoi_irq,
         .irq_set_type           = gic_set_type,
         .irq_retrigger          = gic_retrigger,
 #ifdef CONFIG_SMP
@@ -272,13 +272,13 @@ static void __init gic_dist_init(struct gic_chip_data *gic,
         cpumask |= cpumask << 8;
         cpumask |= cpumask << 16;
 
-        writel(0, base + GIC_DIST_CTRL);
+        writel_relaxed(0, base + GIC_DIST_CTRL);
 
         /*
          * Find out how many interrupts are supported.
          * The GIC only supports up to 1020 interrupt sources.
          */
-        gic_irqs = readl(base + GIC_DIST_CTR) & 0x1f;
+        gic_irqs = readl_relaxed(base + GIC_DIST_CTR) & 0x1f;
         gic_irqs = (gic_irqs + 1) * 32;
         if (gic_irqs > 1020)
                 gic_irqs = 1020;
@@ -287,26 +287,26 @@ static void __init gic_dist_init(struct gic_chip_data *gic,
          * Set all global interrupts to be level triggered, active low.
          */
         for (i = 32; i < gic_irqs; i += 16)
-                writel(0, base + GIC_DIST_CONFIG + i * 4 / 16);
+                writel_relaxed(0, base + GIC_DIST_CONFIG + i * 4 / 16);
 
         /*
          * Set all global interrupts to this CPU only.
          */
         for (i = 32; i < gic_irqs; i += 4)
-                writel(cpumask, base + GIC_DIST_TARGET + i * 4 / 4);
+                writel_relaxed(cpumask, base + GIC_DIST_TARGET + i * 4 / 4);
 
         /*
          * Set priority on all global interrupts.
          */
         for (i = 32; i < gic_irqs; i += 4)
-                writel(0xa0a0a0a0, base + GIC_DIST_PRI + i * 4 / 4);
+                writel_relaxed(0xa0a0a0a0, base + GIC_DIST_PRI + i * 4 / 4);
 
         /*
          * Disable all interrupts.  Leave the PPI and SGIs alone
          * as these enables are banked registers.
          */
         for (i = 32; i < gic_irqs; i += 32)
-                writel(0xffffffff, base + GIC_DIST_ENABLE_CLEAR + i * 4 / 32);
+                writel_relaxed(0xffffffff, base + GIC_DIST_ENABLE_CLEAR + i * 4 / 32);
 
         /*
          * Limit number of interrupts registered to the platform maximum
@@ -319,12 +319,12 @@ static void __init gic_dist_init(struct gic_chip_data *gic,
          * Setup the Linux IRQ subsystem.
          */
         for (i = irq_start; i < irq_limit; i++) {
-                irq_set_chip_and_handler(i, &gic_chip, handle_level_irq);
+                irq_set_chip_and_handler(i, &gic_chip, handle_fasteoi_irq);
                 irq_set_chip_data(i, gic);
                 set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
         }
 
-        writel(1, base + GIC_DIST_CTRL);
+        writel_relaxed(1, base + GIC_DIST_CTRL);
 }
 
 static void __cpuinit gic_cpu_init(struct gic_chip_data *gic)
@@ -337,17 +337,17 @@ static void __cpuinit gic_cpu_init(struct gic_chip_data *gic)
          * Deal with the banked PPI and SGI interrupts - disable all
          * PPI interrupts, ensure all SGI interrupts are enabled.
          */
-        writel(0xffff0000, dist_base + GIC_DIST_ENABLE_CLEAR);
-        writel(0x0000ffff, dist_base + GIC_DIST_ENABLE_SET);
+        writel_relaxed(0xffff0000, dist_base + GIC_DIST_ENABLE_CLEAR);
+        writel_relaxed(0x0000ffff, dist_base + GIC_DIST_ENABLE_SET);
 
         /*
          * Set priority on PPI and SGI interrupts
          */
         for (i = 0; i < 32; i += 4)
-                writel(0xa0a0a0a0, dist_base + GIC_DIST_PRI + i * 4 / 4);
+                writel_relaxed(0xa0a0a0a0, dist_base + GIC_DIST_PRI + i * 4 / 4);
 
-        writel(0xf0, base + GIC_CPU_PRIMASK);
-        writel(1, base + GIC_CPU_CTRL);
+        writel_relaxed(0xf0, base + GIC_CPU_PRIMASK);
+        writel_relaxed(1, base + GIC_CPU_CTRL);
 }
 
 void __init gic_init(unsigned int gic_nr, unsigned int irq_start,
@@ -391,7 +391,13 @@ void gic_raise_softirq(const struct cpumask *mask, unsigned int irq)
 {
         unsigned long map = *cpus_addr(*mask);
 
+        /*
+         * Ensure that stores to Normal memory are visible to the
+         * other CPUs before issuing the IPI.
+         */
+        dsb();
+
         /* this always happens on GIC0 */
-        writel(map << 16 | irq, gic_data[0].dist_base + GIC_DIST_SOFTINT);
+        writel_relaxed(map << 16 | irq, gic_data[0].dist_base + GIC_DIST_SOFTINT);
 }
 #endif
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index a12b33c0dc42..9c49a46a2b7a 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -185,14 +185,6 @@ static struct sa1111_dev_info sa1111_devices[] = {
         },
 };
 
-void __init sa1111_adjust_zones(unsigned long *size, unsigned long *holes)
-{
-        unsigned int sz = SZ_1M >> PAGE_SHIFT;
-
-        size[1] = size[0] - sz;
-        size[0] = sz;
-}
-
 /*
  * SA1111 interrupt support.  Since clearing an IRQ while there are
  * active IRQs causes the interrupt output to pulse, the upper levels
diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c
index 6ef3342153b9..41df47875122 100644
--- a/arch/arm/common/timer-sp.c
+++ b/arch/arm/common/timer-sp.c
@@ -18,53 +18,67 @@
  * 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/clk.h>
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
+#include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 
 #include <asm/hardware/arm_timer.h>
 
-/*
- * These timers are currently always setup to be clocked at 1MHz.
- */
-#define TIMER_FREQ_KHZ  (1000)
-#define TIMER_RELOAD    (TIMER_FREQ_KHZ * 1000 / HZ)
+static long __init sp804_get_clock_rate(const char *name)
+{
+        struct clk *clk;
+        long rate;
+        int err;
+
+        clk = clk_get_sys("sp804", name);
+        if (IS_ERR(clk)) {
+                pr_err("sp804: %s clock not found: %d\n", name,
+                        (int)PTR_ERR(clk));
+                return PTR_ERR(clk);
+        }
 
-static void __iomem *clksrc_base;
+        err = clk_enable(clk);
+        if (err) {
+                pr_err("sp804: %s clock failed to enable: %d\n", name, err);
+                clk_put(clk);
+                return err;
+        }
 
-static cycle_t sp804_read(struct clocksource *cs)
-{
-        return ~readl(clksrc_base + TIMER_VALUE);
-}
+        rate = clk_get_rate(clk);
+        if (rate < 0) {
+                pr_err("sp804: %s clock failed to get rate: %ld\n", name, rate);
+                clk_disable(clk);
+                clk_put(clk);
+        }
 
-static struct clocksource clocksource_sp804 = {
-        .name           = "timer3",
-        .rating         = 200,
-        .read           = sp804_read,
-        .mask           = CLOCKSOURCE_MASK(32),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
+        return rate;
+}
 
-void __init sp804_clocksource_init(void __iomem *base)
+void __init sp804_clocksource_init(void __iomem *base, const char *name)
 {
-        struct clocksource *cs = &clocksource_sp804;
+        long rate = sp804_get_clock_rate(name);
 
-        clksrc_base = base;
+        if (rate < 0)
+                return;
 
         /* setup timer 0 as free-running clocksource */
-        writel(0, clksrc_base + TIMER_CTRL);
-        writel(0xffffffff, clksrc_base + TIMER_LOAD);
-        writel(0xffffffff, clksrc_base + TIMER_VALUE);
+        writel(0, base + TIMER_CTRL);
+        writel(0xffffffff, base + TIMER_LOAD);
+        writel(0xffffffff, base + TIMER_VALUE);
         writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC,
-                clksrc_base + TIMER_CTRL);
+                base + TIMER_CTRL);
 
-        clocksource_register_khz(cs, TIMER_FREQ_KHZ);
+        clocksource_mmio_init(base + TIMER_VALUE, name,
+                rate, 200, 32, clocksource_mmio_readl_down);
 }
 
 
 static void __iomem *clkevt_base;
+static unsigned long clkevt_reload;
 
 /*
  * IRQ handler for the timer
@@ -90,7 +104,7 @@ static void sp804_set_mode(enum clock_event_mode mode,
 
         switch (mode) {
         case CLOCK_EVT_MODE_PERIODIC:
-                writel(TIMER_RELOAD, clkevt_base + TIMER_LOAD);
+                writel(clkevt_reload, clkevt_base + TIMER_LOAD);
                 ctrl |= TIMER_CTRL_PERIODIC | TIMER_CTRL_ENABLE;
                 break;
 
@@ -120,7 +134,6 @@ static int sp804_set_next_event(unsigned long next,
 }
 
 static struct clock_event_device sp804_clockevent = {
-        .name           = "timer0",
         .shift          = 32,
         .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
         .set_mode       = sp804_set_mode,
@@ -136,17 +149,24 @@ static struct irqaction sp804_timer_irq = {
         .dev_id         = &sp804_clockevent,
 };
 
-void __init sp804_clockevents_init(void __iomem *base, unsigned int timer_irq)
+void __init sp804_clockevents_init(void __iomem *base, unsigned int irq,
+        const char *name)
 {
         struct clock_event_device *evt = &sp804_clockevent;
+        long rate = sp804_get_clock_rate(name);
+
+        if (rate < 0)
+                return;
 
         clkevt_base = base;
+        clkevt_reload = DIV_ROUND_CLOSEST(rate, HZ);
 
-        evt->irq = timer_irq;
-        evt->mult = div_sc(TIMER_FREQ_KHZ, NSEC_PER_MSEC, evt->shift);
+        evt->name = name;
+        evt->irq = irq;
+        evt->mult = div_sc(rate, NSEC_PER_SEC, evt->shift);
         evt->max_delta_ns = clockevent_delta2ns(0xffffffff, evt);
         evt->min_delta_ns = clockevent_delta2ns(0xf, evt);
 
-        setup_irq(timer_irq, &sp804_timer_irq);
+        setup_irq(irq, &sp804_timer_irq);
         clockevents_register_device(evt);
 }
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 113085a77123..7aa4262ada7a 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -22,17 +22,16 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/device.h>
 #include <linux/amba/bus.h>
 
 #include <asm/mach/irq.h>
 #include <asm/hardware/vic.h>
 
-#if defined(CONFIG_PM)
+#ifdef CONFIG_PM
 /**
  * struct vic_device - VIC PM device
- * @sysdev: The system device which is registered.
  * @irq: The IRQ number for the base of the VIC.
  * @base: The register base for the VIC.
  * @resume_sources: A bitmask of interrupts for resume.
@@ -43,8 +42,6 @@
  * @protect: Save for VIC_PROTECT.
  */
 struct vic_device {
-        struct sys_device sysdev;
-
         void __iomem    *base;
         int             irq;
         u32             resume_sources;
@@ -59,11 +56,6 @@ struct vic_device {
 static struct vic_device vic_devices[CONFIG_ARM_VIC_NR];
 
 static int vic_id;
-
-static inline struct vic_device *to_vic(struct sys_device *sys)
-{
-        return container_of(sys, struct vic_device, sysdev);
-}
 #endif /* CONFIG_PM */
 
 /**
@@ -85,10 +77,9 @@ static void vic_init2(void __iomem *base)
         writel(32, base + VIC_PL190_DEF_VECT_ADDR);
 }
 
-#if defined(CONFIG_PM)
-static int vic_class_resume(struct sys_device *dev)
+#ifdef CONFIG_PM
+static void resume_one_vic(struct vic_device *vic)
 {
-        struct vic_device *vic = to_vic(dev);
         void __iomem *base = vic->base;
 
         printk(KERN_DEBUG "%s: resuming vic at %p\n", __func__, base);
@@ -107,13 +98,18 @@ static int vic_class_resume(struct sys_device *dev)
 
         writel(vic->soft_int, base + VIC_INT_SOFT);
         writel(~vic->soft_int, base + VIC_INT_SOFT_CLEAR);
+}
 
-        return 0;
+static void vic_resume(void)
+{
+        int id;
+
+        for (id = vic_id - 1; id >= 0; id--)
+                resume_one_vic(vic_devices + id);
 }
 
-static int vic_class_suspend(struct sys_device *dev, pm_message_t state)
+static void suspend_one_vic(struct vic_device *vic)
 {
-        struct vic_device *vic = to_vic(dev);
         void __iomem *base = vic->base;
 
         printk(KERN_DEBUG "%s: suspending vic at %p\n", __func__, base);
@@ -128,14 +124,21 @@ static int vic_class_suspend(struct sys_device *dev, pm_message_t state)
 
         writel(vic->resume_irqs, base + VIC_INT_ENABLE);
         writel(~vic->resume_irqs, base + VIC_INT_ENABLE_CLEAR);
+}
+
+static int vic_suspend(void)
+{
+        int id;
+
+        for (id = 0; id < vic_id; id++)
+                suspend_one_vic(vic_devices + id);
 
         return 0;
 }
 
-struct sysdev_class vic_class = {
-        .name           = "vic",
-        .suspend        = vic_class_suspend,
-        .resume         = vic_class_resume,
+struct syscore_ops vic_syscore_ops = {
+        .suspend        = vic_suspend,
+        .resume         = vic_resume,
 };
 
 /**
@@ -147,30 +150,8 @@ struct sysdev_class vic_class = {
 */
 static int __init vic_pm_init(void)
 {
-        struct vic_device *dev = vic_devices;
-        int err;
-        int id;
-
-        if (vic_id == 0)
-                return 0;
-
-        err = sysdev_class_register(&vic_class);
-        if (err) {
-                printk(KERN_ERR "%s: cannot register class\n", __func__);
-                return err;
-        }
-
-        for (id = 0; id < vic_id; id++, dev++) {
-                dev->sysdev.id = id;
-                dev->sysdev.cls = &vic_class;
-
-                err = sysdev_register(&dev->sysdev);
-                if (err) {
-                        printk(KERN_ERR "%s: failed to register device\n",
-                               __func__);
-                        return err;
-                }
-        }
+        if (vic_id > 0)
+                register_syscore_ops(&vic_syscore_ops);
 
         return 0;
 }
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig
index 54bf5eec8016..40db34cf2771 100644
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
@@ -8,8 +8,6 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_ARCH_DOVE=y
 CONFIG_MACH_DOVE_DB=y
-CONFIG_CPU_V6=y
-CONFIG_CPU_32v6K=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_AEABI=y
@@ -44,7 +42,6 @@ CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=1
-# CONFIG_MISC_DEVICES is not set
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_LOWLEVEL is not set
@@ -59,12 +56,12 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
 # CONFIG_MOUSE_PS2 is not set
 # CONFIG_SERIO is not set
+CONFIG_LEGACY_PTY_COUNT=16
 # CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_SERIAL_8250_PCI is not set
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_LEGACY_PTY_COUNT=16
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
@@ -72,12 +69,10 @@ CONFIG_I2C_MV64XXX=y
 CONFIG_SPI=y
 CONFIG_SPI_ORION=y
 # CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
 CONFIG_USB=y
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_STORAGE=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_MV=y
@@ -86,7 +81,6 @@ CONFIG_MV_XOR=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
-CONFIG_INOTIFY=y
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
 CONFIG_UDF_FS=m
@@ -110,23 +104,19 @@ CONFIG_DEBUG_KERNEL=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_ERRORS=y
 CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_MD4=y
-CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_BLOWFISH=y
-CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_TEA=y
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_DEFLATE=y
diff --git a/arch/arm/configs/mx1_defconfig b/arch/arm/configs/mx1_defconfig
index b39b5ced8a10..c9436d0bf593 100644
--- a/arch/arm/configs/mx1_defconfig
+++ b/arch/arm/configs/mx1_defconfig
@@ -15,6 +15,7 @@ CONFIG_ARCH_MXC=y
 CONFIG_ARCH_MX1=y
 CONFIG_ARCH_MX1ADS=y
 CONFIG_MACH_SCB9328=y
+CONFIG_MACH_APF9328=y
 CONFIG_MXC_IRQ_PRIOR=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
diff --git a/arch/arm/configs/mx51_defconfig b/arch/arm/configs/mx51_defconfig
index e3c903281f70..0ace16cba9b5 100644
--- a/arch/arm/configs/mx51_defconfig
+++ b/arch/arm/configs/mx51_defconfig
@@ -13,7 +13,7 @@ CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_LBDAF is not set
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX5=y
+CONFIG_ARCH_MX51=y
 CONFIG_MACH_MX51_BABBAGE=y
 CONFIG_MACH_MX51_3DS=y
 CONFIG_MACH_EUKREA_CPUIMX51=y
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
new file mode 100644
index 000000000000..2bf224310fb4
--- /dev/null
+++ b/arch/arm/configs/mxs_defconfig
@@ -0,0 +1,129 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_NET_NS is not set
+CONFIG_PERF_EVENTS=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_BLK_DEV_INTEGRITY=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_MXS=y
+CONFIG_MACH_STMP378X_DEVB=y
+CONFIG_MACH_TX28=y
+# CONFIG_ARM_THUMB is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_AEABI=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_FPE_NWFPE=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_FLEXCAN=m
+# CONFIG_WIRELESS is not set
+CONFIG_DEVTMPFS=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+# CONFIG_BLK_DEV is not set
+CONFIG_NETDEVICES=y
+CONFIG_NET_ETHERNET=y
+CONFIG_ENC28J60=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_TSC2007=m
+# CONFIG_SERIO is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=m
+# CONFIG_I2C_COMPAT is not set
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MXS=m
+CONFIG_SPI=y
+CONFIG_SPI_GPIO=m
+CONFIG_DEBUG_GPIO=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+# CONFIG_MFD_SUPPORT is not set
+CONFIG_DISPLAY_SUPPORT=m
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_MMC=y
+CONFIG_MMC_MXS=y
+CONFIG_RTC_CLASS=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_DMADEVICES=y
+CONFIG_MXS_DMA=y
+CONFIG_EXT3_FS=y
+# CONFIG_DNOTIFY is not set
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_CACHEFILES=m
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_MISC_FILESYSTEMS is not set
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_PRINTK_TIME=y
+CONFIG_FRAME_WARN=2048
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_TIMER_STATS=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
+CONFIG_DEBUG_INFO=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_DEBUG_USER=y
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC7=m
diff --git a/arch/arm/configs/ns9xxx_defconfig b/arch/arm/configs/ns9xxx_defconfig
deleted file mode 100644
index 1f528a002983..000000000000
--- a/arch/arm/configs/ns9xxx_defconfig
+++ /dev/null
@@ -1,56 +0,0 @@
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_NS9XXX=y
-CONFIG_MACH_CC9P9360DEV=y
-CONFIG_MACH_CC9P9360JS=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_FPE_NWFPE=y
-CONFIG_NET=y
-CONFIG_PACKET=m
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_SYN_COOKIES=y
-CONFIG_MTD=m
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_PHYSMAP=m
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_SERIO_SERPORT is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=m
-CONFIG_I2C_GPIO=m
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_RTC_CLASS=m
-CONFIG_EXT2_FS=m
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=m
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_ERRORS=y
diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig
index 5ca7a61f7c01..abe61bf379d2 100644
--- a/arch/arm/configs/realview-smp_defconfig
+++ b/arch/arm/configs/realview-smp_defconfig
@@ -38,7 +38,7 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_ARM_INTEGRATOR=y
+CONFIG_MTD_PHYSMAP=y
 CONFIG_ARM_CHARLCD=y
 CONFIG_NETDEVICES=y
 CONFIG_SMSC_PHY=y
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig
index fcaa60328051..7079cbe898a8 100644
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
@@ -37,7 +37,7 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_ARM_INTEGRATOR=y
+CONFIG_MTD_PHYSMAP=y
 CONFIG_ARM_CHARLCD=y
 CONFIG_NETDEVICES=y
 CONFIG_SMSC_PHY=y
diff --git a/arch/arm/configs/spear310_defconfig b/arch/arm/configs/spear310_defconfig
deleted file mode 100644
index 824e44418b18..000000000000
--- a/arch/arm/configs/spear310_defconfig
+++ /dev/null
@@ -1,52 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_PLAT_SPEAR=y
-CONFIG_MACH_SPEAR310=y
-CONFIG_BINFMT_MISC=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_INPUT_FF_MEMLESS=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=8192
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_PL061=y
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
-CONFIG_TMPFS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=m
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-CONFIG_DEBUG_INFO=y
-# CONFIG_CRC32 is not set
diff --git a/arch/arm/configs/spear320_defconfig b/arch/arm/configs/spear320_defconfig
deleted file mode 100644
index 842f7f3c512a..000000000000
--- a/arch/arm/configs/spear320_defconfig
+++ /dev/null
@@ -1,52 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_PLAT_SPEAR=y
-CONFIG_MACH_SPEAR320=y
-CONFIG_BINFMT_MISC=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_INPUT_FF_MEMLESS=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=8192
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_PL061=y
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_AUTOFS4_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
-CONFIG_TMPFS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=m
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-CONFIG_DEBUG_INFO=y
-# CONFIG_CRC32 is not set
diff --git a/arch/arm/configs/spear300_defconfig b/arch/arm/configs/spear3xx_defconfig
index cf29f3e56922..fea7e1f026a3 100644
--- a/arch/arm/configs/spear300_defconfig
+++ b/arch/arm/configs/spear3xx_defconfig
@@ -7,6 +7,9 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_PLAT_SPEAR=y
+CONFIG_BOARD_SPEAR300_EVB=y
+CONFIG_BOARD_SPEAR310_EVB=y
+CONFIG_BOARD_SPEAR320_EVB=y
 CONFIG_BINFMT_MISC=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_BLK_DEV_RAM=y
@@ -24,7 +27,6 @@ CONFIG_MAX_RAW_DEVS=8192
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_PL061=y
 # CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_EXT2_FS=y
diff --git a/arch/arm/configs/spear600_defconfig b/arch/arm/configs/spear6xx_defconfig
index 6777c11f63e7..cef2e836afd2 100644
--- a/arch/arm/configs/spear600_defconfig
+++ b/arch/arm/configs/spear6xx_defconfig
@@ -8,6 +8,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_PLAT_SPEAR=y
 CONFIG_ARCH_SPEAR6XX=y
+CONFIG_BOARD_SPEAR600_EVB=y
 CONFIG_BINFMT_MISC=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_BLK_DEV_RAM=y
@@ -22,7 +23,6 @@ CONFIG_MAX_RAW_DEVS=8192
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_PL061=y
 # CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_EXT2_FS=y
diff --git a/arch/arm/configs/stmp378x_defconfig b/arch/arm/configs/stmp378x_defconfig
deleted file mode 100644
index 1079c2b6eb3a..000000000000
--- a/arch/arm/configs/stmp378x_defconfig
+++ /dev/null
@@ -1,128 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-default"
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_STMP3XXX=y
-CONFIG_ARCH_STMP378X=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySDBG0,115200 mem=32M"
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=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_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_LRO is not set
-# CONFIG_IPV6 is not set
-CONFIG_NET_SCHED=y
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_STANDALONE is not set
-CONFIG_MTD=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_GLUEBI=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_CRYPTOLOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=4
-CONFIG_BLK_DEV_RAM_SIZE=6144
-# CONFIG_MISC_DEVICES is not set
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_INPUT_POLLDEV=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=320
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_MISC=y
-# CONFIG_SERIO_SERPORT is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_HW_RANDOM=y
-CONFIG_DEBUG_GPIO=y
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_FB=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_LOGO=y
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=m
-# CONFIG_MISC_FILESYSTEMS is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_SHIRQ=y
-# CONFIG_SCHED_DEBUG is not set
-CONFIG_DEBUG_OBJECTS=y
-CONFIG_DEBUG_OBJECTS_SELFTEST=y
-CONFIG_DEBUG_OBJECTS_FREE=y
-CONFIG_DEBUG_OBJECTS_TIMERS=y
-CONFIG_DEBUG_SLAB=y
-CONFIG_DEBUG_SLAB_LEAK=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-CONFIG_DEBUG_KOBJECT=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-CONFIG_DEBUG_INFO=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_BOOT_TRACER=y
-CONFIG_STACK_TRACER=y
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITY=y
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
diff --git a/arch/arm/configs/stmp37xx_defconfig b/arch/arm/configs/stmp37xx_defconfig
deleted file mode 100644
index 564a5cc44085..000000000000
--- a/arch/arm/configs/stmp37xx_defconfig
+++ /dev/null
@@ -1,108 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-default"
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_STMP3XXX=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySDBG0,115200 mem=32M lcd_panel=lms350 rdinit=/bin/sh ignore_loglevel"
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=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_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_SYN_COOKIES=y
-# CONFIG_INET_LRO is not set
-# CONFIG_IPV6 is not set
-CONFIG_NET_SCHED=y
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_STANDALONE is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_CRYPTOLOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=4
-CONFIG_BLK_DEV_RAM_SIZE=6144
-# CONFIG_MISC_DEVICES is not set
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_INPUT_POLLDEV=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=320
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_MISC=y
-# CONFIG_SERIO_SERPORT is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_HW_RANDOM=y
-CONFIG_DEBUG_GPIO=y
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_FB=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_LOGO=y
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=m
-# CONFIG_MISC_FILESYSTEMS is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_BOOT_TRACER=y
-CONFIG_STACK_TRACER=y
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_DEBUG_LL=y
-CONFIG_KEYS=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
-CONFIG_SECURITY=y
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_LZO=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=y
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig
index 0ce710f47500..cdd4d2bd3962 100644
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
@@ -32,7 +32,7 @@ CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_ARM_INTEGRATOR=y
+CONFIG_MTD_PHYSMAP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_EEPROM_LEGACY=m
 CONFIG_NETDEVICES=y
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index ca51143f97f1..42005542932b 100644
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -6,8 +6,10 @@
 /*
  * This is the maximum virtual address which can be DMA'd from.
  */
-#ifndef MAX_DMA_ADDRESS
+#ifndef ARM_DMA_ZONE_SIZE
 #define MAX_DMA_ADDRESS 0xffffffff
+#else
+#define MAX_DMA_ADDRESS (PAGE_OFFSET + ARM_DMA_ZONE_SIZE)
 #endif
 
 #ifdef CONFIG_ISA_DMA_API
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index c3cd8755e648..0e9ce8d9686e 100644
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
@@ -108,6 +108,7 @@ struct task_struct;
 int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
 #define ELF_CORE_COPY_TASK_REGS dump_task_regs
 
+#define CORE_DUMP_USE_REGSET
 #define ELF_EXEC_PAGESIZE       4096
 
 /* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
index 199a6b6de7f4..8c73900da9ed 100644
--- a/arch/arm/include/asm/futex.h
+++ b/arch/arm/include/asm/futex.h
@@ -3,16 +3,74 @@
 
 #ifdef __KERNEL__
 
+#if defined(CONFIG_CPU_USE_DOMAINS) && defined(CONFIG_SMP)
+/* ARM doesn't provide unprivileged exclusive memory accessors */
+#include <asm-generic/futex.h>
+#else
+
+#include <linux/futex.h>
+#include <linux/uaccess.h>
+#include <asm/errno.h>
+
+#define __futex_atomic_ex_table(err_reg)                        \
+        "3:\n"                                                  \
+        "       .pushsection __ex_table,\"a\"\n"                \
+        "       .align  3\n"                                    \
+        "       .long   1b, 4f, 2b, 4f\n"                       \
+        "       .popsection\n"                                  \
+        "       .pushsection .fixup,\"ax\"\n"                   \
+        "4:     mov     %0, " err_reg "\n"                      \
+        "       b       3b\n"                                   \
+        "       .popsection"
+
 #ifdef CONFIG_SMP
 
-#include <asm-generic/futex.h>
+#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg)      \
+        smp_mb();                                               \
+        __asm__ __volatile__(                                   \
+        "1:     ldrex   %1, [%2]\n"                             \
+        "       " insn "\n"                                     \
+        "2:     strex   %1, %0, [%2]\n"                         \
+        "       teq     %1, #0\n"                               \
+        "       bne     1b\n"                                   \
+        "       mov     %0, #0\n"                               \
+        __futex_atomic_ex_table("%4")                           \
+        : "=&r" (ret), "=&r" (oldval)                           \
+        : "r" (uaddr), "r" (oparg), "Ir" (-EFAULT)              \
+        : "cc", "memory")
+
+static inline int
+futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
+                              u32 oldval, u32 newval)
+{
+        int ret;
+        u32 val;
+
+        if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
+                return -EFAULT;
+
+        smp_mb();
+        __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
+        "1:     ldrex   %1, [%4]\n"
+        "       teq     %1, %2\n"
+        "       ite     eq      @ explicit IT needed for the 2b label\n"
+        "2:     strexeq %0, %3, [%4]\n"
+        "       movne   %0, #0\n"
+        "       teq     %0, #0\n"
+        "       bne     1b\n"
+        __futex_atomic_ex_table("%5")
+        : "=&r" (ret), "=&r" (val)
+        : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
+        : "cc", "memory");
+        smp_mb();
+
+        *uval = val;
+        return ret;
+}
 
 #else /* !SMP, we can work around lack of atomic ops by disabling preemption */
 
-#include <linux/futex.h>
 #include <linux/preempt.h>
-#include <linux/uaccess.h>
-#include <asm/errno.h>
 #include <asm/domain.h>
 
 #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg)      \
@@ -21,20 +79,38 @@
         "       " insn "\n"                                     \
         "2:     " T(str) "      %0, [%2]\n"                     \
         "       mov     %0, #0\n"                               \
-        "3:\n"                                                  \
-        "       .pushsection __ex_table,\"a\"\n"                \
-        "       .align  3\n"                                    \
-        "       .long   1b, 4f, 2b, 4f\n"                       \
-        "       .popsection\n"                                  \
-        "       .pushsection .fixup,\"ax\"\n"                   \
-        "4:     mov     %0, %4\n"                               \
-        "       b       3b\n"                                   \
-        "       .popsection"                                    \
+        __futex_atomic_ex_table("%4")                           \
         : "=&r" (ret), "=&r" (oldval)                           \
         : "r" (uaddr), "r" (oparg), "Ir" (-EFAULT)              \
         : "cc", "memory")
 
 static inline int
+futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
+                              u32 oldval, u32 newval)
+{
+        int ret = 0;
+        u32 val;
+
+        if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
+                return -EFAULT;
+
+        __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
+        "1:     " T(ldr) "      %1, [%4]\n"
+        "       teq     %1, %2\n"
+        "       it      eq      @ explicit IT needed for the 2b label\n"
+        "2:     " T(streq) "    %3, [%4]\n"
+        __futex_atomic_ex_table("%5")
+        : "+r" (ret), "=&r" (val)
+        : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
+        : "cc", "memory");
+
+        *uval = val;
+        return ret;
+}
+
+#endif /* !SMP */
+
+static inline int
 futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
 {
         int op = (encoded_op >> 28) & 7;
@@ -87,39 +163,6 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
         return ret;
 }
 
-static inline int
-futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
-                              u32 oldval, u32 newval)
-{
-        int ret = 0;
-        u32 val;
-
-        if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
-                return -EFAULT;
-
-        __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
-        "1:     " T(ldr) "      %1, [%4]\n"
-        "       teq     %1, %2\n"
-        "       it      eq      @ explicit IT needed for the 2b label\n"
-        "2:     " T(streq) "    %3, [%4]\n"
-        "3:\n"
-        "       .pushsection __ex_table,\"a\"\n"
-        "       .align  3\n"
-        "       .long   1b, 4f, 2b, 4f\n"
-        "       .popsection\n"
-        "       .pushsection .fixup,\"ax\"\n"
-        "4:     mov     %0, %5\n"
-        "       b       3b\n"
-        "       .popsection"
-        : "+r" (ret), "=&r" (val)
-        : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
-        : "cc", "memory");
-
-        *uval = val;
-        return ret;
-}
-
-#endif /* !SMP */
-
+#endif /* !(CPU_USE_DOMAINS && SMP) */
 #endif /* __KERNEL__ */
 #endif /* _ASM_ARM_FUTEX_H */
diff --git a/arch/arm/include/asm/hardware/timer-sp.h b/arch/arm/include/asm/hardware/timer-sp.h
index 21e75e30d497..4384d81eee79 100644
--- a/arch/arm/include/asm/hardware/timer-sp.h
+++ b/arch/arm/include/asm/hardware/timer-sp.h
@@ -1,2 +1,2 @@
-void sp804_clocksource_init(void __iomem *);
-void sp804_clockevents_init(void __iomem *, unsigned int);
+void sp804_clocksource_init(void __iomem *, const char *);
+void sp804_clockevents_init(void __iomem *, unsigned int, const char *);
diff --git a/arch/arm/include/asm/i8253.h b/arch/arm/include/asm/i8253.h
new file mode 100644
index 000000000000..70656b69d5ce
--- /dev/null
+++ b/arch/arm/include/asm/i8253.h
@@ -0,0 +1,15 @@
+#ifndef __ASMARM_I8253_H
+#define __ASMARM_I8253_H
+
+/* i8253A PIT registers */
+#define PIT_MODE        0x43
+#define PIT_CH0         0x40
+
+#define PIT_LATCH       ((PIT_TICK_RATE + HZ / 2) / HZ)
+
+extern raw_spinlock_t i8253_lock;
+
+#define outb_pit        outb_p
+#define inb_pit         inb_p
+
+#endif
diff --git a/arch/arm/include/asm/mach/time.h b/arch/arm/include/asm/mach/time.h
index 883f6be5117a..d5adaae5ee2c 100644
--- a/arch/arm/include/asm/mach/time.h
+++ b/arch/arm/include/asm/mach/time.h
@@ -34,7 +34,6 @@
  *   timer interrupt which may be pending.
  */
 struct sys_timer {
-        struct sys_device       dev;
         void                    (*init)(void);
         void                    (*suspend)(void);
         void                    (*resume)(void);
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 431077c5a867..af44a8fb3480 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -209,14 +209,10 @@ static inline unsigned long __phys_to_virt(unsigned long x)
  * allocations.  This must be the smallest DMA mask in the system,
  * so a successful GFP_DMA allocation will always satisfy this.
  */
-#ifndef ISA_DMA_THRESHOLD
+#ifndef ARM_DMA_ZONE_SIZE
 #define ISA_DMA_THRESHOLD       (0xffffffffULL)
-#endif
-
-#ifndef arch_adjust_zones
-#define arch_adjust_zones(size,holes) do { } while (0)
-#elif !defined(CONFIG_ZONE_DMA)
-#error "custom arch_adjust_zones() requires CONFIG_ZONE_DMA"
+#else
+#define ISA_DMA_THRESHOLD       (PHYS_OFFSET + ARM_DMA_ZONE_SIZE - 1)
 #endif
 
 /*
diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h
index a8ff22b2a391..312d10877bd7 100644
--- a/arch/arm/include/asm/ptrace.h
+++ b/arch/arm/include/asm/ptrace.h
@@ -128,6 +128,12 @@ struct pt_regs {
 #define ARM_r0          uregs[0]
 #define ARM_ORIG_r0     uregs[17]
 
+/*
+ * The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS
+ * and core dumps.
+ */
+#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ )
+
 #ifdef __KERNEL__
 
 #define user_mode(regs) \
diff --git a/arch/arm/include/asm/sizes.h b/arch/arm/include/asm/sizes.h
index 316bb2b2be3d..154b89b81d3e 100644
--- a/arch/arm/include/asm/sizes.h
+++ b/arch/arm/include/asm/sizes.h
@@ -16,44 +16,6 @@
 /*  Size definitions
  *  Copyright (C) ARM Limited 1998. All rights reserved.
  */
+#include <asm-generic/sizes.h>
 
-#ifndef __sizes_h
-#define __sizes_h                       1
-
-/* handy sizes */
-#define SZ_16                           0x00000010
-#define SZ_32                           0x00000020
-#define SZ_64                           0x00000040
-#define SZ_128                          0x00000080
-#define SZ_256                          0x00000100
-#define SZ_512                          0x00000200
-
-#define SZ_1K                           0x00000400
-#define SZ_2K                           0x00000800
-#define SZ_4K                           0x00001000
-#define SZ_8K                           0x00002000
-#define SZ_16K                          0x00004000
-#define SZ_32K                          0x00008000
-#define SZ_64K                          0x00010000
-#define SZ_128K                         0x00020000
-#define SZ_256K                         0x00040000
-#define SZ_512K                         0x00080000
-
-#define SZ_1M                           0x00100000
-#define SZ_2M                           0x00200000
-#define SZ_4M                           0x00400000
-#define SZ_8M                           0x00800000
-#define SZ_16M                          0x01000000
-#define SZ_32M                          0x02000000
-#define SZ_48M                          0x03000000
-#define SZ_64M                          0x04000000
-#define SZ_128M                         0x08000000
-#define SZ_256M                         0x10000000
-#define SZ_512M                         0x20000000
-
-#define SZ_1G                           0x40000000
-#define SZ_2G                           0x80000000
-
-#endif
-
-/*         END */
+#define SZ_48M  (SZ_32M + SZ_16M)
diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
index 96ed521f2408..d2b514fd76f4 100644
--- a/arch/arm/include/asm/smp.h
+++ b/arch/arm/include/asm/smp.h
@@ -14,20 +14,12 @@
 #include <linux/cpumask.h>
 #include <linux/thread_info.h>
 
-#include <mach/smp.h>
-
 #ifndef CONFIG_SMP
 # error "<asm/smp.h> included in non-SMP build"
 #endif
 
 #define raw_smp_processor_id() (current_thread_info()->cpu)
 
-/*
- * at the moment, there's not a big penalty for changing CPUs
- * (the >big< penalty is running SMP in the first place)
- */
-#define PROC_CHANGE_PENALTY             15
-
 struct seq_file;
 
 /*
@@ -47,9 +39,9 @@ extern void smp_init_cpus(void);
 
 
 /*
- * Raise an IPI cross call on CPUs in callmap.
+ * Provide a function to raise an IPI cross call on CPUs in callmap.
  */
-extern void smp_cross_call(const struct cpumask *mask, int ipi);
+extern void set_smp_cross_call(void (*)(const struct cpumask *, unsigned int));
 
 /*
  * Boot a secondary CPU, and assign it the specified idle task.
diff --git a/arch/arm/include/asm/spinlock.h b/arch/arm/include/asm/spinlock.h
index fdd3820edff8..65fa3c88095c 100644
--- a/arch/arm/include/asm/spinlock.h
+++ b/arch/arm/include/asm/spinlock.h
@@ -5,6 +5,8 @@
 #error SMP not supported on pre-ARMv6 CPUs
 #endif
 
+#include <asm/processor.h>
+
 /*
  * sev and wfe are ARMv6K extensions.  Uniprocessor ARMv6 may not have the K
  * extensions, so when running on UP, we have to patch these instructions away.
diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h
index 82dfe5d0c41e..265f908c4a6e 100644
--- a/arch/arm/include/asm/tlb.h
+++ b/arch/arm/include/asm/tlb.h
@@ -41,12 +41,12 @@
  */
 #if defined(CONFIG_SMP) || defined(CONFIG_CPU_32v7)
 #define tlb_fast_mode(tlb)      0
-#define FREE_PTE_NR             500
 #else
 #define tlb_fast_mode(tlb)      1
-#define FREE_PTE_NR             0
 #endif
 
+#define MMU_GATHER_BUNDLE       8
+
 /*
  * TLB handling.  This allows us to remove pages from the page
  * tables, and efficiently handle the TLB issues.
@@ -58,7 +58,9 @@ struct mmu_gather {
         unsigned long           range_start;
         unsigned long           range_end;
         unsigned int            nr;
-        struct page             *pages[FREE_PTE_NR];
+        unsigned int            max;
+        struct page             **pages;
+        struct page             *local[MMU_GATHER_BUNDLE];
 };
 
 DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
@@ -97,26 +99,37 @@ static inline void tlb_add_flush(struct mmu_gather *tlb, unsigned long addr)
         }
 }
 
+static inline void __tlb_alloc_page(struct mmu_gather *tlb)
+{
+        unsigned long addr = __get_free_pages(GFP_NOWAIT | __GFP_NOWARN, 0);
+
+        if (addr) {
+                tlb->pages = (void *)addr;
+                tlb->max = PAGE_SIZE / sizeof(struct page *);
+        }
+}
+
 static inline void tlb_flush_mmu(struct mmu_gather *tlb)
 {
         tlb_flush(tlb);
         if (!tlb_fast_mode(tlb)) {
                 free_pages_and_swap_cache(tlb->pages, tlb->nr);
                 tlb->nr = 0;
+                if (tlb->pages == tlb->local)
+                        __tlb_alloc_page(tlb);
         }
 }
 
-static inline struct mmu_gather *
-tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
+static inline void
+tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned int fullmm)
 {
-        struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
-
         tlb->mm = mm;
-        tlb->fullmm = full_mm_flush;
+        tlb->fullmm = fullmm;
         tlb->vma = NULL;
+        tlb->max = ARRAY_SIZE(tlb->local);
+        tlb->pages = tlb->local;
         tlb->nr = 0;
-
-        return tlb;
+        __tlb_alloc_page(tlb);
 }
 
 static inline void
@@ -127,7 +140,8 @@ tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
         /* keep the page table cache within bounds */
         check_pgt_cache();
 
-        put_cpu_var(mmu_gathers);
+        if (tlb->pages != tlb->local)
+                free_pages((unsigned long)tlb->pages, 0);
 }
 
 /*
@@ -162,15 +176,22 @@ tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)
                 tlb_flush(tlb);
 }
 
-static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)
 {
         if (tlb_fast_mode(tlb)) {
                 free_page_and_swap_cache(page);
-        } else {
-                tlb->pages[tlb->nr++] = page;
-                if (tlb->nr >= FREE_PTE_NR)
-                        tlb_flush_mmu(tlb);
+                return 1; /* avoid calling tlb_flush_mmu */
         }
+
+        tlb->pages[tlb->nr++] = page;
+        VM_BUG_ON(tlb->nr > tlb->max);
+        return tlb->max - tlb->nr;
+}
+
+static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+{
+        if (!__tlb_remove_page(tlb, page))
+                tlb_flush_mmu(tlb);
 }
 
 static inline void __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,
diff --git a/arch/arm/kernel/leds.c b/arch/arm/kernel/leds.c
index 31a316c1777b..0f107dcb0347 100644
--- a/arch/arm/kernel/leds.c
+++ b/arch/arm/kernel/leds.c
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
 #include <asm/leds.h>
 
@@ -69,36 +70,37 @@ static ssize_t leds_store(struct sys_device *dev,
 
 static SYSDEV_ATTR(event, 0200, NULL, leds_store);
 
-static int leds_suspend(struct sys_device *dev, pm_message_t state)
+static struct sysdev_class leds_sysclass = {
+        .name           = "leds",
+};
+
+static struct sys_device leds_device = {
+        .id             = 0,
+        .cls            = &leds_sysclass,
+};
+
+static int leds_suspend(void)
 {
         leds_event(led_stop);
         return 0;
 }
 
-static int leds_resume(struct sys_device *dev)
+static void leds_resume(void)
 {
         leds_event(led_start);
-        return 0;
 }
 
-static int leds_shutdown(struct sys_device *dev)
+static void leds_shutdown(void)
 {
         leds_event(led_halted);
-        return 0;
 }
 
-static struct sysdev_class leds_sysclass = {
-        .name           = "leds",
+static struct syscore_ops leds_syscore_ops = {
         .shutdown       = leds_shutdown,
         .suspend        = leds_suspend,
         .resume         = leds_resume,
 };
 
-static struct sys_device leds_device = {
-        .id             = 0,
-        .cls            = &leds_sysclass,
-};
-
 static int __init leds_init(void)
 {
         int ret;
@@ -107,6 +109,8 @@ static int __init leds_init(void)
                 ret = sysdev_register(&leds_device);
         if (ret == 0)
                 ret = sysdev_create_file(&leds_device, &attr_event);
+        if (ret == 0)
+                register_syscore_ops(&leds_syscore_ops);
         return ret;
 }
 
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index 139e3c827369..d53c0abc4dd3 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -560,11 +560,6 @@ static int armpmu_event_init(struct perf_event *event)
         event->destroy = hw_perf_event_destroy;
 
         if (!atomic_inc_not_zero(&active_events)) {
-                if (atomic_read(&active_events) > armpmu->num_events) {
-                        atomic_dec(&active_events);
-                        return -ENOSPC;
-                }
-
                 mutex_lock(&pmu_reserve_mutex);
                 if (atomic_read(&active_events) == 0) {
                         err = armpmu_reserve_hardware();
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index 8182f45ca493..97260060bf26 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -21,6 +21,7 @@
 #include <linux/uaccess.h>
 #include <linux/perf_event.h>
 #include <linux/hw_breakpoint.h>
+#include <linux/regset.h>
 
 #include <asm/pgtable.h>
 #include <asm/system.h>
@@ -308,58 +309,6 @@ static int ptrace_write_user(struct task_struct *tsk, unsigned long off,
         return put_user_reg(tsk, off >> 2, val);
 }
 
-/*
- * Get all user integer registers.
- */
-static int ptrace_getregs(struct task_struct *tsk, void __user *uregs)
-{
-        struct pt_regs *regs = task_pt_regs(tsk);
-
-        return copy_to_user(uregs, regs, sizeof(struct pt_regs)) ? -EFAULT : 0;
-}
-
-/*
- * Set all user integer registers.
- */
-static int ptrace_setregs(struct task_struct *tsk, void __user *uregs)
-{
-        struct pt_regs newregs;
-        int ret;
-
-        ret = -EFAULT;
-        if (copy_from_user(&newregs, uregs, sizeof(struct pt_regs)) == 0) {
-                struct pt_regs *regs = task_pt_regs(tsk);
-
-                ret = -EINVAL;
-                if (valid_user_regs(&newregs)) {
-                        *regs = newregs;
-                        ret = 0;
-                }
-        }
-
-        return ret;
-}
-
-/*
- * Get the child FPU state.
- */
-static int ptrace_getfpregs(struct task_struct *tsk, void __user *ufp)
-{
-        return copy_to_user(ufp, &task_thread_info(tsk)->fpstate,
-                            sizeof(struct user_fp)) ? -EFAULT : 0;
-}
-
-/*
- * Set the child FPU state.
- */
-static int ptrace_setfpregs(struct task_struct *tsk, void __user *ufp)
-{
-        struct thread_info *thread = task_thread_info(tsk);
-        thread->used_cp[1] = thread->used_cp[2] = 1;
-        return copy_from_user(&thread->fpstate, ufp,
-                              sizeof(struct user_fp)) ? -EFAULT : 0;
-}
-
 #ifdef CONFIG_IWMMXT
 
 /*
@@ -418,56 +367,6 @@ static int ptrace_setcrunchregs(struct task_struct *tsk, void __user *ufp)
 }
 #endif
 
-#ifdef CONFIG_VFP
-/*
- * Get the child VFP state.
- */
-static int ptrace_getvfpregs(struct task_struct *tsk, void __user *data)
-{
-        struct thread_info *thread = task_thread_info(tsk);
-        union vfp_state *vfp = &thread->vfpstate;
-        struct user_vfp __user *ufp = data;
-
-        vfp_sync_hwstate(thread);
-
-        /* copy the floating point registers */
-        if (copy_to_user(&ufp->fpregs, &vfp->hard.fpregs,
-                         sizeof(vfp->hard.fpregs)))
-                return -EFAULT;
-
-        /* copy the status and control register */
-        if (put_user(vfp->hard.fpscr, &ufp->fpscr))
-                return -EFAULT;
-
-        return 0;
-}
-
-/*
- * Set the child VFP state.
- */
-static int ptrace_setvfpregs(struct task_struct *tsk, void __user *data)
-{
-        struct thread_info *thread = task_thread_info(tsk);
-        union vfp_state *vfp = &thread->vfpstate;
-        struct user_vfp __user *ufp = data;
-
-        vfp_sync_hwstate(thread);
-
-        /* copy the floating point registers */
-        if (copy_from_user(&vfp->hard.fpregs, &ufp->fpregs,
-                           sizeof(vfp->hard.fpregs)))
-                return -EFAULT;
-
-        /* copy the status and control register */
-        if (get_user(vfp->hard.fpscr, &ufp->fpscr))
-                return -EFAULT;
-
-        vfp_flush_hwstate(thread);
-
-        return 0;
-}
-#endif
-
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
 /*
  * Convert a virtual register number into an index for a thread_info
@@ -694,6 +593,219 @@ out:
 }
 #endif
 
+/* regset get/set implementations */
+
+static int gpr_get(struct task_struct *target,
+                   const struct user_regset *regset,
+                   unsigned int pos, unsigned int count,
+                   void *kbuf, void __user *ubuf)
+{
+        struct pt_regs *regs = task_pt_regs(target);
+
+        return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                   regs,
+                                   0, sizeof(*regs));
+}
+
+static int gpr_set(struct task_struct *target,
+                   const struct user_regset *regset,
+                   unsigned int pos, unsigned int count,
+                   const void *kbuf, const void __user *ubuf)
+{
+        int ret;
+        struct pt_regs newregs;
+
+        ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                 &newregs,
+                                 0, sizeof(newregs));
+        if (ret)
+                return ret;
+
+        if (!valid_user_regs(&newregs))
+                return -EINVAL;
+
+        *task_pt_regs(target) = newregs;
+        return 0;
+}
+
+static int fpa_get(struct task_struct *target,
+                   const struct user_regset *regset,
+                   unsigned int pos, unsigned int count,
+                   void *kbuf, void __user *ubuf)
+{
+        return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                   &task_thread_info(target)->fpstate,
+                                   0, sizeof(struct user_fp));
+}
+
+static int fpa_set(struct task_struct *target,
+                   const struct user_regset *regset,
+                   unsigned int pos, unsigned int count,
+                   const void *kbuf, const void __user *ubuf)
+{
+        struct thread_info *thread = task_thread_info(target);
+
+        thread->used_cp[1] = thread->used_cp[2] = 1;
+
+        return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                &thread->fpstate,
+                0, sizeof(struct user_fp));
+}
+
+#ifdef CONFIG_VFP
+/*
+ * VFP register get/set implementations.
+ *
+ * With respect to the kernel, struct user_fp is divided into three chunks:
+ * 16 or 32 real VFP registers (d0-d15 or d0-31)
+ *      These are transferred to/from the real registers in the task's
+ *      vfp_hard_struct.  The number of registers depends on the kernel
+ *      configuration.
+ *
+ * 16 or 0 fake VFP registers (d16-d31 or empty)
+ *      i.e., the user_vfp structure has space for 32 registers even if
+ *      the kernel doesn't have them all.
+ *
+ *      vfp_get() reads this chunk as zero where applicable
+ *      vfp_set() ignores this chunk
+ *
+ * 1 word for the FPSCR
+ *
+ * The bounds-checking logic built into user_regset_copyout and friends
+ * means that we can make a simple sequence of calls to map the relevant data
+ * to/from the specified slice of the user regset structure.
+ */
+static int vfp_get(struct task_struct *target,
+                   const struct user_regset *regset,
+                   unsigned int pos, unsigned int count,
+                   void *kbuf, void __user *ubuf)
+{
+        int ret;
+        struct thread_info *thread = task_thread_info(target);
+        struct vfp_hard_struct const *vfp = &thread->vfpstate.hard;
+        const size_t user_fpregs_offset = offsetof(struct user_vfp, fpregs);
+        const size_t user_fpscr_offset = offsetof(struct user_vfp, fpscr);
+
+        vfp_sync_hwstate(thread);
+
+        ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                  &vfp->fpregs,
+                                  user_fpregs_offset,
+                                  user_fpregs_offset + sizeof(vfp->fpregs));
+        if (ret)
+                return ret;
+
+        ret = user_regset_copyout_zero(&pos, &count, &kbuf, &ubuf,
+                                       user_fpregs_offset + sizeof(vfp->fpregs),
+                                       user_fpscr_offset);
+        if (ret)
+                return ret;
+
+        return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                   &vfp->fpscr,
+                                   user_fpscr_offset,
+                                   user_fpscr_offset + sizeof(vfp->fpscr));
+}
+
+/*
+ * For vfp_set() a read-modify-write is done on the VFP registers,
+ * in order to avoid writing back a half-modified set of registers on
+ * failure.
+ */
+static int vfp_set(struct task_struct *target,
+                          const struct user_regset *regset,
+                          unsigned int pos, unsigned int count,
+                          const void *kbuf, const void __user *ubuf)
+{
+        int ret;
+        struct thread_info *thread = task_thread_info(target);
+        struct vfp_hard_struct new_vfp = thread->vfpstate.hard;
+        const size_t user_fpregs_offset = offsetof(struct user_vfp, fpregs);
+        const size_t user_fpscr_offset = offsetof(struct user_vfp, fpscr);
+
+        ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                  &new_vfp.fpregs,
+                                  user_fpregs_offset,
+                                  user_fpregs_offset + sizeof(new_vfp.fpregs));
+        if (ret)
+                return ret;
+
+        ret = user_regset_copyin_ignore(&pos, &count, &kbuf, &ubuf,
+                                user_fpregs_offset + sizeof(new_vfp.fpregs),
+                                user_fpscr_offset);
+        if (ret)
+                return ret;
+
+        ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                 &new_vfp.fpscr,
+                                 user_fpscr_offset,
+                                 user_fpscr_offset + sizeof(new_vfp.fpscr));
+        if (ret)
+                return ret;
+
+        vfp_sync_hwstate(thread);
+        thread->vfpstate.hard = new_vfp;
+        vfp_flush_hwstate(thread);
+
+        return 0;
+}
+#endif /* CONFIG_VFP */
+
+enum arm_regset {
+        REGSET_GPR,
+        REGSET_FPR,
+#ifdef CONFIG_VFP
+        REGSET_VFP,
+#endif
+};
+
+static const struct user_regset arm_regsets[] = {
+        [REGSET_GPR] = {
+                .core_note_type = NT_PRSTATUS,
+                .n = ELF_NGREG,
+                .size = sizeof(u32),
+                .align = sizeof(u32),
+                .get = gpr_get,
+                .set = gpr_set
+        },
+        [REGSET_FPR] = {
+                /*
+                 * For the FPA regs in fpstate, the real fields are a mixture
+                 * of sizes, so pretend that the registers are word-sized:
+                 */
+                .core_note_type = NT_PRFPREG,
+                .n = sizeof(struct user_fp) / sizeof(u32),
+                .size = sizeof(u32),
+                .align = sizeof(u32),
+                .get = fpa_get,
+                .set = fpa_set
+        },
+#ifdef CONFIG_VFP
+        [REGSET_VFP] = {
+                /*
+                 * Pretend that the VFP regs are word-sized, since the FPSCR is
+                 * a single word dangling at the end of struct user_vfp:
+                 */
+                .core_note_type = NT_ARM_VFP,
+                .n = ARM_VFPREGS_SIZE / sizeof(u32),
+                .size = sizeof(u32),
+                .align = sizeof(u32),
+                .get = vfp_get,
+                .set = vfp_set
+        },
+#endif /* CONFIG_VFP */
+};
+
+static const struct user_regset_view user_arm_view = {
+        .name = "arm", .e_machine = ELF_ARCH, .ei_osabi = ELF_OSABI,
+        .regsets = arm_regsets, .n = ARRAY_SIZE(arm_regsets)
+};
+
+const struct user_regset_view *task_user_regset_view(struct task_struct *task)
+{
+        return &user_arm_view;
+}
+
 long arch_ptrace(struct task_struct *child, long request,
                  unsigned long addr, unsigned long data)
 {
@@ -710,19 +822,31 @@ long arch_ptrace(struct task_struct *child, long request,
                         break;
 
                 case PTRACE_GETREGS:
-                        ret = ptrace_getregs(child, datap);
+                        ret = copy_regset_to_user(child,
+                                                  &user_arm_view, REGSET_GPR,
+                                                  0, sizeof(struct pt_regs),
+                                                  datap);
                         break;
 
                 case PTRACE_SETREGS:
-                        ret = ptrace_setregs(child, datap);
+                        ret = copy_regset_from_user(child,
+                                                    &user_arm_view, REGSET_GPR,
+                                                    0, sizeof(struct pt_regs),
+                                                    datap);
                         break;
 
                 case PTRACE_GETFPREGS:
-                        ret = ptrace_getfpregs(child, datap);
+                        ret = copy_regset_to_user(child,
+                                                  &user_arm_view, REGSET_FPR,
+                                                  0, sizeof(union fp_state),
+                                                  datap);
                         break;
-                
+
                 case PTRACE_SETFPREGS:
-                        ret = ptrace_setfpregs(child, datap);
+                        ret = copy_regset_from_user(child,
+                                                    &user_arm_view, REGSET_FPR,
+                                                    0, sizeof(union fp_state),
+                                                    datap);
                         break;
 
 #ifdef CONFIG_IWMMXT
@@ -757,11 +881,17 @@ long arch_ptrace(struct task_struct *child, long request,
 
 #ifdef CONFIG_VFP
                 case PTRACE_GETVFPREGS:
-                        ret = ptrace_getvfpregs(child, datap);
+                        ret = copy_regset_to_user(child,
+                                                  &user_arm_view, REGSET_VFP,
+                                                  0, ARM_VFPREGS_SIZE,
+                                                  datap);
                         break;
 
                 case PTRACE_SETVFPREGS:
-                        ret = ptrace_setvfpregs(child, datap);
+                        ret = copy_regset_from_user(child,
+                                                    &user_arm_view, REGSET_VFP,
+                                                    0, ARM_VFPREGS_SIZE,
+                                                    datap);
                         break;
 #endif
 
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 006c1e884eaf..6dce209a623b 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -672,11 +672,16 @@ __tagtable(ATAG_REVISION, parse_tag_revision);
 
 static int __init parse_tag_cmdline(const struct tag *tag)
 {
-#ifndef CONFIG_CMDLINE_FORCE
-        strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
-#else
+#if defined(CONFIG_CMDLINE_EXTEND)
+        strlcat(default_command_line, " ", COMMAND_LINE_SIZE);
+        strlcat(default_command_line, tag->u.cmdline.cmdline,
+                COMMAND_LINE_SIZE);
+#elif defined(CONFIG_CMDLINE_FORCE)
         pr_warning("Ignoring tag cmdline (using the default kernel command line)\n");
-#endif /* CONFIG_CMDLINE_FORCE */
+#else
+        strlcpy(default_command_line, tag->u.cmdline.cmdline,
+                COMMAND_LINE_SIZE);
+#endif
         return 0;
 }
 
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index f29b8a29b174..d439a8f4c078 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -376,6 +376,13 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         }
 }
 
+static void (*smp_cross_call)(const struct cpumask *, unsigned int);
+
+void __init set_smp_cross_call(void (*fn)(const struct cpumask *, unsigned int))
+{
+        smp_cross_call = fn;
+}
+
 void arch_send_call_function_ipi_mask(const struct cpumask *mask)
 {
         smp_cross_call(mask, IPI_CALL_FUNC);
@@ -560,10 +567,7 @@ asmlinkage void __exception_irq_entry do_IPI(int ipinr, struct pt_regs *regs)
                 break;
 
         case IPI_RESCHEDULE:
-                /*
-                 * nothing more to do - eveything is
-                 * done on the interrupt return path
-                 */
+                scheduler_ipi();
                 break;
 
         case IPI_CALL_FUNC:
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 1ff46cabc7ef..cb634c3e28e9 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -21,7 +21,7 @@
 #include <linux/timex.h>
 #include <linux/errno.h>
 #include <linux/profile.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/timer.h>
 #include <linux/irq.h>
 
@@ -115,48 +115,37 @@ void timer_tick(void)
 #endif
 
 #if defined(CONFIG_PM) && !defined(CONFIG_GENERIC_CLOCKEVENTS)
-static int timer_suspend(struct sys_device *dev, pm_message_t state)
+static int timer_suspend(void)
 {
-        struct sys_timer *timer = container_of(dev, struct sys_timer, dev);
-
-        if (timer->suspend != NULL)
-                timer->suspend();
+        if (system_timer->suspend)
+                system_timer->suspend();
 
         return 0;
 }
 
-static int timer_resume(struct sys_device *dev)
+static void timer_resume(void)
 {
-        struct sys_timer *timer = container_of(dev, struct sys_timer, dev);
-
-        if (timer->resume != NULL)
-                timer->resume();
-
-        return 0;
+        if (system_timer->resume)
+                system_timer->resume();
 }
 #else
 #define timer_suspend NULL
 #define timer_resume NULL
 #endif
 
-static struct sysdev_class timer_sysclass = {
-        .name           = "timer",
+static struct syscore_ops timer_syscore_ops = {
         .suspend        = timer_suspend,
         .resume         = timer_resume,
 };
 
-static int __init timer_init_sysfs(void)
+static int __init timer_init_syscore_ops(void)
 {
-        int ret = sysdev_class_register(&timer_sysclass);
-        if (ret == 0) {
-                system_timer->dev.cls = &timer_sysclass;
-                ret = sysdev_register(&system_timer->dev);
-        }
+        register_syscore_ops(&timer_syscore_ops);
 
-        return ret;
+        return 0;
 }
 
-device_initcall(timer_init_sysfs);
+device_initcall(timer_init_syscore_ops);
 
 void __init time_init(void)
 {
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 3b54ad19d489..d52eec268b47 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -234,7 +234,6 @@ static int __die(const char *str, int err, struct thread_info *thread, struct pt
 
         printk(KERN_EMERG "Internal error: %s: %x [#%d]" S_PREEMPT S_SMP "\n",
                str, err, ++die_counter);
-        sysfs_printk_last_file();
 
         /* trap and error numbers are mostly meaningless on ARM */
         ret = notify_die(DIE_OOPS, str, regs, err, tsk->thread.trap_no, SIGSEGV);
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index b4348e62ef06..e5287f21badc 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -82,7 +82,7 @@ SECTIONS
 #endif
         }
 
-        PERCPU(32, PAGE_SIZE)
+        PERCPU_SECTION(32)
 
 #ifndef CONFIG_XIP_KERNEL
         . = ALIGN(PAGE_SIZE);
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
index 9ffbf3a2dfea..21020ceb2f3a 100644
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
@@ -171,7 +171,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
          */
         usba_udc_data.pdata.vbus_pin = -EINVAL;
         usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
-        memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
+        memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
 
         if (data && data->vbus_pin > 0) {
                 at91_set_gpio_input(data->vbus_pin, 0);
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 1e8f275c17f6..5e9f8a4c38df 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -256,7 +256,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
 {
         usba_udc_data.pdata.vbus_pin = -EINVAL;
         usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
-        memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
+        memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
 
         if (data && data->vbus_pin > 0) {
                 at91_set_gpio_input(data->vbus_pin, 0);
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index 53aaa94df75a..c49262bddd85 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -145,7 +145,7 @@ void __init at91_add_device_usba(struct usba_platform_data *data)
          */
         usba_udc_data.pdata.vbus_pin = -EINVAL;
         usba_udc_data.pdata.num_ep = ARRAY_SIZE(usba_udc_ep);
-        memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));;
+        memcpy(usba_udc_data.ep, usba_udc_ep, sizeof(usba_udc_ep));
 
         if (data && data->vbus_pin > 0) {
                 at91_set_gpio_input(data->vbus_pin, 0);
diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c
index 73eb066d2329..a604b9ebb501 100644
--- a/arch/arm/mach-bcmring/arch.c
+++ b/arch/arm/mach-bcmring/arch.c
@@ -169,6 +169,7 @@ MACHINE_START(BCMRING, "BCMRING")
         /* Maintainer: Broadcom Corporation */
         .fixup = bcmring_fixup,
         .map_io = bcmring_map_io,
+        .init_early = bcmring_init_early,
         .init_irq = bcmring_init_irq,
         .timer = &bcmring_timer,
         .init_machine = bcmring_init_machine
diff --git a/arch/arm/mach-bcmring/core.c b/arch/arm/mach-bcmring/core.c
index 8fc2035759fb..43eadbcc29ed 100644
--- a/arch/arm/mach-bcmring/core.c
+++ b/arch/arm/mach-bcmring/core.c
@@ -28,8 +28,6 @@
 #include <linux/sysdev.h>
 #include <linux/interrupt.h>
 #include <linux/amba/bus.h>
-#include <linux/clocksource.h>
-#include <linux/clockchips.h>
 #include <linux/clkdev.h>
 
 #include <mach/csp/mm_addr.h>
@@ -37,6 +35,7 @@
 #include <linux/io.h>
 #include <asm/irq.h>
 #include <asm/hardware/arm_timer.h>
+#include <asm/hardware/timer-sp.h>
 #include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>
@@ -97,6 +96,35 @@ static struct clk dummy_apb_pclk = {
         .mode = CLK_MODE_XTAL,
 };
 
+/* Timer 0 - 25 MHz, Timer3 at bus clock rate, typically  150-166 MHz */
+#if defined(CONFIG_ARCH_FPGA11107)
+/* fpga cpu/bus are currently 30 times slower so scale frequency as well to */
+/* slow down Linux's sense of time */
+#define TIMER0_FREQUENCY_MHZ  (tmrHw_LOW_FREQUENCY_MHZ * 30)
+#define TIMER1_FREQUENCY_MHZ  (tmrHw_LOW_FREQUENCY_MHZ * 30)
+#define TIMER3_FREQUENCY_MHZ  (tmrHw_HIGH_FREQUENCY_MHZ * 30)
+#define TIMER3_FREQUENCY_KHZ   (tmrHw_HIGH_FREQUENCY_HZ / 1000 * 30)
+#else
+#define TIMER0_FREQUENCY_MHZ  tmrHw_LOW_FREQUENCY_MHZ
+#define TIMER1_FREQUENCY_MHZ  tmrHw_LOW_FREQUENCY_MHZ
+#define TIMER3_FREQUENCY_MHZ  tmrHw_HIGH_FREQUENCY_MHZ
+#define TIMER3_FREQUENCY_KHZ  (tmrHw_HIGH_FREQUENCY_HZ / 1000)
+#endif
+
+static struct clk sp804_timer012_clk = {
+        .name = "sp804-timer-0,1,2",
+        .type = CLK_TYPE_PRIMARY,
+        .mode = CLK_MODE_XTAL,
+        .rate_hz = TIMER1_FREQUENCY_MHZ * 1000000,
+};
+
+static struct clk sp804_timer3_clk = {
+        .name = "sp804-timer-3",
+        .type = CLK_TYPE_PRIMARY,
+        .mode = CLK_MODE_XTAL,
+        .rate_hz = TIMER3_FREQUENCY_KHZ * 1000,
+};
+
 static struct clk_lookup lookups[] = {
         {                       /* Bus clock */
                 .con_id = "apb_pclk",
@@ -107,6 +135,18 @@ static struct clk_lookup lookups[] = {
         }, {                    /* UART1 */
                 .dev_id = "uartb",
                 .clk = &uart_clk,
+        }, {                    /* SP804 timer 0 */
+                .dev_id = "sp804",
+                .con_id = "timer0",
+                .clk = &sp804_timer012_clk,
+        }, {                    /* SP804 timer 1 */
+                .dev_id = "sp804",
+                .con_id = "timer1",
+                .clk = &sp804_timer012_clk,
+        }, {                    /* SP804 timer 3 */
+                .dev_id = "sp804",
+                .con_id = "timer3",
+                .clk = &sp804_timer3_clk,
         }
 };
 
@@ -151,8 +191,6 @@ void __init bcmring_amba_init(void)
 
         chipcHw_busInterfaceClockEnable(bus_clock);
 
-        clkdev_add_table(lookups, ARRAY_SIZE(lookups));
-
         for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
                 struct amba_device *d = amba_devs[i];
                 amba_device_register(d, &iomem_resource);
@@ -162,170 +200,18 @@ void __init bcmring_amba_init(void)
 /*
  * Where is the timer (VA)?
  */
-#define TIMER0_VA_BASE           MM_IO_BASE_TMR
-#define TIMER1_VA_BASE          (MM_IO_BASE_TMR + 0x20)
-#define TIMER2_VA_BASE          (MM_IO_BASE_TMR + 0x40)
-#define TIMER3_VA_BASE          (MM_IO_BASE_TMR + 0x60)
-
-/* Timer 0 - 25 MHz, Timer3 at bus clock rate, typically  150-166 MHz */
-#if defined(CONFIG_ARCH_FPGA11107)
-/* fpga cpu/bus are currently 30 times slower so scale frequency as well to */
-/* slow down Linux's sense of time */
-#define TIMER0_FREQUENCY_MHZ  (tmrHw_LOW_FREQUENCY_MHZ * 30)
-#define TIMER1_FREQUENCY_MHZ  (tmrHw_LOW_FREQUENCY_MHZ * 30)
-#define TIMER3_FREQUENCY_MHZ  (tmrHw_HIGH_FREQUENCY_MHZ * 30)
-#define TIMER3_FREQUENCY_KHZ   (tmrHw_HIGH_FREQUENCY_HZ / 1000 * 30)
-#else
-#define TIMER0_FREQUENCY_MHZ  tmrHw_LOW_FREQUENCY_MHZ
-#define TIMER1_FREQUENCY_MHZ  tmrHw_LOW_FREQUENCY_MHZ
-#define TIMER3_FREQUENCY_MHZ  tmrHw_HIGH_FREQUENCY_MHZ
-#define TIMER3_FREQUENCY_KHZ  (tmrHw_HIGH_FREQUENCY_HZ / 1000)
-#endif
-
-#define TICKS_PER_uSEC     TIMER0_FREQUENCY_MHZ
-
-/*
- *  These are useconds NOT ticks.
- *
- */
-#define mSEC_1                          1000
-#define mSEC_5                          (mSEC_1 * 5)
-#define mSEC_10                         (mSEC_1 * 10)
-#define mSEC_25                         (mSEC_1 * 25)
-#define SEC_1                           (mSEC_1 * 1000)
-
-/*
- * How long is the timer interval?
- */
-#define TIMER_INTERVAL  (TICKS_PER_uSEC * mSEC_10)
-#if TIMER_INTERVAL >= 0x100000
-#define TIMER_RELOAD    (TIMER_INTERVAL >> 8)
-#define TIMER_DIVISOR   (TIMER_CTRL_DIV256)
-#define TICKS2USECS(x)  (256 * (x) / TICKS_PER_uSEC)
-#elif TIMER_INTERVAL >= 0x10000
-#define TIMER_RELOAD    (TIMER_INTERVAL >> 4)   /* Divide by 16 */
-#define TIMER_DIVISOR   (TIMER_CTRL_DIV16)
-#define TICKS2USECS(x)  (16 * (x) / TICKS_PER_uSEC)
-#else
-#define TIMER_RELOAD    (TIMER_INTERVAL)
-#define TIMER_DIVISOR   (TIMER_CTRL_DIV1)
-#define TICKS2USECS(x)  ((x) / TICKS_PER_uSEC)
-#endif
-
-static void timer_set_mode(enum clock_event_mode mode,
-                           struct clock_event_device *clk)
-{
-        unsigned long ctrl;
-
-        switch (mode) {
-        case CLOCK_EVT_MODE_PERIODIC:
-                writel(TIMER_RELOAD, TIMER0_VA_BASE + TIMER_LOAD);
-
-                ctrl = TIMER_CTRL_PERIODIC;
-                ctrl |=
-                    TIMER_DIVISOR | TIMER_CTRL_32BIT | TIMER_CTRL_IE |
-                    TIMER_CTRL_ENABLE;
-                break;
-        case CLOCK_EVT_MODE_ONESHOT:
-                /* period set, and timer enabled in 'next_event' hook */
-                ctrl = TIMER_CTRL_ONESHOT;
-                ctrl |= TIMER_DIVISOR | TIMER_CTRL_32BIT | TIMER_CTRL_IE;
-                break;
-        case CLOCK_EVT_MODE_UNUSED:
-        case CLOCK_EVT_MODE_SHUTDOWN:
-        default:
-                ctrl = 0;
-        }
-
-        writel(ctrl, TIMER0_VA_BASE + TIMER_CTRL);
-}
-
-static int timer_set_next_event(unsigned long evt,
-                                struct clock_event_device *unused)
-{
-        unsigned long ctrl = readl(TIMER0_VA_BASE + TIMER_CTRL);
-
-        writel(evt, TIMER0_VA_BASE + TIMER_LOAD);
-        writel(ctrl | TIMER_CTRL_ENABLE, TIMER0_VA_BASE + TIMER_CTRL);
-
-        return 0;
-}
-
-static struct clock_event_device timer0_clockevent = {
-        .name = "timer0",
-        .shift = 32,
-        .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-        .set_mode = timer_set_mode,
-        .set_next_event = timer_set_next_event,
-};
-
-/*
- * IRQ handler for the timer
- */
-static irqreturn_t bcmring_timer_interrupt(int irq, void *dev_id)
-{
-        struct clock_event_device *evt = &timer0_clockevent;
-
-        writel(1, TIMER0_VA_BASE + TIMER_INTCLR);
-
-        evt->event_handler(evt);
-
-        return IRQ_HANDLED;
-}
-
-static struct irqaction bcmring_timer_irq = {
-        .name = "bcmring Timer Tick",
-        .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
-        .handler = bcmring_timer_interrupt,
-};
-
-static cycle_t bcmring_get_cycles_timer1(struct clocksource *cs)
-{
-        return ~readl(TIMER1_VA_BASE + TIMER_VALUE);
-}
-
-static cycle_t bcmring_get_cycles_timer3(struct clocksource *cs)
-{
-        return ~readl(TIMER3_VA_BASE + TIMER_VALUE);
-}
-
-static struct clocksource clocksource_bcmring_timer1 = {
-        .name = "timer1",
-        .rating = 200,
-        .read = bcmring_get_cycles_timer1,
-        .mask = CLOCKSOURCE_MASK(32),
-        .flags = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
-static struct clocksource clocksource_bcmring_timer3 = {
-        .name = "timer3",
-        .rating = 100,
-        .read = bcmring_get_cycles_timer3,
-        .mask = CLOCKSOURCE_MASK(32),
-        .flags = CLOCK_SOURCE_IS_CONTINUOUS,
-};
+#define TIMER0_VA_BASE          ((void __iomem *)MM_IO_BASE_TMR)
+#define TIMER1_VA_BASE          ((void __iomem *)(MM_IO_BASE_TMR + 0x20))
+#define TIMER2_VA_BASE          ((void __iomem *)(MM_IO_BASE_TMR + 0x40))
+#define TIMER3_VA_BASE          ((void __iomem *)(MM_IO_BASE_TMR + 0x60))
 
 static int __init bcmring_clocksource_init(void)
 {
         /* setup timer1 as free-running clocksource */
-        writel(0, TIMER1_VA_BASE + TIMER_CTRL);
-        writel(0xffffffff, TIMER1_VA_BASE + TIMER_LOAD);
-        writel(0xffffffff, TIMER1_VA_BASE + TIMER_VALUE);
-        writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC,
-               TIMER1_VA_BASE + TIMER_CTRL);
-
-        clocksource_register_khz(&clocksource_bcmring_timer1,
-                                 TIMER1_FREQUENCY_MHZ * 1000);
+        sp804_clocksource_init(TIMER1_VA_BASE, "timer1");
 
         /* setup timer3 as free-running clocksource */
-        writel(0, TIMER3_VA_BASE + TIMER_CTRL);
-        writel(0xffffffff, TIMER3_VA_BASE + TIMER_LOAD);
-        writel(0xffffffff, TIMER3_VA_BASE + TIMER_VALUE);
-        writel(TIMER_CTRL_32BIT | TIMER_CTRL_ENABLE | TIMER_CTRL_PERIODIC,
-               TIMER3_VA_BASE + TIMER_CTRL);
-
-        clocksource_register_khz(&clocksource_bcmring_timer3,
-                                 TIMER3_FREQUENCY_KHZ);
+        sp804_clocksource_init(TIMER3_VA_BASE, "timer3");
 
         return 0;
 }
@@ -347,21 +233,16 @@ void __init bcmring_init_timer(void)
         /*
          * Make irqs happen for the system timer
          */
-        setup_irq(IRQ_TIMER0, &bcmring_timer_irq);
-
         bcmring_clocksource_init();
 
-        timer0_clockevent.mult =
-            div_sc(1000000, NSEC_PER_SEC, timer0_clockevent.shift);
-        timer0_clockevent.max_delta_ns =
-            clockevent_delta2ns(0xffffffff, &timer0_clockevent);
-        timer0_clockevent.min_delta_ns =
-            clockevent_delta2ns(0xf, &timer0_clockevent);
-
-        timer0_clockevent.cpumask = cpumask_of(0);
-        clockevents_register_device(&timer0_clockevent);
+        sp804_clockevents_register(TIMER0_VA_BASE, IRQ_TIMER0, "timer0");
 }
 
 struct sys_timer bcmring_timer = {
         .init = bcmring_init_timer,
 };
+
+void __init bcmring_init_early(void)
+{
+        clkdev_add_table(lookups, ARRAY_SIZE(lookups));
+}
diff --git a/arch/arm/mach-bcmring/core.h b/arch/arm/mach-bcmring/core.h
index b197ba48e36e..e0e02c48f9b1 100644
--- a/arch/arm/mach-bcmring/core.h
+++ b/arch/arm/mach-bcmring/core.h
@@ -25,6 +25,7 @@
 void __init bcmring_amba_init(void);
 void __init bcmring_map_io(void);
 void __init bcmring_init_irq(void);
+void __init bcmring_init_early(void);
 
 extern struct sys_timer bcmring_timer;
 #endif
diff --git a/arch/arm/mach-davinci/cpufreq.c b/arch/arm/mach-davinci/cpufreq.c
index 0a95be1512bb..41669ecc1f91 100644
--- a/arch/arm/mach-davinci/cpufreq.c
+++ b/arch/arm/mach-davinci/cpufreq.c
@@ -94,9 +94,7 @@ static int davinci_target(struct cpufreq_policy *policy,
         if (freqs.old == freqs.new)
                 return ret;
 
-        cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER,
-                        dev_driver_string(cpufreq.dev),
-                        "transition: %u --> %u\n", freqs.old, freqs.new);
+        dev_dbg(&cpufreq.dev, "transition: %u --> %u\n", freqs.old, freqs.new);
 
         ret = cpufreq_frequency_table_target(policy, pdata->freq_table,
                                                 freqs.new, relation, &idx);
diff --git a/arch/arm/mach-davinci/include/mach/memory.h b/arch/arm/mach-davinci/include/mach/memory.h
index 78822723f382..491249ef209c 100644
--- a/arch/arm/mach-davinci/include/mach/memory.h
+++ b/arch/arm/mach-davinci/include/mach/memory.h
@@ -41,27 +41,11 @@
  */
 #define CONSISTENT_DMA_SIZE (14<<20)
 
-#ifndef __ASSEMBLY__
 /*
  * Restrict DMA-able region to workaround silicon bug.  The bug
  * restricts buffers available for DMA to video hardware to be
  * below 128M
  */
-static inline void
-__arch_adjust_zones(unsigned long *size, unsigned long *holes)
-{
-        unsigned int sz = (128<<20) >> PAGE_SHIFT;
-
-        size[1] = size[0] - sz;
-        size[0] = sz;
-}
-
-#define arch_adjust_zones(zone_size, holes) \
-        if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(zone_size, holes)
-
-#define ISA_DMA_THRESHOLD       (PHYS_OFFSET + (128<<20) - 1)
-#define MAX_DMA_ADDRESS         (PAGE_OFFSET + (128<<20))
-
-#endif
+#define ARM_DMA_ZONE_SIZE       SZ_128M
 
 #endif /* __ASM_ARCH_MEMORY_H */
diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h
index 47723e8d75a4..78d80683cdc2 100644
--- a/arch/arm/mach-davinci/include/mach/uncompress.h
+++ b/arch/arm/mach-davinci/include/mach/uncompress.h
@@ -25,8 +25,7 @@
 
 #include <mach/serial.h>
 
-static u32 *uart;
-static u32 *uart_info = (u32 *)(DAVINCI_UART_INFO);
+u32 *uart;
 
 /* PORT_16C550A, in polled non-fifo mode */
 static void putc(char c)
@@ -44,6 +43,8 @@ static inline void flush(void)
 
 static inline void set_uart_info(u32 phys, void * __iomem virt)
 {
+        u32 *uart_info = (u32 *)(DAVINCI_UART_INFO);
+
         uart = (u32 *)phys;
         uart_info[0] = phys;
         uart_info[1] = (u32)virt;
diff --git a/arch/arm/mach-davinci/irq.c b/arch/arm/mach-davinci/irq.c
index e6269a6e0014..bfe68ec4e1a6 100644
--- a/arch/arm/mach-davinci/irq.c
+++ b/arch/arm/mach-davinci/irq.c
@@ -29,8 +29,6 @@
 #include <mach/common.h>
 #include <asm/mach/irq.h>
 
-#define IRQ_BIT(irq)            ((irq) & 0x1f)
-
 #define FIQ_REG0_OFFSET         0x0000
 #define FIQ_REG1_OFFSET         0x0004
 #define IRQ_REG0_OFFSET         0x0008
@@ -42,78 +40,33 @@
 #define IRQ_INTPRI0_REG_OFFSET  0x0030
 #define IRQ_INTPRI7_REG_OFFSET  0x004C
 
-static inline unsigned int davinci_irq_readl(int offset)
-{
-        return __raw_readl(davinci_intc_base + offset);
-}
-
 static inline void davinci_irq_writel(unsigned long value, int offset)
 {
         __raw_writel(value, davinci_intc_base + offset);
 }
 
-/* Disable interrupt */
-static void davinci_mask_irq(struct irq_data *d)
+static __init void
+davinci_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)
 {
-        unsigned int mask;
-        u32 l;
-
-        mask = 1 << IRQ_BIT(d->irq);
-
-        if (d->irq > 31) {
-                l = davinci_irq_readl(IRQ_ENT_REG1_OFFSET);
-                l &= ~mask;
-                davinci_irq_writel(l, IRQ_ENT_REG1_OFFSET);
-        } else {
-                l = davinci_irq_readl(IRQ_ENT_REG0_OFFSET);
-                l &= ~mask;
-                davinci_irq_writel(l, IRQ_ENT_REG0_OFFSET);
-        }
-}
-
-/* Enable interrupt */
-static void davinci_unmask_irq(struct irq_data *d)
-{
-        unsigned int mask;
-        u32 l;
-
-        mask = 1 << IRQ_BIT(d->irq);
-
-        if (d->irq > 31) {
-                l = davinci_irq_readl(IRQ_ENT_REG1_OFFSET);
-                l |= mask;
-                davinci_irq_writel(l, IRQ_ENT_REG1_OFFSET);
-        } else {
-                l = davinci_irq_readl(IRQ_ENT_REG0_OFFSET);
-                l |= mask;
-                davinci_irq_writel(l, IRQ_ENT_REG0_OFFSET);
-        }
+        struct irq_chip_generic *gc;
+        struct irq_chip_type *ct;
+
+        gc = irq_alloc_generic_chip("AINTC", 1, irq_start, base, handle_edge_irq);
+        ct = gc->chip_types;
+        ct->chip.irq_ack = irq_gc_ack;
+        ct->chip.irq_mask = irq_gc_mask_clr_bit;
+        ct->chip.irq_unmask = irq_gc_mask_set_bit;
+
+        ct->regs.ack = IRQ_REG0_OFFSET;
+        ct->regs.mask = IRQ_ENT_REG0_OFFSET;
+        irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,
+                               IRQ_NOREQUEST | IRQ_NOPROBE, 0);
 }
 
-/* EOI interrupt */
-static void davinci_ack_irq(struct irq_data *d)
-{
-        unsigned int mask;
-
-        mask = 1 << IRQ_BIT(d->irq);
-
-        if (d->irq > 31)
-                davinci_irq_writel(mask, IRQ_REG1_OFFSET);
-        else
-                davinci_irq_writel(mask, IRQ_REG0_OFFSET);
-}
-
-static struct irq_chip davinci_irq_chip_0 = {
-        .name           = "AINTC",
-        .irq_ack        = davinci_ack_irq,
-        .irq_mask       = davinci_mask_irq,
-        .irq_unmask     = davinci_unmask_irq,
-};
-
 /* ARM Interrupt Controller Initialization */
 void __init davinci_irq_init(void)
 {
-        unsigned i;
+        unsigned i, j;
         const u8 *davinci_def_priorities = davinci_soc_info.intc_irq_prios;
 
         davinci_intc_type = DAVINCI_INTC_TYPE_AINTC;
@@ -144,7 +97,6 @@ void __init davinci_irq_init(void)
         davinci_irq_writel(~0x0, IRQ_REG1_OFFSET);
 
         for (i = IRQ_INTPRI0_REG_OFFSET; i <= IRQ_INTPRI7_REG_OFFSET; i += 4) {
-                unsigned        j;
                 u32             pri;
 
                 for (j = 0, pri = 0; j < 32; j += 4, davinci_def_priorities++)
@@ -152,13 +104,8 @@ void __init davinci_irq_init(void)
                 davinci_irq_writel(pri, i);
         }
 
-        /* set up genirq dispatch for ARM INTC */
-        for (i = 0; i < davinci_soc_info.intc_irq_num; i++) {
-                irq_set_chip(i, &davinci_irq_chip_0);
-                set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
-                if (i != IRQ_TINT1_TINT34)
-                        irq_set_handler(i, handle_edge_irq);
-                else
-                        irq_set_handler(i, handle_level_irq);
-        }
+        for (i = 0, j = 0; i < davinci_soc_info.intc_irq_num; i += 32, j += 0x04)
+                davinci_alloc_gc(davinci_intc_base + j, i, 32);
+
+        irq_set_handler(IRQ_TINT1_TINT34, handle_level_irq);
 }
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index e06a88f1f81d..5ed51b84c1b2 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -16,10 +16,8 @@
 #include <linux/serial_8250.h>
 #include <linux/clk.h>
 #include <linux/mbus.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/mv643xx_i2c.h>
 #include <linux/ata_platform.h>
-#include <linux/spi/orion_spi.h>
+#include <linux/serial_8250.h>
 #include <linux/gpio.h>
 #include <asm/page.h>
 #include <asm/setup.h>
@@ -32,11 +30,12 @@
 #include <mach/bridge-regs.h>
 #include <asm/mach/arch.h>
 #include <linux/irq.h>
-#include <plat/mv_xor.h>
-#include <plat/ehci-orion.h>
 #include <plat/time.h>
+#include <plat/common.h>
 #include "common.h"
 
+static int get_tclk(void);
+
 /*****************************************************************************
  * I/O Address Mapping
  ****************************************************************************/
@@ -70,463 +69,106 @@ void __init dove_map_io(void)
 }
 
 /*****************************************************************************
- * EHCI
- ****************************************************************************/
-static struct orion_ehci_data dove_ehci_data = {
-        .dram           = &dove_mbus_dram_info,
-        .phy_version    = EHCI_PHY_NA,
-};
-
-static u64 ehci_dmamask = DMA_BIT_MASK(32);
-
-/*****************************************************************************
  * EHCI0
  ****************************************************************************/
-static struct resource dove_ehci0_resources[] = {
-        {
-                .start  = DOVE_USB0_PHYS_BASE,
-                .end    = DOVE_USB0_PHYS_BASE + SZ_4K - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_DOVE_USB0,
-                .end    = IRQ_DOVE_USB0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device dove_ehci0 = {
-        .name           = "orion-ehci",
-        .id             = 0,
-        .dev            = {
-                .dma_mask               = &ehci_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data          = &dove_ehci_data,
-        },
-        .resource       = dove_ehci0_resources,
-        .num_resources  = ARRAY_SIZE(dove_ehci0_resources),
-};
-
 void __init dove_ehci0_init(void)
 {
-        platform_device_register(&dove_ehci0);
+        orion_ehci_init(&dove_mbus_dram_info,
+                        DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0);
 }
 
 /*****************************************************************************
  * EHCI1
  ****************************************************************************/
-static struct resource dove_ehci1_resources[] = {
-        {
-                .start  = DOVE_USB1_PHYS_BASE,
-                .end    = DOVE_USB1_PHYS_BASE + SZ_4K - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_DOVE_USB1,
-                .end    = IRQ_DOVE_USB1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device dove_ehci1 = {
-        .name           = "orion-ehci",
-        .id             = 1,
-        .dev            = {
-                .dma_mask               = &ehci_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-                .platform_data          = &dove_ehci_data,
-        },
-        .resource       = dove_ehci1_resources,
-        .num_resources  = ARRAY_SIZE(dove_ehci1_resources),
-};
-
 void __init dove_ehci1_init(void)
 {
-        platform_device_register(&dove_ehci1);
+        orion_ehci_1_init(&dove_mbus_dram_info,
+                          DOVE_USB1_PHYS_BASE, IRQ_DOVE_USB1);
 }
 
 /*****************************************************************************
  * GE00
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data dove_ge00_shared_data = {
-        .t_clk          = 0,
-        .dram           = &dove_mbus_dram_info,
-};
-
-static struct resource dove_ge00_shared_resources[] = {
-        {
-                .name   = "ge00 base",
-                .start  = DOVE_GE00_PHYS_BASE + 0x2000,
-                .end    = DOVE_GE00_PHYS_BASE + SZ_16K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device dove_ge00_shared = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 0,
-        .dev            = {
-                .platform_data  = &dove_ge00_shared_data,
-        },
-        .num_resources  = 1,
-        .resource       = dove_ge00_shared_resources,
-};
-
-static struct resource dove_ge00_resources[] = {
-        {
-                .name   = "ge00 irq",
-                .start  = IRQ_DOVE_GE00_SUM,
-                .end    = IRQ_DOVE_GE00_SUM,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device dove_ge00 = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 0,
-        .num_resources  = 1,
-        .resource       = dove_ge00_resources,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-};
-
 void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data)
 {
-        eth_data->shared = &dove_ge00_shared;
-        dove_ge00.dev.platform_data = eth_data;
-
-        platform_device_register(&dove_ge00_shared);
-        platform_device_register(&dove_ge00);
+        orion_ge00_init(eth_data, &dove_mbus_dram_info,
+                        DOVE_GE00_PHYS_BASE, IRQ_DOVE_GE00_SUM,
+                        0, get_tclk());
 }
 
 /*****************************************************************************
  * SoC RTC
  ****************************************************************************/
-static struct resource dove_rtc_resource[] = {
-        {
-                .start  = DOVE_RTC_PHYS_BASE,
-                .end    = DOVE_RTC_PHYS_BASE + 32 - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_DOVE_RTC,
-                .flags  = IORESOURCE_IRQ,
-        }
-};
-
 void __init dove_rtc_init(void)
 {
-        platform_device_register_simple("rtc-mv", -1, dove_rtc_resource, 2);
+        orion_rtc_init(DOVE_RTC_PHYS_BASE, IRQ_DOVE_RTC);
 }
 
 /*****************************************************************************
  * SATA
  ****************************************************************************/
-static struct resource dove_sata_resources[] = {
-        {
-                .name   = "sata base",
-                .start  = DOVE_SATA_PHYS_BASE,
-                .end    = DOVE_SATA_PHYS_BASE + 0x5000 - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "sata irq",
-                .start  = IRQ_DOVE_SATA,
-                .end    = IRQ_DOVE_SATA,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device dove_sata = {
-        .name           = "sata_mv",
-        .id             = 0,
-        .dev            = {
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-        .num_resources  = ARRAY_SIZE(dove_sata_resources),
-        .resource       = dove_sata_resources,
-};
-
 void __init dove_sata_init(struct mv_sata_platform_data *sata_data)
 {
-        sata_data->dram = &dove_mbus_dram_info;
-        dove_sata.dev.platform_data = sata_data;
-        platform_device_register(&dove_sata);
+        orion_sata_init(sata_data, &dove_mbus_dram_info,
+                        DOVE_SATA_PHYS_BASE, IRQ_DOVE_SATA);
+
 }
 
 /*****************************************************************************
  * UART0
  ****************************************************************************/
-static struct plat_serial8250_port dove_uart0_data[] = {
-        {
-                .mapbase        = DOVE_UART0_PHYS_BASE,
-                .membase        = (char *)DOVE_UART0_VIRT_BASE,
-                .irq            = IRQ_DOVE_UART_0,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = 0,
-        }, {
-        },
-};
-
-static struct resource dove_uart0_resources[] = {
-        {
-                .start          = DOVE_UART0_PHYS_BASE,
-                .end            = DOVE_UART0_PHYS_BASE + SZ_256 - 1,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_DOVE_UART_0,
-                .end            = IRQ_DOVE_UART_0,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device dove_uart0 = {
-        .name                   = "serial8250",
-        .id                     = 0,
-        .dev                    = {
-                .platform_data  = dove_uart0_data,
-        },
-        .resource               = dove_uart0_resources,
-        .num_resources          = ARRAY_SIZE(dove_uart0_resources),
-};
-
 void __init dove_uart0_init(void)
 {
-        platform_device_register(&dove_uart0);
+        orion_uart0_init(DOVE_UART0_VIRT_BASE, DOVE_UART0_PHYS_BASE,
+                         IRQ_DOVE_UART_0, get_tclk());
 }
 
 /*****************************************************************************
  * UART1
  ****************************************************************************/
-static struct plat_serial8250_port dove_uart1_data[] = {
-        {
-                .mapbase        = DOVE_UART1_PHYS_BASE,
-                .membase        = (char *)DOVE_UART1_VIRT_BASE,
-                .irq            = IRQ_DOVE_UART_1,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = 0,
-        }, {
-        },
-};
-
-static struct resource dove_uart1_resources[] = {
-        {
-                .start          = DOVE_UART1_PHYS_BASE,
-                .end            = DOVE_UART1_PHYS_BASE + SZ_256 - 1,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_DOVE_UART_1,
-                .end            = IRQ_DOVE_UART_1,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device dove_uart1 = {
-        .name                   = "serial8250",
-        .id                     = 1,
-        .dev                    = {
-                .platform_data  = dove_uart1_data,
-        },
-        .resource               = dove_uart1_resources,
-        .num_resources          = ARRAY_SIZE(dove_uart1_resources),
-};
-
 void __init dove_uart1_init(void)
 {
-        platform_device_register(&dove_uart1);
+        orion_uart1_init(DOVE_UART1_VIRT_BASE, DOVE_UART1_PHYS_BASE,
+                         IRQ_DOVE_UART_1, get_tclk());
 }
 
 /*****************************************************************************
  * UART2
  ****************************************************************************/
-static struct plat_serial8250_port dove_uart2_data[] = {
-        {
-                .mapbase        = DOVE_UART2_PHYS_BASE,
-                .membase        = (char *)DOVE_UART2_VIRT_BASE,
-                .irq            = IRQ_DOVE_UART_2,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = 0,
-        }, {
-        },
-};
-
-static struct resource dove_uart2_resources[] = {
-        {
-                .start          = DOVE_UART2_PHYS_BASE,
-                .end            = DOVE_UART2_PHYS_BASE + SZ_256 - 1,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_DOVE_UART_2,
-                .end            = IRQ_DOVE_UART_2,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device dove_uart2 = {
-        .name                   = "serial8250",
-        .id                     = 2,
-        .dev                    = {
-                .platform_data  = dove_uart2_data,
-        },
-        .resource               = dove_uart2_resources,
-        .num_resources          = ARRAY_SIZE(dove_uart2_resources),
-};
-
 void __init dove_uart2_init(void)
 {
-        platform_device_register(&dove_uart2);
+        orion_uart2_init(DOVE_UART2_VIRT_BASE, DOVE_UART2_PHYS_BASE,
+                         IRQ_DOVE_UART_2, get_tclk());
 }
 
 /*****************************************************************************
  * UART3
  ****************************************************************************/
-static struct plat_serial8250_port dove_uart3_data[] = {
-        {
-                .mapbase        = DOVE_UART3_PHYS_BASE,
-                .membase        = (char *)DOVE_UART3_VIRT_BASE,
-                .irq            = IRQ_DOVE_UART_3,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = 0,
-        }, {
-        },
-};
-
-static struct resource dove_uart3_resources[] = {
-        {
-                .start          = DOVE_UART3_PHYS_BASE,
-                .end            = DOVE_UART3_PHYS_BASE + SZ_256 - 1,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_DOVE_UART_3,
-                .end            = IRQ_DOVE_UART_3,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device dove_uart3 = {
-        .name                   = "serial8250",
-        .id                     = 3,
-        .dev                    = {
-                .platform_data  = dove_uart3_data,
-        },
-        .resource               = dove_uart3_resources,
-        .num_resources          = ARRAY_SIZE(dove_uart3_resources),
-};
-
 void __init dove_uart3_init(void)
 {
-        platform_device_register(&dove_uart3);
+        orion_uart3_init(DOVE_UART3_VIRT_BASE, DOVE_UART3_PHYS_BASE,
+                         IRQ_DOVE_UART_3, get_tclk());
 }
 
 /*****************************************************************************
- * SPI0
+ * SPI
  ****************************************************************************/
-static struct orion_spi_info dove_spi0_data = {
-        .tclk           = 0,
-};
-
-static struct resource dove_spi0_resources[] = {
-        {
-                .start  = DOVE_SPI0_PHYS_BASE,
-                .end    = DOVE_SPI0_PHYS_BASE + SZ_512 - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_DOVE_SPI0,
-                .end    = IRQ_DOVE_SPI0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device dove_spi0 = {
-        .name           = "orion_spi",
-        .id             = 0,
-        .resource       = dove_spi0_resources,
-        .dev            = {
-                .platform_data  = &dove_spi0_data,
-        },
-        .num_resources  = ARRAY_SIZE(dove_spi0_resources),
-};
-
 void __init dove_spi0_init(void)
 {
-        platform_device_register(&dove_spi0);
+        orion_spi_init(DOVE_SPI0_PHYS_BASE, get_tclk());
 }
 
-/*****************************************************************************
- * SPI1
- ****************************************************************************/
-static struct orion_spi_info dove_spi1_data = {
-        .tclk           = 0,
-};
-
-static struct resource dove_spi1_resources[] = {
-        {
-                .start  = DOVE_SPI1_PHYS_BASE,
-                .end    = DOVE_SPI1_PHYS_BASE + SZ_512 - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_DOVE_SPI1,
-                .end    = IRQ_DOVE_SPI1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device dove_spi1 = {
-        .name           = "orion_spi",
-        .id             = 1,
-        .resource       = dove_spi1_resources,
-        .dev            = {
-                .platform_data  = &dove_spi1_data,
-        },
-        .num_resources  = ARRAY_SIZE(dove_spi1_resources),
-};
-
 void __init dove_spi1_init(void)
 {
-        platform_device_register(&dove_spi1);
+        orion_spi_init(DOVE_SPI1_PHYS_BASE, get_tclk());
 }
 
 /*****************************************************************************
  * I2C
  ****************************************************************************/
-static struct mv64xxx_i2c_pdata dove_i2c_data = {
-        .freq_m         = 10, /* assumes 166 MHz TCLK gets 94.3kHz */
-        .freq_n         = 3,
-        .timeout        = 1000, /* Default timeout of 1 second */
-};
-
-static struct resource dove_i2c_resources[] = {
-        {
-                .name   = "i2c base",
-                .start  = DOVE_I2C_PHYS_BASE,
-                .end    = DOVE_I2C_PHYS_BASE + 0x20 - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "i2c irq",
-                .start  = IRQ_DOVE_I2C,
-                .end    = IRQ_DOVE_I2C,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device dove_i2c = {
-        .name           = MV64XXX_I2C_CTLR_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(dove_i2c_resources),
-        .resource       = dove_i2c_resources,
-        .dev            = {
-                .platform_data = &dove_i2c_data,
-        },
-};
-
 void __init dove_i2c_init(void)
 {
-        platform_device_register(&dove_i2c);
+        orion_i2c_init(DOVE_I2C_PHYS_BASE, IRQ_DOVE_I2C, 10);
 }
 
 /*****************************************************************************
@@ -554,208 +196,22 @@ struct sys_timer dove_timer = {
 };
 
 /*****************************************************************************
- * XOR
- ****************************************************************************/
-static struct mv_xor_platform_shared_data dove_xor_shared_data = {
-        .dram           = &dove_mbus_dram_info,
-};
-
-/*****************************************************************************
  * XOR 0
  ****************************************************************************/
-static u64 dove_xor0_dmamask = DMA_BIT_MASK(32);
-
-static struct resource dove_xor0_shared_resources[] = {
-        {
-                .name   = "xor 0 low",
-                .start  = DOVE_XOR0_PHYS_BASE,
-                .end    = DOVE_XOR0_PHYS_BASE + 0xff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "xor 0 high",
-                .start  = DOVE_XOR0_HIGH_PHYS_BASE,
-                .end    = DOVE_XOR0_HIGH_PHYS_BASE + 0xff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device dove_xor0_shared = {
-        .name           = MV_XOR_SHARED_NAME,
-        .id             = 0,
-        .dev            = {
-                .platform_data = &dove_xor_shared_data,
-        },
-        .num_resources  = ARRAY_SIZE(dove_xor0_shared_resources),
-        .resource       = dove_xor0_shared_resources,
-};
-
-static struct resource dove_xor00_resources[] = {
-        [0] = {
-                .start  = IRQ_DOVE_XOR_00,
-                .end    = IRQ_DOVE_XOR_00,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct mv_xor_platform_data dove_xor00_data = {
-        .shared         = &dove_xor0_shared,
-        .hw_id          = 0,
-        .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device dove_xor00_channel = {
-        .name           = MV_XOR_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(dove_xor00_resources),
-        .resource       = dove_xor00_resources,
-        .dev            = {
-                .dma_mask               = &dove_xor0_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(64),
-                .platform_data          = &dove_xor00_data,
-        },
-};
-
-static struct resource dove_xor01_resources[] = {
-        [0] = {
-                .start  = IRQ_DOVE_XOR_01,
-                .end    = IRQ_DOVE_XOR_01,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct mv_xor_platform_data dove_xor01_data = {
-        .shared         = &dove_xor0_shared,
-        .hw_id          = 1,
-        .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device dove_xor01_channel = {
-        .name           = MV_XOR_NAME,
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(dove_xor01_resources),
-        .resource       = dove_xor01_resources,
-        .dev            = {
-                .dma_mask               = &dove_xor0_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(64),
-                .platform_data          = &dove_xor01_data,
-        },
-};
-
 void __init dove_xor0_init(void)
 {
-        platform_device_register(&dove_xor0_shared);
-
-        /*
-         * two engines can't do memset simultaneously, this limitation
-         * satisfied by removing memset support from one of the engines.
-         */
-        dma_cap_set(DMA_MEMCPY, dove_xor00_data.cap_mask);
-        dma_cap_set(DMA_XOR, dove_xor00_data.cap_mask);
-        platform_device_register(&dove_xor00_channel);
-
-        dma_cap_set(DMA_MEMCPY, dove_xor01_data.cap_mask);
-        dma_cap_set(DMA_MEMSET, dove_xor01_data.cap_mask);
-        dma_cap_set(DMA_XOR, dove_xor01_data.cap_mask);
-        platform_device_register(&dove_xor01_channel);
+        orion_xor0_init(&dove_mbus_dram_info,
+                        DOVE_XOR0_PHYS_BASE, DOVE_XOR0_HIGH_PHYS_BASE,
+                        IRQ_DOVE_XOR_00, IRQ_DOVE_XOR_01);
 }
 
 /*****************************************************************************
  * XOR 1
  ****************************************************************************/
-static u64 dove_xor1_dmamask = DMA_BIT_MASK(32);
-
-static struct resource dove_xor1_shared_resources[] = {
-        {
-                .name   = "xor 0 low",
-                .start  = DOVE_XOR1_PHYS_BASE,
-                .end    = DOVE_XOR1_PHYS_BASE + 0xff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "xor 0 high",
-                .start  = DOVE_XOR1_HIGH_PHYS_BASE,
-                .end    = DOVE_XOR1_HIGH_PHYS_BASE + 0xff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device dove_xor1_shared = {
-        .name           = MV_XOR_SHARED_NAME,
-        .id             = 1,
-        .dev            = {
-                .platform_data = &dove_xor_shared_data,
-        },
-        .num_resources  = ARRAY_SIZE(dove_xor1_shared_resources),
-        .resource       = dove_xor1_shared_resources,
-};
-
-static struct resource dove_xor10_resources[] = {
-        [0] = {
-                .start  = IRQ_DOVE_XOR_10,
-                .end    = IRQ_DOVE_XOR_10,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct mv_xor_platform_data dove_xor10_data = {
-        .shared         = &dove_xor1_shared,
-        .hw_id          = 0,
-        .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device dove_xor10_channel = {
-        .name           = MV_XOR_NAME,
-        .id             = 2,
-        .num_resources  = ARRAY_SIZE(dove_xor10_resources),
-        .resource       = dove_xor10_resources,
-        .dev            = {
-                .dma_mask               = &dove_xor1_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(64),
-                .platform_data          = &dove_xor10_data,
-        },
-};
-
-static struct resource dove_xor11_resources[] = {
-        [0] = {
-                .start  = IRQ_DOVE_XOR_11,
-                .end    = IRQ_DOVE_XOR_11,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct mv_xor_platform_data dove_xor11_data = {
-        .shared         = &dove_xor1_shared,
-        .hw_id          = 1,
-        .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device dove_xor11_channel = {
-        .name           = MV_XOR_NAME,
-        .id             = 3,
-        .num_resources  = ARRAY_SIZE(dove_xor11_resources),
-        .resource       = dove_xor11_resources,
-        .dev            = {
-                .dma_mask               = &dove_xor1_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(64),
-                .platform_data          = &dove_xor11_data,
-        },
-};
-
 void __init dove_xor1_init(void)
 {
-        platform_device_register(&dove_xor1_shared);
-
-        /*
-         * two engines can't do memset simultaneously, this limitation
-         * satisfied by removing memset support from one of the engines.
-         */
-        dma_cap_set(DMA_MEMCPY, dove_xor10_data.cap_mask);
-        dma_cap_set(DMA_XOR, dove_xor10_data.cap_mask);
-        platform_device_register(&dove_xor10_channel);
-
-        dma_cap_set(DMA_MEMCPY, dove_xor11_data.cap_mask);
-        dma_cap_set(DMA_MEMSET, dove_xor11_data.cap_mask);
-        dma_cap_set(DMA_XOR, dove_xor11_data.cap_mask);
-        platform_device_register(&dove_xor11_channel);
+        orion_xor1_init(DOVE_XOR1_PHYS_BASE, DOVE_XOR1_HIGH_PHYS_BASE,
+                        IRQ_DOVE_XOR_10, IRQ_DOVE_XOR_11);
 }
 
 /*****************************************************************************
@@ -833,14 +289,6 @@ void __init dove_init(void)
 #endif
         dove_setup_cpu_mbus();
 
-        dove_ge00_shared_data.t_clk = tclk;
-        dove_uart0_data[0].uartclk = tclk;
-        dove_uart1_data[0].uartclk = tclk;
-        dove_uart2_data[0].uartclk = tclk;
-        dove_uart3_data[0].uartclk = tclk;
-        dove_spi0_data.tclk = tclk;
-        dove_spi1_data.tclk = tclk;
-
         /* internal devices that every board has */
         dove_rtc_init();
         dove_xor0_init();
diff --git a/arch/arm/mach-dove/mpp.c b/arch/arm/mach-dove/mpp.c
index c66c76346904..51e0e411c9cb 100644
--- a/arch/arm/mach-dove/mpp.c
+++ b/arch/arm/mach-dove/mpp.c
@@ -11,24 +11,17 @@
 #include <linux/kernel.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
-
+#include <plat/mpp.h>
 #include <mach/dove.h>
-
 #include "mpp.h"
 
-#define MPP_NR_REGS 4
-#define MPP_CTRL(i)     ((i) == 3 ?                             \
-                         DOVE_MPP_CTRL4_VIRT_BASE :             \
-                         DOVE_MPP_VIRT_BASE + (i) * 4)
-#define PMU_SIG_REGS 2
-#define PMU_SIG_CTRL(i) (DOVE_PMU_SIG_CTRL + (i) * 4)
-
 struct dove_mpp_grp {
         int start;
         int end;
 };
 
-static struct dove_mpp_grp dove_mpp_grp[] = {
+/* Map a group to a range of GPIO pins in that group */
+static const struct dove_mpp_grp dove_mpp_grp[] = {
         [MPP_24_39] = {
                 .start  = 24,
                 .end    = 39,
@@ -38,8 +31,8 @@ static struct dove_mpp_grp dove_mpp_grp[] = {
                 .end    = 45,
         },
         [MPP_46_51] = {
-                .start  = 40,
-                .end    = 45,
+                .start  = 46,
+                .end    = 51,
         },
         [MPP_58_61] = {
                 .start  = 58,
@@ -51,6 +44,8 @@ static struct dove_mpp_grp dove_mpp_grp[] = {
         },
 };
 
+/* Enable gpio for a range of pins. mode should be a combination of
+   GPIO_OUTPUT_OK | GPIO_INPUT_OK */
 static void dove_mpp_gpio_mode(int start, int end, int gpio_mode)
 {
         int i;
@@ -59,24 +54,17 @@ static void dove_mpp_gpio_mode(int start, int end, int gpio_mode)
                 orion_gpio_set_valid(i, gpio_mode);
 }
 
+/* Dump all the extra MPP registers. The platform code will dump the
+   registers for pins 0-23. */
 static void dove_mpp_dump_regs(void)
 {
-#ifdef DEBUG
-        int i;
+        pr_debug("PMU_CTRL4_CTRL: %08x\n",
+                 readl(DOVE_MPP_CTRL4_VIRT_BASE));
 
-        pr_debug("MPP_CTRL regs:");
-        for (i = 0; i < MPP_NR_REGS; i++)
-                printk(" %08x", readl(MPP_CTRL(i)));
-        printk("\n");
+        pr_debug("PMU_MPP_GENERAL_CTRL: %08x\n",
+                 readl(DOVE_PMU_MPP_GENERAL_CTRL));
 
-        pr_debug("PMU_SIG_CTRL regs:");
-        for (i = 0; i < PMU_SIG_REGS; i++)
-                printk(" %08x", readl(PMU_SIG_CTRL(i)));
-        printk("\n");
-
-        pr_debug("PMU_MPP_GENERAL_CTRL: %08x\n", readl(DOVE_PMU_MPP_GENERAL_CTRL));
         pr_debug("MPP_GENERAL: %08x\n", readl(DOVE_MPP_GENERAL_VIRT_BASE));
-#endif
 }
 
 static void dove_mpp_cfg_nfc(int sel)
@@ -92,7 +80,7 @@ static void dove_mpp_cfg_nfc(int sel)
 
 static void dove_mpp_cfg_au1(int sel)
 {
-        u32 mpp_ctrl4           = readl(DOVE_MPP_CTRL4_VIRT_BASE);
+        u32 mpp_ctrl4 = readl(DOVE_MPP_CTRL4_VIRT_BASE);
         u32 ssp_ctrl1 = readl(DOVE_SSP_CTRL_STATUS_1);
         u32 mpp_gen_ctrl = readl(DOVE_MPP_GENERAL_VIRT_BASE);
         u32 global_cfg_2 = readl(DOVE_GLOBAL_CONFIG_2);
@@ -128,82 +116,46 @@ static void dove_mpp_cfg_au1(int sel)
         writel(global_cfg_2, DOVE_GLOBAL_CONFIG_2);
 }
 
-static void dove_mpp_conf_grp(int num, int sel, u32 *mpp_ctrl)
-{
-        int start = dove_mpp_grp[num].start;
-        int end = dove_mpp_grp[num].end;
-        int gpio_mode = sel ? GPIO_OUTPUT_OK | GPIO_INPUT_OK : 0;
-
-        *mpp_ctrl &= ~(0x1 << num);
-        *mpp_ctrl |= sel << num;
-
-        dove_mpp_gpio_mode(start, end, gpio_mode);
-}
-
-void __init dove_mpp_conf(unsigned int *mpp_list)
+/* Configure the group registers, enabling GPIO if sel indicates the
+   pin is to be used for GPIO */
+static void dove_mpp_conf_grp(unsigned int *mpp_grp_list)
 {
-        u32 mpp_ctrl[MPP_NR_REGS];
-        u32 pmu_mpp_ctrl = 0;
-        u32 pmu_sig_ctrl[PMU_SIG_REGS];
-        int i;
-
-        for (i = 0; i < MPP_NR_REGS; i++)
-                mpp_ctrl[i] = readl(MPP_CTRL(i));
-
-        for (i = 0; i < PMU_SIG_REGS; i++)
-                pmu_sig_ctrl[i] = readl(PMU_SIG_CTRL(i));
-
-        pmu_mpp_ctrl = readl(DOVE_PMU_MPP_GENERAL_CTRL);
+        u32 mpp_ctrl4 = readl(DOVE_MPP_CTRL4_VIRT_BASE);
+        int gpio_mode;
 
-        dove_mpp_dump_regs();
-
-        for ( ; *mpp_list != MPP_END; mpp_list++) {
-                unsigned int num = MPP_NUM(*mpp_list);
-                unsigned int sel = MPP_SEL(*mpp_list);
-                int shift, gpio_mode;
-
-                if (num > MPP_MAX) {
-                        pr_err("dove: invalid MPP number (%u)\n", num);
-                        continue;
-                }
-
-                if (*mpp_list & MPP_NFC_MASK) {
-                        dove_mpp_cfg_nfc(sel);
-                        continue;
-                }
+        for ( ; *mpp_grp_list; mpp_grp_list++) {
+                unsigned int num = MPP_NUM(*mpp_grp_list);
+                unsigned int sel = MPP_SEL(*mpp_grp_list);
 
-                if (*mpp_list & MPP_AU1_MASK) {
-                        dove_mpp_cfg_au1(sel);
+                if (num > MPP_GRP_MAX) {
+                        pr_err("dove: invalid MPP GRP number (%u)\n", num);
                         continue;
                 }
 
-                if (*mpp_list & MPP_GRP_MASK) {
-                        dove_mpp_conf_grp(num, sel, &mpp_ctrl[3]);
-                        continue;
-                }
-
-                shift = (num & 7) << 2;
-                if (*mpp_list & MPP_PMU_MASK) {
-                        pmu_mpp_ctrl |= (0x1 << num);
-                        pmu_sig_ctrl[num / 8] &= ~(0xf << shift);
-                        pmu_sig_ctrl[num / 8] |= 0xf << shift;
-                        gpio_mode = 0;
-                } else {
-                        mpp_ctrl[num / 8] &= ~(0xf << shift);
-                        mpp_ctrl[num / 8] |= sel << shift;
-                        gpio_mode = GPIO_OUTPUT_OK | GPIO_INPUT_OK;
-                }
+                mpp_ctrl4 &= ~(0x1 << num);
+                mpp_ctrl4 |= sel << num;
 
-                orion_gpio_set_valid(num, gpio_mode);
+                gpio_mode = sel ? GPIO_OUTPUT_OK | GPIO_INPUT_OK : 0;
+                dove_mpp_gpio_mode(dove_mpp_grp[num].start,
+                                   dove_mpp_grp[num].end, gpio_mode);
         }
+        writel(mpp_ctrl4, DOVE_MPP_CTRL4_VIRT_BASE);
+}
 
-        for (i = 0; i < MPP_NR_REGS; i++)
-                writel(mpp_ctrl[i], MPP_CTRL(i));
+/* Configure the various MPP pins on Dove */
+void __init dove_mpp_conf(unsigned int *mpp_list,
+                          unsigned int *mpp_grp_list,
+                          unsigned int grp_au1_52_57,
+                          unsigned int grp_nfc_64_71)
+{
+        dove_mpp_dump_regs();
 
-        for (i = 0; i < PMU_SIG_REGS; i++)
-                writel(pmu_sig_ctrl[i], PMU_SIG_CTRL(i));
+        /* Use platform code for pins 0-23 */
+        orion_mpp_conf(mpp_list, 0, MPP_MAX, DOVE_MPP_VIRT_BASE);
 
-        writel(pmu_mpp_ctrl, DOVE_PMU_MPP_GENERAL_CTRL);
+        dove_mpp_conf_grp(mpp_grp_list);
+        dove_mpp_cfg_au1(grp_au1_52_57);
+        dove_mpp_cfg_nfc(grp_nfc_64_71);
 
         dove_mpp_dump_regs();
 }
diff --git a/arch/arm/mach-dove/mpp.h b/arch/arm/mach-dove/mpp.h
index 2a43ce413b15..fbec7c52bfac 100644
--- a/arch/arm/mach-dove/mpp.h
+++ b/arch/arm/mach-dove/mpp.h
@@ -1,178 +1,150 @@
 #ifndef __ARCH_DOVE_MPP_CODED_H
 #define __ARCH_DOVE_MPP_CODED_H
 
-#define MPP(_num, _mode, _pmu, _grp, _au1, _nfc) (      \
-/* MPP/group number */          ((_num) & 0xff) |               \
-/* MPP select value */          (((_mode) & 0xf) << 8) |        \
-/* MPP PMU */                   ((!!(_pmu)) << 12) |            \
-/* group flag */                ((!!(_grp)) << 13) |            \
-/* AU1 flag */                  ((!!(_au1)) << 14) |            \
-/* NFCE flag */                 ((!!(_nfc)) << 15))
-
-#define MPP_MAX 71
-
-#define MPP_NUM(x)    ((x) & 0xff)
-#define MPP_SEL(x)    (((x) >> 8) & 0xf)
-
-#define MPP_PMU_MASK            MPP(0, 0x0, 1, 0, 0, 0)
-#define MPP_GRP_MASK            MPP(0, 0x0, 0, 1, 0, 0)
-#define MPP_AU1_MASK            MPP(0, 0x0, 0, 0, 1, 0)
-#define MPP_NFC_MASK            MPP(0, 0x0, 0, 0, 0, 1)
-
-#define MPP_END                 MPP(0xff, 0xf, 1, 1, 1, 1)
-
-#define MPP_PMU_DRIVE_0         0x1
-#define MPP_PMU_DRIVE_1         0x2
-#define MPP_PMU_SDI             0x3
-#define MPP_PMU_CPU_PWRDWN      0x4
-#define MPP_PMU_STBY_PWRDWN     0x5
-#define MPP_PMU_CORE_PWR_GOOD   0x8
-#define MPP_PMU_BAT_FAULT       0xa
-#define MPP_PMU_EXT0_WU         0xb
-#define MPP_PMU_EXT1_WU         0xc
-#define MPP_PMU_EXT2_WU         0xd
-#define MPP_PMU_BLINK           0xe
-#define MPP_PMU(_num, _mode)    MPP((_num), MPP_PMU_##_mode, 1, 0, 0, 0)
-
-#define MPP_PIN(_num, _mode)    MPP((_num), (_mode), 0, 0, 0, 0)
-#define MPP_GRP(_grp, _mode)    MPP((_grp), (_mode), 0, 1, 0, 0)
-#define MPP_GRP_AU1(_mode)      MPP(0, (_mode), 0, 0, 1, 0)
-#define MPP_GRP_NFC(_mode)      MPP(0, (_mode), 0, 0, 0, 1)
-
-#define MPP0_GPIO0              MPP_PIN(0, 0x0)
-#define MPP0_UA2_RTSn           MPP_PIN(0, 0x2)
-#define MPP0_SDIO0_CD           MPP_PIN(0, 0x3)
-#define MPP0_LCD0_PWM           MPP_PIN(0, 0xf)
-
-#define MPP1_GPIO1              MPP_PIN(1, 0x0)
-#define MPP1_UA2_CTSn           MPP_PIN(1, 0x2)
-#define MPP1_SDIO0_WP           MPP_PIN(1, 0x3)
-#define MPP1_LCD1_PWM           MPP_PIN(1, 0xf)
-
-#define MPP2_GPIO2              MPP_PIN(2, 0x0)
-#define MPP2_SATA_PRESENT       MPP_PIN(2, 0x1)
-#define MPP2_UA2_TXD            MPP_PIN(2, 0x2)
-#define MPP2_SDIO0_BUS_POWER    MPP_PIN(2, 0x3)
-#define MPP2_UA_RTSn1           MPP_PIN(2, 0x4)
-
-#define MPP3_GPIO3              MPP_PIN(3, 0x0)
-#define MPP3_SATA_ACT           MPP_PIN(3, 0x1)
-#define MPP3_UA2_RXD            MPP_PIN(3, 0x2)
-#define MPP3_SDIO0_LED_CTRL     MPP_PIN(3, 0x3)
-#define MPP3_UA_CTSn1           MPP_PIN(3, 0x4)
-#define MPP3_SPI_LCD_CS1        MPP_PIN(3, 0xf)
-
-#define MPP4_GPIO4              MPP_PIN(4, 0x0)
-#define MPP4_UA3_RTSn           MPP_PIN(4, 0x2)
-#define MPP4_SDIO1_CD           MPP_PIN(4, 0x3)
-#define MPP4_SPI_1_MISO         MPP_PIN(4, 0x4)
-
-#define MPP5_GPIO5              MPP_PIN(5, 0x0)
-#define MPP5_UA3_CTSn           MPP_PIN(5, 0x2)
-#define MPP5_SDIO1_WP           MPP_PIN(5, 0x3)
-#define MPP5_SPI_1_CS           MPP_PIN(5, 0x4)
-
-#define MPP6_GPIO6              MPP_PIN(6, 0x0)
-#define MPP6_UA3_TXD            MPP_PIN(6, 0x2)
-#define MPP6_SDIO1_BUS_POWER    MPP_PIN(6, 0x3)
-#define MPP6_SPI_1_MOSI         MPP_PIN(6, 0x4)
-
-#define MPP7_GPIO7              MPP_PIN(7, 0x0)
-#define MPP7_UA3_RXD            MPP_PIN(7, 0x2)
-#define MPP7_SDIO1_LED_CTRL     MPP_PIN(7, 0x3)
-#define MPP7_SPI_1_SCK          MPP_PIN(7, 0x4)
-
-#define MPP8_GPIO8              MPP_PIN(8, 0x0)
-#define MPP8_WD_RST_OUT         MPP_PIN(8, 0x1)
-
-#define MPP9_GPIO9              MPP_PIN(9, 0x0)
-#define MPP9_PEX1_CLKREQn       MPP_PIN(9, 0x5)
-
-#define MPP10_GPIO10            MPP_PIN(10, 0x0)
-#define MPP10_SSP_SCLK          MPP_PIN(10, 0x5)
-
-#define MPP11_GPIO11            MPP_PIN(11, 0x0)
-#define MPP11_SATA_PRESENT      MPP_PIN(11, 0x1)
-#define MPP11_SATA_ACT          MPP_PIN(11, 0x2)
-#define MPP11_SDIO0_LED_CTRL    MPP_PIN(11, 0x3)
-#define MPP11_SDIO1_LED_CTRL    MPP_PIN(11, 0x4)
-#define MPP11_PEX0_CLKREQn      MPP_PIN(11, 0x5)
-
-#define MPP12_GPIO12            MPP_PIN(12, 0x0)
-#define MPP12_SATA_ACT          MPP_PIN(12, 0x1)
-#define MPP12_UA2_RTSn          MPP_PIN(12, 0x2)
-#define MPP12_AD0_I2S_EXT_MCLK  MPP_PIN(12, 0x3)
-#define MPP12_SDIO1_CD          MPP_PIN(12, 0x4)
-
-#define MPP13_GPIO13            MPP_PIN(13, 0x0)
-#define MPP13_UA2_CTSn          MPP_PIN(13, 0x2)
-#define MPP13_AD1_I2S_EXT_MCLK  MPP_PIN(13, 0x3)
-#define MPP13_SDIO1WP           MPP_PIN(13, 0x4)
-#define MPP13_SSP_EXTCLK        MPP_PIN(13, 0x5)
-
-#define MPP14_GPIO14            MPP_PIN(14, 0x0)
-#define MPP14_UA2_TXD           MPP_PIN(14, 0x2)
-#define MPP14_SDIO1_BUS_POWER   MPP_PIN(14, 0x4)
-#define MPP14_SSP_RXD           MPP_PIN(14, 0x5)
-
-#define MPP15_GPIO15            MPP_PIN(15, 0x0)
-#define MPP15_UA2_RXD           MPP_PIN(15, 0x2)
-#define MPP15_SDIO1_LED_CTRL    MPP_PIN(15, 0x4)
-#define MPP15_SSP_SFRM          MPP_PIN(15, 0x5)
-
-#define MPP16_GPIO16            MPP_PIN(16, 0x0)
-#define MPP16_UA3_RTSn          MPP_PIN(16, 0x2)
-#define MPP16_SDIO0_CD          MPP_PIN(16, 0x3)
-#define MPP16_SPI_LCD_CS1       MPP_PIN(16, 0x4)
-#define MPP16_AC97_SDATA_IN1    MPP_PIN(16, 0x5)
-
-#define MPP17_GPIO17            MPP_PIN(17, 0x0)
-#define MPP17_AC97_SYSCLK_OUT   MPP_PIN(17, 0x1)
-#define MPP17_UA3_CTSn          MPP_PIN(17, 0x2)
-#define MPP17_SDIO0_WP          MPP_PIN(17, 0x3)
-#define MPP17_TW_SDA2           MPP_PIN(17, 0x4)
-#define MPP17_AC97_SDATA_IN2    MPP_PIN(17, 0x5)
-
-#define MPP18_GPIO18            MPP_PIN(18, 0x0)
-#define MPP18_UA3_TXD           MPP_PIN(18, 0x2)
-#define MPP18_SDIO0_BUS_POWER   MPP_PIN(18, 0x3)
-#define MPP18_LCD0_PWM          MPP_PIN(18, 0x4)
-#define MPP18_AC_SDATA_IN3      MPP_PIN(18, 0x5)
-
-#define MPP19_GPIO19            MPP_PIN(19, 0x0)
-#define MPP19_UA3_RXD           MPP_PIN(19, 0x2)
-#define MPP19_SDIO0_LED_CTRL    MPP_PIN(19, 0x3)
-#define MPP19_TW_SCK2           MPP_PIN(19, 0x4)
-
-#define MPP20_GPIO20            MPP_PIN(20, 0x0)
-#define MPP20_AC97_SYSCLK_OUT   MPP_PIN(20, 0x1)
-#define MPP20_SPI_LCD_MISO      MPP_PIN(20, 0x2)
-#define MPP20_SDIO1_CD          MPP_PIN(20, 0x3)
-#define MPP20_SDIO0_CD          MPP_PIN(20, 0x5)
-#define MPP20_SPI_1_MISO        MPP_PIN(20, 0x6)
-
-#define MPP21_GPIO21            MPP_PIN(21, 0x0)
-#define MPP21_UA1_RTSn          MPP_PIN(21, 0x1)
-#define MPP21_SPI_LCD_CS0       MPP_PIN(21, 0x2)
-#define MPP21_SDIO1_WP          MPP_PIN(21, 0x3)
-#define MPP21_SSP_SFRM          MPP_PIN(21, 0x4)
-#define MPP21_SDIO0_WP          MPP_PIN(21, 0x5)
-#define MPP21_SPI_1_CS          MPP_PIN(21, 0x6)
-
-#define MPP22_GPIO22            MPP_PIN(22, 0x0)
-#define MPP22_UA1_CTSn          MPP_PIN(22, 0x1)
-#define MPP22_SPI_LCD_MOSI      MPP_PIN(22, 0x2)
-#define MPP22_SDIO1_BUS_POWER   MPP_PIN(22, 0x3)
-#define MPP22_SSP_TXD           MPP_PIN(22, 0x4)
-#define MPP22_SDIO0_BUS_POWER   MPP_PIN(22, 0x5)
-#define MPP22_SPI_1_MOSI        MPP_PIN(22, 0x6)
-
-#define MPP23_GPIO23            MPP_PIN(23, 0x0)
-#define MPP23_SPI_LCD_SCK       MPP_PIN(23, 0x2)
-#define MPP23_SDIO1_LED_CTRL    MPP_PIN(23, 0x3)
-#define MPP23_SSP_SCLK          MPP_PIN(23, 0x4)
-#define MPP23_SDIO0_LED_CTRL    MPP_PIN(23, 0x5)
-#define MPP23_SPI_1_SCK         MPP_PIN(23, 0x6)
+#define MPP(_num, _sel, _in, _out) ( \
+        /* MPP number */                ((_num) & 0xff) | \
+        /* MPP select value */          (((_sel) & 0xf) << 8) | \
+        /* may be input signal */       ((!!(_in)) << 12) | \
+        /* may be output signal */      ((!!(_out)) << 13))
+
+#define MPP0_GPIO0              MPP(0, 0x0, 1, 1)
+#define MPP0_UA2_RTSn           MPP(0, 0x2, 0, 0)
+#define MPP0_SDIO0_CD           MPP(0, 0x3, 0, 0)
+#define MPP0_LCD0_PWM           MPP(0, 0xf, 0, 0)
+
+#define MPP1_GPIO1              MPP(1, 0x0, 1, 1)
+#define MPP1_UA2_CTSn           MPP(1, 0x2, 0, 0)
+#define MPP1_SDIO0_WP           MPP(1, 0x3, 0, 0)
+#define MPP1_LCD1_PWM           MPP(1, 0xf, 0, 0)
+
+#define MPP2_GPIO2              MPP(2, 0x0, 1, 1)
+#define MPP2_SATA_PRESENT       MPP(2, 0x1, 0, 0)
+#define MPP2_UA2_TXD            MPP(2, 0x2, 0, 0)
+#define MPP2_SDIO0_BUS_POWER    MPP(2, 0x3, 0, 0)
+#define MPP2_UA_RTSn1           MPP(2, 0x4, 0, 0)
+
+#define MPP3_GPIO3              MPP(3, 0x0, 1, 1)
+#define MPP3_SATA_ACT           MPP(3, 0x1, 0, 0)
+#define MPP3_UA2_RXD            MPP(3, 0x2, 0, 0)
+#define MPP3_SDIO0_LED_CTRL     MPP(3, 0x3, 0, 0)
+#define MPP3_UA_CTSn1           MPP(3, 0x4, 0, 0)
+#define MPP3_SPI_LCD_CS1        MPP(3, 0xf, 0, 0)
+
+#define MPP4_GPIO4              MPP(4, 0x0, 1, 1)
+#define MPP4_UA3_RTSn           MPP(4, 0x2, 0, 0)
+#define MPP4_SDIO1_CD           MPP(4, 0x3, 0, 0)
+#define MPP4_SPI_1_MISO         MPP(4, 0x4, 0, 0)
+
+#define MPP5_GPIO5              MPP(5, 0x0, 1, 1)
+#define MPP5_UA3_CTSn           MPP(5, 0x2, 0, 0)
+#define MPP5_SDIO1_WP           MPP(5, 0x3, 0, 0)
+#define MPP5_SPI_1_CS           MPP(5, 0x4, 0, 0)
+
+#define MPP6_GPIO6              MPP(6, 0x0, 1, 1)
+#define MPP6_UA3_TXD            MPP(6, 0x2, 0, 0)
+#define MPP6_SDIO1_BUS_POWER    MPP(6, 0x3, 0, 0)
+#define MPP6_SPI_1_MOSI         MPP(6, 0x4, 0, 0)
+
+#define MPP7_GPIO7              MPP(7, 0x0, 1, 1)
+#define MPP7_UA3_RXD            MPP(7, 0x2, 0, 0)
+#define MPP7_SDIO1_LED_CTRL     MPP(7, 0x3, 0, 0)
+#define MPP7_SPI_1_SCK          MPP(7, 0x4, 0, 0)
+
+#define MPP8_GPIO8              MPP(8, 0x0, 1, 1)
+#define MPP8_WD_RST_OUT         MPP(8, 0x1, 0, 0)
+
+#define MPP9_GPIO9              MPP(9, 0x0, 1, 1)
+#define MPP9_PEX1_CLKREQn       MPP(9, 0x5, 0, 0)
+
+#define MPP10_GPIO10            MPP(10, 0x0, 1, 1)
+#define MPP10_SSP_SCLK          MPP(10, 0x5, 0, 0)
+
+#define MPP11_GPIO11            MPP(11, 0x0, 1, 1)
+#define MPP11_SATA_PRESENT      MPP(11, 0x1, 0, 0)
+#define MPP11_SATA_ACT          MPP(11, 0x2, 0, 0)
+#define MPP11_SDIO0_LED_CTRL    MPP(11, 0x3, 0, 0)
+#define MPP11_SDIO1_LED_CTRL    MPP(11, 0x4, 0, 0)
+#define MPP11_PEX0_CLKREQn      MPP(11, 0x5, 0, 0)
+
+#define MPP12_GPIO12            MPP(12, 0x0, 1, 1)
+#define MPP12_SATA_ACT          MPP(12, 0x1, 0, 0)
+#define MPP12_UA2_RTSn          MPP(12, 0x2, 0, 0)
+#define MPP12_AD0_I2S_EXT_MCLK  MPP(12, 0x3, 0, 0)
+#define MPP12_SDIO1_CD          MPP(12, 0x4, 0, 0)
+
+#define MPP13_GPIO13            MPP(13, 0x0, 1, 1)
+#define MPP13_UA2_CTSn          MPP(13, 0x2, 0, 0)
+#define MPP13_AD1_I2S_EXT_MCLK  MPP(13, 0x3, 0, 0)
+#define MPP13_SDIO1WP           MPP(13, 0x4, 0, 0)
+#define MPP13_SSP_EXTCLK        MPP(13, 0x5, 0, 0)
+
+#define MPP14_GPIO14            MPP(14, 0x0, 1, 1)
+#define MPP14_UA2_TXD           MPP(14, 0x2, 0, 0)
+#define MPP14_SDIO1_BUS_POWER   MPP(14, 0x4, 0, 0)
+#define MPP14_SSP_RXD           MPP(14, 0x5, 0, 0)
+
+#define MPP15_GPIO15            MPP(15, 0x0, 1, 1)
+#define MPP15_UA2_RXD           MPP(15, 0x2, 0, 0)
+#define MPP15_SDIO1_LED_CTRL    MPP(15, 0x4, 0, 0)
+#define MPP15_SSP_SFRM          MPP(15, 0x5, 0, 0)
+
+#define MPP16_GPIO16            MPP(16, 0x0, 1, 1)
+#define MPP16_UA3_RTSn          MPP(16, 0x2, 0, 0)
+#define MPP16_SDIO0_CD          MPP(16, 0x3, 0, 0)
+#define MPP16_SPI_LCD_CS1       MPP(16, 0x4, 0, 0)
+#define MPP16_AC97_SDATA_IN1    MPP(16, 0x5, 0, 0)
+
+#define MPP17_GPIO17            MPP(17, 0x0, 1, 1)
+#define MPP17_AC97_SYSCLK_OUT   MPP(17, 0x1, 0, 0)
+#define MPP17_UA3_CTSn          MPP(17, 0x2, 0, 0)
+#define MPP17_SDIO0_WP          MPP(17, 0x3, 0, 0)
+#define MPP17_TW_SDA2           MPP(17, 0x4, 0, 0)
+#define MPP17_AC97_SDATA_IN2    MPP(17, 0x5, 0, 0)
+
+#define MPP18_GPIO18            MPP(18, 0x0, 1, 1)
+#define MPP18_UA3_TXD           MPP(18, 0x2, 0, 0)
+#define MPP18_SDIO0_BUS_POWER   MPP(18, 0x3, 0, 0)
+#define MPP18_LCD0_PWM          MPP(18, 0x4, 0, 0)
+#define MPP18_AC_SDATA_IN3      MPP(18, 0x5, 0, 0)
+
+#define MPP19_GPIO19            MPP(19, 0x0, 1, 1)
+#define MPP19_UA3_RXD           MPP(19, 0x2, 0, 0)
+#define MPP19_SDIO0_LED_CTRL    MPP(19, 0x3, 0, 0)
+#define MPP19_TW_SCK2           MPP(19, 0x4, 0, 0)
+
+#define MPP20_GPIO20            MPP(20, 0x0, 1, 1)
+#define MPP20_AC97_SYSCLK_OUT   MPP(20, 0x1, 0, 0)
+#define MPP20_SPI_LCD_MISO      MPP(20, 0x2, 0, 0)
+#define MPP20_SDIO1_CD          MPP(20, 0x3, 0, 0)
+#define MPP20_SDIO0_CD          MPP(20, 0x5, 0, 0)
+#define MPP20_SPI_1_MISO        MPP(20, 0x6, 0, 0)
+
+#define MPP21_GPIO21            MPP(21, 0x0, 1, 1)
+#define MPP21_UA1_RTSn          MPP(21, 0x1, 0, 0)
+#define MPP21_SPI_LCD_CS0       MPP(21, 0x2, 0, 0)
+#define MPP21_SDIO1_WP          MPP(21, 0x3, 0, 0)
+#define MPP21_SSP_SFRM          MPP(21, 0x4, 0, 0)
+#define MPP21_SDIO0_WP          MPP(21, 0x5, 0, 0)
+#define MPP21_SPI_1_CS          MPP(21, 0x6, 0, 0)
+
+#define MPP22_GPIO22            MPP(22, 0x0, 1, 1)
+#define MPP22_UA1_CTSn          MPP(22, 0x1, 0, 0)
+#define MPP22_SPI_LCD_MOSI      MPP(22, 0x2, 0, 0)
+#define MPP22_SDIO1_BUS_POWER   MPP(22, 0x3, 0, 0)
+#define MPP22_SSP_TXD           MPP(22, 0x4, 0, 0)
+#define MPP22_SDIO0_BUS_POWER   MPP(22, 0x5, 0, 0)
+#define MPP22_SPI_1_MOSI        MPP(22, 0x6, 0, 0)
+
+#define MPP23_GPIO23            MPP(23, 0x0, 1, 1)
+#define MPP23_SPI_LCD_SCK       MPP(23, 0x2, 0, 0)
+#define MPP23_SDIO1_LED_CTRL    MPP(23, 0x3, 0, 0)
+#define MPP23_SSP_SCLK          MPP(23, 0x4, 0, 0)
+#define MPP23_SDIO0_LED_CTRL    MPP(23, 0x5, 0, 0)
+#define MPP23_SPI_1_SCK         MPP(23, 0x6, 0, 0)
+
+#define MPP_MAX                 23
+
+#define MPP_GRP(_grp, _mode)    MPP((_grp), (_mode), 0, 0)
 
 /* for MPP groups _num is a group index */
 enum dove_mpp_grp_idx {
@@ -181,40 +153,44 @@ enum dove_mpp_grp_idx {
         MPP_46_51 = 1,
         MPP_58_61 = 5,
         MPP_62_63 = 4,
+        MPP_GRP_MAX = 5,
 };
 
-#define MPP24_39_GPIO           MPP_GRP(MPP_24_39, 0x1)
-#define MPP24_39_CAM            MPP_GRP(MPP_24_39, 0x0)
+#define MPP_GRP_24_39_GPIO              MPP_GRP(MPP_24_39, 0x1)
+#define MPP_GRP_24_39_CAM               MPP_GRP(MPP_24_39, 0x0)
 
-#define MPP40_45_GPIO           MPP_GRP(MPP_40_45, 0x1)
-#define MPP40_45_SD0            MPP_GRP(MPP_40_45, 0x0)
+#define MPP_GRP_40_45_GPIO              MPP_GRP(MPP_40_45, 0x1)
+#define MPP_GRP_40_45_SD0               MPP_GRP(MPP_40_45, 0x0)
 
-#define MPP46_51_GPIO           MPP_GRP(MPP_46_51, 0x1)
-#define MPP46_51_SD1            MPP_GRP(MPP_46_51, 0x0)
+#define MPP_GRP_46_51_GPIO              MPP_GRP(MPP_46_51, 0x1)
+#define MPP_GRP_46_51_SD1               MPP_GRP(MPP_46_51, 0x0)
 
-#define MPP58_61_GPIO           MPP_GRP(MPP_58_61, 0x1)
-#define MPP58_61_SPI            MPP_GRP(MPP_58_61, 0x0)
+#define MPP_GRP_58_61_GPIO              MPP_GRP(MPP_58_61, 0x1)
+#define MPP_GRP_58_61_SPI               MPP_GRP(MPP_58_61, 0x0)
 
-#define MPP62_63_GPIO           MPP_GRP(MPP_62_63, 0x1)
-#define MPP62_63_UA1            MPP_GRP(MPP_62_63, 0x0)
+#define MPP_GRP_62_63_GPIO              MPP_GRP(MPP_62_63, 0x1)
+#define MPP_GRP_62_63_UA1               MPP_GRP(MPP_62_63, 0x0)
 
 /* The MPP[64:71] control differs from other groups */
-#define MPP64_71_GPO            MPP_GRP_NFC(0x1)
-#define MPP64_71_NFC            MPP_GRP_NFC(0x0)
+#define MPP_GRP_NFC_64_71_GPO           0x1
+#define MPP_GRP_NFC_64_71_NFC           0x0
 
 /*
  * The MPP[52:57] functionality is encoded by 4 bits in different
  * registers. The _num field in this case encodes those bits in
  * correspodence with Table 135 of 88AP510 Functional specification
  */
-#define MPP52_57_AU1            MPP_GRP_AU1(0x0)
-#define MPP52_57_AU1_GPIO57     MPP_GRP_AU1(0x2)
-#define MPP52_57_GPIO           MPP_GRP_AU1(0xa)
-#define MPP52_57_TW_GPIO        MPP_GRP_AU1(0xb)
-#define MPP52_57_AU1_SSP        MPP_GRP_AU1(0xc)
-#define MPP52_57_SSP_GPIO       MPP_GRP_AU1(0xe)
-#define MPP52_57_SSP_TW         MPP_GRP_AU1(0xf)
-
-void dove_mpp_conf(unsigned int *mpp_list);
+#define MPP_GRP_AU1_52_57_AU1           0x0
+#define MPP_GRP_AU1_52_57_AU1_GPIO57    0x2
+#define MPP_GRP_AU1_52_57_GPIO          0xa
+#define MPP_GRP_AU1_52_57_TW_GPIO       0xb
+#define MPP_GRP_AU1_52_57_AU1_SSP       0xc
+#define MPP_GRP_AU1_52_57_SSP_GPIO      0xe
+#define MPP_GRP_AU1_52_57_SSP_TW        0xf
+
+void dove_mpp_conf(unsigned int *mpp_list,
+                   unsigned int *mpp_grp_list,
+                   unsigned int grp_au1_52_57,
+                   unsigned int grp_nfc_64_71);
 
 #endif  /* __ARCH_DOVE_MPP_CODED_H */
diff --git a/arch/arm/mach-ep93xx/gpio.c b/arch/arm/mach-ep93xx/gpio.c
index a5a9ff70b198..415dce37b88c 100644
--- a/arch/arm/mach-ep93xx/gpio.c
+++ b/arch/arm/mach-ep93xx/gpio.c
@@ -356,29 +356,6 @@ static int ep93xx_gpio_set_debounce(struct gpio_chip *chip,
         return 0;
 }
 
-static void ep93xx_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
-{
-        struct ep93xx_gpio_chip *ep93xx_chip = to_ep93xx_gpio_chip(chip);
-        u8 data_reg, data_dir_reg;
-        int gpio, i;
-
-        data_reg = __raw_readb(ep93xx_chip->data_reg);
-        data_dir_reg = __raw_readb(ep93xx_chip->data_dir_reg);
-
-        gpio = ep93xx_chip->chip.base;
-        for (i = 0; i < chip->ngpio; i++, gpio++) {
-                int is_out = data_dir_reg & (1 << i);
-                int irq = gpio_to_irq(gpio);
-
-                seq_printf(s, " %s%d gpio-%-3d (%-12s) %s %s %s\n",
-                                chip->label, i, gpio,
-                                gpiochip_is_requested(chip, i) ? : "",
-                                is_out ? "out" : "in ",
-                                (data_reg & (1<<  i)) ? "hi" : "lo",
-                                (!is_out && irq>= 0) ? "(interrupt)" : "");
-        }
-}
-
 #define EP93XX_GPIO_BANK(name, dr, ddr, base_gpio)                      \
         {                                                               \
                 .chip = {                                               \
@@ -387,7 +364,6 @@ static void ep93xx_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
                         .direction_output = ep93xx_gpio_direction_output, \
                         .get              = ep93xx_gpio_get,            \
                         .set              = ep93xx_gpio_set,            \
-                        .dbg_show         = ep93xx_gpio_dbg_show,       \
                         .base             = base_gpio,                  \
                         .ngpio            = 8,                          \
                 },                                                      \
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index e849f67be47d..805196207ce8 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -170,6 +170,7 @@ config MACH_NURI
         select S3C_DEV_HSMMC3
         select S3C_DEV_I2C1
         select S3C_DEV_I2C5
+        select S5P_DEV_USB_EHCI
         select EXYNOS4_SETUP_I2C1
         select EXYNOS4_SETUP_I2C5
         select EXYNOS4_SETUP_SDHCI
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
index 9be104f63c0b..777897551e42 100644
--- a/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@ -54,3 +54,5 @@ obj-$(CONFIG_EXYNOS4_SETUP_I2C7)	+= setup-i2c7.o
 obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)      += setup-keypad.o
 obj-$(CONFIG_EXYNOS4_SETUP_SDHCI)       += setup-sdhci.o
 obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)  += setup-sdhci-gpio.o
+
+obj-$(CONFIG_USB_SUPPORT)               += usb-phy.o
diff --git a/arch/arm/mach-exynos4/cpu.c b/arch/arm/mach-exynos4/cpu.c
index 793011391943..08813a6f66b1 100644
--- a/arch/arm/mach-exynos4/cpu.c
+++ b/arch/arm/mach-exynos4/cpu.c
@@ -97,7 +97,12 @@ static struct map_desc exynos4_iodesc[] __initdata = {
                 .pfn            = __phys_to_pfn(EXYNOS4_PA_SROMC),
                 .length         = SZ_4K,
                 .type           = MT_DEVICE,
-        },
+        }, {
+                .virtual        = (unsigned long)S5P_VA_USB_HSPHY,
+                .pfn            = __phys_to_pfn(EXYNOS4_PA_HSPHY),
+                .length         = SZ_4K,
+                .type           = MT_DEVICE,
+        }
 };
 
 static void exynos4_idle(void)
diff --git a/arch/arm/mach-exynos4/include/mach/map.h b/arch/arm/mach-exynos4/include/mach/map.h
index 6330b73b9ea7..0009e77a05fc 100644
--- a/arch/arm/mach-exynos4/include/mach/map.h
+++ b/arch/arm/mach-exynos4/include/mach/map.h
@@ -101,6 +101,9 @@
 
 #define EXYNOS4_PA_SROMC                0x12570000
 
+#define EXYNOS4_PA_EHCI                 0x12580000
+#define EXYNOS4_PA_HSPHY                0x125B0000
+
 #define EXYNOS4_PA_UART                 0x13800000
 
 #define EXYNOS4_PA_IIC(x)               (0x13860000 + ((x) * 0x10000))
@@ -143,6 +146,7 @@
 #define S5P_PA_SROMC                    EXYNOS4_PA_SROMC
 #define S5P_PA_SYSCON                   EXYNOS4_PA_SYSCON
 #define S5P_PA_TIMER                    EXYNOS4_PA_TIMER
+#define S5P_PA_EHCI                     EXYNOS4_PA_EHCI
 
 #define SAMSUNG_PA_KEYPAD               EXYNOS4_PA_KEYPAD
 
diff --git a/arch/arm/mach-exynos4/include/mach/regs-pmu.h b/arch/arm/mach-exynos4/include/mach/regs-pmu.h
index 62b0014d05e0..a9643371f8e7 100644
--- a/arch/arm/mach-exynos4/include/mach/regs-pmu.h
+++ b/arch/arm/mach-exynos4/include/mach/regs-pmu.h
@@ -33,6 +33,9 @@
 #define S5P_EINT_WAKEUP_MASK                    S5P_PMUREG(0x0604)
 #define S5P_WAKEUP_MASK                         S5P_PMUREG(0x0608)
 
+#define S5P_USBHOST_PHY_CONTROL                 S5P_PMUREG(0x0708)
+#define S5P_USBHOST_PHY_ENABLE                  (1 << 0)
+
 #define S5P_MIPI_DPHY_CONTROL(n)                S5P_PMUREG(0x0710 + (n) * 4)
 #define S5P_MIPI_DPHY_ENABLE                    (1 << 0)
 #define S5P_MIPI_DPHY_SRESETN                   (1 << 1)
diff --git a/arch/arm/mach-exynos4/include/mach/regs-usb-phy.h b/arch/arm/mach-exynos4/include/mach/regs-usb-phy.h
new file mode 100644
index 000000000000..703118d5173c
--- /dev/null
+++ b/arch/arm/mach-exynos4/include/mach/regs-usb-phy.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.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 __PLAT_S5P_REGS_USB_PHY_H
+#define __PLAT_S5P_REGS_USB_PHY_H
+
+#define EXYNOS4_HSOTG_PHYREG(x)         ((x) + S5P_VA_USB_HSPHY)
+
+#define EXYNOS4_PHYPWR                  EXYNOS4_HSOTG_PHYREG(0x00)
+#define PHY1_HSIC_NORMAL_MASK           (0xf << 9)
+#define PHY1_HSIC1_SLEEP                (1 << 12)
+#define PHY1_HSIC1_FORCE_SUSPEND        (1 << 11)
+#define PHY1_HSIC0_SLEEP                (1 << 10)
+#define PHY1_HSIC0_FORCE_SUSPEND        (1 << 9)
+
+#define PHY1_STD_NORMAL_MASK            (0x7 << 6)
+#define PHY1_STD_SLEEP                  (1 << 8)
+#define PHY1_STD_ANALOG_POWERDOWN       (1 << 7)
+#define PHY1_STD_FORCE_SUSPEND          (1 << 6)
+
+#define PHY0_NORMAL_MASK                (0x39 << 0)
+#define PHY0_SLEEP                      (1 << 5)
+#define PHY0_OTG_DISABLE                (1 << 4)
+#define PHY0_ANALOG_POWERDOWN           (1 << 3)
+#define PHY0_FORCE_SUSPEND              (1 << 0)
+
+#define EXYNOS4_PHYCLK                  EXYNOS4_HSOTG_PHYREG(0x04)
+#define PHY1_COMMON_ON_N                (1 << 7)
+#define PHY0_COMMON_ON_N                (1 << 4)
+#define PHY0_ID_PULLUP                  (1 << 2)
+#define CLKSEL_MASK                     (0x3 << 0)
+#define CLKSEL_SHIFT                    (0)
+#define CLKSEL_48M                      (0x0 << 0)
+#define CLKSEL_12M                      (0x2 << 0)
+#define CLKSEL_24M                      (0x3 << 0)
+
+#define EXYNOS4_RSTCON                  EXYNOS4_HSOTG_PHYREG(0x08)
+#define HOST_LINK_PORT_SWRST_MASK       (0xf << 6)
+#define HOST_LINK_PORT2_SWRST           (1 << 9)
+#define HOST_LINK_PORT1_SWRST           (1 << 8)
+#define HOST_LINK_PORT0_SWRST           (1 << 7)
+#define HOST_LINK_ALL_SWRST             (1 << 6)
+
+#define PHY1_SWRST_MASK                 (0x7 << 3)
+#define PHY1_HSIC_SWRST                 (1 << 5)
+#define PHY1_STD_SWRST                  (1 << 4)
+#define PHY1_ALL_SWRST                  (1 << 3)
+
+#define PHY0_SWRST_MASK                 (0x7 << 0)
+#define PHY0_PHYLINK_SWRST              (1 << 2)
+#define PHY0_HLINK_SWRST                (1 << 1)
+#define PHY0_SWRST                      (1 << 0)
+
+#define EXYNOS4_PHY1CON                 EXYNOS4_HSOTG_PHYREG(0x34)
+#define FPENABLEN                       (1 << 0)
+
+#endif /* __PLAT_S5P_REGS_USB_PHY_H */
diff --git a/arch/arm/mach-exynos4/include/mach/smp.h b/arch/arm/mach-exynos4/include/mach/smp.h
deleted file mode 100644
index a463dcebcfd3..000000000000
--- a/arch/arm/mach-exynos4/include/mach/smp.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* linux/arch/arm/mach-exynos4/include/mach/smp.h
- *
- * Cloned from arch/arm/mach-realview/include/mach/smp.h
-*/
-
-#ifndef ASM_ARCH_SMP_H
-#define ASM_ARCH_SMP_H __FILE__
-
-#include <asm/hardware/gic.h>
-
-/*
- * We use IRQ1 as the IPI
- */
-static inline void smp_cross_call(const struct cpumask *mask, int ipi)
-{
-        gic_raise_softirq(mask, ipi);
-}
-
-#endif
diff --git a/arch/arm/mach-exynos4/irq-combiner.c b/arch/arm/mach-exynos4/irq-combiner.c
index f488b66d6806..5a2758ab055e 100644
--- a/arch/arm/mach-exynos4/irq-combiner.c
+++ b/arch/arm/mach-exynos4/irq-combiner.c
@@ -59,8 +59,7 @@ static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
         unsigned int cascade_irq, combiner_irq;
         unsigned long status;
 
-        /* primary controller ack'ing */
-        chip->irq_ack(&desc->irq_data);
+        chained_irq_enter(chip, desc);
 
         spin_lock(&irq_controller_lock);
         status = __raw_readl(chip_data->base + COMBINER_INT_STATUS);
@@ -79,8 +78,7 @@ static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
                 generic_handle_irq(cascade_irq);
 
  out:
-        /* primary controller unmasking */
-        chip->irq_unmask(&desc->irq_data);
+        chained_irq_exit(chip, desc);
 }
 
 static struct irq_chip combiner_chip = {
diff --git a/arch/arm/mach-exynos4/mach-nuri.c b/arch/arm/mach-exynos4/mach-nuri.c
index b79ad010d194..bb5d12f43af8 100644
--- a/arch/arm/mach-exynos4/mach-nuri.c
+++ b/arch/arm/mach-exynos4/mach-nuri.c
@@ -30,6 +30,8 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/sdhci.h>
+#include <plat/ehci.h>
+#include <plat/clock.h>
 
 #include <mach/map.h>
 
@@ -262,6 +264,16 @@ static struct i2c_board_info i2c5_devs[] __initdata = {
         /* max8997, To be updated */
 };
 
+/* USB EHCI */
+static struct s5p_ehci_platdata nuri_ehci_pdata;
+
+static void __init nuri_ehci_init(void)
+{
+        struct s5p_ehci_platdata *pdata = &nuri_ehci_pdata;
+
+        s5p_ehci_set_platdata(pdata);
+}
+
 static struct platform_device *nuri_devices[] __initdata = {
         /* Samsung Platform Devices */
         &emmc_fixed_voltage,
@@ -270,6 +282,7 @@ static struct platform_device *nuri_devices[] __initdata = {
         &s3c_device_hsmmc3,
         &s3c_device_wdt,
         &s3c_device_timer[0],
+        &s5p_device_ehci,
 
         /* NURI Devices */
         &nuri_gpio_keys,
@@ -291,6 +304,9 @@ static void __init nuri_machine_init(void)
         i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));
         i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs));
 
+        nuri_ehci_init();
+        clk_xusbxti.rate = 24000000;
+
         /* Last */
         platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
 }
diff --git a/arch/arm/mach-exynos4/platsmp.c b/arch/arm/mach-exynos4/platsmp.c
index 6d35878ec1aa..c5e65a02be8d 100644
--- a/arch/arm/mach-exynos4/platsmp.c
+++ b/arch/arm/mach-exynos4/platsmp.c
@@ -22,6 +22,7 @@
 #include <linux/io.h>
 
 #include <asm/cacheflush.h>
+#include <asm/hardware/gic.h>
 #include <asm/smp_scu.h>
 #include <asm/unified.h>
 
@@ -104,7 +105,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
          * the boot monitor to read the system wide flags register,
          * and branch to the address found there.
          */
-        smp_cross_call(cpumask_of(cpu), 1);
+        gic_raise_softirq(cpumask_of(cpu), 1);
 
         timeout = jiffies + (1 * HZ);
         while (time_before(jiffies, timeout)) {
@@ -147,6 +148,8 @@ void __init smp_init_cpus(void)
 
         for (i = 0; i < ncores; i++)
                 set_cpu_possible(i, true);
+
+        set_smp_cross_call(gic_raise_softirq);
 }
 
 void __init platform_smp_prepare_cpus(unsigned int max_cpus)
diff --git a/arch/arm/mach-exynos4/pm.c b/arch/arm/mach-exynos4/pm.c
index 10d917d9e3ad..8755ca8dd48d 100644
--- a/arch/arm/mach-exynos4/pm.c
+++ b/arch/arm/mach-exynos4/pm.c
@@ -16,6 +16,7 @@
 
 #include <linux/init.h>
 #include <linux/suspend.h>
+#include <linux/syscore_ops.h>
 #include <linux/io.h>
 
 #include <asm/cacheflush.h>
@@ -372,7 +373,27 @@ void exynos4_scu_enable(void __iomem *scu_base)
         flush_cache_all();
 }
 
-static int exynos4_pm_resume(struct sys_device *dev)
+static struct sysdev_driver exynos4_pm_driver = {
+        .add            = exynos4_pm_add,
+};
+
+static __init int exynos4_pm_drvinit(void)
+{
+        unsigned int tmp;
+
+        s3c_pm_init();
+
+        /* All wakeup disable */
+
+        tmp = __raw_readl(S5P_WAKEUP_MASK);
+        tmp |= ((0xFF << 8) | (0x1F << 1));
+        __raw_writel(tmp, S5P_WAKEUP_MASK);
+
+        return sysdev_driver_register(&exynos4_sysclass, &exynos4_pm_driver);
+}
+arch_initcall(exynos4_pm_drvinit);
+
+static void exynos4_pm_resume(void)
 {
         /* For release retention */
 
@@ -394,27 +415,15 @@ static int exynos4_pm_resume(struct sys_device *dev)
         /* enable L2X0*/
         writel_relaxed(1, S5P_VA_L2CC + L2X0_CTRL);
 #endif
-
-        return 0;
 }
 
-static struct sysdev_driver exynos4_pm_driver = {
-        .add            = exynos4_pm_add,
+static struct syscore_ops exynos4_pm_syscore_ops = {
         .resume         = exynos4_pm_resume,
 };
 
-static __init int exynos4_pm_drvinit(void)
+static __init int exynos4_pm_syscore_init(void)
 {
-        unsigned int tmp;
-
-        s3c_pm_init();
-
-        /* All wakeup disable */
-
-        tmp = __raw_readl(S5P_WAKEUP_MASK);
-        tmp |= ((0xFF << 8) | (0x1F << 1));
-        __raw_writel(tmp, S5P_WAKEUP_MASK);
-
-        return sysdev_driver_register(&exynos4_sysclass, &exynos4_pm_driver);
+        register_syscore_ops(&exynos4_pm_syscore_ops);
+        return 0;
 }
-arch_initcall(exynos4_pm_drvinit);
+arch_initcall(exynos4_pm_syscore_init);
diff --git a/arch/arm/mach-exynos4/usb-phy.c b/arch/arm/mach-exynos4/usb-phy.c
new file mode 100644
index 000000000000..0883c1b824b9
--- /dev/null
+++ b/arch/arm/mach-exynos4/usb-phy.c
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.com>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/platform_device.h>
+#include <mach/regs-pmu.h>
+#include <mach/regs-usb-phy.h>
+#include <plat/cpu.h>
+#include <plat/usb-phy.h>
+
+static int exynos4_usb_phy1_init(struct platform_device *pdev)
+{
+        struct clk *otg_clk;
+        struct clk *xusbxti_clk;
+        u32 phyclk;
+        u32 rstcon;
+        int err;
+
+        otg_clk = clk_get(&pdev->dev, "otg");
+        if (IS_ERR(otg_clk)) {
+                dev_err(&pdev->dev, "Failed to get otg clock\n");
+                return PTR_ERR(otg_clk);
+        }
+
+        err = clk_enable(otg_clk);
+        if (err) {
+                clk_put(otg_clk);
+                return err;
+        }
+
+        writel(readl(S5P_USBHOST_PHY_CONTROL) | S5P_USBHOST_PHY_ENABLE,
+                        S5P_USBHOST_PHY_CONTROL);
+
+        /* set clock frequency for PLL */
+        phyclk = readl(EXYNOS4_PHYCLK) & ~CLKSEL_MASK;
+
+        xusbxti_clk = clk_get(&pdev->dev, "xusbxti");
+        if (xusbxti_clk && !IS_ERR(xusbxti_clk)) {
+                switch (clk_get_rate(xusbxti_clk)) {
+                case 12 * MHZ:
+                        phyclk |= CLKSEL_12M;
+                        break;
+                case 24 * MHZ:
+                        phyclk |= CLKSEL_24M;
+                        break;
+                default:
+                case 48 * MHZ:
+                        /* default reference clock */
+                        break;
+                }
+                clk_put(xusbxti_clk);
+        }
+
+        writel(phyclk, EXYNOS4_PHYCLK);
+
+        /* floating prevention logic: disable */
+        writel((readl(EXYNOS4_PHY1CON) | FPENABLEN), EXYNOS4_PHY1CON);
+
+        /* set to normal HSIC 0 and 1 of PHY1 */
+        writel((readl(EXYNOS4_PHYPWR) & ~PHY1_HSIC_NORMAL_MASK),
+                        EXYNOS4_PHYPWR);
+
+        /* set to normal standard USB of PHY1 */
+        writel((readl(EXYNOS4_PHYPWR) & ~PHY1_STD_NORMAL_MASK), EXYNOS4_PHYPWR);
+
+        /* reset all ports of both PHY and Link */
+        rstcon = readl(EXYNOS4_RSTCON) | HOST_LINK_PORT_SWRST_MASK |
+                PHY1_SWRST_MASK;
+        writel(rstcon, EXYNOS4_RSTCON);
+        udelay(10);
+
+        rstcon &= ~(HOST_LINK_PORT_SWRST_MASK | PHY1_SWRST_MASK);
+        writel(rstcon, EXYNOS4_RSTCON);
+        udelay(50);
+
+        clk_disable(otg_clk);
+        clk_put(otg_clk);
+
+        return 0;
+}
+
+static int exynos4_usb_phy1_exit(struct platform_device *pdev)
+{
+        struct clk *otg_clk;
+        int err;
+
+        otg_clk = clk_get(&pdev->dev, "otg");
+        if (IS_ERR(otg_clk)) {
+                dev_err(&pdev->dev, "Failed to get otg clock\n");
+                return PTR_ERR(otg_clk);
+        }
+
+        err = clk_enable(otg_clk);
+        if (err) {
+                clk_put(otg_clk);
+                return err;
+        }
+
+        writel((readl(EXYNOS4_PHYPWR) | PHY1_STD_ANALOG_POWERDOWN),
+                        EXYNOS4_PHYPWR);
+
+        writel(readl(S5P_USBHOST_PHY_CONTROL) & ~S5P_USBHOST_PHY_ENABLE,
+                        S5P_USBHOST_PHY_CONTROL);
+
+        clk_disable(otg_clk);
+        clk_put(otg_clk);
+
+        return 0;
+}
+
+int s5p_usb_phy_init(struct platform_device *pdev, int type)
+{
+        if (type == S5P_USB_PHY_HOST)
+                return exynos4_usb_phy1_init(pdev);
+
+        return -EINVAL;
+}
+
+int s5p_usb_phy_exit(struct platform_device *pdev, int type)
+{
+        if (type == S5P_USB_PHY_HOST)
+                return exynos4_usb_phy1_exit(pdev);
+
+        return -EINVAL;
+}
diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig
index bdd257921cfb..46adca068f2c 100644
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
@@ -4,6 +4,7 @@ menu "Footbridge Implementations"
 
 config ARCH_CATS
         bool "CATS"
+        select CLKSRC_I8253
         select FOOTBRIDGE_HOST
         select ISA
         select ISA_DMA
@@ -59,6 +60,7 @@ config ARCH_EBSA285_HOST
 
 config ARCH_NETWINDER
         bool "NetWinder"
+        select CLKSRC_I8253
         select FOOTBRIDGE_HOST
         select ISA
         select ISA_DMA
diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c
index 441c6ce0d555..7020f1a3feca 100644
--- a/arch/arm/mach-footbridge/isa-timer.c
+++ b/arch/arm/mach-footbridge/isa-timer.c
@@ -10,53 +10,16 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/spinlock.h>
 #include <linux/timex.h>
 
 #include <asm/irq.h>
-
+#include <asm/i8253.h>
 #include <asm/mach/time.h>
 
 #include "common.h"
 
-#define PIT_MODE        0x43
-#define PIT_CH0         0x40
-
-#define PIT_LATCH       ((PIT_TICK_RATE + HZ / 2) / HZ)
-
-static cycle_t pit_read(struct clocksource *cs)
-{
-        unsigned long flags;
-        static int old_count;
-        static u32 old_jifs;
-        int count;
-        u32 jifs;
-
-        raw_local_irq_save(flags);
-
-        jifs = jiffies;
-        outb_p(0x00, PIT_MODE);         /* latch the count */
-        count = inb_p(PIT_CH0);         /* read the latched count */
-        count |= inb_p(PIT_CH0) << 8;
-
-        if (count > old_count && jifs == old_jifs)
-                count = old_count;
-
-        old_count = count;
-        old_jifs = jifs;
-
-        raw_local_irq_restore(flags);
-
-        count = (PIT_LATCH - 1) - count;
-
-        return (cycle_t)(jifs * PIT_LATCH) + count;
-}
-
-static struct clocksource pit_cs = {
-        .name           = "pit",
-        .rating         = 110,
-        .read           = pit_read,
-        .mask           = CLOCKSOURCE_MASK(32),
-};
+DEFINE_RAW_SPINLOCK(i8253_lock);
 
 static void pit_set_mode(enum clock_event_mode mode,
         struct clock_event_device *evt)
@@ -121,7 +84,7 @@ static void __init isa_timer_init(void)
         pit_ce.max_delta_ns = clockevent_delta2ns(0x7fff, &pit_ce);
         pit_ce.min_delta_ns = clockevent_delta2ns(0x000f, &pit_ce);
 
-        clocksource_register_hz(&pit_cs, PIT_TICK_RATE);
+        clocksource_i8253_init();
 
         setup_irq(pit_ce.irq, &pit_timer_irq);
         clockevents_register_device(&pit_ce);
diff --git a/arch/arm/mach-gemini/include/mach/uncompress.h b/arch/arm/mach-gemini/include/mach/uncompress.h
index 5483f61a8061..0efa26247235 100644
--- a/arch/arm/mach-gemini/include/mach/uncompress.h
+++ b/arch/arm/mach-gemini/include/mach/uncompress.h
@@ -16,7 +16,7 @@
 #include <linux/serial_reg.h>
 #include <mach/hardware.h>
 
-static volatile unsigned long *UART = (unsigned long *)GEMINI_UART_BASE;
+static volatile unsigned long * const UART = (unsigned long *)GEMINI_UART_BASE;
 
 /*
  * The following code assumes the serial port has already been
diff --git a/arch/arm/mach-h720x/include/mach/memory.h b/arch/arm/mach-h720x/include/mach/memory.h
index 9d3687651462..b0b3baec9acf 100644
--- a/arch/arm/mach-h720x/include/mach/memory.h
+++ b/arch/arm/mach-h720x/include/mach/memory.h
@@ -13,7 +13,6 @@
  * There should not be more than (0xd0000000 - 0xc0000000)
  * bytes of RAM.
  */
-#define ISA_DMA_THRESHOLD       (PHYS_OFFSET + SZ_256M - 1)
-#define MAX_DMA_ADDRESS         (PAGE_OFFSET + SZ_256M)
+#define ARM_DMA_ZONE_SIZE       SZ_256M
 
 #endif
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 56b930a13443..59c97a331136 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,5 +1,15 @@
 config IMX_HAVE_DMA_V1
         bool
+#
+# ARCH_MX31 and ARCH_MX35 are left for compatibility
+# Some usages assume that having one of them implies not having (e.g.) ARCH_MX2.
+# To easily distinguish good and reviewed from unreviewed usages new (and IMHO
+# more sensible) names are used: SOC_IMX31 and SOC_IMX35
+config ARCH_MX31
+        bool
+
+config ARCH_MX35
+        bool
 
 config SOC_IMX1
         bool
@@ -31,6 +41,24 @@ config SOC_IMX27
         select IMX_HAVE_IOMUX_V1
         select MXC_AVIC
 
+config SOC_IMX31
+        bool
+        select CPU_V6
+        select IMX_HAVE_PLATFORM_MXC_RNGA
+        select ARCH_MXC_AUDMUX_V2
+        select ARCH_MX31
+        select MXC_AVIC
+
+config SOC_IMX35
+        bool
+        select CPU_V6
+        select ARCH_MXC_IOMUX_V3
+        select ARCH_MXC_AUDMUX_V2
+        select HAVE_EPIT
+        select ARCH_MX35
+        select MXC_AVIC
+
+
 if ARCH_MX1
 
 comment "MX1 platforms:"
@@ -40,6 +68,7 @@ config MACH_MXLADS
 config ARCH_MX1ADS
         bool "MX1ADS platform"
         select MACH_MXLADS
+        select SOC_IMX1
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
         help
@@ -51,6 +80,13 @@ config MACH_SCB9328
         help
           Say Y here if you are using a Synertronixx scb9328 board
 
+config MACH_APF9328
+        bool "APF9328"
+        select SOC_IMX1
+        select IMX_HAVE_PLATFORM_IMX_UART
+        help
+          Say Yes here if you are using the Armadeus APF9328 development board
+
 endif
 
 if ARCH_MX2
@@ -129,6 +165,7 @@ choice
 
 config MACH_EUKREA_MBIMXSD25_BASEBOARD
         bool "Eukrea MBIMXSD development board"
+        select IMX_HAVE_PLATFORM_GPIO_KEYS
         select IMX_HAVE_PLATFORM_IMX_SSI
         help
           This adds board specific devices that can be found on Eukrea's
@@ -254,6 +291,7 @@ config MACH_MX27_3DS
 config MACH_IMX27_VISSTRIM_M10
         bool "Vista Silicon i.MX27 Visstrim_m10"
         select SOC_IMX27
+        select IMX_HAVE_PLATFORM_GPIO_KEYS
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_SSI
         select IMX_HAVE_PLATFORM_IMX_UART
@@ -314,3 +352,251 @@ config MACH_IMX27IPCAM
           configurations for the board and its peripherals.
 
 endif
+
+if ARCH_MX3
+
+comment "MX31 platforms:"
+
+config MACH_MX31ADS
+        bool "Support MX31ADS platforms"
+        select SOC_IMX31
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_SSI
+        select IMX_HAVE_PLATFORM_IMX_UART
+        default y
+        help
+          Include support for MX31ADS platform. This includes specific
+          configurations for the board and its peripherals.
+
+config MACH_MX31ADS_WM1133_EV1
+        bool "Support Wolfson Microelectronics 1133-EV1 module"
+        depends on MACH_MX31ADS
+        depends on MFD_WM8350_I2C
+        depends on REGULATOR_WM8350
+        select MFD_WM8350_CONFIG_MODE_0
+        select MFD_WM8352_CONFIG_MODE_0
+        help
+          Include support for the Wolfson Microelectronics 1133-EV1 PMU
+          and audio module for the MX31ADS platform.
+
+config MACH_MX31LILLY
+        bool "Support MX31 LILLY-1131 platforms (INCO startec)"
+        select SOC_IMX31
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IPU_CORE
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_MXC_MMC
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        select MXC_ULPI if USB_ULPI
+        help
+          Include support for mx31 based LILLY1131 modules. This includes
+          specific configurations for the board and its peripherals.
+
+config MACH_MX31LITE
+        bool "Support MX31 LITEKIT (LogicPD)"
+        select SOC_IMX31
+        select MXC_ULPI if USB_ULPI
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_MXC_MMC
+        select IMX_HAVE_PLATFORM_MXC_NAND
+        select IMX_HAVE_PLATFORM_MXC_RTC
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        help
+          Include support for MX31 LITEKIT platform. This includes specific
+          configurations for the board and its peripherals.
+
+config MACH_PCM037
+        bool "Support Phytec pcm037 (i.MX31) platforms"
+        select SOC_IMX31
+        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IPU_CORE
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_MXC_MMC
+        select IMX_HAVE_PLATFORM_MXC_NAND
+        select IMX_HAVE_PLATFORM_MXC_W1
+        select MXC_ULPI if USB_ULPI
+        help
+          Include support for Phytec pcm037 platform. This includes
+          specific configurations for the board and its peripherals.
+
+config MACH_PCM037_EET
+        bool "Support pcm037 EET board extensions"
+        depends on MACH_PCM037
+        select IMX_HAVE_PLATFORM_GPIO_KEYS
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        help
+          Add support for PCM037 EET baseboard extensions. If you are using the
+          OLED display with EET, use "video=mx3fb:CMEL-OLED" kernel
+          command-line parameter.
+
+config MACH_MX31_3DS
+        bool "Support MX31PDK (3DS)"
+        select SOC_IMX31
+        select MXC_DEBUG_BOARD
+        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_KEYPAD
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IPU_CORE
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_MXC_NAND
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        select MXC_ULPI if USB_ULPI
+        help
+          Include support for MX31PDK (3DS) platform. This includes specific
+          configurations for the board and its peripherals.
+
+config MACH_MX31_3DS_MXC_NAND_USE_BBT
+        bool "Make the MXC NAND driver use the in flash Bad Block Table"
+        depends on MACH_MX31_3DS
+        depends on MTD_NAND_MXC
+        help
+          Enable this if you want that the MXC NAND driver uses the in flash
+          Bad Block Table to know what blocks are bad instead of scanning the
+          entire flash looking for bad block markers.
+
+config MACH_MX31MOBOARD
+        bool "Support mx31moboard platforms (EPFL Mobots group)"
+        select SOC_IMX31
+        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IPU_CORE
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_MXC_MMC
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        select MXC_ULPI if USB_ULPI
+        help
+          Include support for mx31moboard platform. This includes specific
+          configurations for the board and its peripherals.
+
+config MACH_QONG
+        bool "Support Dave/DENX QongEVB-LITE platform"
+        select SOC_IMX31
+        select IMX_HAVE_PLATFORM_IMX_UART
+        help
+          Include support for Dave/DENX QongEVB-LITE platform. This includes
+          specific configurations for the board and its peripherals.
+
+config MACH_ARMADILLO5X0
+        bool "Support Atmark Armadillo-500 Development Base Board"
+        select SOC_IMX31
+        select IMX_HAVE_PLATFORM_GPIO_KEYS
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IPU_CORE
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_MXC_MMC
+        select IMX_HAVE_PLATFORM_MXC_NAND
+        select MXC_ULPI if USB_ULPI
+        help
+          Include support for Atmark Armadillo-500 platform. This includes
+          specific configurations for the board and its peripherals.
+
+config MACH_KZM_ARM11_01
+        bool "Support KZM-ARM11-01(Kyoto Microcomputer)"
+        select SOC_IMX31
+        select IMX_HAVE_PLATFORM_IMX_UART
+        help
+          Include support for KZM-ARM11-01. This includes specific
+          configurations for the board and its peripherals.
+
+config MACH_BUG
+        bool "Support Buglabs BUGBase platform"
+        select SOC_IMX31
+        select IMX_HAVE_PLATFORM_IMX_UART
+        default y
+        help
+          Include support for BUGBase 1.3 platform. This includes specific
+          configurations for the board and its peripherals.
+
+comment "MX35 platforms:"
+
+config MACH_PCM043
+        bool "Support Phytec pcm043 (i.MX35) platforms"
+        select SOC_IMX35
+        select IMX_HAVE_PLATFORM_FLEXCAN
+        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_SSI
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IPU_CORE
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_MXC_NAND
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select MXC_ULPI if USB_ULPI
+        help
+          Include support for Phytec pcm043 platform. This includes
+          specific configurations for the board and its peripherals.
+
+config MACH_MX35_3DS
+        bool "Support MX35PDK platform"
+        select SOC_IMX35
+        select MXC_DEBUG_BOARD
+        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_MXC_NAND
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        help
+          Include support for MX35PDK platform. This includes specific
+          configurations for the board and its peripherals.
+
+config MACH_EUKREA_CPUIMX35
+        bool "Support Eukrea CPUIMX35 Platform"
+        select SOC_IMX35
+        select IMX_HAVE_PLATFORM_FLEXCAN
+        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_MXC_NAND
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select MXC_ULPI if USB_ULPI
+        help
+          Include support for Eukrea CPUIMX35 platform. This includes
+          specific configurations for the board and its peripherals.
+
+choice
+        prompt "Baseboard"
+        depends on MACH_EUKREA_CPUIMX35
+        default MACH_EUKREA_MBIMXSD35_BASEBOARD
+
+config MACH_EUKREA_MBIMXSD35_BASEBOARD
+        bool "Eukrea MBIMXSD development board"
+        select IMX_HAVE_PLATFORM_GPIO_KEYS
+        select IMX_HAVE_PLATFORM_IMX_SSI
+        select IMX_HAVE_PLATFORM_IPU_CORE
+        help
+          This adds board specific devices that can be found on Eukrea's
+          MBIMXSD evaluation board.
+
+endchoice
+
+config MACH_VPR200
+        bool "Support VPR200 platform"
+        select SOC_IMX35
+        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
+        select IMX_HAVE_PLATFORM_GPIO_KEYS
+        select IMX_HAVE_PLATFORM_IMX2_WDT
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IPU_CORE
+        select IMX_HAVE_PLATFORM_MXC_EHCI
+        select IMX_HAVE_PLATFORM_MXC_NAND
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        help
+          Include support for VPR200 platform. This includes specific
+          configurations for the board and its peripherals.
+
+endif
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index b85794d27991..e9eb36dad888 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -1,9 +1,3 @@
-#
-# Makefile for the linux kernel.
-#
-
-# Object file lists.
-
 obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o
 
 obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o
@@ -14,18 +8,27 @@ obj-$(CONFIG_ARCH_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o
 obj-$(CONFIG_MACH_MX27) += cpu-imx27.o pm-imx27.o
 obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o ehci-imx27.o
 
+obj-$(CONFIG_SOC_IMX31) += mm-imx31.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o
+obj-$(CONFIG_SOC_IMX35) += mm-imx35.o cpu-imx35.o clock-imx35.o ehci-imx35.o
+obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o
+
 # Support for CMOS sensor interface
-obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
+obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
 
+# i.MX1 based machines
 obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
 obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
+obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
 
+# i.MX21 based machines
 obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
 
+# i.MX25 based machines
 obj-$(CONFIG_MACH_MX25_3DS) += mach-mx25_3ds.o
 obj-$(CONFIG_MACH_EUKREA_CPUIMX25) += mach-eukrea_cpuimx25.o
 obj-$(CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD) += eukrea_mbimxsd25-baseboard.o
 
+# i.MX27 based machines
 obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o
 obj-$(CONFIG_MACH_PCM038) += mach-pcm038.o
 obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o
@@ -37,3 +40,24 @@ obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o
 obj-$(CONFIG_MACH_PCA100) += mach-pca100.o
 obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
 obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
+
+# i.MX31 based machines
+obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
+obj-$(CONFIG_MACH_MX31LILLY) += mach-mx31lilly.o mx31lilly-db.o
+obj-$(CONFIG_MACH_MX31LITE) += mach-mx31lite.o mx31lite-db.o
+obj-$(CONFIG_MACH_PCM037) += mach-pcm037.o
+obj-$(CONFIG_MACH_PCM037_EET) += mach-pcm037_eet.o
+obj-$(CONFIG_MACH_MX31_3DS) += mach-mx31_3ds.o
+obj-$(CONFIG_MACH_MX31MOBOARD) += mach-mx31moboard.o mx31moboard-devboard.o \
+                mx31moboard-marxbot.o mx31moboard-smartbot.o
+obj-$(CONFIG_MACH_QONG) += mach-qong.o
+obj-$(CONFIG_MACH_ARMADILLO5X0) += mach-armadillo5x0.o
+obj-$(CONFIG_MACH_KZM_ARM11_01) += mach-kzm_arm11_01.o
+obj-$(CONFIG_MACH_BUG) += mach-bug.o
+
+# i.MX35 based machines
+obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o
+obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35_3ds.o
+obj-$(CONFIG_MACH_EUKREA_CPUIMX35) += mach-cpuimx35.o
+obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD) += eukrea_mbimxsd35-baseboard.o
+obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o
diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot
index 3953d60bff0b..ebee18b3884c 100644
--- a/arch/arm/mach-imx/Makefile.boot
+++ b/arch/arm/mach-imx/Makefile.boot
@@ -13,3 +13,7 @@ initrd_phys-$(CONFIG_ARCH_MX25)	:= 0x80800000
 zreladdr-$(CONFIG_MACH_MX27)    := 0xA0008000
 params_phys-$(CONFIG_MACH_MX27) := 0xA0000100
 initrd_phys-$(CONFIG_MACH_MX27) := 0xA0800000
+
+zreladdr-$(CONFIG_ARCH_MX3)     := 0x80008000
+params_phys-$(CONFIG_ARCH_MX3)  := 0x80000100
+initrd_phys-$(CONFIG_ARCH_MX3)  := 0x80800000
diff --git a/arch/arm/mach-imx/cache-l2x0.c b/arch/arm/mach-imx/cache-l2x0.c
new file mode 100644
index 000000000000..69d1322add3c
--- /dev/null
+++ b/arch/arm/mach-imx/cache-l2x0.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2009-2010 Pengutronix
+ * Sascha Hauer <s.hauer@pengutronix.de>
+ * Juergen Beisert <j.beisert@pengutronix.de>
+ *
+ * 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/err.h>
+#include <linux/kernel.h>
+
+#include <asm/hardware/cache-l2x0.h>
+
+#include <mach/hardware.h>
+
+static int mxc_init_l2x0(void)
+{
+        void __iomem *l2x0_base;
+        void __iomem *clkctl_base;
+
+        if (!cpu_is_mx31() && !cpu_is_mx35())
+                return 0;
+
+/*
+ * First of all, we must repair broken chip settings. There are some
+ * i.MX35 CPUs in the wild, comming with bogus L2 cache settings. These
+ * misconfigured CPUs will run amok immediately when the L2 cache gets enabled.
+ * Workaraound is to setup the correct register setting prior enabling the
+ * L2 cache. This should not hurt already working CPUs, as they are using the
+ * same value.
+ */
+#define L2_MEM_VAL 0x10
+
+        clkctl_base = ioremap(MX35_CLKCTL_BASE_ADDR, 4096);
+        if (clkctl_base != NULL) {
+                writel(0x00000515, clkctl_base + L2_MEM_VAL);
+                iounmap(clkctl_base);
+        } else {
+                pr_err("L2 cache: Cannot fix timing. Trying to continue without\n");
+        }
+
+        l2x0_base = ioremap(MX3x_L2CC_BASE_ADDR, 4096);
+        if (IS_ERR(l2x0_base)) {
+                printk(KERN_ERR "remapping L2 cache area failed with %ld\n",
+                                PTR_ERR(l2x0_base));
+                return 0;
+        }
+
+        l2x0_init(l2x0_base, 0x00030024, 0x00000000);
+
+        return 0;
+}
+arch_initcall(mxc_init_l2x0);
diff --git a/arch/arm/mach-mx3/clock-imx31.c b/arch/arm/mach-imx/clock-imx31.c
index d423cac8cab7..25f343fca2b9 100644
--- a/arch/arm/mach-mx3/clock-imx31.c
+++ b/arch/arm/mach-imx/clock-imx31.c
@@ -32,7 +32,7 @@
 #include <mach/mx31.h>
 #include <mach/common.h>
 
-#include "crm_regs.h"
+#include "crmregs-imx31.h"
 
 #define PRE_DIV_MIN_FREQ    10000000 /* Minimum Frequency after Predivider */
 
@@ -627,4 +627,3 @@ int __init mx31_clocks_init(unsigned long fref)
 
         return 0;
 }
-
diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-imx/clock-imx35.c
index 448a038cd1ec..5a4cc1ea405b 100644
--- a/arch/arm/mach-mx3/clock-imx35.c
+++ b/arch/arm/mach-imx/clock-imx35.c
@@ -547,4 +547,3 @@ int __init mx35_clocks_init()
 
         return 0;
 }
-
diff --git a/arch/arm/mach-mx3/cpu.c b/arch/arm/mach-imx/cpu-imx31.c
index d1d339576fdf..a3780700a882 100644
--- a/arch/arm/mach-mx3/cpu.c
+++ b/arch/arm/mach-imx/cpu-imx31.c
@@ -1,5 +1,5 @@
 /*
- * MX3 CPU type detection
+ * MX31 CPU type detection
  *
  * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
  *
@@ -17,14 +17,12 @@
 unsigned int mx31_cpu_rev;
 EXPORT_SYMBOL(mx31_cpu_rev);
 
-struct mx3_cpu_type {
+static struct {
         u8 srev;
         const char *name;
         const char *v;
         unsigned int rev;
-};
-
-static struct mx3_cpu_type mx31_cpu_type[] __initdata = {
+} mx31_cpu_type[] __initdata = {
         { .srev = 0x00, .name = "i.MX31(L)", .v = "1.0",  .rev = IMX_CHIP_REVISION_1_0  },
         { .srev = 0x10, .name = "i.MX31",    .v = "1.1",  .rev = IMX_CHIP_REVISION_1_1  },
         { .srev = 0x11, .name = "i.MX31L",   .v = "1.1",  .rev = IMX_CHIP_REVISION_1_1  },
@@ -57,33 +55,3 @@ void __init mx31_read_cpu_rev(void)
 
         printk(KERN_WARNING "Unknown CPU identifier. srev = %02x\n", srev);
 }
-
-unsigned int mx35_cpu_rev;
-EXPORT_SYMBOL(mx35_cpu_rev);
-
-void __init mx35_read_cpu_rev(void)
-{
-        u32 rev;
-        char *srev;
-
-        rev = __raw_readl(MX35_IO_ADDRESS(MX35_IIM_BASE_ADDR + MXC_IIMSREV));
-        switch (rev) {
-        case 0x00:
-                mx35_cpu_rev = IMX_CHIP_REVISION_1_0;
-                srev = "1.0";
-                break;
-        case 0x10:
-                mx35_cpu_rev = IMX_CHIP_REVISION_2_0;
-                srev = "2.0";
-                break;
-        case 0x11:
-                mx35_cpu_rev = IMX_CHIP_REVISION_2_1;
-                srev = "2.1";
-                break;
-        default:
-                mx35_cpu_rev = IMX_CHIP_REVISION_UNKNOWN;
-                srev = "unknown";
-        }
-
-        printk(KERN_INFO "CPU identified as i.MX35, silicon rev %s\n", srev);
-}
diff --git a/arch/arm/mach-imx/cpu-imx35.c b/arch/arm/mach-imx/cpu-imx35.c
new file mode 100644
index 000000000000..6637cd819ecb
--- /dev/null
+++ b/arch/arm/mach-imx/cpu-imx35.c
@@ -0,0 +1,44 @@
+/*
+ * MX35 CPU type detection
+ *
+ * Copyright (c) 2009 Daniel Mack <daniel@caiaq.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.
+ */
+#include <linux/module.h>
+#include <linux/io.h>
+#include <mach/hardware.h>
+#include <mach/iim.h>
+
+unsigned int mx35_cpu_rev;
+EXPORT_SYMBOL(mx35_cpu_rev);
+
+void __init mx35_read_cpu_rev(void)
+{
+        u32 rev;
+        char *srev;
+
+        rev = __raw_readl(MX35_IO_ADDRESS(MX35_IIM_BASE_ADDR + MXC_IIMSREV));
+        switch (rev) {
+        case 0x00:
+                mx35_cpu_rev = IMX_CHIP_REVISION_1_0;
+                srev = "1.0";
+                break;
+        case 0x10:
+                mx35_cpu_rev = IMX_CHIP_REVISION_2_0;
+                srev = "2.0";
+                break;
+        case 0x11:
+                mx35_cpu_rev = IMX_CHIP_REVISION_2_1;
+                srev = "2.1";
+                break;
+        default:
+                mx35_cpu_rev = IMX_CHIP_REVISION_UNKNOWN;
+                srev = "unknown";
+        }
+
+        printk(KERN_INFO "CPU identified as i.MX35, silicon rev %s\n", srev);
+}
diff --git a/arch/arm/mach-mx3/crm_regs.h b/arch/arm/mach-imx/crmregs-imx31.h
index 37a8a07beda3..37a8a07beda3 100644
--- a/arch/arm/mach-mx3/crm_regs.h
+++ b/arch/arm/mach-imx/crmregs-imx31.h
diff --git a/arch/arm/mach-imx/devices-imx1.h b/arch/arm/mach-imx/devices-imx1.h
index da593657ff3f..3aad1e70de96 100644
--- a/arch/arm/mach-imx/devices-imx1.h
+++ b/arch/arm/mach-imx/devices-imx1.h
@@ -9,21 +9,21 @@
 #include <mach/mx1.h>
 #include <mach/devices-common.h>
 
-extern const struct imx_imx_fb_data imx1_imx_fb_data __initconst;
+extern const struct imx_imx_fb_data imx1_imx_fb_data;
 #define imx1_add_imx_fb(pdata) \
     imx_add_imx_fb(&imx1_imx_fb_data, pdata)
 
-extern const struct imx_imx_i2c_data imx1_imx_i2c_data __initconst;
+extern const struct imx_imx_i2c_data imx1_imx_i2c_data;
 #define imx1_add_imx_i2c(pdata)         \
         imx_add_imx_i2c(&imx1_imx_i2c_data, pdata)
 
-extern const struct imx_imx_uart_3irq_data imx1_imx_uart_data[] __initconst;
+extern const struct imx_imx_uart_3irq_data imx1_imx_uart_data[];
 #define imx1_add_imx_uart(id, pdata)    \
         imx_add_imx_uart_3irq(&imx1_imx_uart_data[id], pdata)
 #define imx1_add_imx_uart0(pdata)       imx1_add_imx_uart(0, pdata)
 #define imx1_add_imx_uart1(pdata)       imx1_add_imx_uart(1, pdata)
 
-extern const struct imx_spi_imx_data imx1_cspi_data[] __initconst;
+extern const struct imx_spi_imx_data imx1_cspi_data[];
 #define imx1_add_cspi(id, pdata)   \
         imx_add_spi_imx(&imx1_cspi_data[id], pdata)
 
diff --git a/arch/arm/mach-imx/devices-imx21.h b/arch/arm/mach-imx/devices-imx21.h
index 16744d2d9b81..2628e0c474dc 100644
--- a/arch/arm/mach-imx/devices-imx21.h
+++ b/arch/arm/mach-imx/devices-imx21.h
@@ -9,31 +9,31 @@
 #include <mach/mx21.h>
 #include <mach/devices-common.h>
 
-extern const struct imx_imx21_hcd_data imx21_imx21_hcd_data __initconst;
+extern const struct imx_imx21_hcd_data imx21_imx21_hcd_data;
 #define imx21_add_imx21_hcd(pdata)      \
         imx_add_imx21_hcd(&imx21_imx21_hcd_data, pdata)
 
-extern const struct imx_imx2_wdt_data imx21_imx2_wdt_data __initconst;
+extern const struct imx_imx2_wdt_data imx21_imx2_wdt_data;
 #define imx21_add_imx2_wdt(pdata)       \
         imx_add_imx2_wdt(&imx21_imx2_wdt_data)
 
-extern const struct imx_imx_fb_data imx21_imx_fb_data __initconst;
+extern const struct imx_imx_fb_data imx21_imx_fb_data;
 #define imx21_add_imx_fb(pdata) \
         imx_add_imx_fb(&imx21_imx_fb_data, pdata)
 
-extern const struct imx_imx_i2c_data imx21_imx_i2c_data __initconst;
+extern const struct imx_imx_i2c_data imx21_imx_i2c_data;
 #define imx21_add_imx_i2c(pdata)        \
         imx_add_imx_i2c(&imx21_imx_i2c_data, pdata)
 
-extern const struct imx_imx_keypad_data imx21_imx_keypad_data __initconst;
+extern const struct imx_imx_keypad_data imx21_imx_keypad_data;
 #define imx21_add_imx_keypad(pdata)     \
         imx_add_imx_keypad(&imx21_imx_keypad_data, pdata)
 
-extern const struct imx_imx_ssi_data imx21_imx_ssi_data[] __initconst;
+extern const struct imx_imx_ssi_data imx21_imx_ssi_data[];
 #define imx21_add_imx_ssi(id, pdata)    \
         imx_add_imx_ssi(&imx21_imx_ssi_data[id], pdata)
 
-extern const struct imx_imx_uart_1irq_data imx21_imx_uart_data[] __initconst;
+extern const struct imx_imx_uart_1irq_data imx21_imx_uart_data[];
 #define imx21_add_imx_uart(id, pdata)   \
         imx_add_imx_uart_1irq(&imx21_imx_uart_data[id], pdata)
 #define imx21_add_imx_uart0(pdata)      imx21_add_imx_uart(0, pdata)
@@ -41,19 +41,19 @@ extern const struct imx_imx_uart_1irq_data imx21_imx_uart_data[] __initconst;
 #define imx21_add_imx_uart2(pdata)      imx21_add_imx_uart(2, pdata)
 #define imx21_add_imx_uart3(pdata)      imx21_add_imx_uart(3, pdata)
 
-extern const struct imx_mxc_mmc_data imx21_mxc_mmc_data[] __initconst;
+extern const struct imx_mxc_mmc_data imx21_mxc_mmc_data[];
 #define imx21_add_mxc_mmc(id, pdata)    \
         imx_add_mxc_mmc(&imx21_mxc_mmc_data[id], pdata)
 
-extern const struct imx_mxc_nand_data imx21_mxc_nand_data __initconst;
+extern const struct imx_mxc_nand_data imx21_mxc_nand_data;
 #define imx21_add_mxc_nand(pdata)       \
         imx_add_mxc_nand(&imx21_mxc_nand_data, pdata)
 
-extern const struct imx_mxc_w1_data imx21_mxc_w1_data __initconst;
+extern const struct imx_mxc_w1_data imx21_mxc_w1_data;
 #define imx21_add_mxc_w1(pdata) \
         imx_add_mxc_w1(&imx21_mxc_w1_data)
 
-extern const struct imx_spi_imx_data imx21_cspi_data[] __initconst;
+extern const struct imx_spi_imx_data imx21_cspi_data[];
 #define imx21_add_cspi(id, pdata)       \
         imx_add_spi_imx(&imx21_cspi_data[id], pdata)
 #define imx21_add_spi_imx0(pdata)       imx21_add_cspi(0, pdata)
diff --git a/arch/arm/mach-imx/devices-imx25.h b/arch/arm/mach-imx/devices-imx25.h
index b591d72f6037..efa0761c508d 100644
--- a/arch/arm/mach-imx/devices-imx25.h
+++ b/arch/arm/mach-imx/devices-imx25.h
@@ -9,48 +9,48 @@
 #include <mach/mx25.h>
 #include <mach/devices-common.h>
 
-extern const struct imx_fec_data imx25_fec_data __initconst;
+extern const struct imx_fec_data imx25_fec_data;
 #define imx25_add_fec(pdata)    \
         imx_add_fec(&imx25_fec_data, pdata)
 
-extern const struct imx_flexcan_data imx25_flexcan_data[] __initconst;
+extern const struct imx_flexcan_data imx25_flexcan_data[];
 #define imx25_add_flexcan(id, pdata)    \
         imx_add_flexcan(&imx25_flexcan_data[id], pdata)
 #define imx25_add_flexcan0(pdata)       imx25_add_flexcan(0, pdata)
 #define imx25_add_flexcan1(pdata)       imx25_add_flexcan(1, pdata)
 
-extern const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst;
+extern const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data;
 #define imx25_add_fsl_usb2_udc(pdata)   \
         imx_add_fsl_usb2_udc(&imx25_fsl_usb2_udc_data, pdata)
 
-extern struct imx_imxdi_rtc_data imx25_imxdi_rtc_data __initconst;
+extern struct imx_imxdi_rtc_data imx25_imxdi_rtc_data;
 #define imx25_add_imxdi_rtc(pdata)      \
         imx_add_imxdi_rtc(&imx25_imxdi_rtc_data)
 
-extern const struct imx_imx2_wdt_data imx25_imx2_wdt_data __initconst;
+extern const struct imx_imx2_wdt_data imx25_imx2_wdt_data;
 #define imx25_add_imx2_wdt(pdata)       \
         imx_add_imx2_wdt(&imx25_imx2_wdt_data)
 
-extern const struct imx_imx_fb_data imx25_imx_fb_data __initconst;
+extern const struct imx_imx_fb_data imx25_imx_fb_data;
 #define imx25_add_imx_fb(pdata) \
         imx_add_imx_fb(&imx25_imx_fb_data, pdata)
 
-extern const struct imx_imx_i2c_data imx25_imx_i2c_data[] __initconst;
+extern const struct imx_imx_i2c_data imx25_imx_i2c_data[];
 #define imx25_add_imx_i2c(id, pdata)    \
         imx_add_imx_i2c(&imx25_imx_i2c_data[id], pdata)
 #define imx25_add_imx_i2c0(pdata)       imx25_add_imx_i2c(0, pdata)
 #define imx25_add_imx_i2c1(pdata)       imx25_add_imx_i2c(1, pdata)
 #define imx25_add_imx_i2c2(pdata)       imx25_add_imx_i2c(2, pdata)
 
-extern const struct imx_imx_keypad_data imx25_imx_keypad_data __initconst;
+extern const struct imx_imx_keypad_data imx25_imx_keypad_data;
 #define imx25_add_imx_keypad(pdata)     \
         imx_add_imx_keypad(&imx25_imx_keypad_data, pdata)
 
-extern const struct imx_imx_ssi_data imx25_imx_ssi_data[] __initconst;
+extern const struct imx_imx_ssi_data imx25_imx_ssi_data[];
 #define imx25_add_imx_ssi(id, pdata)    \
         imx_add_imx_ssi(&imx25_imx_ssi_data[id], pdata)
 
-extern const struct imx_imx_uart_1irq_data imx25_imx_uart_data[] __initconst;
+extern const struct imx_imx_uart_1irq_data imx25_imx_uart_data[];
 #define imx25_add_imx_uart(id, pdata)   \
         imx_add_imx_uart_1irq(&imx25_imx_uart_data[id], pdata)
 #define imx25_add_imx_uart0(pdata)      imx25_add_imx_uart(0, pdata)
@@ -59,33 +59,32 @@ extern const struct imx_imx_uart_1irq_data imx25_imx_uart_data[] __initconst;
 #define imx25_add_imx_uart3(pdata)      imx25_add_imx_uart(3, pdata)
 #define imx25_add_imx_uart4(pdata)      imx25_add_imx_uart(4, pdata)
 
-extern const struct imx_mx2_camera_data imx25_mx2_camera_data __initconst;
+extern const struct imx_mx2_camera_data imx25_mx2_camera_data;
 #define imx25_add_mx2_camera(pdata)     \
         imx_add_mx2_camera(&imx25_mx2_camera_data, pdata)
 
-extern const struct imx_mxc_ehci_data imx25_mxc_ehci_otg_data __initconst;
+extern const struct imx_mxc_ehci_data imx25_mxc_ehci_otg_data;
 #define imx25_add_mxc_ehci_otg(pdata)   \
         imx_add_mxc_ehci(&imx25_mxc_ehci_otg_data, pdata)
-extern const struct imx_mxc_ehci_data imx25_mxc_ehci_hs_data __initconst;
+extern const struct imx_mxc_ehci_data imx25_mxc_ehci_hs_data;
 #define imx25_add_mxc_ehci_hs(pdata)    \
         imx_add_mxc_ehci(&imx25_mxc_ehci_hs_data, pdata)
 
-extern const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst;
+extern const struct imx_mxc_nand_data imx25_mxc_nand_data;
 #define imx25_add_mxc_nand(pdata)       \
         imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)
 
-extern const struct imx_sdhci_esdhc_imx_data
-imx25_sdhci_esdhc_imx_data[] __initconst;
+extern const struct imx_sdhci_esdhc_imx_data imx25_sdhci_esdhc_imx_data[];
 #define imx25_add_sdhci_esdhc_imx(id, pdata)    \
         imx_add_sdhci_esdhc_imx(&imx25_sdhci_esdhc_imx_data[id], pdata)
 
-extern const struct imx_spi_imx_data imx25_cspi_data[] __initconst;
+extern const struct imx_spi_imx_data imx25_cspi_data[];
 #define imx25_add_spi_imx(id, pdata)    \
         imx_add_spi_imx(&imx25_cspi_data[id], pdata)
 #define imx25_add_spi_imx0(pdata)       imx25_add_spi_imx(0, pdata)
 #define imx25_add_spi_imx1(pdata)       imx25_add_spi_imx(1, pdata)
 #define imx25_add_spi_imx2(pdata)       imx25_add_spi_imx(2, pdata)
 
-extern struct imx_mxc_pwm_data imx25_mxc_pwm_data[] __initconst;
+extern struct imx_mxc_pwm_data imx25_mxc_pwm_data[];
 #define imx25_add_mxc_pwm(id)   \
         imx_add_mxc_pwm(&imx25_mxc_pwm_data[id])
diff --git a/arch/arm/mach-imx/devices-imx27.h b/arch/arm/mach-imx/devices-imx27.h
index f1272d4b5a33..7f97a3cdd41d 100644
--- a/arch/arm/mach-imx/devices-imx27.h
+++ b/arch/arm/mach-imx/devices-imx27.h
@@ -9,35 +9,35 @@
 #include <mach/mx27.h>
 #include <mach/devices-common.h>
 
-extern const struct imx_fec_data imx27_fec_data __initconst;
+extern const struct imx_fec_data imx27_fec_data;
 #define imx27_add_fec(pdata)    \
         imx_add_fec(&imx27_fec_data, pdata)
 
-extern const struct imx_fsl_usb2_udc_data imx27_fsl_usb2_udc_data __initconst;
+extern const struct imx_fsl_usb2_udc_data imx27_fsl_usb2_udc_data;
 #define imx27_add_fsl_usb2_udc(pdata)   \
         imx_add_fsl_usb2_udc(&imx27_fsl_usb2_udc_data, pdata)
 
-extern const struct imx_imx2_wdt_data imx27_imx2_wdt_data __initconst;
+extern const struct imx_imx2_wdt_data imx27_imx2_wdt_data;
 #define imx27_add_imx2_wdt(pdata)       \
         imx_add_imx2_wdt(&imx27_imx2_wdt_data)
 
-extern const struct imx_imx_fb_data imx27_imx_fb_data __initconst;
+extern const struct imx_imx_fb_data imx27_imx_fb_data;
 #define imx27_add_imx_fb(pdata) \
         imx_add_imx_fb(&imx27_imx_fb_data, pdata)
 
-extern const struct imx_imx_i2c_data imx27_imx_i2c_data[] __initconst;
+extern const struct imx_imx_i2c_data imx27_imx_i2c_data[];
 #define imx27_add_imx_i2c(id, pdata)    \
         imx_add_imx_i2c(&imx27_imx_i2c_data[id], pdata)
 
-extern const struct imx_imx_keypad_data imx27_imx_keypad_data __initconst;
+extern const struct imx_imx_keypad_data imx27_imx_keypad_data;
 #define imx27_add_imx_keypad(pdata)     \
         imx_add_imx_keypad(&imx27_imx_keypad_data, pdata)
 
-extern const struct imx_imx_ssi_data imx27_imx_ssi_data[] __initconst;
+extern const struct imx_imx_ssi_data imx27_imx_ssi_data[];
 #define imx27_add_imx_ssi(id, pdata)    \
         imx_add_imx_ssi(&imx27_imx_ssi_data[id], pdata)
 
-extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[] __initconst;
+extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[];
 #define imx27_add_imx_uart(id, pdata)   \
         imx_add_imx_uart_1irq(&imx27_imx_uart_data[id], pdata)
 #define imx27_add_imx_uart0(pdata)      imx27_add_imx_uart(0, pdata)
@@ -47,30 +47,30 @@ extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[] __initconst;
 #define imx27_add_imx_uart4(pdata)      imx27_add_imx_uart(4, pdata)
 #define imx27_add_imx_uart5(pdata)      imx27_add_imx_uart(5, pdata)
 
-extern const struct imx_mx2_camera_data imx27_mx2_camera_data __initconst;
+extern const struct imx_mx2_camera_data imx27_mx2_camera_data;
 #define imx27_add_mx2_camera(pdata)     \
         imx_add_mx2_camera(&imx27_mx2_camera_data, pdata)
 
-extern const struct imx_mxc_ehci_data imx27_mxc_ehci_otg_data __initconst;
+extern const struct imx_mxc_ehci_data imx27_mxc_ehci_otg_data;
 #define imx27_add_mxc_ehci_otg(pdata)   \
         imx_add_mxc_ehci(&imx27_mxc_ehci_otg_data, pdata)
-extern const struct imx_mxc_ehci_data imx27_mxc_ehci_hs_data[] __initconst;
+extern const struct imx_mxc_ehci_data imx27_mxc_ehci_hs_data[];
 #define imx27_add_mxc_ehci_hs(id, pdata)        \
         imx_add_mxc_ehci(&imx27_mxc_ehci_hs_data[id - 1], pdata)
 
-extern const struct imx_mxc_mmc_data imx27_mxc_mmc_data[] __initconst;
+extern const struct imx_mxc_mmc_data imx27_mxc_mmc_data[];
 #define imx27_add_mxc_mmc(id, pdata)    \
         imx_add_mxc_mmc(&imx27_mxc_mmc_data[id], pdata)
 
-extern const struct imx_mxc_nand_data imx27_mxc_nand_data __initconst;
+extern const struct imx_mxc_nand_data imx27_mxc_nand_data;
 #define imx27_add_mxc_nand(pdata)       \
         imx_add_mxc_nand(&imx27_mxc_nand_data, pdata)
 
-extern const struct imx_mxc_w1_data imx27_mxc_w1_data __initconst;
+extern const struct imx_mxc_w1_data imx27_mxc_w1_data;
 #define imx27_add_mxc_w1(pdata) \
         imx_add_mxc_w1(&imx27_mxc_w1_data)
 
-extern const struct imx_spi_imx_data imx27_cspi_data[] __initconst;
+extern const struct imx_spi_imx_data imx27_cspi_data[];
 #define imx27_add_cspi(id, pdata)       \
         imx_add_spi_imx(&imx27_cspi_data[id], pdata)
 #define imx27_add_spi_imx0(pdata)       imx27_add_cspi(0, pdata)
diff --git a/arch/arm/mach-mx3/devices-imx31.h b/arch/arm/mach-imx/devices-imx31.h
index 40f4e848a671..dbe940d9c53a 100644
--- a/arch/arm/mach-mx3/devices-imx31.h
+++ b/arch/arm/mach-imx/devices-imx31.h
@@ -9,30 +9,30 @@
 #include <mach/mx31.h>
 #include <mach/devices-common.h>
 
-extern const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data __initconst;
+extern const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data;
 #define imx31_add_fsl_usb2_udc(pdata)   \
         imx_add_fsl_usb2_udc(&imx31_fsl_usb2_udc_data, pdata)
 
-extern const struct imx_imx2_wdt_data imx31_imx2_wdt_data __initconst;
+extern const struct imx_imx2_wdt_data imx31_imx2_wdt_data;
 #define imx31_add_imx2_wdt(pdata)       \
         imx_add_imx2_wdt(&imx31_imx2_wdt_data)
 
-extern const struct imx_imx_i2c_data imx31_imx_i2c_data[] __initconst;
+extern const struct imx_imx_i2c_data imx31_imx_i2c_data[];
 #define imx31_add_imx_i2c(id, pdata)    \
         imx_add_imx_i2c(&imx31_imx_i2c_data[id], pdata)
 #define imx31_add_imx_i2c0(pdata)       imx31_add_imx_i2c(0, pdata)
 #define imx31_add_imx_i2c1(pdata)       imx31_add_imx_i2c(1, pdata)
 #define imx31_add_imx_i2c2(pdata)       imx31_add_imx_i2c(2, pdata)
 
-extern const struct imx_imx_keypad_data imx31_imx_keypad_data __initconst;
+extern const struct imx_imx_keypad_data imx31_imx_keypad_data;
 #define imx31_add_imx_keypad(pdata)     \
         imx_add_imx_keypad(&imx31_imx_keypad_data, pdata)
 
-extern const struct imx_imx_ssi_data imx31_imx_ssi_data[] __initconst;
+extern const struct imx_imx_ssi_data imx31_imx_ssi_data[];
 #define imx31_add_imx_ssi(id, pdata)    \
         imx_add_imx_ssi(&imx31_imx_ssi_data[id], pdata)
 
-extern const struct imx_imx_uart_1irq_data imx31_imx_uart_data[] __initconst;
+extern const struct imx_imx_uart_1irq_data imx31_imx_uart_data[];
 #define imx31_add_imx_uart(id, pdata)   \
         imx_add_imx_uart_1irq(&imx31_imx_uart_data[id], pdata)
 #define imx31_add_imx_uart0(pdata)      imx31_add_imx_uart(0, pdata)
@@ -41,26 +41,38 @@ extern const struct imx_imx_uart_1irq_data imx31_imx_uart_data[] __initconst;
 #define imx31_add_imx_uart3(pdata)      imx31_add_imx_uart(3, pdata)
 #define imx31_add_imx_uart4(pdata)      imx31_add_imx_uart(4, pdata)
 
-extern const struct imx_mxc_ehci_data imx31_mxc_ehci_otg_data __initconst;
+extern const struct imx_ipu_core_data imx31_ipu_core_data;
+#define imx31_add_ipu_core(pdata)       \
+        imx_add_ipu_core(&imx31_ipu_core_data, pdata)
+#define imx31_alloc_mx3_camera(pdata)   \
+        imx_alloc_mx3_camera(&imx31_ipu_core_data, pdata)
+#define imx31_add_mx3_sdc_fb(pdata)     \
+        imx_add_mx3_sdc_fb(&imx31_ipu_core_data, pdata)
+
+extern const struct imx_mxc_ehci_data imx31_mxc_ehci_otg_data;
 #define imx31_add_mxc_ehci_otg(pdata)   \
         imx_add_mxc_ehci(&imx31_mxc_ehci_otg_data, pdata)
-extern const struct imx_mxc_ehci_data imx31_mxc_ehci_hs_data[] __initconst;
+extern const struct imx_mxc_ehci_data imx31_mxc_ehci_hs_data[];
 #define imx31_add_mxc_ehci_hs(id, pdata)        \
         imx_add_mxc_ehci(&imx31_mxc_ehci_hs_data[id - 1], pdata)
 
-extern const struct imx_mxc_mmc_data imx31_mxc_mmc_data[] __initconst;
+extern const struct imx_mxc_mmc_data imx31_mxc_mmc_data[];
 #define imx31_add_mxc_mmc(id, pdata)    \
         imx_add_mxc_mmc(&imx31_mxc_mmc_data[id], pdata)
 
-extern const struct imx_mxc_nand_data imx31_mxc_nand_data __initconst;
+extern const struct imx_mxc_nand_data imx31_mxc_nand_data;
 #define imx31_add_mxc_nand(pdata)       \
         imx_add_mxc_nand(&imx31_mxc_nand_data, pdata)
 
-extern const struct imx_mxc_w1_data imx31_mxc_w1_data __initconst;
+extern const struct imx_mxc_rtc_data imx31_mxc_rtc_data;
+#define imx31_add_mxc_rtc(pdata)        \
+        imx_add_mxc_rtc(&imx31_mxc_rtc_data)
+
+extern const struct imx_mxc_w1_data imx31_mxc_w1_data;
 #define imx31_add_mxc_w1(pdata) \
         imx_add_mxc_w1(&imx31_mxc_w1_data)
 
-extern const struct imx_spi_imx_data imx31_cspi_data[] __initconst;
+extern const struct imx_spi_imx_data imx31_cspi_data[];
 #define imx31_add_cspi(id, pdata)       \
         imx_add_spi_imx(&imx31_cspi_data[id], pdata)
 #define imx31_add_spi_imx0(pdata)       imx31_add_cspi(0, pdata)
diff --git a/arch/arm/mach-mx3/devices-imx35.h b/arch/arm/mach-imx/devices-imx35.h
index d545d86cc202..234cbd3c18af 100644
--- a/arch/arm/mach-mx3/devices-imx35.h
+++ b/arch/arm/mach-imx/devices-imx35.h
@@ -9,67 +9,74 @@
 #include <mach/mx35.h>
 #include <mach/devices-common.h>
 
-extern const struct imx_fec_data imx35_fec_data __initconst;
+extern const struct imx_fec_data imx35_fec_data;
 #define imx35_add_fec(pdata)    \
         imx_add_fec(&imx35_fec_data, pdata)
 
-extern const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data __initconst;
+extern const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data;
 #define imx35_add_fsl_usb2_udc(pdata)   \
         imx_add_fsl_usb2_udc(&imx35_fsl_usb2_udc_data, pdata)
 
-extern const struct imx_flexcan_data imx35_flexcan_data[] __initconst;
+extern const struct imx_flexcan_data imx35_flexcan_data[];
 #define imx35_add_flexcan(id, pdata)    \
         imx_add_flexcan(&imx35_flexcan_data[id], pdata)
 #define imx35_add_flexcan0(pdata)       imx35_add_flexcan(0, pdata)
 #define imx35_add_flexcan1(pdata)       imx35_add_flexcan(1, pdata)
 
-extern const struct imx_imx2_wdt_data imx35_imx2_wdt_data __initconst;
+extern const struct imx_imx2_wdt_data imx35_imx2_wdt_data;
 #define imx35_add_imx2_wdt(pdata)       \
         imx_add_imx2_wdt(&imx35_imx2_wdt_data)
 
-extern const struct imx_imx_i2c_data imx35_imx_i2c_data[] __initconst;
+extern const struct imx_imx_i2c_data imx35_imx_i2c_data[];
 #define imx35_add_imx_i2c(id, pdata)    \
         imx_add_imx_i2c(&imx35_imx_i2c_data[id], pdata)
 #define imx35_add_imx_i2c0(pdata)       imx35_add_imx_i2c(0, pdata)
 #define imx35_add_imx_i2c1(pdata)       imx35_add_imx_i2c(1, pdata)
 #define imx35_add_imx_i2c2(pdata)       imx35_add_imx_i2c(2, pdata)
 
-extern const struct imx_imx_keypad_data imx35_imx_keypad_data __initconst;
+extern const struct imx_imx_keypad_data imx35_imx_keypad_data;
 #define imx35_add_imx_keypad(pdata)     \
         imx_add_imx_keypad(&imx35_imx_keypad_data, pdata)
 
-extern const struct imx_imx_ssi_data imx35_imx_ssi_data[] __initconst;
+extern const struct imx_imx_ssi_data imx35_imx_ssi_data[];
 #define imx35_add_imx_ssi(id, pdata)    \
         imx_add_imx_ssi(&imx35_imx_ssi_data[id], pdata)
 
-extern const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst;
+extern const struct imx_imx_uart_1irq_data imx35_imx_uart_data[];
 #define imx35_add_imx_uart(id, pdata)   \
         imx_add_imx_uart_1irq(&imx35_imx_uart_data[id], pdata)
 #define imx35_add_imx_uart0(pdata)      imx35_add_imx_uart(0, pdata)
 #define imx35_add_imx_uart1(pdata)      imx35_add_imx_uart(1, pdata)
 #define imx35_add_imx_uart2(pdata)      imx35_add_imx_uart(2, pdata)
 
-extern const struct imx_mxc_ehci_data imx35_mxc_ehci_otg_data __initconst;
+extern const struct imx_ipu_core_data imx35_ipu_core_data;
+#define imx35_add_ipu_core(pdata)       \
+        imx_add_ipu_core(&imx35_ipu_core_data, pdata)
+#define imx35_alloc_mx3_camera(pdata)   \
+        imx_alloc_mx3_camera(&imx35_ipu_core_data, pdata)
+#define imx35_add_mx3_sdc_fb(pdata)     \
+        imx_add_mx3_sdc_fb(&imx35_ipu_core_data, pdata)
+
+extern const struct imx_mxc_ehci_data imx35_mxc_ehci_otg_data;
 #define imx35_add_mxc_ehci_otg(pdata)   \
         imx_add_mxc_ehci(&imx35_mxc_ehci_otg_data, pdata)
-extern const struct imx_mxc_ehci_data imx35_mxc_ehci_hs_data __initconst;
+extern const struct imx_mxc_ehci_data imx35_mxc_ehci_hs_data;
 #define imx35_add_mxc_ehci_hs(pdata)    \
         imx_add_mxc_ehci(&imx35_mxc_ehci_hs_data, pdata)
 
-extern const struct imx_mxc_nand_data imx35_mxc_nand_data __initconst;
+extern const struct imx_mxc_nand_data imx35_mxc_nand_data;
 #define imx35_add_mxc_nand(pdata)       \
         imx_add_mxc_nand(&imx35_mxc_nand_data, pdata)
 
-extern const struct imx_mxc_w1_data imx35_mxc_w1_data __initconst;
+extern const struct imx_mxc_w1_data imx35_mxc_w1_data;
 #define imx35_add_mxc_w1(pdata) \
         imx_add_mxc_w1(&imx35_mxc_w1_data)
 
-extern const struct imx_sdhci_esdhc_imx_data
-imx35_sdhci_esdhc_imx_data[] __initconst;
+extern const struct imx_sdhci_esdhc_imx_data imx35_sdhci_esdhc_imx_data[];
 #define imx35_add_sdhci_esdhc_imx(id, pdata)    \
         imx_add_sdhci_esdhc_imx(&imx35_sdhci_esdhc_imx_data[id], pdata)
 
-extern const struct imx_spi_imx_data imx35_cspi_data[] __initconst;
+extern const struct imx_spi_imx_data imx35_cspi_data[];
 #define imx35_add_cspi(id, pdata)       \
         imx_add_spi_imx(&imx35_cspi_data[id], pdata)
 #define imx35_add_spi_imx0(pdata)       imx35_add_cspi(0, pdata)
diff --git a/arch/arm/mach-mx3/ehci-imx31.c b/arch/arm/mach-imx/ehci-imx31.c
index 314a983ac614..faad0f15ac7f 100644
--- a/arch/arm/mach-mx3/ehci-imx31.c
+++ b/arch/arm/mach-imx/ehci-imx31.c
@@ -80,4 +80,3 @@ int mx31_initialize_usb_hw(int port, unsigned int flags)
 
         return 0;
 }
-
diff --git a/arch/arm/mach-mx3/ehci-imx35.c b/arch/arm/mach-imx/ehci-imx35.c
index 33983a478c6b..001ec3971f5d 100644
--- a/arch/arm/mach-mx3/ehci-imx35.c
+++ b/arch/arm/mach-imx/ehci-imx35.c
@@ -77,4 +77,3 @@ int mx35_initialize_usb_hw(int port, unsigned int flags)
 
         return 0;
 }
-
diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
index fa5288018ba7..5911281da5f5 100644
--- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
@@ -32,7 +32,6 @@
 #include <mach/common.h>
 #include <mach/iomux-mx27.h>
 #include <mach/hardware.h>
-#include <mach/spi.h>
 #include <mach/audmux.h>
 
 #include "devices-imx27.h"
diff --git a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
index 6269053505f7..f9ef04acdab1 100644
--- a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
@@ -22,7 +22,6 @@
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/platform_device.h>
-#include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <video/platform_lcd.h>
 
@@ -32,9 +31,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/mx25.h>
-#include <mach/imx-uart.h>
 #include <mach/audmux.h>
-#include <mach/esdhc.h>
 
 #include "devices-imx25.h"
 
@@ -208,23 +205,14 @@ static struct gpio_keys_button eukrea_mbimxsd_gpio_buttons[] = {
         },
 };
 
-static struct gpio_keys_platform_data eukrea_mbimxsd_button_data = {
+static const struct gpio_keys_platform_data
+                eukrea_mbimxsd_button_data __initconst = {
         .buttons        = eukrea_mbimxsd_gpio_buttons,
         .nbuttons       = ARRAY_SIZE(eukrea_mbimxsd_gpio_buttons),
 };
 
-static struct platform_device eukrea_mbimxsd_button_device = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .num_resources  = 0,
-        .dev            = {
-                .platform_data  = &eukrea_mbimxsd_button_data,
-        }
-};
-
 static struct platform_device *platform_devices[] __initdata = {
         &eukrea_mbimxsd_leds_gpio,
-        &eukrea_mbimxsd_button_device,
         &eukrea_mbimxsd_lcd_powerdev,
 };
 
@@ -299,4 +287,5 @@ void __init eukrea_mbimxsd25_baseboard_init(void)
                                 ARRAY_SIZE(eukrea_mbimxsd_i2c_devices));
 
         platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+        imx_add_gpio_keys(&eukrea_mbimxsd_button_data);
 }
diff --git a/arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
index 2e288b38b4ad..4909ea05855a 100644
--- a/arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
@@ -26,7 +26,6 @@
 #include <linux/interrupt.h>
 #include <linux/leds.h>
 #include <linux/platform_device.h>
-#include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <video/platform_lcd.h>
 #include <linux/i2c.h>
@@ -38,15 +37,10 @@
 
 #include <mach/hardware.h>
 #include <mach/common.h>
-#include <mach/imx-uart.h>
 #include <mach/iomux-mx35.h>
-#include <mach/ipu.h>
-#include <mach/mx3fb.h>
 #include <mach/audmux.h>
-#include <mach/esdhc.h>
 
 #include "devices-imx35.h"
-#include "devices.h"
 
 static const struct fb_videomode fb_modedb[] = {
         {
@@ -101,12 +95,11 @@ static const struct fb_videomode fb_modedb[] = {
         },
 };
 
-static struct ipu_platform_data mx3_ipu_data = {
+static const struct ipu_platform_data mx3_ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
-static struct mx3fb_platform_data mx3fb_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+static struct mx3fb_platform_data mx3fb_pdata __initdata = {
         .name           = "CMO-QVGA",
         .mode           = fb_modedb,
         .num_modes      = ARRAY_SIZE(fb_modedb),
@@ -223,23 +216,14 @@ static struct gpio_keys_button eukrea_mbimxsd_gpio_buttons[] = {
         },
 };
 
-static struct gpio_keys_platform_data eukrea_mbimxsd_button_data = {
+static const struct gpio_keys_platform_data
+                eukrea_mbimxsd_button_data __initconst = {
         .buttons        = eukrea_mbimxsd_gpio_buttons,
         .nbuttons       = ARRAY_SIZE(eukrea_mbimxsd_gpio_buttons),
 };
 
-static struct platform_device eukrea_mbimxsd_button_device = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .num_resources  = 0,
-        .dev            = {
-                .platform_data  = &eukrea_mbimxsd_button_data,
-        }
-};
-
 static struct platform_device *platform_devices[] __initdata = {
         &eukrea_mbimxsd_leds_gpio,
-        &eukrea_mbimxsd_button_device,
         &eukrea_mbimxsd_lcd_powerdev,
 };
 
@@ -292,8 +276,8 @@ void __init eukrea_mbimxsd35_baseboard_init(void)
 #endif
 
         imx35_add_imx_uart1(&uart_pdata);
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        mxc_register_device(&mx3_fb, &mx3fb_pdata);
+        imx35_add_ipu_core(&mx3_ipu_data);
+        imx35_add_mx3_sdc_fb(&mx3fb_pdata);
 
         imx35_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);
 
@@ -315,4 +299,5 @@ void __init eukrea_mbimxsd35_baseboard_init(void)
                                 ARRAY_SIZE(eukrea_mbimxsd_i2c_devices));
 
         platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+        imx_add_gpio_keys(&eukrea_mbimxsd_button_data);
 }
diff --git a/arch/arm/mach-mx3/iomux-imx31.c b/arch/arm/mach-imx/iomux-imx31.c
index cf8f8099ebd7..cf8f8099ebd7 100644
--- a/arch/arm/mach-mx3/iomux-imx31.c
+++ b/arch/arm/mach-imx/iomux-imx31.c
diff --git a/arch/arm/mach-imx/mach-apf9328.c b/arch/arm/mach-imx/mach-apf9328.c
new file mode 100644
index 000000000000..15e45c84e371
--- /dev/null
+++ b/arch/arm/mach-imx/mach-apf9328.c
@@ -0,0 +1,144 @@
+/*
+ * linux/arch/arm/mach-imx/mach-apf9328.c
+ *
+ * Copyright (c) 2005-2011 ARMadeus systems <support@armadeus.com>
+ *
+ * This work is based on mach-scb9328.c which is:
+ * Copyright (c) 2004 Sascha Hauer <saschahauer@web.de>
+ * Copyright (c) 2006-2008 Juergen Beisert <jbeisert@netscape.net>
+ *
+ * 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/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/physmap.h>
+#include <linux/dm9000.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+
+#include <mach/common.h>
+#include <mach/hardware.h>
+#include <mach/irqs.h>
+#include <mach/iomux-mx1.h>
+
+#include "devices-imx1.h"
+
+static const int apf9328_pins[] __initconst = {
+        /* UART1 */
+        PC9_PF_UART1_CTS,
+        PC10_PF_UART1_RTS,
+        PC11_PF_UART1_TXD,
+        PC12_PF_UART1_RXD,
+        /* UART2 */
+        PB28_PF_UART2_CTS,
+        PB29_PF_UART2_RTS,
+        PB30_PF_UART2_TXD,
+        PB31_PF_UART2_RXD,
+};
+
+/*
+ * The APF9328 can have up to 32MB NOR Flash
+ */
+static struct resource flash_resource = {
+        .start  = MX1_CS0_PHYS,
+        .end    = MX1_CS0_PHYS + SZ_32M - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+static struct physmap_flash_data apf9328_flash_data = {
+        .width  = 2,
+};
+
+static struct platform_device apf9328_flash_device = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev = {
+                .platform_data = &apf9328_flash_data,
+        },
+        .resource = &flash_resource,
+        .num_resources = 1,
+};
+
+/*
+ * APF9328 has a DM9000 Ethernet controller
+ */
+static struct dm9000_plat_data dm9000_setup = {
+        .flags          = DM9000_PLATF_16BITONLY
+};
+
+static struct resource dm9000_resources[] = {
+        {
+                .start  = MX1_CS4_PHYS + 0x00C00000,
+                .end    = MX1_CS4_PHYS + 0x00C00001,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = MX1_CS4_PHYS + 0x00C00002,
+                .end    = MX1_CS4_PHYS + 0x00C00003,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = IRQ_GPIOB(14),
+                .end    = IRQ_GPIOB(14),
+                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
+        },
+};
+
+static struct platform_device dm9000x_device = {
+        .name           = "dm9000",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(dm9000_resources),
+        .resource       = dm9000_resources,
+        .dev            = {
+                .platform_data = &dm9000_setup,
+        }
+};
+
+/* --- SERIAL RESSOURCE --- */
+static const struct imxuart_platform_data uart0_pdata __initconst = {
+        .flags = 0,
+};
+
+static const struct imxuart_platform_data uart1_pdata __initconst = {
+        .flags = IMXUART_HAVE_RTSCTS,
+};
+
+static struct platform_device *devices[] __initdata = {
+        &apf9328_flash_device,
+        &dm9000x_device,
+};
+
+static void __init apf9328_init(void)
+{
+        mxc_gpio_setup_multiple_pins(apf9328_pins,
+                        ARRAY_SIZE(apf9328_pins),
+                        "APF9328");
+
+        imx1_add_imx_uart0(&uart0_pdata);
+        imx1_add_imx_uart1(&uart1_pdata);
+
+        platform_add_devices(devices, ARRAY_SIZE(devices));
+}
+
+static void __init apf9328_timer_init(void)
+{
+        mx1_clocks_init(32768);
+}
+
+static struct sys_timer apf9328_timer = {
+        .init   = apf9328_timer_init,
+};
+
+MACHINE_START(APF9328, "Armadeus APF9328")
+        /* Maintainer: Gwenhael Goavec-Merou, ARMadeus Systems */
+        .map_io       = mx1_map_io,
+        .init_early   = imx1_init_early,
+        .init_irq     = mx1_init_irq,
+        .timer        = &apf9328_timer,
+        .init_machine = apf9328_init,
+MACHINE_END
diff --git a/arch/arm/mach-mx3/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c
index 226829bf7c25..ffb40ff619b1 100644
--- a/arch/arm/mach-mx3/mach-armadillo5x0.c
+++ b/arch/arm/mach-imx/mach-armadillo5x0.c
@@ -34,7 +34,6 @@
 #include <linux/mtd/physmap.h>
 #include <linux/io.h>
 #include <linux/input.h>
-#include <linux/gpio_keys.h>
 #include <linux/i2c.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
@@ -49,13 +48,10 @@
 
 #include <mach/common.h>
 #include <mach/iomux-mx3.h>
-#include <mach/ipu.h>
-#include <mach/mx3fb.h>
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
-#include "crm_regs.h"
+#include "crmregs-imx31.h"
 
 static int armadillo5x0_pins[] = {
         /* UART1 */
@@ -280,20 +276,12 @@ static struct gpio_keys_button armadillo5x0_buttons[] = {
         }
 };
 
-static struct gpio_keys_platform_data armadillo5x0_button_data = {
+static const struct gpio_keys_platform_data
+                armadillo5x0_button_data __initconst = {
         .buttons        = armadillo5x0_buttons,
         .nbuttons       = ARRAY_SIZE(armadillo5x0_buttons),
 };
 
-static struct platform_device armadillo5x0_button_device = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .num_resources  = 0,
-        .dev            = {
-                .platform_data  = &armadillo5x0_button_data,
-        }
-};
-
 /*
  * NAND Flash
  */
@@ -383,12 +371,11 @@ static const struct fb_videomode fb_modedb[] = {
         },
 };
 
-static struct ipu_platform_data mx3_ipu_data = {
+static const struct ipu_platform_data mx3_ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
-static struct mx3fb_platform_data mx3fb_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+static struct mx3fb_platform_data mx3fb_pdata __initdata = {
         .name           = "CRT-VGA",
         .mode           = fb_modedb,
         .num_modes      = ARRAY_SIZE(fb_modedb),
@@ -496,7 +483,6 @@ static const struct imxuart_platform_data uart_pdata __initconst = {
 
 static struct platform_device *devices[] __initdata = {
         &armadillo5x0_smc911x_device,
-        &armadillo5x0_button_device,
 };
 
 /*
@@ -508,6 +494,7 @@ static void __init armadillo5x0_init(void)
                         ARRAY_SIZE(armadillo5x0_pins), "armadillo5x0");
 
         platform_add_devices(devices, ARRAY_SIZE(devices));
+        imx_add_gpio_keys(&armadillo5x0_button_data);
         imx31_add_imx_i2c1(NULL);
 
         /* Register UART */
@@ -521,8 +508,8 @@ static void __init armadillo5x0_init(void)
         imx31_add_mxc_mmc(0, &sdhc_pdata);
 
         /* Register FB */
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        mxc_register_device(&mx3_fb, &mx3fb_pdata);
+        imx31_add_ipu_core(&mx3_ipu_data);
+        imx31_add_mx3_sdc_fb(&mx3fb_pdata);
 
         /* Register NOR Flash */
         mxc_register_device(&armadillo5x0_nor_flash,
diff --git a/arch/arm/mach-mx3/mach-bug.c b/arch/arm/mach-imx/mach-bug.c
index d137d7078ee9..42e4f078a19c 100644
--- a/arch/arm/mach-mx3/mach-bug.c
+++ b/arch/arm/mach-imx/mach-bug.c
@@ -20,7 +20,6 @@
 #include <linux/platform_device.h>
 
 #include <mach/iomux-mx3.h>
-#include <mach/imx-uart.h>
 #include <mach/hardware.h>
 #include <mach/common.h>
 
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c
index 759299bb035b..46a2e41d43d2 100644
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@ -38,7 +38,6 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx27.h>
-#include <mach/mxc_nand.h>
 #include <mach/ulpi.h>
 
 #include "devices-imx27.h"
diff --git a/arch/arm/mach-mx3/mach-cpuimx35.c b/arch/arm/mach-imx/mach-cpuimx35.c
index ec63d998f647..3f8ef825fa6f 100644
--- a/arch/arm/mach-mx3/mach-cpuimx35.c
+++ b/arch/arm/mach-imx/mach-cpuimx35.c
@@ -41,10 +41,8 @@
 #include <mach/hardware.h>
 #include <mach/common.h>
 #include <mach/iomux-mx35.h>
-#include <mach/mxc_nand.h>
 
 #include "devices-imx35.h"
-#include "devices.h"
 
 static const struct imxuart_platform_data uart_pdata __initconst = {
         .flags = IMXUART_HAVE_RTSCTS,
diff --git a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
index 9da8d18eeb00..148cff2819b9 100644
--- a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
+++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
@@ -36,8 +36,6 @@
 #include <asm/mach/map.h>
 #include <mach/common.h>
 #include <mach/mx25.h>
-#include <mach/mxc_nand.h>
-#include <mach/imxfb.h>
 #include <mach/iomux-mx25.h>
 
 #include "devices-imx25.h"
diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index d7e0d219726a..7ae43b1ec517 100644
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@ -27,7 +27,6 @@
 #include <linux/mtd/physmap.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pca953x.h>
-#include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/gpio.h>
 #include <linux/delay.h>
@@ -130,19 +129,12 @@ static struct gpio_keys_button visstrim_gpio_keys[] = {
         }
 };
 
-static struct gpio_keys_platform_data visstrim_gpio_keys_platform_data = {
+static const struct gpio_keys_platform_data
+                visstrim_gpio_keys_platform_data __initconst = {
         .buttons        = visstrim_gpio_keys,
         .nbuttons       = ARRAY_SIZE(visstrim_gpio_keys),
 };
 
-static struct platform_device visstrim_gpio_keys_device = {
-        .name   = "gpio-keys",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &visstrim_gpio_keys_platform_data,
-        },
-};
-
 /* Visstrim_SM10 has a microSD slot connected to sdhc1 */
 static int visstrim_m10_sdhc1_init(struct device *dev,
                 irq_handler_t detect_irq, void *data)
@@ -186,7 +178,6 @@ static struct platform_device visstrim_m10_nor_mtd_device = {
 };
 
 static struct platform_device *platform_devices[] __initdata = {
-        &visstrim_gpio_keys_device,
         &visstrim_m10_nor_mtd_device,
 };
 
@@ -255,6 +246,7 @@ static void __init visstrim_m10_board_init(void)
         imx27_add_mxc_mmc(0, &visstrim_m10_sdhc_pdata);
         imx27_add_mxc_ehci_otg(&visstrim_m10_usbotg_pdata);
         imx27_add_fec(NULL);
+        imx_add_gpio_keys(&visstrim_gpio_keys_platform_data);
         platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
 }
 
diff --git a/arch/arm/mach-mx3/mach-kzm_arm11_01.c b/arch/arm/mach-imx/mach-kzm_arm11_01.c
index d35621d62b4d..1ecae20cf4e3 100644
--- a/arch/arm/mach-mx3/mach-kzm_arm11_01.c
+++ b/arch/arm/mach-imx/mach-kzm_arm11_01.c
@@ -39,7 +39,6 @@
 #include <mach/iomux-mx3.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 #define KZM_ARM11_IO_ADDRESS(x) (IOMEM(                                 \
         IMX_IO_P2V_MODULE(x, MX31_CS4) ?:                               \
diff --git a/arch/arm/mach-imx/mach-mx1ads.c b/arch/arm/mach-imx/mach-mx1ads.c
index 47cf56ac6d5b..38ec5cbbda9b 100644
--- a/arch/arm/mach-imx/mach-mx1ads.c
+++ b/arch/arm/mach-imx/mach-mx1ads.c
@@ -25,7 +25,6 @@
 
 #include <mach/common.h>
 #include <mach/hardware.h>
-#include <mach/i2c.h>
 #include <mach/iomux-mx1.h>
 #include <mach/irqs.h>
 
diff --git a/arch/arm/mach-imx/mach-mx21ads.c b/arch/arm/mach-imx/mach-mx21ads.c
index fa52a1086eae..74ac88978ddd 100644
--- a/arch/arm/mach-imx/mach-mx21ads.c
+++ b/arch/arm/mach-imx/mach-mx21ads.c
@@ -25,7 +25,6 @@
 #include <asm/mach/time.h>
 #include <asm/mach/map.h>
 #include <mach/iomux-mx21.h>
-#include <mach/mxc_nand.h>
 
 #include "devices-imx21.h"
 
diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c
index 06da438282aa..58ea3fdf0911 100644
--- a/arch/arm/mach-imx/mach-mx25_3ds.c
+++ b/arch/arm/mach-imx/mach-mx25_3ds.c
@@ -29,7 +29,6 @@
 #include <linux/irq.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
-#include <linux/input/matrix_keypad.h>
 #include <linux/usb/otg.h>
 
 #include <mach/hardware.h>
@@ -103,6 +102,8 @@ static iomux_v3_cfg_t mx25pdk_pads[] = {
         MX25_PAD_SD1_DATA1__SD1_DATA1,
         MX25_PAD_SD1_DATA2__SD1_DATA2,
         MX25_PAD_SD1_DATA3__SD1_DATA3,
+        MX25_PAD_A14__GPIO_2_0, /* WriteProtect */
+        MX25_PAD_A15__GPIO_2_1, /* CardDetect */
 
         /* I2C1 */
         MX25_PAD_I2C1_CLK__I2C1_CLK,
@@ -208,6 +209,14 @@ static const struct imxi2c_platform_data mx25_3ds_i2c0_data __initconst = {
         .bitrate = 100000,
 };
 
+#define SD1_GPIO_WP     IMX_GPIO_NR(2, 0)
+#define SD1_GPIO_CD     IMX_GPIO_NR(2, 1)
+
+static const struct esdhc_platform_data mx25pdk_esdhc_pdata __initconst = {
+        .wp_gpio = SD1_GPIO_WP,
+        .cd_gpio = SD1_GPIO_CD,
+};
+
 static void __init mx25pdk_init(void)
 {
         mxc_iomux_v3_setup_multiple_pads(mx25pdk_pads,
@@ -225,7 +234,7 @@ static void __init mx25pdk_init(void)
         imx25_add_fec(&mx25_fec_pdata);
         imx25_add_imx_keypad(&mx25pdk_keymap_data);
 
-        imx25_add_sdhci_esdhc_imx(0, NULL);
+        imx25_add_sdhci_esdhc_imx(0, &mx25pdk_esdhc_pdata);
         imx25_add_imx_i2c0(&mx25_3ds_i2c0_data);
 }
 
diff --git a/arch/arm/mach-imx/mach-mx27ads.c b/arch/arm/mach-imx/mach-mx27ads.c
index 367d1e4384c7..1db79506f5e4 100644
--- a/arch/arm/mach-imx/mach-mx27ads.c
+++ b/arch/arm/mach-imx/mach-mx27ads.c
@@ -29,7 +29,6 @@
 #include <asm/mach/map.h>
 #include <mach/gpio.h>
 #include <mach/iomux-mx27.h>
-#include <mach/mxc_nand.h>
 
 #include "devices-imx27.h"
 
diff --git a/arch/arm/mach-mx3/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index 034be624d35c..9b982449cb52 100644
--- a/arch/arm/mach-mx3/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -39,13 +39,8 @@
 #include <mach/iomux-mx3.h>
 #include <mach/3ds_debugboard.h>
 #include <mach/ulpi.h>
-#include <mach/mmc.h>
-#include <mach/ipu.h>
-#include <mach/mx3fb.h>
-#include <mach/mx3_camera.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /* CPLD IRQ line for external uart, external ethernet etc */
 #define EXPIO_PARENT_INT        IOMUX_TO_IRQ(MX31_PIN_GPIO1_1)
@@ -178,22 +173,37 @@ static struct gpio mx31_3ds_camera_gpios[] = {
         { MX31_3DS_GPIO_CAMERA_RST, GPIOF_OUT_INIT_HIGH, "camera-reset" },
 };
 
-static int __init mx31_3ds_camera_alloc_dma(void)
+static const struct mx3_camera_pdata mx31_3ds_camera_pdata __initconst = {
+        .flags = MX3_CAMERA_DATAWIDTH_10,
+        .mclk_10khz = 2600,
+};
+
+static int __init mx31_3ds_init_camera(void)
 {
-        int dma;
+        int dma, ret = -ENOMEM;
+        struct platform_device *pdev =
+                imx31_alloc_mx3_camera(&mx31_3ds_camera_pdata);
+
+        if (IS_ERR(pdev))
+                return PTR_ERR(pdev);
 
         if (!mx3_camera_base)
-                return -ENOMEM;
+                goto err;
 
-        dma = dma_declare_coherent_memory(&mx3_camera.dev,
+        dma = dma_declare_coherent_memory(&pdev->dev,
                                         mx3_camera_base, mx3_camera_base,
                                         MX31_3DS_CAMERA_BUF_SIZE,
                                         DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
 
         if (!(dma & DMA_MEMORY_MAP))
-                return -ENOMEM;
+                goto err;
 
-        return 0;
+        ret = platform_device_add(pdev);
+        if (ret)
+err:
+                platform_device_put(pdev);
+
+        return ret;
 }
 
 static int mx31_3ds_camera_power(struct device *dev, int on)
@@ -241,12 +251,6 @@ static struct platform_device mx31_3ds_ov2640 = {
         },
 };
 
-struct mx3_camera_pdata mx31_3ds_camera_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
-        .flags          = MX3_CAMERA_DATAWIDTH_10,
-        .mclk_10khz     = 2600,
-};
-
 /*
  * FB support
  */
@@ -273,8 +277,7 @@ static struct ipu_platform_data mx3_ipu_data = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
-static struct mx3fb_platform_data mx3fb_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+static struct mx3fb_platform_data mx3fb_pdata __initdata = {
         .name           = "Epson-VGA",
         .mode           = fb_modedb,
         .num_modes      = ARRAY_SIZE(fb_modedb),
@@ -723,8 +726,8 @@ static void __init mx31_3ds_init(void)
         imx31_add_mxc_mmc(0, &sdhc1_pdata);
 
         imx31_add_spi_imx0(&spi0_pdata);
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        mxc_register_device(&mx3_fb, &mx3fb_pdata);
+        imx31_add_ipu_core(&mx3_ipu_data);
+        imx31_add_mx3_sdc_fb(&mx3fb_pdata);
 
         /* CSI */
         /* Camera power: default - off */
@@ -735,10 +738,7 @@ static void __init mx31_3ds_init(void)
                 iclink_ov2640.power = NULL;
         }
 
-        if (!mx31_3ds_camera_alloc_dma())
-                mxc_register_device(&mx3_camera, &mx31_3ds_camera_pdata);
-        else
-                pr_err("Failed to allocate dma memory for camera");
+        mx31_3ds_init_camera();
 }
 
 static void __init mx31_3ds_timer_init(void)
diff --git a/arch/arm/mach-mx3/mach-mx31ads.c b/arch/arm/mach-imx/mach-mx31ads.c
index 3d095d69bc68..f4dee0254634 100644
--- a/arch/arm/mach-mx3/mach-mx31ads.c
+++ b/arch/arm/mach-imx/mach-mx31ads.c
@@ -38,7 +38,6 @@
 #endif
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /* PBC Board interrupt status register */
 #define PBC_INTSTATUS           0x000016
diff --git a/arch/arm/mach-mx3/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c
index ed95745163b8..410e676ae087 100644
--- a/arch/arm/mach-mx3/mach-mx31lilly.c
+++ b/arch/arm/mach-imx/mach-mx31lilly.c
@@ -46,7 +46,6 @@
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /*
  * This file contains module-specific initialization routines for LILLY-1131.
diff --git a/arch/arm/mach-mx3/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c
index 24a21a384bf1..ac9b4cad320e 100644
--- a/arch/arm/mach-mx3/mach-mx31lite.c
+++ b/arch/arm/mach-imx/mach-mx31lite.c
@@ -44,7 +44,6 @@
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /*
  * This file contains the module-specific initialization routines.
diff --git a/arch/arm/mach-mx3/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index 3a021b01161d..eaa51e49ca95 100644
--- a/arch/arm/mach-mx3/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -27,6 +27,7 @@
 #include <linux/mfd/mc13783.h>
 #include <linux/spi/spi.h>
 #include <linux/types.h>
+#include <linux/memblock.h>
 
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
@@ -39,13 +40,9 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx3.h>
-#include <mach/ipu.h>
-#include <mach/mx3_camera.h>
-#include <mach/spi.h>
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 static unsigned int moboard_pins[] = {
         /* UART0 */
@@ -102,7 +99,7 @@ static unsigned int moboard_pins[] = {
 };
 
 static struct physmap_flash_data mx31moboard_flash_data = {
-        .width          = 2,
+        .width  = 2,
 };
 
 static struct resource mx31moboard_flash_resource = {
@@ -194,8 +191,8 @@ static struct regulator_init_data sdhc_vreg_data = {
 
 static struct regulator_consumer_supply cam_consumers[] = {
         {
-                .dev    = &mx3_camera.dev,
-                .supply = "cam_vcc",
+                .dev_name = "mx3_camera.0",
+                .supply = "cam_vcc",
         },
 };
 
@@ -430,9 +427,9 @@ static int __init moboard_usbh2_init(void)
 
 static struct gpio_led mx31moboard_leds[] = {
         {
-                .name   = "coreboard-led-0:red:running",
+                .name   = "coreboard-led-0:red:running",
                 .default_trigger = "heartbeat",
-                .gpio   = IOMUX_TO_GPIO(MX31_PIN_SVEN0),
+                .gpio   = IOMUX_TO_GPIO(MX31_PIN_SVEN0),
         }, {
                 .name   = "coreboard-led-1:red",
                 .gpio   = IOMUX_TO_GPIO(MX31_PIN_STX0),
@@ -446,7 +443,7 @@ static struct gpio_led mx31moboard_leds[] = {
 };
 
 static struct gpio_led_platform_data mx31moboard_led_pdata = {
-        .num_leds       = ARRAY_SIZE(mx31moboard_leds),
+        .num_leds       = ARRAY_SIZE(mx31moboard_leds),
         .leds           = mx31moboard_leds,
 };
 
@@ -458,7 +455,7 @@ static struct platform_device mx31moboard_leds_device = {
         },
 };
 
-static struct ipu_platform_data mx3_ipu_data = {
+static const struct ipu_platform_data mx3_ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
@@ -467,37 +464,39 @@ static struct platform_device *devices[] __initdata = {
         &mx31moboard_leds_device,
 };
 
-static struct mx3_camera_pdata camera_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+static struct mx3_camera_pdata camera_pdata __initdata = {
         .flags          = MX3_CAMERA_DATAWIDTH_8 | MX3_CAMERA_DATAWIDTH_10,
         .mclk_10khz     = 4800,
 };
 
-#define CAMERA_BUF_SIZE (4*1024*1024)
+static phys_addr_t mx3_camera_base __initdata;
+#define MX3_CAMERA_BUF_SIZE SZ_4M
 
-static int __init mx31moboard_cam_alloc_dma(const size_t buf_size)
+static int __init mx31moboard_init_cam(void)
 {
-        dma_addr_t dma_handle;
-        void *buf;
-        int dma;
-
-        if (buf_size < 2 * 1024 * 1024)
-                return -EINVAL;
+        int dma, ret = -ENOMEM;
+        struct platform_device *pdev;
 
-        buf = dma_alloc_coherent(NULL, buf_size, &dma_handle, GFP_KERNEL);
-        if (!buf) {
-                pr_err("%s: cannot allocate camera buffer-memory\n", __func__);
-                return -ENOMEM;
-        }
+        imx31_add_ipu_core(&mx3_ipu_data);
 
-        memset(buf, 0, buf_size);
+        pdev = imx31_alloc_mx3_camera(&camera_pdata);
+        if (IS_ERR(pdev))
+                return PTR_ERR(pdev);
 
-        dma = dma_declare_coherent_memory(&mx3_camera.dev,
-                                        dma_handle, dma_handle, buf_size,
+        dma = dma_declare_coherent_memory(&pdev->dev,
+                                        mx3_camera_base, mx3_camera_base,
+                                        MX3_CAMERA_BUF_SIZE,
                                         DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
+        if (!(dma & DMA_MEMORY_MAP))
+                goto err;
+
+        ret = platform_device_add(pdev);
+        if (ret)
+err:
+                platform_device_put(pdev);
+
+        return ret;
 
-        /* The way we call dma_declare_coherent_memory only a malloc can fail */
-        return dma & DMA_MEMORY_MAP ? 0 : -ENOMEM;
 }
 
 static int mx31moboard_baseboard;
@@ -529,9 +528,7 @@ static void __init mx31moboard_init(void)
 
         imx31_add_mxc_mmc(0, &sdhc1_pdata);
 
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        if (!mx31moboard_cam_alloc_dma(CAMERA_BUF_SIZE))
-                mxc_register_device(&mx3_camera, &camera_pdata);
+        mx31moboard_init_cam();
 
         usb_xcvr_reset();
 
@@ -565,9 +562,19 @@ struct sys_timer mx31moboard_timer = {
         .init   = mx31moboard_timer_init,
 };
 
+static void __init mx31moboard_reserve(void)
+{
+        /* reserve 4 MiB for mx3-camera */
+        mx3_camera_base = memblock_alloc(MX3_CAMERA_BUF_SIZE,
+                        MX3_CAMERA_BUF_SIZE);
+        memblock_free(mx3_camera_base, MX3_CAMERA_BUF_SIZE);
+        memblock_remove(mx3_camera_base, MX3_CAMERA_BUF_SIZE);
+}
+
 MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard")
         /* Maintainer: Valentin Longchamp, EPFL Mobots group */
         .boot_params = MX3x_PHYS_OFFSET + 0x100,
+        .reserve = mx31moboard_reserve,
         .map_io = mx31_map_io,
         .init_early = imx31_init_early,
         .init_irq = mx31_init_irq,
diff --git a/arch/arm/mach-mx3/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c
index ff5fe231b8d6..882880ac1bbc 100644
--- a/arch/arm/mach-mx3/mach-mx35_3ds.c
+++ b/arch/arm/mach-imx/mach-mx35_3ds.c
@@ -42,7 +42,6 @@
 #include <mach/3ds_debugboard.h>
 
 #include "devices-imx35.h"
-#include "devices.h"
 
 #define EXPIO_PARENT_INT        (MXC_INTERNAL_IRQS + GPIO_PORTA + 1)
 
diff --git a/arch/arm/mach-imx/mach-mxt_td60.c b/arch/arm/mach-imx/mach-mxt_td60.c
index 69787c30c320..2774541511e7 100644
--- a/arch/arm/mach-imx/mach-mxt_td60.c
+++ b/arch/arm/mach-imx/mach-mxt_td60.c
@@ -29,7 +29,6 @@
 #include <asm/mach/map.h>
 #include <linux/gpio.h>
 #include <mach/iomux-mx27.h>
-#include <mach/mxc_nand.h>
 #include <linux/i2c/pca953x.h>
 
 #include "devices-imx27.h"
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index 63e182556778..bbddc5a11c43 100644
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -37,7 +37,6 @@
 #include <mach/iomux-mx27.h>
 #include <asm/mach/time.h>
 #include <mach/audmux.h>
-#include <mach/mxc_nand.h>
 #include <mach/irqs.h>
 #include <mach/ulpi.h>
 
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c
index f07d3bded674..89c213b81295 100644
--- a/arch/arm/mach-mx3/mach-pcm037.c
+++ b/arch/arm/mach-imx/mach-pcm037.c
@@ -31,6 +31,7 @@
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
 #include <linux/gfp.h>
+#include <linux/memblock.h>
 
 #include <media/soc_camera.h>
 
@@ -41,13 +42,9 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx3.h>
-#include <mach/ipu.h>
-#include <mach/mx3_camera.h>
-#include <mach/mx3fb.h>
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 #include "pcm037.h"
 
 static enum pcm037_board_variant pcm037_instance = PCM037_PCM970;
@@ -404,35 +401,35 @@ static const struct imxmmc_platform_data sdhc_pdata __initconst = {
         .exit = pcm970_sdhc1_exit,
 };
 
-struct mx3_camera_pdata camera_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+struct mx3_camera_pdata camera_pdata __initdata = {
         .flags          = MX3_CAMERA_DATAWIDTH_8 | MX3_CAMERA_DATAWIDTH_10,
         .mclk_10khz     = 2000,
 };
 
-static int __init pcm037_camera_alloc_dma(const size_t buf_size)
-{
-        dma_addr_t dma_handle;
-        void *buf;
-        int dma;
-
-        if (buf_size < 2 * 1024 * 1024)
-                return -EINVAL;
+static phys_addr_t mx3_camera_base __initdata;
+#define MX3_CAMERA_BUF_SIZE SZ_4M
 
-        buf = dma_alloc_coherent(NULL, buf_size, &dma_handle, GFP_KERNEL);
-        if (!buf) {
-                pr_err("%s: cannot allocate camera buffer-memory\n", __func__);
-                return -ENOMEM;
-        }
+static int __init pcm037_init_camera(void)
+{
+        int dma, ret = -ENOMEM;
+        struct platform_device *pdev = imx31_alloc_mx3_camera(&camera_pdata);
 
-        memset(buf, 0, buf_size);
+        if (IS_ERR(pdev))
+                return PTR_ERR(pdev);
 
-        dma = dma_declare_coherent_memory(&mx3_camera.dev,
-                                        dma_handle, dma_handle, buf_size,
+        dma = dma_declare_coherent_memory(&pdev->dev,
+                                        mx3_camera_base, mx3_camera_base,
+                                        MX3_CAMERA_BUF_SIZE,
                                         DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE);
+        if (!(dma & DMA_MEMORY_MAP))
+                goto err;
+
+        ret = platform_device_add(pdev);
+        if (ret)
+err:
+                platform_device_put(pdev);
 
-        /* The way we call dma_declare_coherent_memory only a malloc can fail */
-        return dma & DMA_MEMORY_MAP ? 0 : -ENOMEM;
+        return ret;
 }
 
 static struct platform_device *devices[] __initdata = {
@@ -442,7 +439,7 @@ static struct platform_device *devices[] __initdata = {
         &pcm037_mt9v022,
 };
 
-static struct ipu_platform_data mx3_ipu_data = {
+static const struct ipu_platform_data mx3_ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
@@ -500,7 +497,6 @@ static const struct fb_videomode fb_modedb[] = {
 };
 
 static struct mx3fb_platform_data mx3fb_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
         .name           = "Sharp-LQ035Q7DH06-QVGA",
         .mode           = fb_modedb,
         .num_modes      = ARRAY_SIZE(fb_modedb),
@@ -638,8 +634,8 @@ static void __init pcm037_init(void)
 
         imx31_add_mxc_nand(&pcm037_nand_board_info);
         imx31_add_mxc_mmc(0, &sdhc_pdata);
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        mxc_register_device(&mx3_fb, &mx3fb_pdata);
+        imx31_add_ipu_core(&mx3_ipu_data);
+        imx31_add_mx3_sdc_fb(&mx3fb_pdata);
 
         /* CSI */
         /* Camera power: default - off */
@@ -649,8 +645,7 @@ static void __init pcm037_init(void)
         else
                 iclink_mt9t031.power = NULL;
 
-        if (!pcm037_camera_alloc_dma(4 * 1024 * 1024))
-                mxc_register_device(&mx3_camera, &camera_pdata);
+        pcm037_init_camera();
 
         platform_device_register(&pcm970_sja1000);
 
@@ -680,9 +675,19 @@ struct sys_timer pcm037_timer = {
         .init   = pcm037_timer_init,
 };
 
+static void __init pcm037_reserve(void)
+{
+        /* reserve 4 MiB for mx3-camera */
+        mx3_camera_base = memblock_alloc(MX3_CAMERA_BUF_SIZE,
+                        MX3_CAMERA_BUF_SIZE);
+        memblock_free(mx3_camera_base, MX3_CAMERA_BUF_SIZE);
+        memblock_remove(mx3_camera_base, MX3_CAMERA_BUF_SIZE);
+}
+
 MACHINE_START(PCM037, "Phytec Phycore pcm037")
         /* Maintainer: Pengutronix */
         .boot_params = MX3x_PHYS_OFFSET + 0x100,
+        .reserve = pcm037_reserve,
         .map_io = mx31_map_io,
         .init_early = imx31_init_early,
         .init_irq = mx31_init_irq,
diff --git a/arch/arm/mach-mx3/mach-pcm037_eet.c b/arch/arm/mach-imx/mach-pcm037_eet.c
index df6fb07d037e..1b7606bef8f4 100644
--- a/arch/arm/mach-mx3/mach-pcm037_eet.c
+++ b/arch/arm/mach-imx/mach-pcm037_eet.c
@@ -7,19 +7,16 @@
  * published by the Free Software Foundation.
  */
 #include <linux/gpio.h>
-#include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 
 #include <mach/common.h>
 #include <mach/iomux-mx3.h>
-#include <mach/spi.h>
 
 #include <asm/mach-types.h>
 
 #include "pcm037.h"
-#include "devices.h"
 #include "devices-imx31.h"
 
 static unsigned int pcm037_eet_pins[] = {
@@ -156,20 +153,13 @@ static struct gpio_keys_button pcm037_gpio_keys[] = {
         },
 };
 
-static struct gpio_keys_platform_data pcm037_gpio_keys_platform_data = {
+static const struct gpio_keys_platform_data
+                pcm037_gpio_keys_platform_data __initconst = {
         .buttons        = pcm037_gpio_keys,
         .nbuttons       = ARRAY_SIZE(pcm037_gpio_keys),
         .rep            = 0, /* No auto-repeat */
 };
 
-static struct platform_device pcm037_gpio_keys_device = {
-        .name   = "gpio-keys",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &pcm037_gpio_keys_platform_data,
-        },
-};
-
 static int __init eet_init_devices(void)
 {
         if (!machine_is_pcm037() || pcm037_variant() != PCM037_EET)
@@ -182,9 +172,8 @@ static int __init eet_init_devices(void)
         spi_register_board_info(pcm037_spi_dev, ARRAY_SIZE(pcm037_spi_dev));
         imx31_add_spi_imx0(&pcm037_spi1_pdata);
 
-        platform_device_register(&pcm037_gpio_keys_device);
+        imx_add_gpio_keys(&pcm037_gpio_keys_platform_data);
 
         return 0;
 }
-
 late_initcall(eet_init_devices);
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c
index 4cbce6d0fef1..853bb871c7ed 100644
--- a/arch/arm/mach-imx/mach-pcm038.c
+++ b/arch/arm/mach-imx/mach-pcm038.c
@@ -36,7 +36,6 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx27.h>
-#include <mach/mxc_nand.h>
 #include <mach/ulpi.h>
 
 #include "devices-imx27.h"
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c
index 036ba1a4704b..026441628dfa 100644
--- a/arch/arm/mach-mx3/mach-pcm043.c
+++ b/arch/arm/mach-imx/mach-pcm043.c
@@ -36,14 +36,10 @@
 #include <mach/hardware.h>
 #include <mach/common.h>
 #include <mach/iomux-mx35.h>
-#include <mach/ipu.h>
-#include <mach/mx3fb.h>
 #include <mach/ulpi.h>
 #include <mach/audmux.h>
-#include <mach/esdhc.h>
 
 #include "devices-imx35.h"
-#include "devices.h"
 
 static const struct fb_videomode fb_modedb[] = {
         {
@@ -81,12 +77,11 @@ static const struct fb_videomode fb_modedb[] = {
         },
 };
 
-static struct ipu_platform_data mx3_ipu_data = {
+static const struct ipu_platform_data mx3_ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
-static struct mx3fb_platform_data mx3fb_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+static struct mx3fb_platform_data mx3fb_pdata __initdata = {
         .name           = "Sharp-LQ035Q7",
         .mode           = fb_modedb,
         .num_modes      = ARRAY_SIZE(fb_modedb),
@@ -127,12 +122,12 @@ static struct at24_platform_data board_eeprom = {
 };
 
 static struct i2c_board_info pcm043_i2c_devices[] = {
-       {
+        {
                 I2C_BOARD_INFO("at24", 0x52), /* E0=0, E1=1, E2=0 */
                 .platform_data = &board_eeprom,
         }, {
                 I2C_BOARD_INFO("pcf8563", 0x51),
-        }
+        },
 };
 
 static struct platform_device *devices[] __initdata = {
@@ -390,8 +385,8 @@ static void __init pcm043_init(void)
 
         imx35_add_imx_i2c0(&pcm043_i2c0_data);
 
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        mxc_register_device(&mx3_fb, &mx3fb_pdata);
+        imx35_add_ipu_core(&mx3_ipu_data);
+        imx35_add_mx3_sdc_fb(&mx3fb_pdata);
 
         if (otg_mode_host) {
                 otg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
diff --git a/arch/arm/mach-mx3/mach-qong.c b/arch/arm/mach-imx/mach-qong.c
index 17f758b77623..c16328715939 100644
--- a/arch/arm/mach-mx3/mach-qong.c
+++ b/arch/arm/mach-imx/mach-qong.c
@@ -33,24 +33,23 @@
 #include <mach/iomux-mx3.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /* FPGA defines */
 #define QONG_FPGA_VERSION(major, minor, rev)    \
         (((major & 0xF) << 12) | ((minor & 0xF) << 8) | (rev & 0xFF))
 
-#define QONG_FPGA_BASEADDR              MX31_CS1_BASE_ADDR
-#define QONG_FPGA_PERIPH_SIZE           (1 << 24)
+#define QONG_FPGA_BASEADDR              MX31_CS1_BASE_ADDR
+#define QONG_FPGA_PERIPH_SIZE           (1 << 24)
 
 #define QONG_FPGA_CTRL_BASEADDR         QONG_FPGA_BASEADDR
-#define QONG_FPGA_CTRL_SIZE             0x10
+#define QONG_FPGA_CTRL_SIZE             0x10
 /* FPGA control registers */
 #define QONG_FPGA_CTRL_VERSION          0x00
 
 #define QONG_DNET_ID            1
 #define QONG_DNET_BASEADDR      \
         (QONG_FPGA_BASEADDR + QONG_DNET_ID * QONG_FPGA_PERIPH_SIZE)
-#define QONG_DNET_SIZE          0x00001000
+#define QONG_DNET_SIZE          0x00001000
 
 #define QONG_FPGA_IRQ           IOMUX_TO_IRQ(MX31_PIN_DTR_DCE1)
 
@@ -166,15 +165,15 @@ static struct platform_nand_data qong_nand_data = {
                 .options                = 0,
         },
         .ctrl = {
-                .cmd_ctrl               = qong_nand_cmd_ctrl,
+                .cmd_ctrl               = qong_nand_cmd_ctrl,
                 .dev_ready              = qong_nand_device_ready,
                 .select_chip            = qong_nand_select_chip,
         }
 };
 
 static struct resource qong_nand_resource = {
-        .start          = MX31_CS3_BASE_ADDR,
-        .end            = MX31_CS3_BASE_ADDR + SZ_32M - 1,
+        .start          = MX31_CS3_BASE_ADDR,
+        .end            = MX31_CS3_BASE_ADDR + SZ_32M - 1,
         .flags          = IORESOURCE_MEM,
 };
 
diff --git a/arch/arm/mach-mx3/mach-vpr200.c b/arch/arm/mach-imx/mach-vpr200.c
index 47a69cbc31a8..d74e3473d236 100644
--- a/arch/arm/mach-mx3/mach-vpr200.c
+++ b/arch/arm/mach-imx/mach-vpr200.c
@@ -32,16 +32,12 @@
 #include <mach/common.h>
 #include <mach/iomux-mx35.h>
 #include <mach/irqs.h>
-#include <mach/ipu.h>
-#include <mach/mx3fb.h>
 
 #include <linux/i2c.h>
 #include <linux/i2c/at24.h>
 #include <linux/mfd/mc13xxx.h>
-#include <linux/gpio_keys.h>
 
 #include "devices-imx35.h"
-#include "devices.h"
 
 #define GPIO_LCDPWR     IMX_GPIO_NR(1, 2)
 #define GPIO_PMIC_INT   IMX_GPIO_NR(2, 0)
@@ -91,12 +87,11 @@ static const struct fb_videomode fb_modedb[] = {
         }
 };
 
-static struct ipu_platform_data mx3_ipu_data = {
+static const struct ipu_platform_data mx3_ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
-static struct mx3fb_platform_data mx3fb_pdata = {
-        .dma_dev        = &mx3_ipu.dev,
+static struct mx3fb_platform_data mx3fb_pdata __initdata = {
         .name           = "PT0708048",
         .mode           = fb_modedb,
         .num_modes      = ARRAY_SIZE(fb_modedb),
@@ -141,18 +136,12 @@ static struct gpio_keys_button vpr200_gpio_keys_table[] = {
         {KEY_F9, GPIO_BUTTON8, 1, "vpr-keys: F9", 1, VPR_KEY_DEBOUNCE},
 };
 
-static struct gpio_keys_platform_data vpr200_gpio_keys_data = {
+static const struct gpio_keys_platform_data
+                vpr200_gpio_keys_data __initconst = {
         .buttons = vpr200_gpio_keys_table,
         .nbuttons = ARRAY_SIZE(vpr200_gpio_keys_table),
 };
 
-static struct platform_device vpr200_device_gpiokeys = {
-        .name = "gpio-keys",
-        .dev = {
-                .platform_data = &vpr200_gpio_keys_data,
-        }
-};
-
 static struct mc13xxx_platform_data vpr200_pmic = {
         .flags = MC13XXX_USE_ADC | MC13XXX_USE_TOUCHSCREEN,
 };
@@ -271,7 +260,6 @@ static const struct mxc_usbh_platform_data usb_host_pdata __initconst = {
 
 static struct platform_device *devices[] __initdata = {
         &vpr200_flash,
-        &vpr200_device_gpiokeys,
 };
 
 /*
@@ -283,6 +271,7 @@ static void __init vpr200_board_init(void)
 
         imx35_add_fec(NULL);
         imx35_add_imx2_wdt(NULL);
+        imx_add_gpio_keys(&vpr200_gpio_keys_data);
 
         platform_add_devices(devices, ARRAY_SIZE(devices));
 
@@ -299,8 +288,8 @@ static void __init vpr200_board_init(void)
         imx35_add_imx_uart0(NULL);
         imx35_add_imx_uart2(NULL);
 
-        mxc_register_device(&mx3_ipu, &mx3_ipu_data);
-        mxc_register_device(&mx3_fb, &mx3fb_pdata);
+        imx35_add_ipu_core(&mx3_ipu_data);
+        imx35_add_mx3_sdc_fb(&mx3fb_pdata);
 
         imx35_add_fsl_usb2_udc(&otg_device_pdata);
         imx35_add_mxc_ehci_hs(&usb_host_pdata);
diff --git a/arch/arm/mach-imx/mm-imx31.c b/arch/arm/mach-imx/mm-imx31.c
new file mode 100644
index 000000000000..86b9b45864d2
--- /dev/null
+++ b/arch/arm/mach-imx/mm-imx31.c
@@ -0,0 +1,66 @@
+/*
+ *  Copyright (C) 1999,2000 Arm Limited
+ *  Copyright (C) 2000 Deep Blue Solutions Ltd
+ *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
+ *  Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ *    - add MX31 specific definitions
+ *
+ * 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/mm.h>
+#include <linux/init.h>
+#include <linux/err.h>
+
+#include <asm/pgtable.h>
+#include <asm/mach/map.h>
+
+#include <mach/common.h>
+#include <mach/hardware.h>
+#include <mach/iomux-v3.h>
+#include <mach/gpio.h>
+#include <mach/irqs.h>
+
+static struct map_desc mx31_io_desc[] __initdata = {
+        imx_map_entry(MX31, X_MEMC, MT_DEVICE),
+        imx_map_entry(MX31, AVIC, MT_DEVICE_NONSHARED),
+        imx_map_entry(MX31, AIPS1, MT_DEVICE_NONSHARED),
+        imx_map_entry(MX31, AIPS2, MT_DEVICE_NONSHARED),
+        imx_map_entry(MX31, SPBA0, MT_DEVICE_NONSHARED),
+};
+
+/*
+ * This function initializes the memory map. It is called during the
+ * system startup to create static physical to virtual memory mappings
+ * for the IO modules.
+ */
+void __init mx31_map_io(void)
+{
+        iotable_init(mx31_io_desc, ARRAY_SIZE(mx31_io_desc));
+}
+
+void __init imx31_init_early(void)
+{
+        mxc_set_cpu_type(MXC_CPU_MX31);
+        mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR));
+}
+
+static struct mxc_gpio_port imx31_gpio_ports[] = {
+        DEFINE_IMX_GPIO_PORT_IRQ(MX31, 0, 1, MX31_INT_GPIO1),
+        DEFINE_IMX_GPIO_PORT_IRQ(MX31, 1, 2, MX31_INT_GPIO2),
+        DEFINE_IMX_GPIO_PORT_IRQ(MX31, 2, 3, MX31_INT_GPIO3),
+};
+
+void __init mx31_init_irq(void)
+{
+        mxc_init_irq(MX31_IO_ADDRESS(MX31_AVIC_BASE_ADDR));
+        mxc_gpio_init(imx31_gpio_ports, ARRAY_SIZE(imx31_gpio_ports));
+}
diff --git a/arch/arm/mach-imx/mm-imx35.c b/arch/arm/mach-imx/mm-imx35.c
new file mode 100644
index 000000000000..c880e6d1ae55
--- /dev/null
+++ b/arch/arm/mach-imx/mm-imx35.c
@@ -0,0 +1,63 @@
+/*
+ *  Copyright (C) 1999,2000 Arm Limited
+ *  Copyright (C) 2000 Deep Blue Solutions Ltd
+ *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
+ *  Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ *    - add MX31 specific definitions
+ *
+ * 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/mm.h>
+#include <linux/init.h>
+#include <linux/err.h>
+
+#include <asm/pgtable.h>
+#include <asm/mach/map.h>
+#include <asm/hardware/cache-l2x0.h>
+
+#include <mach/common.h>
+#include <mach/hardware.h>
+#include <mach/iomux-v3.h>
+#include <mach/gpio.h>
+#include <mach/irqs.h>
+
+static struct map_desc mx35_io_desc[] __initdata = {
+        imx_map_entry(MX35, X_MEMC, MT_DEVICE),
+        imx_map_entry(MX35, AVIC, MT_DEVICE_NONSHARED),
+        imx_map_entry(MX35, AIPS1, MT_DEVICE_NONSHARED),
+        imx_map_entry(MX35, AIPS2, MT_DEVICE_NONSHARED),
+        imx_map_entry(MX35, SPBA0, MT_DEVICE_NONSHARED),
+};
+
+void __init mx35_map_io(void)
+{
+        iotable_init(mx35_io_desc, ARRAY_SIZE(mx35_io_desc));
+}
+
+void __init imx35_init_early(void)
+{
+        mxc_set_cpu_type(MXC_CPU_MX35);
+        mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR));
+        mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR));
+}
+
+static struct mxc_gpio_port imx35_gpio_ports[] = {
+        DEFINE_IMX_GPIO_PORT_IRQ(MX35, 0, 1, MX35_INT_GPIO1),
+        DEFINE_IMX_GPIO_PORT_IRQ(MX35, 1, 2, MX35_INT_GPIO2),
+        DEFINE_IMX_GPIO_PORT_IRQ(MX35, 2, 3, MX35_INT_GPIO3),
+};
+
+void __init mx35_init_irq(void)
+{
+        mxc_init_irq(MX35_IO_ADDRESS(MX35_AVIC_BASE_ADDR));
+        mxc_gpio_init(imx35_gpio_ports, ARRAY_SIZE(imx35_gpio_ports));
+}
diff --git a/arch/arm/mach-mx3/mx31lilly-db.c b/arch/arm/mach-imx/mx31lilly-db.c
index 8f1a38ebf5c8..7d26f766a4ee 100644
--- a/arch/arm/mach-mx3/mx31lilly-db.c
+++ b/arch/arm/mach-imx/mx31lilly-db.c
@@ -34,11 +34,8 @@
 #include <mach/common.h>
 #include <mach/iomux-mx3.h>
 #include <mach/board-mx31lilly.h>
-#include <mach/mx3fb.h>
-#include <mach/ipu.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /*
  * This file contains board-specific initialization routines for the
@@ -164,13 +161,13 @@ static const struct imxmmc_platform_data mmc_pdata __initconst = {
 };
 
 /* Framebuffer support */
-static struct ipu_platform_data ipu_data __initdata = {
+static const struct ipu_platform_data ipu_data __initconst = {
         .irq_base = MXC_IPU_IRQ_START,
 };
 
 static const struct fb_videomode fb_modedb = {
         /* 640x480 TFT panel (IPS-056T) */
-        .name           = "CRT-VGA",
+        .name           = "CRT-VGA",
         .refresh        = 64,
         .xres           = 640,
         .yres           = 480,
@@ -187,7 +184,6 @@ static const struct fb_videomode fb_modedb = {
 };
 
 static struct mx3fb_platform_data fb_pdata __initdata = {
-        .dma_dev        = &mx3_ipu.dev,
         .name           = "CRT-VGA",
         .mode           = &fb_modedb,
         .num_modes      = 1,
@@ -202,8 +198,8 @@ static void __init mx31lilly_init_fb(void)
                 return;
         }
 
-        mxc_register_device(&mx3_ipu, &ipu_data);
-        mxc_register_device(&mx3_fb, &fb_pdata);
+        imx31_add_ipu_core(&ipu_data);
+        imx31_add_mx3_sdc_fb(&fb_pdata);
         gpio_direction_output(LCD_VCC_EN_GPIO, 1);
 }
 
@@ -218,4 +214,3 @@ void __init mx31lilly_db_init(void)
         imx31_add_mxc_mmc(0, &mmc_pdata);
         mx31lilly_init_fb();
 }
-
diff --git a/arch/arm/mach-mx3/mx31lite-db.c b/arch/arm/mach-imx/mx31lite-db.c
index 3124ea837ac7..5aa053edc17c 100644
--- a/arch/arm/mach-mx3/mx31lite-db.c
+++ b/arch/arm/mach-imx/mx31lite-db.c
@@ -37,7 +37,6 @@
 #include <mach/board-mx31lite.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 /*
  * This file contains board-specific initialization routines for the
@@ -200,5 +199,5 @@ void __init mx31lite_db_init(void)
         imx31_add_spi_imx0(&spi0_pdata);
         platform_device_register(&litekit_led_device);
         imx31_add_imx2_wdt(NULL);
-        mxc_register_device(&imx_rtc_device0, NULL);
+        imx31_add_mxc_rtc(NULL);
 }
diff --git a/arch/arm/mach-mx3/mx31moboard-devboard.c b/arch/arm/mach-imx/mx31moboard-devboard.c
index 6410b9c48a02..0aa25364360d 100644
--- a/arch/arm/mach-mx3/mx31moboard-devboard.c
+++ b/arch/arm/mach-imx/mx31moboard-devboard.c
@@ -28,7 +28,6 @@
 #include <mach/ulpi.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 static unsigned int devboard_pins[] = {
         /* UART1 */
diff --git a/arch/arm/mach-mx3/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c
index 57f7b00cb709..bb639cbda4e5 100644
--- a/arch/arm/mach-mx3/mx31moboard-marxbot.c
+++ b/arch/arm/mach-imx/mx31moboard-marxbot.c
@@ -26,14 +26,12 @@
 
 #include <mach/common.h>
 #include <mach/hardware.h>
-#include <mach/imx-uart.h>
 #include <mach/iomux-mx3.h>
 #include <mach/ulpi.h>
 
 #include <media/soc_camera.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 static unsigned int marxbot_pins[] = {
         /* SDHC2 */
diff --git a/arch/arm/mach-mx3/mx31moboard-smartbot.c b/arch/arm/mach-imx/mx31moboard-smartbot.c
index 35f806e737c1..fabb801e7994 100644
--- a/arch/arm/mach-mx3/mx31moboard-smartbot.c
+++ b/arch/arm/mach-imx/mx31moboard-smartbot.c
@@ -32,7 +32,6 @@
 #include <media/soc_camera.h>
 
 #include "devices-imx31.h"
-#include "devices.h"
 
 static unsigned int smartbot_pins[] = {
         /* UART1 */
diff --git a/arch/arm/mach-mx3/pcm037.h b/arch/arm/mach-imx/pcm037.h
index d6929721a5fd..d6929721a5fd 100644
--- a/arch/arm/mach-mx3/pcm037.h
+++ b/arch/arm/mach-imx/pcm037.h
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig
index d701d32a07f1..dfd18f3b50e8 100644
--- a/arch/arm/mach-integrator/Kconfig
+++ b/arch/arm/mach-integrator/Kconfig
@@ -4,6 +4,7 @@ menu "Integrator Options"
 
 config ARCH_INTEGRATOR_AP
         bool "Support Integrator/AP and Integrator/PP2 platforms"
+        select CLKSRC_MMIO
         select MIGHT_HAVE_PCI
         help
           Include support for the ARM(R) Integrator/AP and
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 980803ff348c..2fbbdd5eac35 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -24,13 +24,14 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/amba/bus.h>
 #include <linux/amba/kmi.h>
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/mtd/physmap.h>
 
 #include <mach/hardware.h>
 #include <mach/platform.h>
@@ -43,7 +44,6 @@
 #include <mach/lm.h>
 
 #include <asm/mach/arch.h>
-#include <asm/mach/flash.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
@@ -180,13 +180,13 @@ static void __init ap_init_irq(void)
 #ifdef CONFIG_PM
 static unsigned long ic_irq_enable;
 
-static int irq_suspend(struct sys_device *dev, pm_message_t state)
+static int irq_suspend(void)
 {
         ic_irq_enable = readl(VA_IC_BASE + IRQ_ENABLE);
         return 0;
 }
 
-static int irq_resume(struct sys_device *dev)
+static void irq_resume(void)
 {
         /* disable all irq sources */
         writel(-1, VA_CMIC_BASE + IRQ_ENABLE_CLEAR);
@@ -194,33 +194,25 @@ static int irq_resume(struct sys_device *dev)
         writel(-1, VA_IC_BASE + FIQ_ENABLE_CLEAR);
 
         writel(ic_irq_enable, VA_IC_BASE + IRQ_ENABLE_SET);
-        return 0;
 }
 #else
 #define irq_suspend NULL
 #define irq_resume NULL
 #endif
 
-static struct sysdev_class irq_class = {
-        .name           = "irq",
+static struct syscore_ops irq_syscore_ops = {
         .suspend        = irq_suspend,
         .resume         = irq_resume,
 };
 
-static struct sys_device irq_device = {
-        .id     = 0,
-        .cls    = &irq_class,
-};
-
-static int __init irq_init_sysfs(void)
+static int __init irq_syscore_init(void)
 {
-        int ret = sysdev_class_register(&irq_class);
-        if (ret == 0)
-                ret = sysdev_register(&irq_device);
-        return ret;
+        register_syscore_ops(&irq_syscore_ops);
+
+        return 0;
 }
 
-device_initcall(irq_init_sysfs);
+device_initcall(irq_syscore_init);
 
 /*
  * Flash handling.
@@ -230,7 +222,7 @@ device_initcall(irq_init_sysfs);
 #define EBI_CSR1 (VA_EBI_BASE + INTEGRATOR_EBI_CSR1_OFFSET)
 #define EBI_LOCK (VA_EBI_BASE + INTEGRATOR_EBI_LOCK_OFFSET)
 
-static int ap_flash_init(void)
+static int ap_flash_init(struct platform_device *dev)
 {
         u32 tmp;
 
@@ -247,7 +239,7 @@ static int ap_flash_init(void)
         return 0;
 }
 
-static void ap_flash_exit(void)
+static void ap_flash_exit(struct platform_device *dev)
 {
         u32 tmp;
 
@@ -263,15 +255,14 @@ static void ap_flash_exit(void)
         }
 }
 
-static void ap_flash_set_vpp(int on)
+static void ap_flash_set_vpp(struct platform_device *pdev, int on)
 {
         void __iomem *reg = on ? SC_CTRLS : SC_CTRLC;
 
         writel(INTEGRATOR_SC_CTRL_nFLVPPEN, reg);
 }
 
-static struct flash_platform_data ap_flash_data = {
-        .map_name       = "cfi_probe",
+static struct physmap_flash_data ap_flash_data = {
         .width          = 4,
         .init           = ap_flash_init,
         .exit           = ap_flash_exit,
@@ -285,7 +276,7 @@ static struct resource cfi_flash_resource = {
 };
 
 static struct platform_device cfi_flash_device = {
-        .name           = "armflash",
+        .name           = "physmap-flash",
         .id             = 0,
         .dev            = {
                 .platform_data  = &ap_flash_data,
@@ -343,25 +334,9 @@ static void __init ap_init(void)
 
 static unsigned long timer_reload;
 
-static void __iomem * const clksrc_base = (void __iomem *)TIMER2_VA_BASE;
-
-static cycle_t timersp_read(struct clocksource *cs)
-{
-        return ~(readl(clksrc_base + TIMER_VALUE) & 0xffff);
-}
-
-static struct clocksource clocksource_timersp = {
-        .name           = "timer2",
-        .rating         = 200,
-        .read           = timersp_read,
-        .mask           = CLOCKSOURCE_MASK(16),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 static void integrator_clocksource_init(u32 khz)
 {
-        struct clocksource *cs = &clocksource_timersp;
-        void __iomem *base = clksrc_base;
+        void __iomem *base = (void __iomem *)TIMER2_VA_BASE;
         u32 ctrl = TIMER_CTRL_ENABLE;
 
         if (khz >= 1500) {
@@ -372,7 +347,8 @@ static void integrator_clocksource_init(u32 khz)
         writel(ctrl, base + TIMER_CTRL);
         writel(0xffff, base + TIMER_LOAD);
 
-        clocksource_register_khz(cs, khz);
+        clocksource_mmio_init(base + TIMER_VALUE, "timer2",
+                khz * 1000, 200, 16, clocksource_mmio_readl_down);
 }
 
 static void __iomem * const clkevt_base = (void __iomem *)TIMER1_VA_BASE;
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 9e3ce26023e8..4eb03ab5cb46 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -22,6 +22,7 @@
 #include <linux/io.h>
 #include <linux/gfp.h>
 #include <linux/clkdev.h>
+#include <linux/mtd/physmap.h>
 
 #include <mach/hardware.h>
 #include <mach/platform.h>
@@ -35,7 +36,6 @@
 #include <mach/lm.h>
 
 #include <asm/mach/arch.h>
-#include <asm/mach/flash.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
@@ -229,17 +229,24 @@ static struct clk cp_auxclk = {
         .vcoreg = CM_AUXOSC,
 };
 
+static struct clk sp804_clk = {
+        .rate   = 1000000,
+};
+
 static struct clk_lookup cp_lookups[] = {
         {       /* CLCD */
                 .dev_id         = "mb:c0",
                 .clk            = &cp_auxclk,
+        }, {    /* SP804 timers */
+                .dev_id         = "sp804",
+                .clk            = &sp804_clk,
         },
 };
 
 /*
  * Flash handling.
  */
-static int intcp_flash_init(void)
+static int intcp_flash_init(struct platform_device *dev)
 {
         u32 val;
 
@@ -250,7 +257,7 @@ static int intcp_flash_init(void)
         return 0;
 }
 
-static void intcp_flash_exit(void)
+static void intcp_flash_exit(struct platform_device *dev)
 {
         u32 val;
 
@@ -259,7 +266,7 @@ static void intcp_flash_exit(void)
         writel(val, INTCP_VA_CTRL_BASE + INTCP_FLASHPROG);
 }
 
-static void intcp_flash_set_vpp(int on)
+static void intcp_flash_set_vpp(struct platform_device *pdev, int on)
 {
         u32 val;
 
@@ -271,8 +278,7 @@ static void intcp_flash_set_vpp(int on)
         writel(val, INTCP_VA_CTRL_BASE + INTCP_FLASHPROG);
 }
 
-static struct flash_platform_data intcp_flash_data = {
-        .map_name       = "cfi_probe",
+static struct physmap_flash_data intcp_flash_data = {
         .width          = 4,
         .init           = intcp_flash_init,
         .exit           = intcp_flash_exit,
@@ -286,7 +292,7 @@ static struct resource intcp_flash_resource = {
 };
 
 static struct platform_device intcp_flash_device = {
-        .name           = "armflash",
+        .name           = "physmap-flash",
         .id             = 0,
         .dev            = {
                 .platform_data  = &intcp_flash_data,
@@ -476,8 +482,8 @@ static void __init intcp_timer_init(void)
         writel(0, TIMER1_VA_BASE + TIMER_CTRL);
         writel(0, TIMER2_VA_BASE + TIMER_CTRL);
 
-        sp804_clocksource_init(TIMER2_VA_BASE);
-        sp804_clockevents_init(TIMER1_VA_BASE, IRQ_TIMERINT1);
+        sp804_clocksource_init(TIMER2_VA_BASE, "timer2");
+        sp804_clockevents_init(TIMER1_VA_BASE, IRQ_TIMERINT1, "timer1");
 }
 
 static struct sys_timer cp_timer = {
diff --git a/arch/arm/mach-iop32x/include/mach/uncompress.h b/arch/arm/mach-iop32x/include/mach/uncompress.h
index b247551b6f5a..4fd715496f45 100644
--- a/arch/arm/mach-iop32x/include/mach/uncompress.h
+++ b/arch/arm/mach-iop32x/include/mach/uncompress.h
@@ -7,7 +7,7 @@
 #include <linux/serial_reg.h>
 #include <mach/hardware.h>
 
-static volatile u8 *uart_base;
+volatile u8 *uart_base;
 
 #define TX_DONE         (UART_LSR_TEMT | UART_LSR_THRE)
 
diff --git a/arch/arm/mach-iop33x/include/mach/uncompress.h b/arch/arm/mach-iop33x/include/mach/uncompress.h
index b42423f63302..f99bb848c5a1 100644
--- a/arch/arm/mach-iop33x/include/mach/uncompress.h
+++ b/arch/arm/mach-iop33x/include/mach/uncompress.h
@@ -7,7 +7,7 @@
 #include <linux/serial_reg.h>
 #include <mach/hardware.h>
 
-static volatile u32 *uart_base;
+volatile u32 *uart_base;
 
 #define TX_DONE         (UART_LSR_TEMT | UART_LSR_THRE)
 
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c
index a54b3db80366..e9a589395723 100644
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
@@ -342,29 +342,6 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)
         return (dev->bus == &pci_bus_type ) && ((dma_addr + size) >= SZ_64M);
 }
 
-/*
- * Only first 64MB of memory can be accessed via PCI.
- * We use GFP_DMA to allocate safe buffers to do map/unmap.
- * This is really ugly and we need a better way of specifying
- * DMA-capable regions of memory.
- */
-void __init ixp4xx_adjust_zones(unsigned long *zone_size,
-        unsigned long *zhole_size)
-{
-        unsigned int sz = SZ_64M >> PAGE_SHIFT;
-
-        /*
-         * Only adjust if > 64M on current system
-         */
-        if (zone_size[0] <= sz)
-                return;
-
-        zone_size[1] = zone_size[0] - sz;
-        zone_size[0] = sz;
-        zhole_size[1] = zhole_size[0];
-        zhole_size[0] = 0;
-}
-
 void __init ixp4xx_pci_preinit(void)
 {
         unsigned long cpuid = read_cpuid_id();
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index ed19bc314318..74ed81a3cb1a 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -419,26 +419,14 @@ static void notrace ixp4xx_update_sched_clock(void)
 /*
  * clocksource
  */
-static cycle_t ixp4xx_get_cycles(struct clocksource *cs)
-{
-        return *IXP4XX_OSTS;
-}
-
-static struct clocksource clocksource_ixp4xx = {
-        .name           = "OSTS",
-        .rating         = 200,
-        .read           = ixp4xx_get_cycles,
-        .mask           = CLOCKSOURCE_MASK(32),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 unsigned long ixp4xx_timer_freq = IXP4XX_TIMER_FREQ;
 EXPORT_SYMBOL(ixp4xx_timer_freq);
 static void __init ixp4xx_clocksource_init(void)
 {
         init_sched_clock(&cd, ixp4xx_update_sched_clock, 32, ixp4xx_timer_freq);
 
-        clocksource_register_hz(&clocksource_ixp4xx, ixp4xx_timer_freq);
+        clocksource_mmio_init(&IXP4XX_OSTS, "OSTS", ixp4xx_timer_freq, 200, 32,
+                        clocksource_mmio_readl_up);
 }
 
 /*
diff --git a/arch/arm/mach-ixp4xx/include/mach/ixp46x_ts.h b/arch/arm/mach-ixp4xx/include/mach/ixp46x_ts.h
new file mode 100644
index 000000000000..292d55ed2113
--- /dev/null
+++ b/arch/arm/mach-ixp4xx/include/mach/ixp46x_ts.h
@@ -0,0 +1,78 @@
+/*
+ * PTP 1588 clock using the IXP46X
+ *
+ * Copyright (C) 2010 OMICRON electronics GmbH
+ *
+ *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _IXP46X_TS_H_
+#define _IXP46X_TS_H_
+
+#define DEFAULT_ADDEND 0xF0000029
+#define TICKS_NS_SHIFT 4
+
+struct ixp46x_channel_ctl {
+        u32 ch_control;  /* 0x40 Time Synchronization Channel Control */
+        u32 ch_event;    /* 0x44 Time Synchronization Channel Event */
+        u32 tx_snap_lo;  /* 0x48 Transmit Snapshot Low Register */
+        u32 tx_snap_hi;  /* 0x4C Transmit Snapshot High Register */
+        u32 rx_snap_lo;  /* 0x50 Receive Snapshot Low Register */
+        u32 rx_snap_hi;  /* 0x54 Receive Snapshot High Register */
+        u32 src_uuid_lo; /* 0x58 Source UUID0 Low Register */
+        u32 src_uuid_hi; /* 0x5C Sequence Identifier/Source UUID0 High */
+};
+
+struct ixp46x_ts_regs {
+        u32 control;     /* 0x00 Time Sync Control Register */
+        u32 event;       /* 0x04 Time Sync Event Register */
+        u32 addend;      /* 0x08 Time Sync Addend Register */
+        u32 accum;       /* 0x0C Time Sync Accumulator Register */
+        u32 test;        /* 0x10 Time Sync Test Register */
+        u32 unused;      /* 0x14 */
+        u32 rsystime_lo; /* 0x18 RawSystemTime_Low Register */
+        u32 rsystime_hi; /* 0x1C RawSystemTime_High Register */
+        u32 systime_lo;  /* 0x20 SystemTime_Low Register */
+        u32 systime_hi;  /* 0x24 SystemTime_High Register */
+        u32 trgt_lo;     /* 0x28 TargetTime_Low Register */
+        u32 trgt_hi;     /* 0x2C TargetTime_High Register */
+        u32 asms_lo;     /* 0x30 Auxiliary Slave Mode Snapshot Low  */
+        u32 asms_hi;     /* 0x34 Auxiliary Slave Mode Snapshot High */
+        u32 amms_lo;     /* 0x38 Auxiliary Master Mode Snapshot Low */
+        u32 amms_hi;     /* 0x3C Auxiliary Master Mode Snapshot High */
+
+        struct ixp46x_channel_ctl channel[3];
+};
+
+/* 0x00 Time Sync Control Register Bits */
+#define TSCR_AMM (1<<3)
+#define TSCR_ASM (1<<2)
+#define TSCR_TTM (1<<1)
+#define TSCR_RST (1<<0)
+
+/* 0x04 Time Sync Event Register Bits */
+#define TSER_SNM (1<<3)
+#define TSER_SNS (1<<2)
+#define TTIPEND  (1<<1)
+
+/* 0x40 Time Synchronization Channel Control Register Bits */
+#define MASTER_MODE   (1<<0)
+#define TIMESTAMP_ALL (1<<1)
+
+/* 0x44 Time Synchronization Channel Event Register Bits */
+#define TX_SNAPSHOT_LOCKED (1<<0)
+#define RX_SNAPSHOT_LOCKED (1<<1)
+
+#endif
diff --git a/arch/arm/mach-ixp4xx/include/mach/memory.h b/arch/arm/mach-ixp4xx/include/mach/memory.h
index 6d388c9d0e20..34e79404671a 100644
--- a/arch/arm/mach-ixp4xx/include/mach/memory.h
+++ b/arch/arm/mach-ixp4xx/include/mach/memory.h
@@ -14,16 +14,8 @@
  */
 #define PLAT_PHYS_OFFSET        UL(0x00000000)
 
-#if !defined(__ASSEMBLY__) && defined(CONFIG_PCI)
-
-void ixp4xx_adjust_zones(unsigned long *size, unsigned long *holes);
-
-#define arch_adjust_zones(size, holes) \
-        ixp4xx_adjust_zones(size, holes)
-
-#define ISA_DMA_THRESHOLD (SZ_64M - 1)
-#define MAX_DMA_ADDRESS         (PAGE_OFFSET + SZ_64M)
-
+#ifdef CONFIG_PCI
+#define ARM_DMA_ZONE_SIZE       SZ_64M
 #endif
 
 #endif
diff --git a/arch/arm/mach-ixp4xx/include/mach/uncompress.h b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
index 2db0078a8cf2..219d7c1dcdba 100644
--- a/arch/arm/mach-ixp4xx/include/mach/uncompress.h
+++ b/arch/arm/mach-ixp4xx/include/mach/uncompress.h
@@ -19,7 +19,7 @@
 
 #define TX_DONE (UART_LSR_TEMT|UART_LSR_THRE)
 
-static volatile u32* uart_base;
+volatile u32* uart_base;
 
 static inline void putc(int c)
 {
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 20e71df3e3bb..f3248cfbe51d 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -13,11 +13,9 @@
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 #include <linux/mbus.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/mv643xx_i2c.h>
 #include <linux/ata_platform.h>
 #include <linux/mtd/nand.h>
-#include <linux/spi/orion_spi.h>
+#include <linux/dma-mapping.h>
 #include <net/dsa.h>
 #include <asm/page.h>
 #include <asm/timex.h>
@@ -28,11 +26,9 @@
 #include <mach/bridge-regs.h>
 #include <plat/audio.h>
 #include <plat/cache-feroceon-l2.h>
-#include <plat/ehci-orion.h>
 #include <plat/mvsdio.h>
-#include <plat/mv_xor.h>
 #include <plat/orion_nand.h>
-#include <plat/orion_wdt.h>
+#include <plat/common.h>
 #include <plat/time.h>
 #include "common.h"
 
@@ -69,210 +65,52 @@ void __init kirkwood_map_io(void)
  * registered.  Some reserved bits must be set to 1.
  */
 unsigned int kirkwood_clk_ctrl = CGC_DUNIT | CGC_RESERVED;
-        
-
-/*****************************************************************************
- * EHCI
- ****************************************************************************/
-static struct orion_ehci_data kirkwood_ehci_data = {
-        .dram           = &kirkwood_mbus_dram_info,
-        .phy_version    = EHCI_PHY_NA,
-};
-
-static u64 ehci_dmamask = 0xffffffffUL;
 
 
 /*****************************************************************************
  * EHCI0
  ****************************************************************************/
-static struct resource kirkwood_ehci_resources[] = {
-        {
-                .start  = USB_PHYS_BASE,
-                .end    = USB_PHYS_BASE + 0x0fff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_KIRKWOOD_USB,
-                .end    = IRQ_KIRKWOOD_USB,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device kirkwood_ehci = {
-        .name           = "orion-ehci",
-        .id             = 0,
-        .dev            = {
-                .dma_mask               = &ehci_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
-                .platform_data          = &kirkwood_ehci_data,
-        },
-        .resource       = kirkwood_ehci_resources,
-        .num_resources  = ARRAY_SIZE(kirkwood_ehci_resources),
-};
-
 void __init kirkwood_ehci_init(void)
 {
         kirkwood_clk_ctrl |= CGC_USB0;
-        platform_device_register(&kirkwood_ehci);
+        orion_ehci_init(&kirkwood_mbus_dram_info,
+                        USB_PHYS_BASE, IRQ_KIRKWOOD_USB);
 }
 
 
 /*****************************************************************************
  * GE00
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data kirkwood_ge00_shared_data = {
-        .dram           = &kirkwood_mbus_dram_info,
-};
-
-static struct resource kirkwood_ge00_shared_resources[] = {
-        {
-                .name   = "ge00 base",
-                .start  = GE00_PHYS_BASE + 0x2000,
-                .end    = GE00_PHYS_BASE + 0x3fff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "ge00 err irq",
-                .start  = IRQ_KIRKWOOD_GE00_ERR,
-                .end    = IRQ_KIRKWOOD_GE00_ERR,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device kirkwood_ge00_shared = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 0,
-        .dev            = {
-                .platform_data  = &kirkwood_ge00_shared_data,
-        },
-        .num_resources  = ARRAY_SIZE(kirkwood_ge00_shared_resources),
-        .resource       = kirkwood_ge00_shared_resources,
-};
-
-static struct resource kirkwood_ge00_resources[] = {
-        {
-                .name   = "ge00 irq",
-                .start  = IRQ_KIRKWOOD_GE00_SUM,
-                .end    = IRQ_KIRKWOOD_GE00_SUM,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device kirkwood_ge00 = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 0,
-        .num_resources  = 1,
-        .resource       = kirkwood_ge00_resources,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-};
-
 void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data)
 {
         kirkwood_clk_ctrl |= CGC_GE0;
-        eth_data->shared = &kirkwood_ge00_shared;
-        kirkwood_ge00.dev.platform_data = eth_data;
 
-        platform_device_register(&kirkwood_ge00_shared);
-        platform_device_register(&kirkwood_ge00);
+        orion_ge00_init(eth_data, &kirkwood_mbus_dram_info,
+                        GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM,
+                        IRQ_KIRKWOOD_GE00_ERR, kirkwood_tclk);
 }
 
 
 /*****************************************************************************
  * GE01
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data kirkwood_ge01_shared_data = {
-        .dram           = &kirkwood_mbus_dram_info,
-        .shared_smi     = &kirkwood_ge00_shared,
-};
-
-static struct resource kirkwood_ge01_shared_resources[] = {
-        {
-                .name   = "ge01 base",
-                .start  = GE01_PHYS_BASE + 0x2000,
-                .end    = GE01_PHYS_BASE + 0x3fff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "ge01 err irq",
-                .start  = IRQ_KIRKWOOD_GE01_ERR,
-                .end    = IRQ_KIRKWOOD_GE01_ERR,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device kirkwood_ge01_shared = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 1,
-        .dev            = {
-                .platform_data  = &kirkwood_ge01_shared_data,
-        },
-        .num_resources  = ARRAY_SIZE(kirkwood_ge01_shared_resources),
-        .resource       = kirkwood_ge01_shared_resources,
-};
-
-static struct resource kirkwood_ge01_resources[] = {
-        {
-                .name   = "ge01 irq",
-                .start  = IRQ_KIRKWOOD_GE01_SUM,
-                .end    = IRQ_KIRKWOOD_GE01_SUM,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device kirkwood_ge01 = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 1,
-        .num_resources  = 1,
-        .resource       = kirkwood_ge01_resources,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-};
-
 void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data)
 {
+
         kirkwood_clk_ctrl |= CGC_GE1;
-        eth_data->shared = &kirkwood_ge01_shared;
-        kirkwood_ge01.dev.platform_data = eth_data;
 
-        platform_device_register(&kirkwood_ge01_shared);
-        platform_device_register(&kirkwood_ge01);
+        orion_ge01_init(eth_data, &kirkwood_mbus_dram_info,
+                        GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM,
+                        IRQ_KIRKWOOD_GE01_ERR, kirkwood_tclk);
 }
 
 
 /*****************************************************************************
  * Ethernet switch
  ****************************************************************************/
-static struct resource kirkwood_switch_resources[] = {
-        {
-                .start  = 0,
-                .end    = 0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device kirkwood_switch_device = {
-        .name           = "dsa",
-        .id             = 0,
-        .num_resources  = 0,
-        .resource       = kirkwood_switch_resources,
-};
-
 void __init kirkwood_ge00_switch_init(struct dsa_platform_data *d, int irq)
 {
-        int i;
-
-        if (irq != NO_IRQ) {
-                kirkwood_switch_resources[0].start = irq;
-                kirkwood_switch_resources[0].end = irq;
-                kirkwood_switch_device.num_resources = 1;
-        }
-
-        d->netdev = &kirkwood_ge00.dev;
-        for (i = 0; i < d->nr_chips; i++)
-                d->chip[i].mii_bus = &kirkwood_ge00_shared.dev;
-        kirkwood_switch_device.dev.platform_data = d;
-
-        platform_device_register(&kirkwood_switch_device);
+        orion_ge00_switch_init(d, irq);
 }
 
 
@@ -325,53 +163,23 @@ void __init kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts,
 /*****************************************************************************
  * SoC RTC
  ****************************************************************************/
-static struct resource kirkwood_rtc_resource = {
-        .start  = RTC_PHYS_BASE,
-        .end    = RTC_PHYS_BASE + SZ_16 - 1,
-        .flags  = IORESOURCE_MEM,
-};
-
 static void __init kirkwood_rtc_init(void)
 {
-        platform_device_register_simple("rtc-mv", -1, &kirkwood_rtc_resource, 1);
+        orion_rtc_init(RTC_PHYS_BASE, IRQ_KIRKWOOD_RTC);
 }
 
 
 /*****************************************************************************
  * SATA
  ****************************************************************************/
-static struct resource kirkwood_sata_resources[] = {
-        {
-                .name   = "sata base",
-                .start  = SATA_PHYS_BASE,
-                .end    = SATA_PHYS_BASE + 0x5000 - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "sata irq",
-                .start  = IRQ_KIRKWOOD_SATA,
-                .end    = IRQ_KIRKWOOD_SATA,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device kirkwood_sata = {
-        .name           = "sata_mv",
-        .id             = 0,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-        .num_resources  = ARRAY_SIZE(kirkwood_sata_resources),
-        .resource       = kirkwood_sata_resources,
-};
-
 void __init kirkwood_sata_init(struct mv_sata_platform_data *sata_data)
 {
         kirkwood_clk_ctrl |= CGC_SATA0;
         if (sata_data->n_ports > 1)
                 kirkwood_clk_ctrl |= CGC_SATA1;
-        sata_data->dram = &kirkwood_mbus_dram_info;
-        kirkwood_sata.dev.platform_data = sata_data;
-        platform_device_register(&kirkwood_sata);
+
+        orion_sata_init(sata_data, &kirkwood_mbus_dram_info,
+                        SATA_PHYS_BASE, IRQ_KIRKWOOD_SATA);
 }
 
 
@@ -391,14 +199,14 @@ static struct resource mvsdio_resources[] = {
         },
 };
 
-static u64 mvsdio_dmamask = 0xffffffffUL;
+static u64 mvsdio_dmamask = DMA_BIT_MASK(32);
 
 static struct platform_device kirkwood_sdio = {
         .name           = "mvsdio",
         .id             = -1,
         .dev            = {
                 .dma_mask = &mvsdio_dmamask,
-                .coherent_dma_mask = 0xffffffff,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
         },
         .num_resources  = ARRAY_SIZE(mvsdio_resources),
         .resource       = mvsdio_resources,
@@ -423,424 +231,84 @@ void __init kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data)
 /*****************************************************************************
  * SPI
  ****************************************************************************/
-static struct orion_spi_info kirkwood_spi_plat_data = {
-};
-
-static struct resource kirkwood_spi_resources[] = {
-        {
-                .start  = SPI_PHYS_BASE,
-                .end    = SPI_PHYS_BASE + SZ_512 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device kirkwood_spi = {
-        .name           = "orion_spi",
-        .id             = 0,
-        .resource       = kirkwood_spi_resources,
-        .dev            = {
-                .platform_data  = &kirkwood_spi_plat_data,
-        },
-        .num_resources  = ARRAY_SIZE(kirkwood_spi_resources),
-};
-
 void __init kirkwood_spi_init()
 {
         kirkwood_clk_ctrl |= CGC_RUNIT;
-        platform_device_register(&kirkwood_spi);
+        orion_spi_init(SPI_PHYS_BASE, kirkwood_tclk);
 }
 
 
 /*****************************************************************************
  * I2C
  ****************************************************************************/
-static struct mv64xxx_i2c_pdata kirkwood_i2c_pdata = {
-        .freq_m         = 8, /* assumes 166 MHz TCLK */
-        .freq_n         = 3,
-        .timeout        = 1000, /* Default timeout of 1 second */
-};
-
-static struct resource kirkwood_i2c_resources[] = {
-        {
-                .start  = I2C_PHYS_BASE,
-                .end    = I2C_PHYS_BASE + 0x1f,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_KIRKWOOD_TWSI,
-                .end    = IRQ_KIRKWOOD_TWSI,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device kirkwood_i2c = {
-        .name           = MV64XXX_I2C_CTLR_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(kirkwood_i2c_resources),
-        .resource       = kirkwood_i2c_resources,
-        .dev            = {
-                .platform_data  = &kirkwood_i2c_pdata,
-        },
-};
-
 void __init kirkwood_i2c_init(void)
 {
-        platform_device_register(&kirkwood_i2c);
+        orion_i2c_init(I2C_PHYS_BASE, IRQ_KIRKWOOD_TWSI, 8);
 }
 
 
 /*****************************************************************************
  * UART0
  ****************************************************************************/
-static struct plat_serial8250_port kirkwood_uart0_data[] = {
-        {
-                .mapbase        = UART0_PHYS_BASE,
-                .membase        = (char *)UART0_VIRT_BASE,
-                .irq            = IRQ_KIRKWOOD_UART_0,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = 0,
-        }, {
-        },
-};
-
-static struct resource kirkwood_uart0_resources[] = {
-        {
-                .start          = UART0_PHYS_BASE,
-                .end            = UART0_PHYS_BASE + 0xff,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_KIRKWOOD_UART_0,
-                .end            = IRQ_KIRKWOOD_UART_0,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device kirkwood_uart0 = {
-        .name                   = "serial8250",
-        .id                     = 0,
-        .dev                    = {
-                .platform_data  = kirkwood_uart0_data,
-        },
-        .resource               = kirkwood_uart0_resources,
-        .num_resources          = ARRAY_SIZE(kirkwood_uart0_resources),
-};
 
 void __init kirkwood_uart0_init(void)
 {
-        platform_device_register(&kirkwood_uart0);
+        orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE,
+                         IRQ_KIRKWOOD_UART_0, kirkwood_tclk);
 }
 
 
 /*****************************************************************************
  * UART1
  ****************************************************************************/
-static struct plat_serial8250_port kirkwood_uart1_data[] = {
-        {
-                .mapbase        = UART1_PHYS_BASE,
-                .membase        = (char *)UART1_VIRT_BASE,
-                .irq            = IRQ_KIRKWOOD_UART_1,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = 0,
-        }, {
-        },
-};
-
-static struct resource kirkwood_uart1_resources[] = {
-        {
-                .start          = UART1_PHYS_BASE,
-                .end            = UART1_PHYS_BASE + 0xff,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_KIRKWOOD_UART_1,
-                .end            = IRQ_KIRKWOOD_UART_1,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device kirkwood_uart1 = {
-        .name                   = "serial8250",
-        .id                     = 1,
-        .dev                    = {
-                .platform_data  = kirkwood_uart1_data,
-        },
-        .resource               = kirkwood_uart1_resources,
-        .num_resources          = ARRAY_SIZE(kirkwood_uart1_resources),
-};
-
 void __init kirkwood_uart1_init(void)
 {
-        platform_device_register(&kirkwood_uart1);
+        orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE,
+                         IRQ_KIRKWOOD_UART_1, kirkwood_tclk);
 }
 
-
 /*****************************************************************************
  * Cryptographic Engines and Security Accelerator (CESA)
  ****************************************************************************/
-
-static struct resource kirkwood_crypto_res[] = {
-        {
-                .name   = "regs",
-                .start  = CRYPTO_PHYS_BASE,
-                .end    = CRYPTO_PHYS_BASE + 0xffff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "sram",
-                .start  = KIRKWOOD_SRAM_PHYS_BASE,
-                .end    = KIRKWOOD_SRAM_PHYS_BASE + KIRKWOOD_SRAM_SIZE - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "crypto interrupt",
-                .start  = IRQ_KIRKWOOD_CRYPTO,
-                .end    = IRQ_KIRKWOOD_CRYPTO,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device kirkwood_crypto_device = {
-        .name           = "mv_crypto",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(kirkwood_crypto_res),
-        .resource       = kirkwood_crypto_res,
-};
-
 void __init kirkwood_crypto_init(void)
 {
         kirkwood_clk_ctrl |= CGC_CRYPTO;
-        platform_device_register(&kirkwood_crypto_device);
+        orion_crypto_init(CRYPTO_PHYS_BASE, KIRKWOOD_SRAM_PHYS_BASE,
+                          KIRKWOOD_SRAM_SIZE, IRQ_KIRKWOOD_CRYPTO);
 }
 
 
 /*****************************************************************************
- * XOR
- ****************************************************************************/
-static struct mv_xor_platform_shared_data kirkwood_xor_shared_data = {
-        .dram           = &kirkwood_mbus_dram_info,
-};
-
-static u64 kirkwood_xor_dmamask = DMA_BIT_MASK(32);
-
-
-/*****************************************************************************
  * XOR0
  ****************************************************************************/
-static struct resource kirkwood_xor0_shared_resources[] = {
-        {
-                .name   = "xor 0 low",
-                .start  = XOR0_PHYS_BASE,
-                .end    = XOR0_PHYS_BASE + 0xff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "xor 0 high",
-                .start  = XOR0_HIGH_PHYS_BASE,
-                .end    = XOR0_HIGH_PHYS_BASE + 0xff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device kirkwood_xor0_shared = {
-        .name           = MV_XOR_SHARED_NAME,
-        .id             = 0,
-        .dev            = {
-                .platform_data = &kirkwood_xor_shared_data,
-        },
-        .num_resources  = ARRAY_SIZE(kirkwood_xor0_shared_resources),
-        .resource       = kirkwood_xor0_shared_resources,
-};
-
-static struct resource kirkwood_xor00_resources[] = {
-        [0] = {
-                .start  = IRQ_KIRKWOOD_XOR_00,
-                .end    = IRQ_KIRKWOOD_XOR_00,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct mv_xor_platform_data kirkwood_xor00_data = {
-        .shared         = &kirkwood_xor0_shared,
-        .hw_id          = 0,
-        .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device kirkwood_xor00_channel = {
-        .name           = MV_XOR_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(kirkwood_xor00_resources),
-        .resource       = kirkwood_xor00_resources,
-        .dev            = {
-                .dma_mask               = &kirkwood_xor_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(64),
-                .platform_data          = &kirkwood_xor00_data,
-        },
-};
-
-static struct resource kirkwood_xor01_resources[] = {
-        [0] = {
-                .start  = IRQ_KIRKWOOD_XOR_01,
-                .end    = IRQ_KIRKWOOD_XOR_01,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct mv_xor_platform_data kirkwood_xor01_data = {
-        .shared         = &kirkwood_xor0_shared,
-        .hw_id          = 1,
-        .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device kirkwood_xor01_channel = {
-        .name           = MV_XOR_NAME,
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(kirkwood_xor01_resources),
-        .resource       = kirkwood_xor01_resources,
-        .dev            = {
-                .dma_mask               = &kirkwood_xor_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(64),
-                .platform_data          = &kirkwood_xor01_data,
-        },
-};
-
 static void __init kirkwood_xor0_init(void)
 {
         kirkwood_clk_ctrl |= CGC_XOR0;
-        platform_device_register(&kirkwood_xor0_shared);
 
-        /*
-         * two engines can't do memset simultaneously, this limitation
-         * satisfied by removing memset support from one of the engines.
-         */
-        dma_cap_set(DMA_MEMCPY, kirkwood_xor00_data.cap_mask);
-        dma_cap_set(DMA_XOR, kirkwood_xor00_data.cap_mask);
-        platform_device_register(&kirkwood_xor00_channel);
-
-        dma_cap_set(DMA_MEMCPY, kirkwood_xor01_data.cap_mask);
-        dma_cap_set(DMA_MEMSET, kirkwood_xor01_data.cap_mask);
-        dma_cap_set(DMA_XOR, kirkwood_xor01_data.cap_mask);
-        platform_device_register(&kirkwood_xor01_channel);
+        orion_xor0_init(&kirkwood_mbus_dram_info,
+                        XOR0_PHYS_BASE, XOR0_HIGH_PHYS_BASE,
+                        IRQ_KIRKWOOD_XOR_00, IRQ_KIRKWOOD_XOR_01);
 }
 
 
 /*****************************************************************************
  * XOR1
  ****************************************************************************/
-static struct resource kirkwood_xor1_shared_resources[] = {
-        {
-                .name   = "xor 1 low",
-                .start  = XOR1_PHYS_BASE,
-                .end    = XOR1_PHYS_BASE + 0xff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "xor 1 high",
-                .start  = XOR1_HIGH_PHYS_BASE,
-                .end    = XOR1_HIGH_PHYS_BASE + 0xff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device kirkwood_xor1_shared = {
-        .name           = MV_XOR_SHARED_NAME,
-        .id             = 1,
-        .dev            = {
-                .platform_data = &kirkwood_xor_shared_data,
-        },
-        .num_resources  = ARRAY_SIZE(kirkwood_xor1_shared_resources),
-        .resource       = kirkwood_xor1_shared_resources,
-};
-
-static struct resource kirkwood_xor10_resources[] = {
-        [0] = {
-                .start  = IRQ_KIRKWOOD_XOR_10,
-                .end    = IRQ_KIRKWOOD_XOR_10,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct mv_xor_platform_data kirkwood_xor10_data = {
-        .shared         = &kirkwood_xor1_shared,
-        .hw_id          = 0,
-        .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device kirkwood_xor10_channel = {
-        .name           = MV_XOR_NAME,
-        .id             = 2,
-        .num_resources  = ARRAY_SIZE(kirkwood_xor10_resources),
-        .resource       = kirkwood_xor10_resources,
-        .dev            = {
-                .dma_mask               = &kirkwood_xor_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(64),
-                .platform_data          = &kirkwood_xor10_data,
-        },
-};
-
-static struct resource kirkwood_xor11_resources[] = {
-        [0] = {
-                .start  = IRQ_KIRKWOOD_XOR_11,
-                .end    = IRQ_KIRKWOOD_XOR_11,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct mv_xor_platform_data kirkwood_xor11_data = {
-        .shared         = &kirkwood_xor1_shared,
-        .hw_id          = 1,
-        .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device kirkwood_xor11_channel = {
-        .name           = MV_XOR_NAME,
-        .id             = 3,
-        .num_resources  = ARRAY_SIZE(kirkwood_xor11_resources),
-        .resource       = kirkwood_xor11_resources,
-        .dev            = {
-                .dma_mask               = &kirkwood_xor_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(64),
-                .platform_data          = &kirkwood_xor11_data,
-        },
-};
-
 static void __init kirkwood_xor1_init(void)
 {
         kirkwood_clk_ctrl |= CGC_XOR1;
-        platform_device_register(&kirkwood_xor1_shared);
 
-        /*
-         * two engines can't do memset simultaneously, this limitation
-         * satisfied by removing memset support from one of the engines.
-         */
-        dma_cap_set(DMA_MEMCPY, kirkwood_xor10_data.cap_mask);
-        dma_cap_set(DMA_XOR, kirkwood_xor10_data.cap_mask);
-        platform_device_register(&kirkwood_xor10_channel);
-
-        dma_cap_set(DMA_MEMCPY, kirkwood_xor11_data.cap_mask);
-        dma_cap_set(DMA_MEMSET, kirkwood_xor11_data.cap_mask);
-        dma_cap_set(DMA_XOR, kirkwood_xor11_data.cap_mask);
-        platform_device_register(&kirkwood_xor11_channel);
+        orion_xor1_init(XOR1_PHYS_BASE, XOR1_HIGH_PHYS_BASE,
+                        IRQ_KIRKWOOD_XOR_10, IRQ_KIRKWOOD_XOR_11);
 }
 
 
 /*****************************************************************************
  * Watchdog
  ****************************************************************************/
-static struct orion_wdt_platform_data kirkwood_wdt_data = {
-        .tclk           = 0,
-};
-
-static struct platform_device kirkwood_wdt_device = {
-        .name           = "orion_wdt",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &kirkwood_wdt_data,
-        },
-        .num_resources  = 0,
-};
-
 static void __init kirkwood_wdt_init(void)
 {
-        kirkwood_wdt_data.tclk = kirkwood_tclk;
-        platform_device_register(&kirkwood_wdt_device);
+        orion_wdt_init(kirkwood_tclk);
 }
 
 
@@ -984,11 +452,6 @@ void __init kirkwood_init(void)
 {
         printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n",
                 kirkwood_id(), kirkwood_tclk);
-        kirkwood_ge00_shared_data.t_clk = kirkwood_tclk;
-        kirkwood_ge01_shared_data.t_clk = kirkwood_tclk;
-        kirkwood_spi_plat_data.tclk = kirkwood_tclk;
-        kirkwood_uart0_data[0].uartclk = kirkwood_tclk;
-        kirkwood_uart1_data[0].uartclk = kirkwood_tclk;
         kirkwood_i2s_data.tclk = kirkwood_tclk;
 
         /*
diff --git a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h
index 9da2eb59180b..2bf8161e3b51 100644
--- a/arch/arm/mach-kirkwood/include/mach/irqs.h
+++ b/arch/arm/mach-kirkwood/include/mach/irqs.h
@@ -51,6 +51,7 @@
 #define IRQ_KIRKWOOD_GPIO_HIGH_16_23    41
 #define IRQ_KIRKWOOD_GE00_ERR   46
 #define IRQ_KIRKWOOD_GE01_ERR   47
+#define IRQ_KIRKWOOD_RTC        53
 
 /*
  * KIRKWOOD General Purpose Pins
diff --git a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
index 7ce201848067..b0a7d979a8ed 100644
--- a/arch/arm/mach-kirkwood/mpp.c
+++ b/arch/arm/mach-kirkwood/mpp.c
@@ -14,6 +14,7 @@
 #include <linux/io.h>
 #include <asm/gpio.h>
 #include <mach/hardware.h>
+#include <plat/mpp.h>
 #include "common.h"
 #include "mpp.h"
 
@@ -36,61 +37,8 @@ static unsigned int __init kirkwood_variant(void)
         return 0;
 }
 
-#define MPP_CTRL(i)     (DEV_BUS_VIRT_BASE + (i) * 4)
-#define MPP_NR_REGS     (1 + MPP_MAX/8)
-
 void __init kirkwood_mpp_conf(unsigned int *mpp_list)
 {
-        u32 mpp_ctrl[MPP_NR_REGS];
-        unsigned int variant_mask;
-        int i;
-
-        variant_mask = kirkwood_variant();
-        if (!variant_mask)
-                return;
-
-        printk(KERN_DEBUG "initial MPP regs:");
-        for (i = 0; i < MPP_NR_REGS; i++) {
-                mpp_ctrl[i] = readl(MPP_CTRL(i));
-                printk(" %08x", mpp_ctrl[i]);
-        }
-        printk("\n");
-
-        for ( ; *mpp_list; mpp_list++) {
-                unsigned int num = MPP_NUM(*mpp_list);
-                unsigned int sel = MPP_SEL(*mpp_list);
-                int shift, gpio_mode;
-
-                if (num > MPP_MAX) {
-                        printk(KERN_ERR "kirkwood_mpp_conf: invalid MPP "
-                                        "number (%u)\n", num);
-                        continue;
-                }
-                if (!(*mpp_list & variant_mask)) {
-                        printk(KERN_WARNING
-                               "kirkwood_mpp_conf: requested MPP%u config "
-                               "unavailable on this hardware\n", num);
-                        continue;
-                }
-
-                shift = (num & 7) << 2;
-                mpp_ctrl[num / 8] &= ~(0xf << shift);
-                mpp_ctrl[num / 8] |= sel << shift;
-
-                gpio_mode = 0;
-                if (*mpp_list & MPP_INPUT_MASK)
-                        gpio_mode |= GPIO_INPUT_OK;
-                if (*mpp_list & MPP_OUTPUT_MASK)
-                        gpio_mode |= GPIO_OUTPUT_OK;
-                if (sel != 0)
-                        gpio_mode = 0;
-                orion_gpio_set_valid(num, gpio_mode);
-        }
-
-        printk(KERN_DEBUG "  final MPP regs:");
-        for (i = 0; i < MPP_NR_REGS; i++) {
-                writel(mpp_ctrl[i], MPP_CTRL(i));
-                printk(" %08x", mpp_ctrl[i]);
-        }
-        printk("\n");
+        orion_mpp_conf(mpp_list, kirkwood_variant(),
+                       MPP_MAX, DEV_BUS_VIRT_BASE);
 }
diff --git a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
index 9b0a94d85c3e..ac787957e2d9 100644
--- a/arch/arm/mach-kirkwood/mpp.h
+++ b/arch/arm/mach-kirkwood/mpp.h
@@ -22,14 +22,8 @@
         /* available on F6281 */        ((!!(_F6281)) << 17) | \
         /* available on F6282 */        ((!!(_F6282)) << 18))
 
-#define MPP_NUM(x)      ((x) & 0xff)
-#define MPP_SEL(x)      (((x) >> 8) & 0xf)
-
                                 /*   num sel  i  o  6180 6190 6192 6281 6282 */
 
-#define MPP_INPUT_MASK          MPP(  0, 0x0, 1, 0, 0,   0,   0,   0,   0 )
-#define MPP_OUTPUT_MASK         MPP(  0, 0x0, 0, 1, 0,   0,   0,   0,   0 )
-
 #define MPP_F6180_MASK          MPP(  0, 0x0, 0, 0, 1,   0,   0,   0,   0 )
 #define MPP_F6190_MASK          MPP(  0, 0x0, 0, 0, 0,   1,   0,   0,   0 )
 #define MPP_F6192_MASK          MPP(  0, 0x0, 0, 0, 0,   0,   1,   0,   0 )
diff --git a/arch/arm/mach-loki/common.c b/arch/arm/mach-loki/common.c
index e41e909cf8f4..5f02664db812 100644
--- a/arch/arm/mach-loki/common.c
+++ b/arch/arm/mach-loki/common.c
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 #include <linux/mbus.h>
-#include <linux/mv643xx_eth.h>
+#include <linux/dma-mapping.h>
 #include <asm/page.h>
 #include <asm/timex.h>
 #include <asm/mach/map.h>
@@ -22,6 +22,7 @@
 #include <mach/loki.h>
 #include <plat/orion_nand.h>
 #include <plat/time.h>
+#include <plat/common.h>
 #include "common.h"
 
 /*****************************************************************************
@@ -43,116 +44,28 @@ void __init loki_map_io(void)
 
 
 /*****************************************************************************
- * GE0
+ * GE00
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data loki_ge0_shared_data = {
-        .t_clk          = LOKI_TCLK,
-        .dram           = &loki_mbus_dram_info,
-};
-
-static struct resource loki_ge0_shared_resources[] = {
-        {
-                .name   = "ge0 base",
-                .start  = GE0_PHYS_BASE + 0x2000,
-                .end    = GE0_PHYS_BASE + 0x3fff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device loki_ge0_shared = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 0,
-        .dev            = {
-                .platform_data  = &loki_ge0_shared_data,
-        },
-        .num_resources  = 1,
-        .resource       = loki_ge0_shared_resources,
-};
-
-static struct resource loki_ge0_resources[] = {
-        {
-                .name   = "ge0 irq",
-                .start  = IRQ_LOKI_GBE_A_INT,
-                .end    = IRQ_LOKI_GBE_A_INT,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device loki_ge0 = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 0,
-        .num_resources  = 1,
-        .resource       = loki_ge0_resources,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-};
-
 void __init loki_ge0_init(struct mv643xx_eth_platform_data *eth_data)
 {
-        eth_data->shared = &loki_ge0_shared;
-        loki_ge0.dev.platform_data = eth_data;
-
         writel(0x00079220, GE0_VIRT_BASE + 0x20b0);
-        platform_device_register(&loki_ge0_shared);
-        platform_device_register(&loki_ge0);
+
+        orion_ge00_init(eth_data, &loki_mbus_dram_info,
+                        GE0_PHYS_BASE, IRQ_LOKI_GBE_A_INT,
+                        0, LOKI_TCLK);
 }
 
 
 /*****************************************************************************
- * GE1
+ * GE01
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data loki_ge1_shared_data = {
-        .t_clk          = LOKI_TCLK,
-        .dram           = &loki_mbus_dram_info,
-};
-
-static struct resource loki_ge1_shared_resources[] = {
-        {
-                .name   = "ge1 base",
-                .start  = GE1_PHYS_BASE + 0x2000,
-                .end    = GE1_PHYS_BASE + 0x3fff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device loki_ge1_shared = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 1,
-        .dev            = {
-                .platform_data  = &loki_ge1_shared_data,
-        },
-        .num_resources  = 1,
-        .resource       = loki_ge1_shared_resources,
-};
-
-static struct resource loki_ge1_resources[] = {
-        {
-                .name   = "ge1 irq",
-                .start  = IRQ_LOKI_GBE_B_INT,
-                .end    = IRQ_LOKI_GBE_B_INT,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device loki_ge1 = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 1,
-        .num_resources  = 1,
-        .resource       = loki_ge1_resources,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-};
-
 void __init loki_ge1_init(struct mv643xx_eth_platform_data *eth_data)
 {
-        eth_data->shared = &loki_ge1_shared;
-        loki_ge1.dev.platform_data = eth_data;
-
         writel(0x00079220, GE1_VIRT_BASE + 0x20b0);
-        platform_device_register(&loki_ge1_shared);
-        platform_device_register(&loki_ge1);
+
+        orion_ge01_init(eth_data, &loki_mbus_dram_info,
+                        GE1_PHYS_BASE, IRQ_LOKI_GBE_B_INT,
+                        0, LOKI_TCLK);
 }
 
 
@@ -187,7 +100,7 @@ static struct platform_device loki_sas = {
         .name           = "mvsas",
         .id             = 0,
         .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
         },
         .num_resources  = ARRAY_SIZE(loki_sas_resources),
         .resource       = loki_sas_resources,
@@ -203,88 +116,19 @@ void __init loki_sas_init(void)
 /*****************************************************************************
  * UART0
  ****************************************************************************/
-static struct plat_serial8250_port loki_uart0_data[] = {
-        {
-                .mapbase        = UART0_PHYS_BASE,
-                .membase        = (char *)UART0_VIRT_BASE,
-                .irq            = IRQ_LOKI_UART0,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = LOKI_TCLK,
-        }, {
-        },
-};
-
-static struct resource loki_uart0_resources[] = {
-        {
-                .start          = UART0_PHYS_BASE,
-                .end            = UART0_PHYS_BASE + 0xff,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_LOKI_UART0,
-                .end            = IRQ_LOKI_UART0,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device loki_uart0 = {
-        .name                   = "serial8250",
-        .id                     = 0,
-        .dev                    = {
-                .platform_data  = loki_uart0_data,
-        },
-        .resource               = loki_uart0_resources,
-        .num_resources          = ARRAY_SIZE(loki_uart0_resources),
-};
-
 void __init loki_uart0_init(void)
 {
-        platform_device_register(&loki_uart0);
+        orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE,
+                         IRQ_LOKI_UART0, LOKI_TCLK);
 }
 
-
 /*****************************************************************************
  * UART1
  ****************************************************************************/
-static struct plat_serial8250_port loki_uart1_data[] = {
-        {
-                .mapbase        = UART1_PHYS_BASE,
-                .membase        = (char *)UART1_VIRT_BASE,
-                .irq            = IRQ_LOKI_UART1,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = LOKI_TCLK,
-        }, {
-        },
-};
-
-static struct resource loki_uart1_resources[] = {
-        {
-                .start          = UART1_PHYS_BASE,
-                .end            = UART1_PHYS_BASE + 0xff,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_LOKI_UART1,
-                .end            = IRQ_LOKI_UART1,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device loki_uart1 = {
-        .name                   = "serial8250",
-        .id                     = 1,
-        .dev                    = {
-                .platform_data  = loki_uart1_data,
-        },
-        .resource               = loki_uart1_resources,
-        .num_resources          = ARRAY_SIZE(loki_uart1_resources),
-};
-
 void __init loki_uart1_init(void)
 {
-        platform_device_register(&loki_uart1);
+        orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE,
+                         IRQ_LOKI_UART1, LOKI_TCLK);
 }
 
 
diff --git a/arch/arm/mach-lpc32xx/timer.c b/arch/arm/mach-lpc32xx/timer.c
index 6162ac308c20..b42c909bbeeb 100644
--- a/arch/arm/mach-lpc32xx/timer.c
+++ b/arch/arm/mach-lpc32xx/timer.c
@@ -31,19 +31,6 @@
 #include <mach/platform.h>
 #include "common.h"
 
-static cycle_t lpc32xx_clksrc_read(struct clocksource *cs)
-{
-        return (cycle_t)__raw_readl(LCP32XX_TIMER_TC(LPC32XX_TIMER1_BASE));
-}
-
-static struct clocksource lpc32xx_clksrc = {
-        .name   = "lpc32xx_clksrc",
-        .rating = 300,
-        .read   = lpc32xx_clksrc_read,
-        .mask   = CLOCKSOURCE_MASK(32),
-        .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 static int lpc32xx_clkevt_next_event(unsigned long delta,
     struct clock_event_device *dev)
 {
@@ -170,7 +157,9 @@ static void __init lpc32xx_timer_init(void)
         __raw_writel(0, LCP32XX_TIMER_MCR(LPC32XX_TIMER1_BASE));
         __raw_writel(LCP32XX_TIMER_CNTR_TCR_EN,
                 LCP32XX_TIMER_TCR(LPC32XX_TIMER1_BASE));
-        clocksource_register_hz(&lpc32xx_clksrc, clkrate);
+
+        clocksource_mmio_init(LCP32XX_TIMER_TC(LPC32XX_TIMER1_BASE),
+                "lpc32xx_clksrc", clkrate, 300, 32, clocksource_mmio_readl_up);
 }
 
 struct sys_timer lpc32xx_timer = {
diff --git a/arch/arm/mach-mmp/include/mach/uncompress.h b/arch/arm/mach-mmp/include/mach/uncompress.h
index 85bd8a2d84b5..d6daeb7e4ef1 100644
--- a/arch/arm/mach-mmp/include/mach/uncompress.h
+++ b/arch/arm/mach-mmp/include/mach/uncompress.h
@@ -14,7 +14,7 @@
 #define UART2_BASE      (APB_PHYS_BASE + 0x17000)
 #define UART3_BASE      (APB_PHYS_BASE + 0x18000)
 
-static volatile unsigned long *UART;
+volatile unsigned long *UART;
 
 static inline void putc(char c)
 {
diff --git a/arch/arm/mach-msm/gpio-v2.c b/arch/arm/mach-msm/gpio-v2.c
index 56a964e52ad3..cc9c4fd7cccc 100644
--- a/arch/arm/mach-msm/gpio-v2.c
+++ b/arch/arm/mach-msm/gpio-v2.c
@@ -27,6 +27,9 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
+
+#include <asm/mach/irq.h>
+
 #include <mach/msm_iomap.h>
 #include "gpiomux.h"
 
@@ -309,8 +312,10 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int flow_type)
  */
 static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_data *data = irq_desc_get_irq_data(desc);
         unsigned long i;
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+
+        chained_irq_enter(chip, desc);
 
         for (i = find_first_bit(msm_gpio.enabled_irqs, NR_GPIO_IRQS);
              i < NR_GPIO_IRQS;
@@ -319,7 +324,8 @@ static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc)
                         generic_handle_irq(msm_gpio_to_irq(&msm_gpio.gpio_chip,
                                                            i));
         }
-        data->chip->irq_ack(data);
+
+        chained_irq_exit(chip, desc);
 }
 
 static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h
index c98c7591f3b8..2f494b6a9d0a 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -55,7 +55,7 @@
 
 #include "msm_iomap-8960.h"
 
-/* Virtual addressses shared across all MSM targets. */
+/* Virtual addresses shared across all MSM targets. */
 #define MSM_CSR_BASE            IOMEM(0xE0001000)
 #define MSM_QGIC_DIST_BASE      IOMEM(0xF0000000)
 #define MSM_QGIC_CPU_BASE       IOMEM(0xF0001000)
diff --git a/arch/arm/mach-msm/include/mach/smp.h b/arch/arm/mach-msm/include/mach/smp.h
deleted file mode 100644
index 3c01000ecc80..000000000000
--- a/arch/arm/mach-msm/include/mach/smp.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef __ASM_ARCH_MSM_SMP_H
-#define __ASM_ARCH_MSM_SMP_H
-
-#include <asm/hardware/gic.h>
-
-static inline void smp_cross_call(const struct cpumask *mask, int ipi)
-{
-        gic_raise_softirq(mask, ipi);
-}
-
-#endif
diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c
index 0f427bc94447..2034098cf015 100644
--- a/arch/arm/mach-msm/platsmp.c
+++ b/arch/arm/mach-msm/platsmp.c
@@ -119,7 +119,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
          * the boot monitor to read the system wide flags register,
          * and branch to the address found there.
          */
-        smp_cross_call(cpumask_of(cpu), 1);
+        gic_raise_softirq(cpumask_of(cpu), 1);
 
         timeout = jiffies + (1 * HZ);
         while (time_before(jiffies, timeout)) {
@@ -151,6 +151,8 @@ void __init smp_init_cpus(void)
 
         for (i = 0; i < NR_CPUS; i++)
                 set_cpu_possible(i, true);
+
+        set_smp_cross_call(gic_raise_softirq);
 }
 
 void __init platform_smp_prepare_cpus(unsigned int max_cpus)
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 44fb4e55be0d..23d3980ef59d 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -13,8 +13,6 @@
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
 #include <linux/mbus.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/mv643xx_i2c.h>
 #include <linux/ata_platform.h>
 #include <linux/ethtool.h>
 #include <asm/mach/map.h>
@@ -22,11 +20,12 @@
 #include <mach/mv78xx0.h>
 #include <mach/bridge-regs.h>
 #include <plat/cache-feroceon-l2.h>
-#include <plat/ehci-orion.h>
 #include <plat/orion_nand.h>
 #include <plat/time.h>
+#include <plat/common.h>
 #include "common.h"
 
+static int get_tclk(void);
 
 /*****************************************************************************
  * Common bits
@@ -168,285 +167,62 @@ void __init mv78xx0_map_io(void)
 /*****************************************************************************
  * EHCI
  ****************************************************************************/
-static struct orion_ehci_data mv78xx0_ehci_data = {
-        .dram           = &mv78xx0_mbus_dram_info,
-        .phy_version    = EHCI_PHY_NA,
-};
-
-static u64 ehci_dmamask = 0xffffffffUL;
-
-
-/*****************************************************************************
- * EHCI0
- ****************************************************************************/
-static struct resource mv78xx0_ehci0_resources[] = {
-        {
-                .start  = USB0_PHYS_BASE,
-                .end    = USB0_PHYS_BASE + 0x0fff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_MV78XX0_USB_0,
-                .end    = IRQ_MV78XX0_USB_0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_ehci0 = {
-        .name           = "orion-ehci",
-        .id             = 0,
-        .dev            = {
-                .dma_mask               = &ehci_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
-                .platform_data          = &mv78xx0_ehci_data,
-        },
-        .resource       = mv78xx0_ehci0_resources,
-        .num_resources  = ARRAY_SIZE(mv78xx0_ehci0_resources),
-};
-
 void __init mv78xx0_ehci0_init(void)
 {
-        platform_device_register(&mv78xx0_ehci0);
+        orion_ehci_init(&mv78xx0_mbus_dram_info,
+                        USB0_PHYS_BASE, IRQ_MV78XX0_USB_0);
 }
 
 
 /*****************************************************************************
  * EHCI1
  ****************************************************************************/
-static struct resource mv78xx0_ehci1_resources[] = {
-        {
-                .start  = USB1_PHYS_BASE,
-                .end    = USB1_PHYS_BASE + 0x0fff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_MV78XX0_USB_1,
-                .end    = IRQ_MV78XX0_USB_1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_ehci1 = {
-        .name           = "orion-ehci",
-        .id             = 1,
-        .dev            = {
-                .dma_mask               = &ehci_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
-                .platform_data          = &mv78xx0_ehci_data,
-        },
-        .resource       = mv78xx0_ehci1_resources,
-        .num_resources  = ARRAY_SIZE(mv78xx0_ehci1_resources),
-};
-
 void __init mv78xx0_ehci1_init(void)
 {
-        platform_device_register(&mv78xx0_ehci1);
+        orion_ehci_1_init(&mv78xx0_mbus_dram_info,
+                          USB1_PHYS_BASE, IRQ_MV78XX0_USB_1);
 }
 
 
 /*****************************************************************************
  * EHCI2
  ****************************************************************************/
-static struct resource mv78xx0_ehci2_resources[] = {
-        {
-                .start  = USB2_PHYS_BASE,
-                .end    = USB2_PHYS_BASE + 0x0fff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_MV78XX0_USB_2,
-                .end    = IRQ_MV78XX0_USB_2,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_ehci2 = {
-        .name           = "orion-ehci",
-        .id             = 2,
-        .dev            = {
-                .dma_mask               = &ehci_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
-                .platform_data          = &mv78xx0_ehci_data,
-        },
-        .resource       = mv78xx0_ehci2_resources,
-        .num_resources  = ARRAY_SIZE(mv78xx0_ehci2_resources),
-};
-
 void __init mv78xx0_ehci2_init(void)
 {
-        platform_device_register(&mv78xx0_ehci2);
+        orion_ehci_2_init(&mv78xx0_mbus_dram_info,
+                          USB2_PHYS_BASE, IRQ_MV78XX0_USB_2);
 }
 
 
 /*****************************************************************************
  * GE00
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data mv78xx0_ge00_shared_data = {
-        .t_clk          = 0,
-        .dram           = &mv78xx0_mbus_dram_info,
-};
-
-static struct resource mv78xx0_ge00_shared_resources[] = {
-        {
-                .name   = "ge00 base",
-                .start  = GE00_PHYS_BASE + 0x2000,
-                .end    = GE00_PHYS_BASE + 0x3fff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "ge err irq",
-                .start  = IRQ_MV78XX0_GE_ERR,
-                .end    = IRQ_MV78XX0_GE_ERR,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_ge00_shared = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 0,
-        .dev            = {
-                .platform_data  = &mv78xx0_ge00_shared_data,
-        },
-        .num_resources  = ARRAY_SIZE(mv78xx0_ge00_shared_resources),
-        .resource       = mv78xx0_ge00_shared_resources,
-};
-
-static struct resource mv78xx0_ge00_resources[] = {
-        {
-                .name   = "ge00 irq",
-                .start  = IRQ_MV78XX0_GE00_SUM,
-                .end    = IRQ_MV78XX0_GE00_SUM,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_ge00 = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 0,
-        .num_resources  = 1,
-        .resource       = mv78xx0_ge00_resources,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-};
-
 void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)
 {
-        eth_data->shared = &mv78xx0_ge00_shared;
-        mv78xx0_ge00.dev.platform_data = eth_data;
-
-        platform_device_register(&mv78xx0_ge00_shared);
-        platform_device_register(&mv78xx0_ge00);
+        orion_ge00_init(eth_data, &mv78xx0_mbus_dram_info,
+                        GE00_PHYS_BASE, IRQ_MV78XX0_GE00_SUM,
+                        IRQ_MV78XX0_GE_ERR, get_tclk());
 }
 
 
 /*****************************************************************************
  * GE01
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data mv78xx0_ge01_shared_data = {
-        .t_clk          = 0,
-        .dram           = &mv78xx0_mbus_dram_info,
-        .shared_smi     = &mv78xx0_ge00_shared,
-};
-
-static struct resource mv78xx0_ge01_shared_resources[] = {
-        {
-                .name   = "ge01 base",
-                .start  = GE01_PHYS_BASE + 0x2000,
-                .end    = GE01_PHYS_BASE + 0x3fff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device mv78xx0_ge01_shared = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 1,
-        .dev            = {
-                .platform_data  = &mv78xx0_ge01_shared_data,
-        },
-        .num_resources  = 1,
-        .resource       = mv78xx0_ge01_shared_resources,
-};
-
-static struct resource mv78xx0_ge01_resources[] = {
-        {
-                .name   = "ge01 irq",
-                .start  = IRQ_MV78XX0_GE01_SUM,
-                .end    = IRQ_MV78XX0_GE01_SUM,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_ge01 = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 1,
-        .num_resources  = 1,
-        .resource       = mv78xx0_ge01_resources,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-};
-
 void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)
 {
-        eth_data->shared = &mv78xx0_ge01_shared;
-        mv78xx0_ge01.dev.platform_data = eth_data;
-
-        platform_device_register(&mv78xx0_ge01_shared);
-        platform_device_register(&mv78xx0_ge01);
+        orion_ge01_init(eth_data, &mv78xx0_mbus_dram_info,
+                        GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM,
+                        NO_IRQ, get_tclk());
 }
 
 
 /*****************************************************************************
  * GE10
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data mv78xx0_ge10_shared_data = {
-        .t_clk          = 0,
-        .dram           = &mv78xx0_mbus_dram_info,
-        .shared_smi     = &mv78xx0_ge00_shared,
-};
-
-static struct resource mv78xx0_ge10_shared_resources[] = {
-        {
-                .name   = "ge10 base",
-                .start  = GE10_PHYS_BASE + 0x2000,
-                .end    = GE10_PHYS_BASE + 0x3fff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device mv78xx0_ge10_shared = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 2,
-        .dev            = {
-                .platform_data  = &mv78xx0_ge10_shared_data,
-        },
-        .num_resources  = 1,
-        .resource       = mv78xx0_ge10_shared_resources,
-};
-
-static struct resource mv78xx0_ge10_resources[] = {
-        {
-                .name   = "ge10 irq",
-                .start  = IRQ_MV78XX0_GE10_SUM,
-                .end    = IRQ_MV78XX0_GE10_SUM,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_ge10 = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 2,
-        .num_resources  = 1,
-        .resource       = mv78xx0_ge10_resources,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-};
-
 void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)
 {
         u32 dev, rev;
 
-        eth_data->shared = &mv78xx0_ge10_shared;
-        mv78xx0_ge10.dev.platform_data = eth_data;
-
         /*
          * On the Z0, ge10 and ge11 are internally connected back
          * to back, and not brought out.
@@ -458,65 +234,19 @@ void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)
                 eth_data->duplex = DUPLEX_FULL;
         }
 
-        platform_device_register(&mv78xx0_ge10_shared);
-        platform_device_register(&mv78xx0_ge10);
+        orion_ge10_init(eth_data, &mv78xx0_mbus_dram_info,
+                        GE10_PHYS_BASE, IRQ_MV78XX0_GE10_SUM,
+                        NO_IRQ, get_tclk());
 }
 
 
 /*****************************************************************************
  * GE11
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data mv78xx0_ge11_shared_data = {
-        .t_clk          = 0,
-        .dram           = &mv78xx0_mbus_dram_info,
-        .shared_smi     = &mv78xx0_ge00_shared,
-};
-
-static struct resource mv78xx0_ge11_shared_resources[] = {
-        {
-                .name   = "ge11 base",
-                .start  = GE11_PHYS_BASE + 0x2000,
-                .end    = GE11_PHYS_BASE + 0x3fff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device mv78xx0_ge11_shared = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 3,
-        .dev            = {
-                .platform_data  = &mv78xx0_ge11_shared_data,
-        },
-        .num_resources  = 1,
-        .resource       = mv78xx0_ge11_shared_resources,
-};
-
-static struct resource mv78xx0_ge11_resources[] = {
-        {
-                .name   = "ge11 irq",
-                .start  = IRQ_MV78XX0_GE11_SUM,
-                .end    = IRQ_MV78XX0_GE11_SUM,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_ge11 = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 3,
-        .num_resources  = 1,
-        .resource       = mv78xx0_ge11_resources,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-};
-
 void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)
 {
         u32 dev, rev;
 
-        eth_data->shared = &mv78xx0_ge11_shared;
-        mv78xx0_ge11.dev.platform_data = eth_data;
-
         /*
          * On the Z0, ge10 and ge11 are internally connected back
          * to back, and not brought out.
@@ -528,293 +258,68 @@ void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)
                 eth_data->duplex = DUPLEX_FULL;
         }
 
-        platform_device_register(&mv78xx0_ge11_shared);
-        platform_device_register(&mv78xx0_ge11);
+        orion_ge11_init(eth_data, &mv78xx0_mbus_dram_info,
+                        GE11_PHYS_BASE, IRQ_MV78XX0_GE11_SUM,
+                        NO_IRQ, get_tclk());
 }
 
 /*****************************************************************************
- * I2C bus 0
- ****************************************************************************/
-
-static struct mv64xxx_i2c_pdata mv78xx0_i2c_0_pdata = {
-        .freq_m         = 8, /* assumes 166 MHz TCLK */
-        .freq_n         = 3,
-        .timeout        = 1000, /* Default timeout of 1 second */
-};
-
-static struct resource mv78xx0_i2c_0_resources[] = {
-        {
-                .start  = I2C_0_PHYS_BASE,
-                .end    = I2C_0_PHYS_BASE + 0x1f,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_MV78XX0_I2C_0,
-                .end    = IRQ_MV78XX0_I2C_0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-
-static struct platform_device mv78xx0_i2c_0 = {
-        .name           = MV64XXX_I2C_CTLR_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(mv78xx0_i2c_0_resources),
-        .resource       = mv78xx0_i2c_0_resources,
-        .dev            = {
-                .platform_data  = &mv78xx0_i2c_0_pdata,
-        },
-};
-
-/*****************************************************************************
- * I2C bus 1
+ * I2C
  ****************************************************************************/
-
-static struct mv64xxx_i2c_pdata mv78xx0_i2c_1_pdata = {
-        .freq_m         = 8, /* assumes 166 MHz TCLK */
-        .freq_n         = 3,
-        .timeout        = 1000, /* Default timeout of 1 second */
-};
-
-static struct resource mv78xx0_i2c_1_resources[] = {
-        {
-                .start  = I2C_1_PHYS_BASE,
-                .end    = I2C_1_PHYS_BASE + 0x1f,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_MV78XX0_I2C_1,
-                .end    = IRQ_MV78XX0_I2C_1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-
-static struct platform_device mv78xx0_i2c_1 = {
-        .name           = MV64XXX_I2C_CTLR_NAME,
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(mv78xx0_i2c_1_resources),
-        .resource       = mv78xx0_i2c_1_resources,
-        .dev            = {
-                .platform_data  = &mv78xx0_i2c_1_pdata,
-        },
-};
-
 void __init mv78xx0_i2c_init(void)
 {
-        platform_device_register(&mv78xx0_i2c_0);
-        platform_device_register(&mv78xx0_i2c_1);
+        orion_i2c_init(I2C_0_PHYS_BASE, IRQ_MV78XX0_I2C_0, 8);
+        orion_i2c_1_init(I2C_1_PHYS_BASE, IRQ_MV78XX0_I2C_1, 8);
 }
 
 /*****************************************************************************
  * SATA
  ****************************************************************************/
-static struct resource mv78xx0_sata_resources[] = {
-        {
-                .name   = "sata base",
-                .start  = SATA_PHYS_BASE,
-                .end    = SATA_PHYS_BASE + 0x5000 - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "sata irq",
-                .start  = IRQ_MV78XX0_SATA,
-                .end    = IRQ_MV78XX0_SATA,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_sata = {
-        .name           = "sata_mv",
-        .id             = 0,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-        .num_resources  = ARRAY_SIZE(mv78xx0_sata_resources),
-        .resource       = mv78xx0_sata_resources,
-};
-
 void __init mv78xx0_sata_init(struct mv_sata_platform_data *sata_data)
 {
-        sata_data->dram = &mv78xx0_mbus_dram_info;
-        mv78xx0_sata.dev.platform_data = sata_data;
-        platform_device_register(&mv78xx0_sata);
+        orion_sata_init(sata_data, &mv78xx0_mbus_dram_info,
+                        SATA_PHYS_BASE, IRQ_MV78XX0_SATA);
 }
 
 
 /*****************************************************************************
  * UART0
  ****************************************************************************/
-static struct plat_serial8250_port mv78xx0_uart0_data[] = {
-        {
-                .mapbase        = UART0_PHYS_BASE,
-                .membase        = (char *)UART0_VIRT_BASE,
-                .irq            = IRQ_MV78XX0_UART_0,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = 0,
-        }, {
-        },
-};
-
-static struct resource mv78xx0_uart0_resources[] = {
-        {
-                .start          = UART0_PHYS_BASE,
-                .end            = UART0_PHYS_BASE + 0xff,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_MV78XX0_UART_0,
-                .end            = IRQ_MV78XX0_UART_0,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_uart0 = {
-        .name                   = "serial8250",
-        .id                     = 0,
-        .dev                    = {
-                .platform_data  = mv78xx0_uart0_data,
-        },
-        .resource               = mv78xx0_uart0_resources,
-        .num_resources          = ARRAY_SIZE(mv78xx0_uart0_resources),
-};
-
 void __init mv78xx0_uart0_init(void)
 {
-        platform_device_register(&mv78xx0_uart0);
+        orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE,
+                         IRQ_MV78XX0_UART_0, get_tclk());
 }
 
 
 /*****************************************************************************
  * UART1
  ****************************************************************************/
-static struct plat_serial8250_port mv78xx0_uart1_data[] = {
-        {
-                .mapbase        = UART1_PHYS_BASE,
-                .membase        = (char *)UART1_VIRT_BASE,
-                .irq            = IRQ_MV78XX0_UART_1,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = 0,
-        }, {
-        },
-};
-
-static struct resource mv78xx0_uart1_resources[] = {
-        {
-                .start          = UART1_PHYS_BASE,
-                .end            = UART1_PHYS_BASE + 0xff,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_MV78XX0_UART_1,
-                .end            = IRQ_MV78XX0_UART_1,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_uart1 = {
-        .name                   = "serial8250",
-        .id                     = 1,
-        .dev                    = {
-                .platform_data  = mv78xx0_uart1_data,
-        },
-        .resource               = mv78xx0_uart1_resources,
-        .num_resources          = ARRAY_SIZE(mv78xx0_uart1_resources),
-};
-
 void __init mv78xx0_uart1_init(void)
 {
-        platform_device_register(&mv78xx0_uart1);
+        orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE,
+                         IRQ_MV78XX0_UART_1, get_tclk());
 }
 
 
 /*****************************************************************************
  * UART2
  ****************************************************************************/
-static struct plat_serial8250_port mv78xx0_uart2_data[] = {
-        {
-                .mapbase        = UART2_PHYS_BASE,
-                .membase        = (char *)UART2_VIRT_BASE,
-                .irq            = IRQ_MV78XX0_UART_2,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = 0,
-        }, {
-        },
-};
-
-static struct resource mv78xx0_uart2_resources[] = {
-        {
-                .start          = UART2_PHYS_BASE,
-                .end            = UART2_PHYS_BASE + 0xff,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_MV78XX0_UART_2,
-                .end            = IRQ_MV78XX0_UART_2,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_uart2 = {
-        .name                   = "serial8250",
-        .id                     = 2,
-        .dev                    = {
-                .platform_data  = mv78xx0_uart2_data,
-        },
-        .resource               = mv78xx0_uart2_resources,
-        .num_resources          = ARRAY_SIZE(mv78xx0_uart2_resources),
-};
-
 void __init mv78xx0_uart2_init(void)
 {
-        platform_device_register(&mv78xx0_uart2);
+        orion_uart2_init(UART2_VIRT_BASE, UART2_PHYS_BASE,
+                         IRQ_MV78XX0_UART_2, get_tclk());
 }
 
-
 /*****************************************************************************
  * UART3
  ****************************************************************************/
-static struct plat_serial8250_port mv78xx0_uart3_data[] = {
-        {
-                .mapbase        = UART3_PHYS_BASE,
-                .membase        = (char *)UART3_VIRT_BASE,
-                .irq            = IRQ_MV78XX0_UART_3,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = 0,
-        }, {
-        },
-};
-
-static struct resource mv78xx0_uart3_resources[] = {
-        {
-                .start          = UART3_PHYS_BASE,
-                .end            = UART3_PHYS_BASE + 0xff,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_MV78XX0_UART_3,
-                .end            = IRQ_MV78XX0_UART_3,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device mv78xx0_uart3 = {
-        .name                   = "serial8250",
-        .id                     = 3,
-        .dev                    = {
-                .platform_data  = mv78xx0_uart3_data,
-        },
-        .resource               = mv78xx0_uart3_resources,
-        .num_resources          = ARRAY_SIZE(mv78xx0_uart3_resources),
-};
-
 void __init mv78xx0_uart3_init(void)
 {
-        platform_device_register(&mv78xx0_uart3);
+        orion_uart3_init(UART3_VIRT_BASE, UART3_PHYS_BASE,
+                         IRQ_MV78XX0_UART_3, get_tclk());
 }
 
-
 /*****************************************************************************
  * Time handling
  ****************************************************************************/
@@ -895,13 +400,4 @@ void __init mv78xx0_init(void)
 #ifdef CONFIG_CACHE_FEROCEON_L2
         feroceon_l2_init(is_l2_writethrough());
 #endif
-
-        mv78xx0_ge00_shared_data.t_clk = tclk;
-        mv78xx0_ge01_shared_data.t_clk = tclk;
-        mv78xx0_ge10_shared_data.t_clk = tclk;
-        mv78xx0_ge11_shared_data.t_clk = tclk;
-        mv78xx0_uart0_data[0].uartclk = tclk;
-        mv78xx0_uart1_data[0].uartclk = tclk;
-        mv78xx0_uart2_data[0].uartclk = tclk;
-        mv78xx0_uart3_data[0].uartclk = tclk;
 }
diff --git a/arch/arm/mach-mv78xx0/mpp.c b/arch/arm/mach-mv78xx0/mpp.c
index 65b72c454cb0..59b7686b9209 100644
--- a/arch/arm/mach-mv78xx0/mpp.c
+++ b/arch/arm/mach-mv78xx0/mpp.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
+#include <plat/mpp.h>
 #include <asm/gpio.h>
 #include <mach/hardware.h>
 #include "common.h"
@@ -31,61 +32,8 @@ static unsigned int __init mv78xx0_variant(void)
         return 0;
 }
 
-#define MPP_CTRL(i)     (DEV_BUS_VIRT_BASE + (i) * 4)
-#define MPP_NR_REGS     (1 + MPP_MAX/8)
-
 void __init mv78xx0_mpp_conf(unsigned int *mpp_list)
 {
-        u32 mpp_ctrl[MPP_NR_REGS];
-        unsigned int variant_mask;
-        int i;
-
-        variant_mask = mv78xx0_variant();
-        if (!variant_mask)
-                return;
-
-        printk(KERN_DEBUG "initial MPP regs:");
-        for (i = 0; i < MPP_NR_REGS; i++) {
-                mpp_ctrl[i] = readl(MPP_CTRL(i));
-                printk(" %08x", mpp_ctrl[i]);
-        }
-        printk("\n");
-
-        for ( ; *mpp_list; mpp_list++) {
-                unsigned int num = MPP_NUM(*mpp_list);
-                unsigned int sel = MPP_SEL(*mpp_list);
-                int shift, gpio_mode;
-
-                if (num > MPP_MAX) {
-                        printk(KERN_ERR "mv78xx0_mpp_conf: invalid MPP "
-                                        "number (%u)\n", num);
-                        continue;
-                }
-                if (!(*mpp_list & variant_mask)) {
-                        printk(KERN_WARNING
-                                        "mv78xx0_mpp_conf: requested MPP%u config "
-                                        "unavailable on this hardware\n", num);
-                        continue;
-                }
-
-                shift = (num & 7) << 2;
-                mpp_ctrl[num / 8] &= ~(0xf << shift);
-                mpp_ctrl[num / 8] |= sel << shift;
-
-                gpio_mode = 0;
-                if (*mpp_list & MPP_INPUT_MASK)
-                        gpio_mode |= GPIO_INPUT_OK;
-                if (*mpp_list & MPP_OUTPUT_MASK)
-                        gpio_mode |= GPIO_OUTPUT_OK;
-                if (sel != 0)
-                        gpio_mode = 0;
-                orion_gpio_set_valid(num, gpio_mode);
-        }
-
-        printk(KERN_DEBUG "  final MPP regs:");
-        for (i = 0; i < MPP_NR_REGS; i++) {
-                writel(mpp_ctrl[i], MPP_CTRL(i));
-                printk(" %08x", mpp_ctrl[i]);
-        }
-        printk("\n");
+        orion_mpp_conf(mpp_list, mv78xx0_variant(),
+                       MPP_MAX, DEV_BUS_VIRT_BASE);
 }
diff --git a/arch/arm/mach-mv78xx0/mpp.h b/arch/arm/mach-mv78xx0/mpp.h
index 80840b781eaa..b61b50927123 100644
--- a/arch/arm/mach-mv78xx0/mpp.h
+++ b/arch/arm/mach-mv78xx0/mpp.h
@@ -19,14 +19,8 @@
     /* may be output signal */    ((!!(_out)) << 13) | \
     /* available on A0 */    ((!!(_78100_A0)) << 14))
 
-#define MPP_NUM(x)    ((x) & 0xff)
-#define MPP_SEL(x)    (((x) >> 8) & 0xf)
-
                 /*   num sel  i  o  78100_A0  */
 
-#define MPP_INPUT_MASK        MPP(0, 0x0, 1, 0, 0)
-#define MPP_OUTPUT_MASK        MPP(0, 0x0, 0, 1, 0)
-
 #define MPP_78100_A0_MASK    MPP(0, 0x0, 0, 0, 1)
 
 #define MPP0_GPIO        MPP(0, 0x0, 1, 1, 1)
diff --git a/arch/arm/mach-mx3/Kconfig b/arch/arm/mach-mx3/Kconfig
deleted file mode 100644
index 340809a7d233..000000000000
--- a/arch/arm/mach-mx3/Kconfig
+++ /dev/null
@@ -1,257 +0,0 @@
-if ARCH_MX3
-
-# ARCH_MX31 and ARCH_MX35 are left for compatibility
-# Some usages assume that having one of them implies not having (e.g.) ARCH_MX2.
-# To easily distinguish good and reviewed from unreviewed usages new (and IMHO
-# more sensible) names are used: SOC_IMX31 and SOC_IMX35
-config ARCH_MX31
-        bool
-
-config ARCH_MX35
-        bool
-
-config SOC_IMX31
-        bool
-        select IMX_HAVE_PLATFORM_MXC_RNGA
-        select ARCH_MXC_AUDMUX_V2
-        select ARCH_MX31
-        select MXC_AVIC
-
-config SOC_IMX35
-        bool
-        select ARCH_MXC_IOMUX_V3
-        select ARCH_MXC_AUDMUX_V2
-        select HAVE_EPIT
-        select ARCH_MX35
-        select MXC_AVIC
-
-comment "MX3 platforms:"
-
-config MACH_MX31ADS
-        bool "Support MX31ADS platforms"
-        select SOC_IMX31
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_SSI
-        select IMX_HAVE_PLATFORM_IMX_UART
-        default y
-        help
-          Include support for MX31ADS platform. This includes specific
-          configurations for the board and its peripherals.
-
-config MACH_MX31ADS_WM1133_EV1
-        bool "Support Wolfson Microelectronics 1133-EV1 module"
-        depends on MACH_MX31ADS
-        depends on MFD_WM8350_I2C
-        depends on REGULATOR_WM8350
-        select MFD_WM8350_CONFIG_MODE_0
-        select MFD_WM8352_CONFIG_MODE_0
-        help
-          Include support for the Wolfson Microelectronics 1133-EV1 PMU
-          and audio module for the MX31ADS platform.
-
-config MACH_PCM037
-        bool "Support Phytec pcm037 (i.MX31) platforms"
-        select SOC_IMX31
-        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_MXC_MMC
-        select IMX_HAVE_PLATFORM_MXC_NAND
-        select IMX_HAVE_PLATFORM_MXC_W1
-        select MXC_ULPI if USB_ULPI
-        help
-          Include support for Phytec pcm037 platform. This includes
-          specific configurations for the board and its peripherals.
-
-config MACH_PCM037_EET
-        bool "Support pcm037 EET board extensions"
-        depends on MACH_PCM037
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        help
-          Add support for PCM037 EET baseboard extensions. If you are using the
-          OLED display with EET, use "video=mx3fb:CMEL-OLED" kernel
-          command-line parameter.
-
-config MACH_MX31LITE
-        bool "Support MX31 LITEKIT (LogicPD)"
-        select SOC_IMX31
-        select MXC_ULPI if USB_ULPI
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_MXC_MMC
-        select IMX_HAVE_PLATFORM_MXC_NAND
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        help
-          Include support for MX31 LITEKIT platform. This includes specific
-          configurations for the board and its peripherals.
-
-config MACH_MX31_3DS
-        bool "Support MX31PDK (3DS)"
-        select SOC_IMX31
-        select MXC_DEBUG_BOARD
-        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_KEYPAD
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_MXC_NAND
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        select MXC_ULPI if USB_ULPI
-        help
-          Include support for MX31PDK (3DS) platform. This includes specific
-          configurations for the board and its peripherals.
-
-config MACH_MX31_3DS_MXC_NAND_USE_BBT
-        bool "Make the MXC NAND driver use the in flash Bad Block Table"
-        depends on MACH_MX31_3DS
-        depends on MTD_NAND_MXC
-        help
-          Enable this if you want that the MXC NAND driver uses the in flash
-          Bad Block Table to know what blocks are bad instead of scanning the
-          entire flash looking for bad block markers.
-
-config MACH_MX31MOBOARD
-        bool "Support mx31moboard platforms (EPFL Mobots group)"
-        select SOC_IMX31
-        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_MXC_MMC
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        select MXC_ULPI if USB_ULPI
-        help
-          Include support for mx31moboard platform. This includes specific
-          configurations for the board and its peripherals.
-
-config MACH_MX31LILLY
-        bool "Support MX31 LILLY-1131 platforms (INCO startec)"
-        select SOC_IMX31
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_MXC_MMC
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        select MXC_ULPI if USB_ULPI
-        help
-          Include support for mx31 based LILLY1131 modules. This includes
-          specific configurations for the board and its peripherals.
-
-config MACH_QONG
-        bool "Support Dave/DENX QongEVB-LITE platform"
-        select SOC_IMX31
-        select IMX_HAVE_PLATFORM_IMX_UART
-        help
-          Include support for Dave/DENX QongEVB-LITE platform. This includes
-          specific configurations for the board and its peripherals.
-
-config MACH_PCM043
-        bool "Support Phytec pcm043 (i.MX35) platforms"
-        select SOC_IMX35
-        select IMX_HAVE_PLATFORM_FLEXCAN
-        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_SSI
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_MXC_NAND
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        select MXC_ULPI if USB_ULPI
-        help
-          Include support for Phytec pcm043 platform. This includes
-          specific configurations for the board and its peripherals.
-
-config MACH_ARMADILLO5X0
-        bool "Support Atmark Armadillo-500 Development Base Board"
-        select SOC_IMX31
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_MXC_MMC
-        select IMX_HAVE_PLATFORM_MXC_NAND
-        select MXC_ULPI if USB_ULPI
-        help
-          Include support for Atmark Armadillo-500 platform. This includes
-          specific configurations for the board and its peripherals.
-
-config MACH_MX35_3DS
-        bool "Support MX35PDK platform"
-        select SOC_IMX35
-        select MXC_DEBUG_BOARD
-        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_MXC_NAND
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        help
-          Include support for MX35PDK platform. This includes specific
-          configurations for the board and its peripherals.
-
-config MACH_KZM_ARM11_01
-        bool "Support KZM-ARM11-01(Kyoto Microcomputer)"
-        select SOC_IMX31
-        select IMX_HAVE_PLATFORM_IMX_UART
-        help
-          Include support for KZM-ARM11-01. This includes specific
-          configurations for the board and its peripherals.
-
-config MACH_BUG
-        bool "Support Buglabs BUGBase platform"
-        select SOC_IMX31
-        select IMX_HAVE_PLATFORM_IMX_UART
-        default y
-        help
-          Include support for BUGBase 1.3 platform. This includes specific
-          configurations for the board and its peripherals.
-
-config MACH_EUKREA_CPUIMX35
-        bool "Support Eukrea CPUIMX35 Platform"
-        select SOC_IMX35
-        select IMX_HAVE_PLATFORM_FLEXCAN
-        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_MXC_NAND
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        select MXC_ULPI if USB_ULPI
-        help
-          Include support for Eukrea CPUIMX35 platform. This includes
-          specific configurations for the board and its peripherals.
-
-choice
-        prompt "Baseboard"
-        depends on MACH_EUKREA_CPUIMX35
-        default MACH_EUKREA_MBIMXSD35_BASEBOARD
-
-config MACH_EUKREA_MBIMXSD35_BASEBOARD
-        bool "Eukrea MBIMXSD development board"
-        select IMX_HAVE_PLATFORM_IMX_SSI
-        help
-          This adds board specific devices that can be found on Eukrea's
-          MBIMXSD evaluation board.
-
-endchoice
-
-config MACH_VPR200
-        bool "Support VPR200 platform"
-        select SOC_IMX35
-        select IMX_HAVE_PLATFORM_FSL_USB2_UDC
-        select IMX_HAVE_PLATFORM_IMX2_WDT
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_MXC_EHCI
-        select IMX_HAVE_PLATFORM_MXC_NAND
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        help
-          Include support for VPR200 platform. This includes specific
-          configurations for the board and its peripherals.
-
-endif
diff --git a/arch/arm/mach-mx3/Makefile b/arch/arm/mach-mx3/Makefile
deleted file mode 100644
index a54faf2cf5fa..000000000000
--- a/arch/arm/mach-mx3/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-# Object file lists.
-
-obj-y                           := mm.o devices.o cpu.o
-obj-$(CONFIG_SOC_IMX31)         += clock-imx31.o iomux-imx31.o ehci-imx31.o
-obj-$(CONFIG_SOC_IMX35)         += clock-imx35.o ehci-imx35.o
-obj-$(CONFIG_MACH_MX31ADS)      += mach-mx31ads.o
-obj-$(CONFIG_MACH_MX31LILLY)    += mach-mx31lilly.o mx31lilly-db.o
-obj-$(CONFIG_MACH_MX31LITE)     += mach-mx31lite.o mx31lite-db.o
-obj-$(CONFIG_MACH_PCM037)       += mach-pcm037.o
-obj-$(CONFIG_MACH_PCM037_EET)   += mach-pcm037_eet.o
-obj-$(CONFIG_MACH_MX31_3DS)     += mach-mx31_3ds.o
-obj-$(CONFIG_MACH_MX31MOBOARD)  += mach-mx31moboard.o mx31moboard-devboard.o \
-                                   mx31moboard-marxbot.o mx31moboard-smartbot.o
-obj-$(CONFIG_MACH_QONG)         += mach-qong.o
-obj-$(CONFIG_MACH_PCM043)       += mach-pcm043.o
-obj-$(CONFIG_MACH_ARMADILLO5X0) += mach-armadillo5x0.o
-obj-$(CONFIG_MACH_MX35_3DS)     += mach-mx35_3ds.o
-obj-$(CONFIG_MACH_KZM_ARM11_01) += mach-kzm_arm11_01.o
-obj-$(CONFIG_MACH_BUG)          += mach-bug.o
-obj-$(CONFIG_MACH_EUKREA_CPUIMX35)      += mach-cpuimx35.o
-obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD)   += eukrea_mbimxsd-baseboard.o
-obj-$(CONFIG_MACH_VPR200)       += mach-vpr200.o
diff --git a/arch/arm/mach-mx3/Makefile.boot b/arch/arm/mach-mx3/Makefile.boot
deleted file mode 100644
index e1dd366f836b..000000000000
--- a/arch/arm/mach-mx3/Makefile.boot
+++ /dev/null
@@ -1,3 +0,0 @@
-   zreladdr-y   := 0x80008000
-params_phys-y   := 0x80000100
-initrd_phys-y   := 0x80800000
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c
deleted file mode 100644
index b6672db788fb..000000000000
--- a/arch/arm/mach-mx3/devices.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2006-2007 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Sascha Hauer, kernel@pengutronix.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 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/dma-mapping.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/serial.h>
-#include <linux/gpio.h>
-#include <mach/hardware.h>
-#include <mach/irqs.h>
-#include <mach/common.h>
-#include <mach/mx3_camera.h>
-
-#include "devices.h"
-
-/* i.MX31 Image Processing Unit */
-
-/* The resource order is important! */
-static struct resource mx3_ipu_rsrc[] = {
-        {
-                .start = MX3x_IPU_CTRL_BASE_ADDR,
-                .end = MX3x_IPU_CTRL_BASE_ADDR + 0x5F,
-                .flags = IORESOURCE_MEM,
-        }, {
-                .start = MX3x_IPU_CTRL_BASE_ADDR + 0x88,
-                .end = MX3x_IPU_CTRL_BASE_ADDR + 0xB3,
-                .flags = IORESOURCE_MEM,
-        }, {
-                .start = MX3x_INT_IPU_SYN,
-                .end = MX3x_INT_IPU_SYN,
-                .flags = IORESOURCE_IRQ,
-        }, {
-                .start = MX3x_INT_IPU_ERR,
-                .end = MX3x_INT_IPU_ERR,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-struct platform_device mx3_ipu = {
-        .name = "ipu-core",
-        .id = -1,
-        .num_resources = ARRAY_SIZE(mx3_ipu_rsrc),
-        .resource = mx3_ipu_rsrc,
-};
-
-static struct resource fb_resources[] = {
-        {
-                .start  = MX3x_IPU_CTRL_BASE_ADDR + 0xB4,
-                .end    = MX3x_IPU_CTRL_BASE_ADDR + 0x1BF,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-struct platform_device mx3_fb = {
-        .name           = "mx3_sdc_fb",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(fb_resources),
-        .resource       = fb_resources,
-        .dev            = {
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-       },
-};
-
-static struct resource camera_resources[] = {
-        {
-                .start  = MX3x_IPU_CTRL_BASE_ADDR + 0x60,
-                .end    = MX3x_IPU_CTRL_BASE_ADDR + 0x87,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-struct platform_device mx3_camera = {
-        .name           = "mx3-camera",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(camera_resources),
-        .resource       = camera_resources,
-        .dev            = {
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-};
-
-static struct resource imx_rtc_resources[] = {
-        {
-                .start  = MX31_RTC_BASE_ADDR,
-                .end    = MX31_RTC_BASE_ADDR + 0x3fff,
-                .flags  = IORESOURCE_MEM,
-        },
-        {
-                .start  = MX31_INT_RTC,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-struct platform_device imx_rtc_device0 = {
-        .name           = "mxc_rtc",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(imx_rtc_resources),
-        .resource       = imx_rtc_resources,
-};
diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h
deleted file mode 100644
index 121962c568d1..000000000000
--- a/arch/arm/mach-mx3/devices.h
+++ /dev/null
@@ -1,4 +0,0 @@
-extern struct platform_device mx3_ipu;
-extern struct platform_device mx3_fb;
-extern struct platform_device mx3_camera;
-extern struct platform_device imx_rtc_device0;
diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c
deleted file mode 100644
index 54d7174b4202..000000000000
--- a/arch/arm/mach-mx3/mm.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *  Copyright (C) 1999,2000 Arm Limited
- *  Copyright (C) 2000 Deep Blue Solutions Ltd
- *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
- *  Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
- *    - add MX31 specific definitions
- *
- * 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/mm.h>
-#include <linux/init.h>
-#include <linux/err.h>
-
-#include <asm/pgtable.h>
-#include <asm/mach/map.h>
-#include <asm/hardware/cache-l2x0.h>
-
-#include <mach/common.h>
-#include <mach/hardware.h>
-#include <mach/iomux-v3.h>
-#include <mach/gpio.h>
-#include <mach/irqs.h>
-
-#ifdef CONFIG_SOC_IMX31
-static struct map_desc mx31_io_desc[] __initdata = {
-        imx_map_entry(MX31, X_MEMC, MT_DEVICE),
-        imx_map_entry(MX31, AVIC, MT_DEVICE_NONSHARED),
-        imx_map_entry(MX31, AIPS1, MT_DEVICE_NONSHARED),
-        imx_map_entry(MX31, AIPS2, MT_DEVICE_NONSHARED),
-        imx_map_entry(MX31, SPBA0, MT_DEVICE_NONSHARED),
-};
-
-/*
- * This function initializes the memory map. It is called during the
- * system startup to create static physical to virtual memory mappings
- * for the IO modules.
- */
-void __init mx31_map_io(void)
-{
-        iotable_init(mx31_io_desc, ARRAY_SIZE(mx31_io_desc));
-}
-
-void __init imx31_init_early(void)
-{
-        mxc_set_cpu_type(MXC_CPU_MX31);
-        mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR));
-}
-
-static struct mxc_gpio_port imx31_gpio_ports[] = {
-        DEFINE_IMX_GPIO_PORT_IRQ(MX31, 0, 1, MX31_INT_GPIO1),
-        DEFINE_IMX_GPIO_PORT_IRQ(MX31, 1, 2, MX31_INT_GPIO2),
-        DEFINE_IMX_GPIO_PORT_IRQ(MX31, 2, 3, MX31_INT_GPIO3),
-};
-
-void __init mx31_init_irq(void)
-{
-        mxc_init_irq(MX31_IO_ADDRESS(MX31_AVIC_BASE_ADDR));
-        mxc_gpio_init(imx31_gpio_ports, ARRAY_SIZE(imx31_gpio_ports));
-}
-#endif /* ifdef CONFIG_SOC_IMX31 */
-
-#ifdef CONFIG_SOC_IMX35
-static struct map_desc mx35_io_desc[] __initdata = {
-        imx_map_entry(MX35, X_MEMC, MT_DEVICE),
-        imx_map_entry(MX35, AVIC, MT_DEVICE_NONSHARED),
-        imx_map_entry(MX35, AIPS1, MT_DEVICE_NONSHARED),
-        imx_map_entry(MX35, AIPS2, MT_DEVICE_NONSHARED),
-        imx_map_entry(MX35, SPBA0, MT_DEVICE_NONSHARED),
-};
-
-void __init mx35_map_io(void)
-{
-        iotable_init(mx35_io_desc, ARRAY_SIZE(mx35_io_desc));
-}
-
-void __init imx35_init_early(void)
-{
-        mxc_set_cpu_type(MXC_CPU_MX35);
-        mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR));
-        mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR));
-}
-
-static struct mxc_gpio_port imx35_gpio_ports[] = {
-        DEFINE_IMX_GPIO_PORT_IRQ(MX35, 0, 1, MX35_INT_GPIO1),
-        DEFINE_IMX_GPIO_PORT_IRQ(MX35, 1, 2, MX35_INT_GPIO2),
-        DEFINE_IMX_GPIO_PORT_IRQ(MX35, 2, 3, MX35_INT_GPIO3),
-};
-
-void __init mx35_init_irq(void)
-{
-        mxc_init_irq(MX35_IO_ADDRESS(MX35_AVIC_BASE_ADDR));
-        mxc_gpio_init(imx35_gpio_ports, ARRAY_SIZE(imx35_gpio_ports));
-}
-#endif /* ifdef CONFIG_SOC_IMX35 */
-
-#ifdef CONFIG_CACHE_L2X0
-static int mxc_init_l2x0(void)
-{
-        void __iomem *l2x0_base;
-        void __iomem *clkctl_base;
-/*
- * First of all, we must repair broken chip settings. There are some
- * i.MX35 CPUs in the wild, comming with bogus L2 cache settings. These
- * misconfigured CPUs will run amok immediately when the L2 cache gets enabled.
- * Workaraound is to setup the correct register setting prior enabling the
- * L2 cache. This should not hurt already working CPUs, as they are using the
- * same value
- */
-#define L2_MEM_VAL 0x10
-
-        clkctl_base = ioremap(MX35_CLKCTL_BASE_ADDR, 4096);
-        if (clkctl_base != NULL) {
-                writel(0x00000515, clkctl_base + L2_MEM_VAL);
-                iounmap(clkctl_base);
-        } else {
-                pr_err("L2 cache: Cannot fix timing. Trying to continue without\n");
-        }
-
-        l2x0_base = ioremap(MX3x_L2CC_BASE_ADDR, 4096);
-        if (IS_ERR(l2x0_base)) {
-                printk(KERN_ERR "remapping L2 cache area failed with %ld\n",
-                                PTR_ERR(l2x0_base));
-                return 0;
-        }
-
-        l2x0_init(l2x0_base, 0x00030024, 0x00000000);
-
-        return 0;
-}
-
-arch_initcall(mxc_init_l2x0);
-#endif
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index 159340da9191..799fbc40e53c 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@ -1,11 +1,11 @@
-if ARCH_MX5
-# ARCH_MX50/51/53 are left to mark places where prevent multi-soc in single
+if ARCH_MX503 || ARCH_MX51
+# ARCH_MX5/50/53 are left to mark places where prevent multi-soc in single
 # image. So for most time, SOC_IMX50/51/53 should be used.
 
-config ARCH_MX50
+config ARCH_MX5
         bool
 
-config ARCH_MX51
+config ARCH_MX50
         bool
 
 config ARCH_MX53
@@ -13,27 +13,54 @@ config ARCH_MX53
 
 config SOC_IMX50
         bool
+        select CPU_V7
+        select ARM_L1_CACHE_SHIFT_6
         select MXC_TZIC
         select ARCH_MXC_IOMUX_V3
         select ARCH_MXC_AUDMUX_V2
         select ARCH_HAS_CPUFREQ
+        select ARCH_MX5
         select ARCH_MX50
 
 config  SOC_IMX51
         bool
+        select CPU_V7
+        select ARM_L1_CACHE_SHIFT_6
         select MXC_TZIC
         select ARCH_MXC_IOMUX_V3
         select ARCH_MXC_AUDMUX_V2
         select ARCH_HAS_CPUFREQ
-        select ARCH_MX51
+        select ARCH_MX5
 
 config  SOC_IMX53
         bool
+        select CPU_V7
+        select ARM_L1_CACHE_SHIFT_6
         select MXC_TZIC
         select ARCH_MXC_IOMUX_V3
+        select ARCH_MX5
         select ARCH_MX53
 
-comment "MX5 platforms:"
+if ARCH_MX50_SUPPORTED
+#comment "i.MX50 machines:"
+
+config MACH_MX50_RDP
+        bool "Support MX50 reference design platform"
+        depends on BROKEN
+        select SOC_IMX50
+        select IMX_HAVE_PLATFORM_IMX_I2C
+        select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
+        select IMX_HAVE_PLATFORM_SPI_IMX
+        select IMX_HAVE_PLATFORM_FEC
+        help
+          Include support for MX50 reference design platform (RDP) board. This
+          includes specific configurations for the board and its peripherals.
+
+endif # ARCH_MX50_SUPPORTED
+
+if ARCH_MX51
+comment "i.MX51 machines:"
 
 config MACH_MX51_BABBAGE
         bool "Support MX51 BABBAGE platforms"
@@ -136,6 +163,11 @@ config MACH_MX51_EFIKASB
           Include support for Genesi Efika Smartbook. This includes specific
           configurations for the board and its peripherals.
 
+endif # ARCH_MX51
+
+if ARCH_MX53_SUPPORTED
+comment "i.MX53 machines:"
+
 config MACH_MX53_EVK
         bool "Support MX53 EVK platforms"
         select SOC_IMX53
@@ -154,6 +186,7 @@ config MACH_MX53_SMD
         select IMX_HAVE_PLATFORM_IMX2_WDT
         select IMX_HAVE_PLATFORM_IMX_I2C
         select IMX_HAVE_PLATFORM_IMX_UART
+        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
         help
           Include support for MX53 SMD platform. This includes specific
           configurations for the board and its peripherals.
@@ -170,17 +203,6 @@ config MACH_MX53_LOCO
           Include support for MX53 LOCO platform. This includes specific
           configurations for the board and its peripherals.
 
-config MACH_MX50_RDP
-        bool "Support MX50 reference design platform"
-        depends on BROKEN
-        select SOC_IMX50
-        select IMX_HAVE_PLATFORM_IMX_I2C
-        select IMX_HAVE_PLATFORM_IMX_UART
-        select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
-        select IMX_HAVE_PLATFORM_SPI_IMX
-        select IMX_HAVE_PLATFORM_FEC
-        help
-          Include support for MX50 reference design platform (RDP) board. This
-          includes specific configurations for the board and its peripherals.
+endif # ARCH_MX53_SUPPORTED
 
 endif
diff --git a/arch/arm/mach-mx5/board-cpuimx51.c b/arch/arm/mach-mx5/board-cpuimx51.c
index d0296a94c475..4efa02ee1639 100644
--- a/arch/arm/mach-mx5/board-cpuimx51.c
+++ b/arch/arm/mach-mx5/board-cpuimx51.c
@@ -23,13 +23,11 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/fsl_devices.h>
 
 #include <mach/eukrea-baseboards.h>
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx51.h>
-#include <mach/mxc_ehci.h>
 
 #include <asm/irq.h>
 #include <asm/setup.h>
diff --git a/arch/arm/mach-mx5/board-cpuimx51sd.c b/arch/arm/mach-mx5/board-cpuimx51sd.c
index 29b180823bf5..5ef25a596143 100644
--- a/arch/arm/mach-mx5/board-cpuimx51sd.c
+++ b/arch/arm/mach-mx5/board-cpuimx51sd.c
@@ -23,7 +23,6 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/fsl_devices.h>
 #include <linux/i2c-gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/can/platform/mcp251x.h>
@@ -32,7 +31,6 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx51.h>
-#include <mach/mxc_ehci.h>
 
 #include <asm/irq.h>
 #include <asm/setup.h>
diff --git a/arch/arm/mach-mx5/board-mx50_rdp.c b/arch/arm/mach-mx5/board-mx50_rdp.c
index dedf7f2d6d0f..11210e1ae42a 100644
--- a/arch/arm/mach-mx5/board-mx50_rdp.c
+++ b/arch/arm/mach-mx5/board-mx50_rdp.c
@@ -23,7 +23,6 @@
 #include <linux/gpio.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/fsl_devices.h>
 
 #include <mach/common.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c
index bea4e4135f9d..c7b3fabf50f9 100644
--- a/arch/arm/mach-mx5/board-mx51_babbage.c
+++ b/arch/arm/mach-mx5/board-mx51_babbage.c
@@ -16,9 +16,6 @@
 #include <linux/gpio.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/fsl_devices.h>
-#include <linux/fec.h>
-#include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/spi/flash.h>
 #include <linux/spi/spi.h>
@@ -26,7 +23,6 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx51.h>
-#include <mach/mxc_ehci.h>
 
 #include <asm/irq.h>
 #include <asm/setup.h>
@@ -208,18 +204,16 @@ static inline void babbage_usbhub_reset(void)
 {
         int ret;
 
-        /* Bring USB hub out of reset */
-        ret = gpio_request(BABBAGE_USB_HUB_RESET, "GPIO1_7");
+        /* Reset USB hub */
+        ret = gpio_request_one(BABBAGE_USB_HUB_RESET,
+                                        GPIOF_OUT_INIT_LOW, "GPIO1_7");
         if (ret) {
                 printk(KERN_ERR"failed to get GPIO_USB_HUB_RESET: %d\n", ret);
                 return;
         }
-        gpio_direction_output(BABBAGE_USB_HUB_RESET, 0);
 
-        /* USB HUB RESET - De-assert USB HUB RESET_N */
-        msleep(1);
-        gpio_set_value(BABBAGE_USB_HUB_RESET, 0);
-        msleep(1);
+        msleep(2);
+        /* Deassert reset */
         gpio_set_value(BABBAGE_USB_HUB_RESET, 1);
 }
 
@@ -361,7 +355,7 @@ static void __init mx51_babbage_init(void)
 
         /* Set the PAD settings for the pwr key. */
         mxc_iomux_v3_setup_pad(power_key);
-        imx51_add_gpio_keys(&imx_button_data);
+        imx_add_gpio_keys(&imx_button_data);
 
         imx51_add_imx_i2c(0, &babbage_i2c_data);
         imx51_add_imx_i2c(1, &babbage_i2c_data);
diff --git a/arch/arm/mach-mx5/board-mx51_efikamx.c b/arch/arm/mach-mx5/board-mx51_efikamx.c
index acab1911cb3c..6e362315291b 100644
--- a/arch/arm/mach-mx5/board-mx51_efikamx.c
+++ b/arch/arm/mach-mx5/board-mx51_efikamx.c
@@ -22,7 +22,6 @@
 #include <linux/input.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/fsl_devices.h>
 #include <linux/spi/flash.h>
 #include <linux/spi/spi.h>
 #include <linux/mfd/mc13892.h>
@@ -32,8 +31,6 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx51.h>
-#include <mach/i2c.h>
-#include <mach/mxc_ehci.h>
 
 #include <asm/irq.h>
 #include <asm/setup.h>
@@ -252,7 +249,7 @@ static void __init mx51_efikamx_init(void)
         }
 
         platform_device_register(&mx51_efikamx_leds_device);
-        imx51_add_gpio_keys(&mx51_efikamx_powerkey_data);
+        imx_add_gpio_keys(&mx51_efikamx_powerkey_data);
 
         if (system_rev == 0x11) {
                 gpio_request(EFIKAMX_RESET1_1, "reset");
diff --git a/arch/arm/mach-mx5/board-mx51_efikasb.c b/arch/arm/mach-mx5/board-mx51_efikasb.c
index db04ce8462dc..474fc6e4c6df 100644
--- a/arch/arm/mach-mx5/board-mx51_efikasb.c
+++ b/arch/arm/mach-mx5/board-mx51_efikasb.c
@@ -22,7 +22,6 @@
 #include <linux/input.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/fsl_devices.h>
 #include <linux/spi/flash.h>
 #include <linux/spi/spi.h>
 #include <linux/mfd/mc13892.h>
@@ -35,8 +34,6 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx51.h>
-#include <mach/i2c.h>
-#include <mach/mxc_ehci.h>
 
 #include <asm/irq.h>
 #include <asm/setup.h>
@@ -260,7 +257,7 @@ static void __init efikasb_board_init(void)
         imx51_add_sdhci_esdhc_imx(1, NULL);
 
         platform_device_register(&mx51_efikasb_leds_device);
-        imx51_add_gpio_keys(&mx51_efikasb_keys_data);
+        imx_add_gpio_keys(&mx51_efikasb_keys_data);
 
 }
 
diff --git a/arch/arm/mach-mx5/board-mx53_evk.c b/arch/arm/mach-mx5/board-mx53_evk.c
index 2af3f43f74db..f87d571882c6 100644
--- a/arch/arm/mach-mx5/board-mx53_evk.c
+++ b/arch/arm/mach-mx5/board-mx53_evk.c
@@ -21,7 +21,6 @@
 
 #include <linux/init.h>
 #include <linux/clk.h>
-#include <linux/fec.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/spi/flash.h>
@@ -31,7 +30,6 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
-#include <mach/imx-uart.h>
 #include <mach/iomux-mx53.h>
 
 #define MX53_EVK_FEC_PHY_RST    IMX_GPIO_NR(7, 6)
diff --git a/arch/arm/mach-mx5/board-mx53_loco.c b/arch/arm/mach-mx5/board-mx53_loco.c
index 6206b1191fe8..1b947e8c9c0c 100644
--- a/arch/arm/mach-mx5/board-mx53_loco.c
+++ b/arch/arm/mach-mx5/board-mx53_loco.c
@@ -20,13 +20,11 @@
 
 #include <linux/init.h>
 #include <linux/clk.h>
-#include <linux/fec.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
 
 #include <mach/common.h>
 #include <mach/hardware.h>
-#include <mach/imx-uart.h>
 #include <mach/iomux-mx53.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-mx5/board-mx53_smd.c b/arch/arm/mach-mx5/board-mx53_smd.c
index 31e173267edf..817c08938f55 100644
--- a/arch/arm/mach-mx5/board-mx53_smd.c
+++ b/arch/arm/mach-mx5/board-mx53_smd.c
@@ -20,13 +20,11 @@
 
 #include <linux/init.h>
 #include <linux/clk.h>
-#include <linux/fec.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
 
 #include <mach/common.h>
 #include <mach/hardware.h>
-#include <mach/imx-uart.h>
 #include <mach/iomux-mx53.h>
 
 #include <asm/mach-types.h>
@@ -52,6 +50,31 @@ static iomux_v3_cfg_t mx53_smd_pads[] = {
         /* I2C1 */
         MX53_PAD_CSI0_DAT8__I2C1_SDA,
         MX53_PAD_CSI0_DAT9__I2C1_SCL,
+        /* SD1 */
+        MX53_PAD_SD1_CMD__ESDHC1_CMD,
+        MX53_PAD_SD1_CLK__ESDHC1_CLK,
+        MX53_PAD_SD1_DATA0__ESDHC1_DAT0,
+        MX53_PAD_SD1_DATA1__ESDHC1_DAT1,
+        MX53_PAD_SD1_DATA2__ESDHC1_DAT2,
+        MX53_PAD_SD1_DATA3__ESDHC1_DAT3,
+        /* SD2 */
+        MX53_PAD_SD2_CMD__ESDHC2_CMD,
+        MX53_PAD_SD2_CLK__ESDHC2_CLK,
+        MX53_PAD_SD2_DATA0__ESDHC2_DAT0,
+        MX53_PAD_SD2_DATA1__ESDHC2_DAT1,
+        MX53_PAD_SD2_DATA2__ESDHC2_DAT2,
+        MX53_PAD_SD2_DATA3__ESDHC2_DAT3,
+        /* SD3 */
+        MX53_PAD_PATA_DATA8__ESDHC3_DAT0,
+        MX53_PAD_PATA_DATA9__ESDHC3_DAT1,
+        MX53_PAD_PATA_DATA10__ESDHC3_DAT2,
+        MX53_PAD_PATA_DATA11__ESDHC3_DAT3,
+        MX53_PAD_PATA_DATA0__ESDHC3_DAT4,
+        MX53_PAD_PATA_DATA1__ESDHC3_DAT5,
+        MX53_PAD_PATA_DATA2__ESDHC3_DAT6,
+        MX53_PAD_PATA_DATA3__ESDHC3_DAT7,
+        MX53_PAD_PATA_IORDY__ESDHC3_CLK,
+        MX53_PAD_PATA_RESET_B__ESDHC3_CMD,
 };
 
 static const struct imxuart_platform_data mx53_smd_uart_data __initconst = {
@@ -97,6 +120,9 @@ static void __init mx53_smd_board_init(void)
         imx53_add_fec(&mx53_smd_fec_data);
         imx53_add_imx2_wdt(0, NULL);
         imx53_add_imx_i2c(0, &mx53_smd_i2c_data);
+        imx53_add_sdhci_esdhc_imx(0, NULL);
+        imx53_add_sdhci_esdhc_imx(1, NULL);
+        imx53_add_sdhci_esdhc_imx(2, NULL);
 }
 
 static void __init mx53_smd_timer_init(void)
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c
index fdbc05ed5513..6b89c1bf4eb2 100644
--- a/arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/arch/arm/mach-mx5/clock-mx51-mx53.c
@@ -1563,6 +1563,7 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc,
         clk_enable(&iim_clk);
         mx53_revision();
         clk_disable(&iim_clk);
+        mx53_display_revision();
 
         /* Set SDHC parents to be PLL2 */
         clk_set_parent(&esdhc1_clk, &pll2_sw_clk);
diff --git a/arch/arm/mach-mx5/cpu.c b/arch/arm/mach-mx5/cpu.c
index 472bdfab2e55..86f87da59c64 100644
--- a/arch/arm/mach-mx5/cpu.c
+++ b/arch/arm/mach-mx5/cpu.c
@@ -166,6 +166,29 @@ int mx50_revision(void)
 }
 EXPORT_SYMBOL(mx50_revision);
 
+void mx53_display_revision(void)
+{
+        int rev;
+        char *srev;
+        rev = mx53_revision();
+
+        switch (rev) {
+        case IMX_CHIP_REVISION_1_0:
+                srev = IMX_CHIP_REVISION_1_0_STRING;
+                break;
+        case IMX_CHIP_REVISION_2_0:
+                srev = IMX_CHIP_REVISION_2_0_STRING;
+                break;
+        case IMX_CHIP_REVISION_2_1:
+                srev = IMX_CHIP_REVISION_2_1_STRING;
+                break;
+        default:
+                srev = IMX_CHIP_REVISION_UNKNOWN_STRING;
+        }
+        printk(KERN_INFO "CPU identified as i.MX53, silicon rev %s\n", srev);
+}
+EXPORT_SYMBOL(mx53_display_revision);
+
 static int __init post_cpu_init(void)
 {
         unsigned int reg;
diff --git a/arch/arm/mach-mx5/devices-imx50.h b/arch/arm/mach-mx5/devices-imx50.h
index c9e42823c7e3..7216667eaafc 100644
--- a/arch/arm/mach-mx5/devices-imx50.h
+++ b/arch/arm/mach-mx5/devices-imx50.h
@@ -21,14 +21,14 @@
 #include <mach/mx50.h>
 #include <mach/devices-common.h>
 
-extern const struct imx_imx_uart_1irq_data imx50_imx_uart_data[] __initconst;
+extern const struct imx_imx_uart_1irq_data imx50_imx_uart_data[];
 #define imx50_add_imx_uart(id, pdata)   \
         imx_add_imx_uart_1irq(&imx50_imx_uart_data[id], pdata)
 
-extern const struct imx_fec_data imx50_fec_data __initconst;
+extern const struct imx_fec_data imx50_fec_data;
 #define imx50_add_fec(pdata)    \
         imx_add_fec(&imx50_fec_data, pdata)
 
-extern const struct imx_imx_i2c_data imx50_imx_i2c_data[] __initconst;
+extern const struct imx_imx_i2c_data imx50_imx_i2c_data[];
 #define imx50_add_imx_i2c(id, pdata)    \
         imx_add_imx_i2c(&imx50_imx_i2c_data[id], pdata)
diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51.h
index 7fff485e5603..e11bc0e0ec49 100644
--- a/arch/arm/mach-mx5/devices-imx51.h
+++ b/arch/arm/mach-mx5/devices-imx51.h
@@ -9,49 +9,46 @@
 #include <mach/mx51.h>
 #include <mach/devices-common.h>
 
-extern const struct imx_fec_data imx51_fec_data __initconst;
+extern const struct imx_fec_data imx51_fec_data;
 #define imx51_add_fec(pdata)    \
         imx_add_fec(&imx51_fec_data, pdata)
 
-#define imx51_add_gpio_keys(pdata) imx_add_gpio_keys(pdata)
-
-extern const struct imx_imx_i2c_data imx51_imx_i2c_data[] __initconst;
+extern const struct imx_imx_i2c_data imx51_imx_i2c_data[];
 #define imx51_add_imx_i2c(id, pdata)    \
         imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata)
 
-extern const struct imx_imx_ssi_data imx51_imx_ssi_data[] __initconst;
+extern const struct imx_imx_ssi_data imx51_imx_ssi_data[];
 #define imx51_add_imx_ssi(id, pdata)    \
         imx_add_imx_ssi(&imx51_imx_ssi_data[id], pdata)
 
-extern const struct imx_imx_uart_1irq_data imx51_imx_uart_data[] __initconst;
+extern const struct imx_imx_uart_1irq_data imx51_imx_uart_data[];
 #define imx51_add_imx_uart(id, pdata)   \
         imx_add_imx_uart_1irq(&imx51_imx_uart_data[id], pdata)
 
-extern const struct imx_mxc_nand_data imx51_mxc_nand_data __initconst;
+extern const struct imx_mxc_nand_data imx51_mxc_nand_data;
 #define imx51_add_mxc_nand(pdata)       \
         imx_add_mxc_nand(&imx51_mxc_nand_data, pdata)
 
-extern const struct imx_sdhci_esdhc_imx_data
-imx51_sdhci_esdhc_imx_data[] __initconst;
+extern const struct imx_sdhci_esdhc_imx_data imx51_sdhci_esdhc_imx_data[];
 #define imx51_add_sdhci_esdhc_imx(id, pdata)    \
         imx_add_sdhci_esdhc_imx(&imx51_sdhci_esdhc_imx_data[id], pdata)
 
-extern const struct imx_spi_imx_data imx51_cspi_data __initconst;
+extern const struct imx_spi_imx_data imx51_cspi_data;
 #define imx51_add_cspi(pdata)   \
         imx_add_spi_imx(&imx51_cspi_data, pdata)
 
-extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst;
+extern const struct imx_spi_imx_data imx51_ecspi_data[];
 #define imx51_add_ecspi(id, pdata)      \
         imx_add_spi_imx(&imx51_ecspi_data[id], pdata)
 
-extern const struct imx_imx2_wdt_data imx51_imx2_wdt_data[] __initconst;
+extern const struct imx_imx2_wdt_data imx51_imx2_wdt_data[];
 #define imx51_add_imx2_wdt(id, pdata)   \
         imx_add_imx2_wdt(&imx51_imx2_wdt_data[id])
 
-extern const struct imx_mxc_pwm_data imx51_mxc_pwm_data[] __initconst;
+extern const struct imx_mxc_pwm_data imx51_mxc_pwm_data[];
 #define imx51_add_mxc_pwm(id)   \
         imx_add_mxc_pwm(&imx51_mxc_pwm_data[id])
 
-extern const struct imx_imx_keypad_data imx51_imx_keypad_data __initconst;
+extern const struct imx_imx_keypad_data imx51_imx_keypad_data;
 #define imx51_add_imx_keypad(pdata)     \
         imx_add_imx_keypad(&imx51_imx_keypad_data, pdata)
diff --git a/arch/arm/mach-mx5/devices-imx53.h b/arch/arm/mach-mx5/devices-imx53.h
index 9251008dad1f..48f4c8cc42f5 100644
--- a/arch/arm/mach-mx5/devices-imx53.h
+++ b/arch/arm/mach-mx5/devices-imx53.h
@@ -8,28 +8,27 @@
 #include <mach/mx53.h>
 #include <mach/devices-common.h>
 
-extern const struct imx_fec_data imx53_fec_data __initconst;
+extern const struct imx_fec_data imx53_fec_data;
 #define imx53_add_fec(pdata)   \
         imx_add_fec(&imx53_fec_data, pdata)
 
-extern const struct imx_imx_uart_1irq_data imx53_imx_uart_data[] __initconst;
+extern const struct imx_imx_uart_1irq_data imx53_imx_uart_data[];
 #define imx53_add_imx_uart(id, pdata)   \
         imx_add_imx_uart_1irq(&imx53_imx_uart_data[id], pdata)
 
 
-extern const struct imx_imx_i2c_data imx53_imx_i2c_data[] __initconst;
+extern const struct imx_imx_i2c_data imx53_imx_i2c_data[];
 #define imx53_add_imx_i2c(id, pdata)    \
         imx_add_imx_i2c(&imx53_imx_i2c_data[id], pdata)
 
-extern const struct imx_sdhci_esdhc_imx_data
-imx53_sdhci_esdhc_imx_data[] __initconst;
+extern const struct imx_sdhci_esdhc_imx_data imx53_sdhci_esdhc_imx_data[];
 #define imx53_add_sdhci_esdhc_imx(id, pdata)    \
         imx_add_sdhci_esdhc_imx(&imx53_sdhci_esdhc_imx_data[id], pdata)
 
-extern const struct imx_spi_imx_data imx53_ecspi_data[] __initconst;
+extern const struct imx_spi_imx_data imx53_ecspi_data[];
 #define imx53_add_ecspi(id, pdata)      \
         imx_add_spi_imx(&imx53_ecspi_data[id], pdata)
 
-extern const struct imx_imx2_wdt_data imx53_imx2_wdt_data[] __initconst;
+extern const struct imx_imx2_wdt_data imx53_imx2_wdt_data[];
 #define imx53_add_imx2_wdt(id, pdata)   \
         imx_add_imx2_wdt(&imx53_imx2_wdt_data[id])
diff --git a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c b/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
index 4a8550529b04..97292d20f1f3 100644
--- a/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
+++ b/arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
@@ -18,13 +18,11 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/fsl_devices.h>
 #include <linux/i2c/tsc2007.h>
 #include <linux/leds.h>
 
 #include <mach/common.h>
 #include <mach/hardware.h>
-#include <mach/imx-uart.h>
 #include <mach/iomux-mx51.h>
 
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c b/arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c
index e6c1119c20ae..31c871ec46a6 100644
--- a/arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c
+++ b/arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c
@@ -27,7 +27,6 @@
 #include <linux/irq.h>
 #include <linux/leds.h>
 #include <linux/platform_device.h>
-#include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/i2c.h>
 
@@ -38,7 +37,6 @@
 
 #include <mach/hardware.h>
 #include <mach/common.h>
-#include <mach/imx-uart.h>
 #include <mach/iomux-mx51.h>
 #include <mach/audmux.h>
 
@@ -108,23 +106,14 @@ static struct gpio_keys_button eukrea_mbimxsd_gpio_buttons[] = {
         },
 };
 
-static struct gpio_keys_platform_data eukrea_mbimxsd_button_data = {
+static const struct gpio_keys_platform_data
+                eukrea_mbimxsd_button_data __initconst = {
         .buttons        = eukrea_mbimxsd_gpio_buttons,
         .nbuttons       = ARRAY_SIZE(eukrea_mbimxsd_gpio_buttons),
 };
 
-static struct platform_device eukrea_mbimxsd_button_device = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .num_resources  = 0,
-        .dev            = {
-                .platform_data  = &eukrea_mbimxsd_button_data,
-        }
-};
-
 static struct platform_device *platform_devices[] __initdata = {
         &eukrea_mbimxsd_leds_gpio,
-        &eukrea_mbimxsd_button_device,
 };
 
 static const struct imxuart_platform_data uart_pdata __initconst = {
@@ -166,4 +155,5 @@ void __init eukrea_mbimxsd51_baseboard_init(void)
                                 ARRAY_SIZE(eukrea_mbimxsd_i2c_devices));
 
         platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+        imx_add_gpio_keys(&eukrea_mbimxsd_button_data);
 }
diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c
index d0c7075937cf..56739c23aca7 100644
--- a/arch/arm/mach-mx5/mx51_efika.c
+++ b/arch/arm/mach-mx5/mx51_efika.c
@@ -20,7 +20,6 @@
 #include <linux/input.h>
 #include <linux/delay.h>
 #include <linux/io.h>
-#include <linux/fsl_devices.h>
 #include <linux/spi/flash.h>
 #include <linux/spi/spi.h>
 #include <linux/mfd/mc13892.h>
@@ -30,8 +29,6 @@
 #include <mach/common.h>
 #include <mach/hardware.h>
 #include <mach/iomux-mx51.h>
-#include <mach/i2c.h>
-#include <mach/mxc_ehci.h>
 
 #include <linux/usb/otg.h>
 #include <linux/usb/ulpi.h>
diff --git a/arch/arm/mach-mxc91231/Kconfig b/arch/arm/mach-mxc91231/Kconfig
deleted file mode 100644
index 8e5fa38ebb67..000000000000
--- a/arch/arm/mach-mxc91231/Kconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-if ARCH_MXC91231
-
-comment "MXC91231 platforms:"
-
-config MACH_MAGX_ZN5
-        bool "Support Motorola Zn5 GSM phone"
-        default n
-        help
-          Include support for Motorola Zn5 GSM phone.
-
-endif
diff --git a/arch/arm/mach-mxc91231/Makefile b/arch/arm/mach-mxc91231/Makefile
deleted file mode 100644
index 011d5e197125..000000000000
--- a/arch/arm/mach-mxc91231/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-y   := mm.o clock.o devices.o system.o iomux.o
-obj-$(CONFIG_MACH_MAGX_ZN5) += magx-zn5.o
diff --git a/arch/arm/mach-mxc91231/Makefile.boot b/arch/arm/mach-mxc91231/Makefile.boot
deleted file mode 100644
index 9939a19d99a1..000000000000
--- a/arch/arm/mach-mxc91231/Makefile.boot
+++ /dev/null
@@ -1,3 +0,0 @@
-   zreladdr-y   := 0x90008000
-params_phys-y   := 0x90000100
-initrd_phys-y   := 0x90800000
diff --git a/arch/arm/mach-mxc91231/clock.c b/arch/arm/mach-mxc91231/clock.c
deleted file mode 100644
index 9fab505f1eb1..000000000000
--- a/arch/arm/mach-mxc91231/clock.c
+++ /dev/null
@@ -1,640 +0,0 @@
-#include <linux/clk.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/clkdev.h>
-
-#include <mach/clock.h>
-#include <mach/hardware.h>
-#include <mach/common.h>
-
-#include <asm/bug.h>
-#include <asm/div64.h>
-
-#include "crm_regs.h"
-
-#define CRM_SMALL_DIVIDER(base, name) \
-        crm_small_divider(base, \
-                          base ## _ ## name ## _OFFSET, \
-                          base ## _ ## name ## _MASK)
-#define CRM_1DIVIDER(base, name) \
-        crm_divider(base, \
-                    base ## _ ## name ## _OFFSET, \
-                    base ## _ ## name ## _MASK, 1)
-#define CRM_16DIVIDER(base, name) \
-        crm_divider(base, \
-                    base ## _ ## name ## _OFFSET, \
-                    base ## _ ## name ## _MASK, 16)
-
-static u32 crm_small_divider(void __iomem *reg, u8 offset, u32 mask)
-{
-        static const u32 crm_small_dividers[] = {
-                2, 3, 4, 5, 6, 8, 10, 12
-        };
-        u8 idx;
-
-        idx = (__raw_readl(reg) & mask) >> offset;
-        if (idx > 7)
-                return 1;
-
-        return crm_small_dividers[idx];
-}
-
-static u32 crm_divider(void __iomem *reg, u8 offset, u32 mask, u32 z)
-{
-        u32 div;
-        div = (__raw_readl(reg) & mask) >> offset;
-        return div ? div : z;
-}
-
-static int _clk_1bit_enable(struct clk *clk)
-{
-        u32 reg;
-
-        reg = __raw_readl(clk->enable_reg);
-        reg |= 1 << clk->enable_shift;
-        __raw_writel(reg, clk->enable_reg);
-
-        return 0;
-}
-
-static void _clk_1bit_disable(struct clk *clk)
-{
-        u32 reg;
-
-        reg = __raw_readl(clk->enable_reg);
-        reg &= ~(1 << clk->enable_shift);
-        __raw_writel(reg, clk->enable_reg);
-}
-
-static int _clk_3bit_enable(struct clk *clk)
-{
-        u32 reg;
-
-        reg = __raw_readl(clk->enable_reg);
-        reg |= 0x7 << clk->enable_shift;
-        __raw_writel(reg, clk->enable_reg);
-
-        return 0;
-}
-
-static void _clk_3bit_disable(struct clk *clk)
-{
-        u32 reg;
-
-        reg = __raw_readl(clk->enable_reg);
-        reg &= ~(0x7 << clk->enable_shift);
-        __raw_writel(reg, clk->enable_reg);
-}
-
-static unsigned long ckih_rate;
-
-static unsigned long clk_ckih_get_rate(struct clk *clk)
-{
-        return ckih_rate;
-}
-
-static struct clk ckih_clk = {
-        .get_rate = clk_ckih_get_rate,
-};
-
-static unsigned long clk_ckih_x2_get_rate(struct clk *clk)
-{
-        return 2 * clk_get_rate(clk->parent);
-}
-
-static struct clk ckih_x2_clk = {
-        .parent = &ckih_clk,
-        .get_rate = clk_ckih_x2_get_rate,
-};
-
-static unsigned long clk_ckil_get_rate(struct clk *clk)
-{
-        return CKIL_CLK_FREQ;
-}
-
-static struct clk ckil_clk = {
-        .get_rate = clk_ckil_get_rate,
-};
-
-/* plls stuff */
-static struct clk mcu_pll_clk;
-static struct clk dsp_pll_clk;
-static struct clk usb_pll_clk;
-
-static struct clk *pll_clk(u8 sel)
-{
-        switch (sel) {
-        case 0:
-                return &mcu_pll_clk;
-        case 1:
-                return &dsp_pll_clk;
-        case 2:
-                return &usb_pll_clk;
-        }
-        BUG();
-}
-
-static void __iomem *pll_base(struct clk *clk)
-{
-        if (clk == &mcu_pll_clk)
-                return MXC_PLL0_BASE;
-        else if (clk == &dsp_pll_clk)
-                return MXC_PLL1_BASE;
-        else if (clk == &usb_pll_clk)
-                return MXC_PLL2_BASE;
-        BUG();
-}
-
-static unsigned long clk_pll_get_rate(struct clk *clk)
-{
-        const void __iomem *pllbase;
-        unsigned long dp_op, dp_mfd, dp_mfn, pll_hfsm, ref_clk, mfi;
-        long mfn, mfn_abs, mfd, pdf;
-        s64 temp;
-        pllbase = pll_base(clk);
-
-        pll_hfsm = __raw_readl(pllbase + MXC_PLL_DP_CTL) & MXC_PLL_DP_CTL_HFSM;
-        if (pll_hfsm == 0) {
-                dp_op = __raw_readl(pllbase + MXC_PLL_DP_OP);
-                dp_mfd = __raw_readl(pllbase + MXC_PLL_DP_MFD);
-                dp_mfn = __raw_readl(pllbase + MXC_PLL_DP_MFN);
-        } else {
-                dp_op = __raw_readl(pllbase + MXC_PLL_DP_HFS_OP);
-                dp_mfd = __raw_readl(pllbase + MXC_PLL_DP_HFS_MFD);
-                dp_mfn = __raw_readl(pllbase + MXC_PLL_DP_HFS_MFN);
-        }
-
-        pdf = dp_op & MXC_PLL_DP_OP_PDF_MASK;
-        mfi = (dp_op >> MXC_PLL_DP_OP_MFI_OFFSET) & MXC_PLL_DP_OP_PDF_MASK;
-        mfi = (mfi <= 5) ? 5 : mfi;
-        mfd = dp_mfd & MXC_PLL_DP_MFD_MASK;
-        mfn = dp_mfn & MXC_PLL_DP_MFN_MASK;
-        mfn = (mfn <= 0x4000000) ? mfn : (mfn - 0x10000000);
-
-        if (mfn < 0)
-                mfn_abs = -mfn;
-        else
-                mfn_abs = mfn;
-
-/* XXX: actually this asumes that ckih is fed to pll, but spec says
- * that ckih_x2 is also possible. need to check this out.
- */
-        ref_clk = clk_get_rate(&ckih_clk);
-
-        ref_clk *= 2;
-        ref_clk /= pdf + 1;
-
-        temp = (u64) ref_clk * mfn_abs;
-        do_div(temp, mfd);
-        if (mfn < 0)
-                temp = -temp;
-        temp += ref_clk * mfi;
-
-        return temp;
-}
-
-static int clk_pll_enable(struct clk *clk)
-{
-        void __iomem *ctl;
-        u32 reg;
-
-        ctl = pll_base(clk);
-        reg = __raw_readl(ctl);
-        reg |= (MXC_PLL_DP_CTL_RST | MXC_PLL_DP_CTL_UPEN);
-        __raw_writel(reg, ctl);
-        do {
-                reg = __raw_readl(ctl);
-        } while ((reg & MXC_PLL_DP_CTL_LRF) != MXC_PLL_DP_CTL_LRF);
-        return 0;
-}
-
-static void clk_pll_disable(struct clk *clk)
-{
-        void __iomem *ctl;
-        u32 reg;
-
-        ctl = pll_base(clk);
-        reg = __raw_readl(ctl);
-        reg &= ~(MXC_PLL_DP_CTL_RST | MXC_PLL_DP_CTL_UPEN);
-        __raw_writel(reg, ctl);
-}
-
-static struct clk mcu_pll_clk = {
-        .parent = &ckih_clk,
-        .get_rate = clk_pll_get_rate,
-        .enable = clk_pll_enable,
-        .disable = clk_pll_disable,
-};
-
-static struct clk dsp_pll_clk = {
-        .parent = &ckih_clk,
-        .get_rate = clk_pll_get_rate,
-        .enable = clk_pll_enable,
-        .disable = clk_pll_disable,
-};
-
-static struct clk usb_pll_clk = {
-        .parent = &ckih_clk,
-        .get_rate = clk_pll_get_rate,
-        .enable = clk_pll_enable,
-        .disable = clk_pll_disable,
-};
-/* plls stuff end */
-
-/* ap_ref_clk stuff */
-static struct clk ap_ref_clk;
-
-static unsigned long clk_ap_ref_get_rate(struct clk *clk)
-{
-        u32 ascsr, acsr;
-        u8 ap_pat_ref_div_2, ap_isel, acs, ads;
-
-        ascsr = __raw_readl(MXC_CRMAP_ASCSR);
-        acsr = __raw_readl(MXC_CRMAP_ACSR);
-
-        /* 0 for ckih, 1 for ckih*2 */
-        ap_isel = ascsr & MXC_CRMAP_ASCSR_APISEL;
-        /* reg divider */
-        ap_pat_ref_div_2 = (ascsr >> MXC_CRMAP_ASCSR_AP_PATDIV2_OFFSET) & 0x1;
-        /* undocumented, 1 for disabling divider */
-        ads = (acsr >> MXC_CRMAP_ACSR_ADS_OFFSET) & 0x1;
-        /* 0 for pat_ref, 1 for divider out */
-        acs = acsr & MXC_CRMAP_ACSR_ACS;
-
-        if (acs & !ads)
-                /* use divided clock */
-                return clk_get_rate(clk->parent) / (ap_pat_ref_div_2 ? 2 : 1);
-
-        return clk_get_rate(clk->parent) * (ap_isel ? 2 : 1);
-}
-
-static struct clk ap_ref_clk = {
-        .parent = &ckih_clk,
-        .get_rate = clk_ap_ref_get_rate,
-};
-/* ap_ref_clk stuff end */
-
-/* ap_pre_dfs_clk stuff */
-static struct clk ap_pre_dfs_clk;
-
-static unsigned long clk_ap_pre_dfs_get_rate(struct clk *clk)
-{
-        u32 acsr, ascsr;
-
-        acsr = __raw_readl(MXC_CRMAP_ACSR);
-        ascsr = __raw_readl(MXC_CRMAP_ASCSR);
-
-        if (acsr & MXC_CRMAP_ACSR_ACS) {
-                u8 sel;
-                sel = (ascsr & MXC_CRMAP_ASCSR_APSEL_MASK) >>
-                        MXC_CRMAP_ASCSR_APSEL_OFFSET;
-                return clk_get_rate(pll_clk(sel)) /
-                        CRM_SMALL_DIVIDER(MXC_CRMAP_ACDR, ARMDIV);
-        }
-        return clk_get_rate(&ap_ref_clk);
-}
-
-static struct clk ap_pre_dfs_clk = {
-        .get_rate = clk_ap_pre_dfs_get_rate,
-};
-/* ap_pre_dfs_clk stuff end */
-
-/* usb_clk stuff */
-static struct clk usb_clk;
-
-static struct clk *clk_usb_parent(struct clk *clk)
-{
-        u32 acsr, ascsr;
-
-        acsr = __raw_readl(MXC_CRMAP_ACSR);
-        ascsr = __raw_readl(MXC_CRMAP_ASCSR);
-
-        if (acsr & MXC_CRMAP_ACSR_ACS) {
-                u8 sel;
-                sel = (ascsr & MXC_CRMAP_ASCSR_USBSEL_MASK) >>
-                        MXC_CRMAP_ASCSR_USBSEL_OFFSET;
-                return pll_clk(sel);
-        }
-        return &ap_ref_clk;
-}
-
-static unsigned long clk_usb_get_rate(struct clk *clk)
-{
-        return clk_get_rate(clk->parent) /
-                CRM_SMALL_DIVIDER(MXC_CRMAP_ACDER2, USBDIV);
-}
-
-static struct clk usb_clk = {
-        .enable_reg = MXC_CRMAP_ACDER2,
-        .enable_shift = MXC_CRMAP_ACDER2_USBEN_OFFSET,
-        .get_rate = clk_usb_get_rate,
-        .enable = _clk_1bit_enable,
-        .disable = _clk_1bit_disable,
-};
-/* usb_clk stuff end */
-
-static unsigned long clk_ipg_get_rate(struct clk *clk)
-{
-        return clk_get_rate(clk->parent) / CRM_16DIVIDER(MXC_CRMAP_ACDR, IPDIV);
-}
-
-static unsigned long clk_ahb_get_rate(struct clk *clk)
-{
-        return clk_get_rate(clk->parent) /
-                CRM_16DIVIDER(MXC_CRMAP_ACDR, AHBDIV);
-}
-
-static struct clk ipg_clk = {
-        .parent = &ap_pre_dfs_clk,
-        .get_rate = clk_ipg_get_rate,
-};
-
-static struct clk ahb_clk = {
-        .parent = &ap_pre_dfs_clk,
-        .get_rate = clk_ahb_get_rate,
-};
-
-/* perclk_clk stuff */
-static struct clk perclk_clk;
-
-static unsigned long clk_perclk_get_rate(struct clk *clk)
-{
-        u32 acder2;
-
-        acder2 = __raw_readl(MXC_CRMAP_ACDER2);
-        if (acder2 & MXC_CRMAP_ACDER2_BAUD_ISEL_MASK)
-                return 2 * clk_get_rate(clk->parent);
-
-        return clk_get_rate(clk->parent);
-}
-
-static struct clk perclk_clk = {
-        .parent = &ckih_clk,
-        .get_rate = clk_perclk_get_rate,
-};
-/* perclk_clk stuff end */
-
-/* uart_clk stuff */
-static struct clk uart_clk[];
-
-static unsigned long clk_uart_get_rate(struct clk *clk)
-{
-        u32 div;
-
-        switch (clk->id) {
-        case 0:
-        case 1:
-                div = CRM_SMALL_DIVIDER(MXC_CRMAP_ACDER2, BAUDDIV);
-                break;
-        case 2:
-                div = CRM_SMALL_DIVIDER(MXC_CRMAP_APRA, UART3DIV);
-                break;
-        default:
-                BUG();
-        }
-        return clk_get_rate(clk->parent) / div;
-}
-
-static struct clk uart_clk[] = {
-        {
-                .id = 0,
-                .parent = &perclk_clk,
-                .enable_reg = MXC_CRMAP_APRA,
-                .enable_shift = MXC_CRMAP_APRA_UART1EN_OFFSET,
-                .get_rate = clk_uart_get_rate,
-                .enable = _clk_1bit_enable,
-                .disable = _clk_1bit_disable,
-        }, {
-                .id = 1,
-                .parent = &perclk_clk,
-                .enable_reg = MXC_CRMAP_APRA,
-                .enable_shift = MXC_CRMAP_APRA_UART2EN_OFFSET,
-                .get_rate = clk_uart_get_rate,
-                .enable = _clk_1bit_enable,
-                .disable = _clk_1bit_disable,
-        }, {
-                .id = 2,
-                .parent = &perclk_clk,
-                .enable_reg = MXC_CRMAP_APRA,
-                .enable_shift = MXC_CRMAP_APRA_UART3EN_OFFSET,
-                .get_rate = clk_uart_get_rate,
-                .enable = _clk_1bit_enable,
-                .disable = _clk_1bit_disable,
-        },
-};
-/* uart_clk stuff end */
-
-/* sdhc_clk stuff */
-static struct clk nfc_clk;
-
-static unsigned long clk_nfc_get_rate(struct clk *clk)
-{
-        return clk_get_rate(clk->parent) /
-                CRM_1DIVIDER(MXC_CRMAP_ACDER2, NFCDIV);
-}
-
-static struct clk nfc_clk = {
-        .parent = &ahb_clk,
-        .enable_reg = MXC_CRMAP_ACDER2,
-        .enable_shift = MXC_CRMAP_ACDER2_NFCEN_OFFSET,
-        .get_rate = clk_nfc_get_rate,
-        .enable = _clk_1bit_enable,
-        .disable = _clk_1bit_disable,
-};
-/* sdhc_clk stuff end */
-
-/* sdhc_clk stuff */
-static struct clk sdhc_clk[];
-
-static struct clk *clk_sdhc_parent(struct clk *clk)
-{
-        u32 aprb;
-        u8 sel;
-        u32 mask;
-        int offset;
-
-        aprb = __raw_readl(MXC_CRMAP_APRB);
-
-        switch (clk->id) {
-        case 0:
-                mask = MXC_CRMAP_APRB_SDHC1_ISEL_MASK;
-                offset = MXC_CRMAP_APRB_SDHC1_ISEL_OFFSET;
-                break;
-        case 1:
-                mask = MXC_CRMAP_APRB_SDHC2_ISEL_MASK;
-                offset = MXC_CRMAP_APRB_SDHC2_ISEL_OFFSET;
-                break;
-        default:
-                BUG();
-        }
-        sel = (aprb & mask) >> offset;
-
-        switch (sel) {
-        case 0:
-                return &ckih_clk;
-        case 1:
-                return &ckih_x2_clk;
-        }
-        return &usb_clk;
-}
-
-static unsigned long clk_sdhc_get_rate(struct clk *clk)
-{
-        u32 div;
-
-        switch (clk->id) {
-        case 0:
-                div = CRM_SMALL_DIVIDER(MXC_CRMAP_APRB, SDHC1_DIV);
-                break;
-        case 1:
-                div = CRM_SMALL_DIVIDER(MXC_CRMAP_APRB, SDHC2_DIV);
-                break;
-        default:
-                BUG();
-        }
-
-        return clk_get_rate(clk->parent) / div;
-}
-
-static int clk_sdhc_enable(struct clk *clk)
-{
-        u32 amlpmre1, aprb;
-
-        amlpmre1 = __raw_readl(MXC_CRMAP_AMLPMRE1);
-        aprb = __raw_readl(MXC_CRMAP_APRB);
-        switch (clk->id) {
-        case 0:
-                amlpmre1 |= (0x7 << MXC_CRMAP_AMLPMRE1_MLPME4_OFFSET);
-                aprb |= (0x1 << MXC_CRMAP_APRB_SDHC1EN_OFFSET);
-                break;
-        case 1:
-                amlpmre1 |= (0x7 << MXC_CRMAP_AMLPMRE1_MLPME5_OFFSET);
-                aprb |= (0x1 << MXC_CRMAP_APRB_SDHC2EN_OFFSET);
-                break;
-        }
-        __raw_writel(amlpmre1, MXC_CRMAP_AMLPMRE1);
-        __raw_writel(aprb, MXC_CRMAP_APRB);
-        return 0;
-}
-
-static void clk_sdhc_disable(struct clk *clk)
-{
-        u32 amlpmre1, aprb;
-
-        amlpmre1 = __raw_readl(MXC_CRMAP_AMLPMRE1);
-        aprb = __raw_readl(MXC_CRMAP_APRB);
-        switch (clk->id) {
-        case 0:
-                amlpmre1 &= ~(0x7 << MXC_CRMAP_AMLPMRE1_MLPME4_OFFSET);
-                aprb &= ~(0x1 << MXC_CRMAP_APRB_SDHC1EN_OFFSET);
-                break;
-        case 1:
-                amlpmre1 &= ~(0x7 << MXC_CRMAP_AMLPMRE1_MLPME5_OFFSET);
-                aprb &= ~(0x1 << MXC_CRMAP_APRB_SDHC2EN_OFFSET);
-                break;
-        }
-        __raw_writel(amlpmre1, MXC_CRMAP_AMLPMRE1);
-        __raw_writel(aprb, MXC_CRMAP_APRB);
-}
-
-static struct clk sdhc_clk[] = {
-        {
-                .id = 0,
-                .get_rate = clk_sdhc_get_rate,
-                .enable = clk_sdhc_enable,
-                .disable = clk_sdhc_disable,
-        }, {
-                .id = 1,
-                .get_rate = clk_sdhc_get_rate,
-                .enable = clk_sdhc_enable,
-                .disable = clk_sdhc_disable,
-        },
-};
-/* sdhc_clk stuff end */
-
-/* wdog_clk stuff */
-static struct clk wdog_clk[] = {
-        {
-                .id = 0,
-                .parent = &ipg_clk,
-                .enable_reg = MXC_CRMAP_AMLPMRD,
-                .enable_shift = MXC_CRMAP_AMLPMRD_MLPMD7_OFFSET,
-                .enable = _clk_3bit_enable,
-                .disable = _clk_3bit_disable,
-        }, {
-                .id = 1,
-                .parent = &ipg_clk,
-                .enable_reg = MXC_CRMAP_AMLPMRD,
-                .enable_shift = MXC_CRMAP_AMLPMRD_MLPMD3_OFFSET,
-                .enable = _clk_3bit_enable,
-                .disable = _clk_3bit_disable,
-        },
-};
-/* wdog_clk stuff end */
-
-/* gpt_clk stuff */
-static struct clk gpt_clk = {
-        .parent = &ipg_clk,
-        .enable_reg = MXC_CRMAP_AMLPMRC,
-        .enable_shift = MXC_CRMAP_AMLPMRC_MLPMC4_OFFSET,
-        .enable = _clk_3bit_enable,
-        .disable = _clk_3bit_disable,
-};
-/* gpt_clk stuff end */
-
-/* cspi_clk stuff */
-static struct clk cspi_clk[] = {
-        {
-                .id = 0,
-                .parent = &ipg_clk,
-                .enable_reg = MXC_CRMAP_AMLPMRE2,
-                .enable_shift = MXC_CRMAP_AMLPMRE2_MLPME0_OFFSET,
-                .enable = _clk_3bit_enable,
-                .disable = _clk_3bit_disable,
-        }, {
-                .id = 1,
-                .parent = &ipg_clk,
-                .enable_reg = MXC_CRMAP_AMLPMRE1,
-                .enable_shift = MXC_CRMAP_AMLPMRE1_MLPME6_OFFSET,
-                .enable = _clk_3bit_enable,
-                .disable = _clk_3bit_disable,
-        },
-};
-/* cspi_clk stuff end */
-
-#define _REGISTER_CLOCK(d, n, c) \
-        { \
-                .dev_id = d, \
-                .con_id = n, \
-                .clk = &c, \
-        },
-
-static struct clk_lookup lookups[] = {
-        _REGISTER_CLOCK("imx-uart.0", NULL, uart_clk[0])
-        _REGISTER_CLOCK("imx-uart.1", NULL, uart_clk[1])
-        _REGISTER_CLOCK("imx-uart.2", NULL, uart_clk[2])
-        _REGISTER_CLOCK("mxc-mmc.0", NULL, sdhc_clk[0])
-        _REGISTER_CLOCK("mxc-mmc.1", NULL, sdhc_clk[1])
-        _REGISTER_CLOCK("mxc-wdt.0", NULL, wdog_clk[0])
-        _REGISTER_CLOCK("spi_imx.0", NULL, cspi_clk[0])
-        _REGISTER_CLOCK("spi_imx.1", NULL, cspi_clk[1])
-};
-
-int __init mxc91231_clocks_init(unsigned long fref)
-{
-        void __iomem *gpt_base;
-
-        ckih_rate = fref;
-
-        usb_clk.parent = clk_usb_parent(&usb_clk);
-        sdhc_clk[0].parent = clk_sdhc_parent(&sdhc_clk[0]);
-        sdhc_clk[1].parent = clk_sdhc_parent(&sdhc_clk[1]);
-
-        clkdev_add_table(lookups, ARRAY_SIZE(lookups));
-
-        gpt_base = MXC91231_IO_ADDRESS(MXC91231_GPT1_BASE_ADDR);
-        mxc_timer_init(&gpt_clk, gpt_base, MXC91231_INT_GPT);
-
-        return 0;
-}
diff --git a/arch/arm/mach-mxc91231/crm_regs.h b/arch/arm/mach-mxc91231/crm_regs.h
deleted file mode 100644
index b989baccd675..000000000000
--- a/arch/arm/mach-mxc91231/crm_regs.h
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * Copyright 2006 Freescale Semiconductor, Inc.
- * Copyright 2006-2007 Motorola, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _ARCH_ARM_MACH_MXC91231_CRM_REGS_H_
-#define _ARCH_ARM_MACH_MXC91231_CRM_REGS_H_
-
-#define CKIL_CLK_FREQ                   32768
-
-#define MXC_CRM_AP_BASE                 MXC91231_IO_ADDRESS(MXC91231_CRM_AP_BASE_ADDR)
-#define MXC_CRM_COM_BASE                MXC91231_IO_ADDRESS(MXC91231_CRM_COM_BASE_ADDR)
-#define MXC_DSM_BASE                    MXC91231_IO_ADDRESS(MXC91231_DSM_BASE_ADDR)
-#define MXC_PLL0_BASE                   MXC91231_IO_ADDRESS(MXC91231_PLL0_BASE_ADDR)
-#define MXC_PLL1_BASE                   MXC91231_IO_ADDRESS(MXC91231_PLL1_BASE_ADDR)
-#define MXC_PLL2_BASE                   MXC91231_IO_ADDRESS(MXC91231_PLL2_BASE_ADDR)
-#define MXC_CLKCTL_BASE                 MXC91231_IO_ADDRESS(MXC91231_CLKCTL_BASE_ADDR)
-
-/* PLL Register Offsets */
-#define MXC_PLL_DP_CTL                  0x00
-#define MXC_PLL_DP_CONFIG               0x04
-#define MXC_PLL_DP_OP                   0x08
-#define MXC_PLL_DP_MFD                  0x0C
-#define MXC_PLL_DP_MFN                  0x10
-#define MXC_PLL_DP_HFS_OP               0x1C
-#define MXC_PLL_DP_HFS_MFD              0x20
-#define MXC_PLL_DP_HFS_MFN              0x24
-
-/* PLL Register Bit definitions */
-#define MXC_PLL_DP_CTL_DPDCK0_2_EN      0x1000
-#define MXC_PLL_DP_CTL_ADE              0x800
-#define MXC_PLL_DP_CTL_REF_CLK_DIV      0x400
-#define MXC_PLL_DP_CTL_HFSM             0x80
-#define MXC_PLL_DP_CTL_PRE              0x40
-#define MXC_PLL_DP_CTL_UPEN             0x20
-#define MXC_PLL_DP_CTL_RST              0x10
-#define MXC_PLL_DP_CTL_RCP              0x8
-#define MXC_PLL_DP_CTL_PLM              0x4
-#define MXC_PLL_DP_CTL_BRM0             0x2
-#define MXC_PLL_DP_CTL_LRF              0x1
-
-#define MXC_PLL_DP_OP_MFI_OFFSET        4
-#define MXC_PLL_DP_OP_MFI_MASK          0xF
-#define MXC_PLL_DP_OP_PDF_OFFSET        0
-#define MXC_PLL_DP_OP_PDF_MASK          0xF
-
-#define MXC_PLL_DP_MFD_OFFSET           0
-#define MXC_PLL_DP_MFD_MASK             0x7FFFFFF
-
-#define MXC_PLL_DP_MFN_OFFSET           0
-#define MXC_PLL_DP_MFN_MASK             0x7FFFFFF
-
-/* CRM AP Register Offsets */
-#define MXC_CRMAP_ASCSR                 (MXC_CRM_AP_BASE + 0x00)
-#define MXC_CRMAP_ACDR                  (MXC_CRM_AP_BASE + 0x04)
-#define MXC_CRMAP_ACDER1                (MXC_CRM_AP_BASE + 0x08)
-#define MXC_CRMAP_ACDER2                (MXC_CRM_AP_BASE + 0x0C)
-#define MXC_CRMAP_ACGCR                 (MXC_CRM_AP_BASE + 0x10)
-#define MXC_CRMAP_ACCGCR                (MXC_CRM_AP_BASE + 0x14)
-#define MXC_CRMAP_AMLPMRA               (MXC_CRM_AP_BASE + 0x18)
-#define MXC_CRMAP_AMLPMRB               (MXC_CRM_AP_BASE + 0x1C)
-#define MXC_CRMAP_AMLPMRC               (MXC_CRM_AP_BASE + 0x20)
-#define MXC_CRMAP_AMLPMRD               (MXC_CRM_AP_BASE + 0x24)
-#define MXC_CRMAP_AMLPMRE1              (MXC_CRM_AP_BASE + 0x28)
-#define MXC_CRMAP_AMLPMRE2              (MXC_CRM_AP_BASE + 0x2C)
-#define MXC_CRMAP_AMLPMRF               (MXC_CRM_AP_BASE + 0x30)
-#define MXC_CRMAP_AMLPMRG               (MXC_CRM_AP_BASE + 0x34)
-#define MXC_CRMAP_APGCR                 (MXC_CRM_AP_BASE + 0x38)
-#define MXC_CRMAP_ACSR                  (MXC_CRM_AP_BASE + 0x3C)
-#define MXC_CRMAP_ADCR                  (MXC_CRM_AP_BASE + 0x40)
-#define MXC_CRMAP_ACR                   (MXC_CRM_AP_BASE + 0x44)
-#define MXC_CRMAP_AMCR                  (MXC_CRM_AP_BASE + 0x48)
-#define MXC_CRMAP_APCR                  (MXC_CRM_AP_BASE + 0x4C)
-#define MXC_CRMAP_AMORA                 (MXC_CRM_AP_BASE + 0x50)
-#define MXC_CRMAP_AMORB                 (MXC_CRM_AP_BASE + 0x54)
-#define MXC_CRMAP_AGPR                  (MXC_CRM_AP_BASE + 0x58)
-#define MXC_CRMAP_APRA                  (MXC_CRM_AP_BASE + 0x5C)
-#define MXC_CRMAP_APRB                  (MXC_CRM_AP_BASE + 0x60)
-#define MXC_CRMAP_APOR                  (MXC_CRM_AP_BASE + 0x64)
-#define MXC_CRMAP_ADFMR                 (MXC_CRM_AP_BASE + 0x68)
-
-/* CRM AP Register Bit definitions */
-#define MXC_CRMAP_ASCSR_CRS                     0x10000
-#define MXC_CRMAP_ASCSR_AP_PATDIV2_OFFSET       15
-#define MXC_CRMAP_ASCSR_AP_PATREF_DIV2          0x8000
-#define MXC_CRMAP_ASCSR_USBSEL_OFFSET           13
-#define MXC_CRMAP_ASCSR_USBSEL_MASK             (0x3 << 13)
-#define MXC_CRMAP_ASCSR_CSISEL_OFFSET           11
-#define MXC_CRMAP_ASCSR_CSISEL_MASK             (0x3 << 11)
-#define MXC_CRMAP_ASCSR_SSI2SEL_OFFSET          7
-#define MXC_CRMAP_ASCSR_SSI2SEL_MASK            (0x3 << 7)
-#define MXC_CRMAP_ASCSR_SSI1SEL_OFFSET          5
-#define MXC_CRMAP_ASCSR_SSI1SEL_MASK            (0x3 << 5)
-#define MXC_CRMAP_ASCSR_APSEL_OFFSET            3
-#define MXC_CRMAP_ASCSR_APSEL_MASK              (0x3 << 3)
-#define MXC_CRMAP_ASCSR_AP_PATDIV1_OFFSET       2
-#define MXC_CRMAP_ASCSR_AP_PATREF_DIV1          0x4
-#define MXC_CRMAP_ASCSR_APISEL                  0x1
-
-#define MXC_CRMAP_ACDR_ARMDIV_OFFSET            8
-#define MXC_CRMAP_ACDR_ARMDIV_MASK              (0xF << 8)
-#define MXC_CRMAP_ACDR_AHBDIV_OFFSET            4
-#define MXC_CRMAP_ACDR_AHBDIV_MASK              (0xF << 4)
-#define MXC_CRMAP_ACDR_IPDIV_OFFSET             0
-#define MXC_CRMAP_ACDR_IPDIV_MASK               0xF
-
-#define MXC_CRMAP_ACDER1_CSIEN_OFFSET           30
-#define MXC_CRMAP_ACDER1_CSIDIV_OFFSET          24
-#define MXC_CRMAP_ACDER1_CSIDIV_MASK            (0x3F << 24)
-#define MXC_CRMAP_ACDER1_SSI2EN_OFFSET          14
-#define MXC_CRMAP_ACDER1_SSI2DIV_OFFSET         8
-#define MXC_CRMAP_ACDER1_SSI2DIV_MASK           (0x3F << 8)
-#define MXC_CRMAP_ACDER1_SSI1EN_OFFSET          6
-#define MXC_CRMAP_ACDER1_SSI1DIV_OFFSET         0
-#define MXC_CRMAP_ACDER1_SSI1DIV_MASK           0x3F
-
-#define MXC_CRMAP_ACDER2_CRCT_CLK_DIV_OFFSET    24
-#define MXC_CRMAP_ACDER2_CRCT_CLK_DIV_MASK      (0x7 << 24)
-#define MXC_CRMAP_ACDER2_NFCEN_OFFSET           20
-#define MXC_CRMAP_ACDER2_NFCDIV_OFFSET          16
-#define MXC_CRMAP_ACDER2_NFCDIV_MASK            (0xF << 16)
-#define MXC_CRMAP_ACDER2_USBEN_OFFSET           12
-#define MXC_CRMAP_ACDER2_USBDIV_OFFSET          8
-#define MXC_CRMAP_ACDER2_USBDIV_MASK            (0xF << 8)
-#define MXC_CRMAP_ACDER2_BAUD_ISEL_OFFSET       5
-#define MXC_CRMAP_ACDER2_BAUD_ISEL_MASK         (0x3 << 5)
-#define MXC_CRMAP_ACDER2_BAUDDIV_OFFSET         0
-#define MXC_CRMAP_ACDER2_BAUDDIV_MASK           0xF
-
-#define MXC_CRMAP_AMLPMRA_MLPMA7_OFFSET         22
-#define MXC_CRMAP_AMLPMRA_MLPMA7_MASK           (0x7 << 22)
-#define MXC_CRMAP_AMLPMRA_MLPMA6_OFFSET         19
-#define MXC_CRMAP_AMLPMRA_MLPMA6_MASK           (0x7 << 19)
-#define MXC_CRMAP_AMLPMRA_MLPMA4_OFFSET         12
-#define MXC_CRMAP_AMLPMRA_MLPMA4_MASK           (0x7 << 12)
-#define MXC_CRMAP_AMLPMRA_MLPMA3_OFFSET         9
-#define MXC_CRMAP_AMLPMRA_MLPMA3_MASK           (0x7 << 9)
-#define MXC_CRMAP_AMLPMRA_MLPMA2_OFFSET         6
-#define MXC_CRMAP_AMLPMRA_MLPMA2_MASK           (0x7 << 6)
-#define MXC_CRMAP_AMLPMRA_MLPMA1_OFFSET         3
-#define MXC_CRMAP_AMLPMRA_MLPMA1_MASK           (0x7 << 3)
-
-#define MXC_CRMAP_AMLPMRB_MLPMB0_OFFSET         0
-#define MXC_CRMAP_AMLPMRB_MLPMB0_MASK           0x7
-
-#define MXC_CRMAP_AMLPMRC_MLPMC9_OFFSET         28
-#define MXC_CRMAP_AMLPMRC_MLPMC9_MASK           (0x7 << 28)
-#define MXC_CRMAP_AMLPMRC_MLPMC7_OFFSET         22
-#define MXC_CRMAP_AMLPMRC_MLPMC7_MASK           (0x7 << 22)
-#define MXC_CRMAP_AMLPMRC_MLPMC5_OFFSET         16
-#define MXC_CRMAP_AMLPMRC_MLPMC5_MASK           (0x7 << 16)
-#define MXC_CRMAP_AMLPMRC_MLPMC4_OFFSET         12
-#define MXC_CRMAP_AMLPMRC_MLPMC4_MASK           (0x7 << 12)
-#define MXC_CRMAP_AMLPMRC_MLPMC3_OFFSET         9
-#define MXC_CRMAP_AMLPMRC_MLPMC3_MASK           (0x7 << 9)
-#define MXC_CRMAP_AMLPMRC_MLPMC2_OFFSET         6
-#define MXC_CRMAP_AMLPMRC_MLPMC2_MASK           (0x7 << 6)
-#define MXC_CRMAP_AMLPMRC_MLPMC1_OFFSET         3
-#define MXC_CRMAP_AMLPMRC_MLPMC1_MASK           (0x7 << 3)
-#define MXC_CRMAP_AMLPMRC_MLPMC0_OFFSET         0
-#define MXC_CRMAP_AMLPMRC_MLPMC0_MASK           0x7
-
-#define MXC_CRMAP_AMLPMRD_MLPMD7_OFFSET         22
-#define MXC_CRMAP_AMLPMRD_MLPMD7_MASK           (0x7 << 22)
-#define MXC_CRMAP_AMLPMRD_MLPMD4_OFFSET         12
-#define MXC_CRMAP_AMLPMRD_MLPMD4_MASK           (0x7 << 12)
-#define MXC_CRMAP_AMLPMRD_MLPMD3_OFFSET         9
-#define MXC_CRMAP_AMLPMRD_MLPMD3_MASK           (0x7 << 9)
-#define MXC_CRMAP_AMLPMRD_MLPMD2_OFFSET         6
-#define MXC_CRMAP_AMLPMRD_MLPMD2_MASK           (0x7 << 6)
-#define MXC_CRMAP_AMLPMRD_MLPMD0_OFFSET         0
-#define MXC_CRMAP_AMLPMRD_MLPMD0_MASK           0x7
-
-#define MXC_CRMAP_AMLPMRE1_MLPME9_OFFSET        28
-#define MXC_CRMAP_AMLPMRE1_MLPME9_MASK          (0x7 << 28)
-#define MXC_CRMAP_AMLPMRE1_MLPME8_OFFSET        25
-#define MXC_CRMAP_AMLPMRE1_MLPME8_MASK          (0x7 << 25)
-#define MXC_CRMAP_AMLPMRE1_MLPME7_OFFSET        22
-#define MXC_CRMAP_AMLPMRE1_MLPME7_MASK          (0x7 << 22)
-#define MXC_CRMAP_AMLPMRE1_MLPME6_OFFSET        19
-#define MXC_CRMAP_AMLPMRE1_MLPME6_MASK          (0x7 << 19)
-#define MXC_CRMAP_AMLPMRE1_MLPME5_OFFSET        16
-#define MXC_CRMAP_AMLPMRE1_MLPME5_MASK          (0x7 << 16)
-#define MXC_CRMAP_AMLPMRE1_MLPME4_OFFSET        12
-#define MXC_CRMAP_AMLPMRE1_MLPME4_MASK          (0x7 << 12)
-#define MXC_CRMAP_AMLPMRE1_MLPME3_OFFSET        9
-#define MXC_CRMAP_AMLPMRE1_MLPME3_MASK          (0x7 << 9)
-#define MXC_CRMAP_AMLPMRE1_MLPME2_OFFSET        6
-#define MXC_CRMAP_AMLPMRE1_MLPME2_MASK          (0x7 << 6)
-#define MXC_CRMAP_AMLPMRE1_MLPME1_OFFSET        3
-#define MXC_CRMAP_AMLPMRE1_MLPME1_MASK          (0x7 << 3)
-#define MXC_CRMAP_AMLPMRE1_MLPME0_OFFSET        0
-#define MXC_CRMAP_AMLPMRE1_MLPME0_MASK          0x7
-
-#define MXC_CRMAP_AMLPMRE2_MLPME0_OFFSET        0
-#define MXC_CRMAP_AMLPMRE2_MLPME0_MASK          0x7
-
-#define MXC_CRMAP_AMLPMRF_MLPMF6_OFFSET         19
-#define MXC_CRMAP_AMLPMRF_MLPMF6_MASK           (0x7 << 19)
-#define MXC_CRMAP_AMLPMRF_MLPMF5_OFFSET         16
-#define MXC_CRMAP_AMLPMRF_MLPMF5_MASK           (0x7 << 16)
-#define MXC_CRMAP_AMLPMRF_MLPMF3_OFFSET         9
-#define MXC_CRMAP_AMLPMRF_MLPMF3_MASK           (0x7 << 9)
-#define MXC_CRMAP_AMLPMRF_MLPMF2_OFFSET         6
-#define MXC_CRMAP_AMLPMRF_MLPMF2_MASK           (0x7 << 6)
-#define MXC_CRMAP_AMLPMRF_MLPMF1_OFFSET         3
-#define MXC_CRMAP_AMLPMRF_MLPMF1_MASK           (0x7 << 3)
-#define MXC_CRMAP_AMLPMRF_MLPMF0_OFFSET         0
-#define MXC_CRMAP_AMLPMRF_MLPMF0_MASK           (0x7 << 0)
-
-#define MXC_CRMAP_AMLPMRG_MLPMG9_OFFSET         28
-#define MXC_CRMAP_AMLPMRG_MLPMG9_MASK           (0x7 << 28)
-#define MXC_CRMAP_AMLPMRG_MLPMG7_OFFSET         22
-#define MXC_CRMAP_AMLPMRG_MLPMG7_MASK           (0x7 << 22)
-#define MXC_CRMAP_AMLPMRG_MLPMG6_OFFSET         19
-#define MXC_CRMAP_AMLPMRG_MLPMG6_MASK           (0x7 << 19)
-#define MXC_CRMAP_AMLPMRG_MLPMG5_OFFSET         16
-#define MXC_CRMAP_AMLPMRG_MLPMG5_MASK           (0x7 << 16)
-#define MXC_CRMAP_AMLPMRG_MLPMG4_OFFSET         12
-#define MXC_CRMAP_AMLPMRG_MLPMG4_MASK           (0x7 << 12)
-#define MXC_CRMAP_AMLPMRG_MLPMG3_OFFSET         9
-#define MXC_CRMAP_AMLPMRG_MLPMG3_MASK           (0x7 << 9)
-#define MXC_CRMAP_AMLPMRG_MLPMG2_OFFSET         6
-#define MXC_CRMAP_AMLPMRG_MLPMG2_MASK           (0x7 << 6)
-#define MXC_CRMAP_AMLPMRG_MLPMG1_OFFSET         3
-#define MXC_CRMAP_AMLPMRG_MLPMG1_MASK           (0x7 << 3)
-#define MXC_CRMAP_AMLPMRG_MLPMG0_OFFSET         0
-#define MXC_CRMAP_AMLPMRG_MLPMG0_MASK           0x7
-
-#define MXC_CRMAP_AGPR_IPUPAD_OFFSET            20
-#define MXC_CRMAP_AGPR_IPUPAD_MASK              (0x7 << 20)
-
-#define MXC_CRMAP_APRA_EL1TEN_OFFSET            29
-#define MXC_CRMAP_APRA_SIMEN_OFFSET             24
-#define MXC_CRMAP_APRA_UART3DIV_OFFSET          17
-#define MXC_CRMAP_APRA_UART3DIV_MASK            (0xF << 17)
-#define MXC_CRMAP_APRA_UART3EN_OFFSET           16
-#define MXC_CRMAP_APRA_SAHARA_DIV2_CLKEN_OFFSET 14
-#define MXC_CRMAP_APRA_MQSPIEN_OFFSET           13
-#define MXC_CRMAP_APRA_UART2EN_OFFSET           8
-#define MXC_CRMAP_APRA_UART1EN_OFFSET           0
-
-#define MXC_CRMAP_APRB_SDHC2_ISEL_OFFSET        13
-#define MXC_CRMAP_APRB_SDHC2_ISEL_MASK          (0x7 << 13)
-#define MXC_CRMAP_APRB_SDHC2_DIV_OFFSET         9
-#define MXC_CRMAP_APRB_SDHC2_DIV_MASK           (0xF << 9)
-#define MXC_CRMAP_APRB_SDHC2EN_OFFSET           8
-#define MXC_CRMAP_APRB_SDHC1_ISEL_OFFSET        5
-#define MXC_CRMAP_APRB_SDHC1_ISEL_MASK          (0x7 << 5)
-#define MXC_CRMAP_APRB_SDHC1_DIV_OFFSET         1
-#define MXC_CRMAP_APRB_SDHC1_DIV_MASK           (0xF << 1)
-#define MXC_CRMAP_APRB_SDHC1EN_OFFSET           0
-
-#define MXC_CRMAP_ACSR_ADS_OFFSET               8
-#define MXC_CRMAP_ACSR_ADS                      (0x1 << 8)
-#define MXC_CRMAP_ACSR_ACS                      0x1
-
-#define MXC_CRMAP_ADCR_LFDF_0                   (0x0 << 8)
-#define MXC_CRMAP_ADCR_LFDF_2                   (0x1 << 8)
-#define MXC_CRMAP_ADCR_LFDF_4                   (0x2 << 8)
-#define MXC_CRMAP_ADCR_LFDF_8                   (0x3 << 8)
-#define MXC_CRMAP_ADCR_LFDF_OFFSET              8
-#define MXC_CRMAP_ADCR_LFDF_MASK                (0x3 << 8)
-#define MXC_CRMAP_ADCR_ALT_PLL                  0x80
-#define MXC_CRMAP_ADCR_DFS_DIVEN                0x20
-#define MXC_CRMAP_ADCR_DIV_BYP                  0x2
-#define MXC_CRMAP_ADCR_VSTAT                    0x8
-#define MXC_CRMAP_ADCR_TSTAT                    0x10
-#define MXC_CRMAP_ADCR_DVFS_VCTRL               0x10
-#define MXC_CRMAP_ADCR_CLK_ON                   0x40
-
-#define MXC_CRMAP_ADFMR_FC_OFFSET               16
-#define MXC_CRMAP_ADFMR_FC_MASK                 (0x1F << 16)
-#define MXC_CRMAP_ADFMR_MF_OFFSET               1
-#define MXC_CRMAP_ADFMR_MF_MASK                 (0x3FF << 1)
-#define MXC_CRMAP_ADFMR_DFM_CLK_READY           0x1
-#define MXC_CRMAP_ADFMR_DFM_PWR_DOWN            0x8000
-
-#define MXC_CRMAP_ACR_CKOHS_HIGH                (1 << 18)
-#define MXC_CRMAP_ACR_CKOS_HIGH                 (1 << 16)
-#define MXC_CRMAP_ACR_CKOHS_MASK                (0x7 << 12)
-#define MXC_CRMAP_ACR_CKOHD                     (1 << 11)
-#define MXC_CRMAP_ACR_CKOHDIV_MASK              (0xF << 8)
-#define MXC_CRMAP_ACR_CKOHDIV_OFFSET            8
-#define MXC_CRMAP_ACR_CKOD                      (1 << 7)
-#define MXC_CRMAP_ACR_CKOS_MASK                 (0x7 << 4)
-
-/* AP Warm reset */
-#define MXC_CRMAP_AMCR_SW_AP                    (1 << 14)
-
-/* Bit definitions of ACGCR in CRM_AP for tree level clock gating */
-#define MXC_CRMAP_ACGCR_ACG0_STOP_WAIT          0x00000001
-#define MXC_CRMAP_ACGCR_ACG0_STOP               0x00000003
-#define MXC_CRMAP_ACGCR_ACG0_RUN                0x00000007
-#define MXC_CRMAP_ACGCR_ACG0_DISABLED           0x00000000
-
-#define MXC_CRMAP_ACGCR_ACG1_STOP_WAIT          0x00000008
-#define MXC_CRMAP_ACGCR_ACG1_STOP               0x00000018
-#define MXC_CRMAP_ACGCR_ACG1_RUN                0x00000038
-#define MXC_CRMAP_ACGCR_ACG1_DISABLED           0x00000000
-
-#define MXC_CRMAP_ACGCR_ACG2_STOP_WAIT          0x00000040
-#define MXC_CRMAP_ACGCR_ACG2_STOP               0x000000C0
-#define MXC_CRMAP_ACGCR_ACG2_RUN                0x000001C0
-#define MXC_CRMAP_ACGCR_ACG2_DISABLED           0x00000000
-
-#define MXC_CRMAP_ACGCR_ACG3_STOP_WAIT          0x00000200
-#define MXC_CRMAP_ACGCR_ACG3_STOP               0x00000600
-#define MXC_CRMAP_ACGCR_ACG3_RUN                0x00000E00
-#define MXC_CRMAP_ACGCR_ACG3_DISABLED           0x00000000
-
-#define MXC_CRMAP_ACGCR_ACG4_STOP_WAIT          0x00001000
-#define MXC_CRMAP_ACGCR_ACG4_STOP               0x00003000
-#define MXC_CRMAP_ACGCR_ACG4_RUN                0x00007000
-#define MXC_CRMAP_ACGCR_ACG4_DISABLED           0x00000000
-
-#define MXC_CRMAP_ACGCR_ACG5_STOP_WAIT          0x00010000
-#define MXC_CRMAP_ACGCR_ACG5_STOP               0x00030000
-#define MXC_CRMAP_ACGCR_ACG5_RUN                0x00070000
-#define MXC_CRMAP_ACGCR_ACG5_DISABLED           0x00000000
-
-#define MXC_CRMAP_ACGCR_ACG6_STOP_WAIT          0x00080000
-#define MXC_CRMAP_ACGCR_ACG6_STOP               0x00180000
-#define MXC_CRMAP_ACGCR_ACG6_RUN                0x00380000
-#define MXC_CRMAP_ACGCR_ACG6_DISABLED           0x00000000
-
-#define NUM_GATE_CTRL                           6
-
-/* CRM COM Register Offsets */
-#define MXC_CRMCOM_CSCR                         (MXC_CRM_COM_BASE + 0x0C)
-#define MXC_CRMCOM_CCCR                         (MXC_CRM_COM_BASE + 0x10)
-
-/* CRM COM Bit Definitions */
-#define MXC_CRMCOM_CSCR_PPD1                    0x08000000
-#define MXC_CRMCOM_CSCR_CKOHSEL                 (1 << 18)
-#define MXC_CRMCOM_CSCR_CKOSEL                  (1 << 17)
-#define MXC_CRMCOM_CCCR_CC_DIV_OFFSET           8
-#define MXC_CRMCOM_CCCR_CC_DIV_MASK             (0x1F << 8)
-#define MXC_CRMCOM_CCCR_CC_SEL_OFFSET           0
-#define MXC_CRMCOM_CCCR_CC_SEL_MASK             0x3
-
-/* DSM Register Offsets */
-#define MXC_DSM_SLEEP_TIME                      (MXC_DSM_BASE + 0x0c)
-#define MXC_DSM_CONTROL0                        (MXC_DSM_BASE + 0x20)
-#define MXC_DSM_CONTROL1                        (MXC_DSM_BASE + 0x24)
-#define MXC_DSM_CTREN                           (MXC_DSM_BASE + 0x28)
-#define MXC_DSM_WARM_PER                        (MXC_DSM_BASE + 0x40)
-#define MXC_DSM_LOCK_PER                        (MXC_DSM_BASE + 0x44)
-#define MXC_DSM_MGPER                           (MXC_DSM_BASE + 0x4c)
-#define MXC_DSM_CRM_CONTROL                     (MXC_DSM_BASE + 0x50)
-
-/* Bit definitions of various registers in DSM */
-#define MXC_DSM_CRM_CTRL_DVFS_BYP               0x00000008
-#define MXC_DSM_CRM_CTRL_DVFS_VCTRL             0x00000004
-#define MXC_DSM_CRM_CTRL_LPMD1                  0x00000002
-#define MXC_DSM_CRM_CTRL_LPMD0                  0x00000001
-#define MXC_DSM_CRM_CTRL_LPMD_STOP_MODE         0x00000000
-#define MXC_DSM_CRM_CTRL_LPMD_WAIT_MODE         0x00000001
-#define MXC_DSM_CRM_CTRL_LPMD_RUN_MODE          0x00000003
-#define MXC_DSM_CONTROL0_STBY_COMMIT_EN         0x00000200
-#define MXC_DSM_CONTROL0_MSTR_EN                0x00000001
-#define MXC_DSM_CONTROL0_RESTART                0x00000010
-/* Counter Block reset */
-#define MXC_DSM_CONTROL1_CB_RST                 0x00000002
-/* State Machine reset */
-#define MXC_DSM_CONTROL1_SM_RST                 0x00000004
-/* Bit needed to reset counter block */
-#define MXC_CONTROL1_RST_CNT32                  0x00000008
-#define MXC_DSM_CONTROL1_RST_CNT32_EN           0x00000800
-#define MXC_DSM_CONTROL1_SLEEP                  0x00000100
-#define MXC_DSM_CONTROL1_WAKEUP_DISABLE         0x00004000
-#define MXC_DSM_CTREN_CNT32                     0x00000001
-
-/* Magic Fix enable bit */
-#define MXC_DSM_MGPER_EN_MGFX                   0x80000000
-#define MXC_DSM_MGPER_PER_MASK                  0x000003FF
-#define MXC_DSM_MGPER_PER(n)                    (MXC_DSM_MGPER_PER_MASK & n)
-
-/* Address offsets of the CLKCTL registers */
-#define MXC_CLKCTL_GP_CTRL      (MXC_CLKCTL_BASE + 0x00)
-#define MXC_CLKCTL_GP_SER       (MXC_CLKCTL_BASE + 0x04)
-#define MXC_CLKCTL_GP_CER       (MXC_CLKCTL_BASE + 0x08)
-
-#endif /* _ARCH_ARM_MACH_MXC91231_CRM_REGS_H_ */
diff --git a/arch/arm/mach-mxc91231/devices.c b/arch/arm/mach-mxc91231/devices.c
deleted file mode 100644
index 027af4f0d18a..000000000000
--- a/arch/arm/mach-mxc91231/devices.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright 2006-2007 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Sascha Hauer, kernel@pengutronix.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 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/module.h>
-#include <linux/platform_device.h>
-#include <linux/serial.h>
-#include <linux/gpio.h>
-#include <mach/hardware.h>
-#include <mach/irqs.h>
-#include <mach/imx-uart.h>
-
-static struct resource uart0[] = {
-        {
-                .start = MXC91231_UART1_BASE_ADDR,
-                .end = MXC91231_UART1_BASE_ADDR + 0x0B5,
-                .flags = IORESOURCE_MEM,
-        }, {
-                .start = MXC91231_INT_UART1_RX,
-                .end = MXC91231_INT_UART1_RX,
-                .flags = IORESOURCE_IRQ,
-        }, {
-                .start = MXC91231_INT_UART1_TX,
-                .end = MXC91231_INT_UART1_TX,
-                .flags = IORESOURCE_IRQ,
-        }, {
-                .start = MXC91231_INT_UART1_MINT,
-                .end = MXC91231_INT_UART1_MINT,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-struct platform_device mxc_uart_device0 = {
-        .name = "imx-uart",
-        .id = 0,
-        .resource = uart0,
-        .num_resources = ARRAY_SIZE(uart0),
-};
-
-static struct resource uart1[] = {
-        {
-                .start = MXC91231_UART2_BASE_ADDR,
-                .end = MXC91231_UART2_BASE_ADDR + 0x0B5,
-                .flags = IORESOURCE_MEM,
-        }, {
-                .start = MXC91231_INT_UART2_RX,
-                .end = MXC91231_INT_UART2_RX,
-                .flags = IORESOURCE_IRQ,
-        }, {
-                .start = MXC91231_INT_UART2_TX,
-                .end = MXC91231_INT_UART2_TX,
-                .flags = IORESOURCE_IRQ,
-        }, {
-                .start = MXC91231_INT_UART2_MINT,
-                .end = MXC91231_INT_UART2_MINT,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-struct platform_device mxc_uart_device1 = {
-        .name = "imx-uart",
-        .id = 1,
-        .resource = uart1,
-        .num_resources = ARRAY_SIZE(uart1),
-};
-
-static struct resource uart2[] = {
-        {
-                .start = MXC91231_UART3_BASE_ADDR,
-                .end = MXC91231_UART3_BASE_ADDR + 0x0B5,
-                .flags = IORESOURCE_MEM,
-        }, {
-                .start = MXC91231_INT_UART3_RX,
-                .end = MXC91231_INT_UART3_RX,
-                .flags = IORESOURCE_IRQ,
-        }, {
-                .start = MXC91231_INT_UART3_TX,
-                .end = MXC91231_INT_UART3_TX,
-                .flags = IORESOURCE_IRQ,
-        }, {
-                .start = MXC91231_INT_UART3_MINT,
-                .end = MXC91231_INT_UART3_MINT,
-                .flags = IORESOURCE_IRQ,
-
-        },
-};
-
-struct platform_device mxc_uart_device2 = {
-        .name = "imx-uart",
-        .id = 2,
-        .resource = uart2,
-        .num_resources = ARRAY_SIZE(uart2),
-};
-
-/* GPIO port description */
-static struct mxc_gpio_port mxc_gpio_ports[] = {
-        [0] = {
-                .chip.label = "gpio-0",
-                .base = MXC91231_IO_ADDRESS(MXC91231_GPIO1_AP_BASE_ADDR),
-                .irq = MXC91231_INT_GPIO1,
-                .virtual_irq_start = MXC_GPIO_IRQ_START,
-        },
-        [1] = {
-                .chip.label = "gpio-1",
-                .base = MXC91231_IO_ADDRESS(MXC91231_GPIO2_AP_BASE_ADDR),
-                .irq = MXC91231_INT_GPIO2,
-                .virtual_irq_start = MXC_GPIO_IRQ_START + 32,
-        },
-        [2] = {
-                .chip.label = "gpio-2",
-                .base = MXC91231_IO_ADDRESS(MXC91231_GPIO3_AP_BASE_ADDR),
-                .irq = MXC91231_INT_GPIO3,
-                .virtual_irq_start = MXC_GPIO_IRQ_START + 64,
-        },
-        [3] = {
-                .chip.label = "gpio-3",
-                .base = MXC91231_IO_ADDRESS(MXC91231_GPIO4_SH_BASE_ADDR),
-                .irq = MXC91231_INT_GPIO4,
-                .virtual_irq_start = MXC_GPIO_IRQ_START + 96,
-        },
-};
-
-int __init mxc91231_register_gpios(void)
-{
-        return mxc_gpio_init(mxc_gpio_ports, ARRAY_SIZE(mxc_gpio_ports));
-}
-
-static struct resource mxc_nand_resources[] = {
-        {
-                .start  = MXC91231_NFC_BASE_ADDR,
-                .end    = MXC91231_NFC_BASE_ADDR + 0xfff,
-                .flags  = IORESOURCE_MEM
-        }, {
-                .start  = MXC91231_INT_NANDFC,
-                .end    = MXC91231_INT_NANDFC,
-                .flags  = IORESOURCE_IRQ
-        },
-};
-
-struct platform_device mxc_nand_device = {
-        .name = "mxc_nand",
-        .id = 0,
-        .num_resources = ARRAY_SIZE(mxc_nand_resources),
-        .resource = mxc_nand_resources,
-};
-
-static struct resource mxc_sdhc0_resources[] = {
-        {
-                .start = MXC91231_MMC_SDHC1_BASE_ADDR,
-                .end = MXC91231_MMC_SDHC1_BASE_ADDR + SZ_16K - 1,
-                .flags = IORESOURCE_MEM,
-        }, {
-                .start = MXC91231_INT_MMC_SDHC1,
-                .end = MXC91231_INT_MMC_SDHC1,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct resource mxc_sdhc1_resources[] = {
-        {
-                .start = MXC91231_MMC_SDHC2_BASE_ADDR,
-                .end = MXC91231_MMC_SDHC2_BASE_ADDR + SZ_16K - 1,
-                .flags = IORESOURCE_MEM,
-        }, {
-                .start = MXC91231_INT_MMC_SDHC2,
-                .end = MXC91231_INT_MMC_SDHC2,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-struct platform_device mxc_sdhc_device0 = {
-        .name = "mxc-mmc",
-        .id = 0,
-        .num_resources = ARRAY_SIZE(mxc_sdhc0_resources),
-        .resource = mxc_sdhc0_resources,
-};
-
-struct platform_device mxc_sdhc_device1 = {
-        .name = "mxc-mmc",
-        .id = 1,
-        .num_resources = ARRAY_SIZE(mxc_sdhc1_resources),
-        .resource = mxc_sdhc1_resources,
-};
-
-static struct resource mxc_cspi0_resources[] = {
-        {
-                .start = MXC91231_CSPI1_BASE_ADDR,
-                .end = MXC91231_CSPI1_BASE_ADDR + 0x20,
-                .flags = IORESOURCE_MEM,
-        }, {
-                .start = MXC91231_INT_CSPI1,
-                .end = MXC91231_INT_CSPI1,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-struct platform_device mxc_cspi_device0 = {
-        .name = "spi_imx",
-        .id = 0,
-        .num_resources = ARRAY_SIZE(mxc_cspi0_resources),
-        .resource = mxc_cspi0_resources,
-};
-
-static struct resource mxc_cspi1_resources[] = {
-        {
-                .start = MXC91231_CSPI2_BASE_ADDR,
-                .end = MXC91231_CSPI2_BASE_ADDR + 0x20,
-                .flags = IORESOURCE_MEM,
-        }, {
-                .start = MXC91231_INT_CSPI2,
-                .end = MXC91231_INT_CSPI2,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-struct platform_device mxc_cspi_device1 = {
-        .name = "spi_imx",
-        .id = 1,
-        .num_resources = ARRAY_SIZE(mxc_cspi1_resources),
-        .resource = mxc_cspi1_resources,
-};
-
-static struct resource mxc_wdog0_resources[] = {
-        {
-                .start = MXC91231_WDOG1_BASE_ADDR,
-                .end = MXC91231_WDOG1_BASE_ADDR + 0x10,
-                .flags = IORESOURCE_MEM,
-        },
-};
-
-struct platform_device mxc_wdog_device0 = {
-        .name = "mxc-wdt",
-        .id = 0,
-        .num_resources = ARRAY_SIZE(mxc_wdog0_resources),
-        .resource = mxc_wdog0_resources,
-};
diff --git a/arch/arm/mach-mxc91231/devices.h b/arch/arm/mach-mxc91231/devices.h
deleted file mode 100644
index 72a2136ce27d..000000000000
--- a/arch/arm/mach-mxc91231/devices.h
+++ /dev/null
@@ -1,13 +0,0 @@
-extern struct platform_device mxc_uart_device0;
-extern struct platform_device mxc_uart_device1;
-extern struct platform_device mxc_uart_device2;
-
-extern struct platform_device mxc_nand_device;
-
-extern struct platform_device mxc_sdhc_device0;
-extern struct platform_device mxc_sdhc_device1;
-
-extern struct platform_device mxc_cspi_device0;
-extern struct platform_device mxc_cspi_device1;
-
-extern struct platform_device mxc_wdog_device0;
diff --git a/arch/arm/mach-mxc91231/iomux.c b/arch/arm/mach-mxc91231/iomux.c
deleted file mode 100644
index 66fc41cbf2ca..000000000000
--- a/arch/arm/mach-mxc91231/iomux.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright 2004-2006 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright (C) 2008 by Sascha Hauer <kernel@pengutronix.de>
- * Copyright (C) 2009 by Valentin Longchamp <valentin.longchamp@epfl.ch>
- *
- * 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/module.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <mach/iomux-mxc91231.h>
-
-/*
- * IOMUX register (base) addresses
- */
-#define IOMUX_AP_BASE           MXC91231_IO_ADDRESS(MXC91231_IOMUX_AP_BASE_ADDR)
-#define IOMUX_COM_BASE          MXC91231_IO_ADDRESS(MXC91231_IOMUX_COM_BASE_ADDR)
-#define IOMUXSW_AP_MUX_CTL      (IOMUX_AP_BASE + 0x000)
-#define IOMUXSW_SP_MUX_CTL      (IOMUX_COM_BASE + 0x000)
-#define IOMUXSW_PAD_CTL         (IOMUX_COM_BASE + 0x200)
-
-#define IOMUXINT_OBS1           (IOMUX_AP_BASE + 0x600)
-#define IOMUXINT_OBS2           (IOMUX_AP_BASE + 0x004)
-
-static DEFINE_SPINLOCK(gpio_mux_lock);
-
-#define NB_PORTS                        ((PIN_MAX + 32) / 32)
-#define PIN_GLOBAL_NUM(pin) \
-        (((pin & MUX_SIDE_MASK) >> MUX_SIDE_SHIFT)*PIN_AP_MAX + \
-         ((pin & MUX_REG_MASK) >> MUX_REG_SHIFT)*4 +            \
-         ((pin & MUX_FIELD_MASK) >> MUX_FIELD_SHIFT))
-
-unsigned long mxc_pin_alloc_map[NB_PORTS * 32 / BITS_PER_LONG];
-/*
- * set the mode for a IOMUX pin.
- */
-int mxc_iomux_mode(unsigned int pin_mode)
-{
-        u32 side, field, l, mode, ret = 0;
-        void __iomem *reg;
-
-        side = (pin_mode & MUX_SIDE_MASK) >> MUX_SIDE_SHIFT;
-        switch (side) {
-        case MUX_SIDE_AP:
-                reg = IOMUXSW_AP_MUX_CTL;
-                break;
-        case MUX_SIDE_SP:
-                reg = IOMUXSW_SP_MUX_CTL;
-                break;
-        default:
-                return -EINVAL;
-        }
-        reg += ((pin_mode & MUX_REG_MASK) >> MUX_REG_SHIFT) * 4;
-        field = (pin_mode & MUX_FIELD_MASK) >> MUX_FIELD_SHIFT;
-        mode = (pin_mode & MUX_MODE_MASK) >> MUX_MODE_SHIFT;
-
-        spin_lock(&gpio_mux_lock);
-
-        l = __raw_readl(reg);
-        l &= ~(0xff << (field * 8));
-        l |= mode << (field * 8);
-        __raw_writel(l, reg);
-
-        spin_unlock(&gpio_mux_lock);
-
-        return ret;
-}
-EXPORT_SYMBOL(mxc_iomux_mode);
-
-/*
- * This function configures the pad value for a IOMUX pin.
- */
-void mxc_iomux_set_pad(enum iomux_pins pin, u32 config)
-{
-        u32 padgrp, field, l;
-        void __iomem *reg;
-
-        padgrp = (pin & MUX_PADGRP_MASK) >> MUX_PADGRP_SHIFT;
-        reg = IOMUXSW_PAD_CTL + (pin + 2) / 3 * 4;
-        field = (pin + 2) % 3;
-
-        pr_debug("%s: reg offset = 0x%x, field = %d\n",
-                        __func__, (pin + 2) / 3, field);
-
-        spin_lock(&gpio_mux_lock);
-
-        l = __raw_readl(reg);
-        l &= ~(0x1ff << (field * 10));
-        l |= config << (field * 10);
-        __raw_writel(l, reg);
-
-        spin_unlock(&gpio_mux_lock);
-}
-EXPORT_SYMBOL(mxc_iomux_set_pad);
-
-/*
- * allocs a single pin:
- *      - reserves the pin so that it is not claimed by another driver
- *      - setups the iomux according to the configuration
- */
-int mxc_iomux_alloc_pin(unsigned int pin_mode, const char *label)
-{
-        unsigned pad = PIN_GLOBAL_NUM(pin_mode);
-        if (pad >= (PIN_MAX + 1)) {
-                printk(KERN_ERR "mxc_iomux: Attempt to request nonexistant pin %u for \"%s\"\n",
-                        pad, label ? label : "?");
-                return -EINVAL;
-        }
-
-        if (test_and_set_bit(pad, mxc_pin_alloc_map)) {
-                printk(KERN_ERR "mxc_iomux: pin %u already used. Allocation for \"%s\" failed\n",
-                        pad, label ? label : "?");
-                return -EBUSY;
-        }
-        mxc_iomux_mode(pin_mode);
-
-        return 0;
-}
-EXPORT_SYMBOL(mxc_iomux_alloc_pin);
-
-int mxc_iomux_setup_multiple_pins(const unsigned int *pin_list, unsigned count,
-                const char *label)
-{
-        const unsigned int *p = pin_list;
-        int i;
-        int ret = -EINVAL;
-
-        for (i = 0; i < count; i++) {
-                ret = mxc_iomux_alloc_pin(*p, label);
-                if (ret)
-                        goto setup_error;
-                p++;
-        }
-        return 0;
-
-setup_error:
-        mxc_iomux_release_multiple_pins(pin_list, i);
-        return ret;
-}
-EXPORT_SYMBOL(mxc_iomux_setup_multiple_pins);
-
-void mxc_iomux_release_pin(unsigned int pin_mode)
-{
-        unsigned pad = PIN_GLOBAL_NUM(pin_mode);
-
-        if (pad < (PIN_MAX + 1))
-                clear_bit(pad, mxc_pin_alloc_map);
-}
-EXPORT_SYMBOL(mxc_iomux_release_pin);
-
-void mxc_iomux_release_multiple_pins(const unsigned int *pin_list, int count)
-{
-        const unsigned int *p = pin_list;
-        int i;
-
-        for (i = 0; i < count; i++) {
-                mxc_iomux_release_pin(*p);
-                p++;
-        }
-}
-EXPORT_SYMBOL(mxc_iomux_release_multiple_pins);
diff --git a/arch/arm/mach-mxc91231/magx-zn5.c b/arch/arm/mach-mxc91231/magx-zn5.c
deleted file mode 100644
index f31a45e5a0b8..000000000000
--- a/arch/arm/mach-mxc91231/magx-zn5.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2009 Dmitriy Taychenachev <dimichxp@gmail.com>
- *
- * This file is released under the GPLv2 or later.
- */
-
-#include <linux/irq.h>
-#include <linux/init.h>
-#include <linux/device.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/time.h>
-#include <asm/mach/arch.h>
-
-#include <mach/common.h>
-#include <mach/hardware.h>
-#include <mach/iomux-mxc91231.h>
-#include <mach/mmc.h>
-#include <mach/imx-uart.h>
-
-#include "devices.h"
-
-static struct imxuart_platform_data uart_pdata = {
-};
-
-static struct imxmmc_platform_data sdhc_pdata = {
-};
-
-static void __init zn5_init(void)
-{
-        pm_power_off = mxc91231_power_off;
-
-        mxc_iomux_alloc_pin(MXC91231_PIN_SP_USB_DAT_VP__RXD2, "uart2-rx");
-        mxc_iomux_alloc_pin(MXC91231_PIN_SP_USB_SE0_VM__TXD2, "uart2-tx");
-
-        mxc_register_device(&mxc_uart_device1, &uart_pdata);
-        mxc_register_device(&mxc_uart_device0, &uart_pdata);
-
-        mxc_register_device(&mxc_sdhc_device0, &sdhc_pdata);
-
-        mxc_register_device(&mxc_wdog_device0, NULL);
-
-        return;
-}
-
-static void __init zn5_timer_init(void)
-{
-        mxc91231_clocks_init(26000000); /* 26mhz ckih */
-}
-
-struct sys_timer zn5_timer = {
-        .init = zn5_timer_init,
-};
-
-MACHINE_START(MAGX_ZN5, "Motorola Zn5")
-        .boot_params = MXC91231_PHYS_OFFSET + 0x100,
-        .map_io = mxc91231_map_io,
-        .init_early = mxc91231_init_early,
-        .init_irq = mxc91231_init_irq,
-        .timer = &zn5_timer,
-        .init_machine = zn5_init,
-MACHINE_END
diff --git a/arch/arm/mach-mxc91231/mm.c b/arch/arm/mach-mxc91231/mm.c
deleted file mode 100644
index a77f6daf6a26..000000000000
--- a/arch/arm/mach-mxc91231/mm.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright (C) 1999,2000 Arm Limited
- *  Copyright (C) 2000 Deep Blue Solutions Ltd
- *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
- *  Copyright 2004-2005 Freescale Semiconductor, Inc. All Rights Reserved.
- *    - add MXC specific definitions
- *  Copyright 2006 Motorola, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/mm.h>
-#include <linux/init.h>
-#include <mach/hardware.h>
-#include <mach/common.h>
-#include <asm/pgtable.h>
-#include <asm/mach/map.h>
-
-/*
- * This structure defines the MXC memory map.
- */
-static struct map_desc mxc91231_io_desc[] __initdata = {
-        imx_map_entry(MXC91231, L2CC, MT_DEVICE),
-        imx_map_entry(MXC91231, X_MEMC, MT_DEVICE),
-        imx_map_entry(MXC91231, ROMP, MT_DEVICE),
-        imx_map_entry(MXC91231, AVIC, MT_DEVICE),
-        imx_map_entry(MXC91231, AIPS1, MT_DEVICE),
-        imx_map_entry(MXC91231, SPBA0, MT_DEVICE),
-        imx_map_entry(MXC91231, SPBA1, MT_DEVICE),
-        imx_map_entry(MXC91231, AIPS2, MT_DEVICE),
-};
-
-/*
- * This function initializes the memory map. It is called during the
- * system startup to create static physical to virtual memory map for
- * the IO modules.
- */
-void __init mxc91231_map_io(void)
-{
-        iotable_init(mxc91231_io_desc, ARRAY_SIZE(mxc91231_io_desc));
-}
-
-void __init mxc91231_init_early(void)
-{
-        mxc_set_cpu_type(MXC_CPU_MXC91231);
-}
-
-int mxc91231_register_gpios(void);
-
-void __init mxc91231_init_irq(void)
-{
-        mxc91231_register_gpios();
-        mxc_init_irq(MXC91231_IO_ADDRESS(MXC91231_AVIC_BASE_ADDR));
-}
diff --git a/arch/arm/mach-mxc91231/system.c b/arch/arm/mach-mxc91231/system.c
deleted file mode 100644
index 736f7efd874a..000000000000
--- a/arch/arm/mach-mxc91231/system.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2009 Dmitriy Taychenachev <dimichxp@gmail.com>
- *
- * This file is released under the GPLv2 or later.
- */
-
-#include <linux/delay.h>
-#include <linux/io.h>
-
-#include <asm/proc-fns.h>
-#include <mach/hardware.h>
-
-#include "crm_regs.h"
-
-#define WDOG_WCR                MXC91231_IO_ADDRESS(MXC91231_WDOG1_BASE_ADDR)
-#define WDOG_WCR_OUT_ENABLE     (1 << 6)
-#define WDOG_WCR_ASSERT         (1 << 5)
-
-void mxc91231_power_off(void)
-{
-        u16 wcr;
-
-        wcr = __raw_readw(WDOG_WCR);
-        wcr |= WDOG_WCR_OUT_ENABLE;
-        wcr &= ~WDOG_WCR_ASSERT;
-        __raw_writew(wcr, WDOG_WCR);
-}
-
-void mxc91231_arch_reset(char mode, const char *cmd)
-{
-        u32 amcr;
-
-        /* Reset the AP using CRM */
-        amcr = __raw_readl(MXC_CRMAP_AMCR);
-        amcr &= ~MXC_CRMAP_AMCR_SW_AP;
-        __raw_writel(amcr, MXC_CRMAP_AMCR);
-
-        mdelay(10);
-        cpu_reset(0);
-}
-
-void mxc91231_prepare_idle(void)
-{
-        u32 crm_ctl;
-
-        /* Go to WAIT mode after WFI */
-        crm_ctl = __raw_readl(MXC_DSM_CRM_CONTROL);
-        crm_ctl &= ~(MXC_DSM_CRM_CTRL_LPMD0 | MXC_DSM_CRM_CTRL_LPMD1);
-        crm_ctl |=  MXC_DSM_CRM_CTRL_LPMD_WAIT_MODE;
-        __raw_writel(crm_ctl, MXC_DSM_CRM_CONTROL);
-}
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 4522fbb235d5..f114960622e0 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -17,6 +17,16 @@ config SOC_IMX28
 
 comment "MXS platforms:"
 
+config MACH_STMP378X_DEVB
+        bool "Support STMP378x_devb Platform"
+        select SOC_IMX23
+        select MXS_HAVE_AMBA_DUART
+        select MXS_HAVE_PLATFORM_AUART
+        select MXS_HAVE_PLATFORM_MXS_MMC
+        help
+          Include support for STMP378x-devb platform. This includes specific
+          configurations for the board and its peripherals.
+
 config MACH_MX23EVK
         bool "Support MX23EVK Platform"
         select SOC_IMX23
@@ -24,7 +34,6 @@ config MACH_MX23EVK
         select MXS_HAVE_PLATFORM_AUART
         select MXS_HAVE_PLATFORM_MXS_MMC
         select MXS_HAVE_PLATFORM_MXSFB
-        default y
         help
           Include support for MX23EVK platform. This includes specific
           configurations for the board and its peripherals.
@@ -39,7 +48,6 @@ config MACH_MX28EVK
         select MXS_HAVE_PLATFORM_MXS_MMC
         select MXS_HAVE_PLATFORM_MXSFB
         select MXS_OCOTP
-        default y
         help
           Include support for MX28EVK platform. This includes specific
           configurations for the board and its peripherals.
diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile
index 2f1f6141ca71..58e892376bf2 100644
--- a/arch/arm/mach-mxs/Makefile
+++ b/arch/arm/mach-mxs/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_PM) += pm.o
 obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o
 obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.o
 
+obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o
 obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o
 obj-$(CONFIG_MACH_MX28EVK) += mach-mx28evk.o
 obj-$(CONFIG_MODULE_TX28) += module-tx28.o
diff --git a/arch/arm/mach-mxs/clock-mx23.c b/arch/arm/mach-mxs/clock-mx23.c
index c3577ea789ac..0163b6d83773 100644
--- a/arch/arm/mach-mxs/clock-mx23.c
+++ b/arch/arm/mach-mxs/clock-mx23.c
@@ -446,6 +446,8 @@ static struct clk_lookup lookups[] = {
         _REGISTER_CLOCK("rtc", NULL, rtc_clk)
         _REGISTER_CLOCK("mxs-dma-apbh", NULL, hbus_clk)
         _REGISTER_CLOCK("mxs-dma-apbx", NULL, xbus_clk)
+        _REGISTER_CLOCK("mxs-mmc.0", NULL, ssp_clk)
+        _REGISTER_CLOCK("mxs-mmc.1", NULL, ssp_clk)
         _REGISTER_CLOCK(NULL, "usb", usb_clk)
         _REGISTER_CLOCK(NULL, "audio", audio_clk)
         _REGISTER_CLOCK("mxs-pwm.0", NULL, pwm_clk)
diff --git a/arch/arm/mach-mxs/devices-mx28.h b/arch/arm/mach-mxs/devices-mx28.h
index c473eddce8cf..79b94523954a 100644
--- a/arch/arm/mach-mxs/devices-mx28.h
+++ b/arch/arm/mach-mxs/devices-mx28.h
@@ -34,7 +34,7 @@ extern const struct mxs_flexcan_data mx28_flexcan_data[] __initconst;
 #define mx28_add_flexcan0(pdata)        mx28_add_flexcan(0, pdata)
 #define mx28_add_flexcan1(pdata)        mx28_add_flexcan(1, pdata)
 
-extern const struct mxs_i2c_data mx28_mxs_i2c_data[] __initconst;
+extern const struct mxs_mxs_i2c_data mx28_mxs_i2c_data[] __initconst;
 #define mx28_add_mxs_i2c(id)            mxs_add_mxs_i2c(&mx28_mxs_i2c_data[id])
 
 extern const struct mxs_mxs_mmc_data mx28_mxs_mmc_data[] __initconst;
diff --git a/arch/arm/mach-mxs/devices/platform-mxs-i2c.c b/arch/arm/mach-mxs/devices/platform-mxs-i2c.c
index eab3a06836d6..79222ec8ede1 100644
--- a/arch/arm/mach-mxs/devices/platform-mxs-i2c.c
+++ b/arch/arm/mach-mxs/devices/platform-mxs-i2c.c
@@ -22,13 +22,14 @@
         [_id] = mxs_i2c_data_entry_single(soc, _id)
 
 #ifdef CONFIG_SOC_IMX28
-const struct mxs_i2c_data mx28_mxs_i2c_data[] __initconst = {
+const struct mxs_mxs_i2c_data mx28_mxs_i2c_data[] __initconst = {
         mxs_i2c_data_entry(MX28, 0),
         mxs_i2c_data_entry(MX28, 1),
 };
 #endif
 
-struct platform_device *__init mxs_add_mxs_i2c(const struct mxs_i2c_data *data)
+struct platform_device *__init mxs_add_mxs_i2c(
+                const struct mxs_mxs_i2c_data *data)
 {
         struct resource res[] = {
                 {
diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h
index c5137f14c364..7a37469ed5bf 100644
--- a/arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/arch/arm/mach-mxs/include/mach/devices-common.h
@@ -65,13 +65,14 @@ struct platform_device *__init mxs_add_flexcan(
                 const struct flexcan_platform_data *pdata);
 
 /* i2c */
-struct mxs_i2c_data {
+struct mxs_mxs_i2c_data {
         int id;
         resource_size_t iobase;
         resource_size_t errirq;
         resource_size_t dmairq;
 };
-struct platform_device * __init mxs_add_mxs_i2c(const struct mxs_i2c_data *data);
+struct platform_device * __init mxs_add_mxs_i2c(
+                const struct mxs_mxs_i2c_data *data);
 
 /* mmc */
 #include <mach/mmc.h>
diff --git a/arch/arm/mach-mxs/include/mach/mx23.h b/arch/arm/mach-mxs/include/mach/mx23.h
index c0a18c23084a..599094bc99de 100644
--- a/arch/arm/mach-mxs/include/mach/mx23.h
+++ b/arch/arm/mach-mxs/include/mach/mx23.h
@@ -57,7 +57,7 @@
 #define MX23_AUDIOIN_BASE_ADDR          (MX23_IO_BASE_ADDR + 0x04c000)
 #define MX23_LRADC_BASE_ADDR            (MX23_IO_BASE_ADDR + 0x050000)
 #define MX23_SPDIF_BASE_ADDR            (MX23_IO_BASE_ADDR + 0x054000)
-#define MX23_I2C0_BASE_ADDR             (MX23_IO_BASE_ADDR + 0x058000)
+#define MX23_I2C_BASE_ADDR              (MX23_IO_BASE_ADDR + 0x058000)
 #define MX23_RTC_BASE_ADDR              (MX23_IO_BASE_ADDR + 0x05c000)
 #define MX23_PWM_BASE_ADDR              (MX23_IO_BASE_ADDR + 0x064000)
 #define MX23_TIMROT_BASE_ADDR           (MX23_IO_BASE_ADDR + 0x068000)
diff --git a/arch/arm/mach-mxs/include/mach/uncompress.h b/arch/arm/mach-mxs/include/mach/uncompress.h
index f12a1732d8b8..7f8bf6539646 100644
--- a/arch/arm/mach-mxs/include/mach/uncompress.h
+++ b/arch/arm/mach-mxs/include/mach/uncompress.h
@@ -20,7 +20,7 @@
 
 #include <asm/mach-types.h>
 
-static unsigned long mxs_duart_base;
+unsigned long mxs_duart_base;
 
 #define MXS_DUART(x)    (*(volatile unsigned long *)(mxs_duart_base + (x)))
 
diff --git a/arch/arm/mach-mxs/mach-mx23evk.c b/arch/arm/mach-mxs/mach-mx23evk.c
index 214e5b641bbc..3c2de33803ab 100644
--- a/arch/arm/mach-mxs/mach-mx23evk.c
+++ b/arch/arm/mach-mxs/mach-mx23evk.c
@@ -148,7 +148,7 @@ static void __init mx23evk_init(void)
         mx23_add_auart0();
 
         /* power on mmc slot by writing 0 to the gpio */
-        ret = gpio_request_one(MX23EVK_MMC0_SLOT_POWER, GPIOF_DIR_OUT,
+        ret = gpio_request_one(MX23EVK_MMC0_SLOT_POWER, GPIOF_OUT_INIT_LOW,
                                "mmc0-slot-power");
         if (ret)
                 pr_warn("failed to request gpio mmc0-slot-power: %d\n", ret);
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c
index bb329b9a2608..eacdc6b0e70a 100644
--- a/arch/arm/mach-mxs/mach-mx28evk.c
+++ b/arch/arm/mach-mxs/mach-mx28evk.c
@@ -375,13 +375,13 @@ static void __init mx28evk_init(void)
         mx28_add_mxsfb(&mx28evk_mxsfb_pdata);
 
         /* power on mmc slot by writing 0 to the gpio */
-        ret = gpio_request_one(MX28EVK_MMC0_SLOT_POWER, GPIOF_DIR_OUT,
+        ret = gpio_request_one(MX28EVK_MMC0_SLOT_POWER, GPIOF_OUT_INIT_LOW,
                                "mmc0-slot-power");
         if (ret)
                 pr_warn("failed to request gpio mmc0-slot-power: %d\n", ret);
         mx28_add_mxs_mmc(0, &mx28evk_mmc_pdata[0]);
 
-        ret = gpio_request_one(MX28EVK_MMC1_SLOT_POWER, GPIOF_DIR_OUT,
+        ret = gpio_request_one(MX28EVK_MMC1_SLOT_POWER, GPIOF_OUT_INIT_LOW,
                                "mmc1-slot-power");
         if (ret)
                 pr_warn("failed to request gpio mmc1-slot-power: %d\n", ret);
diff --git a/arch/arm/mach-mxs/mach-stmp378x_devb.c b/arch/arm/mach-mxs/mach-stmp378x_devb.c
new file mode 100644
index 000000000000..7f38d82b69af
--- /dev/null
+++ b/arch/arm/mach-mxs/mach-stmp378x_devb.c
@@ -0,0 +1,120 @@
+/*
+ * board setup for STMP378x-Development-Board
+ *
+ * based on mx23evk board setup and information gained form the original
+ * plat-stmp based board setup, now converted to mach-mxs.
+ *
+ * Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright (C) 2011 Wolfram Sang, Pengutronix e.K.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This 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/platform_device.h>
+#include <linux/gpio.h>
+#include <linux/irq.h>
+#include <linux/spi/spi.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/time.h>
+
+#include <mach/common.h>
+#include <mach/iomux-mx23.h>
+
+#include "devices-mx23.h"
+
+#define STMP378X_DEVB_MMC0_WRITE_PROTECT        MXS_GPIO_NR(1, 30)
+#define STMP378X_DEVB_MMC0_SLOT_POWER           MXS_GPIO_NR(1, 29)
+
+#define STMP378X_DEVB_PAD_AUART (MXS_PAD_4MA | MXS_PAD_1V8 | MXS_PAD_NOPULL)
+
+static const iomux_cfg_t stmp378x_dvb_pads[] __initconst = {
+        /* duart (extended setup missing in old boardcode, too */
+        MX23_PAD_PWM0__DUART_RX,
+        MX23_PAD_PWM1__DUART_TX,
+
+        /* auart */
+        MX23_PAD_AUART1_RX__AUART1_RX | STMP378X_DEVB_PAD_AUART,
+        MX23_PAD_AUART1_TX__AUART1_TX | STMP378X_DEVB_PAD_AUART,
+        MX23_PAD_AUART1_CTS__AUART1_CTS | STMP378X_DEVB_PAD_AUART,
+        MX23_PAD_AUART1_RTS__AUART1_RTS | STMP378X_DEVB_PAD_AUART,
+
+        /* mmc */
+        MX23_PAD_SSP1_DATA0__SSP1_DATA0 |
+                (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
+        MX23_PAD_SSP1_DATA1__SSP1_DATA1 |
+                (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
+        MX23_PAD_SSP1_DATA2__SSP1_DATA2 |
+                (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
+        MX23_PAD_SSP1_DATA3__SSP1_DATA3 |
+                (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
+        MX23_PAD_SSP1_CMD__SSP1_CMD |
+                (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
+        MX23_PAD_SSP1_DETECT__SSP1_DETECT |
+                (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),
+        MX23_PAD_SSP1_SCK__SSP1_SCK |
+                (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),
+        MX23_PAD_PWM4__GPIO_1_30 | MXS_PAD_CTRL, /* write protect */
+        MX23_PAD_PWM3__GPIO_1_29 | MXS_PAD_CTRL, /* power enable */
+};
+
+static struct mxs_mmc_platform_data stmp378x_dvb_mmc_pdata __initdata = {
+        .wp_gpio = STMP378X_DEVB_MMC0_WRITE_PROTECT,
+};
+
+static struct spi_board_info spi_board_info[] __initdata = {
+#if defined(CONFIG_ENC28J60) || defined(CONFIG_ENC28J60_MODULE)
+        {
+                .modalias       = "enc28j60",
+                .max_speed_hz   = 6 * 1000 * 1000,
+                .bus_num        = 1,
+                .chip_select    = 0,
+                .platform_data  = NULL,
+        },
+#endif
+};
+
+static void __init stmp378x_dvb_init(void)
+{
+        int ret;
+
+        mxs_iomux_setup_multiple_pads(stmp378x_dvb_pads,
+                        ARRAY_SIZE(stmp378x_dvb_pads));
+
+        mx23_add_duart();
+        mx23_add_auart0();
+
+        /* power on mmc slot */
+        ret = gpio_request_one(STMP378X_DEVB_MMC0_SLOT_POWER,
+                GPIOF_OUT_INIT_LOW, "mmc0-slot-power");
+        if (ret)
+                pr_warn("could not power mmc (%d)\n", ret);
+
+        mx23_add_mxs_mmc(0, &stmp378x_dvb_mmc_pdata);
+
+        spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
+}
+
+static void __init stmp378x_dvb_timer_init(void)
+{
+        mx23_clocks_init();
+}
+
+static struct sys_timer stmp378x_dvb_timer = {
+        .init   = stmp378x_dvb_timer_init,
+};
+
+MACHINE_START(STMP378X, "STMP378X")
+        .map_io         = mx23_map_io,
+        .init_irq       = mx23_init_irq,
+        .init_machine   = stmp378x_dvb_init,
+        .timer          = &stmp378x_dvb_timer,
+MACHINE_END
diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c
index 13647f301860..cace0d2e5a55 100644
--- a/arch/arm/mach-mxs/timer.c
+++ b/arch/arm/mach-mxs/timer.c
@@ -101,11 +101,6 @@ static cycle_t timrotv1_get_cycles(struct clocksource *cs)
                         & 0xffff0000) >> 16);
 }
 
-static cycle_t timrotv2_get_cycles(struct clocksource *cs)
-{
-        return ~__raw_readl(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1));
-}
-
 static int timrotv1_set_next_event(unsigned long evt,
                                         struct clock_event_device *dev)
 {
@@ -230,8 +225,8 @@ static int __init mxs_clockevent_init(struct clk *timer_clk)
 static struct clocksource clocksource_mxs = {
         .name           = "mxs_timer",
         .rating         = 200,
-        .read           = timrotv2_get_cycles,
-        .mask           = CLOCKSOURCE_MASK(32),
+        .read           = timrotv1_get_cycles,
+        .mask           = CLOCKSOURCE_MASK(16),
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -239,12 +234,11 @@ static int __init mxs_clocksource_init(struct clk *timer_clk)
 {
         unsigned int c = clk_get_rate(timer_clk);
 
-        if (timrot_is_v1()) {
-                clocksource_mxs.read = timrotv1_get_cycles;
-                clocksource_mxs.mask = CLOCKSOURCE_MASK(16);
-        }
-
-        clocksource_register_hz(&clocksource_mxs, c);
+        if (timrot_is_v1())
+                clocksource_register_hz(&clocksource_mxs, c);
+        else
+                clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1),
+                        "mxs_timer", c, 200, 32, clocksource_mmio_readl_down);
 
         return 0;
 }
diff --git a/arch/arm/mach-netx/time.c b/arch/arm/mach-netx/time.c
index f12f22d09b6c..e24c141ba489 100644
--- a/arch/arm/mach-netx/time.c
+++ b/arch/arm/mach-netx/time.c
@@ -104,19 +104,6 @@ static struct irqaction netx_timer_irq = {
         .handler        = netx_timer_interrupt,
 };
 
-cycle_t netx_get_cycles(struct clocksource *cs)
-{
-        return readl(NETX_GPIO_COUNTER_CURRENT(TIMER_CLOCKSOURCE));
-}
-
-static struct clocksource clocksource_netx = {
-        .name           = "netx_timer",
-        .rating         = 200,
-        .read           = netx_get_cycles,
-        .mask           = CLOCKSOURCE_MASK(32),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 /*
  * Set up timer interrupt
  */
@@ -150,7 +137,8 @@ static void __init netx_timer_init(void)
         writel(NETX_GPIO_COUNTER_CTRL_RUN,
                         NETX_GPIO_COUNTER_CTRL(TIMER_CLOCKSOURCE));
 
-        clocksource_register_hz(&clocksource_netx, CLOCK_TICK_RATE);
+        clocksource_mmio_init(NETX_GPIO_COUNTER_CURRENT(TIMER_CLOCKSOURCE),
+                "netx_timer", CLOCK_TICK_RATE, 200, 32, clocksource_mmio_readl_up);
 
         netx_clockevent.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC,
                         netx_clockevent.shift);
diff --git a/arch/arm/mach-ns9xxx/Kconfig b/arch/arm/mach-ns9xxx/Kconfig
deleted file mode 100644
index dd0cd5ac4b8b..000000000000
--- a/arch/arm/mach-ns9xxx/Kconfig
+++ /dev/null
@@ -1,40 +0,0 @@
-if ARCH_NS9XXX
-
-menu "NS9xxx Implementations"
-
-config NS9XXX_HAVE_SERIAL8250
-        bool
-
-config PROCESSOR_NS9360
-        bool
-
-config MODULE_CC9P9360
-        bool
-        select PROCESSOR_NS9360
-
-config BOARD_A9M9750DEV
-        select NS9XXX_HAVE_SERIAL8250
-        bool
-
-config BOARD_JSCC9P9360
-        bool
-
-config MACH_CC9P9360DEV
-        bool "ConnectCore 9P 9360 on an A9M9750 Devboard"
-        select MODULE_CC9P9360
-        select BOARD_A9M9750DEV
-        help
-          Say Y here if you are using the Digi ConnectCore 9P 9360
-          on an A9M9750 Development Board.
-
-config MACH_CC9P9360JS
-        bool "ConnectCore 9P 9360 on a JSCC9P9360 Devboard"
-        select MODULE_CC9P9360
-        select BOARD_JSCC9P9360
-        help
-          Say Y here if you are using the Digi ConnectCore 9P 9360
-          on an JSCC9P9360 Development Board.
-
-endmenu
-
-endif
diff --git a/arch/arm/mach-ns9xxx/Makefile b/arch/arm/mach-ns9xxx/Makefile
deleted file mode 100644
index 41efaf9ad50b..000000000000
--- a/arch/arm/mach-ns9xxx/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-obj-y := clock.o generic.o gpio.o irq.o
-
-obj-$(CONFIG_MACH_CC9P9360DEV) += mach-cc9p9360dev.o
-obj-$(CONFIG_MACH_CC9P9360JS) += mach-cc9p9360js.o
-
-obj-$(CONFIG_PROCESSOR_NS9360) += gpio-ns9360.o processor-ns9360.o time-ns9360.o
-
-obj-$(CONFIG_BOARD_A9M9750DEV) += board-a9m9750dev.o
-obj-$(CONFIG_BOARD_JSCC9P9360) += board-jscc9p9360.o
-
-# platform devices
-obj-$(CONFIG_NS9XXX_HAVE_SERIAL8250) += plat-serial8250.o
diff --git a/arch/arm/mach-ns9xxx/Makefile.boot b/arch/arm/mach-ns9xxx/Makefile.boot
deleted file mode 100644
index 54654919229b..000000000000
--- a/arch/arm/mach-ns9xxx/Makefile.boot
+++ /dev/null
@@ -1,2 +0,0 @@
-zreladdr-y := 0x8000
-params_phys-y := 0x100
diff --git a/arch/arm/mach-ns9xxx/board-a9m9750dev.c b/arch/arm/mach-ns9xxx/board-a9m9750dev.c
deleted file mode 100644
index e27687d53504..000000000000
--- a/arch/arm/mach-ns9xxx/board-a9m9750dev.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/board-a9m9750dev.c
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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/irq.h>
-
-#include <asm/mach/map.h>
-#include <asm/gpio.h>
-
-#include <mach/board.h>
-#include <mach/processor-ns9360.h>
-#include <mach/regs-sys-ns9360.h>
-#include <mach/regs-mem.h>
-#include <mach/regs-bbu.h>
-#include <mach/regs-board-a9m9750dev.h>
-
-#include "board-a9m9750dev.h"
-
-static struct map_desc board_a9m9750dev_io_desc[] __initdata = {
-        { /* FPGA on CS0 */
-                .virtual = io_p2v(NS9XXX_CSxSTAT_PHYS(0)),
-                .pfn = __phys_to_pfn(NS9XXX_CSxSTAT_PHYS(0)),
-                .length = NS9XXX_CS0STAT_LENGTH,
-                .type = MT_DEVICE,
-        },
-};
-
-void __init board_a9m9750dev_map_io(void)
-{
-        iotable_init(board_a9m9750dev_io_desc,
-                     ARRAY_SIZE(board_a9m9750dev_io_desc));
-}
-
-static void a9m9750dev_fpga_ack_irq(struct irq_data *d)
-{
-        /* nothing */
-}
-
-static void a9m9750dev_fpga_mask_irq(struct irq_data *d)
-{
-        u8 ier;
-
-        ier = __raw_readb(FPGA_IER);
-
-        ier &= ~(1 << (d->irq - FPGA_IRQ(0)));
-
-        __raw_writeb(ier, FPGA_IER);
-}
-
-static void a9m9750dev_fpga_maskack_irq(struct irq_data *d)
-{
-        a9m9750dev_fpga_mask_irq(d);
-        a9m9750dev_fpga_ack_irq(d);
-}
-
-static void a9m9750dev_fpga_unmask_irq(struct irq_data *d)
-{
-        u8 ier;
-
-        ier = __raw_readb(FPGA_IER);
-
-        ier |= 1 << (d->irq - FPGA_IRQ(0));
-
-        __raw_writeb(ier, FPGA_IER);
-}
-
-static struct irq_chip a9m9750dev_fpga_chip = {
-        .irq_ack        = a9m9750dev_fpga_ack_irq,
-        .irq_mask       = a9m9750dev_fpga_mask_irq,
-        .irq_mask_ack   = a9m9750dev_fpga_maskack_irq,
-        .irq_unmask     = a9m9750dev_fpga_unmask_irq,
-};
-
-static void a9m9750dev_fpga_demux_handler(unsigned int irq,
-                struct irq_desc *desc)
-{
-        u8 stat = __raw_readb(FPGA_ISR);
-
-        desc->irq_data.chip->irq_mask_ack(&desc->irq_data);
-
-        while (stat != 0) {
-                int irqno = fls(stat) - 1;
-
-                stat &= ~(1 << irqno);
-
-                generic_handle_irq(FPGA_IRQ(irqno));
-        }
-
-        desc->irq_data.chip->irq_unmask(&desc->irq_data);
-}
-
-void __init board_a9m9750dev_init_irq(void)
-{
-        u32 eic;
-        int i;
-
-        if (gpio_request(11, "board a9m9750dev extirq2") == 0)
-                ns9360_gpio_configure(11, 0, 1);
-        else
-                printk(KERN_ERR "%s: cannot get gpio 11 for IRQ_NS9XXX_EXT2\n",
-                                __func__);
-
-        for (i = FPGA_IRQ(0); i <= FPGA_IRQ(7); ++i) {
-                irq_set_chip_and_handler(i, &a9m9750dev_fpga_chip,
-                                         handle_level_irq);
-                set_irq_flags(i, IRQF_VALID);
-        }
-
-        /* IRQ_NS9XXX_EXT2: level sensitive + active low */
-        eic = __raw_readl(SYS_EIC(2));
-        REGSET(eic, SYS_EIC, PLTY, AL);
-        REGSET(eic, SYS_EIC, LVEDG, LEVEL);
-        __raw_writel(eic, SYS_EIC(2));
-
-        irq_set_chained_handler(IRQ_NS9XXX_EXT2,
-                                a9m9750dev_fpga_demux_handler);
-}
-
-void __init board_a9m9750dev_init_machine(void)
-{
-        u32 reg;
-
-        /* setup static CS0: memory base ... */
-        reg = __raw_readl(SYS_SMCSSMB(0));
-        REGSETIM(reg, SYS_SMCSSMB, CSxB, NS9XXX_CSxSTAT_PHYS(0) >> 12);
-        __raw_writel(reg, SYS_SMCSSMB(0));
-
-        /* ... and mask */
-        reg = __raw_readl(SYS_SMCSSMM(0));
-        REGSETIM(reg, SYS_SMCSSMM, CSxM, 0xfffff);
-        REGSET(reg, SYS_SMCSSMM, CSEx, EN);
-        __raw_writel(reg, SYS_SMCSSMM(0));
-
-        /* setup static CS0: memory configuration */
-        reg = __raw_readl(MEM_SMC(0));
-        REGSET(reg, MEM_SMC, PSMC, OFF);
-        REGSET(reg, MEM_SMC, BSMC, OFF);
-        REGSET(reg, MEM_SMC, EW, OFF);
-        REGSET(reg, MEM_SMC, PB, 1);
-        REGSET(reg, MEM_SMC, PC, AL);
-        REGSET(reg, MEM_SMC, PM, DIS);
-        REGSET(reg, MEM_SMC, MW, 8);
-        __raw_writel(reg, MEM_SMC(0));
-
-        /* setup static CS0: timing */
-        __raw_writel(0x2, MEM_SMWED(0));
-        __raw_writel(0x2, MEM_SMOED(0));
-        __raw_writel(0x6, MEM_SMRD(0));
-        __raw_writel(0x6, MEM_SMWD(0));
-}
diff --git a/arch/arm/mach-ns9xxx/board-a9m9750dev.h b/arch/arm/mach-ns9xxx/board-a9m9750dev.h
deleted file mode 100644
index edc75abbc5dd..000000000000
--- a/arch/arm/mach-ns9xxx/board-a9m9750dev.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/board-a9m9750dev.h
- *
- * Copyright (C) 2006 by Digi International Inc.
- * All rights reserved.
- *
- * 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>
-
-void __init board_a9m9750dev_map_io(void);
-void __init board_a9m9750dev_init_machine(void);
-void __init board_a9m9750dev_init_irq(void);
diff --git a/arch/arm/mach-ns9xxx/board-jscc9p9360.c b/arch/arm/mach-ns9xxx/board-jscc9p9360.c
deleted file mode 100644
index 4bd3eec04bfe..000000000000
--- a/arch/arm/mach-ns9xxx/board-jscc9p9360.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/board-jscc9p9360.c
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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 "board-jscc9p9360.h"
-
-void __init board_jscc9p9360_init_machine(void)
-{
-        /* TODO: reserve GPIOs for push buttons, etc pp */
-}
-
diff --git a/arch/arm/mach-ns9xxx/board-jscc9p9360.h b/arch/arm/mach-ns9xxx/board-jscc9p9360.h
deleted file mode 100644
index 1a81a074df45..000000000000
--- a/arch/arm/mach-ns9xxx/board-jscc9p9360.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/board-jscc9p9360.h
- *
- * Copyright (C) 2006 by Digi International Inc.
- * All rights reserved.
- *
- * 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>
-
-void __init board_jscc9p9360_init_machine(void);
diff --git a/arch/arm/mach-ns9xxx/clock.c b/arch/arm/mach-ns9xxx/clock.c
deleted file mode 100644
index cf81cbc57544..000000000000
--- a/arch/arm/mach-ns9xxx/clock.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/clock.c
- *
- * Copyright (C) 2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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/err.h>
-#include <linux/module.h>
-#include <linux/list.h>
-#include <linux/clk.h>
-#include <linux/string.h>
-#include <linux/platform_device.h>
-#include <linux/semaphore.h>
-
-#include "clock.h"
-
-static LIST_HEAD(clocks);
-static DEFINE_SPINLOCK(clk_lock);
-
-struct clk *clk_get(struct device *dev, const char *id)
-{
-        struct clk *p, *ret = NULL, *retgen = NULL;
-        unsigned long flags;
-        int idno;
-
-        if (dev == NULL || dev->bus != &platform_bus_type)
-                idno = -1;
-        else
-                idno = to_platform_device(dev)->id;
-
-        spin_lock_irqsave(&clk_lock, flags);
-        list_for_each_entry(p, &clocks, node) {
-                if (strcmp(id, p->name) == 0) {
-                        if (p->id == idno) {
-                                if (!try_module_get(p->owner))
-                                        continue;
-                                ret = p;
-                                break;
-                        } else if (p->id == -1)
-                                /* remember match with id == -1 in case there is
-                                 * no clock for idno */
-                                retgen = p;
-                }
-        }
-
-        if (!ret && retgen && try_module_get(retgen->owner))
-                ret = retgen;
-
-        if (ret)
-                ++ret->refcount;
-
-        spin_unlock_irqrestore(&clk_lock, flags);
-
-        return ret ? ret : ERR_PTR(-ENOENT);
-}
-EXPORT_SYMBOL(clk_get);
-
-void clk_put(struct clk *clk)
-{
-        module_put(clk->owner);
-        --clk->refcount;
-}
-EXPORT_SYMBOL(clk_put);
-
-static int clk_enable_unlocked(struct clk *clk)
-{
-        int ret = 0;
-        if (clk->parent) {
-                ret = clk_enable_unlocked(clk->parent);
-                if (ret)
-                        return ret;
-        }
-
-        if (clk->usage++ == 0 && clk->endisable)
-                ret = clk->endisable(clk, 1);
-
-        return ret;
-}
-
-int clk_enable(struct clk *clk)
-{
-        int ret;
-        unsigned long flags;
-
-        spin_lock_irqsave(&clk_lock, flags);
-
-        ret = clk_enable_unlocked(clk);
-
-        spin_unlock_irqrestore(&clk_lock, flags);
-
-        return ret;
-}
-EXPORT_SYMBOL(clk_enable);
-
-static void clk_disable_unlocked(struct clk *clk)
-{
-        if (--clk->usage == 0 && clk->endisable)
-                clk->endisable(clk, 0);
-
-        if (clk->parent)
-                clk_disable_unlocked(clk->parent);
-}
-
-void clk_disable(struct clk *clk)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&clk_lock, flags);
-
-        clk_disable_unlocked(clk);
-
-        spin_unlock_irqrestore(&clk_lock, flags);
-}
-EXPORT_SYMBOL(clk_disable);
-
-unsigned long clk_get_rate(struct clk *clk)
-{
-        if (clk->get_rate)
-                return clk->get_rate(clk);
-
-        if (clk->rate)
-                return clk->rate;
-
-        if (clk->parent)
-                return clk_get_rate(clk->parent);
-
-        return 0;
-}
-EXPORT_SYMBOL(clk_get_rate);
-
-int clk_register(struct clk *clk)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&clk_lock, flags);
-
-        list_add(&clk->node, &clocks);
-
-        if (clk->parent)
-                ++clk->parent->refcount;
-
-        spin_unlock_irqrestore(&clk_lock, flags);
-
-        return 0;
-}
-
-int clk_unregister(struct clk *clk)
-{
-        int ret = 0;
-        unsigned long flags;
-
-        spin_lock_irqsave(&clk_lock, flags);
-
-        if (clk->usage || clk->refcount)
-                ret = -EBUSY;
-        else
-                list_del(&clk->node);
-
-        if (clk->parent)
-                --clk->parent->refcount;
-
-        spin_unlock_irqrestore(&clk_lock, flags);
-
-        return ret;
-}
-
-#if defined CONFIG_DEBUG_FS
-
-#include <linux/debugfs.h>
-#include <linux/seq_file.h>
-
-static int clk_debugfs_show(struct seq_file *s, void *null)
-{
-        unsigned long flags;
-        struct clk *p;
-
-        spin_lock_irqsave(&clk_lock, flags);
-
-        list_for_each_entry(p, &clocks, node)
-                seq_printf(s, "%s.%d: usage=%lu refcount=%lu rate=%lu\n",
-                                p->name, p->id, p->usage, p->refcount,
-                                p->usage ? clk_get_rate(p) : 0);
-
-        spin_unlock_irqrestore(&clk_lock, flags);
-
-        return 0;
-}
-
-static int clk_debugfs_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, clk_debugfs_show, NULL);
-}
-
-static const struct file_operations clk_debugfs_operations = {
-        .open = clk_debugfs_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
-static int __init clk_debugfs_init(void)
-{
-        struct dentry *dentry;
-
-        dentry = debugfs_create_file("clk", S_IFREG | S_IRUGO, NULL, NULL,
-                        &clk_debugfs_operations);
-        return IS_ERR(dentry) ? PTR_ERR(dentry) : 0;
-}
-subsys_initcall(clk_debugfs_init);
-
-#endif /* if defined CONFIG_DEBUG_FS */
diff --git a/arch/arm/mach-ns9xxx/clock.h b/arch/arm/mach-ns9xxx/clock.h
deleted file mode 100644
index b86c30dd79eb..000000000000
--- a/arch/arm/mach-ns9xxx/clock.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/clock.h
- *
- * Copyright (C) 2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __NS9XXX_CLOCK_H
-#define __NS9XXX_CLOCK_H
-
-#include <linux/list.h>
-
-struct clk {
-        struct module *owner;
-        const char *name;
-        int id;
-
-        struct clk *parent;
-
-        unsigned long rate;
-        int (*endisable)(struct clk *, int enable);
-        unsigned long (*get_rate)(struct clk *);
-
-        struct list_head node;
-        unsigned long refcount;
-        unsigned long usage;
-};
-
-int clk_register(struct clk *clk);
-int clk_unregister(struct clk *clk);
-
-#endif /* ifndef __NS9XXX_CLOCK_H */
diff --git a/arch/arm/mach-ns9xxx/generic.c b/arch/arm/mach-ns9xxx/generic.c
deleted file mode 100644
index 1e0f467879cc..000000000000
--- a/arch/arm/mach-ns9xxx/generic.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/generic.c
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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/kernel.h>
-#include <linux/init.h>
-#include <asm/memory.h>
-
-#include "generic.h"
-
-void __init ns9xxx_init_machine(void)
-{
-}
diff --git a/arch/arm/mach-ns9xxx/generic.h b/arch/arm/mach-ns9xxx/generic.h
deleted file mode 100644
index 82493191aad6..000000000000
--- a/arch/arm/mach-ns9xxx/generic.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/generic.h
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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/time.h>
-#include <asm/mach/time.h>
-#include <linux/init.h>
-
-void __init ns9xxx_init_irq(void);
-void __init ns9xxx_init_machine(void);
diff --git a/arch/arm/mach-ns9xxx/gpio-ns9360.c b/arch/arm/mach-ns9xxx/gpio-ns9360.c
deleted file mode 100644
index 377330c1b250..000000000000
--- a/arch/arm/mach-ns9xxx/gpio-ns9360.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/gpio-ns9360.c
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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/bug.h>
-#include <linux/errno.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-
-#include <mach/regs-bbu.h>
-#include <mach/processor-ns9360.h>
-
-#include "gpio-ns9360.h"
-
-static inline int ns9360_valid_gpio(unsigned gpio)
-{
-        return gpio <= 72;
-}
-
-static inline void __iomem *ns9360_gpio_get_gconfaddr(unsigned gpio)
-{
-        if (gpio < 56)
-                return BBU_GCONFb1(gpio / 8);
-        else
-                /*
-                 * this could be optimised away on
-                 * ns9750 only builds, but it isn't ...
-                 */
-                return BBU_GCONFb2((gpio - 56) / 8);
-}
-
-static inline void __iomem *ns9360_gpio_get_gctrladdr(unsigned gpio)
-{
-        if (gpio < 32)
-                return BBU_GCTRL1;
-        else if (gpio < 64)
-                return BBU_GCTRL2;
-        else
-                /* this could be optimised away on ns9750 only builds */
-                return BBU_GCTRL3;
-}
-
-static inline void __iomem *ns9360_gpio_get_gstataddr(unsigned gpio)
-{
-        if (gpio < 32)
-                return BBU_GSTAT1;
-        else if (gpio < 64)
-                return BBU_GSTAT2;
-        else
-                /* this could be optimised away on ns9750 only builds */
-                return BBU_GSTAT3;
-}
-
-/*
- * each gpio can serve for 4 different purposes [0..3].  These are called
- * "functions" and passed in the parameter func.  Functions 0-2 are always some
- * special things, function 3 is GPIO.  If func == 3 dir specifies input or
- * output, and with inv you can enable an inverter (independent of func).
- */
-int __ns9360_gpio_configure(unsigned gpio, int dir, int inv, int func)
-{
-        void __iomem *conf = ns9360_gpio_get_gconfaddr(gpio);
-        u32 confval;
-
-        confval = __raw_readl(conf);
-        REGSETIM_IDX(confval, BBU_GCONFx, DIR, gpio & 7, dir);
-        REGSETIM_IDX(confval, BBU_GCONFx, INV, gpio & 7, inv);
-        REGSETIM_IDX(confval, BBU_GCONFx, FUNC, gpio & 7, func);
-        __raw_writel(confval, conf);
-
-        return 0;
-}
-
-int ns9360_gpio_configure(unsigned gpio, int inv, int func)
-{
-        if (likely(ns9360_valid_gpio(gpio))) {
-                if (func == 3) {
-                        printk(KERN_WARNING "use gpio_direction_input "
-                                        "or gpio_direction_output\n");
-                        return -EINVAL;
-                } else
-                        return __ns9360_gpio_configure(gpio, 0, inv, func);
-        } else
-                return -EINVAL;
-}
-EXPORT_SYMBOL(ns9360_gpio_configure);
-
-int ns9360_gpio_get_value(unsigned gpio)
-{
-        void __iomem *stat = ns9360_gpio_get_gstataddr(gpio);
-        int ret;
-
-        ret = 1 & (__raw_readl(stat) >> (gpio & 31));
-
-        return ret;
-}
-
-void ns9360_gpio_set_value(unsigned gpio, int value)
-{
-        void __iomem *ctrl = ns9360_gpio_get_gctrladdr(gpio);
-        u32 ctrlval;
-
-        ctrlval = __raw_readl(ctrl);
-
-        if (value)
-                ctrlval |= 1 << (gpio & 31);
-        else
-                ctrlval &= ~(1 << (gpio & 31));
-
-        __raw_writel(ctrlval, ctrl);
-}
diff --git a/arch/arm/mach-ns9xxx/gpio-ns9360.h b/arch/arm/mach-ns9xxx/gpio-ns9360.h
deleted file mode 100644
index 131cd1715caa..000000000000
--- a/arch/arm/mach-ns9xxx/gpio-ns9360.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/gpio-ns9360.h
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-int __ns9360_gpio_configure(unsigned gpio, int dir, int inv, int func);
-int ns9360_gpio_get_value(unsigned gpio);
-void ns9360_gpio_set_value(unsigned gpio, int value);
diff --git a/arch/arm/mach-ns9xxx/gpio.c b/arch/arm/mach-ns9xxx/gpio.c
deleted file mode 100644
index 5503ca09c4ae..000000000000
--- a/arch/arm/mach-ns9xxx/gpio.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/gpio.c
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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/kernel.h>
-#include <linux/compiler.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/module.h>
-#include <linux/bitops.h>
-
-#include <mach/gpio.h>
-#include <mach/processor.h>
-#include <mach/processor-ns9360.h>
-#include <asm/bug.h>
-#include <asm/types.h>
-
-#include "gpio-ns9360.h"
-
-#if defined(CONFIG_PROCESSOR_NS9360)
-#define GPIO_MAX 72
-#elif defined(CONFIG_PROCESSOR_NS9750)
-#define GPIO_MAX 49
-#endif
-
-/* protects BBU_GCONFx and BBU_GCTRLx */
-static spinlock_t gpio_lock = __SPIN_LOCK_UNLOCKED(gpio_lock);
-
-/* only access gpiores with atomic ops */
-static DECLARE_BITMAP(gpiores, GPIO_MAX + 1);
-
-static inline int ns9xxx_valid_gpio(unsigned gpio)
-{
-#if defined(CONFIG_PROCESSOR_NS9360)
-        if (processor_is_ns9360())
-                return gpio <= 72;
-        else
-#endif
-#if defined(CONFIG_PROCESSOR_NS9750)
-        if (processor_is_ns9750())
-                return gpio <= 49;
-        else
-#endif
-        {
-                BUG();
-                return 0;
-        }
-}
-
-int gpio_request(unsigned gpio, const char *label)
-{
-        if (likely(ns9xxx_valid_gpio(gpio)))
-                return test_and_set_bit(gpio, gpiores) ? -EBUSY : 0;
-        else
-                return -EINVAL;
-}
-EXPORT_SYMBOL(gpio_request);
-
-void gpio_free(unsigned gpio)
-{
-        might_sleep();
-        clear_bit(gpio, gpiores);
-        return;
-}
-EXPORT_SYMBOL(gpio_free);
-
-int gpio_direction_input(unsigned gpio)
-{
-        if (likely(ns9xxx_valid_gpio(gpio))) {
-                int ret = -EINVAL;
-                unsigned long flags;
-
-                spin_lock_irqsave(&gpio_lock, flags);
-#if defined(CONFIG_PROCESSOR_NS9360)
-                if (processor_is_ns9360())
-                        ret = __ns9360_gpio_configure(gpio, 0, 0, 3);
-                else
-#endif
-                        BUG();
-
-                spin_unlock_irqrestore(&gpio_lock, flags);
-
-                return ret;
-
-        } else
-                return -EINVAL;
-}
-EXPORT_SYMBOL(gpio_direction_input);
-
-int gpio_direction_output(unsigned gpio, int value)
-{
-        if (likely(ns9xxx_valid_gpio(gpio))) {
-                int ret = -EINVAL;
-                unsigned long flags;
-
-                gpio_set_value(gpio, value);
-
-                spin_lock_irqsave(&gpio_lock, flags);
-#if defined(CONFIG_PROCESSOR_NS9360)
-                if (processor_is_ns9360())
-                        ret = __ns9360_gpio_configure(gpio, 1, 0, 3);
-                else
-#endif
-                        BUG();
-
-                spin_unlock_irqrestore(&gpio_lock, flags);
-
-                return ret;
-        } else
-                return -EINVAL;
-}
-EXPORT_SYMBOL(gpio_direction_output);
-
-int gpio_get_value(unsigned gpio)
-{
-#if defined(CONFIG_PROCESSOR_NS9360)
-        if (processor_is_ns9360())
-                return ns9360_gpio_get_value(gpio);
-        else
-#endif
-        {
-                BUG();
-                return -EINVAL;
-        }
-}
-EXPORT_SYMBOL(gpio_get_value);
-
-void gpio_set_value(unsigned gpio, int value)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&gpio_lock, flags);
-#if defined(CONFIG_PROCESSOR_NS9360)
-        if (processor_is_ns9360())
-                ns9360_gpio_set_value(gpio, value);
-        else
-#endif
-                BUG();
-
-        spin_unlock_irqrestore(&gpio_lock, flags);
-}
-EXPORT_SYMBOL(gpio_set_value);
diff --git a/arch/arm/mach-ns9xxx/include/mach/board.h b/arch/arm/mach-ns9xxx/include/mach/board.h
deleted file mode 100644
index 19ca6de46a45..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/board.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/board.h
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_BOARD_H
-#define __ASM_ARCH_BOARD_H
-
-#include <asm/mach-types.h>
-
-#define board_is_a9m9750dev()   (0                      \
-                || machine_is_cc9p9750dev()             \
-                )
-
-#define board_is_a9mvali()      (0                      \
-                || machine_is_cc9p9750val()             \
-                )
-
-#define board_is_jscc9p9210()   (0                      \
-                || machine_is_cc9p9210js()              \
-                )
-
-#define board_is_jscc9p9215()   (0                      \
-                || machine_is_cc9p9215js()              \
-                )
-
-#define board_is_jscc9p9360()   (0                      \
-                || machine_is_cc9p9360js()              \
-                )
-
-#define board_is_uncbas()       (0                      \
-                || machine_is_cc7ucamry()               \
-                )
-
-#endif /* ifndef __ASM_ARCH_BOARD_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/debug-macro.S b/arch/arm/mach-ns9xxx/include/mach/debug-macro.S
deleted file mode 100644
index 5a2acbdc3d67..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/debug-macro.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/debug-macro.S
- * Copyright (C) 2006 by Digi International Inc.
- * All rights reserved.
- *
- * 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 <mach/hardware.h>
-#include <asm/memory.h>
-
-#include <mach/regs-board-a9m9750dev.h>
-
-                .macro  addruart, rp, rv
-                ldr     \rp, =NS9XXX_CSxSTAT_PHYS(0)
-                ldr     \rv, =io_p2v(NS9XXX_CSxSTAT_PHYS(0))
-                .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-ns9xxx/include/mach/entry-macro.S b/arch/arm/mach-ns9xxx/include/mach/entry-macro.S
deleted file mode 100644
index 71ca0319b547..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/entry-macro.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/entry-macro.S
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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 <mach/hardware.h>
-#include <mach/regs-sys-common.h>
-
-                .macro  get_irqnr_preamble, base, tmp
-                ldr     \base, =SYS_ISRADDR
-                .endm
-
-                .macro  arch_ret_to_user, tmp1, tmp2
-                .endm
-
-                .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-                ldr     \irqstat, [\base, #(SYS_ISA - SYS_ISRADDR)]
-                cmp     \irqstat, #0
-                ldrne   \irqnr, [\base]
-                .endm
-
-                .macro  disable_fiq
-                .endm
diff --git a/arch/arm/mach-ns9xxx/include/mach/gpio.h b/arch/arm/mach-ns9xxx/include/mach/gpio.h
deleted file mode 100644
index 5eb349032579..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/gpio.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/gpio.h
- *
- * Copyright (C) 2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
-*/
-#ifndef __ASM_ARCH_GPIO_H
-#define __ASM_ARCH_GPIO_H
-
-#include <asm/errno.h>
-
-int gpio_request(unsigned gpio, const char *label);
-
-void gpio_free(unsigned gpio);
-
-int ns9xxx_gpio_configure(unsigned gpio, int inv, int func);
-
-int gpio_direction_input(unsigned gpio);
-
-int gpio_direction_output(unsigned gpio, int value);
-
-int gpio_get_value(unsigned gpio);
-
-void gpio_set_value(unsigned gpio, int value);
-
-/*
- * ns9xxx can use gpio pins to trigger an irq, but it's not generic
- * enough to be supported by the gpio_to_irq/irq_to_gpio interface
- */
-static inline int gpio_to_irq(unsigned gpio)
-{
-        return -EINVAL;
-}
-
-static inline int irq_to_gpio(unsigned irq)
-{
-        return -EINVAL;
-}
-
-/* get the cansleep() stubs */
-#include <asm-generic/gpio.h>
-
-#endif /* ifndef __ASM_ARCH_GPIO_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/hardware.h b/arch/arm/mach-ns9xxx/include/mach/hardware.h
deleted file mode 100644
index 76631128e11c..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/hardware.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/hardware.h
- *
- * Copyright (C) 2006 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H
-
-/*
- * NetSilicon NS9xxx internal mapping:
- *
- * physical                <--> virtual
- * 0x90000000 - 0x906fffff <--> 0xf9000000 - 0xf96fffff
- * 0xa0100000 - 0xa0afffff <--> 0xfa100000 - 0xfaafffff
- */
-#define io_p2v(x)       (0xf0000000 \
-                         + (((x) & 0xf0000000) >> 4) \
-                         + ((x) & 0x00ffffff))
-
-#define io_v2p(x)       ((((x) & 0x0f000000) << 4) \
-                         + ((x) & 0x00ffffff))
-
-#define __REGSHIFT(mask)        ((mask) & (-(mask)))
-
-#define __REGBIT(bit)           ((u32)1 << (bit))
-#define __REGBITS(hbit, lbit)   ((((u32)1 << ((hbit) - (lbit) + 1)) - 1) << (lbit))
-#define __REGVAL(mask, value)   (((value) * __REGSHIFT(mask)) & (mask))
-
-#ifndef __ASSEMBLY__
-
-#  define __REG(x)      ((void __iomem __force *)io_p2v((x)))
-#  define __REG2(x, y)  ((void __iomem __force *)(io_p2v((x)) + 4 * (y)))
-
-#  define __REGSET(var, field, value)                                   \
-        ((var) = (((var) & ~((field) & ~(value))) | (value)))
-
-#  define REGSET(var, reg, field, value)                                \
-        __REGSET(var, reg ## _ ## field, reg ## _ ## field ## _ ## value)
-
-#  define REGSET_IDX(var, reg, field, idx, value)                       \
-        __REGSET(var, reg ## _ ## field((idx)), reg ## _ ## field ## _ ## value((idx)))
-
-#  define REGSETIM(var, reg, field, value)                              \
-        __REGSET(var, reg ## _ ## field, __REGVAL(reg ## _ ## field, (value)))
-
-#  define REGSETIM_IDX(var, reg, field, idx, value)                     \
-        __REGSET(var, reg ## _ ## field((idx)), __REGVAL(reg ## _ ## field((idx)), (value)))
-
-#  define __REGGET(var, field)                                          \
-        (((var) & (field)))
-
-#  define REGGET(var, reg, field)                                       \
-         __REGGET(var, reg ## _ ## field)
-
-#  define REGGET_IDX(var, reg, field, idx)                              \
-         __REGGET(var, reg ## _ ## field((idx)))
-
-#  define REGGETIM(var, reg, field)                                     \
-         __REGGET(var, reg ## _ ## field) / __REGSHIFT(reg ## _ ## field)
-
-#  define REGGETIM_IDX(var, reg, field, idx)                            \
-         __REGGET(var, reg ## _ ## field((idx))) /                      \
-         __REGSHIFT(reg ## _ ## field((idx)))
-
-#else
-
-#  define __REG(x)      io_p2v(x)
-#  define __REG2(x, y)  io_p2v((x) + 4 * (y))
-
-#endif
-
-#endif /* ifndef __ASM_ARCH_HARDWARE_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/io.h b/arch/arm/mach-ns9xxx/include/mach/io.h
deleted file mode 100644
index f08451d2e1bc..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/io.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/io.h
- *
- * Copyright (C) 2006 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_IO_H
-#define __ASM_ARCH_IO_H
-
-#define IO_SPACE_LIMIT  0xffffffff /* XXX */
-
-#define __io(a)         __typesafe_io(a)
-#define __mem_pci(a)    (a)
-#define __mem_isa(a)    (IO_BASE + (a))
-
-#endif /* ifndef __ASM_ARCH_IO_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/irqs.h b/arch/arm/mach-ns9xxx/include/mach/irqs.h
deleted file mode 100644
index 13483949e210..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/irqs.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/irqs.h
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_IRQS_H
-#define __ASM_ARCH_IRQS_H
-
-/* NetSilicon 9360 */
-#define IRQ_NS9XXX_WATCHDOG     0
-#define IRQ_NS9XXX_AHBBUSERR    1
-#define IRQ_NS9360_BBUSAGG      2
-/* irq 3 is reserved for NS9360 */
-#define IRQ_NS9XXX_ETHRX        4
-#define IRQ_NS9XXX_ETHTX        5
-#define IRQ_NS9XXX_ETHPHY       6
-#define IRQ_NS9360_LCD          7
-#define IRQ_NS9360_SERBRX       8
-#define IRQ_NS9360_SERBTX       9
-#define IRQ_NS9360_SERARX       10
-#define IRQ_NS9360_SERATX       11
-#define IRQ_NS9360_SERCRX       12
-#define IRQ_NS9360_SERCTX       13
-#define IRQ_NS9360_I2C          14
-#define IRQ_NS9360_BBUSDMA      15
-#define IRQ_NS9360_TIMER0       16
-#define IRQ_NS9360_TIMER1       17
-#define IRQ_NS9360_TIMER2       18
-#define IRQ_NS9360_TIMER3       19
-#define IRQ_NS9360_TIMER4       20
-#define IRQ_NS9360_TIMER5       21
-#define IRQ_NS9360_TIMER6       22
-#define IRQ_NS9360_TIMER7       23
-#define IRQ_NS9360_RTC          24
-#define IRQ_NS9360_USBHOST      25
-#define IRQ_NS9360_USBDEVICE    26
-#define IRQ_NS9360_IEEE1284     27
-#define IRQ_NS9XXX_EXT0         28
-#define IRQ_NS9XXX_EXT1         29
-#define IRQ_NS9XXX_EXT2         30
-#define IRQ_NS9XXX_EXT3         31
-
-#define BBUS_IRQ(irq)   (32 + irq)
-
-#define IRQ_BBUS_DMA            BBUS_IRQ(0)
-#define IRQ_BBUS_SERBRX         BBUS_IRQ(2)
-#define IRQ_BBUS_SERBTX         BBUS_IRQ(3)
-#define IRQ_BBUS_SERARX         BBUS_IRQ(4)
-#define IRQ_BBUS_SERATX         BBUS_IRQ(5)
-#define IRQ_BBUS_SERCRX         BBUS_IRQ(6)
-#define IRQ_BBUS_SERCTX         BBUS_IRQ(7)
-#define IRQ_BBUS_SERDRX         BBUS_IRQ(8)
-#define IRQ_BBUS_SERDTX         BBUS_IRQ(9)
-#define IRQ_BBUS_I2C            BBUS_IRQ(10)
-#define IRQ_BBUS_1284           BBUS_IRQ(11)
-#define IRQ_BBUS_UTIL           BBUS_IRQ(12)
-#define IRQ_BBUS_RTC            BBUS_IRQ(13)
-#define IRQ_BBUS_USBHST         BBUS_IRQ(14)
-#define IRQ_BBUS_USBDEV         BBUS_IRQ(15)
-#define IRQ_BBUS_AHBDMA1        BBUS_IRQ(24)
-#define IRQ_BBUS_AHBDMA2        BBUS_IRQ(25)
-
-/*
- * these Interrupts are specific for the a9m9750dev board.
- * They are generated by an FPGA that interrupts the CPU on
- * IRQ_NS9360_EXT2
- */
-#define FPGA_IRQ(irq)   (64 + irq)
-
-#define IRQ_FPGA_UARTA          FPGA_IRQ(0)
-#define IRQ_FPGA_UARTB          FPGA_IRQ(1)
-#define IRQ_FPGA_UARTC          FPGA_IRQ(2)
-#define IRQ_FPGA_UARTD          FPGA_IRQ(3)
-#define IRQ_FPGA_TOUCH          FPGA_IRQ(4)
-#define IRQ_FPGA_CF             FPGA_IRQ(5)
-#define IRQ_FPGA_CAN0           FPGA_IRQ(6)
-#define IRQ_FPGA_CAN1           FPGA_IRQ(7)
-
-#define NR_IRQS 72
-
-#endif /* __ASM_ARCH_IRQS_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/memory.h b/arch/arm/mach-ns9xxx/include/mach/memory.h
deleted file mode 100644
index 5c65aee6e7a9..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/memory.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/memory.h
- *
- * Copyright (C) 2006 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
-*/
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-/* x in [0..3] */
-#define NS9XXX_CSxSTAT_PHYS(x)  UL(((x) + 4) << 28)
-
-#define NS9XXX_CS0STAT_LENGTH   UL(0x1000)
-#define NS9XXX_CS1STAT_LENGTH   UL(0x1000)
-#define NS9XXX_CS2STAT_LENGTH   UL(0x1000)
-#define NS9XXX_CS3STAT_LENGTH   UL(0x1000)
-
-#define PLAT_PHYS_OFFSET        UL(0x00000000)
-
-#endif
diff --git a/arch/arm/mach-ns9xxx/include/mach/module.h b/arch/arm/mach-ns9xxx/include/mach/module.h
deleted file mode 100644
index 628e9752589b..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/module.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/module.h
- *
- * Copyright (C) 2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_MODULE_H
-#define __ASM_ARCH_MODULE_H
-
-#include <asm/mach-types.h>
-
-#define module_is_cc7ucamry()   (0                      \
-                || machine_is_cc7ucamry()               \
-                )
-
-#define module_is_cc9c()        (0                      \
-                )
-
-#define module_is_cc9p9210()    (0                      \
-                || machine_is_cc9p9210()                \
-                || machine_is_cc9p9210js()              \
-                )
-
-#define module_is_cc9p9215()    (0                      \
-                || machine_is_cc9p9215()                \
-                || machine_is_cc9p9215js()              \
-                )
-
-#define module_is_cc9p9360()    (0                      \
-                || machine_is_cc9p9360dev()             \
-                || machine_is_cc9p9360js()              \
-                )
-
-#define module_is_cc9p9750()    (0                      \
-                || machine_is_a9m9750()                 \
-                || machine_is_cc9p9750js()              \
-                || machine_is_cc9p9750val()             \
-                )
-
-#define module_is_ccw9c()       (0                      \
-                )
-
-#define module_is_inc20otter()  (0                      \
-                || machine_is_inc20otter()              \
-                )
-
-#define module_is_otter()       (0                      \
-                || machine_is_otter()                   \
-                )
-
-#endif /* ifndef __ASM_ARCH_MODULE_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h b/arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h
deleted file mode 100644
index f41deda5129e..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h
- *
- * Copyright (C) 2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_PROCESSORNS9360_H
-#define __ASM_ARCH_PROCESSORNS9360_H
-
-#include <linux/init.h>
-
-void ns9360_reset(char mode);
-
-unsigned long ns9360_systemclock(void) __attribute__((const));
-
-static inline unsigned long ns9360_cpuclock(void) __attribute__((const));
-static inline unsigned long ns9360_cpuclock(void)
-{
-        return ns9360_systemclock() / 2;
-}
-
-void __init ns9360_map_io(void);
-
-extern struct sys_timer ns9360_timer;
-
-int ns9360_gpio_configure(unsigned gpio, int inv, int func);
-
-#endif /* ifndef __ASM_ARCH_PROCESSORNS9360_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/processor.h b/arch/arm/mach-ns9xxx/include/mach/processor.h
deleted file mode 100644
index 9f77f746a386..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/processor.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/processor.h
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_PROCESSOR_H
-#define __ASM_ARCH_PROCESSOR_H
-
-#include <mach/module.h>
-
-#define processor_is_ns9210()   (0                      \
-                || module_is_cc7ucamry()                \
-                || module_is_cc9p9210()                 \
-                || module_is_inc20otter()               \
-                || module_is_otter()                    \
-                )
-
-#define processor_is_ns9215()   (0                      \
-                || module_is_cc9p9215()                 \
-                )
-
-#define processor_is_ns9360()   (0                      \
-                || module_is_cc9p9360()                 \
-                || module_is_cc9c()                     \
-                || module_is_ccw9c()                    \
-                )
-
-#define processor_is_ns9750()   (0                      \
-                || module_is_cc9p9750()                 \
-                )
-
-#define processor_is_ns921x()   (0                      \
-                || processor_is_ns9210()                \
-                || processor_is_ns9215()                \
-                )
-
-#endif /* ifndef __ASM_ARCH_PROCESSOR_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/regs-bbu.h b/arch/arm/mach-ns9xxx/include/mach/regs-bbu.h
deleted file mode 100644
index af227c058fb9..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/regs-bbu.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/regs-bbu.h
- *
- * Copyright (C) 2006 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_REGSBBU_H
-#define __ASM_ARCH_REGSBBU_H
-
-#include <mach/hardware.h>
-
-/* BBus Utility */
-
-/* GPIO Configuration Registers block 1 */
-/* NOTE: the HRM starts counting at 1 for the GPIO registers, here the start is
- * at 0 for each block.  That is, BBU_GCONFb1(0) is GPIO Configuration Register
- * #1, BBU_GCONFb2(0) is GPIO Configuration Register #8. */
-#define BBU_GCONFb1(x)  __REG2(0x90600010, (x))
-#define BBU_GCONFb2(x)  __REG2(0x90600100, (x))
-
-#define BBU_GCONFx_DIR(m)       __REGBIT(3 + (((m) & 7) << 2))
-#define BBU_GCONFx_DIR_INPUT(m) __REGVAL(BBU_GCONFx_DIR(m), 0)
-#define BBU_GCONFx_DIR_OUTPUT(m)        __REGVAL(BBU_GCONFx_DIR(m), 1)
-#define BBU_GCONFx_INV(m)       __REGBIT(2 + (((m) & 7) << 2))
-#define BBU_GCONFx_INV_NO(m)            __REGVAL(BBU_GCONFx_INV(m), 0)
-#define BBU_GCONFx_INV_YES(m)           __REGVAL(BBU_GCONFx_INV(m), 1)
-#define BBU_GCONFx_FUNC(m)      __REGBITS(1 + (((m) & 7) << 2), ((m) & 7) << 2)
-#define BBU_GCONFx_FUNC_0(m)            __REGVAL(BBU_GCONFx_FUNC(m), 0)
-#define BBU_GCONFx_FUNC_1(m)            __REGVAL(BBU_GCONFx_FUNC(m), 1)
-#define BBU_GCONFx_FUNC_2(m)            __REGVAL(BBU_GCONFx_FUNC(m), 2)
-#define BBU_GCONFx_FUNC_3(m)            __REGVAL(BBU_GCONFx_FUNC(m), 3)
-
-#define BBU_GCTRL1      __REG(0x90600030)
-#define BBU_GCTRL2      __REG(0x90600034)
-#define BBU_GCTRL3      __REG(0x90600120)
-
-#define BBU_GSTAT1      __REG(0x90600040)
-#define BBU_GSTAT2      __REG(0x90600044)
-#define BBU_GSTAT3      __REG(0x90600130)
-
-#endif /* ifndef __ASM_ARCH_REGSBBU_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h b/arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h
deleted file mode 100644
index cd1593693f56..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h
- *
- * Copyright (C) 2006 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_REGSBOARDA9M9750_H
-#define __ASM_ARCH_REGSBOARDA9M9750_H
-
-#include <mach/hardware.h>
-
-#define FPGA_UARTA_BASE io_p2v(NS9XXX_CSxSTAT_PHYS(0))
-#define FPGA_UARTB_BASE io_p2v(NS9XXX_CSxSTAT_PHYS(0) + 0x08)
-#define FPGA_UARTC_BASE io_p2v(NS9XXX_CSxSTAT_PHYS(0) + 0x10)
-#define FPGA_UARTD_BASE io_p2v(NS9XXX_CSxSTAT_PHYS(0) + 0x18)
-
-#define FPGA_IER        __REG(NS9XXX_CSxSTAT_PHYS(0) + 0x50)
-#define FPGA_ISR        __REG(NS9XXX_CSxSTAT_PHYS(0) + 0x60)
-
-#endif /* ifndef __ASM_ARCH_REGSBOARDA9M9750_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/regs-mem.h b/arch/arm/mach-ns9xxx/include/mach/regs-mem.h
deleted file mode 100644
index f1625bf8cdce..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/regs-mem.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/regs-mem.h
- *
- * Copyright (C) 2006 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_REGSMEM_H
-#define __ASM_ARCH_REGSMEM_H
-
-#include <mach/hardware.h>
-
-/* Memory Module */
-
-/* Control register */
-#define MEM_CTRL        __REG(0xa0700000)
-
-/* Status register */
-#define MEM_STAT        __REG(0xa0700004)
-
-/* Configuration register */
-#define MEM_CONF        __REG(0xa0700008)
-
-/* Dynamic Memory Control register */
-#define MEM_DMCTRL      __REG(0xa0700020)
-
-/* Dynamic Memory Refresh Timer */
-#define MEM_DMRT        __REG(0xa0700024)
-
-/* Dynamic Memory Read Configuration register */
-#define MEM_DMRC        __REG(0xa0700028)
-
-/* Dynamic Memory Precharge Command Period (tRP) */
-#define MEM_DMPCP       __REG(0xa0700030)
-
-/* Dynamic Memory Active to Precharge Command Period (tRAS) */
-#define MEM_DMAPCP      __REG(0xa0700034)
-
-/* Dynamic Memory Self-Refresh Exit Time (tSREX) */
-#define MEM_DMSRET      __REG(0xa0700038)
-
-/* Dynamic Memory Last Data Out to Active Time (tAPR) */
-#define MEM_DMLDOAT     __REG(0xa070003c)
-
-/* Dynamic Memory Data-in to Active Command Time (tDAL or TAPW) */
-#define MEM_DMDIACT     __REG(0xa0700040)
-
-/* Dynamic Memory Write Recovery Time (tWR, tDPL, tRWL, tRDL) */
-#define MEM_DMWRT       __REG(0xa0700044)
-
-/* Dynamic Memory Active to Active Command Period (tRC) */
-#define MEM_DMAACP      __REG(0xa0700048)
-
-/* Dynamic Memory Auto Refresh Period, and Auto Refresh to Active Command Period (tRFC) */
-#define MEM_DMARP       __REG(0xa070004c)
-
-/* Dynamic Memory Exit Self-Refresh to Active Command (tXSR) */
-#define MEM_DMESRAC     __REG(0xa0700050)
-
-/* Dynamic Memory Active Bank A to Active B Time (tRRD) */
-#define MEM_DMABAABT    __REG(0xa0700054)
-
-/* Dynamic Memory Load Mode register to Active Command Time (tMRD) */
-#define MEM_DMLMACT     __REG(0xa0700058)
-
-/* Static Memory Extended Wait */
-#define MEM_SMEW        __REG(0xa0700080)
-
-/* Dynamic Memory Configuration Register x */
-#define MEM_DMCONF(x)   __REG2(0xa0700100, (x) << 3)
-
-/* Dynamic Memory RAS and CAS Delay x */
-#define MEM_DMRCD(x)    __REG2(0xa0700104, (x) << 3)
-
-/* Static Memory Configuration Register x */
-#define MEM_SMC(x)      __REG2(0xa0700200, (x) << 3)
-
-/* Static Memory Configuration Register x: Write protect */
-#define MEM_SMC_PSMC            __REGBIT(20)
-#define MEM_SMC_PSMC_OFF                __REGVAL(MEM_SMC_PSMC, 0)
-#define MEM_SMC_PSMC_ON                 __REGVAL(MEM_SMC_PSMC, 1)
-
-/* Static Memory Configuration Register x: Buffer enable */
-#define MEM_SMC_BSMC            __REGBIT(19)
-#define MEM_SMC_BSMC_OFF                __REGVAL(MEM_SMC_BSMC, 0)
-#define MEM_SMC_BSMC_ON                 __REGVAL(MEM_SMC_BSMC, 1)
-
-/* Static Memory Configuration Register x: Extended Wait */
-#define MEM_SMC_EW              __REGBIT(8)
-#define MEM_SMC_EW_OFF                  __REGVAL(MEM_SMC_EW, 0)
-#define MEM_SMC_EW_ON                   __REGVAL(MEM_SMC_EW, 1)
-
-/* Static Memory Configuration Register x: Byte lane state */
-#define MEM_SMC_PB              __REGBIT(7)
-#define MEM_SMC_PB_0                    __REGVAL(MEM_SMC_PB, 0)
-#define MEM_SMC_PB_1                    __REGVAL(MEM_SMC_PB, 1)
-
-/* Static Memory Configuration Register x: Chip select polarity */
-#define MEM_SMC_PC              __REGBIT(6)
-#define MEM_SMC_PC_AL                   __REGVAL(MEM_SMC_PC, 0)
-#define MEM_SMC_PC_AH                   __REGVAL(MEM_SMC_PC, 1)
-
-/* static memory configuration register x: page mode*/
-#define MEM_SMC_PM              __REGBIT(3)
-#define MEM_SMC_PM_DIS                  __REGVAL(MEM_SMC_PM, 0)
-#define MEM_SMC_PM_ASYNC                __REGVAL(MEM_SMC_PM, 1)
-
-/* static memory configuration register x: Memory width */
-#define MEM_SMC_MW              __REGBITS(1, 0)
-#define MEM_SMC_MW_8                    __REGVAL(MEM_SMC_MW, 0)
-#define MEM_SMC_MW_16                   __REGVAL(MEM_SMC_MW, 1)
-#define MEM_SMC_MW_32                   __REGVAL(MEM_SMC_MW, 2)
-
-/* Static Memory Write Enable Delay x */
-#define MEM_SMWED(x)    __REG2(0xa0700204, (x) << 3)
-
-/* Static Memory Output Enable Delay x */
-#define MEM_SMOED(x)    __REG2(0xa0700208, (x) << 3)
-
-/* Static Memory Read Delay x */
-#define MEM_SMRD(x)     __REG2(0xa070020c, (x) << 3)
-
-/* Static Memory Page Mode Read Delay 0 */
-#define MEM_SMPMRD(x)   __REG2(0xa0700210, (x) << 3)
-
-/* Static Memory Write Delay */
-#define MEM_SMWD(x)     __REG2(0xa0700214, (x) << 3)
-
-/* Static Memory Turn Round Delay x */
-#define MEM_SWT(x)      __REG2(0xa0700218, (x) << 3)
-
-#endif /* ifndef __ASM_ARCH_REGSMEM_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h b/arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h
deleted file mode 100644
index 14f91dfd5736..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h
- *
- * Copyright (C) 2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-
-#ifndef __ASM_ARCH_REGSSYSCOMMON_H
-#define __ASM_ARCH_REGSSYSCOMMON_H
-#include <mach/hardware.h>
-
-/* Interrupt Vector Address Register Level x */
-#define SYS_IVA(x)      __REG2(0xa09000c4, (x))
-
-/* Interrupt Configuration registers */
-#define SYS_IC(x)       __REG2(0xa0900144, (x))
-
-/* ISRADDR */
-#define SYS_ISRADDR     __REG(0xa0900164)
-
-/* Interrupt Status Active */
-#define SYS_ISA         __REG(0xa0900168)
-
-/* Interrupt Status Raw */
-#define SYS_ISR         __REG(0xa090016c)
-
-#endif /* ifndef __ASM_ARCH_REGSSYSCOMMON_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h b/arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h
deleted file mode 100644
index 8ff254d9901c..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_REGSSYSNS9360_H
-#define __ASM_ARCH_REGSSYSNS9360_H
-
-#include <mach/hardware.h>
-
-/* System Control Module */
-
-/* AHB Arbiter Gen Configuration */
-#define SYS_AHBAGENCONF __REG(0xa0900000)
-
-/* BRC */
-#define SYS_BRC(x)      __REG2(0xa0900004, (x))
-
-/* Timer x Reload Count register */
-#define SYS_TRC(x)      __REG2(0xa0900044, (x))
-
-/* Timer x Read register */
-#define SYS_TR(x)       __REG2(0xa0900084, (x))
-
-/* Timer Interrupt Status register */
-#define SYS_TIS         __REG(0xa0900170)
-
-/* PLL Configuration register */
-#define SYS_PLL         __REG(0xa0900188)
-
-/* PLL FS status */
-#define SYS_PLL_FS              __REGBITS(24, 23)
-
-/* PLL ND status */
-#define SYS_PLL_ND              __REGBITS(20, 16)
-
-/* PLL Configuration register: PLL SW change */
-#define SYS_PLL_SWC             __REGBIT(15)
-#define SYS_PLL_SWC_NO                  __REGVAL(SYS_PLL_SWC, 0)
-#define SYS_PLL_SWC_YES                 __REGVAL(SYS_PLL_SWC, 1)
-
-/* Timer x Control register */
-#define SYS_TC(x)       __REG2(0xa0900190, (x))
-
-/* Timer x Control register: Timer enable */
-#define SYS_TCx_TEN             __REGBIT(15)
-#define SYS_TCx_TEN_DIS                 __REGVAL(SYS_TCx_TEN, 0)
-#define SYS_TCx_TEN_EN                  __REGVAL(SYS_TCx_TEN, 1)
-
-/* Timer x Control register: CPU debug mode */
-#define SYS_TCx_TDBG            __REGBIT(10)
-#define SYS_TCx_TDBG_CONT               __REGVAL(SYS_TCx_TDBG, 0)
-#define SYS_TCx_TDBG_STOP               __REGVAL(SYS_TCx_TDBG, 1)
-
-/* Timer x Control register: Interrupt clear */
-#define SYS_TCx_INTC            __REGBIT(9)
-#define SYS_TCx_INTC_UNSET              __REGVAL(SYS_TCx_INTC, 0)
-#define SYS_TCx_INTC_SET                __REGVAL(SYS_TCx_INTC, 1)
-
-/* Timer x Control register: Timer clock select */
-#define SYS_TCx_TLCS            __REGBITS(8, 6)
-#define SYS_TCx_TLCS_CPU                __REGVAL(SYS_TCx_TLCS, 0)       /* CPU clock */
-#define SYS_TCx_TLCS_DIV2               __REGVAL(SYS_TCx_TLCS, 1)       /* CPU clock / 2 */
-#define SYS_TCx_TLCS_DIV4               __REGVAL(SYS_TCx_TLCS, 2)       /* CPU clock / 4 */
-#define SYS_TCx_TLCS_DIV8               __REGVAL(SYS_TCx_TLCS, 3)       /* CPU clock / 8 */
-#define SYS_TCx_TLCS_DIV16              __REGVAL(SYS_TCx_TLCS, 4)       /* CPU clock / 16 */
-#define SYS_TCx_TLCS_DIV32              __REGVAL(SYS_TCx_TLCS, 5)       /* CPU clock / 32 */
-#define SYS_TCx_TLCS_DIV64              __REGVAL(SYS_TCx_TLCS, 6)       /* CPU clock / 64 */
-#define SYS_TCx_TLCS_EXT                __REGVAL(SYS_TCx_TLCS, 7)
-
-/* Timer x Control register: Timer mode */
-#define SYS_TCx_TM              __REGBITS(5, 4)
-#define SYS_TCx_TM_IEE                  __REGVAL(SYS_TCx_TM, 0)         /* Internal timer or external event */
-#define SYS_TCx_TM_ELL                  __REGVAL(SYS_TCx_TM, 1)         /* External low-level, gated timer */
-#define SYS_TCx_TM_EHL                  __REGVAL(SYS_TCx_TM, 2)         /* External high-level, gated timer */
-#define SYS_TCx_TM_CONCAT               __REGVAL(SYS_TCx_TM, 3)         /* Concatenate the lower timer. */
-
-/* Timer x Control register: Interrupt select */
-#define SYS_TCx_INTS            __REGBIT(3)
-#define SYS_TCx_INTS_DIS                __REGVAL(SYS_TCx_INTS, 0)
-#define SYS_TCx_INTS_EN                 __REGVAL(SYS_TCx_INTS, 1)
-
-/* Timer x Control register: Up/down select */
-#define SYS_TCx_UDS             __REGBIT(2)
-#define SYS_TCx_UDS_UP                  __REGVAL(SYS_TCx_UDS, 0)
-#define SYS_TCx_UDS_DOWN                __REGVAL(SYS_TCx_UDS, 1)
-
-/* Timer x Control register: 32- or 16-bit timer */
-#define SYS_TCx_TSZ             __REGBIT(1)
-#define SYS_TCx_TSZ_16                  __REGVAL(SYS_TCx_TSZ, 0)
-#define SYS_TCx_TSZ_32                  __REGVAL(SYS_TCx_TSZ, 1)
-
-/* Timer x Control register: Reload enable */
-#define SYS_TCx_REN             __REGBIT(0)
-#define SYS_TCx_REN_DIS                 __REGVAL(SYS_TCx_REN, 0)
-#define SYS_TCx_REN_EN                  __REGVAL(SYS_TCx_REN, 1)
-
-/* System Memory Chip Select x Dynamic Memory Base */
-#define SYS_SMCSDMB(x)  __REG2(0xa09001d0, (x) << 1)
-
-/* System Memory Chip Select x Dynamic Memory Mask */
-#define SYS_SMCSDMM(x)  __REG2(0xa09001d4, (x) << 1)
-
-/* System Memory Chip Select x Static Memory Base */
-#define SYS_SMCSSMB(x)  __REG2(0xa09001f0, (x) << 1)
-
-/* System Memory Chip Select x Static Memory Base: Chip select x base */
-#define SYS_SMCSSMB_CSxB        __REGBITS(31, 12)
-
-/* System Memory Chip Select x Static Memory Mask */
-#define SYS_SMCSSMM(x)  __REG2(0xa09001f4, (x) << 1)
-
-/* System Memory Chip Select x Static Memory Mask: Chip select x mask */
-#define SYS_SMCSSMM_CSxM        __REGBITS(31, 12)
-
-/* System Memory Chip Select x Static Memory Mask: Chip select x enable */
-#define SYS_SMCSSMM_CSEx        __REGBIT(0)
-#define SYS_SMCSSMM_CSEx_DIS            __REGVAL(SYS_SMCSSMM_CSEx, 0)
-#define SYS_SMCSSMM_CSEx_EN             __REGVAL(SYS_SMCSSMM_CSEx, 1)
-
-/* General purpose, user-defined ID register */
-#define SYS_GENID       __REG(0xa0900210)
-
-/* External Interrupt x Control register */
-#define SYS_EIC(x)      __REG2(0xa0900214, (x))
-
-/* External Interrupt x Control register: Status */
-#define SYS_EIC_STS             __REGBIT(3)
-
-/* External Interrupt x Control register: Clear */
-#define SYS_EIC_CLR             __REGBIT(2)
-
-/* External Interrupt x Control register: Polarity */
-#define SYS_EIC_PLTY            __REGBIT(1)
-#define SYS_EIC_PLTY_AH                 __REGVAL(SYS_EIC_PLTY, 0)
-#define SYS_EIC_PLTY_AL                 __REGVAL(SYS_EIC_PLTY, 1)
-
-/* External Interrupt x Control register: Level edge */
-#define SYS_EIC_LVEDG           __REGBIT(0)
-#define SYS_EIC_LVEDG_LEVEL             __REGVAL(SYS_EIC_LVEDG, 0)
-#define SYS_EIC_LVEDG_EDGE              __REGVAL(SYS_EIC_LVEDG, 1)
-
-#endif /* ifndef __ASM_ARCH_REGSSYSNS9360_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/system.h b/arch/arm/mach-ns9xxx/include/mach/system.h
deleted file mode 100644
index 1561588ca364..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/system.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/system.h
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_SYSTEM_H
-#define __ASM_ARCH_SYSTEM_H
-
-#include <asm/proc-fns.h>
-#include <mach/processor.h>
-#include <mach/processor-ns9360.h>
-
-static inline void arch_idle(void)
-{
-        cpu_do_idle();
-}
-
-static inline void arch_reset(char mode, const char *cmd)
-{
-#ifdef CONFIG_PROCESSOR_NS9360
-        if (processor_is_ns9360())
-                ns9360_reset(mode);
-        else
-#endif
-                BUG();
-
-        BUG();
-}
-
-#endif /* ifndef __ASM_ARCH_SYSTEM_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/timex.h b/arch/arm/mach-ns9xxx/include/mach/timex.h
deleted file mode 100644
index 734a8d8bd578..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/timex.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/timex.h
- *
- * Copyright (C) 2005-2006 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_TIMEX_H
-#define __ASM_ARCH_TIMEX_H
-
-/*
- * value for CLOCK_TICK_RATE stolen from arch/arm/mach-s3c2410/include/mach/timex.h.
- * See there for an explanation.
- */
-#define CLOCK_TICK_RATE         12000000
-
-#endif /* ifndef __ASM_ARCH_TIMEX_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/uncompress.h b/arch/arm/mach-ns9xxx/include/mach/uncompress.h
deleted file mode 100644
index 770a68c46e81..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/uncompress.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/uncompress.h
- *
- * Copyright (C) 2006 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_UNCOMPRESS_H
-#define __ASM_ARCH_UNCOMPRESS_H
-
-#include <linux/io.h>
-
-#define __REG(x)        ((void __iomem __force *)(x))
-
-static void putc_dummy(char c, void __iomem *base)
-{
-        /* nothing */
-}
-
-static int timeout;
-
-static void putc_ns9360(char c, void __iomem *base)
-{
-        do {
-                if (timeout)
-                        --timeout;
-
-                if (__raw_readl(base + 8) & (1 << 3)) {
-                        __raw_writeb(c, base + 16);
-                        timeout = 0x10000;
-                        break;
-                }
-        } while (timeout);
-}
-
-static void putc_a9m9750dev(char c, void __iomem *base)
-{
-        do {
-                if (timeout)
-                        --timeout;
-
-                if (__raw_readb(base + 5) & (1 << 5)) {
-                        __raw_writeb(c, base);
-                        timeout = 0x10000;
-                        break;
-                }
-        } while (timeout);
-
-}
-
-static void putc_ns921x(char c, void __iomem *base)
-{
-        do {
-                if (timeout)
-                        --timeout;
-
-                if (!(__raw_readl(base) & (1 << 11))) {
-                        __raw_writeb(c, base + 0x0028);
-                        timeout = 0x10000;
-                        break;
-                }
-        } while (timeout);
-}
-
-#define MSCS __REG(0xA0900184)
-
-#define NS9360_UARTA    __REG(0x90200040)
-#define NS9360_UARTB    __REG(0x90200000)
-#define NS9360_UARTC    __REG(0x90300000)
-#define NS9360_UARTD    __REG(0x90300040)
-
-#define NS9360_UART_ENABLED(base)                                       \
-                (__raw_readl(NS9360_UARTA) & (1 << 31))
-
-#define A9M9750DEV_UARTA        __REG(0x40000000)
-
-#define NS921XSYS_CLOCK __REG(0xa090017c)
-#define NS921X_UARTA    __REG(0x90010000)
-#define NS921X_UARTB    __REG(0x90018000)
-#define NS921X_UARTC    __REG(0x90020000)
-#define NS921X_UARTD    __REG(0x90028000)
-
-#define NS921X_UART_ENABLED(base)                                       \
-                (__raw_readl((base) + 0x1000) & (1 << 29))
-
-static void autodetect(void (**putc)(char, void __iomem *), void __iomem **base)
-{
-        timeout = 0x10000;
-        if (((__raw_readl(MSCS) >> 16) & 0xfe) == 0x00) {
-                /* ns9360 or ns9750 */
-                if (NS9360_UART_ENABLED(NS9360_UARTA)) {
-                        *putc = putc_ns9360;
-                        *base = NS9360_UARTA;
-                        return;
-                } else if (NS9360_UART_ENABLED(NS9360_UARTB)) {
-                        *putc = putc_ns9360;
-                        *base = NS9360_UARTB;
-                        return;
-                } else if (NS9360_UART_ENABLED(NS9360_UARTC)) {
-                        *putc = putc_ns9360;
-                        *base = NS9360_UARTC;
-                        return;
-                } else if (NS9360_UART_ENABLED(NS9360_UARTD)) {
-                        *putc = putc_ns9360;
-                        *base = NS9360_UARTD;
-                        return;
-                } else if (__raw_readl(__REG(0xa09001f4)) == 0xfffff001) {
-                        *putc = putc_a9m9750dev;
-                        *base = A9M9750DEV_UARTA;
-                        return;
-                }
-        } else if (((__raw_readl(MSCS) >> 16) & 0xfe) == 0x02) {
-                /* ns921x */
-                u32 clock = __raw_readl(NS921XSYS_CLOCK);
-
-                if ((clock & (1 << 1)) &&
-                                NS921X_UART_ENABLED(NS921X_UARTA)) {
-                        *putc = putc_ns921x;
-                        *base = NS921X_UARTA;
-                        return;
-                } else if ((clock & (1 << 2)) &&
-                                NS921X_UART_ENABLED(NS921X_UARTB)) {
-                        *putc = putc_ns921x;
-                        *base = NS921X_UARTB;
-                        return;
-                } else if ((clock & (1 << 3)) &&
-                                NS921X_UART_ENABLED(NS921X_UARTC)) {
-                        *putc = putc_ns921x;
-                        *base = NS921X_UARTC;
-                        return;
-                } else if ((clock & (1 << 4)) &&
-                                NS921X_UART_ENABLED(NS921X_UARTD)) {
-                        *putc = putc_ns921x;
-                        *base = NS921X_UARTD;
-                        return;
-                }
-        }
-
-        *putc = putc_dummy;
-}
-
-void (*myputc)(char, void __iomem *);
-void __iomem *base;
-
-static void putc(char c)
-{
-        myputc(c, base);
-}
-
-static void arch_decomp_setup(void)
-{
-        autodetect(&myputc, &base);
-}
-#define arch_decomp_wdog()
-
-static void flush(void)
-{
-        /* nothing */
-}
-
-#endif /* ifndef __ASM_ARCH_UNCOMPRESS_H */
diff --git a/arch/arm/mach-ns9xxx/include/mach/vmalloc.h b/arch/arm/mach-ns9xxx/include/mach/vmalloc.h
deleted file mode 100644
index c8651974c4b0..000000000000
--- a/arch/arm/mach-ns9xxx/include/mach/vmalloc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/include/mach/vmalloc.h
- *
- * Copyright (C) 2006 by Digi International Inc.
- * All rights reserved.
- *
- * 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.
- */
-#ifndef __ASM_ARCH_VMALLOC_H
-#define __ASM_ARCH_VMALLOC_H
-
-#define VMALLOC_END     (0xf0000000UL)
-
-#endif /* ifndef __ASM_ARCH_VMALLOC_H */
diff --git a/arch/arm/mach-ns9xxx/irq.c b/arch/arm/mach-ns9xxx/irq.c
deleted file mode 100644
index 37ab0a2b83ad..000000000000
--- a/arch/arm/mach-ns9xxx/irq.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/irq.c
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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/interrupt.h>
-#include <linux/kernel_stat.h>
-#include <linux/io.h>
-#include <asm/mach/irq.h>
-#include <mach/regs-sys-common.h>
-#include <mach/irqs.h>
-#include <mach/board.h>
-
-#include "generic.h"
-
-/* simple interrupt prio table: prio(x) < prio(y) <=> x < y */
-#define irq2prio(i) (i)
-#define prio2irq(p) (p)
-
-static void ns9xxx_mask_irq(struct irq_data *d)
-{
-        /* XXX: better use cpp symbols */
-        int prio = irq2prio(d->irq);
-        u32 ic = __raw_readl(SYS_IC(prio / 4));
-        ic &= ~(1 << (7 + 8 * (3 - (prio & 3))));
-        __raw_writel(ic, SYS_IC(prio / 4));
-}
-
-static void ns9xxx_eoi_irq(struct irq_data *d)
-{
-        __raw_writel(0, SYS_ISRADDR);
-}
-
-static void ns9xxx_unmask_irq(struct irq_data *d)
-{
-        /* XXX: better use cpp symbols */
-        int prio = irq2prio(d->irq);
-        u32 ic = __raw_readl(SYS_IC(prio / 4));
-        ic |= 1 << (7 + 8 * (3 - (prio & 3)));
-        __raw_writel(ic, SYS_IC(prio / 4));
-}
-
-static struct irq_chip ns9xxx_chip = {
-        .irq_eoi        = ns9xxx_eoi_irq,
-        .irq_mask       = ns9xxx_mask_irq,
-        .irq_unmask     = ns9xxx_unmask_irq,
-};
-
-void __init ns9xxx_init_irq(void)
-{
-        int i;
-
-        /* disable all IRQs */
-        for (i = 0; i < 8; ++i)
-                __raw_writel(prio2irq(4 * i) << 24 |
-                                prio2irq(4 * i + 1) << 16 |
-                                prio2irq(4 * i + 2) << 8 |
-                                prio2irq(4 * i + 3),
-                                SYS_IC(i));
-
-        for (i = 0; i < 32; ++i)
-                __raw_writel(prio2irq(i), SYS_IVA(i));
-
-        for (i = 0; i <= 31; ++i) {
-                irq_set_chip_and_handler(i, &ns9xxx_chip, handle_fasteoi_irq);
-                set_irq_flags(i, IRQF_VALID);
-                irq_set_status_flags(i, IRQ_LEVEL);
-        }
-}
diff --git a/arch/arm/mach-ns9xxx/mach-cc9p9360dev.c b/arch/arm/mach-ns9xxx/mach-cc9p9360dev.c
deleted file mode 100644
index 2858417d8d8a..000000000000
--- a/arch/arm/mach-ns9xxx/mach-cc9p9360dev.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/mach-cc9p9360dev.c
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-#include <asm/mach/arch.h>
-#include <asm/mach-types.h>
-
-#include <mach/processor-ns9360.h>
-
-#include "board-a9m9750dev.h"
-#include "generic.h"
-
-static void __init mach_cc9p9360dev_map_io(void)
-{
-        ns9360_map_io();
-        board_a9m9750dev_map_io();
-}
-
-static void __init mach_cc9p9360dev_init_irq(void)
-{
-        ns9xxx_init_irq();
-        board_a9m9750dev_init_irq();
-}
-
-static void __init mach_cc9p9360dev_init_machine(void)
-{
-        ns9xxx_init_machine();
-        board_a9m9750dev_init_machine();
-}
-
-MACHINE_START(CC9P9360DEV, "Digi ConnectCore 9P 9360 on an A9M9750 Devboard")
-        .map_io = mach_cc9p9360dev_map_io,
-        .init_irq = mach_cc9p9360dev_init_irq,
-        .init_machine = mach_cc9p9360dev_init_machine,
-        .timer = &ns9360_timer,
-        .boot_params = 0x100,
-MACHINE_END
diff --git a/arch/arm/mach-ns9xxx/mach-cc9p9360js.c b/arch/arm/mach-ns9xxx/mach-cc9p9360js.c
deleted file mode 100644
index 729f68da4293..000000000000
--- a/arch/arm/mach-ns9xxx/mach-cc9p9360js.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/mach-cc9p9360js.c
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-#include <asm/mach/arch.h>
-#include <asm/mach-types.h>
-
-#include <mach/processor-ns9360.h>
-
-#include "board-jscc9p9360.h"
-#include "generic.h"
-
-static void __init mach_cc9p9360js_init_machine(void)
-{
-        ns9xxx_init_machine();
-        board_jscc9p9360_init_machine();
-}
-
-MACHINE_START(CC9P9360JS, "Digi ConnectCore 9P 9360 on an JSCC9P9360 Devboard")
-        .map_io = ns9360_map_io,
-        .init_irq = ns9xxx_init_irq,
-        .init_machine = mach_cc9p9360js_init_machine,
-        .timer = &ns9360_timer,
-        .boot_params = 0x100,
-MACHINE_END
diff --git a/arch/arm/mach-ns9xxx/plat-serial8250.c b/arch/arm/mach-ns9xxx/plat-serial8250.c
deleted file mode 100644
index 463e92465fda..000000000000
--- a/arch/arm/mach-ns9xxx/plat-serial8250.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/plat-serial8250.c
- *
- * Copyright (C) 2008 by Digi International Inc.
- * All rights reserved.
- *
- * 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/platform_device.h>
-#include <linux/serial_8250.h>
-#include <linux/slab.h>
-
-#include <mach/regs-board-a9m9750dev.h>
-#include <mach/board.h>
-
-#define DRIVER_NAME "serial8250"
-
-static int __init ns9xxx_plat_serial8250_init(void)
-{
-        struct plat_serial8250_port *pdata;
-        struct platform_device *pdev;
-        int ret = -ENOMEM;
-        int i;
-
-        if (!board_is_a9m9750dev())
-                return -ENODEV;
-
-        pdev = platform_device_alloc(DRIVER_NAME, 0);
-        if (!pdev)
-                goto err;
-
-        pdata = kzalloc(5 * sizeof(*pdata), GFP_KERNEL);
-        if (!pdata)
-                goto err;
-
-        pdev->dev.platform_data = pdata;
-
-        pdata[0].iobase = FPGA_UARTA_BASE;
-        pdata[1].iobase = FPGA_UARTB_BASE;
-        pdata[2].iobase = FPGA_UARTC_BASE;
-        pdata[3].iobase = FPGA_UARTD_BASE;
-
-        for (i = 0; i < 4; ++i) {
-                pdata[i].membase = (void __iomem *)pdata[i].iobase;
-                pdata[i].mapbase = pdata[i].iobase;
-                pdata[i].iotype = UPIO_MEM;
-                pdata[i].uartclk = 18432000;
-                pdata[i].flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ;
-        }
-
-        pdata[0].irq = IRQ_FPGA_UARTA;
-        pdata[1].irq = IRQ_FPGA_UARTB;
-        pdata[2].irq = IRQ_FPGA_UARTC;
-        pdata[3].irq = IRQ_FPGA_UARTD;
-
-        ret = platform_device_add(pdev);
-        if (ret) {
-err:
-                platform_device_put(pdev);
-
-                printk(KERN_WARNING "Could not add %s (errno=%d)\n",
-                                DRIVER_NAME, ret);
-        }
-
-        return 0;
-}
-
-arch_initcall(ns9xxx_plat_serial8250_init);
diff --git a/arch/arm/mach-ns9xxx/processor-ns9360.c b/arch/arm/mach-ns9xxx/processor-ns9360.c
deleted file mode 100644
index aed1999d24fc..000000000000
--- a/arch/arm/mach-ns9xxx/processor-ns9360.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/processor-ns9360.c
- *
- * Copyright (C) 2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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/io.h>
-#include <linux/kernel.h>
-
-#include <asm/page.h>
-#include <asm/mach/map.h>
-#include <mach/processor-ns9360.h>
-#include <mach/regs-sys-ns9360.h>
-
-void ns9360_reset(char mode)
-{
-        u32 reg;
-
-        reg = __raw_readl(SYS_PLL) >> 16;
-        REGSET(reg, SYS_PLL, SWC, YES);
-        __raw_writel(reg, SYS_PLL);
-}
-
-#define CRYSTAL 29491200 /* Hz */
-unsigned long ns9360_systemclock(void)
-{
-        u32 pll = __raw_readl(SYS_PLL);
-        return CRYSTAL * (REGGETIM(pll, SYS_PLL, ND) + 1)
-                >> REGGETIM(pll, SYS_PLL, FS);
-}
-
-static struct map_desc ns9360_io_desc[] __initdata = {
-        { /* BBus */
-                .virtual = io_p2v(0x90000000),
-                .pfn = __phys_to_pfn(0x90000000),
-                .length = 0x00700000,
-                .type = MT_DEVICE,
-        }, { /* AHB */
-                .virtual = io_p2v(0xa0100000),
-                .pfn = __phys_to_pfn(0xa0100000),
-                .length = 0x00900000,
-                .type = MT_DEVICE,
-        },
-};
-
-void __init ns9360_map_io(void)
-{
-        iotable_init(ns9360_io_desc, ARRAY_SIZE(ns9360_io_desc));
-}
diff --git a/arch/arm/mach-ns9xxx/time-ns9360.c b/arch/arm/mach-ns9xxx/time-ns9360.c
deleted file mode 100644
index 9ca32f55728b..000000000000
--- a/arch/arm/mach-ns9xxx/time-ns9360.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * arch/arm/mach-ns9xxx/time-ns9360.c
- *
- * Copyright (C) 2006,2007 by Digi International Inc.
- * All rights reserved.
- *
- * 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/jiffies.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/stringify.h>
-#include <linux/clocksource.h>
-#include <linux/clockchips.h>
-
-#include <mach/processor-ns9360.h>
-#include <mach/regs-sys-ns9360.h>
-#include <mach/irqs.h>
-#include <mach/system.h>
-#include "generic.h"
-
-#define TIMER_CLOCKSOURCE 0
-#define TIMER_CLOCKEVENT 1
-static u32 latch;
-
-static cycle_t ns9360_clocksource_read(struct clocksource *cs)
-{
-        return __raw_readl(SYS_TR(TIMER_CLOCKSOURCE));
-}
-
-static struct clocksource ns9360_clocksource = {
-        .name   = "ns9360-timer" __stringify(TIMER_CLOCKSOURCE),
-        .rating = 300,
-        .read   = ns9360_clocksource_read,
-        .mask   = CLOCKSOURCE_MASK(32),
-        .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
-static void ns9360_clockevent_setmode(enum clock_event_mode mode,
-                struct clock_event_device *clk)
-{
-        u32 tc = __raw_readl(SYS_TC(TIMER_CLOCKEVENT));
-
-        switch (mode) {
-        case CLOCK_EVT_MODE_PERIODIC:
-                __raw_writel(latch, SYS_TRC(TIMER_CLOCKEVENT));
-                REGSET(tc, SYS_TCx, REN, EN);
-                REGSET(tc, SYS_TCx, INTS, EN);
-                REGSET(tc, SYS_TCx, TEN, EN);
-                break;
-
-        case CLOCK_EVT_MODE_ONESHOT:
-                REGSET(tc, SYS_TCx, REN, DIS);
-                REGSET(tc, SYS_TCx, INTS, EN);
-
-                /* fall through */
-
-        case CLOCK_EVT_MODE_UNUSED:
-        case CLOCK_EVT_MODE_SHUTDOWN:
-        case CLOCK_EVT_MODE_RESUME:
-        default:
-                REGSET(tc, SYS_TCx, TEN, DIS);
-                break;
-        }
-
-        __raw_writel(tc, SYS_TC(TIMER_CLOCKEVENT));
-}
-
-static int ns9360_clockevent_setnextevent(unsigned long evt,
-                struct clock_event_device *clk)
-{
-        u32 tc = __raw_readl(SYS_TC(TIMER_CLOCKEVENT));
-
-        if (REGGET(tc, SYS_TCx, TEN)) {
-                REGSET(tc, SYS_TCx, TEN, DIS);
-                __raw_writel(tc, SYS_TC(TIMER_CLOCKEVENT));
-        }
-
-        REGSET(tc, SYS_TCx, TEN, EN);
-
-        __raw_writel(evt, SYS_TRC(TIMER_CLOCKEVENT));
-
-        __raw_writel(tc, SYS_TC(TIMER_CLOCKEVENT));
-
-        return 0;
-}
-
-static struct clock_event_device ns9360_clockevent_device = {
-        .name           = "ns9360-timer" __stringify(TIMER_CLOCKEVENT),
-        .shift          = 20,
-        .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-        .set_mode       = ns9360_clockevent_setmode,
-        .set_next_event = ns9360_clockevent_setnextevent,
-};
-
-static irqreturn_t ns9360_clockevent_handler(int irq, void *dev_id)
-{
-        int timerno = irq - IRQ_NS9360_TIMER0;
-        u32 tc;
-
-        struct clock_event_device *evt = &ns9360_clockevent_device;
-
-        /* clear irq */
-        tc = __raw_readl(SYS_TC(timerno));
-        if (REGGET(tc, SYS_TCx, REN) == SYS_TCx_REN_DIS) {
-                REGSET(tc, SYS_TCx, TEN, DIS);
-                __raw_writel(tc, SYS_TC(timerno));
-        }
-        REGSET(tc, SYS_TCx, INTC, SET);
-        __raw_writel(tc, SYS_TC(timerno));
-        REGSET(tc, SYS_TCx, INTC, UNSET);
-        __raw_writel(tc, SYS_TC(timerno));
-
-        evt->event_handler(evt);
-
-        return IRQ_HANDLED;
-}
-
-static struct irqaction ns9360_clockevent_action = {
-        .name           = "ns9360-timer" __stringify(TIMER_CLOCKEVENT),
-        .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
-        .handler        = ns9360_clockevent_handler,
-};
-
-static void __init ns9360_timer_init(void)
-{
-        int tc;
-
-        tc = __raw_readl(SYS_TC(TIMER_CLOCKSOURCE));
-        if (REGGET(tc, SYS_TCx, TEN)) {
-                REGSET(tc, SYS_TCx, TEN, DIS);
-                __raw_writel(tc, SYS_TC(TIMER_CLOCKSOURCE));
-        }
-
-        __raw_writel(0, SYS_TRC(TIMER_CLOCKSOURCE));
-
-        REGSET(tc, SYS_TCx, TEN, EN);
-        REGSET(tc, SYS_TCx, TDBG, STOP);
-        REGSET(tc, SYS_TCx, TLCS, CPU);
-        REGSET(tc, SYS_TCx, TM, IEE);
-        REGSET(tc, SYS_TCx, INTS, DIS);
-        REGSET(tc, SYS_TCx, UDS, UP);
-        REGSET(tc, SYS_TCx, TSZ, 32);
-        REGSET(tc, SYS_TCx, REN, EN);
-
-        __raw_writel(tc, SYS_TC(TIMER_CLOCKSOURCE));
-
-        clocksource_register_hz(&ns9360_clocksource, ns9360_cpuclock());
-
-        latch = SH_DIV(ns9360_cpuclock(), HZ, 0);
-
-        tc = __raw_readl(SYS_TC(TIMER_CLOCKEVENT));
-        REGSET(tc, SYS_TCx, TEN, DIS);
-        REGSET(tc, SYS_TCx, TDBG, STOP);
-        REGSET(tc, SYS_TCx, TLCS, CPU);
-        REGSET(tc, SYS_TCx, TM, IEE);
-        REGSET(tc, SYS_TCx, INTS, DIS);
-        REGSET(tc, SYS_TCx, UDS, DOWN);
-        REGSET(tc, SYS_TCx, TSZ, 32);
-        REGSET(tc, SYS_TCx, REN, EN);
-        __raw_writel(tc, SYS_TC(TIMER_CLOCKEVENT));
-
-        ns9360_clockevent_device.mult = div_sc(ns9360_cpuclock(),
-                        NSEC_PER_SEC, ns9360_clockevent_device.shift);
-        ns9360_clockevent_device.max_delta_ns =
-                clockevent_delta2ns(-1, &ns9360_clockevent_device);
-        ns9360_clockevent_device.min_delta_ns =
-                clockevent_delta2ns(1, &ns9360_clockevent_device);
-
-        ns9360_clockevent_device.cpumask = cpumask_of(0);
-        clockevents_register_device(&ns9360_clockevent_device);
-
-        setup_irq(IRQ_NS9360_TIMER0 + TIMER_CLOCKEVENT,
-                        &ns9360_clockevent_action);
-}
-
-struct sys_timer ns9360_timer = {
-        .init = ns9360_timer_init,
-};
diff --git a/arch/arm/mach-nuc93x/include/mach/uncompress.h b/arch/arm/mach-nuc93x/include/mach/uncompress.h
index 73082cd61e84..381cb9baadd5 100644
--- a/arch/arm/mach-nuc93x/include/mach/uncompress.h
+++ b/arch/arm/mach-nuc93x/include/mach/uncompress.h
@@ -27,7 +27,7 @@
 #define arch_decomp_wdog()
 
 #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE)
-static u32 * uart_base = (u32 *)UART0_PA;
+static u32 * const uart_base = (u32 *)UART0_PA;
 
 static void putc(int ch)
 {
diff --git a/arch/arm/mach-omap1/flash.c b/arch/arm/mach-omap1/flash.c
index acd161666408..1749cb37dda0 100644
--- a/arch/arm/mach-omap1/flash.c
+++ b/arch/arm/mach-omap1/flash.c
@@ -13,7 +13,7 @@
 #include <plat/tc.h>
 #include <plat/flash.h>
 
-void omap1_set_vpp(struct map_info *map, int enable)
+void omap1_set_vpp(struct platform_device *pdev, int enable)
 {
         static int count;
         u32 l;
diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index 6588c22b8a64..fe31d933f0ed 100644
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@@ -24,75 +24,50 @@
 #ifdef CONFIG_PM_RUNTIME
 static int omap1_pm_runtime_suspend(struct device *dev)
 {
-        struct clk *iclk, *fclk;
-        int ret = 0;
+        int ret;
 
         dev_dbg(dev, "%s\n", __func__);
 
         ret = pm_generic_runtime_suspend(dev);
+        if (ret)
+                return ret;
 
-        fclk = clk_get(dev, "fck");
-        if (!IS_ERR(fclk)) {
-                clk_disable(fclk);
-                clk_put(fclk);
-        }
-
-        iclk = clk_get(dev, "ick");
-        if (!IS_ERR(iclk)) {
-                clk_disable(iclk);
-                clk_put(iclk);
+        ret = pm_runtime_clk_suspend(dev);
+        if (ret) {
+                pm_generic_runtime_resume(dev);
+                return ret;
         }
 
         return 0;
-};
+}
 
 static int omap1_pm_runtime_resume(struct device *dev)
 {
-        struct clk *iclk, *fclk;
-
         dev_dbg(dev, "%s\n", __func__);
 
-        iclk = clk_get(dev, "ick");
-        if (!IS_ERR(iclk)) {
-                clk_enable(iclk);
-                clk_put(iclk);
-        }
+        pm_runtime_clk_resume(dev);
+        return pm_generic_runtime_resume(dev);
+}
 
-        fclk = clk_get(dev, "fck");
-        if (!IS_ERR(fclk)) {
-                clk_enable(fclk);
-                clk_put(fclk);
-        }
+static struct dev_power_domain default_power_domain = {
+        .ops = {
+                .runtime_suspend = omap1_pm_runtime_suspend,
+                .runtime_resume = omap1_pm_runtime_resume,
+                USE_PLATFORM_PM_SLEEP_OPS
+        },
+};
 
-        return pm_generic_runtime_resume(dev);
+static struct pm_clk_notifier_block platform_bus_notifier = {
+        .pwr_domain = &default_power_domain,
+        .con_ids = { "ick", "fck", NULL, },
 };
 
 static int __init omap1_pm_runtime_init(void)
 {
-        const struct dev_pm_ops *pm;
-        struct dev_pm_ops *omap_pm;
-
         if (!cpu_class_is_omap1())
                 return -ENODEV;
 
-        pm = platform_bus_get_pm_ops();
-        if (!pm) {
-                pr_err("%s: unable to get dev_pm_ops from platform_bus\n",
-                        __func__);
-                return -ENODEV;
-        }
-
-        omap_pm = kmemdup(pm, sizeof(struct dev_pm_ops), GFP_KERNEL);
-        if (!omap_pm) {
-                pr_err("%s: unable to alloc memory for new dev_pm_ops\n",
-                        __func__);
-                return -ENOMEM;
-        }
-
-        omap_pm->runtime_suspend = omap1_pm_runtime_suspend;
-        omap_pm->runtime_resume = omap1_pm_runtime_resume;
-
-        platform_bus_set_pm_ops(omap_pm);
+        pm_runtime_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
 
         return 0;
 }
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index 6885d2fac183..03e1e1062ad4 100644
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -68,49 +68,50 @@ typedef struct {
 } omap_mpu_timer_regs_t;
 
 #define omap_mpu_timer_base(n)                                                  \
-((volatile omap_mpu_timer_regs_t*)OMAP1_IO_ADDRESS(OMAP_MPU_TIMER_BASE +        \
+((omap_mpu_timer_regs_t __iomem *)OMAP1_IO_ADDRESS(OMAP_MPU_TIMER_BASE +        \
                                  (n)*OMAP_MPU_TIMER_OFFSET))
 
 static inline unsigned long notrace omap_mpu_timer_read(int nr)
 {
-        volatile omap_mpu_timer_regs_t* timer = omap_mpu_timer_base(nr);
-        return timer->read_tim;
+        omap_mpu_timer_regs_t __iomem *timer = omap_mpu_timer_base(nr);
+        return readl(&timer->read_tim);
 }
 
 static inline void omap_mpu_set_autoreset(int nr)
 {
-        volatile omap_mpu_timer_regs_t* timer = omap_mpu_timer_base(nr);
+        omap_mpu_timer_regs_t __iomem *timer = omap_mpu_timer_base(nr);
 
-        timer->cntl = timer->cntl | MPU_TIMER_AR;
+        writel(readl(&timer->cntl) | MPU_TIMER_AR, &timer->cntl);
 }
 
 static inline void omap_mpu_remove_autoreset(int nr)
 {
-        volatile omap_mpu_timer_regs_t* timer = omap_mpu_timer_base(nr);
+        omap_mpu_timer_regs_t __iomem *timer = omap_mpu_timer_base(nr);
 
-        timer->cntl = timer->cntl & ~MPU_TIMER_AR;
+        writel(readl(&timer->cntl) & ~MPU_TIMER_AR, &timer->cntl);
 }
 
 static inline void omap_mpu_timer_start(int nr, unsigned long load_val,
                                         int autoreset)
 {
-        volatile omap_mpu_timer_regs_t* timer = omap_mpu_timer_base(nr);
-        unsigned int timerflags = (MPU_TIMER_CLOCK_ENABLE | MPU_TIMER_ST);
+        omap_mpu_timer_regs_t __iomem *timer = omap_mpu_timer_base(nr);
+        unsigned int timerflags = MPU_TIMER_CLOCK_ENABLE | MPU_TIMER_ST;
 
-        if (autoreset) timerflags |= MPU_TIMER_AR;
+        if (autoreset)
+                timerflags |= MPU_TIMER_AR;
 
-        timer->cntl = MPU_TIMER_CLOCK_ENABLE;
+        writel(MPU_TIMER_CLOCK_ENABLE, &timer->cntl);
         udelay(1);
-        timer->load_tim = load_val;
+        writel(load_val, &timer->load_tim);
         udelay(1);
-        timer->cntl = timerflags;
+        writel(timerflags, &timer->cntl);
 }
 
 static inline void omap_mpu_timer_stop(int nr)
 {
-        volatile omap_mpu_timer_regs_t* timer = omap_mpu_timer_base(nr);
+        omap_mpu_timer_regs_t __iomem *timer = omap_mpu_timer_base(nr);
 
-        timer->cntl &= ~MPU_TIMER_ST;
+        writel(readl(&timer->cntl) & ~MPU_TIMER_ST, &timer->cntl);
 }
 
 /*
@@ -189,38 +190,11 @@ static __init void omap_init_mpu_timer(unsigned long rate)
  * ---------------------------------------------------------------------------
  */
 
-static unsigned long omap_mpu_timer2_overflows;
-
-static irqreturn_t omap_mpu_timer2_interrupt(int irq, void *dev_id)
-{
-        omap_mpu_timer2_overflows++;
-        return IRQ_HANDLED;
-}
-
-static struct irqaction omap_mpu_timer2_irq = {
-        .name           = "mpu_timer2",
-        .flags          = IRQF_DISABLED,
-        .handler        = omap_mpu_timer2_interrupt,
-};
-
-static cycle_t mpu_read(struct clocksource *cs)
-{
-        return ~omap_mpu_timer_read(1);
-}
-
-static struct clocksource clocksource_mpu = {
-        .name           = "mpu_timer2",
-        .rating         = 300,
-        .read           = mpu_read,
-        .mask           = CLOCKSOURCE_MASK(32),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 static DEFINE_CLOCK_DATA(cd);
 
 static inline unsigned long long notrace _omap_mpu_sched_clock(void)
 {
-        u32 cyc = mpu_read(&clocksource_mpu);
+        u32 cyc = ~omap_mpu_timer_read(1);
         return cyc_to_sched_clock(&cd, cyc, (u32)~0);
 }
 
@@ -238,21 +212,22 @@ static unsigned long long notrace omap_mpu_sched_clock(void)
 
 static void notrace mpu_update_sched_clock(void)
 {
-        u32 cyc = mpu_read(&clocksource_mpu);
+        u32 cyc = ~omap_mpu_timer_read(1);
         update_sched_clock(&cd, cyc, (u32)~0);
 }
 
 static void __init omap_init_clocksource(unsigned long rate)
 {
+        omap_mpu_timer_regs_t __iomem *timer = omap_mpu_timer_base(1);
         static char err[] __initdata = KERN_ERR
                         "%s: can't register clocksource!\n";
 
-        setup_irq(INT_TIMER2, &omap_mpu_timer2_irq);
         omap_mpu_timer_start(1, ~0, 1);
         init_sched_clock(&cd, mpu_update_sched_clock, 32, rate);
 
-        if (clocksource_register_hz(&clocksource_mpu, rate))
-                printk(err, clocksource_mpu.name);
+        if (clocksource_mmio_init(&timer->read_tim, "mpu_timer2", rate,
+                        300, 32, clocksource_mmio_readl_down))
+                printk(err, "mpu_timer2");
 }
 
 static void __init omap_mpu_timer_init(void)
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 512b15204450..66dfbccacd25 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -59,10 +59,10 @@ endif
 # Power Management
 ifeq ($(CONFIG_PM),y)
 obj-$(CONFIG_ARCH_OMAP2)                += pm24xx.o
-obj-$(CONFIG_ARCH_OMAP2)                += sleep24xx.o pm_bus.o
+obj-$(CONFIG_ARCH_OMAP2)                += sleep24xx.o
 obj-$(CONFIG_ARCH_OMAP3)                += pm34xx.o sleep34xx.o \
-                                           cpuidle34xx.o pm_bus.o
-obj-$(CONFIG_ARCH_OMAP4)                += pm44xx.o pm_bus.o
+                                           cpuidle34xx.o
+obj-$(CONFIG_ARCH_OMAP4)                += pm44xx.o
 obj-$(CONFIG_PM_DEBUG)                  += pm-debug.o
 obj-$(CONFIG_OMAP_SMARTREFLEX)          += sr_device.o smartreflex.o
 obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3)   += smartreflex-class3.o
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 9afd087cc29c..23244cd0a5b6 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -37,8 +37,8 @@
 #include <plat/common.h>
 #include <plat/dma.h>
 #include <plat/gpmc.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
 
 #include <plat/gpmc-smc91x.h>
 
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 56702c5e577f..93edd7fcf451 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -36,7 +36,7 @@
 #include <plat/usb.h>
 #include <plat/mmc.h>
 #include <plat/omap4-keypad.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
 
 #include "mux.h"
 #include "hsmmc.h"
@@ -680,6 +680,15 @@ static struct omap_dss_device sdp4430_hdmi_device = {
         .name = "hdmi",
         .driver_name = "hdmi_panel",
         .type = OMAP_DISPLAY_TYPE_HDMI,
+        .clocks = {
+                .dispc  = {
+                        .dispc_fclk_src = OMAP_DSS_CLK_SRC_FCK,
+                },
+                .hdmi   = {
+                        .regn   = 15,
+                        .regm2  = 1,
+                },
+        },
         .platform_enable = sdp4430_panel_enable_hdmi,
         .platform_disable = sdp4430_panel_disable_hdmi,
         .channel = OMAP_DSS_CHANNEL_DIGIT,
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index ce7d5e6e4150..ff8c59be36e5 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -34,8 +34,8 @@
 #include <plat/board.h>
 #include <plat/common.h>
 #include <plat/usb.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
 
 #include "mux.h"
 #include "control.h"
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 02a12b41c0ff..9340f6a06f4a 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -45,8 +45,8 @@
 #include <plat/nand.h>
 #include <plat/gpmc.h>
 #include <plat/usb.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
 #include <plat/mcspi.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 65f9fde2c567..1d1b56a29fb1 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -45,8 +45,8 @@
 #include <plat/gpmc.h>
 #include <plat/nand.h>
 #include <plat/usb.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
 
 #include <plat/mcspi.h>
 #include <linux/input/matrix_keypad.h>
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 34cf982b9679..3da64d361651 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -31,8 +31,8 @@
 #include <plat/common.h>
 #include <plat/gpmc.h>
 #include <plat/usb.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
 #include <plat/onenand.h>
 
 #include "mux.h"
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 33007fd4a083..97750d483a70 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -41,8 +41,8 @@
 
 #include <plat/board.h>
 #include <plat/common.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
 #include <plat/gpmc.h>
 #include <plat/nand.h>
 #include <plat/usb.h>
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 5a1a916e5cc8..7f94cccdb076 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -44,8 +44,8 @@
 #include <plat/usb.h>
 #include <plat/common.h>
 #include <plat/mcspi.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
 
 #include "mux.h"
 #include "sdram-micron-mt46h32m32lf-6.h"
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 07dba888f450..1db15492d82b 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -46,7 +46,7 @@
 #include <mach/hardware.h>
 #include <plat/mcspi.h>
 #include <plat/usb.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
 #include <plat/nand.h>
 
 #include "mux.h"
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index a6e0b9161c99..a72c90a08c8a 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -39,8 +39,8 @@
 #include <plat/gpmc.h>
 #include <plat/nand.h>
 #include <plat/usb.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
 
 #include <plat/mcspi.h>
 #include <linux/input/matrix_keypad.h>
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index f3a7b1011914..e4973ac77cbc 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -34,13 +34,13 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
 
 #include <plat/board.h>
 #include <plat/common.h>
 #include <plat/usb.h>
 #include <plat/mmc.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omap-panel-generic-dpi.h>
 #include "timer-gp.h"
 
 #include "hsmmc.h"
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 59ca33326b8c..9d192ff3b9ac 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -43,8 +43,8 @@
 
 #include <plat/board.h>
 #include <plat/common.h>
-#include <plat/display.h>
-#include <plat/panel-generic-dpi.h>
+#include <video/omapdss.h>
+#include <video/omap-panel-generic-dpi.h>
 #include <mach/gpio.h>
 #include <plat/gpmc.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index 89a66db8b77d..2df10b6a5940 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -15,7 +15,7 @@
 #include <linux/spi/spi.h>
 #include <linux/mm.h>
 #include <asm/mach-types.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
 #include <plat/vram.h>
 #include <plat/mcspi.h>
 
diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c
index 37b84c2b850f..60e8645db59d 100644
--- a/arch/arm/mach-omap2/board-zoom-display.c
+++ b/arch/arm/mach-omap2/board-zoom-display.c
@@ -15,7 +15,7 @@
 #include <linux/i2c/twl.h>
 #include <linux/spi/spi.h>
 #include <plat/mcspi.h>
-#include <plat/display.h>
+#include <video/omapdss.h>
 
 #define LCD_PANEL_RESET_GPIO_PROD       96
 #define LCD_PANEL_RESET_GPIO_PILOT      55
diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h
index c2804c1c4efd..a016c8b59e00 100644
--- a/arch/arm/mach-omap2/control.h
+++ b/arch/arm/mach-omap2/control.h
@@ -236,7 +236,7 @@
 #define OMAP343X_CONTROL_WKUP_DEBOBS3 (OMAP343X_CONTROL_GENERAL_WKUP + 0x014)
 #define OMAP343X_CONTROL_WKUP_DEBOBS4 (OMAP343X_CONTROL_GENERAL_WKUP + 0x018)
 
-/* 36xx-only RTA - Retention till Accesss control registers and bits */
+/* 36xx-only RTA - Retention till Access control registers and bits */
 #define OMAP36XX_CONTROL_MEM_RTA_CTRL   0x40C
 #define OMAP36XX_RTA_DISABLE            0x0
 
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 256d23fb79ab..543fcb8b518c 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -22,7 +22,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 
-#include <plat/display.h>
+#include <video/omapdss.h>
 #include <plat/omap_hwmod.h>
 #include <plat/omap_device.h>
 
@@ -56,37 +56,58 @@ static bool opt_clock_available(const char *clk_role)
         return false;
 }
 
+struct omap_dss_hwmod_data {
+        const char *oh_name;
+        const char *dev_name;
+        const int id;
+};
+
+static const struct omap_dss_hwmod_data omap2_dss_hwmod_data[] __initdata = {
+        { "dss_core", "omapdss_dss", -1 },
+        { "dss_dispc", "omapdss_dispc", -1 },
+        { "dss_rfbi", "omapdss_rfbi", -1 },
+        { "dss_venc", "omapdss_venc", -1 },
+};
+
+static const struct omap_dss_hwmod_data omap3_dss_hwmod_data[] __initdata = {
+        { "dss_core", "omapdss_dss", -1 },
+        { "dss_dispc", "omapdss_dispc", -1 },
+        { "dss_rfbi", "omapdss_rfbi", -1 },
+        { "dss_venc", "omapdss_venc", -1 },
+        { "dss_dsi1", "omapdss_dsi1", -1 },
+};
+
+static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initdata = {
+        { "dss_core", "omapdss_dss", -1 },
+        { "dss_dispc", "omapdss_dispc", -1 },
+        { "dss_rfbi", "omapdss_rfbi", -1 },
+        { "dss_venc", "omapdss_venc", -1 },
+        { "dss_dsi1", "omapdss_dsi1", -1 },
+        { "dss_dsi2", "omapdss_dsi2", -1 },
+        { "dss_hdmi", "omapdss_hdmi", -1 },
+};
+
 int __init omap_display_init(struct omap_dss_board_info *board_data)
 {
         int r = 0;
         struct omap_hwmod *oh;
         struct omap_device *od;
-        int i;
+        int i, oh_count;
         struct omap_display_platform_data pdata;
-
-        /*
-         * omap: valid DSS hwmod names
-         * omap2,3,4: dss_core, dss_dispc, dss_rfbi, dss_venc
-         * omap3,4: dss_dsi1
-         * omap4: dss_dsi2, dss_hdmi
-         */
-        char *oh_name[] = { "dss_core", "dss_dispc", "dss_rfbi", "dss_venc",
-                "dss_dsi1", "dss_dsi2", "dss_hdmi" };
-        char *dev_name[] = { "omapdss_dss", "omapdss_dispc", "omapdss_rfbi",
-                "omapdss_venc", "omapdss_dsi1", "omapdss_dsi2",
-                "omapdss_hdmi" };
-        int oh_count;
+        const struct omap_dss_hwmod_data *curr_dss_hwmod;
 
         memset(&pdata, 0, sizeof(pdata));
 
-        if (cpu_is_omap24xx())
-                oh_count = ARRAY_SIZE(oh_name) - 3;
-                /* last 3 hwmod dev in oh_name are not available for omap2 */
-        else if (cpu_is_omap44xx())
-                oh_count = ARRAY_SIZE(oh_name);
-        else
-                oh_count = ARRAY_SIZE(oh_name) - 2;
-                /* last 2 hwmod dev in oh_name are not available for omap3 */
+        if (cpu_is_omap24xx()) {
+                curr_dss_hwmod = omap2_dss_hwmod_data;
+                oh_count = ARRAY_SIZE(omap2_dss_hwmod_data);
+        } else if (cpu_is_omap34xx()) {
+                curr_dss_hwmod = omap3_dss_hwmod_data;
+                oh_count = ARRAY_SIZE(omap3_dss_hwmod_data);
+        } else {
+                curr_dss_hwmod = omap4_dss_hwmod_data;
+                oh_count = ARRAY_SIZE(omap4_dss_hwmod_data);
+        }
 
         /* opt_clks are always associated with dss hwmod */
         oh_core = omap_hwmod_lookup("dss_core");
@@ -100,19 +121,21 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
         pdata.opt_clock_available = opt_clock_available;
 
         for (i = 0; i < oh_count; i++) {
-                oh = omap_hwmod_lookup(oh_name[i]);
+                oh = omap_hwmod_lookup(curr_dss_hwmod[i].oh_name);
                 if (!oh) {
-                        pr_err("Could not look up %s\n", oh_name[i]);
+                        pr_err("Could not look up %s\n",
+                                curr_dss_hwmod[i].oh_name);
                         return -ENODEV;
                 }
 
-                od = omap_device_build(dev_name[i], -1, oh, &pdata,
+                od = omap_device_build(curr_dss_hwmod[i].dev_name,
+                                curr_dss_hwmod[i].id, oh, &pdata,
                                 sizeof(struct omap_display_platform_data),
                                 omap_dss_latency,
                                 ARRAY_SIZE(omap_dss_latency), 0);
 
                 if (WARN((IS_ERR(od)), "Could not build omap_device for %s\n",
-                                oh_name[i]))
+                                curr_dss_hwmod[i].oh_name))
                         return -ENODEV;
         }
         omap_display_device.dev.platform_data = board_data;
diff --git a/arch/arm/mach-omap2/include/mach/board-zoom.h b/arch/arm/mach-omap2/include/mach/board-zoom.h
index d20bd9c1a106..775fdc3b000b 100644
--- a/arch/arm/mach-omap2/include/mach/board-zoom.h
+++ b/arch/arm/mach-omap2/include/mach/board-zoom.h
@@ -1,7 +1,7 @@
 /*
  * Defines for zoom boards
  */
-#include <plat/display.h>
+#include <video/omapdss.h>
 
 #define ZOOM_NAND_CS    0
 
diff --git a/arch/arm/mach-omap2/include/mach/omap4-common.h b/arch/arm/mach-omap2/include/mach/omap4-common.h
index de441c05a6a6..e4bd87619734 100644
--- a/arch/arm/mach-omap2/include/mach/omap4-common.h
+++ b/arch/arm/mach-omap2/include/mach/omap4-common.h
@@ -33,4 +33,11 @@ extern void __iomem *gic_dist_base_addr;
 extern void __init gic_init_irq(void);
 extern void omap_smc1(u32 fn, u32 arg);
 
+#ifdef CONFIG_SMP
+/* Needed for secondary core boot */
+extern void omap_secondary_startup(void);
+extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask);
+extern void omap_auxcoreboot_addr(u32 cpu_addr);
+extern u32 omap_read_auxcoreboot0(void);
+#endif
 #endif
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 237e4530abf2..3af2b7a1045e 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -73,83 +73,18 @@ static u32 intc_bank_read_reg(struct omap_irq_bank *bank, u16 reg)
         return __raw_readl(bank->base_reg + reg);
 }
 
-static int previous_irq;
-
-/*
- * On 34xx we can get occasional spurious interrupts if the ack from
- * an interrupt handler does not get posted before we unmask. Warn about
- * the interrupt handlers that need to flush posted writes.
- */
-static int omap_check_spurious(unsigned int irq)
-{
-        u32 sir, spurious;
-
-        sir = intc_bank_read_reg(&irq_banks[0], INTC_SIR);
-        spurious = sir >> 7;
-
-        if (spurious) {
-                printk(KERN_WARNING "Spurious irq %i: 0x%08x, please flush "
-                                        "posted write for irq %i\n",
-                                        irq, sir, previous_irq);
-                return spurious;
-        }
-
-        return 0;
-}
-
 /* XXX: FIQ and additional INTC support (only MPU at the moment) */
 static void omap_ack_irq(struct irq_data *d)
 {
         intc_bank_write_reg(0x1, &irq_banks[0], INTC_CONTROL);
 }
 
-static void omap_mask_irq(struct irq_data *d)
-{
-        unsigned int irq = d->irq;
-        int offset = irq & (~(IRQ_BITS_PER_REG - 1));
-
-        if (cpu_is_omap34xx() && !cpu_is_ti816x()) {
-                int spurious = 0;
-
-                /*
-                 * INT_34XX_GPT12_IRQ is also the spurious irq. Maybe because
-                 * it is the highest irq number?
-                 */
-                if (irq == INT_34XX_GPT12_IRQ)
-                        spurious = omap_check_spurious(irq);
-
-                if (!spurious)
-                        previous_irq = irq;
-        }
-
-        irq &= (IRQ_BITS_PER_REG - 1);
-
-        intc_bank_write_reg(1 << irq, &irq_banks[0], INTC_MIR_SET0 + offset);
-}
-
-static void omap_unmask_irq(struct irq_data *d)
-{
-        unsigned int irq = d->irq;
-        int offset = irq & (~(IRQ_BITS_PER_REG - 1));
-
-        irq &= (IRQ_BITS_PER_REG - 1);
-
-        intc_bank_write_reg(1 << irq, &irq_banks[0], INTC_MIR_CLEAR0 + offset);
-}
-
 static void omap_mask_ack_irq(struct irq_data *d)
 {
-        omap_mask_irq(d);
+        irq_gc_mask_disable_reg(d);
         omap_ack_irq(d);
 }
 
-static struct irq_chip omap_irq_chip = {
-        .name           = "INTC",
-        .irq_ack        = omap_mask_ack_irq,
-        .irq_mask       = omap_mask_irq,
-        .irq_unmask     = omap_unmask_irq,
-};
-
 static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank)
 {
         unsigned long tmp;
@@ -186,11 +121,31 @@ int omap_irq_pending(void)
         return 0;
 }
 
+static __init void
+omap_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num)
+{
+        struct irq_chip_generic *gc;
+        struct irq_chip_type *ct;
+
+        gc = irq_alloc_generic_chip("INTC", 1, irq_start, base,
+                                        handle_level_irq);
+        ct = gc->chip_types;
+        ct->chip.irq_ack = omap_mask_ack_irq;
+        ct->chip.irq_mask = irq_gc_mask_disable_reg;
+        ct->chip.irq_unmask = irq_gc_unmask_enable_reg;
+
+        ct->regs.ack = INTC_CONTROL;
+        ct->regs.enable = INTC_MIR_CLEAR0;
+        ct->regs.disable = INTC_MIR_SET0;
+        irq_setup_generic_chip(gc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,
+                                IRQ_NOREQUEST | IRQ_NOPROBE, 0);
+}
+
 void __init omap_init_irq(void)
 {
         unsigned long nr_of_irqs = 0;
         unsigned int nr_banks = 0;
-        int i;
+        int i, j;
 
         for (i = 0; i < ARRAY_SIZE(irq_banks); i++) {
                 unsigned long base = 0;
@@ -215,17 +170,15 @@ void __init omap_init_irq(void)
 
                 omap_irq_bank_init_one(bank);
 
+                for (i = 0, j = 0; i < bank->nr_irqs; i += 32, j += 0x20)
+                        omap_alloc_gc(bank->base_reg + j, i, 32);
+
                 nr_of_irqs += bank->nr_irqs;
                 nr_banks++;
         }
 
         printk(KERN_INFO "Total of %ld interrupts on %d active controller%s\n",
                nr_of_irqs, nr_banks, nr_banks > 1 ? "s" : "");
-
-        for (i = 0; i < nr_of_irqs; i++) {
-                irq_set_chip_and_handler(i, &omap_irq_chip, handle_level_irq);
-                set_irq_flags(i, IRQF_VALID);
-        }
 }
 
 #ifdef CONFIG_ARCH_OMAP3
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
index b66cfe8bc464..ecfe93c4b585 100644
--- a/arch/arm/mach-omap2/omap-smp.c
+++ b/arch/arm/mach-omap2/omap-smp.c
@@ -21,6 +21,7 @@
 #include <linux/io.h>
 
 #include <asm/cacheflush.h>
+#include <asm/hardware/gic.h>
 #include <asm/smp_scu.h>
 #include <mach/hardware.h>
 #include <mach/omap4-common.h>
@@ -63,7 +64,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
         omap_modify_auxcoreboot0(0x200, 0xfffffdff);
         flush_cache_all();
         smp_wmb();
-        smp_cross_call(cpumask_of(cpu), 1);
+        gic_raise_softirq(cpumask_of(cpu), 1);
 
         /*
          * Now the secondary core is starting up let it run its
@@ -118,6 +119,8 @@ void __init smp_init_cpus(void)
 
         for (i = 0; i < ncores; i++)
                 set_cpu_possible(i, true);
+
+        set_smp_cross_call(gic_raise_softirq);
 }
 
 void __init platform_smp_prepare_cpus(unsigned int max_cpus)
diff --git a/arch/arm/mach-omap2/pm_bus.c b/arch/arm/mach-omap2/pm_bus.c
deleted file mode 100644
index 5acd2ab298b1..000000000000
--- a/arch/arm/mach-omap2/pm_bus.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Runtime PM support code for OMAP
- *
- * Author: Kevin Hilman, Deep Root Systems, LLC
- *
- * Copyright (C) 2010 Texas Instruments, 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/kernel.h>
-#include <linux/io.h>
-#include <linux/pm_runtime.h>
-#include <linux/platform_device.h>
-#include <linux/mutex.h>
-
-#include <plat/omap_device.h>
-#include <plat/omap-pm.h>
-
-#ifdef CONFIG_PM_RUNTIME
-static int omap_pm_runtime_suspend(struct device *dev)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        int r, ret = 0;
-
-        dev_dbg(dev, "%s\n", __func__);
-
-        ret = pm_generic_runtime_suspend(dev);
-
-        if (!ret && dev->parent == &omap_device_parent) {
-                r = omap_device_idle(pdev);
-                WARN_ON(r);
-        }
-
-        return ret;
-};
-
-static int omap_pm_runtime_resume(struct device *dev)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        int r;
-
-        dev_dbg(dev, "%s\n", __func__);
-
-        if (dev->parent == &omap_device_parent) {
-                r = omap_device_enable(pdev);
-                WARN_ON(r);
-        }
-
-        return pm_generic_runtime_resume(dev);
-};
-#else
-#define omap_pm_runtime_suspend NULL
-#define omap_pm_runtime_resume NULL
-#endif /* CONFIG_PM_RUNTIME */
-
-static int __init omap_pm_runtime_init(void)
-{
-        const struct dev_pm_ops *pm;
-        struct dev_pm_ops *omap_pm;
-
-        pm = platform_bus_get_pm_ops();
-        if (!pm) {
-                pr_err("%s: unable to get dev_pm_ops from platform_bus\n",
-                        __func__);
-                return -ENODEV;
-        }
-
-        omap_pm = kmemdup(pm, sizeof(struct dev_pm_ops), GFP_KERNEL);
-        if (!omap_pm) {
-                pr_err("%s: unable to alloc memory for new dev_pm_ops\n",
-                        __func__);
-                return -ENOMEM;
-        }
-
-        omap_pm->runtime_suspend = omap_pm_runtime_suspend;
-        omap_pm->runtime_resume = omap_pm_runtime_resume;
-
-        platform_bus_set_pm_ops(omap_pm);
-
-        return 0;
-}
-core_initcall(omap_pm_runtime_init);
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 986c3bf4e6b8..0ab531d047fc 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -13,12 +13,11 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
 #include <linux/serial_8250.h>
 #include <linux/mbus.h>
-#include <linux/mv643xx_eth.h>
 #include <linux/mv643xx_i2c.h>
 #include <linux/ata_platform.h>
-#include <linux/spi/orion_spi.h>
 #include <net/dsa.h>
 #include <asm/page.h>
 #include <asm/setup.h>
@@ -29,11 +28,9 @@
 #include <mach/bridge-regs.h>
 #include <mach/hardware.h>
 #include <mach/orion5x.h>
-#include <plat/ehci-orion.h>
-#include <plat/mv_xor.h>
 #include <plat/orion_nand.h>
-#include <plat/orion_wdt.h>
 #include <plat/time.h>
+#include <plat/common.h>
 #include "common.h"
 
 /*****************************************************************************
@@ -70,530 +67,124 @@ void __init orion5x_map_io(void)
 
 
 /*****************************************************************************
- * EHCI
- ****************************************************************************/
-static struct orion_ehci_data orion5x_ehci_data = {
-        .dram           = &orion5x_mbus_dram_info,
-        .phy_version    = EHCI_PHY_ORION,
-};
-
-static u64 ehci_dmamask = 0xffffffffUL;
-
-
-/*****************************************************************************
  * EHCI0
  ****************************************************************************/
-static struct resource orion5x_ehci0_resources[] = {
-        {
-                .start  = ORION5X_USB0_PHYS_BASE,
-                .end    = ORION5X_USB0_PHYS_BASE + SZ_4K - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_ORION5X_USB0_CTRL,
-                .end    = IRQ_ORION5X_USB0_CTRL,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device orion5x_ehci0 = {
-        .name           = "orion-ehci",
-        .id             = 0,
-        .dev            = {
-                .dma_mask               = &ehci_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
-                .platform_data          = &orion5x_ehci_data,
-        },
-        .resource       = orion5x_ehci0_resources,
-        .num_resources  = ARRAY_SIZE(orion5x_ehci0_resources),
-};
-
 void __init orion5x_ehci0_init(void)
 {
-        platform_device_register(&orion5x_ehci0);
+        orion_ehci_init(&orion5x_mbus_dram_info,
+                        ORION5X_USB0_PHYS_BASE, IRQ_ORION5X_USB0_CTRL);
 }
 
 
 /*****************************************************************************
  * EHCI1
  ****************************************************************************/
-static struct resource orion5x_ehci1_resources[] = {
-        {
-                .start  = ORION5X_USB1_PHYS_BASE,
-                .end    = ORION5X_USB1_PHYS_BASE + SZ_4K - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_ORION5X_USB1_CTRL,
-                .end    = IRQ_ORION5X_USB1_CTRL,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device orion5x_ehci1 = {
-        .name           = "orion-ehci",
-        .id             = 1,
-        .dev            = {
-                .dma_mask               = &ehci_dmamask,
-                .coherent_dma_mask      = 0xffffffff,
-                .platform_data          = &orion5x_ehci_data,
-        },
-        .resource       = orion5x_ehci1_resources,
-        .num_resources  = ARRAY_SIZE(orion5x_ehci1_resources),
-};
-
 void __init orion5x_ehci1_init(void)
 {
-        platform_device_register(&orion5x_ehci1);
+        orion_ehci_1_init(&orion5x_mbus_dram_info,
+                          ORION5X_USB1_PHYS_BASE, IRQ_ORION5X_USB1_CTRL);
 }
 
 
 /*****************************************************************************
- * GigE
+ * GE00
  ****************************************************************************/
-struct mv643xx_eth_shared_platform_data orion5x_eth_shared_data = {
-        .dram           = &orion5x_mbus_dram_info,
-};
-
-static struct resource orion5x_eth_shared_resources[] = {
-        {
-                .start  = ORION5X_ETH_PHYS_BASE + 0x2000,
-                .end    = ORION5X_ETH_PHYS_BASE + 0x3fff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_ORION5X_ETH_ERR,
-                .end    = IRQ_ORION5X_ETH_ERR,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device orion5x_eth_shared = {
-        .name           = MV643XX_ETH_SHARED_NAME,
-        .id             = 0,
-        .dev            = {
-                .platform_data  = &orion5x_eth_shared_data,
-        },
-        .num_resources  = ARRAY_SIZE(orion5x_eth_shared_resources),
-        .resource       = orion5x_eth_shared_resources,
-};
-
-static struct resource orion5x_eth_resources[] = {
-        {
-                .name   = "eth irq",
-                .start  = IRQ_ORION5X_ETH_SUM,
-                .end    = IRQ_ORION5X_ETH_SUM,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device orion5x_eth = {
-        .name           = MV643XX_ETH_NAME,
-        .id             = 0,
-        .num_resources  = 1,
-        .resource       = orion5x_eth_resources,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-};
-
 void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)
 {
-        eth_data->shared = &orion5x_eth_shared;
-        orion5x_eth.dev.platform_data = eth_data;
-
-        platform_device_register(&orion5x_eth_shared);
-        platform_device_register(&orion5x_eth);
+        orion_ge00_init(eth_data, &orion5x_mbus_dram_info,
+                        ORION5X_ETH_PHYS_BASE, IRQ_ORION5X_ETH_SUM,
+                        IRQ_ORION5X_ETH_ERR, orion5x_tclk);
 }
 
 
 /*****************************************************************************
  * Ethernet switch
  ****************************************************************************/
-static struct resource orion5x_switch_resources[] = {
-        {
-                .start  = 0,
-                .end    = 0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device orion5x_switch_device = {
-        .name           = "dsa",
-        .id             = 0,
-        .num_resources  = 0,
-        .resource       = orion5x_switch_resources,
-};
-
 void __init orion5x_eth_switch_init(struct dsa_platform_data *d, int irq)
 {
-        int i;
-
-        if (irq != NO_IRQ) {
-                orion5x_switch_resources[0].start = irq;
-                orion5x_switch_resources[0].end = irq;
-                orion5x_switch_device.num_resources = 1;
-        }
-
-        d->netdev = &orion5x_eth.dev;
-        for (i = 0; i < d->nr_chips; i++)
-                d->chip[i].mii_bus = &orion5x_eth_shared.dev;
-        orion5x_switch_device.dev.platform_data = d;
-
-        platform_device_register(&orion5x_switch_device);
+        orion_ge00_switch_init(d, irq);
 }
 
 
 /*****************************************************************************
  * I2C
  ****************************************************************************/
-static struct mv64xxx_i2c_pdata orion5x_i2c_pdata = {
-        .freq_m         = 8, /* assumes 166 MHz TCLK */
-        .freq_n         = 3,
-        .timeout        = 1000, /* Default timeout of 1 second */
-};
-
-static struct resource orion5x_i2c_resources[] = {
-        {
-                .start  = I2C_PHYS_BASE,
-                .end    = I2C_PHYS_BASE + 0x1f,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_ORION5X_I2C,
-                .end    = IRQ_ORION5X_I2C,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device orion5x_i2c = {
-        .name           = MV64XXX_I2C_CTLR_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(orion5x_i2c_resources),
-        .resource       = orion5x_i2c_resources,
-        .dev            = {
-                .platform_data  = &orion5x_i2c_pdata,
-        },
-};
-
 void __init orion5x_i2c_init(void)
 {
-        platform_device_register(&orion5x_i2c);
+        orion_i2c_init(I2C_PHYS_BASE, IRQ_ORION5X_I2C, 8);
+
 }
 
 
 /*****************************************************************************
  * SATA
  ****************************************************************************/
-static struct resource orion5x_sata_resources[] = {
-        {
-                .name   = "sata base",
-                .start  = ORION5X_SATA_PHYS_BASE,
-                .end    = ORION5X_SATA_PHYS_BASE + 0x5000 - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "sata irq",
-                .start  = IRQ_ORION5X_SATA,
-                .end    = IRQ_ORION5X_SATA,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device orion5x_sata = {
-        .name           = "sata_mv",
-        .id             = 0,
-        .dev            = {
-                .coherent_dma_mask      = 0xffffffff,
-        },
-        .num_resources  = ARRAY_SIZE(orion5x_sata_resources),
-        .resource       = orion5x_sata_resources,
-};
-
 void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data)
 {
-        sata_data->dram = &orion5x_mbus_dram_info;
-        orion5x_sata.dev.platform_data = sata_data;
-        platform_device_register(&orion5x_sata);
+        orion_sata_init(sata_data, &orion5x_mbus_dram_info,
+                        ORION5X_SATA_PHYS_BASE, IRQ_ORION5X_SATA);
 }
 
 
 /*****************************************************************************
  * SPI
  ****************************************************************************/
-static struct orion_spi_info orion5x_spi_plat_data = {
-        .tclk                   = 0,
-        .enable_clock_fix       = 1,
-};
-
-static struct resource orion5x_spi_resources[] = {
-        {
-                .name   = "spi base",
-                .start  = SPI_PHYS_BASE,
-                .end    = SPI_PHYS_BASE + 0x1f,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device orion5x_spi = {
-        .name           = "orion_spi",
-        .id             = 0,
-        .dev            = {
-                .platform_data  = &orion5x_spi_plat_data,
-        },
-        .num_resources  = ARRAY_SIZE(orion5x_spi_resources),
-        .resource       = orion5x_spi_resources,
-};
-
 void __init orion5x_spi_init()
 {
-        platform_device_register(&orion5x_spi);
+        orion_spi_init(SPI_PHYS_BASE, orion5x_tclk);
 }
 
 
 /*****************************************************************************
  * UART0
  ****************************************************************************/
-static struct plat_serial8250_port orion5x_uart0_data[] = {
-        {
-                .mapbase        = UART0_PHYS_BASE,
-                .membase        = (char *)UART0_VIRT_BASE,
-                .irq            = IRQ_ORION5X_UART0,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = 0,
-        }, {
-        },
-};
-
-static struct resource orion5x_uart0_resources[] = {
-        {
-                .start          = UART0_PHYS_BASE,
-                .end            = UART0_PHYS_BASE + 0xff,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_ORION5X_UART0,
-                .end            = IRQ_ORION5X_UART0,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device orion5x_uart0 = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM,
-        .dev                    = {
-                .platform_data  = orion5x_uart0_data,
-        },
-        .resource               = orion5x_uart0_resources,
-        .num_resources          = ARRAY_SIZE(orion5x_uart0_resources),
-};
-
 void __init orion5x_uart0_init(void)
 {
-        platform_device_register(&orion5x_uart0);
+        orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE,
+                         IRQ_ORION5X_UART0, orion5x_tclk);
 }
 
-
 /*****************************************************************************
  * UART1
  ****************************************************************************/
-static struct plat_serial8250_port orion5x_uart1_data[] = {
-        {
-                .mapbase        = UART1_PHYS_BASE,
-                .membase        = (char *)UART1_VIRT_BASE,
-                .irq            = IRQ_ORION5X_UART1,
-                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
-                .iotype         = UPIO_MEM,
-                .regshift       = 2,
-                .uartclk        = 0,
-        }, {
-        },
-};
-
-static struct resource orion5x_uart1_resources[] = {
-        {
-                .start          = UART1_PHYS_BASE,
-                .end            = UART1_PHYS_BASE + 0xff,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_ORION5X_UART1,
-                .end            = IRQ_ORION5X_UART1,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device orion5x_uart1 = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM1,
-        .dev                    = {
-                .platform_data  = orion5x_uart1_data,
-        },
-        .resource               = orion5x_uart1_resources,
-        .num_resources          = ARRAY_SIZE(orion5x_uart1_resources),
-};
-
 void __init orion5x_uart1_init(void)
 {
-        platform_device_register(&orion5x_uart1);
+        orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE,
+                         IRQ_ORION5X_UART1, orion5x_tclk);
 }
 
-
 /*****************************************************************************
  * XOR engine
  ****************************************************************************/
-struct mv_xor_platform_shared_data orion5x_xor_shared_data = {
-        .dram           = &orion5x_mbus_dram_info,
-};
-
-static struct resource orion5x_xor_shared_resources[] = {
-        {
-                .name   = "xor low",
-                .start  = ORION5X_XOR_PHYS_BASE,
-                .end    = ORION5X_XOR_PHYS_BASE + 0xff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "xor high",
-                .start  = ORION5X_XOR_PHYS_BASE + 0x200,
-                .end    = ORION5X_XOR_PHYS_BASE + 0x2ff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device orion5x_xor_shared = {
-        .name           = MV_XOR_SHARED_NAME,
-        .id             = 0,
-        .dev            = {
-                .platform_data  = &orion5x_xor_shared_data,
-        },
-        .num_resources  = ARRAY_SIZE(orion5x_xor_shared_resources),
-        .resource       = orion5x_xor_shared_resources,
-};
-
-static u64 orion5x_xor_dmamask = DMA_BIT_MASK(32);
-
-static struct resource orion5x_xor0_resources[] = {
-        [0] = {
-                .start  = IRQ_ORION5X_XOR0,
-                .end    = IRQ_ORION5X_XOR0,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct mv_xor_platform_data orion5x_xor0_data = {
-        .shared         = &orion5x_xor_shared,
-        .hw_id          = 0,
-        .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device orion5x_xor0_channel = {
-        .name           = MV_XOR_NAME,
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(orion5x_xor0_resources),
-        .resource       = orion5x_xor0_resources,
-        .dev            = {
-                .dma_mask               = &orion5x_xor_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(64),
-                .platform_data          = &orion5x_xor0_data,
-        },
-};
-
-static struct resource orion5x_xor1_resources[] = {
-        [0] = {
-                .start  = IRQ_ORION5X_XOR1,
-                .end    = IRQ_ORION5X_XOR1,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct mv_xor_platform_data orion5x_xor1_data = {
-        .shared         = &orion5x_xor_shared,
-        .hw_id          = 1,
-        .pool_size      = PAGE_SIZE,
-};
-
-static struct platform_device orion5x_xor1_channel = {
-        .name           = MV_XOR_NAME,
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(orion5x_xor1_resources),
-        .resource       = orion5x_xor1_resources,
-        .dev            = {
-                .dma_mask               = &orion5x_xor_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(64),
-                .platform_data          = &orion5x_xor1_data,
-        },
-};
-
 void __init orion5x_xor_init(void)
 {
-        platform_device_register(&orion5x_xor_shared);
-
-        /*
-         * two engines can't do memset simultaneously, this limitation
-         * satisfied by removing memset support from one of the engines.
-         */
-        dma_cap_set(DMA_MEMCPY, orion5x_xor0_data.cap_mask);
-        dma_cap_set(DMA_XOR, orion5x_xor0_data.cap_mask);
-        platform_device_register(&orion5x_xor0_channel);
-
-        dma_cap_set(DMA_MEMCPY, orion5x_xor1_data.cap_mask);
-        dma_cap_set(DMA_MEMSET, orion5x_xor1_data.cap_mask);
-        dma_cap_set(DMA_XOR, orion5x_xor1_data.cap_mask);
-        platform_device_register(&orion5x_xor1_channel);
+        orion_xor0_init(&orion5x_mbus_dram_info,
+                        ORION5X_XOR_PHYS_BASE,
+                        ORION5X_XOR_PHYS_BASE + 0x200,
+                        IRQ_ORION5X_XOR0, IRQ_ORION5X_XOR1);
 }
 
-static struct resource orion5x_crypto_res[] = {
-        {
-                .name   = "regs",
-                .start  = ORION5X_CRYPTO_PHYS_BASE,
-                .end    = ORION5X_CRYPTO_PHYS_BASE + 0xffff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "sram",
-                .start  = ORION5X_SRAM_PHYS_BASE,
-                .end    = ORION5X_SRAM_PHYS_BASE + SZ_8K - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .name   = "crypto interrupt",
-                .start  = IRQ_ORION5X_CESA,
-                .end    = IRQ_ORION5X_CESA,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device orion5x_crypto_device = {
-        .name           = "mv_crypto",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(orion5x_crypto_res),
-        .resource       = orion5x_crypto_res,
-};
-
-static int __init orion5x_crypto_init(void)
+/*****************************************************************************
+ * Cryptographic Engines and Security Accelerator (CESA)
+ ****************************************************************************/
+static void __init orion5x_crypto_init(void)
 {
         int ret;
 
         ret = orion5x_setup_sram_win();
         if (ret)
-                return ret;
+                return;
 
-        return platform_device_register(&orion5x_crypto_device);
+        orion_crypto_init(ORION5X_CRYPTO_PHYS_BASE, ORION5X_SRAM_PHYS_BASE,
+                          SZ_8K, IRQ_ORION5X_CESA);
 }
 
 /*****************************************************************************
  * Watchdog
  ****************************************************************************/
-static struct orion_wdt_platform_data orion5x_wdt_data = {
-        .tclk                   = 0,
-};
-
-static struct platform_device orion5x_wdt_device = {
-        .name           = "orion_wdt",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &orion5x_wdt_data,
-        },
-        .num_resources  = 0,
-};
-
 void __init orion5x_wdt_init(void)
 {
-        orion5x_wdt_data.tclk = orion5x_tclk;
-        platform_device_register(&orion5x_wdt_device);
+        orion_wdt_init(orion5x_tclk);
 }
 
 
@@ -685,11 +276,6 @@ void __init orion5x_init(void)
         orion5x_id(&dev, &rev, &dev_name);
         printk(KERN_INFO "Orion ID: %s. TCLK=%d.\n", dev_name, orion5x_tclk);
 
-        orion5x_eth_shared_data.t_clk = orion5x_tclk;
-        orion5x_spi_plat_data.tclk = orion5x_tclk;
-        orion5x_uart0_data[0].uartclk = orion5x_tclk;
-        orion5x_uart1_data[0].uartclk = orion5x_tclk;
-
         /*
          * Setup Orion address map
          */
diff --git a/arch/arm/mach-orion5x/d2net-setup.c b/arch/arm/mach-orion5x/d2net-setup.c
index 425807579303..19cf5bf99f1b 100644
--- a/arch/arm/mach-orion5x/d2net-setup.c
+++ b/arch/arm/mach-orion5x/d2net-setup.c
@@ -267,28 +267,28 @@ static struct platform_device d2net_gpio_buttons = {
  * General Setup
  ****************************************************************************/
 
-static struct orion5x_mpp_mode d2net_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },       /* Board ID (bit 0) */
-        {  1, MPP_GPIO },       /* Board ID (bit 1) */
-        {  2, MPP_GPIO },       /* Board ID (bit 2) */
-        {  3, MPP_GPIO },       /* SATA 0 power */
-        {  4, MPP_UNUSED },
-        {  5, MPP_GPIO },       /* Fan fail detection */
-        {  6, MPP_GPIO },       /* Red front LED */
-        {  7, MPP_UNUSED },
-        {  8, MPP_GPIO },       /* Rear power switch (on|auto) */
-        {  9, MPP_GPIO },       /* Rear power switch (auto|off) */
-        { 10, MPP_UNUSED },
-        { 11, MPP_UNUSED },
-        { 12, MPP_GPIO },       /* SATA 1 power */
-        { 13, MPP_UNUSED },
-        { 14, MPP_SATA_LED },   /* SATA 0 active */
-        { 15, MPP_SATA_LED },   /* SATA 1 active */
-        { 16, MPP_GPIO },       /* Blue front LED blink control */
-        { 17, MPP_UNUSED },
-        { 18, MPP_GPIO },       /* Front button (0 = Released, 1 = Pushed ) */
-        { 19, MPP_UNUSED },
-        { -1 }
+static unsigned int d2net_mpp_modes[] __initdata = {
+        MPP0_GPIO,      /* Board ID (bit 0) */
+        MPP1_GPIO,      /* Board ID (bit 1) */
+        MPP2_GPIO,      /* Board ID (bit 2) */
+        MPP3_GPIO,      /* SATA 0 power */
+        MPP4_UNUSED,
+        MPP5_GPIO,      /* Fan fail detection */
+        MPP6_GPIO,      /* Red front LED */
+        MPP7_UNUSED,
+        MPP8_GPIO,      /* Rear power switch (on|auto) */
+        MPP9_GPIO,      /* Rear power switch (auto|off) */
+        MPP10_UNUSED,
+        MPP11_UNUSED,
+        MPP12_GPIO,     /* SATA 1 power */
+        MPP13_UNUSED,
+        MPP14_SATA_LED, /* SATA 0 active */
+        MPP15_SATA_LED, /* SATA 1 active */
+        MPP16_GPIO,     /* Blue front LED blink control */
+        MPP17_UNUSED,
+        MPP18_GPIO,     /* Front button (0 = Released, 1 = Pushed ) */
+        MPP19_UNUSED,
+        0,
         /* 22: USB port 1 fuse (0 = Fail, 1 = Ok) */
         /* 23: Blue front LED off */
         /* 24: Inhibit board power off (0 = Disabled, 1 = Enabled) */
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index b7d4591214e0..f95d3cb01cbf 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -298,28 +298,28 @@ static struct i2c_board_info __initdata db88f5281_i2c_rtc = {
 /*****************************************************************************
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode db88f5281_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* USB Over Current */
-        {  1, MPP_GPIO },               /* USB Vbat input */
-        {  2, MPP_PCI_ARB },            /* PCI_REQn[2] */
-        {  3, MPP_PCI_ARB },            /* PCI_GNTn[2] */
-        {  4, MPP_PCI_ARB },            /* PCI_REQn[3] */
-        {  5, MPP_PCI_ARB },            /* PCI_GNTn[3] */
-        {  6, MPP_GPIO },               /* JP0, CON17.2 */
-        {  7, MPP_GPIO },               /* JP1, CON17.1 */
-        {  8, MPP_GPIO },               /* JP2, CON11.2 */
-        {  9, MPP_GPIO },               /* JP3, CON11.3 */
-        { 10, MPP_GPIO },               /* RTC int */
-        { 11, MPP_GPIO },               /* Baud Rate Generator */
-        { 12, MPP_GPIO },               /* PCI int 1 */
-        { 13, MPP_GPIO },               /* PCI int 2 */
-        { 14, MPP_NAND },               /* NAND_REn[2] */
-        { 15, MPP_NAND },               /* NAND_WEn[2] */
-        { 16, MPP_UART },               /* UART1_RX */
-        { 17, MPP_UART },               /* UART1_TX */
-        { 18, MPP_UART },               /* UART1_CTSn */
-        { 19, MPP_UART },               /* UART1_RTSn */
-        { -1 },
+static unsigned int db88f5281_mpp_modes[] __initdata = {
+        MPP0_GPIO,              /* USB Over Current */
+        MPP1_GPIO,              /* USB Vbat input */
+        MPP2_PCI_ARB,           /* PCI_REQn[2] */
+        MPP3_PCI_ARB,           /* PCI_GNTn[2] */
+        MPP4_PCI_ARB,           /* PCI_REQn[3] */
+        MPP5_PCI_ARB,           /* PCI_GNTn[3] */
+        MPP6_GPIO,              /* JP0, CON17.2 */
+        MPP7_GPIO,              /* JP1, CON17.1 */
+        MPP8_GPIO,              /* JP2, CON11.2 */
+        MPP9_GPIO,              /* JP3, CON11.3 */
+        MPP10_GPIO,             /* RTC int */
+        MPP11_GPIO,             /* Baud Rate Generator */
+        MPP12_GPIO,             /* PCI int 1 */
+        MPP13_GPIO,             /* PCI int 2 */
+        MPP14_NAND,             /* NAND_REn[2] */
+        MPP15_NAND,             /* NAND_WEn[2] */
+        MPP16_UART,             /* UART1_RX */
+        MPP17_UART,             /* UART1_TX */
+        MPP18_UART,             /* UART1_CTSn */
+        MPP19_UART,             /* UART1_RTSn */
+        0,
 };
 
 static void __init db88f5281_init(void)
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 90ab022eabeb..855e0e77d563 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -385,76 +385,76 @@ static struct mv_sata_platform_data dns323_sata_data = {
 /****************************************************************************
  * General Setup
  */
-static struct orion5x_mpp_mode dns323a_mpp_modes[] __initdata = {
-        {  0, MPP_PCIE_RST_OUTn },
-        {  1, MPP_GPIO },               /* right amber LED (sata ch0) */
-        {  2, MPP_GPIO },               /* left amber LED (sata ch1) */
-        {  3, MPP_UNUSED },
-        {  4, MPP_GPIO },               /* power button LED */
-        {  5, MPP_GPIO },               /* power button LED */
-        {  6, MPP_GPIO },               /* GMT G751-2f overtemp */
-        {  7, MPP_GPIO },               /* M41T80 nIRQ/OUT/SQW */
-        {  8, MPP_GPIO },               /* triggers power off */
-        {  9, MPP_GPIO },               /* power button switch */
-        { 10, MPP_GPIO },               /* reset button switch */
-        { 11, MPP_UNUSED },
-        { 12, MPP_UNUSED },
-        { 13, MPP_UNUSED },
-        { 14, MPP_UNUSED },
-        { 15, MPP_UNUSED },
-        { 16, MPP_UNUSED },
-        { 17, MPP_UNUSED },
-        { 18, MPP_UNUSED },
-        { 19, MPP_UNUSED },
-        { -1 },
+static unsigned int dns323a_mpp_modes[] __initdata = {
+        MPP0_PCIE_RST_OUTn,
+        MPP1_GPIO,              /* right amber LED (sata ch0) */
+        MPP2_GPIO,              /* left amber LED (sata ch1) */
+        MPP3_UNUSED,
+        MPP4_GPIO,              /* power button LED */
+        MPP5_GPIO,              /* power button LED */
+        MPP6_GPIO,              /* GMT G751-2f overtemp */
+        MPP7_GPIO,              /* M41T80 nIRQ/OUT/SQW */
+        MPP8_GPIO,              /* triggers power off */
+        MPP9_GPIO,              /* power button switch */
+        MPP10_GPIO,             /* reset button switch */
+        MPP11_UNUSED,
+        MPP12_UNUSED,
+        MPP13_UNUSED,
+        MPP14_UNUSED,
+        MPP15_UNUSED,
+        MPP16_UNUSED,
+        MPP17_UNUSED,
+        MPP18_UNUSED,
+        MPP19_UNUSED,
+        0,
 };
 
-static struct orion5x_mpp_mode dns323b_mpp_modes[] __initdata = {
-        {  0, MPP_UNUSED },
-        {  1, MPP_GPIO },               /* right amber LED (sata ch0) */
-        {  2, MPP_GPIO },               /* left amber LED (sata ch1) */
-        {  3, MPP_GPIO },               /* system up flag */
-        {  4, MPP_GPIO },               /* power button LED */
-        {  5, MPP_GPIO },               /* power button LED */
-        {  6, MPP_GPIO },               /* GMT G751-2f overtemp */
-        {  7, MPP_GPIO },               /* M41T80 nIRQ/OUT/SQW */
-        {  8, MPP_GPIO },               /* triggers power off */
-        {  9, MPP_GPIO },               /* power button switch */
-        { 10, MPP_GPIO },               /* reset button switch */
-        { 11, MPP_UNUSED },
-        { 12, MPP_SATA_LED },
-        { 13, MPP_SATA_LED },
-        { 14, MPP_SATA_LED },
-        { 15, MPP_SATA_LED },
-        { 16, MPP_UNUSED },
-        { 17, MPP_UNUSED },
-        { 18, MPP_UNUSED },
-        { 19, MPP_UNUSED },
-        { -1 },
+static unsigned int dns323b_mpp_modes[] __initdata = {
+        MPP0_UNUSED,
+        MPP1_GPIO,              /* right amber LED (sata ch0) */
+        MPP2_GPIO,              /* left amber LED (sata ch1) */
+        MPP3_GPIO,              /* system up flag */
+        MPP4_GPIO,              /* power button LED */
+        MPP5_GPIO,              /* power button LED */
+        MPP6_GPIO,              /* GMT G751-2f overtemp */
+        MPP7_GPIO,              /* M41T80 nIRQ/OUT/SQW */
+        MPP8_GPIO,              /* triggers power off */
+        MPP9_GPIO,              /* power button switch */
+        MPP10_GPIO,             /* reset button switch */
+        MPP11_UNUSED,
+        MPP12_SATA_LED,
+        MPP13_SATA_LED,
+        MPP14_SATA_LED,
+        MPP15_SATA_LED,
+        MPP16_UNUSED,
+        MPP17_UNUSED,
+        MPP18_UNUSED,
+        MPP19_UNUSED,
+        0,
 };
 
-static struct orion5x_mpp_mode dns323c_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* ? input */
-        {  1, MPP_GPIO },               /* input power switch (0 = pressed) */
-        {  2, MPP_GPIO },               /* output power off */
-        {  3, MPP_UNUSED },             /* ? output */
-        {  4, MPP_UNUSED },             /* ? output */
-        {  5, MPP_UNUSED },             /* ? output */
-        {  6, MPP_UNUSED },             /* ? output */
-        {  7, MPP_UNUSED },             /* ? output */
-        {  8, MPP_GPIO },               /* i/o right amber LED */
-        {  9, MPP_GPIO },               /* i/o left amber LED */
-        { 10, MPP_GPIO },               /* input */
-        { 11, MPP_UNUSED },
-        { 12, MPP_SATA_LED },
-        { 13, MPP_SATA_LED },
-        { 14, MPP_SATA_LED },
-        { 15, MPP_SATA_LED },
-        { 16, MPP_UNUSED },
-        { 17, MPP_GPIO },               /* power button LED */
-        { 18, MPP_GPIO },               /* fan speed bit 0 */
-        { 19, MPP_GPIO },               /* fan speed bit 1 */
-        { -1 },
+static unsigned int dns323c_mpp_modes[] __initdata = {
+        MPP0_GPIO,              /* ? input */
+        MPP1_GPIO,              /* input power switch (0 = pressed) */
+        MPP2_GPIO,              /* output power off */
+        MPP3_UNUSED,            /* ? output */
+        MPP4_UNUSED,            /* ? output */
+        MPP5_UNUSED,            /* ? output */
+        MPP6_UNUSED,            /* ? output */
+        MPP7_UNUSED,            /* ? output */
+        MPP8_GPIO,              /* i/o right amber LED */
+        MPP9_GPIO,              /* i/o left amber LED */
+        MPP10_GPIO,             /* input */
+        MPP11_UNUSED,
+        MPP12_SATA_LED,
+        MPP13_SATA_LED,
+        MPP14_SATA_LED,
+        MPP15_SATA_LED,
+        MPP16_UNUSED,
+        MPP17_GPIO,             /* power button LED */
+        MPP18_GPIO,             /* fan speed bit 0 */
+        MPP19_GPIO,             /* fan speed bit 1 */
+        0,
 };
 
 /* Rev C1 Fan speed notes:
diff --git a/arch/arm/mach-orion5x/edmini_v2-setup.c b/arch/arm/mach-orion5x/edmini_v2-setup.c
index d037a90c216c..b67cff0d4cfe 100644
--- a/arch/arm/mach-orion5x/edmini_v2-setup.c
+++ b/arch/arm/mach-orion5x/edmini_v2-setup.c
@@ -180,31 +180,31 @@ static struct platform_device edmini_v2_gpio_buttons = {
 /*****************************************************************************
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode edminiv2_mpp_modes[] __initdata = {
-        {  0, MPP_UNUSED },
-        {  1, MPP_UNUSED },
-        {  2, MPP_UNUSED },
-        {  3, MPP_GPIO },       /* RTC interrupt */
-        {  4, MPP_UNUSED },
-        {  5, MPP_UNUSED },
-        {  6, MPP_UNUSED },
-        {  7, MPP_UNUSED },
-        {  8, MPP_UNUSED },
-        {  9, MPP_UNUSED },
-        { 10, MPP_UNUSED },
-        { 11, MPP_UNUSED },
-        { 12, MPP_SATA_LED },   /* SATA 0 presence */
-        { 13, MPP_SATA_LED },   /* SATA 1 presence */
-        { 14, MPP_SATA_LED },   /* SATA 0 active */
-        { 15, MPP_SATA_LED },   /* SATA 1 active */
+static unsigned int edminiv2_mpp_modes[] __initdata = {
+        MPP0_UNUSED,
+        MPP1_UNUSED,
+        MPP2_UNUSED,
+        MPP3_GPIO,      /* RTC interrupt */
+        MPP4_UNUSED,
+        MPP5_UNUSED,
+        MPP6_UNUSED,
+        MPP7_UNUSED,
+        MPP8_UNUSED,
+        MPP9_UNUSED,
+        MPP10_UNUSED,
+        MPP11_UNUSED,
+        MPP12_SATA_LED, /* SATA 0 presence */
+        MPP13_SATA_LED, /* SATA 1 presence */
+        MPP14_SATA_LED, /* SATA 0 active */
+        MPP15_SATA_LED, /* SATA 1 active */
         /* 16: Power LED control (0 = On, 1 = Off) */
-        { 16, MPP_GPIO },
+        MPP16_GPIO,
         /* 17: Power LED control select (0 = CPLD, 1 = GPIO16) */
-        { 17, MPP_GPIO },
+        MPP17_GPIO,
         /* 18: Power button status (0 = Released, 1 = Pressed) */
-        { 18, MPP_GPIO },
-        { 19, MPP_UNUSED },
-        { -1 }
+        MPP18_GPIO,
+        MPP19_UNUSED,
+        0,
 };
 
 static void __init edmini_v2_init(void)
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 47497c76162a..c0eb6462633f 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -315,28 +315,28 @@ static void kurobox_pro_power_off(void)
 /*****************************************************************************
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode kurobox_pro_mpp_modes[] __initdata = {
-        {  0, MPP_UNUSED },
-        {  1, MPP_UNUSED },
-        {  2, MPP_GPIO },               /* GPIO Micon */
-        {  3, MPP_GPIO },               /* GPIO Rtc */
-        {  4, MPP_UNUSED },
-        {  5, MPP_UNUSED },
-        {  6, MPP_NAND },               /* NAND Flash REn */
-        {  7, MPP_NAND },               /* NAND Flash WEn */
-        {  8, MPP_UNUSED },
-        {  9, MPP_UNUSED },
-        { 10, MPP_UNUSED },
-        { 11, MPP_UNUSED },
-        { 12, MPP_SATA_LED },           /* SATA 0 presence */
-        { 13, MPP_SATA_LED },           /* SATA 1 presence */
-        { 14, MPP_SATA_LED },           /* SATA 0 active */
-        { 15, MPP_SATA_LED },           /* SATA 1 active */
-        { 16, MPP_UART },               /* UART1 RXD */
-        { 17, MPP_UART },               /* UART1 TXD */
-        { 18, MPP_UART },               /* UART1 CTSn */
-        { 19, MPP_UART },               /* UART1 RTSn */
-        { -1 },
+static unsigned int kurobox_pro_mpp_modes[] __initdata = {
+        MPP0_UNUSED,
+        MPP1_UNUSED,
+        MPP2_GPIO,              /* GPIO Micon */
+        MPP3_GPIO,              /* GPIO Rtc */
+        MPP4_UNUSED,
+        MPP5_UNUSED,
+        MPP6_NAND,              /* NAND Flash REn */
+        MPP7_NAND,              /* NAND Flash WEn */
+        MPP8_UNUSED,
+        MPP9_UNUSED,
+        MPP10_UNUSED,
+        MPP11_UNUSED,
+        MPP12_SATA_LED,         /* SATA 0 presence */
+        MPP13_SATA_LED,         /* SATA 1 presence */
+        MPP14_SATA_LED,         /* SATA 0 active */
+        MPP15_SATA_LED,         /* SATA 1 active */
+        MPP16_UART,             /* UART1 RXD */
+        MPP17_UART,             /* UART1 TXD */
+        MPP18_UART,             /* UART1 CTSn */
+        MPP19_UART,             /* UART1 RTSn */
+        0,
 };
 
 static void __init kurobox_pro_init(void)
diff --git a/arch/arm/mach-orion5x/ls-chl-setup.c b/arch/arm/mach-orion5x/ls-chl-setup.c
index 6ae12aa6d759..5065803ca82a 100644
--- a/arch/arm/mach-orion5x/ls-chl-setup.c
+++ b/arch/arm/mach-orion5x/ls-chl-setup.c
@@ -251,28 +251,28 @@ static struct platform_device lschl_fan_device = {
  * GPIO Data
  ****************************************************************************/
 
-static struct orion5x_mpp_mode lschl_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO }, /* LED POWER */
-        {  1, MPP_GPIO }, /* HDD POWER */
-        {  2, MPP_GPIO }, /* LED ALARM */
-        {  3, MPP_GPIO }, /* LED INFO */
-        {  4, MPP_UNUSED },
-        {  5, MPP_UNUSED },
-        {  6, MPP_GPIO }, /* FAN LOCK */
-        {  7, MPP_GPIO }, /* SW INIT */
-        {  8, MPP_GPIO }, /* SW POWER */
-        {  9, MPP_GPIO }, /* USB POWER */
-        { 10, MPP_GPIO }, /* SW AUTO POWER */
-        { 11, MPP_UNUSED },
-        { 12, MPP_UNUSED },
-        { 13, MPP_UNUSED },
-        { 14, MPP_GPIO }, /* FAN HIGH */
-        { 15, MPP_GPIO }, /* SW FUNC */
-        { 16, MPP_GPIO }, /* FAN LOW */
-        { 17, MPP_GPIO }, /* LED FUNC */
-        { 18, MPP_UNUSED },
-        { 19, MPP_UNUSED },
-        { -1 },
+static unsigned int lschl_mpp_modes[] __initdata = {
+        MPP0_GPIO, /* LED POWER */
+        MPP1_GPIO, /* HDD POWER */
+        MPP2_GPIO, /* LED ALARM */
+        MPP3_GPIO, /* LED INFO */
+        MPP4_UNUSED,
+        MPP5_UNUSED,
+        MPP6_GPIO, /* FAN LOCK */
+        MPP7_GPIO, /* SW INIT */
+        MPP8_GPIO, /* SW POWER */
+        MPP9_GPIO, /* USB POWER */
+        MPP10_GPIO, /* SW AUTO POWER */
+        MPP11_UNUSED,
+        MPP12_UNUSED,
+        MPP13_UNUSED,
+        MPP14_GPIO, /* FAN HIGH */
+        MPP15_GPIO, /* SW FUNC */
+        MPP16_GPIO, /* FAN LOW */
+        MPP17_GPIO, /* LED FUNC */
+        MPP18_UNUSED,
+        MPP19_UNUSED,
+        0,
 };
 
 static void __init lschl_init(void)
diff --git a/arch/arm/mach-orion5x/ls_hgl-setup.c b/arch/arm/mach-orion5x/ls_hgl-setup.c
index 7adafd79cf98..8503d0a42d41 100644
--- a/arch/arm/mach-orion5x/ls_hgl-setup.c
+++ b/arch/arm/mach-orion5x/ls_hgl-setup.c
@@ -200,28 +200,28 @@ static void ls_hgl_power_off(void)
 
 #define LS_HGL_GPIO_HDD_POWER   1
 
-static struct orion5x_mpp_mode ls_hgl_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO }, /* LED_PWR */
-        {  1, MPP_GPIO }, /* HDD_PWR */
-        {  2, MPP_GPIO }, /* LED_ALARM */
-        {  3, MPP_GPIO }, /* LED_INFO */
-        {  4, MPP_UNUSED },
-        {  5, MPP_UNUSED },
-        {  6, MPP_GPIO }, /* FAN_LCK */
-        {  7, MPP_GPIO }, /* INIT */
-        {  8, MPP_GPIO }, /* POWER */
-        {  9, MPP_GPIO }, /* USB_PWR */
-        { 10, MPP_GPIO }, /* AUTO_POWER */
-        { 11, MPP_UNUSED }, /* LED_ETH (dummy) */
-        { 12, MPP_UNUSED },
-        { 13, MPP_UNUSED },
-        { 14, MPP_UNUSED },
-        { 15, MPP_GPIO }, /* FUNC */
-        { 16, MPP_UNUSED },
-        { 17, MPP_GPIO }, /* LED_FUNC */
-        { 18, MPP_UNUSED },
-        { 19, MPP_UNUSED },
-        { -1 },
+static unsigned int ls_hgl_mpp_modes[] __initdata = {
+        MPP0_GPIO, /* LED_PWR */
+        MPP1_GPIO, /* HDD_PWR */
+        MPP2_GPIO, /* LED_ALARM */
+        MPP3_GPIO, /* LED_INFO */
+        MPP4_UNUSED,
+        MPP5_UNUSED,
+        MPP6_GPIO, /* FAN_LCK */
+        MPP7_GPIO, /* INIT */
+        MPP8_GPIO, /* POWER */
+        MPP9_GPIO, /* USB_PWR */
+        MPP10_GPIO, /* AUTO_POWER */
+        MPP11_UNUSED, /* LED_ETH (dummy) */
+        MPP12_UNUSED,
+        MPP13_UNUSED,
+        MPP14_UNUSED,
+        MPP15_GPIO, /* FUNC */
+        MPP16_UNUSED,
+        MPP17_GPIO, /* LED_FUNC */
+        MPP18_UNUSED,
+        MPP19_UNUSED,
+        0,
 };
 
 static void __init ls_hgl_init(void)
diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c
index 869958f5c394..9c82723c05c0 100644
--- a/arch/arm/mach-orion5x/lsmini-setup.c
+++ b/arch/arm/mach-orion5x/lsmini-setup.c
@@ -201,28 +201,28 @@ static void lsmini_power_off(void)
 #define LSMINI_GPIO_HDD_POWER0  1
 #define LSMINI_GPIO_HDD_POWER1  19
 
-static struct orion5x_mpp_mode lsmini_mpp_modes[] __initdata = {
-        {  0, MPP_UNUSED }, /* LED_RESERVE1 (unused) */
-        {  1, MPP_GPIO }, /* HDD_PWR */
-        {  2, MPP_GPIO }, /* LED_ALARM */
-        {  3, MPP_GPIO }, /* LED_INFO */
-        {  4, MPP_UNUSED },
-        {  5, MPP_UNUSED },
-        {  6, MPP_UNUSED },
-        {  7, MPP_UNUSED },
-        {  8, MPP_UNUSED },
-        {  9, MPP_GPIO }, /* LED_FUNC */
-        { 10, MPP_UNUSED },
-        { 11, MPP_UNUSED }, /* LED_ETH (dummy) */
-        { 12, MPP_UNUSED },
-        { 13, MPP_UNUSED },
-        { 14, MPP_GPIO }, /* LED_PWR */
-        { 15, MPP_GPIO }, /* FUNC */
-        { 16, MPP_GPIO }, /* USB_PWR */
-        { 17, MPP_GPIO }, /* AUTO_POWER */
-        { 18, MPP_GPIO }, /* POWER */
-        { 19, MPP_GPIO }, /* HDD_PWR1 */
-        { -1 },
+static unsigned int lsmini_mpp_modes[] __initdata = {
+        MPP0_UNUSED, /* LED_RESERVE1 (unused) */
+        MPP1_GPIO, /* HDD_PWR */
+        MPP2_GPIO, /* LED_ALARM */
+        MPP3_GPIO, /* LED_INFO */
+        MPP4_UNUSED,
+        MPP5_UNUSED,
+        MPP6_UNUSED,
+        MPP7_UNUSED,
+        MPP8_UNUSED,
+        MPP9_GPIO, /* LED_FUNC */
+        MPP10_UNUSED,
+        MPP11_UNUSED, /* LED_ETH (dummy) */
+        MPP12_UNUSED,
+        MPP13_UNUSED,
+        MPP14_GPIO, /* LED_PWR */
+        MPP15_GPIO, /* FUNC */
+        MPP16_GPIO, /* USB_PWR */
+        MPP17_GPIO, /* AUTO_POWER */
+        MPP18_GPIO, /* POWER */
+        MPP19_GPIO, /* HDD_PWR1 */
+        0,
 };
 
 static void __init lsmini_init(void)
diff --git a/arch/arm/mach-orion5x/mpp.c b/arch/arm/mach-orion5x/mpp.c
index 2288207726e4..f12c41b98d46 100644
--- a/arch/arm/mach-orion5x/mpp.c
+++ b/arch/arm/mach-orion5x/mpp.c
@@ -12,154 +12,34 @@
 #include <linux/init.h>
 #include <linux/mbus.h>
 #include <linux/io.h>
-#include <asm/gpio.h>
 #include <mach/hardware.h>
-#include "common.h"
+#include <plat/mpp.h>
 #include "mpp.h"
+#include "common.h"
 
-static int is_5181l(void)
-{
-        u32 dev;
-        u32 rev;
-
-        orion5x_pcie_id(&dev, &rev);
-
-        return !!(dev == MV88F5181_DEV_ID && rev >= MV88F5181L_REV_A0);
-}
-
-static int is_5182(void)
+static unsigned int __init orion5x_variant(void)
 {
         u32 dev;
         u32 rev;
 
         orion5x_pcie_id(&dev, &rev);
 
-        return !!(dev == MV88F5182_DEV_ID);
-}
+        if (dev == MV88F5181_DEV_ID && rev >= MV88F5181L_REV_A0)
+                return MPP_F5181_MASK;
 
-static int is_5281(void)
-{
-        u32 dev;
-        u32 rev;
+        if (dev == MV88F5182_DEV_ID)
+                return MPP_F5182_MASK;
 
-        orion5x_pcie_id(&dev, &rev);
+        if (dev == MV88F5281_DEV_ID)
+                return MPP_F5281_MASK;
 
-        return !!(dev == MV88F5281_DEV_ID);
+        printk(KERN_ERR "MPP setup: unknown orion5x variant "
+               "(dev %#x rev %#x)\n", dev, rev);
+        return 0;
 }
 
-static int __init determine_type_encoding(int mpp, enum orion5x_mpp_type type)
+void __init orion5x_mpp_conf(unsigned int *mpp_list)
 {
-        switch (type) {
-        case MPP_UNUSED:
-        case MPP_GPIO:
-                if (mpp == 0)
-                        return 3;
-                if (mpp >= 1 && mpp <= 15)
-                        return 0;
-                if (mpp >= 16 && mpp <= 19) {
-                        if (is_5182())
-                                return 5;
-                        if (type == MPP_UNUSED)
-                                return 0;
-                }
-                return -1;
-
-        case MPP_PCIE_RST_OUTn:
-                if (mpp == 0)
-                        return 0;
-                return -1;
-
-        case MPP_PCI_ARB:
-                if (mpp >= 0 && mpp <= 7)
-                        return 2;
-                return -1;
-
-        case MPP_PCI_PMEn:
-                if (mpp == 2)
-                        return 3;
-                return -1;
-
-        case MPP_GIGE:
-                if (mpp >= 8 && mpp <= 19)
-                        return 1;
-                return -1;
-
-        case MPP_NAND:
-                if (is_5182() || is_5281()) {
-                        if (mpp >= 4 && mpp <= 7)
-                                return 4;
-                        if (mpp >= 12 && mpp <= 17)
-                                return 4;
-                }
-                return -1;
-
-        case MPP_PCI_CLK:
-                if (is_5181l() && mpp >= 6 && mpp <= 7)
-                        return 5;
-                return -1;
-
-        case MPP_SATA_LED:
-                if (is_5182()) {
-                        if (mpp >= 4 && mpp <= 7)
-                                return 5;
-                        if (mpp >= 12 && mpp <= 15)
-                                return 5;
-                }
-                return -1;
-
-        case MPP_UART:
-                if (mpp >= 16 && mpp <= 19)
-                        return 0;
-                return -1;
-        }
-
-        printk(KERN_INFO "unknown MPP type %d\n", type);
-
-        return -1;
-}
-
-void __init orion5x_mpp_conf(struct orion5x_mpp_mode *mode)
-{
-        u32 mpp_0_7_ctrl = readl(MPP_0_7_CTRL);
-        u32 mpp_8_15_ctrl = readl(MPP_8_15_CTRL);
-        u32 mpp_16_19_ctrl = readl(MPP_16_19_CTRL);
-
-        for ( ; mode->mpp >= 0; mode++) {
-                u32 *reg;
-                int num_type;
-                int shift;
-
-                if (mode->mpp >= 0 && mode->mpp <= 7)
-                        reg = &mpp_0_7_ctrl;
-                else if (mode->mpp >= 8 && mode->mpp <= 15)
-                        reg = &mpp_8_15_ctrl;
-                else if (mode->mpp >= 16 && mode->mpp <= 19)
-                        reg = &mpp_16_19_ctrl;
-                else {
-                        printk(KERN_ERR "orion5x_mpp_conf: invalid MPP "
-                                        "(%d)\n", mode->mpp);
-                        continue;
-                }
-
-                num_type = determine_type_encoding(mode->mpp, mode->type);
-                if (num_type < 0) {
-                        printk(KERN_ERR "orion5x_mpp_conf: invalid MPP "
-                                        "combination (%d, %d)\n", mode->mpp,
-                                        mode->type);
-                        continue;
-                }
-
-                shift = (mode->mpp & 7) << 2;
-                *reg &= ~(0xf << shift);
-                *reg |= (num_type & 0xf) << shift;
-
-                if (mode->type == MPP_UNUSED && (mode->mpp < 16 || is_5182()))
-                        orion_gpio_set_unused(mode->mpp);
-
-                orion_gpio_set_valid(mode->mpp, !!(mode->type == MPP_GPIO));
-        }
-
-        writel(mpp_0_7_ctrl, MPP_0_7_CTRL);
-        writel(mpp_8_15_ctrl, MPP_8_15_CTRL);
-        writel(mpp_16_19_ctrl, MPP_16_19_CTRL);
+        orion_mpp_conf(mpp_list, orion5x_variant(),
+                       MPP_MAX, ORION5X_DEV_BUS_VIRT_BASE);
 }
diff --git a/arch/arm/mach-orion5x/mpp.h b/arch/arm/mach-orion5x/mpp.h
index 290e610dc012..eac68978a2c2 100644
--- a/arch/arm/mach-orion5x/mpp.h
+++ b/arch/arm/mach-orion5x/mpp.h
@@ -1,74 +1,129 @@
 #ifndef __ARCH_ORION5X_MPP_H
 #define __ARCH_ORION5X_MPP_H
 
-enum orion5x_mpp_type {
-        /*
-         * This MPP is unused.
-         */
-        MPP_UNUSED,
-
-        /*
-         * This MPP pin is used as a generic GPIO pin.  Valid for
-         * MPPs 0-15 and device bus data pins 16-31.  On 5182, also
-         * valid for MPPs 16-19.
-         */
-        MPP_GPIO,
-
-        /*
-         * This MPP is used as PCIe_RST_OUTn pin.  Valid for
-         * MPP 0 only.
-         */
-        MPP_PCIE_RST_OUTn,
-
-        /*
-         * This MPP is used as PCI arbiter pin (REQn/GNTn).
-         * Valid for MPPs 0-7 only.
-         */
-        MPP_PCI_ARB,
-
-        /*
-         * This MPP is used as PCI_PMEn pin.  Valid for MPP 2 only.
-         */
-        MPP_PCI_PMEn,
-
-        /*
-         * This MPP is used as GigE half-duplex (COL, CRS) or GMII
-         * (RXERR, CRS, TXERR, TXD[7:4], RXD[7:4]) pin.  Valid for
-         * MPPs 8-19 only.
-         */
-        MPP_GIGE,
-
-        /*
-         * This MPP is used as NAND REn/WEn pin.  Valid for MPPs
-         * 4-7 and 12-17 only, and only on the 5181l/5182/5281.
-         */
-        MPP_NAND,
-
-        /*
-         * This MPP is used as a PCI clock output pin.  Valid for
-         * MPPs 6-7 only, and only on the 5181l.
-         */
-        MPP_PCI_CLK,
-
-        /*
-         * This MPP is used as a SATA presence/activity LED.
-         * Valid for MPPs 4-7 and 12-15 only, and only on the 5182.
-         */
-        MPP_SATA_LED,
-
-        /*
-         * This MPP is used as UART1 RXD/TXD/CTSn/RTSn pin.
-         * Valid for MPPs 16-19 only.
-         */
-        MPP_UART,
-};
-
-struct orion5x_mpp_mode {
-        int                     mpp;
-        enum orion5x_mpp_type   type;
-};
-
-void orion5x_mpp_conf(struct orion5x_mpp_mode *mode);
+#define MPP(_num, _sel, _in, _out, _F5181l, _F5182, _F5281) ( \
+        /* MPP number */                ((_num) & 0xff) | \
+        /* MPP select value */          (((_sel) & 0xf) << 8) | \
+        /* may be input signal */       ((!!(_in)) << 12) | \
+        /* may be output signal */      ((!!(_out)) << 13) | \
+        /* available on F5181l */       ((!!(_F5181l)) << 14) | \
+        /* available on F5182 */        ((!!(_F5182)) << 15) | \
+        /* available on F5281 */        ((!!(_F5281)) << 16))
 
+                                /* num sel  i  o  5181 5182 5281 */
+
+#define MPP_F5181_MASK          MPP(0,  0x0, 0, 0, 1,   0,   0)
+#define MPP_F5182_MASK          MPP(0,  0x0, 0, 0, 0,   1,   0)
+#define MPP_F5281_MASK          MPP(0,  0x0, 0, 0, 0,   0,   1)
+
+#define MPP0_UNUSED             MPP(0,  0x3, 0, 0, 1,   1,   1)
+#define MPP0_GPIO               MPP(0,  0x3, 1, 1, 1,   1,   1)
+#define MPP0_PCIE_RST_OUTn      MPP(0,  0x0, 0, 0, 1,   1,   1)
+#define MPP0_PCI_ARB            MPP(0,  0x2, 0, 0, 1,   1,   1)
+
+#define MPP1_UNUSED             MPP(1,  0x0, 0, 0, 1,   1,   1)
+#define MPP1_GPIO               MPP(1,  0x0, 1, 1, 1,   1,   1)
+#define MPP1_PCI_ARB            MPP(1,  0x2, 0, 0, 1,   1,   1)
+
+#define MPP2_UNUSED             MPP(2,  0x0, 0, 0, 1,   1,   1)
+#define MPP2_GPIO               MPP(2,  0x0, 1, 1, 1,   1,   1)
+#define MPP2_PCI_ARB            MPP(2,  0x2, 0, 0, 1,   1,   1)
+#define MPP2_PCI_PMEn           MPP(2,  0x3, 0, 0, 1,   1,   1)
+
+#define MPP3_UNUSED             MPP(3,  0x0, 0, 0, 1,   1,   1)
+#define MPP3_GPIO               MPP(3,  0x0, 1, 1, 1,   1,   1)
+#define MPP3_PCI_ARB            MPP(3,  0x2, 0, 0, 1,   1,   1)
+
+#define MPP4_UNUSED             MPP(4,  0x0, 0, 0, 1,   1,   1)
+#define MPP4_GPIO               MPP(4,  0x0, 1, 1, 1,   1,   1)
+#define MPP4_PCI_ARB            MPP(4,  0x2, 0, 0, 1,   1,   1)
+#define MPP4_NAND               MPP(4,  0x4, 0, 0, 0,   1,   1)
+#define MPP4_SATA_LED           MPP(4,  0x5, 0, 0, 0,   1,   0)
+
+#define MPP5_UNUSED             MPP(5,  0x0, 0, 0, 1,   1,   1)
+#define MPP5_GPIO               MPP(5,  0x0, 1, 1, 1,   1,   1)
+#define MPP5_PCI_ARB            MPP(5,  0x2, 0, 0, 1,   1,   1)
+#define MPP5_NAND               MPP(5,  0x4, 0, 0, 0,   1,   1)
+#define MPP5_SATA_LED           MPP(5,  0x5, 0, 0, 0,   1,   0)
+
+#define MPP6_UNUSED             MPP(6,  0x0, 0, 0, 1,   1,   1)
+#define MPP6_GPIO               MPP(6,  0x0, 1, 1, 1,   1,   1)
+#define MPP6_PCI_ARB            MPP(6,  0x2, 0, 0, 1,   1,   1)
+#define MPP6_NAND               MPP(6,  0x4, 0, 0, 0,   1,   1)
+#define MPP6_PCI_CLK            MPP(6,  0x5, 0, 0, 1,   0,   0)
+#define MPP6_SATA_LED           MPP(6,  0x5, 0, 0, 0,   1,   0)
+
+#define MPP7_UNUSED             MPP(7,  0x0, 0, 0, 1,   1,   1)
+#define MPP7_GPIO               MPP(7,  0x0, 1, 1, 1,   1,   1)
+#define MPP7_PCI_ARB            MPP(7,  0x2, 0, 0, 1,   1,   1)
+#define MPP7_NAND               MPP(7,  0x4, 0, 0, 0,   1,   1)
+#define MPP7_PCI_CLK            MPP(7,  0x5, 0, 0, 1,   0,   0)
+#define MPP7_SATA_LED           MPP(7,  0x5, 0, 0, 0,   1,   0)
+
+#define MPP8_UNUSED             MPP(8,  0x0, 0, 0, 1,   1,   1)
+#define MPP8_GPIO               MPP(8,  0x0, 1, 1, 1,   1,   1)
+#define MPP8_GIGE               MPP(8,  0x1, 0, 0, 1,   1,   1)
+
+#define MPP9_UNUSED             MPP(9,  0x0, 0, 0, 1,   1,   1)
+#define MPP9_GPIO               MPP(9,  0x0, 0, 0, 1,   1,   1)
+#define MPP9_GIGE               MPP(9,  0x1, 1, 1, 1,   1,   1)
+
+#define MPP10_UNUSED            MPP(10, 0x0, 0, 0, 1,   1,   1)
+#define MPP10_GPIO              MPP(10, 0x0, 1, 1, 1,   1,   1)
+#define MPP10_GIGE              MPP(10, 0x1, 0, 0, 1,   1,   1)
+
+#define MPP11_UNUSED            MPP(11, 0x0, 0, 0, 1,   1,   1)
+#define MPP11_GPIO              MPP(11, 0x0, 1, 1, 1,   1,   1)
+#define MPP11_GIGE              MPP(11, 0x1, 0, 0, 1,   1,   1)
+
+#define MPP12_UNUSED            MPP(12, 0x0, 0, 0, 1,   1,   1)
+#define MPP12_GPIO              MPP(12, 0x0, 1, 1, 1,   1,   1)
+#define MPP12_GIGE              MPP(12, 0x1, 0, 0, 1,   1,   1)
+#define MPP12_NAND              MPP(12, 0x4, 0, 0, 0,   1,   1)
+#define MPP12_SATA_LED          MPP(12, 0x5, 0, 0, 0,   1,   0)
+
+#define MPP13_UNUSED            MPP(13, 0x0, 0, 0, 1,   1,   1)
+#define MPP13_GPIO              MPP(13, 0x0, 1, 1, 1,   1,   1)
+#define MPP13_GIGE              MPP(13, 0x1, 0, 0, 1,   1,   1)
+#define MPP13_NAND              MPP(13, 0x4, 0, 0, 0,   1,   1)
+#define MPP13_SATA_LED          MPP(13, 0x5, 0, 0, 0,   1,   0)
+
+#define MPP14_UNUSED            MPP(14, 0x0, 0, 0, 1,   1,   1)
+#define MPP14_GPIO              MPP(14, 0x0, 1, 1, 1,   1,   1)
+#define MPP14_GIGE              MPP(14, 0x1, 0, 0, 1,   1,   1)
+#define MPP14_NAND              MPP(14, 0x4, 0, 0, 0,   1,   1)
+#define MPP14_SATA_LED          MPP(14, 0x5, 0, 0, 0,   1,   0)
+
+#define MPP15_UNUSED            MPP(15, 0x0, 0, 0, 1,   1,   1)
+#define MPP15_GPIO              MPP(15, 0x0, 1, 1, 1,   1,   1)
+#define MPP15_GIGE              MPP(15, 0x1, 0, 0, 1,   1,   1)
+#define MPP15_NAND              MPP(15, 0x4, 0, 0, 0,   1,   1)
+#define MPP15_SATA_LED          MPP(15, 0x5, 0, 0, 0,   1,   0)
+
+#define MPP16_UNUSED            MPP(16, 0x0, 0, 0, 1,   1,   1)
+#define MPP16_GPIO              MPP(16, 0x5, 1, 1, 0,   1,   0)
+#define MPP16_GIGE              MPP(16, 0x1, 0, 0, 1,   1,   1)
+#define MPP16_NAND              MPP(16, 0x4, 0, 0, 0,   1,   1)
+#define MPP16_UART              MPP(16, 0x0, 0, 0, 0,   1,   1)
+
+#define MPP17_UNUSED            MPP(17, 0x0, 0, 0, 1,   1,   1)
+#define MPP17_GPIO              MPP(17, 0x5, 1, 1, 0,   1,   0)
+#define MPP17_GIGE              MPP(17, 0x1, 0, 0, 1,   1,   1)
+#define MPP17_NAND              MPP(17, 0x4, 0, 0, 0,   1,   1)
+#define MPP17_UART              MPP(17, 0x0, 0, 0, 0,   1,   1)
+
+#define MPP18_UNUSED            MPP(18, 0x0, 0, 0, 1,   1,   1)
+#define MPP18_GPIO              MPP(18, 0x5, 1, 1, 0,   1,   0)
+#define MPP18_GIGE              MPP(18, 0x1, 0, 0, 1,   1,   1)
+#define MPP18_UART              MPP(18, 0x0, 0, 0, 0,   1,   1)
+
+#define MPP19_UNUSED            MPP(19, 0x0, 0, 0, 1,   1,   1)
+#define MPP19_GPIO              MPP(19, 0x5, 1, 1, 0,   1,   0)
+#define MPP19_GIGE              MPP(19, 0x1, 0, 0, 1,   1,   1)
+#define MPP19_UART              MPP(19, 0x0, 0, 0, 0,   1,   1)
+
+#define MPP_MAX                 19
+
+void orion5x_mpp_conf(unsigned int *mpp_list);
 
 #endif
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c
index b43b208153cb..59263b73d1e4 100644
--- a/arch/arm/mach-orion5x/mss2-setup.c
+++ b/arch/arm/mach-orion5x/mss2-setup.c
@@ -193,28 +193,28 @@ static void mss2_power_off(void)
 /****************************************************************************
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode mss2_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* Power LED */
-        {  1, MPP_GPIO },               /* Error LED */
-        {  2, MPP_UNUSED },
-        {  3, MPP_GPIO },               /* RTC interrupt */
-        {  4, MPP_GPIO },               /* HDD ind. (Single/Dual)*/
-        {  5, MPP_GPIO },               /* HD0 5V control */
-        {  6, MPP_GPIO },               /* HD0 12V control */
-        {  7, MPP_GPIO },               /* HD1 5V control */
-        {  8, MPP_GPIO },               /* HD1 12V control */
-        {  9, MPP_UNUSED },
-        { 10, MPP_GPIO },               /* Fan control */
-        { 11, MPP_GPIO },               /* Power button */
-        { 12, MPP_GPIO },               /* Reset button */
-        { 13, MPP_UNUSED },
-        { 14, MPP_SATA_LED },           /* SATA 0 active */
-        { 15, MPP_SATA_LED },           /* SATA 1 active */
-        { 16, MPP_UNUSED },
-        { 17, MPP_UNUSED },
-        { 18, MPP_UNUSED },
-        { 19, MPP_UNUSED },
-        { -1 },
+static unsigned int mss2_mpp_modes[] __initdata = {
+        MPP0_GPIO,              /* Power LED */
+        MPP1_GPIO,              /* Error LED */
+        MPP2_UNUSED,
+        MPP3_GPIO,              /* RTC interrupt */
+        MPP4_GPIO,              /* HDD ind. (Single/Dual)*/
+        MPP5_GPIO,              /* HD0 5V control */
+        MPP6_GPIO,              /* HD0 12V control */
+        MPP7_GPIO,              /* HD1 5V control */
+        MPP8_GPIO,              /* HD1 12V control */
+        MPP9_UNUSED,
+        MPP10_GPIO,             /* Fan control */
+        MPP11_GPIO,             /* Power button */
+        MPP12_GPIO,             /* Reset button */
+        MPP13_UNUSED,
+        MPP14_SATA_LED,         /* SATA 0 active */
+        MPP15_SATA_LED,         /* SATA 1 active */
+        MPP16_UNUSED,
+        MPP17_UNUSED,
+        MPP18_UNUSED,
+        MPP19_UNUSED,
+        0,
 };
 
 static void __init mss2_init(void)
diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c
index c55d071707f5..63ff10c3c464 100644
--- a/arch/arm/mach-orion5x/mv2120-setup.c
+++ b/arch/arm/mach-orion5x/mv2120-setup.c
@@ -108,28 +108,28 @@ static struct platform_device mv2120_button_device = {
 /****************************************************************************
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode mv2120_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* Sys status LED */
-        {  1, MPP_GPIO },               /* Sys error LED */
-        {  2, MPP_GPIO },               /* OverTemp interrupt */
-        {  3, MPP_GPIO },               /* RTC interrupt */
-        {  4, MPP_GPIO },               /* V_LED 5V */
-        {  5, MPP_GPIO },               /* V_LED 3.3V */
-        {  6, MPP_UNUSED },
-        {  7, MPP_UNUSED },
-        {  8, MPP_GPIO },               /* SATA 0 fail LED */
-        {  9, MPP_GPIO },               /* SATA 1 fail LED */
-        { 10, MPP_UNUSED },
-        { 11, MPP_UNUSED },
-        { 12, MPP_SATA_LED },           /* SATA 0 presence */
-        { 13, MPP_SATA_LED },           /* SATA 1 presence */
-        { 14, MPP_SATA_LED },           /* SATA 0 active */
-        { 15, MPP_SATA_LED },           /* SATA 1 active */
-        { 16, MPP_UNUSED },
-        { 17, MPP_GPIO },               /* Reset button */
-        { 18, MPP_GPIO },               /* Power button */
-        { 19, MPP_GPIO },               /* Power off */
-        { -1 },
+static unsigned int mv2120_mpp_modes[] __initdata = {
+        MPP0_GPIO,              /* Sys status LED */
+        MPP1_GPIO,              /* Sys error LED */
+        MPP2_GPIO,              /* OverTemp interrupt */
+        MPP3_GPIO,              /* RTC interrupt */
+        MPP4_GPIO,              /* V_LED 5V */
+        MPP5_GPIO,              /* V_LED 3.3V */
+        MPP6_UNUSED,
+        MPP7_UNUSED,
+        MPP8_GPIO,              /* SATA 0 fail LED */
+        MPP9_GPIO,              /* SATA 1 fail LED */
+        MPP10_UNUSED,
+        MPP11_UNUSED,
+        MPP12_SATA_LED,         /* SATA 0 presence */
+        MPP13_SATA_LED,         /* SATA 1 presence */
+        MPP14_SATA_LED,         /* SATA 0 active */
+        MPP15_SATA_LED,         /* SATA 1 active */
+        MPP16_UNUSED,
+        MPP17_GPIO,             /* Reset button */
+        MPP18_GPIO,             /* Power button */
+        MPP19_GPIO,             /* Power off */
+        0,
 };
 
 static struct i2c_board_info __initdata mv2120_i2c_rtc = {
diff --git a/arch/arm/mach-orion5x/net2big-setup.c b/arch/arm/mach-orion5x/net2big-setup.c
index a5930f83958b..e43b39cc7fe9 100644
--- a/arch/arm/mach-orion5x/net2big-setup.c
+++ b/arch/arm/mach-orion5x/net2big-setup.c
@@ -339,28 +339,28 @@ static struct platform_device net2big_gpio_buttons = {
  * General Setup
  ****************************************************************************/
 
-static struct orion5x_mpp_mode net2big_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },       /* Raid mode (bit 0) */
-        {  1, MPP_GPIO },       /* USB port 2 fuse (0 = Fail, 1 = Ok) */
-        {  2, MPP_GPIO },       /* Raid mode (bit 1) */
-        {  3, MPP_GPIO },       /* Board ID (bit 0) */
-        {  4, MPP_GPIO },       /* Fan activity (0 = Off, 1 = On) */
-        {  5, MPP_GPIO },       /* Fan fail detection */
-        {  6, MPP_GPIO },       /* Red front LED (0 = Off, 1 = On) */
-        {  7, MPP_GPIO },       /* Disable initial blinking on front LED */
-        {  8, MPP_GPIO },       /* Rear power switch (on|auto) */
-        {  9, MPP_GPIO },       /* Rear power switch (auto|off) */
-        { 10, MPP_GPIO },       /* SATA 1 red LED (0 = Off, 1 = On) */
-        { 11, MPP_GPIO },       /* SATA 0 red LED (0 = Off, 1 = On) */
-        { 12, MPP_GPIO },       /* Board ID (bit 1) */
-        { 13, MPP_GPIO },       /* SATA 1 blue LED blink control */
-        { 14, MPP_SATA_LED },
-        { 15, MPP_SATA_LED },
-        { 16, MPP_GPIO },       /* Blue front LED control */
-        { 17, MPP_GPIO },       /* SATA 0 blue LED blink control */
-        { 18, MPP_GPIO },       /* Front button (0 = Released, 1 = Pushed ) */
-        { 19, MPP_GPIO },       /* SATA{0,1} power On/Off request */
-        { -1 }
+static unsigned int net2big_mpp_modes[] __initdata = {
+        MPP0_GPIO,      /* Raid mode (bit 0) */
+        MPP1_GPIO,      /* USB port 2 fuse (0 = Fail, 1 = Ok) */
+        MPP2_GPIO,      /* Raid mode (bit 1) */
+        MPP3_GPIO,      /* Board ID (bit 0) */
+        MPP4_GPIO,      /* Fan activity (0 = Off, 1 = On) */
+        MPP5_GPIO,      /* Fan fail detection */
+        MPP6_GPIO,      /* Red front LED (0 = Off, 1 = On) */
+        MPP7_GPIO,      /* Disable initial blinking on front LED */
+        MPP8_GPIO,      /* Rear power switch (on|auto) */
+        MPP9_GPIO,      /* Rear power switch (auto|off) */
+        MPP10_GPIO,     /* SATA 1 red LED (0 = Off, 1 = On) */
+        MPP11_GPIO,     /* SATA 0 red LED (0 = Off, 1 = On) */
+        MPP12_GPIO,     /* Board ID (bit 1) */
+        MPP13_GPIO,     /* SATA 1 blue LED blink control */
+        MPP14_SATA_LED,
+        MPP15_SATA_LED,
+        MPP16_GPIO,     /* Blue front LED control */
+        MPP17_GPIO,     /* SATA 0 blue LED blink control */
+        MPP18_GPIO,     /* Front button (0 = Released, 1 = Pushed ) */
+        MPP19_GPIO,     /* SATA{0,1} power On/Off request */
+        0,
         /* 22: USB port 1 fuse (0 = Fail, 1 = Ok) */
         /* 23: SATA 0 power status */
         /* 24: Board power off */
diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index 34310ab56e29..9eec7c2375e9 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -64,28 +64,28 @@ static struct platform_device rd88f5181l_fxo_nor_boot_flash = {
 /*****************************************************************************
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode rd88f5181l_fxo_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* LED1 CardBus LED (front panel) */
-        {  1, MPP_GPIO },               /* PCI_intA */
-        {  2, MPP_GPIO },               /* Hard Reset / Factory Init*/
-        {  3, MPP_GPIO },               /* FXS or DAA select */
-        {  4, MPP_GPIO },               /* LED6 - phone LED (front panel) */
-        {  5, MPP_GPIO },               /* LED5 - phone LED (front panel) */
-        {  6, MPP_PCI_CLK },            /* CPU PCI refclk */
-        {  7, MPP_PCI_CLK },            /* PCI/PCIe refclk */
-        {  8, MPP_GPIO },               /* CardBus reset */
-        {  9, MPP_GPIO },               /* GE_RXERR */
-        { 10, MPP_GPIO },               /* LED2 MiniPCI LED (front panel) */
-        { 11, MPP_GPIO },               /* Lifeline control */
-        { 12, MPP_GIGE },               /* GE_TXD[4] */
-        { 13, MPP_GIGE },               /* GE_TXD[5] */
-        { 14, MPP_GIGE },               /* GE_TXD[6] */
-        { 15, MPP_GIGE },               /* GE_TXD[7] */
-        { 16, MPP_GIGE },               /* GE_RXD[4] */
-        { 17, MPP_GIGE },               /* GE_RXD[5] */
-        { 18, MPP_GIGE },               /* GE_RXD[6] */
-        { 19, MPP_GIGE },               /* GE_RXD[7] */
-        { -1 },
+static unsigned int rd88f5181l_fxo_mpp_modes[] __initdata = {
+        MPP0_GPIO,              /* LED1 CardBus LED (front panel) */
+        MPP1_GPIO,              /* PCI_intA */
+        MPP2_GPIO,              /* Hard Reset / Factory Init*/
+        MPP3_GPIO,              /* FXS or DAA select */
+        MPP4_GPIO,              /* LED6 - phone LED (front panel) */
+        MPP5_GPIO,              /* LED5 - phone LED (front panel) */
+        MPP6_PCI_CLK,           /* CPU PCI refclk */
+        MPP7_PCI_CLK,           /* PCI/PCIe refclk */
+        MPP8_GPIO,              /* CardBus reset */
+        MPP9_GPIO,              /* GE_RXERR */
+        MPP10_GPIO,             /* LED2 MiniPCI LED (front panel) */
+        MPP11_GPIO,             /* Lifeline control */
+        MPP12_GIGE,             /* GE_TXD[4] */
+        MPP13_GIGE,             /* GE_TXD[5] */
+        MPP14_GIGE,             /* GE_TXD[6] */
+        MPP15_GIGE,             /* GE_TXD[7] */
+        MPP16_GIGE,             /* GE_RXD[4] */
+        MPP17_GIGE,             /* GE_RXD[5] */
+        MPP18_GIGE,             /* GE_RXD[6] */
+        MPP19_GIGE,             /* GE_RXD[7] */
+        0,
 };
 
 static struct mv643xx_eth_platform_data rd88f5181l_fxo_eth_data = {
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
index c1f79fa014ed..0cc90bbfd326 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -65,28 +65,28 @@ static struct platform_device rd88f5181l_ge_nor_boot_flash = {
 /*****************************************************************************
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode rd88f5181l_ge_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* LED1 */
-        {  1, MPP_GPIO },               /* LED5 */
-        {  2, MPP_GPIO },               /* LED4 */
-        {  3, MPP_GPIO },               /* LED3 */
-        {  4, MPP_GPIO },               /* PCI_intA */
-        {  5, MPP_GPIO },               /* RTC interrupt */
-        {  6, MPP_PCI_CLK },            /* CPU PCI refclk */
-        {  7, MPP_PCI_CLK },            /* PCI/PCIe refclk */
-        {  8, MPP_GPIO },               /* 88e6131 interrupt */
-        {  9, MPP_GPIO },               /* GE_RXERR */
-        { 10, MPP_GPIO },               /* PCI_intB */
-        { 11, MPP_GPIO },               /* LED2 */
-        { 12, MPP_GIGE },               /* GE_TXD[4] */
-        { 13, MPP_GIGE },               /* GE_TXD[5] */
-        { 14, MPP_GIGE },               /* GE_TXD[6] */
-        { 15, MPP_GIGE },               /* GE_TXD[7] */
-        { 16, MPP_GIGE },               /* GE_RXD[4] */
-        { 17, MPP_GIGE },               /* GE_RXD[5] */
-        { 18, MPP_GIGE },               /* GE_RXD[6] */
-        { 19, MPP_GIGE },               /* GE_RXD[7] */
-        { -1 },
+static unsigned int rd88f5181l_ge_mpp_modes[] __initdata = {
+        MPP0_GPIO,              /* LED1 */
+        MPP1_GPIO,              /* LED5 */
+        MPP2_GPIO,              /* LED4 */
+        MPP3_GPIO,              /* LED3 */
+        MPP4_GPIO,              /* PCI_intA */
+        MPP5_GPIO,              /* RTC interrupt */
+        MPP6_PCI_CLK,           /* CPU PCI refclk */
+        MPP7_PCI_CLK,           /* PCI/PCIe refclk */
+        MPP8_GPIO,              /* 88e6131 interrupt */
+        MPP9_GPIO,              /* GE_RXERR */
+        MPP10_GPIO,             /* PCI_intB */
+        MPP11_GPIO,             /* LED2 */
+        MPP12_GIGE,             /* GE_TXD[4] */
+        MPP13_GIGE,             /* GE_TXD[5] */
+        MPP14_GIGE,             /* GE_TXD[6] */
+        MPP15_GIGE,             /* GE_TXD[7] */
+        MPP16_GIGE,             /* GE_RXD[4] */
+        MPP17_GIGE,             /* GE_RXD[5] */
+        MPP18_GIGE,             /* GE_RXD[6] */
+        MPP19_GIGE,             /* GE_RXD[7] */
+        0,
 };
 
 static struct mv643xx_eth_platform_data rd88f5181l_ge_eth_data = {
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 4fc46772a087..48da39b9bdb0 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -241,28 +241,28 @@ static struct mv_sata_platform_data rd88f5182_sata_data = {
 /*****************************************************************************
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode rd88f5182_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* Debug Led */
-        {  1, MPP_GPIO },               /* Reset Switch */
-        {  2, MPP_UNUSED },
-        {  3, MPP_GPIO },               /* RTC Int */
-        {  4, MPP_GPIO },
-        {  5, MPP_GPIO },
-        {  6, MPP_GPIO },               /* PCI_intA */
-        {  7, MPP_GPIO },               /* PCI_intB */
-        {  8, MPP_UNUSED },
-        {  9, MPP_UNUSED },
-        { 10, MPP_UNUSED },
-        { 11, MPP_UNUSED },
-        { 12, MPP_SATA_LED },           /* SATA 0 presence */
-        { 13, MPP_SATA_LED },           /* SATA 1 presence */
-        { 14, MPP_SATA_LED },           /* SATA 0 active */
-        { 15, MPP_SATA_LED },           /* SATA 1 active */
-        { 16, MPP_UNUSED },
-        { 17, MPP_UNUSED },
-        { 18, MPP_UNUSED },
-        { 19, MPP_UNUSED },
-        { -1 },
+static unsigned int rd88f5182_mpp_modes[] __initdata = {
+        MPP0_GPIO,              /* Debug Led */
+        MPP1_GPIO,              /* Reset Switch */
+        MPP2_UNUSED,
+        MPP3_GPIO,              /* RTC Int */
+        MPP4_GPIO,
+        MPP5_GPIO,
+        MPP6_GPIO,              /* PCI_intA */
+        MPP7_GPIO,              /* PCI_intB */
+        MPP8_UNUSED,
+        MPP9_UNUSED,
+        MPP10_UNUSED,
+        MPP11_UNUSED,
+        MPP12_SATA_LED,         /* SATA 0 presence */
+        MPP13_SATA_LED,         /* SATA 1 presence */
+        MPP14_SATA_LED,         /* SATA 0 active */
+        MPP15_SATA_LED,         /* SATA 1 active */
+        MPP16_UNUSED,
+        MPP17_UNUSED,
+        MPP18_UNUSED,
+        MPP19_UNUSED,
+        0,
 };
 
 static void __init rd88f5182_init(void)
diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
index b080c6966d10..ad2eba9286ad 100644
--- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
@@ -27,7 +27,6 @@
 #include <asm/mach/pci.h>
 #include <mach/orion5x.h>
 #include "common.h"
-#include "mpp.h"
 
 static struct mv643xx_eth_platform_data rd88f6183ap_ge_eth_data = {
         .phy_addr       = -1,
diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c
index 616004143912..29ce826c3c21 100644
--- a/arch/arm/mach-orion5x/terastation_pro2-setup.c
+++ b/arch/arm/mach-orion5x/terastation_pro2-setup.c
@@ -295,28 +295,28 @@ static void tsp2_power_off(void)
 /*****************************************************************************
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode tsp2_mpp_modes[] __initdata = {
-        {  0, MPP_PCIE_RST_OUTn },
-        {  1, MPP_UNUSED },
-        {  2, MPP_UNUSED },
-        {  3, MPP_UNUSED },
-        {  4, MPP_NAND },               /* BOOT NAND Flash REn */
-        {  5, MPP_NAND },               /* BOOT NAND Flash WEn */
-        {  6, MPP_NAND },               /* BOOT NAND Flash HREn[0] */
-        {  7, MPP_NAND },               /* BOOT NAND Flash WEn[0] */
-        {  8, MPP_GPIO },               /* MICON int */
-        {  9, MPP_GPIO },               /* RTC int */
-        { 10, MPP_UNUSED },
-        { 11, MPP_GPIO },               /* PCI Int A */
-        { 12, MPP_UNUSED },
-        { 13, MPP_GPIO },               /* UPS on UART0 enable */
-        { 14, MPP_GPIO },               /* UPS low battery detection */
-        { 15, MPP_UNUSED },
-        { 16, MPP_UART },               /* UART1 RXD */
-        { 17, MPP_UART },               /* UART1 TXD */
-        { 18, MPP_UART },               /* UART1 CTSn */
-        { 19, MPP_UART },               /* UART1 RTSn */
-        { -1 },
+static unsigned int tsp2_mpp_modes[] __initdata = {
+        MPP0_PCIE_RST_OUTn,
+        MPP1_UNUSED,
+        MPP2_UNUSED,
+        MPP3_UNUSED,
+        MPP4_NAND,              /* BOOT NAND Flash REn */
+        MPP5_NAND,              /* BOOT NAND Flash WEn */
+        MPP6_NAND,              /* BOOT NAND Flash HREn[0] */
+        MPP7_NAND,              /* BOOT NAND Flash WEn[0] */
+        MPP8_GPIO,              /* MICON int */
+        MPP9_GPIO,              /* RTC int */
+        MPP10_UNUSED,
+        MPP11_GPIO,             /* PCI Int A */
+        MPP12_UNUSED,
+        MPP13_GPIO,             /* UPS on UART0 enable */
+        MPP14_GPIO,             /* UPS low battery detection */
+        MPP15_UNUSED,
+        MPP16_UART,             /* UART1 RXD */
+        MPP17_UART,             /* UART1 TXD */
+        MPP18_UART,             /* UART1 CTSn */
+        MPP19_UART,             /* UART1 RTSn */
+        0,
 };
 
 static void __init tsp2_init(void)
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index e6d64494d3de..47162fd5f044 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -244,28 +244,28 @@ static struct mv_sata_platform_data qnap_ts209_sata_data = {
 
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode ts209_mpp_modes[] __initdata = {
-        {  0, MPP_UNUSED },
-        {  1, MPP_GPIO },               /* USB copy button */
-        {  2, MPP_GPIO },               /* Load defaults button */
-        {  3, MPP_GPIO },               /* GPIO RTC */
-        {  4, MPP_UNUSED },
-        {  5, MPP_UNUSED },
-        {  6, MPP_GPIO },               /* PCI Int A */
-        {  7, MPP_GPIO },               /* PCI Int B */
-        {  8, MPP_UNUSED },
-        {  9, MPP_UNUSED },
-        { 10, MPP_UNUSED },
-        { 11, MPP_UNUSED },
-        { 12, MPP_SATA_LED },           /* SATA 0 presence */
-        { 13, MPP_SATA_LED },           /* SATA 1 presence */
-        { 14, MPP_SATA_LED },           /* SATA 0 active */
-        { 15, MPP_SATA_LED },           /* SATA 1 active */
-        { 16, MPP_UART },               /* UART1 RXD */
-        { 17, MPP_UART },               /* UART1 TXD */
-        { 18, MPP_GPIO },               /* SW_RST */
-        { 19, MPP_UNUSED },
-        { -1 },
+static unsigned int ts209_mpp_modes[] __initdata = {
+        MPP0_UNUSED,
+        MPP1_GPIO,              /* USB copy button */
+        MPP2_GPIO,              /* Load defaults button */
+        MPP3_GPIO,              /* GPIO RTC */
+        MPP4_UNUSED,
+        MPP5_UNUSED,
+        MPP6_GPIO,              /* PCI Int A */
+        MPP7_GPIO,              /* PCI Int B */
+        MPP8_UNUSED,
+        MPP9_UNUSED,
+        MPP10_UNUSED,
+        MPP11_UNUSED,
+        MPP12_SATA_LED,         /* SATA 0 presence */
+        MPP13_SATA_LED,         /* SATA 1 presence */
+        MPP14_SATA_LED,         /* SATA 0 active */
+        MPP15_SATA_LED,         /* SATA 1 active */
+        MPP16_UART,             /* UART1 RXD */
+        MPP17_UART,             /* UART1 TXD */
+        MPP18_GPIO,             /* SW_RST */
+        MPP19_UNUSED,
+        0,
 };
 
 static void __init qnap_ts209_init(void)
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c
index 9eac8192d923..5aacc7ac5cf4 100644
--- a/arch/arm/mach-orion5x/ts409-setup.c
+++ b/arch/arm/mach-orion5x/ts409-setup.c
@@ -242,28 +242,28 @@ static struct platform_device qnap_ts409_button_device = {
 /*****************************************************************************
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode ts409_mpp_modes[] __initdata = {
-        {  0, MPP_UNUSED },
-        {  1, MPP_UNUSED },
-        {  2, MPP_UNUSED },
-        {  3, MPP_UNUSED },
-        {  4, MPP_GPIO },               /* HDD 1 status */
-        {  5, MPP_GPIO },               /* HDD 2 status */
-        {  6, MPP_GPIO },               /* HDD 3 status */
-        {  7, MPP_GPIO },               /* HDD 4 status */
-        {  8, MPP_UNUSED },
-        {  9, MPP_UNUSED },
-        { 10, MPP_GPIO },               /* RTC int */
-        { 11, MPP_UNUSED },
-        { 12, MPP_UNUSED },
-        { 13, MPP_UNUSED },
-        { 14, MPP_GPIO },               /* SW_RST */
-        { 15, MPP_GPIO },               /* USB copy button */
-        { 16, MPP_UART },               /* UART1 RXD */
-        { 17, MPP_UART },               /* UART1 TXD */
-        { 18, MPP_UNUSED },
-        { 19, MPP_UNUSED },
-        { -1 },
+static unsigned int ts409_mpp_modes[] __initdata = {
+        MPP0_UNUSED,
+        MPP1_UNUSED,
+        MPP2_UNUSED,
+        MPP3_UNUSED,
+        MPP4_GPIO,              /* HDD 1 status */
+        MPP5_GPIO,              /* HDD 2 status */
+        MPP6_GPIO,              /* HDD 3 status */
+        MPP7_GPIO,              /* HDD 4 status */
+        MPP8_UNUSED,
+        MPP9_UNUSED,
+        MPP10_GPIO,             /* RTC int */
+        MPP11_UNUSED,
+        MPP12_UNUSED,
+        MPP13_UNUSED,
+        MPP14_GPIO,             /* SW_RST */
+        MPP15_GPIO,             /* USB copy button */
+        MPP16_UART,             /* UART1 RXD */
+        MPP17_UART,             /* UART1 TXD */
+        MPP18_UNUSED,
+        MPP19_UNUSED,
+        0,
 };
 
 static void __init qnap_ts409_init(void)
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index edb1dd2d1611..6b7b54116f30 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -557,27 +557,27 @@ static struct kobj_attribute ts78xx_fpga_attr =
 /*****************************************************************************
  * General Setup
  ****************************************************************************/
-static struct orion5x_mpp_mode ts78xx_mpp_modes[] __initdata = {
-        {  0, MPP_UNUSED },
-        {  1, MPP_GPIO },               /* JTAG Clock */
-        {  2, MPP_GPIO },               /* JTAG Data In */
-        {  3, MPP_GPIO },               /* Lat ECP2 256 FPGA - PB2B */
-        {  4, MPP_GPIO },               /* JTAG Data Out */
-        {  5, MPP_GPIO },               /* JTAG TMS */
-        {  6, MPP_GPIO },               /* Lat ECP2 256 FPGA - PB31A_CLK4+ */
-        {  7, MPP_GPIO },               /* Lat ECP2 256 FPGA - PB22B */
-        {  8, MPP_UNUSED },
-        {  9, MPP_UNUSED },
-        { 10, MPP_UNUSED },
-        { 11, MPP_UNUSED },
-        { 12, MPP_UNUSED },
-        { 13, MPP_UNUSED },
-        { 14, MPP_UNUSED },
-        { 15, MPP_UNUSED },
-        { 16, MPP_UART },
-        { 17, MPP_UART },
-        { 18, MPP_UART },
-        { 19, MPP_UART },
+static unsigned int ts78xx_mpp_modes[] __initdata = {
+        MPP0_UNUSED,
+        MPP1_GPIO,              /* JTAG Clock */
+        MPP2_GPIO,              /* JTAG Data In */
+        MPP3_GPIO,              /* Lat ECP2 256 FPGA - PB2B */
+        MPP4_GPIO,              /* JTAG Data Out */
+        MPP5_GPIO,              /* JTAG TMS */
+        MPP6_GPIO,              /* Lat ECP2 256 FPGA - PB31A_CLK4+ */
+        MPP7_GPIO,              /* Lat ECP2 256 FPGA - PB22B */
+        MPP8_UNUSED,
+        MPP9_UNUSED,
+        MPP10_UNUSED,
+        MPP11_UNUSED,
+        MPP12_UNUSED,
+        MPP13_UNUSED,
+        MPP14_UNUSED,
+        MPP15_UNUSED,
+        MPP16_UART,
+        MPP17_UART,
+        MPP18_UART,
+        MPP19_UART,
         /*
          * MPP[20] PCI Clock Out 1
          * MPP[21] PCI Clock Out 0
@@ -586,7 +586,7 @@ static struct orion5x_mpp_mode ts78xx_mpp_modes[] __initdata = {
          * MPP[24] Unused
          * MPP[25] Unused
          */
-        { -1 },
+        0,
 };
 
 static void __init ts78xx_init(void)
diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c
index 4e5216be0745..444a1c7fdfd6 100644
--- a/arch/arm/mach-orion5x/wnr854t-setup.c
+++ b/arch/arm/mach-orion5x/wnr854t-setup.c
@@ -24,28 +24,28 @@
 #include "common.h"
 #include "mpp.h"
 
-static struct orion5x_mpp_mode wnr854t_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* Power LED green (0=on) */
-        {  1, MPP_GPIO },               /* Reset Button (0=off) */
-        {  2, MPP_GPIO },               /* Power LED blink (0=off) */
-        {  3, MPP_GPIO },               /* WAN Status LED amber (0=off) */
-        {  4, MPP_GPIO },               /* PCI int */
-        {  5, MPP_GPIO },               /* ??? */
-        {  6, MPP_GPIO },               /* ??? */
-        {  7, MPP_GPIO },               /* ??? */
-        {  8, MPP_UNUSED },             /* ??? */
-        {  9, MPP_GIGE },               /* GE_RXERR */
-        { 10, MPP_UNUSED },             /* ??? */
-        { 11, MPP_UNUSED },             /* ??? */
-        { 12, MPP_GIGE },               /* GE_TXD[4] */
-        { 13, MPP_GIGE },               /* GE_TXD[5] */
-        { 14, MPP_GIGE },               /* GE_TXD[6] */
-        { 15, MPP_GIGE },               /* GE_TXD[7] */
-        { 16, MPP_GIGE },               /* GE_RXD[4] */
-        { 17, MPP_GIGE },               /* GE_RXD[5] */
-        { 18, MPP_GIGE },               /* GE_RXD[6] */
-        { 19, MPP_GIGE },               /* GE_RXD[7] */
-        { -1 },
+static unsigned int wnr854t_mpp_modes[] __initdata = {
+        MPP0_GPIO,              /* Power LED green (0=on) */
+        MPP1_GPIO,              /* Reset Button (0=off) */
+        MPP2_GPIO,              /* Power LED blink (0=off) */
+        MPP3_GPIO,              /* WAN Status LED amber (0=off) */
+        MPP4_GPIO,              /* PCI int */
+        MPP5_GPIO,              /* ??? */
+        MPP6_GPIO,              /* ??? */
+        MPP7_GPIO,              /* ??? */
+        MPP8_UNUSED,            /* ??? */
+        MPP9_GIGE,              /* GE_RXERR */
+        MPP10_UNUSED,           /* ??? */
+        MPP11_UNUSED,           /* ??? */
+        MPP12_GIGE,             /* GE_TXD[4] */
+        MPP13_GIGE,             /* GE_TXD[5] */
+        MPP14_GIGE,             /* GE_TXD[6] */
+        MPP15_GIGE,             /* GE_TXD[7] */
+        MPP16_GIGE,             /* GE_RXD[4] */
+        MPP17_GIGE,             /* GE_RXD[5] */
+        MPP18_GIGE,             /* GE_RXD[6] */
+        MPP19_GIGE,             /* GE_RXD[7] */
+        0,
 };
 
 /*
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
index fab79d09cc5c..d1952be0ae1c 100644
--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@ -101,28 +101,28 @@ static struct platform_device wrt350n_v2_button_device = {
 /*
  * General setup
  */
-static struct orion5x_mpp_mode wrt350n_v2_mpp_modes[] __initdata = {
-        {  0, MPP_GPIO },               /* Power LED green (0=on) */
-        {  1, MPP_GPIO },               /* Security LED (0=on) */
-        {  2, MPP_GPIO },               /* Internal Button (0=on) */
-        {  3, MPP_GPIO },               /* Reset Button (0=on) */
-        {  4, MPP_GPIO },               /* PCI int */
-        {  5, MPP_GPIO },               /* Power LED orange (0=on) */
-        {  6, MPP_GPIO },               /* USB LED (0=on) */
-        {  7, MPP_GPIO },               /* Wireless LED (0=on) */
-        {  8, MPP_UNUSED },             /* ??? */
-        {  9, MPP_GIGE },               /* GE_RXERR */
-        { 10, MPP_UNUSED },             /* ??? */
-        { 11, MPP_UNUSED },             /* ??? */
-        { 12, MPP_GIGE },               /* GE_TXD[4] */
-        { 13, MPP_GIGE },               /* GE_TXD[5] */
-        { 14, MPP_GIGE },               /* GE_TXD[6] */
-        { 15, MPP_GIGE },               /* GE_TXD[7] */
-        { 16, MPP_GIGE },               /* GE_RXD[4] */
-        { 17, MPP_GIGE },               /* GE_RXD[5] */
-        { 18, MPP_GIGE },               /* GE_RXD[6] */
-        { 19, MPP_GIGE },               /* GE_RXD[7] */
-        { -1 },
+static unsigned int wrt350n_v2_mpp_modes[] __initdata = {
+        MPP0_GPIO,              /* Power LED green (0=on) */
+        MPP1_GPIO,              /* Security LED (0=on) */
+        MPP2_GPIO,              /* Internal Button (0=on) */
+        MPP3_GPIO,              /* Reset Button (0=on) */
+        MPP4_GPIO,              /* PCI int */
+        MPP5_GPIO,              /* Power LED orange (0=on) */
+        MPP6_GPIO,              /* USB LED (0=on) */
+        MPP7_GPIO,              /* Wireless LED (0=on) */
+        MPP8_UNUSED,            /* ??? */
+        MPP9_GIGE,              /* GE_RXERR */
+        MPP10_UNUSED,           /* ??? */
+        MPP11_UNUSED,           /* ??? */
+        MPP12_GIGE,             /* GE_TXD[4] */
+        MPP13_GIGE,             /* GE_TXD[5] */
+        MPP14_GIGE,             /* GE_TXD[6] */
+        MPP15_GIGE,             /* GE_TXD[7] */
+        MPP16_GIGE,             /* GE_RXD[4] */
+        MPP17_GIGE,             /* GE_RXD[5] */
+        MPP18_GIGE,             /* GE_RXD[6] */
+        MPP19_GIGE,             /* GE_RXD[7] */
+        0,
 };
 
 /*
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index bfbecec6d05f..810a982a66f8 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -15,7 +15,6 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/bitops.h>
diff --git a/arch/arm/mach-pxa/clock-pxa2xx.c b/arch/arm/mach-pxa/clock-pxa2xx.c
index 1ce090448493..1d5859d9a0e3 100644
--- a/arch/arm/mach-pxa/clock-pxa2xx.c
+++ b/arch/arm/mach-pxa/clock-pxa2xx.c
@@ -9,7 +9,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
 #include <mach/pxa2xx-regs.h>
 
@@ -33,32 +33,22 @@ const struct clkops clk_pxa2xx_cken_ops = {
 #ifdef CONFIG_PM
 static uint32_t saved_cken;
 
-static int pxa2xx_clock_suspend(struct sys_device *d, pm_message_t state)
+static int pxa2xx_clock_suspend(void)
 {
         saved_cken = CKEN;
         return 0;
 }
 
-static int pxa2xx_clock_resume(struct sys_device *d)
+static void pxa2xx_clock_resume(void)
 {
         CKEN = saved_cken;
-        return 0;
 }
 #else
 #define pxa2xx_clock_suspend    NULL
 #define pxa2xx_clock_resume     NULL
 #endif
 
-struct sysdev_class pxa2xx_clock_sysclass = {
-        .name           = "pxa2xx-clock",
+struct syscore_ops pxa2xx_clock_syscore_ops = {
         .suspend        = pxa2xx_clock_suspend,
         .resume         = pxa2xx_clock_resume,
 };
-
-static int __init pxa2xx_clock_init(void)
-{
-        if (cpu_is_pxa2xx())
-                return sysdev_class_register(&pxa2xx_clock_sysclass);
-        return 0;
-}
-postcore_initcall(pxa2xx_clock_init);
diff --git a/arch/arm/mach-pxa/clock-pxa3xx.c b/arch/arm/mach-pxa/clock-pxa3xx.c
index 3f864cd0bd28..2a37a9a8f621 100644
--- a/arch/arm/mach-pxa/clock-pxa3xx.c
+++ b/arch/arm/mach-pxa/clock-pxa3xx.c
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/syscore_ops.h>
 
 #include <mach/smemc.h>
 #include <mach/pxa3xx-regs.h>
@@ -182,7 +183,7 @@ const struct clkops clk_pxa3xx_pout_ops = {
 static uint32_t cken[2];
 static uint32_t accr;
 
-static int pxa3xx_clock_suspend(struct sys_device *d, pm_message_t state)
+static int pxa3xx_clock_suspend(void)
 {
         cken[0] = CKENA;
         cken[1] = CKENB;
@@ -190,28 +191,18 @@ static int pxa3xx_clock_suspend(struct sys_device *d, pm_message_t state)
         return 0;
 }
 
-static int pxa3xx_clock_resume(struct sys_device *d)
+static void pxa3xx_clock_resume(void)
 {
         ACCR = accr;
         CKENA = cken[0];
         CKENB = cken[1];
-        return 0;
 }
 #else
 #define pxa3xx_clock_suspend    NULL
 #define pxa3xx_clock_resume     NULL
 #endif
 
-struct sysdev_class pxa3xx_clock_sysclass = {
-        .name           = "pxa3xx-clock",
+struct syscore_ops pxa3xx_clock_syscore_ops = {
         .suspend        = pxa3xx_clock_suspend,
         .resume         = pxa3xx_clock_resume,
 };
-
-static int __init pxa3xx_clock_init(void)
-{
-        if (cpu_is_pxa3xx() || cpu_is_pxa95x())
-                return sysdev_class_register(&pxa3xx_clock_sysclass);
-        return 0;
-}
-postcore_initcall(pxa3xx_clock_init);
diff --git a/arch/arm/mach-pxa/clock.h b/arch/arm/mach-pxa/clock.h
index f9f349a21b54..1f2fb9c43f06 100644
--- a/arch/arm/mach-pxa/clock.h
+++ b/arch/arm/mach-pxa/clock.h
@@ -1,5 +1,5 @@
 #include <linux/clkdev.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
 struct clkops {
         void                    (*enable)(struct clk *);
@@ -54,7 +54,7 @@ extern const struct clkops clk_pxa2xx_cken_ops;
 void clk_pxa2xx_cken_enable(struct clk *clk);
 void clk_pxa2xx_cken_disable(struct clk *clk);
 
-extern struct sysdev_class pxa2xx_clock_sysclass;
+extern struct syscore_ops pxa2xx_clock_syscore_ops;
 
 #if defined(CONFIG_PXA3xx) || defined(CONFIG_PXA95x)
 #define DEFINE_PXA3_CKEN(_name, _cken, _rate, _delay)   \
@@ -74,5 +74,6 @@ extern const struct clkops clk_pxa3xx_smemc_ops;
 extern void clk_pxa3xx_cken_enable(struct clk *);
 extern void clk_pxa3xx_cken_disable(struct clk *);
 
-extern struct sysdev_class pxa3xx_clock_sysclass;
+extern struct syscore_ops pxa3xx_clock_syscore_ops;
+
 #endif
diff --git a/arch/arm/mach-pxa/cm-x270.c b/arch/arm/mach-pxa/cm-x270.c
index b88d601a8090..13518a705399 100644
--- a/arch/arm/mach-pxa/cm-x270.c
+++ b/arch/arm/mach-pxa/cm-x270.c
@@ -10,7 +10,6 @@
  */
 
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
 #include <linux/irq.h>
 #include <linux/gpio.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.c b/arch/arm/mach-pxa/cm-x2xx-pci.c
index 8b1a30959fae..1afc0fb7d6d5 100644
--- a/arch/arm/mach-pxa/cm-x2xx-pci.c
+++ b/arch/arm/mach-pxa/cm-x2xx-pci.c
@@ -29,33 +29,6 @@
 unsigned long it8152_base_address;
 static int cmx2xx_it8152_irq_gpio;
 
-/*
- * Only first 64MB of memory can be accessed via PCI.
- * We use GFP_DMA to allocate safe buffers to do map/unmap.
- * This is really ugly and we need a better way of specifying
- * DMA-capable regions of memory.
- */
-void __init cmx2xx_pci_adjust_zones(unsigned long *zone_size,
-        unsigned long *zhole_size)
-{
-        unsigned int sz = SZ_64M >> PAGE_SHIFT;
-
-        if (machine_is_armcore()) {
-                pr_info("Adjusting zones for CM-X2XX\n");
-
-                /*
-                 * Only adjust if > 64M on current system
-                 */
-                if (zone_size[0] <= sz)
-                        return;
-
-                zone_size[1] = zone_size[0] - sz;
-                zone_size[0] = sz;
-                zhole_size[1] = zhole_size[0];
-                zhole_size[0] = 0;
-        }
-}
-
 static void cmx2xx_it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
 {
         /* clear our parent irq */
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c
index 8225e2e58c6e..a10996782476 100644
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@ -10,7 +10,7 @@
  */
 
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/irq.h>
 #include <linux/gpio.h>
 
@@ -388,7 +388,7 @@ static inline void cmx2xx_init_display(void) {}
 #ifdef CONFIG_PM
 static unsigned long sleep_save_msc[10];
 
-static int cmx2xx_suspend(struct sys_device *dev, pm_message_t state)
+static int cmx2xx_suspend(void)
 {
         cmx2xx_pci_suspend();
 
@@ -412,7 +412,7 @@ static int cmx2xx_suspend(struct sys_device *dev, pm_message_t state)
         return 0;
 }
 
-static int cmx2xx_resume(struct sys_device *dev)
+static void cmx2xx_resume(void)
 {
         cmx2xx_pci_resume();
 
@@ -420,27 +420,18 @@ static int cmx2xx_resume(struct sys_device *dev)
         __raw_writel(sleep_save_msc[0], MSC0);
         __raw_writel(sleep_save_msc[1], MSC1);
         __raw_writel(sleep_save_msc[2], MSC2);
-
-        return 0;
 }
 
-static struct sysdev_class cmx2xx_pm_sysclass = {
-        .name = "pm",
+static struct syscore_ops cmx2xx_pm_syscore_ops = {
         .resume = cmx2xx_resume,
         .suspend = cmx2xx_suspend,
 };
 
-static struct sys_device cmx2xx_pm_device = {
-        .cls = &cmx2xx_pm_sysclass,
-};
-
 static int __init cmx2xx_pm_init(void)
 {
-        int error;
-        error = sysdev_class_register(&cmx2xx_pm_sysclass);
-        if (error == 0)
-                error = sysdev_register(&cmx2xx_pm_device);
-        return error;
+        register_syscore_ops(&cmx2xx_pm_syscore_ops);
+
+        return 0;
 }
 #else
 static int __init cmx2xx_pm_init(void) { return 0; }
diff --git a/arch/arm/mach-pxa/colibri-evalboard.c b/arch/arm/mach-pxa/colibri-evalboard.c
index 81c3c433e2d6..d28e802e2448 100644
--- a/arch/arm/mach-pxa/colibri-evalboard.c
+++ b/arch/arm/mach-pxa/colibri-evalboard.c
@@ -13,7 +13,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-pxa/colibri-pxa270-income.c b/arch/arm/mach-pxa/colibri-pxa270-income.c
index 44c1b77ece67..80538b8806ed 100644
--- a/arch/arm/mach-pxa/colibri-pxa270-income.c
+++ b/arch/arm/mach-pxa/colibri-pxa270-income.c
@@ -22,7 +22,6 @@
 #include <linux/platform_device.h>
 #include <linux/pwm_backlight.h>
 #include <linux/i2c/pxa-i2c.h>
-#include <linux/sysdev.h>
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c
index 6fc5d328ba7f..7545a48ed88b 100644
--- a/arch/arm/mach-pxa/colibri-pxa270.c
+++ b/arch/arm/mach-pxa/colibri-pxa270.c
@@ -17,7 +17,6 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
 #include <linux/ucb1400.h>
 
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h
index a079d8baa45a..e6c9344a95ae 100644
--- a/arch/arm/mach-pxa/generic.h
+++ b/arch/arm/mach-pxa/generic.h
@@ -61,10 +61,10 @@ extern unsigned pxa3xx_get_clk_frequency_khz(int);
 #define pxa3xx_get_clk_frequency_khz(x)         (0)
 #endif
 
-extern struct sysdev_class pxa_irq_sysclass;
-extern struct sysdev_class pxa_gpio_sysclass;
-extern struct sysdev_class pxa2xx_mfp_sysclass;
-extern struct sysdev_class pxa3xx_mfp_sysclass;
+extern struct syscore_ops pxa_irq_syscore_ops;
+extern struct syscore_ops pxa_gpio_syscore_ops;
+extern struct syscore_ops pxa2xx_mfp_syscore_ops;
+extern struct syscore_ops pxa3xx_mfp_syscore_ops;
 
 void __init pxa_set_ffuart_info(void *info);
 void __init pxa_set_btuart_info(void *info);
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index 9cdcca597924..f941a495a4a8 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -735,7 +735,7 @@ static struct platform_device bq24022 = {
  * StrataFlash
  */
 
-static void hx4700_set_vpp(struct map_info *map, int vpp)
+static void hx4700_set_vpp(struct platform_device *pdev, int vpp)
 {
         gpio_set_value(GPIO91_HX4700_FLASH_VPEN, vpp);
 }
diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h
index 7f68724dcc27..07734f37f8fd 100644
--- a/arch/arm/mach-pxa/include/mach/memory.h
+++ b/arch/arm/mach-pxa/include/mach/memory.h
@@ -17,14 +17,8 @@
  */
 #define PLAT_PHYS_OFFSET        UL(0xa0000000)
 
-#if !defined(__ASSEMBLY__) && defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
-void cmx2xx_pci_adjust_zones(unsigned long *size, unsigned long *holes);
-
-#define arch_adjust_zones(size, holes) \
-        cmx2xx_pci_adjust_zones(size, holes)
-
-#define ISA_DMA_THRESHOLD       (PHYS_OFFSET + SZ_64M - 1)
-#define MAX_DMA_ADDRESS         (PAGE_OFFSET + SZ_64M)
+#if defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
+#define ARM_DMA_ZONE_SIZE       SZ_64M
 #endif
 
 #endif
diff --git a/arch/arm/mach-pxa/include/mach/uncompress.h b/arch/arm/mach-pxa/include/mach/uncompress.h
index 759b851ec985..5519a34b667f 100644
--- a/arch/arm/mach-pxa/include/mach/uncompress.h
+++ b/arch/arm/mach-pxa/include/mach/uncompress.h
@@ -16,9 +16,9 @@
 #define BTUART_BASE     (0x40200000)
 #define STUART_BASE     (0x40700000)
 
-static unsigned long uart_base;
-static unsigned int uart_shift;
-static unsigned int uart_is_pxa;
+unsigned long uart_base;
+unsigned int uart_shift;
+unsigned int uart_is_pxa;
 
 static inline unsigned char uart_read(int offset)
 {
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index 6251e3f5c62c..32ed551bf9c5 100644
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -15,7 +15,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/io.h>
 #include <linux/irq.h>
 
@@ -183,7 +183,7 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
 static unsigned long saved_icmr[MAX_INTERNAL_IRQS/32];
 static unsigned long saved_ipr[MAX_INTERNAL_IRQS];
 
-static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state)
+static int pxa_irq_suspend(void)
 {
         int i;
 
@@ -202,7 +202,7 @@ static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state)
         return 0;
 }
 
-static int pxa_irq_resume(struct sys_device *dev)
+static void pxa_irq_resume(void)
 {
         int i;
 
@@ -218,22 +218,13 @@ static int pxa_irq_resume(struct sys_device *dev)
                         __raw_writel(saved_ipr[i], IRQ_BASE + IPR(i));
 
         __raw_writel(1, IRQ_BASE + ICCR);
-        return 0;
 }
 #else
 #define pxa_irq_suspend         NULL
 #define pxa_irq_resume          NULL
 #endif
 
-struct sysdev_class pxa_irq_sysclass = {
-        .name           = "irq",
+struct syscore_ops pxa_irq_syscore_ops = {
         .suspend        = pxa_irq_suspend,
         .resume         = pxa_irq_resume,
 };
-
-static int __init pxa_irq_init(void)
-{
-        return sysdev_class_register(&pxa_irq_sysclass);
-}
-
-core_initcall(pxa_irq_init);
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c
index f5de541725b1..6cf8180bf5bd 100644
--- a/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@ -15,7 +15,7 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/bitops.h>
@@ -159,30 +159,22 @@ static void __init lpd270_init_irq(void)
 
 
 #ifdef CONFIG_PM
-static int lpd270_irq_resume(struct sys_device *dev)
+static void lpd270_irq_resume(void)
 {
         __raw_writew(lpd270_irq_enabled, LPD270_INT_MASK);
-        return 0;
 }
 
-static struct sysdev_class lpd270_irq_sysclass = {
-        .name = "cpld_irq",
+static struct syscore_ops lpd270_irq_syscore_ops = {
         .resume = lpd270_irq_resume,
 };
 
-static struct sys_device lpd270_irq_device = {
-        .cls = &lpd270_irq_sysclass,
-};
-
 static int __init lpd270_irq_device_init(void)
 {
-        int ret = -ENODEV;
         if (machine_is_logicpd_pxa270()) {
-                ret = sysdev_class_register(&lpd270_irq_sysclass);
-                if (ret == 0)
-                        ret = sysdev_register(&lpd270_irq_device);
+                register_syscore_ops(&lpd270_irq_syscore_ops);
+                return 0;
         }
-        return ret;
+        return -ENODEV;
 }
 
 device_initcall(lpd270_irq_device_init);
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 3ede978c83d9..e10ddb827147 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -15,7 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/major.h>
 #include <linux/fb.h>
 #include <linux/interrupt.h>
@@ -176,31 +176,22 @@ static void __init lubbock_init_irq(void)
 
 #ifdef CONFIG_PM
 
-static int lubbock_irq_resume(struct sys_device *dev)
+static void lubbock_irq_resume(void)
 {
         LUB_IRQ_MASK_EN = lubbock_irq_enabled;
-        return 0;
 }
 
-static struct sysdev_class lubbock_irq_sysclass = {
-        .name = "cpld_irq",
+static struct syscore_ops lubbock_irq_syscore_ops = {
         .resume = lubbock_irq_resume,
 };
 
-static struct sys_device lubbock_irq_device = {
-        .cls = &lubbock_irq_sysclass,
-};
-
 static int __init lubbock_irq_device_init(void)
 {
-        int ret = -ENODEV;
-
         if (machine_is_lubbock()) {
-                ret = sysdev_class_register(&lubbock_irq_sysclass);
-                if (ret == 0)
-                        ret = sysdev_register(&lubbock_irq_device);
+                register_syscore_ops(&lubbock_irq_syscore_ops);
+                return 0;
         }
-        return ret;
+        return -ENODEV;
 }
 
 device_initcall(lubbock_irq_device_init);
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 9984ef70bd79..e1920572948a 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -662,7 +662,7 @@ static struct pxaohci_platform_data magician_ohci_info = {
  * StrataFlash
  */
 
-static void magician_set_vpp(struct map_info *map, int vpp)
+static void magician_set_vpp(struct platform_device *pdev, int vpp)
 {
         gpio_set_value(EGPIO_MAGICIAN_FLASH_VPP, vpp);
 }
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 95163baca29e..3479e2b3b511 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -15,7 +15,7 @@
 
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/bitops.h>
@@ -185,31 +185,21 @@ static void __init mainstone_init_irq(void)
 
 #ifdef CONFIG_PM
 
-static int mainstone_irq_resume(struct sys_device *dev)
+static void mainstone_irq_resume(void)
 {
         MST_INTMSKENA = mainstone_irq_enabled;
-        return 0;
 }
 
-static struct sysdev_class mainstone_irq_sysclass = {
-        .name = "cpld_irq",
+static struct syscore_ops mainstone_irq_syscore_ops = {
         .resume = mainstone_irq_resume,
 };
 
-static struct sys_device mainstone_irq_device = {
-        .cls = &mainstone_irq_sysclass,
-};
-
 static int __init mainstone_irq_device_init(void)
 {
-        int ret = -ENODEV;
+        if (machine_is_mainstone())
+                register_syscore_ops(&mainstone_irq_syscore_ops);
 
-        if (machine_is_mainstone()) {
-                ret = sysdev_class_register(&mainstone_irq_sysclass);
-                if (ret == 0)
-                        ret = sysdev_register(&mainstone_irq_device);
-        }
-        return ret;
+        return 0;
 }
 
 device_initcall(mainstone_irq_device_init);
diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c
index 1d1419b73457..87ae3129f4f7 100644
--- a/arch/arm/mach-pxa/mfp-pxa2xx.c
+++ b/arch/arm/mach-pxa/mfp-pxa2xx.c
@@ -16,7 +16,7 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
 #include <mach/gpio.h>
 #include <mach/pxa2xx-regs.h>
@@ -338,7 +338,7 @@ static unsigned long saved_gafr[2][4];
 static unsigned long saved_gpdr[4];
 static unsigned long saved_pgsr[4];
 
-static int pxa2xx_mfp_suspend(struct sys_device *d, pm_message_t state)
+static int pxa2xx_mfp_suspend(void)
 {
         int i;
 
@@ -365,7 +365,7 @@ static int pxa2xx_mfp_suspend(struct sys_device *d, pm_message_t state)
         return 0;
 }
 
-static int pxa2xx_mfp_resume(struct sys_device *d)
+static void pxa2xx_mfp_resume(void)
 {
         int i;
 
@@ -376,15 +376,13 @@ static int pxa2xx_mfp_resume(struct sys_device *d)
                 PGSR(i) = saved_pgsr[i];
         }
         PSSR = PSSR_RDH | PSSR_PH;
-        return 0;
 }
 #else
 #define pxa2xx_mfp_suspend      NULL
 #define pxa2xx_mfp_resume       NULL
 #endif
 
-struct sysdev_class pxa2xx_mfp_sysclass = {
-        .name           = "mfp",
+struct syscore_ops pxa2xx_mfp_syscore_ops = {
         .suspend        = pxa2xx_mfp_suspend,
         .resume         = pxa2xx_mfp_resume,
 };
@@ -409,6 +407,6 @@ static int __init pxa2xx_mfp_init(void)
         for (i = 0; i <= gpio_to_bank(pxa_last_gpio); i++)
                 gpdr_lpm[i] = GPDR(i * 32);
 
-        return sysdev_class_register(&pxa2xx_mfp_sysclass);
+        return 0;
 }
 postcore_initcall(pxa2xx_mfp_init);
diff --git a/arch/arm/mach-pxa/mfp-pxa3xx.c b/arch/arm/mach-pxa/mfp-pxa3xx.c
index 7a270eecd480..89863a01ecd7 100644
--- a/arch/arm/mach-pxa/mfp-pxa3xx.c
+++ b/arch/arm/mach-pxa/mfp-pxa3xx.c
@@ -17,7 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
 #include <mach/hardware.h>
 #include <mach/mfp-pxa3xx.h>
@@ -31,13 +31,13 @@
  * a pull-down mode if they're an active low chip select, and we're
  * just entering standby.
  */
-static int pxa3xx_mfp_suspend(struct sys_device *d, pm_message_t state)
+static int pxa3xx_mfp_suspend(void)
 {
         mfp_config_lpm();
         return 0;
 }
 
-static int pxa3xx_mfp_resume(struct sys_device *d)
+static void pxa3xx_mfp_resume(void)
 {
         mfp_config_run();
 
@@ -47,24 +47,13 @@ static int pxa3xx_mfp_resume(struct sys_device *d)
          * preserve them here in case they will be referenced later
          */
         ASCR &= ~(ASCR_RDH | ASCR_D1S | ASCR_D2S | ASCR_D3S);
-        return 0;
 }
 #else
 #define pxa3xx_mfp_suspend      NULL
 #define pxa3xx_mfp_resume       NULL
 #endif
 
-struct sysdev_class pxa3xx_mfp_sysclass = {
-        .name           = "mfp",
+struct syscore_ops pxa3xx_mfp_syscore_ops = {
         .suspend        = pxa3xx_mfp_suspend,
-        .resume         = pxa3xx_mfp_resume,
+        .resume         = pxa3xx_mfp_resume,
 };
-
-static int __init mfp_init_devicefs(void)
-{
-        if (cpu_is_pxa3xx())
-                return sysdev_class_register(&pxa3xx_mfp_sysclass);
-
-        return 0;
-}
-postcore_initcall(mfp_init_devicefs);
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c
index 23925db8ff74..e3470137c934 100644
--- a/arch/arm/mach-pxa/mioa701.c
+++ b/arch/arm/mach-pxa/mioa701.c
@@ -22,7 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/input.h>
 #include <linux/delay.h>
 #include <linux/gpio_keys.h>
@@ -488,7 +488,7 @@ static void install_bootstrap(void)
 }
 
 
-static int mioa701_sys_suspend(struct sys_device *sysdev, pm_message_t state)
+static int mioa701_sys_suspend(void)
 {
         int i = 0, is_bt_on;
         u32 *mem_resume_vector  = phys_to_virt(RESUME_VECTOR_ADDR);
@@ -514,7 +514,7 @@ static int mioa701_sys_suspend(struct sys_device *sysdev, pm_message_t state)
         return 0;
 }
 
-static int mioa701_sys_resume(struct sys_device *sysdev)
+static void mioa701_sys_resume(void)
 {
         int i = 0;
         u32 *mem_resume_vector  = phys_to_virt(RESUME_VECTOR_ADDR);
@@ -527,43 +527,18 @@ static int mioa701_sys_resume(struct sys_device *sysdev)
         *mem_resume_enabler = save_buffer[i++];
         *mem_resume_bt      = save_buffer[i++];
         *mem_resume_unknown = save_buffer[i++];
-
-        return 0;
 }
 
-static struct sysdev_class mioa701_sysclass = {
-        .name = "mioa701",
-};
-
-static struct sys_device sysdev_bootstrap = {
-        .cls            = &mioa701_sysclass,
-};
-
-static struct sysdev_driver driver_bootstrap = {
-        .suspend        = &mioa701_sys_suspend,
-        .resume         = &mioa701_sys_resume,
+static struct syscore_ops mioa701_syscore_ops = {
+        .suspend        = mioa701_sys_suspend,
+        .resume         = mioa701_sys_resume,
 };
 
 static int __init bootstrap_init(void)
 {
-        int rc;
         int save_size = mioa701_bootstrap_lg + (sizeof(u32) * 3);
 
-        rc = sysdev_class_register(&mioa701_sysclass);
-        if (rc) {
-                printk(KERN_ERR "Failed registering mioa701 sys class\n");
-                return -ENODEV;
-        }
-        rc = sysdev_register(&sysdev_bootstrap);
-        if (rc) {
-                printk(KERN_ERR "Failed registering mioa701 sys device\n");
-                return -ENODEV;
-        }
-        rc = sysdev_driver_register(&mioa701_sysclass, &driver_bootstrap);
-        if (rc) {
-                printk(KERN_ERR "Failed registering PMU sys driver\n");
-                return -ENODEV;
-        }
+        register_syscore_ops(&mioa701_syscore_ops);
 
         save_buffer = kmalloc(save_size, GFP_KERNEL);
         if (!save_buffer)
@@ -576,9 +551,7 @@ static int __init bootstrap_init(void)
 static void bootstrap_exit(void)
 {
         kfree(save_buffer);
-        sysdev_driver_unregister(&mioa701_sysclass, &driver_bootstrap);
-        sysdev_unregister(&sysdev_bootstrap);
-        sysdev_class_unregister(&mioa701_sysclass);
+        unregister_syscore_ops(&mioa701_syscore_ops);
 
         printk(KERN_CRIT "Unregistering mioa701 suspend will hang next"
                "resume !!!\n");
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c
index a6f898cbfac9..4061ecddee70 100644
--- a/arch/arm/mach-pxa/palmld.c
+++ b/arch/arm/mach-pxa/palmld.c
@@ -24,7 +24,6 @@
 #include <linux/gpio.h>
 #include <linux/wm97xx.h>
 #include <linux/power_supply.h>
-#include <linux/sysdev.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c
index 8aadad55fbe4..20d1b18b1733 100644
--- a/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@ -25,7 +25,6 @@
 #include <linux/pwm_backlight.h>
 #include <linux/gpio.h>
 #include <linux/power_supply.h>
-#include <linux/sysdev.h>
 #include <linux/w1-gpio.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c
index 3b8a4f37dbbe..65f24f0b77e8 100644
--- a/arch/arm/mach-pxa/palmz72.c
+++ b/arch/arm/mach-pxa/palmz72.c
@@ -19,7 +19,7 @@
  */
 
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/gpio_keys.h>
@@ -233,9 +233,9 @@ static struct palmz72_resume_info palmz72_resume_info = {
 
 static unsigned long store_ptr;
 
-/* sys_device for Palm Zire 72 PM */
+/* syscore_ops for Palm Zire 72 PM */
 
-static int palmz72_pm_suspend(struct sys_device *dev, pm_message_t msg)
+static int palmz72_pm_suspend(void)
 {
         /* setup the resume_info struct for the original bootloader */
         palmz72_resume_info.resume_addr = (u32) cpu_resume;
@@ -249,31 +249,23 @@ static int palmz72_pm_suspend(struct sys_device *dev, pm_message_t msg)
         return 0;
 }
 
-static int palmz72_pm_resume(struct sys_device *dev)
+static void palmz72_pm_resume(void)
 {
         *PALMZ72_SAVE_DWORD = store_ptr;
-        return 0;
 }
 
-static struct sysdev_class palmz72_pm_sysclass = {
-        .name = "palmz72_pm",
+static struct syscore_ops palmz72_pm_syscore_ops = {
         .suspend = palmz72_pm_suspend,
         .resume = palmz72_pm_resume,
 };
 
-static struct sys_device palmz72_pm_device = {
-        .cls = &palmz72_pm_sysclass,
-};
-
 static int __init palmz72_pm_init(void)
 {
-        int ret = -ENODEV;
         if (machine_is_palmz72()) {
-                ret = sysdev_class_register(&palmz72_pm_sysclass);
-                if (ret == 0)
-                        ret = sysdev_register(&palmz72_pm_device);
+                register_syscore_ops(&palmz72_pm_syscore_ops);
+                return 0;
         }
-        return ret;
+        return -ENODEV;
 }
 
 device_initcall(palmz72_pm_init);
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index a4af8c52d7ee..fed363cec9c6 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -21,7 +21,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/suspend.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/irq.h>
 
 #include <asm/mach/map.h>
@@ -350,21 +350,9 @@ static struct platform_device *pxa25x_devices[] __initdata = {
         &pxa_device_asoc_platform,
 };
 
-static struct sys_device pxa25x_sysdev[] = {
-        {
-                .cls    = &pxa_irq_sysclass,
-        }, {
-                .cls    = &pxa2xx_mfp_sysclass,
-        }, {
-                .cls    = &pxa_gpio_sysclass,
-        }, {
-                .cls    = &pxa2xx_clock_sysclass,
-        }
-};
-
 static int __init pxa25x_init(void)
 {
-        int i, ret = 0;
+        int ret = 0;
 
         if (cpu_is_pxa25x()) {
 
@@ -377,11 +365,10 @@ static int __init pxa25x_init(void)
 
                 pxa25x_init_pm();
 
-                for (i = 0; i < ARRAY_SIZE(pxa25x_sysdev); i++) {
-                        ret = sysdev_register(&pxa25x_sysdev[i]);
-                        if (ret)
-                                pr_err("failed to register sysdev[%d]\n", i);
-                }
+                register_syscore_ops(&pxa_irq_syscore_ops);
+                register_syscore_ops(&pxa2xx_mfp_syscore_ops);
+                register_syscore_ops(&pxa_gpio_syscore_ops);
+                register_syscore_ops(&pxa2xx_clock_syscore_ops);
 
                 ret = platform_add_devices(pxa25x_devices,
                                            ARRAY_SIZE(pxa25x_devices));
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 909756eaf4b7..2fecbec58d88 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/suspend.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/i2c/pxa-i2c.h>
@@ -428,21 +428,9 @@ static struct platform_device *devices[] __initdata = {
         &pxa27x_device_pwm1,
 };
 
-static struct sys_device pxa27x_sysdev[] = {
-        {
-                .cls    = &pxa_irq_sysclass,
-        }, {
-                .cls    = &pxa2xx_mfp_sysclass,
-        }, {
-                .cls    = &pxa_gpio_sysclass,
-        }, {
-                .cls    = &pxa2xx_clock_sysclass,
-        }
-};
-
 static int __init pxa27x_init(void)
 {
-        int i, ret = 0;
+        int ret = 0;
 
         if (cpu_is_pxa27x()) {
 
@@ -455,11 +443,10 @@ static int __init pxa27x_init(void)
 
                 pxa27x_init_pm();
 
-                for (i = 0; i < ARRAY_SIZE(pxa27x_sysdev); i++) {
-                        ret = sysdev_register(&pxa27x_sysdev[i]);
-                        if (ret)
-                                pr_err("failed to register sysdev[%d]\n", i);
-                }
+                register_syscore_ops(&pxa_irq_syscore_ops);
+                register_syscore_ops(&pxa2xx_mfp_syscore_ops);
+                register_syscore_ops(&pxa_gpio_syscore_ops);
+                register_syscore_ops(&pxa2xx_clock_syscore_ops);
 
                 ret = platform_add_devices(devices, ARRAY_SIZE(devices));
         }
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index 8dd107391157..8521d7d6f1da 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/i2c/pxa-i2c.h>
 
 #include <asm/mach/map.h>
@@ -427,21 +427,9 @@ static struct platform_device *devices[] __initdata = {
         &pxa27x_device_pwm1,
 };
 
-static struct sys_device pxa3xx_sysdev[] = {
-        {
-                .cls    = &pxa_irq_sysclass,
-        }, {
-                .cls    = &pxa3xx_mfp_sysclass,
-        }, {
-                .cls    = &pxa_gpio_sysclass,
-        }, {
-                .cls    = &pxa3xx_clock_sysclass,
-        }
-};
-
 static int __init pxa3xx_init(void)
 {
-        int i, ret = 0;
+        int ret = 0;
 
         if (cpu_is_pxa3xx()) {
 
@@ -462,11 +450,10 @@ static int __init pxa3xx_init(void)
 
                 pxa3xx_init_pm();
 
-                for (i = 0; i < ARRAY_SIZE(pxa3xx_sysdev); i++) {
-                        ret = sysdev_register(&pxa3xx_sysdev[i]);
-                        if (ret)
-                                pr_err("failed to register sysdev[%d]\n", i);
-                }
+                register_syscore_ops(&pxa_irq_syscore_ops);
+                register_syscore_ops(&pxa3xx_mfp_syscore_ops);
+                register_syscore_ops(&pxa_gpio_syscore_ops);
+                register_syscore_ops(&pxa3xx_clock_syscore_ops);
 
                 ret = platform_add_devices(devices, ARRAY_SIZE(devices));
         }
diff --git a/arch/arm/mach-pxa/pxa95x.c b/arch/arm/mach-pxa/pxa95x.c
index 23b229bd06e9..ecc82a330fad 100644
--- a/arch/arm/mach-pxa/pxa95x.c
+++ b/arch/arm/mach-pxa/pxa95x.c
@@ -18,7 +18,7 @@
 #include <linux/i2c/pxa-i2c.h>
 #include <linux/irq.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
 #include <mach/hardware.h>
 #include <mach/gpio.h>
@@ -260,16 +260,6 @@ static struct platform_device *devices[] __initdata = {
         &pxa27x_device_pwm1,
 };
 
-static struct sys_device pxa95x_sysdev[] = {
-        {
-                .cls    = &pxa_irq_sysclass,
-        }, {
-                .cls    = &pxa_gpio_sysclass,
-        }, {
-                .cls    = &pxa3xx_clock_sysclass,
-        }
-};
-
 static int __init pxa95x_init(void)
 {
         int ret = 0, i;
@@ -293,11 +283,9 @@ static int __init pxa95x_init(void)
                 if ((ret = pxa_init_dma(IRQ_DMA, 32)))
                         return ret;
 
-                for (i = 0; i < ARRAY_SIZE(pxa95x_sysdev); i++) {
-                        ret = sysdev_register(&pxa95x_sysdev[i]);
-                        if (ret)
-                                pr_err("failed to register sysdev[%d]\n", i);
-                }
+                register_syscore_ops(&pxa_irq_syscore_ops);
+                register_syscore_ops(&pxa_gpio_syscore_ops);
+                register_syscore_ops(&pxa3xx_clock_syscore_ops);
 
                 ret = platform_add_devices(devices, ARRAY_SIZE(devices));
         }
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
index cd1861351f75..d130f77b6d11 100644
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -18,7 +18,6 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/sysdev.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
diff --git a/arch/arm/mach-pxa/smemc.c b/arch/arm/mach-pxa/smemc.c
index 232b7316ec08..79923058d10f 100644
--- a/arch/arm/mach-pxa/smemc.c
+++ b/arch/arm/mach-pxa/smemc.c
@@ -6,7 +6,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
 #include <mach/hardware.h>
 #include <mach/smemc.h>
@@ -16,7 +16,7 @@ static unsigned long msc[2];
 static unsigned long sxcnfg, memclkcfg;
 static unsigned long csadrcfg[4];
 
-static int pxa3xx_smemc_suspend(struct sys_device *dev, pm_message_t state)
+static int pxa3xx_smemc_suspend(void)
 {
         msc[0] = __raw_readl(MSC0);
         msc[1] = __raw_readl(MSC1);
@@ -30,7 +30,7 @@ static int pxa3xx_smemc_suspend(struct sys_device *dev, pm_message_t state)
         return 0;
 }
 
-static int pxa3xx_smemc_resume(struct sys_device *dev)
+static void pxa3xx_smemc_resume(void)
 {
         __raw_writel(msc[0], MSC0);
         __raw_writel(msc[1], MSC1);
@@ -40,34 +40,19 @@ static int pxa3xx_smemc_resume(struct sys_device *dev)
         __raw_writel(csadrcfg[1], CSADRCFG1);
         __raw_writel(csadrcfg[2], CSADRCFG2);
         __raw_writel(csadrcfg[3], CSADRCFG3);
-
-        return 0;
 }
 
-static struct sysdev_class smemc_sysclass = {
-        .name           = "smemc",
+static struct syscore_ops smemc_syscore_ops = {
         .suspend        = pxa3xx_smemc_suspend,
         .resume         = pxa3xx_smemc_resume,
 };
 
-static struct sys_device smemc_sysdev = {
-        .id             = 0,
-        .cls            = &smemc_sysclass,
-};
-
 static int __init smemc_init(void)
 {
-        int ret = 0;
+        if (cpu_is_pxa3xx())
+                register_syscore_ops(&smemc_syscore_ops);
 
-        if (cpu_is_pxa3xx()) {
-                ret = sysdev_class_register(&smemc_sysclass);
-                if (ret)
-                        return ret;
-
-                ret = sysdev_register(&smemc_sysdev);
-        }
-
-        return ret;
+        return 0;
 }
 subsys_initcall(smemc_init);
 #endif
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index 428da3ff33a5..de684701449c 100644
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -105,19 +105,6 @@ static struct clock_event_device ckevt_pxa_osmr0 = {
         .set_mode       = pxa_osmr0_set_mode,
 };
 
-static cycle_t pxa_read_oscr(struct clocksource *cs)
-{
-        return OSCR;
-}
-
-static struct clocksource cksrc_pxa_oscr0 = {
-        .name           = "oscr0",
-        .rating         = 200,
-        .read           = pxa_read_oscr,
-        .mask           = CLOCKSOURCE_MASK(32),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 static struct irqaction pxa_ost0_irq = {
         .name           = "ost0",
         .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
@@ -134,7 +121,6 @@ static void __init pxa_timer_init(void)
 
         init_sched_clock(&cd, pxa_update_sched_clock, 32, clock_tick_rate);
 
-        clocksource_calc_mult_shift(&cksrc_pxa_oscr0, clock_tick_rate, 4);
         clockevents_calc_mult_shift(&ckevt_pxa_osmr0, clock_tick_rate, 4);
         ckevt_pxa_osmr0.max_delta_ns =
                 clockevent_delta2ns(0x7fffffff, &ckevt_pxa_osmr0);
@@ -144,7 +130,8 @@ static void __init pxa_timer_init(void)
 
         setup_irq(IRQ_OST0, &pxa_ost0_irq);
 
-        clocksource_register_hz(&cksrc_pxa_oscr0, clock_tick_rate);
+        clocksource_mmio_init(&OSCR, "oscr0", clock_tick_rate, 200, 32,
+                clocksource_mmio_readl_up);
         clockevents_register_device(&ckevt_pxa_osmr0);
 }
 
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c
index b9cfbebdfe9c..687417a93698 100644
--- a/arch/arm/mach-pxa/trizeps4.c
+++ b/arch/arm/mach-pxa/trizeps4.c
@@ -15,7 +15,6 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/bitops.h>
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
index b523f119e0f0..903218eab56d 100644
--- a/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@ -44,6 +44,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
+#include <linux/syscore_ops.h>
 
 #include <mach/pxa25x.h>
 #include <mach/audio.h>
@@ -130,20 +131,19 @@ static u8 viper_hw_version(void)
         return v1;
 }
 
-/* CPU sysdev */
-static int viper_cpu_suspend(struct sys_device *sysdev, pm_message_t state)
+/* CPU system core operations. */
+static int viper_cpu_suspend(void)
 {
         viper_icr_set_bit(VIPER_ICR_R_DIS);
         return 0;
 }
 
-static int viper_cpu_resume(struct sys_device *sysdev)
+static void viper_cpu_resume(void)
 {
         viper_icr_clear_bit(VIPER_ICR_R_DIS);
-        return 0;
 }
 
-static struct sysdev_driver viper_cpu_sysdev_driver = {
+static struct syscore_ops viper_cpu_syscore_ops = {
         .suspend        = viper_cpu_suspend,
         .resume         = viper_cpu_resume,
 };
@@ -945,7 +945,7 @@ static void __init viper_init(void)
         viper_init_vcore_gpios();
         viper_init_cpufreq();
 
-        sysdev_driver_register(&cpu_sysdev_class, &viper_cpu_sysdev_driver);
+        register_syscore_ops(&viper_cpu_syscore_ops);
 
         if (version) {
                 pr_info("viper: hardware v%di%d detected. "
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c
index f71d377c8640..67bd41488bf8 100644
--- a/arch/arm/mach-pxa/vpac270.c
+++ b/arch/arm/mach-pxa/vpac270.c
@@ -16,7 +16,6 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/gpio.h>
-#include <linux/sysdev.h>
 #include <linux/usb/gpio_vbus.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index 75dbc8791d05..5c23450d2d1d 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -31,6 +31,7 @@
 #include <linux/amba/mmci.h>
 #include <linux/gfp.h>
 #include <linux/clkdev.h>
+#include <linux/mtd/physmap.h>
 
 #include <asm/system.h>
 #include <mach/hardware.h>
@@ -41,7 +42,6 @@
 #include <asm/hardware/icst.h>
 
 #include <asm/mach/arch.h>
-#include <asm/mach/flash.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 
@@ -56,48 +56,9 @@
 
 #include "core.h"
 
-#ifdef CONFIG_ZONE_DMA
-/*
- * Adjust the zones if there are restrictions for DMA access.
- */
-void __init realview_adjust_zones(unsigned long *size, unsigned long *hole)
-{
-        unsigned long dma_size = SZ_256M >> PAGE_SHIFT;
-
-        if (!machine_is_realview_pbx() || size[0] <= dma_size)
-                return;
-
-        size[ZONE_NORMAL] = size[0] - dma_size;
-        size[ZONE_DMA] = dma_size;
-        hole[ZONE_NORMAL] = hole[0];
-        hole[ZONE_DMA] = 0;
-}
-#endif
-
-
 #define REALVIEW_FLASHCTRL    (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_FLASH_OFFSET)
 
-static int realview_flash_init(void)
-{
-        u32 val;
-
-        val = __raw_readl(REALVIEW_FLASHCTRL);
-        val &= ~REALVIEW_FLASHPROG_FLVPPEN;
-        __raw_writel(val, REALVIEW_FLASHCTRL);
-
-        return 0;
-}
-
-static void realview_flash_exit(void)
-{
-        u32 val;
-
-        val = __raw_readl(REALVIEW_FLASHCTRL);
-        val &= ~REALVIEW_FLASHPROG_FLVPPEN;
-        __raw_writel(val, REALVIEW_FLASHCTRL);
-}
-
-static void realview_flash_set_vpp(int on)
+static void realview_flash_set_vpp(struct platform_device *pdev, int on)
 {
         u32 val;
 
@@ -109,16 +70,13 @@ static void realview_flash_set_vpp(int on)
         __raw_writel(val, REALVIEW_FLASHCTRL);
 }
 
-static struct flash_platform_data realview_flash_data = {
-        .map_name               = "cfi_probe",
+static struct physmap_flash_data realview_flash_data = {
         .width                  = 4,
-        .init                   = realview_flash_init,
-        .exit                   = realview_flash_exit,
         .set_vpp                = realview_flash_set_vpp,
 };
 
 struct platform_device realview_flash_device = {
-        .name                   = "armflash",
+        .name                   = "physmap-flash",
         .id                     = 0,
         .dev                    = {
                 .platform_data  = &realview_flash_data,
@@ -315,6 +273,10 @@ static struct clk ref24_clk = {
         .rate   = 24000000,
 };
 
+static struct clk sp804_clk = {
+        .rate   = 1000000,
+};
+
 static struct clk dummy_apb_pclk;
 
 static struct clk_lookup lookups[] = {
@@ -357,7 +319,10 @@ static struct clk_lookup lookups[] = {
         }, {    /* SSP */
                 .dev_id         = "dev:ssp0",
                 .clk            = &ref24_clk,
-        }
+        }, {    /* SP804 timers */
+                .dev_id         = "sp804",
+                .clk            = &sp804_clk,
+        },
 };
 
 void __init realview_init_early(void)
@@ -545,8 +510,8 @@ void __init realview_timer_init(unsigned int timer_irq)
         writel(0, timer2_va_base + TIMER_CTRL);
         writel(0, timer3_va_base + TIMER_CTRL);
 
-        sp804_clocksource_init(timer3_va_base);
-        sp804_clockevents_init(timer0_va_base, timer_irq);
+        sp804_clocksource_init(timer3_va_base, "timer3");
+        sp804_clockevents_init(timer0_va_base, timer_irq, "timer0");
 }
 
 /*
diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h
index e05fc2c4c080..1759fa673eea 100644
--- a/arch/arm/mach-realview/include/mach/memory.h
+++ b/arch/arm/mach-realview/include/mach/memory.h
@@ -29,13 +29,8 @@
 #define PLAT_PHYS_OFFSET                UL(0x00000000)
 #endif
 
-#if !defined(__ASSEMBLY__) && defined(CONFIG_ZONE_DMA)
-extern void realview_adjust_zones(unsigned long *size, unsigned long *hole);
-#define arch_adjust_zones(size, hole) \
-        realview_adjust_zones(size, hole)
-
-#define ISA_DMA_THRESHOLD       (PHYS_OFFSET + SZ_256M - 1)
-#define MAX_DMA_ADDRESS         (PAGE_OFFSET + SZ_256M)
+#ifdef CONFIG_ZONE_DMA
+#define ARM_DMA_ZONE_SIZE       SZ_256M
 #endif
 
 #ifdef CONFIG_SPARSEMEM
diff --git a/arch/arm/mach-realview/include/mach/smp.h b/arch/arm/mach-realview/include/mach/smp.h
deleted file mode 100644
index c8221b38ee7c..000000000000
--- a/arch/arm/mach-realview/include/mach/smp.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef ASMARM_ARCH_SMP_H
-#define ASMARM_ARCH_SMP_H
-
-#include <asm/hardware/gic.h>
-
-/*
- * We use IRQ1 as the IPI
- */
-static inline void smp_cross_call(const struct cpumask *mask, int ipi)
-{
-        gic_raise_softirq(mask, ipi);
-}
-
-#endif
diff --git a/arch/arm/mach-realview/platsmp.c b/arch/arm/mach-realview/platsmp.c
index 23919229e12d..963bf0d8119a 100644
--- a/arch/arm/mach-realview/platsmp.c
+++ b/arch/arm/mach-realview/platsmp.c
@@ -14,6 +14,7 @@
 #include <linux/io.h>
 
 #include <mach/hardware.h>
+#include <asm/hardware/gic.h>
 #include <asm/mach-types.h>
 #include <asm/smp_scu.h>
 #include <asm/unified.h>
@@ -61,6 +62,8 @@ void __init smp_init_cpus(void)
 
         for (i = 0; i < ncores; i++)
                 set_cpu_possible(i, true);
+
+        set_smp_cross_call(gic_raise_softirq);
 }
 
 void __init platform_smp_prepare_cpus(unsigned int max_cpus)
diff --git a/arch/arm/mach-rpc/include/mach/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h
index 8c9e2c7161c6..9cd9bcdad6cc 100644
--- a/arch/arm/mach-rpc/include/mach/uncompress.h
+++ b/arch/arm/mach-rpc/include/mach/uncompress.h
@@ -66,12 +66,12 @@ extern __attribute__((pure)) struct param_struct *params(void);
 #define params (params())
 
 #ifndef STANDALONE_DEBUG 
-static unsigned long video_num_cols;
-static unsigned long video_num_rows;
-static unsigned long video_x;
-static unsigned long video_y;
-static unsigned char bytes_per_char_v;
-static int white;
+unsigned long video_num_cols;
+unsigned long video_num_rows;
+unsigned long video_x;
+unsigned long video_y;
+unsigned char bytes_per_char_v;
+int white;
 
 /*
  * This does not append a newline
diff --git a/arch/arm/mach-s3c2410/include/mach/map.h b/arch/arm/mach-s3c2410/include/mach/map.h
index 25bbf5a942dd..425552d84b60 100644
--- a/arch/arm/mach-s3c2410/include/mach/map.h
+++ b/arch/arm/mach-s3c2410/include/mach/map.h
@@ -21,6 +21,10 @@
 /* USB host controller */
 #define S3C2410_PA_USBHOST (0x49000000)
 
+/* S3C2416/S3C2443/S3C2450 High-Speed USB Gadget */
+#define S3C2416_PA_HSUDC        (0x49800000)
+#define S3C2416_SZ_HSUDC        (SZ_4K)
+
 /* DMA controller */
 #define S3C2410_PA_DMA     (0x4B000000)
 #define S3C24XX_SZ_DMA     SZ_1M
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
index 44494a56e68b..5e06c7265835 100644
--- a/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
+++ b/arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h
@@ -37,6 +37,10 @@
 #define S3C2443_SYSID                   S3C2443_CLKREG(0x5C)
 #define S3C2443_PWRCFG                  S3C2443_CLKREG(0x60)
 #define S3C2443_RSTCON                  S3C2443_CLKREG(0x64)
+#define S3C2443_PHYCTRL                 S3C2443_CLKREG(0x80)
+#define S3C2443_PHYPWR                  S3C2443_CLKREG(0x84)
+#define S3C2443_URSTCON                 S3C2443_CLKREG(0x88)
+#define S3C2443_UCLKCON                 S3C2443_CLKREG(0x8C)
 
 #define S3C2443_SWRST_RESET             (0x533c2443)
 
@@ -121,6 +125,27 @@
 
 #define S3C2443_PWRCFG_SLEEP            (1<<15)
 
+#define S3C2443_PWRCFG_USBPHY           (1 << 4)
+
+#define S3C2443_URSTCON_FUNCRST         (1 << 2)
+#define S3C2443_URSTCON_PHYRST          (1 << 0)
+
+#define S3C2443_PHYCTRL_CLKSEL          (1 << 3)
+#define S3C2443_PHYCTRL_EXTCLK          (1 << 2)
+#define S3C2443_PHYCTRL_PLLSEL          (1 << 1)
+#define S3C2443_PHYCTRL_DSPORT          (1 << 0)
+
+#define S3C2443_PHYPWR_COMMON_ON        (1 << 31)
+#define S3C2443_PHYPWR_ANALOG_PD        (1 << 4)
+#define S3C2443_PHYPWR_PLL_REFCLK       (1 << 3)
+#define S3C2443_PHYPWR_XO_ON            (1 << 2)
+#define S3C2443_PHYPWR_PLL_PWRDN        (1 << 1)
+#define S3C2443_PHYPWR_FSUSPEND         (1 << 0)
+
+#define S3C2443_UCLKCON_DETECT_VBUS     (1 << 31)
+#define S3C2443_UCLKCON_FUNC_CLKEN      (1 << 2)
+#define S3C2443_UCLKCON_TCLKEN          (1 << 0)
+
 #include <asm/div64.h>
 
 static inline unsigned int
diff --git a/arch/arm/mach-s3c2410/irq.c b/arch/arm/mach-s3c2410/irq.c
index 5e2f35332056..2854129f8cc7 100644
--- a/arch/arm/mach-s3c2410/irq.c
+++ b/arch/arm/mach-s3c2410/irq.c
@@ -23,38 +23,12 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
 #include <plat/cpu.h>
 #include <plat/pm.h>
 
-static int s3c2410_irq_add(struct sys_device *sysdev)
-{
-        return 0;
-}
-
-static struct sysdev_driver s3c2410_irq_driver = {
-        .add            = s3c2410_irq_add,
+struct syscore_ops s3c24xx_irq_syscore_ops = {
         .suspend        = s3c24xx_irq_suspend,
         .resume         = s3c24xx_irq_resume,
 };
-
-static int __init s3c2410_irq_init(void)
-{
-        return sysdev_driver_register(&s3c2410_sysclass, &s3c2410_irq_driver);
-}
-
-arch_initcall(s3c2410_irq_init);
-
-static struct sysdev_driver s3c2410a_irq_driver = {
-        .add            = s3c2410_irq_add,
-        .suspend        = s3c24xx_irq_suspend,
-        .resume         = s3c24xx_irq_resume,
-};
-
-static int __init s3c2410a_irq_init(void)
-{
-        return sysdev_driver_register(&s3c2410a_sysclass, &s3c2410a_irq_driver);
-}
-
-arch_initcall(s3c2410a_irq_init);
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 2970ea9f7c2b..1e2d536adda9 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -17,7 +17,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/dm9000.h>
@@ -214,17 +214,16 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {
 /* NAND Flash on BAST board */
 
 #ifdef CONFIG_PM
-static int bast_pm_suspend(struct sys_device *sd, pm_message_t state)
+static int bast_pm_suspend(void)
 {
         /* ensure that an nRESET is not generated on resume. */
         gpio_direction_output(S3C2410_GPA(21), 1);
         return 0;
 }
 
-static int bast_pm_resume(struct sys_device *sd)
+static void bast_pm_resume(void)
 {
         s3c_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPA21_nRSTOUT);
-        return 0;
 }
 
 #else
@@ -232,16 +231,11 @@ static int bast_pm_resume(struct sys_device *sd)
 #define bast_pm_resume NULL
 #endif
 
-static struct sysdev_class bast_pm_sysclass = {
-        .name           = "mach-bast",
+static struct syscore_ops bast_pm_syscore_ops = {
         .suspend        = bast_pm_suspend,
         .resume         = bast_pm_resume,
 };
 
-static struct sys_device bast_pm_sysdev = {
-        .cls            = &bast_pm_sysclass,
-};
-
 static int smartmedia_map[] = { 0 };
 static int chip0_map[] = { 1 };
 static int chip1_map[] = { 2 };
@@ -642,8 +636,7 @@ static void __init bast_map_io(void)
 
 static void __init bast_init(void)
 {
-        sysdev_class_register(&bast_pm_sysclass);
-        sysdev_register(&bast_pm_sysdev);
+        register_syscore_ops(&bast_pm_syscore_ops);
 
         s3c_i2c0_set_platdata(&bast_i2c_info);
         s3c_nand_set_platdata(&bast_nand_info);
diff --git a/arch/arm/mach-s3c2410/nor-simtec.c b/arch/arm/mach-s3c2410/nor-simtec.c
index 598d130633dc..ad9f750f1e55 100644
--- a/arch/arm/mach-s3c2410/nor-simtec.c
+++ b/arch/arm/mach-s3c2410/nor-simtec.c
@@ -32,7 +32,7 @@
 
 #include "nor-simtec.h"
 
-static void simtec_nor_vpp(struct map_info *map, int vpp)
+static void simtec_nor_vpp(struct platform_device *pdev, int vpp)
 {
         unsigned int val;
         unsigned long flags;
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c
index 725636fc4dc3..4728f9aa7df1 100644
--- a/arch/arm/mach-s3c2410/pm.c
+++ b/arch/arm/mach-s3c2410/pm.c
@@ -25,6 +25,7 @@
 #include <linux/errno.h>
 #include <linux/time.h>
 #include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
 
@@ -92,7 +93,7 @@ static void s3c2410_pm_prepare(void)
         }
 }
 
-static int s3c2410_pm_resume(struct sys_device *dev)
+static void s3c2410_pm_resume(void)
 {
         unsigned long tmp;
 
@@ -104,10 +105,12 @@ static int s3c2410_pm_resume(struct sys_device *dev)
 
         if ( machine_is_aml_m5900() )
                 s3c2410_gpio_setpin(S3C2410_GPF(2), 0);
-
-        return 0;
 }
 
+struct syscore_ops s3c2410_pm_syscore_ops = {
+        .resume         = s3c2410_pm_resume,
+};
+
 static int s3c2410_pm_add(struct sys_device *dev)
 {
         pm_cpu_prep = s3c2410_pm_prepare;
@@ -119,7 +122,6 @@ static int s3c2410_pm_add(struct sys_device *dev)
 #if defined(CONFIG_CPU_S3C2410)
 static struct sysdev_driver s3c2410_pm_driver = {
         .add            = s3c2410_pm_add,
-        .resume         = s3c2410_pm_resume,
 };
 
 /* register ourselves */
@@ -133,7 +135,6 @@ arch_initcall(s3c2410_pm_drvinit);
 
 static struct sysdev_driver s3c2410a_pm_driver = {
         .add            = s3c2410_pm_add,
-        .resume         = s3c2410_pm_resume,
 };
 
 static int __init s3c2410a_pm_drvinit(void)
@@ -147,7 +148,6 @@ arch_initcall(s3c2410a_pm_drvinit);
 #if defined(CONFIG_CPU_S3C2440)
 static struct sysdev_driver s3c2440_pm_driver = {
         .add            = s3c2410_pm_add,
-        .resume         = s3c2410_pm_resume,
 };
 
 static int __init s3c2440_pm_drvinit(void)
@@ -161,7 +161,6 @@ arch_initcall(s3c2440_pm_drvinit);
 #if defined(CONFIG_CPU_S3C2442)
 static struct sysdev_driver s3c2442_pm_driver = {
         .add            = s3c2410_pm_add,
-        .resume         = s3c2410_pm_resume,
 };
 
 static int __init s3c2442_pm_drvinit(void)
diff --git a/arch/arm/mach-s3c2410/s3c2410.c b/arch/arm/mach-s3c2410/s3c2410.c
index adc90a3c5890..f1d3bd8f6f17 100644
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
@@ -19,6 +19,7 @@
 #include <linux/gpio.h>
 #include <linux/clk.h>
 #include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
@@ -40,6 +41,7 @@
 #include <plat/devs.h>
 #include <plat/clock.h>
 #include <plat/pll.h>
+#include <plat/pm.h>
 
 #include <plat/gpio-core.h>
 #include <plat/gpio-cfg.h>
@@ -168,6 +170,9 @@ int __init s3c2410_init(void)
 {
         printk("S3C2410: Initialising architecture\n");
 
+        register_syscore_ops(&s3c2410_pm_syscore_ops);
+        register_syscore_ops(&s3c24xx_irq_syscore_ops);
+
         return sysdev_register(&s3c2410_sysdev);
 }
 
diff --git a/arch/arm/mach-s3c2412/irq.c b/arch/arm/mach-s3c2412/irq.c
index f3355d2ec634..1a1aa220972b 100644
--- a/arch/arm/mach-s3c2412/irq.c
+++ b/arch/arm/mach-s3c2412/irq.c
@@ -202,8 +202,6 @@ static int s3c2412_irq_add(struct sys_device *sysdev)
 
 static struct sysdev_driver s3c2412_irq_driver = {
         .add            = s3c2412_irq_add,
-        .suspend        = s3c24xx_irq_suspend,
-        .resume         = s3c24xx_irq_resume,
 };
 
 static int s3c2412_irq_init(void)
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c
index 923e01bdf017..85dcaeb9e62f 100644
--- a/arch/arm/mach-s3c2412/mach-jive.c
+++ b/arch/arm/mach-s3c2412/mach-jive.c
@@ -17,7 +17,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
@@ -486,7 +486,7 @@ static struct s3c2410_udc_mach_info jive_udc_cfg __initdata = {
 /* Jive power management device */
 
 #ifdef CONFIG_PM
-static int jive_pm_suspend(struct sys_device *sd, pm_message_t state)
+static int jive_pm_suspend(void)
 {
         /* Write the magic value u-boot uses to check for resume into
          * the INFORM0 register, and ensure INFORM1 is set to the
@@ -498,10 +498,9 @@ static int jive_pm_suspend(struct sys_device *sd, pm_message_t state)
         return 0;
 }
 
-static int jive_pm_resume(struct sys_device *sd)
+static void jive_pm_resume(void)
 {
         __raw_writel(0x0, S3C2412_INFORM0);
-        return 0;
 }
 
 #else
@@ -509,16 +508,11 @@ static int jive_pm_resume(struct sys_device *sd)
 #define jive_pm_resume NULL
 #endif
 
-static struct sysdev_class jive_pm_sysclass = {
-        .name           = "jive-pm",
+static struct syscore_ops jive_pm_syscore_ops = {
         .suspend        = jive_pm_suspend,
         .resume         = jive_pm_resume,
 };
 
-static struct sys_device jive_pm_sysdev = {
-        .cls            = &jive_pm_sysclass,
-};
-
 static void __init jive_map_io(void)
 {
         s3c24xx_init_io(jive_iodesc, ARRAY_SIZE(jive_iodesc));
@@ -536,10 +530,9 @@ static void jive_power_off(void)
 
 static void __init jive_machine_init(void)
 {
-        /* register system devices for managing low level suspend */
+        /* register system core operations for managing low level suspend */
 
-        sysdev_class_register(&jive_pm_sysclass);
-        sysdev_register(&jive_pm_sysdev);
+        register_syscore_ops(&jive_pm_syscore_ops);
 
         /* write our sleep configurations for the IO. Pull down all unused
          * IO, ensure that we have turned off all peripherals we do not
diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c
index a7417c479ffe..752b13a7b3db 100644
--- a/arch/arm/mach-s3c2412/pm.c
+++ b/arch/arm/mach-s3c2412/pm.c
@@ -17,6 +17,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
 
@@ -86,13 +87,24 @@ static struct sleep_save s3c2412_sleep[] = {
         SAVE_ITEM(S3C2413_GPJSLPCON),
 };
 
-static int s3c2412_pm_suspend(struct sys_device *dev, pm_message_t state)
+static struct sysdev_driver s3c2412_pm_driver = {
+        .add            = s3c2412_pm_add,
+};
+
+static __init int s3c2412_pm_init(void)
+{
+        return sysdev_driver_register(&s3c2412_sysclass, &s3c2412_pm_driver);
+}
+
+arch_initcall(s3c2412_pm_init);
+
+static int s3c2412_pm_suspend(void)
 {
         s3c_pm_do_save(s3c2412_sleep, ARRAY_SIZE(s3c2412_sleep));
         return 0;
 }
 
-static int s3c2412_pm_resume(struct sys_device *dev)
+static void s3c2412_pm_resume(void)
 {
         unsigned long tmp;
 
@@ -102,18 +114,9 @@ static int s3c2412_pm_resume(struct sys_device *dev)
         __raw_writel(tmp, S3C2412_PWRCFG);
 
         s3c_pm_do_restore(s3c2412_sleep, ARRAY_SIZE(s3c2412_sleep));
-        return 0;
 }
 
-static struct sysdev_driver s3c2412_pm_driver = {
-        .add            = s3c2412_pm_add,
+struct syscore_ops s3c2412_pm_syscore_ops = {
         .suspend        = s3c2412_pm_suspend,
         .resume         = s3c2412_pm_resume,
 };
-
-static __init int s3c2412_pm_init(void)
-{
-        return sysdev_driver_register(&s3c2412_sysclass, &s3c2412_pm_driver);
-}
-
-arch_initcall(s3c2412_pm_init);
diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c
index 4c6df51ddf33..ef0958d3e5c6 100644
--- a/arch/arm/mach-s3c2412/s3c2412.c
+++ b/arch/arm/mach-s3c2412/s3c2412.c
@@ -19,6 +19,7 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
@@ -244,5 +245,8 @@ int __init s3c2412_init(void)
 {
         printk("S3C2412: Initialising architecture\n");
 
+        register_syscore_ops(&s3c2412_pm_syscore_ops);
+        register_syscore_ops(&s3c24xx_irq_syscore_ops);
+
         return sysdev_register(&s3c2412_sysdev);
 }
diff --git a/arch/arm/mach-s3c2416/irq.c b/arch/arm/mach-s3c2416/irq.c
index 77b38f2381c1..28ad20d42445 100644
--- a/arch/arm/mach-s3c2416/irq.c
+++ b/arch/arm/mach-s3c2416/irq.c
@@ -236,8 +236,6 @@ static int __init s3c2416_irq_add(struct sys_device *sysdev)
 
 static struct sysdev_driver s3c2416_irq_driver = {
         .add            = s3c2416_irq_add,
-        .suspend        = s3c24xx_irq_suspend,
-        .resume         = s3c24xx_irq_resume,
 };
 
 static int __init s3c2416_irq_init(void)
diff --git a/arch/arm/mach-s3c2416/mach-smdk2416.c b/arch/arm/mach-s3c2416/mach-smdk2416.c
index 3f83177246c7..ac27ebb31c9b 100644
--- a/arch/arm/mach-s3c2416/mach-smdk2416.c
+++ b/arch/arm/mach-s3c2416/mach-smdk2416.c
@@ -23,6 +23,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/gpio.h>
 #include <linux/fb.h>
+#include <linux/delay.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -35,6 +36,7 @@
 #include <plat/regs-serial.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-lcd.h>
+#include <mach/regs-s3c2443-clock.h>
 
 #include <mach/idle.h>
 #include <mach/leds-gpio.h>
@@ -47,6 +49,7 @@
 #include <plat/cpu.h>
 #include <plat/nand.h>
 #include <plat/sdhci.h>
+#include <plat/udc.h>
 
 #include <plat/regs-fb-v4.h>
 #include <plat/fb.h>
@@ -121,6 +124,27 @@ static struct s3c2410_uartcfg smdk2416_uartcfgs[] __initdata = {
         }
 };
 
+void smdk2416_hsudc_gpio_init(void)
+{
+        s3c_gpio_setpull(S3C2410_GPH(14), S3C_GPIO_PULL_UP);
+        s3c_gpio_setpull(S3C2410_GPF(2), S3C_GPIO_PULL_NONE);
+        s3c_gpio_cfgpin(S3C2410_GPH(14), S3C_GPIO_SFN(1));
+        s3c2410_modify_misccr(S3C2416_MISCCR_SEL_SUSPND, 0);
+}
+
+void smdk2416_hsudc_gpio_uninit(void)
+{
+        s3c2410_modify_misccr(S3C2416_MISCCR_SEL_SUSPND, 1);
+        s3c_gpio_setpull(S3C2410_GPH(14), S3C_GPIO_PULL_NONE);
+        s3c_gpio_cfgpin(S3C2410_GPH(14), S3C_GPIO_SFN(0));
+}
+
+struct s3c24xx_hsudc_platdata smdk2416_hsudc_platdata = {
+        .epnum = 9,
+        .gpio_init = smdk2416_hsudc_gpio_init,
+        .gpio_uninit = smdk2416_hsudc_gpio_uninit,
+};
+
 struct s3c_fb_pd_win smdk2416_fb_win[] = {
         [0] = {
                 /* think this is the same as the smdk6410 */
@@ -186,6 +210,7 @@ static struct platform_device *smdk2416_devices[] __initdata = {
         &s3c_device_i2c0,
         &s3c_device_hsmmc0,
         &s3c_device_hsmmc1,
+        &s3c_device_usb_hsudc,
 };
 
 static void __init smdk2416_map_io(void)
@@ -203,6 +228,8 @@ static void __init smdk2416_machine_init(void)
         s3c_sdhci0_set_platdata(&smdk2416_hsmmc0_pdata);
         s3c_sdhci1_set_platdata(&smdk2416_hsmmc1_pdata);
 
+        s3c24xx_hsudc_set_platdata(&smdk2416_hsudc_platdata);
+
         gpio_request(S3C2410_GPB(4), "USBHost Power");
         gpio_direction_output(S3C2410_GPB(4), 1);
 
diff --git a/arch/arm/mach-s3c2416/pm.c b/arch/arm/mach-s3c2416/pm.c
index 4a04205b04d5..41db2b21e213 100644
--- a/arch/arm/mach-s3c2416/pm.c
+++ b/arch/arm/mach-s3c2416/pm.c
@@ -11,6 +11,7 @@
 */
 
 #include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/io.h>
 
 #include <asm/cacheflush.h>
@@ -55,30 +56,26 @@ static int s3c2416_pm_add(struct sys_device *sysdev)
         return 0;
 }
 
-static int s3c2416_pm_suspend(struct sys_device *dev, pm_message_t state)
+static struct sysdev_driver s3c2416_pm_driver = {
+        .add            = s3c2416_pm_add,
+};
+
+static __init int s3c2416_pm_init(void)
 {
-        return 0;
+        return sysdev_driver_register(&s3c2416_sysclass, &s3c2416_pm_driver);
 }
 
-static int s3c2416_pm_resume(struct sys_device *dev)
+arch_initcall(s3c2416_pm_init);
+
+
+static void s3c2416_pm_resume(void)
 {
         /* unset the return-from-sleep amd inform flags */
         __raw_writel(0x0, S3C2443_PWRMODE);
         __raw_writel(0x0, S3C2412_INFORM0);
         __raw_writel(0x0, S3C2412_INFORM1);
-
-        return 0;
 }
 
-static struct sysdev_driver s3c2416_pm_driver = {
-        .add            = s3c2416_pm_add,
-        .suspend        = s3c2416_pm_suspend,
+struct syscore_ops s3c2416_pm_syscore_ops = {
         .resume         = s3c2416_pm_resume,
 };
-
-static __init int s3c2416_pm_init(void)
-{
-        return sysdev_driver_register(&s3c2416_sysclass, &s3c2416_pm_driver);
-}
-
-arch_initcall(s3c2416_pm_init);
diff --git a/arch/arm/mach-s3c2416/s3c2416.c b/arch/arm/mach-s3c2416/s3c2416.c
index ba7fd8737434..494ce913dc95 100644
--- a/arch/arm/mach-s3c2416/s3c2416.c
+++ b/arch/arm/mach-s3c2416/s3c2416.c
@@ -32,6 +32,7 @@
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
 #include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/clk.h>
 #include <linux/io.h>
 
@@ -54,6 +55,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/sdhci.h>
+#include <plat/pm.h>
 
 #include <plat/iic-core.h>
 #include <plat/fb-core.h>
@@ -95,6 +97,9 @@ int __init s3c2416_init(void)
 
         s3c_fb_setname("s3c2443-fb");
 
+        register_syscore_ops(&s3c2416_pm_syscore_ops);
+        register_syscore_ops(&s3c24xx_irq_syscore_ops);
+
         return sysdev_register(&s3c2416_sysdev);
 }
 
diff --git a/arch/arm/mach-s3c2440/mach-osiris.c b/arch/arm/mach-s3c2440/mach-osiris.c
index 14dc67897757..d88536393310 100644
--- a/arch/arm/mach-s3c2440/mach-osiris.c
+++ b/arch/arm/mach-s3c2440/mach-osiris.c
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <linux/gpio.h>
 #include <linux/device.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/serial_core.h>
 #include <linux/clk.h>
 #include <linux/i2c.h>
@@ -284,7 +284,7 @@ static struct platform_device osiris_pcmcia = {
 #ifdef CONFIG_PM
 static unsigned char pm_osiris_ctrl0;
 
-static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state)
+static int osiris_pm_suspend(void)
 {
         unsigned int tmp;
 
@@ -304,7 +304,7 @@ static int osiris_pm_suspend(struct sys_device *sd, pm_message_t state)
         return 0;
 }
 
-static int osiris_pm_resume(struct sys_device *sd)
+static void osiris_pm_resume(void)
 {
         if (pm_osiris_ctrl0 & OSIRIS_CTRL0_FIX8)
                 __raw_writeb(OSIRIS_CTRL1_FIX8, OSIRIS_VA_CTRL1);
@@ -312,8 +312,6 @@ static int osiris_pm_resume(struct sys_device *sd)
         __raw_writeb(pm_osiris_ctrl0, OSIRIS_VA_CTRL0);
 
         s3c_gpio_cfgpin(S3C2410_GPA(21), S3C2410_GPA21_nRSTOUT);
-
-        return 0;
 }
 
 #else
@@ -321,16 +319,11 @@ static int osiris_pm_resume(struct sys_device *sd)
 #define osiris_pm_resume NULL
 #endif
 
-static struct sysdev_class osiris_pm_sysclass = {
-        .name           = "mach-osiris",
+static struct syscore_ops osiris_pm_syscore_ops = {
         .suspend        = osiris_pm_suspend,
         .resume         = osiris_pm_resume,
 };
 
-static struct sys_device osiris_pm_sysdev = {
-        .cls            = &osiris_pm_sysclass,
-};
-
 /* Link for DVS driver to TPS65011 */
 
 static void osiris_tps_release(struct device *dev)
@@ -439,8 +432,7 @@ static void __init osiris_map_io(void)
 
 static void __init osiris_init(void)
 {
-        sysdev_class_register(&osiris_pm_sysclass);
-        sysdev_register(&osiris_pm_sysdev);
+        register_syscore_ops(&osiris_pm_syscore_ops);
 
         s3c_i2c0_set_platdata(NULL);
         s3c_nand_set_platdata(&osiris_nand_info);
diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c
index f7663f731ea0..ce99ff72838d 100644
--- a/arch/arm/mach-s3c2440/s3c2440.c
+++ b/arch/arm/mach-s3c2440/s3c2440.c
@@ -19,6 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/serial_core.h>
 #include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/gpio.h>
 #include <linux/clk.h>
 #include <linux/io.h>
@@ -33,6 +34,7 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/s3c244x.h>
+#include <plat/pm.h>
 
 #include <plat/gpio-core.h>
 #include <plat/gpio-cfg.h>
@@ -51,6 +53,12 @@ int __init s3c2440_init(void)
         s3c_device_wdt.resource[1].start = IRQ_S3C2440_WDT;
         s3c_device_wdt.resource[1].end   = IRQ_S3C2440_WDT;
 
+        /* register suspend/resume handlers */
+
+        register_syscore_ops(&s3c2410_pm_syscore_ops);
+        register_syscore_ops(&s3c244x_pm_syscore_ops);
+        register_syscore_ops(&s3c24xx_irq_syscore_ops);
+
         /* register our system device for everything else */
 
         return sysdev_register(&s3c2440_sysdev);
diff --git a/arch/arm/mach-s3c2440/s3c2442.c b/arch/arm/mach-s3c2440/s3c2442.c
index ecf813546554..6224bad4d604 100644
--- a/arch/arm/mach-s3c2440/s3c2442.c
+++ b/arch/arm/mach-s3c2440/s3c2442.c
@@ -29,6 +29,7 @@
 #include <linux/err.h>
 #include <linux/device.h>
 #include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/mutex.h>
@@ -45,6 +46,7 @@
 #include <plat/clock.h>
 #include <plat/cpu.h>
 #include <plat/s3c244x.h>
+#include <plat/pm.h>
 
 #include <plat/gpio-core.h>
 #include <plat/gpio-cfg.h>
@@ -167,6 +169,10 @@ int __init s3c2442_init(void)
 {
         printk("S3C2442: Initialising architecture\n");
 
+        register_syscore_ops(&s3c2410_pm_syscore_ops);
+        register_syscore_ops(&s3c244x_pm_syscore_ops);
+        register_syscore_ops(&s3c24xx_irq_syscore_ops);
+
         return sysdev_register(&s3c2442_sysdev);
 }
 
diff --git a/arch/arm/mach-s3c2440/s3c244x-irq.c b/arch/arm/mach-s3c2440/s3c244x-irq.c
index de07c2feaa32..c63e8f26d901 100644
--- a/arch/arm/mach-s3c2440/s3c244x-irq.c
+++ b/arch/arm/mach-s3c2440/s3c244x-irq.c
@@ -116,8 +116,6 @@ static int s3c244x_irq_add(struct sys_device *sysdev)
 
 static struct sysdev_driver s3c2440_irq_driver = {
         .add            = s3c244x_irq_add,
-        .suspend        = s3c24xx_irq_suspend,
-        .resume         = s3c24xx_irq_resume,
 };
 
 static int s3c2440_irq_init(void)
@@ -129,8 +127,6 @@ arch_initcall(s3c2440_irq_init);
 
 static struct sysdev_driver s3c2442_irq_driver = {
         .add            = s3c244x_irq_add,
-        .suspend        = s3c24xx_irq_suspend,
-        .resume         = s3c24xx_irq_resume,
 };
 
 
diff --git a/arch/arm/mach-s3c2440/s3c244x.c b/arch/arm/mach-s3c2440/s3c244x.c
index 90c1707b9c95..7e8a23d2098a 100644
--- a/arch/arm/mach-s3c2440/s3c244x.c
+++ b/arch/arm/mach-s3c2440/s3c244x.c
@@ -19,6 +19,7 @@
 #include <linux/serial_core.h>
 #include <linux/platform_device.h>
 #include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/clk.h>
 #include <linux/io.h>
 
@@ -134,45 +135,14 @@ void __init s3c244x_init_clocks(int xtal)
         s3c2410_baseclk_add();
 }
 
-#ifdef CONFIG_PM
-
-static struct sleep_save s3c244x_sleep[] = {
-        SAVE_ITEM(S3C2440_DSC0),
-        SAVE_ITEM(S3C2440_DSC1),
-        SAVE_ITEM(S3C2440_GPJDAT),
-        SAVE_ITEM(S3C2440_GPJCON),
-        SAVE_ITEM(S3C2440_GPJUP)
-};
-
-static int s3c244x_suspend(struct sys_device *dev, pm_message_t state)
-{
-        s3c_pm_do_save(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep));
-        return 0;
-}
-
-static int s3c244x_resume(struct sys_device *dev)
-{
-        s3c_pm_do_restore(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep));
-        return 0;
-}
-
-#else
-#define s3c244x_suspend NULL
-#define s3c244x_resume  NULL
-#endif
-
 /* Since the S3C2442 and S3C2440 share  items, put both sysclasses here */
 
 struct sysdev_class s3c2440_sysclass = {
         .name           = "s3c2440-core",
-        .suspend        = s3c244x_suspend,
-        .resume         = s3c244x_resume
 };
 
 struct sysdev_class s3c2442_sysclass = {
         .name           = "s3c2442-core",
-        .suspend        = s3c244x_suspend,
-        .resume         = s3c244x_resume
 };
 
 /* need to register class before we actually register the device, and
@@ -194,3 +164,33 @@ static int __init s3c2442_core_init(void)
 }
 
 core_initcall(s3c2442_core_init);
+
+
+#ifdef CONFIG_PM
+static struct sleep_save s3c244x_sleep[] = {
+        SAVE_ITEM(S3C2440_DSC0),
+        SAVE_ITEM(S3C2440_DSC1),
+        SAVE_ITEM(S3C2440_GPJDAT),
+        SAVE_ITEM(S3C2440_GPJCON),
+        SAVE_ITEM(S3C2440_GPJUP)
+};
+
+static int s3c244x_suspend(void)
+{
+        s3c_pm_do_save(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep));
+        return 0;
+}
+
+static void s3c244x_resume(void)
+{
+        s3c_pm_do_restore(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep));
+}
+#else
+#define s3c244x_suspend NULL
+#define s3c244x_resume  NULL
+#endif
+
+struct syscore_ops s3c244x_pm_syscore_ops = {
+        .suspend        = s3c244x_suspend,
+        .resume         = s3c244x_resume,
+};
diff --git a/arch/arm/mach-s3c64xx/irq-pm.c b/arch/arm/mach-s3c64xx/irq-pm.c
index da1bec64b9da..8bec61e242c7 100644
--- a/arch/arm/mach-s3c64xx/irq-pm.c
+++ b/arch/arm/mach-s3c64xx/irq-pm.c
@@ -13,7 +13,7 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/interrupt.h>
 #include <linux/serial_core.h>
 #include <linux/irq.h>
@@ -54,7 +54,7 @@ static struct irq_grp_save {
 
 static u32 irq_uart_mask[CONFIG_SERIAL_SAMSUNG_UARTS];
 
-static int s3c64xx_irq_pm_suspend(struct sys_device *dev, pm_message_t state)
+static int s3c64xx_irq_pm_suspend(void)
 {
         struct irq_grp_save *grp = eint_grp_save;
         int i;
@@ -75,7 +75,7 @@ static int s3c64xx_irq_pm_suspend(struct sys_device *dev, pm_message_t state)
         return 0;
 }
 
-static int s3c64xx_irq_pm_resume(struct sys_device *dev)
+static void s3c64xx_irq_pm_resume(void)
 {
         struct irq_grp_save *grp = eint_grp_save;
         int i;
@@ -94,18 +94,18 @@ static int s3c64xx_irq_pm_resume(struct sys_device *dev)
         }
 
         S3C_PMDBG("%s: IRQ configuration restored\n", __func__);
-        return 0;
 }
 
-static struct sysdev_driver s3c64xx_irq_driver = {
+struct syscore_ops s3c64xx_irq_syscore_ops = {
         .suspend = s3c64xx_irq_pm_suspend,
         .resume  = s3c64xx_irq_pm_resume,
 };
 
-static int __init s3c64xx_irq_pm_init(void)
+static __init int s3c64xx_syscore_init(void)
 {
-        return sysdev_driver_register(&s3c64xx_sysclass, &s3c64xx_irq_driver);
-}
+        register_syscore_ops(&s3c64xx_irq_syscore_ops);
 
-arch_initcall(s3c64xx_irq_pm_init);
+        return 0;
+}
 
+core_initcall(s3c64xx_syscore_init);
diff --git a/arch/arm/mach-s3c64xx/irq.c b/arch/arm/mach-s3c64xx/irq.c
index 67a145d440f3..97660c8141ae 100644
--- a/arch/arm/mach-s3c64xx/irq.c
+++ b/arch/arm/mach-s3c64xx/irq.c
@@ -58,12 +58,7 @@ void __init s3c64xx_init_irq(u32 vic0_valid, u32 vic1_valid)
         vic_init(VA_VIC1, IRQ_VIC1_BASE, vic1_valid, 0);
 
         /* add the timer sub-irqs */
-
-        s3c_init_vic_timer_irq(IRQ_TIMER0_VIC, IRQ_TIMER0);
-        s3c_init_vic_timer_irq(IRQ_TIMER1_VIC, IRQ_TIMER1);
-        s3c_init_vic_timer_irq(IRQ_TIMER2_VIC, IRQ_TIMER2);
-        s3c_init_vic_timer_irq(IRQ_TIMER3_VIC, IRQ_TIMER3);
-        s3c_init_vic_timer_irq(IRQ_TIMER4_VIC, IRQ_TIMER4);
+        s3c_init_vic_timer_irq(5, IRQ_TIMER0);
 
         s3c_init_uart_irqs(uart_irqs, ARRAY_SIZE(uart_irqs));
 }
diff --git a/arch/arm/mach-s5p64x0/include/mach/uncompress.h b/arch/arm/mach-s5p64x0/include/mach/uncompress.h
index c65b229aab23..1608faf870ff 100644
--- a/arch/arm/mach-s5p64x0/include/mach/uncompress.h
+++ b/arch/arm/mach-s5p64x0/include/mach/uncompress.h
@@ -24,8 +24,8 @@ typedef unsigned int upf_t;	/* cannot include linux/serial_core.h */
 
 /* uart setup */
 
-static unsigned int fifo_mask;
-static unsigned int fifo_max;
+unsigned int fifo_mask;
+unsigned int fifo_max;
 
 /* forward declerations */
 
@@ -43,7 +43,7 @@ static void arch_detect_cpu(void);
 /* how many bytes we allow into the FIFO at a time in FIFO mode */
 #define FIFO_MAX         (14)
 
-static unsigned long uart_base;
+unsigned long uart_base;
 
 static __inline__ void get_uart_base(void)
 {
diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c
index 549d7924fd4c..24febae3d4c0 100644
--- a/arch/arm/mach-s5pv210/pm.c
+++ b/arch/arm/mach-s5pv210/pm.c
@@ -16,6 +16,7 @@
 
 #include <linux/init.h>
 #include <linux/suspend.h>
+#include <linux/syscore_ops.h>
 #include <linux/io.h>
 
 #include <plat/cpu.h>
@@ -140,7 +141,17 @@ static int s5pv210_pm_add(struct sys_device *sysdev)
         return 0;
 }
 
-static int s5pv210_pm_resume(struct sys_device *dev)
+static struct sysdev_driver s5pv210_pm_driver = {
+        .add            = s5pv210_pm_add,
+};
+
+static __init int s5pv210_pm_drvinit(void)
+{
+        return sysdev_driver_register(&s5pv210_sysclass, &s5pv210_pm_driver);
+}
+arch_initcall(s5pv210_pm_drvinit);
+
+static void s5pv210_pm_resume(void)
 {
         u32 tmp;
 
@@ -150,17 +161,15 @@ static int s5pv210_pm_resume(struct sys_device *dev)
         __raw_writel(tmp , S5P_OTHERS);
 
         s3c_pm_do_restore_core(s5pv210_core_save, ARRAY_SIZE(s5pv210_core_save));
-
-        return 0;
 }
 
-static struct sysdev_driver s5pv210_pm_driver = {
-        .add            = s5pv210_pm_add,
+static struct syscore_ops s5pv210_pm_syscore_ops = {
         .resume         = s5pv210_pm_resume,
 };
 
-static __init int s5pv210_pm_drvinit(void)
+static __init int s5pv210_pm_syscore_init(void)
 {
-        return sysdev_driver_register(&s5pv210_sysclass, &s5pv210_pm_driver);
+        register_syscore_ops(&s5pv210_pm_syscore_ops);
+        return 0;
 }
-arch_initcall(s5pv210_pm_drvinit);
+arch_initcall(s5pv210_pm_syscore_init);
diff --git a/arch/arm/mach-sa1100/include/mach/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h
index a44da6a2916c..cff31ee246b7 100644
--- a/arch/arm/mach-sa1100/include/mach/memory.h
+++ b/arch/arm/mach-sa1100/include/mach/memory.h
@@ -14,18 +14,8 @@
  */
 #define PLAT_PHYS_OFFSET        UL(0xc0000000)
 
-#ifndef __ASSEMBLY__
-
 #ifdef CONFIG_SA1111
-void sa1111_adjust_zones(unsigned long *size, unsigned long *holes);
-
-#define arch_adjust_zones(size, holes) \
-        sa1111_adjust_zones(size, holes)
-
-#define ISA_DMA_THRESHOLD       (PHYS_OFFSET + SZ_1M - 1)
-#define MAX_DMA_ADDRESS         (PAGE_OFFSET + SZ_1M)
-
-#endif
+#define ARM_DMA_ZONE_SIZE       SZ_1M
 #endif
 
 /*
diff --git a/arch/arm/mach-sa1100/irq.c b/arch/arm/mach-sa1100/irq.c
index 423ddb3d65e9..dfbf824a69fa 100644
--- a/arch/arm/mach-sa1100/irq.c
+++ b/arch/arm/mach-sa1100/irq.c
@@ -14,7 +14,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/ioport.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
 #include <mach/hardware.h>
 #include <asm/mach/irq.h>
@@ -234,7 +234,7 @@ static struct sa1100irq_state {
         unsigned int    iccr;
 } sa1100irq_state;
 
-static int sa1100irq_suspend(struct sys_device *dev, pm_message_t state)
+static int sa1100irq_suspend(void)
 {
         struct sa1100irq_state *st = &sa1100irq_state;
 
@@ -264,7 +264,7 @@ static int sa1100irq_suspend(struct sys_device *dev, pm_message_t state)
         return 0;
 }
 
-static int sa1100irq_resume(struct sys_device *dev)
+static void sa1100irq_resume(void)
 {
         struct sa1100irq_state *st = &sa1100irq_state;
 
@@ -277,24 +277,17 @@ static int sa1100irq_resume(struct sys_device *dev)
 
                 ICMR = st->icmr;
         }
-        return 0;
 }
 
-static struct sysdev_class sa1100irq_sysclass = {
-        .name           = "sa11x0-irq",
+static struct syscore_ops sa1100irq_syscore_ops = {
         .suspend        = sa1100irq_suspend,
         .resume         = sa1100irq_resume,
 };
 
-static struct sys_device sa1100irq_device = {
-        .id             = 0,
-        .cls            = &sa1100irq_sysclass,
-};
-
 static int __init sa1100irq_init_devicefs(void)
 {
-        sysdev_class_register(&sa1100irq_sysclass);
-        return sysdev_register(&sa1100irq_device);
+        register_syscore_ops(&sa1100irq_syscore_ops);
+        return 0;
 }
 
 device_initcall(sa1100irq_init_devicefs);
diff --git a/arch/arm/mach-sa1100/time.c b/arch/arm/mach-sa1100/time.c
index ae4f3d80416f..fa6602491d54 100644
--- a/arch/arm/mach-sa1100/time.c
+++ b/arch/arm/mach-sa1100/time.c
@@ -92,25 +92,11 @@ sa1100_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *c)
 static struct clock_event_device ckevt_sa1100_osmr0 = {
         .name           = "osmr0",
         .features       = CLOCK_EVT_FEAT_ONESHOT,
-        .shift          = 32,
         .rating         = 200,
         .set_next_event = sa1100_osmr0_set_next_event,
         .set_mode       = sa1100_osmr0_set_mode,
 };
 
-static cycle_t sa1100_read_oscr(struct clocksource *s)
-{
-        return OSCR;
-}
-
-static struct clocksource cksrc_sa1100_oscr = {
-        .name           = "oscr",
-        .rating         = 200,
-        .read           = sa1100_read_oscr,
-        .mask           = CLOCKSOURCE_MASK(32),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 static struct irqaction sa1100_timer_irq = {
         .name           = "ost0",
         .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
@@ -120,14 +106,13 @@ static struct irqaction sa1100_timer_irq = {
 
 static void __init sa1100_timer_init(void)
 {
-        OIER = 0;               /* disable any timer interrupts */
-        OSSR = 0xf;             /* clear status on all timers */
+        OIER = 0;
+        OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3;
 
         init_fixed_sched_clock(&cd, sa1100_update_sched_clock, 32,
                                3686400, SC_MULT, SC_SHIFT);
 
-        ckevt_sa1100_osmr0.mult =
-                div_sc(3686400, NSEC_PER_SEC, ckevt_sa1100_osmr0.shift);
+        clockevents_calc_mult_shift(&ckevt_sa1100_osmr0, 3686400, 4);
         ckevt_sa1100_osmr0.max_delta_ns =
                 clockevent_delta2ns(0x7fffffff, &ckevt_sa1100_osmr0);
         ckevt_sa1100_osmr0.min_delta_ns =
@@ -136,7 +121,8 @@ static void __init sa1100_timer_init(void)
 
         setup_irq(IRQ_OST0, &sa1100_timer_irq);
 
-        clocksource_register_hz(&cksrc_sa1100_oscr, CLOCK_TICK_RATE);
+        clocksource_mmio_init(&OSCR, "oscr", CLOCK_TICK_RATE, 200, 32,
+                clocksource_mmio_readl_up);
         clockevents_register_device(&ckevt_sa1100_osmr0);
 }
 
diff --git a/arch/arm/mach-shark/include/mach/memory.h b/arch/arm/mach-shark/include/mach/memory.h
index 9afb17000008..4c0831f83b0c 100644
--- a/arch/arm/mach-shark/include/mach/memory.h
+++ b/arch/arm/mach-shark/include/mach/memory.h
@@ -17,25 +17,7 @@
  */
 #define PLAT_PHYS_OFFSET     UL(0x08000000)
 
-#ifndef __ASSEMBLY__
-
-static inline void __arch_adjust_zones(unsigned long *zone_size, unsigned long *zhole_size)
-{
-  /* Only the first 4 MB (=1024 Pages) are usable for DMA */
-  /* See dev / -> .properties in OpenFirmware. */
-  zone_size[1] = zone_size[0] - 1024;
-  zone_size[0] = 1024;
-  zhole_size[1] = zhole_size[0];
-  zhole_size[0] = 0;
-}
-
-#define arch_adjust_zones(size, holes) \
-        __arch_adjust_zones(size, holes)
-
-#define ISA_DMA_THRESHOLD       (PHYS_OFFSET + SZ_4M - 1)
-#define MAX_DMA_ADDRESS         (PAGE_OFFSET + SZ_4M)
-
-#endif
+#define ARM_DMA_ZONE_SIZE       SZ_4M
 
 /*
  * Cache flushing area
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index e2507f66f9d5..612b27000c3e 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -30,6 +30,11 @@ obj-$(CONFIG_ARCH_SH7377)	+= entry-intc.o
 obj-$(CONFIG_ARCH_SH7372)       += entry-intc.o
 obj-$(CONFIG_ARCH_SH73A0)       += entry-gic.o
 
+# PM objects
+obj-$(CONFIG_SUSPEND)           += suspend.o
+obj-$(CONFIG_CPU_IDLE)          += cpuidle.o
+obj-$(CONFIG_ARCH_SH7372)       += pm-sh7372.o sleep-sh7372.o
+
 # Board objects
 obj-$(CONFIG_MACH_G3EVM)        += board-g3evm.o
 obj-$(CONFIG_MACH_G4EVM)        += board-g4evm.o
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index 3e6f0aab460b..c95258c274c1 100644
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -34,6 +34,8 @@
 #include <linux/input/sh_keysc.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/sh_mmcif.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
+#include <linux/mfd/tmio.h>
 #include <linux/sh_clk.h>
 #include <video/sh_mobile_lcdc.h>
 #include <video/sh_mipi_dsi.h>
@@ -156,10 +158,19 @@ static struct resource sh_mmcif_resources[] = {
         },
 };
 
+static struct sh_mmcif_dma sh_mmcif_dma = {
+        .chan_priv_rx   = {
+                .slave_id       = SHDMA_SLAVE_MMCIF_RX,
+        },
+        .chan_priv_tx   = {
+                .slave_id       = SHDMA_SLAVE_MMCIF_TX,
+        },
+};
 static struct sh_mmcif_plat_data sh_mmcif_platdata = {
         .sup_pclk       = 0,
         .ocr            = MMC_VDD_165_195,
         .caps           = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
+        .dma            = &sh_mmcif_dma,
 };
 
 static struct platform_device mmc_device = {
@@ -296,11 +307,13 @@ static struct platform_device lcdc0_device = {
 /* MIPI-DSI */
 static struct resource mipidsi0_resources[] = {
         [0] = {
+                .name   = "DSI0",
                 .start  = 0xfeab0000,
                 .end    = 0xfeab3fff,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
+                .name   = "DSI0",
                 .start  = 0xfeab4000,
                 .end    = 0xfeab7fff,
                 .flags  = IORESOURCE_MEM,
@@ -325,6 +338,89 @@ static struct platform_device mipidsi0_device = {
         },
 };
 
+static struct sh_mobile_sdhi_info sdhi0_info = {
+        .dma_slave_tx   = SHDMA_SLAVE_SDHI0_TX,
+        .dma_slave_rx   = SHDMA_SLAVE_SDHI0_RX,
+        .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
+        .tmio_ocr_mask  = MMC_VDD_27_28 | MMC_VDD_28_29,
+};
+
+static struct resource sdhi0_resources[] = {
+        [0] = {
+                .name   = "SDHI0",
+                .start  = 0xee100000,
+                .end    = 0xee1000ff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = gic_spi(83),
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                .start  = gic_spi(84),
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                .start  = gic_spi(85),
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device sdhi0_device = {
+        .name           = "sh_mobile_sdhi",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(sdhi0_resources),
+        .resource       = sdhi0_resources,
+        .dev    = {
+                .platform_data  = &sdhi0_info,
+        },
+};
+
+void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state)
+{
+        gpio_set_value(GPIO_PORT114, state);
+}
+
+static struct sh_mobile_sdhi_info sh_sdhi1_platdata = {
+        .dma_slave_tx   = SHDMA_SLAVE_SDHI1_TX,
+        .dma_slave_rx   = SHDMA_SLAVE_SDHI1_RX,
+        .tmio_flags     = TMIO_MMC_WRPROTECT_DISABLE,
+        .tmio_caps      = MMC_CAP_NONREMOVABLE,
+        .tmio_ocr_mask  = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .set_pwr        = ag5evm_sdhi1_set_pwr,
+};
+
+static struct resource sdhi1_resources[] = {
+        [0] = {
+                .name   = "SDHI1",
+                .start  = 0xee120000,
+                .end    = 0xee1200ff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = gic_spi(87),
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                .start  = gic_spi(88),
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                .start  = gic_spi(89),
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device sdhi1_device = {
+        .name           = "sh_mobile_sdhi",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &sh_sdhi1_platdata,
+        },
+        .num_resources  = ARRAY_SIZE(sdhi1_resources),
+        .resource       = sdhi1_resources,
+};
+
 static struct platform_device *ag5evm_devices[] __initdata = {
         &eth_device,
         &keysc_device,
@@ -333,6 +429,8 @@ static struct platform_device *ag5evm_devices[] __initdata = {
         &irda_device,
         &lcdc0_device,
         &mipidsi0_device,
+        &sdhi0_device,
+        &sdhi1_device,
 };
 
 static struct map_desc ag5evm_io_desc[] __initdata = {
@@ -454,6 +552,26 @@ static void __init ag5evm_init(void)
         /* MIPI-DSI clock setup */
         __raw_writel(0x2a809010, DSI0PHYCR);
 
+        /* enable SDHI0 on CN15 [SD I/F] */
+        gpio_request(GPIO_FN_SDHICD0, NULL);
+        gpio_request(GPIO_FN_SDHIWP0, NULL);
+        gpio_request(GPIO_FN_SDHICMD0, NULL);
+        gpio_request(GPIO_FN_SDHICLK0, NULL);
+        gpio_request(GPIO_FN_SDHID0_3, NULL);
+        gpio_request(GPIO_FN_SDHID0_2, NULL);
+        gpio_request(GPIO_FN_SDHID0_1, NULL);
+        gpio_request(GPIO_FN_SDHID0_0, NULL);
+
+        /* enable SDHI1 on CN4 [WLAN I/F] */
+        gpio_request(GPIO_FN_SDHICLK1, NULL);
+        gpio_request(GPIO_FN_SDHICMD1_PU, NULL);
+        gpio_request(GPIO_FN_SDHID1_3_PU, NULL);
+        gpio_request(GPIO_FN_SDHID1_2_PU, NULL);
+        gpio_request(GPIO_FN_SDHID1_1_PU, NULL);
+        gpio_request(GPIO_FN_SDHID1_0_PU, NULL);
+        gpio_request(GPIO_PORT114, "sdhi1_power");
+        gpio_direction_output(GPIO_PORT114, 0);
+
 #ifdef CONFIG_CACHE_L2X0
         /* Shared attribute override enable, 64K*8way */
         l2x0_init(__io(0xf0100000), 0x00460000, 0xc2000fff);
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c
index 1e35fa976d64..08acb6ec8139 100644
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@ -316,8 +316,16 @@ static struct resource sdhi0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = evt2irq(0x0e00) /* SDHI0 */,
-                .flags  = IORESOURCE_IRQ,
+                .start  = evt2irq(0x0e00) /* SDHI0_SDHI0I0 */,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                .start  = evt2irq(0x0e20) /* SDHI0_SDHI0I1 */,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                .start  = evt2irq(0x0e40) /* SDHI0_SDHI0I2 */,
+                .flags  = IORESOURCE_IRQ,
         },
 };
 
@@ -349,8 +357,16 @@ static struct resource sdhi1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = evt2irq(0x0e80),
-                .flags  = IORESOURCE_IRQ,
+                .start  = evt2irq(0x0e80), /* SDHI1_SDHI1I0 */
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                .start  = evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                .start  = evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */
+                .flags  = IORESOURCE_IRQ,
         },
 };
 
@@ -980,11 +996,6 @@ static void __init hdmi_init_pm_clock(void)
                 goto out;
         }
 
-        ret = clk_enable(&sh7372_pllc2_clk);
-        if (ret < 0) {
-                pr_err("Cannot enable pllc2 clock\n");
-                goto out;
-        }
         pr_debug("PLLC2 set frequency %lu\n", rate);
 
         ret = clk_set_parent(hdmi_ick, &sh7372_pllc2_clk);
@@ -1343,6 +1354,7 @@ static void __init ap4evb_init(void)
 
         hdmi_init_pm_clock();
         fsi_init_pm_clock();
+        sh7372_pm_init();
 }
 
 static void __init ap4evb_timer_init(void)
diff --git a/arch/arm/mach-shmobile/board-g4evm.c b/arch/arm/mach-shmobile/board-g4evm.c
index c87a7b7c5832..8e3c5559f27f 100644
--- a/arch/arm/mach-shmobile/board-g4evm.c
+++ b/arch/arm/mach-shmobile/board-g4evm.c
@@ -205,7 +205,7 @@ static struct resource sdhi0_resources[] = {
         [0] = {
                 .name   = "SDHI0",
                 .start  = 0xe6d50000,
-                .end    = 0xe6d50nff,
+                .end    = 0xe6d500ff,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 7da2ca24229d..448ddbe43335 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -43,6 +43,7 @@
 #include <linux/sh_intc.h>
 #include <linux/tca6416_keypad.h>
 #include <linux/usb/r8a66597.h>
+#include <linux/usb/renesas_usbhs.h>
 
 #include <video/sh_mobile_hdmi.h>
 #include <video/sh_mobile_lcdc.h>
@@ -143,7 +144,30 @@
  * open      | external VBUS | Function
  *
  * *1
- * CN31 is used as Host in Linux.
+ * CN31 is used as
+ * CONFIG_USB_R8A66597_HCD      Host
+ * CONFIG_USB_RENESAS_USBHS     Function
+ *
+ * CAUTION
+ *
+ * renesas_usbhs driver can use external interrupt mode
+ * (which come from USB-PHY) or autonomy mode (it use own interrupt)
+ * for detecting connection/disconnection when Function.
+ * USB will be power OFF while it has been disconnecting
+ * if external interrupt mode, and it is always power ON if autonomy mode,
+ *
+ * mackerel can not use external interrupt (IRQ7-PORT167) mode on "USB0",
+ * because Touchscreen is using IRQ7-PORT40.
+ * It is impossible to use IRQ7 demux on this board.
+ *
+ * We can use external interrupt mode USB-Function on "USB1".
+ * USB1 can become Host by r8a66597, and become Function by renesas_usbhs.
+ * But don't select both drivers in same time.
+ * These uses same IRQ number for request_irq(), and aren't supporting
+ * IRQF_SHARD / IORESOURCE_IRQ_SHAREABLE.
+ *
+ * Actually these are old/new version of USB driver.
+ * This mean its register will be broken if it supports SHARD IRQ,
  */
 
 /*
@@ -185,6 +209,7 @@
  * FIXME !!
  *
  * gpio_no_direction
+ * gpio_pull_down
  * are quick_hack.
  *
  * current gpio frame work doesn't have
@@ -196,6 +221,16 @@ static void __init gpio_no_direction(u32 addr)
         __raw_writeb(0x00, addr);
 }
 
+static void __init gpio_pull_down(u32 addr)
+{
+        u8 data = __raw_readb(addr);
+
+        data &= 0x0F;
+        data |= 0xA0;
+
+        __raw_writeb(data, addr);
+}
+
 /* MTD */
 static struct mtd_partition nor_flash_partitions[] = {
         {
@@ -458,12 +493,6 @@ static void __init hdmi_init_pm_clock(void)
                 goto out;
         }
 
-        ret = clk_enable(&sh7372_pllc2_clk);
-        if (ret < 0) {
-                pr_err("Cannot enable pllc2 clock\n");
-                goto out;
-        }
-
         pr_debug("PLLC2 set frequency %lu\n", rate);
 
         ret = clk_set_parent(hdmi_ick, &sh7372_pllc2_clk);
@@ -515,6 +544,157 @@ static struct platform_device usb1_host_device = {
         .resource       = usb1_host_resources,
 };
 
+/* USB1 (Function) */
+#define USB_PHY_MODE            (1 << 4)
+#define USB_PHY_INT_EN          ((1 << 3) | (1 << 2))
+#define USB_PHY_ON              (1 << 1)
+#define USB_PHY_OFF             (1 << 0)
+#define USB_PHY_INT_CLR         (USB_PHY_ON | USB_PHY_OFF)
+
+struct usbhs_private {
+        unsigned int irq;
+        unsigned int usbphyaddr;
+        unsigned int usbcrcaddr;
+        struct renesas_usbhs_platform_info info;
+};
+
+#define usbhs_get_priv(pdev)                            \
+        container_of(renesas_usbhs_get_info(pdev),      \
+                     struct usbhs_private, info)
+
+#define usbhs_is_connected(priv)                        \
+        (!((1 << 7) & __raw_readw(priv->usbcrcaddr)))
+
+static int usbhs1_get_id(struct platform_device *pdev)
+{
+        return USBHS_GADGET;
+}
+
+static int usbhs1_get_vbus(struct platform_device *pdev)
+{
+        return usbhs_is_connected(usbhs_get_priv(pdev));
+}
+
+static irqreturn_t usbhs1_interrupt(int irq, void *data)
+{
+        struct platform_device *pdev = data;
+        struct usbhs_private *priv = usbhs_get_priv(pdev);
+
+        dev_dbg(&pdev->dev, "%s\n", __func__);
+
+        renesas_usbhs_call_notify_hotplug(pdev);
+
+        /* clear status */
+        __raw_writew(__raw_readw(priv->usbphyaddr) | USB_PHY_INT_CLR,
+                     priv->usbphyaddr);
+
+        return IRQ_HANDLED;
+}
+
+static int usbhs1_hardware_init(struct platform_device *pdev)
+{
+        struct usbhs_private *priv = usbhs_get_priv(pdev);
+        int ret;
+
+        irq_set_irq_type(priv->irq, IRQ_TYPE_LEVEL_HIGH);
+
+        /* clear interrupt status */
+        __raw_writew(USB_PHY_MODE | USB_PHY_INT_CLR, priv->usbphyaddr);
+
+        ret = request_irq(priv->irq, usbhs1_interrupt, 0,
+                          dev_name(&pdev->dev), pdev);
+        if (ret) {
+                dev_err(&pdev->dev, "request_irq err\n");
+                return ret;
+        }
+
+        /* enable USB phy interrupt */
+        __raw_writew(USB_PHY_MODE | USB_PHY_INT_EN, priv->usbphyaddr);
+
+        return 0;
+}
+
+static void usbhs1_hardware_exit(struct platform_device *pdev)
+{
+        struct usbhs_private *priv = usbhs_get_priv(pdev);
+
+        /* clear interrupt status */
+        __raw_writew(USB_PHY_MODE | USB_PHY_INT_CLR, priv->usbphyaddr);
+
+        free_irq(priv->irq, pdev);
+}
+
+static void usbhs1_phy_reset(struct platform_device *pdev)
+{
+        struct usbhs_private *priv = usbhs_get_priv(pdev);
+
+        /* init phy */
+        __raw_writew(0x8a0a, priv->usbcrcaddr);
+}
+
+static u32 usbhs1_pipe_cfg[] = {
+        USB_ENDPOINT_XFER_CONTROL,
+        USB_ENDPOINT_XFER_ISOC,
+        USB_ENDPOINT_XFER_ISOC,
+        USB_ENDPOINT_XFER_BULK,
+        USB_ENDPOINT_XFER_BULK,
+        USB_ENDPOINT_XFER_BULK,
+        USB_ENDPOINT_XFER_INT,
+        USB_ENDPOINT_XFER_INT,
+        USB_ENDPOINT_XFER_INT,
+        USB_ENDPOINT_XFER_BULK,
+        USB_ENDPOINT_XFER_BULK,
+        USB_ENDPOINT_XFER_BULK,
+        USB_ENDPOINT_XFER_BULK,
+        USB_ENDPOINT_XFER_BULK,
+        USB_ENDPOINT_XFER_BULK,
+        USB_ENDPOINT_XFER_BULK,
+};
+
+static struct usbhs_private usbhs1_private = {
+        .irq            = evt2irq(0x0300),      /* IRQ8 */
+        .usbphyaddr     = 0xE60581E2,           /* USBPHY1INTAP */
+        .usbcrcaddr     = 0xE6058130,           /* USBCR4 */
+        .info = {
+                .platform_callback = {
+                        .hardware_init  = usbhs1_hardware_init,
+                        .hardware_exit  = usbhs1_hardware_exit,
+                        .phy_reset      = usbhs1_phy_reset,
+                        .get_id         = usbhs1_get_id,
+                        .get_vbus       = usbhs1_get_vbus,
+                },
+                .driver_param = {
+                        .buswait_bwait  = 4,
+                        .pipe_type      = usbhs1_pipe_cfg,
+                        .pipe_size      = ARRAY_SIZE(usbhs1_pipe_cfg),
+                },
+        },
+};
+
+static struct resource usbhs1_resources[] = {
+        [0] = {
+                .name   = "USBHS",
+                .start  = 0xE68B0000,
+                .end    = 0xE68B00E6 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = evt2irq(0x1ce0) /* USB1_USB1I0 */,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device usbhs1_device = {
+        .name   = "renesas_usbhs",
+        .id     = 1,
+        .dev = {
+                .platform_data          = &usbhs1_private.info,
+        },
+        .num_resources  = ARRAY_SIZE(usbhs1_resources),
+        .resource       = usbhs1_resources,
+};
+
+
 /* LED */
 static struct gpio_led mackerel_leds[] = {
         {
@@ -690,7 +870,15 @@ static struct resource sdhi0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = evt2irq(0x0e00) /* SDHI0 */,
+                .start  = evt2irq(0x0e00) /* SDHI0_SDHI0I0 */,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                .start  = evt2irq(0x0e20) /* SDHI0_SDHI0I1 */,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                .start  = evt2irq(0x0e40) /* SDHI0_SDHI0I2 */,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -705,7 +893,7 @@ static struct platform_device sdhi0_device = {
         },
 };
 
-#if !defined(CONFIG_MMC_SH_MMCIF)
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
 /* SDHI1 */
 static struct sh_mobile_sdhi_info sdhi1_info = {
         .dma_slave_tx   = SHDMA_SLAVE_SDHI1_TX,
@@ -725,7 +913,15 @@ static struct resource sdhi1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = evt2irq(0x0e80),
+                .start  = evt2irq(0x0e80), /* SDHI1_SDHI1I0 */
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                .start  = evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                .start  = evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -768,7 +964,15 @@ static struct resource sdhi2_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = evt2irq(0x1200),
+                .start  = evt2irq(0x1200), /* SDHI2_SDHI2I0 */
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                .start  = evt2irq(0x1220), /* SDHI2_SDHI2I1 */
+                .flags  = IORESOURCE_IRQ,
+        },
+        [3] = {
+                .start  = evt2irq(0x1240), /* SDHI2_SDHI2I2 */
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -803,6 +1007,15 @@ static struct resource sh_mmcif_resources[] = {
         },
 };
 
+static struct sh_mmcif_dma sh_mmcif_dma = {
+        .chan_priv_rx   = {
+                .slave_id       = SHDMA_SLAVE_MMCIF_RX,
+        },
+        .chan_priv_tx   = {
+                .slave_id       = SHDMA_SLAVE_MMCIF_TX,
+        },
+};
+
 static struct sh_mmcif_plat_data sh_mmcif_plat = {
         .sup_pclk       = 0,
         .ocr            = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
@@ -810,6 +1023,7 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = {
                           MMC_CAP_8_BIT_DATA |
                           MMC_CAP_NEEDS_POLL,
         .get_cd         = slot_cn7_get_cd,
+        .dma            = &sh_mmcif_dma,
 };
 
 static struct platform_device sh_mmcif_device = {
@@ -858,37 +1072,23 @@ static struct soc_camera_link camera_link = {
         .priv           = &camera_info,
 };
 
-static void dummy_release(struct device *dev)
+static struct platform_device *camera_device;
+
+static void mackerel_camera_release(struct device *dev)
 {
+        soc_camera_platform_release(&camera_device);
 }
 
-static struct platform_device camera_device = {
-        .name           = "soc_camera_platform",
-        .dev            = {
-                .platform_data  = &camera_info,
-                .release        = dummy_release,
-        },
-};
-
 static int mackerel_camera_add(struct soc_camera_link *icl,
                                struct device *dev)
 {
-        if (icl != &camera_link)
-                return -ENODEV;
-
-        camera_info.dev = dev;
-
-        return platform_device_register(&camera_device);
+        return soc_camera_platform_add(icl, dev, &camera_device, &camera_link,
+                                       mackerel_camera_release, 0);
 }
 
 static void mackerel_camera_del(struct soc_camera_link *icl)
 {
-        if (icl != &camera_link)
-                return;
-
-        platform_device_unregister(&camera_device);
-        memset(&camera_device.dev.kobj, 0,
-               sizeof(camera_device.dev.kobj));
+        soc_camera_platform_del(icl, camera_device, &camera_link);
 }
 
 static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
@@ -935,12 +1135,13 @@ static struct platform_device *mackerel_devices[] __initdata = {
         &smc911x_device,
         &lcdc_device,
         &usb1_host_device,
+        &usbhs1_device,
         &leds_device,
         &fsi_device,
         &fsi_ak4643_device,
         &fsi_hdmi_device,
         &sdhi0_device,
-#if !defined(CONFIG_MMC_SH_MMCIF)
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
         &sdhi1_device,
 #endif
         &sdhi2_device,
@@ -1030,6 +1231,7 @@ static void __init mackerel_map_io(void)
 
 #define GPIO_PORT9CR    0xE6051009
 #define GPIO_PORT10CR   0xE605100A
+#define GPIO_PORT168CR  0xE60520A8
 #define SRCR4           0xe61580bc
 #define USCCR1          0xE6058144
 static void __init mackerel_init(void)
@@ -1088,6 +1290,7 @@ static void __init mackerel_init(void)
         gpio_request(GPIO_FN_OVCN_1_114, NULL);
         gpio_request(GPIO_FN_EXTLP_1,    NULL);
         gpio_request(GPIO_FN_OVCN2_1,    NULL);
+        gpio_pull_down(GPIO_PORT168CR);
 
         /* setup USB phy */
         __raw_writew(0x8a0a, 0xE6058130);       /* USBCR4 */
@@ -1140,7 +1343,7 @@ static void __init mackerel_init(void)
         gpio_request(GPIO_FN_SDHID0_1, NULL);
         gpio_request(GPIO_FN_SDHID0_0, NULL);
 
-#if !defined(CONFIG_MMC_SH_MMCIF)
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
         /* enable SDHI1 */
         gpio_request(GPIO_FN_SDHICMD1, NULL);
         gpio_request(GPIO_FN_SDHICLK1, NULL);
@@ -1216,6 +1419,7 @@ static void __init mackerel_init(void)
         platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices));
 
         hdmi_init_pm_clock();
+        sh7372_pm_init();
 }
 
 static void __init mackerel_timer_init(void)
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c
index e9731b5a73ed..d17eb66f4ac2 100644
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@ -44,6 +44,11 @@
 #define DSI1PCKCR       0xe6150098
 #define PLLC01CR        0xe6150028
 #define PLLC2CR         0xe615002c
+#define RMSTPCR0        0xe6150110
+#define RMSTPCR1        0xe6150114
+#define RMSTPCR2        0xe6150118
+#define RMSTPCR3        0xe615011c
+#define RMSTPCR4        0xe6150120
 #define SMSTPCR0        0xe6150130
 #define SMSTPCR1        0xe6150134
 #define SMSTPCR2        0xe6150138
@@ -421,9 +426,6 @@ static unsigned long fsidiv_recalc(struct clk *clk)
 
         value = __raw_readl(clk->mapping->base);
 
-        if ((value & 0x3) != 0x3)
-                return 0;
-
         value >>= 16;
         if (value < 2)
                 return 0;
@@ -504,7 +506,7 @@ static struct clk *late_main_clks[] = {
 enum { MSTP001,
        MSTP131, MSTP130,
        MSTP129, MSTP128, MSTP127, MSTP126, MSTP125,
-       MSTP118, MSTP117, MSTP116,
+       MSTP118, MSTP117, MSTP116, MSTP113,
        MSTP106, MSTP101, MSTP100,
        MSTP223,
        MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,
@@ -527,6 +529,7 @@ static struct clk mstp_clks[MSTP_NR] = {
         [MSTP118] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 18, 0), /* DSITX */
         [MSTP117] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 17, 0), /* LCDC1 */
         [MSTP116] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR1, 16, 0), /* IIC0 */
+        [MSTP113] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR1, 13, 0), /* MERAM */
         [MSTP106] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 6, 0), /* JPU */
         [MSTP101] = MSTP(&div4_clks[DIV4_M1], SMSTPCR1, 1, 0), /* VPU */
         [MSTP100] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 0, 0), /* LCDC0 */
@@ -617,6 +620,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("sh-mipi-dsi.0", &mstp_clks[MSTP118]), /* DSITX0 */
         CLKDEV_DEV_ID("sh_mobile_lcdc_fb.1", &mstp_clks[MSTP117]), /* LCDC1 */
         CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[MSTP116]), /* IIC0 */
+        CLKDEV_DEV_ID("sh_mobile_meram.0", &mstp_clks[MSTP113]), /* MERAM */
         CLKDEV_DEV_ID("uio_pdrv_genirq.5", &mstp_clks[MSTP106]), /* JPU */
         CLKDEV_DEV_ID("uio_pdrv_genirq.0", &mstp_clks[MSTP101]), /* VPU */
         CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */
@@ -634,6 +638,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* IIC1 */
         CLKDEV_DEV_ID("r8a66597_hcd.0", &mstp_clks[MSTP322]), /* USB0 */
         CLKDEV_DEV_ID("r8a66597_udc.0", &mstp_clks[MSTP322]), /* USB0 */
+        CLKDEV_DEV_ID("renesas_usbhs.0", &mstp_clks[MSTP322]), /* USB0 */
         CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), /* SDHI0 */
         CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), /* SDHI1 */
         CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP312]), /* MMC */
@@ -644,6 +649,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("i2c-sh_mobile.4", &mstp_clks[MSTP410]), /* IIC4 */
         CLKDEV_DEV_ID("r8a66597_hcd.1", &mstp_clks[MSTP406]), /* USB1 */
         CLKDEV_DEV_ID("r8a66597_udc.1", &mstp_clks[MSTP406]), /* USB1 */
+        CLKDEV_DEV_ID("renesas_usbhs.1", &mstp_clks[MSTP406]), /* USB1 */
         CLKDEV_DEV_ID("sh_keysc.0", &mstp_clks[MSTP403]), /* KEYSC */
 
         CLKDEV_ICK_ID("ick", "sh-mobile-hdmi", &div6_reparent_clks[DIV6_HDMI]),
@@ -655,6 +661,13 @@ void __init sh7372_clock_init(void)
 {
         int k, ret = 0;
 
+        /* make sure MSTP bits on the RT/SH4AL-DSP side are off */
+        __raw_writel(0xe4ef8087, RMSTPCR0);
+        __raw_writel(0xffffffff, RMSTPCR1);
+        __raw_writel(0x37c7f7ff, RMSTPCR2);
+        __raw_writel(0xffffffff, RMSTPCR3);
+        __raw_writel(0xffe0fffd, RMSTPCR4);
+
         for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++)
                 ret = clk_register(main_clks[k]);
 
diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
index 7e58904c1c8c..bcacb1e8cf85 100644
--- a/arch/arm/mach-shmobile/clock-sh73a0.c
+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
@@ -266,7 +266,8 @@ enum { MSTP001,
         MSTP129, MSTP128, MSTP127, MSTP126, MSTP125, MSTP118, MSTP116, MSTP100,
         MSTP219,
         MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,
-        MSTP331, MSTP329, MSTP325, MSTP323, MSTP312,
+        MSTP331, MSTP329, MSTP325, MSTP323, MSTP318,
+        MSTP314, MSTP313, MSTP312, MSTP311,
         MSTP411, MSTP410, MSTP403,
         MSTP_NR };
 
@@ -295,7 +296,11 @@ static struct clk mstp_clks[MSTP_NR] = {
         [MSTP329] = MSTP(&r_clk, SMSTPCR3, 29, 0), /* CMT10 */
         [MSTP325] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR3, 25, 0), /* IrDA */
         [MSTP323] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 23, 0), /* IIC1 */
+        [MSTP318] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 18, 0), /* SY-DMAC */
+        [MSTP314] = MSTP(&div6_clks[DIV6_SDHI0], SMSTPCR3, 14, 0), /* SDHI0 */
+        [MSTP313] = MSTP(&div6_clks[DIV6_SDHI1], SMSTPCR3, 13, 0), /* SDHI1 */
         [MSTP312] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 12, 0), /* MMCIF0 */
+        [MSTP311] = MSTP(&div6_clks[DIV6_SDHI2], SMSTPCR3, 11, 0), /* SDHI2 */
         [MSTP411] = MSTP(&div4_clks[DIV4_HP], SMSTPCR4, 11, 0), /* IIC3 */
         [MSTP410] = MSTP(&div4_clks[DIV4_HP], SMSTPCR4, 10, 0), /* IIC4 */
         [MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */
@@ -313,6 +318,9 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("vck1_clk", &div6_clks[DIV6_VCK1]),
         CLKDEV_CON_ID("vck2_clk", &div6_clks[DIV6_VCK2]),
         CLKDEV_CON_ID("vck3_clk", &div6_clks[DIV6_VCK3]),
+        CLKDEV_CON_ID("sdhi0_clk", &div6_clks[DIV6_SDHI0]),
+        CLKDEV_CON_ID("sdhi1_clk", &div6_clks[DIV6_SDHI1]),
+        CLKDEV_CON_ID("sdhi2_clk", &div6_clks[DIV6_SDHI2]),
         CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),
         CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),
         CLKDEV_ICK_ID("dsi0p_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),
@@ -341,7 +349,11 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[MSTP329]), /* CMT10 */
         CLKDEV_DEV_ID("sh_irda.0", &mstp_clks[MSTP325]), /* IrDA */
         CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* I2C1 */
+        CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP318]), /* SY-DMAC */
+        CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), /* SDHI0 */
+        CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), /* SDHI1 */
         CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP312]), /* MMCIF0 */
+        CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP311]), /* SDHI2 */
         CLKDEV_DEV_ID("i2c-sh_mobile.3", &mstp_clks[MSTP411]), /* I2C3 */
         CLKDEV_DEV_ID("i2c-sh_mobile.4", &mstp_clks[MSTP410]), /* I2C4 */
         CLKDEV_DEV_ID("sh_keysc.0", &mstp_clks[MSTP403]), /* KEYSC */
@@ -351,6 +363,11 @@ void __init sh73a0_clock_init(void)
 {
         int k, ret = 0;
 
+        /* Set SDHI clocks to a known state */
+        __raw_writel(0x108, SD0CKCR);
+        __raw_writel(0x108, SD1CKCR);
+        __raw_writel(0x108, SD2CKCR);
+
         /* detect main clock parent */
         switch ((__raw_readl(CKSCR) >> 24) & 0x03) {
         case 0:
diff --git a/arch/arm/mach-shmobile/cpuidle.c b/arch/arm/mach-shmobile/cpuidle.c
new file mode 100644
index 000000000000..2e44f11f592e
--- /dev/null
+++ b/arch/arm/mach-shmobile/cpuidle.c
@@ -0,0 +1,92 @@
+/*
+ * CPUIdle support code for SH-Mobile ARM
+ *
+ *  Copyright (C) 2011 Magnus Damm
+ *
+ * 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/pm.h>
+#include <linux/cpuidle.h>
+#include <linux/suspend.h>
+#include <linux/module.h>
+#include <linux/err.h>
+#include <asm/system.h>
+#include <asm/io.h>
+
+static void shmobile_enter_wfi(void)
+{
+        cpu_do_idle();
+}
+
+void (*shmobile_cpuidle_modes[CPUIDLE_STATE_MAX])(void) = {
+        shmobile_enter_wfi, /* regular sleep mode */
+};
+
+static int shmobile_cpuidle_enter(struct cpuidle_device *dev,
+                                  struct cpuidle_state *state)
+{
+        ktime_t before, after;
+        int requested_state = state - &dev->states[0];
+
+        dev->last_state = &dev->states[requested_state];
+        before = ktime_get();
+
+        local_irq_disable();
+        local_fiq_disable();
+
+        shmobile_cpuidle_modes[requested_state]();
+
+        local_irq_enable();
+        local_fiq_enable();
+
+        after = ktime_get();
+        return ktime_to_ns(ktime_sub(after, before)) >> 10;
+}
+
+static struct cpuidle_device shmobile_cpuidle_dev;
+static struct cpuidle_driver shmobile_cpuidle_driver = {
+        .name =         "shmobile_cpuidle",
+        .owner =        THIS_MODULE,
+};
+
+void (*shmobile_cpuidle_setup)(struct cpuidle_device *dev);
+
+static int shmobile_cpuidle_init(void)
+{
+        struct cpuidle_device *dev = &shmobile_cpuidle_dev;
+        struct cpuidle_state *state;
+        int i;
+
+        cpuidle_register_driver(&shmobile_cpuidle_driver);
+
+        for (i = 0; i < CPUIDLE_STATE_MAX; i++) {
+                dev->states[i].name[0] = '\0';
+                dev->states[i].desc[0] = '\0';
+                dev->states[i].enter = shmobile_cpuidle_enter;
+        }
+
+        i = CPUIDLE_DRIVER_STATE_START;
+
+        state = &dev->states[i++];
+        snprintf(state->name, CPUIDLE_NAME_LEN, "C1");
+        strncpy(state->desc, "WFI", CPUIDLE_DESC_LEN);
+        state->exit_latency = 1;
+        state->target_residency = 1 * 2;
+        state->power_usage = 3;
+        state->flags = 0;
+        state->flags |= CPUIDLE_FLAG_TIME_VALID;
+
+        dev->safe_state = state;
+        dev->state_count = i;
+
+        if (shmobile_cpuidle_setup)
+                shmobile_cpuidle_setup(dev);
+
+        cpuidle_register_device(dev);
+
+        return 0;
+}
+late_initcall(shmobile_cpuidle_init);
diff --git a/arch/arm/mach-shmobile/headsmp.S b/arch/arm/mach-shmobile/headsmp.S
index d4cec6b4c7d9..26079d933d91 100644
--- a/arch/arm/mach-shmobile/headsmp.S
+++ b/arch/arm/mach-shmobile/headsmp.S
@@ -24,4 +24,4 @@
         .align  12
 ENTRY(shmobile_secondary_vector)
         ldr     pc, 1f
-1:      .long   secondary_startup - PAGE_OFFSET + PHYS_OFFSET
+1:      .long   secondary_startup - PAGE_OFFSET + PLAT_PHYS_OFFSET
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index 013ac0ee8256..06aecb31d9c7 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -8,6 +8,10 @@ struct clk;
 extern int clk_init(void);
 extern void shmobile_handle_irq_intc(struct pt_regs *);
 extern void shmobile_handle_irq_gic(struct pt_regs *);
+extern struct platform_suspend_ops shmobile_suspend_ops;
+struct cpuidle_device;
+extern void (*shmobile_cpuidle_modes[])(void);
+extern void (*shmobile_cpuidle_setup)(struct cpuidle_device *dev);
 
 extern void sh7367_init_irq(void);
 extern void sh7367_add_early_devices(void);
@@ -30,6 +34,9 @@ extern void sh7372_add_early_devices(void);
 extern void sh7372_add_standard_devices(void);
 extern void sh7372_clock_init(void);
 extern void sh7372_pinmux_init(void);
+extern void sh7372_pm_init(void);
+extern void sh7372_cpu_suspend(void);
+extern void sh7372_cpu_resume(void);
 extern struct clk sh7372_extal1_clk;
 extern struct clk sh7372_extal2_clk;
 
diff --git a/arch/arm/mach-shmobile/include/mach/head-ap4evb.txt b/arch/arm/mach-shmobile/include/mach/head-ap4evb.txt
index 3029aba38688..9f134dfeffdc 100644
--- a/arch/arm/mach-shmobile/include/mach/head-ap4evb.txt
+++ b/arch/arm/mach-shmobile/include/mach/head-ap4evb.txt
@@ -87,8 +87,7 @@ WAIT 1, 0xFE40009C
 ED 0xFE400354, 0x01AD8002
 
 LIST "SCIF0 - Serial port for earlyprintk"
-EB 0xE6053098, 0x11
 EB 0xE6053098, 0xe1
 EW 0xE6C40000, 0x0000
 EB 0xE6C40004, 0x19
-EW 0xE6C40008, 0x3000
+EW 0xE6C40008, 0x0030
diff --git a/arch/arm/mach-shmobile/include/mach/head-mackerel.txt b/arch/arm/mach-shmobile/include/mach/head-mackerel.txt
index 3029aba38688..9f134dfeffdc 100644
--- a/arch/arm/mach-shmobile/include/mach/head-mackerel.txt
+++ b/arch/arm/mach-shmobile/include/mach/head-mackerel.txt
@@ -87,8 +87,7 @@ WAIT 1, 0xFE40009C
 ED 0xFE400354, 0x01AD8002
 
 LIST "SCIF0 - Serial port for earlyprintk"
-EB 0xE6053098, 0x11
 EB 0xE6053098, 0xe1
 EW 0xE6C40000, 0x0000
 EB 0xE6C40004, 0x19
-EW 0xE6C40008, 0x3000
+EW 0xE6C40008, 0x0030
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index 5736efcca60c..df20d7670172 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -435,6 +435,7 @@ enum {
 
 /* DMA slave IDs */
 enum {
+        SHDMA_SLAVE_INVALID,
         SHDMA_SLAVE_SCIF0_TX,
         SHDMA_SLAVE_SCIF0_RX,
         SHDMA_SLAVE_SCIF1_TX,
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/include/mach/sh73a0.h
index ceb2cdc92bf9..216c3d695ef1 100644
--- a/arch/arm/mach-shmobile/include/mach/sh73a0.h
+++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h
@@ -463,5 +463,35 @@ enum {
         GPIO_FN_FSIAIBT_PU,
         GPIO_FN_FSIAISLD_PU,
 };
+/* DMA slave IDs */
+enum {
+        SHDMA_SLAVE_INVALID,
+        SHDMA_SLAVE_SCIF0_TX,
+        SHDMA_SLAVE_SCIF0_RX,
+        SHDMA_SLAVE_SCIF1_TX,
+        SHDMA_SLAVE_SCIF1_RX,
+        SHDMA_SLAVE_SCIF2_TX,
+        SHDMA_SLAVE_SCIF2_RX,
+        SHDMA_SLAVE_SCIF3_TX,
+        SHDMA_SLAVE_SCIF3_RX,
+        SHDMA_SLAVE_SCIF4_TX,
+        SHDMA_SLAVE_SCIF4_RX,
+        SHDMA_SLAVE_SCIF5_TX,
+        SHDMA_SLAVE_SCIF5_RX,
+        SHDMA_SLAVE_SCIF6_TX,
+        SHDMA_SLAVE_SCIF6_RX,
+        SHDMA_SLAVE_SCIF7_TX,
+        SHDMA_SLAVE_SCIF7_RX,
+        SHDMA_SLAVE_SCIF8_TX,
+        SHDMA_SLAVE_SCIF8_RX,
+        SHDMA_SLAVE_SDHI0_TX,
+        SHDMA_SLAVE_SDHI0_RX,
+        SHDMA_SLAVE_SDHI1_TX,
+        SHDMA_SLAVE_SDHI1_RX,
+        SHDMA_SLAVE_SDHI2_TX,
+        SHDMA_SLAVE_SDHI2_RX,
+        SHDMA_SLAVE_MMCIF_TX,
+        SHDMA_SLAVE_MMCIF_RX,
+};
 
 #endif /* __ASM_SH73A0_H__ */
diff --git a/arch/arm/mach-shmobile/include/mach/smp.h b/arch/arm/mach-shmobile/include/mach/smp.h
deleted file mode 100644
index 50db94e927ad..000000000000
--- a/arch/arm/mach-shmobile/include/mach/smp.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef __MACH_SMP_H
-#define __MACH_SMP_H
-
-#include <asm/hardware/gic.h>
-
-/*
- * We use IRQ1 as the IPI
- */
-static inline void smp_cross_call(const struct cpumask *mask, int ipi)
-{
-#if defined(CONFIG_ARM_GIC)
-        gic_raise_softirq(mask, ipi);
-#endif
-}
-
-#endif
diff --git a/arch/arm/mach-shmobile/intc-sh7372.c b/arch/arm/mach-shmobile/intc-sh7372.c
index 7a4960f9c1e3..3b28743c77eb 100644
--- a/arch/arm/mach-shmobile/intc-sh7372.c
+++ b/arch/arm/mach-shmobile/intc-sh7372.c
@@ -27,8 +27,6 @@
 
 enum {
         UNUSED_INTCA = 0,
-        ENABLED,
-        DISABLED,
 
         /* interrupt sources INTCA */
         IRQ0A, IRQ1A, IRQ2A, IRQ3A, IRQ4A, IRQ5A, IRQ6A, IRQ7A,
@@ -49,14 +47,14 @@ enum {
         MSIOF2, MSIOF1,
         SCIFA4, SCIFA5, SCIFB,
         FLCTL_FLSTEI, FLCTL_FLTENDI, FLCTL_FLTREQ0I, FLCTL_FLTREQ1I,
-        SDHI0,
-        SDHI1,
+        SDHI0_SDHI0I0, SDHI0_SDHI0I1, SDHI0_SDHI0I2, SDHI0_SDHI0I3,
+        SDHI1_SDHI1I0, SDHI1_SDHI1I1, SDHI1_SDHI1I2,
         IRREM,
         IRDA,
         TPU0,
         TTI20,
         DDM,
-        SDHI2,
+        SDHI2_SDHI2I0, SDHI2_SDHI2I1, SDHI2_SDHI2I2, SDHI2_SDHI2I3,
         RWDT0,
         DMAC1_1_DEI0, DMAC1_1_DEI1, DMAC1_1_DEI2, DMAC1_1_DEI3,
         DMAC1_2_DEI4, DMAC1_2_DEI5, DMAC1_2_DADERR,
@@ -84,7 +82,7 @@ enum {
 
         /* interrupt groups INTCA */
         DMAC1_1, DMAC1_2, DMAC2_1, DMAC2_2, DMAC3_1, DMAC3_2, SHWYSTAT,
-        AP_ARM1, AP_ARM2, SPU2, FLCTL, IIC1
+        AP_ARM1, AP_ARM2, SPU2, FLCTL, IIC1, SDHI0, SDHI1, SDHI2
 };
 
 static struct intc_vect intca_vectors[] __initdata = {
@@ -125,17 +123,17 @@ static struct intc_vect intca_vectors[] __initdata = {
         INTC_VECT(SCIFB, 0x0d60),
         INTC_VECT(FLCTL_FLSTEI, 0x0d80), INTC_VECT(FLCTL_FLTENDI, 0x0da0),
         INTC_VECT(FLCTL_FLTREQ0I, 0x0dc0), INTC_VECT(FLCTL_FLTREQ1I, 0x0de0),
-        INTC_VECT(SDHI0, 0x0e00), INTC_VECT(SDHI0, 0x0e20),
-        INTC_VECT(SDHI0, 0x0e40), INTC_VECT(SDHI0, 0x0e60),
-        INTC_VECT(SDHI1, 0x0e80), INTC_VECT(SDHI1, 0x0ea0),
-        INTC_VECT(SDHI1, 0x0ec0),
+        INTC_VECT(SDHI0_SDHI0I0, 0x0e00), INTC_VECT(SDHI0_SDHI0I1, 0x0e20),
+        INTC_VECT(SDHI0_SDHI0I2, 0x0e40), INTC_VECT(SDHI0_SDHI0I3, 0x0e60),
+        INTC_VECT(SDHI1_SDHI1I0, 0x0e80), INTC_VECT(SDHI1_SDHI1I1, 0x0ea0),
+        INTC_VECT(SDHI1_SDHI1I2, 0x0ec0),
         INTC_VECT(IRREM, 0x0f60),
         INTC_VECT(IRDA, 0x0480),
         INTC_VECT(TPU0, 0x04a0),
         INTC_VECT(TTI20, 0x1100),
         INTC_VECT(DDM, 0x1140),
-        INTC_VECT(SDHI2, 0x1200), INTC_VECT(SDHI2, 0x1220),
-        INTC_VECT(SDHI2, 0x1240), INTC_VECT(SDHI2, 0x1260),
+        INTC_VECT(SDHI2_SDHI2I0, 0x1200), INTC_VECT(SDHI2_SDHI2I1, 0x1220),
+        INTC_VECT(SDHI2_SDHI2I2, 0x1240), INTC_VECT(SDHI2_SDHI2I3, 0x1260),
         INTC_VECT(RWDT0, 0x1280),
         INTC_VECT(DMAC1_1_DEI0, 0x2000), INTC_VECT(DMAC1_1_DEI1, 0x2020),
         INTC_VECT(DMAC1_1_DEI2, 0x2040), INTC_VECT(DMAC1_1_DEI3, 0x2060),
@@ -195,6 +193,12 @@ static struct intc_group intca_groups[] __initdata = {
         INTC_GROUP(FLCTL, FLCTL_FLSTEI, FLCTL_FLTENDI,
                    FLCTL_FLTREQ0I, FLCTL_FLTREQ1I),
         INTC_GROUP(IIC1, IIC1_ALI1, IIC1_TACKI1, IIC1_WAITI1, IIC1_DTEI1),
+        INTC_GROUP(SDHI0, SDHI0_SDHI0I0, SDHI0_SDHI0I1,
+                   SDHI0_SDHI0I2, SDHI0_SDHI0I3),
+        INTC_GROUP(SDHI1, SDHI1_SDHI1I0, SDHI1_SDHI1I1,
+                   SDHI1_SDHI1I2),
+        INTC_GROUP(SDHI2, SDHI2_SDHI2I0, SDHI2_SDHI2I1,
+                   SDHI2_SDHI2I2, SDHI2_SDHI2I3),
         INTC_GROUP(SHWYSTAT, SHWYSTAT_RT, SHWYSTAT_HS, SHWYSTAT_COM),
 };
 
@@ -230,10 +234,10 @@ static struct intc_mask_reg intca_mask_registers[] __initdata = {
           { SCIFB, SCIFA5, SCIFA4, MSIOF1,
             0, 0, MSIOF2, 0 } },
         { 0xe694009c, 0xe69400dc, 8, /* IMR7A / IMCR7A */
-          { DISABLED, ENABLED, ENABLED, ENABLED,
+          { SDHI0_SDHI0I3, SDHI0_SDHI0I2, SDHI0_SDHI0I1, SDHI0_SDHI0I0,
             FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLTENDI, FLCTL_FLSTEI } },
         { 0xe69400a0, 0xe69400e0, 8, /* IMR8A / IMCR8A */
-          { 0, ENABLED, ENABLED, ENABLED,
+          { 0, SDHI1_SDHI1I2, SDHI1_SDHI1I1, SDHI1_SDHI1I0,
             TTI20, USBHSDMAC0_USHDMI, 0, 0 } },
         { 0xe69400a4, 0xe69400e4, 8, /* IMR9A / IMCR9A */
           { CMT1_CMT13, CMT1_CMT12, CMT1_CMT11, CMT1_CMT10,
@@ -248,7 +252,7 @@ static struct intc_mask_reg intca_mask_registers[] __initdata = {
           { 0, 0, TPU0, 0,
             0, 0, 0, 0 } },
         { 0xe69400b4, 0xe69400f4, 8, /* IMR13A / IMCR13A */
-          { DISABLED, DISABLED, ENABLED, ENABLED,
+          { SDHI2_SDHI2I3, SDHI2_SDHI2I2, SDHI2_SDHI2I1, SDHI2_SDHI2I0,
             0, CMT3, 0, RWDT0 } },
         { 0xe6950080, 0xe69500c0, 8, /* IMR0A3 / IMCR0A3 */
           { SHWYSTAT_RT, SHWYSTAT_HS, SHWYSTAT_COM, 0,
@@ -354,14 +358,10 @@ static struct intc_mask_reg intca_ack_registers[] __initdata = {
           { IRQ24A, IRQ25A, IRQ26A, IRQ27A, IRQ28A, IRQ29A, IRQ30A, IRQ31A } },
 };
 
-static struct intc_desc intca_desc __initdata = {
-        .name = "sh7372-intca",
-        .force_enable = ENABLED,
-        .force_disable = DISABLED,
-        .hw = INTC_HW_DESC(intca_vectors, intca_groups,
-                           intca_mask_registers, intca_prio_registers,
-                           intca_sense_registers, intca_ack_registers),
-};
+static DECLARE_INTC_DESC_ACK(intca_desc, "sh7372-intca",
+                             intca_vectors, intca_groups,
+                             intca_mask_registers, intca_prio_registers,
+                             intca_sense_registers, intca_ack_registers);
 
 enum {
         UNUSED_INTCS = 0,
diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c
index 65e879bab4dc..f3888feb1c68 100644
--- a/arch/arm/mach-shmobile/platsmp.c
+++ b/arch/arm/mach-shmobile/platsmp.c
@@ -16,6 +16,7 @@
 #include <linux/device.h>
 #include <linux/smp.h>
 #include <linux/io.h>
+#include <asm/hardware/gic.h>
 #include <asm/localtimer.h>
 #include <asm/mach-types.h>
 #include <mach/common.h>
@@ -57,6 +58,8 @@ void __init smp_init_cpus(void)
 
         for (i = 0; i < ncores; i++)
                 set_cpu_possible(i, true);
+
+        set_smp_cross_call(gic_raise_softirq);
 }
 
 void __init platform_smp_prepare_cpus(unsigned int max_cpus)
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
new file mode 100644
index 000000000000..8e4aadf14c9f
--- /dev/null
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -0,0 +1,108 @@
+/*
+ * sh7372 Power management support
+ *
+ *  Copyright (C) 2011 Magnus Damm
+ *
+ * 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/pm.h>
+#include <linux/suspend.h>
+#include <linux/cpuidle.h>
+#include <linux/module.h>
+#include <linux/list.h>
+#include <linux/err.h>
+#include <linux/slab.h>
+#include <asm/system.h>
+#include <asm/io.h>
+#include <asm/tlbflush.h>
+#include <mach/common.h>
+
+#define SMFRAM 0xe6a70000
+#define SYSTBCR 0xe6150024
+#define SBAR 0xe6180020
+#define APARMBAREA 0xe6f10020
+
+static void sh7372_enter_core_standby(void)
+{
+        void __iomem *smfram = (void __iomem *)SMFRAM;
+
+        __raw_writel(0, APARMBAREA); /* translate 4k */
+        __raw_writel(__pa(sh7372_cpu_resume), SBAR); /* set reset vector */
+        __raw_writel(0x10, SYSTBCR); /* enable core standby */
+
+        __raw_writel(0, smfram + 0x3c); /* clear page table address */
+
+        sh7372_cpu_suspend();
+        cpu_init();
+
+        /* if page table address is non-NULL then we have been powered down */
+        if (__raw_readl(smfram + 0x3c)) {
+                __raw_writel(__raw_readl(smfram + 0x40),
+                             __va(__raw_readl(smfram + 0x3c)));
+
+                flush_tlb_all();
+                set_cr(__raw_readl(smfram + 0x38));
+        }
+
+        __raw_writel(0, SYSTBCR); /* disable core standby */
+        __raw_writel(0, SBAR); /* disable reset vector translation */
+}
+
+#ifdef CONFIG_CPU_IDLE
+static void sh7372_cpuidle_setup(struct cpuidle_device *dev)
+{
+        struct cpuidle_state *state;
+        int i = dev->state_count;
+
+        state = &dev->states[i];
+        snprintf(state->name, CPUIDLE_NAME_LEN, "C2");
+        strncpy(state->desc, "Core Standby Mode", CPUIDLE_DESC_LEN);
+        state->exit_latency = 10;
+        state->target_residency = 20 + 10;
+        state->power_usage = 1; /* perhaps not */
+        state->flags = 0;
+        state->flags |= CPUIDLE_FLAG_TIME_VALID;
+        shmobile_cpuidle_modes[i] = sh7372_enter_core_standby;
+
+        dev->state_count = i + 1;
+}
+
+static void sh7372_cpuidle_init(void)
+{
+        shmobile_cpuidle_setup = sh7372_cpuidle_setup;
+}
+#else
+static void sh7372_cpuidle_init(void) {}
+#endif
+
+#ifdef CONFIG_SUSPEND
+static int sh7372_enter_suspend(suspend_state_t suspend_state)
+{
+        sh7372_enter_core_standby();
+        return 0;
+}
+
+static void sh7372_suspend_init(void)
+{
+        shmobile_suspend_ops.enter = sh7372_enter_suspend;
+}
+#else
+static void sh7372_suspend_init(void) {}
+#endif
+
+#define DBGREG1 0xe6100020
+#define DBGREG9 0xe6100040
+
+void __init sh7372_pm_init(void)
+{
+        /* enable DBG hardware block to kick SYSC */
+        __raw_writel(0x0000a500, DBGREG9);
+        __raw_writel(0x0000a501, DBGREG9);
+        __raw_writel(0x00000000, DBGREG1);
+
+        sh7372_suspend_init();
+        sh7372_cpuidle_init();
+}
diff --git a/arch/arm/mach-shmobile/pm_runtime.c b/arch/arm/mach-shmobile/pm_runtime.c
index 94912d3944d3..2d1b67a59e4a 100644
--- a/arch/arm/mach-shmobile/pm_runtime.c
+++ b/arch/arm/mach-shmobile/pm_runtime.c
@@ -18,152 +18,41 @@
 #include <linux/clk.h>
 #include <linux/sh_clk.h>
 #include <linux/bitmap.h>
+#include <linux/slab.h>
 
 #ifdef CONFIG_PM_RUNTIME
-#define BIT_ONCE 0
-#define BIT_ACTIVE 1
-#define BIT_CLK_ENABLED 2
 
-struct pm_runtime_data {
-        unsigned long flags;
-        struct clk *clk;
-};
-
-static void __devres_release(struct device *dev, void *res)
-{
-        struct pm_runtime_data *prd = res;
-
-        dev_dbg(dev, "__devres_release()\n");
-
-        if (test_bit(BIT_CLK_ENABLED, &prd->flags))
-                clk_disable(prd->clk);
-
-        if (test_bit(BIT_ACTIVE, &prd->flags))
-                clk_put(prd->clk);
-}
-
-static struct pm_runtime_data *__to_prd(struct device *dev)
-{
-        return devres_find(dev, __devres_release, NULL, NULL);
-}
-
-static void platform_pm_runtime_init(struct device *dev,
-                                     struct pm_runtime_data *prd)
-{
-        if (prd && !test_and_set_bit(BIT_ONCE, &prd->flags)) {
-                prd->clk = clk_get(dev, NULL);
-                if (!IS_ERR(prd->clk)) {
-                        set_bit(BIT_ACTIVE, &prd->flags);
-                        dev_info(dev, "clocks managed by runtime pm\n");
-                }
-        }
-}
-
-static void platform_pm_runtime_bug(struct device *dev,
-                                    struct pm_runtime_data *prd)
-{
-        if (prd && !test_and_set_bit(BIT_ONCE, &prd->flags))
-                dev_err(dev, "runtime pm suspend before resume\n");
-}
-
-int platform_pm_runtime_suspend(struct device *dev)
-{
-        struct pm_runtime_data *prd = __to_prd(dev);
-
-        dev_dbg(dev, "platform_pm_runtime_suspend()\n");
-
-        platform_pm_runtime_bug(dev, prd);
-
-        if (prd && test_bit(BIT_ACTIVE, &prd->flags)) {
-                clk_disable(prd->clk);
-                clear_bit(BIT_CLK_ENABLED, &prd->flags);
-        }
-
-        return 0;
-}
-
-int platform_pm_runtime_resume(struct device *dev)
-{
-        struct pm_runtime_data *prd = __to_prd(dev);
-
-        dev_dbg(dev, "platform_pm_runtime_resume()\n");
-
-        platform_pm_runtime_init(dev, prd);
-
-        if (prd && test_bit(BIT_ACTIVE, &prd->flags)) {
-                clk_enable(prd->clk);
-                set_bit(BIT_CLK_ENABLED, &prd->flags);
-        }
-
-        return 0;
-}
-
-int platform_pm_runtime_idle(struct device *dev)
+static int default_platform_runtime_idle(struct device *dev)
 {
         /* suspend synchronously to disable clocks immediately */
         return pm_runtime_suspend(dev);
 }
 
-static int platform_bus_notify(struct notifier_block *nb,
-                               unsigned long action, void *data)
-{
-        struct device *dev = data;
-        struct pm_runtime_data *prd;
-
-        dev_dbg(dev, "platform_bus_notify() %ld !\n", action);
-
-        if (action == BUS_NOTIFY_BIND_DRIVER) {
-                prd = devres_alloc(__devres_release, sizeof(*prd), GFP_KERNEL);
-                if (prd)
-                        devres_add(dev, prd);
-                else
-                        dev_err(dev, "unable to alloc memory for runtime pm\n");
-        }
-
-        return 0;
-}
-
-#else /* CONFIG_PM_RUNTIME */
-
-static int platform_bus_notify(struct notifier_block *nb,
-                               unsigned long action, void *data)
-{
-        struct device *dev = data;
-        struct clk *clk;
+static struct dev_power_domain default_power_domain = {
+        .ops = {
+                .runtime_suspend = pm_runtime_clk_suspend,
+                .runtime_resume = pm_runtime_clk_resume,
+                .runtime_idle = default_platform_runtime_idle,
+                USE_PLATFORM_PM_SLEEP_OPS
+        },
+};
 
-        dev_dbg(dev, "platform_bus_notify() %ld !\n", action);
+#define DEFAULT_PWR_DOMAIN_PTR  (&default_power_domain)
 
-        switch (action) {
-        case BUS_NOTIFY_BIND_DRIVER:
-                clk = clk_get(dev, NULL);
-                if (!IS_ERR(clk)) {
-                        clk_enable(clk);
-                        clk_put(clk);
-                        dev_info(dev, "runtime pm disabled, clock forced on\n");
-                }
-                break;
-        case BUS_NOTIFY_UNBOUND_DRIVER:
-                clk = clk_get(dev, NULL);
-                if (!IS_ERR(clk)) {
-                        clk_disable(clk);
-                        clk_put(clk);
-                        dev_info(dev, "runtime pm disabled, clock forced off\n");
-                }
-                break;
-        }
+#else
 
-        return 0;
-}
+#define DEFAULT_PWR_DOMAIN_PTR  NULL
 
 #endif /* CONFIG_PM_RUNTIME */
 
-static struct notifier_block platform_bus_notifier = {
-        .notifier_call = platform_bus_notify
+static struct pm_clk_notifier_block platform_bus_notifier = {
+        .pwr_domain = DEFAULT_PWR_DOMAIN_PTR,
+        .con_ids = { NULL, },
 };
 
 static int __init sh_pm_runtime_init(void)
 {
-        bus_register_notifier(&platform_bus_type, &platform_bus_notifier);
+        pm_runtime_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
         return 0;
 }
 core_initcall(sh_pm_runtime_init);
diff --git a/arch/arm/mach-shmobile/setup-sh7367.c b/arch/arm/mach-shmobile/setup-sh7367.c
index ce28141662da..2c10190dbb55 100644
--- a/arch/arm/mach-shmobile/setup-sh7367.c
+++ b/arch/arm/mach-shmobile/setup-sh7367.c
@@ -22,6 +22,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/platform_device.h>
+#include <linux/uio_driver.h>
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/io.h>
@@ -195,6 +196,214 @@ static struct platform_device cmt10_device = {
         .num_resources  = ARRAY_SIZE(cmt10_resources),
 };
 
+/* VPU */
+static struct uio_info vpu_platform_data = {
+        .name = "VPU5",
+        .version = "0",
+        .irq = intcs_evt2irq(0x980),
+};
+
+static struct resource vpu_resources[] = {
+        [0] = {
+                .name   = "VPU",
+                .start  = 0xfe900000,
+                .end    = 0xfe902807,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device vpu_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 0,
+        .dev = {
+                .platform_data  = &vpu_platform_data,
+        },
+        .resource       = vpu_resources,
+        .num_resources  = ARRAY_SIZE(vpu_resources),
+};
+
+/* VEU0 */
+static struct uio_info veu0_platform_data = {
+        .name = "VEU0",
+        .version = "0",
+        .irq = intcs_evt2irq(0x700),
+};
+
+static struct resource veu0_resources[] = {
+        [0] = {
+                .name   = "VEU0",
+                .start  = 0xfe920000,
+                .end    = 0xfe9200b7,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu0_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 1,
+        .dev = {
+                .platform_data  = &veu0_platform_data,
+        },
+        .resource       = veu0_resources,
+        .num_resources  = ARRAY_SIZE(veu0_resources),
+};
+
+/* VEU1 */
+static struct uio_info veu1_platform_data = {
+        .name = "VEU1",
+        .version = "0",
+        .irq = intcs_evt2irq(0x720),
+};
+
+static struct resource veu1_resources[] = {
+        [0] = {
+                .name   = "VEU1",
+                .start  = 0xfe924000,
+                .end    = 0xfe9240b7,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu1_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 2,
+        .dev = {
+                .platform_data  = &veu1_platform_data,
+        },
+        .resource       = veu1_resources,
+        .num_resources  = ARRAY_SIZE(veu1_resources),
+};
+
+/* VEU2 */
+static struct uio_info veu2_platform_data = {
+        .name = "VEU2",
+        .version = "0",
+        .irq = intcs_evt2irq(0x740),
+};
+
+static struct resource veu2_resources[] = {
+        [0] = {
+                .name   = "VEU2",
+                .start  = 0xfe928000,
+                .end    = 0xfe9280b7,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu2_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 3,
+        .dev = {
+                .platform_data  = &veu2_platform_data,
+        },
+        .resource       = veu2_resources,
+        .num_resources  = ARRAY_SIZE(veu2_resources),
+};
+
+/* VEU3 */
+static struct uio_info veu3_platform_data = {
+        .name = "VEU3",
+        .version = "0",
+        .irq = intcs_evt2irq(0x760),
+};
+
+static struct resource veu3_resources[] = {
+        [0] = {
+                .name   = "VEU3",
+                .start  = 0xfe92c000,
+                .end    = 0xfe92c0b7,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu3_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 4,
+        .dev = {
+                .platform_data  = &veu3_platform_data,
+        },
+        .resource       = veu3_resources,
+        .num_resources  = ARRAY_SIZE(veu3_resources),
+};
+
+/* VEU2H */
+static struct uio_info veu2h_platform_data = {
+        .name = "VEU2H",
+        .version = "0",
+        .irq = intcs_evt2irq(0x520),
+};
+
+static struct resource veu2h_resources[] = {
+        [0] = {
+                .name   = "VEU2H",
+                .start  = 0xfe93c000,
+                .end    = 0xfe93c27b,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu2h_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 5,
+        .dev = {
+                .platform_data  = &veu2h_platform_data,
+        },
+        .resource       = veu2h_resources,
+        .num_resources  = ARRAY_SIZE(veu2h_resources),
+};
+
+/* JPU */
+static struct uio_info jpu_platform_data = {
+        .name = "JPU",
+        .version = "0",
+        .irq = intcs_evt2irq(0x560),
+};
+
+static struct resource jpu_resources[] = {
+        [0] = {
+                .name   = "JPU",
+                .start  = 0xfe980000,
+                .end    = 0xfe9902d3,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device jpu_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 6,
+        .dev = {
+                .platform_data  = &jpu_platform_data,
+        },
+        .resource       = jpu_resources,
+        .num_resources  = ARRAY_SIZE(jpu_resources),
+};
+
+/* SPU1 */
+static struct uio_info spu1_platform_data = {
+        .name = "SPU1",
+        .version = "0",
+        .irq = evt2irq(0xfc0),
+};
+
+static struct resource spu1_resources[] = {
+        [0] = {
+                .name   = "SPU1",
+                .start  = 0xfe300000,
+                .end    = 0xfe3fffff,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device spu1_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 7,
+        .dev = {
+                .platform_data  = &spu1_platform_data,
+        },
+        .resource       = spu1_resources,
+        .num_resources  = ARRAY_SIZE(spu1_resources),
+};
+
 static struct platform_device *sh7367_early_devices[] __initdata = {
         &scif0_device,
         &scif1_device,
@@ -206,10 +415,24 @@ static struct platform_device *sh7367_early_devices[] __initdata = {
         &cmt10_device,
 };
 
+static struct platform_device *sh7367_devices[] __initdata = {
+        &vpu_device,
+        &veu0_device,
+        &veu1_device,
+        &veu2_device,
+        &veu3_device,
+        &veu2h_device,
+        &jpu_device,
+        &spu1_device,
+};
+
 void __init sh7367_add_standard_devices(void)
 {
         platform_add_devices(sh7367_early_devices,
                              ARRAY_SIZE(sh7367_early_devices));
+
+        platform_add_devices(sh7367_devices,
+                            ARRAY_SIZE(sh7367_devices));
 }
 
 #define SYMSTPCR2 0xe6158048
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index ff0494f3d00c..cd807eea69e2 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -22,6 +22,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/platform_device.h>
+#include <linux/uio_driver.h>
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/io.h>
@@ -601,6 +602,214 @@ static struct platform_device dma2_device = {
         },
 };
 
+/* VPU */
+static struct uio_info vpu_platform_data = {
+        .name = "VPU5HG",
+        .version = "0",
+        .irq = intcs_evt2irq(0x980),
+};
+
+static struct resource vpu_resources[] = {
+        [0] = {
+                .name   = "VPU",
+                .start  = 0xfe900000,
+                .end    = 0xfe900157,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device vpu_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 0,
+        .dev = {
+                .platform_data  = &vpu_platform_data,
+        },
+        .resource       = vpu_resources,
+        .num_resources  = ARRAY_SIZE(vpu_resources),
+};
+
+/* VEU0 */
+static struct uio_info veu0_platform_data = {
+        .name = "VEU0",
+        .version = "0",
+        .irq = intcs_evt2irq(0x700),
+};
+
+static struct resource veu0_resources[] = {
+        [0] = {
+                .name   = "VEU0",
+                .start  = 0xfe920000,
+                .end    = 0xfe9200cb,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu0_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 1,
+        .dev = {
+                .platform_data  = &veu0_platform_data,
+        },
+        .resource       = veu0_resources,
+        .num_resources  = ARRAY_SIZE(veu0_resources),
+};
+
+/* VEU1 */
+static struct uio_info veu1_platform_data = {
+        .name = "VEU1",
+        .version = "0",
+        .irq = intcs_evt2irq(0x720),
+};
+
+static struct resource veu1_resources[] = {
+        [0] = {
+                .name   = "VEU1",
+                .start  = 0xfe924000,
+                .end    = 0xfe9240cb,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu1_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 2,
+        .dev = {
+                .platform_data  = &veu1_platform_data,
+        },
+        .resource       = veu1_resources,
+        .num_resources  = ARRAY_SIZE(veu1_resources),
+};
+
+/* VEU2 */
+static struct uio_info veu2_platform_data = {
+        .name = "VEU2",
+        .version = "0",
+        .irq = intcs_evt2irq(0x740),
+};
+
+static struct resource veu2_resources[] = {
+        [0] = {
+                .name   = "VEU2",
+                .start  = 0xfe928000,
+                .end    = 0xfe928307,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu2_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 3,
+        .dev = {
+                .platform_data  = &veu2_platform_data,
+        },
+        .resource       = veu2_resources,
+        .num_resources  = ARRAY_SIZE(veu2_resources),
+};
+
+/* VEU3 */
+static struct uio_info veu3_platform_data = {
+        .name = "VEU3",
+        .version = "0",
+        .irq = intcs_evt2irq(0x760),
+};
+
+static struct resource veu3_resources[] = {
+        [0] = {
+                .name   = "VEU3",
+                .start  = 0xfe92c000,
+                .end    = 0xfe92c307,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu3_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 4,
+        .dev = {
+                .platform_data  = &veu3_platform_data,
+        },
+        .resource       = veu3_resources,
+        .num_resources  = ARRAY_SIZE(veu3_resources),
+};
+
+/* JPU */
+static struct uio_info jpu_platform_data = {
+        .name = "JPU",
+        .version = "0",
+        .irq = intcs_evt2irq(0x560),
+};
+
+static struct resource jpu_resources[] = {
+        [0] = {
+                .name   = "JPU",
+                .start  = 0xfe980000,
+                .end    = 0xfe9902d3,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device jpu_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 5,
+        .dev = {
+                .platform_data  = &jpu_platform_data,
+        },
+        .resource       = jpu_resources,
+        .num_resources  = ARRAY_SIZE(jpu_resources),
+};
+
+/* SPU2DSP0 */
+static struct uio_info spu0_platform_data = {
+        .name = "SPU2DSP0",
+        .version = "0",
+        .irq = evt2irq(0x1800),
+};
+
+static struct resource spu0_resources[] = {
+        [0] = {
+                .name   = "SPU2DSP0",
+                .start  = 0xfe200000,
+                .end    = 0xfe2fffff,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device spu0_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 6,
+        .dev = {
+                .platform_data  = &spu0_platform_data,
+        },
+        .resource       = spu0_resources,
+        .num_resources  = ARRAY_SIZE(spu0_resources),
+};
+
+/* SPU2DSP1 */
+static struct uio_info spu1_platform_data = {
+        .name = "SPU2DSP1",
+        .version = "0",
+        .irq = evt2irq(0x1820),
+};
+
+static struct resource spu1_resources[] = {
+        [0] = {
+                .name   = "SPU2DSP1",
+                .start  = 0xfe300000,
+                .end    = 0xfe3fffff,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device spu1_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 7,
+        .dev = {
+                .platform_data  = &spu1_platform_data,
+        },
+        .resource       = spu1_resources,
+        .num_resources  = ARRAY_SIZE(spu1_resources),
+};
+
 static struct platform_device *sh7372_early_devices[] __initdata = {
         &scif0_device,
         &scif1_device,
@@ -620,6 +829,14 @@ static struct platform_device *sh7372_late_devices[] __initdata = {
         &dma0_device,
         &dma1_device,
         &dma2_device,
+        &vpu_device,
+        &veu0_device,
+        &veu1_device,
+        &veu2_device,
+        &veu3_device,
+        &jpu_device,
+        &spu0_device,
+        &spu1_device,
 };
 
 void __init sh7372_add_standard_devices(void)
diff --git a/arch/arm/mach-shmobile/setup-sh7377.c b/arch/arm/mach-shmobile/setup-sh7377.c
index 8099b0b8a934..bb405b8e459b 100644
--- a/arch/arm/mach-shmobile/setup-sh7377.c
+++ b/arch/arm/mach-shmobile/setup-sh7377.c
@@ -22,6 +22,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/platform_device.h>
+#include <linux/uio_driver.h>
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/io.h>
@@ -38,7 +39,7 @@ static struct plat_sci_port scif0_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE,
         .scbrr_algo_id  = SCBRR_ALGO_4,
-        .type           = PORT_SCIF,
+        .type           = PORT_SCIFA,
         .irqs           = { evt2irq(0xc00), evt2irq(0xc00),
                             evt2irq(0xc00), evt2irq(0xc00) },
 };
@@ -57,7 +58,7 @@ static struct plat_sci_port scif1_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE,
         .scbrr_algo_id  = SCBRR_ALGO_4,
-        .type           = PORT_SCIF,
+        .type           = PORT_SCIFA,
         .irqs           = { evt2irq(0xc20), evt2irq(0xc20),
                             evt2irq(0xc20), evt2irq(0xc20) },
 };
@@ -76,7 +77,7 @@ static struct plat_sci_port scif2_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE,
         .scbrr_algo_id  = SCBRR_ALGO_4,
-        .type           = PORT_SCIF,
+        .type           = PORT_SCIFA,
         .irqs           = { evt2irq(0xc40), evt2irq(0xc40),
                             evt2irq(0xc40), evt2irq(0xc40) },
 };
@@ -95,7 +96,7 @@ static struct plat_sci_port scif3_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE,
         .scbrr_algo_id  = SCBRR_ALGO_4,
-        .type           = PORT_SCIF,
+        .type           = PORT_SCIFA,
         .irqs           = { evt2irq(0xc60), evt2irq(0xc60),
                             evt2irq(0xc60), evt2irq(0xc60) },
 };
@@ -114,7 +115,7 @@ static struct plat_sci_port scif4_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE,
         .scbrr_algo_id  = SCBRR_ALGO_4,
-        .type           = PORT_SCIF,
+        .type           = PORT_SCIFA,
         .irqs           = { evt2irq(0xd20), evt2irq(0xd20),
                             evt2irq(0xd20), evt2irq(0xd20) },
 };
@@ -133,7 +134,7 @@ static struct plat_sci_port scif5_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE,
         .scbrr_algo_id  = SCBRR_ALGO_4,
-        .type           = PORT_SCIF,
+        .type           = PORT_SCIFA,
         .irqs           = { evt2irq(0xd40), evt2irq(0xd40),
                             evt2irq(0xd40), evt2irq(0xd40) },
 };
@@ -152,7 +153,7 @@ static struct plat_sci_port scif6_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE,
         .scbrr_algo_id  = SCBRR_ALGO_4,
-        .type           = PORT_SCIF,
+        .type           = PORT_SCIFA,
         .irqs           = { intcs_evt2irq(0x1a80), intcs_evt2irq(0x1a80),
                             intcs_evt2irq(0x1a80), intcs_evt2irq(0x1a80) },
 };
@@ -171,7 +172,7 @@ static struct plat_sci_port scif7_platform_data = {
         .flags          = UPF_BOOT_AUTOCONF,
         .scscr          = SCSCR_RE | SCSCR_TE,
         .scbrr_algo_id  = SCBRR_ALGO_4,
-        .type           = PORT_SCIF,
+        .type           = PORT_SCIFB,
         .irqs           = { evt2irq(0xd60), evt2irq(0xd60),
                             evt2irq(0xd60), evt2irq(0xd60) },
 };
@@ -215,6 +216,214 @@ static struct platform_device cmt10_device = {
         .num_resources  = ARRAY_SIZE(cmt10_resources),
 };
 
+/* VPU */
+static struct uio_info vpu_platform_data = {
+        .name = "VPU5HG",
+        .version = "0",
+        .irq = intcs_evt2irq(0x980),
+};
+
+static struct resource vpu_resources[] = {
+        [0] = {
+                .name   = "VPU",
+                .start  = 0xfe900000,
+                .end    = 0xfe900157,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device vpu_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 0,
+        .dev = {
+                .platform_data  = &vpu_platform_data,
+        },
+        .resource       = vpu_resources,
+        .num_resources  = ARRAY_SIZE(vpu_resources),
+};
+
+/* VEU0 */
+static struct uio_info veu0_platform_data = {
+        .name = "VEU0",
+        .version = "0",
+        .irq = intcs_evt2irq(0x700),
+};
+
+static struct resource veu0_resources[] = {
+        [0] = {
+                .name   = "VEU0",
+                .start  = 0xfe920000,
+                .end    = 0xfe9200cb,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu0_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 1,
+        .dev = {
+                .platform_data  = &veu0_platform_data,
+        },
+        .resource       = veu0_resources,
+        .num_resources  = ARRAY_SIZE(veu0_resources),
+};
+
+/* VEU1 */
+static struct uio_info veu1_platform_data = {
+        .name = "VEU1",
+        .version = "0",
+        .irq = intcs_evt2irq(0x720),
+};
+
+static struct resource veu1_resources[] = {
+        [0] = {
+                .name   = "VEU1",
+                .start  = 0xfe924000,
+                .end    = 0xfe9240cb,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu1_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 2,
+        .dev = {
+                .platform_data  = &veu1_platform_data,
+        },
+        .resource       = veu1_resources,
+        .num_resources  = ARRAY_SIZE(veu1_resources),
+};
+
+/* VEU2 */
+static struct uio_info veu2_platform_data = {
+        .name = "VEU2",
+        .version = "0",
+        .irq = intcs_evt2irq(0x740),
+};
+
+static struct resource veu2_resources[] = {
+        [0] = {
+                .name   = "VEU2",
+                .start  = 0xfe928000,
+                .end    = 0xfe928307,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu2_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 3,
+        .dev = {
+                .platform_data  = &veu2_platform_data,
+        },
+        .resource       = veu2_resources,
+        .num_resources  = ARRAY_SIZE(veu2_resources),
+};
+
+/* VEU3 */
+static struct uio_info veu3_platform_data = {
+        .name = "VEU3",
+        .version = "0",
+        .irq = intcs_evt2irq(0x760),
+};
+
+static struct resource veu3_resources[] = {
+        [0] = {
+                .name   = "VEU3",
+                .start  = 0xfe92c000,
+                .end    = 0xfe92c307,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device veu3_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 4,
+        .dev = {
+                .platform_data  = &veu3_platform_data,
+        },
+        .resource       = veu3_resources,
+        .num_resources  = ARRAY_SIZE(veu3_resources),
+};
+
+/* JPU */
+static struct uio_info jpu_platform_data = {
+        .name = "JPU",
+        .version = "0",
+        .irq = intcs_evt2irq(0x560),
+};
+
+static struct resource jpu_resources[] = {
+        [0] = {
+                .name   = "JPU",
+                .start  = 0xfe980000,
+                .end    = 0xfe9902d3,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device jpu_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 5,
+        .dev = {
+                .platform_data  = &jpu_platform_data,
+        },
+        .resource       = jpu_resources,
+        .num_resources  = ARRAY_SIZE(jpu_resources),
+};
+
+/* SPU2DSP0 */
+static struct uio_info spu0_platform_data = {
+        .name = "SPU2DSP0",
+        .version = "0",
+        .irq = evt2irq(0x1800),
+};
+
+static struct resource spu0_resources[] = {
+        [0] = {
+                .name   = "SPU2DSP0",
+                .start  = 0xfe200000,
+                .end    = 0xfe2fffff,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device spu0_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 6,
+        .dev = {
+                .platform_data  = &spu0_platform_data,
+        },
+        .resource       = spu0_resources,
+        .num_resources  = ARRAY_SIZE(spu0_resources),
+};
+
+/* SPU2DSP1 */
+static struct uio_info spu1_platform_data = {
+        .name = "SPU2DSP1",
+        .version = "0",
+        .irq = evt2irq(0x1820),
+};
+
+static struct resource spu1_resources[] = {
+        [0] = {
+                .name   = "SPU2DSP1",
+                .start  = 0xfe300000,
+                .end    = 0xfe3fffff,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device spu1_device = {
+        .name           = "uio_pdrv_genirq",
+        .id             = 7,
+        .dev = {
+                .platform_data  = &spu1_platform_data,
+        },
+        .resource       = spu1_resources,
+        .num_resources  = ARRAY_SIZE(spu1_resources),
+};
+
 static struct platform_device *sh7377_early_devices[] __initdata = {
         &scif0_device,
         &scif1_device,
@@ -227,10 +436,24 @@ static struct platform_device *sh7377_early_devices[] __initdata = {
         &cmt10_device,
 };
 
+static struct platform_device *sh7377_devices[] __initdata = {
+        &vpu_device,
+        &veu0_device,
+        &veu1_device,
+        &veu2_device,
+        &veu3_device,
+        &jpu_device,
+        &spu0_device,
+        &spu1_device,
+};
+
 void __init sh7377_add_standard_devices(void)
 {
         platform_add_devices(sh7377_early_devices,
                             ARRAY_SIZE(sh7377_early_devices));
+
+        platform_add_devices(sh7377_devices,
+                            ARRAY_SIZE(sh7377_devices));
 }
 
 #define SMSTPCR3 0xe615013c
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 685c40a2f5e6..e46821c0a62e 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -27,9 +27,11 @@
 #include <linux/input.h>
 #include <linux/io.h>
 #include <linux/serial_sci.h>
+#include <linux/sh_dma.h>
 #include <linux/sh_intc.h>
 #include <linux/sh_timer.h>
 #include <mach/hardware.h>
+#include <mach/sh73a0.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
@@ -392,6 +394,242 @@ static struct platform_device i2c4_device = {
         .num_resources  = ARRAY_SIZE(i2c4_resources),
 };
 
+/* Transmit sizes and respective CHCR register values */
+enum {
+        XMIT_SZ_8BIT            = 0,
+        XMIT_SZ_16BIT           = 1,
+        XMIT_SZ_32BIT           = 2,
+        XMIT_SZ_64BIT           = 7,
+        XMIT_SZ_128BIT          = 3,
+        XMIT_SZ_256BIT          = 4,
+        XMIT_SZ_512BIT          = 5,
+};
+
+/* log2(size / 8) - used to calculate number of transfers */
+#define TS_SHIFT {                      \
+        [XMIT_SZ_8BIT]          = 0,    \
+        [XMIT_SZ_16BIT]         = 1,    \
+        [XMIT_SZ_32BIT]         = 2,    \
+        [XMIT_SZ_64BIT]         = 3,    \
+        [XMIT_SZ_128BIT]        = 4,    \
+        [XMIT_SZ_256BIT]        = 5,    \
+        [XMIT_SZ_512BIT]        = 6,    \
+}
+
+#define TS_INDEX2VAL(i) ((((i) & 3) << 3) | (((i) & 0xc) << (20 - 2)))
+#define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL((xmit_sz)))
+#define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL((xmit_sz)))
+
+static const struct sh_dmae_slave_config sh73a0_dmae_slaves[] = {
+        {
+                .slave_id       = SHDMA_SLAVE_SCIF0_TX,
+                .addr           = 0xe6c40020,
+                .chcr           = CHCR_TX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x21,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF0_RX,
+                .addr           = 0xe6c40024,
+                .chcr           = CHCR_RX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x22,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF1_TX,
+                .addr           = 0xe6c50020,
+                .chcr           = CHCR_TX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x25,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF1_RX,
+                .addr           = 0xe6c50024,
+                .chcr           = CHCR_RX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x26,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF2_TX,
+                .addr           = 0xe6c60020,
+                .chcr           = CHCR_TX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x29,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF2_RX,
+                .addr           = 0xe6c60024,
+                .chcr           = CHCR_RX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x2a,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF3_TX,
+                .addr           = 0xe6c70020,
+                .chcr           = CHCR_TX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x2d,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF3_RX,
+                .addr           = 0xe6c70024,
+                .chcr           = CHCR_RX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x2e,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF4_TX,
+                .addr           = 0xe6c80020,
+                .chcr           = CHCR_TX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x39,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF4_RX,
+                .addr           = 0xe6c80024,
+                .chcr           = CHCR_RX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x3a,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF5_TX,
+                .addr           = 0xe6cb0020,
+                .chcr           = CHCR_TX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x35,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF5_RX,
+                .addr           = 0xe6cb0024,
+                .chcr           = CHCR_RX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x36,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF6_TX,
+                .addr           = 0xe6cc0020,
+                .chcr           = CHCR_TX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x1d,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF6_RX,
+                .addr           = 0xe6cc0024,
+                .chcr           = CHCR_RX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x1e,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF7_TX,
+                .addr           = 0xe6cd0020,
+                .chcr           = CHCR_TX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x19,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF7_RX,
+                .addr           = 0xe6cd0024,
+                .chcr           = CHCR_RX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x1a,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF8_TX,
+                .addr           = 0xe6c30040,
+                .chcr           = CHCR_TX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x3d,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SCIF8_RX,
+                .addr           = 0xe6c30060,
+                .chcr           = CHCR_RX(XMIT_SZ_8BIT),
+                .mid_rid        = 0x3e,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SDHI0_TX,
+                .addr           = 0xee100030,
+                .chcr           = CHCR_TX(XMIT_SZ_16BIT),
+                .mid_rid        = 0xc1,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SDHI0_RX,
+                .addr           = 0xee100030,
+                .chcr           = CHCR_RX(XMIT_SZ_16BIT),
+                .mid_rid        = 0xc2,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SDHI1_TX,
+                .addr           = 0xee120030,
+                .chcr           = CHCR_TX(XMIT_SZ_16BIT),
+                .mid_rid        = 0xc9,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SDHI1_RX,
+                .addr           = 0xee120030,
+                .chcr           = CHCR_RX(XMIT_SZ_16BIT),
+                .mid_rid        = 0xca,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SDHI2_TX,
+                .addr           = 0xee140030,
+                .chcr           = CHCR_TX(XMIT_SZ_16BIT),
+                .mid_rid        = 0xcd,
+        }, {
+                .slave_id       = SHDMA_SLAVE_SDHI2_RX,
+                .addr           = 0xee140030,
+                .chcr           = CHCR_RX(XMIT_SZ_16BIT),
+                .mid_rid        = 0xce,
+        }, {
+                .slave_id       = SHDMA_SLAVE_MMCIF_TX,
+                .addr           = 0xe6bd0034,
+                .chcr           = CHCR_TX(XMIT_SZ_32BIT),
+                .mid_rid        = 0xd1,
+        }, {
+                .slave_id       = SHDMA_SLAVE_MMCIF_RX,
+                .addr           = 0xe6bd0034,
+                .chcr           = CHCR_RX(XMIT_SZ_32BIT),
+                .mid_rid        = 0xd2,
+        },
+};
+
+#define DMAE_CHANNEL(_offset)                                   \
+        {                                                       \
+                .offset         = _offset - 0x20,               \
+                .dmars          = _offset - 0x20 + 0x40,        \
+        }
+
+static const struct sh_dmae_channel sh73a0_dmae_channels[] = {
+        DMAE_CHANNEL(0x8000),
+        DMAE_CHANNEL(0x8080),
+        DMAE_CHANNEL(0x8100),
+        DMAE_CHANNEL(0x8180),
+        DMAE_CHANNEL(0x8200),
+        DMAE_CHANNEL(0x8280),
+        DMAE_CHANNEL(0x8300),
+        DMAE_CHANNEL(0x8380),
+        DMAE_CHANNEL(0x8400),
+        DMAE_CHANNEL(0x8480),
+        DMAE_CHANNEL(0x8500),
+        DMAE_CHANNEL(0x8580),
+        DMAE_CHANNEL(0x8600),
+        DMAE_CHANNEL(0x8680),
+        DMAE_CHANNEL(0x8700),
+        DMAE_CHANNEL(0x8780),
+        DMAE_CHANNEL(0x8800),
+        DMAE_CHANNEL(0x8880),
+        DMAE_CHANNEL(0x8900),
+        DMAE_CHANNEL(0x8980),
+};
+
+static const unsigned int ts_shift[] = TS_SHIFT;
+
+static struct sh_dmae_pdata sh73a0_dmae_platform_data = {
+        .slave          = sh73a0_dmae_slaves,
+        .slave_num      = ARRAY_SIZE(sh73a0_dmae_slaves),
+        .channel        = sh73a0_dmae_channels,
+        .channel_num    = ARRAY_SIZE(sh73a0_dmae_channels),
+        .ts_low_shift   = 3,
+        .ts_low_mask    = 0x18,
+        .ts_high_shift  = (20 - 2),     /* 2 bits for shifted low TS */
+        .ts_high_mask   = 0x00300000,
+        .ts_shift       = ts_shift,
+        .ts_shift_num   = ARRAY_SIZE(ts_shift),
+        .dmaor_init     = DMAOR_DME,
+};
+
+static struct resource sh73a0_dmae_resources[] = {
+        {
+                /* Registers including DMAOR and channels including DMARSx */
+                .start  = 0xfe000020,
+                .end    = 0xfe008a00 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                /* DMA error IRQ */
+                .start  = gic_spi(129),
+                .end    = gic_spi(129),
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                /* IRQ for channels 0-19 */
+                .start  = gic_spi(109),
+                .end    = gic_spi(128),
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device dma0_device = {
+        .name           = "sh-dma-engine",
+        .id             = 0,
+        .resource       = sh73a0_dmae_resources,
+        .num_resources  = ARRAY_SIZE(sh73a0_dmae_resources),
+        .dev            = {
+                .platform_data  = &sh73a0_dmae_platform_data,
+        },
+};
+
 static struct platform_device *sh73a0_early_devices[] __initdata = {
         &scif0_device,
         &scif1_device,
@@ -413,10 +651,16 @@ static struct platform_device *sh73a0_late_devices[] __initdata = {
         &i2c2_device,
         &i2c3_device,
         &i2c4_device,
+        &dma0_device,
 };
 
+#define SRCR2          0xe61580b0
+
 void __init sh73a0_add_standard_devices(void)
 {
+        /* Clear software reset bit on SY-DMAC module */
+        __raw_writel(__raw_readl(SRCR2) & ~(1 << 18), SRCR2);
+
         platform_add_devices(sh73a0_early_devices,
                             ARRAY_SIZE(sh73a0_early_devices));
         platform_add_devices(sh73a0_late_devices,
diff --git a/arch/arm/mach-shmobile/sleep-sh7372.S b/arch/arm/mach-shmobile/sleep-sh7372.S
new file mode 100644
index 000000000000..d37d3ca4d18f
--- /dev/null
+++ b/arch/arm/mach-shmobile/sleep-sh7372.S
@@ -0,0 +1,260 @@
+/*
+ * sh7372 lowlevel sleep code for "Core Standby Mode"
+ *
+ * Copyright (C) 2011 Magnus Damm
+ *
+ * In "Core Standby Mode" the ARM core is off, but L2 cache is still on
+ *
+ * Based on mach-omap2/sleep34xx.S
+ *
+ * (C) Copyright 2007 Texas Instruments
+ * Karthik Dasu <karthik-dp@ti.com>
+ *
+ * (C) Copyright 2004 Texas Instruments, <www.ti.com>
+ * Richard Woodruff <r-woodruff2@ti.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.
+ *
+ * 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/linkage.h>
+#include <asm/assembler.h>
+
+#define SMFRAM 0xe6a70000
+
+        .align
+kernel_flush:
+        .word   v7_flush_dcache_all
+
+        .align  3
+ENTRY(sh7372_cpu_suspend)
+        stmfd   sp!, {r0-r12, lr}       @ save registers on stack
+
+        ldr     r8, =SMFRAM
+
+        mov     r4, sp                  @ Store sp
+        mrs     r5, spsr                @ Store spsr
+        mov     r6, lr                  @ Store lr
+        stmia   r8!, {r4-r6}
+
+        mrc     p15, 0, r4, c1, c0, 2   @ Coprocessor access control register
+        mrc     p15, 0, r5, c2, c0, 0   @ TTBR0
+        mrc     p15, 0, r6, c2, c0, 1   @ TTBR1
+        mrc     p15, 0, r7, c2, c0, 2   @ TTBCR
+        stmia   r8!, {r4-r7}
+
+        mrc     p15, 0, r4, c3, c0, 0   @ Domain access Control Register
+        mrc     p15, 0, r5, c10, c2, 0  @ PRRR
+        mrc     p15, 0, r6, c10, c2, 1  @ NMRR
+        stmia   r8!,{r4-r6}
+
+        mrc     p15, 0, r4, c13, c0, 1  @ Context ID
+        mrc     p15, 0, r5, c13, c0, 2  @ User r/w thread and process ID
+        mrc     p15, 0, r6, c12, c0, 0  @ Secure or NS vector base address
+        mrs     r7, cpsr                @ Store current cpsr
+        stmia   r8!, {r4-r7}
+
+        mrc     p15, 0, r4, c1, c0, 0   @ save control register
+        stmia   r8!, {r4}
+
+        /*
+         * jump out to kernel flush routine
+         *  - reuse that code is better
+         *  - it executes in a cached space so is faster than refetch per-block
+         *  - should be faster and will change with kernel
+         *  - 'might' have to copy address, load and jump to it
+         * Flush all data from the L1 data cache before disabling
+         * SCTLR.C bit.
+         */
+        ldr     r1, kernel_flush
+        mov     lr, pc
+        bx      r1
+
+        /*
+         * Clear the SCTLR.C bit to prevent further data cache
+         * allocation. Clearing SCTLR.C would make all the data accesses
+         * strongly ordered and would not hit the cache.
+         */
+        mrc     p15, 0, r0, c1, c0, 0
+        bic     r0, r0, #(1 << 2)       @ Disable the C bit
+        mcr     p15, 0, r0, c1, c0, 0
+        isb
+
+        /*
+         * Invalidate L1 data cache. Even though only invalidate is
+         * necessary exported flush API is used here. Doing clean
+         * on already clean cache would be almost NOP.
+         */
+        ldr     r1, kernel_flush
+        blx     r1
+        /*
+         * The kernel doesn't interwork: v7_flush_dcache_all in particluar will
+         * always return in Thumb state when CONFIG_THUMB2_KERNEL is enabled.
+         * This sequence switches back to ARM.  Note that .align may insert a
+         * nop: bx pc needs to be word-aligned in order to work.
+         */
+ THUMB( .thumb          )
+ THUMB( .align          )
+ THUMB( bx      pc      )
+ THUMB( nop             )
+        .arm
+
+        /* Data memory barrier and Data sync barrier */
+        dsb
+        dmb
+
+/*
+ * ===================================
+ * == WFI instruction => Enter idle ==
+ * ===================================
+ */
+        wfi                             @ wait for interrupt
+
+/*
+ * ===================================
+ * == Resume path for non-OFF modes ==
+ * ===================================
+ */
+        mrc     p15, 0, r0, c1, c0, 0
+        tst     r0, #(1 << 2)           @ Check C bit enabled?
+        orreq   r0, r0, #(1 << 2)       @ Enable the C bit if cleared
+        mcreq   p15, 0, r0, c1, c0, 0
+        isb
+
+/*
+ * ===================================
+ * == Exit point from non-OFF modes ==
+ * ===================================
+ */
+        ldmfd   sp!, {r0-r12, pc}       @ restore regs and return
+
+        .pool
+
+        .align  12
+        .text
+        .global sh7372_cpu_resume
+sh7372_cpu_resume:
+
+        mov     r1, #0
+        /*
+         * Invalidate all instruction caches to PoU
+         * and flush branch target cache
+         */
+        mcr     p15, 0, r1, c7, c5, 0
+
+        ldr     r3, =SMFRAM
+
+        ldmia   r3!, {r4-r6}
+        mov     sp, r4                  @ Restore sp
+        msr     spsr_cxsf, r5           @ Restore spsr
+        mov     lr, r6                  @ Restore lr
+
+        ldmia   r3!, {r4-r7}
+        mcr     p15, 0, r4, c1, c0, 2   @ Coprocessor access Control Register
+        mcr     p15, 0, r5, c2, c0, 0   @ TTBR0
+        mcr     p15, 0, r6, c2, c0, 1   @ TTBR1
+        mcr     p15, 0, r7, c2, c0, 2   @ TTBCR
+
+        ldmia   r3!,{r4-r6}
+        mcr     p15, 0, r4, c3, c0, 0   @ Domain access Control Register
+        mcr     p15, 0, r5, c10, c2, 0  @ PRRR
+        mcr     p15, 0, r6, c10, c2, 1  @ NMRR
+
+        ldmia   r3!,{r4-r7}
+        mcr     p15, 0, r4, c13, c0, 1  @ Context ID
+        mcr     p15, 0, r5, c13, c0, 2  @ User r/w thread and process ID
+        mrc     p15, 0, r6, c12, c0, 0  @ Secure or NS vector base address
+        msr     cpsr, r7                @ store cpsr
+
+        /* Starting to enable MMU here */
+        mrc     p15, 0, r7, c2, c0, 2   @ Read TTBRControl
+        /* Extract N (0:2) bits and decide whether to use TTBR0 or TTBR1 */
+        and     r7, #0x7
+        cmp     r7, #0x0
+        beq     usettbr0
+ttbr_error:
+        /*
+         * More work needs to be done to support N[0:2] value other than 0
+         * So looping here so that the error can be detected
+         */
+        b       ttbr_error
+
+        .align
+cache_pred_disable_mask:
+        .word   0xFFFFE7FB
+ttbrbit_mask:
+        .word   0xFFFFC000
+table_index_mask:
+        .word   0xFFF00000
+table_entry:
+        .word   0x00000C02
+usettbr0:
+
+        mrc     p15, 0, r2, c2, c0, 0
+        ldr     r5, ttbrbit_mask
+        and     r2, r5
+        mov     r4, pc
+        ldr     r5, table_index_mask
+        and     r4, r5                  @ r4 = 31 to 20 bits of pc
+        /* Extract the value to be written to table entry */
+        ldr     r6, table_entry
+        /* r6 has the value to be written to table entry */
+        add     r6, r6, r4
+        /* Getting the address of table entry to modify */
+        lsr     r4, #18
+        /* r2 has the location which needs to be modified */
+        add     r2, r4
+        ldr     r4, [r2]
+        str     r6, [r2] /* modify the table entry */
+
+        mov     r7, r6
+        mov     r5, r2
+        mov     r6, r4
+        /* r5 = original page table address */
+        /* r6 = original page table data */
+
+        mov     r0, #0
+        mcr     p15, 0, r0, c7, c5, 4   @ Flush prefetch buffer
+        mcr     p15, 0, r0, c7, c5, 6   @ Invalidate branch predictor array
+        mcr     p15, 0, r0, c8, c5, 0   @ Invalidate instruction TLB
+        mcr     p15, 0, r0, c8, c6, 0   @ Invalidate data TLB
+
+        /*
+         * Restore control register. This enables the MMU.
+         * The caches and prediction are not enabled here, they
+         * will be enabled after restoring the MMU table entry.
+         */
+        ldmia   r3!, {r4}
+        stmia   r3!, {r5} /* save original page table address */
+        stmia   r3!, {r6} /* save original page table data */
+        stmia   r3!, {r7} /* save modified page table data */
+
+        ldr     r2, cache_pred_disable_mask
+        and     r4, r2
+        mcr     p15, 0, r4, c1, c0, 0
+        dsb
+        isb
+
+        ldr     r0, =restoremmu_on
+        bx      r0
+
+/*
+ * ==============================
+ * == Exit point from OFF mode ==
+ * ==============================
+ */
+restoremmu_on:
+
+        ldmfd   sp!, {r0-r12, pc}       @ restore regs and return
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index a156d2108df1..3ffdbc92ba82 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -59,6 +59,11 @@ unsigned int __init sh73a0_get_core_count(void)
 {
         void __iomem *scu_base = scu_base_addr();
 
+#ifdef CONFIG_HAVE_ARM_TWD
+        /* twd_base needs to be initialized before percpu_timer_setup() */
+        twd_base = (void __iomem *)0xf0000600;
+#endif
+
         return scu_get_core_count(scu_base);
 }
 
@@ -82,10 +87,6 @@ int __cpuinit sh73a0_boot_secondary(unsigned int cpu)
 
 void __init sh73a0_smp_prepare_cpus(void)
 {
-#ifdef CONFIG_HAVE_ARM_TWD
-        twd_base = (void __iomem *)0xf0000600;
-#endif
-
         scu_enable(scu_base_addr());
 
         /* Map the reset vector (in headsmp.S) */
diff --git a/arch/arm/mach-shmobile/suspend.c b/arch/arm/mach-shmobile/suspend.c
new file mode 100644
index 000000000000..c1febe13f709
--- /dev/null
+++ b/arch/arm/mach-shmobile/suspend.c
@@ -0,0 +1,47 @@
+/*
+ * Suspend-to-RAM support code for SH-Mobile ARM
+ *
+ *  Copyright (C) 2011 Magnus Damm
+ *
+ * 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/pm.h>
+#include <linux/suspend.h>
+#include <linux/module.h>
+#include <linux/err.h>
+#include <asm/system.h>
+#include <asm/io.h>
+
+static int shmobile_suspend_default_enter(suspend_state_t suspend_state)
+{
+        cpu_do_idle();
+        return 0;
+}
+
+static int shmobile_suspend_begin(suspend_state_t state)
+{
+        disable_hlt();
+        return 0;
+}
+
+static void shmobile_suspend_end(void)
+{
+        enable_hlt();
+}
+
+struct platform_suspend_ops shmobile_suspend_ops = {
+        .begin          = shmobile_suspend_begin,
+        .end            = shmobile_suspend_end,
+        .enter          = shmobile_suspend_default_enter,
+        .valid          = suspend_valid_only_mem,
+};
+
+static int __init shmobile_suspend_init(void)
+{
+        suspend_set_ops(&shmobile_suspend_ops);
+        return 0;
+}
+late_initcall(shmobile_suspend_init);
diff --git a/arch/arm/mach-spear3xx/Kconfig b/arch/arm/mach-spear3xx/Kconfig
index 20d1317cc486..2cee6b0de371 100644
--- a/arch/arm/mach-spear3xx/Kconfig
+++ b/arch/arm/mach-spear3xx/Kconfig
@@ -4,9 +4,26 @@
 
 if ARCH_SPEAR3XX
 
-choice
-        prompt "SPEAr3XX Family"
-        default MACH_SPEAR300
+menu "SPEAr3xx Implementations"
+config BOARD_SPEAR300_EVB
+        bool "SPEAr300 Evaluation Board"
+        select MACH_SPEAR300
+        help
+          Supports ST SPEAr300 Evaluation Board
+
+config BOARD_SPEAR310_EVB
+        bool "SPEAr310 Evaluation Board"
+        select MACH_SPEAR310
+        help
+          Supports ST SPEAr310 Evaluation Board
+
+config BOARD_SPEAR320_EVB
+        bool "SPEAr320 Evaluation Board"
+        select MACH_SPEAR320
+        help
+          Supports ST SPEAr320 Evaluation Board
+
+endmenu
 
 config MACH_SPEAR300
         bool "SPEAr300"
@@ -23,11 +40,4 @@ config MACH_SPEAR320
         help
           Supports ST SPEAr320 Machine
 
-endchoice
-
-# Adding SPEAr3XX machine specific configuration files
-source "arch/arm/mach-spear3xx/Kconfig300"
-source "arch/arm/mach-spear3xx/Kconfig310"
-source "arch/arm/mach-spear3xx/Kconfig320"
-
 endif #ARCH_SPEAR3XX
diff --git a/arch/arm/mach-spear3xx/Kconfig300 b/arch/arm/mach-spear3xx/Kconfig300
deleted file mode 100644
index c519a05b4ab4..000000000000
--- a/arch/arm/mach-spear3xx/Kconfig300
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# SPEAr300 machine configuration file
-#
-
-if MACH_SPEAR300
-
-choice
-        prompt "SPEAr300 Boards"
-        default BOARD_SPEAR300_EVB
-
-config BOARD_SPEAR300_EVB
-        bool "SPEAr300 Evaluation Board"
-        help
-          Supports ST SPEAr300 Evaluation Board
-endchoice
-
-endif   #MACH_SPEAR300
diff --git a/arch/arm/mach-spear3xx/Kconfig310 b/arch/arm/mach-spear3xx/Kconfig310
deleted file mode 100644
index 60e7442d75bd..000000000000
--- a/arch/arm/mach-spear3xx/Kconfig310
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# SPEAr310 machine configuration file
-#
-
-if MACH_SPEAR310
-
-choice
-        prompt "SPEAr310 Boards"
-        default BOARD_SPEAR310_EVB
-
-config BOARD_SPEAR310_EVB
-        bool "SPEAr310 Evaluation Board"
-        help
-          Supports ST SPEAr310 Evaluation Board
-endchoice
-
-endif   #MACH_SPEAR310
diff --git a/arch/arm/mach-spear3xx/Kconfig320 b/arch/arm/mach-spear3xx/Kconfig320
deleted file mode 100644
index 1c1d438399b8..000000000000
--- a/arch/arm/mach-spear3xx/Kconfig320
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# SPEAr320 machine configuration file
-#
-
-if MACH_SPEAR320
-
-choice
-        prompt "SPEAr320 Boards"
-        default BOARD_SPEAR320_EVB
-
-config BOARD_SPEAR320_EVB
-        bool "SPEAr320 Evaluation Board"
-        help
-          Supports ST SPEAr320 Evaluation Board
-endchoice
-
-endif   #MACH_SPEAR320
diff --git a/arch/arm/mach-spear3xx/clock.c b/arch/arm/mach-spear3xx/clock.c
index 98bc7edc95a6..f67860cd649f 100644
--- a/arch/arm/mach-spear3xx/clock.c
+++ b/arch/arm/mach-spear3xx/clock.c
@@ -13,6 +13,7 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <asm/mach-types.h>
 #include <plat/clock.h>
 #include <mach/misc_regs.h>
 
@@ -688,56 +689,71 @@ static struct clk_lookup spear_clk_lookups[] = {
         { .dev_id = "adc",              .clk = &adc_clk},
         { .dev_id = "ssp-pl022.0",      .clk = &ssp0_clk},
         { .dev_id = "gpio",             .clk = &gpio_clk},
-#if defined(CONFIG_MACH_SPEAR310) || defined(CONFIG_MACH_SPEAR320)
-        { .dev_id = "physmap-flash",    .clk = &emi_clk},
-#endif
-#if defined(CONFIG_MACH_SPEAR300) || defined(CONFIG_MACH_SPEAR310) || \
-        defined(CONFIG_MACH_SPEAR320)
-        { .con_id = "fsmc",             .clk = &fsmc_clk},
-#endif
-
-/* common clocks to spear310 and spear320 */
-#if defined(CONFIG_MACH_SPEAR310) || defined(CONFIG_MACH_SPEAR320)
-        { .dev_id = "uart1",            .clk = &uart1_clk},
-        { .dev_id = "uart2",            .clk = &uart2_clk},
-#endif
-
-        /* common clock to spear300 and spear320 */
-#if defined(CONFIG_MACH_SPEAR300) || defined(CONFIG_MACH_SPEAR320)
-        { .dev_id = "clcd",             .clk = &clcd_clk},
-        { .dev_id = "sdhci",            .clk = &sdhci_clk},
-#endif /* CONFIG_MACH_SPEAR300 || CONFIG_MACH_SPEAR320 */
+};
 
-        /* spear300 machine specific clock structures */
+/* array of all spear 300 clock lookups */
 #ifdef CONFIG_MACH_SPEAR300
+static struct clk_lookup spear300_clk_lookups[] = {
+        { .dev_id = "clcd",             .clk = &clcd_clk},
+        { .con_id = "fsmc",             .clk = &fsmc_clk},
         { .dev_id = "gpio1",            .clk = &gpio1_clk},
         { .dev_id = "keyboard",         .clk = &kbd_clk},
+        { .dev_id = "sdhci",            .clk = &sdhci_clk},
+};
 #endif
 
-        /* spear310 machine specific clock structures */
+/* array of all spear 310 clock lookups */
 #ifdef CONFIG_MACH_SPEAR310
+static struct clk_lookup spear310_clk_lookups[] = {
+        { .con_id = "fsmc",             .clk = &fsmc_clk},
+        { .con_id = "emi",              .clk = &emi_clk},
+        { .dev_id = "uart1",            .clk = &uart1_clk},
+        { .dev_id = "uart2",            .clk = &uart2_clk},
         { .dev_id = "uart3",            .clk = &uart3_clk},
         { .dev_id = "uart4",            .clk = &uart4_clk},
         { .dev_id = "uart5",            .clk = &uart5_clk},
-
+};
 #endif
-        /* spear320 machine specific clock structures */
+
+/* array of all spear 320 clock lookups */
 #ifdef CONFIG_MACH_SPEAR320
+static struct clk_lookup spear320_clk_lookups[] = {
+        { .dev_id = "clcd",             .clk = &clcd_clk},
+        { .con_id = "fsmc",             .clk = &fsmc_clk},
+        { .dev_id = "i2c_designware.1", .clk = &i2c1_clk},
+        { .con_id = "emi",              .clk = &emi_clk},
+        { .dev_id = "pwm",              .clk = &pwm_clk},
+        { .dev_id = "sdhci",            .clk = &sdhci_clk},
         { .dev_id = "c_can_platform.0", .clk = &can0_clk},
         { .dev_id = "c_can_platform.1", .clk = &can1_clk},
-        { .dev_id = "i2c_designware.1", .clk = &i2c1_clk},
         { .dev_id = "ssp-pl022.1",      .clk = &ssp1_clk},
         { .dev_id = "ssp-pl022.2",      .clk = &ssp2_clk},
-        { .dev_id = "pwm",              .clk = &pwm_clk},
-#endif
+        { .dev_id = "uart1",            .clk = &uart1_clk},
+        { .dev_id = "uart2",            .clk = &uart2_clk},
 };
+#endif
 
-void __init clk_init(void)
+void __init spear3xx_clk_init(void)
 {
-        int i;
+        int i, cnt;
+        struct clk_lookup *lookups;
+
+        if (machine_is_spear300()) {
+                cnt = ARRAY_SIZE(spear300_clk_lookups);
+                lookups = spear300_clk_lookups;
+        } else if (machine_is_spear310()) {
+                cnt = ARRAY_SIZE(spear310_clk_lookups);
+                lookups = spear310_clk_lookups;
+        } else {
+                cnt = ARRAY_SIZE(spear320_clk_lookups);
+                lookups = spear320_clk_lookups;
+        }
 
         for (i = 0; i < ARRAY_SIZE(spear_clk_lookups); i++)
                 clk_register(&spear_clk_lookups[i]);
 
-        recalc_root_clocks();
+        for (i = 0; i < cnt; i++)
+                clk_register(&lookups[i]);
+
+        clk_init();
 }
diff --git a/arch/arm/mach-spear3xx/include/mach/generic.h b/arch/arm/mach-spear3xx/include/mach/generic.h
index 8e30636909ef..b8f31c3935f7 100644
--- a/arch/arm/mach-spear3xx/include/mach/generic.h
+++ b/arch/arm/mach-spear3xx/include/mach/generic.h
@@ -27,16 +27,16 @@
  * Following GPT channels will be used as clock source and clockevent
  */
 #define SPEAR_GPT0_BASE         SPEAR3XX_ML1_TMR_BASE
-#define SPEAR_GPT0_CHAN0_IRQ    IRQ_CPU_GPT1_1
-#define SPEAR_GPT0_CHAN1_IRQ    IRQ_CPU_GPT1_2
+#define SPEAR_GPT0_CHAN0_IRQ    SPEAR3XX_IRQ_CPU_GPT1_1
+#define SPEAR_GPT0_CHAN1_IRQ    SPEAR3XX_IRQ_CPU_GPT1_2
 
 /* Add spear3xx family device structure declarations here */
-extern struct amba_device gpio_device;
-extern struct amba_device uart_device;
+extern struct amba_device spear3xx_gpio_device;
+extern struct amba_device spear3xx_uart_device;
 extern struct sys_timer spear3xx_timer;
 
 /* Add spear3xx family function declarations here */
-void __init clk_init(void);
+void __init spear3xx_clk_init(void);
 void __init spear_setup_timer(void);
 void __init spear3xx_map_io(void);
 void __init spear3xx_init_irq(void);
@@ -60,81 +60,80 @@ void __init spear3xx_init(void);
 #define PMX_TIMER_1_2_MASK      (1 << 0)
 
 /* pad mux devices */
-extern struct pmx_dev pmx_firda;
-extern struct pmx_dev pmx_i2c;
-extern struct pmx_dev pmx_ssp_cs;
-extern struct pmx_dev pmx_ssp;
-extern struct pmx_dev pmx_mii;
-extern struct pmx_dev pmx_gpio_pin0;
-extern struct pmx_dev pmx_gpio_pin1;
-extern struct pmx_dev pmx_gpio_pin2;
-extern struct pmx_dev pmx_gpio_pin3;
-extern struct pmx_dev pmx_gpio_pin4;
-extern struct pmx_dev pmx_gpio_pin5;
-extern struct pmx_dev pmx_uart0_modem;
-extern struct pmx_dev pmx_uart0;
-extern struct pmx_dev pmx_timer_3_4;
-extern struct pmx_dev pmx_timer_1_2;
+extern struct pmx_dev spear3xx_pmx_firda;
+extern struct pmx_dev spear3xx_pmx_i2c;
+extern struct pmx_dev spear3xx_pmx_ssp_cs;
+extern struct pmx_dev spear3xx_pmx_ssp;
+extern struct pmx_dev spear3xx_pmx_mii;
+extern struct pmx_dev spear3xx_pmx_gpio_pin0;
+extern struct pmx_dev spear3xx_pmx_gpio_pin1;
+extern struct pmx_dev spear3xx_pmx_gpio_pin2;
+extern struct pmx_dev spear3xx_pmx_gpio_pin3;
+extern struct pmx_dev spear3xx_pmx_gpio_pin4;
+extern struct pmx_dev spear3xx_pmx_gpio_pin5;
+extern struct pmx_dev spear3xx_pmx_uart0_modem;
+extern struct pmx_dev spear3xx_pmx_uart0;
+extern struct pmx_dev spear3xx_pmx_timer_3_4;
+extern struct pmx_dev spear3xx_pmx_timer_1_2;
 
 #if defined(CONFIG_MACH_SPEAR310) || defined(CONFIG_MACH_SPEAR320)
 /* padmux plgpio devices */
-extern struct pmx_dev pmx_plgpio_0_1;
-extern struct pmx_dev pmx_plgpio_2_3;
-extern struct pmx_dev pmx_plgpio_4_5;
-extern struct pmx_dev pmx_plgpio_6_9;
-extern struct pmx_dev pmx_plgpio_10_27;
-extern struct pmx_dev pmx_plgpio_28;
-extern struct pmx_dev pmx_plgpio_29;
-extern struct pmx_dev pmx_plgpio_30;
-extern struct pmx_dev pmx_plgpio_31;
-extern struct pmx_dev pmx_plgpio_32;
-extern struct pmx_dev pmx_plgpio_33;
-extern struct pmx_dev pmx_plgpio_34_36;
-extern struct pmx_dev pmx_plgpio_37_42;
-extern struct pmx_dev pmx_plgpio_43_44_47_48;
-extern struct pmx_dev pmx_plgpio_45_46_49_50;
+extern struct pmx_dev spear3xx_pmx_plgpio_0_1;
+extern struct pmx_dev spear3xx_pmx_plgpio_2_3;
+extern struct pmx_dev spear3xx_pmx_plgpio_4_5;
+extern struct pmx_dev spear3xx_pmx_plgpio_6_9;
+extern struct pmx_dev spear3xx_pmx_plgpio_10_27;
+extern struct pmx_dev spear3xx_pmx_plgpio_28;
+extern struct pmx_dev spear3xx_pmx_plgpio_29;
+extern struct pmx_dev spear3xx_pmx_plgpio_30;
+extern struct pmx_dev spear3xx_pmx_plgpio_31;
+extern struct pmx_dev spear3xx_pmx_plgpio_32;
+extern struct pmx_dev spear3xx_pmx_plgpio_33;
+extern struct pmx_dev spear3xx_pmx_plgpio_34_36;
+extern struct pmx_dev spear3xx_pmx_plgpio_37_42;
+extern struct pmx_dev spear3xx_pmx_plgpio_43_44_47_48;
+extern struct pmx_dev spear3xx_pmx_plgpio_45_46_49_50;
 #endif
 
-extern struct pmx_driver pmx_driver;
-
 /* spear300 declarations */
 #ifdef CONFIG_MACH_SPEAR300
 /* Add spear300 machine device structure declarations here */
-extern struct amba_device gpio1_device;
+extern struct amba_device spear300_gpio1_device;
 
 /* pad mux modes */
-extern struct pmx_mode nand_mode;
-extern struct pmx_mode nor_mode;
-extern struct pmx_mode photo_frame_mode;
-extern struct pmx_mode lend_ip_phone_mode;
-extern struct pmx_mode hend_ip_phone_mode;
-extern struct pmx_mode lend_wifi_phone_mode;
-extern struct pmx_mode hend_wifi_phone_mode;
-extern struct pmx_mode ata_pabx_wi2s_mode;
-extern struct pmx_mode ata_pabx_i2s_mode;
-extern struct pmx_mode caml_lcdw_mode;
-extern struct pmx_mode camu_lcd_mode;
-extern struct pmx_mode camu_wlcd_mode;
-extern struct pmx_mode caml_lcd_mode;
+extern struct pmx_mode spear300_nand_mode;
+extern struct pmx_mode spear300_nor_mode;
+extern struct pmx_mode spear300_photo_frame_mode;
+extern struct pmx_mode spear300_lend_ip_phone_mode;
+extern struct pmx_mode spear300_hend_ip_phone_mode;
+extern struct pmx_mode spear300_lend_wifi_phone_mode;
+extern struct pmx_mode spear300_hend_wifi_phone_mode;
+extern struct pmx_mode spear300_ata_pabx_wi2s_mode;
+extern struct pmx_mode spear300_ata_pabx_i2s_mode;
+extern struct pmx_mode spear300_caml_lcdw_mode;
+extern struct pmx_mode spear300_camu_lcd_mode;
+extern struct pmx_mode spear300_camu_wlcd_mode;
+extern struct pmx_mode spear300_caml_lcd_mode;
 
 /* pad mux devices */
-extern struct pmx_dev pmx_fsmc_2_chips;
-extern struct pmx_dev pmx_fsmc_4_chips;
-extern struct pmx_dev pmx_keyboard;
-extern struct pmx_dev pmx_clcd;
-extern struct pmx_dev pmx_telecom_gpio;
-extern struct pmx_dev pmx_telecom_tdm;
-extern struct pmx_dev pmx_telecom_spi_cs_i2c_clk;
-extern struct pmx_dev pmx_telecom_camera;
-extern struct pmx_dev pmx_telecom_dac;
-extern struct pmx_dev pmx_telecom_i2s;
-extern struct pmx_dev pmx_telecom_boot_pins;
-extern struct pmx_dev pmx_telecom_sdhci_4bit;
-extern struct pmx_dev pmx_telecom_sdhci_8bit;
-extern struct pmx_dev pmx_gpio1;
+extern struct pmx_dev spear300_pmx_fsmc_2_chips;
+extern struct pmx_dev spear300_pmx_fsmc_4_chips;
+extern struct pmx_dev spear300_pmx_keyboard;
+extern struct pmx_dev spear300_pmx_clcd;
+extern struct pmx_dev spear300_pmx_telecom_gpio;
+extern struct pmx_dev spear300_pmx_telecom_tdm;
+extern struct pmx_dev spear300_pmx_telecom_spi_cs_i2c_clk;
+extern struct pmx_dev spear300_pmx_telecom_camera;
+extern struct pmx_dev spear300_pmx_telecom_dac;
+extern struct pmx_dev spear300_pmx_telecom_i2s;
+extern struct pmx_dev spear300_pmx_telecom_boot_pins;
+extern struct pmx_dev spear300_pmx_telecom_sdhci_4bit;
+extern struct pmx_dev spear300_pmx_telecom_sdhci_8bit;
+extern struct pmx_dev spear300_pmx_gpio1;
 
 /* Add spear300 machine function declarations here */
-void __init spear300_init(void);
+void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,
+                u8 pmx_dev_count);
 
 #endif /* CONFIG_MACH_SPEAR300 */
 
@@ -143,17 +142,18 @@ void __init spear300_init(void);
 /* Add spear310 machine device structure declarations here */
 
 /* pad mux devices */
-extern struct pmx_dev pmx_emi_cs_0_1_4_5;
-extern struct pmx_dev pmx_emi_cs_2_3;
-extern struct pmx_dev pmx_uart1;
-extern struct pmx_dev pmx_uart2;
-extern struct pmx_dev pmx_uart3_4_5;
-extern struct pmx_dev pmx_fsmc;
-extern struct pmx_dev pmx_rs485_0_1;
-extern struct pmx_dev pmx_tdm0;
+extern struct pmx_dev spear310_pmx_emi_cs_0_1_4_5;
+extern struct pmx_dev spear310_pmx_emi_cs_2_3;
+extern struct pmx_dev spear310_pmx_uart1;
+extern struct pmx_dev spear310_pmx_uart2;
+extern struct pmx_dev spear310_pmx_uart3_4_5;
+extern struct pmx_dev spear310_pmx_fsmc;
+extern struct pmx_dev spear310_pmx_rs485_0_1;
+extern struct pmx_dev spear310_pmx_tdm0;
 
 /* Add spear310 machine function declarations here */
-void __init spear310_init(void);
+void __init spear310_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,
+                u8 pmx_dev_count);
 
 #endif /* CONFIG_MACH_SPEAR310 */
 
@@ -162,37 +162,38 @@ void __init spear310_init(void);
 /* Add spear320 machine device structure declarations here */
 
 /* pad mux modes */
-extern struct pmx_mode auto_net_smii_mode;
-extern struct pmx_mode auto_net_mii_mode;
-extern struct pmx_mode auto_exp_mode;
-extern struct pmx_mode small_printers_mode;
+extern struct pmx_mode spear320_auto_net_smii_mode;
+extern struct pmx_mode spear320_auto_net_mii_mode;
+extern struct pmx_mode spear320_auto_exp_mode;
+extern struct pmx_mode spear320_small_printers_mode;
 
 /* pad mux devices */
-extern struct pmx_dev pmx_clcd;
-extern struct pmx_dev pmx_emi;
-extern struct pmx_dev pmx_fsmc;
-extern struct pmx_dev pmx_spp;
-extern struct pmx_dev pmx_sdhci;
-extern struct pmx_dev pmx_i2s;
-extern struct pmx_dev pmx_uart1;
-extern struct pmx_dev pmx_uart1_modem;
-extern struct pmx_dev pmx_uart2;
-extern struct pmx_dev pmx_touchscreen;
-extern struct pmx_dev pmx_can;
-extern struct pmx_dev pmx_sdhci_led;
-extern struct pmx_dev pmx_pwm0;
-extern struct pmx_dev pmx_pwm1;
-extern struct pmx_dev pmx_pwm2;
-extern struct pmx_dev pmx_pwm3;
-extern struct pmx_dev pmx_ssp1;
-extern struct pmx_dev pmx_ssp2;
-extern struct pmx_dev pmx_mii1;
-extern struct pmx_dev pmx_smii0;
-extern struct pmx_dev pmx_smii1;
-extern struct pmx_dev pmx_i2c1;
+extern struct pmx_dev spear320_pmx_clcd;
+extern struct pmx_dev spear320_pmx_emi;
+extern struct pmx_dev spear320_pmx_fsmc;
+extern struct pmx_dev spear320_pmx_spp;
+extern struct pmx_dev spear320_pmx_sdhci;
+extern struct pmx_dev spear320_pmx_i2s;
+extern struct pmx_dev spear320_pmx_uart1;
+extern struct pmx_dev spear320_pmx_uart1_modem;
+extern struct pmx_dev spear320_pmx_uart2;
+extern struct pmx_dev spear320_pmx_touchscreen;
+extern struct pmx_dev spear320_pmx_can;
+extern struct pmx_dev spear320_pmx_sdhci_led;
+extern struct pmx_dev spear320_pmx_pwm0;
+extern struct pmx_dev spear320_pmx_pwm1;
+extern struct pmx_dev spear320_pmx_pwm2;
+extern struct pmx_dev spear320_pmx_pwm3;
+extern struct pmx_dev spear320_pmx_ssp1;
+extern struct pmx_dev spear320_pmx_ssp2;
+extern struct pmx_dev spear320_pmx_mii1;
+extern struct pmx_dev spear320_pmx_smii0;
+extern struct pmx_dev spear320_pmx_smii1;
+extern struct pmx_dev spear320_pmx_i2c1;
 
 /* Add spear320 machine function declarations here */
-void __init spear320_init(void);
+void __init spear320_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,
+                u8 pmx_dev_count);
 
 #endif /* CONFIG_MACH_SPEAR320 */
 
diff --git a/arch/arm/mach-spear3xx/include/mach/irqs.h b/arch/arm/mach-spear3xx/include/mach/irqs.h
index a1a7f481866d..6e265442808e 100644
--- a/arch/arm/mach-spear3xx/include/mach/irqs.h
+++ b/arch/arm/mach-spear3xx/include/mach/irqs.h
@@ -15,138 +15,140 @@
 #define __MACH_IRQS_H
 
 /* SPEAr3xx IRQ definitions */
-#define IRQ_HW_ACCEL_MOD_0                      0
-#define IRQ_INTRCOMM_RAS_ARM                    1
-#define IRQ_CPU_GPT1_1                          2
-#define IRQ_CPU_GPT1_2                          3
-#define IRQ_BASIC_GPT1_1                        4
-#define IRQ_BASIC_GPT1_2                        5
-#define IRQ_BASIC_GPT2_1                        6
-#define IRQ_BASIC_GPT2_2                        7
-#define IRQ_BASIC_DMA                           8
-#define IRQ_BASIC_SMI                           9
-#define IRQ_BASIC_RTC                           10
-#define IRQ_BASIC_GPIO                          11
-#define IRQ_BASIC_WDT                           12
-#define IRQ_DDR_CONTROLLER                      13
-#define IRQ_SYS_ERROR                           14
-#define IRQ_WAKEUP_RCV                          15
-#define IRQ_JPEG                                16
-#define IRQ_IRDA                                17
-#define IRQ_ADC                                 18
-#define IRQ_UART                                19
-#define IRQ_SSP                                 20
-#define IRQ_I2C                                 21
-#define IRQ_MAC_1                               22
-#define IRQ_MAC_2                               23
-#define IRQ_USB_DEV                             24
-#define IRQ_USB_H_OHCI_0                        25
-#define IRQ_USB_H_EHCI_0                        26
-#define IRQ_USB_H_EHCI_1                        IRQ_USB_H_EHCI_0
-#define IRQ_USB_H_OHCI_1                        27
-#define IRQ_GEN_RAS_1                           28
-#define IRQ_GEN_RAS_2                           29
-#define IRQ_GEN_RAS_3                           30
-#define IRQ_HW_ACCEL_MOD_1                      31
-#define IRQ_VIC_END                             32
-
-#define VIRQ_START                              IRQ_VIC_END
+#define SPEAR3XX_IRQ_HW_ACCEL_MOD_0             0
+#define SPEAR3XX_IRQ_INTRCOMM_RAS_ARM           1
+#define SPEAR3XX_IRQ_CPU_GPT1_1                 2
+#define SPEAR3XX_IRQ_CPU_GPT1_2                 3
+#define SPEAR3XX_IRQ_BASIC_GPT1_1               4
+#define SPEAR3XX_IRQ_BASIC_GPT1_2               5
+#define SPEAR3XX_IRQ_BASIC_GPT2_1               6
+#define SPEAR3XX_IRQ_BASIC_GPT2_2               7
+#define SPEAR3XX_IRQ_BASIC_DMA                  8
+#define SPEAR3XX_IRQ_BASIC_SMI                  9
+#define SPEAR3XX_IRQ_BASIC_RTC                  10
+#define SPEAR3XX_IRQ_BASIC_GPIO                 11
+#define SPEAR3XX_IRQ_BASIC_WDT                  12
+#define SPEAR3XX_IRQ_DDR_CONTROLLER             13
+#define SPEAR3XX_IRQ_SYS_ERROR                  14
+#define SPEAR3XX_IRQ_WAKEUP_RCV                 15
+#define SPEAR3XX_IRQ_JPEG                       16
+#define SPEAR3XX_IRQ_IRDA                       17
+#define SPEAR3XX_IRQ_ADC                        18
+#define SPEAR3XX_IRQ_UART                       19
+#define SPEAR3XX_IRQ_SSP                        20
+#define SPEAR3XX_IRQ_I2C                        21
+#define SPEAR3XX_IRQ_MAC_1                      22
+#define SPEAR3XX_IRQ_MAC_2                      23
+#define SPEAR3XX_IRQ_USB_DEV                    24
+#define SPEAR3XX_IRQ_USB_H_OHCI_0               25
+#define SPEAR3XX_IRQ_USB_H_EHCI_0               26
+#define SPEAR3XX_IRQ_USB_H_EHCI_1               SPEAR3XX_IRQ_USB_H_EHCI_0
+#define SPEAR3XX_IRQ_USB_H_OHCI_1               27
+#define SPEAR3XX_IRQ_GEN_RAS_1                  28
+#define SPEAR3XX_IRQ_GEN_RAS_2                  29
+#define SPEAR3XX_IRQ_GEN_RAS_3                  30
+#define SPEAR3XX_IRQ_HW_ACCEL_MOD_1             31
+#define SPEAR3XX_IRQ_VIC_END                    32
+
+#define SPEAR3XX_VIRQ_START                     SPEAR3XX_IRQ_VIC_END
 
 /* SPEAr300 Virtual irq definitions */
-#ifdef CONFIG_MACH_SPEAR300
 /* IRQs sharing IRQ_GEN_RAS_1 */
-#define VIRQ_IT_PERS_S                          (VIRQ_START + 0)
-#define VIRQ_IT_CHANGE_S                        (VIRQ_START + 1)
-#define VIRQ_I2S                                (VIRQ_START + 2)
-#define VIRQ_TDM                                (VIRQ_START + 3)
-#define VIRQ_CAMERA_L                           (VIRQ_START + 4)
-#define VIRQ_CAMERA_F                           (VIRQ_START + 5)
-#define VIRQ_CAMERA_V                           (VIRQ_START + 6)
-#define VIRQ_KEYBOARD                           (VIRQ_START + 7)
-#define VIRQ_GPIO1                              (VIRQ_START + 8)
+#define SPEAR300_VIRQ_IT_PERS_S                 (SPEAR3XX_VIRQ_START + 0)
+#define SPEAR300_VIRQ_IT_CHANGE_S               (SPEAR3XX_VIRQ_START + 1)
+#define SPEAR300_VIRQ_I2S                       (SPEAR3XX_VIRQ_START + 2)
+#define SPEAR300_VIRQ_TDM                       (SPEAR3XX_VIRQ_START + 3)
+#define SPEAR300_VIRQ_CAMERA_L                  (SPEAR3XX_VIRQ_START + 4)
+#define SPEAR300_VIRQ_CAMERA_F                  (SPEAR3XX_VIRQ_START + 5)
+#define SPEAR300_VIRQ_CAMERA_V                  (SPEAR3XX_VIRQ_START + 6)
+#define SPEAR300_VIRQ_KEYBOARD                  (SPEAR3XX_VIRQ_START + 7)
+#define SPEAR300_VIRQ_GPIO1                     (SPEAR3XX_VIRQ_START + 8)
 
 /* IRQs sharing IRQ_GEN_RAS_3 */
-#define IRQ_CLCD                                IRQ_GEN_RAS_3
+#define SPEAR300_IRQ_CLCD                       SPEAR3XX_IRQ_GEN_RAS_3
 
 /* IRQs sharing IRQ_INTRCOMM_RAS_ARM */
-#define IRQ_SDHCI                               IRQ_INTRCOMM_RAS_ARM
-
-/* GPIO pins virtual irqs */
-#define SPEAR_GPIO_INT_BASE                     (VIRQ_START + 9)
-#define SPEAR_GPIO1_INT_BASE                    (SPEAR_GPIO_INT_BASE + 8)
-#define SPEAR_GPIO_INT_END                      (SPEAR_GPIO1_INT_BASE + 8)
+#define SPEAR300_IRQ_SDHCI                      SPEAR3XX_IRQ_INTRCOMM_RAS_ARM
 
 /* SPEAr310 Virtual irq definitions */
-#elif defined(CONFIG_MACH_SPEAR310)
 /* IRQs sharing IRQ_GEN_RAS_1 */
-#define VIRQ_SMII0                              (VIRQ_START + 0)
-#define VIRQ_SMII1                              (VIRQ_START + 1)
-#define VIRQ_SMII2                              (VIRQ_START + 2)
-#define VIRQ_SMII3                              (VIRQ_START + 3)
-#define VIRQ_WAKEUP_SMII0                       (VIRQ_START + 4)
-#define VIRQ_WAKEUP_SMII1                       (VIRQ_START + 5)
-#define VIRQ_WAKEUP_SMII2                       (VIRQ_START + 6)
-#define VIRQ_WAKEUP_SMII3                       (VIRQ_START + 7)
+#define SPEAR310_VIRQ_SMII0                     (SPEAR3XX_VIRQ_START + 0)
+#define SPEAR310_VIRQ_SMII1                     (SPEAR3XX_VIRQ_START + 1)
+#define SPEAR310_VIRQ_SMII2                     (SPEAR3XX_VIRQ_START + 2)
+#define SPEAR310_VIRQ_SMII3                     (SPEAR3XX_VIRQ_START + 3)
+#define SPEAR310_VIRQ_WAKEUP_SMII0              (SPEAR3XX_VIRQ_START + 4)
+#define SPEAR310_VIRQ_WAKEUP_SMII1              (SPEAR3XX_VIRQ_START + 5)
+#define SPEAR310_VIRQ_WAKEUP_SMII2              (SPEAR3XX_VIRQ_START + 6)
+#define SPEAR310_VIRQ_WAKEUP_SMII3              (SPEAR3XX_VIRQ_START + 7)
 
 /* IRQs sharing IRQ_GEN_RAS_2 */
-#define VIRQ_UART1                              (VIRQ_START + 8)
-#define VIRQ_UART2                              (VIRQ_START + 9)
-#define VIRQ_UART3                              (VIRQ_START + 10)
-#define VIRQ_UART4                              (VIRQ_START + 11)
-#define VIRQ_UART5                              (VIRQ_START + 12)
+#define SPEAR310_VIRQ_UART1                     (SPEAR3XX_VIRQ_START + 8)
+#define SPEAR310_VIRQ_UART2                     (SPEAR3XX_VIRQ_START + 9)
+#define SPEAR310_VIRQ_UART3                     (SPEAR3XX_VIRQ_START + 10)
+#define SPEAR310_VIRQ_UART4                     (SPEAR3XX_VIRQ_START + 11)
+#define SPEAR310_VIRQ_UART5                     (SPEAR3XX_VIRQ_START + 12)
 
 /* IRQs sharing IRQ_GEN_RAS_3 */
-#define VIRQ_EMI                                (VIRQ_START + 13)
-#define VIRQ_PLGPIO                             (VIRQ_START + 14)
+#define SPEAR310_VIRQ_EMI                       (SPEAR3XX_VIRQ_START + 13)
+#define SPEAR310_VIRQ_PLGPIO                    (SPEAR3XX_VIRQ_START + 14)
 
 /* IRQs sharing IRQ_INTRCOMM_RAS_ARM */
-#define VIRQ_TDM_HDLC                           (VIRQ_START + 15)
-#define VIRQ_RS485_0                            (VIRQ_START + 16)
-#define VIRQ_RS485_1                            (VIRQ_START + 17)
-
-/* GPIO pins virtual irqs */
-#define SPEAR_GPIO_INT_BASE                     (VIRQ_START + 18)
+#define SPEAR310_VIRQ_TDM_HDLC                  (SPEAR3XX_VIRQ_START + 15)
+#define SPEAR310_VIRQ_RS485_0                   (SPEAR3XX_VIRQ_START + 16)
+#define SPEAR310_VIRQ_RS485_1                   (SPEAR3XX_VIRQ_START + 17)
 
 /* SPEAr320 Virtual irq definitions */
-#else
 /* IRQs sharing IRQ_GEN_RAS_1 */
-#define VIRQ_EMI                                (VIRQ_START + 0)
-#define VIRQ_CLCD                               (VIRQ_START + 1)
-#define VIRQ_SPP                                (VIRQ_START + 2)
+#define SPEAR320_VIRQ_EMI                       (SPEAR3XX_VIRQ_START + 0)
+#define SPEAR320_VIRQ_CLCD                      (SPEAR3XX_VIRQ_START + 1)
+#define SPEAR320_VIRQ_SPP                       (SPEAR3XX_VIRQ_START + 2)
 
 /* IRQs sharing IRQ_GEN_RAS_2 */
-#define IRQ_SDHCI                               IRQ_GEN_RAS_2
+#define SPEAR320_IRQ_SDHCI                      SPEAR3XX_IRQ_GEN_RAS_2
 
 /* IRQs sharing IRQ_GEN_RAS_3 */
-#define VIRQ_PLGPIO                             (VIRQ_START + 3)
-#define VIRQ_I2S_PLAY                           (VIRQ_START + 4)
-#define VIRQ_I2S_REC                            (VIRQ_START + 5)
+#define SPEAR320_VIRQ_PLGPIO                    (SPEAR3XX_VIRQ_START + 3)
+#define SPEAR320_VIRQ_I2S_PLAY                  (SPEAR3XX_VIRQ_START + 4)
+#define SPEAR320_VIRQ_I2S_REC                   (SPEAR3XX_VIRQ_START + 5)
 
 /* IRQs sharing IRQ_INTRCOMM_RAS_ARM */
-#define VIRQ_CANU                               (VIRQ_START + 6)
-#define VIRQ_CANL                               (VIRQ_START + 7)
-#define VIRQ_UART1                              (VIRQ_START + 8)
-#define VIRQ_UART2                              (VIRQ_START + 9)
-#define VIRQ_SSP1                               (VIRQ_START + 10)
-#define VIRQ_SSP2                               (VIRQ_START + 11)
-#define VIRQ_SMII0                              (VIRQ_START + 12)
-#define VIRQ_MII1_SMII1                         (VIRQ_START + 13)
-#define VIRQ_WAKEUP_SMII0                       (VIRQ_START + 14)
-#define VIRQ_WAKEUP_MII1_SMII1                  (VIRQ_START + 15)
-#define VIRQ_I2C                                (VIRQ_START + 16)
-
-/* GPIO pins virtual irqs */
-#define SPEAR_GPIO_INT_BASE                     (VIRQ_START + 17)
+#define SPEAR320_VIRQ_CANU                      (SPEAR3XX_VIRQ_START + 6)
+#define SPEAR320_VIRQ_CANL                      (SPEAR3XX_VIRQ_START + 7)
+#define SPEAR320_VIRQ_UART1                     (SPEAR3XX_VIRQ_START + 8)
+#define SPEAR320_VIRQ_UART2                     (SPEAR3XX_VIRQ_START + 9)
+#define SPEAR320_VIRQ_SSP1                      (SPEAR3XX_VIRQ_START + 10)
+#define SPEAR320_VIRQ_SSP2                      (SPEAR3XX_VIRQ_START + 11)
+#define SPEAR320_VIRQ_SMII0                     (SPEAR3XX_VIRQ_START + 12)
+#define SPEAR320_VIRQ_MII1_SMII1                (SPEAR3XX_VIRQ_START + 13)
+#define SPEAR320_VIRQ_WAKEUP_SMII0              (SPEAR3XX_VIRQ_START + 14)
+#define SPEAR320_VIRQ_WAKEUP_MII1_SMII1         (SPEAR3XX_VIRQ_START + 15)
+#define SPEAR320_VIRQ_I2C1                      (SPEAR3XX_VIRQ_START + 16)
 
+/*
+ * GPIO pins virtual irqs
+ * Use the lowest number for the GPIO virtual IRQs base on which subarchs
+ * we have compiled in
+ */
+#if defined(CONFIG_MACH_SPEAR310)
+#define SPEAR3XX_GPIO_INT_BASE                  (SPEAR3XX_VIRQ_START + 18)
+#elif defined(CONFIG_MACH_SPEAR320)
+#define SPEAR3XX_GPIO_INT_BASE                  (SPEAR3XX_VIRQ_START + 17)
+#else
+#define SPEAR3XX_GPIO_INT_BASE                  (SPEAR3XX_VIRQ_START + 9)
 #endif
 
-/* PLGPIO Virtual IRQs */
+#define SPEAR300_GPIO1_INT_BASE                 (SPEAR3XX_GPIO_INT_BASE + 8)
+#define SPEAR3XX_PLGPIO_COUNT   102
+
 #if defined(CONFIG_MACH_SPEAR310) || defined(CONFIG_MACH_SPEAR320)
-#define SPEAR_PLGPIO_INT_BASE                   (SPEAR_GPIO_INT_BASE + 8)
-#define SPEAR_GPIO_INT_END                      (SPEAR_PLGPIO_INT_BASE + 102)
+#define SPEAR3XX_PLGPIO_INT_BASE                (SPEAR3XX_GPIO_INT_BASE + 8)
+#define SPEAR3XX_GPIO_INT_END                   (SPEAR3XX_PLGPIO_INT_BASE + \
+                                                        SPEAR3XX_PLGPIO_COUNT)
+#else
+#define SPEAR3XX_GPIO_INT_END   (SPEAR300_GPIO1_INT_BASE + 8)
 #endif
 
-#define VIRQ_END                                SPEAR_GPIO_INT_END
-#define NR_IRQS                                 VIRQ_END
+#define SPEAR3XX_VIRQ_END       SPEAR3XX_GPIO_INT_END
+#define NR_IRQS                 SPEAR3XX_VIRQ_END
 
 #endif /* __MACH_IRQS_H */
diff --git a/arch/arm/mach-spear3xx/include/mach/spear300.h b/arch/arm/mach-spear3xx/include/mach/spear300.h
index c723515f8853..3b6ea0729040 100644
--- a/arch/arm/mach-spear3xx/include/mach/spear300.h
+++ b/arch/arm/mach-spear3xx/include/mach/spear300.h
@@ -20,19 +20,19 @@
 #define SPEAR300_TELECOM_BASE           UL(0x50000000)
 
 /* Interrupt registers offsets and masks */
-#define INT_ENB_MASK_REG                0x54
-#define INT_STS_MASK_REG                0x58
-#define IT_PERS_S_IRQ_MASK              (1 << 0)
-#define IT_CHANGE_S_IRQ_MASK            (1 << 1)
-#define I2S_IRQ_MASK                    (1 << 2)
-#define TDM_IRQ_MASK                    (1 << 3)
-#define CAMERA_L_IRQ_MASK               (1 << 4)
-#define CAMERA_F_IRQ_MASK               (1 << 5)
-#define CAMERA_V_IRQ_MASK               (1 << 6)
-#define KEYBOARD_IRQ_MASK               (1 << 7)
-#define GPIO1_IRQ_MASK                  (1 << 8)
-
-#define SHIRQ_RAS1_MASK                 0x1FF
+#define SPEAR300_INT_ENB_MASK_REG       0x54
+#define SPEAR300_INT_STS_MASK_REG       0x58
+#define SPEAR300_IT_PERS_S_IRQ_MASK     (1 << 0)
+#define SPEAR300_IT_CHANGE_S_IRQ_MASK   (1 << 1)
+#define SPEAR300_I2S_IRQ_MASK           (1 << 2)
+#define SPEAR300_TDM_IRQ_MASK           (1 << 3)
+#define SPEAR300_CAMERA_L_IRQ_MASK      (1 << 4)
+#define SPEAR300_CAMERA_F_IRQ_MASK      (1 << 5)
+#define SPEAR300_CAMERA_V_IRQ_MASK      (1 << 6)
+#define SPEAR300_KEYBOARD_IRQ_MASK      (1 << 7)
+#define SPEAR300_GPIO1_IRQ_MASK         (1 << 8)
+
+#define SPEAR300_SHIRQ_RAS1_MASK        0x1FF
 
 #define SPEAR300_CLCD_BASE              UL(0x60000000)
 #define SPEAR300_SDHCI_BASE             UL(0x70000000)
diff --git a/arch/arm/mach-spear3xx/include/mach/spear310.h b/arch/arm/mach-spear3xx/include/mach/spear310.h
index 1e853479b8cd..1567d0da725f 100644
--- a/arch/arm/mach-spear3xx/include/mach/spear310.h
+++ b/arch/arm/mach-spear3xx/include/mach/spear310.h
@@ -29,29 +29,29 @@
 #define SPEAR310_SOC_CONFIG_BASE        UL(0xB4000000)
 
 /* Interrupt registers offsets and masks */
-#define INT_STS_MASK_REG                0x04
-#define SMII0_IRQ_MASK                  (1 << 0)
-#define SMII1_IRQ_MASK                  (1 << 1)
-#define SMII2_IRQ_MASK                  (1 << 2)
-#define SMII3_IRQ_MASK                  (1 << 3)
-#define WAKEUP_SMII0_IRQ_MASK           (1 << 4)
-#define WAKEUP_SMII1_IRQ_MASK           (1 << 5)
-#define WAKEUP_SMII2_IRQ_MASK           (1 << 6)
-#define WAKEUP_SMII3_IRQ_MASK           (1 << 7)
-#define UART1_IRQ_MASK                  (1 << 8)
-#define UART2_IRQ_MASK                  (1 << 9)
-#define UART3_IRQ_MASK                  (1 << 10)
-#define UART4_IRQ_MASK                  (1 << 11)
-#define UART5_IRQ_MASK                  (1 << 12)
-#define EMI_IRQ_MASK                    (1 << 13)
-#define TDM_HDLC_IRQ_MASK               (1 << 14)
-#define RS485_0_IRQ_MASK                (1 << 15)
-#define RS485_1_IRQ_MASK                (1 << 16)
+#define SPEAR310_INT_STS_MASK_REG       0x04
+#define SPEAR310_SMII0_IRQ_MASK         (1 << 0)
+#define SPEAR310_SMII1_IRQ_MASK         (1 << 1)
+#define SPEAR310_SMII2_IRQ_MASK         (1 << 2)
+#define SPEAR310_SMII3_IRQ_MASK         (1 << 3)
+#define SPEAR310_WAKEUP_SMII0_IRQ_MASK  (1 << 4)
+#define SPEAR310_WAKEUP_SMII1_IRQ_MASK  (1 << 5)
+#define SPEAR310_WAKEUP_SMII2_IRQ_MASK  (1 << 6)
+#define SPEAR310_WAKEUP_SMII3_IRQ_MASK  (1 << 7)
+#define SPEAR310_UART1_IRQ_MASK         (1 << 8)
+#define SPEAR310_UART2_IRQ_MASK         (1 << 9)
+#define SPEAR310_UART3_IRQ_MASK         (1 << 10)
+#define SPEAR310_UART4_IRQ_MASK         (1 << 11)
+#define SPEAR310_UART5_IRQ_MASK         (1 << 12)
+#define SPEAR310_EMI_IRQ_MASK           (1 << 13)
+#define SPEAR310_TDM_HDLC_IRQ_MASK      (1 << 14)
+#define SPEAR310_RS485_0_IRQ_MASK       (1 << 15)
+#define SPEAR310_RS485_1_IRQ_MASK       (1 << 16)
 
-#define SHIRQ_RAS1_MASK                 0x000FF
-#define SHIRQ_RAS2_MASK                 0x01F00
-#define SHIRQ_RAS3_MASK                 0x02000
-#define SHIRQ_INTRCOMM_RAS_MASK         0x1C000
+#define SPEAR310_SHIRQ_RAS1_MASK        0x000FF
+#define SPEAR310_SHIRQ_RAS2_MASK        0x01F00
+#define SPEAR310_SHIRQ_RAS3_MASK        0x02000
+#define SPEAR310_SHIRQ_INTRCOMM_RAS_MASK        0x1C000
 
 #endif /* __MACH_SPEAR310_H */
 
diff --git a/arch/arm/mach-spear3xx/include/mach/spear320.h b/arch/arm/mach-spear3xx/include/mach/spear320.h
index 940f0d85d959..8cfa83fa1296 100644
--- a/arch/arm/mach-spear3xx/include/mach/spear320.h
+++ b/arch/arm/mach-spear3xx/include/mach/spear320.h
@@ -36,31 +36,31 @@
 #define SPEAR320_SOC_CONFIG_BASE        UL(0xB3000000)
 
 /* Interrupt registers offsets and masks */
-#define INT_STS_MASK_REG                0x04
-#define INT_CLR_MASK_REG                0x04
-#define INT_ENB_MASK_REG                0x08
-#define GPIO_IRQ_MASK                   (1 << 0)
-#define I2S_PLAY_IRQ_MASK               (1 << 1)
-#define I2S_REC_IRQ_MASK                (1 << 2)
-#define EMI_IRQ_MASK                    (1 << 7)
-#define CLCD_IRQ_MASK                   (1 << 8)
-#define SPP_IRQ_MASK                    (1 << 9)
-#define SDHCI_IRQ_MASK                  (1 << 10)
-#define CAN_U_IRQ_MASK                  (1 << 11)
-#define CAN_L_IRQ_MASK                  (1 << 12)
-#define UART1_IRQ_MASK                  (1 << 13)
-#define UART2_IRQ_MASK                  (1 << 14)
-#define SSP1_IRQ_MASK                   (1 << 15)
-#define SSP2_IRQ_MASK                   (1 << 16)
-#define SMII0_IRQ_MASK                  (1 << 17)
-#define MII1_SMII1_IRQ_MASK             (1 << 18)
-#define WAKEUP_SMII0_IRQ_MASK           (1 << 19)
-#define WAKEUP_MII1_SMII1_IRQ_MASK      (1 << 20)
-#define I2C1_IRQ_MASK                   (1 << 21)
+#define SPEAR320_INT_STS_MASK_REG               0x04
+#define SPEAR320_INT_CLR_MASK_REG               0x04
+#define SPEAR320_INT_ENB_MASK_REG               0x08
+#define SPEAR320_GPIO_IRQ_MASK                  (1 << 0)
+#define SPEAR320_I2S_PLAY_IRQ_MASK              (1 << 1)
+#define SPEAR320_I2S_REC_IRQ_MASK               (1 << 2)
+#define SPEAR320_EMI_IRQ_MASK                   (1 << 7)
+#define SPEAR320_CLCD_IRQ_MASK                  (1 << 8)
+#define SPEAR320_SPP_IRQ_MASK                   (1 << 9)
+#define SPEAR320_SDHCI_IRQ_MASK                 (1 << 10)
+#define SPEAR320_CAN_U_IRQ_MASK                 (1 << 11)
+#define SPEAR320_CAN_L_IRQ_MASK                 (1 << 12)
+#define SPEAR320_UART1_IRQ_MASK                 (1 << 13)
+#define SPEAR320_UART2_IRQ_MASK                 (1 << 14)
+#define SPEAR320_SSP1_IRQ_MASK                  (1 << 15)
+#define SPEAR320_SSP2_IRQ_MASK                  (1 << 16)
+#define SPEAR320_SMII0_IRQ_MASK                 (1 << 17)
+#define SPEAR320_MII1_SMII1_IRQ_MASK            (1 << 18)
+#define SPEAR320_WAKEUP_SMII0_IRQ_MASK          (1 << 19)
+#define SPEAR320_WAKEUP_MII1_SMII1_IRQ_MASK     (1 << 20)
+#define SPEAR320_I2C1_IRQ_MASK                  (1 << 21)
 
-#define SHIRQ_RAS1_MASK                 0x000380
-#define SHIRQ_RAS3_MASK                 0x000007
-#define SHIRQ_INTRCOMM_RAS_MASK         0x3FF800
+#define SPEAR320_SHIRQ_RAS1_MASK                0x000380
+#define SPEAR320_SHIRQ_RAS3_MASK                0x000007
+#define SPEAR320_SHIRQ_INTRCOMM_RAS_MASK        0x3FF800
 
 #endif /* __MACH_SPEAR320_H */
 
diff --git a/arch/arm/mach-spear3xx/spear300.c b/arch/arm/mach-spear3xx/spear300.c
index 2697e65adf86..a5e46b4ade20 100644
--- a/arch/arm/mach-spear3xx/spear300.c
+++ b/arch/arm/mach-spear3xx/spear300.c
@@ -40,86 +40,86 @@
 #define CAML_LCD_MODE                   (1 << 12)
 #define ALL_MODES                       0x1FFF
 
-struct pmx_mode nand_mode = {
+struct pmx_mode spear300_nand_mode = {
         .id = NAND_MODE,
         .name = "nand mode",
         .mask = 0x00,
 };
 
-struct pmx_mode nor_mode = {
+struct pmx_mode spear300_nor_mode = {
         .id = NOR_MODE,
         .name = "nor mode",
         .mask = 0x01,
 };
 
-struct pmx_mode photo_frame_mode = {
+struct pmx_mode spear300_photo_frame_mode = {
         .id = PHOTO_FRAME_MODE,
         .name = "photo frame mode",
         .mask = 0x02,
 };
 
-struct pmx_mode lend_ip_phone_mode = {
+struct pmx_mode spear300_lend_ip_phone_mode = {
         .id = LEND_IP_PHONE_MODE,
         .name = "lend ip phone mode",
         .mask = 0x03,
 };
 
-struct pmx_mode hend_ip_phone_mode = {
+struct pmx_mode spear300_hend_ip_phone_mode = {
         .id = HEND_IP_PHONE_MODE,
         .name = "hend ip phone mode",
         .mask = 0x04,
 };
 
-struct pmx_mode lend_wifi_phone_mode = {
+struct pmx_mode spear300_lend_wifi_phone_mode = {
         .id = LEND_WIFI_PHONE_MODE,
         .name = "lend wifi phone mode",
         .mask = 0x05,
 };
 
-struct pmx_mode hend_wifi_phone_mode = {
+struct pmx_mode spear300_hend_wifi_phone_mode = {
         .id = HEND_WIFI_PHONE_MODE,
         .name = "hend wifi phone mode",
         .mask = 0x06,
 };
 
-struct pmx_mode ata_pabx_wi2s_mode = {
+struct pmx_mode spear300_ata_pabx_wi2s_mode = {
         .id = ATA_PABX_WI2S_MODE,
         .name = "ata pabx wi2s mode",
         .mask = 0x07,
 };
 
-struct pmx_mode ata_pabx_i2s_mode = {
+struct pmx_mode spear300_ata_pabx_i2s_mode = {
         .id = ATA_PABX_I2S_MODE,
         .name = "ata pabx i2s mode",
         .mask = 0x08,
 };
 
-struct pmx_mode caml_lcdw_mode = {
+struct pmx_mode spear300_caml_lcdw_mode = {
         .id = CAML_LCDW_MODE,
         .name = "caml lcdw mode",
         .mask = 0x0C,
 };
 
-struct pmx_mode camu_lcd_mode = {
+struct pmx_mode spear300_camu_lcd_mode = {
         .id = CAMU_LCD_MODE,
         .name = "camu lcd mode",
         .mask = 0x0D,
 };
 
-struct pmx_mode camu_wlcd_mode = {
+struct pmx_mode spear300_camu_wlcd_mode = {
         .id = CAMU_WLCD_MODE,
         .name = "camu wlcd mode",
         .mask = 0x0E,
 };
 
-struct pmx_mode caml_lcd_mode = {
+struct pmx_mode spear300_caml_lcd_mode = {
         .id = CAML_LCD_MODE,
         .name = "caml lcd mode",
         .mask = 0x0F,
 };
 
 /* devices */
-struct pmx_dev_mode pmx_fsmc_2_chips_modes[] = {
+static struct pmx_dev_mode pmx_fsmc_2_chips_modes[] = {
         {
                 .ids = NAND_MODE | NOR_MODE | PHOTO_FRAME_MODE |
                         ATA_PABX_WI2S_MODE | ATA_PABX_I2S_MODE,
@@ -127,14 +127,14 @@ struct pmx_dev_mode pmx_fsmc_2_chips_modes[] = {
         },
 };
 
-struct pmx_dev pmx_fsmc_2_chips = {
+struct pmx_dev spear300_pmx_fsmc_2_chips = {
         .name = "fsmc_2_chips",
         .modes = pmx_fsmc_2_chips_modes,
         .mode_count = ARRAY_SIZE(pmx_fsmc_2_chips_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_fsmc_4_chips_modes[] = {
+static struct pmx_dev_mode pmx_fsmc_4_chips_modes[] = {
         {
                 .ids = NAND_MODE | NOR_MODE | PHOTO_FRAME_MODE |
                         ATA_PABX_WI2S_MODE | ATA_PABX_I2S_MODE,
@@ -142,14 +142,14 @@ struct pmx_dev_mode pmx_fsmc_4_chips_modes[] = {
         },
 };
 
-struct pmx_dev pmx_fsmc_4_chips = {
+struct pmx_dev spear300_pmx_fsmc_4_chips = {
         .name = "fsmc_4_chips",
         .modes = pmx_fsmc_4_chips_modes,
         .mode_count = ARRAY_SIZE(pmx_fsmc_4_chips_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_keyboard_modes[] = {
+static struct pmx_dev_mode pmx_keyboard_modes[] = {
         {
                 .ids = LEND_IP_PHONE_MODE | HEND_IP_PHONE_MODE |
                         LEND_WIFI_PHONE_MODE | HEND_WIFI_PHONE_MODE |
@@ -159,14 +159,14 @@ struct pmx_dev_mode pmx_keyboard_modes[] = {
         },
 };
 
-struct pmx_dev pmx_keyboard = {
+struct pmx_dev spear300_pmx_keyboard = {
         .name = "keyboard",
         .modes = pmx_keyboard_modes,
         .mode_count = ARRAY_SIZE(pmx_keyboard_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_clcd_modes[] = {
+static struct pmx_dev_mode pmx_clcd_modes[] = {
         {
                 .ids = PHOTO_FRAME_MODE,
                 .mask = PMX_TIMER_1_2_MASK | PMX_TIMER_3_4_MASK ,
@@ -177,14 +177,14 @@ struct pmx_dev_mode pmx_clcd_modes[] = {
         },
 };
 
-struct pmx_dev pmx_clcd = {
+struct pmx_dev spear300_pmx_clcd = {
         .name = "clcd",
         .modes = pmx_clcd_modes,
         .mode_count = ARRAY_SIZE(pmx_clcd_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_gpio_modes[] = {
+static struct pmx_dev_mode pmx_telecom_gpio_modes[] = {
         {
                 .ids = PHOTO_FRAME_MODE | CAMU_LCD_MODE | CAML_LCD_MODE,
                 .mask = PMX_MII_MASK,
@@ -204,14 +204,14 @@ struct pmx_dev_mode pmx_telecom_gpio_modes[] = {
         },
 };
 
-struct pmx_dev pmx_telecom_gpio = {
+struct pmx_dev spear300_pmx_telecom_gpio = {
         .name = "telecom_gpio",
         .modes = pmx_telecom_gpio_modes,
         .mode_count = ARRAY_SIZE(pmx_telecom_gpio_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_tdm_modes[] = {
+static struct pmx_dev_mode pmx_telecom_tdm_modes[] = {
         {
                 .ids = PHOTO_FRAME_MODE | LEND_IP_PHONE_MODE |
                         HEND_IP_PHONE_MODE | LEND_WIFI_PHONE_MODE
@@ -222,14 +222,14 @@ struct pmx_dev_mode pmx_telecom_tdm_modes[] = {
         },
 };
 
-struct pmx_dev pmx_telecom_tdm = {
+struct pmx_dev spear300_pmx_telecom_tdm = {
         .name = "telecom_tdm",
         .modes = pmx_telecom_tdm_modes,
         .mode_count = ARRAY_SIZE(pmx_telecom_tdm_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_spi_cs_i2c_clk_modes[] = {
+static struct pmx_dev_mode pmx_telecom_spi_cs_i2c_clk_modes[] = {
         {
                 .ids = LEND_IP_PHONE_MODE | HEND_IP_PHONE_MODE |
                         LEND_WIFI_PHONE_MODE | HEND_WIFI_PHONE_MODE
@@ -239,14 +239,14 @@ struct pmx_dev_mode pmx_telecom_spi_cs_i2c_clk_modes[] = {
         },
 };
 
-struct pmx_dev pmx_telecom_spi_cs_i2c_clk = {
+struct pmx_dev spear300_pmx_telecom_spi_cs_i2c_clk = {
         .name = "telecom_spi_cs_i2c_clk",
         .modes = pmx_telecom_spi_cs_i2c_clk_modes,
         .mode_count = ARRAY_SIZE(pmx_telecom_spi_cs_i2c_clk_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_camera_modes[] = {
+static struct pmx_dev_mode pmx_telecom_camera_modes[] = {
         {
                 .ids = CAML_LCDW_MODE | CAML_LCD_MODE,
                 .mask = PMX_MII_MASK,
@@ -256,14 +256,14 @@ struct pmx_dev_mode pmx_telecom_camera_modes[] = {
         },
 };
 
-struct pmx_dev pmx_telecom_camera = {
+struct pmx_dev spear300_pmx_telecom_camera = {
         .name = "telecom_camera",
         .modes = pmx_telecom_camera_modes,
         .mode_count = ARRAY_SIZE(pmx_telecom_camera_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_dac_modes[] = {
+static struct pmx_dev_mode pmx_telecom_dac_modes[] = {
         {
                 .ids = ATA_PABX_I2S_MODE | CAML_LCDW_MODE | CAMU_LCD_MODE
                         | CAMU_WLCD_MODE | CAML_LCD_MODE,
@@ -271,14 +271,14 @@ struct pmx_dev_mode pmx_telecom_dac_modes[] = {
         },
 };
 
-struct pmx_dev pmx_telecom_dac = {
+struct pmx_dev spear300_pmx_telecom_dac = {
         .name = "telecom_dac",
         .modes = pmx_telecom_dac_modes,
         .mode_count = ARRAY_SIZE(pmx_telecom_dac_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_i2s_modes[] = {
+static struct pmx_dev_mode pmx_telecom_i2s_modes[] = {
         {
                 .ids = LEND_IP_PHONE_MODE | HEND_IP_PHONE_MODE
                         | LEND_WIFI_PHONE_MODE | HEND_WIFI_PHONE_MODE |
@@ -288,14 +288,14 @@ struct pmx_dev_mode pmx_telecom_i2s_modes[] = {
         },
 };
 
-struct pmx_dev pmx_telecom_i2s = {
+struct pmx_dev spear300_pmx_telecom_i2s = {
         .name = "telecom_i2s",
         .modes = pmx_telecom_i2s_modes,
         .mode_count = ARRAY_SIZE(pmx_telecom_i2s_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_boot_pins_modes[] = {
+static struct pmx_dev_mode pmx_telecom_boot_pins_modes[] = {
         {
                 .ids = NAND_MODE | NOR_MODE,
                 .mask = PMX_UART0_MODEM_MASK | PMX_TIMER_1_2_MASK |
@@ -303,14 +303,14 @@ struct pmx_dev_mode pmx_telecom_boot_pins_modes[] = {
         },
 };
 
-struct pmx_dev pmx_telecom_boot_pins = {
+struct pmx_dev spear300_pmx_telecom_boot_pins = {
         .name = "telecom_boot_pins",
         .modes = pmx_telecom_boot_pins_modes,
         .mode_count = ARRAY_SIZE(pmx_telecom_boot_pins_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_sdhci_4bit_modes[] = {
+static struct pmx_dev_mode pmx_telecom_sdhci_4bit_modes[] = {
         {
                 .ids = PHOTO_FRAME_MODE | LEND_IP_PHONE_MODE |
                         HEND_IP_PHONE_MODE | LEND_WIFI_PHONE_MODE |
@@ -323,14 +323,14 @@ struct pmx_dev_mode pmx_telecom_sdhci_4bit_modes[] = {
         },
 };
 
-struct pmx_dev pmx_telecom_sdhci_4bit = {
+struct pmx_dev spear300_pmx_telecom_sdhci_4bit = {
         .name = "telecom_sdhci_4bit",
         .modes = pmx_telecom_sdhci_4bit_modes,
         .mode_count = ARRAY_SIZE(pmx_telecom_sdhci_4bit_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_telecom_sdhci_8bit_modes[] = {
+static struct pmx_dev_mode pmx_telecom_sdhci_8bit_modes[] = {
         {
                 .ids = PHOTO_FRAME_MODE | LEND_IP_PHONE_MODE |
                         HEND_IP_PHONE_MODE | LEND_WIFI_PHONE_MODE |
@@ -342,14 +342,14 @@ struct pmx_dev_mode pmx_telecom_sdhci_8bit_modes[] = {
         },
 };
 
-struct pmx_dev pmx_telecom_sdhci_8bit = {
+struct pmx_dev spear300_pmx_telecom_sdhci_8bit = {
         .name = "telecom_sdhci_8bit",
         .modes = pmx_telecom_sdhci_8bit_modes,
         .mode_count = ARRAY_SIZE(pmx_telecom_sdhci_8bit_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_gpio1_modes[] = {
+static struct pmx_dev_mode pmx_gpio1_modes[] = {
         {
                 .ids = PHOTO_FRAME_MODE,
                 .mask = PMX_UART0_MODEM_MASK | PMX_TIMER_1_2_MASK |
@@ -357,7 +357,7 @@ struct pmx_dev_mode pmx_gpio1_modes[] = {
         },
 };
 
-struct pmx_dev pmx_gpio1 = {
+struct pmx_dev spear300_pmx_gpio1 = {
         .name = "arm gpio1",
         .modes = pmx_gpio1_modes,
         .mode_count = ARRAY_SIZE(pmx_gpio1_modes),
@@ -365,60 +365,60 @@ struct pmx_dev pmx_gpio1 = {
 };
 
 /* pmx driver structure */
-struct pmx_driver pmx_driver = {
+static struct pmx_driver pmx_driver = {
         .mode_reg = {.offset = MODE_CONFIG_REG, .mask = 0x0000000f},
         .mux_reg = {.offset = PAD_MUX_CONFIG_REG, .mask = 0x00007fff},
 };
 
 /* spear3xx shared irq */
-struct shirq_dev_config shirq_ras1_config[] = {
+static struct shirq_dev_config shirq_ras1_config[] = {
         {
-                .virq = VIRQ_IT_PERS_S,
-                .enb_mask = IT_PERS_S_IRQ_MASK,
-                .status_mask = IT_PERS_S_IRQ_MASK,
+                .virq = SPEAR300_VIRQ_IT_PERS_S,
+                .enb_mask = SPEAR300_IT_PERS_S_IRQ_MASK,
+                .status_mask = SPEAR300_IT_PERS_S_IRQ_MASK,
         }, {
-                .virq = VIRQ_IT_CHANGE_S,
-                .enb_mask = IT_CHANGE_S_IRQ_MASK,
-                .status_mask = IT_CHANGE_S_IRQ_MASK,
+                .virq = SPEAR300_VIRQ_IT_CHANGE_S,
+                .enb_mask = SPEAR300_IT_CHANGE_S_IRQ_MASK,
+                .status_mask = SPEAR300_IT_CHANGE_S_IRQ_MASK,
         }, {
-                .virq = VIRQ_I2S,
-                .enb_mask = I2S_IRQ_MASK,
-                .status_mask = I2S_IRQ_MASK,
+                .virq = SPEAR300_VIRQ_I2S,
+                .enb_mask = SPEAR300_I2S_IRQ_MASK,
+                .status_mask = SPEAR300_I2S_IRQ_MASK,
         }, {
-                .virq = VIRQ_TDM,
-                .enb_mask = TDM_IRQ_MASK,
-                .status_mask = TDM_IRQ_MASK,
+                .virq = SPEAR300_VIRQ_TDM,
+                .enb_mask = SPEAR300_TDM_IRQ_MASK,
+                .status_mask = SPEAR300_TDM_IRQ_MASK,
         }, {
-                .virq = VIRQ_CAMERA_L,
-                .enb_mask = CAMERA_L_IRQ_MASK,
-                .status_mask = CAMERA_L_IRQ_MASK,
+                .virq = SPEAR300_VIRQ_CAMERA_L,
+                .enb_mask = SPEAR300_CAMERA_L_IRQ_MASK,
+                .status_mask = SPEAR300_CAMERA_L_IRQ_MASK,
         }, {
-                .virq = VIRQ_CAMERA_F,
-                .enb_mask = CAMERA_F_IRQ_MASK,
-                .status_mask = CAMERA_F_IRQ_MASK,
+                .virq = SPEAR300_VIRQ_CAMERA_F,
+                .enb_mask = SPEAR300_CAMERA_F_IRQ_MASK,
+                .status_mask = SPEAR300_CAMERA_F_IRQ_MASK,
         }, {
-                .virq = VIRQ_CAMERA_V,
-                .enb_mask = CAMERA_V_IRQ_MASK,
-                .status_mask = CAMERA_V_IRQ_MASK,
+                .virq = SPEAR300_VIRQ_CAMERA_V,
+                .enb_mask = SPEAR300_CAMERA_V_IRQ_MASK,
+                .status_mask = SPEAR300_CAMERA_V_IRQ_MASK,
         }, {
-                .virq = VIRQ_KEYBOARD,
-                .enb_mask = KEYBOARD_IRQ_MASK,
-                .status_mask = KEYBOARD_IRQ_MASK,
+                .virq = SPEAR300_VIRQ_KEYBOARD,
+                .enb_mask = SPEAR300_KEYBOARD_IRQ_MASK,
+                .status_mask = SPEAR300_KEYBOARD_IRQ_MASK,
         }, {
-                .virq = VIRQ_GPIO1,
-                .enb_mask = GPIO1_IRQ_MASK,
-                .status_mask = GPIO1_IRQ_MASK,
+                .virq = SPEAR300_VIRQ_GPIO1,
+                .enb_mask = SPEAR300_GPIO1_IRQ_MASK,
+                .status_mask = SPEAR300_GPIO1_IRQ_MASK,
         },
 };
 
-struct spear_shirq shirq_ras1 = {
-        .irq = IRQ_GEN_RAS_1,
+static struct spear_shirq shirq_ras1 = {
+        .irq = SPEAR3XX_IRQ_GEN_RAS_1,
         .dev_config = shirq_ras1_config,
         .dev_count = ARRAY_SIZE(shirq_ras1_config),
         .regs = {
-                .enb_reg = INT_ENB_MASK_REG,
-                .status_reg = INT_STS_MASK_REG,
-                .status_reg_mask = SHIRQ_RAS1_MASK,
+                .enb_reg = SPEAR300_INT_ENB_MASK_REG,
+                .status_reg = SPEAR300_INT_STS_MASK_REG,
+                .status_reg_mask = SPEAR300_SHIRQ_RAS1_MASK,
                 .clear_reg = -1,
         },
 };
@@ -427,10 +427,10 @@ struct spear_shirq shirq_ras1 = {
 /* arm gpio1 device registration */
 static struct pl061_platform_data gpio1_plat_data = {
         .gpio_base      = 8,
-        .irq_base       = SPEAR_GPIO1_INT_BASE,
+        .irq_base       = SPEAR300_GPIO1_INT_BASE,
 };
 
-struct amba_device gpio1_device = {
+struct amba_device spear300_gpio1_device = {
         .dev = {
                 .init_name = "gpio1",
                 .platform_data = &gpio1_plat_data,
@@ -440,11 +440,12 @@ struct amba_device gpio1_device = {
                 .end = SPEAR300_GPIO_BASE + SZ_4K - 1,
                 .flags = IORESOURCE_MEM,
         },
-        .irq = {VIRQ_GPIO1, NO_IRQ},
+        .irq = {SPEAR300_VIRQ_GPIO1, NO_IRQ},
 };
 
 /* spear300 routines */
-void __init spear300_init(void)
+void __init spear300_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,
+                u8 pmx_dev_count)
 {
         int ret = 0;
 
@@ -460,6 +461,10 @@ void __init spear300_init(void)
         }
 
         /* pmx initialization */
+        pmx_driver.mode = pmx_mode;
+        pmx_driver.devs = pmx_devs;
+        pmx_driver.devs_count = pmx_dev_count;
+
         pmx_driver.base = ioremap(SPEAR300_SOC_CONFIG_BASE, SZ_4K);
         if (pmx_driver.base) {
                 ret = pmx_register(&pmx_driver);
diff --git a/arch/arm/mach-spear3xx/spear300_evb.c b/arch/arm/mach-spear3xx/spear300_evb.c
index 42d2253ef540..69006f694220 100644
--- a/arch/arm/mach-spear3xx/spear300_evb.c
+++ b/arch/arm/mach-spear3xx/spear300_evb.c
@@ -19,26 +19,26 @@
 /* padmux devices to enable */
 static struct pmx_dev *pmx_devs[] = {
         /* spear3xx specific devices */
-        &pmx_i2c,
-        &pmx_ssp_cs,
-        &pmx_ssp,
-        &pmx_mii,
-        &pmx_uart0,
+        &spear3xx_pmx_i2c,
+        &spear3xx_pmx_ssp_cs,
+        &spear3xx_pmx_ssp,
+        &spear3xx_pmx_mii,
+        &spear3xx_pmx_uart0,
 
         /* spear300 specific devices */
-        &pmx_fsmc_2_chips,
-        &pmx_clcd,
-        &pmx_telecom_sdhci_4bit,
-        &pmx_gpio1,
+        &spear300_pmx_fsmc_2_chips,
+        &spear300_pmx_clcd,
+        &spear300_pmx_telecom_sdhci_4bit,
+        &spear300_pmx_gpio1,
 };
 
 static struct amba_device *amba_devs[] __initdata = {
         /* spear3xx specific devices */
-        &gpio_device,
-        &uart_device,
+        &spear3xx_gpio_device,
+        &spear3xx_uart_device,
 
         /* spear300 specific devices */
-        &gpio1_device,
+        &spear300_gpio1_device,
 };
 
 static struct platform_device *plat_devs[] __initdata = {
@@ -51,13 +51,9 @@ static void __init spear300_evb_init(void)
 {
         unsigned int i;
 
-        /* padmux initialization, must be done before spear300_init */
-        pmx_driver.mode = &photo_frame_mode;
-        pmx_driver.devs = pmx_devs;
-        pmx_driver.devs_count = ARRAY_SIZE(pmx_devs);
-
         /* call spear300 machine init function */
-        spear300_init();
+        spear300_init(&spear300_photo_frame_mode, pmx_devs,
+                        ARRAY_SIZE(pmx_devs));
 
         /* Add Platform Devices */
         platform_add_devices(plat_devs, ARRAY_SIZE(plat_devs));
diff --git a/arch/arm/mach-spear3xx/spear310.c b/arch/arm/mach-spear3xx/spear310.c
index 5c0a67b60c2a..9004cf9f01bf 100644
--- a/arch/arm/mach-spear3xx/spear310.c
+++ b/arch/arm/mach-spear3xx/spear310.c
@@ -22,112 +22,112 @@
 #define PAD_MUX_CONFIG_REG      0x08
 
 /* devices */
-struct pmx_dev_mode pmx_emi_cs_0_1_4_5_modes[] = {
+static struct pmx_dev_mode pmx_emi_cs_0_1_4_5_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_TIMER_3_4_MASK,
         },
 };
 
-struct pmx_dev pmx_emi_cs_0_1_4_5 = {
+struct pmx_dev spear310_pmx_emi_cs_0_1_4_5 = {
         .name = "emi_cs_0_1_4_5",
         .modes = pmx_emi_cs_0_1_4_5_modes,
         .mode_count = ARRAY_SIZE(pmx_emi_cs_0_1_4_5_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_emi_cs_2_3_modes[] = {
+static struct pmx_dev_mode pmx_emi_cs_2_3_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_TIMER_1_2_MASK,
         },
 };
 
-struct pmx_dev pmx_emi_cs_2_3 = {
+struct pmx_dev spear310_pmx_emi_cs_2_3 = {
         .name = "emi_cs_2_3",
         .modes = pmx_emi_cs_2_3_modes,
         .mode_count = ARRAY_SIZE(pmx_emi_cs_2_3_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_uart1_modes[] = {
+static struct pmx_dev_mode pmx_uart1_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_FIRDA_MASK,
         },
 };
 
-struct pmx_dev pmx_uart1 = {
+struct pmx_dev spear310_pmx_uart1 = {
         .name = "uart1",
         .modes = pmx_uart1_modes,
         .mode_count = ARRAY_SIZE(pmx_uart1_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_uart2_modes[] = {
+static struct pmx_dev_mode pmx_uart2_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_TIMER_1_2_MASK,
         },
 };
 
-struct pmx_dev pmx_uart2 = {
+struct pmx_dev spear310_pmx_uart2 = {
         .name = "uart2",
         .modes = pmx_uart2_modes,
         .mode_count = ARRAY_SIZE(pmx_uart2_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_uart3_4_5_modes[] = {
+static struct pmx_dev_mode pmx_uart3_4_5_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_UART0_MODEM_MASK,
         },
 };
 
-struct pmx_dev pmx_uart3_4_5 = {
+struct pmx_dev spear310_pmx_uart3_4_5 = {
         .name = "uart3_4_5",
         .modes = pmx_uart3_4_5_modes,
         .mode_count = ARRAY_SIZE(pmx_uart3_4_5_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_fsmc_modes[] = {
+static struct pmx_dev_mode pmx_fsmc_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_SSP_CS_MASK,
         },
 };
 
-struct pmx_dev pmx_fsmc = {
+struct pmx_dev spear310_pmx_fsmc = {
         .name = "fsmc",
         .modes = pmx_fsmc_modes,
         .mode_count = ARRAY_SIZE(pmx_fsmc_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_rs485_0_1_modes[] = {
+static struct pmx_dev_mode pmx_rs485_0_1_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_MII_MASK,
         },
 };
 
-struct pmx_dev pmx_rs485_0_1 = {
+struct pmx_dev spear310_pmx_rs485_0_1 = {
         .name = "rs485_0_1",
         .modes = pmx_rs485_0_1_modes,
         .mode_count = ARRAY_SIZE(pmx_rs485_0_1_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_tdm0_modes[] = {
+static struct pmx_dev_mode pmx_tdm0_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_MII_MASK,
         },
 };
 
-struct pmx_dev pmx_tdm0 = {
+struct pmx_dev spear310_pmx_tdm0 = {
         .name = "tdm0",
         .modes = pmx_tdm0_modes,
         .mode_count = ARRAY_SIZE(pmx_tdm0_modes),
@@ -135,122 +135,122 @@ struct pmx_dev pmx_tdm0 = {
 };
 
 /* pmx driver structure */
-struct pmx_driver pmx_driver = {
+static struct pmx_driver pmx_driver = {
         .mux_reg = {.offset = PAD_MUX_CONFIG_REG, .mask = 0x00007fff},
 };
 
 /* spear3xx shared irq */
-struct shirq_dev_config shirq_ras1_config[] = {
+static struct shirq_dev_config shirq_ras1_config[] = {
         {
-                .virq = VIRQ_SMII0,
-                .status_mask = SMII0_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_SMII0,
+                .status_mask = SPEAR310_SMII0_IRQ_MASK,
         }, {
-                .virq = VIRQ_SMII1,
-                .status_mask = SMII1_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_SMII1,
+                .status_mask = SPEAR310_SMII1_IRQ_MASK,
         }, {
-                .virq = VIRQ_SMII2,
-                .status_mask = SMII2_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_SMII2,
+                .status_mask = SPEAR310_SMII2_IRQ_MASK,
         }, {
-                .virq = VIRQ_SMII3,
-                .status_mask = SMII3_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_SMII3,
+                .status_mask = SPEAR310_SMII3_IRQ_MASK,
         }, {
-                .virq = VIRQ_WAKEUP_SMII0,
-                .status_mask = WAKEUP_SMII0_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_WAKEUP_SMII0,
+                .status_mask = SPEAR310_WAKEUP_SMII0_IRQ_MASK,
         }, {
-                .virq = VIRQ_WAKEUP_SMII1,
-                .status_mask = WAKEUP_SMII1_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_WAKEUP_SMII1,
+                .status_mask = SPEAR310_WAKEUP_SMII1_IRQ_MASK,
         }, {
-                .virq = VIRQ_WAKEUP_SMII2,
-                .status_mask = WAKEUP_SMII2_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_WAKEUP_SMII2,
+                .status_mask = SPEAR310_WAKEUP_SMII2_IRQ_MASK,
         }, {
-                .virq = VIRQ_WAKEUP_SMII3,
-                .status_mask = WAKEUP_SMII3_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_WAKEUP_SMII3,
+                .status_mask = SPEAR310_WAKEUP_SMII3_IRQ_MASK,
         },
 };
 
-struct spear_shirq shirq_ras1 = {
-        .irq = IRQ_GEN_RAS_1,
+static struct spear_shirq shirq_ras1 = {
+        .irq = SPEAR3XX_IRQ_GEN_RAS_1,
         .dev_config = shirq_ras1_config,
         .dev_count = ARRAY_SIZE(shirq_ras1_config),
         .regs = {
                 .enb_reg = -1,
-                .status_reg = INT_STS_MASK_REG,
-                .status_reg_mask = SHIRQ_RAS1_MASK,
+                .status_reg = SPEAR310_INT_STS_MASK_REG,
+                .status_reg_mask = SPEAR310_SHIRQ_RAS1_MASK,
                 .clear_reg = -1,
         },
 };
 
-struct shirq_dev_config shirq_ras2_config[] = {
+static struct shirq_dev_config shirq_ras2_config[] = {
         {
-                .virq = VIRQ_UART1,
-                .status_mask = UART1_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_UART1,
+                .status_mask = SPEAR310_UART1_IRQ_MASK,
         }, {
-                .virq = VIRQ_UART2,
-                .status_mask = UART2_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_UART2,
+                .status_mask = SPEAR310_UART2_IRQ_MASK,
         }, {
-                .virq = VIRQ_UART3,
-                .status_mask = UART3_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_UART3,
+                .status_mask = SPEAR310_UART3_IRQ_MASK,
         }, {
-                .virq = VIRQ_UART4,
-                .status_mask = UART4_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_UART4,
+                .status_mask = SPEAR310_UART4_IRQ_MASK,
         }, {
-                .virq = VIRQ_UART5,
-                .status_mask = UART5_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_UART5,
+                .status_mask = SPEAR310_UART5_IRQ_MASK,
         },
 };
 
-struct spear_shirq shirq_ras2 = {
-        .irq = IRQ_GEN_RAS_2,
+static struct spear_shirq shirq_ras2 = {
+        .irq = SPEAR3XX_IRQ_GEN_RAS_2,
         .dev_config = shirq_ras2_config,
         .dev_count = ARRAY_SIZE(shirq_ras2_config),
         .regs = {
                 .enb_reg = -1,
-                .status_reg = INT_STS_MASK_REG,
-                .status_reg_mask = SHIRQ_RAS2_MASK,
+                .status_reg = SPEAR310_INT_STS_MASK_REG,
+                .status_reg_mask = SPEAR310_SHIRQ_RAS2_MASK,
                 .clear_reg = -1,
         },
 };
 
-struct shirq_dev_config shirq_ras3_config[] = {
+static struct shirq_dev_config shirq_ras3_config[] = {
         {
-                .virq = VIRQ_EMI,
-                .status_mask = EMI_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_EMI,
+                .status_mask = SPEAR310_EMI_IRQ_MASK,
         },
 };
 
-struct spear_shirq shirq_ras3 = {
-        .irq = IRQ_GEN_RAS_3,
+static struct spear_shirq shirq_ras3 = {
+        .irq = SPEAR3XX_IRQ_GEN_RAS_3,
         .dev_config = shirq_ras3_config,
         .dev_count = ARRAY_SIZE(shirq_ras3_config),
         .regs = {
                 .enb_reg = -1,
-                .status_reg = INT_STS_MASK_REG,
-                .status_reg_mask = SHIRQ_RAS3_MASK,
+                .status_reg = SPEAR310_INT_STS_MASK_REG,
+                .status_reg_mask = SPEAR310_SHIRQ_RAS3_MASK,
                 .clear_reg = -1,
         },
 };
 
-struct shirq_dev_config shirq_intrcomm_ras_config[] = {
+static struct shirq_dev_config shirq_intrcomm_ras_config[] = {
         {
-                .virq = VIRQ_TDM_HDLC,
-                .status_mask = TDM_HDLC_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_TDM_HDLC,
+                .status_mask = SPEAR310_TDM_HDLC_IRQ_MASK,
         }, {
-                .virq = VIRQ_RS485_0,
-                .status_mask = RS485_0_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_RS485_0,
+                .status_mask = SPEAR310_RS485_0_IRQ_MASK,
         }, {
-                .virq = VIRQ_RS485_1,
-                .status_mask = RS485_1_IRQ_MASK,
+                .virq = SPEAR310_VIRQ_RS485_1,
+                .status_mask = SPEAR310_RS485_1_IRQ_MASK,
         },
 };
 
-struct spear_shirq shirq_intrcomm_ras = {
-        .irq = IRQ_INTRCOMM_RAS_ARM,
+static struct spear_shirq shirq_intrcomm_ras = {
+        .irq = SPEAR3XX_IRQ_INTRCOMM_RAS_ARM,
         .dev_config = shirq_intrcomm_ras_config,
         .dev_count = ARRAY_SIZE(shirq_intrcomm_ras_config),
         .regs = {
                 .enb_reg = -1,
-                .status_reg = INT_STS_MASK_REG,
-                .status_reg_mask = SHIRQ_INTRCOMM_RAS_MASK,
+                .status_reg = SPEAR310_INT_STS_MASK_REG,
+                .status_reg_mask = SPEAR310_SHIRQ_INTRCOMM_RAS_MASK,
                 .clear_reg = -1,
         },
 };
@@ -258,7 +258,8 @@ struct spear_shirq shirq_intrcomm_ras = {
 /* Add spear310 specific devices here */
 
 /* spear310 routines */
-void __init spear310_init(void)
+void __init spear310_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,
+                u8 pmx_dev_count)
 {
         void __iomem *base;
         int ret = 0;
@@ -296,6 +297,10 @@ void __init spear310_init(void)
 
         /* pmx initialization */
         pmx_driver.base = base;
+        pmx_driver.mode = pmx_mode;
+        pmx_driver.devs = pmx_devs;
+        pmx_driver.devs_count = pmx_dev_count;
+
         ret = pmx_register(&pmx_driver);
         if (ret)
                 printk(KERN_ERR "padmux: registeration failed. err no: %d\n",
diff --git a/arch/arm/mach-spear3xx/spear310_evb.c b/arch/arm/mach-spear3xx/spear310_evb.c
index 2d7f333bd67b..c8684ce1f9b3 100644
--- a/arch/arm/mach-spear3xx/spear310_evb.c
+++ b/arch/arm/mach-spear3xx/spear310_evb.c
@@ -19,31 +19,31 @@
 /* padmux devices to enable */
 static struct pmx_dev *pmx_devs[] = {
         /* spear3xx specific devices */
-        &pmx_i2c,
-        &pmx_ssp,
-        &pmx_gpio_pin0,
-        &pmx_gpio_pin1,
-        &pmx_gpio_pin2,
-        &pmx_gpio_pin3,
-        &pmx_gpio_pin4,
-        &pmx_gpio_pin5,
-        &pmx_uart0,
+        &spear3xx_pmx_i2c,
+        &spear3xx_pmx_ssp,
+        &spear3xx_pmx_gpio_pin0,
+        &spear3xx_pmx_gpio_pin1,
+        &spear3xx_pmx_gpio_pin2,
+        &spear3xx_pmx_gpio_pin3,
+        &spear3xx_pmx_gpio_pin4,
+        &spear3xx_pmx_gpio_pin5,
+        &spear3xx_pmx_uart0,
 
         /* spear310 specific devices */
-        &pmx_emi_cs_0_1_4_5,
-        &pmx_emi_cs_2_3,
-        &pmx_uart1,
-        &pmx_uart2,
-        &pmx_uart3_4_5,
-        &pmx_fsmc,
-        &pmx_rs485_0_1,
-        &pmx_tdm0,
+        &spear310_pmx_emi_cs_0_1_4_5,
+        &spear310_pmx_emi_cs_2_3,
+        &spear310_pmx_uart1,
+        &spear310_pmx_uart2,
+        &spear310_pmx_uart3_4_5,
+        &spear310_pmx_fsmc,
+        &spear310_pmx_rs485_0_1,
+        &spear310_pmx_tdm0,
 };
 
 static struct amba_device *amba_devs[] __initdata = {
         /* spear3xx specific devices */
-        &gpio_device,
-        &uart_device,
+        &spear3xx_gpio_device,
+        &spear3xx_uart_device,
 
         /* spear310 specific devices */
 };
@@ -58,13 +58,8 @@ static void __init spear310_evb_init(void)
 {
         unsigned int i;
 
-        /* padmux initialization, must be done before spear310_init */
-        pmx_driver.mode = NULL;
-        pmx_driver.devs = pmx_devs;
-        pmx_driver.devs_count = ARRAY_SIZE(pmx_devs);
-
         /* call spear310 machine init function */
-        spear310_init();
+        spear310_init(NULL, pmx_devs, ARRAY_SIZE(pmx_devs));
 
         /* Add Platform Devices */
         platform_add_devices(plat_devs, ARRAY_SIZE(plat_devs));
diff --git a/arch/arm/mach-spear3xx/spear320.c b/arch/arm/mach-spear3xx/spear320.c
index 741c1f414cbd..ee29bef43074 100644
--- a/arch/arm/mach-spear3xx/spear320.c
+++ b/arch/arm/mach-spear3xx/spear320.c
@@ -29,88 +29,88 @@
 #define SMALL_PRINTERS_MODE     (1 << 3)
 #define ALL_MODES               0xF
 
-struct pmx_mode auto_net_smii_mode = {
+struct pmx_mode spear320_auto_net_smii_mode = {
         .id = AUTO_NET_SMII_MODE,
         .name = "Automation Networking SMII Mode",
         .mask = 0x00,
 };
 
-struct pmx_mode auto_net_mii_mode = {
+struct pmx_mode spear320_auto_net_mii_mode = {
         .id = AUTO_NET_MII_MODE,
         .name = "Automation Networking MII Mode",
         .mask = 0x01,
 };
 
-struct pmx_mode auto_exp_mode = {
+struct pmx_mode spear320_auto_exp_mode = {
         .id = AUTO_EXP_MODE,
         .name = "Automation Expanded Mode",
         .mask = 0x02,
 };
 
-struct pmx_mode small_printers_mode = {
+struct pmx_mode spear320_small_printers_mode = {
         .id = SMALL_PRINTERS_MODE,
         .name = "Small Printers Mode",
         .mask = 0x03,
 };
 
 /* devices */
-struct pmx_dev_mode pmx_clcd_modes[] = {
+static struct pmx_dev_mode pmx_clcd_modes[] = {
         {
                 .ids = AUTO_NET_SMII_MODE,
                 .mask = 0x0,
         },
 };
 
-struct pmx_dev pmx_clcd = {
+struct pmx_dev spear320_pmx_clcd = {
         .name = "clcd",
         .modes = pmx_clcd_modes,
         .mode_count = ARRAY_SIZE(pmx_clcd_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_emi_modes[] = {
+static struct pmx_dev_mode pmx_emi_modes[] = {
         {
                 .ids = AUTO_EXP_MODE,
                 .mask = PMX_TIMER_1_2_MASK | PMX_TIMER_3_4_MASK,
         },
 };
 
-struct pmx_dev pmx_emi = {
+struct pmx_dev spear320_pmx_emi = {
         .name = "emi",
         .modes = pmx_emi_modes,
         .mode_count = ARRAY_SIZE(pmx_emi_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_fsmc_modes[] = {
+static struct pmx_dev_mode pmx_fsmc_modes[] = {
         {
                 .ids = ALL_MODES,
                 .mask = 0x0,
         },
 };
 
-struct pmx_dev pmx_fsmc = {
+struct pmx_dev spear320_pmx_fsmc = {
         .name = "fsmc",
         .modes = pmx_fsmc_modes,
         .mode_count = ARRAY_SIZE(pmx_fsmc_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_spp_modes[] = {
+static struct pmx_dev_mode pmx_spp_modes[] = {
         {
                 .ids = SMALL_PRINTERS_MODE,
                 .mask = 0x0,
         },
 };
 
-struct pmx_dev pmx_spp = {
+struct pmx_dev spear320_pmx_spp = {
         .name = "spp",
         .modes = pmx_spp_modes,
         .mode_count = ARRAY_SIZE(pmx_spp_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_sdhci_modes[] = {
+static struct pmx_dev_mode pmx_sdhci_modes[] = {
         {
                 .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE |
                         SMALL_PRINTERS_MODE,
@@ -118,42 +118,42 @@ struct pmx_dev_mode pmx_sdhci_modes[] = {
         },
 };
 
-struct pmx_dev pmx_sdhci = {
+struct pmx_dev spear320_pmx_sdhci = {
         .name = "sdhci",
         .modes = pmx_sdhci_modes,
         .mode_count = ARRAY_SIZE(pmx_sdhci_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_i2s_modes[] = {
+static struct pmx_dev_mode pmx_i2s_modes[] = {
         {
                 .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE,
                 .mask = PMX_UART0_MODEM_MASK,
         },
 };
 
-struct pmx_dev pmx_i2s = {
+struct pmx_dev spear320_pmx_i2s = {
         .name = "i2s",
         .modes = pmx_i2s_modes,
         .mode_count = ARRAY_SIZE(pmx_i2s_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_uart1_modes[] = {
+static struct pmx_dev_mode pmx_uart1_modes[] = {
         {
                 .ids = ALL_MODES,
                 .mask = PMX_GPIO_PIN0_MASK | PMX_GPIO_PIN1_MASK,
         },
 };
 
-struct pmx_dev pmx_uart1 = {
+struct pmx_dev spear320_pmx_uart1 = {
         .name = "uart1",
         .modes = pmx_uart1_modes,
         .mode_count = ARRAY_SIZE(pmx_uart1_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_uart1_modem_modes[] = {
+static struct pmx_dev_mode pmx_uart1_modem_modes[] = {
         {
                 .ids = AUTO_EXP_MODE,
                 .mask = PMX_TIMER_1_2_MASK | PMX_TIMER_3_4_MASK |
@@ -165,42 +165,42 @@ struct pmx_dev_mode pmx_uart1_modem_modes[] = {
         },
 };
 
-struct pmx_dev pmx_uart1_modem = {
+struct pmx_dev spear320_pmx_uart1_modem = {
         .name = "uart1_modem",
         .modes = pmx_uart1_modem_modes,
         .mode_count = ARRAY_SIZE(pmx_uart1_modem_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_uart2_modes[] = {
+static struct pmx_dev_mode pmx_uart2_modes[] = {
         {
                 .ids = ALL_MODES,
                 .mask = PMX_FIRDA_MASK,
         },
 };
 
-struct pmx_dev pmx_uart2 = {
+struct pmx_dev spear320_pmx_uart2 = {
         .name = "uart2",
         .modes = pmx_uart2_modes,
         .mode_count = ARRAY_SIZE(pmx_uart2_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_touchscreen_modes[] = {
+static struct pmx_dev_mode pmx_touchscreen_modes[] = {
         {
                 .ids = AUTO_NET_SMII_MODE,
                 .mask = PMX_SSP_CS_MASK,
         },
 };
 
-struct pmx_dev pmx_touchscreen = {
+struct pmx_dev spear320_pmx_touchscreen = {
         .name = "touchscreen",
         .modes = pmx_touchscreen_modes,
         .mode_count = ARRAY_SIZE(pmx_touchscreen_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_can_modes[] = {
+static struct pmx_dev_mode pmx_can_modes[] = {
         {
                 .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE | AUTO_EXP_MODE,
                 .mask = PMX_GPIO_PIN2_MASK | PMX_GPIO_PIN3_MASK |
@@ -208,28 +208,28 @@ struct pmx_dev_mode pmx_can_modes[] = {
         },
 };
 
-struct pmx_dev pmx_can = {
+struct pmx_dev spear320_pmx_can = {
         .name = "can",
         .modes = pmx_can_modes,
         .mode_count = ARRAY_SIZE(pmx_can_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_sdhci_led_modes[] = {
+static struct pmx_dev_mode pmx_sdhci_led_modes[] = {
         {
                 .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE,
                 .mask = PMX_SSP_CS_MASK,
         },
 };
 
-struct pmx_dev pmx_sdhci_led = {
+struct pmx_dev spear320_pmx_sdhci_led = {
         .name = "sdhci_led",
         .modes = pmx_sdhci_led_modes,
         .mode_count = ARRAY_SIZE(pmx_sdhci_led_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_pwm0_modes[] = {
+static struct pmx_dev_mode pmx_pwm0_modes[] = {
         {
                 .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE,
                 .mask = PMX_UART0_MODEM_MASK,
@@ -239,14 +239,14 @@ struct pmx_dev_mode pmx_pwm0_modes[] = {
         },
 };
 
-struct pmx_dev pmx_pwm0 = {
+struct pmx_dev spear320_pmx_pwm0 = {
         .name = "pwm0",
         .modes = pmx_pwm0_modes,
         .mode_count = ARRAY_SIZE(pmx_pwm0_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_pwm1_modes[] = {
+static struct pmx_dev_mode pmx_pwm1_modes[] = {
         {
                 .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE,
                 .mask = PMX_UART0_MODEM_MASK,
@@ -256,14 +256,14 @@ struct pmx_dev_mode pmx_pwm1_modes[] = {
         },
 };
 
-struct pmx_dev pmx_pwm1 = {
+struct pmx_dev spear320_pmx_pwm1 = {
         .name = "pwm1",
         .modes = pmx_pwm1_modes,
         .mode_count = ARRAY_SIZE(pmx_pwm1_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_pwm2_modes[] = {
+static struct pmx_dev_mode pmx_pwm2_modes[] = {
         {
                 .ids = AUTO_NET_SMII_MODE | AUTO_NET_MII_MODE,
                 .mask = PMX_SSP_CS_MASK,
@@ -273,105 +273,105 @@ struct pmx_dev_mode pmx_pwm2_modes[] = {
         },
 };
 
-struct pmx_dev pmx_pwm2 = {
+struct pmx_dev spear320_pmx_pwm2 = {
         .name = "pwm2",
         .modes = pmx_pwm2_modes,
         .mode_count = ARRAY_SIZE(pmx_pwm2_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_pwm3_modes[] = {
+static struct pmx_dev_mode pmx_pwm3_modes[] = {
         {
                 .ids = AUTO_EXP_MODE | SMALL_PRINTERS_MODE | AUTO_NET_SMII_MODE,
                 .mask = PMX_MII_MASK,
         },
 };
 
-struct pmx_dev pmx_pwm3 = {
+struct pmx_dev spear320_pmx_pwm3 = {
         .name = "pwm3",
         .modes = pmx_pwm3_modes,
         .mode_count = ARRAY_SIZE(pmx_pwm3_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_ssp1_modes[] = {
+static struct pmx_dev_mode pmx_ssp1_modes[] = {
         {
                 .ids = SMALL_PRINTERS_MODE | AUTO_NET_SMII_MODE,
                 .mask = PMX_MII_MASK,
         },
 };
 
-struct pmx_dev pmx_ssp1 = {
+struct pmx_dev spear320_pmx_ssp1 = {
         .name = "ssp1",
         .modes = pmx_ssp1_modes,
         .mode_count = ARRAY_SIZE(pmx_ssp1_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_ssp2_modes[] = {
+static struct pmx_dev_mode pmx_ssp2_modes[] = {
         {
                 .ids = AUTO_NET_SMII_MODE,
                 .mask = PMX_MII_MASK,
         },
 };
 
-struct pmx_dev pmx_ssp2 = {
+struct pmx_dev spear320_pmx_ssp2 = {
         .name = "ssp2",
         .modes = pmx_ssp2_modes,
         .mode_count = ARRAY_SIZE(pmx_ssp2_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_mii1_modes[] = {
+static struct pmx_dev_mode pmx_mii1_modes[] = {
         {
                 .ids = AUTO_NET_MII_MODE,
                 .mask = 0x0,
         },
 };
 
-struct pmx_dev pmx_mii1 = {
+struct pmx_dev spear320_pmx_mii1 = {
         .name = "mii1",
         .modes = pmx_mii1_modes,
         .mode_count = ARRAY_SIZE(pmx_mii1_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_smii0_modes[] = {
+static struct pmx_dev_mode pmx_smii0_modes[] = {
         {
                 .ids = AUTO_NET_SMII_MODE | AUTO_EXP_MODE | SMALL_PRINTERS_MODE,
                 .mask = PMX_MII_MASK,
         },
 };
 
-struct pmx_dev pmx_smii0 = {
+struct pmx_dev spear320_pmx_smii0 = {
         .name = "smii0",
         .modes = pmx_smii0_modes,
         .mode_count = ARRAY_SIZE(pmx_smii0_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_smii1_modes[] = {
+static struct pmx_dev_mode pmx_smii1_modes[] = {
         {
                 .ids = AUTO_NET_SMII_MODE | SMALL_PRINTERS_MODE,
                 .mask = PMX_MII_MASK,
         },
 };
 
-struct pmx_dev pmx_smii1 = {
+struct pmx_dev spear320_pmx_smii1 = {
         .name = "smii1",
         .modes = pmx_smii1_modes,
         .mode_count = ARRAY_SIZE(pmx_smii1_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_i2c1_modes[] = {
+static struct pmx_dev_mode pmx_i2c1_modes[] = {
         {
                 .ids = AUTO_EXP_MODE,
                 .mask = 0x0,
         },
 };
 
-struct pmx_dev pmx_i2c1 = {
+struct pmx_dev spear320_pmx_i2c1 = {
         .name = "i2c1",
         .modes = pmx_i2c1_modes,
         .mode_count = ARRAY_SIZE(pmx_i2c1_modes),
@@ -379,131 +379,131 @@ struct pmx_dev pmx_i2c1 = {
 };
 
 /* pmx driver structure */
-struct pmx_driver pmx_driver = {
+static struct pmx_driver pmx_driver = {
         .mode_reg = {.offset = MODE_CONFIG_REG, .mask = 0x00000007},
         .mux_reg = {.offset = PAD_MUX_CONFIG_REG, .mask = 0x00007fff},
 };
 
 /* spear3xx shared irq */
-struct shirq_dev_config shirq_ras1_config[] = {
+static struct shirq_dev_config shirq_ras1_config[] = {
         {
-                .virq = VIRQ_EMI,
-                .status_mask = EMI_IRQ_MASK,
-                .clear_mask = EMI_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_EMI,
+                .status_mask = SPEAR320_EMI_IRQ_MASK,
+                .clear_mask = SPEAR320_EMI_IRQ_MASK,
         }, {
-                .virq = VIRQ_CLCD,
-                .status_mask = CLCD_IRQ_MASK,
-                .clear_mask = CLCD_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_CLCD,
+                .status_mask = SPEAR320_CLCD_IRQ_MASK,
+                .clear_mask = SPEAR320_CLCD_IRQ_MASK,
         }, {
-                .virq = VIRQ_SPP,
-                .status_mask = SPP_IRQ_MASK,
-                .clear_mask = SPP_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_SPP,
+                .status_mask = SPEAR320_SPP_IRQ_MASK,
+                .clear_mask = SPEAR320_SPP_IRQ_MASK,
         },
 };
 
-struct spear_shirq shirq_ras1 = {
-        .irq = IRQ_GEN_RAS_1,
+static struct spear_shirq shirq_ras1 = {
+        .irq = SPEAR3XX_IRQ_GEN_RAS_1,
         .dev_config = shirq_ras1_config,
         .dev_count = ARRAY_SIZE(shirq_ras1_config),
         .regs = {
                 .enb_reg = -1,
-                .status_reg = INT_STS_MASK_REG,
-                .status_reg_mask = SHIRQ_RAS1_MASK,
-                .clear_reg = INT_CLR_MASK_REG,
+                .status_reg = SPEAR320_INT_STS_MASK_REG,
+                .status_reg_mask = SPEAR320_SHIRQ_RAS1_MASK,
+                .clear_reg = SPEAR320_INT_CLR_MASK_REG,
                 .reset_to_clear = 1,
         },
 };
 
-struct shirq_dev_config shirq_ras3_config[] = {
+static struct shirq_dev_config shirq_ras3_config[] = {
         {
-                .virq = VIRQ_PLGPIO,
-                .enb_mask = GPIO_IRQ_MASK,
-                .status_mask = GPIO_IRQ_MASK,
-                .clear_mask = GPIO_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_PLGPIO,
+                .enb_mask = SPEAR320_GPIO_IRQ_MASK,
+                .status_mask = SPEAR320_GPIO_IRQ_MASK,
+                .clear_mask = SPEAR320_GPIO_IRQ_MASK,
         }, {
-                .virq = VIRQ_I2S_PLAY,
-                .enb_mask = I2S_PLAY_IRQ_MASK,
-                .status_mask = I2S_PLAY_IRQ_MASK,
-                .clear_mask = I2S_PLAY_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_I2S_PLAY,
+                .enb_mask = SPEAR320_I2S_PLAY_IRQ_MASK,
+                .status_mask = SPEAR320_I2S_PLAY_IRQ_MASK,
+                .clear_mask = SPEAR320_I2S_PLAY_IRQ_MASK,
         }, {
-                .virq = VIRQ_I2S_REC,
-                .enb_mask = I2S_REC_IRQ_MASK,
-                .status_mask = I2S_REC_IRQ_MASK,
-                .clear_mask = I2S_REC_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_I2S_REC,
+                .enb_mask = SPEAR320_I2S_REC_IRQ_MASK,
+                .status_mask = SPEAR320_I2S_REC_IRQ_MASK,
+                .clear_mask = SPEAR320_I2S_REC_IRQ_MASK,
         },
 };
 
-struct spear_shirq shirq_ras3 = {
-        .irq = IRQ_GEN_RAS_3,
+static struct spear_shirq shirq_ras3 = {
+        .irq = SPEAR3XX_IRQ_GEN_RAS_3,
         .dev_config = shirq_ras3_config,
         .dev_count = ARRAY_SIZE(shirq_ras3_config),
         .regs = {
-                .enb_reg = INT_ENB_MASK_REG,
+                .enb_reg = SPEAR320_INT_ENB_MASK_REG,
                 .reset_to_enb = 1,
-                .status_reg = INT_STS_MASK_REG,
-                .status_reg_mask = SHIRQ_RAS3_MASK,
-                .clear_reg = INT_CLR_MASK_REG,
+                .status_reg = SPEAR320_INT_STS_MASK_REG,
+                .status_reg_mask = SPEAR320_SHIRQ_RAS3_MASK,
+                .clear_reg = SPEAR320_INT_CLR_MASK_REG,
                 .reset_to_clear = 1,
         },
 };
 
-struct shirq_dev_config shirq_intrcomm_ras_config[] = {
+static struct shirq_dev_config shirq_intrcomm_ras_config[] = {
         {
-                .virq = VIRQ_CANU,
-                .status_mask = CAN_U_IRQ_MASK,
-                .clear_mask = CAN_U_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_CANU,
+                .status_mask = SPEAR320_CAN_U_IRQ_MASK,
+                .clear_mask = SPEAR320_CAN_U_IRQ_MASK,
         }, {
-                .virq = VIRQ_CANL,
-                .status_mask = CAN_L_IRQ_MASK,
-                .clear_mask = CAN_L_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_CANL,
+                .status_mask = SPEAR320_CAN_L_IRQ_MASK,
+                .clear_mask = SPEAR320_CAN_L_IRQ_MASK,
         }, {
-                .virq = VIRQ_UART1,
-                .status_mask = UART1_IRQ_MASK,
-                .clear_mask = UART1_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_UART1,
+                .status_mask = SPEAR320_UART1_IRQ_MASK,
+                .clear_mask = SPEAR320_UART1_IRQ_MASK,
         }, {
-                .virq = VIRQ_UART2,
-                .status_mask = UART2_IRQ_MASK,
-                .clear_mask = UART2_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_UART2,
+                .status_mask = SPEAR320_UART2_IRQ_MASK,
+                .clear_mask = SPEAR320_UART2_IRQ_MASK,
         }, {
-                .virq = VIRQ_SSP1,
-                .status_mask = SSP1_IRQ_MASK,
-                .clear_mask = SSP1_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_SSP1,
+                .status_mask = SPEAR320_SSP1_IRQ_MASK,
+                .clear_mask = SPEAR320_SSP1_IRQ_MASK,
         }, {
-                .virq = VIRQ_SSP2,
-                .status_mask = SSP2_IRQ_MASK,
-                .clear_mask = SSP2_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_SSP2,
+                .status_mask = SPEAR320_SSP2_IRQ_MASK,
+                .clear_mask = SPEAR320_SSP2_IRQ_MASK,
         }, {
-                .virq = VIRQ_SMII0,
-                .status_mask = SMII0_IRQ_MASK,
-                .clear_mask = SMII0_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_SMII0,
+                .status_mask = SPEAR320_SMII0_IRQ_MASK,
+                .clear_mask = SPEAR320_SMII0_IRQ_MASK,
         }, {
-                .virq = VIRQ_MII1_SMII1,
-                .status_mask = MII1_SMII1_IRQ_MASK,
-                .clear_mask = MII1_SMII1_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_MII1_SMII1,
+                .status_mask = SPEAR320_MII1_SMII1_IRQ_MASK,
+                .clear_mask = SPEAR320_MII1_SMII1_IRQ_MASK,
         }, {
-                .virq = VIRQ_WAKEUP_SMII0,
-                .status_mask = WAKEUP_SMII0_IRQ_MASK,
-                .clear_mask = WAKEUP_SMII0_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_WAKEUP_SMII0,
+                .status_mask = SPEAR320_WAKEUP_SMII0_IRQ_MASK,
+                .clear_mask = SPEAR320_WAKEUP_SMII0_IRQ_MASK,
         }, {
-                .virq = VIRQ_WAKEUP_MII1_SMII1,
-                .status_mask = WAKEUP_MII1_SMII1_IRQ_MASK,
-                .clear_mask = WAKEUP_MII1_SMII1_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_WAKEUP_MII1_SMII1,
+                .status_mask = SPEAR320_WAKEUP_MII1_SMII1_IRQ_MASK,
+                .clear_mask = SPEAR320_WAKEUP_MII1_SMII1_IRQ_MASK,
         }, {
-                .virq = VIRQ_I2C,
-                .status_mask = I2C1_IRQ_MASK,
-                .clear_mask = I2C1_IRQ_MASK,
+                .virq = SPEAR320_VIRQ_I2C1,
+                .status_mask = SPEAR320_I2C1_IRQ_MASK,
+                .clear_mask = SPEAR320_I2C1_IRQ_MASK,
         },
 };
 
-struct spear_shirq shirq_intrcomm_ras = {
-        .irq = IRQ_INTRCOMM_RAS_ARM,
+static struct spear_shirq shirq_intrcomm_ras = {
+        .irq = SPEAR3XX_IRQ_INTRCOMM_RAS_ARM,
         .dev_config = shirq_intrcomm_ras_config,
         .dev_count = ARRAY_SIZE(shirq_intrcomm_ras_config),
         .regs = {
                 .enb_reg = -1,
-                .status_reg = INT_STS_MASK_REG,
-                .status_reg_mask = SHIRQ_INTRCOMM_RAS_MASK,
-                .clear_reg = INT_CLR_MASK_REG,
+                .status_reg = SPEAR320_INT_STS_MASK_REG,
+                .status_reg_mask = SPEAR320_SHIRQ_INTRCOMM_RAS_MASK,
+                .clear_reg = SPEAR320_INT_CLR_MASK_REG,
                 .reset_to_clear = 1,
         },
 };
@@ -511,7 +511,8 @@ struct spear_shirq shirq_intrcomm_ras = {
 /* Add spear320 specific devices here */
 
 /* spear320 routines */
-void __init spear320_init(void)
+void __init spear320_init(struct pmx_mode *pmx_mode, struct pmx_dev **pmx_devs,
+                u8 pmx_dev_count)
 {
         void __iomem *base;
         int ret = 0;
@@ -543,6 +544,10 @@ void __init spear320_init(void)
 
         /* pmx initialization */
         pmx_driver.base = base;
+        pmx_driver.mode = pmx_mode;
+        pmx_driver.devs = pmx_devs;
+        pmx_driver.devs_count = pmx_dev_count;
+
         ret = pmx_register(&pmx_driver);
         if (ret)
                 printk(KERN_ERR "padmux: registeration failed. err no: %d\n",
diff --git a/arch/arm/mach-spear3xx/spear320_evb.c b/arch/arm/mach-spear3xx/spear320_evb.c
index 8213e4b66c14..a12b353940d6 100644
--- a/arch/arm/mach-spear3xx/spear320_evb.c
+++ b/arch/arm/mach-spear3xx/spear320_evb.c
@@ -19,28 +19,28 @@
 /* padmux devices to enable */
 static struct pmx_dev *pmx_devs[] = {
         /* spear3xx specific devices */
-        &pmx_i2c,
-        &pmx_ssp,
-        &pmx_mii,
-        &pmx_uart0,
+        &spear3xx_pmx_i2c,
+        &spear3xx_pmx_ssp,
+        &spear3xx_pmx_mii,
+        &spear3xx_pmx_uart0,
 
         /* spear320 specific devices */
-        &pmx_fsmc,
-        &pmx_sdhci,
-        &pmx_i2s,
-        &pmx_uart1,
-        &pmx_uart2,
-        &pmx_can,
-        &pmx_pwm0,
-        &pmx_pwm1,
-        &pmx_pwm2,
-        &pmx_mii1,
+        &spear320_pmx_fsmc,
+        &spear320_pmx_sdhci,
+        &spear320_pmx_i2s,
+        &spear320_pmx_uart1,
+        &spear320_pmx_uart2,
+        &spear320_pmx_can,
+        &spear320_pmx_pwm0,
+        &spear320_pmx_pwm1,
+        &spear320_pmx_pwm2,
+        &spear320_pmx_mii1,
 };
 
 static struct amba_device *amba_devs[] __initdata = {
         /* spear3xx specific devices */
-        &gpio_device,
-        &uart_device,
+        &spear3xx_gpio_device,
+        &spear3xx_uart_device,
 
         /* spear320 specific devices */
 };
@@ -55,13 +55,9 @@ static void __init spear320_evb_init(void)
 {
         unsigned int i;
 
-        /* padmux initialization, must be done before spear320_init */
-        pmx_driver.mode = &auto_net_mii_mode;
-        pmx_driver.devs = pmx_devs;
-        pmx_driver.devs_count = ARRAY_SIZE(pmx_devs);
-
         /* call spear320 machine init function */
-        spear320_init();
+        spear320_init(&spear320_auto_net_mii_mode, pmx_devs,
+                        ARRAY_SIZE(pmx_devs));
 
         /* Add Platform Devices */
         platform_add_devices(plat_devs, ARRAY_SIZE(plat_devs));
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c
index d3ba8ca1bc59..10af45da86a0 100644
--- a/arch/arm/mach-spear3xx/spear3xx.c
+++ b/arch/arm/mach-spear3xx/spear3xx.c
@@ -25,10 +25,10 @@
 /* gpio device registration */
 static struct pl061_platform_data gpio_plat_data = {
         .gpio_base      = 0,
-        .irq_base       = SPEAR_GPIO_INT_BASE,
+        .irq_base       = SPEAR3XX_GPIO_INT_BASE,
 };
 
-struct amba_device gpio_device = {
+struct amba_device spear3xx_gpio_device = {
         .dev = {
                 .init_name = "gpio",
                 .platform_data = &gpio_plat_data,
@@ -38,11 +38,11 @@ struct amba_device gpio_device = {
                 .end = SPEAR3XX_ICM3_GPIO_BASE + SZ_4K - 1,
                 .flags = IORESOURCE_MEM,
         },
-        .irq = {IRQ_BASIC_GPIO, NO_IRQ},
+        .irq = {SPEAR3XX_IRQ_BASIC_GPIO, NO_IRQ},
 };
 
 /* uart device registration */
-struct amba_device uart_device = {
+struct amba_device spear3xx_uart_device = {
         .dev = {
                 .init_name = "uart",
         },
@@ -51,7 +51,7 @@ struct amba_device uart_device = {
                 .end = SPEAR3XX_ICM1_UART_BASE + SZ_4K - 1,
                 .flags = IORESOURCE_MEM,
         },
-        .irq = {IRQ_UART, NO_IRQ},
+        .irq = {SPEAR3XX_IRQ_UART, NO_IRQ},
 };
 
 /* Do spear3xx familiy common initialization part here */
@@ -97,215 +97,215 @@ void __init spear3xx_map_io(void)
         iotable_init(spear3xx_io_desc, ARRAY_SIZE(spear3xx_io_desc));
 
         /* This will initialize clock framework */
-        clk_init();
+        spear3xx_clk_init();
 }
 
 /* pad multiplexing support */
 /* devices */
-struct pmx_dev_mode pmx_firda_modes[] = {
+static struct pmx_dev_mode pmx_firda_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_FIRDA_MASK,
         },
 };
 
-struct pmx_dev pmx_firda = {
+struct pmx_dev spear3xx_pmx_firda = {
         .name = "firda",
         .modes = pmx_firda_modes,
         .mode_count = ARRAY_SIZE(pmx_firda_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_i2c_modes[] = {
+static struct pmx_dev_mode pmx_i2c_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_I2C_MASK,
         },
 };
 
-struct pmx_dev pmx_i2c = {
+struct pmx_dev spear3xx_pmx_i2c = {
         .name = "i2c",
         .modes = pmx_i2c_modes,
         .mode_count = ARRAY_SIZE(pmx_i2c_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_ssp_cs_modes[] = {
+static struct pmx_dev_mode pmx_ssp_cs_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_SSP_CS_MASK,
         },
 };
 
-struct pmx_dev pmx_ssp_cs = {
+struct pmx_dev spear3xx_pmx_ssp_cs = {
         .name = "ssp_chip_selects",
         .modes = pmx_ssp_cs_modes,
         .mode_count = ARRAY_SIZE(pmx_ssp_cs_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_ssp_modes[] = {
+static struct pmx_dev_mode pmx_ssp_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_SSP_MASK,
         },
 };
 
-struct pmx_dev pmx_ssp = {
+struct pmx_dev spear3xx_pmx_ssp = {
         .name = "ssp",
         .modes = pmx_ssp_modes,
         .mode_count = ARRAY_SIZE(pmx_ssp_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_mii_modes[] = {
+static struct pmx_dev_mode pmx_mii_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_MII_MASK,
         },
 };
 
-struct pmx_dev pmx_mii = {
+struct pmx_dev spear3xx_pmx_mii = {
         .name = "mii",
         .modes = pmx_mii_modes,
         .mode_count = ARRAY_SIZE(pmx_mii_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_gpio_pin0_modes[] = {
+static struct pmx_dev_mode pmx_gpio_pin0_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_GPIO_PIN0_MASK,
         },
 };
 
-struct pmx_dev pmx_gpio_pin0 = {
+struct pmx_dev spear3xx_pmx_gpio_pin0 = {
         .name = "gpio_pin0",
         .modes = pmx_gpio_pin0_modes,
         .mode_count = ARRAY_SIZE(pmx_gpio_pin0_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_gpio_pin1_modes[] = {
+static struct pmx_dev_mode pmx_gpio_pin1_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_GPIO_PIN1_MASK,
         },
 };
 
-struct pmx_dev pmx_gpio_pin1 = {
+struct pmx_dev spear3xx_pmx_gpio_pin1 = {
         .name = "gpio_pin1",
         .modes = pmx_gpio_pin1_modes,
         .mode_count = ARRAY_SIZE(pmx_gpio_pin1_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_gpio_pin2_modes[] = {
+static struct pmx_dev_mode pmx_gpio_pin2_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_GPIO_PIN2_MASK,
         },
 };
 
-struct pmx_dev pmx_gpio_pin2 = {
+struct pmx_dev spear3xx_pmx_gpio_pin2 = {
         .name = "gpio_pin2",
         .modes = pmx_gpio_pin2_modes,
         .mode_count = ARRAY_SIZE(pmx_gpio_pin2_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_gpio_pin3_modes[] = {
+static struct pmx_dev_mode pmx_gpio_pin3_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_GPIO_PIN3_MASK,
         },
 };
 
-struct pmx_dev pmx_gpio_pin3 = {
+struct pmx_dev spear3xx_pmx_gpio_pin3 = {
         .name = "gpio_pin3",
         .modes = pmx_gpio_pin3_modes,
         .mode_count = ARRAY_SIZE(pmx_gpio_pin3_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_gpio_pin4_modes[] = {
+static struct pmx_dev_mode pmx_gpio_pin4_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_GPIO_PIN4_MASK,
         },
 };
 
-struct pmx_dev pmx_gpio_pin4 = {
+struct pmx_dev spear3xx_pmx_gpio_pin4 = {
         .name = "gpio_pin4",
         .modes = pmx_gpio_pin4_modes,
         .mode_count = ARRAY_SIZE(pmx_gpio_pin4_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_gpio_pin5_modes[] = {
+static struct pmx_dev_mode pmx_gpio_pin5_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_GPIO_PIN5_MASK,
         },
 };
 
-struct pmx_dev pmx_gpio_pin5 = {
+struct pmx_dev spear3xx_pmx_gpio_pin5 = {
         .name = "gpio_pin5",
         .modes = pmx_gpio_pin5_modes,
         .mode_count = ARRAY_SIZE(pmx_gpio_pin5_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_uart0_modem_modes[] = {
+static struct pmx_dev_mode pmx_uart0_modem_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_UART0_MODEM_MASK,
         },
 };
 
-struct pmx_dev pmx_uart0_modem = {
+struct pmx_dev spear3xx_pmx_uart0_modem = {
         .name = "uart0_modem",
         .modes = pmx_uart0_modem_modes,
         .mode_count = ARRAY_SIZE(pmx_uart0_modem_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_uart0_modes[] = {
+static struct pmx_dev_mode pmx_uart0_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_UART0_MASK,
         },
 };
 
-struct pmx_dev pmx_uart0 = {
+struct pmx_dev spear3xx_pmx_uart0 = {
         .name = "uart0",
         .modes = pmx_uart0_modes,
         .mode_count = ARRAY_SIZE(pmx_uart0_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_timer_3_4_modes[] = {
+static struct pmx_dev_mode pmx_timer_3_4_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_TIMER_3_4_MASK,
         },
 };
 
-struct pmx_dev pmx_timer_3_4 = {
+struct pmx_dev spear3xx_pmx_timer_3_4 = {
         .name = "timer_3_4",
         .modes = pmx_timer_3_4_modes,
         .mode_count = ARRAY_SIZE(pmx_timer_3_4_modes),
         .enb_on_reset = 0,
 };
 
-struct pmx_dev_mode pmx_timer_1_2_modes[] = {
+static struct pmx_dev_mode pmx_timer_1_2_modes[] = {
         {
                 .ids = 0xffffffff,
                 .mask = PMX_TIMER_1_2_MASK,
         },
 };
 
-struct pmx_dev pmx_timer_1_2 = {
+struct pmx_dev spear3xx_pmx_timer_1_2 = {
         .name = "timer_1_2",
         .modes = pmx_timer_1_2_modes,
         .mode_count = ARRAY_SIZE(pmx_timer_1_2_modes),
@@ -314,210 +314,210 @@ struct pmx_dev pmx_timer_1_2 = {
 
 #if defined(CONFIG_MACH_SPEAR310) || defined(CONFIG_MACH_SPEAR320)
 /* plgpios devices */
-struct pmx_dev_mode pmx_plgpio_0_1_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_0_1_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_FIRDA_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_0_1 = {
+struct pmx_dev spear3xx_pmx_plgpio_0_1 = {
         .name = "plgpio 0 and 1",
         .modes = pmx_plgpio_0_1_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_0_1_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_2_3_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_2_3_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_UART0_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_2_3 = {
+struct pmx_dev spear3xx_pmx_plgpio_2_3 = {
         .name = "plgpio 2 and 3",
         .modes = pmx_plgpio_2_3_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_2_3_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_4_5_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_4_5_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_I2C_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_4_5 = {
+struct pmx_dev spear3xx_pmx_plgpio_4_5 = {
         .name = "plgpio 4 and 5",
         .modes = pmx_plgpio_4_5_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_4_5_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_6_9_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_6_9_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_SSP_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_6_9 = {
+struct pmx_dev spear3xx_pmx_plgpio_6_9 = {
         .name = "plgpio 6 to 9",
         .modes = pmx_plgpio_6_9_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_6_9_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_10_27_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_10_27_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_MII_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_10_27 = {
+struct pmx_dev spear3xx_pmx_plgpio_10_27 = {
         .name = "plgpio 10 to 27",
         .modes = pmx_plgpio_10_27_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_10_27_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_28_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_28_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_GPIO_PIN0_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_28 = {
+struct pmx_dev spear3xx_pmx_plgpio_28 = {
         .name = "plgpio 28",
         .modes = pmx_plgpio_28_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_28_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_29_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_29_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_GPIO_PIN1_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_29 = {
+struct pmx_dev spear3xx_pmx_plgpio_29 = {
         .name = "plgpio 29",
         .modes = pmx_plgpio_29_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_29_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_30_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_30_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_GPIO_PIN2_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_30 = {
+struct pmx_dev spear3xx_pmx_plgpio_30 = {
         .name = "plgpio 30",
         .modes = pmx_plgpio_30_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_30_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_31_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_31_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_GPIO_PIN3_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_31 = {
+struct pmx_dev spear3xx_pmx_plgpio_31 = {
         .name = "plgpio 31",
         .modes = pmx_plgpio_31_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_31_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_32_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_32_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_GPIO_PIN4_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_32 = {
+struct pmx_dev spear3xx_pmx_plgpio_32 = {
         .name = "plgpio 32",
         .modes = pmx_plgpio_32_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_32_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_33_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_33_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_GPIO_PIN5_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_33 = {
+struct pmx_dev spear3xx_pmx_plgpio_33 = {
         .name = "plgpio 33",
         .modes = pmx_plgpio_33_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_33_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_34_36_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_34_36_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_SSP_CS_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_34_36 = {
+struct pmx_dev spear3xx_pmx_plgpio_34_36 = {
         .name = "plgpio 34 to 36",
         .modes = pmx_plgpio_34_36_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_34_36_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_37_42_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_37_42_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_UART0_MODEM_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_37_42 = {
+struct pmx_dev spear3xx_pmx_plgpio_37_42 = {
         .name = "plgpio 37 to 42",
         .modes = pmx_plgpio_37_42_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_37_42_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_43_44_47_48_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_43_44_47_48_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_TIMER_1_2_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_43_44_47_48 = {
+struct pmx_dev spear3xx_pmx_plgpio_43_44_47_48 = {
         .name = "plgpio 43, 44, 47 and 48",
         .modes = pmx_plgpio_43_44_47_48_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_43_44_47_48_modes),
         .enb_on_reset = 1,
 };
 
-struct pmx_dev_mode pmx_plgpio_45_46_49_50_modes[] = {
+static struct pmx_dev_mode pmx_plgpio_45_46_49_50_modes[] = {
         {
                 .ids = 0x00,
                 .mask = PMX_TIMER_3_4_MASK,
         },
 };
 
-struct pmx_dev pmx_plgpio_45_46_49_50 = {
+struct pmx_dev spear3xx_pmx_plgpio_45_46_49_50 = {
         .name = "plgpio 45, 46, 49 and 50",
         .modes = pmx_plgpio_45_46_49_50_modes,
         .mode_count = ARRAY_SIZE(pmx_plgpio_45_46_49_50_modes),
diff --git a/arch/arm/mach-spear6xx/Kconfig b/arch/arm/mach-spear6xx/Kconfig
index bddba034f862..ff4ae5ba00f1 100644
--- a/arch/arm/mach-spear6xx/Kconfig
+++ b/arch/arm/mach-spear6xx/Kconfig
@@ -4,17 +4,18 @@
 
 if ARCH_SPEAR6XX
 
-choice
-        prompt "SPEAr6XX Family"
-        default MACH_SPEAR600
+menu "SPEAr6xx Implementations"
+config BOARD_SPEAR600_EVB
+        bool "SPEAr600 Evaluation Board"
+        select MACH_SPEAR600
+        help
+          Supports ST SPEAr600 Evaluation Board
+
+endmenu
 
 config MACH_SPEAR600
         bool "SPEAr600"
         help
           Supports ST SPEAr600 Machine
-endchoice
-
-# Adding SPEAr6XX machine specific configuration files
-source "arch/arm/mach-spear6xx/Kconfig600"
 
 endif #ARCH_SPEAR6XX
diff --git a/arch/arm/mach-spear6xx/Kconfig600 b/arch/arm/mach-spear6xx/Kconfig600
deleted file mode 100644
index 9e19f65eb78e..000000000000
--- a/arch/arm/mach-spear6xx/Kconfig600
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# SPEAr600 machine configuration file
-#
-
-if MACH_SPEAR600
-
-choice
-        prompt "SPEAr600 Boards"
-        default BOARD_SPEAR600_EVB
-
-config  BOARD_SPEAR600_EVB
-        bool "SPEAr600 Evaluation Board"
-        help
-          Supports ST SPEAr600 Evaluation Board
-endchoice
-
-endif   #MACH_SPEAR600
diff --git a/arch/arm/mach-spear6xx/clock.c b/arch/arm/mach-spear6xx/clock.c
index 88b748b5be80..ac70e0d88fef 100644
--- a/arch/arm/mach-spear6xx/clock.c
+++ b/arch/arm/mach-spear6xx/clock.c
@@ -671,12 +671,12 @@ static struct clk_lookup spear_clk_lookups[] = {
         { .dev_id = "gpio2",            .clk = &gpio2_clk},
 };
 
-void __init clk_init(void)
+void __init spear6xx_clk_init(void)
 {
         int i;
 
         for (i = 0; i < ARRAY_SIZE(spear_clk_lookups); i++)
                 clk_register(&spear_clk_lookups[i]);
 
-        recalc_root_clocks();
+        clk_init();
 }
diff --git a/arch/arm/mach-spear6xx/include/mach/generic.h b/arch/arm/mach-spear6xx/include/mach/generic.h
index 94cf4a648b57..183f0238c5e2 100644
--- a/arch/arm/mach-spear6xx/include/mach/generic.h
+++ b/arch/arm/mach-spear6xx/include/mach/generic.h
@@ -39,7 +39,7 @@ void __init spear6xx_map_io(void);
 void __init spear6xx_init_irq(void);
 void __init spear6xx_init(void);
 void __init spear600_init(void);
-void __init clk_init(void);
+void __init spear6xx_clk_init(void);
 
 /* Add spear600 machine device structure declarations here */
 
diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c
index 981812961ac7..e0f6628c8b2c 100644
--- a/arch/arm/mach-spear6xx/spear6xx.c
+++ b/arch/arm/mach-spear6xx/spear6xx.c
@@ -148,7 +148,7 @@ void __init spear6xx_map_io(void)
         iotable_init(spear6xx_io_desc, ARRAY_SIZE(spear6xx_io_desc));
 
         /* This will initialize clock framework */
-        clk_init();
+        spear6xx_clk_init();
 }
 
 static void __init spear6xx_timer_init(void)
diff --git a/arch/arm/mach-stmp378x/Makefile b/arch/arm/mach-stmp378x/Makefile
deleted file mode 100644
index d156f76b379f..000000000000
--- a/arch/arm/mach-stmp378x/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_ARCH_STMP378X) += stmp378x.o
-obj-$(CONFIG_MACH_STMP378X) += stmp378x_devb.o
diff --git a/arch/arm/mach-stmp378x/Makefile.boot b/arch/arm/mach-stmp378x/Makefile.boot
deleted file mode 100644
index 1568ad404d59..000000000000
--- a/arch/arm/mach-stmp378x/Makefile.boot
+++ /dev/null
@@ -1,3 +0,0 @@
-   zreladdr-y   := 0x40008000
-params_phys-y   := 0x40000100
-initrd_phys-y   := 0x40800000
diff --git a/arch/arm/mach-stmp378x/include/mach/entry-macro.S b/arch/arm/mach-stmp378x/include/mach/entry-macro.S
deleted file mode 100644
index 731a92286da2..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/entry-macro.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Low-level IRQ helper macros for Freescale STMP378X
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-                .macro  disable_fiq
-                .endm
-
-                .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-
-                mov     \base, #0xf0000000      @ vm address of IRQ controller
-                ldr     \irqnr, [\base, #0x70]  @ HW_ICOLL_STAT
-                cmp     \irqnr, #0x7f
-                moveqs  \irqnr, #0              @ Zero flag set for no IRQ
-
-                .endm
-
-                .macro  get_irqnr_preamble, base, tmp
-                .endm
-
-                .macro  arch_ret_to_user, tmp1, tmp2
-                .endm
diff --git a/arch/arm/mach-stmp378x/include/mach/irqs.h b/arch/arm/mach-stmp378x/include/mach/irqs.h
deleted file mode 100644
index cc59673becdd..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/irqs.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Freescale STMP378X interrupts
- *
- * Copyright (C) 2005 Sigmatel Inc
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#define IRQ_DEBUG_UART                  0
-#define IRQ_COMMS_RX                    1
-#define IRQ_COMMS_TX                    1
-#define IRQ_SSP2_ERROR                  2
-#define IRQ_VDD5V                       3
-#define IRQ_HEADPHONE_SHORT             4
-#define IRQ_DAC_DMA                     5
-#define IRQ_DAC_ERROR                   6
-#define IRQ_ADC_DMA                     7
-#define IRQ_ADC_ERROR                   8
-#define IRQ_SPDIF_DMA                   9
-#define IRQ_SAIF2_DMA                   9
-#define IRQ_SPDIF_ERROR                 10
-#define IRQ_SAIF1_IRQ                   10
-#define IRQ_SAIF2_IRQ                   10
-#define IRQ_USB_CTRL                    11
-#define IRQ_USB_WAKEUP                  12
-#define IRQ_GPMI_DMA                    13
-#define IRQ_SSP1_DMA                    14
-#define IRQ_SSP_ERROR                   15
-#define IRQ_GPIO0                       16
-#define IRQ_GPIO1                       17
-#define IRQ_GPIO2                       18
-#define IRQ_SAIF1_DMA                   19
-#define IRQ_SSP2_DMA                    20
-#define IRQ_ECC8_IRQ                    21
-#define IRQ_RTC_ALARM                   22
-#define IRQ_UARTAPP_TX_DMA              23
-#define IRQ_UARTAPP_INTERNAL            24
-#define IRQ_UARTAPP_RX_DMA              25
-#define IRQ_I2C_DMA                     26
-#define IRQ_I2C_ERROR                   27
-#define IRQ_TIMER0                      28
-#define IRQ_TIMER1                      29
-#define IRQ_TIMER2                      30
-#define IRQ_TIMER3                      31
-#define IRQ_BATT_BRNOUT                 32
-#define IRQ_VDDD_BRNOUT                 33
-#define IRQ_VDDIO_BRNOUT                34
-#define IRQ_VDD18_BRNOUT                35
-#define IRQ_TOUCH_DETECT                36
-#define IRQ_LRADC_CH0                   37
-#define IRQ_LRADC_CH1                   38
-#define IRQ_LRADC_CH2                   39
-#define IRQ_LRADC_CH3                   40
-#define IRQ_LRADC_CH4                   41
-#define IRQ_LRADC_CH5                   42
-#define IRQ_LRADC_CH6                   43
-#define IRQ_LRADC_CH7                   44
-#define IRQ_LCDIF_DMA                   45
-#define IRQ_LCDIF_ERROR                 46
-#define IRQ_DIGCTL_DEBUG_TRAP           47
-#define IRQ_RTC_1MSEC                   48
-#define IRQ_DRI_DMA                     49
-#define IRQ_DRI_ATTENTION               50
-#define IRQ_GPMI_ATTENTION              51
-#define IRQ_IR                          52
-#define IRQ_DCP_VMI                     53
-#define IRQ_DCP                         54
-#define IRQ_BCH                         56
-#define IRQ_PXP                         57
-#define IRQ_UARTAPP2_TX_DMA             58
-#define IRQ_UARTAPP2_INTERNAL           59
-#define IRQ_UARTAPP2_RX_DMA             60
-#define IRQ_VDAC_DETECT                 61
-#define IRQ_VDD5V_DROOP                 64
-#define IRQ_DCDC4P2_BO                  65
-
-
-#define NR_REAL_IRQS    128
-#define NR_IRQS         (NR_REAL_IRQS + 32 * 3)
-
-/* All interrupts are FIQ capable */
-#define FIQ_START               IRQ_DEBUG_UART
-
-/* Hard disk IRQ is a GPMI attention IRQ */
-#define IRQ_HARDDISK            IRQ_GPMI_ATTENTION
diff --git a/arch/arm/mach-stmp378x/include/mach/pins.h b/arch/arm/mach-stmp378x/include/mach/pins.h
deleted file mode 100644
index 93f952d35969..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/pins.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Freescale STMP378X SoC pin multiplexing
- *
- * Author: Vladislav Buzov <vbuzov@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_ARCH_PINS_H
-#define __ASM_ARCH_PINS_H
-
-/*
- * Define all STMP378x pins, a pin name corresponds to a STMP378x hardware
- * interface  this pin belongs to.
- */
-
-/* Bank 0 */
-#define PINID_GPMI_D00          STMP3XXX_PINID(0, 0)
-#define PINID_GPMI_D01          STMP3XXX_PINID(0, 1)
-#define PINID_GPMI_D02          STMP3XXX_PINID(0, 2)
-#define PINID_GPMI_D03          STMP3XXX_PINID(0, 3)
-#define PINID_GPMI_D04          STMP3XXX_PINID(0, 4)
-#define PINID_GPMI_D05          STMP3XXX_PINID(0, 5)
-#define PINID_GPMI_D06          STMP3XXX_PINID(0, 6)
-#define PINID_GPMI_D07          STMP3XXX_PINID(0, 7)
-#define PINID_GPMI_D08          STMP3XXX_PINID(0, 8)
-#define PINID_GPMI_D09          STMP3XXX_PINID(0, 9)
-#define PINID_GPMI_D10          STMP3XXX_PINID(0, 10)
-#define PINID_GPMI_D11          STMP3XXX_PINID(0, 11)
-#define PINID_GPMI_D12          STMP3XXX_PINID(0, 12)
-#define PINID_GPMI_D13          STMP3XXX_PINID(0, 13)
-#define PINID_GPMI_D14          STMP3XXX_PINID(0, 14)
-#define PINID_GPMI_D15          STMP3XXX_PINID(0, 15)
-#define PINID_GPMI_CLE          STMP3XXX_PINID(0, 16)
-#define PINID_GPMI_ALE          STMP3XXX_PINID(0, 17)
-#define PINID_GMPI_CE2N         STMP3XXX_PINID(0, 18)
-#define PINID_GPMI_RDY0         STMP3XXX_PINID(0, 19)
-#define PINID_GPMI_RDY1         STMP3XXX_PINID(0, 20)
-#define PINID_GPMI_RDY2         STMP3XXX_PINID(0, 21)
-#define PINID_GPMI_RDY3         STMP3XXX_PINID(0, 22)
-#define PINID_GPMI_WPN          STMP3XXX_PINID(0, 23)
-#define PINID_GPMI_WRN          STMP3XXX_PINID(0, 24)
-#define PINID_GPMI_RDN          STMP3XXX_PINID(0, 25)
-#define PINID_AUART1_CTS        STMP3XXX_PINID(0, 26)
-#define PINID_AUART1_RTS        STMP3XXX_PINID(0, 27)
-#define PINID_AUART1_RX         STMP3XXX_PINID(0, 28)
-#define PINID_AUART1_TX         STMP3XXX_PINID(0, 29)
-#define PINID_I2C_SCL           STMP3XXX_PINID(0, 30)
-#define PINID_I2C_SDA           STMP3XXX_PINID(0, 31)
-
-/* Bank 1 */
-#define PINID_LCD_D00           STMP3XXX_PINID(1, 0)
-#define PINID_LCD_D01           STMP3XXX_PINID(1, 1)
-#define PINID_LCD_D02           STMP3XXX_PINID(1, 2)
-#define PINID_LCD_D03           STMP3XXX_PINID(1, 3)
-#define PINID_LCD_D04           STMP3XXX_PINID(1, 4)
-#define PINID_LCD_D05           STMP3XXX_PINID(1, 5)
-#define PINID_LCD_D06           STMP3XXX_PINID(1, 6)
-#define PINID_LCD_D07           STMP3XXX_PINID(1, 7)
-#define PINID_LCD_D08           STMP3XXX_PINID(1, 8)
-#define PINID_LCD_D09           STMP3XXX_PINID(1, 9)
-#define PINID_LCD_D10           STMP3XXX_PINID(1, 10)
-#define PINID_LCD_D11           STMP3XXX_PINID(1, 11)
-#define PINID_LCD_D12           STMP3XXX_PINID(1, 12)
-#define PINID_LCD_D13           STMP3XXX_PINID(1, 13)
-#define PINID_LCD_D14           STMP3XXX_PINID(1, 14)
-#define PINID_LCD_D15           STMP3XXX_PINID(1, 15)
-#define PINID_LCD_D16           STMP3XXX_PINID(1, 16)
-#define PINID_LCD_D17           STMP3XXX_PINID(1, 17)
-#define PINID_LCD_RESET         STMP3XXX_PINID(1, 18)
-#define PINID_LCD_RS            STMP3XXX_PINID(1, 19)
-#define PINID_LCD_WR            STMP3XXX_PINID(1, 20)
-#define PINID_LCD_CS            STMP3XXX_PINID(1, 21)
-#define PINID_LCD_DOTCK         STMP3XXX_PINID(1, 22)
-#define PINID_LCD_ENABLE        STMP3XXX_PINID(1, 23)
-#define PINID_LCD_HSYNC         STMP3XXX_PINID(1, 24)
-#define PINID_LCD_VSYNC         STMP3XXX_PINID(1, 25)
-#define PINID_PWM0              STMP3XXX_PINID(1, 26)
-#define PINID_PWM1              STMP3XXX_PINID(1, 27)
-#define PINID_PWM2              STMP3XXX_PINID(1, 28)
-#define PINID_PWM3              STMP3XXX_PINID(1, 29)
-#define PINID_PWM4              STMP3XXX_PINID(1, 30)
-
-/* Bank 2 */
-#define PINID_SSP1_CMD          STMP3XXX_PINID(2, 0)
-#define PINID_SSP1_DETECT       STMP3XXX_PINID(2, 1)
-#define PINID_SSP1_DATA0        STMP3XXX_PINID(2, 2)
-#define PINID_SSP1_DATA1        STMP3XXX_PINID(2, 3)
-#define PINID_SSP1_DATA2        STMP3XXX_PINID(2, 4)
-#define PINID_SSP1_DATA3        STMP3XXX_PINID(2, 5)
-#define PINID_SSP1_SCK          STMP3XXX_PINID(2, 6)
-#define PINID_ROTARYA           STMP3XXX_PINID(2, 7)
-#define PINID_ROTARYB           STMP3XXX_PINID(2, 8)
-#define PINID_EMI_A00           STMP3XXX_PINID(2, 9)
-#define PINID_EMI_A01           STMP3XXX_PINID(2, 10)
-#define PINID_EMI_A02           STMP3XXX_PINID(2, 11)
-#define PINID_EMI_A03           STMP3XXX_PINID(2, 12)
-#define PINID_EMI_A04           STMP3XXX_PINID(2, 13)
-#define PINID_EMI_A05           STMP3XXX_PINID(2, 14)
-#define PINID_EMI_A06           STMP3XXX_PINID(2, 15)
-#define PINID_EMI_A07           STMP3XXX_PINID(2, 16)
-#define PINID_EMI_A08           STMP3XXX_PINID(2, 17)
-#define PINID_EMI_A09           STMP3XXX_PINID(2, 18)
-#define PINID_EMI_A10           STMP3XXX_PINID(2, 19)
-#define PINID_EMI_A11           STMP3XXX_PINID(2, 20)
-#define PINID_EMI_A12           STMP3XXX_PINID(2, 21)
-#define PINID_EMI_BA0           STMP3XXX_PINID(2, 22)
-#define PINID_EMI_BA1           STMP3XXX_PINID(2, 23)
-#define PINID_EMI_CASN          STMP3XXX_PINID(2, 24)
-#define PINID_EMI_CE0N          STMP3XXX_PINID(2, 25)
-#define PINID_EMI_CE1N          STMP3XXX_PINID(2, 26)
-#define PINID_GPMI_CE1N         STMP3XXX_PINID(2, 27)
-#define PINID_GPMI_CE0N         STMP3XXX_PINID(2, 28)
-#define PINID_EMI_CKE           STMP3XXX_PINID(2, 29)
-#define PINID_EMI_RASN          STMP3XXX_PINID(2, 30)
-#define PINID_EMI_WEN           STMP3XXX_PINID(2, 31)
-
-/* Bank 3 */
-#define PINID_EMI_D00           STMP3XXX_PINID(3, 0)
-#define PINID_EMI_D01           STMP3XXX_PINID(3, 1)
-#define PINID_EMI_D02           STMP3XXX_PINID(3, 2)
-#define PINID_EMI_D03           STMP3XXX_PINID(3, 3)
-#define PINID_EMI_D04           STMP3XXX_PINID(3, 4)
-#define PINID_EMI_D05           STMP3XXX_PINID(3, 5)
-#define PINID_EMI_D06           STMP3XXX_PINID(3, 6)
-#define PINID_EMI_D07           STMP3XXX_PINID(3, 7)
-#define PINID_EMI_D08           STMP3XXX_PINID(3, 8)
-#define PINID_EMI_D09           STMP3XXX_PINID(3, 9)
-#define PINID_EMI_D10           STMP3XXX_PINID(3, 10)
-#define PINID_EMI_D11           STMP3XXX_PINID(3, 11)
-#define PINID_EMI_D12           STMP3XXX_PINID(3, 12)
-#define PINID_EMI_D13           STMP3XXX_PINID(3, 13)
-#define PINID_EMI_D14           STMP3XXX_PINID(3, 14)
-#define PINID_EMI_D15           STMP3XXX_PINID(3, 15)
-#define PINID_EMI_DQM0          STMP3XXX_PINID(3, 16)
-#define PINID_EMI_DQM1          STMP3XXX_PINID(3, 17)
-#define PINID_EMI_DQS0          STMP3XXX_PINID(3, 18)
-#define PINID_EMI_DQS1          STMP3XXX_PINID(3, 19)
-#define PINID_EMI_CLK           STMP3XXX_PINID(3, 20)
-#define PINID_EMI_CLKN          STMP3XXX_PINID(3, 21)
-
-#endif /* __ASM_ARCH_PINS_H */
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-apbh.h b/arch/arm/mach-stmp378x/include/mach/regs-apbh.h
deleted file mode 100644
index dbcf85b6ac2a..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-apbh.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * stmp378x: APBH register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_APBH
-#define _MACH_REGS_APBH
-
-#define REGS_APBH_BASE  (STMP3XXX_REGS_BASE + 0x4000)
-#define REGS_APBH_PHYS  0x80004000
-#define REGS_APBH_SIZE  0x2000
-
-#define HW_APBH_CTRL0           0x0
-#define BM_APBH_CTRL0_RESET_CHANNEL     0x00FF0000
-#define BP_APBH_CTRL0_RESET_CHANNEL     16
-#define BM_APBH_CTRL0_CLKGATE   0x40000000
-#define BM_APBH_CTRL0_SFTRST    0x80000000
-
-#define HW_APBH_CTRL1           0x10
-#define BM_APBH_CTRL1_CH0_CMDCMPLT_IRQ  0x00000001
-#define BP_APBH_CTRL1_CH0_CMDCMPLT_IRQ  0
-
-#define HW_APBH_CTRL2           0x20
-
-#define HW_APBH_DEVSEL          0x30
-
-#define HW_APBH_CH0_NXTCMDAR    (0x50 + 0 * 0x70)
-#define HW_APBH_CH1_NXTCMDAR    (0x50 + 1 * 0x70)
-#define HW_APBH_CH2_NXTCMDAR    (0x50 + 2 * 0x70)
-#define HW_APBH_CH3_NXTCMDAR    (0x50 + 3 * 0x70)
-#define HW_APBH_CH4_NXTCMDAR    (0x50 + 4 * 0x70)
-#define HW_APBH_CH5_NXTCMDAR    (0x50 + 5 * 0x70)
-#define HW_APBH_CH6_NXTCMDAR    (0x50 + 6 * 0x70)
-#define HW_APBH_CH7_NXTCMDAR    (0x50 + 7 * 0x70)
-#define HW_APBH_CH8_NXTCMDAR    (0x50 + 8 * 0x70)
-#define HW_APBH_CH9_NXTCMDAR    (0x50 + 9 * 0x70)
-#define HW_APBH_CH10_NXTCMDAR   (0x50 + 10 * 0x70)
-#define HW_APBH_CH11_NXTCMDAR   (0x50 + 11 * 0x70)
-#define HW_APBH_CH12_NXTCMDAR   (0x50 + 12 * 0x70)
-#define HW_APBH_CH13_NXTCMDAR   (0x50 + 13 * 0x70)
-#define HW_APBH_CH14_NXTCMDAR   (0x50 + 14 * 0x70)
-#define HW_APBH_CH15_NXTCMDAR   (0x50 + 15 * 0x70)
-
-#define HW_APBH_CHn_NXTCMDAR    0x50
-
-#define BV_APBH_CHn_CMD_COMMAND__NO_DMA_XFER     0
-#define BV_APBH_CHn_CMD_COMMAND__DMA_WRITE       1
-#define BV_APBH_CHn_CMD_COMMAND__DMA_READ        2
-#define BV_APBH_CHn_CMD_COMMAND__DMA_SENSE       3
-#define BM_APBH_CHn_CMD_COMMAND 0x00000003
-#define BP_APBH_CHn_CMD_COMMAND 0
-#define BM_APBH_CHn_CMD_CHAIN   0x00000004
-#define BM_APBH_CHn_CMD_IRQONCMPLT      0x00000008
-#define BM_APBH_CHn_CMD_NANDLOCK        0x00000010
-#define BM_APBH_CHn_CMD_NANDWAIT4READY  0x00000020
-#define BM_APBH_CHn_CMD_SEMAPHORE       0x00000040
-#define BM_APBH_CHn_CMD_WAIT4ENDCMD     0x00000080
-#define BM_APBH_CHn_CMD_CMDWORDS        0x0000F000
-#define BP_APBH_CHn_CMD_CMDWORDS        12
-#define BM_APBH_CHn_CMD_XFER_COUNT      0xFFFF0000
-#define BP_APBH_CHn_CMD_XFER_COUNT      16
-
-#define HW_APBH_CH0_SEMA        (0x80 + 0 * 0x70)
-#define HW_APBH_CH1_SEMA        (0x80 + 1 * 0x70)
-#define HW_APBH_CH2_SEMA        (0x80 + 2 * 0x70)
-#define HW_APBH_CH3_SEMA        (0x80 + 3 * 0x70)
-#define HW_APBH_CH4_SEMA        (0x80 + 4 * 0x70)
-#define HW_APBH_CH5_SEMA        (0x80 + 5 * 0x70)
-#define HW_APBH_CH6_SEMA        (0x80 + 6 * 0x70)
-#define HW_APBH_CH7_SEMA        (0x80 + 7 * 0x70)
-#define HW_APBH_CH8_SEMA        (0x80 + 8 * 0x70)
-#define HW_APBH_CH9_SEMA        (0x80 + 9 * 0x70)
-#define HW_APBH_CH10_SEMA       (0x80 + 10 * 0x70)
-#define HW_APBH_CH11_SEMA       (0x80 + 11 * 0x70)
-#define HW_APBH_CH12_SEMA       (0x80 + 12 * 0x70)
-#define HW_APBH_CH13_SEMA       (0x80 + 13 * 0x70)
-#define HW_APBH_CH14_SEMA       (0x80 + 14 * 0x70)
-#define HW_APBH_CH15_SEMA       (0x80 + 15 * 0x70)
-
-#define HW_APBH_CHn_SEMA        0x80
-#define BM_APBH_CHn_SEMA_INCREMENT_SEMA 0x000000FF
-#define BP_APBH_CHn_SEMA_INCREMENT_SEMA 0
-#define BM_APBH_CHn_SEMA_PHORE  0x00FF0000
-#define BP_APBH_CHn_SEMA_PHORE  16
-
-#endif
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-apbx.h b/arch/arm/mach-stmp378x/include/mach/regs-apbx.h
deleted file mode 100644
index 3b934a4d27f0..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-apbx.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * stmp378x: APBX register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_APBX
-#define _MACH_REGS_APBX
-
-#define REGS_APBX_BASE  (STMP3XXX_REGS_BASE + 0x24000)
-#define REGS_APBX_PHYS  0x80024000
-#define REGS_APBX_SIZE  0x2000
-
-#define HW_APBX_CTRL0           0x0
-#define BM_APBX_CTRL0_CLKGATE   0x40000000
-#define BM_APBX_CTRL0_SFTRST    0x80000000
-
-#define HW_APBX_CTRL1           0x10
-
-#define HW_APBX_CTRL2           0x20
-
-#define HW_APBX_CHANNEL_CTRL    0x30
-#define BM_APBX_CHANNEL_CTRL_RESET_CHANNEL      0xFFFF0000
-#define BP_APBX_CHANNEL_CTRL_RESET_CHANNEL      16
-
-#define HW_APBX_DEVSEL          0x40
-
-#define HW_APBX_CH0_NXTCMDAR    (0x110 + 0 * 0x70)
-#define HW_APBX_CH1_NXTCMDAR    (0x110 + 1 * 0x70)
-#define HW_APBX_CH2_NXTCMDAR    (0x110 + 2 * 0x70)
-#define HW_APBX_CH3_NXTCMDAR    (0x110 + 3 * 0x70)
-#define HW_APBX_CH4_NXTCMDAR    (0x110 + 4 * 0x70)
-#define HW_APBX_CH5_NXTCMDAR    (0x110 + 5 * 0x70)
-#define HW_APBX_CH6_NXTCMDAR    (0x110 + 6 * 0x70)
-#define HW_APBX_CH7_NXTCMDAR    (0x110 + 7 * 0x70)
-#define HW_APBX_CH8_NXTCMDAR    (0x110 + 8 * 0x70)
-#define HW_APBX_CH9_NXTCMDAR    (0x110 + 9 * 0x70)
-#define HW_APBX_CH10_NXTCMDAR   (0x110 + 10 * 0x70)
-#define HW_APBX_CH11_NXTCMDAR   (0x110 + 11 * 0x70)
-#define HW_APBX_CH12_NXTCMDAR   (0x110 + 12 * 0x70)
-#define HW_APBX_CH13_NXTCMDAR   (0x110 + 13 * 0x70)
-#define HW_APBX_CH14_NXTCMDAR   (0x110 + 14 * 0x70)
-#define HW_APBX_CH15_NXTCMDAR   (0x110 + 15 * 0x70)
-
-#define HW_APBX_CHn_NXTCMDAR    0x110
-#define BM_APBX_CHn_CMD_COMMAND 0x00000003
-#define BP_APBX_CHn_CMD_COMMAND 0
-#define BV_APBX_CHn_CMD_COMMAND__NO_DMA_XFER     0
-#define BV_APBX_CHn_CMD_COMMAND__DMA_WRITE       1
-#define BV_APBX_CHn_CMD_COMMAND__DMA_READ        2
-#define BV_APBX_CHn_CMD_COMMAND__DMA_SENSE       3
-#define BM_APBX_CHn_CMD_CHAIN   0x00000004
-#define BM_APBX_CHn_CMD_IRQONCMPLT      0x00000008
-#define BM_APBX_CHn_CMD_SEMAPHORE       0x00000040
-#define BM_APBX_CHn_CMD_WAIT4ENDCMD     0x00000080
-#define BM_APBX_CHn_CMD_HALTONTERMINATE 0x00000100
-#define BM_APBX_CHn_CMD_CMDWORDS        0x0000F000
-#define BP_APBX_CHn_CMD_CMDWORDS        12
-#define BM_APBX_CHn_CMD_XFER_COUNT      0xFFFF0000
-#define BP_APBX_CHn_CMD_XFER_COUNT      16
-
-#define HW_APBX_CH0_BAR         (0x130 + 0 * 0x70)
-#define HW_APBX_CH1_BAR         (0x130 + 1 * 0x70)
-#define HW_APBX_CH2_BAR         (0x130 + 2 * 0x70)
-#define HW_APBX_CH3_BAR         (0x130 + 3 * 0x70)
-#define HW_APBX_CH4_BAR         (0x130 + 4 * 0x70)
-#define HW_APBX_CH5_BAR         (0x130 + 5 * 0x70)
-#define HW_APBX_CH6_BAR         (0x130 + 6 * 0x70)
-#define HW_APBX_CH7_BAR         (0x130 + 7 * 0x70)
-#define HW_APBX_CH8_BAR         (0x130 + 8 * 0x70)
-#define HW_APBX_CH9_BAR         (0x130 + 9 * 0x70)
-#define HW_APBX_CH10_BAR                (0x130 + 10 * 0x70)
-#define HW_APBX_CH11_BAR                (0x130 + 11 * 0x70)
-#define HW_APBX_CH12_BAR                (0x130 + 12 * 0x70)
-#define HW_APBX_CH13_BAR                (0x130 + 13 * 0x70)
-#define HW_APBX_CH14_BAR                (0x130 + 14 * 0x70)
-#define HW_APBX_CH15_BAR                (0x130 + 15 * 0x70)
-
-#define HW_APBX_CHn_BAR         0x130
-
-#define HW_APBX_CH0_SEMA        (0x140 + 0 * 0x70)
-#define HW_APBX_CH1_SEMA        (0x140 + 1 * 0x70)
-#define HW_APBX_CH2_SEMA        (0x140 + 2 * 0x70)
-#define HW_APBX_CH3_SEMA        (0x140 + 3 * 0x70)
-#define HW_APBX_CH4_SEMA        (0x140 + 4 * 0x70)
-#define HW_APBX_CH5_SEMA        (0x140 + 5 * 0x70)
-#define HW_APBX_CH6_SEMA        (0x140 + 6 * 0x70)
-#define HW_APBX_CH7_SEMA        (0x140 + 7 * 0x70)
-#define HW_APBX_CH8_SEMA        (0x140 + 8 * 0x70)
-#define HW_APBX_CH9_SEMA        (0x140 + 9 * 0x70)
-#define HW_APBX_CH10_SEMA       (0x140 + 10 * 0x70)
-#define HW_APBX_CH11_SEMA       (0x140 + 11 * 0x70)
-#define HW_APBX_CH12_SEMA       (0x140 + 12 * 0x70)
-#define HW_APBX_CH13_SEMA       (0x140 + 13 * 0x70)
-#define HW_APBX_CH14_SEMA       (0x140 + 14 * 0x70)
-#define HW_APBX_CH15_SEMA       (0x140 + 15 * 0x70)
-
-#define HW_APBX_CHn_SEMA        0x140
-#define BM_APBX_CHn_SEMA_INCREMENT_SEMA 0x000000FF
-#define BP_APBX_CHn_SEMA_INCREMENT_SEMA 0
-#define BM_APBX_CHn_SEMA_PHORE  0x00FF0000
-#define BP_APBX_CHn_SEMA_PHORE  16
-
-#endif
-
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-audioin.h b/arch/arm/mach-stmp378x/include/mach/regs-audioin.h
deleted file mode 100644
index 641ac6126f83..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-audioin.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * stmp378x: AUDIOIN register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_AUDIOIN_BASE       (STMP3XXX_REGS_BASE + 0x4C000)
-#define REGS_AUDIOIN_PHYS       0x8004C000
-#define REGS_AUDIOIN_SIZE       0x2000
-
-#define HW_AUDIOIN_CTRL         0x0
-#define BM_AUDIOIN_CTRL_RUN     0x00000001
-#define BP_AUDIOIN_CTRL_RUN     0
-#define BM_AUDIOIN_CTRL_FIFO_ERROR_IRQ_EN       0x00000002
-#define BM_AUDIOIN_CTRL_FIFO_OVERFLOW_IRQ       0x00000004
-#define BM_AUDIOIN_CTRL_FIFO_UNDERFLOW_IRQ      0x00000008
-#define BM_AUDIOIN_CTRL_WORD_LENGTH     0x00000020
-#define BM_AUDIOIN_CTRL_CLKGATE 0x40000000
-#define BM_AUDIOIN_CTRL_SFTRST  0x80000000
-
-#define HW_AUDIOIN_STAT         0x10
-
-#define HW_AUDIOIN_ADCSRR       0x20
-
-#define HW_AUDIOIN_ADCVOLUME    0x30
-#define BM_AUDIOIN_ADCVOLUME_VOLUME_RIGHT       0x000000FF
-#define BP_AUDIOIN_ADCVOLUME_VOLUME_RIGHT       0
-#define BM_AUDIOIN_ADCVOLUME_VOLUME_LEFT        0x00FF0000
-#define BP_AUDIOIN_ADCVOLUME_VOLUME_LEFT        16
-
-#define HW_AUDIOIN_ADCDEBUG     0x40
-
-#define HW_AUDIOIN_ADCVOL       0x50
-#define BM_AUDIOIN_ADCVOL_GAIN_RIGHT    0x0000000F
-#define BP_AUDIOIN_ADCVOL_GAIN_RIGHT    0
-#define BM_AUDIOIN_ADCVOL_SELECT_RIGHT  0x00000030
-#define BP_AUDIOIN_ADCVOL_SELECT_RIGHT  4
-#define BM_AUDIOIN_ADCVOL_GAIN_LEFT     0x00000F00
-#define BP_AUDIOIN_ADCVOL_GAIN_LEFT     8
-#define BM_AUDIOIN_ADCVOL_SELECT_LEFT   0x00003000
-#define BP_AUDIOIN_ADCVOL_SELECT_LEFT   12
-#define BM_AUDIOIN_ADCVOL_MUTE  0x01000000
-
-#define HW_AUDIOIN_MICLINE      0x60
-
-#define HW_AUDIOIN_ANACLKCTRL   0x70
-#define BM_AUDIOIN_ANACLKCTRL_CLKGATE   0x80000000
-
-#define HW_AUDIOIN_DATA         0x80
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-audioout.h b/arch/arm/mach-stmp378x/include/mach/regs-audioout.h
deleted file mode 100644
index f533e23694a0..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-audioout.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * stmp378x: AUDIOOUT register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_AUDIOOUT_BASE      (STMP3XXX_REGS_BASE + 0x48000)
-#define REGS_AUDIOOUT_PHYS      0x80048000
-#define REGS_AUDIOOUT_SIZE      0x2000
-
-#define HW_AUDIOOUT_CTRL        0x0
-#define BM_AUDIOOUT_CTRL_RUN    0x00000001
-#define BP_AUDIOOUT_CTRL_RUN    0
-#define BM_AUDIOOUT_CTRL_FIFO_ERROR_IRQ_EN      0x00000002
-#define BM_AUDIOOUT_CTRL_FIFO_OVERFLOW_IRQ      0x00000004
-#define BM_AUDIOOUT_CTRL_FIFO_UNDERFLOW_IRQ     0x00000008
-#define BM_AUDIOOUT_CTRL_WORD_LENGTH    0x00000040
-#define BM_AUDIOOUT_CTRL_CLKGATE        0x40000000
-#define BM_AUDIOOUT_CTRL_SFTRST 0x80000000
-
-#define HW_AUDIOOUT_STAT        0x10
-
-#define HW_AUDIOOUT_DACSRR      0x20
-#define BM_AUDIOOUT_DACSRR_SRC_FRAC     0x00001FFF
-#define BP_AUDIOOUT_DACSRR_SRC_FRAC     0
-#define BM_AUDIOOUT_DACSRR_SRC_INT      0x001F0000
-#define BP_AUDIOOUT_DACSRR_SRC_INT      16
-#define BM_AUDIOOUT_DACSRR_SRC_HOLD     0x07000000
-#define BP_AUDIOOUT_DACSRR_SRC_HOLD     24
-#define BM_AUDIOOUT_DACSRR_BASEMULT     0x70000000
-#define BP_AUDIOOUT_DACSRR_BASEMULT     28
-
-#define HW_AUDIOOUT_DACVOLUME   0x30
-#define BM_AUDIOOUT_DACVOLUME_MUTE_RIGHT        0x00000100
-#define BM_AUDIOOUT_DACVOLUME_MUTE_LEFT 0x01000000
-#define BM_AUDIOOUT_DACVOLUME_EN_ZCD    0x02000000
-
-#define HW_AUDIOOUT_DACDEBUG    0x40
-
-#define HW_AUDIOOUT_HPVOL       0x50
-#define BM_AUDIOOUT_HPVOL_MUTE  0x01000000
-#define BM_AUDIOOUT_HPVOL_EN_MSTR_ZCD   0x02000000
-
-#define HW_AUDIOOUT_PWRDN       0x70
-#define BM_AUDIOOUT_PWRDN_HEADPHONE     0x00000001
-#define BP_AUDIOOUT_PWRDN_HEADPHONE     0
-#define BM_AUDIOOUT_PWRDN_CAPLESS       0x00000010
-#define BM_AUDIOOUT_PWRDN_ADC   0x00000100
-#define BM_AUDIOOUT_PWRDN_DAC   0x00001000
-#define BM_AUDIOOUT_PWRDN_RIGHT_ADC     0x00010000
-#define BM_AUDIOOUT_PWRDN_SPEAKER       0x01000000
-
-#define HW_AUDIOOUT_REFCTRL     0x80
-#define BM_AUDIOOUT_REFCTRL_VAG_VAL     0x000000F0
-#define BP_AUDIOOUT_REFCTRL_VAG_VAL     4
-#define BM_AUDIOOUT_REFCTRL_ADC_REFVAL  0x00000F00
-#define BP_AUDIOOUT_REFCTRL_ADC_REFVAL  8
-#define BM_AUDIOOUT_REFCTRL_ADJ_VAG     0x00001000
-#define BM_AUDIOOUT_REFCTRL_ADJ_ADC     0x00002000
-#define BM_AUDIOOUT_REFCTRL_BIAS_CTRL   0x00030000
-#define BP_AUDIOOUT_REFCTRL_BIAS_CTRL   16
-#define BM_AUDIOOUT_REFCTRL_LOW_PWR     0x00080000
-#define BM_AUDIOOUT_REFCTRL_VBG_ADJ     0x00700000
-#define BP_AUDIOOUT_REFCTRL_VBG_ADJ     20
-#define BM_AUDIOOUT_REFCTRL_XTAL_BGR_BIAS       0x01000000
-#define BM_AUDIOOUT_REFCTRL_RAISE_REF   0x02000000
-
-#define HW_AUDIOOUT_ANACTRL     0x90
-#define BM_AUDIOOUT_ANACTRL_HP_CLASSAB  0x00000010
-#define BM_AUDIOOUT_ANACTRL_HP_HOLD_GND 0x00000020
-
-#define HW_AUDIOOUT_TEST        0xA0
-#define BM_AUDIOOUT_TEST_HP_I1_ADJ      0x00C00000
-#define BP_AUDIOOUT_TEST_HP_I1_ADJ      22
-
-#define HW_AUDIOOUT_BISTCTRL    0xB0
-
-#define HW_AUDIOOUT_BISTSTAT0   0xC0
-
-#define HW_AUDIOOUT_BISTSTAT1   0xD0
-
-#define HW_AUDIOOUT_ANACLKCTRL  0xE0
-#define BM_AUDIOOUT_ANACLKCTRL_CLKGATE  0x80000000
-
-#define HW_AUDIOOUT_DATA        0xF0
-
-#define HW_AUDIOOUT_SPEAKERCTRL 0x100
-#define BM_AUDIOOUT_SPEAKERCTRL_MUTE    0x01000000
-
-#define HW_AUDIOOUT_VERSION     0x200
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-bch.h b/arch/arm/mach-stmp378x/include/mach/regs-bch.h
deleted file mode 100644
index 532d24650717..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-bch.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * stmp378x: BCH register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_BCH_BASE   (STMP3XXX_REGS_BASE + 0xA000)
-#define REGS_BCH_PHYS   0x8000A000
-#define REGS_BCH_SIZE   0x2000
-
-#define HW_BCH_CTRL             0x0
-#define BM_BCH_CTRL_COMPLETE_IRQ        0x00000001
-#define BP_BCH_CTRL_COMPLETE_IRQ        0
-#define BM_BCH_CTRL_COMPLETE_IRQ_EN     0x00000100
-
-#define HW_BCH_STATUS0          0x10
-#define BM_BCH_STATUS0_UNCORRECTABLE    0x00000004
-#define BM_BCH_STATUS0_CORRECTED        0x00000008
-#define BM_BCH_STATUS0_STATUS_BLK0      0x0000FF00
-#define BP_BCH_STATUS0_STATUS_BLK0      8
-#define BM_BCH_STATUS0_COMPLETED_CE     0x000F0000
-#define BP_BCH_STATUS0_COMPLETED_CE     16
-
-#define HW_BCH_LAYOUTSELECT     0x70
-
-#define HW_BCH_FLASH0LAYOUT0    0x80
-#define BM_BCH_FLASH0LAYOUT0_DATA0_SIZE 0x00000FFF
-#define BP_BCH_FLASH0LAYOUT0_DATA0_SIZE 0
-#define BM_BCH_FLASH0LAYOUT0_ECC0       0x0000F000
-#define BP_BCH_FLASH0LAYOUT0_ECC0       12
-#define BM_BCH_FLASH0LAYOUT0_META_SIZE  0x00FF0000
-#define BP_BCH_FLASH0LAYOUT0_META_SIZE  16
-#define BM_BCH_FLASH0LAYOUT0_NBLOCKS    0xFF000000
-#define BP_BCH_FLASH0LAYOUT0_NBLOCKS    24
-#define BM_BCH_FLASH0LAYOUT1_DATAN_SIZE 0x00000FFF
-#define BP_BCH_FLASH0LAYOUT1_DATAN_SIZE 0
-#define BM_BCH_FLASH0LAYOUT1_ECCN       0x0000F000
-#define BP_BCH_FLASH0LAYOUT1_ECCN       12
-#define BM_BCH_FLASH0LAYOUT1_PAGE_SIZE  0xFFFF0000
-#define BP_BCH_FLASH0LAYOUT1_PAGE_SIZE  16
-
-#define HW_BCH_BLOCKNAME        0x150
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h b/arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h
deleted file mode 100644
index 7c546afd57a3..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * stmp378x: CLKCTRL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_CLKCTRL
-#define _MACH_REGS_CLKCTRL
-
-#define REGS_CLKCTRL_BASE       (STMP3XXX_REGS_BASE + 0x40000)
-#define REGS_CLKCTRL_PHYS       0x80040000
-#define REGS_CLKCTRL_SIZE       0x2000
-
-#define HW_CLKCTRL_PLLCTRL0     0x0
-#define BM_CLKCTRL_PLLCTRL0_EN_USB_CLKS 0x00040000
-
-#define HW_CLKCTRL_CPU          0x20
-#define BM_CLKCTRL_CPU_DIV_CPU  0x0000003F
-#define BP_CLKCTRL_CPU_DIV_CPU  0
-
-#define HW_CLKCTRL_HBUS         0x30
-#define BM_CLKCTRL_HBUS_DIV     0x0000001F
-#define BP_CLKCTRL_HBUS_DIV     0
-#define BM_CLKCTRL_HBUS_DIV_FRAC_EN     0x00000020
-
-#define HW_CLKCTRL_XBUS         0x40
-
-#define HW_CLKCTRL_XTAL         0x50
-#define BM_CLKCTRL_XTAL_DRI_CLK24M_GATE 0x10000000
-
-#define HW_CLKCTRL_PIX          0x60
-#define BM_CLKCTRL_PIX_DIV      0x00000FFF
-#define BP_CLKCTRL_PIX_DIV      0
-#define BM_CLKCTRL_PIX_CLKGATE  0x80000000
-
-#define HW_CLKCTRL_SSP          0x70
-
-#define HW_CLKCTRL_GPMI         0x80
-
-#define HW_CLKCTRL_SPDIF        0x90
-
-#define HW_CLKCTRL_EMI          0xA0
-#define BM_CLKCTRL_EMI_DIV_EMI  0x0000003F
-#define BP_CLKCTRL_EMI_DIV_EMI  0
-#define BM_CLKCTRL_EMI_DCC_RESYNC_ENABLE        0x00010000
-#define BM_CLKCTRL_EMI_BUSY_DCC_RESYNC  0x00020000
-#define BM_CLKCTRL_EMI_BUSY_REF_EMI     0x10000000
-#define BM_CLKCTRL_EMI_BUSY_REF_XTAL    0x20000000
-
-#define HW_CLKCTRL_IR           0xB0
-
-#define HW_CLKCTRL_SAIF         0xC0
-
-#define HW_CLKCTRL_TV           0xD0
-
-#define HW_CLKCTRL_ETM          0xE0
-
-#define HW_CLKCTRL_FRAC         0xF0
-#define BM_CLKCTRL_FRAC_EMIFRAC 0x00003F00
-#define BP_CLKCTRL_FRAC_EMIFRAC 8
-#define BM_CLKCTRL_FRAC_PIXFRAC 0x003F0000
-#define BP_CLKCTRL_FRAC_PIXFRAC 16
-#define BM_CLKCTRL_FRAC_CLKGATEPIX      0x00800000
-
-#define HW_CLKCTRL_FRAC1        0x100
-
-#define HW_CLKCTRL_CLKSEQ       0x110
-#define BM_CLKCTRL_CLKSEQ_BYPASS_PIX    0x00000002
-
-#define HW_CLKCTRL_RESET        0x120
-#define BM_CLKCTRL_RESET_DIG    0x00000001
-#define BP_CLKCTRL_RESET_DIG    0
-
-#endif
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-dcp.h b/arch/arm/mach-stmp378x/include/mach/regs-dcp.h
deleted file mode 100644
index fdedd00c0e28..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-dcp.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * stmp378x: DCP register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_DCP_BASE   (STMP3XXX_REGS_BASE + 0x28000)
-#define REGS_DCP_PHYS   0x80028000
-#define REGS_DCP_SIZE   0x2000
-
-#define HW_DCP_CTRL             0x0
-#define BM_DCP_CTRL_CHANNEL_INTERRUPT_ENABLE    0x000000FF
-#define BP_DCP_CTRL_CHANNEL_INTERRUPT_ENABLE    0
-#define BM_DCP_CTRL_ENABLE_CONTEXT_CACHING      0x00400000
-#define BM_DCP_CTRL_GATHER_RESIDUAL_WRITES      0x00800000
-#define BM_DCP_CTRL_CLKGATE     0x40000000
-#define BM_DCP_CTRL_SFTRST      0x80000000
-
-#define HW_DCP_STAT             0x10
-#define BM_DCP_STAT_IRQ         0x0000000F
-#define BP_DCP_STAT_IRQ         0
-
-#define HW_DCP_CHANNELCTRL      0x20
-#define BM_DCP_CHANNELCTRL_ENABLE_CHANNEL       0x000000FF
-#define BP_DCP_CHANNELCTRL_ENABLE_CHANNEL       0
-
-#define HW_DCP_CONTEXT          0x50
-#define BM_DCP_PACKET1_INTERRUPT        0x00000001
-#define BP_DCP_PACKET1_INTERRUPT        0
-#define BM_DCP_PACKET1_DECR_SEMAPHORE   0x00000002
-#define BM_DCP_PACKET1_CHAIN    0x00000004
-#define BM_DCP_PACKET1_CHAIN_CONTIGUOUS 0x00000008
-#define BM_DCP_PACKET1_ENABLE_CIPHER    0x00000020
-#define BM_DCP_PACKET1_ENABLE_HASH      0x00000040
-#define BM_DCP_PACKET1_CIPHER_ENCRYPT   0x00000100
-#define BM_DCP_PACKET1_CIPHER_INIT      0x00000200
-#define BM_DCP_PACKET1_OTP_KEY  0x00000400
-#define BM_DCP_PACKET1_PAYLOAD_KEY      0x00000800
-#define BM_DCP_PACKET1_HASH_INIT        0x00001000
-#define BM_DCP_PACKET1_HASH_TERM        0x00002000
-#define BM_DCP_PACKET2_CIPHER_SELECT    0x0000000F
-#define BP_DCP_PACKET2_CIPHER_SELECT    0
-#define BM_DCP_PACKET2_CIPHER_MODE      0x000000F0
-#define BP_DCP_PACKET2_CIPHER_MODE      4
-#define BM_DCP_PACKET2_KEY_SELECT       0x0000FF00
-#define BP_DCP_PACKET2_KEY_SELECT       8
-#define BM_DCP_PACKET2_HASH_SELECT      0x000F0000
-#define BP_DCP_PACKET2_HASH_SELECT      16
-#define BM_DCP_PACKET2_CIPHER_CFG       0xFF000000
-#define BP_DCP_PACKET2_CIPHER_CFG       24
-
-#define HW_DCP_CH0CMDPTR        (0x100 + 0 * 0x40)
-#define HW_DCP_CH1CMDPTR        (0x100 + 1 * 0x40)
-#define HW_DCP_CH2CMDPTR        (0x100 + 2 * 0x40)
-#define HW_DCP_CH3CMDPTR        (0x100 + 3 * 0x40)
-
-#define HW_DCP_CHnCMDPTR        0x100
-
-#define HW_DCP_CH0SEMA          (0x110 + 0 * 0x40)
-#define HW_DCP_CH1SEMA          (0x110 + 1 * 0x40)
-#define HW_DCP_CH2SEMA          (0x110 + 2 * 0x40)
-#define HW_DCP_CH3SEMA          (0x110 + 3 * 0x40)
-
-#define HW_DCP_CHnSEMA          0x110
-#define BM_DCP_CHnSEMA_INCREMENT        0x000000FF
-#define BP_DCP_CHnSEMA_INCREMENT        0
-
-#define HW_DCP_CH0STAT          (0x120 + 0 * 0x40)
-#define HW_DCP_CH1STAT          (0x120 + 1 * 0x40)
-#define HW_DCP_CH2STAT          (0x120 + 2 * 0x40)
-#define HW_DCP_CH3STAT          (0x120 + 3 * 0x40)
-
-#define HW_DCP_CHnSTAT          0x120
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-digctl.h b/arch/arm/mach-stmp378x/include/mach/regs-digctl.h
deleted file mode 100644
index 5293005523b3..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-digctl.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * stmp378x: DIGCTL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_DIGCTL_BASE        (STMP3XXX_REGS_BASE + 0x1C000)
-#define REGS_DIGCTL_PHYS        0x8001C000
-#define REGS_DIGCTL_SIZE        0x2000
-
-#define HW_DIGCTL_CTRL          0x0
-#define BM_DIGCTL_CTRL_USB_CLKGATE      0x00000004
-
-#define HW_DIGCTL_ARMCACHE      0x2B0
-#define BM_DIGCTL_ARMCACHE_ITAG_SS      0x00000003
-#define BP_DIGCTL_ARMCACHE_ITAG_SS      0
-#define BM_DIGCTL_ARMCACHE_DTAG_SS      0x00000030
-#define BP_DIGCTL_ARMCACHE_DTAG_SS      4
-#define BM_DIGCTL_ARMCACHE_CACHE_SS     0x00000300
-#define BP_DIGCTL_ARMCACHE_CACHE_SS     8
-#define BM_DIGCTL_ARMCACHE_DRTY_SS      0x00003000
-#define BP_DIGCTL_ARMCACHE_DRTY_SS      12
-#define BM_DIGCTL_ARMCACHE_VALID_SS     0x00030000
-#define BP_DIGCTL_ARMCACHE_VALID_SS     16
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-dram.h b/arch/arm/mach-stmp378x/include/mach/regs-dram.h
deleted file mode 100644
index 02851431677c..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-dram.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * stmp378x: DRAM register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_DRAM_BASE  (STMP3XXX_REGS_BASE + 0xE0000)
-#define REGS_DRAM_PHYS  0x800E0000
-#define REGS_DRAM_SIZE  0x2000
-
-#define HW_DRAM_CTL06           0x18
-
-#define HW_DRAM_CTL08           0x20
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-dri.h b/arch/arm/mach-stmp378x/include/mach/regs-dri.h
deleted file mode 100644
index da25f7e397e5..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-dri.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * stmp378x: DRI register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_DRI_BASE   (STMP3XXX_REGS_BASE + 0x74000)
-#define REGS_DRI_PHYS   0x80074000
-#define REGS_DRI_SIZE   0x2000
-
-#define HW_DRI_CTRL             0x0
-#define BM_DRI_CTRL_RUN         0x00000001
-#define BP_DRI_CTRL_RUN         0
-#define BM_DRI_CTRL_ATTENTION_IRQ       0x00000002
-#define BM_DRI_CTRL_PILOT_SYNC_LOSS_IRQ 0x00000004
-#define BM_DRI_CTRL_OVERFLOW_IRQ        0x00000008
-#define BM_DRI_CTRL_ATTENTION_IRQ_EN    0x00000200
-#define BM_DRI_CTRL_PILOT_SYNC_LOSS_IRQ_EN      0x00000400
-#define BM_DRI_CTRL_OVERFLOW_IRQ_EN     0x00000800
-#define BM_DRI_CTRL_REACQUIRE_PHASE     0x00008000
-#define BM_DRI_CTRL_STOP_ON_PILOT_ERROR 0x02000000
-#define BM_DRI_CTRL_STOP_ON_OFLOW_ERROR 0x04000000
-#define BM_DRI_CTRL_ENABLE_INPUTS       0x20000000
-#define BM_DRI_CTRL_CLKGATE     0x40000000
-#define BM_DRI_CTRL_SFTRST      0x80000000
-
-#define HW_DRI_TIMING           0x10
-#define BM_DRI_TIMING_GAP_DETECTION_INTERVAL    0x000000FF
-#define BP_DRI_TIMING_GAP_DETECTION_INTERVAL    0
-#define BM_DRI_TIMING_PILOT_REP_RATE    0x000F0000
-#define BP_DRI_TIMING_PILOT_REP_RATE    16
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-ecc8.h b/arch/arm/mach-stmp378x/include/mach/regs-ecc8.h
deleted file mode 100644
index cc353bec331b..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-ecc8.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * stmp378x: ECC8 register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_ECC8_BASE  (STMP3XXX_REGS_BASE + 0x8000)
-#define REGS_ECC8_PHYS  0x80008000
-#define REGS_ECC8_SIZE  0x2000
-
-#define HW_ECC8_CTRL            0x0
-#define BM_ECC8_CTRL_COMPLETE_IRQ       0x00000001
-#define BP_ECC8_CTRL_COMPLETE_IRQ       0
-#define BM_ECC8_CTRL_COMPLETE_IRQ_EN    0x00000100
-#define BM_ECC8_CTRL_AHBM_SFTRST        0x20000000
-
-#define HW_ECC8_STATUS0         0x10
-#define BM_ECC8_STATUS0_UNCORRECTABLE   0x00000004
-#define BM_ECC8_STATUS0_CORRECTED       0x00000008
-#define BM_ECC8_STATUS0_STATUS_AUX      0x00000F00
-#define BP_ECC8_STATUS0_STATUS_AUX      8
-#define BM_ECC8_STATUS0_COMPLETED_CE    0x000F0000
-#define BP_ECC8_STATUS0_COMPLETED_CE    16
-
-#define HW_ECC8_STATUS1         0x20
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-emi.h b/arch/arm/mach-stmp378x/include/mach/regs-emi.h
deleted file mode 100644
index 98773fc33d7b..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-emi.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * stmp378x: EMI register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_EMI_BASE   (STMP3XXX_REGS_BASE + 0x20000)
-#define REGS_EMI_PHYS   0x80020000
-#define REGS_EMI_SIZE   0x2000
-
-#define HW_EMI_STAT             0x10
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-gpmi.h b/arch/arm/mach-stmp378x/include/mach/regs-gpmi.h
deleted file mode 100644
index 2cc8bbe91687..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-gpmi.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * stmp378x: GPMI register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_GPMI_BASE  (STMP3XXX_REGS_BASE + 0xC000)
-#define REGS_GPMI_PHYS  0x8000C000
-#define REGS_GPMI_SIZE  0x2000
-
-#define HW_GPMI_CTRL0           0x0
-#define BM_GPMI_CTRL0_XFER_COUNT        0x0000FFFF
-#define BP_GPMI_CTRL0_XFER_COUNT        0
-#define BM_GPMI_CTRL0_CS        0x00300000
-#define BP_GPMI_CTRL0_CS        20
-#define BM_GPMI_CTRL0_LOCK_CS   0x00400000
-#define BM_GPMI_CTRL0_WORD_LENGTH       0x00800000
-#define BM_GPMI_CTRL0_ADDRESS      0x000E0000
-#define BP_GPMI_CTRL0_ADDRESS      17
-#define BV_GPMI_CTRL0_ADDRESS__NAND_DATA  0x0
-#define BV_GPMI_CTRL0_ADDRESS__NAND_CLE   0x1
-#define BV_GPMI_CTRL0_ADDRESS__NAND_ALE   0x2
-#define BM_GPMI_CTRL0_ADDRESS_INCREMENT      0x00010000
-#define BM_GPMI_CTRL0_COMMAND_MODE      0x03000000
-#define BP_GPMI_CTRL0_COMMAND_MODE      24
-#define BV_GPMI_CTRL0_COMMAND_MODE__WRITE           0x0
-#define BV_GPMI_CTRL0_COMMAND_MODE__READ             0x1
-#define BV_GPMI_CTRL0_COMMAND_MODE__READ_AND_COMPARE 0x2
-#define BV_GPMI_CTRL0_COMMAND_MODE__WAIT_FOR_READY   0x3
-#define BM_GPMI_CTRL0_RUN       0x20000000
-#define BM_GPMI_CTRL0_CLKGATE   0x40000000
-#define BM_GPMI_CTRL0_SFTRST    0x80000000
-#define BM_GPMI_ECCCTRL_BUFFER_MASK     0x000001FF
-#define BP_GPMI_ECCCTRL_BUFFER_MASK     0
-#define BM_GPMI_ECCCTRL_ENABLE_ECC      0x00001000
-#define BM_GPMI_ECCCTRL_ECC_CMD 0x00006000
-#define BP_GPMI_ECCCTRL_ECC_CMD 13
-#define BV_GPMI_ECCCTRL_ECC_CMD__DECODE_4_BIT                   0
-#define BV_GPMI_ECCCTRL_ECC_CMD__ENCODE_4_BIT                   1
-#define BV_GPMI_ECCCTRL_ECC_CMD__DECODE_8_BIT                   2
-#define BV_GPMI_ECCCTRL_ECC_CMD__ENCODE_8_BIT                   3
-
-#define HW_GPMI_CTRL1           0x60
-#define BM_GPMI_CTRL1_GPMI_MODE 0x00000001
-#define BP_GPMI_CTRL1_GPMI_MODE 0
-#define BM_GPMI_CTRL1_ATA_IRQRDY_POLARITY       0x00000004
-#define BM_GPMI_CTRL1_DEV_RESET 0x00000008
-#define BM_GPMI_CTRL1_TIMEOUT_IRQ       0x00000200
-#define BM_GPMI_CTRL1_DEV_IRQ   0x00000400
-#define BM_GPMI_CTRL1_RDN_DELAY 0x0000F000
-#define BP_GPMI_CTRL1_RDN_DELAY 12
-#define BM_GPMI_CTRL1_BCH_MODE  0x00040000
-
-#define HW_GPMI_TIMING0         0x70
-#define BM_GPMI_TIMING0_DATA_SETUP      0x000000FF
-#define BP_GPMI_TIMING0_DATA_SETUP      0
-#define BM_GPMI_TIMING0_DATA_HOLD       0x0000FF00
-#define BP_GPMI_TIMING0_DATA_HOLD       8
-#define BM_GPMI_TIMING0_ADDRESS_SETUP   0x00FF0000
-#define BP_GPMI_TIMING0_ADDRESS_SETUP   16
-
-#define HW_GPMI_TIMING1         0x80
-#define BM_GPMI_TIMING1_DEVICE_BUSY_TIMEOUT     0xFFFF0000
-#define BP_GPMI_TIMING1_DEVICE_BUSY_TIMEOUT     16
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-i2c.h b/arch/arm/mach-stmp378x/include/mach/regs-i2c.h
deleted file mode 100644
index 13a234c99433..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-i2c.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * stmp378x: I2C register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_I2C_BASE   (STMP3XXX_REGS_BASE + 0x58000)
-#define REGS_I2C_PHYS   0x80058000
-#define REGS_I2C_SIZE   0x2000
-
-#define HW_I2C_CTRL0            0x0
-#define BM_I2C_CTRL0_XFER_COUNT 0x0000FFFF
-#define BP_I2C_CTRL0_XFER_COUNT 0
-#define BM_I2C_CTRL0_DIRECTION  0x00010000
-#define BM_I2C_CTRL0_MASTER_MODE        0x00020000
-#define BM_I2C_CTRL0_PRE_SEND_START     0x00080000
-#define BM_I2C_CTRL0_POST_SEND_STOP     0x00100000
-#define BM_I2C_CTRL0_RETAIN_CLOCK       0x00200000
-#define BM_I2C_CTRL0_SEND_NAK_ON_LAST   0x02000000
-#define BM_I2C_CTRL0_CLKGATE    0x40000000
-#define BM_I2C_CTRL0_SFTRST     0x80000000
-
-#define HW_I2C_TIMING0          0x10
-
-#define HW_I2C_TIMING1          0x20
-
-#define HW_I2C_TIMING2          0x30
-
-#define HW_I2C_CTRL1            0x40
-#define BM_I2C_CTRL1_SLAVE_IRQ  0x00000001
-#define BP_I2C_CTRL1_SLAVE_IRQ  0
-#define BM_I2C_CTRL1_SLAVE_STOP_IRQ     0x00000002
-#define BM_I2C_CTRL1_MASTER_LOSS_IRQ    0x00000004
-#define BM_I2C_CTRL1_EARLY_TERM_IRQ     0x00000008
-#define BM_I2C_CTRL1_OVERSIZE_XFER_TERM_IRQ     0x00000010
-#define BM_I2C_CTRL1_NO_SLAVE_ACK_IRQ   0x00000020
-#define BM_I2C_CTRL1_DATA_ENGINE_CMPLT_IRQ      0x00000040
-#define BM_I2C_CTRL1_BUS_FREE_IRQ       0x00000080
-#define BM_I2C_CTRL1_CLR_GOT_A_NAK      0x10000000
-
-#define HW_I2C_VERSION          0x90
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-icoll.h b/arch/arm/mach-stmp378x/include/mach/regs-icoll.h
deleted file mode 100644
index f996e80f40e7..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-icoll.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * stmp378x: ICOLL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_ICOLL
-#define _MACH_REGS_ICOLL
-
-#define REGS_ICOLL_BASE (STMP3XXX_REGS_BASE + 0x0)
-#define REGS_ICOLL_PHYS 0x80000000
-#define REGS_ICOLL_SIZE 0x2000
-
-#define HW_ICOLL_VECTOR         0x0
-
-#define HW_ICOLL_LEVELACK       0x10
-#define BM_ICOLL_LEVELACK_IRQLEVELACK   0x0000000F
-#define BP_ICOLL_LEVELACK_IRQLEVELACK   0
-
-#define HW_ICOLL_CTRL           0x20
-#define BM_ICOLL_CTRL_CLKGATE   0x40000000
-#define BM_ICOLL_CTRL_SFTRST    0x80000000
-
-#define HW_ICOLL_STAT           0x70
-
-#define HW_ICOLL_INTERRUPTn     0x120
-
-#define HW_ICOLL_INTERRUPTn     0x120
-#define BM_ICOLL_INTERRUPTn_ENABLE      0x00000004
-
-#endif
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-ir.h b/arch/arm/mach-stmp378x/include/mach/regs-ir.h
deleted file mode 100644
index a5b4ef10fab8..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-ir.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * stmp378x: IR register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_IR_BASE    (STMP3XXX_REGS_BASE + 0x78000)
-#define REGS_IR_PHYS    0x80078000
-#define REGS_IR_SIZE    0x2000
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-lcdif.h b/arch/arm/mach-stmp378x/include/mach/regs-lcdif.h
deleted file mode 100644
index 9cdbef4badc3..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-lcdif.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * stmp378x: LCDIF register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_LCDIF_BASE (STMP3XXX_REGS_BASE + 0x30000)
-#define REGS_LCDIF_PHYS 0x80030000
-#define REGS_LCDIF_SIZE 0x2000
-
-#define HW_LCDIF_CTRL           0x0
-#define BM_LCDIF_CTRL_RUN       0x00000001
-#define BP_LCDIF_CTRL_RUN       0
-#define BM_LCDIF_CTRL_LCDIF_MASTER      0x00000020
-#define BM_LCDIF_CTRL_RGB_TO_YCBCR422_CSC       0x00000080
-#define BM_LCDIF_CTRL_WORD_LENGTH       0x00000300
-#define BP_LCDIF_CTRL_WORD_LENGTH       8
-#define BM_LCDIF_CTRL_LCD_DATABUS_WIDTH 0x00000C00
-#define BP_LCDIF_CTRL_LCD_DATABUS_WIDTH 10
-#define BM_LCDIF_CTRL_INPUT_DATA_SWIZZLE        0x0000C000
-#define BP_LCDIF_CTRL_INPUT_DATA_SWIZZLE        14
-#define BM_LCDIF_CTRL_DATA_SELECT       0x00010000
-#define BM_LCDIF_CTRL_DOTCLK_MODE       0x00020000
-#define BM_LCDIF_CTRL_VSYNC_MODE        0x00040000
-#define BM_LCDIF_CTRL_BYPASS_COUNT      0x00080000
-#define BM_LCDIF_CTRL_DVI_MODE  0x00100000
-#define BM_LCDIF_CTRL_SHIFT_NUM_BITS    0x03E00000
-#define BP_LCDIF_CTRL_SHIFT_NUM_BITS    21
-#define BM_LCDIF_CTRL_DATA_SHIFT_DIR    0x04000000
-#define BM_LCDIF_CTRL_WAIT_FOR_VSYNC_EDGE       0x08000000
-#define BM_LCDIF_CTRL_CLKGATE   0x40000000
-#define BM_LCDIF_CTRL_SFTRST    0x80000000
-
-#define HW_LCDIF_CTRL1          0x10
-#define BM_LCDIF_CTRL1_RESET    0x00000001
-#define BP_LCDIF_CTRL1_RESET    0
-#define BM_LCDIF_CTRL1_MODE86   0x00000002
-#define BM_LCDIF_CTRL1_BUSY_ENABLE      0x00000004
-#define BM_LCDIF_CTRL1_VSYNC_EDGE_IRQ   0x00000100
-#define BM_LCDIF_CTRL1_CUR_FRAME_DONE_IRQ       0x00000200
-#define BM_LCDIF_CTRL1_UNDERFLOW_IRQ    0x00000400
-#define BM_LCDIF_CTRL1_OVERFLOW_IRQ     0x00000800
-#define BM_LCDIF_CTRL1_VSYNC_EDGE_IRQ_EN        0x00001000
-#define BM_LCDIF_CTRL1_BYTE_PACKING_FORMAT      0x000F0000
-#define BP_LCDIF_CTRL1_BYTE_PACKING_FORMAT      16
-#define BM_LCDIF_CTRL1_INTERLACE_FIELDS 0x00800000
-#define BM_LCDIF_CTRL1_RECOVER_ON_UNDERFLOW     0x01000000
-
-#define HW_LCDIF_TRANSFER_COUNT 0x20
-#define BM_LCDIF_TRANSFER_COUNT_H_COUNT 0x0000FFFF
-#define BP_LCDIF_TRANSFER_COUNT_H_COUNT 0
-#define BM_LCDIF_TRANSFER_COUNT_V_COUNT 0xFFFF0000
-#define BP_LCDIF_TRANSFER_COUNT_V_COUNT 16
-
-#define HW_LCDIF_CUR_BUF        0x30
-
-#define HW_LCDIF_NEXT_BUF       0x40
-
-#define HW_LCDIF_TIMING         0x60
-
-#define HW_LCDIF_VDCTRL0        0x70
-#define BM_LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH      0x0003FFFF
-#define BP_LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH      0
-#define BM_LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH_UNIT 0x00100000
-#define BM_LCDIF_VDCTRL0_VSYNC_PERIOD_UNIT      0x00200000
-#define BM_LCDIF_VDCTRL0_ENABLE_POL     0x01000000
-#define BM_LCDIF_VDCTRL0_DOTCLK_POL     0x02000000
-#define BM_LCDIF_VDCTRL0_HSYNC_POL      0x04000000
-#define BM_LCDIF_VDCTRL0_VSYNC_POL      0x08000000
-#define BM_LCDIF_VDCTRL0_ENABLE_PRESENT 0x10000000
-#define BM_LCDIF_VDCTRL0_VSYNC_OEB      0x20000000
-
-#define HW_LCDIF_VDCTRL1        0x80
-#define BM_LCDIF_VDCTRL1_VSYNC_PERIOD   0xFFFFFFFF
-#define BP_LCDIF_VDCTRL1_VSYNC_PERIOD   0
-
-#define HW_LCDIF_VDCTRL2        0x90
-#define BM_LCDIF_VDCTRL2_HSYNC_PERIOD   0x0003FFFF
-#define BP_LCDIF_VDCTRL2_HSYNC_PERIOD   0
-#define BM_LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH      0xFF000000
-#define BP_LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH      24
-
-#define HW_LCDIF_VDCTRL3        0xA0
-#define BM_LCDIF_VDCTRL3_VERTICAL_WAIT_CNT      0x0000FFFF
-#define BP_LCDIF_VDCTRL3_VERTICAL_WAIT_CNT      0
-#define BM_LCDIF_VDCTRL3_HORIZONTAL_WAIT_CNT    0x0FFF0000
-#define BP_LCDIF_VDCTRL3_HORIZONTAL_WAIT_CNT    16
-
-#define HW_LCDIF_VDCTRL4        0xB0
-#define BM_LCDIF_VDCTRL4_DOTCLK_H_VALID_DATA_CNT        0x0003FFFF
-#define BP_LCDIF_VDCTRL4_DOTCLK_H_VALID_DATA_CNT        0
-#define BM_LCDIF_VDCTRL4_SYNC_SIGNALS_ON        0x00040000
-
-#define HW_LCDIF_DVICTRL0       0xC0
-#define BM_LCDIF_DVICTRL0_V_LINES_CNT   0x000003FF
-#define BP_LCDIF_DVICTRL0_V_LINES_CNT   0
-#define BM_LCDIF_DVICTRL0_H_BLANKING_CNT        0x000FFC00
-#define BP_LCDIF_DVICTRL0_H_BLANKING_CNT        10
-#define BM_LCDIF_DVICTRL0_H_ACTIVE_CNT  0x7FF00000
-#define BP_LCDIF_DVICTRL0_H_ACTIVE_CNT  20
-
-#define HW_LCDIF_DVICTRL1       0xD0
-#define BM_LCDIF_DVICTRL1_F2_START_LINE 0x000003FF
-#define BP_LCDIF_DVICTRL1_F2_START_LINE 0
-#define BM_LCDIF_DVICTRL1_F1_END_LINE   0x000FFC00
-#define BP_LCDIF_DVICTRL1_F1_END_LINE   10
-#define BM_LCDIF_DVICTRL1_F1_START_LINE 0x3FF00000
-#define BP_LCDIF_DVICTRL1_F1_START_LINE 20
-
-#define HW_LCDIF_DVICTRL2       0xE0
-#define BM_LCDIF_DVICTRL2_V1_BLANK_END_LINE     0x000003FF
-#define BP_LCDIF_DVICTRL2_V1_BLANK_END_LINE     0
-#define BM_LCDIF_DVICTRL2_V1_BLANK_START_LINE   0x000FFC00
-#define BP_LCDIF_DVICTRL2_V1_BLANK_START_LINE   10
-#define BM_LCDIF_DVICTRL2_F2_END_LINE   0x3FF00000
-#define BP_LCDIF_DVICTRL2_F2_END_LINE   20
-
-#define HW_LCDIF_DVICTRL3       0xF0
-#define BM_LCDIF_DVICTRL3_V2_BLANK_END_LINE     0x000003FF
-#define BP_LCDIF_DVICTRL3_V2_BLANK_END_LINE     0
-#define BM_LCDIF_DVICTRL3_V2_BLANK_START_LINE   0x03FF0000
-#define BP_LCDIF_DVICTRL3_V2_BLANK_START_LINE   16
-
-#define HW_LCDIF_DVICTRL4       0x100
-#define BM_LCDIF_DVICTRL4_H_FILL_CNT    0x000000FF
-#define BP_LCDIF_DVICTRL4_H_FILL_CNT    0
-#define BM_LCDIF_DVICTRL4_CR_FILL_VALUE 0x0000FF00
-#define BP_LCDIF_DVICTRL4_CR_FILL_VALUE 8
-#define BM_LCDIF_DVICTRL4_CB_FILL_VALUE 0x00FF0000
-#define BP_LCDIF_DVICTRL4_CB_FILL_VALUE 16
-#define BM_LCDIF_DVICTRL4_Y_FILL_VALUE  0xFF000000
-#define BP_LCDIF_DVICTRL4_Y_FILL_VALUE  24
-
-#define HW_LCDIF_CSC_COEFF0     0x110
-#define BM_LCDIF_CSC_COEFF0_CSC_SUBSAMPLE_FILTER        0x00000003
-#define BP_LCDIF_CSC_COEFF0_CSC_SUBSAMPLE_FILTER        0
-#define BM_LCDIF_CSC_COEFF0_C0  0x03FF0000
-#define BP_LCDIF_CSC_COEFF0_C0  16
-
-#define HW_LCDIF_CSC_COEFF1     0x120
-#define BM_LCDIF_CSC_COEFF1_C1  0x000003FF
-#define BP_LCDIF_CSC_COEFF1_C1  0
-#define BM_LCDIF_CSC_COEFF1_C2  0x03FF0000
-#define BP_LCDIF_CSC_COEFF1_C2  16
-
-#define HW_LCDIF_CSC_COEFF2     0x130
-#define BM_LCDIF_CSC_COEFF2_C3  0x000003FF
-#define BP_LCDIF_CSC_COEFF2_C3  0
-#define BM_LCDIF_CSC_COEFF2_C4  0x03FF0000
-#define BP_LCDIF_CSC_COEFF2_C4  16
-
-#define HW_LCDIF_CSC_COEFF3     0x140
-#define BM_LCDIF_CSC_COEFF3_C5  0x000003FF
-#define BP_LCDIF_CSC_COEFF3_C5  0
-#define BM_LCDIF_CSC_COEFF3_C6  0x03FF0000
-#define BP_LCDIF_CSC_COEFF3_C6  16
-
-#define HW_LCDIF_CSC_COEFF4     0x150
-#define BM_LCDIF_CSC_COEFF4_C7  0x000003FF
-#define BP_LCDIF_CSC_COEFF4_C7  0
-#define BM_LCDIF_CSC_COEFF4_C8  0x03FF0000
-#define BP_LCDIF_CSC_COEFF4_C8  16
-
-#define HW_LCDIF_CSC_OFFSET     0x160
-#define BM_LCDIF_CSC_OFFSET_Y_OFFSET    0x000001FF
-#define BP_LCDIF_CSC_OFFSET_Y_OFFSET    0
-#define BM_LCDIF_CSC_OFFSET_CBCR_OFFSET 0x01FF0000
-#define BP_LCDIF_CSC_OFFSET_CBCR_OFFSET 16
-
-#define HW_LCDIF_CSC_LIMIT      0x170
-#define BM_LCDIF_CSC_LIMIT_Y_MAX        0x000000FF
-#define BP_LCDIF_CSC_LIMIT_Y_MAX        0
-#define BM_LCDIF_CSC_LIMIT_Y_MIN        0x0000FF00
-#define BP_LCDIF_CSC_LIMIT_Y_MIN        8
-#define BM_LCDIF_CSC_LIMIT_CBCR_MAX     0x00FF0000
-#define BP_LCDIF_CSC_LIMIT_CBCR_MAX     16
-#define BM_LCDIF_CSC_LIMIT_CBCR_MIN     0xFF000000
-#define BP_LCDIF_CSC_LIMIT_CBCR_MIN     24
-
-#define HW_LCDIF_STAT           0x1D0
-#define BM_LCDIF_STAT_TXFIFO_EMPTY      0x04000000
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-lradc.h b/arch/arm/mach-stmp378x/include/mach/regs-lradc.h
deleted file mode 100644
index cb8cb06f8277..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-lradc.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * stmp378x: LRADC register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_LRADC_BASE (STMP3XXX_REGS_BASE + 0x50000)
-#define REGS_LRADC_PHYS 0x80050000
-#define REGS_LRADC_SIZE 0x2000
-
-#define HW_LRADC_CTRL0          0x0
-#define BM_LRADC_CTRL0_SCHEDULE 0x000000FF
-#define BP_LRADC_CTRL0_SCHEDULE 0
-#define BM_LRADC_CTRL0_XPLUS_ENABLE     0x00010000
-#define BM_LRADC_CTRL0_YPLUS_ENABLE     0x00020000
-#define BM_LRADC_CTRL0_XMINUS_ENABLE    0x00040000
-#define BM_LRADC_CTRL0_YMINUS_ENABLE    0x00080000
-#define BM_LRADC_CTRL0_TOUCH_DETECT_ENABLE      0x00100000
-#define BM_LRADC_CTRL0_ONCHIP_GROUNDREF 0x00200000
-#define BM_LRADC_CTRL0_CLKGATE  0x40000000
-#define BM_LRADC_CTRL0_SFTRST   0x80000000
-
-#define HW_LRADC_CTRL1          0x10
-#define BM_LRADC_CTRL1_LRADC0_IRQ       0x00000001
-#define BP_LRADC_CTRL1_LRADC0_IRQ       0
-#define BM_LRADC_CTRL1_LRADC5_IRQ       0x00000020
-#define BM_LRADC_CTRL1_LRADC6_IRQ       0x00000040
-#define BM_LRADC_CTRL1_TOUCH_DETECT_IRQ 0x00000100
-#define BM_LRADC_CTRL1_LRADC0_IRQ_EN    0x00010000
-#define BM_LRADC_CTRL1_LRADC5_IRQ_EN    0x00200000
-#define BM_LRADC_CTRL1_TOUCH_DETECT_IRQ_EN      0x01000000
-
-#define HW_LRADC_CTRL2          0x20
-#define BM_LRADC_CTRL2_BL_BRIGHTNESS    0x001F0000
-#define BP_LRADC_CTRL2_BL_BRIGHTNESS    16
-#define BM_LRADC_CTRL2_BL_MUX_SELECT    0x00200000
-#define BM_LRADC_CTRL2_BL_ENABLE        0x00400000
-#define BM_LRADC_CTRL2_DIVIDE_BY_TWO    0xFF000000
-#define BP_LRADC_CTRL2_DIVIDE_BY_TWO    24
-
-#define HW_LRADC_CTRL3          0x30
-#define BM_LRADC_CTRL3_CYCLE_TIME       0x00000300
-#define BP_LRADC_CTRL3_CYCLE_TIME       8
-
-#define HW_LRADC_STATUS         0x40
-#define BM_LRADC_STATUS_TOUCH_DETECT_RAW        0x00000001
-#define BP_LRADC_STATUS_TOUCH_DETECT_RAW        0
-
-#define HW_LRADC_CH0            (0x50 + 0 * 0x10)
-#define HW_LRADC_CH1            (0x50 + 1 * 0x10)
-#define HW_LRADC_CH2            (0x50 + 2 * 0x10)
-#define HW_LRADC_CH3            (0x50 + 3 * 0x10)
-#define HW_LRADC_CH4            (0x50 + 4 * 0x10)
-#define HW_LRADC_CH5            (0x50 + 5 * 0x10)
-#define HW_LRADC_CH6            (0x50 + 6 * 0x10)
-#define HW_LRADC_CH7            (0x50 + 7 * 0x10)
-
-#define HW_LRADC_CHn            0x50
-#define BM_LRADC_CHn_VALUE      0x0003FFFF
-#define BP_LRADC_CHn_VALUE      0
-#define BM_LRADC_CHn_NUM_SAMPLES        0x1F000000
-#define BP_LRADC_CHn_NUM_SAMPLES        24
-#define BM_LRADC_CHn_ACCUMULATE 0x20000000
-
-#define HW_LRADC_DELAY0         (0xD0 + 0 * 0x10)
-#define HW_LRADC_DELAY1         (0xD0 + 1 * 0x10)
-#define HW_LRADC_DELAY2         (0xD0 + 2 * 0x10)
-#define HW_LRADC_DELAY3         (0xD0 + 3 * 0x10)
-
-#define HW_LRADC_DELAYn         0xD0
-#define BM_LRADC_DELAYn_DELAY   0x000007FF
-#define BP_LRADC_DELAYn_DELAY   0
-#define BM_LRADC_DELAYn_LOOP_COUNT      0x0000F800
-#define BP_LRADC_DELAYn_LOOP_COUNT      11
-#define BM_LRADC_DELAYn_TRIGGER_DELAYS  0x000F0000
-#define BP_LRADC_DELAYn_TRIGGER_DELAYS  16
-#define BM_LRADC_DELAYn_KICK    0x00100000
-#define BM_LRADC_DELAYn_TRIGGER_LRADCS  0xFF000000
-#define BP_LRADC_DELAYn_TRIGGER_LRADCS  24
-
-#define HW_LRADC_CTRL4          0x140
-#define BM_LRADC_CTRL4_LRADC6SELECT     0x0F000000
-#define BP_LRADC_CTRL4_LRADC6SELECT     24
-#define BM_LRADC_CTRL4_LRADC7SELECT     0xF0000000
-#define BP_LRADC_CTRL4_LRADC7SELECT     28
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-ocotp.h b/arch/arm/mach-stmp378x/include/mach/regs-ocotp.h
deleted file mode 100644
index f0af64d9937e..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-ocotp.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * stmp378x: OCOTP register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_OCOTP_BASE (STMP3XXX_REGS_BASE + 0x2C000)
-#define REGS_OCOTP_PHYS 0x8002C000
-#define REGS_OCOTP_SIZE 0x2000
-
-#define HW_OCOTP_CTRL           0x0
-#define BM_OCOTP_CTRL_BUSY      0x00000100
-#define BM_OCOTP_CTRL_ERROR     0x00000200
-#define BM_OCOTP_CTRL_RD_BANK_OPEN      0x00001000
-#define BM_OCOTP_CTRL_RELOAD_SHADOWS    0x00002000
-#define BM_OCOTP_CTRL_WR_UNLOCK 0xFFFF0000
-#define BP_OCOTP_CTRL_WR_UNLOCK 16
-
-#define HW_OCOTP_DATA           0x10
-
-#define HW_OCOTP_CUST0          (0x20 + 0 * 0x10)
-#define HW_OCOTP_CUST1          (0x20 + 1 * 0x10)
-#define HW_OCOTP_CUST2          (0x20 + 2 * 0x10)
-#define HW_OCOTP_CUST3          (0x20 + 3 * 0x10)
-
-#define HW_OCOTP_CUSTn          0x20
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h b/arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h
deleted file mode 100644
index 50d90ea1b136..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * stmp378x: PINCTRL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_PINCTRL
-#define _MACH_REGS_PINCTRL
-
-#define REGS_PINCTRL_BASE       (STMP3XXX_REGS_BASE + 0x18000)
-#define REGS_PINCTRL_PHYS       0x80018000
-#define REGS_PINCTRL_SIZE       0x2000
-
-#define HW_PINCTRL_MUXSEL0      0x100
-#define HW_PINCTRL_MUXSEL1      0x110
-#define HW_PINCTRL_MUXSEL2      0x120
-#define HW_PINCTRL_MUXSEL3      0x130
-#define HW_PINCTRL_MUXSEL4      0x140
-#define HW_PINCTRL_MUXSEL5      0x150
-#define HW_PINCTRL_MUXSEL6      0x160
-#define HW_PINCTRL_MUXSEL7      0x170
-
-#define HW_PINCTRL_DRIVE0       0x200
-#define HW_PINCTRL_DRIVE1       0x210
-#define HW_PINCTRL_DRIVE2       0x220
-#define HW_PINCTRL_DRIVE3       0x230
-#define HW_PINCTRL_DRIVE4       0x240
-#define HW_PINCTRL_DRIVE5       0x250
-#define HW_PINCTRL_DRIVE6       0x260
-#define HW_PINCTRL_DRIVE7       0x270
-#define HW_PINCTRL_DRIVE8       0x280
-#define HW_PINCTRL_DRIVE9       0x290
-#define HW_PINCTRL_DRIVE10      0x2A0
-#define HW_PINCTRL_DRIVE11      0x2B0
-#define HW_PINCTRL_DRIVE12      0x2C0
-#define HW_PINCTRL_DRIVE13      0x2D0
-#define HW_PINCTRL_DRIVE14      0x2E0
-
-#define HW_PINCTRL_PULL0        0x400
-#define HW_PINCTRL_PULL1        0x410
-#define HW_PINCTRL_PULL2        0x420
-#define HW_PINCTRL_PULL3        0x430
-
-#define HW_PINCTRL_DOUT0        0x500
-#define HW_PINCTRL_DOUT1        0x510
-#define HW_PINCTRL_DOUT2        0x520
-
-#define HW_PINCTRL_DIN0         0x600
-#define HW_PINCTRL_DIN1         0x610
-#define HW_PINCTRL_DIN2         0x620
-
-#define HW_PINCTRL_DOE0         0x700
-#define HW_PINCTRL_DOE1         0x710
-#define HW_PINCTRL_DOE2         0x720
-
-#define HW_PINCTRL_PIN2IRQ0     0x800
-#define HW_PINCTRL_PIN2IRQ1     0x810
-#define HW_PINCTRL_PIN2IRQ2     0x820
-
-#define HW_PINCTRL_IRQEN0       0x900
-#define HW_PINCTRL_IRQEN1       0x910
-#define HW_PINCTRL_IRQEN2       0x920
-
-#define HW_PINCTRL_IRQLEVEL0    0xA00
-#define HW_PINCTRL_IRQLEVEL1    0xA10
-#define HW_PINCTRL_IRQLEVEL2    0xA20
-
-#define HW_PINCTRL_IRQPOL0      0xB00
-#define HW_PINCTRL_IRQPOL1      0xB10
-#define HW_PINCTRL_IRQPOL2      0xB20
-
-#define HW_PINCTRL_IRQSTAT0     0xC00
-#define HW_PINCTRL_IRQSTAT1     0xC10
-#define HW_PINCTRL_IRQSTAT2     0xC20
-
-#endif
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-power.h b/arch/arm/mach-stmp378x/include/mach/regs-power.h
deleted file mode 100644
index e454c830f076..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-power.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * stmp378x: POWER register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_POWER
-#define _MACH_REGS_POWER
-
-#define REGS_POWER_BASE (STMP3XXX_REGS_BASE + 0x44000)
-#define REGS_POWER_PHYS 0x80044000
-#define REGS_POWER_SIZE 0x2000
-
-#define HW_POWER_CTRL           0x0
-#define BM_POWER_CTRL_ENIRQ_VDD5V_GT_VDDIO      0x00000001
-#define BP_POWER_CTRL_ENIRQ_VDD5V_GT_VDDIO      0
-#define BM_POWER_CTRL_ENIRQ_PSWITCH     0x00020000
-#define BM_POWER_CTRL_PSWITCH_IRQ       0x00100000
-#define BM_POWER_CTRL_CLKGATE   0x40000000
-
-#define HW_POWER_5VCTRL         0x10
-#define BM_POWER_5VCTRL_ENABLE_LINREG_ILIMIT    0x00000040
-
-#define HW_POWER_MINPWR         0x20
-
-#define HW_POWER_CHARGE         0x30
-
-#define HW_POWER_VDDDCTRL       0x40
-
-#define HW_POWER_VDDACTRL       0x50
-
-#define HW_POWER_VDDIOCTRL      0x60
-#define BM_POWER_VDDIOCTRL_TRG  0x0000001F
-#define BP_POWER_VDDIOCTRL_TRG  0
-
-#define HW_POWER_STS            0xC0
-#define BM_POWER_STS_VBUSVALID  0x00000002
-#define BM_POWER_STS_BVALID     0x00000004
-#define BM_POWER_STS_AVALID     0x00000008
-#define BM_POWER_STS_DC_OK      0x00000200
-
-#define HW_POWER_RESET          0x100
-
-#define HW_POWER_DEBUG          0x110
-#define BM_POWER_DEBUG_BVALIDPIOLOCK    0x00000002
-#define BM_POWER_DEBUG_AVALIDPIOLOCK    0x00000004
-#define BM_POWER_DEBUG_VBUSVALIDPIOLOCK 0x00000008
-
-#endif
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-pwm.h b/arch/arm/mach-stmp378x/include/mach/regs-pwm.h
deleted file mode 100644
index 0d0f9e56ec77..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-pwm.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * stmp378x: PWM register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_PWM_BASE   (STMP3XXX_REGS_BASE + 0x64000)
-#define REGS_PWM_PHYS   0x80064000
-#define REGS_PWM_SIZE   0x2000
-
-#define HW_PWM_CTRL             0x0
-#define BM_PWM_CTRL_PWM2_ENABLE 0x00000004
-#define BM_PWM_CTRL_PWM2_ANA_CTRL_ENABLE        0x00000020
-
-#define HW_PWM_ACTIVE0          (0x10 + 0 * 0x20)
-#define HW_PWM_ACTIVE1          (0x10 + 1 * 0x20)
-#define HW_PWM_ACTIVE2          (0x10 + 2 * 0x20)
-#define HW_PWM_ACTIVE3          (0x10 + 3 * 0x20)
-
-#define HW_PWM_ACTIVEn          0x10
-#define BM_PWM_ACTIVEn_ACTIVE   0x0000FFFF
-#define BP_PWM_ACTIVEn_ACTIVE   0
-#define BM_PWM_ACTIVEn_INACTIVE 0xFFFF0000
-#define BP_PWM_ACTIVEn_INACTIVE 16
-
-#define HW_PWM_PERIOD0          (0x20 + 0 * 0x20)
-#define HW_PWM_PERIOD1          (0x20 + 1 * 0x20)
-#define HW_PWM_PERIOD2          (0x20 + 2 * 0x20)
-#define HW_PWM_PERIOD3          (0x20 + 3 * 0x20)
-
-#define HW_PWM_PERIODn          0x20
-#define BM_PWM_PERIODn_PERIOD   0x0000FFFF
-#define BP_PWM_PERIODn_PERIOD   0
-#define BM_PWM_PERIODn_ACTIVE_STATE     0x00030000
-#define BP_PWM_PERIODn_ACTIVE_STATE     16
-#define BM_PWM_PERIODn_INACTIVE_STATE   0x000C0000
-#define BP_PWM_PERIODn_INACTIVE_STATE   18
-#define BM_PWM_PERIODn_CDIV     0x00700000
-#define BP_PWM_PERIODn_CDIV     20
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-pxp.h b/arch/arm/mach-stmp378x/include/mach/regs-pxp.h
deleted file mode 100644
index 54d297896de8..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-pxp.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * stmp378x: PXP register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_PXP_BASE   (STMP3XXX_REGS_BASE + 0x2A000)
-#define REGS_PXP_PHYS   0x8002A000
-#define REGS_PXP_SIZE   0x2000
-
-#define HW_PXP_CTRL             0x0
-#define BM_PXP_CTRL_ENABLE      0x00000001
-#define BP_PXP_CTRL_ENABLE      0
-#define BM_PXP_CTRL_IRQ_ENABLE  0x00000002
-#define BM_PXP_CTRL_OUTPUT_RGB_FORMAT   0x000000F0
-#define BP_PXP_CTRL_OUTPUT_RGB_FORMAT   4
-#define BM_PXP_CTRL_ROTATE      0x00000300
-#define BP_PXP_CTRL_ROTATE      8
-#define BM_PXP_CTRL_HFLIP       0x00000400
-#define BM_PXP_CTRL_VFLIP       0x00000800
-#define BM_PXP_CTRL_S0_FORMAT   0x0000F000
-#define BP_PXP_CTRL_S0_FORMAT   12
-#define BM_PXP_CTRL_SCALE       0x00040000
-#define BM_PXP_CTRL_CROP        0x00080000
-
-#define HW_PXP_STAT             0x10
-#define BM_PXP_STAT_IRQ         0x00000001
-#define BP_PXP_STAT_IRQ         0
-
-#define HW_PXP_RGBBUF           0x20
-
-#define HW_PXP_RGBSIZE          0x40
-#define BM_PXP_RGBSIZE_HEIGHT   0x00000FFF
-#define BP_PXP_RGBSIZE_HEIGHT   0
-#define BM_PXP_RGBSIZE_WIDTH    0x00FFF000
-#define BP_PXP_RGBSIZE_WIDTH    12
-
-#define HW_PXP_S0BUF            0x50
-
-#define HW_PXP_S0UBUF           0x60
-
-#define HW_PXP_S0VBUF           0x70
-
-#define HW_PXP_S0PARAM          0x80
-#define BM_PXP_S0PARAM_HEIGHT   0x000000FF
-#define BP_PXP_S0PARAM_HEIGHT   0
-#define BM_PXP_S0PARAM_WIDTH    0x0000FF00
-#define BP_PXP_S0PARAM_WIDTH    8
-#define BM_PXP_S0PARAM_YBASE    0x00FF0000
-#define BP_PXP_S0PARAM_YBASE    16
-#define BM_PXP_S0PARAM_XBASE    0xFF000000
-#define BP_PXP_S0PARAM_XBASE    24
-
-#define HW_PXP_S0BACKGROUND     0x90
-
-#define HW_PXP_S0CROP           0xA0
-#define BM_PXP_S0CROP_HEIGHT    0x000000FF
-#define BP_PXP_S0CROP_HEIGHT    0
-#define BM_PXP_S0CROP_WIDTH     0x0000FF00
-#define BP_PXP_S0CROP_WIDTH     8
-#define BM_PXP_S0CROP_YBASE     0x00FF0000
-#define BP_PXP_S0CROP_YBASE     16
-#define BM_PXP_S0CROP_XBASE     0xFF000000
-#define BP_PXP_S0CROP_XBASE     24
-
-#define HW_PXP_S0SCALE          0xB0
-#define BM_PXP_S0SCALE_XSCALE   0x00003FFF
-#define BP_PXP_S0SCALE_XSCALE   0
-#define BM_PXP_S0SCALE_YSCALE   0x3FFF0000
-#define BP_PXP_S0SCALE_YSCALE   16
-
-#define HW_PXP_CSCCOEFF0        0xD0
-
-#define HW_PXP_CSCCOEFF1        0xE0
-
-#define HW_PXP_CSCCOEFF2        0xF0
-
-#define HW_PXP_S0COLORKEYLOW    0x180
-
-#define HW_PXP_S0COLORKEYHIGH   0x190
-
-#define HW_PXP_OL0              (0x200 + 0 * 0x40)
-#define HW_PXP_OL1              (0x200 + 1 * 0x40)
-#define HW_PXP_OL2              (0x200 + 2 * 0x40)
-#define HW_PXP_OL3              (0x200 + 3 * 0x40)
-#define HW_PXP_OL4              (0x200 + 4 * 0x40)
-#define HW_PXP_OL5              (0x200 + 5 * 0x40)
-#define HW_PXP_OL6              (0x200 + 6 * 0x40)
-#define HW_PXP_OL7              (0x200 + 7 * 0x40)
-
-#define HW_PXP_OLn              0x200
-
-#define HW_PXP_OL0SIZE          (0x210 + 0 * 0x40)
-#define HW_PXP_OL1SIZE          (0x210 + 1 * 0x40)
-#define HW_PXP_OL2SIZE          (0x210 + 2 * 0x40)
-#define HW_PXP_OL3SIZE          (0x210 + 3 * 0x40)
-#define HW_PXP_OL4SIZE          (0x210 + 4 * 0x40)
-#define HW_PXP_OL5SIZE          (0x210 + 5 * 0x40)
-#define HW_PXP_OL6SIZE          (0x210 + 6 * 0x40)
-#define HW_PXP_OL7SIZE          (0x210 + 7 * 0x40)
-
-#define HW_PXP_OLnSIZE          0x210
-#define BM_PXP_OLnSIZE_HEIGHT   0x000000FF
-#define BP_PXP_OLnSIZE_HEIGHT   0
-#define BM_PXP_OLnSIZE_WIDTH    0x0000FF00
-#define BP_PXP_OLnSIZE_WIDTH    8
-
-#define HW_PXP_OL0PARAM         (0x220 + 0 * 0x40)
-#define HW_PXP_OL1PARAM         (0x220 + 1 * 0x40)
-#define HW_PXP_OL2PARAM         (0x220 + 2 * 0x40)
-#define HW_PXP_OL3PARAM         (0x220 + 3 * 0x40)
-#define HW_PXP_OL4PARAM         (0x220 + 4 * 0x40)
-#define HW_PXP_OL5PARAM         (0x220 + 5 * 0x40)
-#define HW_PXP_OL6PARAM         (0x220 + 6 * 0x40)
-#define HW_PXP_OL7PARAM         (0x220 + 7 * 0x40)
-
-#define HW_PXP_OLnPARAM         0x220
-#define BM_PXP_OLnPARAM_ENABLE  0x00000001
-#define BP_PXP_OLnPARAM_ENABLE  0
-#define BM_PXP_OLnPARAM_ALPHA_CNTL      0x00000006
-#define BP_PXP_OLnPARAM_ALPHA_CNTL      1
-#define BM_PXP_OLnPARAM_ENABLE_COLORKEY 0x00000008
-#define BM_PXP_OLnPARAM_FORMAT  0x000000F0
-#define BP_PXP_OLnPARAM_FORMAT  4
-#define BM_PXP_OLnPARAM_ALPHA   0x0000FF00
-#define BP_PXP_OLnPARAM_ALPHA   8
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-rtc.h b/arch/arm/mach-stmp378x/include/mach/regs-rtc.h
deleted file mode 100644
index b8dbd6742d98..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-rtc.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * stmp378x: RTC register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_RTC_BASE   (STMP3XXX_REGS_BASE + 0x5C000)
-#define REGS_RTC_PHYS   0x8005C000
-#define REGS_RTC_SIZE   0x2000
-
-#define HW_RTC_CTRL             0x0
-#define BM_RTC_CTRL_ALARM_IRQ_EN        0x00000001
-#define BP_RTC_CTRL_ALARM_IRQ_EN        0
-#define BM_RTC_CTRL_ONEMSEC_IRQ_EN      0x00000002
-#define BM_RTC_CTRL_ALARM_IRQ   0x00000004
-#define BM_RTC_CTRL_ONEMSEC_IRQ 0x00000008
-#define BM_RTC_CTRL_WATCHDOGEN  0x00000010
-
-#define HW_RTC_STAT             0x10
-#define BM_RTC_STAT_NEW_REGS    0x0000FF00
-#define BP_RTC_STAT_NEW_REGS    8
-#define BM_RTC_STAT_STALE_REGS  0x00FF0000
-#define BP_RTC_STAT_STALE_REGS  16
-#define BM_RTC_STAT_RTC_PRESENT 0x80000000
-
-#define HW_RTC_SECONDS          0x30
-
-#define HW_RTC_ALARM            0x40
-
-#define HW_RTC_WATCHDOG         0x50
-
-#define HW_RTC_PERSISTENT0      0x60
-#define BM_RTC_PERSISTENT0_ALARM_WAKE_EN        0x00000002
-#define BM_RTC_PERSISTENT0_ALARM_EN     0x00000004
-#define BM_RTC_PERSISTENT0_XTAL24MHZ_PWRUP      0x00000010
-#define BM_RTC_PERSISTENT0_XTAL32KHZ_PWRUP      0x00000020
-#define BM_RTC_PERSISTENT0_ALARM_WAKE   0x00000080
-#define BM_RTC_PERSISTENT0_SPARE_ANALOG 0xFFFC0000
-#define BP_RTC_PERSISTENT0_SPARE_ANALOG 18
-
-#define HW_RTC_PERSISTENT1      0x70
-#define BM_RTC_PERSISTENT1_GENERAL      0xFFFFFFFF
-#define BP_RTC_PERSISTENT1_GENERAL      0
-
-#define HW_RTC_VERSION          0xD0
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-saif.h b/arch/arm/mach-stmp378x/include/mach/regs-saif.h
deleted file mode 100644
index 6df41762c2a3..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-saif.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * stmp378x: SAIF register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_SAIF_SIZE  0x2000
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-spdif.h b/arch/arm/mach-stmp378x/include/mach/regs-spdif.h
deleted file mode 100644
index 801539848c28..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-spdif.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * stmp378x: SPDIF register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_SPDIF_BASE (STMP3XXX_REGS_BASE + 0x54000)
-#define REGS_SPDIF_PHYS 0x80054000
-#define REGS_SPDIF_SIZE 0x2000
-
-#define HW_SPDIF_CTRL           0x0
-#define BM_SPDIF_CTRL_RUN       0x00000001
-#define BP_SPDIF_CTRL_RUN       0
-#define BM_SPDIF_CTRL_FIFO_ERROR_IRQ_EN 0x00000002
-#define BM_SPDIF_CTRL_FIFO_OVERFLOW_IRQ 0x00000004
-#define BM_SPDIF_CTRL_FIFO_UNDERFLOW_IRQ        0x00000008
-#define BM_SPDIF_CTRL_WORD_LENGTH       0x00000010
-#define BM_SPDIF_CTRL_CLKGATE   0x40000000
-#define BM_SPDIF_CTRL_SFTRST    0x80000000
-
-#define HW_SPDIF_STAT           0x10
-
-#define HW_SPDIF_FRAMECTRL      0x20
-
-#define HW_SPDIF_SRR            0x30
-#define BM_SPDIF_SRR_RATE       0x000FFFFF
-#define BP_SPDIF_SRR_RATE       0
-#define BM_SPDIF_SRR_BASEMULT   0x70000000
-#define BP_SPDIF_SRR_BASEMULT   28
-
-#define HW_SPDIF_DEBUG          0x40
-
-#define HW_SPDIF_DATA           0x50
-
-#define HW_SPDIF_VERSION        0x60
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-ssp.h b/arch/arm/mach-stmp378x/include/mach/regs-ssp.h
deleted file mode 100644
index 28aacf0f58ed..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-ssp.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * stmp378x: SSP register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_SSP1_BASE  (STMP3XXX_REGS_BASE + 0x10000)
-#define REGS_SSP1_PHYS  0x80010000
-#define REGS_SSP2_BASE  (STMP3XXX_REGS_BASE + 0x34000)
-#define REGS_SSP2_PHYS  0x80034000
-#define REGS_SSP_SIZE   0x2000
-
-#define HW_SSP_CTRL0            0x0
-#define BM_SSP_CTRL0_XFER_COUNT 0x0000FFFF
-#define BP_SSP_CTRL0_XFER_COUNT 0
-#define BM_SSP_CTRL0_ENABLE     0x00010000
-#define BM_SSP_CTRL0_GET_RESP   0x00020000
-#define BM_SSP_CTRL0_LONG_RESP  0x00080000
-#define BM_SSP_CTRL0_WAIT_FOR_CMD       0x00100000
-#define BM_SSP_CTRL0_WAIT_FOR_IRQ       0x00200000
-#define BM_SSP_CTRL0_BUS_WIDTH  0x00C00000
-#define BP_SSP_CTRL0_BUS_WIDTH  22
-#define BM_SSP_CTRL0_DATA_XFER  0x01000000
-#define BM_SSP_CTRL0_READ       0x02000000
-#define BM_SSP_CTRL0_IGNORE_CRC 0x04000000
-#define BM_SSP_CTRL0_LOCK_CS    0x08000000
-#define BM_SSP_CTRL0_RUN        0x20000000
-#define BM_SSP_CTRL0_CLKGATE    0x40000000
-#define BM_SSP_CTRL0_SFTRST     0x80000000
-
-#define HW_SSP_CMD0             0x10
-#define BM_SSP_CMD0_CMD         0x000000FF
-#define BP_SSP_CMD0_CMD         0
-#define BM_SSP_CMD0_BLOCK_COUNT 0x0000FF00
-#define BP_SSP_CMD0_BLOCK_COUNT 8
-#define BM_SSP_CMD0_BLOCK_SIZE  0x000F0000
-#define BP_SSP_CMD0_BLOCK_SIZE  16
-#define BM_SSP_CMD0_APPEND_8CYC 0x00100000
-#define BM_SSP_CMD1_CMD_ARG     0xFFFFFFFF
-#define BP_SSP_CMD1_CMD_ARG     0
-
-#define HW_SSP_TIMING           0x50
-#define BM_SSP_TIMING_CLOCK_RATE        0x000000FF
-#define BP_SSP_TIMING_CLOCK_RATE        0
-#define BM_SSP_TIMING_CLOCK_DIVIDE      0x0000FF00
-#define BP_SSP_TIMING_CLOCK_DIVIDE      8
-#define BM_SSP_TIMING_TIMEOUT   0xFFFF0000
-#define BP_SSP_TIMING_TIMEOUT   16
-
-#define HW_SSP_CTRL1            0x60
-#define BM_SSP_CTRL1_SSP_MODE   0x0000000F
-#define BP_SSP_CTRL1_SSP_MODE   0
-#define BM_SSP_CTRL1_WORD_LENGTH        0x000000F0
-#define BP_SSP_CTRL1_WORD_LENGTH        4
-#define BM_SSP_CTRL1_POLARITY   0x00000200
-#define BM_SSP_CTRL1_PHASE      0x00000400
-#define BM_SSP_CTRL1_DMA_ENABLE 0x00002000
-#define BM_SSP_CTRL1_FIFO_OVERRUN_IRQ   0x00008000
-#define BM_SSP_CTRL1_RECV_TIMEOUT_IRQ_EN        0x00010000
-#define BM_SSP_CTRL1_RECV_TIMEOUT_IRQ   0x00020000
-#define BM_SSP_CTRL1_FIFO_UNDERRUN_IRQ  0x00200000
-#define BM_SSP_CTRL1_DATA_CRC_IRQ_EN    0x00400000
-#define BM_SSP_CTRL1_DATA_CRC_IRQ       0x00800000
-#define BM_SSP_CTRL1_DATA_TIMEOUT_IRQ_EN        0x01000000
-#define BM_SSP_CTRL1_DATA_TIMEOUT_IRQ   0x02000000
-#define BM_SSP_CTRL1_RESP_TIMEOUT_IRQ_EN        0x04000000
-#define BM_SSP_CTRL1_RESP_TIMEOUT_IRQ   0x08000000
-#define BM_SSP_CTRL1_RESP_ERR_IRQ_EN    0x10000000
-#define BM_SSP_CTRL1_RESP_ERR_IRQ       0x20000000
-#define BM_SSP_CTRL1_SDIO_IRQ   0x80000000
-
-#define HW_SSP_DATA             0x70
-
-#define HW_SSP_SDRESP0          0x80
-
-#define HW_SSP_SDRESP1          0x90
-
-#define HW_SSP_SDRESP2          0xA0
-
-#define HW_SSP_SDRESP3          0xB0
-
-#define HW_SSP_STATUS           0xC0
-#define BM_SSP_STATUS_FIFO_EMPTY        0x00000020
-#define BM_SSP_STATUS_TIMEOUT   0x00001000
-#define BM_SSP_STATUS_RESP_TIMEOUT      0x00004000
-#define BM_SSP_STATUS_RESP_ERR  0x00008000
-#define BM_SSP_STATUS_RESP_CRC_ERR      0x00010000
-#define BM_SSP_STATUS_CARD_DETECT       0x10000000
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-sydma.h b/arch/arm/mach-stmp378x/include/mach/regs-sydma.h
deleted file mode 100644
index 08343a8b5566..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-sydma.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * stmp378x: SYDMA register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_SYDMA_BASE (STMP3XXX_REGS_BASE + 0x26000)
-#define REGS_SYDMA_PHYS 0x80026000
-#define REGS_SYDMA_SIZE 0x2000
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-timrot.h b/arch/arm/mach-stmp378x/include/mach/regs-timrot.h
deleted file mode 100644
index b5527957c67f..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-timrot.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * stmp378x: TIMROT register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_TIMROT
-#define _MACH_REGS_TIMROT
-
-#define REGS_TIMROT_BASE        (STMP3XXX_REGS_BASE + 0x68000)
-#define REGS_TIMROT_PHYS        0x80068000
-#define REGS_TIMROT_SIZE        0x2000
-
-#define HW_TIMROT_ROTCTRL       0x0
-#define BM_TIMROT_ROTCTRL_SELECT_A      0x00000007
-#define BP_TIMROT_ROTCTRL_SELECT_A      0
-#define BM_TIMROT_ROTCTRL_SELECT_B      0x00000070
-#define BP_TIMROT_ROTCTRL_SELECT_B      4
-#define BM_TIMROT_ROTCTRL_POLARITY_A    0x00000100
-#define BM_TIMROT_ROTCTRL_POLARITY_B    0x00000200
-#define BM_TIMROT_ROTCTRL_OVERSAMPLE    0x00000C00
-#define BP_TIMROT_ROTCTRL_OVERSAMPLE    10
-#define BM_TIMROT_ROTCTRL_RELATIVE      0x00001000
-#define BM_TIMROT_ROTCTRL_DIVIDER       0x003F0000
-#define BP_TIMROT_ROTCTRL_DIVIDER       16
-#define BM_TIMROT_ROTCTRL_ROTARY_PRESENT        0x20000000
-#define BM_TIMROT_ROTCTRL_CLKGATE       0x40000000
-#define BM_TIMROT_ROTCTRL_SFTRST        0x80000000
-
-#define HW_TIMROT_ROTCOUNT      0x10
-#define BM_TIMROT_ROTCOUNT_UPDOWN       0x0000FFFF
-#define BP_TIMROT_ROTCOUNT_UPDOWN       0
-
-#define HW_TIMROT_TIMCTRL0      (0x20 + 0 * 0x20)
-#define HW_TIMROT_TIMCTRL1      (0x20 + 1 * 0x20)
-#define HW_TIMROT_TIMCTRL2      (0x20 + 2 * 0x20)
-
-#define HW_TIMROT_TIMCTRLn      0x20
-#define BM_TIMROT_TIMCTRLn_SELECT       0x0000000F
-#define BP_TIMROT_TIMCTRLn_SELECT       0
-#define BM_TIMROT_TIMCTRLn_PRESCALE     0x00000030
-#define BP_TIMROT_TIMCTRLn_PRESCALE     4
-#define BM_TIMROT_TIMCTRLn_RELOAD       0x00000040
-#define BM_TIMROT_TIMCTRLn_UPDATE       0x00000080
-#define BM_TIMROT_TIMCTRLn_IRQ_EN       0x00004000
-#define BM_TIMROT_TIMCTRLn_IRQ  0x00008000
-
-#define HW_TIMROT_TIMCOUNT0     (0x30 + 0 * 0x20)
-#define HW_TIMROT_TIMCOUNT1     (0x30 + 1 * 0x20)
-#define HW_TIMROT_TIMCOUNT2     (0x30 + 2 * 0x20)
-
-#define HW_TIMROT_TIMCOUNTn     0x30
-
-#endif
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-tvenc.h b/arch/arm/mach-stmp378x/include/mach/regs-tvenc.h
deleted file mode 100644
index 7f895cb34350..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-tvenc.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * stmp378x: TVENC register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_TVENC_BASE (STMP3XXX_REGS_BASE + 0x38000)
-#define REGS_TVENC_PHYS 0x80038000
-#define REGS_TVENC_SIZE 0x2000
-
-#define HW_TVENC_CTRL           0x0
-#define BM_TVENC_CTRL_CLKGATE   0x40000000
-#define BM_TVENC_CTRL_SFTRST    0x80000000
-
-#define HW_TVENC_CONFIG         0x10
-#define BM_TVENC_CONFIG_ENCD_MODE       0x00000007
-#define BP_TVENC_CONFIG_ENCD_MODE       0
-#define BM_TVENC_CONFIG_SYNC_MODE       0x00000070
-#define BP_TVENC_CONFIG_SYNC_MODE       4
-#define BM_TVENC_CONFIG_FSYNC_PHS       0x00000200
-#define BM_TVENC_CONFIG_CGAIN   0x0000C000
-#define BP_TVENC_CONFIG_CGAIN   14
-#define BM_TVENC_CONFIG_YGAIN_SEL       0x00030000
-#define BP_TVENC_CONFIG_YGAIN_SEL       16
-#define BM_TVENC_CONFIG_PAL_SHAPE       0x00100000
-
-#define HW_TVENC_SYNCOFFSET     0x30
-
-#define HW_TVENC_COLORSUB0      0xC0
-
-#define HW_TVENC_COLORBURST     0x140
-#define BM_TVENC_COLORBURST_PBA 0x00FF0000
-#define BP_TVENC_COLORBURST_PBA 16
-#define BM_TVENC_COLORBURST_NBA 0xFF000000
-#define BP_TVENC_COLORBURST_NBA 24
-
-#define HW_TVENC_MACROVISION0   0x150
-
-#define HW_TVENC_MACROVISION1   0x160
-
-#define HW_TVENC_MACROVISION2   0x170
-
-#define HW_TVENC_MACROVISION3   0x180
-
-#define HW_TVENC_MACROVISION4   0x190
-
-#define HW_TVENC_DACCTRL        0x1A0
-#define BM_TVENC_DACCTRL_RVAL   0x00000070
-#define BP_TVENC_DACCTRL_RVAL   4
-#define BM_TVENC_DACCTRL_DUMP_TOVDD1    0x00000100
-#define BM_TVENC_DACCTRL_PWRUP1 0x00001000
-#define BM_TVENC_DACCTRL_GAINUP 0x00040000
-#define BM_TVENC_DACCTRL_GAINDN 0x00080000
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-uartapp.h b/arch/arm/mach-stmp378x/include/mach/regs-uartapp.h
deleted file mode 100644
index a251e68bb3a1..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-uartapp.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * stmp378x: UARTAPP register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_UARTAPP1_BASE      (STMP3XXX_REGS_BASE + 0x6C000)
-#define REGS_UARTAPP1_PHYS      0x8006C000
-#define REGS_UARTAPP2_BASE      (STMP3XXX_REGS_BASE + 0x6E000)
-#define REGS_UARTAPP2_PHYS      0x8006E000
-#define REGS_UARTAPP_SIZE       0x2000
-
-#define HW_UARTAPP_CTRL0        0x0
-#define BM_UARTAPP_CTRL0_XFER_COUNT     0x0000FFFF
-#define BP_UARTAPP_CTRL0_XFER_COUNT     0
-#define BM_UARTAPP_CTRL0_RXTIMEOUT      0x07FF0000
-#define BP_UARTAPP_CTRL0_RXTIMEOUT      16
-#define BM_UARTAPP_CTRL0_RXTO_ENABLE    0x08000000
-#define BM_UARTAPP_CTRL0_RUN    0x20000000
-#define BM_UARTAPP_CTRL0_SFTRST 0x80000000
-#define BM_UARTAPP_CTRL1_XFER_COUNT     0x0000FFFF
-#define BP_UARTAPP_CTRL1_XFER_COUNT     0
-#define BM_UARTAPP_CTRL1_RUN    0x10000000
-
-#define HW_UARTAPP_CTRL2        0x20
-#define BM_UARTAPP_CTRL2_UARTEN 0x00000001
-#define BP_UARTAPP_CTRL2_UARTEN 0
-#define BM_UARTAPP_CTRL2_TXE    0x00000100
-#define BM_UARTAPP_CTRL2_RXE    0x00000200
-#define BM_UARTAPP_CTRL2_RTS    0x00000800
-#define BM_UARTAPP_CTRL2_RTSEN  0x00004000
-#define BM_UARTAPP_CTRL2_CTSEN  0x00008000
-#define BM_UARTAPP_CTRL2_RXDMAE 0x01000000
-#define BM_UARTAPP_CTRL2_TXDMAE 0x02000000
-#define BM_UARTAPP_CTRL2_DMAONERR       0x04000000
-
-#define HW_UARTAPP_LINECTRL     0x30
-#define BM_UARTAPP_LINECTRL_BRK 0x00000001
-#define BP_UARTAPP_LINECTRL_BRK 0
-#define BM_UARTAPP_LINECTRL_PEN 0x00000002
-#define BM_UARTAPP_LINECTRL_EPS 0x00000004
-#define BM_UARTAPP_LINECTRL_STP2        0x00000008
-#define BM_UARTAPP_LINECTRL_FEN 0x00000010
-#define BM_UARTAPP_LINECTRL_WLEN        0x00000060
-#define BP_UARTAPP_LINECTRL_WLEN        5
-#define BM_UARTAPP_LINECTRL_SPS 0x00000080
-#define BM_UARTAPP_LINECTRL_BAUD_DIVFRAC        0x00003F00
-#define BP_UARTAPP_LINECTRL_BAUD_DIVFRAC        8
-#define BM_UARTAPP_LINECTRL_BAUD_DIVINT 0xFFFF0000
-#define BP_UARTAPP_LINECTRL_BAUD_DIVINT 16
-
-#define HW_UARTAPP_INTR         0x50
-#define BM_UARTAPP_INTR_CTSMIS  0x00000002
-#define BM_UARTAPP_INTR_RTIS    0x00000040
-#define BM_UARTAPP_INTR_CTSMIEN 0x00020000
-#define BM_UARTAPP_INTR_RXIEN   0x00100000
-#define BM_UARTAPP_INTR_RTIEN   0x00400000
-
-#define HW_UARTAPP_DATA         0x60
-
-#define HW_UARTAPP_STAT         0x70
-#define BM_UARTAPP_STAT_RXCOUNT 0x0000FFFF
-#define BP_UARTAPP_STAT_RXCOUNT 0
-#define BM_UARTAPP_STAT_FERR    0x00010000
-#define BM_UARTAPP_STAT_PERR    0x00020000
-#define BM_UARTAPP_STAT_BERR    0x00040000
-#define BM_UARTAPP_STAT_OERR    0x00080000
-#define BM_UARTAPP_STAT_RXFE    0x01000000
-#define BM_UARTAPP_STAT_TXFF    0x02000000
-#define BM_UARTAPP_STAT_TXFE    0x08000000
-#define BM_UARTAPP_STAT_CTS     0x10000000
-
-#define HW_UARTAPP_VERSION      0x90
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h b/arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h
deleted file mode 100644
index b810deb552a9..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * stmp378x: UARTDBG register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_UARTDBG_BASE       (STMP3XXX_REGS_BASE + 0x70000)
-#define REGS_UARTDBG_PHYS       0x80070000
-#define REGS_UARTDBG_SIZE       0x2000
-
-#define HW_UARTDBGDR 0x00000000
-#define BP_UARTDBGDR_UNAVAILABLE      16
-#define BM_UARTDBGDR_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGDR_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGDR_UNAVAILABLE)
-#define BP_UARTDBGDR_RESERVED      12
-#define BM_UARTDBGDR_RESERVED 0x0000F000
-#define BF_UARTDBGDR_RESERVED(v)  \
-        (((v) << 12) & BM_UARTDBGDR_RESERVED)
-#define BM_UARTDBGDR_OE 0x00000800
-#define BM_UARTDBGDR_BE 0x00000400
-#define BM_UARTDBGDR_PE 0x00000200
-#define BM_UARTDBGDR_FE 0x00000100
-#define BP_UARTDBGDR_DATA      0
-#define BM_UARTDBGDR_DATA 0x000000FF
-#define BF_UARTDBGDR_DATA(v)  \
-        (((v) << 0) & BM_UARTDBGDR_DATA)
-#define HW_UARTDBGRSR_ECR 0x00000004
-#define BP_UARTDBGRSR_ECR_UNAVAILABLE      8
-#define BM_UARTDBGRSR_ECR_UNAVAILABLE 0xFFFFFF00
-#define BF_UARTDBGRSR_ECR_UNAVAILABLE(v) \
-        (((v) << 8) & BM_UARTDBGRSR_ECR_UNAVAILABLE)
-#define BP_UARTDBGRSR_ECR_EC      4
-#define BM_UARTDBGRSR_ECR_EC 0x000000F0
-#define BF_UARTDBGRSR_ECR_EC(v)  \
-        (((v) << 4) & BM_UARTDBGRSR_ECR_EC)
-#define BM_UARTDBGRSR_ECR_OE 0x00000008
-#define BM_UARTDBGRSR_ECR_BE 0x00000004
-#define BM_UARTDBGRSR_ECR_PE 0x00000002
-#define BM_UARTDBGRSR_ECR_FE 0x00000001
-#define HW_UARTDBGFR 0x00000018
-#define BP_UARTDBGFR_UNAVAILABLE      16
-#define BM_UARTDBGFR_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGFR_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGFR_UNAVAILABLE)
-#define BP_UARTDBGFR_RESERVED      9
-#define BM_UARTDBGFR_RESERVED 0x0000FE00
-#define BF_UARTDBGFR_RESERVED(v)  \
-        (((v) << 9) & BM_UARTDBGFR_RESERVED)
-#define BM_UARTDBGFR_RI 0x00000100
-#define BM_UARTDBGFR_TXFE 0x00000080
-#define BM_UARTDBGFR_RXFF 0x00000040
-#define BM_UARTDBGFR_TXFF 0x00000020
-#define BM_UARTDBGFR_RXFE 0x00000010
-#define BM_UARTDBGFR_BUSY 0x00000008
-#define BM_UARTDBGFR_DCD 0x00000004
-#define BM_UARTDBGFR_DSR 0x00000002
-#define BM_UARTDBGFR_CTS 0x00000001
-#define HW_UARTDBGILPR 0x00000020
-#define BP_UARTDBGILPR_UNAVAILABLE      8
-#define BM_UARTDBGILPR_UNAVAILABLE 0xFFFFFF00
-#define BF_UARTDBGILPR_UNAVAILABLE(v) \
-        (((v) << 8) & BM_UARTDBGILPR_UNAVAILABLE)
-#define BP_UARTDBGILPR_ILPDVSR      0
-#define BM_UARTDBGILPR_ILPDVSR 0x000000FF
-#define BF_UARTDBGILPR_ILPDVSR(v)  \
-        (((v) << 0) & BM_UARTDBGILPR_ILPDVSR)
-#define HW_UARTDBGIBRD 0x00000024
-#define BP_UARTDBGIBRD_UNAVAILABLE      16
-#define BM_UARTDBGIBRD_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGIBRD_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGIBRD_UNAVAILABLE)
-#define BP_UARTDBGIBRD_BAUD_DIVINT      0
-#define BM_UARTDBGIBRD_BAUD_DIVINT 0x0000FFFF
-#define BF_UARTDBGIBRD_BAUD_DIVINT(v)  \
-        (((v) << 0) & BM_UARTDBGIBRD_BAUD_DIVINT)
-#define HW_UARTDBGFBRD 0x00000028
-#define BP_UARTDBGFBRD_UNAVAILABLE      8
-#define BM_UARTDBGFBRD_UNAVAILABLE 0xFFFFFF00
-#define BF_UARTDBGFBRD_UNAVAILABLE(v) \
-        (((v) << 8) & BM_UARTDBGFBRD_UNAVAILABLE)
-#define BP_UARTDBGFBRD_RESERVED      6
-#define BM_UARTDBGFBRD_RESERVED 0x000000C0
-#define BF_UARTDBGFBRD_RESERVED(v)  \
-        (((v) << 6) & BM_UARTDBGFBRD_RESERVED)
-#define BP_UARTDBGFBRD_BAUD_DIVFRAC      0
-#define BM_UARTDBGFBRD_BAUD_DIVFRAC 0x0000003F
-#define BF_UARTDBGFBRD_BAUD_DIVFRAC(v)  \
-        (((v) << 0) & BM_UARTDBGFBRD_BAUD_DIVFRAC)
-#define HW_UARTDBGLCR_H 0x0000002c
-#define BP_UARTDBGLCR_H_UNAVAILABLE      16
-#define BM_UARTDBGLCR_H_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGLCR_H_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGLCR_H_UNAVAILABLE)
-#define BP_UARTDBGLCR_H_RESERVED      8
-#define BM_UARTDBGLCR_H_RESERVED 0x0000FF00
-#define BF_UARTDBGLCR_H_RESERVED(v)  \
-        (((v) << 8) & BM_UARTDBGLCR_H_RESERVED)
-#define BM_UARTDBGLCR_H_SPS 0x00000080
-#define BP_UARTDBGLCR_H_WLEN      5
-#define BM_UARTDBGLCR_H_WLEN 0x00000060
-#define BF_UARTDBGLCR_H_WLEN(v)  \
-        (((v) << 5) & BM_UARTDBGLCR_H_WLEN)
-#define BM_UARTDBGLCR_H_FEN 0x00000010
-#define BM_UARTDBGLCR_H_STP2 0x00000008
-#define BM_UARTDBGLCR_H_EPS 0x00000004
-#define BM_UARTDBGLCR_H_PEN 0x00000002
-#define BM_UARTDBGLCR_H_BRK 0x00000001
-#define HW_UARTDBGCR 0x00000030
-#define BP_UARTDBGCR_UNAVAILABLE      16
-#define BM_UARTDBGCR_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGCR_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGCR_UNAVAILABLE)
-#define BM_UARTDBGCR_CTSEN 0x00008000
-#define BM_UARTDBGCR_RTSEN 0x00004000
-#define BM_UARTDBGCR_OUT2 0x00002000
-#define BM_UARTDBGCR_OUT1 0x00001000
-#define BM_UARTDBGCR_RTS 0x00000800
-#define BM_UARTDBGCR_DTR 0x00000400
-#define BM_UARTDBGCR_RXE 0x00000200
-#define BM_UARTDBGCR_TXE 0x00000100
-#define BM_UARTDBGCR_LBE 0x00000080
-#define BP_UARTDBGCR_RESERVED      3
-#define BM_UARTDBGCR_RESERVED 0x00000078
-#define BF_UARTDBGCR_RESERVED(v)  \
-        (((v) << 3) & BM_UARTDBGCR_RESERVED)
-#define BM_UARTDBGCR_SIRLP 0x00000004
-#define BM_UARTDBGCR_SIREN 0x00000002
-#define BM_UARTDBGCR_UARTEN 0x00000001
-#define HW_UARTDBGIFLS 0x00000034
-#define BP_UARTDBGIFLS_UNAVAILABLE      16
-#define BM_UARTDBGIFLS_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGIFLS_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGIFLS_UNAVAILABLE)
-#define BP_UARTDBGIFLS_RESERVED      6
-#define BM_UARTDBGIFLS_RESERVED 0x0000FFC0
-#define BF_UARTDBGIFLS_RESERVED(v)  \
-        (((v) << 6) & BM_UARTDBGIFLS_RESERVED)
-#define BP_UARTDBGIFLS_RXIFLSEL      3
-#define BM_UARTDBGIFLS_RXIFLSEL 0x00000038
-#define BF_UARTDBGIFLS_RXIFLSEL(v)  \
-        (((v) << 3) & BM_UARTDBGIFLS_RXIFLSEL)
-#define BV_UARTDBGIFLS_RXIFLSEL__NOT_EMPTY      0x0
-#define BV_UARTDBGIFLS_RXIFLSEL__ONE_QUARTER    0x1
-#define BV_UARTDBGIFLS_RXIFLSEL__ONE_HALF       0x2
-#define BV_UARTDBGIFLS_RXIFLSEL__THREE_QUARTERS 0x3
-#define BV_UARTDBGIFLS_RXIFLSEL__SEVEN_EIGHTHS  0x4
-#define BV_UARTDBGIFLS_RXIFLSEL__INVALID5       0x5
-#define BV_UARTDBGIFLS_RXIFLSEL__INVALID6       0x6
-#define BV_UARTDBGIFLS_RXIFLSEL__INVALID7       0x7
-#define BP_UARTDBGIFLS_TXIFLSEL      0
-#define BM_UARTDBGIFLS_TXIFLSEL 0x00000007
-#define BF_UARTDBGIFLS_TXIFLSEL(v)  \
-        (((v) << 0) & BM_UARTDBGIFLS_TXIFLSEL)
-#define BV_UARTDBGIFLS_TXIFLSEL__EMPTY    0x0
-#define BV_UARTDBGIFLS_TXIFLSEL__ONE_QUARTER    0x1
-#define BV_UARTDBGIFLS_TXIFLSEL__ONE_HALF       0x2
-#define BV_UARTDBGIFLS_TXIFLSEL__THREE_QUARTERS 0x3
-#define BV_UARTDBGIFLS_TXIFLSEL__SEVEN_EIGHTHS  0x4
-#define BV_UARTDBGIFLS_TXIFLSEL__INVALID5       0x5
-#define BV_UARTDBGIFLS_TXIFLSEL__INVALID6       0x6
-#define BV_UARTDBGIFLS_TXIFLSEL__INVALID7       0x7
-#define HW_UARTDBGIMSC 0x00000038
-#define BP_UARTDBGIMSC_UNAVAILABLE      16
-#define BM_UARTDBGIMSC_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGIMSC_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGIMSC_UNAVAILABLE)
-#define BP_UARTDBGIMSC_RESERVED      11
-#define BM_UARTDBGIMSC_RESERVED 0x0000F800
-#define BF_UARTDBGIMSC_RESERVED(v)  \
-        (((v) << 11) & BM_UARTDBGIMSC_RESERVED)
-#define BM_UARTDBGIMSC_OEIM 0x00000400
-#define BM_UARTDBGIMSC_BEIM 0x00000200
-#define BM_UARTDBGIMSC_PEIM 0x00000100
-#define BM_UARTDBGIMSC_FEIM 0x00000080
-#define BM_UARTDBGIMSC_RTIM 0x00000040
-#define BM_UARTDBGIMSC_TXIM 0x00000020
-#define BM_UARTDBGIMSC_RXIM 0x00000010
-#define BM_UARTDBGIMSC_DSRMIM 0x00000008
-#define BM_UARTDBGIMSC_DCDMIM 0x00000004
-#define BM_UARTDBGIMSC_CTSMIM 0x00000002
-#define BM_UARTDBGIMSC_RIMIM 0x00000001
-#define HW_UARTDBGRIS 0x0000003c
-#define BP_UARTDBGRIS_UNAVAILABLE      16
-#define BM_UARTDBGRIS_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGRIS_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGRIS_UNAVAILABLE)
-#define BP_UARTDBGRIS_RESERVED      11
-#define BM_UARTDBGRIS_RESERVED 0x0000F800
-#define BF_UARTDBGRIS_RESERVED(v)  \
-        (((v) << 11) & BM_UARTDBGRIS_RESERVED)
-#define BM_UARTDBGRIS_OERIS 0x00000400
-#define BM_UARTDBGRIS_BERIS 0x00000200
-#define BM_UARTDBGRIS_PERIS 0x00000100
-#define BM_UARTDBGRIS_FERIS 0x00000080
-#define BM_UARTDBGRIS_RTRIS 0x00000040
-#define BM_UARTDBGRIS_TXRIS 0x00000020
-#define BM_UARTDBGRIS_RXRIS 0x00000010
-#define BM_UARTDBGRIS_DSRRMIS 0x00000008
-#define BM_UARTDBGRIS_DCDRMIS 0x00000004
-#define BM_UARTDBGRIS_CTSRMIS 0x00000002
-#define BM_UARTDBGRIS_RIRMIS 0x00000001
-#define HW_UARTDBGMIS 0x00000040
-#define BP_UARTDBGMIS_UNAVAILABLE      16
-#define BM_UARTDBGMIS_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGMIS_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGMIS_UNAVAILABLE)
-#define BP_UARTDBGMIS_RESERVED      11
-#define BM_UARTDBGMIS_RESERVED 0x0000F800
-#define BF_UARTDBGMIS_RESERVED(v)  \
-        (((v) << 11) & BM_UARTDBGMIS_RESERVED)
-#define BM_UARTDBGMIS_OEMIS 0x00000400
-#define BM_UARTDBGMIS_BEMIS 0x00000200
-#define BM_UARTDBGMIS_PEMIS 0x00000100
-#define BM_UARTDBGMIS_FEMIS 0x00000080
-#define BM_UARTDBGMIS_RTMIS 0x00000040
-#define BM_UARTDBGMIS_TXMIS 0x00000020
-#define BM_UARTDBGMIS_RXMIS 0x00000010
-#define BM_UARTDBGMIS_DSRMMIS 0x00000008
-#define BM_UARTDBGMIS_DCDMMIS 0x00000004
-#define BM_UARTDBGMIS_CTSMMIS 0x00000002
-#define BM_UARTDBGMIS_RIMMIS 0x00000001
-#define HW_UARTDBGICR 0x00000044
-#define BP_UARTDBGICR_UNAVAILABLE      16
-#define BM_UARTDBGICR_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGICR_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGICR_UNAVAILABLE)
-#define BP_UARTDBGICR_RESERVED      11
-#define BM_UARTDBGICR_RESERVED 0x0000F800
-#define BF_UARTDBGICR_RESERVED(v)  \
-        (((v) << 11) & BM_UARTDBGICR_RESERVED)
-#define BM_UARTDBGICR_OEIC 0x00000400
-#define BM_UARTDBGICR_BEIC 0x00000200
-#define BM_UARTDBGICR_PEIC 0x00000100
-#define BM_UARTDBGICR_FEIC 0x00000080
-#define BM_UARTDBGICR_RTIC 0x00000040
-#define BM_UARTDBGICR_TXIC 0x00000020
-#define BM_UARTDBGICR_RXIC 0x00000010
-#define BM_UARTDBGICR_DSRMIC 0x00000008
-#define BM_UARTDBGICR_DCDMIC 0x00000004
-#define BM_UARTDBGICR_CTSMIC 0x00000002
-#define BM_UARTDBGICR_RIMIC 0x00000001
-#define HW_UARTDBGDMACR 0x00000048
-#define BP_UARTDBGDMACR_UNAVAILABLE      16
-#define BM_UARTDBGDMACR_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGDMACR_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGDMACR_UNAVAILABLE)
-#define BP_UARTDBGDMACR_RESERVED      3
-#define BM_UARTDBGDMACR_RESERVED 0x0000FFF8
-#define BF_UARTDBGDMACR_RESERVED(v)  \
-        (((v) << 3) & BM_UARTDBGDMACR_RESERVED)
-#define BM_UARTDBGDMACR_DMAONERR 0x00000004
-#define BM_UARTDBGDMACR_TXDMAE 0x00000002
-#define BM_UARTDBGDMACR_RXDMAE 0x00000001
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h b/arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h
deleted file mode 100644
index 25112c1aa608..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * stmp378x: USBCTRL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_USBCTRL_BASE       (STMP3XXX_REGS_BASE + 0x80000)
-#define REGS_USBCTRL_PHYS       0x80080000
-#define REGS_USBCTRL_SIZE       0x2000
-
-#define HW_USBCTRL_USBCMD       0x140
-#define BM_USBCTRL_USBCMD_RS    0x00000001
-#define BP_USBCTRL_USBCMD_RS    0
-#define BM_USBCTRL_USBCMD_RST   0x00000002
-
-#define HW_USBCTRL_USBINTR      0x148
-#define BM_USBCTRL_USBINTR_UE   0x00000001
-#define BP_USBCTRL_USBINTR_UE   0
-
-#define HW_USBCTRL_PORTSC1      0x184
-#define BM_USBCTRL_PORTSC1_PHCD 0x00800000
-
-#define HW_USBCTRL_OTGSC        0x1A4
-#define BM_USBCTRL_OTGSC_ID     0x00000100
-#define BM_USBCTRL_OTGSC_IDIS   0x00010000
-#define BM_USBCTRL_OTGSC_IDIE   0x01000000
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-usbphy.h b/arch/arm/mach-stmp378x/include/mach/regs-usbphy.h
deleted file mode 100644
index 11f3b732dc92..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-usbphy.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * stmp378x: USBPHY register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_USBPHY_BASE        (STMP3XXX_REGS_BASE + 0x7C000)
-#define REGS_USBPHY_PHYS        0x8007C000
-#define REGS_USBPHY_SIZE        0x2000
-
-#define HW_USBPHY_PWD           0x0
-
-#define HW_USBPHY_CTRL          0x30
-#define BM_USBPHY_CTRL_ENHOSTDISCONDETECT       0x00000002
-#define BM_USBPHY_CTRL_ENDEVPLUGINDETECT        0x00000010
-#define BM_USBPHY_CTRL_ENOTGIDDETECT    0x00000080
-#define BM_USBPHY_CTRL_ENIRQDEVPLUGIN   0x00000800
-#define BM_USBPHY_CTRL_CLKGATE  0x40000000
-#define BM_USBPHY_CTRL_SFTRST   0x80000000
-
-#define HW_USBPHY_STATUS        0x40
-#define BM_USBPHY_STATUS_DEVPLUGIN_STATUS       0x00000040
-#define BM_USBPHY_STATUS_OTGID_STATUS   0x00000100
diff --git a/arch/arm/mach-stmp378x/stmp378x.c b/arch/arm/mach-stmp378x/stmp378x.c
deleted file mode 100644
index c2f9fe04c112..000000000000
--- a/arch/arm/mach-stmp378x/stmp378x.c
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Freescale STMP378X platform support
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/irq.h>
-#include <linux/dma-mapping.h>
-
-#include <asm/dma.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/irq.h>
-#include <asm/mach/map.h>
-#include <asm/mach/time.h>
-
-#include <mach/pins.h>
-#include <mach/pinmux.h>
-#include <mach/dma.h>
-#include <mach/hardware.h>
-#include <mach/system.h>
-#include <mach/platform.h>
-#include <mach/stmp3xxx.h>
-#include <mach/regs-icoll.h>
-#include <mach/regs-apbh.h>
-#include <mach/regs-apbx.h>
-#include <mach/regs-pxp.h>
-#include <mach/regs-i2c.h>
-
-#include "stmp378x.h"
-/*
- * IRQ handling
- */
-static void stmp378x_ack_irq(struct irq_data *d)
-{
-        /* Tell ICOLL to release IRQ line */
-        __raw_writel(0, REGS_ICOLL_BASE + HW_ICOLL_VECTOR);
-
-        /* ACK current interrupt */
-        __raw_writel(0x01 /* BV_ICOLL_LEVELACK_IRQLEVELACK__LEVEL0 */,
-                        REGS_ICOLL_BASE + HW_ICOLL_LEVELACK);
-
-        /* Barrier */
-        (void)__raw_readl(REGS_ICOLL_BASE + HW_ICOLL_STAT);
-}
-
-static void stmp378x_mask_irq(struct irq_data *d)
-{
-        /* IRQ disable */
-        stmp3xxx_clearl(BM_ICOLL_INTERRUPTn_ENABLE,
-                        REGS_ICOLL_BASE + HW_ICOLL_INTERRUPTn + d->irq * 0x10);
-}
-
-static void stmp378x_unmask_irq(struct irq_data *d)
-{
-        /* IRQ enable */
-        stmp3xxx_setl(BM_ICOLL_INTERRUPTn_ENABLE,
-                      REGS_ICOLL_BASE + HW_ICOLL_INTERRUPTn + d->irq * 0x10);
-}
-
-static struct irq_chip stmp378x_chip = {
-        .irq_ack        = stmp378x_ack_irq,
-        .irq_mask       = stmp378x_mask_irq,
-        .irq_unmask     = stmp378x_unmask_irq,
-};
-
-void __init stmp378x_init_irq(void)
-{
-        stmp3xxx_init_irq(&stmp378x_chip);
-}
-
-/*
- * DMA interrupt handling
- */
-void stmp3xxx_arch_dma_enable_interrupt(int channel)
-{
-        void __iomem *c1, *c2;
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                c1 = REGS_APBH_BASE + HW_APBH_CTRL1;
-                c2 = REGS_APBH_BASE + HW_APBH_CTRL2;
-                break;
-
-        case STMP3XXX_BUS_APBX:
-                c1 = REGS_APBX_BASE + HW_APBX_CTRL1;
-                c2 = REGS_APBX_BASE + HW_APBX_CTRL2;
-                break;
-
-        default:
-                return;
-        }
-        stmp3xxx_setl(1 << (16 + STMP3XXX_DMA_CHANNEL(channel)), c1);
-        stmp3xxx_setl(1 << (16 + STMP3XXX_DMA_CHANNEL(channel)), c2);
-}
-EXPORT_SYMBOL(stmp3xxx_arch_dma_enable_interrupt);
-
-void stmp3xxx_arch_dma_clear_interrupt(int channel)
-{
-        void __iomem *c1, *c2;
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                c1 = REGS_APBH_BASE + HW_APBH_CTRL1;
-                c2 = REGS_APBH_BASE + HW_APBH_CTRL2;
-                break;
-
-        case STMP3XXX_BUS_APBX:
-                c1 = REGS_APBX_BASE + HW_APBX_CTRL1;
-                c2 = REGS_APBX_BASE + HW_APBX_CTRL2;
-                break;
-
-        default:
-                return;
-        }
-        stmp3xxx_clearl(1 << STMP3XXX_DMA_CHANNEL(channel), c1);
-        stmp3xxx_clearl(1 << STMP3XXX_DMA_CHANNEL(channel), c2);
-}
-EXPORT_SYMBOL(stmp3xxx_arch_dma_clear_interrupt);
-
-int stmp3xxx_arch_dma_is_interrupt(int channel)
-{
-        int r = 0;
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                r = __raw_readl(REGS_APBH_BASE + HW_APBH_CTRL1) &
-                        (1 << STMP3XXX_DMA_CHANNEL(channel));
-                break;
-
-        case STMP3XXX_BUS_APBX:
-                r = __raw_readl(REGS_APBX_BASE + HW_APBX_CTRL1) &
-                        (1 << STMP3XXX_DMA_CHANNEL(channel));
-                break;
-        }
-        return r;
-}
-EXPORT_SYMBOL(stmp3xxx_arch_dma_is_interrupt);
-
-void stmp3xxx_arch_dma_reset_channel(int channel)
-{
-        unsigned chbit = 1 << STMP3XXX_DMA_CHANNEL(channel);
-        void __iomem *c0;
-        u32 mask;
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                c0 = REGS_APBH_BASE + HW_APBH_CTRL0;
-                mask = chbit << BP_APBH_CTRL0_RESET_CHANNEL;
-                break;
-        case STMP3XXX_BUS_APBX:
-                c0 = REGS_APBX_BASE + HW_APBX_CHANNEL_CTRL;
-                mask = chbit << BP_APBX_CHANNEL_CTRL_RESET_CHANNEL;
-                break;
-        default:
-                return;
-        }
-
-        /* Reset channel and wait for it to complete */
-        stmp3xxx_setl(mask, c0);
-        while (__raw_readl(c0) & mask)
-                cpu_relax();
-}
-EXPORT_SYMBOL(stmp3xxx_arch_dma_reset_channel);
-
-void stmp3xxx_arch_dma_freeze(int channel)
-{
-        unsigned chbit = 1 << STMP3XXX_DMA_CHANNEL(channel);
-        u32 mask = 1 << chbit;
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                stmp3xxx_setl(mask, REGS_APBH_BASE + HW_APBH_CTRL0);
-                break;
-        case STMP3XXX_BUS_APBX:
-                stmp3xxx_setl(mask, REGS_APBX_BASE + HW_APBX_CHANNEL_CTRL);
-                break;
-        }
-}
-EXPORT_SYMBOL(stmp3xxx_arch_dma_freeze);
-
-void stmp3xxx_arch_dma_unfreeze(int channel)
-{
-        unsigned chbit = 1 << STMP3XXX_DMA_CHANNEL(channel);
-        u32 mask = 1 << chbit;
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                stmp3xxx_clearl(mask, REGS_APBH_BASE + HW_APBH_CTRL0);
-                break;
-        case STMP3XXX_BUS_APBX:
-                stmp3xxx_clearl(mask, REGS_APBX_BASE + HW_APBX_CHANNEL_CTRL);
-                break;
-        }
-}
-EXPORT_SYMBOL(stmp3xxx_arch_dma_unfreeze);
-
-/*
- * The registers are all very closely mapped, so we might as well map them all
- * with a single mapping
- *
- * Logical      Physical
- * f0000000     80000000        On-chip registers
- * f1000000     00000000        32k on-chip SRAM
- */
-
-static struct map_desc stmp378x_io_desc[] __initdata = {
-        {
-                .virtual        = (u32)STMP3XXX_REGS_BASE,
-                .pfn            = __phys_to_pfn(STMP3XXX_REGS_PHBASE),
-                .length         = STMP3XXX_REGS_SIZE,
-                .type           = MT_DEVICE,
-        },
-        {
-                .virtual        = (u32)STMP3XXX_OCRAM_BASE,
-                .pfn            = __phys_to_pfn(STMP3XXX_OCRAM_PHBASE),
-                .length         = STMP3XXX_OCRAM_SIZE,
-                .type           = MT_DEVICE,
-        },
-};
-
-
-static u64 common_dmamask = DMA_BIT_MASK(32);
-
-/*
- * devices that are present only on stmp378x, not on all 3xxx boards:
- *      PxP
- *      I2C
- */
-static struct resource pxp_resource[] = {
-        {
-                .flags  = IORESOURCE_MEM,
-                .start  = REGS_PXP_PHYS,
-                .end    = REGS_PXP_PHYS + REGS_PXP_SIZE,
-        }, {
-                .flags  = IORESOURCE_IRQ,
-                .start  = IRQ_PXP,
-                .end    = IRQ_PXP,
-        },
-};
-
-struct platform_device stmp378x_pxp = {
-        .name           = "stmp3xxx-pxp",
-        .id             = -1,
-        .dev            = {
-                .dma_mask               = &common_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-        .num_resources  = ARRAY_SIZE(pxp_resource),
-        .resource       = pxp_resource,
-};
-
-static struct resource i2c_resources[] = {
-        {
-                .flags = IORESOURCE_IRQ,
-                .start = IRQ_I2C_ERROR,
-                .end = IRQ_I2C_ERROR,
-        }, {
-                .flags = IORESOURCE_MEM,
-                .start = REGS_I2C_PHYS,
-                .end = REGS_I2C_PHYS + REGS_I2C_SIZE,
-        }, {
-                .flags = IORESOURCE_DMA,
-                .start = STMP3XXX_DMA(3, STMP3XXX_BUS_APBX),
-                .end = STMP3XXX_DMA(3, STMP3XXX_BUS_APBX),
-        },
-};
-
-struct platform_device stmp378x_i2c = {
-        .name = "i2c_stmp3xxx",
-        .id = 0,
-        .dev    = {
-                .dma_mask       = &common_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-        .resource = i2c_resources,
-        .num_resources = ARRAY_SIZE(i2c_resources),
-};
-
-void __init stmp378x_map_io(void)
-{
-        iotable_init(stmp378x_io_desc, ARRAY_SIZE(stmp378x_io_desc));
-}
diff --git a/arch/arm/mach-stmp378x/stmp378x.h b/arch/arm/mach-stmp378x/stmp378x.h
deleted file mode 100644
index 0dc15b3c891f..000000000000
--- a/arch/arm/mach-stmp378x/stmp378x.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X internal functions and data declarations
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __MACH_STMP378X_H
-#define __MACH_STMP378X_H
-
-void stmp378x_map_io(void);
-void stmp378x_init_irq(void);
-
-extern struct platform_device stmp378x_pxp, stmp378x_i2c;
-#endif /* __MACH_STMP378X_COMMON_H */
diff --git a/arch/arm/mach-stmp378x/stmp378x_devb.c b/arch/arm/mach-stmp378x/stmp378x_devb.c
deleted file mode 100644
index 06158848afd9..000000000000
--- a/arch/arm/mach-stmp378x/stmp378x_devb.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * Freescale STMP378X development board support
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/spi/spi.h>
-
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include <mach/pins.h>
-#include <mach/pinmux.h>
-#include <mach/platform.h>
-#include <mach/stmp3xxx.h>
-#include <mach/mmc.h>
-#include <mach/gpmi.h>
-
-#include "stmp378x.h"
-
-static struct platform_device *devices[] = {
-        &stmp3xxx_dbguart,
-        &stmp3xxx_appuart,
-        &stmp3xxx_watchdog,
-        &stmp3xxx_touchscreen,
-        &stmp3xxx_rtc,
-        &stmp3xxx_keyboard,
-        &stmp3xxx_framebuffer,
-        &stmp3xxx_backlight,
-        &stmp3xxx_rotdec,
-        &stmp3xxx_persistent,
-        &stmp3xxx_dcp_bootstream,
-        &stmp3xxx_dcp,
-        &stmp3xxx_battery,
-        &stmp378x_pxp,
-        &stmp378x_i2c,
-};
-
-static struct pin_desc i2c_pins_desc[] = {
-        { PINID_I2C_SCL, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_I2C_SDA, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-};
-
-static struct pin_group i2c_pins = {
-        .pins           = i2c_pins_desc,
-        .nr_pins        = ARRAY_SIZE(i2c_pins_desc),
-};
-
-static struct pin_desc dbguart_pins_0[] = {
-        { PINID_PWM0, PIN_FUN3, },
-        { PINID_PWM1, PIN_FUN3, },
-};
-
-static struct pin_group dbguart_pins[] = {
-        [0] = {
-                .pins           = dbguart_pins_0,
-                .nr_pins        = ARRAY_SIZE(dbguart_pins_0),
-        },
-};
-
-static int dbguart_pins_control(int id, int request)
-{
-        int r = 0;
-
-        if (request)
-                r = stmp3xxx_request_pin_group(&dbguart_pins[id], "debug uart");
-        else
-                stmp3xxx_release_pin_group(&dbguart_pins[id], "debug uart");
-        return r;
-}
-
-static struct pin_desc appuart_pins_0[] = {
-        { PINID_AUART1_CTS, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
-        { PINID_AUART1_RTS, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
-        { PINID_AUART1_RX, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
-        { PINID_AUART1_TX, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
-};
-
-static struct pin_desc appuart_pins_1[] = {
-#if 0 /* enable these when second appuart will be connected */
-        { PINID_AUART2_CTS, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
-        { PINID_AUART2_RTS, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
-        { PINID_AUART2_RX, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
-        { PINID_AUART2_TX, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
-#endif
-};
-
-static struct pin_desc mmc_pins_desc[] = {
-        { PINID_SSP1_DATA0, PIN_FUN1, PIN_8MA, PIN_3_3V, 1 },
-        { PINID_SSP1_DATA1, PIN_FUN1, PIN_8MA, PIN_3_3V, 1 },
-        { PINID_SSP1_DATA2, PIN_FUN1, PIN_8MA, PIN_3_3V, 1 },
-        { PINID_SSP1_DATA3, PIN_FUN1, PIN_8MA, PIN_3_3V, 1 },
-        { PINID_SSP1_CMD, PIN_FUN1, PIN_8MA, PIN_3_3V, 1 },
-        { PINID_SSP1_SCK, PIN_FUN1, PIN_8MA, PIN_3_3V, 0 },
-        { PINID_SSP1_DETECT, PIN_FUN1, PIN_8MA, PIN_3_3V, 0 },
-};
-
-static struct pin_group mmc_pins = {
-        .pins           = mmc_pins_desc,
-        .nr_pins        = ARRAY_SIZE(mmc_pins_desc),
-};
-
-static int stmp3xxxmmc_get_wp(void)
-{
-        return gpio_get_value(PINID_PWM4);
-}
-
-static int stmp3xxxmmc_hw_init_ssp1(void)
-{
-        int ret;
-
-        ret = stmp3xxx_request_pin_group(&mmc_pins, "mmc");
-        if (ret)
-                goto out;
-
-        /* Configure write protect GPIO pin */
-        ret = gpio_request(PINID_PWM4, "mmc wp");
-        if (ret)
-                goto out_wp;
-
-        gpio_direction_input(PINID_PWM4);
-
-        /* Configure POWER pin as gpio to drive power to MMC slot */
-        ret = gpio_request(PINID_PWM3, "mmc power");
-        if (ret)
-                goto out_power;
-
-        gpio_direction_output(PINID_PWM3, 0);
-        mdelay(100);
-
-        return 0;
-
-out_power:
-        gpio_free(PINID_PWM4);
-out_wp:
-        stmp3xxx_release_pin_group(&mmc_pins, "mmc");
-out:
-        return ret;
-}
-
-static void stmp3xxxmmc_hw_release_ssp1(void)
-{
-        gpio_free(PINID_PWM3);
-        gpio_free(PINID_PWM4);
-        stmp3xxx_release_pin_group(&mmc_pins, "mmc");
-}
-
-static void stmp3xxxmmc_cmd_pullup_ssp1(int enable)
-{
-        stmp3xxx_pin_pullup(PINID_SSP1_CMD, enable, "mmc");
-}
-
-static unsigned long
-stmp3xxxmmc_setclock_ssp1(void __iomem *base, unsigned long hz)
-{
-        struct clk *ssp, *parent;
-        char *p;
-        long r;
-
-        ssp = clk_get(NULL, "ssp");
-
-        /* using SSP1, no timeout, clock rate 1 */
-        writel(BF(2, SSP_TIMING_CLOCK_DIVIDE) |
-               BF(0xFFFF, SSP_TIMING_TIMEOUT),
-               base + HW_SSP_TIMING);
-
-        p = (hz > 1000000) ? "io" : "osc_24M";
-        parent = clk_get(NULL, p);
-        clk_set_parent(ssp, parent);
-        r = clk_set_rate(ssp, 2 * hz / 1000);
-        clk_put(parent);
-        clk_put(ssp);
-
-        return hz;
-}
-
-static struct stmp3xxxmmc_platform_data mmc_data = {
-        .hw_init        = stmp3xxxmmc_hw_init_ssp1,
-        .hw_release     = stmp3xxxmmc_hw_release_ssp1,
-        .get_wp         = stmp3xxxmmc_get_wp,
-        .cmd_pullup     = stmp3xxxmmc_cmd_pullup_ssp1,
-        .setclock       = stmp3xxxmmc_setclock_ssp1,
-};
-
-
-static struct pin_group appuart_pins[] = {
-        [0] = {
-                .pins           = appuart_pins_0,
-                .nr_pins        = ARRAY_SIZE(appuart_pins_0),
-        },
-        [1] = {
-                .pins           = appuart_pins_1,
-                .nr_pins        = ARRAY_SIZE(appuart_pins_1),
-        },
-};
-
-static struct pin_desc ssp1_pins_desc[] = {
-        { PINID_SSP1_SCK,       PIN_FUN1, PIN_8MA, PIN_3_3V, 0, },
-        { PINID_SSP1_CMD,       PIN_FUN1, PIN_4MA, PIN_3_3V, 0, },
-        { PINID_SSP1_DATA0,     PIN_FUN1, PIN_4MA, PIN_3_3V, 0, },
-        { PINID_SSP1_DATA3,     PIN_FUN1, PIN_4MA, PIN_3_3V, 0, },
-};
-
-static struct pin_desc ssp2_pins_desc[] = {
-        { PINID_GPMI_WRN,       PIN_FUN3, PIN_8MA, PIN_3_3V, 0, },
-        { PINID_GPMI_RDY1,      PIN_FUN3, PIN_4MA, PIN_3_3V, 0, },
-        { PINID_GPMI_D00,       PIN_FUN3, PIN_4MA, PIN_3_3V, 0, },
-        { PINID_GPMI_D03,       PIN_FUN3, PIN_4MA, PIN_3_3V, 0, },
-};
-
-static struct pin_group ssp1_pins = {
-        .pins = ssp1_pins_desc,
-        .nr_pins = ARRAY_SIZE(ssp1_pins_desc),
-};
-
-static struct pin_group ssp2_pins = {
-        .pins = ssp1_pins_desc,
-        .nr_pins = ARRAY_SIZE(ssp2_pins_desc),
-};
-
-static struct pin_desc gpmi_pins_desc[] = {
-        { PINID_GPMI_CE0N, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_CE1N, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GMPI_CE2N, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_CLE, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_ALE, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_WPN, PIN_FUN1, PIN_12MA, PIN_3_3V, 0 },
-        { PINID_GPMI_RDY1, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_D00, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_D01, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_D02, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_D03, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_D04, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_D05, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_D06, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_D07, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_RDY0, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_RDY2, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_RDY3, PIN_FUN1, PIN_4MA, PIN_3_3V, 0 },
-        { PINID_GPMI_WRN, PIN_FUN1, PIN_12MA, PIN_3_3V, 0 },
-        { PINID_GPMI_RDN, PIN_FUN1, PIN_12MA, PIN_3_3V, 0 },
-};
-
-static struct pin_group gpmi_pins = {
-        .pins           = gpmi_pins_desc,
-        .nr_pins        = ARRAY_SIZE(gpmi_pins_desc),
-};
-
-static struct mtd_partition gpmi_partitions[] = {
-        [0] = {
-                .name   = "boot",
-                .size   = 10 * SZ_1M,
-                .offset = 0,
-        },
-        [1] = {
-                .name   = "data",
-                .size   = MTDPART_SIZ_FULL,
-                .offset = MTDPART_OFS_APPEND,
-        },
-};
-
-static struct gpmi_platform_data gpmi_data = {
-        .pins = &gpmi_pins,
-        .nr_parts = ARRAY_SIZE(gpmi_partitions),
-        .parts = gpmi_partitions,
-        .part_types = { "cmdline", NULL },
-};
-
-static struct spi_board_info spi_board_info[] __initdata = {
-#if defined(CONFIG_ENC28J60) || defined(CONFIG_ENC28J60_MODULE)
-        {
-                .modalias       = "enc28j60",
-                .max_speed_hz   = 6 * 1000 * 1000,
-                .bus_num        = 1,
-                .chip_select    = 0,
-                .platform_data  = NULL,
-        },
-#endif
-};
-
-static void __init stmp378x_devb_init(void)
-{
-        stmp3xxx_pinmux_init(NR_REAL_IRQS);
-
-        /* init stmp3xxx platform */
-        stmp3xxx_init();
-
-        stmp3xxx_dbguart.dev.platform_data = dbguart_pins_control;
-        stmp3xxx_appuart.dev.platform_data = appuart_pins;
-        stmp3xxx_mmc.dev.platform_data = &mmc_data;
-        stmp3xxx_gpmi.dev.platform_data = &gpmi_data;
-        stmp3xxx_spi1.dev.platform_data = &ssp1_pins;
-        stmp3xxx_spi2.dev.platform_data = &ssp2_pins;
-        stmp378x_i2c.dev.platform_data = &i2c_pins;
-
-        /* register spi devices */
-        spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
-
-        /* add board's devices */
-        platform_add_devices(devices, ARRAY_SIZE(devices));
-
-        /* add devices selected by command line ssp1= and ssp2= options */
-        stmp3xxx_ssp1_device_register();
-        stmp3xxx_ssp2_device_register();
-}
-
-MACHINE_START(STMP378X, "STMP378X")
-        .boot_params    = 0x40000100,
-        .map_io         = stmp378x_map_io,
-        .init_irq       = stmp378x_init_irq,
-        .timer          = &stmp3xxx_timer,
-        .init_machine   = stmp378x_devb_init,
-MACHINE_END
diff --git a/arch/arm/mach-stmp37xx/Makefile b/arch/arm/mach-stmp37xx/Makefile
deleted file mode 100644
index 57deffd09fbf..000000000000
--- a/arch/arm/mach-stmp37xx/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_ARCH_STMP37XX) += stmp37xx.o
-obj-$(CONFIG_MACH_STMP37XX) += stmp37xx_devb.o
diff --git a/arch/arm/mach-stmp37xx/Makefile.boot b/arch/arm/mach-stmp37xx/Makefile.boot
deleted file mode 100644
index 1568ad404d59..000000000000
--- a/arch/arm/mach-stmp37xx/Makefile.boot
+++ /dev/null
@@ -1,3 +0,0 @@
-   zreladdr-y   := 0x40008000
-params_phys-y   := 0x40000100
-initrd_phys-y   := 0x40800000
diff --git a/arch/arm/mach-stmp37xx/include/mach/entry-macro.S b/arch/arm/mach-stmp37xx/include/mach/entry-macro.S
deleted file mode 100644
index fed2787b6c34..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/entry-macro.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Low-level IRQ helper macros for Freescale STMP37XX
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-                .macro  disable_fiq
-                .endm
-
-                .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-
-                mov     \base, #0xf0000000      @ vm address of IRQ controller
-                ldr     \irqnr, [\base, #0x30]  @ HW_ICOLL_STAT
-                cmp     \irqnr, #0x3f
-                movne   \irqstat, #0            @ Ack this IRQ
-                strne   \irqstat, [\base, #0x00]@ HW_ICOLL_VECTOR
-                moveqs  \irqnr, #0              @ Zero flag set for no IRQ
-
-                .endm
-
-                .macro  get_irqnr_preamble, base, tmp
-                .endm
-
-                .macro  arch_ret_to_user, tmp1, tmp2
-                .endm
diff --git a/arch/arm/mach-stmp37xx/include/mach/irqs.h b/arch/arm/mach-stmp37xx/include/mach/irqs.h
deleted file mode 100644
index 98f12938550d..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/irqs.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Freescale STMP37XX interrupts
- *
- * Copyright (C) 2005 Sigmatel Inc
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef _ASM_ARCH_IRQS_H
-#define _ASM_ARCH_IRQS_H
-
-#define IRQ_DEBUG_UART           0
-#define IRQ_COMMS_RX               1
-#define IRQ_COMMS_TX               1
-#define IRQ_SSP2_ERROR           2
-#define IRQ_VDD5V                     3
-#define IRQ_HEADPHONE_SHORT         4
-#define IRQ_DAC_DMA                 5
-#define IRQ_DAC_ERROR             6
-#define IRQ_ADC_DMA                 7
-#define IRQ_ADC_ERROR             8
-#define IRQ_SPDIF_DMA             9
-#define IRQ_SAIF2_DMA             9
-#define IRQ_SPDIF_ERROR         10
-#define IRQ_SAIF1_IRQ             10
-#define IRQ_SAIF2_IRQ             10
-#define IRQ_USB_CTRL               11
-#define IRQ_USB_WAKEUP           12
-#define IRQ_GPMI_DMA               13
-#define IRQ_SSP1_DMA               14
-#define IRQ_SSP_ERROR             15
-#define IRQ_GPIO0                     16
-#define IRQ_GPIO1                     17
-#define IRQ_GPIO2                     18
-#define IRQ_SAIF1_DMA             19
-#define IRQ_SSP2_DMA               20
-#define IRQ_ECC8_IRQ               21
-#define IRQ_RTC_ALARM             22
-#define IRQ_UARTAPP_TX_DMA           23
-#define IRQ_UARTAPP_INTERNAL       24
-#define IRQ_UARTAPP_RX_DMA           25
-#define IRQ_I2C_DMA                 26
-#define IRQ_I2C_ERROR             27
-#define IRQ_TIMER0                   28
-#define IRQ_TIMER1                   29
-#define IRQ_TIMER2                   30
-#define IRQ_TIMER3                   31
-#define IRQ_BATT_BRNOUT         32
-#define IRQ_VDDD_BRNOUT         33
-#define IRQ_VDDIO_BRNOUT               34
-#define IRQ_VDD18_BRNOUT               35
-#define IRQ_TOUCH_DETECT               36
-#define IRQ_LRADC_CH0             37
-#define IRQ_LRADC_CH1             38
-#define IRQ_LRADC_CH2             39
-#define IRQ_LRADC_CH3             40
-#define IRQ_LRADC_CH4             41
-#define IRQ_LRADC_CH5             42
-#define IRQ_LRADC_CH6             43
-#define IRQ_LRADC_CH7             44
-#define IRQ_LCDIF_DMA             45
-#define IRQ_LCDIF_ERROR         46
-#define IRQ_DIGCTL_DEBUG_TRAP     47
-#define IRQ_RTC_1MSEC             48
-#define IRQ_DRI_DMA                 49
-#define IRQ_DRI_ATTENTION             50
-#define IRQ_GPMI_ATTENTION           51
-#define IRQ_IR                   52
-#define IRQ_DCP_VMI                 53
-#define IRQ_DCP                 54
-#define IRQ_RESERVED_55         55
-#define IRQ_RESERVED_56         56
-#define IRQ_RESERVED_57         57
-#define IRQ_RESERVED_58         58
-#define IRQ_RESERVED_59         59
-#define SW_IRQ_60                     60
-#define SW_IRQ_61                     61
-#define SW_IRQ_62                     62
-#define SW_IRQ_63                     63
-
-#define NR_REAL_IRQS            64
-#define NR_IRQS                 (NR_REAL_IRQS + 32 * 3)
-
-/* TIMER and BRNOUT are FIQ capable */
-#define FIQ_START                       IRQ_TIMER0
-
-/* Hard disk IRQ is a GPMI attention IRQ */
-#define IRQ_HARDDISK            IRQ_GPMI_ATTENTION
-
-#endif /* _ASM_ARCH_IRQS_H */
diff --git a/arch/arm/mach-stmp37xx/include/mach/pins.h b/arch/arm/mach-stmp37xx/include/mach/pins.h
deleted file mode 100644
index d56de0c471d8..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/pins.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Freescale STMP37XX SoC pin multiplexing
- *
- * Author: Vladislav Buzov <vbuzov@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_ARCH_PINS_H
-#define __ASM_ARCH_PINS_H
-
-/*
- * Define all STMP37XX pins, a pin name corresponds to a STMP37xx hardware
- * interface  this pin belongs to.
- */
-
-/* Bank 0 */
-#define PINID_GPMI_D00          STMP3XXX_PINID(0, 0)
-#define PINID_GPMI_D01          STMP3XXX_PINID(0, 1)
-#define PINID_GPMI_D02          STMP3XXX_PINID(0, 2)
-#define PINID_GPMI_D03          STMP3XXX_PINID(0, 3)
-#define PINID_GPMI_D04          STMP3XXX_PINID(0, 4)
-#define PINID_GPMI_D05          STMP3XXX_PINID(0, 5)
-#define PINID_GPMI_D06          STMP3XXX_PINID(0, 6)
-#define PINID_GPMI_D07          STMP3XXX_PINID(0, 7)
-#define PINID_GPMI_D08          STMP3XXX_PINID(0, 8)
-#define PINID_GPMI_D09          STMP3XXX_PINID(0, 9)
-#define PINID_GPMI_D10          STMP3XXX_PINID(0, 10)
-#define PINID_GPMI_D11          STMP3XXX_PINID(0, 11)
-#define PINID_GPMI_D12          STMP3XXX_PINID(0, 12)
-#define PINID_GPMI_D13          STMP3XXX_PINID(0, 13)
-#define PINID_GPMI_D14          STMP3XXX_PINID(0, 14)
-#define PINID_GPMI_D15          STMP3XXX_PINID(0, 15)
-#define PINID_GPMI_A0           STMP3XXX_PINID(0, 16)
-#define PINID_GPMI_A1           STMP3XXX_PINID(0, 17)
-#define PINID_GPMI_A2           STMP3XXX_PINID(0, 18)
-#define PINID_GPMI_RDY0         STMP3XXX_PINID(0, 19)
-#define PINID_GPMI_RDY2         STMP3XXX_PINID(0, 20)
-#define PINID_GPMI_RDY3         STMP3XXX_PINID(0, 21)
-#define PINID_GPMI_RESETN       STMP3XXX_PINID(0, 22)
-#define PINID_GPMI_IRQ          STMP3XXX_PINID(0, 23)
-#define PINID_GPMI_WRN          STMP3XXX_PINID(0, 24)
-#define PINID_GPMI_RDN          STMP3XXX_PINID(0, 25)
-#define PINID_UART2_CTS         STMP3XXX_PINID(0, 26)
-#define PINID_UART2_RTS         STMP3XXX_PINID(0, 27)
-#define PINID_UART2_RX          STMP3XXX_PINID(0, 28)
-#define PINID_UART2_TX          STMP3XXX_PINID(0, 29)
-
-/* Bank 1 */
-#define PINID_LCD_D00           STMP3XXX_PINID(1, 0)
-#define PINID_LCD_D01           STMP3XXX_PINID(1, 1)
-#define PINID_LCD_D02           STMP3XXX_PINID(1, 2)
-#define PINID_LCD_D03           STMP3XXX_PINID(1, 3)
-#define PINID_LCD_D04           STMP3XXX_PINID(1, 4)
-#define PINID_LCD_D05           STMP3XXX_PINID(1, 5)
-#define PINID_LCD_D06           STMP3XXX_PINID(1, 6)
-#define PINID_LCD_D07           STMP3XXX_PINID(1, 7)
-#define PINID_LCD_D08           STMP3XXX_PINID(1, 8)
-#define PINID_LCD_D09           STMP3XXX_PINID(1, 9)
-#define PINID_LCD_D10           STMP3XXX_PINID(1, 10)
-#define PINID_LCD_D11           STMP3XXX_PINID(1, 11)
-#define PINID_LCD_D12           STMP3XXX_PINID(1, 12)
-#define PINID_LCD_D13           STMP3XXX_PINID(1, 13)
-#define PINID_LCD_D14           STMP3XXX_PINID(1, 14)
-#define PINID_LCD_D15           STMP3XXX_PINID(1, 15)
-#define PINID_LCD_RESET         STMP3XXX_PINID(1, 16)
-#define PINID_LCD_RS            STMP3XXX_PINID(1, 17)
-#define PINID_LCD_WR_RWN        STMP3XXX_PINID(1, 18)
-#define PINID_LCD_RD_E          STMP3XXX_PINID(1, 19)
-#define PINID_LCD_CS            STMP3XXX_PINID(1, 20)
-#define PINID_LCD_BUSY          STMP3XXX_PINID(1, 21)
-#define PINID_SSP1_CMD          STMP3XXX_PINID(1, 22)
-#define PINID_SSP1_SCK          STMP3XXX_PINID(1, 23)
-#define PINID_SSP1_DATA0        STMP3XXX_PINID(1, 24)
-#define PINID_SSP1_DATA1        STMP3XXX_PINID(1, 25)
-#define PINID_SSP1_DATA2        STMP3XXX_PINID(1, 26)
-#define PINID_SSP1_DATA3        STMP3XXX_PINID(1, 27)
-#define PINID_SSP1_DETECT       STMP3XXX_PINID(1, 28)
-
-/* Bank 2 */
-#define PINID_PWM0              STMP3XXX_PINID(2, 0)
-#define PINID_PWM1              STMP3XXX_PINID(2, 1)
-#define PINID_PWM2              STMP3XXX_PINID(2, 2)
-#define PINID_PWM3              STMP3XXX_PINID(2, 3)
-#define PINID_PWM4              STMP3XXX_PINID(2, 4)
-#define PINID_I2C_SCL           STMP3XXX_PINID(2, 5)
-#define PINID_I2C_SDA           STMP3XXX_PINID(2, 6)
-#define PINID_ROTTARYA          STMP3XXX_PINID(2, 7)
-#define PINID_ROTTARYB          STMP3XXX_PINID(2, 8)
-#define PINID_EMI_CKE           STMP3XXX_PINID(2, 9)
-#define PINID_EMI_RASN          STMP3XXX_PINID(2, 10)
-#define PINID_EMI_CASN          STMP3XXX_PINID(2, 11)
-#define PINID_EMI_CE0N          STMP3XXX_PINID(2, 12)
-#define PINID_EMI_CE1N          STMP3XXX_PINID(2, 13)
-#define PINID_EMI_CE2N          STMP3XXX_PINID(2, 14)
-#define PINID_EMI_CE3N          STMP3XXX_PINID(2, 15)
-#define PINID_EMI_A00           STMP3XXX_PINID(2, 16)
-#define PINID_EMI_A01           STMP3XXX_PINID(2, 17)
-#define PINID_EMI_A02           STMP3XXX_PINID(2, 18)
-#define PINID_EMI_A03           STMP3XXX_PINID(2, 19)
-#define PINID_EMI_A04           STMP3XXX_PINID(2, 20)
-#define PINID_EMI_A05           STMP3XXX_PINID(2, 21)
-#define PINID_EMI_A06           STMP3XXX_PINID(2, 22)
-#define PINID_EMI_A07           STMP3XXX_PINID(2, 23)
-#define PINID_EMI_A08           STMP3XXX_PINID(2, 24)
-#define PINID_EMI_A09           STMP3XXX_PINID(2, 25)
-#define PINID_EMI_A10           STMP3XXX_PINID(2, 26)
-#define PINID_EMI_A11           STMP3XXX_PINID(2, 27)
-#define PINID_EMI_A12           STMP3XXX_PINID(2, 28)
-#define PINID_EMI_A13           STMP3XXX_PINID(2, 29)
-#define PINID_EMI_A14           STMP3XXX_PINID(2, 30)
-#define PINID_EMI_WEN           STMP3XXX_PINID(2, 31)
-
-/* Bank 3 */
-#define PINID_EMI_D00           STMP3XXX_PINID(3, 0)
-#define PINID_EMI_D01           STMP3XXX_PINID(3, 1)
-#define PINID_EMI_D02           STMP3XXX_PINID(3, 2)
-#define PINID_EMI_D03           STMP3XXX_PINID(3, 3)
-#define PINID_EMI_D04           STMP3XXX_PINID(3, 4)
-#define PINID_EMI_D05           STMP3XXX_PINID(3, 5)
-#define PINID_EMI_D06           STMP3XXX_PINID(3, 6)
-#define PINID_EMI_D07           STMP3XXX_PINID(3, 7)
-#define PINID_EMI_D08           STMP3XXX_PINID(3, 8)
-#define PINID_EMI_D09           STMP3XXX_PINID(3, 9)
-#define PINID_EMI_D10           STMP3XXX_PINID(3, 10)
-#define PINID_EMI_D11           STMP3XXX_PINID(3, 11)
-#define PINID_EMI_D12           STMP3XXX_PINID(3, 12)
-#define PINID_EMI_D13           STMP3XXX_PINID(3, 13)
-#define PINID_EMI_D14           STMP3XXX_PINID(3, 14)
-#define PINID_EMI_D15           STMP3XXX_PINID(3, 15)
-#define PINID_EMI_DQS0          STMP3XXX_PINID(3, 16)
-#define PINID_EMI_DQS1          STMP3XXX_PINID(3, 17)
-#define PINID_EMI_DQM0          STMP3XXX_PINID(3, 18)
-#define PINID_EMI_DQM1          STMP3XXX_PINID(3, 19)
-#define PINID_EMI_CLK           STMP3XXX_PINID(3, 20)
-#define PINID_EMI_CLKN          STMP3XXX_PINID(3, 21)
-
-#endif /* __ASM_ARCH_PINS_H */
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-apbh.h b/arch/arm/mach-stmp37xx/include/mach/regs-apbh.h
deleted file mode 100644
index a323aa9a21f2..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-apbh.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * stmp37xx: APBH register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_APBH
-#define _MACH_REGS_APBH
-
-#define REGS_APBH_BASE  (STMP3XXX_REGS_BASE + 0x4000)
-
-#define HW_APBH_CTRL0           0x0
-#define BM_APBH_CTRL0_RESET_CHANNEL     0x00FF0000
-#define BP_APBH_CTRL0_RESET_CHANNEL     16
-#define BM_APBH_CTRL0_CLKGATE   0x40000000
-#define BM_APBH_CTRL0_SFTRST    0x80000000
-
-#define HW_APBH_CTRL1           0x10
-#define BM_APBH_CTRL1_CH0_CMDCMPLT_IRQ  0x00000001
-#define BP_APBH_CTRL1_CH0_CMDCMPLT_IRQ  0
-
-#define HW_APBH_DEVSEL          0x20
-
-#define HW_APBH_CH0_NXTCMDAR    (0x50 + 0 * 0x70)
-#define HW_APBH_CH1_NXTCMDAR    (0x50 + 1 * 0x70)
-#define HW_APBH_CH2_NXTCMDAR    (0x50 + 2 * 0x70)
-#define HW_APBH_CH3_NXTCMDAR    (0x50 + 3 * 0x70)
-#define HW_APBH_CH4_NXTCMDAR    (0x50 + 4 * 0x70)
-#define HW_APBH_CH5_NXTCMDAR    (0x50 + 5 * 0x70)
-#define HW_APBH_CH6_NXTCMDAR    (0x50 + 6 * 0x70)
-#define HW_APBH_CH7_NXTCMDAR    (0x50 + 7 * 0x70)
-#define HW_APBH_CH8_NXTCMDAR    (0x50 + 8 * 0x70)
-#define HW_APBH_CH9_NXTCMDAR    (0x50 + 9 * 0x70)
-#define HW_APBH_CH10_NXTCMDAR   (0x50 + 10 * 0x70)
-#define HW_APBH_CH11_NXTCMDAR   (0x50 + 11 * 0x70)
-#define HW_APBH_CH12_NXTCMDAR   (0x50 + 12 * 0x70)
-#define HW_APBH_CH13_NXTCMDAR   (0x50 + 13 * 0x70)
-#define HW_APBH_CH14_NXTCMDAR   (0x50 + 14 * 0x70)
-#define HW_APBH_CH15_NXTCMDAR   (0x50 + 15 * 0x70)
-
-#define HW_APBH_CHn_NXTCMDAR    0x50
-
-#define BM_APBH_CHn_CMD_MODE            0x00000003
-#define BP_APBH_CHn_CMD_MODE            0x00000001
-#define BV_APBH_CHn_CMD_MODE_NOOP                0
-#define BV_APBH_CHn_CMD_MODE_WRITE               1
-#define BV_APBH_CHn_CMD_MODE_READ                2
-#define BV_APBH_CHn_CMD_MODE_SENSE               3
-#define BM_APBH_CHn_CMD_CHAIN           0x00000004
-#define BM_APBH_CHn_CMD_IRQONCMPLT      0x00000008
-#define BM_APBH_CHn_CMD_NANDLOCK        0x00000010
-#define BM_APBH_CHn_CMD_NANDWAIT4READY  0x00000020
-#define BM_APBH_CHn_CMD_SEMAPHORE       0x00000040
-#define BM_APBH_CHn_CMD_WAIT4ENDCMD     0x00000080
-#define BM_APBH_CHn_CMD_CMDWORDS        0x0000F000
-#define BP_APBH_CHn_CMD_CMDWORDS        12
-#define BM_APBH_CHn_CMD_XFER_COUNT      0xFFFF0000
-#define BP_APBH_CHn_CMD_XFER_COUNT      16
-
-#define HW_APBH_CH0_SEMA        (0x80 + 0 * 0x70)
-#define HW_APBH_CH1_SEMA        (0x80 + 1 * 0x70)
-#define HW_APBH_CH2_SEMA        (0x80 + 2 * 0x70)
-#define HW_APBH_CH3_SEMA        (0x80 + 3 * 0x70)
-#define HW_APBH_CH4_SEMA        (0x80 + 4 * 0x70)
-#define HW_APBH_CH5_SEMA        (0x80 + 5 * 0x70)
-#define HW_APBH_CH6_SEMA        (0x80 + 6 * 0x70)
-#define HW_APBH_CH7_SEMA        (0x80 + 7 * 0x70)
-#define HW_APBH_CH8_SEMA        (0x80 + 8 * 0x70)
-#define HW_APBH_CH9_SEMA        (0x80 + 9 * 0x70)
-#define HW_APBH_CH10_SEMA       (0x80 + 10 * 0x70)
-#define HW_APBH_CH11_SEMA       (0x80 + 11 * 0x70)
-#define HW_APBH_CH12_SEMA       (0x80 + 12 * 0x70)
-#define HW_APBH_CH13_SEMA       (0x80 + 13 * 0x70)
-#define HW_APBH_CH14_SEMA       (0x80 + 14 * 0x70)
-#define HW_APBH_CH15_SEMA       (0x80 + 15 * 0x70)
-
-#define HW_APBH_CHn_SEMA        0x80
-#define BM_APBH_CHn_SEMA_INCREMENT_SEMA 0x000000FF
-#define BP_APBH_CHn_SEMA_INCREMENT_SEMA 0
-#define BM_APBH_CHn_SEMA_PHORE  0x00FF0000
-#define BP_APBH_CHn_SEMA_PHORE  16
-
-#endif
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-apbx.h b/arch/arm/mach-stmp37xx/include/mach/regs-apbx.h
deleted file mode 100644
index 6d080cd5b702..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-apbx.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * stmp37xx: APBX register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_APBX
-#define _MACH_REGS_APBX
-
-#define REGS_APBX_BASE  (STMP3XXX_REGS_BASE + 0x24000)
-
-#define HW_APBX_CTRL0           0x0
-#define BM_APBX_CTRL0_RESET_CHANNEL     0x00FF0000
-#define BP_APBX_CTRL0_RESET_CHANNEL     16
-#define BM_APBX_CTRL0_CLKGATE   0x40000000
-#define BM_APBX_CTRL0_SFTRST    0x80000000
-
-#define HW_APBX_CTRL1           0x10
-
-#define HW_APBX_DEVSEL          0x20
-
-#define HW_APBX_CH0_NXTCMDAR    (0x50 + 0 * 0x70)
-#define HW_APBX_CH1_NXTCMDAR    (0x50 + 1 * 0x70)
-#define HW_APBX_CH2_NXTCMDAR    (0x50 + 2 * 0x70)
-#define HW_APBX_CH3_NXTCMDAR    (0x50 + 3 * 0x70)
-#define HW_APBX_CH4_NXTCMDAR    (0x50 + 4 * 0x70)
-#define HW_APBX_CH5_NXTCMDAR    (0x50 + 5 * 0x70)
-#define HW_APBX_CH6_NXTCMDAR    (0x50 + 6 * 0x70)
-#define HW_APBX_CH7_NXTCMDAR    (0x50 + 7 * 0x70)
-#define HW_APBX_CH8_NXTCMDAR    (0x50 + 8 * 0x70)
-#define HW_APBX_CH9_NXTCMDAR    (0x50 + 9 * 0x70)
-#define HW_APBX_CH10_NXTCMDAR   (0x50 + 10 * 0x70)
-#define HW_APBX_CH11_NXTCMDAR   (0x50 + 11 * 0x70)
-#define HW_APBX_CH12_NXTCMDAR   (0x50 + 12 * 0x70)
-#define HW_APBX_CH13_NXTCMDAR   (0x50 + 13 * 0x70)
-#define HW_APBX_CH14_NXTCMDAR   (0x50 + 14 * 0x70)
-#define HW_APBX_CH15_NXTCMDAR   (0x50 + 15 * 0x70)
-
-#define HW_APBX_CHn_NXTCMDAR    0x50
-#define BM_APBX_CHn_CMD_MODE            0x00000003
-#define BP_APBX_CHn_CMD_MODE            0x00000001
-#define BV_APBX_CHn_CMD_MODE_NOOP                0
-#define BV_APBX_CHn_CMD_MODE_WRITE               1
-#define BV_APBX_CHn_CMD_MODE_READ                2
-#define BV_APBX_CHn_CMD_MODE_SENSE               3
-#define BM_APBX_CHn_CMD_COMMAND 0x00000003
-#define BP_APBX_CHn_CMD_COMMAND 0
-#define BM_APBX_CHn_CMD_CHAIN   0x00000004
-#define BM_APBX_CHn_CMD_IRQONCMPLT      0x00000008
-#define BM_APBX_CHn_CMD_SEMAPHORE       0x00000040
-#define BM_APBX_CHn_CMD_WAIT4ENDCMD     0x00000080
-#define BM_APBX_CHn_CMD_CMDWORDS        0x0000F000
-#define BP_APBX_CHn_CMD_CMDWORDS        12
-#define BM_APBX_CHn_CMD_XFER_COUNT      0xFFFF0000
-#define BP_APBX_CHn_CMD_XFER_COUNT      16
-
-#define HW_APBX_CH0_BAR         (0x70 + 0 * 0x70)
-#define HW_APBX_CH1_BAR         (0x70 + 1 * 0x70)
-#define HW_APBX_CH2_BAR         (0x70 + 2 * 0x70)
-#define HW_APBX_CH3_BAR         (0x70 + 3 * 0x70)
-#define HW_APBX_CH4_BAR         (0x70 + 4 * 0x70)
-#define HW_APBX_CH5_BAR         (0x70 + 5 * 0x70)
-#define HW_APBX_CH6_BAR         (0x70 + 6 * 0x70)
-#define HW_APBX_CH7_BAR         (0x70 + 7 * 0x70)
-#define HW_APBX_CH8_BAR         (0x70 + 8 * 0x70)
-#define HW_APBX_CH9_BAR         (0x70 + 9 * 0x70)
-#define HW_APBX_CH10_BAR                (0x70 + 10 * 0x70)
-#define HW_APBX_CH11_BAR                (0x70 + 11 * 0x70)
-#define HW_APBX_CH12_BAR                (0x70 + 12 * 0x70)
-#define HW_APBX_CH13_BAR                (0x70 + 13 * 0x70)
-#define HW_APBX_CH14_BAR                (0x70 + 14 * 0x70)
-#define HW_APBX_CH15_BAR                (0x70 + 15 * 0x70)
-
-#define HW_APBX_CHn_BAR         0x70
-
-#define HW_APBX_CH0_SEMA        (0x80 + 0 * 0x70)
-#define HW_APBX_CH1_SEMA        (0x80 + 1 * 0x70)
-#define HW_APBX_CH2_SEMA        (0x80 + 2 * 0x70)
-#define HW_APBX_CH3_SEMA        (0x80 + 3 * 0x70)
-#define HW_APBX_CH4_SEMA        (0x80 + 4 * 0x70)
-#define HW_APBX_CH5_SEMA        (0x80 + 5 * 0x70)
-#define HW_APBX_CH6_SEMA        (0x80 + 6 * 0x70)
-#define HW_APBX_CH7_SEMA        (0x80 + 7 * 0x70)
-#define HW_APBX_CH8_SEMA        (0x80 + 8 * 0x70)
-#define HW_APBX_CH9_SEMA        (0x80 + 9 * 0x70)
-#define HW_APBX_CH10_SEMA       (0x80 + 10 * 0x70)
-#define HW_APBX_CH11_SEMA       (0x80 + 11 * 0x70)
-#define HW_APBX_CH12_SEMA       (0x80 + 12 * 0x70)
-#define HW_APBX_CH13_SEMA       (0x80 + 13 * 0x70)
-#define HW_APBX_CH14_SEMA       (0x80 + 14 * 0x70)
-#define HW_APBX_CH15_SEMA       (0x80 + 15 * 0x70)
-
-#define HW_APBX_CHn_SEMA        0x80
-#define BM_APBX_CHn_SEMA_INCREMENT_SEMA 0x000000FF
-#define BP_APBX_CHn_SEMA_INCREMENT_SEMA 0
-#define BM_APBX_CHn_SEMA_PHORE  0x00FF0000
-#define BP_APBX_CHn_SEMA_PHORE  16
-
-#endif
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-audioin.h b/arch/arm/mach-stmp37xx/include/mach/regs-audioin.h
deleted file mode 100644
index 3b511f947a53..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-audioin.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * stmp37xx: AUDIOIN register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_AUDIOIN_BASE       (STMP3XXX_REGS_BASE + 0x4C000)
-
-#define HW_AUDIOIN_CTRL         0x0
-#define BM_AUDIOIN_CTRL_RUN     0x00000001
-#define BP_AUDIOIN_CTRL_RUN     0
-#define BM_AUDIOIN_CTRL_FIFO_ERROR_IRQ_EN       0x00000002
-#define BM_AUDIOIN_CTRL_FIFO_OVERFLOW_IRQ       0x00000004
-#define BM_AUDIOIN_CTRL_FIFO_UNDERFLOW_IRQ      0x00000008
-#define BM_AUDIOIN_CTRL_WORD_LENGTH     0x00000020
-#define BM_AUDIOIN_CTRL_CLKGATE 0x40000000
-#define BM_AUDIOIN_CTRL_SFTRST  0x80000000
-
-#define HW_AUDIOIN_STAT         0x10
-
-#define HW_AUDIOIN_ADCSRR       0x20
-
-#define HW_AUDIOIN_ADCVOLUME    0x30
-#define BM_AUDIOIN_ADCVOLUME_VOLUME_RIGHT       0x000000FF
-#define BP_AUDIOIN_ADCVOLUME_VOLUME_RIGHT       0
-#define BM_AUDIOIN_ADCVOLUME_VOLUME_LEFT        0x00FF0000
-#define BP_AUDIOIN_ADCVOLUME_VOLUME_LEFT        16
-
-#define HW_AUDIOIN_ADCDEBUG     0x40
-
-#define HW_AUDIOIN_ADCVOL       0x50
-#define BM_AUDIOIN_ADCVOL_GAIN_RIGHT    0x0000000F
-#define BP_AUDIOIN_ADCVOL_GAIN_RIGHT    0
-#define BM_AUDIOIN_ADCVOL_SELECT_RIGHT  0x00000030
-#define BP_AUDIOIN_ADCVOL_SELECT_RIGHT  4
-#define BM_AUDIOIN_ADCVOL_GAIN_LEFT     0x00000F00
-#define BP_AUDIOIN_ADCVOL_GAIN_LEFT     8
-#define BM_AUDIOIN_ADCVOL_SELECT_LEFT   0x00003000
-#define BP_AUDIOIN_ADCVOL_SELECT_LEFT   12
-#define BM_AUDIOIN_ADCVOL_MUTE  0x01000000
-
-#define HW_AUDIOIN_MICLINE      0x60
-
-#define HW_AUDIOIN_ANACLKCTRL   0x70
-#define BM_AUDIOIN_ANACLKCTRL_CLKGATE   0x80000000
-
-#define HW_AUDIOIN_DATA         0x80
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-audioout.h b/arch/arm/mach-stmp37xx/include/mach/regs-audioout.h
deleted file mode 100644
index ca1942b8a3e9..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-audioout.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * stmp37xx: AUDIOOUT register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_AUDIOOUT_BASE      (STMP3XXX_REGS_BASE + 0x48000)
-
-#define HW_AUDIOOUT_CTRL        0x0
-#define BM_AUDIOOUT_CTRL_RUN    0x00000001
-#define BP_AUDIOOUT_CTRL_RUN    0
-#define BM_AUDIOOUT_CTRL_FIFO_ERROR_IRQ_EN      0x00000002
-#define BM_AUDIOOUT_CTRL_FIFO_OVERFLOW_IRQ      0x00000004
-#define BM_AUDIOOUT_CTRL_FIFO_UNDERFLOW_IRQ     0x00000008
-#define BM_AUDIOOUT_CTRL_WORD_LENGTH    0x00000040
-#define BM_AUDIOOUT_CTRL_CLKGATE        0x40000000
-#define BM_AUDIOOUT_CTRL_SFTRST 0x80000000
-
-#define HW_AUDIOOUT_STAT        0x10
-
-#define HW_AUDIOOUT_DACSRR      0x20
-#define BM_AUDIOOUT_DACSRR_SRC_FRAC     0x00001FFF
-#define BP_AUDIOOUT_DACSRR_SRC_FRAC     0
-#define BM_AUDIOOUT_DACSRR_SRC_INT      0x001F0000
-#define BP_AUDIOOUT_DACSRR_SRC_INT      16
-#define BM_AUDIOOUT_DACSRR_SRC_HOLD     0x07000000
-#define BP_AUDIOOUT_DACSRR_SRC_HOLD     24
-#define BM_AUDIOOUT_DACSRR_BASEMULT     0x70000000
-#define BP_AUDIOOUT_DACSRR_BASEMULT     28
-
-#define HW_AUDIOOUT_DACVOLUME   0x30
-#define BM_AUDIOOUT_DACVOLUME_MUTE_RIGHT        0x00000100
-#define BM_AUDIOOUT_DACVOLUME_MUTE_LEFT 0x01000000
-#define BM_AUDIOOUT_DACVOLUME_EN_ZCD    0x02000000
-
-#define HW_AUDIOOUT_DACDEBUG    0x40
-
-#define HW_AUDIOOUT_HPVOL       0x50
-#define BM_AUDIOOUT_HPVOL_MUTE  0x01000000
-#define BM_AUDIOOUT_HPVOL_EN_MSTR_ZCD   0x02000000
-
-#define HW_AUDIOOUT_PWRDN       0x70
-#define BM_AUDIOOUT_PWRDN_HEADPHONE     0x00000001
-#define BP_AUDIOOUT_PWRDN_HEADPHONE     0
-#define BM_AUDIOOUT_PWRDN_CAPLESS       0x00000010
-#define BM_AUDIOOUT_PWRDN_ADC   0x00000100
-#define BM_AUDIOOUT_PWRDN_DAC   0x00001000
-#define BM_AUDIOOUT_PWRDN_RIGHT_ADC     0x00010000
-#define BM_AUDIOOUT_PWRDN_LINEOUT       0x01000000
-
-#define HW_AUDIOOUT_REFCTRL     0x80
-#define BM_AUDIOOUT_REFCTRL_VAG_VAL     0x000000F0
-#define BP_AUDIOOUT_REFCTRL_VAG_VAL     4
-#define BM_AUDIOOUT_REFCTRL_ADC_REFVAL  0x00000F00
-#define BP_AUDIOOUT_REFCTRL_ADC_REFVAL  8
-#define BM_AUDIOOUT_REFCTRL_ADJ_VAG     0x00001000
-#define BM_AUDIOOUT_REFCTRL_ADJ_ADC     0x00002000
-#define BM_AUDIOOUT_REFCTRL_BIAS_CTRL   0x00030000
-#define BP_AUDIOOUT_REFCTRL_BIAS_CTRL   16
-#define BM_AUDIOOUT_REFCTRL_LOW_PWR     0x00080000
-#define BM_AUDIOOUT_REFCTRL_VBG_ADJ     0x00700000
-#define BP_AUDIOOUT_REFCTRL_VBG_ADJ     20
-#define BM_AUDIOOUT_REFCTRL_XTAL_BGR_BIAS       0x01000000
-#define BM_AUDIOOUT_REFCTRL_RAISE_REF   0x02000000
-
-#define HW_AUDIOOUT_ANACTRL     0x90
-#define BM_AUDIOOUT_ANACTRL_HP_CLASSAB  0x00000010
-#define BM_AUDIOOUT_ANACTRL_HP_HOLD_GND 0x00000020
-
-#define HW_AUDIOOUT_TEST        0xA0
-#define BM_AUDIOOUT_TEST_HP_I1_ADJ      0x00C00000
-#define BP_AUDIOOUT_TEST_HP_I1_ADJ      22
-
-#define HW_AUDIOOUT_BISTCTRL    0xB0
-
-#define HW_AUDIOOUT_BISTSTAT0   0xC0
-
-#define HW_AUDIOOUT_BISTSTAT1   0xD0
-
-#define HW_AUDIOOUT_ANACLKCTRL  0xE0
-#define BM_AUDIOOUT_ANACLKCTRL_CLKGATE  0x80000000
-
-#define HW_AUDIOOUT_DATA        0xF0
-
-#define HW_AUDIOOUT_LINEOUTCTRL 0x100
-#define BM_AUDIOOUT_LINEOUTCTRL_VOL_RIGHT       0x0000001F
-#define BP_AUDIOOUT_LINEOUTCTRL_VOL_RIGHT       0
-#define BM_AUDIOOUT_LINEOUTCTRL_VOL_LEFT        0x00001F00
-#define BP_AUDIOOUT_LINEOUTCTRL_VOL_LEFT        8
-#define BM_AUDIOOUT_LINEOUTCTRL_CHARGE_CAP      0x00007000
-#define BP_AUDIOOUT_LINEOUTCTRL_CHARGE_CAP      12
-#define BM_AUDIOOUT_LINEOUTCTRL_VAG_CTRL        0x00F00000
-#define BP_AUDIOOUT_LINEOUTCTRL_VAG_CTRL        20
-#define BM_AUDIOOUT_LINEOUTCTRL_MUTE    0x01000000
-#define BM_AUDIOOUT_LINEOUTCTRL_EN_ZCD  0x02000000
-
-#define HW_AUDIOOUT_VERSION     0x200
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h b/arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h
deleted file mode 100644
index 47f5c92fdaf6..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * stmp37xx: CLKCTRL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_CLKCTRL
-#define _MACH_REGS_CLKCTRL
-
-#define REGS_CLKCTRL_BASE       (STMP3XXX_REGS_BASE + 0x40000)
-
-#define HW_CLKCTRL_PLLCTRL0     0x0
-#define BM_CLKCTRL_PLLCTRL0_EN_USB_CLKS 0x00040000
-
-#define HW_CLKCTRL_CPU          0x20
-#define BM_CLKCTRL_CPU_DIV_CPU  0x0000003F
-#define BP_CLKCTRL_CPU_DIV_CPU  0
-
-#define HW_CLKCTRL_HBUS         0x30
-#define BM_CLKCTRL_HBUS_DIV     0x0000001F
-#define BP_CLKCTRL_HBUS_DIV     0
-
-#define HW_CLKCTRL_XBUS         0x40
-
-#define HW_CLKCTRL_XTAL         0x50
-
-#define HW_CLKCTRL_PIX          0x60
-#define BM_CLKCTRL_PIX_DIV      0x00007FFF
-#define BP_CLKCTRL_PIX_DIV      0
-#define BM_CLKCTRL_PIX_CLKGATE  0x80000000
-
-#define HW_CLKCTRL_SSP          0x70
-
-#define HW_CLKCTRL_GPMI         0x80
-
-#define HW_CLKCTRL_SPDIF        0x90
-
-#define HW_CLKCTRL_EMI          0xA0
-
-#define HW_CLKCTRL_IR           0xB0
-
-#define HW_CLKCTRL_SAIF         0xC0
-
-#define HW_CLKCTRL_FRAC         0xD0
-#define BM_CLKCTRL_FRAC_EMIFRAC 0x00003F00
-#define BP_CLKCTRL_FRAC_EMIFRAC 8
-#define BM_CLKCTRL_FRAC_PIXFRAC 0x003F0000
-#define BP_CLKCTRL_FRAC_PIXFRAC 16
-#define BM_CLKCTRL_FRAC_CLKGATEPIX      0x00800000
-
-#define HW_CLKCTRL_CLKSEQ       0xE0
-#define BM_CLKCTRL_CLKSEQ_BYPASS_PIX    0x00000002
-
-#define HW_CLKCTRL_RESET        0xF0
-#define BM_CLKCTRL_RESET_DIG    0x00000001
-#define BP_CLKCTRL_RESET_DIG    0
-
-#endif
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-digctl.h b/arch/arm/mach-stmp37xx/include/mach/regs-digctl.h
deleted file mode 100644
index ba1bbe265c20..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-digctl.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * stmp37xx: DIGCTL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_DIGCTL_BASE        (STMP3XXX_REGS_BASE + 0x1C000)
-
-#define HW_DIGCTL_CTRL          0x0
-#define BM_DIGCTL_CTRL_USB_CLKGATE      0x00000004
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h b/arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h
deleted file mode 100644
index 3b6d990a3af5..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * stmp37xx: ECC8 register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_ECC8_BASE  (STMP3XXX_REGS_BASE + 0x8000)
-
-#define HW_ECC8_CTRL            0x0
-#define BM_ECC8_CTRL_COMPLETE_IRQ       0x00000001
-#define BP_ECC8_CTRL_COMPLETE_IRQ       0
-#define BM_ECC8_CTRL_COMPLETE_IRQ_EN    0x00000100
-#define BM_ECC8_CTRL_AHBM_SFTRST        0x20000000
-
-#define HW_ECC8_STATUS0         0x10
-#define BM_ECC8_STATUS0_UNCORRECTABLE   0x00000004
-#define BM_ECC8_STATUS0_CORRECTED       0x00000008
-#define BM_ECC8_STATUS0_STATUS_AUX      0x00000F00
-#define BP_ECC8_STATUS0_STATUS_AUX      8
-#define BM_ECC8_STATUS0_COMPLETED_CE    0x000F0000
-#define BP_ECC8_STATUS0_COMPLETED_CE    16
-
-#define HW_ECC8_STATUS1         0x20
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h b/arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h
deleted file mode 100644
index f2b304f54490..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * stmp37xx: GPMI register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_GPMI_BASE  (STMP3XXX_REGS_BASE + 0xC000)
-#define REGS_GPMI_PHYS  0x8000C000
-#define REGS_GPMI_SIZE  0x2000
-
-#define HW_GPMI_CTRL0           0x0
-#define BM_GPMI_CTRL0_XFER_COUNT        0x0000FFFF
-#define BP_GPMI_CTRL0_XFER_COUNT        0
-#define BM_GPMI_CTRL0_CS        0x00300000
-#define BP_GPMI_CTRL0_CS        20
-#define BM_GPMI_CTRL0_LOCK_CS   0x00400000
-#define BM_GPMI_CTRL0_WORD_LENGTH       0x00800000
-#define BM_GPMI_CTRL0_COMMAND_MODE      0x03000000
-#define BP_GPMI_CTRL0_COMMAND_MODE      24
-#define BV_GPMI_CTRL0_COMMAND_MODE__WRITE           0x0
-#define BV_GPMI_CTRL0_COMMAND_MODE__READ             0x1
-#define BV_GPMI_CTRL0_COMMAND_MODE__READ_AND_COMPARE 0x2
-#define BV_GPMI_CTRL0_COMMAND_MODE__WAIT_FOR_READY   0x3
-#define BM_GPMI_CTRL0_RUN       0x20000000
-#define BM_GPMI_CTRL0_CLKGATE   0x40000000
-#define BM_GPMI_CTRL0_SFTRST    0x80000000
-#define BM_GPMI_ECCCTRL_ENABLE_ECC      0x00001000
-#define BM_GPMI_ECCCTRL_ECC_CMD 0x00006000
-#define BP_GPMI_ECCCTRL_ECC_CMD 13
-
-#define HW_GPMI_CTRL1           0x60
-#define BM_GPMI_CTRL1_GPMI_MODE 0x00000003
-#define BP_GPMI_CTRL1_GPMI_MODE 0
-#define BM_GPMI_CTRL1_ATA_IRQRDY_POLARITY       0x00000004
-#define BM_GPMI_CTRL1_DEV_RESET 0x00000008
-#define BM_GPMI_CTRL1_TIMEOUT_IRQ       0x00000200
-#define BM_GPMI_CTRL1_DEV_IRQ   0x00000400
-#define BM_GPMI_CTRL1_DSAMPLE_TIME      0x00007000
-#define BP_GPMI_CTRL1_DSAMPLE_TIME      12
-
-#define HW_GPMI_TIMING0         0x70
-#define BM_GPMI_TIMING0_DATA_SETUP      0x000000FF
-#define BP_GPMI_TIMING0_DATA_SETUP      0
-#define BM_GPMI_TIMING0_DATA_HOLD       0x0000FF00
-#define BP_GPMI_TIMING0_DATA_HOLD       8
-
-#define HW_GPMI_TIMING1         0x80
-#define BM_GPMI_TIMING1_DEVICE_BUSY_TIMEOUT     0xFFFF0000
-#define BP_GPMI_TIMING1_DEVICE_BUSY_TIMEOUT     16
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-i2c.h b/arch/arm/mach-stmp37xx/include/mach/regs-i2c.h
deleted file mode 100644
index 35882a9b8bc5..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-i2c.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * stmp37xx: I2C register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_I2C_BASE   (STMP3XXX_REGS_BASE + 0x58000)
-#define REGS_I2C_PHYS   0x80058000
-#define REGS_I2C_SIZE   0x2000
-
-#define HW_I2C_CTRL0            0x0
-#define BM_I2C_CTRL0_XFER_COUNT 0x0000FFFF
-#define BP_I2C_CTRL0_XFER_COUNT 0
-#define BM_I2C_CTRL0_DIRECTION  0x00010000
-#define BM_I2C_CTRL0_MASTER_MODE        0x00020000
-#define BM_I2C_CTRL0_PRE_SEND_START     0x00080000
-#define BM_I2C_CTRL0_POST_SEND_STOP     0x00100000
-#define BM_I2C_CTRL0_RETAIN_CLOCK       0x00200000
-#define BM_I2C_CTRL0_SEND_NAK_ON_LAST   0x02000000
-#define BM_I2C_CTRL0_CLKGATE    0x40000000
-#define BM_I2C_CTRL0_SFTRST     0x80000000
-
-#define HW_I2C_TIMING0          0x10
-
-#define HW_I2C_TIMING1          0x20
-
-#define HW_I2C_TIMING2          0x30
-
-#define HW_I2C_CTRL1            0x40
-#define BM_I2C_CTRL1_SLAVE_IRQ  0x00000001
-#define BP_I2C_CTRL1_SLAVE_IRQ  0
-#define BM_I2C_CTRL1_SLAVE_STOP_IRQ     0x00000002
-#define BM_I2C_CTRL1_MASTER_LOSS_IRQ    0x00000004
-#define BM_I2C_CTRL1_EARLY_TERM_IRQ     0x00000008
-#define BM_I2C_CTRL1_OVERSIZE_XFER_TERM_IRQ     0x00000010
-#define BM_I2C_CTRL1_NO_SLAVE_ACK_IRQ   0x00000020
-#define BM_I2C_CTRL1_DATA_ENGINE_CMPLT_IRQ      0x00000040
-#define BM_I2C_CTRL1_BUS_FREE_IRQ       0x00000080
-#define BM_I2C_CTRL1_CLR_GOT_A_NAK      0x10000000
-
-#define HW_I2C_VERSION          0x90
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-icoll.h b/arch/arm/mach-stmp37xx/include/mach/regs-icoll.h
deleted file mode 100644
index 3b7c92239e20..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-icoll.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * stmp37xx: ICOLL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_ICOLL
-#define _MACH_REGS_ICOLL
-
-#define REGS_ICOLL_BASE (STMP3XXX_REGS_BASE + 0x0)
-
-#define HW_ICOLL_VECTOR         0x0
-
-#define HW_ICOLL_LEVELACK       0x10
-
-#define HW_ICOLL_CTRL           0x20
-#define BM_ICOLL_CTRL_CLKGATE   0x40000000
-#define BM_ICOLL_CTRL_SFTRST    0x80000000
-
-#define HW_ICOLL_STAT           0x30
-
-#define HW_ICOLL_PRIORITY0      (0x60 + 0 * 0x10)
-#define HW_ICOLL_PRIORITY1      (0x60 + 1 * 0x10)
-#define HW_ICOLL_PRIORITY2      (0x60 + 2 * 0x10)
-#define HW_ICOLL_PRIORITY3      (0x60 + 3 * 0x10)
-
-#define HW_ICOLL_PRIORITYn      0x60
-
-#endif
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h b/arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h
deleted file mode 100644
index 72514e8b0737..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * stmp37xx: LCDIF register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_LCDIF_BASE (STMP3XXX_REGS_BASE + 0x30000)
-#define REGS_LCDIF_PHYS 0x80030000
-#define REGS_LCDIF_SIZE 0x2000
-
-#define HW_LCDIF_CTRL           0x0
-#define BM_LCDIF_CTRL_COUNT     0x0000FFFF
-#define BP_LCDIF_CTRL_COUNT     0
-#define BM_LCDIF_CTRL_RUN       0x00010000
-#define BM_LCDIF_CTRL_WORD_LENGTH       0x00020000
-#define BM_LCDIF_CTRL_DATA_SELECT       0x00040000
-#define BM_LCDIF_CTRL_DOTCLK_MODE       0x00080000
-#define BM_LCDIF_CTRL_VSYNC_MODE        0x00100000
-#define BM_LCDIF_CTRL_DATA_SWIZZLE      0x00600000
-#define BP_LCDIF_CTRL_DATA_SWIZZLE      21
-#define BM_LCDIF_CTRL_BYPASS_COUNT      0x00800000
-#define BM_LCDIF_CTRL_SHIFT_NUM_BITS    0x06000000
-#define BP_LCDIF_CTRL_SHIFT_NUM_BITS    25
-#define BM_LCDIF_CTRL_DATA_SHIFT_DIR    0x08000000
-#define BM_LCDIF_CTRL_WAIT_FOR_VSYNC_EDGE       0x10000000
-#define BM_LCDIF_CTRL_CLKGATE   0x40000000
-#define BM_LCDIF_CTRL_SFTRST    0x80000000
-
-#define HW_LCDIF_CTRL1          0x10
-#define BM_LCDIF_CTRL1_RESET    0x00000001
-#define BP_LCDIF_CTRL1_RESET    0
-#define BM_LCDIF_CTRL1_MODE86   0x00000002
-#define BM_LCDIF_CTRL1_BUSY_ENABLE      0x00000004
-#define BM_LCDIF_CTRL1_VSYNC_EDGE_IRQ   0x00000100
-#define BM_LCDIF_CTRL1_CUR_FRAME_DONE_IRQ       0x00000200
-#define BM_LCDIF_CTRL1_UNDERFLOW_IRQ    0x00000400
-#define BM_LCDIF_CTRL1_OVERFLOW_IRQ     0x00000800
-#define BM_LCDIF_CTRL1_VSYNC_EDGE_IRQ_EN        0x00001000
-#define BM_LCDIF_CTRL1_BYTE_PACKING_FORMAT      0x000F0000
-#define BP_LCDIF_CTRL1_BYTE_PACKING_FORMAT      16
-
-#define HW_LCDIF_TIMING         0x20
-
-#define HW_LCDIF_VDCTRL0        0x30
-#define BM_LCDIF_VDCTRL0_VALID_DATA_CNT 0x000003FF
-#define BP_LCDIF_VDCTRL0_VALID_DATA_CNT 0
-#define BM_LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH_UNIT 0x00100000
-#define BM_LCDIF_VDCTRL0_VSYNC_PERIOD_UNIT      0x00200000
-#define BM_LCDIF_VDCTRL0_ENABLE_POL     0x01000000
-#define BM_LCDIF_VDCTRL0_DOTCLK_POL     0x02000000
-#define BM_LCDIF_VDCTRL0_HSYNC_POL      0x04000000
-#define BM_LCDIF_VDCTRL0_VSYNC_POL      0x08000000
-#define BM_LCDIF_VDCTRL0_ENABLE_PRESENT 0x10000000
-#define BM_LCDIF_VDCTRL0_VSYNC_OEB      0x20000000
-
-#define HW_LCDIF_VDCTRL1        0x40
-#define BM_LCDIF_VDCTRL1_VSYNC_PERIOD   0x000FFFFF
-#define BP_LCDIF_VDCTRL1_VSYNC_PERIOD   0
-#define BM_LCDIF_VDCTRL1_VSYNC_PULSE_WIDTH      0xFFF00000
-#define BP_LCDIF_VDCTRL1_VSYNC_PULSE_WIDTH      20
-
-#define HW_LCDIF_VDCTRL2        0x50
-#define BM_LCDIF_VDCTRL2_VALID_DATA_CNT 0x000007FF
-#define BP_LCDIF_VDCTRL2_VALID_DATA_CNT 0
-#define BM_LCDIF_VDCTRL2_HSYNC_PERIOD   0x007FF800
-#define BP_LCDIF_VDCTRL2_HSYNC_PERIOD   11
-#define BM_LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH      0xFF800000
-#define BP_LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH      23
-
-#define HW_LCDIF_VDCTRL3        0x60
-#define BM_LCDIF_VDCTRL3_VERTICAL_WAIT_CNT      0x000001FF
-#define BP_LCDIF_VDCTRL3_VERTICAL_WAIT_CNT      0
-#define BM_LCDIF_VDCTRL3_HORIZONTAL_WAIT_CNT    0x00FFF000
-#define BP_LCDIF_VDCTRL3_HORIZONTAL_WAIT_CNT    12
-#define BM_LCDIF_VDCTRL3_SYNC_SIGNALS_ON        0x01000000
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-lradc.h b/arch/arm/mach-stmp37xx/include/mach/regs-lradc.h
deleted file mode 100644
index cc7b4702d1cd..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-lradc.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * stmp37xx: LRADC register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_LRADC_BASE (STMP3XXX_REGS_BASE + 0x50000)
-
-#define HW_LRADC_CTRL0          0x0
-#define BM_LRADC_CTRL0_SCHEDULE 0x000000FF
-#define BP_LRADC_CTRL0_SCHEDULE 0
-#define BM_LRADC_CTRL0_XPLUS_ENABLE     0x00010000
-#define BM_LRADC_CTRL0_YPLUS_ENABLE     0x00020000
-#define BM_LRADC_CTRL0_XMINUS_ENABLE    0x00040000
-#define BM_LRADC_CTRL0_YMINUS_ENABLE    0x00080000
-#define BM_LRADC_CTRL0_TOUCH_DETECT_ENABLE      0x00100000
-#define BM_LRADC_CTRL0_ONCHIP_GROUNDREF 0x00200000
-#define BM_LRADC_CTRL0_CLKGATE  0x40000000
-#define BM_LRADC_CTRL0_SFTRST   0x80000000
-
-#define HW_LRADC_CTRL1          0x10
-#define BM_LRADC_CTRL1_LRADC0_IRQ       0x00000001
-#define BP_LRADC_CTRL1_LRADC0_IRQ       0
-#define BM_LRADC_CTRL1_LRADC5_IRQ       0x00000020
-#define BM_LRADC_CTRL1_LRADC6_IRQ       0x00000040
-#define BM_LRADC_CTRL1_TOUCH_DETECT_IRQ 0x00000100
-#define BM_LRADC_CTRL1_LRADC0_IRQ_EN    0x00010000
-#define BM_LRADC_CTRL1_LRADC5_IRQ_EN    0x00200000
-#define BM_LRADC_CTRL1_TOUCH_DETECT_IRQ_EN      0x01000000
-
-#define HW_LRADC_CTRL2          0x20
-#define BM_LRADC_CTRL2_BL_BRIGHTNESS    0x001F0000
-#define BP_LRADC_CTRL2_BL_BRIGHTNESS    16
-#define BM_LRADC_CTRL2_BL_MUX_SELECT    0x00200000
-#define BM_LRADC_CTRL2_BL_ENABLE        0x00400000
-#define BM_LRADC_CTRL2_DIVIDE_BY_TWO    0xFF000000
-#define BP_LRADC_CTRL2_DIVIDE_BY_TWO    24
-
-#define HW_LRADC_CTRL3          0x30
-#define BM_LRADC_CTRL3_CYCLE_TIME       0x00000300
-#define BP_LRADC_CTRL3_CYCLE_TIME       8
-
-#define HW_LRADC_STATUS         0x40
-#define BM_LRADC_STATUS_TOUCH_DETECT_RAW        0x00000001
-#define BP_LRADC_STATUS_TOUCH_DETECT_RAW        0
-
-#define HW_LRADC_CH0            (0x50 + 0 * 0x10)
-#define HW_LRADC_CH1            (0x50 + 1 * 0x10)
-#define HW_LRADC_CH2            (0x50 + 2 * 0x10)
-#define HW_LRADC_CH3            (0x50 + 3 * 0x10)
-#define HW_LRADC_CH4            (0x50 + 4 * 0x10)
-#define HW_LRADC_CH5            (0x50 + 5 * 0x10)
-#define HW_LRADC_CH6            (0x50 + 6 * 0x10)
-#define HW_LRADC_CH7            (0x50 + 7 * 0x10)
-
-#define HW_LRADC_CHn            0x50
-#define BM_LRADC_CHn_VALUE      0x0003FFFF
-#define BP_LRADC_CHn_VALUE      0
-#define BM_LRADC_CHn_NUM_SAMPLES        0x1F000000
-#define BP_LRADC_CHn_NUM_SAMPLES        24
-#define BM_LRADC_CHn_ACCUMULATE 0x20000000
-
-#define HW_LRADC_DELAY0         (0xD0 + 0 * 0x10)
-#define HW_LRADC_DELAY1         (0xD0 + 1 * 0x10)
-#define HW_LRADC_DELAY2         (0xD0 + 2 * 0x10)
-#define HW_LRADC_DELAY3         (0xD0 + 3 * 0x10)
-
-#define HW_LRADC_DELAYn         0xD0
-#define BM_LRADC_DELAYn_DELAY   0x000007FF
-#define BP_LRADC_DELAYn_DELAY   0
-#define BM_LRADC_DELAYn_LOOP_COUNT      0x0000F800
-#define BP_LRADC_DELAYn_LOOP_COUNT      11
-#define BM_LRADC_DELAYn_TRIGGER_DELAYS  0x000F0000
-#define BP_LRADC_DELAYn_TRIGGER_DELAYS  16
-#define BM_LRADC_DELAYn_KICK    0x00100000
-#define BM_LRADC_DELAYn_TRIGGER_LRADCS  0xFF000000
-#define BP_LRADC_DELAYn_TRIGGER_LRADCS  24
-
-#define HW_LRADC_CTRL4          0x140
-#define BM_LRADC_CTRL4_LRADC6SELECT     0x0F000000
-#define BP_LRADC_CTRL4_LRADC6SELECT     24
-#define BM_LRADC_CTRL4_LRADC7SELECT     0xF0000000
-#define BP_LRADC_CTRL4_LRADC7SELECT     28
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h b/arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h
deleted file mode 100644
index d5efce2388c7..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * stmp37xx: PINCTRL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_PINCTRL
-#define _MACH_REGS_PINCTRL
-
-#define REGS_PINCTRL_BASE       (STMP3XXX_REGS_BASE + 0x18000)
-
-#define HW_PINCTRL_MUXSEL0      0x100
-#define HW_PINCTRL_MUXSEL1      0x110
-#define HW_PINCTRL_MUXSEL2      0x120
-#define HW_PINCTRL_MUXSEL3      0x130
-#define HW_PINCTRL_MUXSEL4      0x140
-#define HW_PINCTRL_MUXSEL5      0x150
-#define HW_PINCTRL_MUXSEL6      0x160
-#define HW_PINCTRL_MUXSEL7      0x170
-
-#define HW_PINCTRL_DRIVE0       0x200
-#define HW_PINCTRL_DRIVE1       0x210
-#define HW_PINCTRL_DRIVE2       0x220
-#define HW_PINCTRL_DRIVE3       0x230
-#define HW_PINCTRL_DRIVE4       0x240
-#define HW_PINCTRL_DRIVE5       0x250
-#define HW_PINCTRL_DRIVE6       0x260
-#define HW_PINCTRL_DRIVE7       0x270
-#define HW_PINCTRL_DRIVE8       0x280
-#define HW_PINCTRL_DRIVE9       0x290
-#define HW_PINCTRL_DRIVE10      0x2A0
-#define HW_PINCTRL_DRIVE11      0x2B0
-#define HW_PINCTRL_DRIVE12      0x2C0
-#define HW_PINCTRL_DRIVE13      0x2D0
-#define HW_PINCTRL_DRIVE14      0x2E0
-
-#define HW_PINCTRL_PULL0        0x300
-#define HW_PINCTRL_PULL1        0x310
-#define HW_PINCTRL_PULL2        0x320
-#define HW_PINCTRL_PULL3        0x330
-
-#define HW_PINCTRL_DOUT0        0x400
-#define HW_PINCTRL_DOUT1        0x410
-#define HW_PINCTRL_DOUT2        0x420
-
-#define HW_PINCTRL_DIN0         0x500
-#define HW_PINCTRL_DIN1         0x510
-#define HW_PINCTRL_DIN2         0x520
-
-#define HW_PINCTRL_DOE0         0x600
-#define HW_PINCTRL_DOE1         0x610
-#define HW_PINCTRL_DOE2         0x620
-
-#define HW_PINCTRL_PIN2IRQ0     0x700
-#define HW_PINCTRL_PIN2IRQ1     0x710
-#define HW_PINCTRL_PIN2IRQ2     0x720
-
-#define HW_PINCTRL_IRQEN0       0x800
-#define HW_PINCTRL_IRQEN1       0x810
-#define HW_PINCTRL_IRQEN2       0x820
-
-#define HW_PINCTRL_IRQLEVEL0    0x900
-#define HW_PINCTRL_IRQLEVEL1    0x910
-#define HW_PINCTRL_IRQLEVEL2    0x920
-
-#define HW_PINCTRL_IRQPOL0      0xA00
-#define HW_PINCTRL_IRQPOL1      0xA10
-#define HW_PINCTRL_IRQPOL2      0xA20
-
-#define HW_PINCTRL_IRQSTAT0     0xB00
-#define HW_PINCTRL_IRQSTAT1     0xB10
-#define HW_PINCTRL_IRQSTAT2     0xB20
-
-#endif
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-power.h b/arch/arm/mach-stmp37xx/include/mach/regs-power.h
deleted file mode 100644
index 0e733d74a229..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-power.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * stmp37xx: POWER register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_POWER
-#define _MACH_REGS_POWER
-
-#define REGS_POWER_BASE (STMP3XXX_REGS_BASE + 0x44000)
-
-#define HW_POWER_CTRL           0x0
-#define BM_POWER_CTRL_CLKGATE   0x40000000
-
-#define HW_POWER_5VCTRL         0x10
-
-#define HW_POWER_MINPWR         0x20
-
-#define HW_POWER_CHARGE         0x30
-
-#define HW_POWER_VDDDCTRL       0x40
-
-#define HW_POWER_VDDACTRL       0x50
-
-#define HW_POWER_VDDIOCTRL      0x60
-#define BM_POWER_VDDIOCTRL_TRG  0x0000001F
-#define BP_POWER_VDDIOCTRL_TRG  0
-
-#define HW_POWER_STS            0xB0
-#define BM_POWER_STS_VBUSVALID  0x00000002
-#define BM_POWER_STS_BVALID     0x00000004
-#define BM_POWER_STS_AVALID     0x00000008
-#define BM_POWER_STS_DC_OK      0x00000100
-
-#define HW_POWER_RESET          0xE0
-
-#define HW_POWER_DEBUG          0xF0
-#define BM_POWER_DEBUG_BVALIDPIOLOCK    0x00000002
-#define BM_POWER_DEBUG_AVALIDPIOLOCK    0x00000004
-#define BM_POWER_DEBUG_VBUSVALIDPIOLOCK 0x00000008
-
-#endif
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-pwm.h b/arch/arm/mach-stmp37xx/include/mach/regs-pwm.h
deleted file mode 100644
index 15966a1b62e0..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-pwm.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * stmp37xx: PWM register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_PWM_BASE   (STMP3XXX_REGS_BASE + 0x64000)
-
-#define HW_PWM_CTRL             0x0
-#define BM_PWM_CTRL_PWM2_ENABLE 0x00000004
-#define BM_PWM_CTRL_PWM2_ANA_CTRL_ENABLE        0x00000020
-
-#define HW_PWM_ACTIVE0          (0x10 + 0 * 0x20)
-#define HW_PWM_ACTIVE1          (0x10 + 1 * 0x20)
-#define HW_PWM_ACTIVE2          (0x10 + 2 * 0x20)
-#define HW_PWM_ACTIVE3          (0x10 + 3 * 0x20)
-
-#define HW_PWM_ACTIVEn          0x10
-#define BM_PWM_ACTIVEn_ACTIVE   0x0000FFFF
-#define BP_PWM_ACTIVEn_ACTIVE   0
-#define BM_PWM_ACTIVEn_INACTIVE 0xFFFF0000
-#define BP_PWM_ACTIVEn_INACTIVE 16
-
-#define HW_PWM_PERIOD0          (0x20 + 0 * 0x20)
-#define HW_PWM_PERIOD1          (0x20 + 1 * 0x20)
-#define HW_PWM_PERIOD2          (0x20 + 2 * 0x20)
-#define HW_PWM_PERIOD3          (0x20 + 3 * 0x20)
-
-#define HW_PWM_PERIODn          0x20
-#define BM_PWM_PERIODn_PERIOD   0x0000FFFF
-#define BP_PWM_PERIODn_PERIOD   0
-#define BM_PWM_PERIODn_ACTIVE_STATE     0x00030000
-#define BP_PWM_PERIODn_ACTIVE_STATE     16
-#define BM_PWM_PERIODn_INACTIVE_STATE   0x000C0000
-#define BP_PWM_PERIODn_INACTIVE_STATE   18
-#define BM_PWM_PERIODn_CDIV     0x00700000
-#define BP_PWM_PERIODn_CDIV     20
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-rtc.h b/arch/arm/mach-stmp37xx/include/mach/regs-rtc.h
deleted file mode 100644
index fac40edc38a1..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-rtc.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * stmp37xx: RTC register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_RTC_BASE   (STMP3XXX_REGS_BASE + 0x5C000)
-#define REGS_RTC_PHYS   0x8005C000
-#define REGS_RTC_SIZE   0x2000
-
-#define HW_RTC_CTRL             0x0
-#define BM_RTC_CTRL_ALARM_IRQ_EN        0x00000001
-#define BP_RTC_CTRL_ALARM_IRQ_EN        0
-#define BM_RTC_CTRL_ONEMSEC_IRQ_EN      0x00000002
-#define BM_RTC_CTRL_ALARM_IRQ   0x00000004
-#define BM_RTC_CTRL_ONEMSEC_IRQ 0x00000008
-#define BM_RTC_CTRL_WATCHDOGEN  0x00000010
-
-#define HW_RTC_STAT             0x10
-#define BM_RTC_STAT_NEW_REGS    0x0000FF00
-#define BP_RTC_STAT_NEW_REGS    8
-#define BM_RTC_STAT_STALE_REGS  0x00FF0000
-#define BP_RTC_STAT_STALE_REGS  16
-#define BM_RTC_STAT_RTC_PRESENT 0x80000000
-
-#define HW_RTC_SECONDS          0x30
-
-#define HW_RTC_ALARM            0x40
-
-#define HW_RTC_WATCHDOG         0x50
-
-#define HW_RTC_PERSISTENT0      0x60
-#define BM_RTC_PERSISTENT0_ALARM_WAKE_EN        0x00000002
-#define BM_RTC_PERSISTENT0_ALARM_EN     0x00000004
-#define BM_RTC_PERSISTENT0_XTAL24MHZ_PWRUP      0x00000010
-#define BM_RTC_PERSISTENT0_XTAL32KHZ_PWRUP      0x00000020
-#define BM_RTC_PERSISTENT0_ALARM_WAKE   0x00000080
-#define BM_RTC_PERSISTENT0_SPARE_ANALOG 0xFFFC0000
-#define BP_RTC_PERSISTENT0_SPARE_ANALOG 18
-
-#define HW_RTC_PERSISTENT1      0x70
-
-#define HW_RTC_VERSION          0xD0
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-ssp.h b/arch/arm/mach-stmp37xx/include/mach/regs-ssp.h
deleted file mode 100644
index cbde891a06c2..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-ssp.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * stmp37xx: SSP register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_SSP_BASE   (STMP3XXX_REGS_BASE + 0x10000)
-#define REGS_SSP1_PHYS  0x80010000
-#define REGS_SSP2_PHYS  0x80034000
-#define REGS_SSP_SIZE   0x2000
-
-#define HW_SSP_CTRL0            0x0
-#define BM_SSP_CTRL0_XFER_COUNT 0x0000FFFF
-#define BP_SSP_CTRL0_XFER_COUNT 0
-#define BM_SSP_CTRL0_ENABLE     0x00010000
-#define BM_SSP_CTRL0_GET_RESP   0x00020000
-#define BM_SSP_CTRL0_LONG_RESP  0x00080000
-#define BM_SSP_CTRL0_WAIT_FOR_CMD       0x00100000
-#define BM_SSP_CTRL0_WAIT_FOR_IRQ       0x00200000
-#define BM_SSP_CTRL0_BUS_WIDTH  0x00C00000
-#define BP_SSP_CTRL0_BUS_WIDTH  22
-#define BM_SSP_CTRL0_DATA_XFER  0x01000000
-#define BM_SSP_CTRL0_READ       0x02000000
-#define BM_SSP_CTRL0_IGNORE_CRC 0x04000000
-#define BM_SSP_CTRL0_LOCK_CS    0x08000000
-#define BM_SSP_CTRL0_RUN        0x20000000
-#define BM_SSP_CTRL0_CLKGATE    0x40000000
-#define BM_SSP_CTRL0_SFTRST     0x80000000
-
-#define HW_SSP_CMD0             0x10
-#define BM_SSP_CMD0_CMD         0x000000FF
-#define BP_SSP_CMD0_CMD         0
-#define BM_SSP_CMD0_BLOCK_COUNT 0x0000FF00
-#define BP_SSP_CMD0_BLOCK_COUNT 8
-#define BM_SSP_CMD0_BLOCK_SIZE  0x000F0000
-#define BP_SSP_CMD0_BLOCK_SIZE  16
-#define BM_SSP_CMD0_APPEND_8CYC 0x00100000
-#define BM_SSP_CMD1_CMD_ARG     0xFFFFFFFF
-#define BP_SSP_CMD1_CMD_ARG     0
-
-#define HW_SSP_TIMING           0x50
-#define BM_SSP_TIMING_CLOCK_RATE        0x000000FF
-#define BP_SSP_TIMING_CLOCK_RATE        0
-#define BM_SSP_TIMING_CLOCK_DIVIDE      0x0000FF00
-#define BP_SSP_TIMING_CLOCK_DIVIDE      8
-#define BM_SSP_TIMING_TIMEOUT   0xFFFF0000
-#define BP_SSP_TIMING_TIMEOUT   16
-
-#define HW_SSP_CTRL1            0x60
-#define BM_SSP_CTRL1_SSP_MODE   0x0000000F
-#define BP_SSP_CTRL1_SSP_MODE   0
-#define BM_SSP_CTRL1_WORD_LENGTH        0x000000F0
-#define BP_SSP_CTRL1_WORD_LENGTH        4
-#define BM_SSP_CTRL1_POLARITY   0x00000200
-#define BM_SSP_CTRL1_PHASE      0x00000400
-#define BM_SSP_CTRL1_DMA_ENABLE 0x00002000
-#define BM_SSP_CTRL1_FIFO_OVERRUN_IRQ   0x00008000
-#define BM_SSP_CTRL1_RECV_TIMEOUT_IRQ_EN        0x00010000
-#define BM_SSP_CTRL1_RECV_TIMEOUT_IRQ   0x00020000
-#define BM_SSP_CTRL1_FIFO_UNDERRUN_IRQ  0x00200000
-#define BM_SSP_CTRL1_DATA_CRC_IRQ_EN    0x00400000
-#define BM_SSP_CTRL1_DATA_CRC_IRQ       0x00800000
-#define BM_SSP_CTRL1_DATA_TIMEOUT_IRQ_EN        0x01000000
-#define BM_SSP_CTRL1_DATA_TIMEOUT_IRQ   0x02000000
-#define BM_SSP_CTRL1_RESP_TIMEOUT_IRQ_EN        0x04000000
-#define BM_SSP_CTRL1_RESP_TIMEOUT_IRQ   0x08000000
-#define BM_SSP_CTRL1_RESP_ERR_IRQ_EN    0x10000000
-#define BM_SSP_CTRL1_RESP_ERR_IRQ       0x20000000
-#define BM_SSP_CTRL1_SDIO_IRQ   0x80000000
-
-#define HW_SSP_DATA             0x70
-
-#define HW_SSP_SDRESP0          0x80
-
-#define HW_SSP_SDRESP1          0x90
-
-#define HW_SSP_SDRESP2          0xA0
-
-#define HW_SSP_SDRESP3          0xB0
-
-#define HW_SSP_STATUS           0xC0
-#define BM_SSP_STATUS_FIFO_EMPTY        0x00000020
-#define BM_SSP_STATUS_TIMEOUT   0x00001000
-#define BM_SSP_STATUS_RESP_TIMEOUT      0x00004000
-#define BM_SSP_STATUS_RESP_ERR  0x00008000
-#define BM_SSP_STATUS_RESP_CRC_ERR      0x00010000
-#define BM_SSP_STATUS_CARD_DETECT       0x10000000
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-timrot.h b/arch/arm/mach-stmp37xx/include/mach/regs-timrot.h
deleted file mode 100644
index 4af0f6edfa78..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-timrot.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * stmp37xx: TIMROT register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#ifndef _MACH_REGS_TIMROT
-#define _MACH_REGS_TIMROT
-
-#define REGS_TIMROT_BASE        (STMP3XXX_REGS_BASE + 0x68000)
-
-#define HW_TIMROT_ROTCTRL       0x0
-#define BM_TIMROT_ROTCTRL_CLKGATE       0x40000000
-#define BM_TIMROT_ROTCTRL_SFTRST        0x80000000
-
-#define HW_TIMROT_TIMCTRL0      (0x20 + 0 * 0x20)
-#define HW_TIMROT_TIMCTRL1      (0x20 + 1 * 0x20)
-#define HW_TIMROT_TIMCTRL2      (0x20 + 2 * 0x20)
-
-#define HW_TIMROT_TIMCTRLn      0x20
-#define BM_TIMROT_TIMCTRLn_SELECT       0x0000000F
-#define BP_TIMROT_TIMCTRLn_SELECT       0
-#define BM_TIMROT_TIMCTRLn_PRESCALE     0x00000030
-#define BP_TIMROT_TIMCTRLn_PRESCALE     4
-#define BM_TIMROT_TIMCTRLn_RELOAD       0x00000040
-#define BM_TIMROT_TIMCTRLn_UPDATE       0x00000080
-#define BM_TIMROT_TIMCTRLn_IRQ_EN       0x00004000
-#define BM_TIMROT_TIMCTRLn_IRQ  0x00008000
-
-#define HW_TIMROT_TIMCOUNT0     (0x30 + 0 * 0x20)
-#define HW_TIMROT_TIMCOUNT1     (0x30 + 1 * 0x20)
-#define HW_TIMROT_TIMCOUNT2     (0x30 + 2 * 0x20)
-
-#define HW_TIMROT_TIMCOUNTn     0x30
-#endif
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h b/arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h
deleted file mode 100644
index 0594275d860c..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * stmp37xx: UARTAPP register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_UARTAPP_BASE       (STMP3XXX_REGS_BASE + 0x6C000)
-#define REGS_UARTAPP1_PHYS      0x8006C000
-#define REGS_UARTAPP_SIZE       0x2000
-
-#define HW_UARTAPP_CTRL0        0x0
-#define BM_UARTAPP_CTRL0_XFER_COUNT     0x0000FFFF
-#define BP_UARTAPP_CTRL0_XFER_COUNT     0
-#define BM_UARTAPP_CTRL0_RXTIMEOUT      0x07FF0000
-#define BP_UARTAPP_CTRL0_RXTIMEOUT      16
-#define BM_UARTAPP_CTRL0_RXTO_ENABLE    0x08000000
-#define BM_UARTAPP_CTRL0_RUN    0x20000000
-#define BM_UARTAPP_CTRL0_SFTRST 0x80000000
-#define BM_UARTAPP_CTRL1_XFER_COUNT     0x0000FFFF
-#define BP_UARTAPP_CTRL1_XFER_COUNT     0
-#define BM_UARTAPP_CTRL1_RUN    0x10000000
-
-#define HW_UARTAPP_CTRL2        0x20
-#define BM_UARTAPP_CTRL2_UARTEN 0x00000001
-#define BP_UARTAPP_CTRL2_UARTEN 0
-#define BM_UARTAPP_CTRL2_TXE    0x00000100
-#define BM_UARTAPP_CTRL2_RXE    0x00000200
-#define BM_UARTAPP_CTRL2_RTS    0x00000800
-#define BM_UARTAPP_CTRL2_RTSEN  0x00004000
-#define BM_UARTAPP_CTRL2_CTSEN  0x00008000
-#define BM_UARTAPP_CTRL2_RXDMAE 0x01000000
-#define BM_UARTAPP_CTRL2_TXDMAE 0x02000000
-#define BM_UARTAPP_CTRL2_DMAONERR       0x04000000
-
-#define HW_UARTAPP_LINECTRL     0x30
-#define BM_UARTAPP_LINECTRL_BRK 0x00000001
-#define BP_UARTAPP_LINECTRL_BRK 0
-#define BM_UARTAPP_LINECTRL_PEN 0x00000002
-#define BM_UARTAPP_LINECTRL_EPS 0x00000004
-#define BM_UARTAPP_LINECTRL_STP2        0x00000008
-#define BM_UARTAPP_LINECTRL_FEN 0x00000010
-#define BM_UARTAPP_LINECTRL_WLEN        0x00000060
-#define BP_UARTAPP_LINECTRL_WLEN        5
-#define BM_UARTAPP_LINECTRL_SPS 0x00000080
-#define BM_UARTAPP_LINECTRL_BAUD_DIVFRAC        0x00003F00
-#define BP_UARTAPP_LINECTRL_BAUD_DIVFRAC        8
-#define BM_UARTAPP_LINECTRL_BAUD_DIVINT 0xFFFF0000
-#define BP_UARTAPP_LINECTRL_BAUD_DIVINT 16
-
-#define HW_UARTAPP_INTR         0x50
-#define BM_UARTAPP_INTR_CTSMIS  0x00000002
-#define BM_UARTAPP_INTR_RTIS    0x00000040
-#define BM_UARTAPP_INTR_CTSMIEN 0x00020000
-#define BM_UARTAPP_INTR_RXIEN   0x00100000
-#define BM_UARTAPP_INTR_RTIEN   0x00400000
-
-#define HW_UARTAPP_DATA         0x60
-
-#define HW_UARTAPP_STAT         0x70
-#define BM_UARTAPP_STAT_RXCOUNT 0x0000FFFF
-#define BP_UARTAPP_STAT_RXCOUNT 0
-#define BM_UARTAPP_STAT_FERR    0x00010000
-#define BM_UARTAPP_STAT_PERR    0x00020000
-#define BM_UARTAPP_STAT_BERR    0x00040000
-#define BM_UARTAPP_STAT_OERR    0x00080000
-#define BM_UARTAPP_STAT_RXFE    0x01000000
-#define BM_UARTAPP_STAT_TXFF    0x02000000
-#define BM_UARTAPP_STAT_TXFE    0x08000000
-#define BM_UARTAPP_STAT_CTS     0x10000000
-
-#define HW_UARTAPP_VERSION      0x90
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h b/arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h
deleted file mode 100644
index b810deb552a9..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * stmp378x: UARTDBG register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_UARTDBG_BASE       (STMP3XXX_REGS_BASE + 0x70000)
-#define REGS_UARTDBG_PHYS       0x80070000
-#define REGS_UARTDBG_SIZE       0x2000
-
-#define HW_UARTDBGDR 0x00000000
-#define BP_UARTDBGDR_UNAVAILABLE      16
-#define BM_UARTDBGDR_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGDR_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGDR_UNAVAILABLE)
-#define BP_UARTDBGDR_RESERVED      12
-#define BM_UARTDBGDR_RESERVED 0x0000F000
-#define BF_UARTDBGDR_RESERVED(v)  \
-        (((v) << 12) & BM_UARTDBGDR_RESERVED)
-#define BM_UARTDBGDR_OE 0x00000800
-#define BM_UARTDBGDR_BE 0x00000400
-#define BM_UARTDBGDR_PE 0x00000200
-#define BM_UARTDBGDR_FE 0x00000100
-#define BP_UARTDBGDR_DATA      0
-#define BM_UARTDBGDR_DATA 0x000000FF
-#define BF_UARTDBGDR_DATA(v)  \
-        (((v) << 0) & BM_UARTDBGDR_DATA)
-#define HW_UARTDBGRSR_ECR 0x00000004
-#define BP_UARTDBGRSR_ECR_UNAVAILABLE      8
-#define BM_UARTDBGRSR_ECR_UNAVAILABLE 0xFFFFFF00
-#define BF_UARTDBGRSR_ECR_UNAVAILABLE(v) \
-        (((v) << 8) & BM_UARTDBGRSR_ECR_UNAVAILABLE)
-#define BP_UARTDBGRSR_ECR_EC      4
-#define BM_UARTDBGRSR_ECR_EC 0x000000F0
-#define BF_UARTDBGRSR_ECR_EC(v)  \
-        (((v) << 4) & BM_UARTDBGRSR_ECR_EC)
-#define BM_UARTDBGRSR_ECR_OE 0x00000008
-#define BM_UARTDBGRSR_ECR_BE 0x00000004
-#define BM_UARTDBGRSR_ECR_PE 0x00000002
-#define BM_UARTDBGRSR_ECR_FE 0x00000001
-#define HW_UARTDBGFR 0x00000018
-#define BP_UARTDBGFR_UNAVAILABLE      16
-#define BM_UARTDBGFR_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGFR_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGFR_UNAVAILABLE)
-#define BP_UARTDBGFR_RESERVED      9
-#define BM_UARTDBGFR_RESERVED 0x0000FE00
-#define BF_UARTDBGFR_RESERVED(v)  \
-        (((v) << 9) & BM_UARTDBGFR_RESERVED)
-#define BM_UARTDBGFR_RI 0x00000100
-#define BM_UARTDBGFR_TXFE 0x00000080
-#define BM_UARTDBGFR_RXFF 0x00000040
-#define BM_UARTDBGFR_TXFF 0x00000020
-#define BM_UARTDBGFR_RXFE 0x00000010
-#define BM_UARTDBGFR_BUSY 0x00000008
-#define BM_UARTDBGFR_DCD 0x00000004
-#define BM_UARTDBGFR_DSR 0x00000002
-#define BM_UARTDBGFR_CTS 0x00000001
-#define HW_UARTDBGILPR 0x00000020
-#define BP_UARTDBGILPR_UNAVAILABLE      8
-#define BM_UARTDBGILPR_UNAVAILABLE 0xFFFFFF00
-#define BF_UARTDBGILPR_UNAVAILABLE(v) \
-        (((v) << 8) & BM_UARTDBGILPR_UNAVAILABLE)
-#define BP_UARTDBGILPR_ILPDVSR      0
-#define BM_UARTDBGILPR_ILPDVSR 0x000000FF
-#define BF_UARTDBGILPR_ILPDVSR(v)  \
-        (((v) << 0) & BM_UARTDBGILPR_ILPDVSR)
-#define HW_UARTDBGIBRD 0x00000024
-#define BP_UARTDBGIBRD_UNAVAILABLE      16
-#define BM_UARTDBGIBRD_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGIBRD_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGIBRD_UNAVAILABLE)
-#define BP_UARTDBGIBRD_BAUD_DIVINT      0
-#define BM_UARTDBGIBRD_BAUD_DIVINT 0x0000FFFF
-#define BF_UARTDBGIBRD_BAUD_DIVINT(v)  \
-        (((v) << 0) & BM_UARTDBGIBRD_BAUD_DIVINT)
-#define HW_UARTDBGFBRD 0x00000028
-#define BP_UARTDBGFBRD_UNAVAILABLE      8
-#define BM_UARTDBGFBRD_UNAVAILABLE 0xFFFFFF00
-#define BF_UARTDBGFBRD_UNAVAILABLE(v) \
-        (((v) << 8) & BM_UARTDBGFBRD_UNAVAILABLE)
-#define BP_UARTDBGFBRD_RESERVED      6
-#define BM_UARTDBGFBRD_RESERVED 0x000000C0
-#define BF_UARTDBGFBRD_RESERVED(v)  \
-        (((v) << 6) & BM_UARTDBGFBRD_RESERVED)
-#define BP_UARTDBGFBRD_BAUD_DIVFRAC      0
-#define BM_UARTDBGFBRD_BAUD_DIVFRAC 0x0000003F
-#define BF_UARTDBGFBRD_BAUD_DIVFRAC(v)  \
-        (((v) << 0) & BM_UARTDBGFBRD_BAUD_DIVFRAC)
-#define HW_UARTDBGLCR_H 0x0000002c
-#define BP_UARTDBGLCR_H_UNAVAILABLE      16
-#define BM_UARTDBGLCR_H_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGLCR_H_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGLCR_H_UNAVAILABLE)
-#define BP_UARTDBGLCR_H_RESERVED      8
-#define BM_UARTDBGLCR_H_RESERVED 0x0000FF00
-#define BF_UARTDBGLCR_H_RESERVED(v)  \
-        (((v) << 8) & BM_UARTDBGLCR_H_RESERVED)
-#define BM_UARTDBGLCR_H_SPS 0x00000080
-#define BP_UARTDBGLCR_H_WLEN      5
-#define BM_UARTDBGLCR_H_WLEN 0x00000060
-#define BF_UARTDBGLCR_H_WLEN(v)  \
-        (((v) << 5) & BM_UARTDBGLCR_H_WLEN)
-#define BM_UARTDBGLCR_H_FEN 0x00000010
-#define BM_UARTDBGLCR_H_STP2 0x00000008
-#define BM_UARTDBGLCR_H_EPS 0x00000004
-#define BM_UARTDBGLCR_H_PEN 0x00000002
-#define BM_UARTDBGLCR_H_BRK 0x00000001
-#define HW_UARTDBGCR 0x00000030
-#define BP_UARTDBGCR_UNAVAILABLE      16
-#define BM_UARTDBGCR_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGCR_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGCR_UNAVAILABLE)
-#define BM_UARTDBGCR_CTSEN 0x00008000
-#define BM_UARTDBGCR_RTSEN 0x00004000
-#define BM_UARTDBGCR_OUT2 0x00002000
-#define BM_UARTDBGCR_OUT1 0x00001000
-#define BM_UARTDBGCR_RTS 0x00000800
-#define BM_UARTDBGCR_DTR 0x00000400
-#define BM_UARTDBGCR_RXE 0x00000200
-#define BM_UARTDBGCR_TXE 0x00000100
-#define BM_UARTDBGCR_LBE 0x00000080
-#define BP_UARTDBGCR_RESERVED      3
-#define BM_UARTDBGCR_RESERVED 0x00000078
-#define BF_UARTDBGCR_RESERVED(v)  \
-        (((v) << 3) & BM_UARTDBGCR_RESERVED)
-#define BM_UARTDBGCR_SIRLP 0x00000004
-#define BM_UARTDBGCR_SIREN 0x00000002
-#define BM_UARTDBGCR_UARTEN 0x00000001
-#define HW_UARTDBGIFLS 0x00000034
-#define BP_UARTDBGIFLS_UNAVAILABLE      16
-#define BM_UARTDBGIFLS_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGIFLS_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGIFLS_UNAVAILABLE)
-#define BP_UARTDBGIFLS_RESERVED      6
-#define BM_UARTDBGIFLS_RESERVED 0x0000FFC0
-#define BF_UARTDBGIFLS_RESERVED(v)  \
-        (((v) << 6) & BM_UARTDBGIFLS_RESERVED)
-#define BP_UARTDBGIFLS_RXIFLSEL      3
-#define BM_UARTDBGIFLS_RXIFLSEL 0x00000038
-#define BF_UARTDBGIFLS_RXIFLSEL(v)  \
-        (((v) << 3) & BM_UARTDBGIFLS_RXIFLSEL)
-#define BV_UARTDBGIFLS_RXIFLSEL__NOT_EMPTY      0x0
-#define BV_UARTDBGIFLS_RXIFLSEL__ONE_QUARTER    0x1
-#define BV_UARTDBGIFLS_RXIFLSEL__ONE_HALF       0x2
-#define BV_UARTDBGIFLS_RXIFLSEL__THREE_QUARTERS 0x3
-#define BV_UARTDBGIFLS_RXIFLSEL__SEVEN_EIGHTHS  0x4
-#define BV_UARTDBGIFLS_RXIFLSEL__INVALID5       0x5
-#define BV_UARTDBGIFLS_RXIFLSEL__INVALID6       0x6
-#define BV_UARTDBGIFLS_RXIFLSEL__INVALID7       0x7
-#define BP_UARTDBGIFLS_TXIFLSEL      0
-#define BM_UARTDBGIFLS_TXIFLSEL 0x00000007
-#define BF_UARTDBGIFLS_TXIFLSEL(v)  \
-        (((v) << 0) & BM_UARTDBGIFLS_TXIFLSEL)
-#define BV_UARTDBGIFLS_TXIFLSEL__EMPTY    0x0
-#define BV_UARTDBGIFLS_TXIFLSEL__ONE_QUARTER    0x1
-#define BV_UARTDBGIFLS_TXIFLSEL__ONE_HALF       0x2
-#define BV_UARTDBGIFLS_TXIFLSEL__THREE_QUARTERS 0x3
-#define BV_UARTDBGIFLS_TXIFLSEL__SEVEN_EIGHTHS  0x4
-#define BV_UARTDBGIFLS_TXIFLSEL__INVALID5       0x5
-#define BV_UARTDBGIFLS_TXIFLSEL__INVALID6       0x6
-#define BV_UARTDBGIFLS_TXIFLSEL__INVALID7       0x7
-#define HW_UARTDBGIMSC 0x00000038
-#define BP_UARTDBGIMSC_UNAVAILABLE      16
-#define BM_UARTDBGIMSC_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGIMSC_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGIMSC_UNAVAILABLE)
-#define BP_UARTDBGIMSC_RESERVED      11
-#define BM_UARTDBGIMSC_RESERVED 0x0000F800
-#define BF_UARTDBGIMSC_RESERVED(v)  \
-        (((v) << 11) & BM_UARTDBGIMSC_RESERVED)
-#define BM_UARTDBGIMSC_OEIM 0x00000400
-#define BM_UARTDBGIMSC_BEIM 0x00000200
-#define BM_UARTDBGIMSC_PEIM 0x00000100
-#define BM_UARTDBGIMSC_FEIM 0x00000080
-#define BM_UARTDBGIMSC_RTIM 0x00000040
-#define BM_UARTDBGIMSC_TXIM 0x00000020
-#define BM_UARTDBGIMSC_RXIM 0x00000010
-#define BM_UARTDBGIMSC_DSRMIM 0x00000008
-#define BM_UARTDBGIMSC_DCDMIM 0x00000004
-#define BM_UARTDBGIMSC_CTSMIM 0x00000002
-#define BM_UARTDBGIMSC_RIMIM 0x00000001
-#define HW_UARTDBGRIS 0x0000003c
-#define BP_UARTDBGRIS_UNAVAILABLE      16
-#define BM_UARTDBGRIS_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGRIS_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGRIS_UNAVAILABLE)
-#define BP_UARTDBGRIS_RESERVED      11
-#define BM_UARTDBGRIS_RESERVED 0x0000F800
-#define BF_UARTDBGRIS_RESERVED(v)  \
-        (((v) << 11) & BM_UARTDBGRIS_RESERVED)
-#define BM_UARTDBGRIS_OERIS 0x00000400
-#define BM_UARTDBGRIS_BERIS 0x00000200
-#define BM_UARTDBGRIS_PERIS 0x00000100
-#define BM_UARTDBGRIS_FERIS 0x00000080
-#define BM_UARTDBGRIS_RTRIS 0x00000040
-#define BM_UARTDBGRIS_TXRIS 0x00000020
-#define BM_UARTDBGRIS_RXRIS 0x00000010
-#define BM_UARTDBGRIS_DSRRMIS 0x00000008
-#define BM_UARTDBGRIS_DCDRMIS 0x00000004
-#define BM_UARTDBGRIS_CTSRMIS 0x00000002
-#define BM_UARTDBGRIS_RIRMIS 0x00000001
-#define HW_UARTDBGMIS 0x00000040
-#define BP_UARTDBGMIS_UNAVAILABLE      16
-#define BM_UARTDBGMIS_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGMIS_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGMIS_UNAVAILABLE)
-#define BP_UARTDBGMIS_RESERVED      11
-#define BM_UARTDBGMIS_RESERVED 0x0000F800
-#define BF_UARTDBGMIS_RESERVED(v)  \
-        (((v) << 11) & BM_UARTDBGMIS_RESERVED)
-#define BM_UARTDBGMIS_OEMIS 0x00000400
-#define BM_UARTDBGMIS_BEMIS 0x00000200
-#define BM_UARTDBGMIS_PEMIS 0x00000100
-#define BM_UARTDBGMIS_FEMIS 0x00000080
-#define BM_UARTDBGMIS_RTMIS 0x00000040
-#define BM_UARTDBGMIS_TXMIS 0x00000020
-#define BM_UARTDBGMIS_RXMIS 0x00000010
-#define BM_UARTDBGMIS_DSRMMIS 0x00000008
-#define BM_UARTDBGMIS_DCDMMIS 0x00000004
-#define BM_UARTDBGMIS_CTSMMIS 0x00000002
-#define BM_UARTDBGMIS_RIMMIS 0x00000001
-#define HW_UARTDBGICR 0x00000044
-#define BP_UARTDBGICR_UNAVAILABLE      16
-#define BM_UARTDBGICR_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGICR_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGICR_UNAVAILABLE)
-#define BP_UARTDBGICR_RESERVED      11
-#define BM_UARTDBGICR_RESERVED 0x0000F800
-#define BF_UARTDBGICR_RESERVED(v)  \
-        (((v) << 11) & BM_UARTDBGICR_RESERVED)
-#define BM_UARTDBGICR_OEIC 0x00000400
-#define BM_UARTDBGICR_BEIC 0x00000200
-#define BM_UARTDBGICR_PEIC 0x00000100
-#define BM_UARTDBGICR_FEIC 0x00000080
-#define BM_UARTDBGICR_RTIC 0x00000040
-#define BM_UARTDBGICR_TXIC 0x00000020
-#define BM_UARTDBGICR_RXIC 0x00000010
-#define BM_UARTDBGICR_DSRMIC 0x00000008
-#define BM_UARTDBGICR_DCDMIC 0x00000004
-#define BM_UARTDBGICR_CTSMIC 0x00000002
-#define BM_UARTDBGICR_RIMIC 0x00000001
-#define HW_UARTDBGDMACR 0x00000048
-#define BP_UARTDBGDMACR_UNAVAILABLE      16
-#define BM_UARTDBGDMACR_UNAVAILABLE 0xFFFF0000
-#define BF_UARTDBGDMACR_UNAVAILABLE(v) \
-        (((v) << 16) & BM_UARTDBGDMACR_UNAVAILABLE)
-#define BP_UARTDBGDMACR_RESERVED      3
-#define BM_UARTDBGDMACR_RESERVED 0x0000FFF8
-#define BF_UARTDBGDMACR_RESERVED(v)  \
-        (((v) << 3) & BM_UARTDBGDMACR_RESERVED)
-#define BM_UARTDBGDMACR_DMAONERR 0x00000004
-#define BM_UARTDBGDMACR_TXDMAE 0x00000002
-#define BM_UARTDBGDMACR_RXDMAE 0x00000001
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h b/arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h
deleted file mode 100644
index 9145e22df32c..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * stmp37xx: USBCTL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_USBCTL_BASE        (STMP3XXX_REGS_BASE + 0x80000)
-#define REGS_USBCTL_PHYS        0x80000
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h b/arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h
deleted file mode 100644
index 1a2ae9cbdfed..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * stmp37xx: USBCTRL register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_USBCTRL_BASE       (STMP3XXX_REGS_BASE + 0x80000)
-#define REGS_USBCTRL_PHYS       0x80080000
diff --git a/arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h b/arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h
deleted file mode 100644
index b7fce0fbc560..000000000000
--- a/arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * stmp37xx: USBPHY register definitions
- *
- * Copyright (c) 2008 Freescale Semiconductor
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * 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
- */
-#define REGS_USBPHY_BASE        (STMP3XXX_REGS_BASE + 0x7C000)
-
-#define HW_USBPHY_PWD           0x0
-
-#define HW_USBPHY_CTRL          0x30
-#define BM_USBPHY_CTRL_ENHSPRECHARGEXMIT        0x00000001
-#define BP_USBPHY_CTRL_ENHSPRECHARGEXMIT        0
-#define BM_USBPHY_CTRL_ENHOSTDISCONDETECT       0x00000002
-#define BM_USBPHY_CTRL_ENDEVPLUGINDETECT        0x00000010
-#define BM_USBPHY_CTRL_ENOTGIDDETECT    0x00000080
-#define BM_USBPHY_CTRL_ENIRQDEVPLUGIN   0x00000800
-#define BM_USBPHY_CTRL_CLKGATE  0x40000000
-#define BM_USBPHY_CTRL_SFTRST   0x80000000
-
-#define HW_USBPHY_STATUS        0x40
-#define BM_USBPHY_STATUS_DEVPLUGIN_STATUS       0x00000040
-#define BM_USBPHY_STATUS_OTGID_STATUS   0x00000100
diff --git a/arch/arm/mach-stmp37xx/stmp37xx.c b/arch/arm/mach-stmp37xx/stmp37xx.c
deleted file mode 100644
index a9aed06ff376..000000000000
--- a/arch/arm/mach-stmp37xx/stmp37xx.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Freescale STMP37XX platform support
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/irq.h>
-#include <linux/io.h>
-
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <asm/mach/arch.h>
-#include <asm/mach/irq.h>
-#include <asm/mach/map.h>
-#include <asm/mach/time.h>
-
-#include <mach/stmp3xxx.h>
-#include <mach/dma.h>
-
-#include <mach/platform.h>
-#include <mach/regs-icoll.h>
-#include <mach/regs-apbh.h>
-#include <mach/regs-apbx.h>
-#include "stmp37xx.h"
-
-/*
- * IRQ handling
- */
-static void stmp37xx_ack_irq(struct irq_data *d)
-{
-        /* Disable IRQ */
-        stmp3xxx_clearl(0x04 << ((d->irq % 4) * 8),
-                REGS_ICOLL_BASE + HW_ICOLL_PRIORITYn + d->irq / 4 * 0x10);
-
-        /* ACK current interrupt */
-        __raw_writel(1, REGS_ICOLL_BASE + HW_ICOLL_LEVELACK);
-
-        /* Barrier */
-        (void)__raw_readl(REGS_ICOLL_BASE + HW_ICOLL_STAT);
-}
-
-static void stmp37xx_mask_irq(struct irq_data *d)
-{
-        /* IRQ disable */
-        stmp3xxx_clearl(0x04 << ((d->irq % 4) * 8),
-                REGS_ICOLL_BASE + HW_ICOLL_PRIORITYn + d->irq / 4 * 0x10);
-}
-
-static void stmp37xx_unmask_irq(struct irq_data *d)
-{
-        /* IRQ enable */
-        stmp3xxx_setl(0x04 << ((d->irq % 4) * 8),
-                REGS_ICOLL_BASE + HW_ICOLL_PRIORITYn + d->irq / 4 * 0x10);
-}
-
-static struct irq_chip stmp37xx_chip = {
-        .irq_ack        = stmp37xx_ack_irq,
-        .irq_mask       = stmp37xx_mask_irq,
-        .irq_unmask     = stmp37xx_unmask_irq,
-};
-
-void __init stmp37xx_init_irq(void)
-{
-        stmp3xxx_init_irq(&stmp37xx_chip);
-}
-
-/*
- * DMA interrupt handling
- */
-void stmp3xxx_arch_dma_enable_interrupt(int channel)
-{
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                stmp3xxx_setl(1 << (8 + STMP3XXX_DMA_CHANNEL(channel)),
-                        REGS_APBH_BASE + HW_APBH_CTRL1);
-                break;
-
-        case STMP3XXX_BUS_APBX:
-                stmp3xxx_setl(1 << (8 + STMP3XXX_DMA_CHANNEL(channel)),
-                        REGS_APBX_BASE + HW_APBX_CTRL1);
-                break;
-        }
-}
-EXPORT_SYMBOL(stmp3xxx_arch_dma_enable_interrupt);
-
-void stmp3xxx_arch_dma_clear_interrupt(int channel)
-{
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                stmp3xxx_clearl(1 << STMP3XXX_DMA_CHANNEL(channel),
-                                REGS_APBH_BASE + HW_APBH_CTRL1);
-                break;
-
-        case STMP3XXX_BUS_APBX:
-                stmp3xxx_clearl(1 << STMP3XXX_DMA_CHANNEL(channel),
-                                REGS_APBX_BASE + HW_APBX_CTRL1);
-                break;
-        }
-}
-EXPORT_SYMBOL(stmp3xxx_arch_dma_clear_interrupt);
-
-int stmp3xxx_arch_dma_is_interrupt(int channel)
-{
-        int r = 0;
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                r = __raw_readl(REGS_APBH_BASE + HW_APBH_CTRL1) &
-                        (1 << STMP3XXX_DMA_CHANNEL(channel));
-                break;
-
-        case STMP3XXX_BUS_APBX:
-                r = __raw_readl(REGS_APBH_BASE + HW_APBH_CTRL1) &
-                        (1 << STMP3XXX_DMA_CHANNEL(channel));
-                break;
-        }
-        return r;
-}
-EXPORT_SYMBOL(stmp3xxx_arch_dma_is_interrupt);
-
-void stmp3xxx_arch_dma_reset_channel(int channel)
-{
-        unsigned chbit = 1 << STMP3XXX_DMA_CHANNEL(channel);
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                /* Reset channel and wait for it to complete */
-                stmp3xxx_setl(chbit << BP_APBH_CTRL0_RESET_CHANNEL,
-                        REGS_APBH_BASE + HW_APBH_CTRL0);
-                while (__raw_readl(REGS_APBH_BASE + HW_APBH_CTRL0) &
-                       (chbit << BP_APBH_CTRL0_RESET_CHANNEL))
-                                cpu_relax();
-                break;
-
-        case STMP3XXX_BUS_APBX:
-                stmp3xxx_setl(chbit << BP_APBX_CTRL0_RESET_CHANNEL,
-                        REGS_APBX_BASE + HW_APBX_CTRL0);
-                while (__raw_readl(REGS_APBX_BASE + HW_APBX_CTRL0) &
-                       (chbit << BP_APBX_CTRL0_RESET_CHANNEL))
-                                cpu_relax();
-                break;
-        }
-}
-EXPORT_SYMBOL(stmp3xxx_arch_dma_reset_channel);
-
-void stmp3xxx_arch_dma_freeze(int channel)
-{
-        unsigned chbit = 1 << STMP3XXX_DMA_CHANNEL(channel);
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                stmp3xxx_setl(1 << chbit, REGS_APBH_BASE + HW_APBH_CTRL0);
-                break;
-        case STMP3XXX_BUS_APBX:
-                stmp3xxx_setl(1 << chbit, REGS_APBH_BASE + HW_APBH_CTRL0);
-                break;
-        }
-}
-EXPORT_SYMBOL(stmp3xxx_arch_dma_freeze);
-
-void stmp3xxx_arch_dma_unfreeze(int channel)
-{
-        unsigned chbit = 1 << STMP3XXX_DMA_CHANNEL(channel);
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                stmp3xxx_clearl(1 << chbit, REGS_APBH_BASE + HW_APBH_CTRL0);
-                break;
-        case STMP3XXX_BUS_APBX:
-                stmp3xxx_clearl(1 << chbit, REGS_APBH_BASE + HW_APBH_CTRL0);
-                break;
-        }
-}
-EXPORT_SYMBOL(stmp3xxx_arch_dma_unfreeze);
-
-/*
- * The registers are all very closely mapped, so we might as well map them all
- * with a single mapping
- *
- * Logical      Physical
- * f0000000     80000000        On-chip registers
- * f1000000     00000000        32k on-chip SRAM
- */
-static struct map_desc stmp37xx_io_desc[] __initdata = {
-        {
-                .virtual        = (u32)STMP3XXX_REGS_BASE,
-                .pfn            = __phys_to_pfn(STMP3XXX_REGS_PHBASE),
-                .length         = SZ_1M,
-                .type           = MT_DEVICE
-        },
-        {
-                .virtual        = (u32)STMP3XXX_OCRAM_BASE,
-                .pfn            = __phys_to_pfn(STMP3XXX_OCRAM_PHBASE),
-                .length         = STMP3XXX_OCRAM_SIZE,
-                .type           = MT_DEVICE,
-        },
-};
-
-void __init stmp37xx_map_io(void)
-{
-        iotable_init(stmp37xx_io_desc, ARRAY_SIZE(stmp37xx_io_desc));
-}
diff --git a/arch/arm/mach-stmp37xx/stmp37xx.h b/arch/arm/mach-stmp37xx/stmp37xx.h
deleted file mode 100644
index 0b75fb796a64..000000000000
--- a/arch/arm/mach-stmp37xx/stmp37xx.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X internal functions and data declarations
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __MACH_STMP37XX_H
-#define __MACH_STMP37XX_H
-
-void stmp37xx_map_io(void);
-void stmp37xx_init_irq(void);
-
-#endif /* __MACH_STMP37XX_H */
diff --git a/arch/arm/mach-stmp37xx/stmp37xx_devb.c b/arch/arm/mach-stmp37xx/stmp37xx_devb.c
deleted file mode 100644
index 311d8552d362..000000000000
--- a/arch/arm/mach-stmp37xx/stmp37xx_devb.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Freescale STMP37XX development board support
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include <mach/stmp3xxx.h>
-#include <mach/pins.h>
-#include <mach/pinmux.h>
-#include "stmp37xx.h"
-
-/*
- * List of STMP37xx development board specific devices
- */
-static struct platform_device *stmp37xx_devb_devices[] = {
-        &stmp3xxx_dbguart,
-        &stmp3xxx_appuart,
-};
-
-static struct pin_desc dbguart_pins_0[] = {
-        { PINID_PWM0, PIN_FUN3, },
-        { PINID_PWM1, PIN_FUN3, },
-};
-
-struct pin_desc appuart_pins_0[] = {
-        { PINID_UART2_CTS, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
-        { PINID_UART2_RTS, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
-        { PINID_UART2_RX, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
-        { PINID_UART2_TX, PIN_FUN1, PIN_4MA, PIN_1_8V, 0, },
-};
-
-static struct pin_group appuart_pins[] = {
-        [0] = {
-                .pins           = appuart_pins_0,
-                .nr_pins        = ARRAY_SIZE(appuart_pins_0),
-        },
-        /* 37xx has the only app uart */
-};
-
-static struct pin_group dbguart_pins[] = {
-        [0] = {
-                .pins           = dbguart_pins_0,
-                .nr_pins        = ARRAY_SIZE(dbguart_pins_0),
-        },
-};
-
-static int dbguart_pins_control(int id, int request)
-{
-        int r = 0;
-
-        if (request)
-                r = stmp3xxx_request_pin_group(&dbguart_pins[id], "debug uart");
-        else
-                stmp3xxx_release_pin_group(&dbguart_pins[id], "debug uart");
-        return r;
-}
-
-
-static void __init stmp37xx_devb_init(void)
-{
-        stmp3xxx_pinmux_init(NR_REAL_IRQS);
-
-        /* Init STMP3xxx platform */
-        stmp3xxx_init();
-
-        stmp3xxx_dbguart.dev.platform_data = dbguart_pins_control;
-        stmp3xxx_appuart.dev.platform_data = appuart_pins;
-
-        /* Add STMP37xx development board devices */
-        platform_add_devices(stmp37xx_devb_devices,
-                        ARRAY_SIZE(stmp37xx_devb_devices));
-}
-
-MACHINE_START(STMP37XX, "STMP37XX")
-        .boot_params    = 0x40000100,
-        .map_io         = stmp37xx_map_io,
-        .init_irq       = stmp37xx_init_irq,
-        .timer          = &stmp3xxx_timer,
-        .init_machine   = stmp37xx_devb_init,
-MACHINE_END
diff --git a/arch/arm/mach-tcc8k/time.c b/arch/arm/mach-tcc8k/time.c
index e0a8d609afe1..a96babe83771 100644
--- a/arch/arm/mach-tcc8k/time.c
+++ b/arch/arm/mach-tcc8k/time.c
@@ -25,19 +25,6 @@
 
 static void __iomem *timer_base;
 
-static cycle_t tcc_get_cycles(struct clocksource *cs)
-{
-        return __raw_readl(timer_base + TC32MCNT_OFFS);
-}
-
-static struct clocksource clocksource_tcc = {
-        .name           = "tcc_tc32",
-        .rating         = 200,
-        .read           = tcc_get_cycles,
-        .mask           = CLOCKSOURCE_MASK(32),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 static int tcc_set_next_event(unsigned long evt,
                               struct clock_event_device *unused)
 {
@@ -102,7 +89,8 @@ static int __init tcc_clockevent_init(struct clk *clock)
 {
         unsigned int c = clk_get_rate(clock);
 
-        clocksource_register_hz(&clocksource_tcc, c);
+        clocksource_mmio_init(timer_base + TC32MCNT_OFFS, "tcc_tc32", c,
+                200, 32, clocksource_mmio_readl_up);
 
         clockevent_tcc.mult = div_sc(c, NSEC_PER_SEC,
                                         clockevent_tcc.shift);
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 3cdeffc97b44..5ec1846aa1d0 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -27,12 +27,14 @@ comment "Tegra board type"
 
 config MACH_HARMONY
        bool "Harmony board"
+       select MACH_HAS_SND_SOC_TEGRA_WM8903
        help
          Support for nVidia Harmony development platform
 
 config MACH_KAEN
        bool "Kaen board"
        select MACH_SEABOARD
+       select MACH_HAS_SND_SOC_TEGRA_WM8903
        help
          Support for the Kaen version of Seaboard
 
@@ -43,6 +45,7 @@ config MACH_PAZ00
 
 config MACH_SEABOARD
        bool "Seaboard board"
+       select MACH_HAS_SND_SOC_TEGRA_WM8903
        help
          Support for nVidia Seaboard development platform. It will
          also be included for some of the derivative boards that
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 1afe05038c27..823c703e573c 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -1,7 +1,7 @@
 obj-y                                   += common.o
 obj-y                                   += devices.o
 obj-y                                   += io.o
-obj-y                                   += irq.o legacy_irq.o
+obj-y                                   += irq.o
 obj-y                                   += clock.o
 obj-y                                   += timer.o
 obj-y                                   += gpio.o
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index 75c918a86a31..30e18bc60647 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -34,7 +34,7 @@
 #include <asm/mach/time.h>
 #include <asm/setup.h>
 
-#include <mach/harmony_audio.h>
+#include <mach/tegra_wm8903_pdata.h>
 #include <mach/iomap.h>
 #include <mach/irqs.h>
 #include <mach/sdhci.h>
@@ -67,15 +67,16 @@ static struct platform_device debug_uart = {
         },
 };
 
-static struct harmony_audio_platform_data harmony_audio_pdata = {
+static struct tegra_wm8903_platform_data harmony_audio_pdata = {
         .gpio_spkr_en           = TEGRA_GPIO_SPKR_EN,
         .gpio_hp_det            = TEGRA_GPIO_HP_DET,
+        .gpio_hp_mute           = -1,
         .gpio_int_mic_en        = TEGRA_GPIO_INT_MIC_EN,
         .gpio_ext_mic_en        = TEGRA_GPIO_EXT_MIC_EN,
 };
 
 static struct platform_device harmony_audio_device = {
-        .name   = "tegra-snd-harmony",
+        .name   = "tegra-snd-wm8903",
         .id     = 0,
         .dev    = {
                 .platform_data  = &harmony_audio_pdata,
diff --git a/arch/arm/mach-tegra/gpio.c b/arch/arm/mach-tegra/gpio.c
index 65a1aba6823d..919d63837736 100644
--- a/arch/arm/mach-tegra/gpio.c
+++ b/arch/arm/mach-tegra/gpio.c
@@ -24,6 +24,8 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 
+#include <asm/mach/irq.h>
+
 #include <mach/iomap.h>
 #include <mach/suspend.h>
 
@@ -221,8 +223,9 @@ static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
         int port;
         int pin;
         int unmasked = 0;
+        struct irq_chip *chip = irq_desc_get_chip(desc);
 
-        desc->irq_data.chip->irq_ack(&desc->irq_data);
+        chained_irq_enter(chip, desc);
 
         bank = irq_get_handler_data(irq);
 
@@ -241,7 +244,7 @@ static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
                          */
                         if (lvl & (0x100 << pin)) {
                                 unmasked = 1;
-                                desc->irq_data.chip->irq_unmask(&desc->irq_data);
+                                chained_irq_exit(chip, desc);
                         }
 
                         generic_handle_irq(gpio_to_irq(gpio + pin));
@@ -249,7 +252,7 @@ static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
         }
 
         if (!unmasked)
-                desc->irq_data.chip->irq_unmask(&desc->irq_data);
+                chained_irq_exit(chip, desc);
 
 }
 
diff --git a/arch/arm/mach-tegra/include/mach/kbc.h b/arch/arm/mach-tegra/include/mach/kbc.h
index 04c779832c78..4f3572a1c684 100644
--- a/arch/arm/mach-tegra/include/mach/kbc.h
+++ b/arch/arm/mach-tegra/include/mach/kbc.h
@@ -50,13 +50,11 @@ struct tegra_kbc_platform_data {
         unsigned int debounce_cnt;
         unsigned int repeat_cnt;
 
-        unsigned int wake_cnt; /* 0:wake on any key >1:wake on wake_cfg */
-        const struct tegra_kbc_wake_key *wake_cfg;
-
         struct tegra_kbc_pin_cfg pin_cfg[KBC_MAX_GPIO];
         const struct matrix_keymap_data *keymap_data;
 
         bool wakeup;
         bool use_fn_map;
+        bool use_ghost_filter;
 };
 #endif
diff --git a/arch/arm/mach-tegra/include/mach/legacy_irq.h b/arch/arm/mach-tegra/include/mach/legacy_irq.h
deleted file mode 100644
index d898c0e3d905..000000000000
--- a/arch/arm/mach-tegra/include/mach/legacy_irq.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/arm/mach-tegra/include/mach/legacy_irq.h
- *
- * Copyright (C) 2010 Google, Inc.
- * Author: Colin Cross <ccross@android.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- */
-
-#ifndef _ARCH_ARM_MACH_TEGRA_LEGARY_IRQ_H
-#define _ARCH_ARM_MACH_TEGRA_LEGARY_IRQ_H
-
-void tegra_legacy_mask_irq(unsigned int irq);
-void tegra_legacy_unmask_irq(unsigned int irq);
-void tegra_legacy_select_fiq(unsigned int irq, bool fiq);
-void tegra_legacy_force_irq_set(unsigned int irq);
-void tegra_legacy_force_irq_clr(unsigned int irq);
-int tegra_legacy_force_irq_status(unsigned int irq);
-void tegra_legacy_select_fiq(unsigned int irq, bool fiq);
-unsigned long tegra_legacy_vfiq(int nr);
-unsigned long tegra_legacy_class(int nr);
-int tegra_legacy_irq_set_wake(int irq, int enable);
-void tegra_legacy_irq_set_lp1_wake_mask(void);
-void tegra_legacy_irq_restore_mask(void);
-void tegra_init_legacy_irq(void);
-
-#endif
diff --git a/arch/arm/mach-tegra/include/mach/sdhci.h b/arch/arm/mach-tegra/include/mach/sdhci.h
index 3ad086e859c3..4231bc7b8652 100644
--- a/arch/arm/mach-tegra/include/mach/sdhci.h
+++ b/arch/arm/mach-tegra/include/mach/sdhci.h
@@ -24,6 +24,7 @@ struct tegra_sdhci_platform_data {
         int wp_gpio;
         int power_gpio;
         int is_8bit;
+        int pm_flags;
 };
 
 #endif
diff --git a/arch/arm/mach-tegra/include/mach/smp.h b/arch/arm/mach-tegra/include/mach/smp.h
deleted file mode 100644
index c8221b38ee7c..000000000000
--- a/arch/arm/mach-tegra/include/mach/smp.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef ASMARM_ARCH_SMP_H
-#define ASMARM_ARCH_SMP_H
-
-#include <asm/hardware/gic.h>
-
-/*
- * We use IRQ1 as the IPI
- */
-static inline void smp_cross_call(const struct cpumask *mask, int ipi)
-{
-        gic_raise_softirq(mask, ipi);
-}
-
-#endif
diff --git a/arch/arm/mach-tegra/include/mach/harmony_audio.h b/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
index af086500ab7d..9d293344a7ff 100644
--- a/arch/arm/mach-tegra/include/mach/harmony_audio.h
+++ b/arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-tegra/include/mach/harmony_audio.h
+ * arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
  *
  * Copyright 2011 NVIDIA, Inc.
  *
@@ -14,9 +14,10 @@
  *
  */
 
-struct harmony_audio_platform_data {
+struct tegra_wm8903_platform_data {
         int gpio_spkr_en;
         int gpio_hp_det;
+        int gpio_hp_mute;
         int gpio_int_mic_en;
         int gpio_ext_mic_en;
 };
diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
index 4330d8995b27..4956c3cea731 100644
--- a/arch/arm/mach-tegra/irq.c
+++ b/arch/arm/mach-tegra/irq.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (C) 2010 Google, Inc.
+ * Copyright (C) 2011 Google, Inc.
  *
  * Author:
- *      Colin Cross <ccross@google.com>
+ *      Colin Cross <ccross@android.com>
  *
  * Copyright (C) 2010, NVIDIA Corporation
  *
@@ -18,8 +18,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
@@ -27,134 +25,110 @@
 #include <asm/hardware/gic.h>
 
 #include <mach/iomap.h>
-#include <mach/legacy_irq.h>
-#include <mach/suspend.h>
 
 #include "board.h"
 
-#define PMC_CTRL                0x0
-#define PMC_CTRL_LATCH_WAKEUPS  (1 << 5)
-#define PMC_WAKE_MASK           0xc
-#define PMC_WAKE_LEVEL          0x10
-#define PMC_WAKE_STATUS         0x14
-#define PMC_SW_WAKE_STATUS      0x18
-#define PMC_DPD_SAMPLE          0x20
+#define INT_SYS_NR      (INT_GPIO_BASE - INT_PRI_BASE)
+#define INT_SYS_SZ      (INT_SEC_BASE - INT_PRI_BASE)
+#define PPI_NR          ((INT_SYS_NR+INT_SYS_SZ-1)/INT_SYS_SZ)
+
+#define ICTLR_CPU_IEP_VFIQ      0x08
+#define ICTLR_CPU_IEP_FIR       0x14
+#define ICTLR_CPU_IEP_FIR_SET   0x18
+#define ICTLR_CPU_IEP_FIR_CLR   0x1c
+
+#define ICTLR_CPU_IER           0x20
+#define ICTLR_CPU_IER_SET       0x24
+#define ICTLR_CPU_IER_CLR       0x28
+#define ICTLR_CPU_IEP_CLASS     0x2C
+
+#define ICTLR_COP_IER           0x30
+#define ICTLR_COP_IER_SET       0x34
+#define ICTLR_COP_IER_CLR       0x38
+#define ICTLR_COP_IEP_CLASS     0x3c
+
+#define NUM_ICTLRS 4
+#define FIRST_LEGACY_IRQ 32
+
+static void __iomem *ictlr_reg_base[] = {
+        IO_ADDRESS(TEGRA_PRIMARY_ICTLR_BASE),
+        IO_ADDRESS(TEGRA_SECONDARY_ICTLR_BASE),
+        IO_ADDRESS(TEGRA_TERTIARY_ICTLR_BASE),
+        IO_ADDRESS(TEGRA_QUATERNARY_ICTLR_BASE),
+};
 
-static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE);
+static inline void tegra_irq_write_mask(unsigned int irq, unsigned long reg)
+{
+        void __iomem *base;
+        u32 mask;
 
-static u32 tegra_lp0_wake_enb;
-static u32 tegra_lp0_wake_level;
-static u32 tegra_lp0_wake_level_any;
+        BUG_ON(irq < FIRST_LEGACY_IRQ ||
+                irq >= FIRST_LEGACY_IRQ + NUM_ICTLRS * 32);
 
-static void (*tegra_gic_mask_irq)(struct irq_data *d);
-static void (*tegra_gic_unmask_irq)(struct irq_data *d);
-static void (*tegra_gic_ack_irq)(struct irq_data *d);
+        base = ictlr_reg_base[(irq - FIRST_LEGACY_IRQ) / 32];
+        mask = BIT((irq - FIRST_LEGACY_IRQ) % 32);
 
-/* ensures that sufficient time is passed for a register write to
- * serialize into the 32KHz domain */
-static void pmc_32kwritel(u32 val, unsigned long offs)
-{
-        writel(val, pmc + offs);
-        udelay(130);
+        __raw_writel(mask, base + reg);
 }
 
-int tegra_set_lp1_wake(int irq, int enable)
+static void tegra_mask(struct irq_data *d)
 {
-        return tegra_legacy_irq_set_wake(irq, enable);
+        if (d->irq < FIRST_LEGACY_IRQ)
+                return;
+
+        tegra_irq_write_mask(d->irq, ICTLR_CPU_IER_CLR);
 }
 
-void tegra_set_lp0_wake_pads(u32 wake_enb, u32 wake_level, u32 wake_any)
+static void tegra_unmask(struct irq_data *d)
 {
-        u32 temp;
-        u32 status;
-        u32 lvl;
-
-        wake_level &= wake_enb;
-        wake_any &= wake_enb;
+        if (d->irq < FIRST_LEGACY_IRQ)
+                return;
 
-        wake_level |= (tegra_lp0_wake_level & tegra_lp0_wake_enb);
-        wake_any |= (tegra_lp0_wake_level_any & tegra_lp0_wake_enb);
-
-        wake_enb |= tegra_lp0_wake_enb;
-
-        pmc_32kwritel(0, PMC_SW_WAKE_STATUS);
-        temp = readl(pmc + PMC_CTRL);
-        temp |= PMC_CTRL_LATCH_WAKEUPS;
-        pmc_32kwritel(temp, PMC_CTRL);
-        temp &= ~PMC_CTRL_LATCH_WAKEUPS;
-        pmc_32kwritel(temp, PMC_CTRL);
-        status = readl(pmc + PMC_SW_WAKE_STATUS);
-        lvl = readl(pmc + PMC_WAKE_LEVEL);
-
-        /* flip the wakeup trigger for any-edge triggered pads
-         * which are currently asserting as wakeups */
-        lvl ^= status;
-        lvl &= wake_any;
-
-        wake_level |= lvl;
-
-        writel(wake_level, pmc + PMC_WAKE_LEVEL);
-        /* Enable DPD sample to trigger sampling pads data and direction
-         * in which pad will be driven during lp0 mode*/
-        writel(0x1, pmc + PMC_DPD_SAMPLE);
-
-        writel(wake_enb, pmc + PMC_WAKE_MASK);
+        tegra_irq_write_mask(d->irq, ICTLR_CPU_IER_SET);
 }
 
-static void tegra_mask(struct irq_data *d)
+static void tegra_ack(struct irq_data *d)
 {
-        tegra_gic_mask_irq(d);
-        tegra_legacy_mask_irq(d->irq);
-}
+        if (d->irq < FIRST_LEGACY_IRQ)
+                return;
 
-static void tegra_unmask(struct irq_data *d)
-{
-        tegra_gic_unmask_irq(d);
-        tegra_legacy_unmask_irq(d->irq);
+        tegra_irq_write_mask(d->irq, ICTLR_CPU_IEP_FIR_CLR);
 }
 
-static void tegra_ack(struct irq_data *d)
+static void tegra_eoi(struct irq_data *d)
 {
-        tegra_legacy_force_irq_clr(d->irq);
-        tegra_gic_ack_irq(d);
+        if (d->irq < FIRST_LEGACY_IRQ)
+                return;
+
+        tegra_irq_write_mask(d->irq, ICTLR_CPU_IEP_FIR_CLR);
 }
 
 static int tegra_retrigger(struct irq_data *d)
 {
-        tegra_legacy_force_irq_set(d->irq);
+        if (d->irq < FIRST_LEGACY_IRQ)
+                return 0;
+
+        tegra_irq_write_mask(d->irq, ICTLR_CPU_IEP_FIR_SET);
+
         return 1;
 }
 
-static struct irq_chip tegra_irq = {
-        .name                   = "PPI",
-        .irq_ack                = tegra_ack,
-        .irq_mask               = tegra_mask,
-        .irq_unmask             = tegra_unmask,
-        .irq_retrigger          = tegra_retrigger,
-};
-
 void __init tegra_init_irq(void)
 {
-        struct irq_chip *gic;
-        unsigned int i;
-        int irq;
+        int i;
 
-        tegra_init_legacy_irq();
+        for (i = 0; i < NUM_ICTLRS; i++) {
+                void __iomem *ictlr = ictlr_reg_base[i];
+                writel(~0, ictlr + ICTLR_CPU_IER_CLR);
+                writel(0, ictlr + ICTLR_CPU_IEP_CLASS);
+        }
+
+        gic_arch_extn.irq_ack = tegra_ack;
+        gic_arch_extn.irq_eoi = tegra_eoi;
+        gic_arch_extn.irq_mask = tegra_mask;
+        gic_arch_extn.irq_unmask = tegra_unmask;
+        gic_arch_extn.irq_retrigger = tegra_retrigger;
 
         gic_init(0, 29, IO_ADDRESS(TEGRA_ARM_INT_DIST_BASE),
                  IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));
-
-        gic = irq_get_chip(29);
-        tegra_gic_unmask_irq = gic->irq_unmask;
-        tegra_gic_mask_irq = gic->irq_mask;
-        tegra_gic_ack_irq = gic->irq_ack;
-#ifdef CONFIG_SMP
-        tegra_irq.irq_set_affinity = gic->irq_set_affinity;
-#endif
-
-        for (i = 0; i < INT_MAIN_NR; i++) {
-                irq = INT_PRI_BASE + i;
-                irq_set_chip_and_handler(irq, &tegra_irq, handle_level_irq);
-                set_irq_flags(irq, IRQF_VALID);
-        }
 }
diff --git a/arch/arm/mach-tegra/legacy_irq.c b/arch/arm/mach-tegra/legacy_irq.c
deleted file mode 100644
index 38eb719a4f53..000000000000
--- a/arch/arm/mach-tegra/legacy_irq.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * arch/arm/mach-tegra/legacy_irq.c
- *
- * Copyright (C) 2010 Google, Inc.
- * Author: Colin Cross <ccross@android.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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/io.h>
-#include <linux/kernel.h>
-#include <mach/iomap.h>
-#include <mach/irqs.h>
-#include <mach/legacy_irq.h>
-
-#define INT_SYS_NR      (INT_GPIO_BASE - INT_PRI_BASE)
-#define INT_SYS_SZ      (INT_SEC_BASE - INT_PRI_BASE)
-#define PPI_NR          ((INT_SYS_NR+INT_SYS_SZ-1)/INT_SYS_SZ)
-
-#define ICTLR_CPU_IEP_VFIQ      0x08
-#define ICTLR_CPU_IEP_FIR       0x14
-#define ICTLR_CPU_IEP_FIR_SET   0x18
-#define ICTLR_CPU_IEP_FIR_CLR   0x1c
-
-#define ICTLR_CPU_IER           0x20
-#define ICTLR_CPU_IER_SET       0x24
-#define ICTLR_CPU_IER_CLR       0x28
-#define ICTLR_CPU_IEP_CLASS     0x2C
-
-#define ICTLR_COP_IER           0x30
-#define ICTLR_COP_IER_SET       0x34
-#define ICTLR_COP_IER_CLR       0x38
-#define ICTLR_COP_IEP_CLASS     0x3c
-
-#define NUM_ICTLRS 4
-
-static void __iomem *ictlr_reg_base[] = {
-        IO_ADDRESS(TEGRA_PRIMARY_ICTLR_BASE),
-        IO_ADDRESS(TEGRA_SECONDARY_ICTLR_BASE),
-        IO_ADDRESS(TEGRA_TERTIARY_ICTLR_BASE),
-        IO_ADDRESS(TEGRA_QUATERNARY_ICTLR_BASE),
-};
-
-static u32 tegra_legacy_wake_mask[4];
-static u32 tegra_legacy_saved_mask[4];
-
-/* When going into deep sleep, the CPU is powered down, taking the GIC with it
-   In order to wake, the wake interrupts need to be enabled in the legacy
-   interrupt controller. */
-void tegra_legacy_unmask_irq(unsigned int irq)
-{
-        void __iomem *base;
-        pr_debug("%s: %d\n", __func__, irq);
-
-        irq -= 32;
-        base = ictlr_reg_base[irq>>5];
-        writel(1 << (irq & 31), base + ICTLR_CPU_IER_SET);
-}
-
-void tegra_legacy_mask_irq(unsigned int irq)
-{
-        void __iomem *base;
-        pr_debug("%s: %d\n", __func__, irq);
-
-        irq -= 32;
-        base = ictlr_reg_base[irq>>5];
-        writel(1 << (irq & 31), base + ICTLR_CPU_IER_CLR);
-}
-
-void tegra_legacy_force_irq_set(unsigned int irq)
-{
-        void __iomem *base;
-        pr_debug("%s: %d\n", __func__, irq);
-
-        irq -= 32;
-        base = ictlr_reg_base[irq>>5];
-        writel(1 << (irq & 31), base + ICTLR_CPU_IEP_FIR_SET);
-}
-
-void tegra_legacy_force_irq_clr(unsigned int irq)
-{
-        void __iomem *base;
-        pr_debug("%s: %d\n", __func__, irq);
-
-        irq -= 32;
-        base = ictlr_reg_base[irq>>5];
-        writel(1 << (irq & 31), base + ICTLR_CPU_IEP_FIR_CLR);
-}
-
-int tegra_legacy_force_irq_status(unsigned int irq)
-{
-        void __iomem *base;
-        pr_debug("%s: %d\n", __func__, irq);
-
-        irq -= 32;
-        base = ictlr_reg_base[irq>>5];
-        return !!(readl(base + ICTLR_CPU_IEP_FIR) & (1 << (irq & 31)));
-}
-
-void tegra_legacy_select_fiq(unsigned int irq, bool fiq)
-{
-        void __iomem *base;
-        pr_debug("%s: %d\n", __func__, irq);
-
-        irq -= 32;
-        base = ictlr_reg_base[irq>>5];
-        writel(fiq << (irq & 31), base + ICTLR_CPU_IEP_CLASS);
-}
-
-unsigned long tegra_legacy_vfiq(int nr)
-{
-        void __iomem *base;
-        base = ictlr_reg_base[nr];
-        return readl(base + ICTLR_CPU_IEP_VFIQ);
-}
-
-unsigned long tegra_legacy_class(int nr)
-{
-        void __iomem *base;
-        base = ictlr_reg_base[nr];
-        return readl(base + ICTLR_CPU_IEP_CLASS);
-}
-
-int tegra_legacy_irq_set_wake(int irq, int enable)
-{
-        irq -= 32;
-        if (enable)
-                tegra_legacy_wake_mask[irq >> 5] |= 1 << (irq & 31);
-        else
-                tegra_legacy_wake_mask[irq >> 5] &= ~(1 << (irq & 31));
-
-        return 0;
-}
-
-void tegra_legacy_irq_set_lp1_wake_mask(void)
-{
-        void __iomem *base;
-        int i;
-
-        for (i = 0; i < NUM_ICTLRS; i++) {
-                base = ictlr_reg_base[i];
-                tegra_legacy_saved_mask[i] = readl(base + ICTLR_CPU_IER);
-                writel(tegra_legacy_wake_mask[i], base + ICTLR_CPU_IER);
-        }
-}
-
-void tegra_legacy_irq_restore_mask(void)
-{
-        void __iomem *base;
-        int i;
-
-        for (i = 0; i < NUM_ICTLRS; i++) {
-                base = ictlr_reg_base[i];
-                writel(tegra_legacy_saved_mask[i], base + ICTLR_CPU_IER);
-        }
-}
-
-void tegra_init_legacy_irq(void)
-{
-        int i;
-
-        for (i = 0; i < NUM_ICTLRS; i++) {
-                void __iomem *ictlr = ictlr_reg_base[i];
-                writel(~0, ictlr + ICTLR_CPU_IER_CLR);
-                writel(0, ictlr + ICTLR_CPU_IEP_CLASS);
-        }
-}
-
-#ifdef CONFIG_PM
-static u32 cop_ier[NUM_ICTLRS];
-static u32 cpu_ier[NUM_ICTLRS];
-static u32 cpu_iep[NUM_ICTLRS];
-
-void tegra_irq_suspend(void)
-{
-        unsigned long flags;
-        int i;
-
-        local_irq_save(flags);
-        for (i = 0; i < NUM_ICTLRS; i++) {
-                void __iomem *ictlr = ictlr_reg_base[i];
-                cpu_ier[i] = readl(ictlr + ICTLR_CPU_IER);
-                cpu_iep[i] = readl(ictlr + ICTLR_CPU_IEP_CLASS);
-                cop_ier[i] = readl(ictlr + ICTLR_COP_IER);
-                writel(~0, ictlr + ICTLR_COP_IER_CLR);
-        }
-        local_irq_restore(flags);
-}
-
-void tegra_irq_resume(void)
-{
-        unsigned long flags;
-        int i;
-
-        local_irq_save(flags);
-        for (i = 0; i < NUM_ICTLRS; i++) {
-                void __iomem *ictlr = ictlr_reg_base[i];
-                writel(cpu_iep[i], ictlr + ICTLR_CPU_IEP_CLASS);
-                writel(~0ul, ictlr + ICTLR_CPU_IER_CLR);
-                writel(cpu_ier[i], ictlr + ICTLR_CPU_IER_SET);
-                writel(0, ictlr + ICTLR_COP_IEP_CLASS);
-                writel(~0ul, ictlr + ICTLR_COP_IER_CLR);
-                writel(cop_ier[i], ictlr + ICTLR_COP_IER_SET);
-        }
-        local_irq_restore(flags);
-}
-#endif
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index ec1f68924edf..b8ae3c978dee 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -20,6 +20,7 @@
 #include <linux/io.h>
 
 #include <asm/cacheflush.h>
+#include <asm/hardware/gic.h>
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/smp_scu.h>
@@ -122,6 +123,8 @@ void __init smp_init_cpus(void)
 
         for (i = 0; i < ncores; i++)
                 cpu_set(i, cpu_possible_map);
+
+        set_smp_cross_call(gic_raise_softirq);
 }
 
 void __init platform_smp_prepare_cpus(unsigned int max_cpus)
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index 4459470c052d..bb618075fab6 100644
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -337,7 +337,7 @@ static int tegra2_super_clk_set_parent(struct clk *c, struct clk *p)
         const struct clk_mux_sel *sel;
         int shift;
 
-        val = clk_readl(c->reg + SUPER_CLK_MUX);;
+        val = clk_readl(c->reg + SUPER_CLK_MUX);
         BUG_ON(((val & SUPER_STATE_MASK) != SUPER_STATE_RUN) &&
                 ((val & SUPER_STATE_MASK) != SUPER_STATE_IDLE));
         shift = ((val & SUPER_STATE_MASK) == SUPER_STATE_IDLE) ?
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index 0fcb1eb4214d..90350420c4e9 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -98,11 +98,6 @@ static void tegra_timer_set_mode(enum clock_event_mode mode,
         }
 }
 
-static cycle_t tegra_clocksource_read(struct clocksource *cs)
-{
-        return timer_readl(TIMERUS_CNTR_1US);
-}
-
 static struct clock_event_device tegra_clockevent = {
         .name           = "timer0",
         .rating         = 300,
@@ -111,14 +106,6 @@ static struct clock_event_device tegra_clockevent = {
         .set_mode       = tegra_timer_set_mode,
 };
 
-static struct clocksource tegra_clocksource = {
-        .name   = "timer_us",
-        .rating = 300,
-        .read   = tegra_clocksource_read,
-        .mask   = CLOCKSOURCE_MASK(32),
-        .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 static DEFINE_CLOCK_DATA(cd);
 
 /*
@@ -234,7 +221,8 @@ static void __init tegra_init_timer(void)
         init_fixed_sched_clock(&cd, tegra_update_sched_clock, 32,
                                1000000, SC_MULT, SC_SHIFT);
 
-        if (clocksource_register_hz(&tegra_clocksource, 1000000)) {
+        if (clocksource_mmio_init(timer_reg_base + TIMERUS_CNTR_1US,
+                "timer_us", 1000000, 300, 32, clocksource_mmio_readl_up)) {
                 printk(KERN_ERR "Failed to register clocksource\n");
                 BUG();
         }
diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c
index 3ec58bd2d6e4..891cf44591e0 100644
--- a/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@ -333,20 +333,6 @@ static struct irqaction u300_timer_irq = {
         .handler        = u300_timer_interrupt,
 };
 
-/* Use general purpose timer 2 as clock source */
-static cycle_t u300_get_cycles(struct clocksource *cs)
-{
-        return (cycles_t) readl(U300_TIMER_APP_VBASE + U300_TIMER_APP_GPT2CC);
-}
-
-static struct clocksource clocksource_u300_1mhz = {
-        .name           = "GPT2",
-        .rating         = 300, /* Reasonably fast and accurate clock source */
-        .read           = u300_get_cycles,
-        .mask           = CLOCKSOURCE_MASK(32), /* 32 bits */
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 /*
  * Override the global weak sched_clock symbol with this
  * local implementation which uses the clocksource to get some
@@ -422,7 +408,9 @@ static void __init u300_timer_init(void)
         writel(U300_TIMER_APP_EGPT2_TIMER_ENABLE,
                 U300_TIMER_APP_VBASE + U300_TIMER_APP_EGPT2);
 
-        if (clocksource_register_hz(&clocksource_u300_1mhz, rate))
+        /* Use general purpose timer 2 as clock source */
+        if (clocksource_mmio_init(U300_TIMER_APP_VBASE + U300_TIMER_APP_GPT2CC,
+                        "GPT2", rate, 300, 32, clocksource_mmio_readl_up))
                 printk(KERN_ERR "timer: failed to initialize clock "
                        "source %s\n", clocksource_u300_1mhz.name);
 
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 58626013aa32..54429d015954 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -12,9 +12,12 @@ menu "Ux500 SoC"
 
 config UX500_SOC_DB5500
         bool "DB5500"
+        select MFD_DB5500_PRCMU
 
 config UX500_SOC_DB8500
         bool "DB8500"
+        select MFD_DB8500_PRCMU
+        select REGULATOR_DB8500_PRCMU
 
 endmenu
 
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index b549a8fb4231..1694916e6822 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -5,7 +5,7 @@
 obj-y                           := clock.o cpu.o devices.o devices-common.o \
                                    id.o usb.o
 obj-$(CONFIG_UX500_SOC_DB5500)  += cpu-db5500.o dma-db5500.o
-obj-$(CONFIG_UX500_SOC_DB8500)  += cpu-db8500.o devices-db8500.o prcmu.o
+obj-$(CONFIG_UX500_SOC_DB8500)  += cpu-db8500.o devices-db8500.o
 obj-$(CONFIG_MACH_U8500)        += board-mop500.o board-mop500-sdi.o \
                                 board-mop500-regulators.o \
                                 board-mop500-uib.o board-mop500-stuib.o \
@@ -17,4 +17,4 @@ obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
 obj-$(CONFIG_LOCAL_TIMERS)      += localtimer.o
 obj-$(CONFIG_U5500_MODEM_IRQ)   += modem-irq-db5500.o
 obj-$(CONFIG_U5500_MBOX)        += mbox-db5500.o
-obj-$(CONFIG_CPU_FREQ)          += cpufreq.o
+
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 6e1907fa94f0..bb26f40493e6 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -204,7 +204,7 @@ static struct i2c_board_info __initdata mop500_i2c2_devices[] = {
         },
 };
 
-#define U8500_I2C_CONTROLLER(id, _slsu, _tft, _rft, clk, _sm) \
+#define U8500_I2C_CONTROLLER(id, _slsu, _tft, _rft, clk, t_out, _sm)    \
 static struct nmk_i2c_controller u8500_i2c##id##_data = { \
         /*                              \
          * slave data setup time, which is      \
@@ -219,19 +219,21 @@ static struct nmk_i2c_controller u8500_i2c##id##_data = { \
         .rft            = _rft,         \
         /* std. mode operation */       \
         .clk_freq       = clk,          \
+        /* Slave response timeout(ms) */\
+        .timeout        = t_out,        \
         .sm             = _sm,          \
 }
 
 /*
  * The board uses 4 i2c controllers, initialize all of
  * them with slave data setup time of 250 ns,
- * Tx & Rx FIFO threshold values as 1 and standard
+ * Tx & Rx FIFO threshold values as 8 and standard
  * mode of operation
  */
-U8500_I2C_CONTROLLER(0, 0xe, 1, 1, 100000, I2C_FREQ_MODE_STANDARD);
-U8500_I2C_CONTROLLER(1, 0xe, 1, 1, 100000, I2C_FREQ_MODE_STANDARD);
-U8500_I2C_CONTROLLER(2, 0xe, 1, 1, 100000, I2C_FREQ_MODE_STANDARD);
-U8500_I2C_CONTROLLER(3, 0xe, 1, 1, 100000, I2C_FREQ_MODE_STANDARD);
+U8500_I2C_CONTROLLER(0, 0xe, 1, 8, 100000, 200, I2C_FREQ_MODE_FAST);
+U8500_I2C_CONTROLLER(1, 0xe, 1, 8, 100000, 200, I2C_FREQ_MODE_FAST);
+U8500_I2C_CONTROLLER(2, 0xe, 1, 8, 100000, 200, I2C_FREQ_MODE_FAST);
+U8500_I2C_CONTROLLER(3, 0xe, 1, 8, 100000, 200, I2C_FREQ_MODE_FAST);
 
 static void __init mop500_i2c_init(void)
 {
diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c
index c9dc2eff3cb2..c01bc19e3c5e 100644
--- a/arch/arm/mach-ux500/cpu-db5500.c
+++ b/arch/arm/mach-ux500/cpu-db5500.c
@@ -188,6 +188,8 @@ void __init u5500_map_io(void)
         ux500_map_io();
 
         iotable_init(u5500_io_desc, ARRAY_SIZE(u5500_io_desc));
+
+        _PRCMU_BASE = __io_address(U5500_PRCMU_BASE);
 }
 
 static int usb_db5500_rx_dma_cfg[] = {
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 516126cb357d..c3c417656bd9 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -87,6 +87,8 @@ void __init u8500_map_io(void)
                 iotable_init(u8500_v1_io_desc, ARRAY_SIZE(u8500_v1_io_desc));
         else if (cpu_is_u8500v2())
                 iotable_init(u8500_v2_io_desc, ARRAY_SIZE(u8500_v2_io_desc));
+
+        _PRCMU_BASE = __io_address(U8500_PRCMU_BASE);
 }
 
 static struct resource db8500_pmu_resources[] = {
@@ -129,9 +131,14 @@ static struct platform_device db8500_pmu_device = {
         .dev.platform_data      = &db8500_pmu_platdata,
 };
 
+static struct platform_device db8500_prcmu_device = {
+        .name                   = "db8500-prcmu",
+};
+
 static struct platform_device *platform_devs[] __initdata = {
         &u8500_dma40_device,
         &db8500_pmu_device,
+        &db8500_prcmu_device,
 };
 
 static resource_size_t __initdata db8500_gpio_base[] = {
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index 5a43107c6232..1da23bb87c16 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -8,6 +8,8 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/clk.h>
+#include <linux/mfd/db8500-prcmu.h>
+#include <linux/mfd/db5500-prcmu.h>
 
 #include <asm/cacheflush.h>
 #include <asm/hardware/cache-l2x0.h>
@@ -19,10 +21,11 @@
 #include <mach/hardware.h>
 #include <mach/setup.h>
 #include <mach/devices.h>
-#include <mach/prcmu.h>
 
 #include "clock.h"
 
+void __iomem *_PRCMU_BASE;
+
 #ifdef CONFIG_CACHE_L2X0
 static void __iomem *l2x0_base;
 #endif
@@ -47,6 +50,8 @@ void __init ux500_init_irq(void)
          * Init clocks here so that they are available for system timer
          * initialization.
          */
+        if (cpu_is_u5500())
+                db5500_prcmu_early_init();
         if (cpu_is_u8500())
                 prcmu_early_init();
         clk_init();
diff --git a/arch/arm/mach-ux500/cpufreq.c b/arch/arm/mach-ux500/cpufreq.c
deleted file mode 100644
index 5c5b747f134d..000000000000
--- a/arch/arm/mach-ux500/cpufreq.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * CPU frequency scaling for u8500
- * Inspired by linux/arch/arm/mach-davinci/cpufreq.c
- *
- * Copyright (C) STMicroelectronics 2009
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License Terms: GNU General Public License v2
- *
- * Author: Sundar Iyer <sundar.iyer@stericsson.com>
- * Author: Martin Persson <martin.persson@stericsson.com>
- * Author: Jonas Aaberg <jonas.aberg@stericsson.com>
- *
- */
-
-#include <linux/platform_device.h>
-#include <linux/kernel.h>
-#include <linux/cpufreq.h>
-#include <linux/delay.h>
-
-#include <mach/hardware.h>
-#include <mach/prcmu.h>
-#include <mach/prcmu-defs.h>
-
-#define DRIVER_NAME "cpufreq-u8500"
-#define CPUFREQ_NAME "u8500"
-
-static struct device *dev;
-
-static struct cpufreq_frequency_table freq_table[] = {
-        [0] = {
-                .index = 0,
-                .frequency = 200000,
-        },
-        [1] = {
-                .index = 1,
-                .frequency = 300000,
-        },
-        [2] = {
-                .index = 2,
-                .frequency = 600000,
-        },
-        [3] = {
-                /* Used for CPU_OPP_MAX, if available */
-                .index = 3,
-                .frequency = CPUFREQ_TABLE_END,
-        },
-        [4] = {
-                .index = 4,
-                .frequency = CPUFREQ_TABLE_END,
-        },
-};
-
-static enum prcmu_cpu_opp index2opp[] = {
-        CPU_OPP_EXT_CLK,
-        CPU_OPP_50,
-        CPU_OPP_100,
-        CPU_OPP_MAX
-};
-
-static int u8500_cpufreq_verify_speed(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, freq_table);
-}
-
-static int u8500_cpufreq_target(struct cpufreq_policy *policy,
-                                unsigned int target_freq,
-                                unsigned int relation)
-{
-        struct cpufreq_freqs freqs;
-        unsigned int index;
-        int ret = 0;
-
-        /*
-         * Ensure desired rate is within allowed range.  Some govenors
-         * (ondemand) will just pass target_freq=0 to get the minimum.
-         */
-        if (target_freq < policy->cpuinfo.min_freq)
-                target_freq = policy->cpuinfo.min_freq;
-        if (target_freq > policy->cpuinfo.max_freq)
-                target_freq = policy->cpuinfo.max_freq;
-
-        ret = cpufreq_frequency_table_target(policy, freq_table,
-                                             target_freq, relation, &index);
-        if (ret < 0) {
-                dev_err(dev, "Could not look up next frequency\n");
-                return ret;
-        }
-
-        freqs.old = policy->cur;
-        freqs.new = freq_table[index].frequency;
-        freqs.cpu = policy->cpu;
-
-        if (freqs.old == freqs.new) {
-                dev_dbg(dev, "Current and target frequencies are equal\n");
-                return 0;
-        }
-
-        dev_dbg(dev, "transition: %u --> %u\n", freqs.old, freqs.new);
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        ret = prcmu_set_cpu_opp(index2opp[index]);
-        if (ret < 0) {
-                dev_err(dev, "Failed to set OPP level\n");
-                return ret;
-        }
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        return ret;
-}
-
-static unsigned int u8500_cpufreq_getspeed(unsigned int cpu)
-{
-        int i;
-
-        for (i = 0; prcmu_get_cpu_opp() != index2opp[i]; i++)
-                ;
-        return freq_table[i].frequency;
-}
-
-static int __cpuinit u8500_cpu_init(struct cpufreq_policy *policy)
-{
-        int res;
-
-        BUILD_BUG_ON(ARRAY_SIZE(index2opp) + 1 != ARRAY_SIZE(freq_table));
-
-        if (cpu_is_u8500v2()) {
-                freq_table[1].frequency = 400000;
-                freq_table[2].frequency = 800000;
-                if (prcmu_has_arm_maxopp())
-                        freq_table[3].frequency = 1000000;
-        }
-
-        /* get policy fields based on the table */
-        res = cpufreq_frequency_table_cpuinfo(policy, freq_table);
-        if (!res)
-                cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
-        else {
-                dev_err(dev, "u8500-cpufreq : Failed to read policy table\n");
-                return res;
-        }
-
-        policy->min = policy->cpuinfo.min_freq;
-        policy->max = policy->cpuinfo.max_freq;
-        policy->cur = u8500_cpufreq_getspeed(policy->cpu);
-        policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
-
-        /*
-         * FIXME : Need to take time measurement across the target()
-         *         function with no/some/all drivers in the notification
-         *         list.
-         */
-        policy->cpuinfo.transition_latency = 200 * 1000; /* in ns */
-
-        /* policy sharing between dual CPUs */
-        cpumask_copy(policy->cpus, &cpu_present_map);
-
-        policy->shared_type = CPUFREQ_SHARED_TYPE_ALL;
-
-        return res;
-}
-
-static struct freq_attr *u8500_cpufreq_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-static int u8500_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        return 0;
-}
-
-static struct cpufreq_driver u8500_driver = {
-        .owner = THIS_MODULE,
-        .flags = CPUFREQ_STICKY,
-        .verify = u8500_cpufreq_verify_speed,
-        .target = u8500_cpufreq_target,
-        .get = u8500_cpufreq_getspeed,
-        .init = u8500_cpu_init,
-        .exit = u8500_cpu_exit,
-        .name = CPUFREQ_NAME,
-        .attr = u8500_cpufreq_attr,
-};
-
-static int __init u8500_cpufreq_probe(struct platform_device *pdev)
-{
-        dev = &pdev->dev;
-        return cpufreq_register_driver(&u8500_driver);
-}
-
-static int __exit u8500_cpufreq_remove(struct platform_device *pdev)
-{
-        return cpufreq_unregister_driver(&u8500_driver);
-}
-
-static struct platform_driver u8500_cpufreq_driver = {
-        .driver = {
-                .name    = DRIVER_NAME,
-                .owner   = THIS_MODULE,
-        },
-        .remove = __exit_p(u8500_cpufreq_remove),
-};
-
-static int __init u8500_cpufreq_init(void)
-{
-        return platform_driver_probe(&u8500_cpufreq_driver,
-                                     &u8500_cpufreq_probe);
-}
-
-device_initcall(u8500_cpufreq_init);
diff --git a/arch/arm/mach-ux500/include/mach/db5500-regs.h b/arch/arm/mach-ux500/include/mach/db5500-regs.h
index bd88c1e74060..6ad983294103 100644
--- a/arch/arm/mach-ux500/include/mach/db5500-regs.h
+++ b/arch/arm/mach-ux500/include/mach/db5500-regs.h
@@ -17,6 +17,8 @@
 #define U5500_GIC_DIST_BASE     0xA0411000
 #define U5500_GIC_CPU_BASE      0xA0410100
 #define U5500_DMA_BASE          0x90030000
+#define U5500_STM_BASE          0x90020000
+#define U5500_STM_REG_BASE      (U5500_STM_BASE + 0xF000)
 #define U5500_MCDE_BASE         0xA0400000
 #define U5500_MODEM_BASE        0xB0000000
 #define U5500_L2CC_BASE         0xA0412000
@@ -29,7 +31,9 @@
 #define U5500_NAND0_BASE        0x60000000
 #define U5500_NAND1_BASE        0x70000000
 #define U5500_TWD_BASE          0xa0410600
+#define U5500_ICN_BASE          0xA0040000
 #define U5500_B2R2_BASE         0xa0200000
+#define U5500_BOOT_ROM_BASE     0x90000000
 
 #define U5500_FSMC_BASE         (U5500_PER1_BASE + 0x0000)
 #define U5500_SDI0_BASE         (U5500_PER1_BASE + 0x1000)
@@ -60,6 +64,7 @@
 #define U5500_MSP1_BASE         (U5500_PER4_BASE + 0x9000)
 #define U5500_GPIO2_BASE        (U5500_PER4_BASE + 0xA000)
 #define U5500_CDETECT_BASE      (U5500_PER4_BASE + 0xF000)
+#define U5500_PRCMU_TCDM_BASE   (U5500_PER4_BASE + 0x18000)
 
 #define U5500_SPI0_BASE         (U5500_PER5_BASE + 0x0000)
 #define U5500_SPI1_BASE         (U5500_PER5_BASE + 0x1000)
@@ -83,7 +88,7 @@
 #define U5500_HASH0_BASE        (U5500_PER6_BASE + 0x1000)
 #define U5500_HASH1_BASE        (U5500_PER6_BASE + 0x2000)
 #define U5500_PKA_BASE          (U5500_PER6_BASE + 0x4000)
-#define U5500_PKAM_BASE         (U5500_PER6_BASE + 0x5000)
+#define U5500_PKAM_BASE         (U5500_PER6_BASE + 0x5100)
 #define U5500_MTU0_BASE         (U5500_PER6_BASE + 0x6000)
 #define U5500_MTU1_BASE         (U5500_PER6_BASE + 0x7000)
 #define U5500_CR_BASE           (U5500_PER6_BASE + 0x8000)
@@ -114,8 +119,19 @@
 #define U5500_MBOX2_LOCAL_START (U5500_MBOX_BASE + 0x20)
 #define U5500_MBOX2_LOCAL_END   (U5500_MBOX_BASE + 0x3F)
 
-#define U5500_ESRAM_BASE                0x40000000
+#define U5500_ACCCON_BASE_SEC   (0xBFFF0000)
+#define U5500_ACCCON_BASE               (0xBFFF1000)
+#define U5500_ACCCON_CPUVEC_RESET_ADDR_OFFSET (0x00000020)
+#define U5500_ACCCON_ACC_CPU_CTRL_OFFSET (0x000000BC)
+
+#define U5500_ESRAM_BASE                0x40000000
 #define U5500_ESRAM_DMA_LCPA_OFFSET     0x10000
 #define U5500_DMA_LCPA_BASE    (U5500_ESRAM_BASE + U5500_ESRAM_DMA_LCPA_OFFSET)
 
+#define U5500_MCDE_SIZE         0x1000
+#define U5500_DSI_LINK_SIZE     0x1000
+#define U5500_DSI_LINK_COUNT    0x2
+#define U5500_DSI_LINK1_BASE    (U5500_MCDE_BASE + U5500_MCDE_SIZE)
+#define U5500_DSI_LINK2_BASE    (U5500_DSI_LINK1_BASE + U5500_DSI_LINK_SIZE)
+
 #endif
diff --git a/arch/arm/mach-ux500/include/mach/db8500-regs.h b/arch/arm/mach-ux500/include/mach/db8500-regs.h
index 16647b255378..049997109cf9 100644
--- a/arch/arm/mach-ux500/include/mach/db8500-regs.h
+++ b/arch/arm/mach-ux500/include/mach/db8500-regs.h
@@ -15,8 +15,13 @@
 #define U8500_ESRAM_BANK2       (U8500_ESRAM_BANK1 + U8500_ESRAM_BANK_SIZE)
 #define U8500_ESRAM_BANK3       (U8500_ESRAM_BANK2 + U8500_ESRAM_BANK_SIZE)
 #define U8500_ESRAM_BANK4       (U8500_ESRAM_BANK3 + U8500_ESRAM_BANK_SIZE)
-/* Use bank 4 for DMA LCPA */
-#define U8500_DMA_LCPA_BASE     U8500_ESRAM_BANK4
+/*
+ * on V1 DMA uses 4KB for logical parameters position is right after the 64KB
+ * reserved for security
+ */
+#define U8500_ESRAM_DMA_LCPA_OFFSET     0x10000
+
+#define U8500_DMA_LCPA_BASE    (U8500_ESRAM_BANK0 + U8500_ESRAM_DMA_LCPA_OFFSET)
 #define U8500_DMA_LCPA_BASE_ED  (U8500_ESRAM_BANK4 + 0x4000)
 
 #define U8500_PER3_BASE         0x80000000
@@ -27,9 +32,12 @@
 #define U8500_B2R2_BASE         0x80130000
 #define U8500_HSEM_BASE         0x80140000
 #define U8500_PER4_BASE         0x80150000
+#define U8500_TPIU_BASE         0x80190000
 #define U8500_ICN_BASE          0x81000000
 
 #define U8500_BOOT_ROM_BASE     0x90000000
+/* ASIC ID is at 0xbf4 offset within this region */
+#define U8500_ASIC_ID_BASE      0x9001D000
 
 #define U8500_PER6_BASE         0xa03c0000
 #define U8500_PER5_BASE         0xa03e0000
@@ -70,13 +78,15 @@
 
 /* per6 base addresses */
 #define U8500_RNG_BASE          (U8500_PER6_BASE + 0x0000)
-#define U8500_PKA_BASE          (U8500_PER6_BASE + 0x1000)
-#define U8500_PKAM_BASE         (U8500_PER6_BASE + 0x2000)
+#define U8500_HASH0_BASE        (U8500_PER6_BASE + 0x1000)
+#define U8500_HASH1_BASE        (U8500_PER6_BASE + 0x2000)
+#define U8500_PKA_BASE          (U8500_PER6_BASE + 0x4000)
+#define U8500_PKAM_BASE         (U8500_PER6_BASE + 0x5100)
 #define U8500_MTU0_BASE         (U8500_PER6_BASE + 0x6000) /* v1 */
 #define U8500_MTU1_BASE         (U8500_PER6_BASE + 0x7000) /* v1 */
 #define U8500_CR_BASE           (U8500_PER6_BASE + 0x8000) /* v1 */
-#define U8500_CRYPTO0_BASE      (U8500_PER6_BASE + 0xa000)
-#define U8500_CRYPTO1_BASE      (U8500_PER6_BASE + 0xb000)
+#define U8500_CRYP0_BASE        (U8500_PER6_BASE + 0xa000)
+#define U8500_CRYP1_BASE        (U8500_PER6_BASE + 0xb000)
 #define U8500_CLKRST6_BASE      (U8500_PER6_BASE + 0xf000)
 
 /* per5 base addresses */
@@ -93,7 +103,8 @@
 #define U8500_DMC_BASE          (U8500_PER4_BASE + 0x06000)
 #define U8500_PRCMU_BASE        (U8500_PER4_BASE + 0x07000)
 #define U8500_PRCMU_TCDM_BASE_V1 (U8500_PER4_BASE + 0x0f000)
-#define U8500_PRCMU_TCDM_BASE   (U8500_PER4_BASE + 0x68000)
+#define U8500_PRCMU_TCDM_BASE   (U8500_PER4_BASE + 0x68000)
+#define U8500_PRCMU_TCPM_BASE   (U8500_PER4_BASE + 0x60000)
 
 /* per3 base addresses */
 #define U8500_FSMC_BASE         (U8500_PER3_BASE + 0x0000)
@@ -124,6 +135,7 @@
 #define U8500_I2C1_BASE         (U8500_PER1_BASE + 0x2000)
 #define U8500_MSP0_BASE         (U8500_PER1_BASE + 0x3000)
 #define U8500_MSP1_BASE         (U8500_PER1_BASE + 0x4000)
+#define U8500_MSP3_BASE         (U8500_PER1_BASE + 0x5000)
 #define U8500_SDI0_BASE         (U8500_PER1_BASE + 0x6000)
 #define U8500_I2C2_BASE         (U8500_PER1_BASE + 0x8000)
 #define U8500_SPI3_BASE         (U8500_PER1_BASE + 0x9000)
@@ -143,4 +155,15 @@
 #define U8500_GPIOBANK7_BASE    (U8500_GPIO2_BASE + 0x80)
 #define U8500_GPIOBANK8_BASE    U8500_GPIO3_BASE
 
+#define U8500_MCDE_SIZE         0x1000
+#define U8500_DSI_LINK_SIZE     0x1000
+#define U8500_DSI_LINK1_BASE    (U8500_MCDE_BASE + U8500_MCDE_SIZE)
+#define U8500_DSI_LINK2_BASE    (U8500_DSI_LINK1_BASE + U8500_DSI_LINK_SIZE)
+#define U8500_DSI_LINK3_BASE    (U8500_DSI_LINK2_BASE + U8500_DSI_LINK_SIZE)
+#define U8500_DSI_LINK_COUNT    0x3
+
+/* Modem and APE physical addresses */
+#define U8500_MODEM_BASE        0xe000000
+#define U8500_APE_BASE          0x6000000
+
 #endif
diff --git a/arch/arm/mach-ux500/include/mach/hardware.h b/arch/arm/mach-ux500/include/mach/hardware.h
index bf63f2631ba0..2c6f71049f2e 100644
--- a/arch/arm/mach-ux500/include/mach/hardware.h
+++ b/arch/arm/mach-ux500/include/mach/hardware.h
@@ -35,6 +35,7 @@
 #ifndef __ASSEMBLY__
 
 #include <mach/id.h>
+extern void __iomem *_PRCMU_BASE;
 
 #define ARRAY_AND_SIZE(x)       (x), ARRAY_SIZE(x)
 
diff --git a/arch/arm/mach-ux500/include/mach/id.h b/arch/arm/mach-ux500/include/mach/id.h
index f1288d10b6ab..02b541a37ee5 100644
--- a/arch/arm/mach-ux500/include/mach/id.h
+++ b/arch/arm/mach-ux500/include/mach/id.h
@@ -75,6 +75,26 @@ static inline bool __attribute_const__ cpu_is_u8500v2(void)
         return cpu_is_u8500() && ((dbx500_revision() & 0xf0) == 0xB0);
 }
 
+static inline bool cpu_is_u8500v20(void)
+{
+        return cpu_is_u8500() && (dbx500_revision() == 0xB0);
+}
+
+static inline bool cpu_is_u8500v21(void)
+{
+        return cpu_is_u8500() && (dbx500_revision() == 0xB1);
+}
+
+static inline bool cpu_is_u8500v20_or_later(void)
+{
+        return cpu_is_u8500() && !cpu_is_u8500v10() && !cpu_is_u8500v11();
+}
+
+static inline bool ux500_is_svp(void)
+{
+        return false;
+}
+
 #define ux500_unknown_soc()     BUG()
 
 #endif
diff --git a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h
index 97ef55f84934..47969909836c 100644
--- a/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h
+++ b/arch/arm/mach-ux500/include/mach/irqs-board-mop500.h
@@ -50,6 +50,11 @@
 
 #define MOP500_IRQ_END          MOP500_NR_IRQS
 
+/*
+ * We may have several boards, but only one will run at a
+ * time, so the one with most IRQs will bump this ahead,
+ * but the IRQ_BOARD_START remains the same for either board.
+ */
 #if MOP500_IRQ_END > IRQ_BOARD_END
 #undef IRQ_BOARD_END
 #define IRQ_BOARD_END   MOP500_IRQ_END
diff --git a/arch/arm/mach-ux500/include/mach/irqs-board-u5500.h b/arch/arm/mach-ux500/include/mach/irqs-board-u5500.h
new file mode 100644
index 000000000000..29d972c7717b
--- /dev/null
+++ b/arch/arm/mach-ux500/include/mach/irqs-board-u5500.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * License terms: GNU General Public License (GPL) version 2
+ */
+
+#ifndef __MACH_IRQS_BOARD_U5500_H
+#define __MACH_IRQS_BOARD_U5500_H
+
+#define AB5500_NR_IRQS          5
+#define IRQ_AB5500_BASE         IRQ_BOARD_START
+#define IRQ_AB5500_END          (IRQ_AB5500_BASE + AB5500_NR_IRQS)
+
+#define U5500_IRQ_END           IRQ_AB5500_END
+
+#if IRQ_BOARD_END < U5500_IRQ_END
+#undef IRQ_BOARD_END
+#define IRQ_BOARD_END           U5500_IRQ_END
+#endif
+
+#endif
diff --git a/arch/arm/mach-ux500/include/mach/irqs-db5500.h b/arch/arm/mach-ux500/include/mach/irqs-db5500.h
index bfa123dbec3b..77239776a6f2 100644
--- a/arch/arm/mach-ux500/include/mach/irqs-db5500.h
+++ b/arch/arm/mach-ux500/include/mach/irqs-db5500.h
@@ -83,4 +83,31 @@
 #define IRQ_DB5500_GPIO6                (IRQ_SHPI_START + 125)
 #define IRQ_DB5500_GPIO7                (IRQ_SHPI_START + 126)
 
+#ifdef CONFIG_UX500_SOC_DB5500
+
+/*
+ * After the GPIO ones we reserve a range of IRQ:s in which virtual
+ * IRQ:s representing modem IRQ:s can be allocated
+ */
+#define IRQ_MODEM_EVENTS_BASE   IRQ_SOC_START
+#define IRQ_MODEM_EVENTS_NBR    72
+#define IRQ_MODEM_EVENTS_END    (IRQ_MODEM_EVENTS_BASE + IRQ_MODEM_EVENTS_NBR)
+
+/* List of virtual IRQ:s that are allocated from the range above */
+#define MBOX_PAIR0_VIRT_IRQ     (IRQ_MODEM_EVENTS_BASE + 43)
+#define MBOX_PAIR1_VIRT_IRQ     (IRQ_MODEM_EVENTS_BASE + 45)
+#define MBOX_PAIR2_VIRT_IRQ     (IRQ_MODEM_EVENTS_BASE + 41)
+
+/*
+ * We may have several SoCs, but only one will run at a
+ * time, so the one with most IRQs will bump this ahead,
+ * but the IRQ_SOC_START remains the same for either SoC.
+ */
+#if IRQ_SOC_END < IRQ_MODEM_EVENTS_END
+#undef IRQ_SOC_END
+#define IRQ_SOC_END             IRQ_MODEM_EVENTS_END
+#endif
+
+#endif /* CONFIG_UX500_SOC_DB5500 */
+
 #endif
diff --git a/arch/arm/mach-ux500/include/mach/irqs-db8500.h b/arch/arm/mach-ux500/include/mach/irqs-db8500.h
index 8b5d9f0a1633..68bc14974608 100644
--- a/arch/arm/mach-ux500/include/mach/irqs-db8500.h
+++ b/arch/arm/mach-ux500/include/mach/irqs-db8500.h
@@ -93,4 +93,58 @@
 #define IRQ_DB8500_GPIO7                (IRQ_SHPI_START + 126)
 #define IRQ_DB8500_GPIO8                (IRQ_SHPI_START + 127)
 
+#define IRQ_CA_WAKE_REQ_ED                      (IRQ_SHPI_START + 71)
+#define IRQ_AC_READ_NOTIFICATION_0_ED           (IRQ_SHPI_START + 66)
+#define IRQ_AC_READ_NOTIFICATION_1_ED           (IRQ_SHPI_START + 64)
+#define IRQ_CA_MSG_PEND_NOTIFICATION_0_ED       (IRQ_SHPI_START + 67)
+#define IRQ_CA_MSG_PEND_NOTIFICATION_1_ED       (IRQ_SHPI_START + 65)
+
+#define IRQ_CA_WAKE_REQ_V1                      (IRQ_SHPI_START + 83)
+#define IRQ_AC_READ_NOTIFICATION_0_V1           (IRQ_SHPI_START + 78)
+#define IRQ_AC_READ_NOTIFICATION_1_V1           (IRQ_SHPI_START + 76)
+#define IRQ_CA_MSG_PEND_NOTIFICATION_0_V1       (IRQ_SHPI_START + 79)
+#define IRQ_CA_MSG_PEND_NOTIFICATION_1_V1       (IRQ_SHPI_START + 77)
+
+#ifdef CONFIG_UX500_SOC_DB8500
+
+/* Virtual interrupts corresponding to the PRCMU wakeups.  */
+#define IRQ_PRCMU_BASE IRQ_SOC_START
+#define NUM_PRCMU_WAKEUPS (IRQ_PRCMU_END - IRQ_PRCMU_BASE)
+
+#define IRQ_PRCMU_RTC (IRQ_PRCMU_BASE)
+#define IRQ_PRCMU_RTT0 (IRQ_PRCMU_BASE + 1)
+#define IRQ_PRCMU_RTT1 (IRQ_PRCMU_BASE + 2)
+#define IRQ_PRCMU_HSI0 (IRQ_PRCMU_BASE + 3)
+#define IRQ_PRCMU_HSI1 (IRQ_PRCMU_BASE + 4)
+#define IRQ_PRCMU_CA_WAKE (IRQ_PRCMU_BASE + 5)
+#define IRQ_PRCMU_USB (IRQ_PRCMU_BASE + 6)
+#define IRQ_PRCMU_ABB (IRQ_PRCMU_BASE + 7)
+#define IRQ_PRCMU_ABB_FIFO (IRQ_PRCMU_BASE + 8)
+#define IRQ_PRCMU_ARM (IRQ_PRCMU_BASE + 9)
+#define IRQ_PRCMU_MODEM_SW_RESET_REQ (IRQ_PRCMU_BASE + 10)
+#define IRQ_PRCMU_GPIO0 (IRQ_PRCMU_BASE + 11)
+#define IRQ_PRCMU_GPIO1 (IRQ_PRCMU_BASE + 12)
+#define IRQ_PRCMU_GPIO2 (IRQ_PRCMU_BASE + 13)
+#define IRQ_PRCMU_GPIO3 (IRQ_PRCMU_BASE + 14)
+#define IRQ_PRCMU_GPIO4 (IRQ_PRCMU_BASE + 15)
+#define IRQ_PRCMU_GPIO5 (IRQ_PRCMU_BASE + 16)
+#define IRQ_PRCMU_GPIO6 (IRQ_PRCMU_BASE + 17)
+#define IRQ_PRCMU_GPIO7 (IRQ_PRCMU_BASE + 18)
+#define IRQ_PRCMU_GPIO8 (IRQ_PRCMU_BASE + 19)
+#define IRQ_PRCMU_CA_SLEEP (IRQ_PRCMU_BASE + 20)
+#define IRQ_PRCMU_HOTMON_LOW (IRQ_PRCMU_BASE + 21)
+#define IRQ_PRCMU_HOTMON_HIGH (IRQ_PRCMU_BASE + 22)
+#define IRQ_PRCMU_END (IRQ_PRCMU_BASE + 23)
+
+/*
+ * We may have several SoCs, but only one will run at a
+ * time, so the one with most IRQs will bump this ahead,
+ * but the IRQ_SOC_START remains the same for either SoC.
+ */
+#if IRQ_SOC_END < IRQ_PRCMU_END
+#undef IRQ_SOC_END
+#define IRQ_SOC_END IRQ_PRCMU_END
+#endif
+
+#endif /* CONFIG_UX500_SOC_DB8500 */
 #endif
diff --git a/arch/arm/mach-ux500/include/mach/irqs.h b/arch/arm/mach-ux500/include/mach/irqs.h
index ba1294c13c4d..9db68d264c5f 100644
--- a/arch/arm/mach-ux500/include/mach/irqs.h
+++ b/arch/arm/mach-ux500/include/mach/irqs.h
@@ -10,49 +10,47 @@
 #ifndef ASM_ARCH_IRQS_H
 #define ASM_ARCH_IRQS_H
 
-#include <mach/irqs-db5500.h>
-#include <mach/irqs-db8500.h>
+#include <mach/hardware.h>
 
-#define IRQ_LOCALTIMER                  29
-#define IRQ_LOCALWDOG                   30
+#define IRQ_LOCALTIMER                  29
+#define IRQ_LOCALWDOG                   30
 
 /* Shared Peripheral Interrupt (SHPI) */
 #define IRQ_SHPI_START                  32
 
-/* Interrupt numbers generic for shared peripheral */
+/*
+ * MTU0 preserved for now until plat-nomadik is taught not to use it.  Don't
+ * add any other IRQs here, use the irqs-dbx500.h files.
+ */
 #define IRQ_MTU0                (IRQ_SHPI_START + 4)
 
-/* There are 128 shared peripheral interrupts assigned to
- * INTID[160:32]. The first 32 interrupts are reserved.
- */
-#define DBX500_NR_INTERNAL_IRQS         161
+#define DBX500_NR_INTERNAL_IRQS         160
 
 /* After chip-specific IRQ numbers we have the GPIO ones */
 #define NOMADIK_NR_GPIO                 288
 #define NOMADIK_GPIO_TO_IRQ(gpio)       ((gpio) + DBX500_NR_INTERNAL_IRQS)
 #define NOMADIK_IRQ_TO_GPIO(irq)        ((irq) - DBX500_NR_INTERNAL_IRQS)
-#define IRQ_BOARD_START                 NOMADIK_GPIO_TO_IRQ(NOMADIK_NR_GPIO)
+#define IRQ_GPIO_END                    NOMADIK_GPIO_TO_IRQ(NOMADIK_NR_GPIO)
+
+#define IRQ_SOC_START           IRQ_GPIO_END
+/* This will be overridden by SoC-specific irq headers */
+#define IRQ_SOC_END             IRQ_SOC_START
 
+#include <mach/irqs-db5500.h>
+#include <mach/irqs-db8500.h>
+
+#define IRQ_BOARD_START         IRQ_SOC_END
 /* This will be overridden by board-specific irq headers */
-#define IRQ_BOARD_END                   IRQ_BOARD_START
+#define IRQ_BOARD_END           IRQ_BOARD_START
 
 #ifdef CONFIG_MACH_U8500
 #include <mach/irqs-board-mop500.h>
 #endif
 
-/*
- * After the board specific IRQ:s we reserve a range of IRQ:s in which virtual
- * IRQ:s representing modem IRQ:s can be allocated
- */
-#define IRQ_MODEM_EVENTS_BASE (IRQ_BOARD_END + 1)
-#define IRQ_MODEM_EVENTS_NBR 72
-#define IRQ_MODEM_EVENTS_END (IRQ_MODEM_EVENTS_BASE + IRQ_MODEM_EVENTS_NBR)
-
-/* List of virtual IRQ:s that are allocated from the range above */
-#define MBOX_PAIR0_VIRT_IRQ (IRQ_MODEM_EVENTS_BASE + 43)
-#define MBOX_PAIR1_VIRT_IRQ (IRQ_MODEM_EVENTS_BASE + 45)
-#define MBOX_PAIR2_VIRT_IRQ (IRQ_MODEM_EVENTS_BASE + 41)
+#ifdef CONFIG_MACH_U5500
+#include <mach/irqs-board-u5500.h>
+#endif
 
-#define NR_IRQS                         IRQ_MODEM_EVENTS_END
+#define NR_IRQS                 IRQ_BOARD_END
 
 #endif /* ASM_ARCH_IRQS_H */
diff --git a/arch/arm/mach-ux500/include/mach/prcmu-defs.h b/arch/arm/mach-ux500/include/mach/prcmu-defs.h
deleted file mode 100644
index 848ba64b561f..000000000000
--- a/arch/arm/mach-ux500/include/mach/prcmu-defs.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) STMicroelectronics 2009
- * Copyright (C) ST-Ericsson SA 2010
- *
- * Author: Sundar Iyer <sundar.iyer@stericsson.com>
- * Author: Martin Persson <martin.persson@stericsson.com>
- *
- * License Terms: GNU General Public License v2
- *
- * PRCM Unit definitions
- */
-
-#ifndef __MACH_PRCMU_DEFS_H
-#define __MACH_PRCMU_DEFS_H
-
-enum prcmu_cpu_opp {
-        CPU_OPP_INIT      = 0x00,
-        CPU_OPP_NO_CHANGE = 0x01,
-        CPU_OPP_100       = 0x02,
-        CPU_OPP_50        = 0x03,
-        CPU_OPP_MAX       = 0x04,
-        CPU_OPP_EXT_CLK   = 0x07
-};
-enum prcmu_ape_opp {
-        APE_OPP_NO_CHANGE = 0x00,
-        APE_OPP_100       = 0x02,
-        APE_OPP_50        = 0x03,
-};
-
-#endif /* __MACH_PRCMU_DEFS_H */
diff --git a/arch/arm/mach-ux500/include/mach/prcmu-regs.h b/arch/arm/mach-ux500/include/mach/prcmu-regs.h
deleted file mode 100644
index 455467e88791..000000000000
--- a/arch/arm/mach-ux500/include/mach/prcmu-regs.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) STMicroelectronics 2009
- * Copyright (C) ST-Ericsson SA 2010
- *
- * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
- * Author: Sundar Iyer <sundar.iyer@stericsson.com>
- *
- * License Terms: GNU General Public License v2
- *
- * PRCM Unit registers
- */
-
-#ifndef __MACH_PRCMU_REGS_H
-#define __MACH_PRCMU_REGS_H
-
-#include <mach/hardware.h>
-
-#define _PRCMU_BASE             IO_ADDRESS(U8500_PRCMU_BASE)
-
-#define PRCM_ARM_PLLDIVPS       (_PRCMU_BASE + 0x118)
-#define PRCM_ARM_CHGCLKREQ      (_PRCMU_BASE + 0x114)
-#define PRCM_PLLARM_ENABLE      (_PRCMU_BASE + 0x98)
-#define PRCM_ARMCLKFIX_MGT      (_PRCMU_BASE + 0x0)
-#define PRCM_A9_RESETN_CLR      (_PRCMU_BASE + 0x1f4)
-#define PRCM_A9_RESETN_SET      (_PRCMU_BASE + 0x1f0)
-#define PRCM_ARM_LS_CLAMP       (_PRCMU_BASE + 0x30c)
-#define PRCM_SRAM_A9            (_PRCMU_BASE + 0x308)
-
-/* ARM WFI Standby signal register */
-#define PRCM_ARM_WFI_STANDBY    (_PRCMU_BASE + 0x130)
-#define PRCMU_IOCR              (_PRCMU_BASE + 0x310)
-
-/* CPU mailbox registers */
-#define PRCM_MBOX_CPU_VAL       (_PRCMU_BASE + 0x0fc)
-#define PRCM_MBOX_CPU_SET       (_PRCMU_BASE + 0x100)
-#define PRCM_MBOX_CPU_CLR       (_PRCMU_BASE + 0x104)
-
-/* Dual A9 core interrupt management unit registers */
-#define PRCM_A9_MASK_REQ        (_PRCMU_BASE + 0x328)
-#define PRCM_A9_MASK_ACK        (_PRCMU_BASE + 0x32c)
-#define PRCM_ARMITMSK31TO0      (_PRCMU_BASE + 0x11c)
-#define PRCM_ARMITMSK63TO32     (_PRCMU_BASE + 0x120)
-#define PRCM_ARMITMSK95TO64     (_PRCMU_BASE + 0x124)
-#define PRCM_ARMITMSK127TO96    (_PRCMU_BASE + 0x128)
-#define PRCM_POWER_STATE_VAL    (_PRCMU_BASE + 0x25C)
-#define PRCM_ARMITVAL31TO0      (_PRCMU_BASE + 0x260)
-#define PRCM_ARMITVAL63TO32     (_PRCMU_BASE + 0x264)
-#define PRCM_ARMITVAL95TO64     (_PRCMU_BASE + 0x268)
-#define PRCM_ARMITVAL127TO96    (_PRCMU_BASE + 0x26C)
-
-#define PRCM_HOSTACCESS_REQ     (_PRCMU_BASE + 0x334)
-#define ARM_WAKEUP_MODEM        0x1
-
-#define PRCM_ARM_IT1_CLEAR      (_PRCMU_BASE + 0x48C)
-#define PRCM_ARM_IT1_VAL        (_PRCMU_BASE + 0x494)
-#define PRCM_HOLD_EVT           (_PRCMU_BASE + 0x174)
-
-#define PRCM_ITSTATUS0          (_PRCMU_BASE + 0x148)
-#define PRCM_ITSTATUS1          (_PRCMU_BASE + 0x150)
-#define PRCM_ITSTATUS2          (_PRCMU_BASE + 0x158)
-#define PRCM_ITSTATUS3          (_PRCMU_BASE + 0x160)
-#define PRCM_ITSTATUS4          (_PRCMU_BASE + 0x168)
-#define PRCM_ITSTATUS5          (_PRCMU_BASE + 0x484)
-#define PRCM_ITCLEAR5           (_PRCMU_BASE + 0x488)
-#define PRCM_ARMIT_MASKXP70_IT  (_PRCMU_BASE + 0x1018)
-
-/* System reset register */
-#define PRCM_APE_SOFTRST        (_PRCMU_BASE + 0x228)
-
-/* Level shifter and clamp control registers */
-#define PRCM_MMIP_LS_CLAMP_SET     (_PRCMU_BASE + 0x420)
-#define PRCM_MMIP_LS_CLAMP_CLR     (_PRCMU_BASE + 0x424)
-
-/* PRCMU clock/PLL/reset registers */
-#define PRCM_PLLDSI_FREQ           (_PRCMU_BASE + 0x500)
-#define PRCM_PLLDSI_ENABLE         (_PRCMU_BASE + 0x504)
-#define PRCM_LCDCLK_MGT            (_PRCMU_BASE + 0x044)
-#define PRCM_MCDECLK_MGT           (_PRCMU_BASE + 0x064)
-#define PRCM_HDMICLK_MGT           (_PRCMU_BASE + 0x058)
-#define PRCM_TVCLK_MGT             (_PRCMU_BASE + 0x07c)
-#define PRCM_DSI_PLLOUT_SEL        (_PRCMU_BASE + 0x530)
-#define PRCM_DSITVCLK_DIV          (_PRCMU_BASE + 0x52C)
-#define PRCM_APE_RESETN_SET        (_PRCMU_BASE + 0x1E4)
-#define PRCM_APE_RESETN_CLR        (_PRCMU_BASE + 0x1E8)
-
-/* ePOD and memory power signal control registers */
-#define PRCM_EPOD_C_SET            (_PRCMU_BASE + 0x410)
-#define PRCM_SRAM_LS_SLEEP         (_PRCMU_BASE + 0x304)
-
-/* Debug power control unit registers */
-#define PRCM_POWER_STATE_SET       (_PRCMU_BASE + 0x254)
-
-/* Miscellaneous unit registers */
-#define PRCM_DSI_SW_RESET          (_PRCMU_BASE + 0x324)
-
-#endif /* __MACH_PRCMU_REGS_H */
diff --git a/arch/arm/mach-ux500/include/mach/prcmu.h b/arch/arm/mach-ux500/include/mach/prcmu.h
deleted file mode 100644
index c49e456162ef..000000000000
--- a/arch/arm/mach-ux500/include/mach/prcmu.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) STMicroelectronics 2009
- * Copyright (C) ST-Ericsson SA 2010
- *
- * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
- * Author: Sundar Iyer <sundar.iyer@stericsson.com>
- * Author: Mattias Nilsson <mattias.i.nilsson@stericsson.com>
- *
- * License Terms: GNU General Public License v2
- *
- * PRCM Unit f/w API
- */
-#ifndef __MACH_PRCMU_H
-#define __MACH_PRCMU_H
-#include <mach/prcmu-defs.h>
-
-void __init prcmu_early_init(void);
-int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size);
-int prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size);
-int prcmu_set_ape_opp(enum prcmu_ape_opp opp);
-int prcmu_set_cpu_opp(enum prcmu_cpu_opp opp);
-int prcmu_set_ape_cpu_opps(enum prcmu_ape_opp ape_opp,
-                           enum prcmu_cpu_opp cpu_opp);
-int prcmu_get_ape_opp(void);
-int prcmu_get_cpu_opp(void);
-bool prcmu_has_arm_maxopp(void);
-
-#endif /* __MACH_PRCMU_H */
diff --git a/arch/arm/mach-ux500/include/mach/smp.h b/arch/arm/mach-ux500/include/mach/smp.h
deleted file mode 100644
index ca2b15b1b3b1..000000000000
--- a/arch/arm/mach-ux500/include/mach/smp.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * This file is based ARM realview platform.
- * Copyright (C) ARM Limited.
- *
- * 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 ASMARM_ARCH_SMP_H
-#define ASMARM_ARCH_SMP_H
-
-#include <asm/hardware/gic.h>
-
-/* This is required to wakeup the secondary core */
-extern void u8500_secondary_startup(void);
-
-/*
- * We use IRQ1 as the IPI
- */
-static inline void smp_cross_call(const struct cpumask *mask, int ipi)
-{
-        gic_raise_softirq(mask, ipi);
-}
-#endif
diff --git a/arch/arm/mach-ux500/include/mach/uncompress.h b/arch/arm/mach-ux500/include/mach/uncompress.h
index ab0fe1432fae..088b550c40df 100644
--- a/arch/arm/mach-ux500/include/mach/uncompress.h
+++ b/arch/arm/mach-ux500/include/mach/uncompress.h
@@ -24,7 +24,7 @@
 #include <linux/amba/serial.h>
 #include <mach/hardware.h>
 
-static u32 ux500_uart_base;
+u32 ux500_uart_base;
 
 static void putc(const char c)
 {
diff --git a/arch/arm/mach-ux500/mbox-db5500.c b/arch/arm/mach-ux500/mbox-db5500.c
index a4ffb9f4f461..2b2d51caf9d8 100644
--- a/arch/arm/mach-ux500/mbox-db5500.c
+++ b/arch/arm/mach-ux500/mbox-db5500.c
@@ -416,8 +416,7 @@ struct mbox *mbox_setup(u8 mbox_id, mbox_recv_cb_t *mbox_cb, void *priv)
         dev_dbg(&(mbox->pdev->dev),
                 "Resource name: %s start: 0x%X, end: 0x%X\n",
                 resource->name, resource->start, resource->end);
-        mbox->virtbase_peer =
-                ioremap(resource->start, resource->end - resource->start);
+        mbox->virtbase_peer = ioremap(resource->start, resource_size(resource));
         if (!mbox->virtbase_peer) {
                 dev_err(&(mbox->pdev->dev), "Unable to ioremap peer mbox\n");
                 mbox = NULL;
@@ -440,8 +439,7 @@ struct mbox *mbox_setup(u8 mbox_id, mbox_recv_cb_t *mbox_cb, void *priv)
         dev_dbg(&(mbox->pdev->dev),
                 "Resource name: %s start: 0x%X, end: 0x%X\n",
                 resource->name, resource->start, resource->end);
-        mbox->virtbase_local =
-                ioremap(resource->start, resource->end - resource->start);
+        mbox->virtbase_local = ioremap(resource->start, resource_size(resource));
         if (!mbox->virtbase_local) {
                 dev_err(&(mbox->pdev->dev), "Unable to ioremap local mbox\n");
                 mbox = NULL;
diff --git a/arch/arm/mach-ux500/platsmp.c b/arch/arm/mach-ux500/platsmp.c
index 4fff4d408417..0c527fe2cebb 100644
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@ -18,10 +18,14 @@
 #include <linux/io.h>
 
 #include <asm/cacheflush.h>
+#include <asm/hardware/gic.h>
 #include <asm/smp_scu.h>
 #include <mach/hardware.h>
 #include <mach/setup.h>
 
+/* This is called from headsmp.S to wakeup the secondary core */
+extern void u8500_secondary_startup(void);
+
 /*
  * control for which core is the next to come out of the secondary
  * boot "holding pen"
@@ -94,7 +98,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
          */
         write_pen_release(cpu);
 
-        smp_cross_call(cpumask_of(cpu), 1);
+        gic_raise_softirq(cpumask_of(cpu), 1);
 
         timeout = jiffies + (1 * HZ);
         while (time_before(jiffies, timeout)) {
@@ -162,6 +166,8 @@ void __init smp_init_cpus(void)
 
         for (i = 0; i < ncores; i++)
                 set_cpu_possible(i, true);
+
+        set_smp_cross_call(gic_raise_softirq);
 }
 
 void __init platform_smp_prepare_cpus(unsigned int max_cpus)
diff --git a/arch/arm/mach-ux500/prcmu.c b/arch/arm/mach-ux500/prcmu.c
deleted file mode 100644
index c522d26ef348..000000000000
--- a/arch/arm/mach-ux500/prcmu.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * Copyright (C) STMicroelectronics 2009
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License Terms: GNU General Public License v2
- * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
- * Author: Sundar Iyer <sundar.iyer@stericsson.com>
- * Author: Mattias Nilsson <mattias.i.nilsson@stericsson.com>
- *
- * U8500 PRCM Unit interface driver
- *
- */
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/mutex.h>
-#include <linux/completion.h>
-#include <linux/jiffies.h>
-#include <linux/bitops.h>
-#include <linux/interrupt.h>
-
-#include <mach/hardware.h>
-#include <mach/prcmu-regs.h>
-#include <mach/prcmu-defs.h>
-
-/* Global var to runtime determine TCDM base for v2 or v1 */
-static __iomem void *tcdm_base;
-
-#define _MBOX_HEADER            (tcdm_base + 0xFE8)
-#define MBOX_HEADER_REQ_MB0     (_MBOX_HEADER + 0x0)
-
-#define REQ_MB1 (tcdm_base + 0xFD0)
-#define REQ_MB5 (tcdm_base + 0xE44)
-
-#define REQ_MB1_ARMOPP          (REQ_MB1 + 0x0)
-#define REQ_MB1_APEOPP          (REQ_MB1 + 0x1)
-#define REQ_MB1_BOOSTOPP        (REQ_MB1 + 0x2)
-
-#define ACK_MB1 (tcdm_base + 0xE04)
-#define ACK_MB5 (tcdm_base + 0xDF4)
-
-#define ACK_MB1_CURR_ARMOPP             (ACK_MB1 + 0x0)
-#define ACK_MB1_CURR_APEOPP             (ACK_MB1 + 0x1)
-
-#define REQ_MB5_I2C_SLAVE_OP (REQ_MB5)
-#define REQ_MB5_I2C_HW_BITS (REQ_MB5 + 1)
-#define REQ_MB5_I2C_REG (REQ_MB5 + 2)
-#define REQ_MB5_I2C_VAL (REQ_MB5 + 3)
-
-#define ACK_MB5_I2C_STATUS (ACK_MB5 + 1)
-#define ACK_MB5_I2C_VAL (ACK_MB5 + 3)
-
-#define PRCM_AVS_VARM_MAX_OPP           (tcdm_base + 0x2E4)
-#define PRCM_AVS_ISMODEENABLE           7
-#define PRCM_AVS_ISMODEENABLE_MASK      (1 << PRCM_AVS_ISMODEENABLE)
-
-#define I2C_WRITE(slave) \
-        (((slave) << 1) | (cpu_is_u8500v2() ? BIT(6) : 0))
-#define I2C_READ(slave) \
-        (((slave) << 1) | (cpu_is_u8500v2() ? BIT(6) : 0) | BIT(0))
-#define I2C_STOP_EN BIT(3)
-
-enum mb1_h {
-        MB1H_ARM_OPP = 1,
-        MB1H_APE_OPP,
-        MB1H_ARM_APE_OPP,
-};
-
-static struct {
-        struct mutex lock;
-        struct completion work;
-        struct {
-                u8 arm_opp;
-                u8 ape_opp;
-                u8 arm_status;
-                u8 ape_status;
-        } ack;
-} mb1_transfer;
-
-enum ack_mb5_status {
-        I2C_WR_OK = 0x01,
-        I2C_RD_OK = 0x02,
-};
-
-#define MBOX_BIT BIT
-#define NUM_MBOX 8
-
-static struct {
-        struct mutex lock;
-        struct completion work;
-        bool failed;
-        struct {
-                u8 status;
-                u8 value;
-        } ack;
-} mb5_transfer;
-
-/**
- * prcmu_abb_read() - Read register value(s) from the ABB.
- * @slave:      The I2C slave address.
- * @reg:        The (start) register address.
- * @value:      The read out value(s).
- * @size:       The number of registers to read.
- *
- * Reads register value(s) from the ABB.
- * @size has to be 1 for the current firmware version.
- */
-int prcmu_abb_read(u8 slave, u8 reg, u8 *value, u8 size)
-{
-        int r;
-
-        if (size != 1)
-                return -EINVAL;
-
-        r = mutex_lock_interruptible(&mb5_transfer.lock);
-        if (r)
-                return r;
-
-        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(5))
-                cpu_relax();
-
-        writeb(I2C_READ(slave), REQ_MB5_I2C_SLAVE_OP);
-        writeb(I2C_STOP_EN, REQ_MB5_I2C_HW_BITS);
-        writeb(reg, REQ_MB5_I2C_REG);
-
-        writel(MBOX_BIT(5), PRCM_MBOX_CPU_SET);
-        if (!wait_for_completion_timeout(&mb5_transfer.work,
-                        msecs_to_jiffies(500))) {
-                pr_err("prcmu: prcmu_abb_read timed out.\n");
-                r = -EIO;
-                goto unlock_and_return;
-        }
-        r = ((mb5_transfer.ack.status == I2C_RD_OK) ? 0 : -EIO);
-        if (!r)
-                *value = mb5_transfer.ack.value;
-
-unlock_and_return:
-        mutex_unlock(&mb5_transfer.lock);
-        return r;
-}
-EXPORT_SYMBOL(prcmu_abb_read);
-
-/**
- * prcmu_abb_write() - Write register value(s) to the ABB.
- * @slave:      The I2C slave address.
- * @reg:        The (start) register address.
- * @value:      The value(s) to write.
- * @size:       The number of registers to write.
- *
- * Reads register value(s) from the ABB.
- * @size has to be 1 for the current firmware version.
- */
-int prcmu_abb_write(u8 slave, u8 reg, u8 *value, u8 size)
-{
-        int r;
-
-        if (size != 1)
-                return -EINVAL;
-
-        r = mutex_lock_interruptible(&mb5_transfer.lock);
-        if (r)
-                return r;
-
-
-        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(5))
-                cpu_relax();
-
-        writeb(I2C_WRITE(slave), REQ_MB5_I2C_SLAVE_OP);
-        writeb(I2C_STOP_EN, REQ_MB5_I2C_HW_BITS);
-        writeb(reg, REQ_MB5_I2C_REG);
-        writeb(*value, REQ_MB5_I2C_VAL);
-
-        writel(MBOX_BIT(5), PRCM_MBOX_CPU_SET);
-        if (!wait_for_completion_timeout(&mb5_transfer.work,
-                        msecs_to_jiffies(500))) {
-                pr_err("prcmu: prcmu_abb_write timed out.\n");
-                r = -EIO;
-                goto unlock_and_return;
-        }
-        r = ((mb5_transfer.ack.status == I2C_WR_OK) ? 0 : -EIO);
-
-unlock_and_return:
-        mutex_unlock(&mb5_transfer.lock);
-        return r;
-}
-EXPORT_SYMBOL(prcmu_abb_write);
-
-static int set_ape_cpu_opps(u8 header, enum prcmu_ape_opp ape_opp,
-                            enum prcmu_cpu_opp cpu_opp)
-{
-        bool do_ape;
-        bool do_arm;
-        int err = 0;
-
-        do_ape = ((header == MB1H_APE_OPP) || (header == MB1H_ARM_APE_OPP));
-        do_arm = ((header == MB1H_ARM_OPP) || (header == MB1H_ARM_APE_OPP));
-
-        mutex_lock(&mb1_transfer.lock);
-
-        while (readl(PRCM_MBOX_CPU_VAL) & MBOX_BIT(1))
-                cpu_relax();
-
-        writeb(0, MBOX_HEADER_REQ_MB0);
-        writeb(cpu_opp, REQ_MB1_ARMOPP);
-        writeb(ape_opp, REQ_MB1_APEOPP);
-        writeb(0, REQ_MB1_BOOSTOPP);
-        writel(MBOX_BIT(1), PRCM_MBOX_CPU_SET);
-        wait_for_completion(&mb1_transfer.work);
-        if ((do_ape) && (mb1_transfer.ack.ape_status != 0))
-                err = -EIO;
-        if ((do_arm) && (mb1_transfer.ack.arm_status != 0))
-                err = -EIO;
-
-        mutex_unlock(&mb1_transfer.lock);
-
-        return err;
-}
-
-/**
- * prcmu_set_ape_opp() - Set the OPP of the APE.
- * @opp:        The OPP to set.
- *
- * This function sets the OPP of the APE.
- */
-int prcmu_set_ape_opp(enum prcmu_ape_opp opp)
-{
-        return set_ape_cpu_opps(MB1H_APE_OPP, opp, APE_OPP_NO_CHANGE);
-}
-EXPORT_SYMBOL(prcmu_set_ape_opp);
-
-/**
- * prcmu_set_cpu_opp() - Set the OPP of the CPU.
- * @opp:        The OPP to set.
- *
- * This function sets the OPP of the CPU.
- */
-int prcmu_set_cpu_opp(enum prcmu_cpu_opp opp)
-{
-        return set_ape_cpu_opps(MB1H_ARM_OPP, CPU_OPP_NO_CHANGE, opp);
-}
-EXPORT_SYMBOL(prcmu_set_cpu_opp);
-
-/**
- * prcmu_set_ape_cpu_opps() - Set the OPPs of the APE and the CPU.
- * @ape_opp:    The APE OPP to set.
- * @cpu_opp:    The CPU OPP to set.
- *
- * This function sets the OPPs of the APE and the CPU.
- */
-int prcmu_set_ape_cpu_opps(enum prcmu_ape_opp ape_opp,
-                           enum prcmu_cpu_opp cpu_opp)
-{
-        return set_ape_cpu_opps(MB1H_ARM_APE_OPP, ape_opp, cpu_opp);
-}
-EXPORT_SYMBOL(prcmu_set_ape_cpu_opps);
-
-/**
- * prcmu_get_ape_opp() - Get the OPP of the APE.
- *
- * This function gets the OPP of the APE.
- */
-enum prcmu_ape_opp prcmu_get_ape_opp(void)
-{
-        return readb(ACK_MB1_CURR_APEOPP);
-}
-EXPORT_SYMBOL(prcmu_get_ape_opp);
-
-/**
- * prcmu_get_cpu_opp() - Get the OPP of the CPU.
- *
- * This function gets the OPP of the CPU. The OPP is specified in %%.
- * PRCMU_OPP_EXT is a special OPP value, not specified in %%.
- */
-int prcmu_get_cpu_opp(void)
-{
-        return readb(ACK_MB1_CURR_ARMOPP);
-}
-EXPORT_SYMBOL(prcmu_get_cpu_opp);
-
-bool prcmu_has_arm_maxopp(void)
-{
-        return (readb(PRCM_AVS_VARM_MAX_OPP) & PRCM_AVS_ISMODEENABLE_MASK)
-                == PRCM_AVS_ISMODEENABLE_MASK;
-}
-
-static void read_mailbox_0(void)
-{
-        writel(MBOX_BIT(0), PRCM_ARM_IT1_CLEAR);
-}
-
-static void read_mailbox_1(void)
-{
-        mb1_transfer.ack.arm_opp = readb(ACK_MB1_CURR_ARMOPP);
-        mb1_transfer.ack.ape_opp = readb(ACK_MB1_CURR_APEOPP);
-        complete(&mb1_transfer.work);
-        writel(MBOX_BIT(1), PRCM_ARM_IT1_CLEAR);
-}
-
-static void read_mailbox_2(void)
-{
-        writel(MBOX_BIT(2), PRCM_ARM_IT1_CLEAR);
-}
-
-static void read_mailbox_3(void)
-{
-        writel(MBOX_BIT(3), PRCM_ARM_IT1_CLEAR);
-}
-
-static void read_mailbox_4(void)
-{
-        writel(MBOX_BIT(4), PRCM_ARM_IT1_CLEAR);
-}
-
-static void read_mailbox_5(void)
-{
-        mb5_transfer.ack.status = readb(ACK_MB5_I2C_STATUS);
-        mb5_transfer.ack.value = readb(ACK_MB5_I2C_VAL);
-        complete(&mb5_transfer.work);
-        writel(MBOX_BIT(5), PRCM_ARM_IT1_CLEAR);
-}
-
-static void read_mailbox_6(void)
-{
-        writel(MBOX_BIT(6), PRCM_ARM_IT1_CLEAR);
-}
-
-static void read_mailbox_7(void)
-{
-        writel(MBOX_BIT(7), PRCM_ARM_IT1_CLEAR);
-}
-
-static void (* const read_mailbox[NUM_MBOX])(void) = {
-        read_mailbox_0,
-        read_mailbox_1,
-        read_mailbox_2,
-        read_mailbox_3,
-        read_mailbox_4,
-        read_mailbox_5,
-        read_mailbox_6,
-        read_mailbox_7
-};
-
-static irqreturn_t prcmu_irq_handler(int irq, void *data)
-{
-        u32 bits;
-        u8 n;
-
-        bits = (readl(PRCM_ARM_IT1_VAL) & (MBOX_BIT(NUM_MBOX) - 1));
-        if (unlikely(!bits))
-                return IRQ_NONE;
-
-        for (n = 0; bits; n++) {
-                if (bits & MBOX_BIT(n)) {
-                        bits -= MBOX_BIT(n);
-                        read_mailbox[n]();
-                }
-        }
-        return IRQ_HANDLED;
-}
-
-void __init prcmu_early_init(void)
-{
-        if (cpu_is_u8500v11() || cpu_is_u8500ed()) {
-                tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE_V1);
-        } else if (cpu_is_u8500v2()) {
-                tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
-        } else {
-                pr_err("prcmu: Unsupported chip version\n");
-                BUG();
-        }
-}
-
-static int __init prcmu_init(void)
-{
-        if (cpu_is_u8500ed()) {
-                pr_err("prcmu: Unsupported chip version\n");
-                return 0;
-        }
-
-        mutex_init(&mb1_transfer.lock);
-        init_completion(&mb1_transfer.work);
-        mutex_init(&mb5_transfer.lock);
-        init_completion(&mb5_transfer.work);
-
-        /* Clean up the mailbox interrupts after pre-kernel code. */
-        writel((MBOX_BIT(NUM_MBOX) - 1), PRCM_ARM_IT1_CLEAR);
-
-        return request_irq(IRQ_DB8500_PRCMU1, prcmu_irq_handler, 0,
-                           "prcmu", NULL);
-}
-
-arch_initcall(prcmu_init);
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index eb7ffa0ee8b5..0c99cf076c63 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -32,6 +32,7 @@
 #include <linux/io.h>
 #include <linux/gfp.h>
 #include <linux/clkdev.h>
+#include <linux/mtd/physmap.h>
 
 #include <asm/system.h>
 #include <asm/irq.h>
@@ -42,7 +43,6 @@
 #include <asm/mach-types.h>
 
 #include <asm/mach/arch.h>
-#include <asm/mach/flash.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
 #include <asm/mach/map.h>
@@ -190,27 +190,7 @@ void __init versatile_map_io(void)
 
 #define VERSATILE_FLASHCTRL    (__io_address(VERSATILE_SYS_BASE) + VERSATILE_SYS_FLASH_OFFSET)
 
-static int versatile_flash_init(void)
-{
-        u32 val;
-
-        val = __raw_readl(VERSATILE_FLASHCTRL);
-        val &= ~VERSATILE_FLASHPROG_FLVPPEN;
-        __raw_writel(val, VERSATILE_FLASHCTRL);
-
-        return 0;
-}
-
-static void versatile_flash_exit(void)
-{
-        u32 val;
-
-        val = __raw_readl(VERSATILE_FLASHCTRL);
-        val &= ~VERSATILE_FLASHPROG_FLVPPEN;
-        __raw_writel(val, VERSATILE_FLASHCTRL);
-}
-
-static void versatile_flash_set_vpp(int on)
+static void versatile_flash_set_vpp(struct platform_device *pdev, int on)
 {
         u32 val;
 
@@ -222,11 +202,8 @@ static void versatile_flash_set_vpp(int on)
         __raw_writel(val, VERSATILE_FLASHCTRL);
 }
 
-static struct flash_platform_data versatile_flash_data = {
-        .map_name               = "cfi_probe",
+static struct physmap_flash_data versatile_flash_data = {
         .width                  = 4,
-        .init                   = versatile_flash_init,
-        .exit                   = versatile_flash_exit,
         .set_vpp                = versatile_flash_set_vpp,
 };
 
@@ -237,7 +214,7 @@ static struct resource versatile_flash_resource = {
 };
 
 static struct platform_device versatile_flash_device = {
-        .name                   = "armflash",
+        .name                   = "physmap-flash",
         .id                     = 0,
         .dev                    = {
                 .platform_data  = &versatile_flash_data,
@@ -375,6 +352,10 @@ static struct clk ref24_clk = {
         .rate   = 24000000,
 };
 
+static struct clk sp804_clk = {
+        .rate   = 1000000,
+};
+
 static struct clk dummy_apb_pclk;
 
 static struct clk_lookup lookups[] = {
@@ -411,7 +392,10 @@ static struct clk_lookup lookups[] = {
         }, {    /* CLCD */
                 .dev_id         = "dev:20",
                 .clk            = &osc4_clk,
-        }
+        }, {    /* SP804 timers */
+                .dev_id         = "sp804",
+                .clk            = &sp804_clk,
+        },
 };
 
 /*
@@ -764,8 +748,8 @@ static void __init versatile_timer_init(void)
         writel(0, TIMER2_VA_BASE + TIMER_CTRL);
         writel(0, TIMER3_VA_BASE + TIMER_CTRL);
 
-        sp804_clocksource_init(TIMER3_VA_BASE);
-        sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1);
+        sp804_clocksource_init(TIMER3_VA_BASE, "timer3");
+        sp804_clockevents_init(TIMER0_VA_BASE, IRQ_TIMERINT0_1, "timer0");
 }
 
 struct sys_timer versatile_timer = {
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
index ebc22e759325..765a71ff7f3b 100644
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -71,8 +71,9 @@ static void __init ct_ca9x4_timer_init(void)
         writel(0, MMIO_P2V(CT_CA9X4_TIMER0) + TIMER_CTRL);
         writel(0, MMIO_P2V(CT_CA9X4_TIMER1) + TIMER_CTRL);
 
-        sp804_clocksource_init(MMIO_P2V(CT_CA9X4_TIMER1));
-        sp804_clockevents_init(MMIO_P2V(CT_CA9X4_TIMER0), IRQ_CT_CA9X4_TIMER0);
+        sp804_clocksource_init(MMIO_P2V(CT_CA9X4_TIMER1), "ct-timer1");
+        sp804_clockevents_init(MMIO_P2V(CT_CA9X4_TIMER0), IRQ_CT_CA9X4_TIMER0,
+                "ct-timer0");
 }
 
 static struct sys_timer ct_ca9x4_timer = {
@@ -141,10 +142,22 @@ static struct clk osc1_clk = {
         .rate   = 24000000,
 };
 
+static struct clk ct_sp804_clk = {
+        .rate   = 1000000,
+};
+
 static struct clk_lookup lookups[] = {
         {       /* CLCD */
                 .dev_id         = "ct:clcd",
                 .clk            = &osc1_clk,
+        }, {    /* SP804 timers */
+                .dev_id         = "sp804",
+                .con_id         = "ct-timer0",
+                .clk            = &ct_sp804_clk,
+        }, {    /* SP804 timers */
+                .dev_id         = "sp804",
+                .con_id         = "ct-timer1",
+                .clk            = &ct_sp804_clk,
         },
 };
 
@@ -210,6 +223,8 @@ static void ct_ca9x4_init_cpu_map(void)
 
         for (i = 0; i < ncores; ++i)
                 set_cpu_possible(i, true);
+
+        set_smp_cross_call(gic_raise_softirq);
 }
 
 static void ct_ca9x4_smp_enable(unsigned int max_cpus)
diff --git a/arch/arm/mach-vexpress/include/mach/smp.h b/arch/arm/mach-vexpress/include/mach/smp.h
deleted file mode 100644
index 4c05e4a9713a..000000000000
--- a/arch/arm/mach-vexpress/include/mach/smp.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __MACH_SMP_H
-#define __MACH_SMP_H
-
-#include <asm/hardware/gic.h>
-
-/*
- * We use IRQ1 as the IPI
- */
-static inline void smp_cross_call(const struct cpumask *mask, int ipi)
-{
-        gic_raise_softirq(mask, ipi);
-}
-#endif
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index ba46e8e07437..285edcd2da2a 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -13,11 +13,11 @@
 #include <linux/sysdev.h>
 #include <linux/usb/isp1760.h>
 #include <linux/clkdev.h>
+#include <linux/mtd/physmap.h>
 
 #include <asm/mach-types.h>
 #include <asm/sizes.h>
 #include <asm/mach/arch.h>
-#include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
 #include <asm/hardware/arm_timer.h>
@@ -65,8 +65,9 @@ static void __init v2m_timer_init(void)
         writel(0, MMIO_P2V(V2M_TIMER0) + TIMER_CTRL);
         writel(0, MMIO_P2V(V2M_TIMER1) + TIMER_CTRL);
 
-        sp804_clocksource_init(MMIO_P2V(V2M_TIMER1));
-        sp804_clockevents_init(MMIO_P2V(V2M_TIMER0), IRQ_V2M_TIMER0);
+        sp804_clocksource_init(MMIO_P2V(V2M_TIMER1), "v2m-timer1");
+        sp804_clockevents_init(MMIO_P2V(V2M_TIMER0), IRQ_V2M_TIMER0,
+                "v2m-timer0");
 }
 
 static struct sys_timer v2m_timer = {
@@ -206,27 +207,13 @@ static struct platform_device v2m_usb_device = {
         .dev.platform_data = &v2m_usb_config,
 };
 
-static int v2m_flash_init(void)
-{
-        writel(0, MMIO_P2V(V2M_SYS_FLASH));
-        return 0;
-}
-
-static void v2m_flash_exit(void)
-{
-        writel(0, MMIO_P2V(V2M_SYS_FLASH));
-}
-
-static void v2m_flash_set_vpp(int on)
+static void v2m_flash_set_vpp(struct platform_device *pdev, int on)
 {
         writel(on != 0, MMIO_P2V(V2M_SYS_FLASH));
 }
 
-static struct flash_platform_data v2m_flash_data = {
-        .map_name       = "cfi_probe",
+static struct physmap_flash_data v2m_flash_data = {
         .width          = 4,
-        .init           = v2m_flash_init,
-        .exit           = v2m_flash_exit,
         .set_vpp        = v2m_flash_set_vpp,
 };
 
@@ -243,7 +230,7 @@ static struct resource v2m_flash_resources[] = {
 };
 
 static struct platform_device v2m_flash_device = {
-        .name           = "armflash",
+        .name           = "physmap-flash",
         .id             = -1,
         .resource       = v2m_flash_resources,
         .num_resources  = ARRAY_SIZE(v2m_flash_resources),
@@ -333,6 +320,10 @@ static struct clk osc2_clk = {
         .rate   = 24000000,
 };
 
+static struct clk v2m_sp804_clk = {
+        .rate   = 1000000,
+};
+
 static struct clk dummy_apb_pclk;
 
 static struct clk_lookup v2m_lookups[] = {
@@ -363,6 +354,14 @@ static struct clk_lookup v2m_lookups[] = {
         }, {    /* CLCD */
                 .dev_id         = "mb:clcd",
                 .clk            = &osc1_clk,
+        }, {    /* SP804 timers */
+                .dev_id         = "sp804",
+                .con_id         = "v2m-timer0",
+                .clk            = &v2m_sp804_clk,
+        }, {    /* SP804 timers */
+                .dev_id         = "sp804",
+                .con_id         = "v2m-timer1",
+                .clk            = &v2m_sp804_clk,
         },
 };
 
diff --git a/arch/arm/mach-w90x900/include/mach/uncompress.h b/arch/arm/mach-w90x900/include/mach/uncompress.h
index 56f1a74d7016..03130212ace2 100644
--- a/arch/arm/mach-w90x900/include/mach/uncompress.h
+++ b/arch/arm/mach-w90x900/include/mach/uncompress.h
@@ -27,7 +27,7 @@
 #define arch_decomp_wdog()
 
 #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE)
-static volatile u32 * uart_base = (u32 *)UART0_PA;
+static volatile u32 * const uart_base = (u32 *)UART0_PA;
 
 static void putc(int ch)
 {
diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c
index 4b089cb930dc..a2c4e2d0a0d4 100644
--- a/arch/arm/mach-w90x900/time.c
+++ b/arch/arm/mach-w90x900/time.c
@@ -43,7 +43,6 @@
 #define PRESCALE        0x63 /* Divider = prescale + 1 */
 
 #define TDR_SHIFT       24
-#define TDR_MASK        ((1 << TDR_SHIFT) - 1)
 
 static unsigned int timer0_load;
 
@@ -143,19 +142,6 @@ static void __init nuc900_clockevents_init(void)
         clockevents_register_device(&nuc900_clockevent_device);
 }
 
-static cycle_t nuc900_get_cycles(struct clocksource *cs)
-{
-        return (~__raw_readl(REG_TDR1)) & TDR_MASK;
-}
-
-static struct clocksource clocksource_nuc900 = {
-        .name   = "nuc900-timer1",
-        .rating = 200,
-        .read   = nuc900_get_cycles,
-        .mask   = CLOCKSOURCE_MASK(TDR_SHIFT),
-        .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 static void __init nuc900_clocksource_init(void)
 {
         unsigned int val;
@@ -175,7 +161,8 @@ static void __init nuc900_clocksource_init(void)
         val |= (COUNTEN | PERIOD | PRESCALE);
         __raw_writel(val, REG_TCSR1);
 
-        clocksource_register_hz(&clocksource_nuc900, rate);
+        clocksource_mmio_init(REG_TDR1, "nuc900-timer1", rate, 200,
+                TDR_SHIFT, clocksource_mmio_readl_down);
 }
 
 static void __init nuc900_timer_init(void)
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index 2b269c955524..1a8d4aa821be 100644
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
@@ -253,8 +253,8 @@ void __sync_icache_dcache(pte_t pteval)
 
         if (!test_and_set_bit(PG_dcache_clean, &page->flags))
                 __flush_dcache_page(mapping, page);
-        /* pte_exec() already checked above for non-aliasing VIPT cache */
-        if (cache_is_vipt_nonaliasing() || pte_exec(pteval))
+
+        if (pte_exec(pteval))
                 __flush_icache_all();
 }
 #endif
@@ -275,7 +275,8 @@ void __sync_icache_dcache(pte_t pteval)
  *  kernel cache lines for later.  Otherwise, we assume we have
  *  aliasing mappings.
  *
- * Note that we disable the lazy flush for SMP.
+ * Note that we disable the lazy flush for SMP configurations where
+ * the cache maintenance operations are not automatically broadcasted.
  */
 void flush_dcache_page(struct page *page)
 {
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index e591513bb53e..3f17ea146f0e 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -85,7 +85,7 @@ void show_mem(unsigned int filter)
         struct meminfo * mi = &meminfo;
 
         printk("Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
 
         for_each_bank (i, mi) {
                 struct membank *bank = &mi->bank[i];
@@ -201,6 +201,20 @@ static void __init arm_bootmem_init(unsigned long start_pfn,
         }
 }
 
+#ifdef CONFIG_ZONE_DMA
+static void __init arm_adjust_dma_zone(unsigned long *size, unsigned long *hole,
+        unsigned long dma_size)
+{
+        if (size[0] <= dma_size)
+                return;
+
+        size[ZONE_NORMAL] = size[0] - dma_size;
+        size[ZONE_DMA] = dma_size;
+        hole[ZONE_NORMAL] = hole[0];
+        hole[ZONE_DMA] = 0;
+}
+#endif
+
 static void __init arm_bootmem_free(unsigned long min, unsigned long max_low,
         unsigned long max_high)
 {
@@ -243,11 +257,18 @@ static void __init arm_bootmem_free(unsigned long min, unsigned long max_low,
 #endif
         }
 
+#ifdef ARM_DMA_ZONE_SIZE
+#ifndef CONFIG_ZONE_DMA
+#error ARM_DMA_ZONE_SIZE set but no DMA zone to limit allocations
+#endif
+
         /*
          * Adjust the sizes according to any special requirements for
          * this machine type.
          */
-        arch_adjust_zones(zone_size, zhole_size);
+        arm_adjust_dma_zone(zone_size, zhole_size,
+                ARM_DMA_ZONE_SIZE >> PAGE_SHIFT);
+#endif
 
         free_area_init_node(0, zone_size, min, zhole_size);
 }
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 6cf76b3b68d1..08a92368d9d3 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -31,8 +31,6 @@
 
 #include "mm.h"
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 /*
  * empty_zero_page is a special page that is used for
  * zero-initialized data and COW.
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 7c99cb4c8e4f..ab17cc0d3fa7 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -175,11 +175,6 @@ cpu_v6_name:
         .asciz  "ARMv6-compatible processor"
         .size   cpu_v6_name, . - cpu_v6_name
 
-        .type   cpu_pj4_name, #object
-cpu_pj4_name:
-        .asciz  "Marvell PJ4 processor"
-        .size   cpu_pj4_name, . - cpu_pj4_name
-
         .align
 
         __CPUINIT
@@ -305,32 +300,3 @@ __v6_proc_info:
         .long   v6_user_fns
         .long   v6_cache_fns
         .size   __v6_proc_info, . - __v6_proc_info
-
-        .type   __pj4_v6_proc_info, #object
-__pj4_v6_proc_info:
-        .long   0x560f5810
-        .long   0xff0ffff0
-        ALT_SMP(.long \
-                PMD_TYPE_SECT | \
-                PMD_SECT_AP_WRITE | \
-                PMD_SECT_AP_READ | \
-                PMD_FLAGS_SMP)
-        ALT_UP(.long \
-                PMD_TYPE_SECT | \
-                PMD_SECT_AP_WRITE | \
-                PMD_SECT_AP_READ | \
-                PMD_FLAGS_UP)
-        .long   PMD_TYPE_SECT | \
-                PMD_SECT_XN | \
-                PMD_SECT_AP_WRITE | \
-                PMD_SECT_AP_READ
-        b       __v6_setup
-        .long   cpu_arch_name
-        .long   cpu_elf_name
-        .long   HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP|HWCAP_TLS
-        .long   cpu_pj4_name
-        .long   v6_processor_functions
-        .long   v6wbi_tlb_fns
-        .long   v6_user_fns
-        .long   v6_cache_fns
-        .size   __pj4_v6_proc_info, . - __pj4_v6_proc_info
diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c
index 07f23bb42bed..7cdc5161ff2b 100644
--- a/arch/arm/plat-iop/time.c
+++ b/arch/arm/plat-iop/time.c
@@ -17,7 +17,6 @@
 #include <linux/interrupt.h>
 #include <linux/time.h>
 #include <linux/init.h>
-#include <linux/sched.h>
 #include <linux/timex.h>
 #include <linux/sched.h>
 #include <linux/io.h>
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index b0cb4258e382..a5353fc0793f 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -4,13 +4,18 @@ source "arch/arm/plat-mxc/devices/Kconfig"
 
 menu "Freescale MXC Implementations"
 
+config ARCH_MX50_SUPPORTED
+        bool
+
+config ARCH_MX53_SUPPORTED
+        bool
+
 choice
         prompt "Freescale CPU family:"
         default ARCH_MX3
 
 config ARCH_MX1
         bool "MX1-based"
-        select SOC_IMX1
         help
           This enables support for systems based on the Freescale i.MX1 family
 
@@ -26,29 +31,26 @@ config ARCH_MX25
 
 config ARCH_MX3
         bool "MX3-based"
-        select CPU_V6
         help
           This enables support for systems based on the Freescale i.MX3 family
 
-config ARCH_MXC91231
-        bool "MXC91231-based"
-        select CPU_V6
-        select MXC_AVIC
+config ARCH_MX503
+        bool "i.MX50 + i.MX53"
+        select ARCH_MX50_SUPPORTED
+        select ARCH_MX53_SUPPORTED
         help
-          This enables support for systems based on the Freescale MXC91231 family
+          This enables support for machines using Freescale's i.MX50 and i.MX51
+          processors.
 
-config ARCH_MX5
-        bool "MX5-based"
-        select CPU_V7
-        select ARM_L1_CACHE_SHIFT_6
+config ARCH_MX51
+        bool "i.MX51"
+        select ARCH_MX51_SUPPORTED
         help
           This enables support for systems based on the Freescale i.MX51 family
 
 endchoice
 
 source "arch/arm/mach-imx/Kconfig"
-source "arch/arm/mach-mx3/Kconfig"
-source "arch/arm/mach-mxc91231/Kconfig"
 source "arch/arm/mach-mx5/Kconfig"
 
 endmenu
diff --git a/arch/arm/plat-mxc/cpufreq.c b/arch/arm/plat-mxc/cpufreq.c
index 4268a2bdf145..74aac96cda20 100644
--- a/arch/arm/plat-mxc/cpufreq.c
+++ b/arch/arm/plat-mxc/cpufreq.c
@@ -153,8 +153,8 @@ static int __init mxc_cpufreq_init(struct cpufreq_policy *policy)
         ret = cpufreq_frequency_table_cpuinfo(policy, imx_freq_table);
 
         if (ret < 0) {
-                printk(KERN_ERR "%s: failed to register i.MXC CPUfreq \
-                                with error code %d\n", __func__, ret);
+                printk(KERN_ERR "%s: failed to register i.MXC CPUfreq with error code %d\n",
+                       __func__, ret);
                 goto err;
         }
 
diff --git a/arch/arm/plat-mxc/devices/Kconfig b/arch/arm/plat-mxc/devices/Kconfig
index b9ab1d58b5e7..bd294add932c 100644
--- a/arch/arm/plat-mxc/devices/Kconfig
+++ b/arch/arm/plat-mxc/devices/Kconfig
@@ -24,7 +24,6 @@ config IMX_HAVE_PLATFORM_IMXDI_RTC
 
 config IMX_HAVE_PLATFORM_IMX_FB
         bool
-        select HAVE_FB_IMX
 
 config IMX_HAVE_PLATFORM_IMX_I2C
         bool
@@ -41,6 +40,9 @@ config IMX_HAVE_PLATFORM_IMX_UART
 config IMX_HAVE_PLATFORM_IMX_UDC
         bool
 
+config IMX_HAVE_PLATFORM_IPU_CORE
+        bool
+
 config IMX_HAVE_PLATFORM_MX1_CAMERA
         bool
 
@@ -63,6 +65,9 @@ config IMX_HAVE_PLATFORM_MXC_RNGA
         bool
         select ARCH_HAS_RNGA
 
+config IMX_HAVE_PLATFORM_MXC_RTC
+        bool
+
 config IMX_HAVE_PLATFORM_MXC_W1
         bool
 
diff --git a/arch/arm/plat-mxc/devices/Makefile b/arch/arm/plat-mxc/devices/Makefile
index 75cd2ece9053..ad2922acf480 100644
--- a/arch/arm/plat-mxc/devices/Makefile
+++ b/arch/arm/plat-mxc/devices/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_KEYPAD) += platform-imx-keypad.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UDC) += platform-imx_udc.o
+obj-$(CONFIG_IMX_HAVE_PLATFORM_IPU_CORE) += platform-ipu-core.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MX1_CAMERA) += platform-mx1-camera.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_CAMERA) += platform-mx2-camera.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI) += platform-mxc-ehci.o
@@ -19,6 +20,7 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_MMC) += platform-mxc-mmc.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_PWM) += platform-mxc_pwm.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_RNGA) += platform-mxc_rnga.o
+obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_RTC) += platform-mxc_rtc.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_W1) += platform-mxc_w1.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX) += platform-sdhci-esdhc-imx.o
 obj-$(CONFIG_IMX_HAVE_PLATFORM_SPI_IMX) +=  platform-spi_imx.o
diff --git a/arch/arm/plat-mxc/devices/platform-ipu-core.c b/arch/arm/plat-mxc/devices/platform-ipu-core.c
new file mode 100644
index 000000000000..edf65034aea5
--- /dev/null
+++ b/arch/arm/plat-mxc/devices/platform-ipu-core.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2011 Pengutronix
+ * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
+ *
+ * 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 <mach/hardware.h>
+#include <mach/devices-common.h>
+
+#define imx_ipu_core_entry_single(soc)                                  \
+{                                                                       \
+        .iobase = soc ## _IPU_CTRL_BASE_ADDR,                           \
+        .synirq = soc ## _INT_IPU_SYN,                                  \
+        .errirq = soc ## _INT_IPU_ERR,                                  \
+}
+
+#ifdef CONFIG_SOC_IMX31
+const struct imx_ipu_core_data imx31_ipu_core_data __initconst =
+        imx_ipu_core_entry_single(MX31);
+#endif
+
+#ifdef CONFIG_SOC_IMX35
+const struct imx_ipu_core_data imx35_ipu_core_data __initconst =
+        imx_ipu_core_entry_single(MX35);
+#endif
+
+static struct platform_device *imx_ipu_coredev __initdata;
+
+struct platform_device *__init imx_add_ipu_core(
+                const struct imx_ipu_core_data *data,
+                const struct ipu_platform_data *pdata)
+{
+        /* The resource order is important! */
+        struct resource res[] = {
+                {
+                        .start = data->iobase,
+                        .end = data->iobase + 0x5f,
+                        .flags = IORESOURCE_MEM,
+                }, {
+                        .start = data->iobase + 0x88,
+                        .end = data->iobase + 0xb3,
+                        .flags = IORESOURCE_MEM,
+                }, {
+                        .start = data->synirq,
+                        .end = data->synirq,
+                        .flags = IORESOURCE_IRQ,
+                }, {
+                        .start = data->errirq,
+                        .end = data->errirq,
+                        .flags = IORESOURCE_IRQ,
+                },
+        };
+
+        return imx_ipu_coredev = imx_add_platform_device("ipu-core", -1,
+                        res, ARRAY_SIZE(res), pdata, sizeof(*pdata));
+}
+
+struct platform_device *__init imx_alloc_mx3_camera(
+                const struct imx_ipu_core_data *data,
+                const struct mx3_camera_pdata *pdata)
+{
+        struct resource res[] = {
+                {
+                        .start = data->iobase + 0x60,
+                        .end = data->iobase + 0x87,
+                        .flags = IORESOURCE_MEM,
+                },
+        };
+        int ret = -ENOMEM;
+        struct platform_device *pdev;
+
+        if (IS_ERR_OR_NULL(imx_ipu_coredev))
+                return ERR_PTR(-ENODEV);
+
+        pdev = platform_device_alloc("mx3-camera", 0);
+        if (!pdev)
+                goto err;
+
+        pdev->dev.dma_mask = kmalloc(sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
+        if (!pdev->dev.dma_mask)
+                goto err;
+
+        *pdev->dev.dma_mask = DMA_BIT_MASK(32);
+        pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
+
+        ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res));
+        if (ret)
+                goto err;
+
+        if (pdata) {
+                struct mx3_camera_pdata *copied_pdata;
+
+                ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));
+                if (ret) {
+err:
+                        kfree(pdev->dev.dma_mask);
+                        platform_device_put(pdev);
+                        return ERR_PTR(-ENODEV);
+                }
+                copied_pdata = dev_get_platdata(&pdev->dev);
+                copied_pdata->dma_dev = &imx_ipu_coredev->dev;
+        }
+
+        return pdev;
+}
+
+struct platform_device *__init imx_add_mx3_sdc_fb(
+                const struct imx_ipu_core_data *data,
+                struct mx3fb_platform_data *pdata)
+{
+        struct resource res[] = {
+                {
+                        .start = data->iobase + 0xb4,
+                        .end = data->iobase + 0x1bf,
+                        .flags = IORESOURCE_MEM,
+                },
+        };
+
+        if (IS_ERR_OR_NULL(imx_ipu_coredev))
+                return ERR_PTR(-ENODEV);
+
+        pdata->dma_dev = &imx_ipu_coredev->dev;
+
+        return imx_add_platform_device_dmamask("mx3_sdc_fb", -1,
+                        res, ARRAY_SIZE(res), pdata, sizeof(*pdata),
+                        DMA_BIT_MASK(32));
+}
diff --git a/arch/arm/plat-mxc/devices/platform-mxc_rtc.c b/arch/arm/plat-mxc/devices/platform-mxc_rtc.c
new file mode 100644
index 000000000000..16d0ec4df5f6
--- /dev/null
+++ b/arch/arm/plat-mxc/devices/platform-mxc_rtc.c
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010-2011 Pengutronix
+ * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
+ *
+ * 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 <mach/hardware.h>
+#include <mach/devices-common.h>
+
+#define imx_mxc_rtc_data_entry_single(soc)                              \
+        {                                                               \
+                .iobase = soc ## _RTC_BASE_ADDR,                        \
+                .irq = soc ## _INT_RTC,                                 \
+        }
+
+#ifdef CONFIG_SOC_IMX31
+const struct imx_mxc_rtc_data imx31_mxc_rtc_data __initconst =
+        imx_mxc_rtc_data_entry_single(MX31);
+#endif /* ifdef CONFIG_SOC_IMX31 */
+
+struct platform_device *__init imx_add_mxc_rtc(
+                const struct imx_mxc_rtc_data *data)
+{
+        struct resource res[] = {
+                {
+                        .start = data->iobase,
+                        .end = data->iobase + SZ_16K - 1,
+                        .flags = IORESOURCE_MEM,
+                }, {
+                        .start = data->irq,
+                        .end = data->irq,
+                        .flags = IORESOURCE_IRQ,
+                },
+        };
+
+        return imx_add_platform_device("mxc_rtc", -1,
+                        res, ARRAY_SIZE(res), NULL, 0);
+}
diff --git a/arch/arm/plat-mxc/devices/platform-spi_imx.c b/arch/arm/plat-mxc/devices/platform-spi_imx.c
index f4a60ab6763b..f97eb3615b2c 100644
--- a/arch/arm/plat-mxc/devices/platform-spi_imx.c
+++ b/arch/arm/plat-mxc/devices/platform-spi_imx.c
@@ -80,7 +80,7 @@ const struct imx_spi_imx_data imx35_cspi_data[] __initconst = {
 
 #ifdef CONFIG_SOC_IMX51
 const struct imx_spi_imx_data imx51_cspi_data __initconst =
-        imx_spi_imx_data_entry_single(MX51, CSPI, "imx51-cspi", 0, , SZ_4K);
+        imx_spi_imx_data_entry_single(MX51, CSPI, "imx51-cspi", 2, , SZ_4K);
 
 const struct imx_spi_imx_data imx51_ecspi_data[] __initconst = {
 #define imx51_ecspi_data_entry(_id, _hwid)                              \
diff --git a/arch/arm/plat-mxc/epit.c b/arch/arm/plat-mxc/epit.c
index d69d343ff61f..d3467f818c33 100644
--- a/arch/arm/plat-mxc/epit.c
+++ b/arch/arm/plat-mxc/epit.c
@@ -83,26 +83,12 @@ static void epit_irq_acknowledge(void)
         __raw_writel(EPITSR_OCIF, timer_base + EPITSR);
 }
 
-static cycle_t epit_read(struct clocksource *cs)
-{
-        return 0 - __raw_readl(timer_base + EPITCNR);
-}
-
-static struct clocksource clocksource_epit = {
-        .name           = "epit",
-        .rating         = 200,
-        .read           = epit_read,
-        .mask           = CLOCKSOURCE_MASK(32),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 static int __init epit_clocksource_init(struct clk *timer_clk)
 {
         unsigned int c = clk_get_rate(timer_clk);
 
-        clocksource_register_hz(&clocksource_epit, c);
-
-        return 0;
+        return clocksource_mmio_init(timer_base + EPITCNR, "epit", c, 200, 32,
+                        clocksource_mmio_readl_down);
 }
 
 /* clock event */
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h
index a22ebe11a602..da7991832af6 100644
--- a/arch/arm/plat-mxc/include/mach/common.h
+++ b/arch/arm/plat-mxc/include/mach/common.h
@@ -23,7 +23,6 @@ extern void mx35_map_io(void);
 extern void mx50_map_io(void);
 extern void mx51_map_io(void);
 extern void mx53_map_io(void);
-extern void mxc91231_map_io(void);
 extern void imx1_init_early(void);
 extern void imx21_init_early(void);
 extern void imx25_init_early(void);
@@ -33,7 +32,6 @@ extern void imx35_init_early(void);
 extern void imx50_init_early(void);
 extern void imx51_init_early(void);
 extern void imx53_init_early(void);
-extern void mxc91231_init_early(void);
 extern void mxc_init_irq(void __iomem *);
 extern void tzic_init_irq(void __iomem *);
 extern void mx1_init_irq(void);
@@ -45,7 +43,6 @@ extern void mx35_init_irq(void);
 extern void mx50_init_irq(void);
 extern void mx51_init_irq(void);
 extern void mx53_init_irq(void);
-extern void mxc91231_init_irq(void);
 extern void epit_timer_init(struct clk *timer_clk, void __iomem *base, int irq);
 extern void mxc_timer_init(struct clk *timer_clk, void __iomem *, int);
 extern int mx1_clocks_init(unsigned long fref);
@@ -58,14 +55,11 @@ extern int mx51_clocks_init(unsigned long ckil, unsigned long osc,
                         unsigned long ckih1, unsigned long ckih2);
 extern int mx53_clocks_init(unsigned long ckil, unsigned long osc,
                         unsigned long ckih1, unsigned long ckih2);
-extern int mxc91231_clocks_init(unsigned long fref);
 extern int mxc_register_gpios(void);
 extern int mxc_register_device(struct platform_device *pdev, void *data);
 extern void mxc_set_cpu_type(unsigned int type);
 extern void mxc_arch_reset_init(void __iomem *);
-extern void mxc91231_power_off(void);
-extern void mxc91231_arch_reset(int, const char *);
-extern void mxc91231_prepare_idle(void);
 extern void mx51_efikamx_reset(void);
 extern int mx53_revision(void);
+extern int mx53_display_revision(void);
 #endif
diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S
index 3b3a37c25c56..8e8d175e5077 100644
--- a/arch/arm/plat-mxc/include/mach/debug-macro.S
+++ b/arch/arm/plat-mxc/include/mach/debug-macro.S
@@ -44,13 +44,6 @@
 #define UART_PADDR      MX51_UART1_BASE_ADDR
 #endif
 
-#ifdef CONFIG_ARCH_MXC91231
-#ifdef UART_PADDR
-#error "CONFIG_DEBUG_LL is incompatible with multiple archs"
-#endif
-#define UART_PADDR      MXC91231_UART2_BASE_ADDR
-#endif
-
 #define UART_VADDR      IMX_IO_ADDRESS(UART_PADDR)
 
                 .macro  addruart, rp, rv
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h
index 8658c9caa650..fa8477337f91 100644
--- a/arch/arm/plat-mxc/include/mach/devices-common.h
+++ b/arch/arm/plat-mxc/include/mach/devices-common.h
@@ -166,6 +166,24 @@ struct platform_device *__init imx_add_imx_udc(
                 const struct imx_imx_udc_data *data,
                 const struct imxusb_platform_data *pdata);
 
+#include <mach/ipu.h>
+#include <mach/mx3fb.h>
+#include <mach/mx3_camera.h>
+struct imx_ipu_core_data {
+        resource_size_t iobase;
+        resource_size_t synirq;
+        resource_size_t errirq;
+};
+struct platform_device *__init imx_add_ipu_core(
+                const struct imx_ipu_core_data *data,
+                const struct ipu_platform_data *pdata);
+struct platform_device *__init imx_alloc_mx3_camera(
+                const struct imx_ipu_core_data *data,
+                const struct mx3_camera_pdata *pdata);
+struct platform_device *__init imx_add_mx3_sdc_fb(
+                const struct imx_ipu_core_data *data,
+                struct mx3fb_platform_data *pdata);
+
 #include <mach/mx1_camera.h>
 struct imx_mx1_camera_data {
         resource_size_t iobase;
@@ -237,6 +255,15 @@ struct imx_mxc_pwm_data {
 struct platform_device *__init imx_add_mxc_pwm(
                 const struct imx_mxc_pwm_data *data);
 
+/* mxc_rtc */
+struct imx_mxc_rtc_data {
+        resource_size_t iobase;
+        resource_size_t irq;
+};
+struct platform_device *__init imx_add_mxc_rtc(
+                const struct imx_mxc_rtc_data *data);
+
+/* mxc_w1 */
 struct imx_mxc_w1_data {
         resource_size_t iobase;
 };
diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h
index 26bb1bab4aeb..67d3e2bed065 100644
--- a/arch/arm/plat-mxc/include/mach/hardware.h
+++ b/arch/arm/plat-mxc/include/mach/hardware.h
@@ -86,15 +86,6 @@
  *      SPBA0   0x70000000+0x100000     ->      0xf5400000+0x100000
  *      AIPS1   0x73f00000+0x100000     ->      0xf5700000+0x100000
  *      AIPS2   0x83f00000+0x100000     ->      0xf4300000+0x100000
- * mxc91231:
- *      L2CC    0x30000000+0x010000     ->      0xf4400000+0x010000
- *      X_MEMC  0xb8000000+0x010000     ->      0xf4c00000+0x010000
- *      ROMP    0x60000000+0x010000     ->      0xf5000000+0x010000
- *      AVIC    0x68000000+0x010000     ->      0xf5800000+0x010000
- *      AIPS1   0x43f00000+0x100000     ->      0xf5300000+0x100000
- *      SPBA0   0x50000000+0x100000     ->      0xf5400000+0x100000
- *      SPBA1   0x52000000+0x100000     ->      0xf5600000+0x100000
- *      AIPS2   0x53f00000+0x100000     ->      0xf5700000+0x100000
  */
 #define IMX_IO_P2V(x)   (                                               \
                         0xf4000000 +                                    \
@@ -104,6 +95,8 @@
 
 #define IMX_IO_ADDRESS(x)       IOMEM(IMX_IO_P2V(x))
 
+#include <mach/mxc.h>
+
 #ifdef CONFIG_ARCH_MX5
 #include <mach/mx50.h>
 #include <mach/mx51.h>
@@ -134,12 +127,6 @@
 # include <mach/mx25.h>
 #endif
 
-#ifdef CONFIG_ARCH_MXC91231
-# include <mach/mxc91231.h>
-#endif
-
-#include <mach/mxc.h>
-
 #define imx_map_entry(soc, name, _type) {                               \
         .virtual = soc ## _IO_P2V(soc ## _ ## name ## _BASE_ADDR),      \
         .pfn = __phys_to_pfn(soc ## _ ## name ## _BASE_ADDR),           \
diff --git a/arch/arm/plat-mxc/include/mach/io.h b/arch/arm/plat-mxc/include/mach/io.h
index b4f2de769466..4347a87d2bb0 100644
--- a/arch/arm/plat-mxc/include/mach/io.h
+++ b/arch/arm/plat-mxc/include/mach/io.h
@@ -14,19 +14,26 @@
 /* Allow IO space to be anywhere in the memory */
 #define IO_SPACE_LIMIT 0xffffffff
 
-#ifdef CONFIG_ARCH_MX3
-#define __arch_ioremap __mx3_ioremap
+#if defined(CONFIG_SOC_IMX31) || defined(CONFIG_SOC_IMX35)
+#include <mach/hardware.h>
+
+#define __arch_ioremap __imx_ioremap
 #define __arch_iounmap __iounmap
 
+#define addr_in_module(addr, mod) \
+        ((unsigned long)(addr) - mod ## _BASE_ADDR < mod ## _SIZE)
+
 static inline void __iomem *
-__mx3_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)
+__imx_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)
 {
-        if (mtype == MT_DEVICE) {
-                /* Access all peripherals below 0x80000000 as nonshared device
-                 * but leave l2cc alone.
+        if (mtype == MT_DEVICE && (cpu_is_mx31() || cpu_is_mx35())) {
+                /*
+                 * Access all peripherals below 0x80000000 as nonshared device
+                 * on mx3, but leave l2cc alone.  Otherwise cache corruptions
+                 * can occur.
                  */
-                if ((phys_addr < 0x80000000) && ((phys_addr < 0x30000000) ||
-                        (phys_addr >= 0x30000000 + SZ_1M)))
+                if (phys_addr < 0x80000000 &&
+                                !addr_in_module(phys_addr, MX3x_L2CC))
                         mtype = MT_DEVICE_NONSHARED;
         }
 
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx25.h b/arch/arm/plat-mxc/include/mach/iomux-mx25.h
index d7f52c91f82e..2e5244de7ff5 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mx25.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx25.h
@@ -89,13 +89,16 @@
 #define MX25_PAD_CS0__GPIO_4_2          IOMUX_PAD(0x000, 0x04c, 0x05, 0, 0, NO_PAD_CTRL)
 
 #define MX25_PAD_CS1__CS1               IOMUX_PAD(0x000, 0x050, 0x00, 0, 0, NO_PAD_CTRL)
+#define MX25_PAD_CS1__NF_CE3            IOMUX_PAD(0x000, 0x050, 0x01, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_CS1__GPIO_4_3          IOMUX_PAD(0x000, 0x050, 0x05, 0, 0, NO_PAD_CTRL)
 
 #define MX25_PAD_CS4__CS4               IOMUX_PAD(0x264, 0x054, 0x10, 0, 0, NO_PAD_CTRL)
+#define MX25_PAD_CS4__NF_CE1            IOMUX_PAD(0x264, 0x054, 0x01, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_CS4__UART5_CTS         IOMUX_PAD(0x264, 0x054, 0x13, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_CS4__GPIO_3_20         IOMUX_PAD(0x264, 0x054, 0x15, 0, 0, NO_PAD_CTRL)
 
 #define MX25_PAD_CS5__CS5               IOMUX_PAD(0x268, 0x058, 0x10, 0, 0, NO_PAD_CTRL)
+#define MX25_PAD_CS5__NF_CE2            IOMUX_PAD(0x268, 0x058, 0x01, 0, 0, NO_PAD_CTRL)
 #define MX25_PAD_CS5__UART5_RTS         IOMUX_PAD(0x268, 0x058, 0x13, 0x574, 0, NO_PAD_CTRL)
 #define MX25_PAD_CS5__GPIO_3_21         IOMUX_PAD(0x268, 0x058, 0x15, 0, 0, NO_PAD_CTRL)
 
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mxc91231.h b/arch/arm/plat-mxc/include/mach/iomux-mxc91231.h
deleted file mode 100644
index bf28df0d58b7..000000000000
--- a/arch/arm/plat-mxc/include/mach/iomux-mxc91231.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright 2004-2006 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright (C) 2008 by Sascha Hauer <kernel@pengutronix.de>
- * Copyright (C) 2009 by Dmitriy Taychenachev <dimichxp@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- */
-
-#ifndef __MACH_IOMUX_MXC91231_H__
-#define __MACH_IOMUX_MXC91231_H__
-
-/*
- * various IOMUX output functions
- */
-
-#define IOMUX_OCONFIG_GPIO (0 << 4)     /* used as GPIO */
-#define IOMUX_OCONFIG_FUNC (1 << 4)     /* used as function */
-#define IOMUX_OCONFIG_ALT1 (2 << 4)     /* used as alternate function 1 */
-#define IOMUX_OCONFIG_ALT2 (3 << 4)     /* used as alternate function 2 */
-#define IOMUX_OCONFIG_ALT3 (4 << 4)     /* used as alternate function 3 */
-#define IOMUX_OCONFIG_ALT4 (5 << 4)     /* used as alternate function 4 */
-#define IOMUX_OCONFIG_ALT5 (6 << 4)     /* used as alternate function 5 */
-#define IOMUX_OCONFIG_ALT6 (7 << 4)     /* used as alternate function 6 */
-#define IOMUX_ICONFIG_NONE  0           /* not configured for input */
-#define IOMUX_ICONFIG_GPIO  1           /* used as GPIO */
-#define IOMUX_ICONFIG_FUNC  2           /* used as function */
-#define IOMUX_ICONFIG_ALT1  4           /* used as alternate function 1 */
-#define IOMUX_ICONFIG_ALT2  8           /* used as alternate function 2 */
-
-#define IOMUX_CONFIG_GPIO (IOMUX_OCONFIG_GPIO | IOMUX_ICONFIG_GPIO)
-#define IOMUX_CONFIG_FUNC (IOMUX_OCONFIG_FUNC | IOMUX_ICONFIG_FUNC)
-#define IOMUX_CONFIG_ALT1 (IOMUX_OCONFIG_ALT1 | IOMUX_ICONFIG_ALT1)
-#define IOMUX_CONFIG_ALT2 (IOMUX_OCONFIG_ALT2 | IOMUX_ICONFIG_ALT2)
-
-/*
- * setups a single pin:
- *      - reserves the pin so that it is not claimed by another driver
- *      - setups the iomux according to the configuration
- *      - if the pin is configured as a GPIO, we claim it through kernel gpiolib
- */
-int mxc_iomux_alloc_pin(unsigned int pin_mode, const char *label);
-/*
- * setups mutliple pins
- * convenient way to call the above function with tables
- */
-int mxc_iomux_setup_multiple_pins(const unsigned int *pin_list, unsigned count,
-                const char *label);
-
-/*
- * releases a single pin:
- *      - make it available for a future use by another driver
- *      - frees the GPIO if the pin was configured as GPIO
- *      - DOES NOT reconfigure the IOMUX in its reset state
- */
-void mxc_iomux_release_pin(unsigned int pin_mode);
-/*
- * releases multiple pins
- * convenvient way to call the above function with tables
- */
-void mxc_iomux_release_multiple_pins(const unsigned int *pin_list, int count);
-
-#define MUX_SIDE_AP             (0)
-#define MUX_SIDE_SP             (1)
-
-#define MUX_SIDE_SHIFT          (26)
-#define MUX_SIDE_MASK           (0x1 << MUX_SIDE_SHIFT)
-
-#define MUX_GPIO_PORT_SHIFT     (23)
-#define MUX_GPIO_PORT_MASK      (0x7 << MUX_GPIO_PORT_SHIFT)
-
-#define MUX_GPIO_PIN_SHIFT      (20)
-#define MUX_GPIO_PIN_MASK       (0x1f << MUX_GPIO_PIN_SHIFT)
-
-#define MUX_REG_SHIFT           (15)
-#define MUX_REG_MASK            (0x1f << MUX_REG_SHIFT)
-
-#define MUX_FIELD_SHIFT         (13)
-#define MUX_FIELD_MASK          (0x3 << MUX_FIELD_SHIFT)
-
-#define MUX_PADGRP_SHIFT        (8)
-#define MUX_PADGRP_MASK         (0x1f << MUX_PADGRP_SHIFT)
-
-#define MUX_PIN_MASK            (0xffffff << 8)
-
-#define GPIO_PORT_MAX           (3)
-
-#define IOMUX_PIN(side, gport, gpin, ctlreg, ctlfield, padgrp) \
-        (((side) << MUX_SIDE_SHIFT) |             \
-         (gport << MUX_GPIO_PORT_SHIFT) |               \
-         ((gpin) << MUX_GPIO_PIN_SHIFT) |               \
-         ((ctlreg) << MUX_REG_SHIFT) |          \
-         ((ctlfield) << MUX_FIELD_SHIFT) |              \
-         ((padgrp) << MUX_PADGRP_SHIFT))
-
-#define MUX_MODE_OUT_SHIFT      (4)
-#define MUX_MODE_IN_SHIFT       (0)
-#define MUX_MODE_SHIFT          (0)
-#define MUX_MODE_MASK           (0xff << MUX_MODE_SHIFT)
-
-#define IOMUX_MODE(pin, mode) \
-        (pin | (mode << MUX_MODE_SHIFT))
-
-enum iomux_pins {
-        /* AP Side pins */
-        MXC91231_PIN_AP_CLE             = IOMUX_PIN(0, 0,  0,  0, 0, 24),
-        MXC91231_PIN_AP_ALE             = IOMUX_PIN(0, 0,  1,  0, 1, 24),
-        MXC91231_PIN_AP_CE_B            = IOMUX_PIN(0, 0,  2,  0, 2, 24),
-        MXC91231_PIN_AP_RE_B            = IOMUX_PIN(0, 0,  3,  0, 3, 24),
-        MXC91231_PIN_AP_WE_B            = IOMUX_PIN(0, 0,  4,  1, 0, 24),
-        MXC91231_PIN_AP_WP_B            = IOMUX_PIN(0, 0,  5,  1, 1, 24),
-        MXC91231_PIN_AP_BSY_B           = IOMUX_PIN(0, 0,  6,  1, 2, 24),
-        MXC91231_PIN_AP_U1_TXD          = IOMUX_PIN(0, 0,  7,  1, 3, 28),
-        MXC91231_PIN_AP_U1_RXD          = IOMUX_PIN(0, 0,  8,  2, 0, 28),
-        MXC91231_PIN_AP_U1_RTS_B        = IOMUX_PIN(0, 0,  9,  2, 1, 28),
-        MXC91231_PIN_AP_U1_CTS_B        = IOMUX_PIN(0, 0, 10,  2, 2, 28),
-        MXC91231_PIN_AP_AD1_TXD         = IOMUX_PIN(0, 0, 11,  2, 3,  9),
-        MXC91231_PIN_AP_AD1_RXD         = IOMUX_PIN(0, 0, 12,  3, 0,  9),
-        MXC91231_PIN_AP_AD1_TXC         = IOMUX_PIN(0, 0, 13,  3, 1,  9),
-        MXC91231_PIN_AP_AD1_TXFS        = IOMUX_PIN(0, 0, 14,  3, 2,  9),
-        MXC91231_PIN_AP_AD2_TXD         = IOMUX_PIN(0, 0, 15,  3, 3,  9),
-        MXC91231_PIN_AP_AD2_RXD         = IOMUX_PIN(0, 0, 16,  4, 0,  9),
-        MXC91231_PIN_AP_AD2_TXC         = IOMUX_PIN(0, 0, 17,  4, 1,  9),
-        MXC91231_PIN_AP_AD2_TXFS        = IOMUX_PIN(0, 0, 18,  4, 2,  9),
-        MXC91231_PIN_AP_OWDAT           = IOMUX_PIN(0, 0, 19,  4, 3, 28),
-        MXC91231_PIN_AP_IPU_LD17        = IOMUX_PIN(0, 0, 20,  5, 0, 28),
-        MXC91231_PIN_AP_IPU_D3_VSYNC    = IOMUX_PIN(0, 0, 21,  5, 1, 28),
-        MXC91231_PIN_AP_IPU_D3_HSYNC    = IOMUX_PIN(0, 0, 22,  5, 2, 28),
-        MXC91231_PIN_AP_IPU_D3_CLK      = IOMUX_PIN(0, 0, 23,  5, 3, 28),
-        MXC91231_PIN_AP_IPU_D3_DRDY     = IOMUX_PIN(0, 0, 24,  6, 0, 28),
-        MXC91231_PIN_AP_IPU_D3_CONTR    = IOMUX_PIN(0, 0, 25,  6, 1, 28),
-        MXC91231_PIN_AP_IPU_D0_CS       = IOMUX_PIN(0, 0, 26,  6, 2, 28),
-        MXC91231_PIN_AP_IPU_LD16        = IOMUX_PIN(0, 0, 27,  6, 3, 28),
-        MXC91231_PIN_AP_IPU_D2_CS       = IOMUX_PIN(0, 0, 28,  7, 0, 28),
-        MXC91231_PIN_AP_IPU_PAR_RS      = IOMUX_PIN(0, 0, 29,  7, 1, 28),
-        MXC91231_PIN_AP_IPU_D3_PS       = IOMUX_PIN(0, 0, 30,  7, 2, 28),
-        MXC91231_PIN_AP_IPU_D3_CLS      = IOMUX_PIN(0, 0, 31,  7, 3, 28),
-        MXC91231_PIN_AP_IPU_RD          = IOMUX_PIN(0, 1,  0,  8, 0, 28),
-        MXC91231_PIN_AP_IPU_WR          = IOMUX_PIN(0, 1,  1,  8, 1, 28),
-        MXC91231_PIN_AP_IPU_LD0         = IOMUX_PIN(0, 7,  0,  8, 2, 28),
-        MXC91231_PIN_AP_IPU_LD1         = IOMUX_PIN(0, 7,  0,  8, 3, 28),
-        MXC91231_PIN_AP_IPU_LD2         = IOMUX_PIN(0, 7,  0,  9, 0, 28),
-        MXC91231_PIN_AP_IPU_LD3         = IOMUX_PIN(0, 1,  2,  9, 1, 28),
-        MXC91231_PIN_AP_IPU_LD4         = IOMUX_PIN(0, 1,  3,  9, 2, 28),
-        MXC91231_PIN_AP_IPU_LD5         = IOMUX_PIN(0, 1,  4,  9, 3, 28),
-        MXC91231_PIN_AP_IPU_LD6         = IOMUX_PIN(0, 1,  5, 10, 0, 28),
-        MXC91231_PIN_AP_IPU_LD7         = IOMUX_PIN(0, 1,  6, 10, 1, 28),
-        MXC91231_PIN_AP_IPU_LD8         = IOMUX_PIN(0, 1,  7, 10, 2, 28),
-        MXC91231_PIN_AP_IPU_LD9         = IOMUX_PIN(0, 1,  8, 10, 3, 28),
-        MXC91231_PIN_AP_IPU_LD10        = IOMUX_PIN(0, 1,  9, 11, 0, 28),
-        MXC91231_PIN_AP_IPU_LD11        = IOMUX_PIN(0, 1, 10, 11, 1, 28),
-        MXC91231_PIN_AP_IPU_LD12        = IOMUX_PIN(0, 1, 11, 11, 2, 28),
-        MXC91231_PIN_AP_IPU_LD13        = IOMUX_PIN(0, 1, 12, 11, 3, 28),
-        MXC91231_PIN_AP_IPU_LD14        = IOMUX_PIN(0, 1, 13, 12, 0, 28),
-        MXC91231_PIN_AP_IPU_LD15        = IOMUX_PIN(0, 1, 14, 12, 1, 28),
-        MXC91231_PIN_AP_KPROW4          = IOMUX_PIN(0, 7,  0, 12, 2, 10),
-        MXC91231_PIN_AP_KPROW5          = IOMUX_PIN(0, 1, 16, 12, 3, 10),
-        MXC91231_PIN_AP_GPIO_AP_B17     = IOMUX_PIN(0, 1, 17, 13, 0, 10),
-        MXC91231_PIN_AP_GPIO_AP_B18     = IOMUX_PIN(0, 1, 18, 13, 1, 10),
-        MXC91231_PIN_AP_KPCOL3          = IOMUX_PIN(0, 1, 19, 13, 2, 11),
-        MXC91231_PIN_AP_KPCOL4          = IOMUX_PIN(0, 1, 20, 13, 3, 11),
-        MXC91231_PIN_AP_KPCOL5          = IOMUX_PIN(0, 1, 21, 14, 0, 11),
-        MXC91231_PIN_AP_GPIO_AP_B22     = IOMUX_PIN(0, 1, 22, 14, 1, 11),
-        MXC91231_PIN_AP_GPIO_AP_B23     = IOMUX_PIN(0, 1, 23, 14, 2, 11),
-        MXC91231_PIN_AP_CSI_D0          = IOMUX_PIN(0, 1, 24, 14, 3, 21),
-        MXC91231_PIN_AP_CSI_D1          = IOMUX_PIN(0, 1, 25, 15, 0, 21),
-        MXC91231_PIN_AP_CSI_D2          = IOMUX_PIN(0, 1, 26, 15, 1, 21),
-        MXC91231_PIN_AP_CSI_D3          = IOMUX_PIN(0, 1, 27, 15, 2, 21),
-        MXC91231_PIN_AP_CSI_D4          = IOMUX_PIN(0, 1, 28, 15, 3, 21),
-        MXC91231_PIN_AP_CSI_D5          = IOMUX_PIN(0, 1, 29, 16, 0, 21),
-        MXC91231_PIN_AP_CSI_D6          = IOMUX_PIN(0, 1, 30, 16, 1, 21),
-        MXC91231_PIN_AP_CSI_D7          = IOMUX_PIN(0, 1, 31, 16, 2, 21),
-        MXC91231_PIN_AP_CSI_D8          = IOMUX_PIN(0, 2,  0, 16, 3, 21),
-        MXC91231_PIN_AP_CSI_D9          = IOMUX_PIN(0, 2,  1, 17, 0, 21),
-        MXC91231_PIN_AP_CSI_MCLK        = IOMUX_PIN(0, 2,  2, 17, 1, 21),
-        MXC91231_PIN_AP_CSI_VSYNC       = IOMUX_PIN(0, 2,  3, 17, 2, 21),
-        MXC91231_PIN_AP_CSI_HSYNC       = IOMUX_PIN(0, 2,  4, 17, 3, 21),
-        MXC91231_PIN_AP_CSI_PIXCLK      = IOMUX_PIN(0, 2,  5, 18, 0, 21),
-        MXC91231_PIN_AP_I2CLK           = IOMUX_PIN(0, 2,  6, 18, 1, 12),
-        MXC91231_PIN_AP_I2DAT           = IOMUX_PIN(0, 2,  7, 18, 2, 12),
-        MXC91231_PIN_AP_GPIO_AP_C8      = IOMUX_PIN(0, 2,  8, 18, 3,  9),
-        MXC91231_PIN_AP_GPIO_AP_C9      = IOMUX_PIN(0, 2,  9, 19, 0,  9),
-        MXC91231_PIN_AP_GPIO_AP_C10     = IOMUX_PIN(0, 2, 10, 19, 1,  9),
-        MXC91231_PIN_AP_GPIO_AP_C11     = IOMUX_PIN(0, 2, 11, 19, 2,  9),
-        MXC91231_PIN_AP_GPIO_AP_C12     = IOMUX_PIN(0, 2, 12, 19, 3,  9),
-        MXC91231_PIN_AP_GPIO_AP_C13     = IOMUX_PIN(0, 2, 13, 20, 0, 28),
-        MXC91231_PIN_AP_GPIO_AP_C14     = IOMUX_PIN(0, 2, 14, 20, 1, 28),
-        MXC91231_PIN_AP_GPIO_AP_C15     = IOMUX_PIN(0, 2, 15, 20, 2,  9),
-        MXC91231_PIN_AP_GPIO_AP_C16     = IOMUX_PIN(0, 2, 16, 20, 3,  9),
-        MXC91231_PIN_AP_GPIO_AP_C17     = IOMUX_PIN(0, 2, 17, 21, 0,  9),
-        MXC91231_PIN_AP_ED_INT0         = IOMUX_PIN(0, 2, 18, 21, 1, 22),
-        MXC91231_PIN_AP_ED_INT1         = IOMUX_PIN(0, 2, 19, 21, 2, 22),
-        MXC91231_PIN_AP_ED_INT2         = IOMUX_PIN(0, 2, 20, 21, 3, 22),
-        MXC91231_PIN_AP_ED_INT3         = IOMUX_PIN(0, 2, 21, 22, 0, 22),
-        MXC91231_PIN_AP_ED_INT4         = IOMUX_PIN(0, 2, 22, 22, 1, 23),
-        MXC91231_PIN_AP_ED_INT5         = IOMUX_PIN(0, 2, 23, 22, 2, 23),
-        MXC91231_PIN_AP_ED_INT6         = IOMUX_PIN(0, 2, 24, 22, 3, 23),
-        MXC91231_PIN_AP_ED_INT7         = IOMUX_PIN(0, 2, 25, 23, 0, 23),
-        MXC91231_PIN_AP_U2_DSR_B        = IOMUX_PIN(0, 2, 26, 23, 1, 28),
-        MXC91231_PIN_AP_U2_RI_B         = IOMUX_PIN(0, 2, 27, 23, 2, 28),
-        MXC91231_PIN_AP_U2_CTS_B        = IOMUX_PIN(0, 2, 28, 23, 3, 28),
-        MXC91231_PIN_AP_U2_DTR_B        = IOMUX_PIN(0, 2, 29, 24, 0, 28),
-        MXC91231_PIN_AP_KPROW0          = IOMUX_PIN(0, 7,  0, 24, 1, 10),
-        MXC91231_PIN_AP_KPROW1          = IOMUX_PIN(0, 1, 15, 24, 2, 10),
-        MXC91231_PIN_AP_KPROW2          = IOMUX_PIN(0, 7,  0, 24, 3, 10),
-        MXC91231_PIN_AP_KPROW3          = IOMUX_PIN(0, 7,  0, 25, 0, 10),
-        MXC91231_PIN_AP_KPCOL0          = IOMUX_PIN(0, 7,  0, 25, 1, 11),
-        MXC91231_PIN_AP_KPCOL1          = IOMUX_PIN(0, 7,  0, 25, 2, 11),
-        MXC91231_PIN_AP_KPCOL2          = IOMUX_PIN(0, 7,  0, 25, 3, 11),
-
-        /* Shared pins */
-        MXC91231_PIN_SP_U3_TXD          = IOMUX_PIN(1, 3,  0,  0, 0, 28),
-        MXC91231_PIN_SP_U3_RXD          = IOMUX_PIN(1, 3,  1,  0, 1, 28),
-        MXC91231_PIN_SP_U3_RTS_B        = IOMUX_PIN(1, 3,  2,  0, 2, 28),
-        MXC91231_PIN_SP_U3_CTS_B        = IOMUX_PIN(1, 3,  3,  0, 3, 28),
-        MXC91231_PIN_SP_USB_TXOE_B      = IOMUX_PIN(1, 3,  4,  1, 0, 28),
-        MXC91231_PIN_SP_USB_DAT_VP      = IOMUX_PIN(1, 3,  5,  1, 1, 28),
-        MXC91231_PIN_SP_USB_SE0_VM      = IOMUX_PIN(1, 3,  6,  1, 2, 28),
-        MXC91231_PIN_SP_USB_RXD         = IOMUX_PIN(1, 3,  7,  1, 3, 28),
-        MXC91231_PIN_SP_UH2_TXOE_B      = IOMUX_PIN(1, 3,  8,  2, 0, 28),
-        MXC91231_PIN_SP_UH2_SPEED       = IOMUX_PIN(1, 3,  9,  2, 1, 28),
-        MXC91231_PIN_SP_UH2_SUSPEN      = IOMUX_PIN(1, 3, 10,  2, 2, 28),
-        MXC91231_PIN_SP_UH2_TXDP        = IOMUX_PIN(1, 3, 11,  2, 3, 28),
-        MXC91231_PIN_SP_UH2_RXDP        = IOMUX_PIN(1, 3, 12,  3, 0, 28),
-        MXC91231_PIN_SP_UH2_RXDM        = IOMUX_PIN(1, 3, 13,  3, 1, 28),
-        MXC91231_PIN_SP_UH2_OVR         = IOMUX_PIN(1, 3, 14,  3, 2, 28),
-        MXC91231_PIN_SP_UH2_PWR         = IOMUX_PIN(1, 3, 15,  3, 3, 28),
-        MXC91231_PIN_SP_SD1_DAT0        = IOMUX_PIN(1, 3, 16,  4, 0, 25),
-        MXC91231_PIN_SP_SD1_DAT1        = IOMUX_PIN(1, 3, 17,  4, 1, 25),
-        MXC91231_PIN_SP_SD1_DAT2        = IOMUX_PIN(1, 3, 18,  4, 2, 25),
-        MXC91231_PIN_SP_SD1_DAT3        = IOMUX_PIN(1, 3, 19,  4, 3, 25),
-        MXC91231_PIN_SP_SD1_CMD         = IOMUX_PIN(1, 3, 20,  5, 0, 25),
-        MXC91231_PIN_SP_SD1_CLK         = IOMUX_PIN(1, 3, 21,  5, 1, 25),
-        MXC91231_PIN_SP_SD2_DAT0        = IOMUX_PIN(1, 3, 22,  5, 2, 26),
-        MXC91231_PIN_SP_SD2_DAT1        = IOMUX_PIN(1, 3, 23,  5, 3, 26),
-        MXC91231_PIN_SP_SD2_DAT2        = IOMUX_PIN(1, 3, 24,  6, 0, 26),
-        MXC91231_PIN_SP_SD2_DAT3        = IOMUX_PIN(1, 3, 25,  6, 1, 26),
-        MXC91231_PIN_SP_GPIO_SP_A26     = IOMUX_PIN(1, 3, 26,  6, 2, 28),
-        MXC91231_PIN_SP_SPI1_CLK        = IOMUX_PIN(1, 3, 27,  6, 3, 13),
-        MXC91231_PIN_SP_SPI1_MOSI       = IOMUX_PIN(1, 3, 28,  7, 0, 13),
-        MXC91231_PIN_SP_SPI1_MISO       = IOMUX_PIN(1, 3, 29,  7, 1, 13),
-        MXC91231_PIN_SP_SPI1_SS0        = IOMUX_PIN(1, 3, 30,  7, 2, 13),
-        MXC91231_PIN_SP_SPI1_SS1        = IOMUX_PIN(1, 3, 31,  7, 3, 13),
-        MXC91231_PIN_SP_SD2_CMD         = IOMUX_PIN(1, 7,  0,  8, 0, 26),
-        MXC91231_PIN_SP_SD2_CLK         = IOMUX_PIN(1, 7,  0,  8, 1, 26),
-        MXC91231_PIN_SP_SIM1_RST_B      = IOMUX_PIN(1, 2, 30,  8, 2, 28),
-        MXC91231_PIN_SP_SIM1_SVEN       = IOMUX_PIN(1, 7,  0,  8, 3, 28),
-        MXC91231_PIN_SP_SIM1_CLK        = IOMUX_PIN(1, 7,  0,  9, 0, 28),
-        MXC91231_PIN_SP_SIM1_TRXD       = IOMUX_PIN(1, 7,  0,  9, 1, 28),
-        MXC91231_PIN_SP_SIM1_PD         = IOMUX_PIN(1, 2, 31,  9, 2, 28),
-        MXC91231_PIN_SP_UH2_TXDM        = IOMUX_PIN(1, 7,  0,  9, 3, 28),
-        MXC91231_PIN_SP_UH2_RXD         = IOMUX_PIN(1, 7,  0, 10, 0, 28),
-};
-
-#define PIN_AP_MAX      (104)
-#define PIN_SP_MAX      (41)
-
-#define PIN_MAX         (PIN_AP_MAX + PIN_SP_MAX)
-
-/*
- * Convenience values for use with mxc_iomux_mode()
- *
- * Format here is MXC91231_PIN_(pin name)__(function)
- */
-
-#define MXC91231_PIN_SP_USB_DAT_VP__USB_DAT_VP \
-        IOMUX_MODE(MXC91231_PIN_SP_USB_DAT_VP, IOMUX_CONFIG_FUNC)
-#define MXC91231_PIN_SP_USB_SE0_VM__USB_SE0_VM \
-        IOMUX_MODE(MXC91231_PIN_SP_USB_SE0_VM, IOMUX_CONFIG_FUNC)
-#define MXC91231_PIN_SP_USB_DAT_VP__RXD2 \
-        IOMUX_MODE(MXC91231_PIN_SP_USB_DAT_VP, IOMUX_CONFIG_ALT1)
-#define MXC91231_PIN_SP_USB_SE0_VM__TXD2 \
-        IOMUX_MODE(MXC91231_PIN_SP_USB_SE0_VM, IOMUX_CONFIG_ALT1)
-
-
-#endif /* __MACH_IOMUX_MXC91231_H__ */
diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h
index a3d930d3e65d..35c89bcdf758 100644
--- a/arch/arm/plat-mxc/include/mach/irqs.h
+++ b/arch/arm/plat-mxc/include/mach/irqs.h
@@ -35,8 +35,6 @@
 #define MXC_GPIO_IRQS           (32 * 4)
 #elif defined CONFIG_SOC_IMX51
 #define MXC_GPIO_IRQS           (32 * 4)
-#elif defined CONFIG_ARCH_MXC91231
-#define MXC_GPIO_IRQS           (32 * 4)
 #elif defined CONFIG_ARCH_MX3
 #define MXC_GPIO_IRQS           (32 * 3)
 #endif
diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include/mach/memory.h
index 5d51cbb98893..11be5cdbdd1a 100644
--- a/arch/arm/plat-mxc/include/mach/memory.h
+++ b/arch/arm/plat-mxc/include/mach/memory.h
@@ -19,7 +19,6 @@
 #define MX50_PHYS_OFFSET        UL(0x70000000)
 #define MX51_PHYS_OFFSET        UL(0x90000000)
 #define MX53_PHYS_OFFSET        UL(0x70000000)
-#define MXC91231_PHYS_OFFSET    UL(0x90000000)
 
 #if !defined(CONFIG_RUNTIME_PHYS_OFFSET)
 # if defined CONFIG_ARCH_MX1
@@ -32,8 +31,6 @@
 #  define PLAT_PHYS_OFFSET              MX27_PHYS_OFFSET
 # elif defined CONFIG_ARCH_MX3
 #  define PLAT_PHYS_OFFSET              MX3x_PHYS_OFFSET
-# elif defined CONFIG_ARCH_MXC91231
-#  define PLAT_PHYS_OFFSET              MXC91231_PHYS_OFFSET
 # elif defined CONFIG_ARCH_MX50
 #  define PLAT_PHYS_OFFSET              MX50_PHYS_OFFSET
 # elif defined CONFIG_ARCH_MX51
diff --git a/arch/arm/plat-mxc/include/mach/mx27.h b/arch/arm/plat-mxc/include/mach/mx27.h
index cbc43ad5ef48..1dc1c522601b 100644
--- a/arch/arm/plat-mxc/include/mach/mx27.h
+++ b/arch/arm/plat-mxc/include/mach/mx27.h
@@ -60,8 +60,8 @@
 #define MX27_AUDMUX_BASE_ADDR                   (MX27_AIPI_BASE_ADDR + 0x16000)
 #define MX27_CSPI3_BASE_ADDR                    (MX27_AIPI_BASE_ADDR + 0x17000)
 #define MX27_MSHC_BASE_ADDR                     (MX27_AIPI_BASE_ADDR + 0x18000)
-#define MX27_GPT5_BASE_ADDR                     (MX27_AIPI_BASE_ADDR + 0x19000)
-#define MX27_GPT4_BASE_ADDR                     (MX27_AIPI_BASE_ADDR + 0x1a000)
+#define MX27_GPT4_BASE_ADDR                     (MX27_AIPI_BASE_ADDR + 0x19000)
+#define MX27_GPT5_BASE_ADDR                     (MX27_AIPI_BASE_ADDR + 0x1a000)
 #define MX27_UART5_BASE_ADDR                    (MX27_AIPI_BASE_ADDR + 0x1b000)
 #define MX27_UART6_BASE_ADDR                    (MX27_AIPI_BASE_ADDR + 0x1c000)
 #define MX27_I2C2_BASE_ADDR                     (MX27_AIPI_BASE_ADDR + 0x1d000)
diff --git a/arch/arm/plat-mxc/include/mach/mx53.h b/arch/arm/plat-mxc/include/mach/mx53.h
index ace17864575e..9d2a1ef84de2 100644
--- a/arch/arm/plat-mxc/include/mach/mx53.h
+++ b/arch/arm/plat-mxc/include/mach/mx53.h
@@ -337,17 +337,4 @@
 #define MX53_INT_GPIO7_LOW      107
 #define MX53_INT_GPIO7_HIGH     108
 
-/* silicon revisions specific to i.MX53 */
-#define MX53_CHIP_REV_1_0               0x10
-#define MX53_CHIP_REV_1_1               0x11
-#define MX53_CHIP_REV_1_2               0x12
-#define MX53_CHIP_REV_1_3               0x13
-#define MX53_CHIP_REV_2_0               0x20
-#define MX53_CHIP_REV_2_1               0x21
-#define MX53_CHIP_REV_2_2               0x22
-#define MX53_CHIP_REV_2_3               0x23
-#define MX53_CHIP_REV_3_0               0x30
-#define MX53_CHIP_REV_3_1               0x31
-#define MX53_CHIP_REV_3_2               0x32
-
 #endif /* ifndef __MACH_MX53_H__ */
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
index 1aea818d9d31..4ac53ce97c24 100644
--- a/arch/arm/plat-mxc/include/mach/mxc.h
+++ b/arch/arm/plat-mxc/include/mach/mxc.h
@@ -35,7 +35,6 @@
 #define MXC_CPU_MX50            50
 #define MXC_CPU_MX51            51
 #define MXC_CPU_MX53            53
-#define MXC_CPU_MXC91231        91231
 
 #define IMX_CHIP_REVISION_1_0           0x10
 #define IMX_CHIP_REVISION_1_1           0x11
@@ -177,18 +176,6 @@ extern unsigned int __mxc_cpu_type;
 # define cpu_is_mx53()          (0)
 #endif
 
-#ifdef CONFIG_ARCH_MXC91231
-# ifdef mxc_cpu_type
-#  undef mxc_cpu_type
-#  define mxc_cpu_type __mxc_cpu_type
-# else
-#  define mxc_cpu_type MXC_CPU_MXC91231
-# endif
-# define cpu_is_mxc91231()      (mxc_cpu_type == MXC_CPU_MXC91231)
-#else
-# define cpu_is_mxc91231()      (0)
-#endif
-
 #ifndef __ASSEMBLY__
 
 struct cpu_op {
@@ -207,14 +194,7 @@ enum mxc_cpu_pwr_mode {
 extern struct cpu_op *(*get_cpu_op)(int *op);
 #endif
 
-#if defined(CONFIG_ARCH_MX3) || defined(CONFIG_ARCH_MX2)
-/* These are deprecated, use mx[23][157]_setup_weimcs instead. */
-#define CSCR_U(n) (IO_ADDRESS(WEIM_BASE_ADDR + n * 0x10))
-#define CSCR_L(n) (IO_ADDRESS(WEIM_BASE_ADDR + n * 0x10 + 0x4))
-#define CSCR_A(n) (IO_ADDRESS(WEIM_BASE_ADDR + n * 0x10 + 0x8))
-#endif
-
-#define cpu_is_mx3()    (cpu_is_mx31() || cpu_is_mx35() || cpu_is_mxc91231())
+#define cpu_is_mx3()    (cpu_is_mx31() || cpu_is_mx35())
 #define cpu_is_mx2()    (cpu_is_mx21() || cpu_is_mx27())
 
 #endif /*  __ASM_ARCH_MXC_H__ */
diff --git a/arch/arm/plat-mxc/include/mach/mxc91231.h b/arch/arm/plat-mxc/include/mach/mxc91231.h
deleted file mode 100644
index 765190fe6332..000000000000
--- a/arch/arm/plat-mxc/include/mach/mxc91231.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- *  Copyright 2004-2006 Freescale Semiconductor, Inc. All Rights Reserved.
- *    - Platform specific register memory map
- *
- *  Copyright 2005-2007 Motorola, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-#ifndef __MACH_MXC91231_H__
-#define __MACH_MXC91231_H__
-
-/*
- * L2CC
- */
-#define MXC91231_L2CC_BASE_ADDR         0x30000000
-#define MXC91231_L2CC_SIZE              SZ_64K
-
-/*
- * AIPS 1
- */
-#define MXC91231_AIPS1_BASE_ADDR        0x43F00000
-#define MXC91231_AIPS1_SIZE             SZ_1M
-
-#define MXC91231_AIPS1_CTRL_BASE_ADDR   MXC91231_AIPS1_BASE_ADDR
-#define MXC91231_MAX_BASE_ADDR          (MXC91231_AIPS1_BASE_ADDR + 0x04000)
-#define MXC91231_EVTMON_BASE_ADDR       (MXC91231_AIPS1_BASE_ADDR + 0x08000)
-#define MXC91231_CLKCTL_BASE_ADDR       (MXC91231_AIPS1_BASE_ADDR + 0x0C000)
-#define MXC91231_ETB_SLOT4_BASE_ADDR    (MXC91231_AIPS1_BASE_ADDR + 0x10000)
-#define MXC91231_ETB_SLOT5_BASE_ADDR    (MXC91231_AIPS1_BASE_ADDR + 0x14000)
-#define MXC91231_ECT_CTIO_BASE_ADDR     (MXC91231_AIPS1_BASE_ADDR + 0x18000)
-#define MXC91231_I2C_BASE_ADDR          (MXC91231_AIPS1_BASE_ADDR + 0x80000)
-#define MXC91231_MU_BASE_ADDR           (MXC91231_AIPS1_BASE_ADDR + 0x88000)
-#define MXC91231_UART1_BASE_ADDR        (MXC91231_AIPS1_BASE_ADDR + 0x90000)
-#define MXC91231_UART2_BASE_ADDR        (MXC91231_AIPS1_BASE_ADDR + 0x94000)
-#define MXC91231_DSM_BASE_ADDR          (MXC91231_AIPS1_BASE_ADDR + 0x98000)
-#define MXC91231_OWIRE_BASE_ADDR        (MXC91231_AIPS1_BASE_ADDR + 0x9C000)
-#define MXC91231_SSI1_BASE_ADDR         (MXC91231_AIPS1_BASE_ADDR + 0xA0000)
-#define MXC91231_KPP_BASE_ADDR          (MXC91231_AIPS1_BASE_ADDR + 0xA8000)
-#define MXC91231_IOMUX_AP_BASE_ADDR     (MXC91231_AIPS1_BASE_ADDR + 0xAC000)
-#define MXC91231_CTI_AP_BASE_ADDR       (MXC91231_AIPS1_BASE_ADDR + 0xB8000)
-
-/*
- * AIPS 2
- */
-#define MXC91231_AIPS2_BASE_ADDR        0x53F00000
-#define MXC91231_AIPS2_SIZE             SZ_1M
-
-#define MXC91231_GEMK_BASE_ADDR         (MXC91231_AIPS2_BASE_ADDR + 0x8C000)
-#define MXC91231_GPT1_BASE_ADDR         (MXC91231_AIPS2_BASE_ADDR + 0x90000)
-#define MXC91231_EPIT1_AP_BASE_ADDR     (MXC91231_AIPS2_BASE_ADDR + 0x94000)
-#define MXC91231_SCC_BASE_ADDR          (MXC91231_AIPS2_BASE_ADDR + 0xAC000)
-#define MXC91231_RNGA_BASE_ADDR         (MXC91231_AIPS2_BASE_ADDR + 0xB0000)
-#define MXC91231_IPU_CTRL_BASE_ADDR     (MXC91231_AIPS2_BASE_ADDR + 0xC0000)
-#define MXC91231_AUDMUX_BASE_ADDR       (MXC91231_AIPS2_BASE_ADDR + 0xC4000)
-#define MXC91231_EDIO_BASE_ADDR         (MXC91231_AIPS2_BASE_ADDR + 0xC8000)
-#define MXC91231_GPIO1_AP_BASE_ADDR     (MXC91231_AIPS2_BASE_ADDR + 0xCC000)
-#define MXC91231_GPIO2_AP_BASE_ADDR     (MXC91231_AIPS2_BASE_ADDR + 0xD0000)
-#define MXC91231_SDMA_BASE_ADDR         (MXC91231_AIPS2_BASE_ADDR + 0xD4000)
-#define MXC91231_RTC_BASE_ADDR          (MXC91231_AIPS2_BASE_ADDR + 0xD8000)
-#define MXC91231_WDOG1_BASE_ADDR        (MXC91231_AIPS2_BASE_ADDR + 0xDC000)
-#define MXC91231_PWM_BASE_ADDR          (MXC91231_AIPS2_BASE_ADDR + 0xE0000)
-#define MXC91231_GPIO3_AP_BASE_ADDR     (MXC91231_AIPS2_BASE_ADDR + 0xE4000)
-#define MXC91231_WDOG2_BASE_ADDR        (MXC91231_AIPS2_BASE_ADDR + 0xE8000)
-#define MXC91231_RTIC_BASE_ADDR         (MXC91231_AIPS2_BASE_ADDR + 0xEC000)
-#define MXC91231_LPMC_BASE_ADDR         (MXC91231_AIPS2_BASE_ADDR + 0xF0000)
-
-/*
- * SPBA global module 0
- */
-#define MXC91231_SPBA0_BASE_ADDR        0x50000000
-#define MXC91231_SPBA0_SIZE             SZ_1M
-
-#define MXC91231_MMC_SDHC1_BASE_ADDR    (MXC91231_SPBA0_BASE_ADDR + 0x04000)
-#define MXC91231_MMC_SDHC2_BASE_ADDR    (MXC91231_SPBA0_BASE_ADDR + 0x08000)
-#define MXC91231_UART3_BASE_ADDR        (MXC91231_SPBA0_BASE_ADDR + 0x0C000)
-#define MXC91231_CSPI2_BASE_ADDR        (MXC91231_SPBA0_BASE_ADDR + 0x10000)
-#define MXC91231_SSI2_BASE_ADDR         (MXC91231_SPBA0_BASE_ADDR + 0x14000)
-#define MXC91231_SIM_BASE_ADDR          (MXC91231_SPBA0_BASE_ADDR + 0x18000)
-#define MXC91231_IIM_BASE_ADDR          (MXC91231_SPBA0_BASE_ADDR + 0x1C000)
-#define MXC91231_CTI_SDMA_BASE_ADDR     (MXC91231_SPBA0_BASE_ADDR + 0x20000)
-#define MXC91231_USBOTG_CTRL_BASE_ADDR  (MXC91231_SPBA0_BASE_ADDR + 0x24000)
-#define MXC91231_USBOTG_DATA_BASE_ADDR  (MXC91231_SPBA0_BASE_ADDR + 0x28000)
-#define MXC91231_CSPI1_BASE_ADDR        (MXC91231_SPBA0_BASE_ADDR + 0x30000)
-#define MXC91231_SPBA_CTRL_BASE_ADDR    (MXC91231_SPBA0_BASE_ADDR + 0x3C000)
-#define MXC91231_IOMUX_COM_BASE_ADDR    (MXC91231_SPBA0_BASE_ADDR + 0x40000)
-#define MXC91231_CRM_COM_BASE_ADDR      (MXC91231_SPBA0_BASE_ADDR + 0x44000)
-#define MXC91231_CRM_AP_BASE_ADDR       (MXC91231_SPBA0_BASE_ADDR + 0x48000)
-#define MXC91231_PLL0_BASE_ADDR         (MXC91231_SPBA0_BASE_ADDR + 0x4C000)
-#define MXC91231_PLL1_BASE_ADDR         (MXC91231_SPBA0_BASE_ADDR + 0x50000)
-#define MXC91231_PLL2_BASE_ADDR         (MXC91231_SPBA0_BASE_ADDR + 0x54000)
-#define MXC91231_GPIO4_SH_BASE_ADDR     (MXC91231_SPBA0_BASE_ADDR + 0x58000)
-#define MXC91231_HAC_BASE_ADDR          (MXC91231_SPBA0_BASE_ADDR + 0x5C000)
-#define MXC91231_SAHARA_BASE_ADDR       (MXC91231_SPBA0_BASE_ADDR + 0x5C000)
-#define MXC91231_PLL3_BASE_ADDR         (MXC91231_SPBA0_BASE_ADDR + 0x60000)
-
-/*
- * SPBA global module 1
- */
-#define MXC91231_SPBA1_BASE_ADDR        0x52000000
-#define MXC91231_SPBA1_SIZE             SZ_1M
-
-#define MXC91231_MQSPI_BASE_ADDR        (MXC91231_SPBA1_BASE_ADDR + 0x34000)
-#define MXC91231_EL1T_BASE_ADDR         (MXC91231_SPBA1_BASE_ADDR + 0x38000)
-
-/*!
- * Defines for SPBA modules
- */
-#define MXC91231_SPBA_SDHC1             0x04
-#define MXC91231_SPBA_SDHC2             0x08
-#define MXC91231_SPBA_UART3             0x0C
-#define MXC91231_SPBA_CSPI2             0x10
-#define MXC91231_SPBA_SSI2              0x14
-#define MXC91231_SPBA_SIM               0x18
-#define MXC91231_SPBA_IIM               0x1C
-#define MXC91231_SPBA_CTI_SDMA          0x20
-#define MXC91231_SPBA_USBOTG_CTRL_REGS  0x24
-#define MXC91231_SPBA_USBOTG_DATA_REGS  0x28
-#define MXC91231_SPBA_CSPI1             0x30
-#define MXC91231_SPBA_MQSPI             0x34
-#define MXC91231_SPBA_EL1T              0x38
-#define MXC91231_SPBA_IOMUX             0x40
-#define MXC91231_SPBA_CRM_COM           0x44
-#define MXC91231_SPBA_CRM_AP            0x48
-#define MXC91231_SPBA_PLL0              0x4C
-#define MXC91231_SPBA_PLL1              0x50
-#define MXC91231_SPBA_PLL2              0x54
-#define MXC91231_SPBA_GPIO4             0x58
-#define MXC91231_SPBA_SAHARA            0x5C
-
-/*
- * ROMP and AVIC
- */
-#define MXC91231_ROMP_BASE_ADDR         0x60000000
-#define MXC91231_ROMP_SIZE              SZ_64K
-
-#define MXC91231_AVIC_BASE_ADDR         0x68000000
-#define MXC91231_AVIC_SIZE              SZ_64K
-
-/*
- * NAND, SDRAM, WEIM, M3IF, EMI controllers
- */
-#define MXC91231_X_MEMC_BASE_ADDR       0xB8000000
-#define MXC91231_X_MEMC_SIZE            SZ_64K
-
-#define MXC91231_NFC_BASE_ADDR          (MXC91231_X_MEMC_BASE_ADDR + 0x0000)
-#define MXC91231_ESDCTL_BASE_ADDR       (MXC91231_X_MEMC_BASE_ADDR + 0x1000)
-#define MXC91231_WEIM_BASE_ADDR         (MXC91231_X_MEMC_BASE_ADDR + 0x2000)
-#define MXC91231_M3IF_BASE_ADDR         (MXC91231_X_MEMC_BASE_ADDR + 0x3000)
-#define MXC91231_EMI_CTL_BASE_ADDR      (MXC91231_X_MEMC_BASE_ADDR + 0x4000)
-
-/*
- * Memory regions and CS
- * CPLD is connected on CS4
- * CS5 is TP1021 or it is not connected
- * */
-#define MXC91231_FB_RAM_BASE_ADDR       0x78000000
-#define MXC91231_FB_RAM_SIZE            SZ_256K
-#define MXC91231_CSD0_BASE_ADDR         0x80000000
-#define MXC91231_CSD1_BASE_ADDR         0x90000000
-#define MXC91231_CS0_BASE_ADDR          0xA0000000
-#define MXC91231_CS1_BASE_ADDR          0xA8000000
-#define MXC91231_CS2_BASE_ADDR          0xB0000000
-#define MXC91231_CS3_BASE_ADDR          0xB2000000
-#define MXC91231_CS4_BASE_ADDR          0xB4000000
-#define MXC91231_CS5_BASE_ADDR          0xB6000000
-
-/*
- * This macro defines the physical to virtual address mapping for all the
- * peripheral modules. It is used by passing in the physical address as x
- * and returning the virtual address.
- */
-#define MXC91231_IO_P2V(x)              IMX_IO_P2V(x)
-#define MXC91231_IO_ADDRESS(x)          IOMEM(MXC91231_IO_P2V(x))
-
-/*
- * Interrupt numbers
- */
-#define MXC91231_INT_GPIO3              0
-#define MXC91231_INT_EL1T_CI            1
-#define MXC91231_INT_EL1T_RFCI          2
-#define MXC91231_INT_EL1T_RFI           3
-#define MXC91231_INT_EL1T_MCU           4
-#define MXC91231_INT_EL1T_IPI           5
-#define MXC91231_INT_MU_GEN             6
-#define MXC91231_INT_GPIO4              7
-#define MXC91231_INT_MMC_SDHC2          8
-#define MXC91231_INT_MMC_SDHC1          9
-#define MXC91231_INT_I2C                10
-#define MXC91231_INT_SSI2               11
-#define MXC91231_INT_SSI1               12
-#define MXC91231_INT_CSPI2              13
-#define MXC91231_INT_CSPI1              14
-#define MXC91231_INT_RTIC               15
-#define MXC91231_INT_SAHARA             15
-#define MXC91231_INT_HAC                15
-#define MXC91231_INT_UART3_RX           16
-#define MXC91231_INT_UART3_TX           17
-#define MXC91231_INT_UART3_MINT         18
-#define MXC91231_INT_ECT                19
-#define MXC91231_INT_SIM_IPB            20
-#define MXC91231_INT_SIM_DATA           21
-#define MXC91231_INT_RNGA               22
-#define MXC91231_INT_DSM_AP             23
-#define MXC91231_INT_KPP                24
-#define MXC91231_INT_RTC                25
-#define MXC91231_INT_PWM                26
-#define MXC91231_INT_GEMK_AP            27
-#define MXC91231_INT_EPIT               28
-#define MXC91231_INT_GPT                29
-#define MXC91231_INT_UART2_RX           30
-#define MXC91231_INT_UART2_TX           31
-#define MXC91231_INT_UART2_MINT         32
-#define MXC91231_INT_NANDFC             33
-#define MXC91231_INT_SDMA               34
-#define MXC91231_INT_USB_WAKEUP         35
-#define MXC91231_INT_USB_SOF            36
-#define MXC91231_INT_PMU_EVTMON         37
-#define MXC91231_INT_USB_FUNC           38
-#define MXC91231_INT_USB_DMA            39
-#define MXC91231_INT_USB_CTRL           40
-#define MXC91231_INT_IPU_ERR            41
-#define MXC91231_INT_IPU_SYN            42
-#define MXC91231_INT_UART1_RX           43
-#define MXC91231_INT_UART1_TX           44
-#define MXC91231_INT_UART1_MINT         45
-#define MXC91231_INT_IIM                46
-#define MXC91231_INT_MU_RX_OR           47
-#define MXC91231_INT_MU_TX_OR           48
-#define MXC91231_INT_SCC_SCM            49
-#define MXC91231_INT_SCC_SMN            50
-#define MXC91231_INT_GPIO2              51
-#define MXC91231_INT_GPIO1              52
-#define MXC91231_INT_MQSPI1             53
-#define MXC91231_INT_MQSPI2             54
-#define MXC91231_INT_WDOG2              55
-#define MXC91231_INT_EXT_INT7           56
-#define MXC91231_INT_EXT_INT6           57
-#define MXC91231_INT_EXT_INT5           58
-#define MXC91231_INT_EXT_INT4           59
-#define MXC91231_INT_EXT_INT3           60
-#define MXC91231_INT_EXT_INT2           61
-#define MXC91231_INT_EXT_INT1           62
-#define MXC91231_INT_EXT_INT0           63
-
-#define MXC91231_MAX_INT_LINES          63
-#define MXC91231_MAX_EXT_LINES          8
-
-#endif /* __MACH_MXC91231_H__ */
diff --git a/arch/arm/plat-mxc/include/mach/system.h b/arch/arm/plat-mxc/include/mach/system.h
index 0417da9f710d..51f02a9d41a3 100644
--- a/arch/arm/plat-mxc/include/mach/system.h
+++ b/arch/arm/plat-mxc/include/mach/system.h
@@ -24,12 +24,6 @@ extern void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode);
 
 static inline void arch_idle(void)
 {
-#ifdef CONFIG_ARCH_MXC91231
-        if (cpu_is_mxc91231()) {
-                /* Need this to set DSM low-power mode */
-                mxc91231_prepare_idle();
-        }
-#endif
         /* fix i.MX31 errata TLSbo65953 and i.MX35 errata ENGcm09472 */
         if (cpu_is_mx31() || cpu_is_mx35()) {
                 unsigned long reg = 0;
diff --git a/arch/arm/plat-mxc/include/mach/timex.h b/arch/arm/plat-mxc/include/mach/timex.h
index 2d9624697cc9..d61d5c74817c 100644
--- a/arch/arm/plat-mxc/include/mach/timex.h
+++ b/arch/arm/plat-mxc/include/mach/timex.h
@@ -26,8 +26,6 @@
 #define CLOCK_TICK_RATE         16000000
 #elif defined CONFIG_ARCH_MX5
 #define CLOCK_TICK_RATE         8000000
-#elif defined CONFIG_ARCH_MXC91231
-#define CLOCK_TICK_RATE         13000000
 #endif
 
 #endif                          /* __ASM_ARCH_MXC_TIMEX_H__ */
diff --git a/arch/arm/plat-mxc/include/mach/uncompress.h b/arch/arm/plat-mxc/include/mach/uncompress.h
index 4864b0afd440..d85e2d1c0324 100644
--- a/arch/arm/plat-mxc/include/mach/uncompress.h
+++ b/arch/arm/plat-mxc/include/mach/uncompress.h
@@ -21,7 +21,7 @@
 
 #include <asm/mach-types.h>
 
-static unsigned long uart_base;
+unsigned long uart_base;
 
 #define UART(x) (*(volatile unsigned long *)(uart_base + (x)))
 
diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c
index 3455fc0575a6..8024f2ac177c 100644
--- a/arch/arm/plat-mxc/system.c
+++ b/arch/arm/plat-mxc/system.c
@@ -37,12 +37,6 @@ void arch_reset(char mode, const char *cmd)
 {
         unsigned int wcr_enable;
 
-#ifdef CONFIG_ARCH_MXC91231
-        if (cpu_is_mxc91231()) {
-                mxc91231_arch_reset(mode, cmd);
-                return;
-        }
-#endif
 #ifdef CONFIG_MACH_MX51_EFIKAMX
         if (machine_is_mx51_efikamx()) {
                 mx51_efikamx_reset();
diff --git a/arch/arm/plat-mxc/time.c b/arch/arm/plat-mxc/time.c
index 2237ff8b434f..4b0fe285e83c 100644
--- a/arch/arm/plat-mxc/time.c
+++ b/arch/arm/plat-mxc/time.c
@@ -54,7 +54,7 @@
 #define MX2_TSTAT_CAPT          (1 << 1)
 #define MX2_TSTAT_COMP          (1 << 0)
 
-/* MX31, MX35, MX25, MXC91231, MX5 */
+/* MX31, MX35, MX25, MX5 */
 #define V2_TCTL_WAITEN          (1 << 3) /* Wait enable mode */
 #define V2_TCTL_CLK_IPG         (1 << 6)
 #define V2_TCTL_FRR             (1 << 9)
@@ -106,56 +106,32 @@ static void gpt_irq_acknowledge(void)
                 __raw_writel(V2_TSTAT_OF1, timer_base + V2_TSTAT);
 }
 
-static cycle_t dummy_get_cycles(struct clocksource *cs)
-{
-        return 0;
-}
-
-static cycle_t mx1_2_get_cycles(struct clocksource *cs)
-{
-        return __raw_readl(timer_base + MX1_2_TCN);
-}
-
-static cycle_t v2_get_cycles(struct clocksource *cs)
-{
-        return __raw_readl(timer_base + V2_TCN);
-}
-
-static struct clocksource clocksource_mxc = {
-        .name           = "mxc_timer1",
-        .rating         = 200,
-        .read           = dummy_get_cycles,
-        .mask           = CLOCKSOURCE_MASK(32),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
+static void __iomem *sched_clock_reg;
 
 static DEFINE_CLOCK_DATA(cd);
 unsigned long long notrace sched_clock(void)
 {
-        cycle_t cyc = clocksource_mxc.read(&clocksource_mxc);
+        cycle_t cyc = sched_clock_reg ? __raw_readl(sched_clock_reg) : 0;
 
         return cyc_to_sched_clock(&cd, cyc, (u32)~0);
 }
 
 static void notrace mxc_update_sched_clock(void)
 {
-        cycle_t cyc = clocksource_mxc.read(&clocksource_mxc);
+        cycle_t cyc = sched_clock_reg ? __raw_readl(sched_clock_reg) : 0;
         update_sched_clock(&cd, cyc, (u32)~0);
 }
 
 static int __init mxc_clocksource_init(struct clk *timer_clk)
 {
         unsigned int c = clk_get_rate(timer_clk);
+        void __iomem *reg = timer_base + (timer_is_v2() ? V2_TCN : MX1_2_TCN);
 
-        if (timer_is_v2())
-                clocksource_mxc.read = v2_get_cycles;
-        else
-                clocksource_mxc.read = mx1_2_get_cycles;
+        sched_clock_reg = reg;
 
         init_sched_clock(&cd, mxc_update_sched_clock, 32, c);
-        clocksource_register_hz(&clocksource_mxc, c);
-
-        return 0;
+        return clocksource_mmio_init(reg, "mxc_timer1", c, 200, 32,
+                        clocksource_mmio_readl_up);
 }
 
 /* clock event */
diff --git a/arch/arm/plat-nomadik/Kconfig b/arch/arm/plat-nomadik/Kconfig
index 187f4e84bb22..18296ee68802 100644
--- a/arch/arm/plat-nomadik/Kconfig
+++ b/arch/arm/plat-nomadik/Kconfig
@@ -5,6 +5,7 @@
 config PLAT_NOMADIK
         bool
         depends on ARCH_NOMADIK || ARCH_U8500
+        select CLKSRC_MMIO
         default y
         help
           Common platform code for Nomadik and other ST-Ericsson
diff --git a/arch/arm/plat-nomadik/gpio.c b/arch/arm/plat-nomadik/gpio.c
index f49748eca1a3..307b8131aa8c 100644
--- a/arch/arm/plat-nomadik/gpio.c
+++ b/arch/arm/plat-nomadik/gpio.c
@@ -23,6 +23,8 @@
 #include <linux/irq.h>
 #include <linux/slab.h>
 
+#include <asm/mach/irq.h>
+
 #include <plat/pincfg.h>
 #include <mach/hardware.h>
 #include <mach/gpio.h>
@@ -681,13 +683,7 @@ static void __nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc,
         struct irq_chip *host_chip = irq_get_chip(irq);
         unsigned int first_irq;
 
-        if (host_chip->irq_mask_ack)
-                host_chip->irq_mask_ack(&desc->irq_data);
-        else {
-                host_chip->irq_mask(&desc->irq_data);
-                if (host_chip->irq_ack)
-                        host_chip->irq_ack(&desc->irq_data);
-        }
+        chained_irq_enter(host_chip, desc);
 
         nmk_chip = irq_get_handler_data(irq);
         first_irq = NOMADIK_GPIO_TO_IRQ(nmk_chip->chip.base);
@@ -698,7 +694,7 @@ static void __nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc,
                 status &= ~BIT(bit);
         }
 
-        host_chip->irq_unmask(&desc->irq_data);
+        chained_irq_exit(host_chip, desc);
 }
 
 static void nmk_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
diff --git a/arch/arm/plat-nomadik/include/plat/i2c.h b/arch/arm/plat-nomadik/include/plat/i2c.h
index 1621db67a53d..8ba70ffc31ec 100644
--- a/arch/arm/plat-nomadik/include/plat/i2c.h
+++ b/arch/arm/plat-nomadik/include/plat/i2c.h
@@ -11,8 +11,8 @@
 enum i2c_freq_mode {
         I2C_FREQ_MODE_STANDARD,         /* up to 100 Kb/s */
         I2C_FREQ_MODE_FAST,             /* up to 400 Kb/s */
+        I2C_FREQ_MODE_HIGH_SPEED,       /* up to 3.4 Mb/s */
         I2C_FREQ_MODE_FAST_PLUS,        /* up to 1 Mb/s */
-        I2C_FREQ_MODE_HIGH_SPEED        /* up to 3.4 Mb/s */
 };
 
 /**
@@ -24,13 +24,15 @@ enum i2c_freq_mode {
  *              to the values of 14, 6, 2 for a 48 MHz i2c clk
  * @tft:        Tx FIFO Threshold in bytes
  * @rft:        Rx FIFO Threshold in bytes
+ * @timeout     Slave response timeout(ms)
  * @sm:         speed mode
  */
 struct nmk_i2c_controller {
         unsigned long   clk_freq;
         unsigned short  slsu;
-        unsigned char   tft;
-        unsigned char   rft;
+        unsigned char   tft;
+        unsigned char   rft;
+        int timeout;
         enum i2c_freq_mode      sm;
 };
 
diff --git a/arch/arm/plat-nomadik/timer.c b/arch/arm/plat-nomadik/timer.c
index 41723402006b..ef74e157a9d5 100644
--- a/arch/arm/plat-nomadik/timer.c
+++ b/arch/arm/plat-nomadik/timer.c
@@ -26,29 +26,6 @@
 void __iomem *mtu_base; /* Assigned by machine code */
 
 /*
- * Kernel assumes that sched_clock can be called early
- * but the MTU may not yet be initialized.
- */
-static cycle_t nmdk_read_timer_dummy(struct clocksource *cs)
-{
-        return 0;
-}
-
-/* clocksource: MTU decrements, so we negate the value being read. */
-static cycle_t nmdk_read_timer(struct clocksource *cs)
-{
-        return -readl(mtu_base + MTU_VAL(0));
-}
-
-static struct clocksource nmdk_clksrc = {
-        .name           = "mtu_0",
-        .rating         = 200,
-        .read           = nmdk_read_timer_dummy,
-        .mask           = CLOCKSOURCE_MASK(32),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
-/*
  * Override the global weak sched_clock symbol with this
  * local implementation which uses the clocksource to get some
  * better resolution when scheduling the kernel.
@@ -172,12 +149,10 @@ void __init nmdk_timer_init(void)
         writel(0, mtu_base + MTU_BGLR(0));
         writel(cr | MTU_CRn_ENA, mtu_base + MTU_CR(0));
 
-        /* Now the clock source is ready */
-        nmdk_clksrc.read = nmdk_read_timer;
-
-        if (clocksource_register_hz(&nmdk_clksrc, rate))
+        if (clocksource_mmio_init(mtu_base + MTU_VAL(0), "mtu_0",
+                        rate, 200, 32, clocksource_mmio_readl_down))
                 pr_err("timer: failed to initialize clock source %s\n",
-                       nmdk_clksrc.name);
+                       "mtu_0");
 
         init_sched_clock(&cd, nomadik_update_sched_clock, 32, rate);
 
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index cd5f993612fd..49a4c75243fc 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -12,12 +12,14 @@ choice
 config ARCH_OMAP1
         bool "TI OMAP1"
         select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
         help
           "Systems based on omap7xx, omap15xx or omap16xx"
 
 config ARCH_OMAP2PLUS
         bool "TI OMAP2/3/4"
         select CLKDEV_LOOKUP
+        select GENERIC_IRQ_CHIP
         select OMAP_DM_TIMER
         help
           "Systems based on OMAP2, OMAP3 or OMAP4"
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index d2adcdda23cf..efb869390199 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -17,7 +17,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/io.h>
@@ -1137,8 +1137,9 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
         struct gpio_bank *bank;
         u32 retrigger = 0;
         int unmasked = 0;
+        struct irq_chip *chip = irq_desc_get_chip(desc);
 
-        desc->irq_data.chip->irq_ack(&desc->irq_data);
+        chained_irq_enter(chip, desc);
 
         bank = irq_get_handler_data(irq);
 #ifdef CONFIG_ARCH_OMAP1
@@ -1195,7 +1196,7 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
                 configured, we could unmask GPIO bank interrupt immediately */
                 if (!level_mask && !unmasked) {
                         unmasked = 1;
-                        desc->irq_data.chip->irq_unmask(&desc->irq_data);
+                        chained_irq_exit(chip, desc);
                 }
 
                 isr |= retrigger;
@@ -1231,7 +1232,7 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
         interrupt */
 exit:
         if (!unmasked)
-                desc->irq_data.chip->irq_unmask(&desc->irq_data);
+                chained_irq_exit(chip, desc);
 }
 
 static void gpio_irq_shutdown(struct irq_data *d)
@@ -1372,9 +1373,7 @@ static const struct dev_pm_ops omap_mpuio_dev_pm_ops = {
         .resume_noirq = omap_mpuio_resume_noirq,
 };
 
-/* use platform_driver for this, now that there's no longer any
- * point to sys_device (other than not disturbing old code).
- */
+/* use platform_driver for this. */
 static struct platform_driver omap_mpuio_driver = {
         .driver         = {
                 .name   = "mpuio",
@@ -1745,7 +1744,7 @@ static int __devinit omap_gpio_probe(struct platform_device *pdev)
 }
 
 #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
-static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
+static int omap_gpio_suspend(void)
 {
         int i;
 
@@ -1795,12 +1794,12 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
         return 0;
 }
 
-static int omap_gpio_resume(struct sys_device *dev)
+static void omap_gpio_resume(void)
 {
         int i;
 
         if (!cpu_class_is_omap2() && !cpu_is_omap16xx())
-                return 0;
+                return;
 
         for (i = 0; i < gpio_bank_count; i++) {
                 struct gpio_bank *bank = &gpio_bank[i];
@@ -1836,21 +1835,13 @@ static int omap_gpio_resume(struct sys_device *dev)
                 __raw_writel(bank->saved_wakeup, wake_set);
                 spin_unlock_irqrestore(&bank->lock, flags);
         }
-
-        return 0;
 }
 
-static struct sysdev_class omap_gpio_sysclass = {
-        .name           = "gpio",
+static struct syscore_ops omap_gpio_syscore_ops = {
         .suspend        = omap_gpio_suspend,
         .resume         = omap_gpio_resume,
 };
 
-static struct sys_device omap_gpio_device = {
-        .id             = 0,
-        .cls            = &omap_gpio_sysclass,
-};
-
 #endif
 
 #ifdef CONFIG_ARCH_OMAP2PLUS
@@ -2108,21 +2099,14 @@ postcore_initcall(omap_gpio_drv_reg);
 
 static int __init omap_gpio_sysinit(void)
 {
-        int ret = 0;
-
         mpuio_init();
 
 #if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2PLUS)
-        if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
-                if (ret == 0) {
-                        ret = sysdev_class_register(&omap_gpio_sysclass);
-                        if (ret == 0)
-                                ret = sysdev_register(&omap_gpio_device);
-                }
-        }
+        if (cpu_is_omap16xx() || cpu_class_is_omap2())
+                register_syscore_ops(&omap_gpio_syscore_ops);
 #endif
 
-        return ret;
+        return 0;
 }
 
 arch_initcall(omap_gpio_sysinit);
diff --git a/arch/arm/plat-omap/include/plat/display.h b/arch/arm/plat-omap/include/plat/display.h
deleted file mode 100644
index 5e04ddc18fa8..000000000000
--- a/arch/arm/plat-omap/include/plat/display.h
+++ /dev/null
@@ -1,591 +0,0 @@
-/*
- * linux/include/asm-arm/arch-omap/display.h
- *
- * Copyright (C) 2008 Nokia Corporation
- * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __ASM_ARCH_OMAP_DISPLAY_H
-#define __ASM_ARCH_OMAP_DISPLAY_H
-
-#include <linux/list.h>
-#include <linux/kobject.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <asm/atomic.h>
-
-#define DISPC_IRQ_FRAMEDONE             (1 << 0)
-#define DISPC_IRQ_VSYNC                 (1 << 1)
-#define DISPC_IRQ_EVSYNC_EVEN           (1 << 2)
-#define DISPC_IRQ_EVSYNC_ODD            (1 << 3)
-#define DISPC_IRQ_ACBIAS_COUNT_STAT     (1 << 4)
-#define DISPC_IRQ_PROG_LINE_NUM         (1 << 5)
-#define DISPC_IRQ_GFX_FIFO_UNDERFLOW    (1 << 6)
-#define DISPC_IRQ_GFX_END_WIN           (1 << 7)
-#define DISPC_IRQ_PAL_GAMMA_MASK        (1 << 8)
-#define DISPC_IRQ_OCP_ERR               (1 << 9)
-#define DISPC_IRQ_VID1_FIFO_UNDERFLOW   (1 << 10)
-#define DISPC_IRQ_VID1_END_WIN          (1 << 11)
-#define DISPC_IRQ_VID2_FIFO_UNDERFLOW   (1 << 12)
-#define DISPC_IRQ_VID2_END_WIN          (1 << 13)
-#define DISPC_IRQ_SYNC_LOST             (1 << 14)
-#define DISPC_IRQ_SYNC_LOST_DIGIT       (1 << 15)
-#define DISPC_IRQ_WAKEUP                (1 << 16)
-#define DISPC_IRQ_SYNC_LOST2            (1 << 17)
-#define DISPC_IRQ_VSYNC2                (1 << 18)
-#define DISPC_IRQ_ACBIAS_COUNT_STAT2    (1 << 21)
-#define DISPC_IRQ_FRAMEDONE2            (1 << 22)
-
-struct omap_dss_device;
-struct omap_overlay_manager;
-
-enum omap_display_type {
-        OMAP_DISPLAY_TYPE_NONE          = 0,
-        OMAP_DISPLAY_TYPE_DPI           = 1 << 0,
-        OMAP_DISPLAY_TYPE_DBI           = 1 << 1,
-        OMAP_DISPLAY_TYPE_SDI           = 1 << 2,
-        OMAP_DISPLAY_TYPE_DSI           = 1 << 3,
-        OMAP_DISPLAY_TYPE_VENC          = 1 << 4,
-        OMAP_DISPLAY_TYPE_HDMI          = 1 << 5,
-};
-
-enum omap_plane {
-        OMAP_DSS_GFX    = 0,
-        OMAP_DSS_VIDEO1 = 1,
-        OMAP_DSS_VIDEO2 = 2
-};
-
-enum omap_channel {
-        OMAP_DSS_CHANNEL_LCD    = 0,
-        OMAP_DSS_CHANNEL_DIGIT  = 1,
-        OMAP_DSS_CHANNEL_LCD2   = 2,
-};
-
-enum omap_color_mode {
-        OMAP_DSS_COLOR_CLUT1    = 1 << 0,  /* BITMAP 1 */
-        OMAP_DSS_COLOR_CLUT2    = 1 << 1,  /* BITMAP 2 */
-        OMAP_DSS_COLOR_CLUT4    = 1 << 2,  /* BITMAP 4 */
-        OMAP_DSS_COLOR_CLUT8    = 1 << 3,  /* BITMAP 8 */
-        OMAP_DSS_COLOR_RGB12U   = 1 << 4,  /* RGB12, 16-bit container */
-        OMAP_DSS_COLOR_ARGB16   = 1 << 5,  /* ARGB16 */
-        OMAP_DSS_COLOR_RGB16    = 1 << 6,  /* RGB16 */
-        OMAP_DSS_COLOR_RGB24U   = 1 << 7,  /* RGB24, 32-bit container */
-        OMAP_DSS_COLOR_RGB24P   = 1 << 8,  /* RGB24, 24-bit container */
-        OMAP_DSS_COLOR_YUV2     = 1 << 9,  /* YUV2 4:2:2 co-sited */
-        OMAP_DSS_COLOR_UYVY     = 1 << 10, /* UYVY 4:2:2 co-sited */
-        OMAP_DSS_COLOR_ARGB32   = 1 << 11, /* ARGB32 */
-        OMAP_DSS_COLOR_RGBA32   = 1 << 12, /* RGBA32 */
-        OMAP_DSS_COLOR_RGBX32   = 1 << 13, /* RGBx32 */
-};
-
-enum omap_lcd_display_type {
-        OMAP_DSS_LCD_DISPLAY_STN,
-        OMAP_DSS_LCD_DISPLAY_TFT,
-};
-
-enum omap_dss_load_mode {
-        OMAP_DSS_LOAD_CLUT_AND_FRAME    = 0,
-        OMAP_DSS_LOAD_CLUT_ONLY         = 1,
-        OMAP_DSS_LOAD_FRAME_ONLY        = 2,
-        OMAP_DSS_LOAD_CLUT_ONCE_FRAME   = 3,
-};
-
-enum omap_dss_trans_key_type {
-        OMAP_DSS_COLOR_KEY_GFX_DST = 0,
-        OMAP_DSS_COLOR_KEY_VID_SRC = 1,
-};
-
-enum omap_rfbi_te_mode {
-        OMAP_DSS_RFBI_TE_MODE_1 = 1,
-        OMAP_DSS_RFBI_TE_MODE_2 = 2,
-};
-
-enum omap_panel_config {
-        OMAP_DSS_LCD_IVS                = 1<<0,
-        OMAP_DSS_LCD_IHS                = 1<<1,
-        OMAP_DSS_LCD_IPC                = 1<<2,
-        OMAP_DSS_LCD_IEO                = 1<<3,
-        OMAP_DSS_LCD_RF                 = 1<<4,
-        OMAP_DSS_LCD_ONOFF              = 1<<5,
-
-        OMAP_DSS_LCD_TFT                = 1<<20,
-};
-
-enum omap_dss_venc_type {
-        OMAP_DSS_VENC_TYPE_COMPOSITE,
-        OMAP_DSS_VENC_TYPE_SVIDEO,
-};
-
-enum omap_display_caps {
-        OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE      = 1 << 0,
-        OMAP_DSS_DISPLAY_CAP_TEAR_ELIM          = 1 << 1,
-};
-
-enum omap_dss_update_mode {
-        OMAP_DSS_UPDATE_DISABLED = 0,
-        OMAP_DSS_UPDATE_AUTO,
-        OMAP_DSS_UPDATE_MANUAL,
-};
-
-enum omap_dss_display_state {
-        OMAP_DSS_DISPLAY_DISABLED = 0,
-        OMAP_DSS_DISPLAY_ACTIVE,
-        OMAP_DSS_DISPLAY_SUSPENDED,
-};
-
-/* XXX perhaps this should be removed */
-enum omap_dss_overlay_managers {
-        OMAP_DSS_OVL_MGR_LCD,
-        OMAP_DSS_OVL_MGR_TV,
-        OMAP_DSS_OVL_MGR_LCD2,
-};
-
-enum omap_dss_rotation_type {
-        OMAP_DSS_ROT_DMA = 0,
-        OMAP_DSS_ROT_VRFB = 1,
-};
-
-/* clockwise rotation angle */
-enum omap_dss_rotation_angle {
-        OMAP_DSS_ROT_0   = 0,
-        OMAP_DSS_ROT_90  = 1,
-        OMAP_DSS_ROT_180 = 2,
-        OMAP_DSS_ROT_270 = 3,
-};
-
-enum omap_overlay_caps {
-        OMAP_DSS_OVL_CAP_SCALE = 1 << 0,
-        OMAP_DSS_OVL_CAP_DISPC = 1 << 1,
-};
-
-enum omap_overlay_manager_caps {
-        OMAP_DSS_OVL_MGR_CAP_DISPC = 1 << 0,
-};
-
-/* RFBI */
-
-struct rfbi_timings {
-        int cs_on_time;
-        int cs_off_time;
-        int we_on_time;
-        int we_off_time;
-        int re_on_time;
-        int re_off_time;
-        int we_cycle_time;
-        int re_cycle_time;
-        int cs_pulse_width;
-        int access_time;
-
-        int clk_div;
-
-        u32 tim[5];             /* set by rfbi_convert_timings() */
-
-        int converted;
-};
-
-void omap_rfbi_write_command(const void *buf, u32 len);
-void omap_rfbi_read_data(void *buf, u32 len);
-void omap_rfbi_write_data(const void *buf, u32 len);
-void omap_rfbi_write_pixels(const void __iomem *buf, int scr_width,
-                u16 x, u16 y,
-                u16 w, u16 h);
-int omap_rfbi_enable_te(bool enable, unsigned line);
-int omap_rfbi_setup_te(enum omap_rfbi_te_mode mode,
-                             unsigned hs_pulse_time, unsigned vs_pulse_time,
-                             int hs_pol_inv, int vs_pol_inv, int extif_div);
-
-/* DSI */
-void dsi_bus_lock(void);
-void dsi_bus_unlock(void);
-int dsi_vc_dcs_write(int channel, u8 *data, int len);
-int dsi_vc_dcs_write_0(int channel, u8 dcs_cmd);
-int dsi_vc_dcs_write_1(int channel, u8 dcs_cmd, u8 param);
-int dsi_vc_dcs_write_nosync(int channel, u8 *data, int len);
-int dsi_vc_dcs_read(int channel, u8 dcs_cmd, u8 *buf, int buflen);
-int dsi_vc_dcs_read_1(int channel, u8 dcs_cmd, u8 *data);
-int dsi_vc_dcs_read_2(int channel, u8 dcs_cmd, u8 *data1, u8 *data2);
-int dsi_vc_set_max_rx_packet_size(int channel, u16 len);
-int dsi_vc_send_null(int channel);
-int dsi_vc_send_bta_sync(int channel);
-
-/* Board specific data */
-struct omap_dss_board_info {
-        int (*get_last_off_on_transaction_id)(struct device *dev);
-        int num_devices;
-        struct omap_dss_device **devices;
-        struct omap_dss_device *default_device;
-};
-
-#if defined(CONFIG_OMAP2_DSS_MODULE) || defined(CONFIG_OMAP2_DSS)
-/* Init with the board info */
-extern int omap_display_init(struct omap_dss_board_info *board_data);
-#else
-static inline int omap_display_init(struct omap_dss_board_info *board_data)
-{
-        return 0;
-}
-#endif
-
-struct omap_display_platform_data {
-        struct omap_dss_board_info *board_data;
-        /* TODO: Additional members to be added when PM is considered */
-
-        bool (*opt_clock_available)(const char *clk_role);
-};
-
-struct omap_video_timings {
-        /* Unit: pixels */
-        u16 x_res;
-        /* Unit: pixels */
-        u16 y_res;
-        /* Unit: KHz */
-        u32 pixel_clock;
-        /* Unit: pixel clocks */
-        u16 hsw;        /* Horizontal synchronization pulse width */
-        /* Unit: pixel clocks */
-        u16 hfp;        /* Horizontal front porch */
-        /* Unit: pixel clocks */
-        u16 hbp;        /* Horizontal back porch */
-        /* Unit: line clocks */
-        u16 vsw;        /* Vertical synchronization pulse width */
-        /* Unit: line clocks */
-        u16 vfp;        /* Vertical front porch */
-        /* Unit: line clocks */
-        u16 vbp;        /* Vertical back porch */
-};
-
-#ifdef CONFIG_OMAP2_DSS_VENC
-/* Hardcoded timings for tv modes. Venc only uses these to
- * identify the mode, and does not actually use the configs
- * itself. However, the configs should be something that
- * a normal monitor can also show */
-extern const struct omap_video_timings omap_dss_pal_timings;
-extern const struct omap_video_timings omap_dss_ntsc_timings;
-#endif
-
-struct omap_overlay_info {
-        bool enabled;
-
-        u32 paddr;
-        void __iomem *vaddr;
-        u16 screen_width;
-        u16 width;
-        u16 height;
-        enum omap_color_mode color_mode;
-        u8 rotation;
-        enum omap_dss_rotation_type rotation_type;
-        bool mirror;
-
-        u16 pos_x;
-        u16 pos_y;
-        u16 out_width;  /* if 0, out_width == width */
-        u16 out_height; /* if 0, out_height == height */
-        u8 global_alpha;
-        u8 pre_mult_alpha;
-};
-
-struct omap_overlay {
-        struct kobject kobj;
-        struct list_head list;
-
-        /* static fields */
-        const char *name;
-        int id;
-        enum omap_color_mode supported_modes;
-        enum omap_overlay_caps caps;
-
-        /* dynamic fields */
-        struct omap_overlay_manager *manager;
-        struct omap_overlay_info info;
-
-        /* if true, info has been changed, but not applied() yet */
-        bool info_dirty;
-
-        int (*set_manager)(struct omap_overlay *ovl,
-                struct omap_overlay_manager *mgr);
-        int (*unset_manager)(struct omap_overlay *ovl);
-
-        int (*set_overlay_info)(struct omap_overlay *ovl,
-                        struct omap_overlay_info *info);
-        void (*get_overlay_info)(struct omap_overlay *ovl,
-                        struct omap_overlay_info *info);
-
-        int (*wait_for_go)(struct omap_overlay *ovl);
-};
-
-struct omap_overlay_manager_info {
-        u32 default_color;
-
-        enum omap_dss_trans_key_type trans_key_type;
-        u32 trans_key;
-        bool trans_enabled;
-
-        bool alpha_enabled;
-};
-
-struct omap_overlay_manager {
-        struct kobject kobj;
-        struct list_head list;
-
-        /* static fields */
-        const char *name;
-        int id;
-        enum omap_overlay_manager_caps caps;
-        int num_overlays;
-        struct omap_overlay **overlays;
-        enum omap_display_type supported_displays;
-
-        /* dynamic fields */
-        struct omap_dss_device *device;
-        struct omap_overlay_manager_info info;
-
-        bool device_changed;
-        /* if true, info has been changed but not applied() yet */
-        bool info_dirty;
-
-        int (*set_device)(struct omap_overlay_manager *mgr,
-                struct omap_dss_device *dssdev);
-        int (*unset_device)(struct omap_overlay_manager *mgr);
-
-        int (*set_manager_info)(struct omap_overlay_manager *mgr,
-                        struct omap_overlay_manager_info *info);
-        void (*get_manager_info)(struct omap_overlay_manager *mgr,
-                        struct omap_overlay_manager_info *info);
-
-        int (*apply)(struct omap_overlay_manager *mgr);
-        int (*wait_for_go)(struct omap_overlay_manager *mgr);
-        int (*wait_for_vsync)(struct omap_overlay_manager *mgr);
-
-        int (*enable)(struct omap_overlay_manager *mgr);
-        int (*disable)(struct omap_overlay_manager *mgr);
-};
-
-struct omap_dss_device {
-        struct device dev;
-
-        enum omap_display_type type;
-
-        enum omap_channel channel;
-
-        union {
-                struct {
-                        u8 data_lines;
-                } dpi;
-
-                struct {
-                        u8 channel;
-                        u8 data_lines;
-                } rfbi;
-
-                struct {
-                        u8 datapairs;
-                } sdi;
-
-                struct {
-                        u8 clk_lane;
-                        u8 clk_pol;
-                        u8 data1_lane;
-                        u8 data1_pol;
-                        u8 data2_lane;
-                        u8 data2_pol;
-
-                        struct {
-                                u16 regn;
-                                u16 regm;
-                                u16 regm_dispc;
-                                u16 regm_dsi;
-
-                                u16 lp_clk_div;
-
-                                u16 lck_div;
-                                u16 pck_div;
-                        } div;
-
-                        bool ext_te;
-                        u8 ext_te_gpio;
-                } dsi;
-
-                struct {
-                        enum omap_dss_venc_type type;
-                        bool invert_polarity;
-                } venc;
-        } phy;
-
-        struct {
-                struct omap_video_timings timings;
-
-                int acbi;       /* ac-bias pin transitions per interrupt */
-                /* Unit: line clocks */
-                int acb;        /* ac-bias pin frequency */
-
-                enum omap_panel_config config;
-        } panel;
-
-        struct {
-                u8 pixel_size;
-                struct rfbi_timings rfbi_timings;
-        } ctrl;
-
-        int reset_gpio;
-
-        int max_backlight_level;
-
-        const char *name;
-
-        /* used to match device to driver */
-        const char *driver_name;
-
-        void *data;
-
-        struct omap_dss_driver *driver;
-
-        /* helper variable for driver suspend/resume */
-        bool activate_after_resume;
-
-        enum omap_display_caps caps;
-
-        struct omap_overlay_manager *manager;
-
-        enum omap_dss_display_state state;
-
-        /* platform specific  */
-        int (*platform_enable)(struct omap_dss_device *dssdev);
-        void (*platform_disable)(struct omap_dss_device *dssdev);
-        int (*set_backlight)(struct omap_dss_device *dssdev, int level);
-        int (*get_backlight)(struct omap_dss_device *dssdev);
-};
-
-struct omap_dss_driver {
-        struct device_driver driver;
-
-        int (*probe)(struct omap_dss_device *);
-        void (*remove)(struct omap_dss_device *);
-
-        int (*enable)(struct omap_dss_device *display);
-        void (*disable)(struct omap_dss_device *display);
-        int (*suspend)(struct omap_dss_device *display);
-        int (*resume)(struct omap_dss_device *display);
-        int (*run_test)(struct omap_dss_device *display, int test);
-
-        int (*set_update_mode)(struct omap_dss_device *dssdev,
-                        enum omap_dss_update_mode);
-        enum omap_dss_update_mode (*get_update_mode)(
-                        struct omap_dss_device *dssdev);
-
-        int (*update)(struct omap_dss_device *dssdev,
-                               u16 x, u16 y, u16 w, u16 h);
-        int (*sync)(struct omap_dss_device *dssdev);
-
-        int (*enable_te)(struct omap_dss_device *dssdev, bool enable);
-        int (*get_te)(struct omap_dss_device *dssdev);
-
-        u8 (*get_rotate)(struct omap_dss_device *dssdev);
-        int (*set_rotate)(struct omap_dss_device *dssdev, u8 rotate);
-
-        bool (*get_mirror)(struct omap_dss_device *dssdev);
-        int (*set_mirror)(struct omap_dss_device *dssdev, bool enable);
-
-        int (*memory_read)(struct omap_dss_device *dssdev,
-                        void *buf, size_t size,
-                        u16 x, u16 y, u16 w, u16 h);
-
-        void (*get_resolution)(struct omap_dss_device *dssdev,
-                        u16 *xres, u16 *yres);
-        int (*get_recommended_bpp)(struct omap_dss_device *dssdev);
-
-        int (*check_timings)(struct omap_dss_device *dssdev,
-                        struct omap_video_timings *timings);
-        void (*set_timings)(struct omap_dss_device *dssdev,
-                        struct omap_video_timings *timings);
-        void (*get_timings)(struct omap_dss_device *dssdev,
-                        struct omap_video_timings *timings);
-
-        int (*set_wss)(struct omap_dss_device *dssdev, u32 wss);
-        u32 (*get_wss)(struct omap_dss_device *dssdev);
-};
-
-int omap_dss_register_driver(struct omap_dss_driver *);
-void omap_dss_unregister_driver(struct omap_dss_driver *);
-
-int omap_dss_register_device(struct omap_dss_device *);
-void omap_dss_unregister_device(struct omap_dss_device *);
-
-void omap_dss_get_device(struct omap_dss_device *dssdev);
-void omap_dss_put_device(struct omap_dss_device *dssdev);
-#define for_each_dss_dev(d) while ((d = omap_dss_get_next_device(d)) != NULL)
-struct omap_dss_device *omap_dss_get_next_device(struct omap_dss_device *from);
-struct omap_dss_device *omap_dss_find_device(void *data,
-                int (*match)(struct omap_dss_device *dssdev, void *data));
-
-int omap_dss_start_device(struct omap_dss_device *dssdev);
-void omap_dss_stop_device(struct omap_dss_device *dssdev);
-
-int omap_dss_get_num_overlay_managers(void);
-struct omap_overlay_manager *omap_dss_get_overlay_manager(int num);
-
-int omap_dss_get_num_overlays(void);
-struct omap_overlay *omap_dss_get_overlay(int num);
-
-void omapdss_default_get_resolution(struct omap_dss_device *dssdev,
-                u16 *xres, u16 *yres);
-int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev);
-
-typedef void (*omap_dispc_isr_t) (void *arg, u32 mask);
-int omap_dispc_register_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
-int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask);
-
-int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout);
-int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask,
-                unsigned long timeout);
-
-#define to_dss_driver(x) container_of((x), struct omap_dss_driver, driver)
-#define to_dss_device(x) container_of((x), struct omap_dss_device, dev)
-
-void omapdss_dsi_vc_enable_hs(int channel, bool enable);
-int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable);
-
-int omap_dsi_prepare_update(struct omap_dss_device *dssdev,
-                                    u16 *x, u16 *y, u16 *w, u16 *h,
-                                    bool enlarge_update_area);
-int omap_dsi_update(struct omap_dss_device *dssdev,
-                int channel,
-                u16 x, u16 y, u16 w, u16 h,
-                void (*callback)(int, void *), void *data);
-int omap_dsi_request_vc(struct omap_dss_device *dssdev, int *channel);
-int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id);
-void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel);
-
-int omapdss_dsi_display_enable(struct omap_dss_device *dssdev);
-void omapdss_dsi_display_disable(struct omap_dss_device *dssdev);
-
-int omapdss_dpi_display_enable(struct omap_dss_device *dssdev);
-void omapdss_dpi_display_disable(struct omap_dss_device *dssdev);
-void dpi_set_timings(struct omap_dss_device *dssdev,
-                        struct omap_video_timings *timings);
-int dpi_check_timings(struct omap_dss_device *dssdev,
-                        struct omap_video_timings *timings);
-
-int omapdss_sdi_display_enable(struct omap_dss_device *dssdev);
-void omapdss_sdi_display_disable(struct omap_dss_device *dssdev);
-
-int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev);
-void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev);
-int omap_rfbi_prepare_update(struct omap_dss_device *dssdev,
-                u16 *x, u16 *y, u16 *w, u16 *h);
-int omap_rfbi_update(struct omap_dss_device *dssdev,
-                u16 x, u16 y, u16 w, u16 h,
-                void (*callback)(void *), void *data);
-
-#endif
diff --git a/arch/arm/plat-omap/include/plat/flash.h b/arch/arm/plat-omap/include/plat/flash.h
index 3e6327016b40..3083195123ea 100644
--- a/arch/arm/plat-omap/include/plat/flash.h
+++ b/arch/arm/plat-omap/include/plat/flash.h
@@ -11,6 +11,6 @@
 
 #include <linux/mtd/map.h>
 
-extern void omap1_set_vpp(struct map_info *map, int enable);
+extern void omap1_set_vpp(struct platform_device *pdev, int enable);
 
 #endif
diff --git a/arch/arm/plat-omap/include/plat/nokia-dsi-panel.h b/arch/arm/plat-omap/include/plat/nokia-dsi-panel.h
deleted file mode 100644
index 01ab6572ccbb..000000000000
--- a/arch/arm/plat-omap/include/plat/nokia-dsi-panel.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H
-#define __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H
-
-#include "display.h"
-
-/**
- * struct nokia_dsi_panel_data - Nokia DSI panel driver configuration
- * @name: panel name
- * @use_ext_te: use external TE
- * @ext_te_gpio: external TE GPIO
- * @use_esd_check: perform ESD checks
- * @max_backlight_level: maximum backlight level
- * @set_backlight: pointer to backlight set function
- * @get_backlight: pointer to backlight get function
- */
-struct nokia_dsi_panel_data {
-        const char *name;
-
-        int reset_gpio;
-
-        bool use_ext_te;
-        int ext_te_gpio;
-
-        bool use_esd_check;
-
-        int max_backlight_level;
-        int (*set_backlight)(struct omap_dss_device *dssdev, int level);
-        int (*get_backlight)(struct omap_dss_device *dssdev);
-};
-
-#endif /* __ARCH_ARM_PLAT_OMAP_NOKIA_DSI_PANEL_H */
diff --git a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h b/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
deleted file mode 100644
index 790619734bcd..000000000000
--- a/arch/arm/plat-omap/include/plat/panel-generic-dpi.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Header for generic DPI panel driver
- *
- * Copyright (C) 2010 Canonical Ltd.
- * Author: Bryan Wu <bryan.wu@canonical.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
-#define __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H
-
-#include "display.h"
-
-/**
- * struct panel_generic_dpi_data - panel driver configuration data
- * @name: panel name
- * @platform_enable: platform specific panel enable function
- * @platform_disable: platform specific panel disable function
- */
-struct panel_generic_dpi_data {
-        const char *name;
-        int (*platform_enable)(struct omap_dss_device *dssdev);
-        void (*platform_disable)(struct omap_dss_device *dssdev);
-};
-
-#endif /* __ARCH_ARM_PLAT_OMAP_PANEL_GENERIC_DPI_H */
diff --git a/arch/arm/plat-omap/include/plat/smp.h b/arch/arm/plat-omap/include/plat/smp.h
deleted file mode 100644
index 7a10257909ef..000000000000
--- a/arch/arm/plat-omap/include/plat/smp.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * OMAP4 machine specific smp.h
- *
- * Copyright (C) 2009 Texas Instruments, Inc.
- *
- * Author:
- *      Santosh Shilimkar <santosh.shilimkar@ti.com>
- *
- * Interface functions needed for the SMP. This file is based on arm
- * realview smp platform.
- * Copyright (c) 2003 ARM Limited.
- *
- * 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.
- */
-#ifndef OMAP_ARCH_SMP_H
-#define OMAP_ARCH_SMP_H
-
-#include <asm/hardware/gic.h>
-
-/* Needed for secondary core boot */
-extern void omap_secondary_startup(void);
-extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask);
-extern void omap_auxcoreboot_addr(u32 cpu_addr);
-extern u32 omap_read_auxcoreboot0(void);
-
-/*
- * We use Soft IRQ1 as the IPI
- */
-static inline void smp_cross_call(const struct cpumask *mask, int ipi)
-{
-        gic_raise_softirq(mask, ipi);
-}
-
-#endif
diff --git a/arch/arm/plat-omap/include/plat/uncompress.h b/arch/arm/plat-omap/include/plat/uncompress.h
index 30b891c4a93f..565d2664f5a7 100644
--- a/arch/arm/plat-omap/include/plat/uncompress.h
+++ b/arch/arm/plat-omap/include/plat/uncompress.h
@@ -27,8 +27,8 @@
 
 #define MDR1_MODE_MASK                  0x07
 
-static volatile u8 *uart_base;
-static int uart_shift;
+volatile u8 *uart_base;
+int uart_shift;
 
 /*
  * Store the DEBUG_LL uart number into memory.
diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c
index 9bbda9acb73b..a37b8eb65b76 100644
--- a/arch/arm/plat-omap/omap_device.c
+++ b/arch/arm/plat-omap/omap_device.c
@@ -536,6 +536,28 @@ int omap_early_device_register(struct omap_device *od)
         return 0;
 }
 
+static int _od_runtime_suspend(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+
+        return omap_device_idle(pdev);
+}
+
+static int _od_runtime_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+
+        return omap_device_enable(pdev);
+}
+
+static struct dev_power_domain omap_device_power_domain = {
+        .ops = {
+                .runtime_suspend = _od_runtime_suspend,
+                .runtime_resume = _od_runtime_resume,
+                USE_PLATFORM_PM_SLEEP_OPS
+        }
+};
+
 /**
  * omap_device_register - register an omap_device with one omap_hwmod
  * @od: struct omap_device * to register
@@ -549,6 +571,7 @@ int omap_device_register(struct omap_device *od)
         pr_debug("omap_device: %s: registering\n", od->pdev.name);
 
         od->pdev.dev.parent = &omap_device_parent;
+        od->pdev.dev.pwr_domain = &omap_device_power_domain;
         return platform_device_register(&od->pdev);
 }
 
diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile
index 56021a72e10c..95a5fc53b6db 100644
--- a/arch/arm/plat-orion/Makefile
+++ b/arch/arm/plat-orion/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the linux kernel.
 #
 
-obj-y   := irq.o pcie.o time.o
+obj-y   := irq.o pcie.o time.o common.o mpp.o
 obj-m   :=
 obj-n   :=
 obj-    :=
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
new file mode 100644
index 000000000000..9e5451b3c8e3
--- /dev/null
+++ b/arch/arm/plat-orion/common.c
@@ -0,0 +1,957 @@
+/*
+ * arch/arm/plat-orion/common.c
+ *
+ * Marvell Orion SoC common setup code used by multiple mach-/common.c
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/dma-mapping.h>
+#include <linux/serial_8250.h>
+#include <linux/mbus.h>
+#include <linux/ata_platform.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/mv643xx_i2c.h>
+#include <net/dsa.h>
+#include <linux/spi/orion_spi.h>
+#include <plat/orion_wdt.h>
+#include <plat/mv_xor.h>
+#include <plat/ehci-orion.h>
+
+/* Fill in the resources structure and link it into the platform
+   device structure. There is always a memory region, and nearly
+   always an interrupt.*/
+static void fill_resources(struct platform_device *device,
+                           struct resource *resources,
+                           resource_size_t mapbase,
+                           resource_size_t size,
+                           unsigned int irq)
+{
+        device->resource = resources;
+        device->num_resources = 1;
+        resources[0].flags = IORESOURCE_MEM;
+        resources[0].start = mapbase;
+        resources[0].end = mapbase + size;
+
+        if (irq != NO_IRQ) {
+                device->num_resources++;
+                resources[1].flags = IORESOURCE_IRQ;
+                resources[1].start = irq;
+                resources[1].end = irq;
+        }
+}
+
+/*****************************************************************************
+ * UART
+ ****************************************************************************/
+static void __init uart_complete(
+        struct platform_device *orion_uart,
+        struct plat_serial8250_port *data,
+        struct resource *resources,
+        unsigned int membase,
+        resource_size_t mapbase,
+        unsigned int irq,
+        unsigned int uartclk)
+{
+        data->mapbase = mapbase;
+        data->membase = (void __iomem *)membase;
+        data->irq = irq;
+        data->uartclk = uartclk;
+        orion_uart->dev.platform_data = data;
+
+        fill_resources(orion_uart, resources, mapbase, 0xff, irq);
+        platform_device_register(orion_uart);
+}
+
+/*****************************************************************************
+ * UART0
+ ****************************************************************************/
+static struct plat_serial8250_port orion_uart0_data[] = {
+        {
+                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+        }, {
+        },
+};
+
+static struct resource orion_uart0_resources[2];
+
+static struct platform_device orion_uart0 = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM,
+};
+
+void __init orion_uart0_init(unsigned int membase,
+                             resource_size_t mapbase,
+                             unsigned int irq,
+                             unsigned int uartclk)
+{
+        uart_complete(&orion_uart0, orion_uart0_data, orion_uart0_resources,
+                      membase, mapbase, irq, uartclk);
+}
+
+/*****************************************************************************
+ * UART1
+ ****************************************************************************/
+static struct plat_serial8250_port orion_uart1_data[] = {
+        {
+                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+        }, {
+        },
+};
+
+static struct resource orion_uart1_resources[2];
+
+static struct platform_device orion_uart1 = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM1,
+};
+
+void __init orion_uart1_init(unsigned int membase,
+                             resource_size_t mapbase,
+                             unsigned int irq,
+                             unsigned int uartclk)
+{
+        uart_complete(&orion_uart1, orion_uart1_data, orion_uart1_resources,
+                      membase, mapbase, irq, uartclk);
+}
+
+/*****************************************************************************
+ * UART2
+ ****************************************************************************/
+static struct plat_serial8250_port orion_uart2_data[] = {
+        {
+                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+        }, {
+        },
+};
+
+static struct resource orion_uart2_resources[2];
+
+static struct platform_device orion_uart2 = {
+        .name                   = "serial8250",
+        .id                     = PLAT8250_DEV_PLATFORM2,
+};
+
+void __init orion_uart2_init(unsigned int membase,
+                             resource_size_t mapbase,
+                             unsigned int irq,
+                             unsigned int uartclk)
+{
+        uart_complete(&orion_uart2, orion_uart2_data, orion_uart2_resources,
+                      membase, mapbase, irq, uartclk);
+}
+
+/*****************************************************************************
+ * UART3
+ ****************************************************************************/
+static struct plat_serial8250_port orion_uart3_data[] = {
+        {
+                .flags          = UPF_SKIP_TEST | UPF_BOOT_AUTOCONF,
+                .iotype         = UPIO_MEM,
+                .regshift       = 2,
+        }, {
+        },
+};
+
+static struct resource orion_uart3_resources[2];
+
+static struct platform_device orion_uart3 = {
+        .name                   = "serial8250",
+        .id                     = 3,
+};
+
+void __init orion_uart3_init(unsigned int membase,
+                             resource_size_t mapbase,
+                             unsigned int irq,
+                             unsigned int uartclk)
+{
+        uart_complete(&orion_uart3, orion_uart3_data, orion_uart3_resources,
+                      membase, mapbase, irq, uartclk);
+}
+
+/*****************************************************************************
+ * SoC RTC
+ ****************************************************************************/
+static struct resource orion_rtc_resource[2];
+
+void __init orion_rtc_init(unsigned long mapbase,
+                           unsigned long irq)
+{
+        orion_rtc_resource[0].start = mapbase;
+        orion_rtc_resource[0].end = mapbase + SZ_32 - 1;
+        orion_rtc_resource[0].flags = IORESOURCE_MEM;
+        orion_rtc_resource[1].start = irq;
+        orion_rtc_resource[1].end = irq;
+        orion_rtc_resource[1].flags = IORESOURCE_IRQ;
+
+        platform_device_register_simple("rtc-mv", -1, orion_rtc_resource, 2);
+}
+
+/*****************************************************************************
+ * GE
+ ****************************************************************************/
+static __init void ge_complete(
+        struct mv643xx_eth_shared_platform_data *orion_ge_shared_data,
+        struct mbus_dram_target_info *mbus_dram_info, int tclk,
+        struct resource *orion_ge_resource, unsigned long irq,
+        struct platform_device *orion_ge_shared,
+        struct mv643xx_eth_platform_data *eth_data,
+        struct platform_device *orion_ge)
+{
+        orion_ge_shared_data->dram = mbus_dram_info;
+        orion_ge_shared_data->t_clk = tclk;
+        orion_ge_resource->start = irq;
+        orion_ge_resource->end = irq;
+        eth_data->shared = orion_ge_shared;
+        orion_ge->dev.platform_data = eth_data;
+
+        platform_device_register(orion_ge_shared);
+        platform_device_register(orion_ge);
+}
+
+/*****************************************************************************
+ * GE00
+ ****************************************************************************/
+struct mv643xx_eth_shared_platform_data orion_ge00_shared_data;
+
+static struct resource orion_ge00_shared_resources[] = {
+        {
+                .name   = "ge00 base",
+        }, {
+                .name   = "ge00 err irq",
+        },
+};
+
+static struct platform_device orion_ge00_shared = {
+        .name           = MV643XX_ETH_SHARED_NAME,
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &orion_ge00_shared_data,
+        },
+};
+
+static struct resource orion_ge00_resources[] = {
+        {
+                .name   = "ge00 irq",
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device orion_ge00 = {
+        .name           = MV643XX_ETH_NAME,
+        .id             = 0,
+        .num_resources  = 1,
+        .resource       = orion_ge00_resources,
+        .dev            = {
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
+                            struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase,
+                            unsigned long irq,
+                            unsigned long irq_err,
+                            int tclk)
+{
+        fill_resources(&orion_ge00_shared, orion_ge00_shared_resources,
+                       mapbase + 0x2000, SZ_16K - 1, irq_err);
+        ge_complete(&orion_ge00_shared_data, mbus_dram_info, tclk,
+                    orion_ge00_resources, irq, &orion_ge00_shared,
+                    eth_data, &orion_ge00);
+}
+
+/*****************************************************************************
+ * GE01
+ ****************************************************************************/
+struct mv643xx_eth_shared_platform_data orion_ge01_shared_data = {
+        .shared_smi     = &orion_ge00_shared,
+};
+
+static struct resource orion_ge01_shared_resources[] = {
+        {
+                .name   = "ge01 base",
+        }, {
+                .name   = "ge01 err irq",
+        },
+};
+
+static struct platform_device orion_ge01_shared = {
+        .name           = MV643XX_ETH_SHARED_NAME,
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &orion_ge01_shared_data,
+        },
+};
+
+static struct resource orion_ge01_resources[] = {
+        {
+                .name   = "ge01 irq",
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device orion_ge01 = {
+        .name           = MV643XX_ETH_NAME,
+        .id             = 1,
+        .num_resources  = 1,
+        .resource       = orion_ge01_resources,
+        .dev            = {
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
+                            struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase,
+                            unsigned long irq,
+                            unsigned long irq_err,
+                            int tclk)
+{
+        fill_resources(&orion_ge01_shared, orion_ge01_shared_resources,
+                       mapbase + 0x2000, SZ_16K - 1, irq_err);
+        ge_complete(&orion_ge01_shared_data, mbus_dram_info, tclk,
+                    orion_ge01_resources, irq, &orion_ge01_shared,
+                    eth_data, &orion_ge01);
+}
+
+/*****************************************************************************
+ * GE10
+ ****************************************************************************/
+struct mv643xx_eth_shared_platform_data orion_ge10_shared_data = {
+        .shared_smi     = &orion_ge00_shared,
+};
+
+static struct resource orion_ge10_shared_resources[] = {
+        {
+                .name   = "ge10 base",
+        }, {
+                .name   = "ge10 err irq",
+        },
+};
+
+static struct platform_device orion_ge10_shared = {
+        .name           = MV643XX_ETH_SHARED_NAME,
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &orion_ge10_shared_data,
+        },
+};
+
+static struct resource orion_ge10_resources[] = {
+        {
+                .name   = "ge10 irq",
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device orion_ge10 = {
+        .name           = MV643XX_ETH_NAME,
+        .id             = 1,
+        .num_resources  = 2,
+        .resource       = orion_ge10_resources,
+        .dev            = {
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,
+                            struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase,
+                            unsigned long irq,
+                            unsigned long irq_err,
+                            int tclk)
+{
+        fill_resources(&orion_ge10_shared, orion_ge10_shared_resources,
+                       mapbase + 0x2000, SZ_16K - 1, irq_err);
+        ge_complete(&orion_ge10_shared_data, mbus_dram_info, tclk,
+                    orion_ge10_resources, irq, &orion_ge10_shared,
+                    eth_data, &orion_ge10);
+}
+
+/*****************************************************************************
+ * GE11
+ ****************************************************************************/
+struct mv643xx_eth_shared_platform_data orion_ge11_shared_data = {
+        .shared_smi     = &orion_ge00_shared,
+};
+
+static struct resource orion_ge11_shared_resources[] = {
+        {
+                .name   = "ge11 base",
+        }, {
+                .name   = "ge11 err irq",
+        },
+};
+
+static struct platform_device orion_ge11_shared = {
+        .name           = MV643XX_ETH_SHARED_NAME,
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &orion_ge11_shared_data,
+        },
+};
+
+static struct resource orion_ge11_resources[] = {
+        {
+                .name   = "ge11 irq",
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device orion_ge11 = {
+        .name           = MV643XX_ETH_NAME,
+        .id             = 1,
+        .num_resources  = 2,
+        .resource       = orion_ge11_resources,
+        .dev            = {
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
+                            struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase,
+                            unsigned long irq,
+                            unsigned long irq_err,
+                            int tclk)
+{
+        fill_resources(&orion_ge11_shared, orion_ge11_shared_resources,
+                       mapbase + 0x2000, SZ_16K - 1, irq_err);
+        ge_complete(&orion_ge11_shared_data, mbus_dram_info, tclk,
+                    orion_ge11_resources, irq, &orion_ge11_shared,
+                    eth_data, &orion_ge11);
+}
+
+/*****************************************************************************
+ * Ethernet switch
+ ****************************************************************************/
+static struct resource orion_switch_resources[] = {
+        {
+                .start  = 0,
+                .end    = 0,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device orion_switch_device = {
+        .name           = "dsa",
+        .id             = 0,
+        .num_resources  = 0,
+        .resource       = orion_switch_resources,
+};
+
+void __init orion_ge00_switch_init(struct dsa_platform_data *d, int irq)
+{
+        int i;
+
+        if (irq != NO_IRQ) {
+                orion_switch_resources[0].start = irq;
+                orion_switch_resources[0].end = irq;
+                orion_switch_device.num_resources = 1;
+        }
+
+        d->netdev = &orion_ge00.dev;
+        for (i = 0; i < d->nr_chips; i++)
+                d->chip[i].mii_bus = &orion_ge00_shared.dev;
+        orion_switch_device.dev.platform_data = d;
+
+        platform_device_register(&orion_switch_device);
+}
+
+/*****************************************************************************
+ * I2C
+ ****************************************************************************/
+static struct mv64xxx_i2c_pdata orion_i2c_pdata = {
+        .freq_n         = 3,
+        .timeout        = 1000, /* Default timeout of 1 second */
+};
+
+static struct resource orion_i2c_resources[2];
+
+static struct platform_device orion_i2c = {
+        .name           = MV64XXX_I2C_CTLR_NAME,
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &orion_i2c_pdata,
+        },
+};
+
+static struct mv64xxx_i2c_pdata orion_i2c_1_pdata = {
+        .freq_n         = 3,
+        .timeout        = 1000, /* Default timeout of 1 second */
+};
+
+static struct resource orion_i2c_1_resources[2];
+
+static struct platform_device orion_i2c_1 = {
+        .name           = MV64XXX_I2C_CTLR_NAME,
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &orion_i2c_1_pdata,
+        },
+};
+
+void __init orion_i2c_init(unsigned long mapbase,
+                           unsigned long irq,
+                           unsigned long freq_m)
+{
+        orion_i2c_pdata.freq_m = freq_m;
+        fill_resources(&orion_i2c, orion_i2c_resources, mapbase,
+                       SZ_32 - 1, irq);
+        platform_device_register(&orion_i2c);
+}
+
+void __init orion_i2c_1_init(unsigned long mapbase,
+                             unsigned long irq,
+                             unsigned long freq_m)
+{
+        orion_i2c_1_pdata.freq_m = freq_m;
+        fill_resources(&orion_i2c_1, orion_i2c_1_resources, mapbase,
+                       SZ_32 - 1, irq);
+        platform_device_register(&orion_i2c_1);
+}
+
+/*****************************************************************************
+ * SPI
+ ****************************************************************************/
+static struct orion_spi_info orion_spi_plat_data;
+static struct resource orion_spi_resources;
+
+static struct platform_device orion_spi = {
+        .name           = "orion_spi",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &orion_spi_plat_data,
+        },
+};
+
+static struct orion_spi_info orion_spi_1_plat_data;
+static struct resource orion_spi_1_resources;
+
+static struct platform_device orion_spi_1 = {
+        .name           = "orion_spi",
+        .id             = 1,
+        .dev            = {
+                .platform_data  = &orion_spi_1_plat_data,
+        },
+};
+
+/* Note: The SPI silicon core does have interrupts. However the
+ * current Linux software driver does not use interrupts. */
+
+void __init orion_spi_init(unsigned long mapbase,
+                           unsigned long tclk)
+{
+        orion_spi_plat_data.tclk = tclk;
+        fill_resources(&orion_spi, &orion_spi_resources,
+                       mapbase, SZ_512 - 1, NO_IRQ);
+        platform_device_register(&orion_spi);
+}
+
+void __init orion_spi_1_init(unsigned long mapbase,
+                             unsigned long tclk)
+{
+        orion_spi_1_plat_data.tclk = tclk;
+        fill_resources(&orion_spi_1, &orion_spi_1_resources,
+                       mapbase, SZ_512 - 1, NO_IRQ);
+        platform_device_register(&orion_spi_1);
+}
+
+/*****************************************************************************
+ * Watchdog
+ ****************************************************************************/
+static struct orion_wdt_platform_data orion_wdt_data;
+
+static struct platform_device orion_wdt_device = {
+        .name           = "orion_wdt",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &orion_wdt_data,
+        },
+        .num_resources  = 0,
+};
+
+void __init orion_wdt_init(unsigned long tclk)
+{
+        orion_wdt_data.tclk = tclk;
+        platform_device_register(&orion_wdt_device);
+}
+
+/*****************************************************************************
+ * XOR
+ ****************************************************************************/
+static struct mv_xor_platform_shared_data orion_xor_shared_data;
+
+static u64 orion_xor_dmamask = DMA_BIT_MASK(32);
+
+void __init orion_xor_init_channels(
+        struct mv_xor_platform_data *orion_xor0_data,
+        struct platform_device *orion_xor0_channel,
+        struct mv_xor_platform_data *orion_xor1_data,
+        struct platform_device *orion_xor1_channel)
+{
+        /*
+         * two engines can't do memset simultaneously, this limitation
+         * satisfied by removing memset support from one of the engines.
+         */
+        dma_cap_set(DMA_MEMCPY, orion_xor0_data->cap_mask);
+        dma_cap_set(DMA_XOR, orion_xor0_data->cap_mask);
+        platform_device_register(orion_xor0_channel);
+
+        dma_cap_set(DMA_MEMCPY, orion_xor1_data->cap_mask);
+        dma_cap_set(DMA_MEMSET, orion_xor1_data->cap_mask);
+        dma_cap_set(DMA_XOR, orion_xor1_data->cap_mask);
+        platform_device_register(orion_xor1_channel);
+}
+
+/*****************************************************************************
+ * XOR0
+ ****************************************************************************/
+static struct resource orion_xor0_shared_resources[] = {
+        {
+                .name   = "xor 0 low",
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .name   = "xor 0 high",
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device orion_xor0_shared = {
+        .name           = MV_XOR_SHARED_NAME,
+        .id             = 0,
+        .dev            = {
+                .platform_data = &orion_xor_shared_data,
+        },
+        .num_resources  = ARRAY_SIZE(orion_xor0_shared_resources),
+        .resource       = orion_xor0_shared_resources,
+};
+
+static struct resource orion_xor00_resources[] = {
+        [0] = {
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct mv_xor_platform_data orion_xor00_data = {
+        .shared         = &orion_xor0_shared,
+        .hw_id          = 0,
+        .pool_size      = PAGE_SIZE,
+};
+
+static struct platform_device orion_xor00_channel = {
+        .name           = MV_XOR_NAME,
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(orion_xor00_resources),
+        .resource       = orion_xor00_resources,
+        .dev            = {
+                .dma_mask               = &orion_xor_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(64),
+                .platform_data          = &orion_xor00_data,
+        },
+};
+
+static struct resource orion_xor01_resources[] = {
+        [0] = {
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct mv_xor_platform_data orion_xor01_data = {
+        .shared         = &orion_xor0_shared,
+        .hw_id          = 1,
+        .pool_size      = PAGE_SIZE,
+};
+
+static struct platform_device orion_xor01_channel = {
+        .name           = MV_XOR_NAME,
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(orion_xor01_resources),
+        .resource       = orion_xor01_resources,
+        .dev            = {
+                .dma_mask               = &orion_xor_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(64),
+                .platform_data          = &orion_xor01_data,
+        },
+};
+
+void __init orion_xor0_init(struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase_low,
+                            unsigned long mapbase_high,
+                            unsigned long irq_0,
+                            unsigned long irq_1)
+{
+        orion_xor_shared_data.dram = mbus_dram_info;
+
+        orion_xor0_shared_resources[0].start = mapbase_low;
+        orion_xor0_shared_resources[0].end = mapbase_low + 0xff;
+        orion_xor0_shared_resources[1].start = mapbase_high;
+        orion_xor0_shared_resources[1].end = mapbase_high + 0xff;
+
+        orion_xor00_resources[0].start = irq_0;
+        orion_xor00_resources[0].end = irq_0;
+        orion_xor01_resources[0].start = irq_1;
+        orion_xor01_resources[0].end = irq_1;
+
+        platform_device_register(&orion_xor0_shared);
+
+        orion_xor_init_channels(&orion_xor00_data, &orion_xor00_channel,
+                                &orion_xor01_data, &orion_xor01_channel);
+}
+
+/*****************************************************************************
+ * XOR1
+ ****************************************************************************/
+static struct resource orion_xor1_shared_resources[] = {
+        {
+                .name   = "xor 1 low",
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .name   = "xor 1 high",
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device orion_xor1_shared = {
+        .name           = MV_XOR_SHARED_NAME,
+        .id             = 1,
+        .dev            = {
+                .platform_data = &orion_xor_shared_data,
+        },
+        .num_resources  = ARRAY_SIZE(orion_xor1_shared_resources),
+        .resource       = orion_xor1_shared_resources,
+};
+
+static struct resource orion_xor10_resources[] = {
+        [0] = {
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct mv_xor_platform_data orion_xor10_data = {
+        .shared         = &orion_xor1_shared,
+        .hw_id          = 0,
+        .pool_size      = PAGE_SIZE,
+};
+
+static struct platform_device orion_xor10_channel = {
+        .name           = MV_XOR_NAME,
+        .id             = 2,
+        .num_resources  = ARRAY_SIZE(orion_xor10_resources),
+        .resource       = orion_xor10_resources,
+        .dev            = {
+                .dma_mask               = &orion_xor_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(64),
+                .platform_data          = &orion_xor10_data,
+        },
+};
+
+static struct resource orion_xor11_resources[] = {
+        [0] = {
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct mv_xor_platform_data orion_xor11_data = {
+        .shared         = &orion_xor1_shared,
+        .hw_id          = 1,
+        .pool_size      = PAGE_SIZE,
+};
+
+static struct platform_device orion_xor11_channel = {
+        .name           = MV_XOR_NAME,
+        .id             = 3,
+        .num_resources  = ARRAY_SIZE(orion_xor11_resources),
+        .resource       = orion_xor11_resources,
+        .dev            = {
+                .dma_mask               = &orion_xor_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(64),
+                .platform_data          = &orion_xor11_data,
+        },
+};
+
+void __init orion_xor1_init(unsigned long mapbase_low,
+                            unsigned long mapbase_high,
+                            unsigned long irq_0,
+                            unsigned long irq_1)
+{
+        orion_xor1_shared_resources[0].start = mapbase_low;
+        orion_xor1_shared_resources[0].end = mapbase_low + 0xff;
+        orion_xor1_shared_resources[1].start = mapbase_high;
+        orion_xor1_shared_resources[1].end = mapbase_high + 0xff;
+
+        orion_xor10_resources[0].start = irq_0;
+        orion_xor10_resources[0].end = irq_0;
+        orion_xor11_resources[0].start = irq_1;
+        orion_xor11_resources[0].end = irq_1;
+
+        platform_device_register(&orion_xor1_shared);
+
+        orion_xor_init_channels(&orion_xor10_data, &orion_xor10_channel,
+                                &orion_xor11_data, &orion_xor11_channel);
+}
+
+/*****************************************************************************
+ * EHCI
+ ****************************************************************************/
+static struct orion_ehci_data orion_ehci_data = {
+        .phy_version    = EHCI_PHY_NA,
+};
+
+static u64 ehci_dmamask = DMA_BIT_MASK(32);
+
+
+/*****************************************************************************
+ * EHCI0
+ ****************************************************************************/
+static struct resource orion_ehci_resources[2];
+
+static struct platform_device orion_ehci = {
+        .name           = "orion-ehci",
+        .id             = 0,
+        .dev            = {
+                .dma_mask               = &ehci_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+                .platform_data          = &orion_ehci_data,
+        },
+};
+
+void __init orion_ehci_init(struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase,
+                            unsigned long irq)
+{
+        orion_ehci_data.dram = mbus_dram_info;
+        fill_resources(&orion_ehci, orion_ehci_resources, mapbase, SZ_4K - 1,
+                       irq);
+
+        platform_device_register(&orion_ehci);
+}
+
+/*****************************************************************************
+ * EHCI1
+ ****************************************************************************/
+static struct resource orion_ehci_1_resources[2];
+
+static struct platform_device orion_ehci_1 = {
+        .name           = "orion-ehci",
+        .id             = 1,
+        .dev            = {
+                .dma_mask               = &ehci_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+                .platform_data          = &orion_ehci_data,
+        },
+};
+
+void __init orion_ehci_1_init(struct mbus_dram_target_info *mbus_dram_info,
+                              unsigned long mapbase,
+                              unsigned long irq)
+{
+        orion_ehci_data.dram = mbus_dram_info;
+        fill_resources(&orion_ehci_1, orion_ehci_1_resources,
+                       mapbase, SZ_4K - 1, irq);
+
+        platform_device_register(&orion_ehci_1);
+}
+
+/*****************************************************************************
+ * EHCI2
+ ****************************************************************************/
+static struct resource orion_ehci_2_resources[2];
+
+static struct platform_device orion_ehci_2 = {
+        .name           = "orion-ehci",
+        .id             = 2,
+        .dev            = {
+                .dma_mask               = &ehci_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+                .platform_data          = &orion_ehci_data,
+        },
+};
+
+void __init orion_ehci_2_init(struct mbus_dram_target_info *mbus_dram_info,
+                              unsigned long mapbase,
+                              unsigned long irq)
+{
+        orion_ehci_data.dram = mbus_dram_info;
+        fill_resources(&orion_ehci_2, orion_ehci_2_resources,
+                       mapbase, SZ_4K - 1, irq);
+
+        platform_device_register(&orion_ehci_2);
+}
+
+/*****************************************************************************
+ * SATA
+ ****************************************************************************/
+static struct resource orion_sata_resources[2] = {
+        {
+                .name   = "sata base",
+        }, {
+                .name   = "sata irq",
+        },
+};
+
+static struct platform_device orion_sata = {
+        .name           = "sata_mv",
+        .id             = 0,
+        .dev            = {
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+void __init orion_sata_init(struct mv_sata_platform_data *sata_data,
+                            struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase,
+                            unsigned long irq)
+{
+        sata_data->dram = mbus_dram_info;
+        orion_sata.dev.platform_data = sata_data;
+        fill_resources(&orion_sata, orion_sata_resources,
+                       mapbase, 0x5000 - 1, irq);
+
+        platform_device_register(&orion_sata);
+}
+
+/*****************************************************************************
+ * Cryptographic Engines and Security Accelerator (CESA)
+ ****************************************************************************/
+static struct resource orion_crypto_resources[] = {
+        {
+                .name   = "regs",
+        }, {
+                .name   = "crypto interrupt",
+        }, {
+                .name   = "sram",
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device orion_crypto = {
+        .name           = "mv_crypto",
+        .id             = -1,
+};
+
+void __init orion_crypto_init(unsigned long mapbase,
+                              unsigned long srambase,
+                              unsigned long sram_size,
+                              unsigned long irq)
+{
+        fill_resources(&orion_crypto, orion_crypto_resources,
+                       mapbase, 0xffff, irq);
+        orion_crypto.num_resources = 3;
+        orion_crypto_resources[2].start = srambase;
+        orion_crypto_resources[2].end = srambase + sram_size - 1;
+
+        platform_device_register(&orion_crypto);
+}
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index a431a138f402..5b4fffab1eb4 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -321,59 +321,16 @@ EXPORT_SYMBOL(orion_gpio_set_blink);
  *        polarity    LEVEL          mask
  *
  ****************************************************************************/
-static void gpio_irq_ack(struct irq_data *d)
-{
-        struct orion_gpio_chip *ochip = irq_data_get_irq_chip_data(d);
-        int type = irqd_get_trigger_type(d);
-
-        if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING)) {
-                int pin = d->irq - ochip->secondary_irq_base;
-
-                writel(~(1 << pin), GPIO_EDGE_CAUSE(ochip));
-        }
-}
-
-static void gpio_irq_mask(struct irq_data *d)
-{
-        struct orion_gpio_chip *ochip = irq_data_get_irq_chip_data(d);
-        int type = irqd_get_trigger_type(d);
-        void __iomem *reg;
-        int pin;
-
-        if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
-                reg = GPIO_EDGE_MASK(ochip);
-        else
-                reg = GPIO_LEVEL_MASK(ochip);
-
-        pin = d->irq - ochip->secondary_irq_base;
-
-        writel(readl(reg) & ~(1 << pin), reg);
-}
-
-static void gpio_irq_unmask(struct irq_data *d)
-{
-        struct orion_gpio_chip *ochip = irq_data_get_irq_chip_data(d);
-        int type = irqd_get_trigger_type(d);
-        void __iomem *reg;
-        int pin;
-
-        if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
-                reg = GPIO_EDGE_MASK(ochip);
-        else
-                reg = GPIO_LEVEL_MASK(ochip);
-
-        pin = d->irq - ochip->secondary_irq_base;
-
-        writel(readl(reg) | (1 << pin), reg);
-}
 
 static int gpio_irq_set_type(struct irq_data *d, u32 type)
 {
-        struct orion_gpio_chip *ochip = irq_data_get_irq_chip_data(d);
+        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+        struct irq_chip_type *ct = irq_data_get_chip_type(d);
+        struct orion_gpio_chip *ochip = gc->private;
         int pin;
         u32 u;
 
-        pin = d->irq - ochip->secondary_irq_base;
+        pin = d->irq - gc->irq_base;
 
         u = readl(GPIO_IO_CONF(ochip)) & (1 << pin);
         if (!u) {
@@ -382,18 +339,14 @@ static int gpio_irq_set_type(struct irq_data *d, u32 type)
                 return -EINVAL;
         }
 
-        /*
-         * Set edge/level type.
-         */
-        if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING)) {
-                __irq_set_handler_locked(d->irq, handle_edge_irq);
-        } else if (type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) {
-                __irq_set_handler_locked(d->irq, handle_level_irq);
-        } else {
-                printk(KERN_ERR "failed to set irq=%d (type=%d)\n",
-                       d->irq, type);
+        type &= IRQ_TYPE_SENSE_MASK;
+        if (type == IRQ_TYPE_NONE)
                 return -EINVAL;
-        }
+
+        /* Check if we need to change chip and handler */
+        if (!(ct->type & type))
+                if (irq_setup_alt_chip(d, type))
+                        return -EINVAL;
 
         /*
          * Configure interrupt polarity.
@@ -425,19 +378,12 @@ static int gpio_irq_set_type(struct irq_data *d, u32 type)
         return 0;
 }
 
-struct irq_chip orion_gpio_irq_chip = {
-        .name           = "orion_gpio_irq",
-        .irq_ack        = gpio_irq_ack,
-        .irq_mask       = gpio_irq_mask,
-        .irq_unmask     = gpio_irq_unmask,
-        .irq_set_type   = gpio_irq_set_type,
-};
-
 void __init orion_gpio_init(int gpio_base, int ngpio,
                             u32 base, int mask_offset, int secondary_irq_base)
 {
         struct orion_gpio_chip *ochip;
-        int i;
+        struct irq_chip_generic *gc;
+        struct irq_chip_type *ct;
 
         if (orion_gpio_chip_count == ARRAY_SIZE(orion_gpio_chips))
                 return;
@@ -471,15 +417,29 @@ void __init orion_gpio_init(int gpio_base, int ngpio,
         writel(0, GPIO_EDGE_MASK(ochip));
         writel(0, GPIO_LEVEL_MASK(ochip));
 
-        for (i = 0; i < ngpio; i++) {
-                unsigned int irq = secondary_irq_base + i;
-
-                irq_set_chip_and_handler(irq, &orion_gpio_irq_chip,
-                                         handle_level_irq);
-                irq_set_chip_data(irq, ochip);
-                irq_set_status_flags(irq, IRQ_LEVEL);
-                set_irq_flags(irq, IRQF_VALID);
-        }
+        gc = irq_alloc_generic_chip("orion_gpio_irq", 2, secondary_irq_base,
+                                    ochip->base, handle_level_irq);
+        gc->private = ochip;
+
+        ct = gc->chip_types;
+        ct->regs.mask = ochip->mask_offset + GPIO_LEVEL_MASK_OFF;
+        ct->type = IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW;
+        ct->chip.irq_mask = irq_gc_mask_clr_bit;
+        ct->chip.irq_unmask = irq_gc_mask_set_bit;
+        ct->chip.irq_set_type = gpio_irq_set_type;
+
+        ct++;
+        ct->regs.mask = ochip->mask_offset + GPIO_EDGE_MASK_OFF;
+        ct->regs.ack = GPIO_EDGE_CAUSE_OFF;
+        ct->type = IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING;
+        ct->chip.irq_ack = irq_gc_ack;
+        ct->chip.irq_mask = irq_gc_mask_clr_bit;
+        ct->chip.irq_unmask = irq_gc_mask_set_bit;
+        ct->chip.irq_set_type = gpio_irq_set_type;
+        ct->handler = handle_edge_irq;
+
+        irq_setup_generic_chip(gc, IRQ_MSK(ngpio), IRQ_GC_INIT_MASK_CACHE,
+                               IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);
 }
 
 void orion_gpio_irq_handler(int pinoff)
diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h
new file mode 100644
index 000000000000..a63c357e2ab1
--- /dev/null
+++ b/arch/arm/plat-orion/include/plat/common.h
@@ -0,0 +1,117 @@
+/*
+ * arch/arm/plat-orion/include/plat/common.h
+ *
+ * Marvell Orion SoC common setup code used by different mach-/common.c
+ *
+ * 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 __PLAT_COMMON_H
+#include <linux/mv643xx_eth.h>
+
+struct dsa_platform_data;
+
+void __init orion_uart0_init(unsigned int membase,
+                             resource_size_t mapbase,
+                             unsigned int irq,
+                             unsigned int uartclk);
+
+void __init orion_uart1_init(unsigned int membase,
+                             resource_size_t mapbase,
+                             unsigned int irq,
+                             unsigned int uartclk);
+
+void __init orion_uart2_init(unsigned int membase,
+                             resource_size_t mapbase,
+                             unsigned int irq,
+                             unsigned int uartclk);
+
+void __init orion_uart3_init(unsigned int membase,
+                             resource_size_t mapbase,
+                             unsigned int irq,
+                             unsigned int uartclk);
+
+void __init orion_rtc_init(unsigned long mapbase,
+                           unsigned long irq);
+
+void __init orion_ge00_init(struct mv643xx_eth_platform_data *eth_data,
+                            struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase,
+                            unsigned long irq,
+                            unsigned long irq_err,
+                            int tclk);
+
+void __init orion_ge01_init(struct mv643xx_eth_platform_data *eth_data,
+                            struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase,
+                            unsigned long irq,
+                            unsigned long irq_err,
+                            int tclk);
+
+void __init orion_ge10_init(struct mv643xx_eth_platform_data *eth_data,
+                            struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase,
+                            unsigned long irq,
+                            unsigned long irq_err,
+                            int tclk);
+
+void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
+                            struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase,
+                            unsigned long irq,
+                            unsigned long irq_err,
+                            int tclk);
+
+void __init orion_ge00_switch_init(struct dsa_platform_data *d,
+                                   int irq);
+void __init orion_i2c_init(unsigned long mapbase,
+                           unsigned long irq,
+                           unsigned long freq_m);
+
+void __init orion_i2c_1_init(unsigned long mapbase,
+                             unsigned long irq,
+                             unsigned long freq_m);
+
+void __init orion_spi_init(unsigned long mapbase,
+                           unsigned long tclk);
+
+void __init orion_spi_1_init(unsigned long mapbase,
+                             unsigned long tclk);
+
+void __init orion_wdt_init(unsigned long tclk);
+
+void __init orion_xor0_init(struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase_low,
+                            unsigned long mapbase_high,
+                            unsigned long irq_0,
+                            unsigned long irq_1);
+
+void __init orion_xor1_init(unsigned long mapbase_low,
+                            unsigned long mapbase_high,
+                            unsigned long irq_0,
+                            unsigned long irq_1);
+
+void __init orion_ehci_init(struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase,
+                            unsigned long irq);
+
+void __init orion_ehci_1_init(struct mbus_dram_target_info *mbus_dram_info,
+                              unsigned long mapbase,
+                              unsigned long irq);
+
+void __init orion_ehci_2_init(struct mbus_dram_target_info *mbus_dram_info,
+                              unsigned long mapbase,
+                              unsigned long irq);
+
+void __init orion_sata_init(struct mv_sata_platform_data *sata_data,
+                            struct mbus_dram_target_info *mbus_dram_info,
+                            unsigned long mapbase,
+                            unsigned long irq);
+
+void __init orion_crypto_init(unsigned long mapbase,
+                              unsigned long srambase,
+                              unsigned long sram_size,
+                              unsigned long irq);
+#endif
diff --git a/arch/arm/plat-orion/include/plat/gpio.h b/arch/arm/plat-orion/include/plat/gpio.h
index 5578b9803fc6..3075b9fdde83 100644
--- a/arch/arm/plat-orion/include/plat/gpio.h
+++ b/arch/arm/plat-orion/include/plat/gpio.h
@@ -39,7 +39,6 @@ void __init orion_gpio_init(int gpio_base, int ngpio,
 /*
  * GPIO interrupt handling.
  */
-extern struct irq_chip orion_gpio_irq_chip;
 void orion_gpio_irq_handler(int irqoff);
 
 
diff --git a/arch/arm/plat-orion/include/plat/mpp.h b/arch/arm/plat-orion/include/plat/mpp.h
new file mode 100644
index 000000000000..723adce99f41
--- /dev/null
+++ b/arch/arm/plat-orion/include/plat/mpp.h
@@ -0,0 +1,34 @@
+/*
+ * arch/arm/plat-orion/include/plat/mpp.h
+ *
+ * Marvell Orion SoC MPP handling.
+ *
+ * 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 __PLAT_MPP_H
+#define __PLAT_MPP_H
+
+#define MPP_NUM(x)      ((x) & 0xff)
+#define MPP_SEL(x)      (((x) >> 8) & 0xf)
+
+/* This is the generic MPP macro, without any variant information.
+   Each machine architecture is expected to extend this with further
+   bit fields indicating which MPP configurations are valid for a
+   specific variant. */
+
+#define GENERIC_MPP(_num, _sel, _in, _out) ( \
+        /* MPP number */                ((_num) & 0xff) | \
+        /* MPP select value */          (((_sel) & 0xf) << 8) | \
+        /* may be input signal */       ((!!(_in)) << 12) | \
+        /* may be output signal */      ((!!(_out)) << 13))
+
+#define MPP_INPUT_MASK          GENERIC_MPP(0, 0x0, 1, 0)
+#define MPP_OUTPUT_MASK         GENERIC_MPP(0, 0x0, 0, 1)
+
+void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
+                           unsigned int mpp_max, unsigned int dev_bus);
+
+#endif
diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c
index d8d638e09f8f..2d5b9c1ef389 100644
--- a/arch/arm/plat-orion/irq.c
+++ b/arch/arm/plat-orion/irq.c
@@ -14,52 +14,21 @@
 #include <linux/io.h>
 #include <plat/irq.h>
 
-static void orion_irq_mask(struct irq_data *d)
-{
-        void __iomem *maskaddr = irq_data_get_irq_chip_data(d);
-        u32 mask;
-
-        mask = readl(maskaddr);
-        mask &= ~(1 << (d->irq & 31));
-        writel(mask, maskaddr);
-}
-
-static void orion_irq_unmask(struct irq_data *d)
-{
-        void __iomem *maskaddr = irq_data_get_irq_chip_data(d);
-        u32 mask;
-
-        mask = readl(maskaddr);
-        mask |= 1 << (d->irq & 31);
-        writel(mask, maskaddr);
-}
-
-static struct irq_chip orion_irq_chip = {
-        .name           = "orion_irq",
-        .irq_mask       = orion_irq_mask,
-        .irq_mask_ack   = orion_irq_mask,
-        .irq_unmask     = orion_irq_unmask,
-};
-
 void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)
 {
-        unsigned int i;
+        struct irq_chip_generic *gc;
+        struct irq_chip_type *ct;
 
         /*
          * Mask all interrupts initially.
          */
         writel(0, maskaddr);
 
-        /*
-         * Register IRQ sources.
-         */
-        for (i = 0; i < 32; i++) {
-                unsigned int irq = irq_start + i;
-
-                irq_set_chip_and_handler(irq, &orion_irq_chip,
-                                         handle_level_irq);
-                irq_set_chip_data(irq, maskaddr);
-                irq_set_status_flags(irq, IRQ_LEVEL);
-                set_irq_flags(irq, IRQF_VALID);
-        }
+        gc = irq_alloc_generic_chip("orion_irq", 1, irq_start, maskaddr,
+                                    handle_level_irq);
+        ct = gc->chip_types;
+        ct->chip.irq_mask = irq_gc_mask_clr_bit;
+        ct->chip.irq_unmask = irq_gc_mask_set_bit;
+        irq_setup_generic_chip(gc, IRQ_MSK(32), IRQ_GC_INIT_MASK_CACHE,
+                               IRQ_NOREQUEST, IRQ_LEVEL | IRQ_NOPROBE);
 }
diff --git a/arch/arm/plat-orion/mpp.c b/arch/arm/plat-orion/mpp.c
new file mode 100644
index 000000000000..91553432711d
--- /dev/null
+++ b/arch/arm/plat-orion/mpp.c
@@ -0,0 +1,78 @@
+/*
+ * arch/arm/plat-orion/mpp.c
+ *
+ * MPP functions for Marvell orion SoCs
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mbus.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+#include <mach/hardware.h>
+#include <plat/mpp.h>
+
+/* Address of the ith MPP control register */
+static __init unsigned long mpp_ctrl_addr(unsigned int i,
+                                          unsigned long dev_bus)
+{
+        return dev_bus + (i) * 4;
+}
+
+
+void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
+                           unsigned int mpp_max, unsigned int dev_bus)
+{
+        unsigned int mpp_nr_regs = (1 + mpp_max/8);
+        u32 mpp_ctrl[mpp_nr_regs];
+        int i;
+
+        printk(KERN_DEBUG "initial MPP regs:");
+        for (i = 0; i < mpp_nr_regs; i++) {
+                mpp_ctrl[i] = readl(mpp_ctrl_addr(i, dev_bus));
+                printk(" %08x", mpp_ctrl[i]);
+        }
+        printk("\n");
+
+        for ( ; *mpp_list; mpp_list++) {
+                unsigned int num = MPP_NUM(*mpp_list);
+                unsigned int sel = MPP_SEL(*mpp_list);
+                int shift, gpio_mode;
+
+                if (num > mpp_max) {
+                        printk(KERN_ERR "orion_mpp_conf: invalid MPP "
+                                        "number (%u)\n", num);
+                        continue;
+                }
+                if (variant_mask & !(*mpp_list & variant_mask)) {
+                        printk(KERN_WARNING
+                               "orion_mpp_conf: requested MPP%u config "
+                               "unavailable on this hardware\n", num);
+                        continue;
+                }
+
+                shift = (num & 7) << 2;
+                mpp_ctrl[num / 8] &= ~(0xf << shift);
+                mpp_ctrl[num / 8] |= sel << shift;
+
+                gpio_mode = 0;
+                if (*mpp_list & MPP_INPUT_MASK)
+                        gpio_mode |= GPIO_INPUT_OK;
+                if (*mpp_list & MPP_OUTPUT_MASK)
+                        gpio_mode |= GPIO_OUTPUT_OK;
+                if (sel != 0)
+                        gpio_mode = 0;
+                orion_gpio_set_valid(num, gpio_mode);
+        }
+
+        printk(KERN_DEBUG "  final MPP regs:");
+        for (i = 0; i < mpp_nr_regs; i++) {
+                writel(mpp_ctrl[i], mpp_ctrl_addr(i, dev_bus));
+                printk(" %08x", mpp_ctrl[i]);
+        }
+        printk("\n");
+}
diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c
index 742b0323c57b..69a61367e4b8 100644
--- a/arch/arm/plat-orion/time.c
+++ b/arch/arm/plat-orion/time.c
@@ -81,24 +81,6 @@ static void __init setup_sched_clock(unsigned long tclk)
 }
 
 /*
- * Clocksource handling.
- */
-static cycle_t orion_clksrc_read(struct clocksource *cs)
-{
-        return 0xffffffff - readl(timer_base + TIMER0_VAL_OFF);
-}
-
-static struct clocksource orion_clksrc = {
-        .name           = "orion_clocksource",
-        .rating         = 300,
-        .read           = orion_clksrc_read,
-        .mask           = CLOCKSOURCE_MASK(32),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
-
-
-/*
  * Clockevent handling.
  */
 static int
@@ -247,7 +229,8 @@ orion_time_init(u32 _bridge_base, u32 _bridge_timer1_clr_mask,
         writel(u & ~BRIDGE_INT_TIMER0, bridge_base + BRIDGE_MASK_OFF);
         u = readl(timer_base + TIMER_CTRL_OFF);
         writel(u | TIMER0_EN | TIMER0_RELOAD_EN, timer_base + TIMER_CTRL_OFF);
-        clocksource_register_hz(&orion_clksrc, tclk);
+        clocksource_mmio_init(timer_base + TIMER0_VAL_OFF, "orion_clocksource",
+                tclk, 300, 32, clocksource_mmio_readl_down);
 
         /*
          * Setup clockevent timer (interrupt-driven).
diff --git a/arch/arm/plat-pxa/gpio.c b/arch/arm/plat-pxa/gpio.c
index dce088f45678..48ebb9479b61 100644
--- a/arch/arm/plat-pxa/gpio.c
+++ b/arch/arm/plat-pxa/gpio.c
@@ -15,7 +15,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/slab.h>
 
 #include <mach/gpio.h>
@@ -295,7 +295,7 @@ void __init pxa_init_gpio(int mux_irq, int start, int end, set_wake_t fn)
 }
 
 #ifdef CONFIG_PM
-static int pxa_gpio_suspend(struct sys_device *dev, pm_message_t state)
+static int pxa_gpio_suspend(void)
 {
         struct pxa_gpio_chip *c;
         int gpio;
@@ -312,7 +312,7 @@ static int pxa_gpio_suspend(struct sys_device *dev, pm_message_t state)
         return 0;
 }
 
-static int pxa_gpio_resume(struct sys_device *dev)
+static void pxa_gpio_resume(void)
 {
         struct pxa_gpio_chip *c;
         int gpio;
@@ -326,22 +326,13 @@ static int pxa_gpio_resume(struct sys_device *dev)
                 __raw_writel(c->saved_gfer, c->regbase + GFER_OFFSET);
                 __raw_writel(c->saved_gpdr, c->regbase + GPDR_OFFSET);
         }
-        return 0;
 }
 #else
 #define pxa_gpio_suspend        NULL
 #define pxa_gpio_resume         NULL
 #endif
 
-struct sysdev_class pxa_gpio_sysclass = {
-        .name           = "gpio",
+struct syscore_ops pxa_gpio_syscore_ops = {
         .suspend        = pxa_gpio_suspend,
         .resume         = pxa_gpio_resume,
 };
-
-static int __init pxa_gpio_init(void)
-{
-        return sysdev_class_register(&pxa_gpio_sysclass);
-}
-
-core_initcall(pxa_gpio_init);
diff --git a/arch/arm/plat-pxa/mfp.c b/arch/arm/plat-pxa/mfp.c
index a9aa5ad3f4eb..be12eadcce20 100644
--- a/arch/arm/plat-pxa/mfp.c
+++ b/arch/arm/plat-pxa/mfp.c
@@ -17,7 +17,6 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
-#include <linux/sysdev.h>
 
 #include <plat/mfp.h>
 
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
index 268f3ed0a105..73667994518a 100644
--- a/arch/arm/plat-s3c24xx/devs.c
+++ b/arch/arm/plat-s3c24xx/devs.c
@@ -22,6 +22,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/string.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -233,6 +234,46 @@ void __init s3c24xx_udc_set_platdata(struct s3c2410_udc_mach_info *pd)
         }
 }
 
+/* USB High Speed 2.0 Device (Gadget) */
+static struct resource s3c_hsudc_resource[] = {
+        [0] = {
+                .start  = S3C2416_PA_HSUDC,
+                .end    = S3C2416_PA_HSUDC + S3C2416_SZ_HSUDC - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_USBD,
+                .end    = IRQ_USBD,
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+
+static u64 s3c_hsudc_dmamask = DMA_BIT_MASK(32);
+
+struct platform_device s3c_device_usb_hsudc = {
+        .name           = "s3c-hsudc",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(s3c_hsudc_resource),
+        .resource       = s3c_hsudc_resource,
+        .dev            = {
+                .dma_mask               = &s3c_hsudc_dmamask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+void __init s3c24xx_hsudc_set_platdata(struct s3c24xx_hsudc_platdata *pd)
+{
+        struct s3c24xx_hsudc_platdata *npd;
+
+        npd = kmalloc(sizeof(*npd), GFP_KERNEL);
+        if (npd) {
+                memcpy(npd, pd, sizeof(*npd));
+                s3c_device_usb_hsudc.dev.platform_data = npd;
+        } else {
+                printk(KERN_ERR "no memory for udc platform data\n");
+        }
+}
+
 /* IIS */
 
 static struct resource s3c_iis_resource[] = {
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 27ea852e3370..c10d10c56e2e 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -22,7 +22,7 @@
 #include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/io.h>
@@ -1195,19 +1195,12 @@ int s3c2410_dma_getposition(unsigned int channel, dma_addr_t *src, dma_addr_t *d
 
 EXPORT_SYMBOL(s3c2410_dma_getposition);
 
-static inline struct s3c2410_dma_chan *to_dma_chan(struct sys_device *dev)
-{
-        return container_of(dev, struct s3c2410_dma_chan, dev);
-}
-
-/* system device class */
+/* system core operations */
 
 #ifdef CONFIG_PM
 
-static int s3c2410_dma_suspend(struct sys_device *dev, pm_message_t state)
+static void s3c2410_dma_suspend_chan(s3c2410_dma_chan *cp)
 {
-        struct s3c2410_dma_chan *cp = to_dma_chan(dev);
-
         printk(KERN_DEBUG "suspending dma channel %d\n", cp->number);
 
         if (dma_rdreg(cp, S3C2410_DMA_DMASKTRIG) & S3C2410_DMASKTRIG_ON) {
@@ -1222,13 +1215,21 @@ static int s3c2410_dma_suspend(struct sys_device *dev, pm_message_t state)
 
                 s3c2410_dma_dostop(cp);
         }
+}
+
+static int s3c2410_dma_suspend(void)
+{
+        struct s3c2410_dma_chan *cp = s3c2410_chans;
+        int channel;
+
+        for (channel = 0; channel < dma_channels; cp++, channel++)
+                s3c2410_dma_suspend_chan(cp);
 
         return 0;
 }
 
-static int s3c2410_dma_resume(struct sys_device *dev)
+static void s3c2410_dma_resume_chan(struct s3c2410_dma_chan *cp)
 {
-        struct s3c2410_dma_chan *cp = to_dma_chan(dev);
         unsigned int no = cp->number | DMACH_LOW_LEVEL;
 
         /* restore channel's hardware configuration */
@@ -1249,13 +1250,21 @@ static int s3c2410_dma_resume(struct sys_device *dev)
         return 0;
 }
 
+static void s3c2410_dma_resume(void)
+{
+        struct s3c2410_dma_chan *cp = s3c2410_chans + dma_channels - 1;
+        int channel;
+
+        for (channel = dma_channels - 1; channel >= 0; cp++, channel--)
+                s3c2410_dma_resume_chan(cp);
+}
+
 #else
 #define s3c2410_dma_suspend NULL
 #define s3c2410_dma_resume  NULL
 #endif /* CONFIG_PM */
 
-struct sysdev_class dma_sysclass = {
-        .name           = "s3c24xx-dma",
+struct syscore_ops dma_syscore_ops = {
         .suspend        = s3c2410_dma_suspend,
         .resume         = s3c2410_dma_resume,
 };
@@ -1269,39 +1278,14 @@ static void s3c2410_dma_cache_ctor(void *p)
 
 /* initialisation code */
 
-static int __init s3c24xx_dma_sysclass_init(void)
+static int __init s3c24xx_dma_syscore_init(void)
 {
-        int ret = sysdev_class_register(&dma_sysclass);
-
-        if (ret != 0)
-                printk(KERN_ERR "dma sysclass registration failed\n");
-
-        return ret;
-}
-
-core_initcall(s3c24xx_dma_sysclass_init);
-
-static int __init s3c24xx_dma_sysdev_register(void)
-{
-        struct s3c2410_dma_chan *cp = s3c2410_chans;
-        int channel, ret;
-
-        for (channel = 0; channel < dma_channels; cp++, channel++) {
-                cp->dev.cls = &dma_sysclass;
-                cp->dev.id  = channel;
-                ret = sysdev_register(&cp->dev);
-
-                if (ret) {
-                        printk(KERN_ERR "error registering dev for dma %d\n",
-                               channel);
-                        return ret;
-                }
-        }
+        register_syscore_ops(&dma_syscore_ops);
 
         return 0;
 }
 
-late_initcall(s3c24xx_dma_sysdev_register);
+late_initcall(s3c24xx_dma_syscore_init);
 
 int __init s3c24xx_dma_init(unsigned int channels, unsigned int irq,
                             unsigned int stride)
diff --git a/arch/arm/plat-s3c24xx/include/plat/udc.h b/arch/arm/plat-s3c24xx/include/plat/udc.h
index 80457c6414aa..f63884242506 100644
--- a/arch/arm/plat-s3c24xx/include/plat/udc.h
+++ b/arch/arm/plat-s3c24xx/include/plat/udc.h
@@ -37,4 +37,21 @@ struct s3c2410_udc_mach_info {
 
 extern void __init s3c24xx_udc_set_platdata(struct s3c2410_udc_mach_info *);
 
+/**
+ * s3c24xx_hsudc_platdata - Platform data for USB High-Speed gadget controller.
+ * @epnum: Number of endpoints to be instantiated by the controller driver.
+ * @gpio_init: Platform specific USB related GPIO initialization.
+ * @gpio_uninit: Platform specific USB releted GPIO uninitialzation.
+ *
+ * Representation of platform data for the S3C24XX USB 2.0 High Speed gadget
+ * controllers.
+ */
+struct s3c24xx_hsudc_platdata {
+        unsigned int    epnum;
+        void            (*gpio_init)(void);
+        void            (*gpio_uninit)(void);
+};
+
+extern void __init s3c24xx_hsudc_set_platdata(struct s3c24xx_hsudc_platdata *pd);
+
 #endif /* __ASM_ARM_ARCH_UDC_H */
diff --git a/arch/arm/plat-s3c24xx/irq-pm.c b/arch/arm/plat-s3c24xx/irq-pm.c
index c3624d898630..0efb2e2848c8 100644
--- a/arch/arm/plat-s3c24xx/irq-pm.c
+++ b/arch/arm/plat-s3c24xx/irq-pm.c
@@ -14,7 +14,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
-#include <linux/sysdev.h>
 #include <linux/irq.h>
 
 #include <plat/cpu.h>
@@ -65,7 +64,7 @@ static unsigned long save_extint[3];
 static unsigned long save_eintflt[4];
 static unsigned long save_eintmask;
 
-int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state)
+int s3c24xx_irq_suspend(void)
 {
         unsigned int i;
 
@@ -81,7 +80,7 @@ int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state)
         return 0;
 }
 
-int s3c24xx_irq_resume(struct sys_device *dev)
+void s3c24xx_irq_resume(void)
 {
         unsigned int i;
 
@@ -93,6 +92,4 @@ int s3c24xx_irq_resume(struct sys_device *dev)
 
         s3c_pm_do_restore(irq_save, ARRAY_SIZE(irq_save));
         __raw_writel(save_eintmask, S3C24XX_EINTMASK);
-
-        return 0;
 }
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index 849229716586..6751bcf7b888 100644
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -85,6 +85,11 @@ config S5P_DEV_CSIS1
         help
           Compile in platform device definitions for MIPI-CSIS channel 1
 
+config S5P_DEV_USB_EHCI
+        bool
+        help
+          Compile in platform device definition for USB EHCI
+
 config S5P_SETUP_MIPIPHY
         bool
         help
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
index 42afff7f60be..e234cc4d49a0 100644
--- a/arch/arm/plat-s5p/Makefile
+++ b/arch/arm/plat-s5p/Makefile
@@ -33,4 +33,5 @@ obj-$(CONFIG_S5P_DEV_FIMC3)	+= dev-fimc3.o
 obj-$(CONFIG_S5P_DEV_ONENAND)   += dev-onenand.o
 obj-$(CONFIG_S5P_DEV_CSIS0)     += dev-csis0.o
 obj-$(CONFIG_S5P_DEV_CSIS1)     += dev-csis1.o
+obj-$(CONFIG_S5P_DEV_USB_EHCI)  += dev-ehci.o
 obj-$(CONFIG_S5P_SETUP_MIPIPHY) += setup-mipiphy.o
diff --git a/arch/arm/plat-s5p/dev-ehci.c b/arch/arm/plat-s5p/dev-ehci.c
new file mode 100644
index 000000000000..94080fff9e9b
--- /dev/null
+++ b/arch/arm/plat-s5p/dev-ehci.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.com>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <mach/irqs.h>
+#include <mach/map.h>
+#include <plat/devs.h>
+#include <plat/ehci.h>
+#include <plat/usb-phy.h>
+
+/* USB EHCI Host Controller registration */
+static struct resource s5p_ehci_resource[] = {
+        [0] = {
+                .start  = S5P_PA_EHCI,
+                .end    = S5P_PA_EHCI + SZ_256 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = IRQ_USB_HOST,
+                .end    = IRQ_USB_HOST,
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+
+static u64 s5p_device_ehci_dmamask = 0xffffffffUL;
+
+struct platform_device s5p_device_ehci = {
+        .name           = "s5p-ehci",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(s5p_ehci_resource),
+        .resource       = s5p_ehci_resource,
+        .dev            = {
+                .dma_mask = &s5p_device_ehci_dmamask,
+                .coherent_dma_mask = 0xffffffffUL
+        }
+};
+
+void __init s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd)
+{
+        struct s5p_ehci_platdata *npd;
+
+        npd = s3c_set_platdata(pd, sizeof(struct s5p_ehci_platdata),
+                        &s5p_device_ehci);
+
+        if (!npd->phy_init)
+                npd->phy_init = s5p_usb_phy_init;
+        if (!npd->phy_exit)
+                npd->phy_exit = s5p_usb_phy_exit;
+}
diff --git a/arch/arm/plat-s5p/include/plat/ehci.h b/arch/arm/plat-s5p/include/plat/ehci.h
new file mode 100644
index 000000000000..6ae6810c7569
--- /dev/null
+++ b/arch/arm/plat-s5p/include/plat/ehci.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.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 __PLAT_S5P_EHCI_H
+#define __PLAT_S5P_EHCI_H
+
+struct s5p_ehci_platdata {
+        int (*phy_init)(struct platform_device *pdev, int type);
+        int (*phy_exit)(struct platform_device *pdev, int type);
+};
+
+extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
+
+#endif /* __PLAT_S5P_EHCI_H */
diff --git a/arch/arm/plat-s5p/include/plat/map-s5p.h b/arch/arm/plat-s5p/include/plat/map-s5p.h
index d973d39666a3..a6c3d327ce72 100644
--- a/arch/arm/plat-s5p/include/plat/map-s5p.h
+++ b/arch/arm/plat-s5p/include/plat/map-s5p.h
@@ -39,7 +39,7 @@
 #define S5P_VA_TWD              S5P_VA_COREPERI(0x600)
 #define S5P_VA_GIC_DIST         S5P_VA_COREPERI(0x1000)
 
-#define S3C_VA_USB_HSPHY        S3C_ADDR(0x02900000)
+#define S5P_VA_USB_HSPHY        S3C_ADDR(0x02900000)
 
 #define VA_VIC(x)               (S3C_VA_IRQ + ((x) * 0x10000))
 #define VA_VIC0                 VA_VIC(0)
diff --git a/arch/arm/plat-s5p/include/plat/usb-phy.h b/arch/arm/plat-s5p/include/plat/usb-phy.h
new file mode 100644
index 000000000000..6dd6bcfca3ce
--- /dev/null
+++ b/arch/arm/plat-s5p/include/plat/usb-phy.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim <jy0922.shim@samsung.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 __PLAT_S5P_USB_PHY_H
+#define __PLAT_S5P_USB_PHY_H
+
+enum s5p_usb_phy_type {
+        S5P_USB_PHY_DEVICE,
+        S5P_USB_PHY_HOST,
+};
+
+extern int s5p_usb_phy_init(struct platform_device *pdev, int type);
+extern int s5p_usb_phy_exit(struct platform_device *pdev, int type);
+
+#endif /* __PLAT_S5P_REGS_USB_PHY_H */
diff --git a/arch/arm/plat-s5p/irq-gpioint.c b/arch/arm/plat-s5p/irq-gpioint.c
index cd6d67c8382a..135abda31c9a 100644
--- a/arch/arm/plat-s5p/irq-gpioint.c
+++ b/arch/arm/plat-s5p/irq-gpioint.c
@@ -41,72 +41,11 @@ struct s5p_gpioint_bank {
 
 LIST_HEAD(banks);
 
-static int s5p_gpioint_get_offset(struct irq_data *data)
+static int s5p_gpioint_set_type(struct irq_data *d, unsigned int type)
 {
-        struct s3c_gpio_chip *chip = irq_data_get_irq_handler_data(data);
-        return data->irq - chip->irq_base;
-}
-
-static void s5p_gpioint_ack(struct irq_data *data)
-{
-        struct s3c_gpio_chip *chip = irq_data_get_irq_handler_data(data);
-        int group, offset, pend_offset;
-        unsigned int value;
-
-        group = chip->group;
-        offset = s5p_gpioint_get_offset(data);
-        pend_offset = REG_OFFSET(group);
-
-        value = __raw_readl(GPIO_BASE(chip) + PEND_OFFSET + pend_offset);
-        value |= BIT(offset);
-        __raw_writel(value, GPIO_BASE(chip) + PEND_OFFSET + pend_offset);
-}
-
-static void s5p_gpioint_mask(struct irq_data *data)
-{
-        struct s3c_gpio_chip *chip = irq_data_get_irq_handler_data(data);
-        int group, offset, mask_offset;
-        unsigned int value;
-
-        group = chip->group;
-        offset = s5p_gpioint_get_offset(data);
-        mask_offset = REG_OFFSET(group);
-
-        value = __raw_readl(GPIO_BASE(chip) + MASK_OFFSET + mask_offset);
-        value |= BIT(offset);
-        __raw_writel(value, GPIO_BASE(chip) + MASK_OFFSET + mask_offset);
-}
-
-static void s5p_gpioint_unmask(struct irq_data *data)
-{
-        struct s3c_gpio_chip *chip = irq_data_get_irq_handler_data(data);
-        int group, offset, mask_offset;
-        unsigned int value;
-
-        group = chip->group;
-        offset = s5p_gpioint_get_offset(data);
-        mask_offset = REG_OFFSET(group);
-
-        value = __raw_readl(GPIO_BASE(chip) + MASK_OFFSET + mask_offset);
-        value &= ~BIT(offset);
-        __raw_writel(value, GPIO_BASE(chip) + MASK_OFFSET + mask_offset);
-}
-
-static void s5p_gpioint_mask_ack(struct irq_data *data)
-{
-        s5p_gpioint_mask(data);
-        s5p_gpioint_ack(data);
-}
-
-static int s5p_gpioint_set_type(struct irq_data *data, unsigned int type)
-{
-        struct s3c_gpio_chip *chip = irq_data_get_irq_handler_data(data);
-        int group, offset, con_offset;
-        unsigned int value;
-
-        group = chip->group;
-        offset = s5p_gpioint_get_offset(data);
-        con_offset = REG_OFFSET(group);
+        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+        struct irq_chip_type *ct = gc->chip_types;
+        unsigned int shift = (d->irq - gc->irq_base) << 2;
 
         switch (type) {
         case IRQ_TYPE_EDGE_RISING:
@@ -130,23 +69,12 @@ static int s5p_gpioint_set_type(struct irq_data *data, unsigned int type)
                 return -EINVAL;
         }
 
-        value = __raw_readl(GPIO_BASE(chip) + CON_OFFSET + con_offset);
-        value &= ~(0x7 << (offset * 0x4));
-        value |= (type << (offset * 0x4));
-        __raw_writel(value, GPIO_BASE(chip) + CON_OFFSET + con_offset);
-
+        gc->type_cache &= ~(0x7 << shift);
+        gc->type_cache |= type << shift;
+        writel(gc->type_cache, gc->reg_base + ct->regs.type);
         return 0;
 }
 
-static struct irq_chip s5p_gpioint = {
-        .name           = "s5p_gpioint",
-        .irq_ack        = s5p_gpioint_ack,
-        .irq_mask       = s5p_gpioint_mask,
-        .irq_mask_ack   = s5p_gpioint_mask_ack,
-        .irq_unmask     = s5p_gpioint_unmask,
-        .irq_set_type   = s5p_gpioint_set_type,
-};
-
 static void s5p_gpioint_handler(unsigned int irq, struct irq_desc *desc)
 {
         struct s5p_gpioint_bank *bank = irq_get_handler_data(irq);
@@ -179,9 +107,10 @@ static void s5p_gpioint_handler(unsigned int irq, struct irq_desc *desc)
 static __init int s5p_gpioint_add(struct s3c_gpio_chip *chip)
 {
         static int used_gpioint_groups = 0;
-        int irq, group = chip->group;
-        int i;
+        int group = chip->group;
         struct s5p_gpioint_bank *bank = NULL;
+        struct irq_chip_generic *gc;
+        struct irq_chip_type *ct;
 
         if (used_gpioint_groups >= S5P_GPIOINT_GROUP_COUNT)
                 return -ENOMEM;
@@ -211,19 +140,28 @@ static __init int s5p_gpioint_add(struct s3c_gpio_chip *chip)
          * chained GPIO irq has been successfully registered, allocate new gpio
          * int group and assign irq nubmers
          */
-
         chip->irq_base = S5P_GPIOINT_BASE +
                          used_gpioint_groups * S5P_GPIOINT_GROUP_SIZE;
         used_gpioint_groups++;
 
         bank->chips[group - bank->start] = chip;
-        for (i = 0; i < chip->chip.ngpio; i++) {
-                irq = chip->irq_base + i;
-                irq_set_chip(irq, &s5p_gpioint);
-                irq_set_handler_data(irq, chip);
-                irq_set_handler(irq, handle_level_irq);
-                set_irq_flags(irq, IRQF_VALID);
-        }
+
+        gc = irq_alloc_generic_chip("s5p_gpioint", 1, chip->irq_base,
+                                    (void __iomem *)GPIO_BASE(chip),
+                                    handle_level_irq);
+        if (!gc)
+                return -ENOMEM;
+        ct = gc->chip_types;
+        ct->chip.irq_ack = irq_gc_ack;
+        ct->chip.irq_mask = irq_gc_mask_set_bit;
+        ct->chip.irq_unmask = irq_gc_mask_clr_bit;
+        ct->chip.irq_set_type = s5p_gpioint_set_type,
+        ct->regs.ack = PEND_OFFSET + REG_OFFSET(chip->group);
+        ct->regs.mask = MASK_OFFSET + REG_OFFSET(chip->group);
+        ct->regs.type = CON_OFFSET + REG_OFFSET(chip->group);
+        irq_setup_generic_chip(gc, IRQ_MSK(chip->chip.ngpio),
+                               IRQ_GC_INIT_MASK_CACHE,
+                               IRQ_NOREQUEST | IRQ_NOPROBE, 0);
         return 0;
 }
 
diff --git a/arch/arm/plat-s5p/irq-pm.c b/arch/arm/plat-s5p/irq-pm.c
index 5259ad458bc8..327acb3a4464 100644
--- a/arch/arm/plat-s5p/irq-pm.c
+++ b/arch/arm/plat-s5p/irq-pm.c
@@ -16,7 +16,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
-#include <linux/sysdev.h>
 
 #include <plat/cpu.h>
 #include <plat/irqs.h>
@@ -77,17 +76,15 @@ static struct sleep_save eint_save[] = {
         SAVE_ITEM(S5P_EINT_MASK(3)),
 };
 
-int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state)
+int s3c24xx_irq_suspend(void)
 {
         s3c_pm_do_save(eint_save, ARRAY_SIZE(eint_save));
 
         return 0;
 }
 
-int s3c24xx_irq_resume(struct sys_device *dev)
+void s3c24xx_irq_resume(void)
 {
         s3c_pm_do_restore(eint_save, ARRAY_SIZE(eint_save));
-
-        return 0;
 }
 
diff --git a/arch/arm/plat-s5p/irq.c b/arch/arm/plat-s5p/irq.c
index 5560b12035d1..a97c08957f49 100644
--- a/arch/arm/plat-s5p/irq.c
+++ b/arch/arm/plat-s5p/irq.c
@@ -64,11 +64,7 @@ void __init s5p_init_irq(u32 *vic, u32 num_vic)
                 vic_init(VA_VIC(irq), VIC_BASE(irq), vic[irq], 0);
 #endif
 
-        s3c_init_vic_timer_irq(IRQ_TIMER0_VIC, IRQ_TIMER0);
-        s3c_init_vic_timer_irq(IRQ_TIMER1_VIC, IRQ_TIMER1);
-        s3c_init_vic_timer_irq(IRQ_TIMER2_VIC, IRQ_TIMER2);
-        s3c_init_vic_timer_irq(IRQ_TIMER3_VIC, IRQ_TIMER3);
-        s3c_init_vic_timer_irq(IRQ_TIMER4_VIC, IRQ_TIMER4);
+        s3c_init_vic_timer_irq(5, IRQ_TIMER0);
 
         s3c_init_uart_irqs(uart_irqs, ARRAY_SIZE(uart_irqs));
 }
diff --git a/arch/arm/plat-s5p/s5p-time.c b/arch/arm/plat-s5p/s5p-time.c
index 8090403eec0f..899a8cc011ff 100644
--- a/arch/arm/plat-s5p/s5p-time.c
+++ b/arch/arm/plat-s5p/s5p-time.c
@@ -290,7 +290,7 @@ static void __init s5p_clockevent_init(void)
         setup_irq(irq_number, &s5p_clock_event_irq);
 }
 
-static cycle_t s5p_timer_read(struct clocksource *cs)
+static void __iomem *s5p_timer_reg(void)
 {
         unsigned long offset = 0;
 
@@ -308,10 +308,17 @@ static cycle_t s5p_timer_read(struct clocksource *cs)
 
         default:
                 printk(KERN_ERR "Invalid Timer %d\n", timer_source.source_id);
-                return 0;
+                return NULL;
         }
 
-        return (cycle_t) ~__raw_readl(S3C_TIMERREG(offset));
+        return S3C_TIMERREG(offset);
+}
+
+static cycle_t s5p_timer_read(struct clocksource *cs)
+{
+        void __iomem *reg = s5p_timer_reg();
+
+        return (cycle_t) (reg ? ~__raw_readl(reg) : 0);
 }
 
 /*
@@ -325,53 +332,22 @@ static DEFINE_CLOCK_DATA(cd);
 
 unsigned long long notrace sched_clock(void)
 {
-        u32 cyc;
-        unsigned long offset = 0;
-
-        switch (timer_source.source_id) {
-        case S5P_PWM0:
-        case S5P_PWM1:
-        case S5P_PWM2:
-        case S5P_PWM3:
-                offset = (timer_source.source_id * 0x0c) + 0x14;
-                break;
-
-        case S5P_PWM4:
-                offset = 0x40;
-                break;
+        void __iomem *reg = s5p_timer_reg();
 
-        default:
-                printk(KERN_ERR "Invalid Timer %d\n", timer_source.source_id);
+        if (!reg)
                 return 0;
-        }
 
-        cyc = ~__raw_readl(S3C_TIMERREG(offset));
-        return cyc_to_sched_clock(&cd, cyc, (u32)~0);
+        return cyc_to_sched_clock(&cd, ~__raw_readl(reg), (u32)~0);
 }
 
 static void notrace s5p_update_sched_clock(void)
 {
-        u32 cyc;
-        unsigned long offset = 0;
+        void __iomem *reg = s5p_timer_reg();
 
-        switch (timer_source.source_id) {
-        case S5P_PWM0:
-        case S5P_PWM1:
-        case S5P_PWM2:
-        case S5P_PWM3:
-                offset = (timer_source.source_id * 0x0c) + 0x14;
-                break;
-
-        case S5P_PWM4:
-                offset = 0x40;
-                break;
-
-        default:
-                printk(KERN_ERR "Invalid Timer %d\n", timer_source.source_id);
-        }
+        if (!reg)
+                return;
 
-        cyc = ~__raw_readl(S3C_TIMERREG(offset));
-        update_sched_clock(&cd, cyc, (u32)~0);
+        update_sched_clock(&cd, ~__raw_readl(reg), (u32)~0);
 }
 
 struct clocksource time_clocksource = {
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index be72100b81b4..4d79519d19a4 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -8,6 +8,7 @@ config PLAT_SAMSUNG
         bool
         depends on PLAT_S3C24XX || ARCH_S3C64XX || PLAT_S5P
         select NO_IOPORT
+        select GENERIC_IRQ_CHIP
         default y
         help
           Base platform code for all Samsung SoC based systems
diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h
index cedfff51c82b..3aedac0034ba 100644
--- a/arch/arm/plat-samsung/include/plat/cpu.h
+++ b/arch/arm/plat-samsung/include/plat/cpu.h
@@ -68,6 +68,12 @@ extern void s3c24xx_init_uartdevs(char *name,
 struct sys_timer;
 extern struct sys_timer s3c24xx_timer;
 
+extern struct syscore_ops s3c2410_pm_syscore_ops;
+extern struct syscore_ops s3c2412_pm_syscore_ops;
+extern struct syscore_ops s3c2416_pm_syscore_ops;
+extern struct syscore_ops s3c244x_pm_syscore_ops;
+extern struct syscore_ops s3c64xx_irq_syscore_ops;
+
 /* system device classes */
 
 extern struct sysdev_class s3c2410_sysclass;
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
index f0da6b70fba4..39818d8da420 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -88,6 +88,7 @@ extern struct platform_device s3c64xx_device_onenand1;
 extern struct platform_device s5p_device_onenand;
 
 extern struct platform_device s3c_device_usbgadget;
+extern struct platform_device s3c_device_usb_hsudc;
 extern struct platform_device s3c_device_usb_hsotg;
 
 extern struct platform_device s5pv210_device_ac97;
@@ -142,6 +143,8 @@ extern struct platform_device s5p_device_fimc3;
 extern struct platform_device s5p_device_mipi_csis0;
 extern struct platform_device s5p_device_mipi_csis1;
 
+extern struct platform_device s5p_device_ehci;
+
 extern struct platform_device exynos4_device_sysmmu;
 
 /* s3c2440 specific devices */
diff --git a/arch/arm/plat-samsung/include/plat/irq-vic-timer.h b/arch/arm/plat-samsung/include/plat/irq-vic-timer.h
index a90b53431b5b..5b9c42fd32d7 100644
--- a/arch/arm/plat-samsung/include/plat/irq-vic-timer.h
+++ b/arch/arm/plat-samsung/include/plat/irq-vic-timer.h
@@ -10,4 +10,4 @@
  * published by the Free Software Foundation.
 */
 
-extern void s3c_init_vic_timer_irq(unsigned int vic, unsigned int timer);
+extern void s3c_init_vic_timer_irq(unsigned int num, unsigned int timer_irq);
diff --git a/arch/arm/plat-samsung/include/plat/pm.h b/arch/arm/plat-samsung/include/plat/pm.h
index 937cc2ace517..7fb6f6be8c81 100644
--- a/arch/arm/plat-samsung/include/plat/pm.h
+++ b/arch/arm/plat-samsung/include/plat/pm.h
@@ -103,14 +103,16 @@ extern void s3c_pm_do_restore_core(struct sleep_save *ptr, int count);
 
 #ifdef CONFIG_PM
 extern int s3c_irqext_wake(struct irq_data *data, unsigned int state);
-extern int s3c24xx_irq_suspend(struct sys_device *dev, pm_message_t state);
-extern int s3c24xx_irq_resume(struct sys_device *dev);
+extern int s3c24xx_irq_suspend(void);
+extern void s3c24xx_irq_resume(void);
 #else
 #define s3c_irqext_wake NULL
 #define s3c24xx_irq_suspend NULL
 #define s3c24xx_irq_resume  NULL
 #endif
 
+extern struct syscore_ops s3c24xx_irq_syscore_ops;
+
 /* PM debug functions */
 
 #ifdef CONFIG_SAMSUNG_PM_DEBUG
diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h
index 7d6ed7263d57..ee48e12a1e72 100644
--- a/arch/arm/plat-samsung/include/plat/uncompress.h
+++ b/arch/arm/plat-samsung/include/plat/uncompress.h
@@ -18,8 +18,8 @@ typedef unsigned int upf_t;	/* cannot include linux/serial_core.h */
 
 /* uart setup */
 
-static unsigned int fifo_mask;
-static unsigned int fifo_max;
+unsigned int fifo_mask;
+unsigned int fifo_max;
 
 /* forward declerations */
 
diff --git a/arch/arm/plat-samsung/irq-uart.c b/arch/arm/plat-samsung/irq-uart.c
index 4d4e571af553..32582c0958e3 100644
--- a/arch/arm/plat-samsung/irq-uart.c
+++ b/arch/arm/plat-samsung/irq-uart.c
@@ -27,60 +27,6 @@
 /* Note, we make use of the fact that the parent IRQs, IRQ_UART[0..3]
  * are consecutive when looking up the interrupt in the demux routines.
  */
-
-static inline void __iomem *s3c_irq_uart_base(struct irq_data *data)
-{
-        struct s3c_uart_irq *uirq = irq_data_get_irq_chip_data(data);
-        return uirq->regs;
-}
-
-static inline unsigned int s3c_irq_uart_bit(unsigned int irq)
-{
-        return irq & 3;
-}
-
-static void s3c_irq_uart_mask(struct irq_data *data)
-{
-        void __iomem *regs = s3c_irq_uart_base(data);
-        unsigned int bit = s3c_irq_uart_bit(data->irq);
-        u32 reg;
-
-        reg = __raw_readl(regs + S3C64XX_UINTM);
-        reg |= (1 << bit);
-        __raw_writel(reg, regs + S3C64XX_UINTM);
-}
-
-static void s3c_irq_uart_maskack(struct irq_data *data)
-{
-        void __iomem *regs = s3c_irq_uart_base(data);
-        unsigned int bit = s3c_irq_uart_bit(data->irq);
-        u32 reg;
-
-        reg = __raw_readl(regs + S3C64XX_UINTM);
-        reg |= (1 << bit);
-        __raw_writel(reg, regs + S3C64XX_UINTM);
-        __raw_writel(1 << bit, regs + S3C64XX_UINTP);
-}
-
-static void s3c_irq_uart_unmask(struct irq_data *data)
-{
-        void __iomem *regs = s3c_irq_uart_base(data);
-        unsigned int bit = s3c_irq_uart_bit(data->irq);
-        u32 reg;
-
-        reg = __raw_readl(regs + S3C64XX_UINTM);
-        reg &= ~(1 << bit);
-        __raw_writel(reg, regs + S3C64XX_UINTM);
-}
-
-static void s3c_irq_uart_ack(struct irq_data *data)
-{
-        void __iomem *regs = s3c_irq_uart_base(data);
-        unsigned int bit = s3c_irq_uart_bit(data->irq);
-
-        __raw_writel(1 << bit, regs + S3C64XX_UINTP);
-}
-
 static void s3c_irq_demux_uart(unsigned int irq, struct irq_desc *desc)
 {
         struct s3c_uart_irq *uirq = desc->irq_data.handler_data;
@@ -97,30 +43,25 @@ static void s3c_irq_demux_uart(unsigned int irq, struct irq_desc *desc)
                 generic_handle_irq(base + 3);
 }
 
-static struct irq_chip s3c_irq_uart = {
-        .name           = "s3c-uart",
-        .irq_mask       = s3c_irq_uart_mask,
-        .irq_unmask     = s3c_irq_uart_unmask,
-        .irq_mask_ack   = s3c_irq_uart_maskack,
-        .irq_ack        = s3c_irq_uart_ack,
-};
-
 static void __init s3c_init_uart_irq(struct s3c_uart_irq *uirq)
 {
         void __iomem *reg_base = uirq->regs;
-        unsigned int irq;
-        int offs;
+        struct irq_chip_generic *gc;
+        struct irq_chip_type *ct;
 
         /* mask all interrupts at the start. */
         __raw_writel(0xf, reg_base + S3C64XX_UINTM);
 
-        for (offs = 0; offs < 3; offs++) {
-                irq = uirq->base_irq + offs;
-
-                irq_set_chip_and_handler(irq, &s3c_irq_uart, handle_level_irq);
-                irq_set_chip_data(irq, uirq);
-                set_irq_flags(irq, IRQF_VALID);
-        }
+        gc = irq_alloc_generic_chip("s3c-uart", 1, uirq->base_irq, reg_base,
+                                    handle_level_irq);
+        ct = gc->chip_types;
+        ct->chip.irq_ack = irq_gc_ack;
+        ct->chip.irq_mask = irq_gc_mask_set_bit;
+        ct->chip.irq_unmask = irq_gc_mask_clr_bit;
+        ct->regs.ack = S3C64XX_UINTP;
+        ct->regs.mask = S3C64XX_UINTM;
+        irq_setup_generic_chip(gc, IRQ_MSK(4), IRQ_GC_INIT_MASK_CACHE,
+                               IRQ_NOREQUEST | IRQ_NOPROBE, 0);
 
         irq_set_handler_data(uirq->parent_irq, uirq);
         irq_set_chained_handler(uirq->parent_irq, s3c_irq_demux_uart);
diff --git a/arch/arm/plat-samsung/irq-vic-timer.c b/arch/arm/plat-samsung/irq-vic-timer.c
index d6ad66ab9290..a607546ddbd0 100644
--- a/arch/arm/plat-samsung/irq-vic-timer.c
+++ b/arch/arm/plat-samsung/irq-vic-timer.c
@@ -28,60 +28,43 @@ static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc)
 }
 
 /* We assume the IRQ_TIMER0..IRQ_TIMER4 range is continuous. */
-
-static void s3c_irq_timer_mask(struct irq_data *data)
-{
-        u32 reg = __raw_readl(S3C64XX_TINT_CSTAT);
-        u32 mask = (u32)data->chip_data;
-
-        reg &= 0x1f;  /* mask out pending interrupts */
-        reg &= ~mask;
-        __raw_writel(reg, S3C64XX_TINT_CSTAT);
-}
-
-static void s3c_irq_timer_unmask(struct irq_data *data)
+static void s3c_irq_timer_ack(struct irq_data *d)
 {
-        u32 reg = __raw_readl(S3C64XX_TINT_CSTAT);
-        u32 mask = (u32)data->chip_data;
+        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
+        u32 mask = (1 << 5) << (d->irq - gc->irq_base);
 
-        reg &= 0x1f;  /* mask out pending interrupts */
-        reg |= mask;
-        __raw_writel(reg, S3C64XX_TINT_CSTAT);
+        irq_reg_writel(mask | gc->mask_cache, gc->reg_base);
 }
 
-static void s3c_irq_timer_ack(struct irq_data *data)
-{
-        u32 reg = __raw_readl(S3C64XX_TINT_CSTAT);
-        u32 mask = (u32)data->chip_data;
-
-        reg &= 0x1f;
-        reg |= mask << 5;
-        __raw_writel(reg, S3C64XX_TINT_CSTAT);
-}
-
-static struct irq_chip s3c_irq_timer = {
-        .name           = "s3c-timer",
-        .irq_mask       = s3c_irq_timer_mask,
-        .irq_unmask     = s3c_irq_timer_unmask,
-        .irq_ack        = s3c_irq_timer_ack,
-};
-
 /**
  * s3c_init_vic_timer_irq() - initialise timer irq chanined off VIC.\
- * @parent_irq: The parent IRQ on the VIC for the timer.
- * @timer_irq: The IRQ to be used for the timer.
+ * @num: Number of timers to initialize
+ * @timer_irq: Base IRQ number to be used for the timers.
  *
  * Register the necessary IRQ chaining and support for the timer IRQs
  * chained of the VIC.
  */
-void __init s3c_init_vic_timer_irq(unsigned int parent_irq,
-                                   unsigned int timer_irq)
+void __init s3c_init_vic_timer_irq(unsigned int num, unsigned int timer_irq)
 {
+        unsigned int pirq[5] = { IRQ_TIMER0_VIC, IRQ_TIMER1_VIC, IRQ_TIMER2_VIC,
+                                 IRQ_TIMER3_VIC, IRQ_TIMER4_VIC };
+        struct irq_chip_generic *s3c_tgc;
+        struct irq_chip_type *ct;
+        unsigned int i;
 
-        irq_set_chained_handler(parent_irq, s3c_irq_demux_vic_timer);
-        irq_set_handler_data(parent_irq, (void *)timer_irq);
+        s3c_tgc = irq_alloc_generic_chip("s3c-timer", 1, timer_irq,
+                                         S3C64XX_TINT_CSTAT, handle_level_irq);
+        ct = s3c_tgc->chip_types;
+        ct->chip.irq_mask = irq_gc_mask_clr_bit;
+        ct->chip.irq_unmask = irq_gc_mask_set_bit;
+        ct->chip.irq_ack = s3c_irq_timer_ack;
+        irq_setup_generic_chip(s3c_tgc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,
+                               IRQ_NOREQUEST | IRQ_NOPROBE, 0);
+        /* Clear the upper bits of the mask_cache*/
+        s3c_tgc->mask_cache &= 0x1f;
 
-        irq_set_chip_and_handler(timer_irq, &s3c_irq_timer, handle_level_irq);
-        irq_set_chip_data(timer_irq, (void *)(1 << (timer_irq - IRQ_TIMER0)));
-        set_irq_flags(timer_irq, IRQF_VALID);
+        for (i = 0; i < num; i++, timer_irq++) {
+                irq_set_chained_handler(pirq[i], s3c_irq_demux_vic_timer);
+                irq_set_handler_data(pirq[i], (void *)timer_irq);
+        }
 }
diff --git a/arch/arm/plat-spear/clock.c b/arch/arm/plat-spear/clock.c
index bdbd7ec9cb6b..6fa474cb398e 100644
--- a/arch/arm/plat-spear/clock.c
+++ b/arch/arm/plat-spear/clock.c
@@ -903,6 +903,11 @@ void recalc_root_clocks(void)
         spin_unlock_irqrestore(&clocks_lock, flags);
 }
 
+void __init clk_init(void)
+{
+        recalc_root_clocks();
+}
+
 #ifdef CONFIG_DEBUG_FS
 /*
  *      debugfs support to trace clock tree hierarchy and attributes
diff --git a/arch/arm/plat-spear/include/plat/clock.h b/arch/arm/plat-spear/include/plat/clock.h
index fcc0d0ad4a1f..0062bafef12d 100644
--- a/arch/arm/plat-spear/include/plat/clock.h
+++ b/arch/arm/plat-spear/include/plat/clock.h
@@ -224,6 +224,7 @@ struct clcd_rate_tbl {
 };
 
 /* platform specific clock functions */
+void __init clk_init(void);
 void clk_register(struct clk_lookup *cl);
 void recalc_root_clocks(void);
 
diff --git a/arch/arm/plat-spear/time.c b/arch/arm/plat-spear/time.c
index dbb6e4fff79d..0c77e4298675 100644
--- a/arch/arm/plat-spear/time.c
+++ b/arch/arm/plat-spear/time.c
@@ -70,19 +70,6 @@ static void clockevent_set_mode(enum clock_event_mode mode,
 static int clockevent_next_event(unsigned long evt,
                                  struct clock_event_device *clk_event_dev);
 
-static cycle_t clocksource_read_cycles(struct clocksource *cs)
-{
-        return (cycle_t) readw(gpt_base + COUNT(CLKSRC));
-}
-
-static struct clocksource clksrc = {
-        .name = "tmr1",
-        .rating = 200,          /* its a pretty decent clock */
-        .read = clocksource_read_cycles,
-        .mask = 0xFFFF,         /* 16 bits */
-        .flags = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
 static void spear_clocksource_init(void)
 {
         u32 tick_rate;
@@ -103,7 +90,8 @@ static void spear_clocksource_init(void)
         writew(val, gpt_base + CR(CLKSRC));
 
         /* register the clocksource */
-        clocksource_register_hz(&clksrc, tick_rate);
+        clocksource_mmio_init(gpt_base + COUNT(CLKSRC), "tmr1", tick_rate,
+                200, 16, clocksource_mmio_readw_up);
 }
 
 static struct clock_event_device clkevt = {
diff --git a/arch/arm/plat-stmp3xxx/Kconfig b/arch/arm/plat-stmp3xxx/Kconfig
deleted file mode 100644
index 2cf37c35951b..000000000000
--- a/arch/arm/plat-stmp3xxx/Kconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-if ARCH_STMP3XXX
-
-menu "Freescale STMP3xxx implementations"
-
-choice
-        prompt "Select STMP3xxx chip family"
-
-config ARCH_STMP37XX
-        bool "Freescale SMTP37xx"
-        select CPU_ARM926T
-        ---help---
-         STMP37xx refers to 3700 through 3769 chips
-
-config ARCH_STMP378X
-        bool "Freescale STMP378x"
-        select CPU_ARM926T
-        ---help---
-         STMP378x refers to 3780 through 3789 chips
-
-endchoice
-
-choice
-        prompt "Select STMP3xxx board type"
-
-config MACH_STMP37XX
-        depends on ARCH_STMP37XX
-        bool "Freescale STMP37xx development board"
-
-config MACH_STMP378X
-        depends on ARCH_STMP378X
-        bool "Freescale STMP378x development board"
-
-endchoice
-
-endmenu
-
-endif
diff --git a/arch/arm/plat-stmp3xxx/Makefile b/arch/arm/plat-stmp3xxx/Makefile
deleted file mode 100644
index 31dd518f37a5..000000000000
--- a/arch/arm/plat-stmp3xxx/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-# Object file lists.
-obj-y += core.o timer.o irq.o dma.o clock.o pinmux.o devices.o
diff --git a/arch/arm/plat-stmp3xxx/clock.c b/arch/arm/plat-stmp3xxx/clock.c
deleted file mode 100644
index 2e712e17ce72..000000000000
--- a/arch/arm/plat-stmp3xxx/clock.c
+++ /dev/null
@@ -1,1134 +0,0 @@
-/*
- * Clock manipulation routines for Freescale STMP37XX/STMP378X
- *
- * Author: Vitaly Wool <vital@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#define DEBUG
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/clk.h>
-#include <linux/spinlock.h>
-#include <linux/errno.h>
-#include <linux/err.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <linux/clkdev.h>
-
-#include <asm/mach-types.h>
-#include <mach/platform.h>
-#include <mach/regs-clkctrl.h>
-
-#include "clock.h"
-
-static DEFINE_SPINLOCK(clocks_lock);
-
-static struct clk osc_24M;
-static struct clk pll_clk;
-static struct clk cpu_clk;
-static struct clk hclk;
-
-static int propagate_rate(struct clk *);
-
-static inline int clk_is_busy(struct clk *clk)
-{
-        return __raw_readl(clk->busy_reg) & (1 << clk->busy_bit);
-}
-
-static inline int clk_good(struct clk *clk)
-{
-        return clk && !IS_ERR(clk) && clk->ops;
-}
-
-static int std_clk_enable(struct clk *clk)
-{
-        if (clk->enable_reg) {
-                u32 clk_reg = __raw_readl(clk->enable_reg);
-                if (clk->enable_negate)
-                        clk_reg &= ~(1 << clk->enable_shift);
-                else
-                        clk_reg |= (1 << clk->enable_shift);
-                __raw_writel(clk_reg, clk->enable_reg);
-                if (clk->enable_wait)
-                        udelay(clk->enable_wait);
-                return 0;
-        } else
-                return -EINVAL;
-}
-
-static int std_clk_disable(struct clk *clk)
-{
-        if (clk->enable_reg) {
-                u32 clk_reg = __raw_readl(clk->enable_reg);
-                if (clk->enable_negate)
-                        clk_reg |= (1 << clk->enable_shift);
-                else
-                        clk_reg &= ~(1 << clk->enable_shift);
-                __raw_writel(clk_reg, clk->enable_reg);
-                return 0;
-        } else
-                return -EINVAL;
-}
-
-static int io_set_rate(struct clk *clk, u32 rate)
-{
-        u32 reg_frac, clkctrl_frac;
-        int i, ret = 0, mask = 0x1f;
-
-        clkctrl_frac = (clk->parent->rate * 18 + rate - 1) / rate;
-
-        if (clkctrl_frac < 18 || clkctrl_frac > 35) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        reg_frac = __raw_readl(clk->scale_reg);
-        reg_frac &= ~(mask << clk->scale_shift);
-        __raw_writel(reg_frac | (clkctrl_frac << clk->scale_shift),
-                                clk->scale_reg);
-        if (clk->busy_reg) {
-                for (i = 10000; i; i--)
-                        if (!clk_is_busy(clk))
-                                break;
-                if (!i)
-                        ret = -ETIMEDOUT;
-                else
-                        ret = 0;
-        }
-out:
-        return ret;
-}
-
-static long io_get_rate(struct clk *clk)
-{
-        long rate = clk->parent->rate * 18;
-        int mask = 0x1f;
-
-        rate /= (__raw_readl(clk->scale_reg) >> clk->scale_shift) & mask;
-        clk->rate = rate;
-
-        return rate;
-}
-
-static long per_get_rate(struct clk *clk)
-{
-        long rate = clk->parent->rate;
-        long div;
-        const int mask = 0xff;
-
-        if (clk->enable_reg &&
-                        !(__raw_readl(clk->enable_reg) & clk->enable_shift))
-                clk->rate = 0;
-        else {
-                div = (__raw_readl(clk->scale_reg) >> clk->scale_shift) & mask;
-                if (div)
-                        rate /= div;
-                clk->rate = rate;
-        }
-
-        return clk->rate;
-}
-
-static int per_set_rate(struct clk *clk, u32 rate)
-{
-        int ret = -EINVAL;
-        int div = (clk->parent->rate + rate - 1) / rate;
-        u32 reg_frac;
-        const int mask = 0xff;
-        int try = 10;
-        int i = -1;
-
-        if (div == 0 || div > mask)
-                goto out;
-
-        reg_frac = __raw_readl(clk->scale_reg);
-        reg_frac &= ~(mask << clk->scale_shift);
-
-        while (try--) {
-                __raw_writel(reg_frac | (div << clk->scale_shift),
-                                clk->scale_reg);
-
-                if (clk->busy_reg) {
-                        for (i = 10000; i; i--)
-                                if (!clk_is_busy(clk))
-                                        break;
-                }
-                if (i)
-                        break;
-        }
-
-        if (!i)
-                ret = -ETIMEDOUT;
-        else
-                ret = 0;
-
-out:
-        if (ret != 0)
-                printk(KERN_ERR "%s: error %d\n", __func__, ret);
-        return ret;
-}
-
-static long lcdif_get_rate(struct clk *clk)
-{
-        long rate = clk->parent->rate;
-        long div;
-        const int mask = 0xff;
-
-        div = (__raw_readl(clk->scale_reg) >> clk->scale_shift) & mask;
-        if (div) {
-                rate /= div;
-                div = (__raw_readl(REGS_CLKCTRL_BASE + HW_CLKCTRL_FRAC) &
-                        BM_CLKCTRL_FRAC_PIXFRAC) >> BP_CLKCTRL_FRAC_PIXFRAC;
-                rate /= div;
-        }
-        clk->rate = rate;
-
-        return rate;
-}
-
-static int lcdif_set_rate(struct clk *clk, u32 rate)
-{
-        int ret = 0;
-        /*
-         * On 3700, we can get most timings exact by modifying ref_pix
-         * and the divider, but keeping the phase timings at 1 (2
-         * phases per cycle).
-         *
-         * ref_pix can be between 480e6*18/35=246.9MHz and 480e6*18/18=480MHz,
-         * which is between 18/(18*480e6)=2.084ns and 35/(18*480e6)=4.050ns.
-         *
-         * ns_cycle >= 2*18e3/(18*480) = 25/6
-         * ns_cycle <= 2*35e3/(18*480) = 875/108
-         *
-         * Multiply the ns_cycle by 'div' to lengthen it until it fits the
-         * bounds. This is the divider we'll use after ref_pix.
-         *
-         * 6 * ns_cycle >= 25 * div
-         * 108 * ns_cycle <= 875 * div
-         */
-        u32 ns_cycle = 1000000 / rate;
-        u32 div, reg_val;
-        u32 lowest_result = (u32) -1;
-        u32 lowest_div = 0, lowest_fracdiv = 0;
-
-        for (div = 1; div < 256; ++div) {
-                u32 fracdiv;
-                u32 ps_result;
-                int lower_bound = 6 * ns_cycle >= 25 * div;
-                int upper_bound = 108 * ns_cycle <= 875 * div;
-                if (!lower_bound)
-                        break;
-                if (!upper_bound)
-                        continue;
-                /*
-                 * Found a matching div. Calculate fractional divider needed,
-                 * rounded up.
-                 */
-                fracdiv = ((clk->parent->rate / 1000 * 18 / 2) *
-                                ns_cycle + 1000 * div - 1) /
-                                (1000 * div);
-                if (fracdiv < 18 || fracdiv > 35) {
-                        ret = -EINVAL;
-                        goto out;
-                }
-                /* Calculate the actual cycle time this results in */
-                ps_result = 6250 * div * fracdiv / 27;
-
-                /* Use the fastest result that doesn't break ns_cycle */
-                if (ps_result <= lowest_result) {
-                        lowest_result = ps_result;
-                        lowest_div = div;
-                        lowest_fracdiv = fracdiv;
-                }
-        }
-
-        if (div >= 256 || lowest_result == (u32) -1) {
-                ret = -EINVAL;
-                goto out;
-        }
-        pr_debug("Programming PFD=%u,DIV=%u ref_pix=%uMHz "
-                        "PIXCLK=%uMHz cycle=%u.%03uns\n",
-                        lowest_fracdiv, lowest_div,
-                        480*18/lowest_fracdiv, 480*18/lowest_fracdiv/lowest_div,
-                        lowest_result / 1000, lowest_result % 1000);
-
-        /* Program ref_pix phase fractional divider */
-        reg_val = __raw_readl(REGS_CLKCTRL_BASE + HW_CLKCTRL_FRAC);
-        reg_val &= ~BM_CLKCTRL_FRAC_PIXFRAC;
-        reg_val |= BF(lowest_fracdiv, CLKCTRL_FRAC_PIXFRAC);
-        __raw_writel(reg_val, REGS_CLKCTRL_BASE + HW_CLKCTRL_FRAC);
-
-        /* Ungate PFD */
-        stmp3xxx_clearl(BM_CLKCTRL_FRAC_CLKGATEPIX,
-                        REGS_CLKCTRL_BASE + HW_CLKCTRL_FRAC);
-
-        /* Program pix divider */
-        reg_val = __raw_readl(clk->scale_reg);
-        reg_val &= ~(BM_CLKCTRL_PIX_DIV | BM_CLKCTRL_PIX_CLKGATE);
-        reg_val |= BF(lowest_div, CLKCTRL_PIX_DIV);
-        __raw_writel(reg_val, clk->scale_reg);
-
-        /* Wait for divider update */
-        if (clk->busy_reg) {
-                int i;
-                for (i = 10000; i; i--)
-                        if (!clk_is_busy(clk))
-                                break;
-                if (!i) {
-                        ret = -ETIMEDOUT;
-                        goto out;
-                }
-        }
-
-        /* Switch to ref_pix source */
-        reg_val = __raw_readl(REGS_CLKCTRL_BASE + HW_CLKCTRL_CLKSEQ);
-        reg_val &= ~BM_CLKCTRL_CLKSEQ_BYPASS_PIX;
-        __raw_writel(reg_val, REGS_CLKCTRL_BASE + HW_CLKCTRL_CLKSEQ);
-
-out:
-        return ret;
-}
-
-
-static int cpu_set_rate(struct clk *clk, u32 rate)
-{
-        u32 reg_val;
-
-        if (rate < 24000)
-                return -EINVAL;
-        else if (rate == 24000) {
-                /* switch to the 24M source */
-                clk_set_parent(clk, &osc_24M);
-        } else {
-                int i;
-                u32 clkctrl_cpu = 1;
-                u32 c = clkctrl_cpu;
-                u32 clkctrl_frac = 1;
-                u32 val;
-                for ( ; c < 0x40; c++) {
-                        u32 f = (pll_clk.rate*18/c + rate/2) / rate;
-                        int s1, s2;
-
-                        if (f < 18 || f > 35)
-                                continue;
-                        s1 = pll_clk.rate*18/clkctrl_frac/clkctrl_cpu - rate;
-                        s2 = pll_clk.rate*18/c/f - rate;
-                        pr_debug("%s: s1 %d, s2 %d\n", __func__, s1, s2);
-                        if (abs(s1) > abs(s2)) {
-                                clkctrl_cpu = c;
-                                clkctrl_frac = f;
-                        }
-                        if (s2 == 0)
-                                break;
-                };
-                pr_debug("%s: clkctrl_cpu %d, clkctrl_frac %d\n", __func__,
-                                clkctrl_cpu, clkctrl_frac);
-                if (c == 0x40) {
-                        int  d = pll_clk.rate*18/clkctrl_frac/clkctrl_cpu -
-                                rate;
-                        if (abs(d) > 100 ||
-                            clkctrl_frac < 18 || clkctrl_frac > 35)
-                                return -EINVAL;
-                }
-
-                /* 4.6.2 */
-                val = __raw_readl(clk->scale_reg);
-                val &= ~(0x3f << clk->scale_shift);
-                val |= clkctrl_frac;
-                clk_set_parent(clk, &osc_24M);
-                udelay(10);
-                __raw_writel(val, clk->scale_reg);
-                /* ungate */
-                __raw_writel(1<<7, clk->scale_reg + 8);
-                /* write clkctrl_cpu */
-                clk->saved_div = clkctrl_cpu;
-
-                reg_val = __raw_readl(REGS_CLKCTRL_BASE + HW_CLKCTRL_CPU);
-                reg_val &= ~0x3F;
-                reg_val |= clkctrl_cpu;
-                __raw_writel(reg_val, REGS_CLKCTRL_BASE + HW_CLKCTRL_CPU);
-
-                for (i = 10000; i; i--)
-                        if (!clk_is_busy(clk))
-                                break;
-                if (!i) {
-                        printk(KERN_ERR "couldn't set up CPU divisor\n");
-                        return -ETIMEDOUT;
-                }
-                clk_set_parent(clk, &pll_clk);
-                clk->saved_div = 0;
-                udelay(10);
-        }
-        return 0;
-}
-
-static long cpu_get_rate(struct clk *clk)
-{
-        long rate = clk->parent->rate * 18;
-
-        rate /= (__raw_readl(clk->scale_reg) >> clk->scale_shift) & 0x3f;
-        rate /= __raw_readl(REGS_CLKCTRL_BASE + HW_CLKCTRL_CPU) & 0x3f;
-        rate = ((rate + 9) / 10) * 10;
-        clk->rate = rate;
-
-        return rate;
-}
-
-static long cpu_round_rate(struct clk *clk, u32 rate)
-{
-        unsigned long r = 0;
-
-        if (rate <= 24000)
-                r = 24000;
-        else {
-                u32 clkctrl_cpu = 1;
-                u32 clkctrl_frac;
-                do {
-                        clkctrl_frac =
-                                (pll_clk.rate*18 / clkctrl_cpu + rate/2) / rate;
-                        if (clkctrl_frac > 35)
-                                continue;
-                        if (pll_clk.rate*18 / clkctrl_frac / clkctrl_cpu/10 ==
-                            rate / 10)
-                                break;
-                } while (pll_clk.rate / 2  >= clkctrl_cpu++ * rate);
-                if (pll_clk.rate / 2 < (clkctrl_cpu - 1) * rate)
-                        clkctrl_cpu--;
-                pr_debug("%s: clkctrl_cpu %d, clkctrl_frac %d\n", __func__,
-                                clkctrl_cpu, clkctrl_frac);
-                if (clkctrl_frac < 18)
-                        clkctrl_frac = 18;
-                if (clkctrl_frac > 35)
-                        clkctrl_frac = 35;
-
-                r = pll_clk.rate * 18;
-                r /= clkctrl_frac;
-                r /= clkctrl_cpu;
-                r = 10 * ((r + 9) / 10);
-        }
-        return r;
-}
-
-static long emi_get_rate(struct clk *clk)
-{
-        long rate = clk->parent->rate * 18;
-
-        rate /= (__raw_readl(clk->scale_reg) >> clk->scale_shift) & 0x3f;
-        rate /= __raw_readl(REGS_CLKCTRL_BASE + HW_CLKCTRL_EMI) & 0x3f;
-        clk->rate = rate;
-
-        return rate;
-}
-
-static int clkseq_set_parent(struct clk *clk, struct clk *parent)
-{
-        int ret = -EINVAL;
-        int shift = 8;
-
-        /* bypass? */
-        if (parent == &osc_24M)
-                shift = 4;
-
-        if (clk->bypass_reg) {
-#ifdef CONFIG_ARCH_STMP378X
-                u32 hbus_val, cpu_val;
-
-                if (clk == &cpu_clk && shift == 4) {
-                        hbus_val = __raw_readl(REGS_CLKCTRL_BASE +
-                                        HW_CLKCTRL_HBUS);
-                        cpu_val = __raw_readl(REGS_CLKCTRL_BASE +
-                                        HW_CLKCTRL_CPU);
-
-                        hbus_val &= ~(BM_CLKCTRL_HBUS_DIV_FRAC_EN |
-                                      BM_CLKCTRL_HBUS_DIV);
-                        clk->saved_div = cpu_val & BM_CLKCTRL_CPU_DIV_CPU;
-                        cpu_val &= ~BM_CLKCTRL_CPU_DIV_CPU;
-                        cpu_val |= 1;
-
-                        if (machine_is_stmp378x()) {
-                                __raw_writel(hbus_val,
-                                        REGS_CLKCTRL_BASE + HW_CLKCTRL_HBUS);
-                                __raw_writel(cpu_val,
-                                        REGS_CLKCTRL_BASE + HW_CLKCTRL_CPU);
-                                hclk.rate = 0;
-                        }
-                } else if (clk == &cpu_clk && shift == 8) {
-                        hbus_val = __raw_readl(REGS_CLKCTRL_BASE +
-                                                        HW_CLKCTRL_HBUS);
-                        cpu_val = __raw_readl(REGS_CLKCTRL_BASE +
-                                                        HW_CLKCTRL_CPU);
-                        hbus_val &= ~(BM_CLKCTRL_HBUS_DIV_FRAC_EN |
-                                      BM_CLKCTRL_HBUS_DIV);
-                        hbus_val |= 2;
-                        cpu_val &= ~BM_CLKCTRL_CPU_DIV_CPU;
-                        if (clk->saved_div)
-                                cpu_val |= clk->saved_div;
-                        else
-                                cpu_val |= 2;
-
-                        if (machine_is_stmp378x()) {
-                                __raw_writel(hbus_val,
-                                        REGS_CLKCTRL_BASE + HW_CLKCTRL_HBUS);
-                                __raw_writel(cpu_val,
-                                        REGS_CLKCTRL_BASE + HW_CLKCTRL_CPU);
-                                hclk.rate = 0;
-                        }
-                }
-#endif
-                __raw_writel(1 << clk->bypass_shift, clk->bypass_reg + shift);
-
-                ret = 0;
-        }
-
-        return ret;
-}
-
-static int hbus_set_rate(struct clk *clk, u32 rate)
-{
-        u8 div = 0;
-        int is_frac = 0;
-        u32 clkctrl_hbus;
-        struct clk *parent = clk->parent;
-
-        pr_debug("%s: rate %d, parent rate %d\n", __func__, rate,
-                        parent->rate);
-
-        if (rate > parent->rate)
-                return -EINVAL;
-
-        if (((parent->rate + rate/2) / rate) * rate != parent->rate &&
-            parent->rate / rate < 32) {
-                pr_debug("%s: switching to fractional mode\n", __func__);
-                is_frac = 1;
-        }
-
-        if (is_frac)
-                div = (32 * rate + parent->rate / 2) / parent->rate;
-        else
-                div = (parent->rate + rate - 1) / rate;
-        pr_debug("%s: div calculated is %d\n", __func__, div);
-        if (!div || div > 0x1f)
-                return -EINVAL;
-
-        clk_set_parent(&cpu_clk, &osc_24M);
-        udelay(10);
-        clkctrl_hbus = __raw_readl(clk->scale_reg);
-        clkctrl_hbus &= ~0x3f;
-        clkctrl_hbus |= div;
-        clkctrl_hbus |= (is_frac << 5);
-
-        __raw_writel(clkctrl_hbus, clk->scale_reg);
-        if (clk->busy_reg) {
-                int i;
-                for (i = 10000; i; i--)
-                        if (!clk_is_busy(clk))
-                                break;
-                if (!i) {
-                        printk(KERN_ERR "couldn't set up CPU divisor\n");
-                        return -ETIMEDOUT;
-                }
-        }
-        clk_set_parent(&cpu_clk, &pll_clk);
-        __raw_writel(clkctrl_hbus, clk->scale_reg);
-        udelay(10);
-        return 0;
-}
-
-static long hbus_get_rate(struct clk *clk)
-{
-        long rate = clk->parent->rate;
-
-        if (__raw_readl(clk->scale_reg) & 0x20) {
-                rate *= __raw_readl(clk->scale_reg) & 0x1f;
-                rate /= 32;
-        } else
-                rate /= __raw_readl(clk->scale_reg) & 0x1f;
-        clk->rate = rate;
-
-        return rate;
-}
-
-static int xbus_set_rate(struct clk *clk, u32 rate)
-{
-        u16 div = 0;
-        u32 clkctrl_xbus;
-
-        pr_debug("%s: rate %d, parent rate %d\n", __func__, rate,
-                        clk->parent->rate);
-
-        div = (clk->parent->rate + rate - 1) / rate;
-        pr_debug("%s: div calculated is %d\n", __func__, div);
-        if (!div || div > 0x3ff)
-                return -EINVAL;
-
-        clkctrl_xbus = __raw_readl(clk->scale_reg);
-        clkctrl_xbus &= ~0x3ff;
-        clkctrl_xbus |= div;
-        __raw_writel(clkctrl_xbus, clk->scale_reg);
-        if (clk->busy_reg) {
-                int i;
-                for (i = 10000; i; i--)
-                        if (!clk_is_busy(clk))
-                                break;
-                if (!i) {
-                        printk(KERN_ERR "couldn't set up xbus divisor\n");
-                        return -ETIMEDOUT;
-                }
-        }
-        return 0;
-}
-
-static long xbus_get_rate(struct clk *clk)
-{
-        long rate = clk->parent->rate;
-
-        rate /= __raw_readl(clk->scale_reg) & 0x3ff;
-        clk->rate = rate;
-
-        return rate;
-}
-
-
-/* Clock ops */
-
-static struct clk_ops std_ops = {
-        .enable         = std_clk_enable,
-        .disable        = std_clk_disable,
-        .get_rate       = per_get_rate,
-        .set_rate       = per_set_rate,
-        .set_parent     = clkseq_set_parent,
-};
-
-static struct clk_ops min_ops = {
-        .enable         = std_clk_enable,
-        .disable        = std_clk_disable,
-};
-
-static struct clk_ops cpu_ops = {
-        .enable         = std_clk_enable,
-        .disable        = std_clk_disable,
-        .get_rate       = cpu_get_rate,
-        .set_rate       = cpu_set_rate,
-        .round_rate     = cpu_round_rate,
-        .set_parent     = clkseq_set_parent,
-};
-
-static struct clk_ops io_ops = {
-        .enable         = std_clk_enable,
-        .disable        = std_clk_disable,
-        .get_rate       = io_get_rate,
-        .set_rate       = io_set_rate,
-};
-
-static struct clk_ops hbus_ops = {
-        .get_rate       = hbus_get_rate,
-        .set_rate       = hbus_set_rate,
-};
-
-static struct clk_ops xbus_ops = {
-        .get_rate       = xbus_get_rate,
-        .set_rate       = xbus_set_rate,
-};
-
-static struct clk_ops lcdif_ops = {
-        .enable         = std_clk_enable,
-        .disable        = std_clk_disable,
-        .get_rate       = lcdif_get_rate,
-        .set_rate       = lcdif_set_rate,
-        .set_parent     = clkseq_set_parent,
-};
-
-static struct clk_ops emi_ops = {
-        .get_rate       = emi_get_rate,
-};
-
-/* List of on-chip clocks */
-
-static struct clk osc_24M = {
-        .flags          = FIXED_RATE | ENABLED,
-        .rate           = 24000,
-};
-
-static struct clk pll_clk = {
-        .parent         = &osc_24M,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_PLLCTRL0,
-        .enable_shift   = 16,
-        .enable_wait    = 10,
-        .flags          = FIXED_RATE | ENABLED,
-        .rate           = 480000,
-        .ops            = &min_ops,
-};
-
-static struct clk cpu_clk = {
-        .parent         = &pll_clk,
-        .scale_reg      = REGS_CLKCTRL_BASE + HW_CLKCTRL_FRAC,
-        .scale_shift    = 0,
-        .bypass_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_CLKSEQ,
-        .bypass_shift   = 7,
-        .busy_reg       = REGS_CLKCTRL_BASE + HW_CLKCTRL_CPU,
-        .busy_bit       = 28,
-        .flags          = RATE_PROPAGATES | ENABLED,
-        .ops            = &cpu_ops,
-};
-
-static struct clk io_clk = {
-        .parent         = &pll_clk,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_FRAC,
-        .enable_shift   = 31,
-        .enable_negate  = 1,
-        .scale_reg      = REGS_CLKCTRL_BASE + HW_CLKCTRL_FRAC,
-        .scale_shift    = 24,
-        .flags          = RATE_PROPAGATES | ENABLED,
-        .ops            = &io_ops,
-};
-
-static struct clk hclk = {
-        .parent         = &cpu_clk,
-        .scale_reg      = REGS_CLKCTRL_BASE + HW_CLKCTRL_HBUS,
-        .bypass_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_CLKSEQ,
-        .bypass_shift   = 7,
-        .busy_reg       = REGS_CLKCTRL_BASE + HW_CLKCTRL_HBUS,
-        .busy_bit       = 29,
-        .flags          = RATE_PROPAGATES | ENABLED,
-        .ops            = &hbus_ops,
-};
-
-static struct clk xclk = {
-        .parent         = &osc_24M,
-        .scale_reg      = REGS_CLKCTRL_BASE + HW_CLKCTRL_XBUS,
-        .busy_reg       = REGS_CLKCTRL_BASE + HW_CLKCTRL_XBUS,
-        .busy_bit       = 31,
-        .flags          = RATE_PROPAGATES | ENABLED,
-        .ops            = &xbus_ops,
-};
-
-static struct clk uart_clk = {
-        .parent         = &xclk,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_XTAL,
-        .enable_shift   = 31,
-        .enable_negate  = 1,
-        .flags          = ENABLED,
-        .ops            = &min_ops,
-};
-
-static struct clk audio_clk = {
-        .parent         = &xclk,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_XTAL,
-        .enable_shift   = 30,
-        .enable_negate  = 1,
-        .ops            = &min_ops,
-};
-
-static struct clk pwm_clk = {
-        .parent         = &xclk,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_XTAL,
-        .enable_shift   = 29,
-        .enable_negate  = 1,
-        .ops            = &min_ops,
-};
-
-static struct clk dri_clk = {
-        .parent         = &xclk,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_XTAL,
-        .enable_shift   = 28,
-        .enable_negate  = 1,
-        .ops            = &min_ops,
-};
-
-static struct clk digctl_clk = {
-        .parent         = &xclk,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_XTAL,
-        .enable_shift   = 27,
-        .enable_negate  = 1,
-        .ops            = &min_ops,
-};
-
-static struct clk timer_clk = {
-        .parent         = &xclk,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_XTAL,
-        .enable_shift   = 26,
-        .enable_negate  = 1,
-        .flags          = ENABLED,
-        .ops            = &min_ops,
-};
-
-static struct clk lcdif_clk = {
-        .parent         = &pll_clk,
-        .scale_reg      = REGS_CLKCTRL_BASE + HW_CLKCTRL_PIX,
-        .busy_reg       = REGS_CLKCTRL_BASE + HW_CLKCTRL_PIX,
-        .busy_bit       = 29,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_PIX,
-        .enable_shift   = 31,
-        .enable_negate  = 1,
-        .bypass_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_CLKSEQ,
-        .bypass_shift   = 1,
-        .flags          = NEEDS_SET_PARENT,
-        .ops            = &lcdif_ops,
-};
-
-static struct clk ssp_clk = {
-        .parent         = &io_clk,
-        .scale_reg      = REGS_CLKCTRL_BASE + HW_CLKCTRL_SSP,
-        .busy_reg       = REGS_CLKCTRL_BASE + HW_CLKCTRL_SSP,
-        .busy_bit       = 29,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_SSP,
-        .enable_shift   = 31,
-        .bypass_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_CLKSEQ,
-        .bypass_shift   = 5,
-        .enable_negate  = 1,
-        .flags          = NEEDS_SET_PARENT,
-        .ops            = &std_ops,
-};
-
-static struct clk gpmi_clk = {
-        .parent         = &io_clk,
-        .scale_reg      = REGS_CLKCTRL_BASE + HW_CLKCTRL_GPMI,
-        .busy_reg       = REGS_CLKCTRL_BASE + HW_CLKCTRL_GPMI,
-        .busy_bit       = 29,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_GPMI,
-        .enable_shift   = 31,
-        .enable_negate  = 1,
-        .bypass_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_CLKSEQ,
-        .bypass_shift   = 4,
-        .flags          = NEEDS_SET_PARENT,
-        .ops            = &std_ops,
-};
-
-static struct clk spdif_clk = {
-        .parent         = &pll_clk,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_SPDIF,
-        .enable_shift   = 31,
-        .enable_negate  = 1,
-        .ops            = &min_ops,
-};
-
-static struct clk emi_clk = {
-        .parent         = &pll_clk,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_EMI,
-        .enable_shift   = 31,
-        .enable_negate  = 1,
-        .scale_reg      = REGS_CLKCTRL_BASE + HW_CLKCTRL_FRAC,
-        .scale_shift    = 8,
-        .busy_reg       = REGS_CLKCTRL_BASE + HW_CLKCTRL_EMI,
-        .busy_bit       = 28,
-        .bypass_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_CLKSEQ,
-        .bypass_shift   = 6,
-        .flags          = ENABLED,
-        .ops            = &emi_ops,
-};
-
-static struct clk ir_clk = {
-        .parent         = &io_clk,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_IR,
-        .enable_shift   = 31,
-        .enable_negate  = 1,
-        .bypass_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_CLKSEQ,
-        .bypass_shift   = 3,
-        .ops            = &min_ops,
-};
-
-static struct clk saif_clk = {
-        .parent         = &pll_clk,
-        .scale_reg      = REGS_CLKCTRL_BASE + HW_CLKCTRL_SAIF,
-        .busy_reg       = REGS_CLKCTRL_BASE + HW_CLKCTRL_SAIF,
-        .busy_bit       = 29,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_SAIF,
-        .enable_shift   = 31,
-        .enable_negate  = 1,
-        .bypass_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_CLKSEQ,
-        .bypass_shift   = 0,
-        .ops            = &std_ops,
-};
-
-static struct clk usb_clk = {
-        .parent         = &pll_clk,
-        .enable_reg     = REGS_CLKCTRL_BASE + HW_CLKCTRL_PLLCTRL0,
-        .enable_shift   = 18,
-        .enable_negate  = 1,
-        .ops            = &min_ops,
-};
-
-/* list of all the clocks */
-static struct clk_lookup onchip_clks[] = {
-        {
-                .con_id = "osc_24M",
-                .clk = &osc_24M,
-        }, {
-                .con_id = "pll",
-                .clk = &pll_clk,
-        }, {
-                .con_id = "cpu",
-                .clk = &cpu_clk,
-        }, {
-                .con_id = "hclk",
-                .clk = &hclk,
-        }, {
-                .con_id = "xclk",
-                .clk = &xclk,
-        }, {
-                .con_id = "io",
-                .clk = &io_clk,
-        }, {
-                .con_id = "uart",
-                .clk = &uart_clk,
-        }, {
-                .con_id = "audio",
-                .clk = &audio_clk,
-        }, {
-                .con_id = "pwm",
-                .clk = &pwm_clk,
-        }, {
-                .con_id = "dri",
-                .clk = &dri_clk,
-        }, {
-                .con_id = "digctl",
-                .clk = &digctl_clk,
-        }, {
-                .con_id = "timer",
-                .clk = &timer_clk,
-        }, {
-                .con_id = "lcdif",
-                .clk = &lcdif_clk,
-        }, {
-                .con_id = "ssp",
-                .clk = &ssp_clk,
-        }, {
-                .con_id = "gpmi",
-                .clk = &gpmi_clk,
-        }, {
-                .con_id = "spdif",
-                .clk = &spdif_clk,
-        }, {
-                .con_id = "emi",
-                .clk = &emi_clk,
-        }, {
-                .con_id = "ir",
-                .clk = &ir_clk,
-        }, {
-                .con_id = "saif",
-                .clk = &saif_clk,
-        }, {
-                .con_id = "usb",
-                .clk = &usb_clk,
-        },
-};
-
-static int __init propagate_rate(struct clk *clk)
-{
-        struct clk_lookup *cl;
-
-        for (cl = onchip_clks; cl < onchip_clks + ARRAY_SIZE(onchip_clks);
-             cl++) {
-                if (unlikely(!clk_good(cl->clk)))
-                        continue;
-                if (cl->clk->parent == clk && cl->clk->ops->get_rate) {
-                        cl->clk->ops->get_rate(cl->clk);
-                        if (cl->clk->flags & RATE_PROPAGATES)
-                                propagate_rate(cl->clk);
-                }
-        }
-
-        return 0;
-}
-
-/* Exported API */
-unsigned long clk_get_rate(struct clk *clk)
-{
-        if (unlikely(!clk_good(clk)))
-                return 0;
-
-        if (clk->rate != 0)
-                return clk->rate;
-
-        if (clk->ops->get_rate != NULL)
-                return clk->ops->get_rate(clk);
-
-        return clk_get_rate(clk->parent);
-}
-EXPORT_SYMBOL(clk_get_rate);
-
-long clk_round_rate(struct clk *clk, unsigned long rate)
-{
-        if (unlikely(!clk_good(clk)))
-                return 0;
-
-        if (clk->ops->round_rate)
-                return clk->ops->round_rate(clk, rate);
-
-        return 0;
-}
-EXPORT_SYMBOL(clk_round_rate);
-
-static inline int close_enough(long rate1, long rate2)
-{
-        return rate1 && !((rate2 - rate1) * 1000 / rate1);
-}
-
-int clk_set_rate(struct clk *clk, unsigned long rate)
-{
-        int ret = -EINVAL;
-
-        if (unlikely(!clk_good(clk)))
-                goto out;
-
-        if (clk->flags & FIXED_RATE || !clk->ops->set_rate)
-                goto out;
-
-        else if (!close_enough(clk->rate, rate)) {
-                ret = clk->ops->set_rate(clk, rate);
-                if (ret < 0)
-                        goto out;
-                clk->rate = rate;
-                if (clk->flags & RATE_PROPAGATES)
-                        propagate_rate(clk);
-        } else
-                ret = 0;
-
-out:
-        return ret;
-}
-EXPORT_SYMBOL(clk_set_rate);
-
-int clk_enable(struct clk *clk)
-{
-        unsigned long clocks_flags;
-
-        if (unlikely(!clk_good(clk)))
-                return -EINVAL;
-
-        if (clk->parent)
-                clk_enable(clk->parent);
-
-        spin_lock_irqsave(&clocks_lock, clocks_flags);
-
-        clk->usage++;
-        if (clk->ops && clk->ops->enable)
-                clk->ops->enable(clk);
-
-        spin_unlock_irqrestore(&clocks_lock, clocks_flags);
-        return 0;
-}
-EXPORT_SYMBOL(clk_enable);
-
-static void local_clk_disable(struct clk *clk)
-{
-        if (unlikely(!clk_good(clk)))
-                return;
-
-        if (clk->usage == 0 && clk->ops->disable)
-                clk->ops->disable(clk);
-
-        if (clk->parent)
-                local_clk_disable(clk->parent);
-}
-
-void clk_disable(struct clk *clk)
-{
-        unsigned long clocks_flags;
-
-        if (unlikely(!clk_good(clk)))
-                return;
-
-        spin_lock_irqsave(&clocks_lock, clocks_flags);
-
-        if ((--clk->usage) == 0 && clk->ops->disable)
-                clk->ops->disable(clk);
-
-        spin_unlock_irqrestore(&clocks_lock, clocks_flags);
-        if (clk->parent)
-                clk_disable(clk->parent);
-}
-EXPORT_SYMBOL(clk_disable);
-
-/* Some additional API */
-int clk_set_parent(struct clk *clk, struct clk *parent)
-{
-        int ret = -ENODEV;
-        unsigned long clocks_flags;
-
-        if (unlikely(!clk_good(clk)))
-                goto out;
-
-        if (!clk->ops->set_parent)
-                goto out;
-
-        spin_lock_irqsave(&clocks_lock, clocks_flags);
-
-        ret = clk->ops->set_parent(clk, parent);
-        if (!ret) {
-                /* disable if usage count is 0 */
-                local_clk_disable(parent);
-
-                parent->usage += clk->usage;
-                clk->parent->usage -= clk->usage;
-
-                /* disable if new usage count is 0 */
-                local_clk_disable(clk->parent);
-
-                clk->parent = parent;
-        }
-        spin_unlock_irqrestore(&clocks_lock, clocks_flags);
-
-out:
-        return ret;
-}
-EXPORT_SYMBOL(clk_set_parent);
-
-struct clk *clk_get_parent(struct clk *clk)
-{
-        if (unlikely(!clk_good(clk)))
-                return NULL;
-        return clk->parent;
-}
-EXPORT_SYMBOL(clk_get_parent);
-
-static int __init clk_init(void)
-{
-        struct clk_lookup *cl;
-        struct clk_ops *ops;
-
-        spin_lock_init(&clocks_lock);
-
-        for (cl = onchip_clks; cl < onchip_clks + ARRAY_SIZE(onchip_clks);
-             cl++) {
-                if (cl->clk->flags & ENABLED)
-                        clk_enable(cl->clk);
-                else
-                        local_clk_disable(cl->clk);
-
-                ops = cl->clk->ops;
-
-                if ((cl->clk->flags & NEEDS_INITIALIZATION) &&
-                                ops && ops->set_rate)
-                        ops->set_rate(cl->clk, cl->clk->rate);
-
-                if (cl->clk->flags & FIXED_RATE) {
-                        if (cl->clk->flags & RATE_PROPAGATES)
-                                propagate_rate(cl->clk);
-                } else {
-                        if (ops && ops->get_rate)
-                                ops->get_rate(cl->clk);
-                }
-
-                if (cl->clk->flags & NEEDS_SET_PARENT) {
-                        if (ops && ops->set_parent)
-                                ops->set_parent(cl->clk, cl->clk->parent);
-                }
-        }
-        clkdev_add_table(onchip_clks, ARRAY_SIZE(onchip_clks));
-        return 0;
-}
-
-arch_initcall(clk_init);
diff --git a/arch/arm/plat-stmp3xxx/clock.h b/arch/arm/plat-stmp3xxx/clock.h
deleted file mode 100644
index a6611e1a3510..000000000000
--- a/arch/arm/plat-stmp3xxx/clock.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Clock control driver for Freescale STMP37XX/STMP378X - internal header file
- *
- * Author: Vitaly Wool <vital@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ARCH_ARM_STMX3XXX_CLOCK_H__
-#define __ARCH_ARM_STMX3XXX_CLOCK_H__
-
-#ifndef __ASSEMBLER__
-
-struct clk_ops {
-        int (*enable) (struct clk *);
-        int (*disable) (struct clk *);
-        long (*get_rate) (struct clk *);
-        long (*round_rate) (struct clk *, u32);
-        int (*set_rate) (struct clk *, u32);
-        int (*set_parent) (struct clk *, struct clk *);
-};
-
-struct clk {
-        struct clk *parent;
-        u32 rate;
-        u32 flags;
-        u8 scale_shift;
-        u8 enable_shift;
-        u8 bypass_shift;
-        u8 busy_bit;
-        s8 usage;
-        int enable_wait;
-        int enable_negate;
-        u32 saved_div;
-        void __iomem *enable_reg;
-        void __iomem *scale_reg;
-        void __iomem *bypass_reg;
-        void __iomem *busy_reg;
-        struct clk_ops *ops;
-};
-
-#endif /* __ASSEMBLER__ */
-
-/* Flags */
-#define RATE_PROPAGATES      (1<<0)
-#define NEEDS_INITIALIZATION (1<<1)
-#define PARENT_SET_RATE      (1<<2)
-#define FIXED_RATE           (1<<3)
-#define ENABLED              (1<<4)
-#define NEEDS_SET_PARENT     (1<<5)
-
-#endif
diff --git a/arch/arm/plat-stmp3xxx/core.c b/arch/arm/plat-stmp3xxx/core.c
deleted file mode 100644
index 37b8a09148a4..000000000000
--- a/arch/arm/plat-stmp3xxx/core.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X core routines
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/io.h>
-
-#include <mach/stmp3xxx.h>
-#include <mach/platform.h>
-#include <mach/dma.h>
-#include <mach/regs-clkctrl.h>
-
-static int __stmp3xxx_reset_block(void __iomem *hwreg, int just_enable)
-{
-        u32 c;
-        int timeout;
-
-        /* the process of software reset of IP block is done
-           in several steps:
-
-           - clear SFTRST and wait for block is enabled;
-           - clear clock gating (CLKGATE bit);
-           - set the SFTRST again and wait for block is in reset;
-           - clear SFTRST and wait for reset completion.
-        */
-        c = __raw_readl(hwreg);
-        c &= ~(1<<31);          /* clear SFTRST */
-        __raw_writel(c, hwreg);
-        for (timeout = 1000000; timeout > 0; timeout--)
-                /* still in SFTRST state ? */
-                if ((__raw_readl(hwreg) & (1<<31)) == 0)
-                        break;
-        if (timeout <= 0) {
-                printk(KERN_ERR"%s(%p): timeout when enabling\n",
-                                __func__, hwreg);
-                return -ETIME;
-        }
-
-        c = __raw_readl(hwreg);
-        c &= ~(1<<30);          /* clear CLKGATE */
-        __raw_writel(c, hwreg);
-
-        if (!just_enable) {
-                c = __raw_readl(hwreg);
-                c |= (1<<31);           /* now again set SFTRST */
-                __raw_writel(c, hwreg);
-                for (timeout = 1000000; timeout > 0; timeout--)
-                        /* poll until CLKGATE set */
-                        if (__raw_readl(hwreg) & (1<<30))
-                                break;
-                if (timeout <= 0) {
-                        printk(KERN_ERR"%s(%p): timeout when resetting\n",
-                                        __func__, hwreg);
-                        return -ETIME;
-                }
-
-                c = __raw_readl(hwreg);
-                c &= ~(1<<31);          /* clear SFTRST */
-                __raw_writel(c, hwreg);
-                for (timeout = 1000000; timeout > 0; timeout--)
-                        /* still in SFTRST state ? */
-                        if ((__raw_readl(hwreg) & (1<<31)) == 0)
-                                break;
-                if (timeout <= 0) {
-                        printk(KERN_ERR"%s(%p): timeout when enabling "
-                                        "after reset\n", __func__, hwreg);
-                        return -ETIME;
-                }
-
-                c = __raw_readl(hwreg);
-                c &= ~(1<<30);          /* clear CLKGATE */
-                __raw_writel(c, hwreg);
-        }
-        for (timeout = 1000000; timeout > 0; timeout--)
-                /* still in SFTRST state ? */
-                if ((__raw_readl(hwreg) & (1<<30)) == 0)
-                        break;
-
-        if (timeout <= 0) {
-                printk(KERN_ERR"%s(%p): timeout when unclockgating\n",
-                                __func__, hwreg);
-                return -ETIME;
-        }
-
-        return 0;
-}
-
-int stmp3xxx_reset_block(void __iomem *hwreg, int just_enable)
-{
-        int try = 10;
-        int r;
-
-        while (try--) {
-                r = __stmp3xxx_reset_block(hwreg, just_enable);
-                if (!r)
-                        break;
-                pr_debug("%s: try %d failed\n", __func__, 10 - try);
-        }
-        return r;
-}
-EXPORT_SYMBOL(stmp3xxx_reset_block);
-
-struct platform_device stmp3xxx_dbguart = {
-        .name = "stmp3xxx-dbguart",
-        .id = -1,
-};
-
-void __init stmp3xxx_init(void)
-{
-        /* Turn off auto-slow and other tricks */
-        stmp3xxx_clearl(0x7f00000, REGS_CLKCTRL_BASE + HW_CLKCTRL_HBUS);
-
-        stmp3xxx_dma_init();
-}
diff --git a/arch/arm/plat-stmp3xxx/devices.c b/arch/arm/plat-stmp3xxx/devices.c
deleted file mode 100644
index 68fed4b8746a..000000000000
--- a/arch/arm/plat-stmp3xxx/devices.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
-* Freescale STMP37XX/STMP378X platform devices
-*
-* Embedded Alley Solutions, Inc <source@embeddedalley.com>
-*
-* Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
-* Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
-*/
-
-/*
-* The code contained herein is licensed under the GNU General Public
-* License. You may obtain a copy of the GNU General Public License
-* Version 2 or later at the following locations:
-*
-* http://www.opensource.org/licenses/gpl-license.html
-* http://www.gnu.org/copyleft/gpl.html
-*/
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
-
-#include <mach/dma.h>
-#include <mach/platform.h>
-#include <mach/stmp3xxx.h>
-#include <mach/regs-lcdif.h>
-#include <mach/regs-uartapp.h>
-#include <mach/regs-gpmi.h>
-#include <mach/regs-usbctrl.h>
-#include <mach/regs-ssp.h>
-#include <mach/regs-rtc.h>
-
-static u64 common_dmamask = DMA_BIT_MASK(32);
-
-static struct resource appuart_resources[] = {
-        {
-                .start = IRQ_UARTAPP_INTERNAL,
-                .end = IRQ_UARTAPP_INTERNAL,
-                .flags = IORESOURCE_IRQ,
-        }, {
-                .start = IRQ_UARTAPP_RX_DMA,
-                .end = IRQ_UARTAPP_RX_DMA,
-                .flags = IORESOURCE_IRQ,
-        }, {
-                .start = IRQ_UARTAPP_TX_DMA,
-                .end = IRQ_UARTAPP_TX_DMA,
-                .flags = IORESOURCE_IRQ,
-        }, {
-                .start = REGS_UARTAPP1_PHYS,
-                .end = REGS_UARTAPP1_PHYS + REGS_UARTAPP_SIZE,
-                .flags = IORESOURCE_MEM,
-        }, {
-                /* Rx DMA channel */
-                .start = STMP3XXX_DMA(6, STMP3XXX_BUS_APBX),
-                .end = STMP3XXX_DMA(6, STMP3XXX_BUS_APBX),
-                .flags = IORESOURCE_DMA,
-        }, {
-                /* Tx DMA channel */
-                .start = STMP3XXX_DMA(7, STMP3XXX_BUS_APBX),
-                .end = STMP3XXX_DMA(7, STMP3XXX_BUS_APBX),
-                .flags = IORESOURCE_DMA,
-        },
-};
-
-struct platform_device stmp3xxx_appuart = {
-        .name = "stmp3xxx-appuart",
-        .id = 0,
-        .resource = appuart_resources,
-        .num_resources = ARRAY_SIZE(appuart_resources),
-        .dev = {
-                .dma_mask       = &common_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-};
-
-struct platform_device stmp3xxx_watchdog = {
-      .name   = "stmp3xxx_wdt",
-      .id     = -1,
-};
-
-static struct resource ts_resource[] = {
-        {
-                .flags  = IORESOURCE_IRQ,
-                .start  = IRQ_TOUCH_DETECT,
-                .end    = IRQ_TOUCH_DETECT,
-        }, {
-                .flags  = IORESOURCE_IRQ,
-                .start  = IRQ_LRADC_CH5,
-                .end    = IRQ_LRADC_CH5,
-        },
-};
-
-struct platform_device stmp3xxx_touchscreen = {
-        .name           = "stmp3xxx_ts",
-        .id             = -1,
-        .resource       = ts_resource,
-        .num_resources  = ARRAY_SIZE(ts_resource),
-};
-
-/*
-* Keypad device
-*/
-struct platform_device stmp3xxx_keyboard = {
-        .name           = "stmp3xxx-keyboard",
-        .id             = -1,
-};
-
-static struct resource gpmi_resources[] = {
-        {
-                .flags = IORESOURCE_MEM,
-                .start = REGS_GPMI_PHYS,
-                .end = REGS_GPMI_PHYS + REGS_GPMI_SIZE,
-        }, {
-                .flags = IORESOURCE_IRQ,
-                .start = IRQ_GPMI_DMA,
-                .end = IRQ_GPMI_DMA,
-        }, {
-                .flags = IORESOURCE_DMA,
-                .start = STMP3XXX_DMA(4, STMP3XXX_BUS_APBH),
-                .end = STMP3XXX_DMA(8, STMP3XXX_BUS_APBH),
-        },
-};
-
-struct platform_device stmp3xxx_gpmi = {
-        .name = "gpmi",
-        .id = -1,
-        .dev    = {
-                .dma_mask       = &common_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-        .resource = gpmi_resources,
-        .num_resources = ARRAY_SIZE(gpmi_resources),
-};
-
-static struct resource mmc1_resource[] = {
-        {
-                .flags  = IORESOURCE_MEM,
-                .start  = REGS_SSP1_PHYS,
-                .end    = REGS_SSP1_PHYS + REGS_SSP_SIZE,
-        }, {
-                .flags  = IORESOURCE_DMA,
-                .start  = STMP3XXX_DMA(1, STMP3XXX_BUS_APBH),
-                .end    = STMP3XXX_DMA(1, STMP3XXX_BUS_APBH),
-        }, {
-                .flags  = IORESOURCE_IRQ,
-                .start  = IRQ_SSP1_DMA,
-                .end    = IRQ_SSP1_DMA,
-        }, {
-                .flags  = IORESOURCE_IRQ,
-                .start  = IRQ_SSP_ERROR,
-                .end    = IRQ_SSP_ERROR,
-        },
-};
-
-struct platform_device stmp3xxx_mmc = {
-        .name   = "stmp3xxx-mmc",
-        .id     = 1,
-        .dev    = {
-                .dma_mask       = &common_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-        .resource = mmc1_resource,
-        .num_resources = ARRAY_SIZE(mmc1_resource),
-};
-
-static struct resource usb_resources[] = {
-        {
-                .start  = REGS_USBCTRL_PHYS,
-                .end    = REGS_USBCTRL_PHYS + SZ_4K,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_USB_CTRL,
-                .end    = IRQ_USB_CTRL,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-struct platform_device stmp3xxx_udc = {
-        .name           = "fsl-usb2-udc",
-        .id             = -1,
-        .dev            = {
-                .dma_mask               = &common_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-        .resource = usb_resources,
-        .num_resources = ARRAY_SIZE(usb_resources),
-};
-
-struct platform_device stmp3xxx_ehci = {
-        .name           = "fsl-ehci",
-        .id             = -1,
-        .dev            = {
-                .dma_mask               = &common_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-        .resource       = usb_resources,
-        .num_resources  = ARRAY_SIZE(usb_resources),
-};
-
-static struct resource rtc_resources[] = {
-        {
-                .start  = REGS_RTC_PHYS,
-                .end    = REGS_RTC_PHYS + REGS_RTC_SIZE,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_RTC_ALARM,
-                .end    = IRQ_RTC_ALARM,
-                .flags  = IORESOURCE_IRQ,
-        }, {
-                .start  = IRQ_RTC_1MSEC,
-                .end    = IRQ_RTC_1MSEC,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-struct platform_device stmp3xxx_rtc = {
-        .name           = "stmp3xxx-rtc",
-        .id             = -1,
-        .resource       = rtc_resources,
-        .num_resources  = ARRAY_SIZE(rtc_resources),
-};
-
-static struct resource ssp1_resources[] = {
-        {
-                .start  = REGS_SSP1_PHYS,
-                .end    = REGS_SSP1_PHYS + REGS_SSP_SIZE,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_SSP1_DMA,
-                .end    = IRQ_SSP1_DMA,
-                .flags  = IORESOURCE_IRQ,
-        }, {
-                .start  = STMP3XXX_DMA(1, STMP3XXX_BUS_APBH),
-                .end    = STMP3XXX_DMA(1, STMP3XXX_BUS_APBH),
-                .flags  = IORESOURCE_DMA,
-        },
-};
-
-static struct resource ssp2_resources[] = {
-        {
-                .start  = REGS_SSP2_PHYS,
-                .end    = REGS_SSP2_PHYS + REGS_SSP_SIZE,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_SSP2_DMA,
-                .end    = IRQ_SSP2_DMA,
-                .flags  = IORESOURCE_IRQ,
-        }, {
-                .start  = STMP3XXX_DMA(2, STMP3XXX_BUS_APBH),
-                .end    = STMP3XXX_DMA(2, STMP3XXX_BUS_APBH),
-                .flags  = IORESOURCE_DMA,
-        },
-};
-
-struct platform_device stmp3xxx_spi1 = {
-        .name   = "stmp3xxx_ssp",
-        .id     = 1,
-        .dev    = {
-                .dma_mask       = &common_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-        .resource = ssp1_resources,
-        .num_resources = ARRAY_SIZE(ssp1_resources),
-};
-
-struct platform_device stmp3xxx_spi2 = {
-        .name   = "stmp3xxx_ssp",
-        .id     = 2,
-        .dev    = {
-                .dma_mask       = &common_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-        .resource = ssp2_resources,
-        .num_resources = ARRAY_SIZE(ssp2_resources),
-};
-
-static struct resource fb_resource[] = {
-        {
-                .flags  = IORESOURCE_IRQ,
-                .start  = IRQ_LCDIF_DMA,
-                .end    = IRQ_LCDIF_DMA,
-        }, {
-                .flags  = IORESOURCE_IRQ,
-                .start  = IRQ_LCDIF_ERROR,
-                .end    = IRQ_LCDIF_ERROR,
-        }, {
-                .flags  = IORESOURCE_MEM,
-                .start  = REGS_LCDIF_PHYS,
-                .end    = REGS_LCDIF_PHYS + REGS_LCDIF_SIZE,
-        },
-};
-
-struct platform_device stmp3xxx_framebuffer = {
-        .name           = "stmp3xxx-fb",
-        .id             = -1,
-        .dev            = {
-                .dma_mask               = &common_dmamask,
-                .coherent_dma_mask      = DMA_BIT_MASK(32),
-        },
-        .num_resources  = ARRAY_SIZE(fb_resource),
-        .resource       = fb_resource,
-};
-
-#define CMDLINE_DEVICE_CHOOSE(name, dev1, dev2)                 \
-        static char *cmdline_device_##name;                     \
-        static int cmdline_device_##name##_setup(char *dev)     \
-        {                                                       \
-                cmdline_device_##name = dev + 1;                \
-                return 0;                                       \
-        }                                                       \
-        __setup(#name, cmdline_device_##name##_setup);          \
-        int stmp3xxx_##name##_device_register(void)             \
-        {                                                       \
-                struct platform_device *d = NULL;               \
-                if (!cmdline_device_##name ||                   \
-                        !strcmp(cmdline_device_##name, #dev1))  \
-                                d = &stmp3xxx_##dev1;           \
-                else if (!strcmp(cmdline_device_##name, #dev2)) \
-                                d = &stmp3xxx_##dev2;           \
-                else                                            \
-                        printk(KERN_ERR"Unknown %s assignment '%s'.\n", \
-                                #name, cmdline_device_##name);  \
-                return d ? platform_device_register(d) : -ENOENT;       \
-        }
-
-CMDLINE_DEVICE_CHOOSE(ssp1, mmc, spi1)
-CMDLINE_DEVICE_CHOOSE(ssp2, gpmi, spi2)
-
-struct platform_device stmp3xxx_backlight = {
-        .name           = "stmp3xxx-bl",
-        .id             = -1,
-};
-
-struct platform_device stmp3xxx_rotdec = {
-        .name   = "stmp3xxx-rotdec",
-        .id     = -1,
-};
-
-struct platform_device stmp3xxx_persistent = {
-        .name                   = "stmp3xxx-persistent",
-        .id                     = -1,
-};
-
-struct platform_device stmp3xxx_dcp_bootstream = {
-        .name                   = "stmp3xxx-dcpboot",
-        .id                     = -1,
-        .dev    = {
-                .dma_mask       = &common_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-};
-
-static struct resource dcp_resources[] = {
-        {
-                .start = IRQ_DCP_VMI,
-                .end = IRQ_DCP_VMI,
-                .flags = IORESOURCE_IRQ,
-        }, {
-                .start = IRQ_DCP,
-                .end = IRQ_DCP,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-struct platform_device stmp3xxx_dcp = {
-        .name                   = "stmp3xxx-dcp",
-        .id                     = -1,
-        .resource               = dcp_resources,
-        .num_resources          = ARRAY_SIZE(dcp_resources),
-        .dev    = {
-                .dma_mask       = &common_dmamask,
-                .coherent_dma_mask = DMA_BIT_MASK(32),
-        },
-};
-
-static struct resource battery_resource[] = {
-        {
-                .flags  = IORESOURCE_IRQ,
-                .start  = IRQ_VDD5V,
-                .end    = IRQ_VDD5V,
-        },
-};
-
-struct platform_device stmp3xxx_battery = {
-        .name   = "stmp3xxx-battery",
-        .resource = battery_resource,
-        .num_resources = ARRAY_SIZE(battery_resource),
-};
diff --git a/arch/arm/plat-stmp3xxx/dma.c b/arch/arm/plat-stmp3xxx/dma.c
deleted file mode 100644
index b4dcf8c0477d..000000000000
--- a/arch/arm/plat-stmp3xxx/dma.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- * DMA helper routines for Freescale STMP37XX/STMP378X
- *
- * Author: dmitry pervushin <dpervushin@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#include <linux/gfp.h>
-#include <linux/kernel.h>
-#include <linux/device.h>
-#include <linux/dmapool.h>
-#include <linux/sysdev.h>
-#include <linux/cpufreq.h>
-
-#include <asm/page.h>
-
-#include <mach/platform.h>
-#include <mach/dma.h>
-#include <mach/regs-apbx.h>
-#include <mach/regs-apbh.h>
-
-static const size_t pool_item_size = sizeof(struct stmp3xxx_dma_command);
-static const size_t pool_alignment = 8;
-static struct stmp3xxx_dma_user {
-        void *pool;
-        int inuse;
-        const char *name;
-} channels[MAX_DMA_CHANNELS];
-
-#define IS_VALID_CHANNEL(ch) ((ch) >= 0 && (ch) < MAX_DMA_CHANNELS)
-#define IS_USED(ch) (channels[ch].inuse)
-
-int stmp3xxx_dma_request(int ch, struct device *dev, const char *name)
-{
-        struct stmp3xxx_dma_user *user;
-        int err = 0;
-
-        user = channels + ch;
-        if (!IS_VALID_CHANNEL(ch)) {
-                err = -ENODEV;
-                goto out;
-        }
-        if (IS_USED(ch)) {
-                err = -EBUSY;
-                goto out;
-        }
-        /* Create a pool to allocate dma commands from */
-        user->pool = dma_pool_create(name, dev, pool_item_size,
-                                     pool_alignment, PAGE_SIZE);
-        if (user->pool == NULL) {
-                err = -ENOMEM;
-                goto out;
-        }
-        user->name = name;
-        user->inuse++;
-out:
-        return err;
-}
-EXPORT_SYMBOL(stmp3xxx_dma_request);
-
-int stmp3xxx_dma_release(int ch)
-{
-        struct stmp3xxx_dma_user *user = channels + ch;
-        int err = 0;
-
-        if (!IS_VALID_CHANNEL(ch)) {
-                err = -ENODEV;
-                goto out;
-        }
-        if (!IS_USED(ch)) {
-                err = -EBUSY;
-                goto out;
-        }
-        BUG_ON(user->pool == NULL);
-        dma_pool_destroy(user->pool);
-        user->inuse--;
-out:
-        return err;
-}
-EXPORT_SYMBOL(stmp3xxx_dma_release);
-
-int stmp3xxx_dma_read_semaphore(int channel)
-{
-        int sem = -1;
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                sem = __raw_readl(REGS_APBH_BASE + HW_APBH_CHn_SEMA +
-                                STMP3XXX_DMA_CHANNEL(channel) * 0x70);
-                sem &= BM_APBH_CHn_SEMA_PHORE;
-                sem >>= BP_APBH_CHn_SEMA_PHORE;
-                break;
-
-        case STMP3XXX_BUS_APBX:
-                sem = __raw_readl(REGS_APBX_BASE + HW_APBX_CHn_SEMA +
-                                STMP3XXX_DMA_CHANNEL(channel) * 0x70);
-                sem &= BM_APBX_CHn_SEMA_PHORE;
-                sem >>= BP_APBX_CHn_SEMA_PHORE;
-                break;
-        default:
-                BUG();
-        }
-        return sem;
-}
-EXPORT_SYMBOL(stmp3xxx_dma_read_semaphore);
-
-int stmp3xxx_dma_allocate_command(int channel,
-                                  struct stmp3xxx_dma_descriptor *descriptor)
-{
-        struct stmp3xxx_dma_user *user = channels + channel;
-        int err = 0;
-
-        if (!IS_VALID_CHANNEL(channel)) {
-                err = -ENODEV;
-                goto out;
-        }
-        if (!IS_USED(channel)) {
-                err = -EBUSY;
-                goto out;
-        }
-        if (descriptor == NULL) {
-                err = -EINVAL;
-                goto out;
-        }
-
-        /* Allocate memory for a command from the buffer */
-        descriptor->command =
-            dma_pool_alloc(user->pool, GFP_KERNEL, &descriptor->handle);
-
-        /* Check it worked */
-        if (!descriptor->command) {
-                err = -ENOMEM;
-                goto out;
-        }
-
-        memset(descriptor->command, 0, pool_item_size);
-out:
-        WARN_ON(err);
-        return err;
-}
-EXPORT_SYMBOL(stmp3xxx_dma_allocate_command);
-
-int stmp3xxx_dma_free_command(int channel,
-                              struct stmp3xxx_dma_descriptor *descriptor)
-{
-        int err = 0;
-
-        if (!IS_VALID_CHANNEL(channel)) {
-                err = -ENODEV;
-                goto out;
-        }
-        if (!IS_USED(channel)) {
-                err = -EBUSY;
-                goto out;
-        }
-
-        /* Return the command memory to the pool */
-        dma_pool_free(channels[channel].pool, descriptor->command,
-                      descriptor->handle);
-
-        /* Initialise descriptor so we're not tempted to use it */
-        descriptor->command = NULL;
-        descriptor->handle = 0;
-        descriptor->virtual_buf_ptr = NULL;
-        descriptor->next_descr = NULL;
-
-        WARN_ON(err);
-out:
-        return err;
-}
-EXPORT_SYMBOL(stmp3xxx_dma_free_command);
-
-void stmp3xxx_dma_go(int channel,
-                     struct stmp3xxx_dma_descriptor *head, u32 semaphore)
-{
-        int ch = STMP3XXX_DMA_CHANNEL(channel);
-        void __iomem *c, *s;
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                c = REGS_APBH_BASE + HW_APBH_CHn_NXTCMDAR + 0x70 * ch;
-                s = REGS_APBH_BASE + HW_APBH_CHn_SEMA + 0x70 * ch;
-                break;
-
-        case STMP3XXX_BUS_APBX:
-                c = REGS_APBX_BASE + HW_APBX_CHn_NXTCMDAR + 0x70 * ch;
-                s = REGS_APBX_BASE + HW_APBX_CHn_SEMA + 0x70 * ch;
-                break;
-
-        default:
-                return;
-        }
-
-        /* Set next command */
-        __raw_writel(head->handle, c);
-        /* Set counting semaphore (kicks off transfer). Assumes
-           peripheral has been set up correctly */
-        __raw_writel(semaphore, s);
-}
-EXPORT_SYMBOL(stmp3xxx_dma_go);
-
-int stmp3xxx_dma_running(int channel)
-{
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                return (__raw_readl(REGS_APBH_BASE + HW_APBH_CHn_SEMA +
-                        0x70 * STMP3XXX_DMA_CHANNEL(channel))) &
-                            BM_APBH_CHn_SEMA_PHORE;
-
-        case STMP3XXX_BUS_APBX:
-                return (__raw_readl(REGS_APBX_BASE + HW_APBX_CHn_SEMA +
-                        0x70 * STMP3XXX_DMA_CHANNEL(channel))) &
-                            BM_APBX_CHn_SEMA_PHORE;
-        default:
-                BUG();
-                return 0;
-        }
-}
-EXPORT_SYMBOL(stmp3xxx_dma_running);
-
-/*
- * Circular dma chain management
- */
-void stmp3xxx_dma_free_chain(struct stmp37xx_circ_dma_chain *chain)
-{
-        int i;
-
-        for (i = 0; i < chain->total_count; i++)
-                stmp3xxx_dma_free_command(
-                        STMP3XXX_DMA(chain->channel, chain->bus),
-                        &chain->chain[i]);
-}
-EXPORT_SYMBOL(stmp3xxx_dma_free_chain);
-
-int stmp3xxx_dma_make_chain(int ch, struct stmp37xx_circ_dma_chain *chain,
-                            struct stmp3xxx_dma_descriptor descriptors[],
-                            unsigned items)
-{
-        int i;
-        int err = 0;
-
-        if (items == 0)
-                return err;
-
-        for (i = 0; i < items; i++) {
-                err = stmp3xxx_dma_allocate_command(ch, &descriptors[i]);
-                if (err) {
-                        WARN_ON(err);
-                        /*
-                         * Couldn't allocate the whole chain.
-                         * deallocate what has been allocated
-                         */
-                        if (i) {
-                                do {
-                                        stmp3xxx_dma_free_command(ch,
-                                                                  &descriptors
-                                                                  [i]);
-                                } while (i-- > 0);
-                        }
-                        return err;
-                }
-
-                /* link them! */
-                if (i > 0) {
-                        descriptors[i - 1].next_descr = &descriptors[i];
-                        descriptors[i - 1].command->next =
-                                                descriptors[i].handle;
-                }
-        }
-
-        /* make list circular */
-        descriptors[items - 1].next_descr = &descriptors[0];
-        descriptors[items - 1].command->next = descriptors[0].handle;
-
-        chain->total_count = items;
-        chain->chain = descriptors;
-        chain->free_index = 0;
-        chain->active_index = 0;
-        chain->cooked_index = 0;
-        chain->free_count = items;
-        chain->active_count = 0;
-        chain->cooked_count = 0;
-        chain->bus = STMP3XXX_DMA_BUS(ch);
-        chain->channel = STMP3XXX_DMA_CHANNEL(ch);
-        return err;
-}
-EXPORT_SYMBOL(stmp3xxx_dma_make_chain);
-
-void stmp37xx_circ_clear_chain(struct stmp37xx_circ_dma_chain *chain)
-{
-        BUG_ON(stmp3xxx_dma_running(STMP3XXX_DMA(chain->channel, chain->bus)));
-        chain->free_index = 0;
-        chain->active_index = 0;
-        chain->cooked_index = 0;
-        chain->free_count = chain->total_count;
-        chain->active_count = 0;
-        chain->cooked_count = 0;
-}
-EXPORT_SYMBOL(stmp37xx_circ_clear_chain);
-
-void stmp37xx_circ_advance_free(struct stmp37xx_circ_dma_chain *chain,
-                unsigned count)
-{
-        BUG_ON(chain->cooked_count < count);
-
-        chain->cooked_count -= count;
-        chain->cooked_index += count;
-        chain->cooked_index %= chain->total_count;
-        chain->free_count += count;
-}
-EXPORT_SYMBOL(stmp37xx_circ_advance_free);
-
-void stmp37xx_circ_advance_active(struct stmp37xx_circ_dma_chain *chain,
-                unsigned count)
-{
-        void __iomem *c;
-        u32 mask_clr, mask;
-        BUG_ON(chain->free_count < count);
-
-        chain->free_count -= count;
-        chain->free_index += count;
-        chain->free_index %= chain->total_count;
-        chain->active_count += count;
-
-        switch (chain->bus) {
-        case STMP3XXX_BUS_APBH:
-                c = REGS_APBH_BASE + HW_APBH_CHn_SEMA + 0x70 * chain->channel;
-                mask_clr = BM_APBH_CHn_SEMA_INCREMENT_SEMA;
-                mask = BF(count, APBH_CHn_SEMA_INCREMENT_SEMA);
-                break;
-        case STMP3XXX_BUS_APBX:
-                c = REGS_APBX_BASE + HW_APBX_CHn_SEMA + 0x70 * chain->channel;
-                mask_clr = BM_APBX_CHn_SEMA_INCREMENT_SEMA;
-                mask = BF(count, APBX_CHn_SEMA_INCREMENT_SEMA);
-                break;
-        default:
-                BUG();
-                return;
-        }
-
-        /* Set counting semaphore (kicks off transfer). Assumes
-           peripheral has been set up correctly */
-        stmp3xxx_clearl(mask_clr, c);
-        stmp3xxx_setl(mask, c);
-}
-EXPORT_SYMBOL(stmp37xx_circ_advance_active);
-
-unsigned stmp37xx_circ_advance_cooked(struct stmp37xx_circ_dma_chain *chain)
-{
-        unsigned cooked;
-
-        cooked = chain->active_count -
-          stmp3xxx_dma_read_semaphore(STMP3XXX_DMA(chain->channel, chain->bus));
-
-        chain->active_count -= cooked;
-        chain->active_index += cooked;
-        chain->active_index %= chain->total_count;
-
-        chain->cooked_count += cooked;
-
-        return cooked;
-}
-EXPORT_SYMBOL(stmp37xx_circ_advance_cooked);
-
-void stmp3xxx_dma_set_alt_target(int channel, int function)
-{
-#if defined(CONFIG_ARCH_STMP37XX)
-        unsigned bits = 4;
-#elif defined(CONFIG_ARCH_STMP378X)
-        unsigned bits = 2;
-#else
-#error wrong arch
-#endif
-        int shift = STMP3XXX_DMA_CHANNEL(channel) * bits;
-        unsigned mask = (1<<bits) - 1;
-        void __iomem *c;
-
-        BUG_ON(function < 0 || function >= (1<<bits));
-        pr_debug("%s: channel = %d, using mask %x, "
-                 "shift = %d\n", __func__, channel, mask, shift);
-
-        switch (STMP3XXX_DMA_BUS(channel)) {
-        case STMP3XXX_BUS_APBH:
-                c = REGS_APBH_BASE + HW_APBH_DEVSEL;
-                break;
-        case STMP3XXX_BUS_APBX:
-                c = REGS_APBX_BASE + HW_APBX_DEVSEL;
-                break;
-        default:
-                BUG();
-        }
-        stmp3xxx_clearl(mask << shift, c);
-        stmp3xxx_setl(mask << shift, c);
-}
-EXPORT_SYMBOL(stmp3xxx_dma_set_alt_target);
-
-void stmp3xxx_dma_suspend(void)
-{
-        stmp3xxx_setl(BM_APBH_CTRL0_CLKGATE, REGS_APBH_BASE + HW_APBH_CTRL0);
-        stmp3xxx_setl(BM_APBX_CTRL0_CLKGATE, REGS_APBX_BASE + HW_APBX_CTRL0);
-}
-
-void stmp3xxx_dma_resume(void)
-{
-        stmp3xxx_clearl(BM_APBH_CTRL0_CLKGATE | BM_APBH_CTRL0_SFTRST,
-                        REGS_APBH_BASE + HW_APBH_CTRL0);
-        stmp3xxx_clearl(BM_APBX_CTRL0_CLKGATE | BM_APBX_CTRL0_SFTRST,
-                        REGS_APBX_BASE + HW_APBX_CTRL0);
-}
-
-#ifdef CONFIG_CPU_FREQ
-
-struct dma_notifier_block {
-        struct notifier_block nb;
-        void *data;
-};
-
-static int dma_cpufreq_notifier(struct notifier_block *self,
-                                unsigned long phase, void *p)
-{
-        switch (phase) {
-        case CPUFREQ_POSTCHANGE:
-                stmp3xxx_dma_resume();
-                break;
-
-        case CPUFREQ_PRECHANGE:
-                stmp3xxx_dma_suspend();
-                break;
-
-        default:
-                break;
-        }
-
-        return NOTIFY_DONE;
-}
-
-static struct dma_notifier_block dma_cpufreq_nb = {
-        .nb = {
-                .notifier_call = dma_cpufreq_notifier,
-        },
-};
-#endif /* CONFIG_CPU_FREQ */
-
-void __init stmp3xxx_dma_init(void)
-{
-        stmp3xxx_clearl(BM_APBH_CTRL0_CLKGATE | BM_APBH_CTRL0_SFTRST,
-                        REGS_APBH_BASE + HW_APBH_CTRL0);
-        stmp3xxx_clearl(BM_APBX_CTRL0_CLKGATE | BM_APBX_CTRL0_SFTRST,
-                        REGS_APBX_BASE + HW_APBX_CTRL0);
-#ifdef CONFIG_CPU_FREQ
-        cpufreq_register_notifier(&dma_cpufreq_nb.nb,
-                                CPUFREQ_TRANSITION_NOTIFIER);
-#endif /* CONFIG_CPU_FREQ */
-}
diff --git a/arch/arm/plat-stmp3xxx/include/mach/clkdev.h b/arch/arm/plat-stmp3xxx/include/mach/clkdev.h
deleted file mode 100644
index f9c39772d7c5..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/clkdev.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_MACH_CLKDEV_H
-#define __ASM_MACH_CLKDEV_H
-
-#define __clk_get(clk) ({ 1; })
-#define __clk_put(clk) do { } while (0)
-
-#endif
diff --git a/arch/arm/plat-stmp3xxx/include/mach/cputype.h b/arch/arm/plat-stmp3xxx/include/mach/cputype.h
deleted file mode 100644
index b4e205b95f2c..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/cputype.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X CPU type detection
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_PLAT_CPU_H
-#define __ASM_PLAT_CPU_H
-
-#ifdef CONFIG_ARCH_STMP37XX
-#define cpu_is_stmp37xx()       (1)
-#else
-#define cpu_is_stmp37xx()       (0)
-#endif
-
-#ifdef CONFIG_ARCH_STMP378X
-#define cpu_is_stmp378x()       (1)
-#else
-#define cpu_is_stmp378x()       (0)
-#endif
-
-#endif /* __ASM_PLAT_CPU_H */
diff --git a/arch/arm/plat-stmp3xxx/include/mach/debug-macro.S b/arch/arm/plat-stmp3xxx/include/mach/debug-macro.S
deleted file mode 100644
index d3a0985c9681..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/debug-macro.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Debugging macro include header
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-                .macro  addruart, rp, rv
-                mov     \rp,      #0x00070000
-                add     \rv, \rp, #0xf0000000   @ virtual base
-                add     \rp, \rp, #0x80000000   @ physical base
-                .endm
-
-                .macro  senduart,rd,rx
-                strb    \rd, [\rx, #0]          @ data register at 0
-                .endm
-
-                .macro  waituart,rd,rx
-1001:           ldr     \rd, [\rx, #0x18]       @ UARTFLG
-                tst     \rd, #1 << 5            @ UARTFLGUTXFF - 1 when full
-                bne     1001b
-                .endm
-
-                .macro  busyuart,rd,rx
-1001:           ldr     \rd, [\rx, #0x18]       @ UARTFLG
-                tst     \rd, #1 << 3            @ UARTFLGUBUSY - 1 when busy
-                bne     1001b
-                .endm
diff --git a/arch/arm/plat-stmp3xxx/include/mach/dma.h b/arch/arm/plat-stmp3xxx/include/mach/dma.h
deleted file mode 100644
index 7c58557c6766..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/dma.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X DMA helper interface
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_PLAT_STMP3XXX_DMA_H
-#define __ASM_PLAT_STMP3XXX_DMA_H
-
-#include <linux/platform_device.h>
-#include <linux/dmapool.h>
-
-#if !defined(MAX_PIO_WORDS)
-#define MAX_PIO_WORDS   (15)
-#endif
-
-#define STMP3XXX_BUS_APBH               0
-#define STMP3XXX_BUS_APBX               1
-#define STMP3XXX_DMA_MAX_CHANNEL        16
-#define STMP3XXX_DMA_BUS(dma)           ((dma) / 16)
-#define STMP3XXX_DMA_CHANNEL(dma)       ((dma) % 16)
-#define STMP3XXX_DMA(channel, bus)      ((bus) * 16 + (channel))
-#define MAX_DMA_ADDRESS                 0xffffffff
-#define MAX_DMA_CHANNELS                32
-
-struct stmp3xxx_dma_command {
-        u32 next;
-        u32 cmd;
-        union {
-                u32 buf_ptr;
-                u32 alternate;
-        };
-        u32 pio_words[MAX_PIO_WORDS];
-};
-
-struct stmp3xxx_dma_descriptor {
-        struct stmp3xxx_dma_command *command;
-        dma_addr_t handle;
-
-        /* The virtual address of the buffer pointer */
-        void *virtual_buf_ptr;
-        /* The next descriptor in a the DMA chain (optional) */
-        struct stmp3xxx_dma_descriptor *next_descr;
-};
-
-struct stmp37xx_circ_dma_chain {
-        unsigned total_count;
-        struct stmp3xxx_dma_descriptor *chain;
-
-        unsigned free_index;
-        unsigned free_count;
-        unsigned active_index;
-        unsigned active_count;
-        unsigned cooked_index;
-        unsigned cooked_count;
-
-        int bus;
-        unsigned channel;
-};
-
-static inline struct stmp3xxx_dma_descriptor
-    *stmp3xxx_dma_circ_get_free_head(struct stmp37xx_circ_dma_chain *chain)
-{
-        return &(chain->chain[chain->free_index]);
-}
-
-static inline struct stmp3xxx_dma_descriptor
-    *stmp3xxx_dma_circ_get_cooked_head(struct stmp37xx_circ_dma_chain *chain)
-{
-        return &(chain->chain[chain->cooked_index]);
-}
-
-int stmp3xxx_dma_request(int ch, struct device *dev, const char *name);
-int stmp3xxx_dma_release(int ch);
-int stmp3xxx_dma_allocate_command(int ch,
-                                  struct stmp3xxx_dma_descriptor *descriptor);
-int stmp3xxx_dma_free_command(int ch,
-                              struct stmp3xxx_dma_descriptor *descriptor);
-void stmp3xxx_dma_continue(int channel, u32 semaphore);
-void stmp3xxx_dma_go(int ch, struct stmp3xxx_dma_descriptor *head,
-                     u32 semaphore);
-int stmp3xxx_dma_running(int ch);
-int stmp3xxx_dma_make_chain(int ch, struct stmp37xx_circ_dma_chain *chain,
-                            struct stmp3xxx_dma_descriptor descriptors[],
-                            unsigned items);
-void stmp3xxx_dma_free_chain(struct stmp37xx_circ_dma_chain *chain);
-void stmp37xx_circ_clear_chain(struct stmp37xx_circ_dma_chain *chain);
-void stmp37xx_circ_advance_free(struct stmp37xx_circ_dma_chain *chain,
-                unsigned count);
-void stmp37xx_circ_advance_active(struct stmp37xx_circ_dma_chain *chain,
-                unsigned count);
-unsigned stmp37xx_circ_advance_cooked(struct stmp37xx_circ_dma_chain *chain);
-int stmp3xxx_dma_read_semaphore(int ch);
-void stmp3xxx_dma_init(void);
-void stmp3xxx_dma_set_alt_target(int ch, int target);
-void stmp3xxx_dma_suspend(void);
-void stmp3xxx_dma_resume(void);
-
-/*
- * STMP37xx and STMP378x have different DMA control
- * registers layout
- */
-
-void stmp3xxx_arch_dma_freeze(int ch);
-void stmp3xxx_arch_dma_unfreeze(int ch);
-void stmp3xxx_arch_dma_reset_channel(int ch);
-void stmp3xxx_arch_dma_enable_interrupt(int ch);
-void stmp3xxx_arch_dma_clear_interrupt(int ch);
-int stmp3xxx_arch_dma_is_interrupt(int ch);
-
-static inline void stmp3xxx_dma_reset_channel(int ch)
-{
-        stmp3xxx_arch_dma_reset_channel(ch);
-}
-
-
-static inline void stmp3xxx_dma_freeze(int ch)
-{
-        stmp3xxx_arch_dma_freeze(ch);
-}
-
-static inline void stmp3xxx_dma_unfreeze(int ch)
-{
-        stmp3xxx_arch_dma_unfreeze(ch);
-}
-
-static inline void stmp3xxx_dma_enable_interrupt(int ch)
-{
-        stmp3xxx_arch_dma_enable_interrupt(ch);
-}
-
-static inline void stmp3xxx_dma_clear_interrupt(int ch)
-{
-        stmp3xxx_arch_dma_clear_interrupt(ch);
-}
-
-static inline int stmp3xxx_dma_is_interrupt(int ch)
-{
-        return stmp3xxx_arch_dma_is_interrupt(ch);
-}
-
-#endif /* __ASM_PLAT_STMP3XXX_DMA_H */
diff --git a/arch/arm/plat-stmp3xxx/include/mach/gpio.h b/arch/arm/plat-stmp3xxx/include/mach/gpio.h
deleted file mode 100644
index a8b579256170..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/gpio.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X GPIO interface
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_PLAT_GPIO_H
-#define __ASM_PLAT_GPIO_H
-
-#define ARCH_NR_GPIOS   (32 * 3)
-#define gpio_to_irq(gpio) __gpio_to_irq(gpio)
-#define gpio_get_value(gpio) __gpio_get_value(gpio)
-#define gpio_set_value(gpio, value) __gpio_set_value(gpio, value)
-
-#include <asm-generic/gpio.h>
-
-#endif /* __ASM_PLAT_GPIO_H */
diff --git a/arch/arm/plat-stmp3xxx/include/mach/gpmi.h b/arch/arm/plat-stmp3xxx/include/mach/gpmi.h
deleted file mode 100644
index e166432910ad..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/gpmi.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __MACH_GPMI_H
-
-#include <linux/mtd/partitions.h>
-#include <mach/regs-gpmi.h>
-
-struct gpmi_platform_data {
-        void *pins;
-        int nr_parts;
-        struct mtd_partition *parts;
-        const char *part_types[];
-};
-#endif
diff --git a/arch/arm/plat-stmp3xxx/include/mach/hardware.h b/arch/arm/plat-stmp3xxx/include/mach/hardware.h
deleted file mode 100644
index 47b8978405bc..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/hardware.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file contains the hardware definitions of the Freescale STMP3XXX
- *
- * Copyright (C) 2005 Sigmatel Inc
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H
-
-/*
- * Where in virtual memory the IO devices (timers, system controllers
- * and so on)
- */
-#define IO_BASE                 0xF0000000                 /* VA of IO  */
-#define IO_SIZE                 0x00100000                 /* How much? */
-#define IO_START                0x80000000                 /* PA of IO  */
-
-/* macro to get at IO space when running virtually */
-#define IO_ADDRESS(x) (((x) & 0x000fffff) | IO_BASE)
-
-#endif
diff --git a/arch/arm/plat-stmp3xxx/include/mach/io.h b/arch/arm/plat-stmp3xxx/include/mach/io.h
deleted file mode 100644
index d08b1b7f3d1c..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/io.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2005 Sigmatel Inc
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_ARM_ARCH_IO_H
-#define __ASM_ARM_ARCH_IO_H
-
-#define IO_SPACE_LIMIT 0xffffffff
-
-#define __io(a)         __typesafe_io(a)
-#define __mem_pci(a)    (a)
-#define __mem_isa(a)    (a)
-
-#endif
diff --git a/arch/arm/plat-stmp3xxx/include/mach/memory.h b/arch/arm/plat-stmp3xxx/include/mach/memory.h
deleted file mode 100644
index 61fa54882e12..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/memory.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-/*
- * Physical DRAM offset.
- */
-#define PLAT_PHYS_OFFSET        UL(0x40000000)
-
-#endif
diff --git a/arch/arm/plat-stmp3xxx/include/mach/mmc.h b/arch/arm/plat-stmp3xxx/include/mach/mmc.h
deleted file mode 100644
index ba81e1543761..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/mmc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _MACH_MMC_H
-#define _MACH_MMC_H
-
-#include <mach/regs-ssp.h>
-
-struct stmp3xxxmmc_platform_data {
-        int (*get_wp)(void);
-        unsigned long (*setclock)(void __iomem *base, unsigned long);
-        void (*cmd_pullup)(int);
-        int  (*hw_init)(void);
-        void (*hw_release)(void);
-};
-
-#endif
diff --git a/arch/arm/plat-stmp3xxx/include/mach/pinmux.h b/arch/arm/plat-stmp3xxx/include/mach/pinmux.h
deleted file mode 100644
index cc5af82279ad..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/pinmux.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X Pin Multiplexing
- *
- * Author: Vladislav Buzov <vbuzov@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __PINMUX_H
-#define __PINMUX_H
-
-#include <linux/spinlock.h>
-#include <linux/types.h>
-#include <linux/gpio.h>
-#include <asm-generic/gpio.h>
-
-/* Pin definitions */
-#include "pins.h"
-#include <mach/pins.h>
-
-/*
- * Each pin may be routed up to four different HW interfaces
- * including GPIO
- */
-enum pin_fun {
-        PIN_FUN1 = 0,
-        PIN_FUN2,
-        PIN_FUN3,
-        PIN_GPIO,
-};
-
-/*
- * Each pin may have different output drive strength in range from
- * 4mA to 20mA. The most common case is 4, 8 and 12 mA strengths.
- */
-enum pin_strength {
-        PIN_4MA = 0,
-        PIN_8MA,
-        PIN_12MA,
-        PIN_16MA,
-        PIN_20MA,
-};
-
-/*
- * Each pin can be programmed for 1.8V or 3.3V
- */
-enum pin_voltage {
-        PIN_1_8V = 0,
-        PIN_3_3V,
-};
-
-/*
- * Structure to define a group of pins and their parameters
- */
-struct pin_desc {
-        unsigned id;
-        enum pin_fun fun;
-        enum pin_strength strength;
-        enum pin_voltage voltage;
-        unsigned pullup:1;
-};
-
-struct pin_group {
-        struct pin_desc *pins;
-        int nr_pins;
-};
-
-/* Set pin drive strength */
-void stmp3xxx_pin_strength(unsigned id, enum pin_strength strength,
-                           const char *label);
-
-/* Set pin voltage */
-void stmp3xxx_pin_voltage(unsigned id, enum pin_voltage voltage,
-                           const char *label);
-
-/* Enable pull-up resistor for a pin */
-void stmp3xxx_pin_pullup(unsigned id, int enable, const char *label);
-
-/*
- * Request a pin ownership, only one module (identified by @label)
- * may own a pin.
- */
-int stmp3xxx_request_pin(unsigned id, enum pin_fun fun, const char *label);
-
-/* Release pin */
-void stmp3xxx_release_pin(unsigned id, const char *label);
-
-void stmp3xxx_set_pin_type(unsigned id, enum pin_fun fun);
-
-/*
- * Each bank is associated with a number of registers to control
- * pin function, drive strength, voltage and pull-up reigster. The
- * number of registers of a given type depends on the number of bits
- * describin particular pin.
- */
-#define HW_MUXSEL_NUM           2       /* registers per bank */
-#define HW_MUXSEL_PIN_LEN       2       /* bits per pin */
-#define HW_MUXSEL_PIN_NUM       16      /* pins per register */
-#define HW_MUXSEL_PINFUN_MASK   0x3     /* pin function mask */
-#define HW_MUXSEL_PINFUN_NUM    4       /* four options for a pin */
-
-#define HW_DRIVE_NUM            4       /* registers per bank */
-#define HW_DRIVE_PIN_LEN        4       /* bits per pin */
-#define HW_DRIVE_PIN_NUM        8       /* pins per register */
-#define HW_DRIVE_PINDRV_MASK    0x3     /* pin strength mask - 2 bits */
-#define HW_DRIVE_PINDRV_NUM     5       /* five possible strength values */
-#define HW_DRIVE_PINV_MASK      0x4     /* pin voltage mask - 1 bit */
-
-
-struct stmp3xxx_pinmux_bank {
-        struct gpio_chip chip;
-
-        /* Pins allocation map */
-        unsigned long pin_map;
-
-        /* Pin owner names */
-        const char *pin_labels[32];
-
-        /* Bank registers */
-        void __iomem *hw_muxsel[HW_MUXSEL_NUM];
-        void __iomem *hw_drive[HW_DRIVE_NUM];
-        void __iomem *hw_pull;
-
-        void __iomem *pin2irq,
-                *irqlevel,
-                *irqpolarity,
-                *irqen,
-                *irqstat;
-
-        /* HW MUXSEL register function bit values */
-        u8 functions[HW_MUXSEL_PINFUN_NUM];
-
-        /*
-         * HW DRIVE register strength bit values:
-         * 0xff - requested strength is not supported for this bank
-         */
-        u8 strengths[HW_DRIVE_PINDRV_NUM];
-
-        /* GPIO things */
-        void __iomem *hw_gpio_in,
-                     *hw_gpio_out,
-                     *hw_gpio_doe;
-        int irq, virq;
-};
-
-int __init stmp3xxx_pinmux_init(int virtual_irq_start);
-
-#endif /* __PINMUX_H */
diff --git a/arch/arm/plat-stmp3xxx/include/mach/pins.h b/arch/arm/plat-stmp3xxx/include/mach/pins.h
deleted file mode 100644
index c573318e1caa..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X Pin multiplexing interface definitions
- *
- * Author: Vladislav Buzov <vbuzov@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_PLAT_PINS_H
-#define __ASM_PLAT_PINS_H
-
-#define STMP3XXX_PINID(bank, pin)       (bank * 32 + pin)
-#define STMP3XXX_PINID_TO_BANK(pinid)   (pinid / 32)
-#define STMP3XXX_PINID_TO_PINNUM(pinid) (pinid % 32)
-
-/*
- * Special invalid pin identificator to show a pin doesn't exist
- */
-#define PINID_NO_PIN    STMP3XXX_PINID(0xFF, 0xFF)
-
-#endif /* __ASM_PLAT_PINS_H */
diff --git a/arch/arm/plat-stmp3xxx/include/mach/platform.h b/arch/arm/plat-stmp3xxx/include/mach/platform.h
deleted file mode 100644
index 7007ddaa91eb..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/platform.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_PLAT_PLATFORM_H
-#define __ASM_PLAT_PLATFORM_H
-
-#ifndef __ASSEMBLER__
-#include <linux/io.h>
-#endif
-#include <asm/sizes.h>
-
-/* Virtual address where registers are mapped */
-#define STMP3XXX_REGS_PHBASE    0x80000000
-#ifdef __ASSEMBLER__
-#define STMP3XXX_REGS_BASE      0xF0000000
-#else
-#define STMP3XXX_REGS_BASE      (void __iomem *)0xF0000000
-#endif
-#define STMP3XXX_REGS_SIZE      SZ_1M
-
-/* Virtual address where OCRAM is mapped */
-#define STMP3XXX_OCRAM_PHBASE   0x00000000
-#ifdef __ASSEMBLER__
-#define STMP3XXX_OCRAM_BASE     0xf1000000
-#else
-#define STMP3XXX_OCRAM_BASE     (void __iomem *)0xf1000000
-#endif
-#define STMP3XXX_OCRAM_SIZE     (32 * SZ_1K)
-
-#ifdef CONFIG_ARCH_STMP37XX
-#define IRQ_PRIORITY_REG_RD     HW_ICOLL_PRIORITYn_RD
-#define IRQ_PRIORITY_REG_WR     HW_ICOLL_PRIORITYn_WR
-#endif
-
-#ifdef CONFIG_ARCH_STMP378X
-#define IRQ_PRIORITY_REG_RD     HW_ICOLL_INTERRUPTn_RD
-#define IRQ_PRIORITY_REG_WR     HW_ICOLL_INTERRUPTn_WR
-#endif
-
-#define HW_STMP3XXX_SET         0x04
-#define HW_STMP3XXX_CLR         0x08
-#define HW_STMP3XXX_TOG         0x0c
-
-#ifndef __ASSEMBLER__
-static inline void stmp3xxx_clearl(u32 v, void __iomem *r)
-{
-        __raw_writel(v, r + HW_STMP3XXX_CLR);
-}
-
-static inline void stmp3xxx_setl(u32 v, void __iomem *r)
-{
-        __raw_writel(v, r + HW_STMP3XXX_SET);
-}
-#endif
-
-#define BF(value, field) (((value) << BP_##field) & BM_##field)
-
-#endif /* __ASM_ARCH_PLATFORM_H */
diff --git a/arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h b/arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h
deleted file mode 100644
index 2e300feaa4cf..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X core structure and function declarations
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_PLAT_STMP3XXX_H
-#define __ASM_PLAT_STMP3XXX_H
-
-#include <linux/irq.h>
-
-extern struct sys_timer stmp3xxx_timer;
-
-void stmp3xxx_init_irq(struct irq_chip *chip);
-void stmp3xxx_init(void);
-int stmp3xxx_reset_block(void __iomem *hwreg, int just_enable);
-extern struct platform_device stmp3xxx_dbguart,
-                              stmp3xxx_appuart,
-                              stmp3xxx_watchdog,
-                              stmp3xxx_touchscreen,
-                              stmp3xxx_keyboard,
-                              stmp3xxx_gpmi,
-                              stmp3xxx_mmc,
-                              stmp3xxx_udc,
-                              stmp3xxx_ehci,
-                              stmp3xxx_rtc,
-                              stmp3xxx_spi1,
-                              stmp3xxx_spi2,
-                              stmp3xxx_backlight,
-                              stmp3xxx_rotdec,
-                              stmp3xxx_dcp,
-                              stmp3xxx_dcp_bootstream,
-                              stmp3xxx_persistent,
-                              stmp3xxx_framebuffer,
-                              stmp3xxx_battery;
-int stmp3xxx_ssp1_device_register(void);
-int stmp3xxx_ssp2_device_register(void);
-
-struct pin_group;
-void stmp3xxx_release_pin_group(struct pin_group *pin_group, const char *label);
-int stmp3xxx_request_pin_group(struct pin_group *pin_group, const char *label);
-
-#endif /* __ASM_PLAT_STMP3XXX_H */
diff --git a/arch/arm/plat-stmp3xxx/include/mach/system.h b/arch/arm/plat-stmp3xxx/include/mach/system.h
deleted file mode 100644
index 28a988889319..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/system.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2005 Sigmatel Inc
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_ARCH_SYSTEM_H
-#define __ASM_ARCH_SYSTEM_H
-
-#include <asm/proc-fns.h>
-#include <mach/platform.h>
-#include <mach/regs-clkctrl.h>
-#include <mach/regs-power.h>
-
-static inline void arch_idle(void)
-{
-        /*
-         * This should do all the clock switching
-         * and wait for interrupt tricks
-         */
-
-        cpu_do_idle();
-}
-
-static inline void arch_reset(char mode, const char *cmd)
-{
-        /* Set BATTCHRG to default value */
-        __raw_writel(0x00010000, REGS_POWER_BASE + HW_POWER_CHARGE);
-
-        /* Set MINPWR to default value   */
-        __raw_writel(0, REGS_POWER_BASE + HW_POWER_MINPWR);
-
-        /* Reset digital side of chip (but not power or RTC) */
-        __raw_writel(BM_CLKCTRL_RESET_DIG,
-                        REGS_CLKCTRL_BASE + HW_CLKCTRL_RESET);
-
-        /* Should not return */
-}
-
-#endif
diff --git a/arch/arm/plat-stmp3xxx/include/mach/timex.h b/arch/arm/plat-stmp3xxx/include/mach/timex.h
deleted file mode 100644
index 3373985d7a8e..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/timex.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 1999 ARM Limited
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/*
- * System time clock is sourced from the 32k clock
- */
-#define CLOCK_TICK_RATE         (32768)
diff --git a/arch/arm/plat-stmp3xxx/include/mach/uncompress.h b/arch/arm/plat-stmp3xxx/include/mach/uncompress.h
deleted file mode 100644
index f79f5ee56cd4..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/uncompress.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_PLAT_UNCOMPRESS_H
-#define __ASM_PLAT_UNCOMPRESS_H
-
-/*
- * Register includes are for when the MMU enabled; we need to define our
- * own stuff here for pre-MMU use
- */
-#define UARTDBG_BASE            0x80070000
-#define UART(c)                 (((volatile unsigned *)UARTDBG_BASE)[c])
-
-/*
- * This does not append a newline
- */
-static void putc(char c)
-{
-        /* Wait for TX fifo empty */
-        while ((UART(6) & (1<<7)) == 0)
-                continue;
-
-        /* Write byte */
-        UART(0) = c;
-
-        /* Wait for last bit to exit the UART */
-        while (UART(6) & (1<<3))
-                continue;
-}
-
-static void flush(void)
-{
-}
-
-/*
- * nothing to do
- */
-#define arch_decomp_setup()
-
-#define arch_decomp_wdog()
-
-#endif /* __ASM_PLAT_UNCOMPRESS_H */
diff --git a/arch/arm/plat-stmp3xxx/include/mach/vmalloc.h b/arch/arm/plat-stmp3xxx/include/mach/vmalloc.h
deleted file mode 100644
index 943c1a29d641..000000000000
--- a/arch/arm/plat-stmp3xxx/include/mach/vmalloc.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#define VMALLOC_END       0xf0000000UL
diff --git a/arch/arm/plat-stmp3xxx/irq.c b/arch/arm/plat-stmp3xxx/irq.c
deleted file mode 100644
index 6fdf9acf82ed..000000000000
--- a/arch/arm/plat-stmp3xxx/irq.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Freescale STMP37XX/STMP378X common interrupt handling code
- *
- * Author: Vladislav Buzov <vbuzov@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/irq.h>
-#include <linux/sysdev.h>
-
-#include <mach/stmp3xxx.h>
-#include <mach/platform.h>
-#include <mach/regs-icoll.h>
-
-void __init stmp3xxx_init_irq(struct irq_chip *chip)
-{
-        unsigned int i, lv;
-
-        /* Reset the interrupt controller */
-        stmp3xxx_reset_block(REGS_ICOLL_BASE + HW_ICOLL_CTRL, true);
-
-        /* Disable all interrupts initially */
-        for (i = 0; i < NR_REAL_IRQS; i++) {
-                chip->irq_mask(irq_get_irq_data(i));
-                irq_set_chip_and_handler(i, chip, handle_level_irq);
-                set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
-        }
-
-        /* Ensure vector is cleared */
-        for (lv = 0; lv < 4; lv++)
-                __raw_writel(1 << lv, REGS_ICOLL_BASE + HW_ICOLL_LEVELACK);
-        __raw_writel(0, REGS_ICOLL_BASE + HW_ICOLL_VECTOR);
-
-        /* Barrier */
-        (void)__raw_readl(REGS_ICOLL_BASE + HW_ICOLL_STAT);
-}
-
diff --git a/arch/arm/plat-stmp3xxx/pinmux.c b/arch/arm/plat-stmp3xxx/pinmux.c
deleted file mode 100644
index 3def03b3217d..000000000000
--- a/arch/arm/plat-stmp3xxx/pinmux.c
+++ /dev/null
@@ -1,550 +0,0 @@
-/*
- * Freescale STMP378X/STMP378X Pin Multiplexing
- *
- * Author: Vladislav Buzov <vbuzov@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#define DEBUG
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/sysdev.h>
-#include <linux/string.h>
-#include <linux/bitops.h>
-#include <linux/irq.h>
-
-#include <mach/hardware.h>
-#include <mach/platform.h>
-#include <mach/regs-pinctrl.h>
-#include <mach/pins.h>
-#include <mach/pinmux.h>
-
-#define NR_BANKS ARRAY_SIZE(pinmux_banks)
-static struct stmp3xxx_pinmux_bank pinmux_banks[] = {
-        [0] = {
-                .hw_muxsel = {
-                        REGS_PINCTRL_BASE + HW_PINCTRL_MUXSEL0,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_MUXSEL1,
-                },
-                .hw_drive = {
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE0,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE1,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE2,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE3,
-                },
-                .hw_pull = REGS_PINCTRL_BASE + HW_PINCTRL_PULL0,
-                .functions = { 0x0, 0x1, 0x2, 0x3 },
-                .strengths = { 0x0, 0x1, 0x2, 0x3, 0xff },
-
-                .hw_gpio_in = REGS_PINCTRL_BASE + HW_PINCTRL_DIN0,
-                .hw_gpio_out = REGS_PINCTRL_BASE + HW_PINCTRL_DOUT0,
-                .hw_gpio_doe = REGS_PINCTRL_BASE + HW_PINCTRL_DOE0,
-                .irq = IRQ_GPIO0,
-
-                .pin2irq = REGS_PINCTRL_BASE + HW_PINCTRL_PIN2IRQ0,
-                .irqstat = REGS_PINCTRL_BASE + HW_PINCTRL_IRQSTAT0,
-                .irqlevel = REGS_PINCTRL_BASE + HW_PINCTRL_IRQLEVEL0,
-                .irqpolarity = REGS_PINCTRL_BASE + HW_PINCTRL_IRQPOL0,
-                .irqen = REGS_PINCTRL_BASE + HW_PINCTRL_IRQEN0,
-        },
-        [1] = {
-                .hw_muxsel = {
-                        REGS_PINCTRL_BASE + HW_PINCTRL_MUXSEL2,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_MUXSEL3,
-                },
-                .hw_drive = {
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE4,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE5,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE6,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE7,
-                },
-                .hw_pull = REGS_PINCTRL_BASE + HW_PINCTRL_PULL1,
-                .functions = { 0x0, 0x1, 0x2, 0x3 },
-                .strengths = { 0x0, 0x1, 0x2, 0x3, 0xff },
-
-                .hw_gpio_in = REGS_PINCTRL_BASE + HW_PINCTRL_DIN1,
-                .hw_gpio_out = REGS_PINCTRL_BASE + HW_PINCTRL_DOUT1,
-                .hw_gpio_doe = REGS_PINCTRL_BASE + HW_PINCTRL_DOE1,
-                .irq = IRQ_GPIO1,
-
-                .pin2irq = REGS_PINCTRL_BASE + HW_PINCTRL_PIN2IRQ1,
-                .irqstat = REGS_PINCTRL_BASE + HW_PINCTRL_IRQSTAT1,
-                .irqlevel = REGS_PINCTRL_BASE + HW_PINCTRL_IRQLEVEL1,
-                .irqpolarity = REGS_PINCTRL_BASE + HW_PINCTRL_IRQPOL1,
-                .irqen = REGS_PINCTRL_BASE + HW_PINCTRL_IRQEN1,
-        },
-        [2] = {
-               .hw_muxsel = {
-                        REGS_PINCTRL_BASE + HW_PINCTRL_MUXSEL4,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_MUXSEL5,
-                },
-                .hw_drive = {
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE8,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE9,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE10,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE11,
-                },
-                .hw_pull = REGS_PINCTRL_BASE + HW_PINCTRL_PULL2,
-                .functions = { 0x0, 0x1, 0x2, 0x3 },
-                .strengths = { 0x0, 0x1, 0x2, 0x1, 0x2 },
-
-                .hw_gpio_in = REGS_PINCTRL_BASE + HW_PINCTRL_DIN2,
-                .hw_gpio_out = REGS_PINCTRL_BASE + HW_PINCTRL_DOUT2,
-                .hw_gpio_doe = REGS_PINCTRL_BASE + HW_PINCTRL_DOE2,
-                .irq = IRQ_GPIO2,
-
-                .pin2irq = REGS_PINCTRL_BASE + HW_PINCTRL_PIN2IRQ2,
-                .irqstat = REGS_PINCTRL_BASE + HW_PINCTRL_IRQSTAT2,
-                .irqlevel = REGS_PINCTRL_BASE + HW_PINCTRL_IRQLEVEL2,
-                .irqpolarity = REGS_PINCTRL_BASE + HW_PINCTRL_IRQPOL2,
-                .irqen = REGS_PINCTRL_BASE + HW_PINCTRL_IRQEN2,
-        },
-        [3] = {
-               .hw_muxsel = {
-                       REGS_PINCTRL_BASE + HW_PINCTRL_MUXSEL6,
-                       REGS_PINCTRL_BASE + HW_PINCTRL_MUXSEL7,
-               },
-               .hw_drive = {
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE12,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE13,
-                        REGS_PINCTRL_BASE + HW_PINCTRL_DRIVE14,
-                        NULL,
-               },
-               .hw_pull = REGS_PINCTRL_BASE + HW_PINCTRL_PULL3,
-               .functions = {0x0, 0x1, 0x2, 0x3},
-               .strengths = {0x0, 0x1, 0x2, 0x3, 0xff},
-        },
-};
-
-static inline struct stmp3xxx_pinmux_bank *
-stmp3xxx_pinmux_bank(unsigned id, unsigned *bank, unsigned *pin)
-{
-        unsigned b, p;
-
-        b = STMP3XXX_PINID_TO_BANK(id);
-        p = STMP3XXX_PINID_TO_PINNUM(id);
-        BUG_ON(b >= NR_BANKS);
-        if (bank)
-                *bank = b;
-        if (pin)
-                *pin = p;
-        return &pinmux_banks[b];
-}
-
-/* Check if requested pin is owned by caller */
-static int stmp3xxx_check_pin(unsigned id, const char *label)
-{
-        unsigned pin;
-        struct stmp3xxx_pinmux_bank *pm = stmp3xxx_pinmux_bank(id, NULL, &pin);
-
-        if (!test_bit(pin, &pm->pin_map)) {
-                printk(KERN_WARNING
-                       "%s: Accessing free pin %x, caller %s\n",
-                       __func__, id, label);
-
-                return -EINVAL;
-        }
-
-        if (label && pm->pin_labels[pin] &&
-            strcmp(label, pm->pin_labels[pin])) {
-                printk(KERN_WARNING
-                       "%s: Wrong pin owner %x, caller %s owner %s\n",
-                       __func__, id, label, pm->pin_labels[pin]);
-
-                return -EINVAL;
-        }
-        return 0;
-}
-
-void stmp3xxx_pin_strength(unsigned id, enum pin_strength strength,
-                const char *label)
-{
-        struct stmp3xxx_pinmux_bank *pbank;
-        void __iomem *hwdrive;
-        u32 shift, val;
-        u32 bank, pin;
-
-        pbank = stmp3xxx_pinmux_bank(id, &bank, &pin);
-        pr_debug("%s: label %s bank %d pin %d strength %d\n", __func__, label,
-                 bank, pin, strength);
-
-        hwdrive = pbank->hw_drive[pin / HW_DRIVE_PIN_NUM];
-        shift = (pin % HW_DRIVE_PIN_NUM) * HW_DRIVE_PIN_LEN;
-        val = pbank->strengths[strength];
-        if (val == 0xff) {
-                printk(KERN_WARNING
-                       "%s: strength is not supported for bank %d, caller %s",
-                       __func__, bank, label);
-                return;
-        }
-
-        if (stmp3xxx_check_pin(id, label))
-                return;
-
-        pr_debug("%s: writing 0x%x to 0x%p register\n", __func__,
-                        val << shift, hwdrive);
-        stmp3xxx_clearl(HW_DRIVE_PINDRV_MASK << shift, hwdrive);
-        stmp3xxx_setl(val << shift, hwdrive);
-}
-
-void stmp3xxx_pin_voltage(unsigned id, enum pin_voltage voltage,
-                          const char *label)
-{
-        struct stmp3xxx_pinmux_bank *pbank;
-        void __iomem *hwdrive;
-        u32 shift;
-        u32 bank, pin;
-
-        pbank = stmp3xxx_pinmux_bank(id, &bank, &pin);
-        pr_debug("%s: label %s bank %d pin %d voltage %d\n", __func__, label,
-                 bank, pin, voltage);
-
-        hwdrive = pbank->hw_drive[pin / HW_DRIVE_PIN_NUM];
-        shift = (pin % HW_DRIVE_PIN_NUM) * HW_DRIVE_PIN_LEN;
-
-        if (stmp3xxx_check_pin(id, label))
-                return;
-
-        pr_debug("%s: changing 0x%x bit in 0x%p register\n",
-                        __func__, HW_DRIVE_PINV_MASK << shift, hwdrive);
-        if (voltage == PIN_1_8V)
-                stmp3xxx_clearl(HW_DRIVE_PINV_MASK << shift, hwdrive);
-        else
-                stmp3xxx_setl(HW_DRIVE_PINV_MASK << shift, hwdrive);
-}
-
-void stmp3xxx_pin_pullup(unsigned id, int enable, const char *label)
-{
-        struct stmp3xxx_pinmux_bank *pbank;
-        void __iomem *hwpull;
-        u32 bank, pin;
-
-        pbank = stmp3xxx_pinmux_bank(id, &bank, &pin);
-        pr_debug("%s: label %s bank %d pin %d enable %d\n", __func__, label,
-                 bank, pin, enable);
-
-        hwpull = pbank->hw_pull;
-
-        if (stmp3xxx_check_pin(id, label))
-                return;
-
-        pr_debug("%s: changing 0x%x bit in 0x%p register\n",
-                        __func__, 1 << pin, hwpull);
-        if (enable)
-                stmp3xxx_setl(1 << pin, hwpull);
-        else
-                stmp3xxx_clearl(1 << pin, hwpull);
-}
-
-int stmp3xxx_request_pin(unsigned id, enum pin_fun fun, const char *label)
-{
-        struct stmp3xxx_pinmux_bank *pbank;
-        u32 bank, pin;
-        int ret = 0;
-
-        pbank = stmp3xxx_pinmux_bank(id, &bank, &pin);
-        pr_debug("%s: label %s bank %d pin %d fun %d\n", __func__, label,
-                 bank, pin, fun);
-
-        if (test_bit(pin, &pbank->pin_map)) {
-                printk(KERN_WARNING
-                       "%s: CONFLICT DETECTED pin %d:%d caller %s owner %s\n",
-                       __func__, bank, pin, label, pbank->pin_labels[pin]);
-                return -EBUSY;
-        }
-
-        set_bit(pin, &pbank->pin_map);
-        pbank->pin_labels[pin] = label;
-
-        stmp3xxx_set_pin_type(id, fun);
-
-        return ret;
-}
-
-void stmp3xxx_set_pin_type(unsigned id, enum pin_fun fun)
-{
-        struct stmp3xxx_pinmux_bank *pbank;
-        void __iomem *hwmux;
-        u32 shift, val;
-        u32 bank, pin;
-
-        pbank = stmp3xxx_pinmux_bank(id, &bank, &pin);
-
-        hwmux = pbank->hw_muxsel[pin / HW_MUXSEL_PIN_NUM];
-        shift = (pin % HW_MUXSEL_PIN_NUM) * HW_MUXSEL_PIN_LEN;
-
-        val = pbank->functions[fun];
-        shift = (pin % HW_MUXSEL_PIN_NUM) * HW_MUXSEL_PIN_LEN;
-        pr_debug("%s: writing 0x%x to 0x%p register\n",
-                        __func__, val << shift, hwmux);
-        stmp3xxx_clearl(HW_MUXSEL_PINFUN_MASK << shift, hwmux);
-        stmp3xxx_setl(val << shift, hwmux);
-}
-
-void stmp3xxx_release_pin(unsigned id, const char *label)
-{
-        struct stmp3xxx_pinmux_bank *pbank;
-        u32 bank, pin;
-
-        pbank = stmp3xxx_pinmux_bank(id, &bank, &pin);
-        pr_debug("%s: label %s bank %d pin %d\n", __func__, label, bank, pin);
-
-        if (stmp3xxx_check_pin(id, label))
-                return;
-
-        clear_bit(pin, &pbank->pin_map);
-        pbank->pin_labels[pin] = NULL;
-}
-
-int stmp3xxx_request_pin_group(struct pin_group *pin_group, const char *label)
-{
-        struct pin_desc *pin;
-        int p;
-        int err = 0;
-
-        /* Allocate and configure pins */
-        for (p = 0; p < pin_group->nr_pins; p++) {
-                pr_debug("%s: #%d\n", __func__, p);
-                pin = &pin_group->pins[p];
-
-                err = stmp3xxx_request_pin(pin->id, pin->fun, label);
-                if (err)
-                        goto out_err;
-
-                stmp3xxx_pin_strength(pin->id, pin->strength, label);
-                stmp3xxx_pin_voltage(pin->id, pin->voltage, label);
-                stmp3xxx_pin_pullup(pin->id, pin->pullup, label);
-        }
-
-        return 0;
-
-out_err:
-        /* Release allocated pins in case of error */
-        while (--p >= 0) {
-                pr_debug("%s: releasing #%d\n", __func__, p);
-                stmp3xxx_release_pin(pin_group->pins[p].id, label);
-        }
-        return err;
-}
-EXPORT_SYMBOL(stmp3xxx_request_pin_group);
-
-void stmp3xxx_release_pin_group(struct pin_group *pin_group, const char *label)
-{
-        struct pin_desc *pin;
-        int p;
-
-        for (p = 0; p < pin_group->nr_pins; p++) {
-                pin = &pin_group->pins[p];
-                stmp3xxx_release_pin(pin->id, label);
-        }
-}
-EXPORT_SYMBOL(stmp3xxx_release_pin_group);
-
-static int stmp3xxx_irq_data_to_gpio(struct irq_data *d,
-        struct stmp3xxx_pinmux_bank **bank, unsigned *gpio)
-{
-        struct stmp3xxx_pinmux_bank *pm;
-
-        for (pm = pinmux_banks; pm < pinmux_banks + NR_BANKS; pm++)
-                if (pm->virq <= d->irq && d->irq < pm->virq + 32) {
-                        *bank = pm;
-                        *gpio = d->irq - pm->virq;
-                        return 0;
-                }
-        return -ENOENT;
-}
-
-static int stmp3xxx_set_irqtype(struct irq_data *d, unsigned type)
-{
-        struct stmp3xxx_pinmux_bank *pm;
-        unsigned gpio;
-        int l, p;
-
-        stmp3xxx_irq_data_to_gpio(d, &pm, &gpio);
-        switch (type) {
-        case IRQ_TYPE_EDGE_RISING:
-                l = 0; p = 1; break;
-        case IRQ_TYPE_EDGE_FALLING:
-                l = 0; p = 0; break;
-        case IRQ_TYPE_LEVEL_HIGH:
-                l = 1; p = 1; break;
-        case IRQ_TYPE_LEVEL_LOW:
-                l = 1; p = 0; break;
-        default:
-                pr_debug("%s: Incorrect GPIO interrupt type 0x%x\n",
-                                __func__, type);
-                return -ENXIO;
-        }
-
-        if (l)
-                stmp3xxx_setl(1 << gpio, pm->irqlevel);
-        else
-                stmp3xxx_clearl(1 << gpio, pm->irqlevel);
-        if (p)
-                stmp3xxx_setl(1 << gpio, pm->irqpolarity);
-        else
-                stmp3xxx_clearl(1 << gpio, pm->irqpolarity);
-        return 0;
-}
-
-static void stmp3xxx_pin_ack_irq(struct irq_data *d)
-{
-        u32 stat;
-        struct stmp3xxx_pinmux_bank *pm;
-        unsigned gpio;
-
-        stmp3xxx_irq_data_to_gpio(d, &pm, &gpio);
-        stat = __raw_readl(pm->irqstat) & (1 << gpio);
-        stmp3xxx_clearl(stat, pm->irqstat);
-}
-
-static void stmp3xxx_pin_mask_irq(struct irq_data *d)
-{
-        struct stmp3xxx_pinmux_bank *pm;
-        unsigned gpio;
-
-        stmp3xxx_irq_data_to_gpio(d, &pm, &gpio);
-        stmp3xxx_clearl(1 << gpio, pm->irqen);
-        stmp3xxx_clearl(1 << gpio, pm->pin2irq);
-}
-
-static void stmp3xxx_pin_unmask_irq(struct irq_data *d)
-{
-        struct stmp3xxx_pinmux_bank *pm;
-        unsigned gpio;
-
-        stmp3xxx_irq_data_to_gpio(d, &pm, &gpio);
-        stmp3xxx_setl(1 << gpio, pm->irqen);
-        stmp3xxx_setl(1 << gpio, pm->pin2irq);
-}
-
-static inline
-struct stmp3xxx_pinmux_bank *to_pinmux_bank(struct gpio_chip *chip)
-{
-        return container_of(chip, struct stmp3xxx_pinmux_bank, chip);
-}
-
-static int stmp3xxx_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
-{
-        struct stmp3xxx_pinmux_bank *pm = to_pinmux_bank(chip);
-        return pm->virq + offset;
-}
-
-static int stmp3xxx_gpio_get(struct gpio_chip *chip, unsigned offset)
-{
-        struct stmp3xxx_pinmux_bank *pm = to_pinmux_bank(chip);
-        unsigned v;
-
-        v = __raw_readl(pm->hw_gpio_in) & (1 << offset);
-        return v ? 1 : 0;
-}
-
-static void stmp3xxx_gpio_set(struct gpio_chip *chip, unsigned offset, int v)
-{
-        struct stmp3xxx_pinmux_bank *pm = to_pinmux_bank(chip);
-
-        if (v)
-                stmp3xxx_setl(1 << offset, pm->hw_gpio_out);
-        else
-                stmp3xxx_clearl(1 << offset, pm->hw_gpio_out);
-}
-
-static int stmp3xxx_gpio_output(struct gpio_chip *chip, unsigned offset, int v)
-{
-        struct stmp3xxx_pinmux_bank *pm = to_pinmux_bank(chip);
-
-        stmp3xxx_setl(1 << offset, pm->hw_gpio_doe);
-        stmp3xxx_gpio_set(chip, offset, v);
-        return 0;
-}
-
-static int stmp3xxx_gpio_input(struct gpio_chip *chip, unsigned offset)
-{
-        struct stmp3xxx_pinmux_bank *pm = to_pinmux_bank(chip);
-
-        stmp3xxx_clearl(1 << offset, pm->hw_gpio_doe);
-        return 0;
-}
-
-static int stmp3xxx_gpio_request(struct gpio_chip *chip, unsigned offset)
-{
-        return stmp3xxx_request_pin(chip->base + offset, PIN_GPIO, "gpio");
-}
-
-static void stmp3xxx_gpio_free(struct gpio_chip *chip, unsigned offset)
-{
-        stmp3xxx_release_pin(chip->base + offset, "gpio");
-}
-
-static void stmp3xxx_gpio_irq(u32 irq, struct irq_desc *desc)
-{
-        struct stmp3xxx_pinmux_bank *pm = irq_get_handler_data(irq);
-        int gpio_irq = pm->virq;
-        u32 stat = __raw_readl(pm->irqstat);
-
-        while (stat) {
-                if (stat & 1)
-                        generic_handle_irq(gpio_irq);
-                gpio_irq++;
-                stat >>= 1;
-        }
-}
-
-static struct irq_chip gpio_irq_chip = {
-        .irq_ack        = stmp3xxx_pin_ack_irq,
-        .irq_mask       = stmp3xxx_pin_mask_irq,
-        .irq_unmask     = stmp3xxx_pin_unmask_irq,
-        .irq_set_type   = stmp3xxx_set_irqtype,
-};
-
-int __init stmp3xxx_pinmux_init(int virtual_irq_start)
-{
-        int b, r = 0;
-        struct stmp3xxx_pinmux_bank *pm;
-        int virq;
-
-        for (b = 0; b < 3; b++) {
-                /* only banks 0,1,2 are allowed to GPIO */
-                pm = pinmux_banks + b;
-                pm->chip.base = 32 * b;
-                pm->chip.ngpio = 32;
-                pm->chip.owner = THIS_MODULE;
-                pm->chip.can_sleep = 1;
-                pm->chip.exported = 1;
-                pm->chip.to_irq = stmp3xxx_gpio_to_irq;
-                pm->chip.direction_input = stmp3xxx_gpio_input;
-                pm->chip.direction_output = stmp3xxx_gpio_output;
-                pm->chip.get = stmp3xxx_gpio_get;
-                pm->chip.set = stmp3xxx_gpio_set;
-                pm->chip.request = stmp3xxx_gpio_request;
-                pm->chip.free = stmp3xxx_gpio_free;
-                pm->virq = virtual_irq_start + b * 32;
-
-                for (virq = pm->virq; virq < pm->virq; virq++) {
-                        gpio_irq_chip.irq_mask(irq_get_irq_data(virq));
-                        irq_set_chip_and_handler(virq, &gpio_irq_chip,
-                                                 handle_level_irq);
-                        set_irq_flags(virq, IRQF_VALID);
-                }
-                r = gpiochip_add(&pm->chip);
-                if (r < 0)
-                        break;
-                irq_set_chained_handler(pm->irq, stmp3xxx_gpio_irq);
-                irq_set_handler_data(pm->irq, pm);
-        }
-        return r;
-}
-
-MODULE_AUTHOR("Vladislav Buzov");
-MODULE_LICENSE("GPL");
diff --git a/arch/arm/plat-stmp3xxx/timer.c b/arch/arm/plat-stmp3xxx/timer.c
deleted file mode 100644
index c395630a6edc..000000000000
--- a/arch/arm/plat-stmp3xxx/timer.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * System timer for Freescale STMP37XX/STMP378X
- *
- * Embedded Alley Solutions, Inc <source@embeddedalley.com>
- *
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/spinlock.h>
-#include <linux/clocksource.h>
-#include <linux/clockchips.h>
-#include <linux/io.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-
-#include <asm/mach/time.h>
-#include <mach/stmp3xxx.h>
-#include <mach/platform.h>
-#include <mach/regs-timrot.h>
-
-static irqreturn_t
-stmp3xxx_timer_interrupt(int irq, void *dev_id)
-{
-        struct clock_event_device *c = dev_id;
-
-        /* timer 0 */
-        if (__raw_readl(REGS_TIMROT_BASE + HW_TIMROT_TIMCTRL0) &
-                        BM_TIMROT_TIMCTRLn_IRQ) {
-                stmp3xxx_clearl(BM_TIMROT_TIMCTRLn_IRQ,
-                                REGS_TIMROT_BASE + HW_TIMROT_TIMCTRL0);
-                c->event_handler(c);
-        }
-
-        /* timer 1 */
-        else if (__raw_readl(REGS_TIMROT_BASE + HW_TIMROT_TIMCTRL1)
-                        & BM_TIMROT_TIMCTRLn_IRQ) {
-                stmp3xxx_clearl(BM_TIMROT_TIMCTRLn_IRQ,
-                                REGS_TIMROT_BASE + HW_TIMROT_TIMCTRL1);
-                stmp3xxx_clearl(BM_TIMROT_TIMCTRLn_IRQ_EN,
-                                REGS_TIMROT_BASE + HW_TIMROT_TIMCTRL1);
-                __raw_writel(0xFFFF, REGS_TIMROT_BASE + HW_TIMROT_TIMCOUNT1);
-        }
-
-        return IRQ_HANDLED;
-}
-
-static cycle_t stmp3xxx_clock_read(struct clocksource *cs)
-{
-        return ~((__raw_readl(REGS_TIMROT_BASE + HW_TIMROT_TIMCOUNT1)
-                                & 0xFFFF0000) >> 16);
-}
-
-static int
-stmp3xxx_timrot_set_next_event(unsigned long delta,
-                struct clock_event_device *dev)
-{
-        /* reload the timer */
-        __raw_writel(delta, REGS_TIMROT_BASE + HW_TIMROT_TIMCOUNT0);
-        return 0;
-}
-
-static void
-stmp3xxx_timrot_set_mode(enum clock_event_mode mode,
-                struct clock_event_device *dev)
-{
-}
-
-static struct clock_event_device ckevt_timrot = {
-        .name           = "timrot",
-        .features       = CLOCK_EVT_FEAT_ONESHOT,
-        .shift          = 32,
-        .set_next_event = stmp3xxx_timrot_set_next_event,
-        .set_mode       = stmp3xxx_timrot_set_mode,
-};
-
-static struct clocksource cksrc_stmp3xxx = {
-        .name           = "cksrc_stmp3xxx",
-        .rating         = 250,
-        .read           = stmp3xxx_clock_read,
-        .mask           = CLOCKSOURCE_MASK(16),
-        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
-};
-
-static struct irqaction stmp3xxx_timer_irq = {
-        .name           = "stmp3xxx_timer",
-        .flags          = IRQF_DISABLED | IRQF_TIMER,
-        .handler        = stmp3xxx_timer_interrupt,
-        .dev_id         = &ckevt_timrot,
-};
-
-
-/*
- * Set up timer interrupt, and return the current time in seconds.
- */
-static void __init stmp3xxx_init_timer(void)
-{
-        ckevt_timrot.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC,
-                                ckevt_timrot.shift);
-        ckevt_timrot.min_delta_ns = clockevent_delta2ns(2, &ckevt_timrot);
-        ckevt_timrot.max_delta_ns = clockevent_delta2ns(0xFFF, &ckevt_timrot);
-        ckevt_timrot.cpumask = cpumask_of(0);
-
-        stmp3xxx_reset_block(REGS_TIMROT_BASE, false);
-
-        /* clear two timers */
-        __raw_writel(0, REGS_TIMROT_BASE + HW_TIMROT_TIMCOUNT0);
-        __raw_writel(0, REGS_TIMROT_BASE + HW_TIMROT_TIMCOUNT1);
-
-        /* configure them */
-        __raw_writel(
-                (8 << BP_TIMROT_TIMCTRLn_SELECT) |  /* 32 kHz */
-                BM_TIMROT_TIMCTRLn_RELOAD |
-                BM_TIMROT_TIMCTRLn_UPDATE |
-                BM_TIMROT_TIMCTRLn_IRQ_EN,
-                        REGS_TIMROT_BASE + HW_TIMROT_TIMCTRL0);
-        __raw_writel(
-                (8 << BP_TIMROT_TIMCTRLn_SELECT) |  /* 32 kHz */
-                BM_TIMROT_TIMCTRLn_RELOAD |
-                BM_TIMROT_TIMCTRLn_UPDATE |
-                BM_TIMROT_TIMCTRLn_IRQ_EN,
-                        REGS_TIMROT_BASE + HW_TIMROT_TIMCTRL1);
-
-        __raw_writel(CLOCK_TICK_RATE / HZ - 1,
-                        REGS_TIMROT_BASE + HW_TIMROT_TIMCOUNT0);
-        __raw_writel(0xFFFF, REGS_TIMROT_BASE + HW_TIMROT_TIMCOUNT1);
-
-        setup_irq(IRQ_TIMER0, &stmp3xxx_timer_irq);
-
-        clocksource_register_hz(&cksrc_stmp3xxx, CLOCK_TICK_RATE);
-        clockevents_register_device(&ckevt_timrot);
-}
-
-#ifdef CONFIG_PM
-
-void stmp3xxx_suspend_timer(void)
-{
-        stmp3xxx_clearl(BM_TIMROT_TIMCTRLn_IRQ_EN | BM_TIMROT_TIMCTRLn_IRQ,
-                        REGS_TIMROT_BASE + HW_TIMROT_TIMCTRL0);
-        stmp3xxx_setl(BM_TIMROT_ROTCTRL_CLKGATE,
-                        REGS_TIMROT_BASE + HW_TIMROT_ROTCTRL);
-}
-
-void stmp3xxx_resume_timer(void)
-{
-        stmp3xxx_clearl(BM_TIMROT_ROTCTRL_SFTRST | BM_TIMROT_ROTCTRL_CLKGATE,
-                        REGS_TIMROT_BASE + HW_TIMROT_ROTCTRL);
-        __raw_writel(
-                8 << BP_TIMROT_TIMCTRLn_SELECT |  /* 32 kHz */
-                BM_TIMROT_TIMCTRLn_RELOAD |
-                BM_TIMROT_TIMCTRLn_UPDATE |
-                BM_TIMROT_TIMCTRLn_IRQ_EN,
-                        REGS_TIMROT_BASE + HW_TIMROT_TIMCTRL0);
-        __raw_writel(
-                8 << BP_TIMROT_TIMCTRLn_SELECT |  /* 32 kHz */
-                BM_TIMROT_TIMCTRLn_RELOAD |
-                BM_TIMROT_TIMCTRLn_UPDATE |
-                BM_TIMROT_TIMCTRLn_IRQ_EN,
-                        REGS_TIMROT_BASE + HW_TIMROT_TIMCTRL1);
-        __raw_writel(CLOCK_TICK_RATE / HZ - 1,
-                        REGS_TIMROT_BASE + HW_TIMROT_TIMCOUNT0);
-        __raw_writel(0xFFFF, REGS_TIMROT_BASE + HW_TIMROT_TIMCOUNT1);
-}
-
-#else
-
-#define stmp3xxx_suspend_timer  NULL
-#define stmp3xxx_resume_timer   NULL
-
-#endif  /* CONFIG_PM */
-
-struct sys_timer stmp3xxx_timer = {
-        .init           = stmp3xxx_init_timer,
-        .suspend        = stmp3xxx_suspend_timer,
-        .resume         = stmp3xxx_resume_timer,
-};
diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c
index ba3d471d4bcf..51ecfea09b27 100644
--- a/arch/arm/plat-versatile/platsmp.c
+++ b/arch/arm/plat-versatile/platsmp.c
@@ -16,6 +16,7 @@
 #include <linux/smp.h>
 
 #include <asm/cacheflush.h>
+#include <asm/hardware/gic.h>
 
 /*
  * control for which core is the next to come out of the secondary
@@ -83,7 +84,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
          * the boot monitor to read the system wide flags register,
          * and branch to the address found there.
          */
-        smp_cross_call(cpumask_of(cpu), 1);
+        gic_raise_softirq(cpumask_of(cpu), 1);
 
         timeout = jiffies + (1 * HZ);
         while (time_before(jiffies, timeout)) {
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 7ca41f0a09b1..3b3776d0a1a7 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -17,7 +17,7 @@
 # XXX: the last 12 months.  If your entry is missing please email rmk at
 # XXX: <linux@arm.linux.org.uk>
 #
-# Last update: Sun Mar 20 18:06:11 2011
+# Last update: Sat May 7 08:48:24 2011
 #
 # machine_is_xxx        CONFIG_xxxx             MACH_TYPE_xxx           number
 #
@@ -377,6 +377,8 @@ davinci_da850_evm	MACH_DAVINCI_DA850_EVM	DAVINCI_DA850_EVM	2157
 at91sam9g10ek           MACH_AT91SAM9G10EK      AT91SAM9G10EK           2159
 omap_4430sdp            MACH_OMAP_4430SDP       OMAP_4430SDP            2160
 magx_zn5                MACH_MAGX_ZN5           MAGX_ZN5                2162
+btmavb101               MACH_BTMAVB101          BTMAVB101               2172
+btmawb101               MACH_BTMAWB101          BTMAWB101               2173
 omap3_torpedo           MACH_OMAP3_TORPEDO      OMAP3_TORPEDO           2178
 anw6410                 MACH_ANW6410            ANW6410                 2183
 imx27_visstrim_m10      MACH_IMX27_VISSTRIM_M10 IMX27_VISSTRIM_M10      2187
@@ -400,6 +402,7 @@ d2net			MACH_D2NET		D2NET			2282
 bigdisk                 MACH_BIGDISK            BIGDISK                 2283
 at91sam9g20ek_2mmc      MACH_AT91SAM9G20EK_2MMC AT91SAM9G20EK_2MMC      2288
 bcmring                 MACH_BCMRING            BCMRING                 2289
+dp6xx                   MACH_DP6XX              DP6XX                   2302
 mahimahi                MACH_MAHIMAHI           MAHIMAHI                2304
 smdk6442                MACH_SMDK6442           SMDK6442                2324
 openrd_base             MACH_OPENRD_BASE        OPENRD_BASE             2325
@@ -424,6 +427,7 @@ smdkv210		MACH_SMDKV210		SMDKV210		2456
 omap_zoom3              MACH_OMAP_ZOOM3         OMAP_ZOOM3              2464
 omap_3630sdp            MACH_OMAP_3630SDP       OMAP_3630SDP            2465
 smartq7                 MACH_SMARTQ7            SMARTQ7                 2479
+watson_efm_plugin       MACH_WATSON_EFM_PLUGIN  WATSON_EFM_PLUGIN       2491
 g4evm                   MACH_G4EVM              G4EVM                   2493
 omapl138_hawkboard      MACH_OMAPL138_HAWKBOARD OMAPL138_HAWKBOARD      2495
 ts41x                   MACH_TS41X              TS41X                   2502
@@ -433,6 +437,8 @@ mx28evk			MACH_MX28EVK		MX28EVK			2531
 smartq5                 MACH_SMARTQ5            SMARTQ5                 2534
 davinci_dm6467tevm      MACH_DAVINCI_DM6467TEVM DAVINCI_DM6467TEVM      2548
 mxt_td60                MACH_MXT_TD60           MXT_TD60                2550
+riot_bei2               MACH_RIOT_BEI2          RIOT_BEI2               2576
+riot_x37                MACH_RIOT_X37           RIOT_X37                2578
 capc7117                MACH_CAPC7117           CAPC7117                2612
 icontrol                MACH_ICONTROL           ICONTROL                2624
 qsd8x50a_st1_5          MACH_QSD8X50A_ST1_5     QSD8X50A_ST1_5          2627
@@ -445,6 +451,7 @@ spear320		MACH_SPEAR320		SPEAR320		2661
 aquila                  MACH_AQUILA             AQUILA                  2676
 sheeva_esata            MACH_ESATA_SHEEVAPLUG   ESATA_SHEEVAPLUG        2678
 msm7x30_surf            MACH_MSM7X30_SURF       MSM7X30_SURF            2679
+ea2478devkit            MACH_EA2478DEVKIT       EA2478DEVKIT            2683
 terastation_wxl         MACH_TERASTATION_WXL    TERASTATION_WXL         2697
 msm7x25_surf            MACH_MSM7X25_SURF       MSM7X25_SURF            2703
 msm7x25_ffa             MACH_MSM7X25_FFA        MSM7X25_FFA             2704
@@ -463,75 +470,16 @@ wbd222			MACH_WBD222		WBD222			2753
 msm8x60_surf            MACH_MSM8X60_SURF       MSM8X60_SURF            2755
 msm8x60_sim             MACH_MSM8X60_SIM        MSM8X60_SIM             2756
 tcc8000_sdk             MACH_TCC8000_SDK        TCC8000_SDK             2758
-ap420                   MACH_AP420              AP420                   2765
-davinci_dm365_fc        MACH_DAVINCI_DM365_FC   DAVINCI_DM365_FC        2767
-msm8x55_surf            MACH_MSM8X55_SURF       MSM8X55_SURF            2768
-msm8x55_ffa             MACH_MSM8X55_FFA        MSM8X55_FFA             2769
-esl_vamana              MACH_ESL_VAMANA         ESL_VAMANA              2770
-sbc35                   MACH_SBC35              SBC35                   2771
-mpx6446                 MACH_MPX6446            MPX6446                 2772
-oreo_controller         MACH_OREO_CONTROLLER    OREO_CONTROLLER         2773
-kopin_models            MACH_KOPIN_MODELS       KOPIN_MODELS            2774
-ttc_vision2             MACH_TTC_VISION2        TTC_VISION2             2775
+nanos                   MACH_NANOS              NANOS                   2759
+stamp9g45               MACH_STAMP9G45          STAMP9G45               2761
 cns3420vb               MACH_CNS3420VB          CNS3420VB               2776
-olympus                 MACH_OLYMPUS            OLYMPUS                 2778
-vortex                  MACH_VORTEX             VORTEX                  2779
-s5pc200                 MACH_S5PC200            S5PC200                 2780
-ecucore_9263            MACH_ECUCORE_9263       ECUCORE_9263            2781
-smdkc200                MACH_SMDKC200           SMDKC200                2782
-emsiso_sx27             MACH_EMSISO_SX27        EMSISO_SX27             2783
-apx_som9g45_ek          MACH_APX_SOM9G45_EK     APX_SOM9G45_EK          2784
-songshan                MACH_SONGSHAN           SONGSHAN                2785
-tianshan                MACH_TIANSHAN           TIANSHAN                2786
-vpx500                  MACH_VPX500             VPX500                  2787
-am3517sam               MACH_AM3517SAM          AM3517SAM               2788
-skat91_sim508           MACH_SKAT91_SIM508      SKAT91_SIM508           2789
-skat91_s3e              MACH_SKAT91_S3E         SKAT91_S3E              2790
 omap4_panda             MACH_OMAP4_PANDA        OMAP4_PANDA             2791
-df7220                  MACH_DF7220             DF7220                  2792
-nemini                  MACH_NEMINI             NEMINI                  2793
-t8200                   MACH_T8200              T8200                   2794
-apf51                   MACH_APF51              APF51                   2795
-dr_rc_unit              MACH_DR_RC_UNIT         DR_RC_UNIT              2796
-bordeaux                MACH_BORDEAUX           BORDEAUX                2797
-catania_b               MACH_CATANIA_B          CATANIA_B               2798
-mx51_ocean              MACH_MX51_OCEAN         MX51_OCEAN              2799
 ti8168evm               MACH_TI8168EVM          TI8168EVM               2800
-neocoreomap             MACH_NEOCOREOMAP        NEOCOREOMAP             2801
-withings_wbp            MACH_WITHINGS_WBP       WITHINGS_WBP            2802
-dbps                    MACH_DBPS               DBPS                    2803
-pcbfp0001               MACH_PCBFP0001          PCBFP0001               2805
-speedy                  MACH_SPEEDY             SPEEDY                  2806
-chrysaor                MACH_CHRYSAOR           CHRYSAOR                2807
-tango                   MACH_TANGO              TANGO                   2808
-synology_dsx11          MACH_SYNOLOGY_DSX11     SYNOLOGY_DSX11          2809
-hanlin_v3ext            MACH_HANLIN_V3EXT       HANLIN_V3EXT            2810
-hanlin_v5               MACH_HANLIN_V5          HANLIN_V5               2811
-hanlin_v3plus           MACH_HANLIN_V3PLUS      HANLIN_V3PLUS           2812
-iriver_story            MACH_IRIVER_STORY       IRIVER_STORY            2813
-irex_iliad              MACH_IREX_ILIAD         IREX_ILIAD              2814
-irex_dr1000             MACH_IREX_DR1000        IREX_DR1000             2815
 teton_bga               MACH_TETON_BGA          TETON_BGA               2816
-snapper9g45             MACH_SNAPPER9G45        SNAPPER9G45             2817
-tam3517                 MACH_TAM3517            TAM3517                 2818
-pdc100                  MACH_PDC100             PDC100                  2819
 eukrea_cpuimx25sd       MACH_EUKREA_CPUIMX25    EUKREA_CPUIMX25         2820
 eukrea_cpuimx35sd       MACH_EUKREA_CPUIMX35    EUKREA_CPUIMX35         2821
 eukrea_cpuimx51sd       MACH_EUKREA_CPUIMX51SD  EUKREA_CPUIMX51SD       2822
 eukrea_cpuimx51         MACH_EUKREA_CPUIMX51    EUKREA_CPUIMX51         2823
-p565                    MACH_P565               P565                    2824
-acer_a4                 MACH_ACER_A4            ACER_A4                 2825
-davinci_dm368_bip       MACH_DAVINCI_DM368_BIP  DAVINCI_DM368_BIP       2826
-eshare                  MACH_ESHARE             ESHARE                  2827
-wlbargn                 MACH_WLBARGN            WLBARGN                 2829
-bm170                   MACH_BM170              BM170                   2830
-netspace_mini_v2        MACH_NETSPACE_MINI_V2   NETSPACE_MINI_V2        2831
-netspace_plug_v2        MACH_NETSPACE_PLUG_V2   NETSPACE_PLUG_V2        2832
-siemens_l1              MACH_SIEMENS_L1         SIEMENS_L1              2833
-elv_lcu1                MACH_ELV_LCU1           ELV_LCU1                2834
-mcu1                    MACH_MCU1               MCU1                    2835
-omap3_tao3530           MACH_OMAP3_TAO3530      OMAP3_TAO3530           2836
-omap3_pcutouch          MACH_OMAP3_PCUTOUCH     OMAP3_PCUTOUCH          2837
 smdkc210                MACH_SMDKC210           SMDKC210                2838
 omap3_braillo           MACH_OMAP3_BRAILLO      OMAP3_BRAILLO           2839
 spyplug                 MACH_SPYPLUG            SPYPLUG                 2840
@@ -973,9 +921,7 @@ isc3			MACH_ISC3		ISC3			3291
 rascal                  MACH_RASCAL             RASCAL                  3292
 hrefv60                 MACH_HREFV60            HREFV60                 3293
 tpt_2_0                 MACH_TPT_2_0            TPT_2_0                 3294
-pyramid_td              MACH_PYRAMID_TD         PYRAMID_TD              3295
 splendor                MACH_SPLENDOR           SPLENDOR                3296
-guf_planet              MACH_GUF_PLANET         GUF_PLANET              3297
 msm8x60_qt              MACH_MSM8X60_QT         MSM8X60_QT              3298
 htc_hd_mini             MACH_HTC_HD_MINI        HTC_HD_MINI             3299
 athene                  MACH_ATHENE             ATHENE                  3300
@@ -1099,3 +1045,71 @@ ecuv5			MACH_ECUV5		ECUV5			3421
 hsgx6d                  MACH_HSGX6D             HSGX6D                  3422
 dawad7                  MACH_DAWAD7             DAWAD7                  3423
 sam9repeater            MACH_SAM9REPEATER       SAM9REPEATER            3424
+gt_i5700                MACH_GT_I5700           GT_I5700                3425
+ctera_plug_c2           MACH_CTERA_PLUG_C2      CTERA_PLUG_C2           3426
+marvelct                MACH_MARVELCT           MARVELCT                3427
+ag11005                 MACH_AG11005            AG11005                 3428
+vangogh                 MACH_VANGOGH            VANGOGH                 3430
+matrix505               MACH_MATRIX505          MATRIX505               3431
+oce_nigma               MACH_OCE_NIGMA          OCE_NIGMA               3432
+t55                     MACH_T55                T55                     3433
+bio3k                   MACH_BIO3K              BIO3K                   3434
+expressct               MACH_EXPRESSCT          EXPRESSCT               3435
+cardhu                  MACH_CARDHU             CARDHU                  3436
+aruba                   MACH_ARUBA              ARUBA                   3437
+bonaire                 MACH_BONAIRE            BONAIRE                 3438
+nuc700evb               MACH_NUC700EVB          NUC700EVB               3439
+nuc710evb               MACH_NUC710EVB          NUC710EVB               3440
+nuc740evb               MACH_NUC740EVB          NUC740EVB               3441
+nuc745evb               MACH_NUC745EVB          NUC745EVB               3442
+transcede               MACH_TRANSCEDE          TRANSCEDE               3443
+mora                    MACH_MORA               MORA                    3444
+nda_evm                 MACH_NDA_EVM            NDA_EVM                 3445
+timu                    MACH_TIMU               TIMU                    3446
+expressh                MACH_EXPRESSH           EXPRESSH                3447
+veridis_a300            MACH_VERIDIS_A300       VERIDIS_A300            3448
+dm368_leopard           MACH_DM368_LEOPARD      DM368_LEOPARD           3449
+omap_mcop               MACH_OMAP_MCOP          OMAP_MCOP               3450
+tritip                  MACH_TRITIP             TRITIP                  3451
+sm1k                    MACH_SM1K               SM1K                    3452
+monch                   MACH_MONCH              MONCH                   3453
+curacao                 MACH_CURACAO            CURACAO                 3454
+origen                  MACH_ORIGEN             ORIGEN                  3455
+epc10                   MACH_EPC10              EPC10                   3456
+sgh_i740                MACH_SGH_I740           SGH_I740                3457
+tuna                    MACH_TUNA               TUNA                    3458
+mx51_tulip              MACH_MX51_TULIP         MX51_TULIP              3459
+mx51_aster7             MACH_MX51_ASTER7        MX51_ASTER7             3460
+acro37xbrd              MACH_ACRO37XBRD         ACRO37XBRD              3461
+elke                    MACH_ELKE               ELKE                    3462
+sbc6000x                MACH_SBC6000X           SBC6000X                3463
+r1801e                  MACH_R1801E             R1801E                  3464
+h1600                   MACH_H1600              H1600                   3465
+mini210                 MACH_MINI210            MINI210                 3466
+mini8168                MACH_MINI8168           MINI8168                3467
+pc7308                  MACH_PC7308             PC7308                  3468
+kmm2m01                 MACH_KMM2M01            KMM2M01                 3470
+mx51erebus              MACH_MX51EREBUS         MX51EREBUS              3471
+wm8650refboard          MACH_WM8650REFBOARD     WM8650REFBOARD          3472
+tuxrail                 MACH_TUXRAIL            TUXRAIL                 3473
+arthur                  MACH_ARTHUR             ARTHUR                  3474
+doorboy                 MACH_DOORBOY            DOORBOY                 3475
+xarina                  MACH_XARINA             XARINA                  3476
+roverx7                 MACH_ROVERX7            ROVERX7                 3477
+sdvr                    MACH_SDVR               SDVR                    3478
+acer_maya               MACH_ACER_MAYA          ACER_MAYA               3479
+pico                    MACH_PICO               PICO                    3480
+cwmx233                 MACH_CWMX233            CWMX233                 3481
+cwam1808                MACH_CWAM1808           CWAM1808                3482
+cwdm365                 MACH_CWDM365            CWDM365                 3483
+mx51_moray              MACH_MX51_MORAY         MX51_MORAY              3484
+thales_cbc              MACH_THALES_CBC         THALES_CBC              3485
+bluepoint               MACH_BLUEPOINT          BLUEPOINT               3486
+dir665                  MACH_DIR665             DIR665                  3487
+acmerover1              MACH_ACMEROVER1         ACMEROVER1              3488
+shooter_ct              MACH_SHOOTER_CT         SHOOTER_CT              3489
+bliss                   MACH_BLISS              BLISS                   3490
+blissc                  MACH_BLISSC             BLISSC                  3491
+thales_adc              MACH_THALES_ADC         THALES_ADC              3492
+ubisys_p9d_evp          MACH_UBISYS_P9D_EVP     UBISYS_P9D_EVP          3493
+atdgp318                MACH_ATDGP318           ATDGP318                3494
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index f74695075e64..f25e7ec89416 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -398,9 +398,9 @@ static void vfp_enable(void *unused)
 }
 
 #ifdef CONFIG_PM
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
-static int vfp_pm_suspend(struct sys_device *dev, pm_message_t state)
+static int vfp_pm_suspend(void)
 {
         struct thread_info *ti = current_thread_info();
         u32 fpexc = fmrx(FPEXC);
@@ -420,34 +420,25 @@ static int vfp_pm_suspend(struct sys_device *dev, pm_message_t state)
         return 0;
 }
 
-static int vfp_pm_resume(struct sys_device *dev)
+static void vfp_pm_resume(void)
 {
         /* ensure we have access to the vfp */
         vfp_enable(NULL);
 
         /* and disable it to ensure the next usage restores the state */
         fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN);
-
-        return 0;
 }
 
-static struct sysdev_class vfp_pm_sysclass = {
-        .name           = "vfp",
+static struct syscore_ops vfp_pm_syscore_ops = {
         .suspend        = vfp_pm_suspend,
         .resume         = vfp_pm_resume,
 };
 
-static struct sys_device vfp_pm_sysdev = {
-        .cls    = &vfp_pm_sysclass,
-};
-
 static void vfp_pm_init(void)
 {
-        sysdev_class_register(&vfp_pm_sysclass);
-        sysdev_register(&vfp_pm_sysdev);
+        register_syscore_ops(&vfp_pm_syscore_ops);
 }
 
-
 #else
 static inline void vfp_pm_init(void) { }
 #endif /* CONFIG_PM */
diff --git a/arch/avr32/mach-at32ap/intc.c b/arch/avr32/mach-at32ap/intc.c
index 21ce35f33aa5..3e3646186c9f 100644
--- a/arch/avr32/mach-at32ap/intc.c
+++ b/arch/avr32/mach-at32ap/intc.c
@@ -12,7 +12,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/platform_device.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
 #include <asm/io.h>
 
@@ -21,7 +21,6 @@
 struct intc {
         void __iomem            *regs;
         struct irq_chip         chip;
-        struct sys_device       sysdev;
 #ifdef CONFIG_PM
         unsigned long           suspend_ipr;
         unsigned long           saved_ipr[64];
@@ -146,9 +145,8 @@ void intc_set_suspend_handler(unsigned long offset)
         intc0.suspend_ipr = offset;
 }
 
-static int intc_suspend(struct sys_device *sdev, pm_message_t state)
+static int intc_suspend(void)
 {
-        struct intc *intc = container_of(sdev, struct intc, sysdev);
         int i;
 
         if (unlikely(!irqs_disabled())) {
@@ -156,28 +154,25 @@ static int intc_suspend(struct sys_device *sdev, pm_message_t state)
                 return -EINVAL;
         }
 
-        if (unlikely(!intc->suspend_ipr)) {
+        if (unlikely(!intc0.suspend_ipr)) {
                 pr_err("intc_suspend: suspend_ipr not initialized\n");
                 return -EINVAL;
         }
 
         for (i = 0; i < 64; i++) {
-                intc->saved_ipr[i] = intc_readl(intc, INTPR0 + 4 * i);
-                intc_writel(intc, INTPR0 + 4 * i, intc->suspend_ipr);
+                intc0.saved_ipr[i] = intc_readl(&intc0, INTPR0 + 4 * i);
+                intc_writel(&intc0, INTPR0 + 4 * i, intc0.suspend_ipr);
         }
 
         return 0;
 }
 
-static int intc_resume(struct sys_device *sdev)
+static int intc_resume(void)
 {
-        struct intc *intc = container_of(sdev, struct intc, sysdev);
         int i;
 
-        WARN_ON(!irqs_disabled());
-
         for (i = 0; i < 64; i++)
-                intc_writel(intc, INTPR0 + 4 * i, intc->saved_ipr[i]);
+                intc_writel(&intc0, INTPR0 + 4 * i, intc0.saved_ipr[i]);
 
         return 0;
 }
@@ -186,27 +181,18 @@ static int intc_resume(struct sys_device *sdev)
 #define intc_resume     NULL
 #endif
 
-static struct sysdev_class intc_class = {
-        .name           = "intc",
+static struct syscore_ops intc_syscore_ops = {
         .suspend        = intc_suspend,
         .resume         = intc_resume,
 };
 
-static int __init intc_init_sysdev(void)
+static int __init intc_init_syscore(void)
 {
-        int ret;
-
-        ret = sysdev_class_register(&intc_class);
-        if (ret)
-                return ret;
+        register_syscore_ops(&intc_syscore_ops);
 
-        intc0.sysdev.id = 0;
-        intc0.sysdev.cls = &intc_class;
-        ret = sysdev_register(&intc0.sysdev);
-
-        return ret;
+        return 0;
 }
-device_initcall(intc_init_sysdev);
+device_initcall(intc_init_syscore);
 
 unsigned long intc_get_pending(unsigned int group)
 {
diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
index a7314d44b17b..2798c2d4a1cf 100644
--- a/arch/avr32/mm/init.c
+++ b/arch/avr32/mm/init.c
@@ -25,8 +25,6 @@
 #include <asm/setup.h>
 #include <asm/sections.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_data;
 
 struct page *empty_zero_page;
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 8addb1220b4f..a18180f2d007 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -24,11 +24,13 @@ config BLACKFIN
         select HAVE_FUNCTION_TRACER
         select HAVE_FUNCTION_TRACE_MCOUNT_TEST
         select HAVE_IDE
+        select HAVE_IRQ_WORK
         select HAVE_KERNEL_GZIP if RAMKERNEL
         select HAVE_KERNEL_BZIP2 if RAMKERNEL
         select HAVE_KERNEL_LZMA if RAMKERNEL
         select HAVE_KERNEL_LZO if RAMKERNEL
         select HAVE_OPROFILE
+        select HAVE_PERF_EVENTS
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_ATOMIC64
diff --git a/arch/blackfin/Kconfig.debug b/arch/blackfin/Kconfig.debug
index 2641731f24cd..e2a3d4c8ab9a 100644
--- a/arch/blackfin/Kconfig.debug
+++ b/arch/blackfin/Kconfig.debug
@@ -9,15 +9,6 @@ config DEBUG_STACKOVERFLOW
           This option will cause messages to be printed if free stack space
           drops below a certain limit.
 
-config DEBUG_STACK_USAGE
-        bool "Enable stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        help
-          Enables the display of the minimum amount of free stack which each
-          task has ever had available in the sysrq-T output.
-
-          This option will slow down process creation somewhat.
-
 config DEBUG_VERBOSE
         bool "Verbose fault messages"
         default y
@@ -32,7 +23,7 @@ config DEBUG_VERBOSE
           Most people should say N here.
 
 config DEBUG_MMRS
-        bool "Generate Blackfin MMR tree"
+        tristate "Generate Blackfin MMR tree"
         select DEBUG_FS
         help
           Create a tree of Blackfin MMRs via the debugfs tree.  If
diff --git a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig
index 95cf2ba9de17..8465b3e6b862 100644
--- a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig
+++ b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig
@@ -121,13 +121,11 @@ CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_VGA16 is not set
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 # CONFIG_LOGO_BLACKFIN_VGA16 is not set
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_SOC=m
-CONFIG_SND_BF5XX_I2S=m
-CONFIG_SND_BF5XX_SOC_SSM2602=m
-CONFIG_SND_BF5XX_AC97=m
-CONFIG_SND_BF5XX_SOC_AD1980=m
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_BF5XX_I2S=y
+CONFIG_SND_BF5XX_SOC_SSM2602=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_APPLE=y
 CONFIG_HID_BELKIN=y
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig
index 8be8e33fac52..5e7321b26040 100644
--- a/arch/blackfin/configs/BF527-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF527-EZKIT_defconfig
@@ -96,7 +96,7 @@ CONFIG_SERIAL_BFIN_UART1=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_BLACKFIN_TWI=m
+CONFIG_I2C_BLACKFIN_TWI=y
 CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
 CONFIG_SPI=y
 CONFIG_SPI_BFIN=y
@@ -115,13 +115,11 @@ CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_VGA16 is not set
 # CONFIG_LOGO_LINUX_CLUT224 is not set
 # CONFIG_LOGO_BLACKFIN_VGA16 is not set
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_SOC=m
-CONFIG_SND_BF5XX_I2S=m
-CONFIG_SND_BF5XX_SOC_SSM2602=m
-CONFIG_SND_BF5XX_AC97=m
-CONFIG_SND_BF5XX_SOC_AD1980=m
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_BF5XX_I2S=y
+CONFIG_SND_BF5XX_SOC_SSM2602=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_APPLE=y
 CONFIG_HID_BELKIN=y
diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig
index 0aafde6c8c2d..b90d3792ed52 100644
--- a/arch/blackfin/configs/BF533-STAMP_defconfig
+++ b/arch/blackfin/configs/BF533-STAMP_defconfig
@@ -99,8 +99,6 @@ CONFIG_SND_PCM_OSS=m
 CONFIG_SND_SOC=m
 CONFIG_SND_BF5XX_I2S=m
 CONFIG_SND_BF5XX_SOC_AD73311=m
-CONFIG_SND_BF5XX_AC97=m
-CONFIG_SND_BF5XX_SOC_AD1980=m
 # CONFIG_USB_SUPPORT is not set
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_BFIN=y
diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig
index c9077fb58135..005362537a7b 100644
--- a/arch/blackfin/configs/BF537-STAMP_defconfig
+++ b/arch/blackfin/configs/BF537-STAMP_defconfig
@@ -110,8 +110,6 @@ CONFIG_SND_PCM_OSS=m
 CONFIG_SND_SOC=m
 CONFIG_SND_BF5XX_I2S=m
 CONFIG_SND_BF5XX_SOC_AD73311=m
-CONFIG_SND_BF5XX_AC97=m
-CONFIG_SND_BF5XX_SOC_AD1980=m
 # CONFIG_USB_SUPPORT is not set
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_BFIN=y
diff --git a/arch/blackfin/include/asm/bfin-global.h b/arch/blackfin/include/asm/bfin-global.h
index 121cc04d877d..17bcbf60bcae 100644
--- a/arch/blackfin/include/asm/bfin-global.h
+++ b/arch/blackfin/include/asm/bfin-global.h
@@ -49,16 +49,6 @@ extern void dump_bfin_trace_buffer(void);
 #define dump_bfin_trace_buffer()
 #endif
 
-/* init functions only */
-extern int init_arch_irq(void);
-extern void init_exception_vectors(void);
-extern void program_IAR(void);
-
-extern asmlinkage void lower_to_irq14(void);
-extern asmlinkage void bfin_return_from_exception(void);
-extern asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs);
-extern int bfin_internal_set_wake(unsigned int irq, unsigned int state);
-
 extern void *l1_data_A_sram_alloc(size_t);
 extern void *l1_data_B_sram_alloc(size_t);
 extern void *l1_inst_sram_alloc(size_t);
diff --git a/arch/blackfin/include/asm/bfin_pfmon.h b/arch/blackfin/include/asm/bfin_pfmon.h
new file mode 100644
index 000000000000..accd47e2db40
--- /dev/null
+++ b/arch/blackfin/include/asm/bfin_pfmon.h
@@ -0,0 +1,44 @@
+/*
+ * Blackfin Performance Monitor definitions
+ *
+ * Copyright 2005-2011 Analog Devices Inc.
+ *
+ * Licensed under the ADI BSD license or GPL-2 (or later).
+ */
+
+#ifndef __ASM_BFIN_PFMON_H__
+#define __ASM_BFIN_PFMON_H__
+
+/* PFCTL Masks */
+#define PFMON_MASK      0xff
+#define PFCEN_MASK      0x3
+#define PFCEN_DISABLE   0x0
+#define PFCEN_ENABLE_USER       0x1
+#define PFCEN_ENABLE_SUPV       0x2
+#define PFCEN_ENABLE_ALL        (PFCEN_ENABLE_USER | PFCEN_ENABLE_SUPV)
+
+#define PFPWR_P 0
+#define PEMUSW0_P       2
+#define PFCEN0_P        3
+#define PFMON0_P        5
+#define PEMUSW1_P       13
+#define PFCEN1_P        14
+#define PFMON1_P        16
+#define PFCNT0_P        24
+#define PFCNT1_P        25
+
+#define PFPWR   (1 << PFPWR_P)
+#define PEMUSW(n, x)    ((x) << ((n) ? PEMUSW1_P : PEMUSW0_P))
+#define PEMUSW0 PEMUSW(0, 1)
+#define PEMUSW1 PEMUSW(1, 1)
+#define PFCEN(n, x)     ((x) << ((n) ? PFCEN1_P : PFCEN0_P))
+#define PFCEN0  PFCEN(0, PFCEN_MASK)
+#define PFCEN1  PFCEN(1, PFCEN_MASK)
+#define PFCNT(n, x)     ((x) << ((n) ? PFCNT1_P : PFCNT0_P))
+#define PFCNT0  PFCNT(0, 1)
+#define PFCNT1  PFCNT(1, 1)
+#define PFMON(n, x)     ((x) << ((n) ? PFMON1_P : PFMON0_P))
+#define PFMON0  PFMON(0, PFMON_MASK)
+#define PFMON1  PFMON(1, PFMON_MASK)
+
+#endif
diff --git a/arch/blackfin/include/asm/bfin_sport.h b/arch/blackfin/include/asm/bfin_sport.h
index d27600c262c2..f8568a31d0ab 100644
--- a/arch/blackfin/include/asm/bfin_sport.h
+++ b/arch/blackfin/include/asm/bfin_sport.h
@@ -100,6 +100,10 @@ struct sport_register {
 };
 #undef __BFP
 
+struct bfin_snd_platform_data {
+        const unsigned short *pin_req;
+};
+
 #define bfin_read_sport_rx32(base) \
 ({ \
         struct sport_register *__mmrs = (void *)base; \
diff --git a/arch/blackfin/include/asm/cacheflush.h b/arch/blackfin/include/asm/cacheflush.h
index 77135b62818e..9a5b2c572ebf 100644
--- a/arch/blackfin/include/asm/cacheflush.h
+++ b/arch/blackfin/include/asm/cacheflush.h
@@ -39,8 +39,13 @@ extern void blackfin_invalidate_entire_icache(void);
 
 static inline void flush_icache_range(unsigned start, unsigned end)
 {
-#if defined(CONFIG_BFIN_EXTMEM_WRITEBACK) || defined(CONFIG_BFIN_L2_WRITEBACK)
-        blackfin_dcache_flush_range(start, end);
+#if defined(CONFIG_BFIN_EXTMEM_WRITEBACK)
+        if (end <= physical_mem_end)
+                blackfin_dcache_flush_range(start, end);
+#endif
+#if defined(CONFIG_BFIN_L2_WRITEBACK)
+        if (start >= L2_START && end <= L2_START + L2_LENGTH)
+                blackfin_dcache_flush_range(start, end);
 #endif
 
         /* Make sure all write buffers in the data side of the core
@@ -52,9 +57,17 @@ static inline void flush_icache_range(unsigned start, unsigned end)
          * the pipeline.
          */
         SSYNC();
-#if defined(CONFIG_BFIN_ICACHE)
-        blackfin_icache_flush_range(start, end);
-        flush_icache_range_others(start, end);
+#if defined(CONFIG_BFIN_EXTMEM_ICACHEABLE)
+        if (end <= physical_mem_end) {
+                blackfin_icache_flush_range(start, end);
+                flush_icache_range_others(start, end);
+        }
+#endif
+#if defined(CONFIG_BFIN_L2_ICACHEABLE)
+        if (start >= L2_START && end <= L2_START + L2_LENGTH) {
+                blackfin_icache_flush_range(start, end);
+                flush_icache_range_others(start, end);
+        }
 #endif
 }
 
diff --git a/arch/blackfin/include/asm/cpu.h b/arch/blackfin/include/asm/cpu.h
index 16883e582e3c..05043786da21 100644
--- a/arch/blackfin/include/asm/cpu.h
+++ b/arch/blackfin/include/asm/cpu.h
@@ -10,11 +10,8 @@
 
 #include <linux/percpu.h>
 
-struct task_struct;
-
 struct blackfin_cpudata {
         struct cpu cpu;
-        struct task_struct *idle;
         unsigned int imemctl;
         unsigned int dmemctl;
 };
diff --git a/arch/blackfin/include/asm/def_LPBlackfin.h b/arch/blackfin/include/asm/def_LPBlackfin.h
index 7600fe0696af..823679011457 100644
--- a/arch/blackfin/include/asm/def_LPBlackfin.h
+++ b/arch/blackfin/include/asm/def_LPBlackfin.h
@@ -52,10 +52,10 @@
 
 #define bfin_read(addr) \
 ({ \
-    sizeof(*(addr)) == 1 ? bfin_read8(addr)  : \
-    sizeof(*(addr)) == 2 ? bfin_read16(addr) : \
-    sizeof(*(addr)) == 4 ? bfin_read32(addr) : \
-    ({ BUG(); 0; }); \
+        sizeof(*(addr)) == 1 ? bfin_read8(addr)  : \
+        sizeof(*(addr)) == 2 ? bfin_read16(addr) : \
+        sizeof(*(addr)) == 4 ? bfin_read32(addr) : \
+        ({ BUG(); 0; }); \
 })
 #define bfin_write(addr, val) \
 do { \
@@ -69,13 +69,13 @@ do { \
 
 #define bfin_write_or(addr, bits) \
 do { \
-        void *__addr = (void *)(addr); \
+        typeof(addr) __addr = (addr); \
         bfin_write(__addr, bfin_read(__addr) | (bits)); \
 } while (0)
 
 #define bfin_write_and(addr, bits) \
 do { \
-        void *__addr = (void *)(addr); \
+        typeof(addr) __addr = (addr); \
         bfin_write(__addr, bfin_read(__addr) & (bits)); \
 } while (0)
 
diff --git a/arch/blackfin/include/asm/irq_handler.h b/arch/blackfin/include/asm/irq_handler.h
index 7fbe42307b9a..ee73f79aef10 100644
--- a/arch/blackfin/include/asm/irq_handler.h
+++ b/arch/blackfin/include/asm/irq_handler.h
@@ -10,6 +10,16 @@
 #include <linux/types.h>
 #include <linux/linkage.h>
 
+/* init functions only */
+extern int __init init_arch_irq(void);
+extern void init_exception_vectors(void);
+extern void __init program_IAR(void);
+#ifdef init_mach_irq
+extern void __init init_mach_irq(void);
+#else
+# define init_mach_irq()
+#endif
+
 /* BASE LEVEL interrupt handler routines */
 asmlinkage void evt_exception(void);
 asmlinkage void trap(void);
@@ -37,4 +47,19 @@ extern void return_from_exception(void);
 extern int bfin_request_exception(unsigned int exception, void (*handler)(void));
 extern int bfin_free_exception(unsigned int exception, void (*handler)(void));
 
+extern asmlinkage void lower_to_irq14(void);
+extern asmlinkage void bfin_return_from_exception(void);
+extern asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs);
+extern int bfin_internal_set_wake(unsigned int irq, unsigned int state);
+
+struct irq_data;
+extern void bfin_handle_irq(unsigned irq);
+extern void bfin_ack_noop(struct irq_data *);
+extern void bfin_internal_mask_irq(unsigned int irq);
+extern void bfin_internal_unmask_irq(unsigned int irq);
+
+struct irq_desc;
+extern void bfin_demux_mac_status_irq(unsigned int, struct irq_desc *);
+extern void bfin_demux_gpio_irq(unsigned int, struct irq_desc *);
+
 #endif
diff --git a/arch/blackfin/include/asm/kgdb.h b/arch/blackfin/include/asm/kgdb.h
index 8651afe12990..3ac0c72e9fee 100644
--- a/arch/blackfin/include/asm/kgdb.h
+++ b/arch/blackfin/include/asm/kgdb.h
@@ -103,7 +103,11 @@ static inline void arch_kgdb_breakpoint(void)
         asm("EXCPT 2;");
 }
 #define BREAK_INSTR_SIZE        2
-#define CACHE_FLUSH_IS_SAFE     1
+#ifdef CONFIG_SMP
+# define CACHE_FLUSH_IS_SAFE    0
+#else
+# define CACHE_FLUSH_IS_SAFE    1
+#endif
 #define HW_INST_WATCHPOINT_NUM  6
 #define HW_WATCHPOINT_NUM       8
 #define TYPE_INST_WATCHPOINT    0
diff --git a/arch/blackfin/include/asm/perf_event.h b/arch/blackfin/include/asm/perf_event.h
new file mode 100644
index 000000000000..3d2b1716322f
--- /dev/null
+++ b/arch/blackfin/include/asm/perf_event.h
@@ -0,0 +1 @@
+#define MAX_HWEVENTS 2
diff --git a/arch/blackfin/include/asm/ptrace.h b/arch/blackfin/include/asm/ptrace.h
index 832d7c009a2c..1066d63e62b5 100644
--- a/arch/blackfin/include/asm/ptrace.h
+++ b/arch/blackfin/include/asm/ptrace.h
@@ -108,8 +108,6 @@ struct pt_regs {
 extern void show_regs(struct pt_regs *);
 
 #define arch_has_single_step()  (1)
-extern void user_enable_single_step(struct task_struct *child);
-extern void user_disable_single_step(struct task_struct *child);
 /* common code demands this function */
 #define ptrace_disable(child) user_disable_single_step(child)
 
diff --git a/arch/blackfin/include/mach-common/irq.h b/arch/blackfin/include/mach-common/irq.h
new file mode 100644
index 000000000000..cab14e911dc2
--- /dev/null
+++ b/arch/blackfin/include/mach-common/irq.h
@@ -0,0 +1,57 @@
+/*
+ * Common Blackfin IRQ definitions (i.e. the CEC)
+ *
+ * Copyright 2005-2011 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later
+ */
+
+#ifndef _MACH_COMMON_IRQ_H_
+#define _MACH_COMMON_IRQ_H_
+
+/*
+ * Core events interrupt source definitions
+ *
+ *  Event Source       Event Name
+ *  Emulation          EMU            0  (highest priority)
+ *  Reset              RST            1
+ *  NMI                NMI            2
+ *  Exception          EVX            3
+ *  Reserved           --             4
+ *  Hardware Error     IVHW           5
+ *  Core Timer         IVTMR          6
+ *  Peripherals        IVG7           7
+ *  Peripherals        IVG8           8
+ *  Peripherals        IVG9           9
+ *  Peripherals        IVG10         10
+ *  Peripherals        IVG11         11
+ *  Peripherals        IVG12         12
+ *  Peripherals        IVG13         13
+ *  Softirq            IVG14         14
+ *  System Call        IVG15         15  (lowest priority)
+ */
+
+/* The ABSTRACT IRQ definitions */
+#define IRQ_EMU                 0       /* Emulation */
+#define IRQ_RST                 1       /* reset */
+#define IRQ_NMI                 2       /* Non Maskable */
+#define IRQ_EVX                 3       /* Exception */
+#define IRQ_UNUSED              4       /* - unused interrupt */
+#define IRQ_HWERR               5       /* Hardware Error */
+#define IRQ_CORETMR             6       /* Core timer */
+
+#define BFIN_IRQ(x)             ((x) + 7)
+
+#define IVG7                    7
+#define IVG8                    8
+#define IVG9                    9
+#define IVG10                   10
+#define IVG11                   11
+#define IVG12                   12
+#define IVG13                   13
+#define IVG14                   14
+#define IVG15                   15
+
+#define NR_IRQS                 (NR_MACH_IRQS + NR_SPARE_IRQS)
+
+#endif
diff --git a/arch/blackfin/kernel/Makefile b/arch/blackfin/kernel/Makefile
index ca5ccc777772..d550b24d9e9b 100644
--- a/arch/blackfin/kernel/Makefile
+++ b/arch/blackfin/kernel/Makefile
@@ -33,7 +33,10 @@ obj-$(CONFIG_EARLY_PRINTK)           += shadow_console.o
 obj-$(CONFIG_STACKTRACE)             += stacktrace.o
 obj-$(CONFIG_DEBUG_VERBOSE)          += trace.o
 obj-$(CONFIG_BFIN_PSEUDODBG_INSNS)   += pseudodbg.o
+obj-$(CONFIG_PERF_EVENTS)            += perf_event.o
 
 # the kgdb test puts code into L2 and without linker
 # relaxation, we need to force long calls to/from it
 CFLAGS_kgdb_test.o := -mlong-calls -O0
+
+obj-$(CONFIG_DEBUG_MMRS)             += debug-mmrs.o
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c
index 6ce8dce753c9..71dbaa4a48af 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -36,6 +36,11 @@ static int __init blackfin_dma_init(void)
 
         printk(KERN_INFO "Blackfin DMA Controller\n");
 
+
+#if ANOMALY_05000480
+        bfin_write_DMAC_TC_PER(0x0111);
+#endif
+
         for (i = 0; i < MAX_DMA_CHANNELS; i++) {
                 atomic_set(&dma_ch[i].chan_status, 0);
                 dma_ch[i].regs = dma_io_base_addr[i];
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index 170cf90735ba..bcf8cf6fe412 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -10,10 +10,12 @@
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <asm/blackfin.h>
 #include <asm/gpio.h>
 #include <asm/portmux.h>
 #include <linux/irq.h>
+#include <asm/irq_handler.h>
 
 #if ANOMALY_05000311 || ANOMALY_05000323
 enum {
@@ -534,7 +536,7 @@ static const unsigned int sic_iwr_irqs[] = {
 #if defined(BF533_FAMILY)
         IRQ_PROG_INTB
 #elif defined(BF537_FAMILY)
-        IRQ_PROG_INTB, IRQ_PORTG_INTB, IRQ_MAC_TX
+        IRQ_PF_INTB_WATCH, IRQ_PORTG_INTB, IRQ_PH_INTB_MAC_TX
 #elif defined(BF538_FAMILY)
         IRQ_PORTF_INTB
 #elif defined(CONFIG_BF52x) || defined(CONFIG_BF51x)
@@ -1203,35 +1205,43 @@ void bfin_reset_boot_spi_cs(unsigned short pin)
 }
 
 #if defined(CONFIG_PROC_FS)
-static int gpio_proc_read(char *buf, char **start, off_t offset,
-                          int len, int *unused_i, void *unused_v)
+static int gpio_proc_show(struct seq_file *m, void *v)
 {
-        int c, irq, gpio, outlen = 0;
+        int c, irq, gpio;
 
         for (c = 0; c < MAX_RESOURCES; c++) {
                 irq = is_reserved(gpio_irq, c, 1);
                 gpio = is_reserved(gpio, c, 1);
                 if (!check_gpio(c) && (gpio || irq))
-                        len = sprintf(buf, "GPIO_%d: \t%s%s \t\tGPIO %s\n", c,
+                        seq_printf(m, "GPIO_%d: \t%s%s \t\tGPIO %s\n", c,
                                  get_label(c), (gpio && irq) ? " *" : "",
                                  get_gpio_dir(c) ? "OUTPUT" : "INPUT");
                 else if (is_reserved(peri, c, 1))
-                        len = sprintf(buf, "GPIO_%d: \t%s \t\tPeripheral\n", c, get_label(c));
+                        seq_printf(m, "GPIO_%d: \t%s \t\tPeripheral\n", c, get_label(c));
                 else
                         continue;
-                buf += len;
-                outlen += len;
         }
-        return outlen;
+
+        return 0;
 }
 
+static int gpio_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, gpio_proc_show, NULL);
+}
+
+static const struct file_operations gpio_proc_ops = {
+        .open           = gpio_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 static __init int gpio_register_proc(void)
 {
         struct proc_dir_entry *proc_gpio;
 
-        proc_gpio = create_proc_entry("gpio", S_IRUGO, NULL);
-        if (proc_gpio)
-                proc_gpio->read_proc = gpio_proc_read;
+        proc_gpio = proc_create("gpio", S_IRUGO, NULL, &gpio_proc_ops);
         return proc_gpio != NULL;
 }
 __initcall(gpio_register_proc);
diff --git a/arch/blackfin/kernel/bfin_ksyms.c b/arch/blackfin/kernel/bfin_ksyms.c
index 2c264b51566a..c446591b961d 100644
--- a/arch/blackfin/kernel/bfin_ksyms.c
+++ b/arch/blackfin/kernel/bfin_ksyms.c
@@ -11,6 +11,7 @@
 
 #include <asm/cacheflush.h>
 #include <asm/io.h>
+#include <asm/irq_handler.h>
 
 /* Allow people to have their own Blackfin exception handler in a module */
 EXPORT_SYMBOL(bfin_return_from_exception);
diff --git a/arch/blackfin/kernel/debug-mmrs.c b/arch/blackfin/kernel/debug-mmrs.c
new file mode 100644
index 000000000000..94b1d8a0256a
--- /dev/null
+++ b/arch/blackfin/kernel/debug-mmrs.c
@@ -0,0 +1,1860 @@
+/*
+ * debugfs interface to core/system MMRs
+ *
+ * Copyright 2007-2011 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later
+ */
+
+#include <linux/debugfs.h>
+#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+
+#include <asm/blackfin.h>
+#include <asm/gpio.h>
+#include <asm/bfin_can.h>
+#include <asm/bfin_dma.h>
+#include <asm/bfin_ppi.h>
+#include <asm/bfin_serial.h>
+#include <asm/bfin5xx_spi.h>
+#include <asm/bfin_twi.h>
+
+/* Common code defines PORT_MUX on us, so redirect the MMR back locally */
+#ifdef BFIN_PORT_MUX
+#undef PORT_MUX
+#define PORT_MUX BFIN_PORT_MUX
+#endif
+
+#define _d(name, bits, addr, perms) debugfs_create_x##bits(name, perms, parent, (u##bits *)addr)
+#define d(name, bits, addr)         _d(name, bits, addr, S_IRUSR|S_IWUSR)
+#define d_RO(name, bits, addr)      _d(name, bits, addr, S_IRUSR)
+#define d_WO(name, bits, addr)      _d(name, bits, addr, S_IWUSR)
+
+#define D_RO(name, bits) d_RO(#name, bits, name)
+#define D_WO(name, bits) d_WO(#name, bits, name)
+#define D32(name)        d(#name, 32, name)
+#define D16(name)        d(#name, 16, name)
+
+#define REGS_OFF(peri, mmr) offsetof(struct bfin_##peri##_regs, mmr)
+#define __REGS(peri, sname, rname) \
+        do { \
+                struct bfin_##peri##_regs r; \
+                void *addr = (void *)(base + REGS_OFF(peri, rname)); \
+                strcpy(_buf, sname); \
+                if (sizeof(r.rname) == 2) \
+                        debugfs_create_x16(buf, S_IRUSR|S_IWUSR, parent, addr); \
+                else \
+                        debugfs_create_x32(buf, S_IRUSR|S_IWUSR, parent, addr); \
+        } while (0)
+#define REGS_STR_PFX(buf, pfx, num) \
+        ({ \
+                buf + (num >= 0 ? \
+                        sprintf(buf, #pfx "%i_", num) : \
+                        sprintf(buf, #pfx "_")); \
+        })
+#define REGS_STR_PFX_C(buf, pfx, num) \
+        ({ \
+                buf + (num >= 0 ? \
+                        sprintf(buf, #pfx "%c_", 'A' + num) : \
+                        sprintf(buf, #pfx "_")); \
+        })
+
+/*
+ * Core registers (not memory mapped)
+ */
+extern u32 last_seqstat;
+
+static int debug_cclk_get(void *data, u64 *val)
+{
+        *val = get_cclk();
+        return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(fops_debug_cclk, debug_cclk_get, NULL, "0x%08llx\n");
+
+static int debug_sclk_get(void *data, u64 *val)
+{
+        *val = get_sclk();
+        return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(fops_debug_sclk, debug_sclk_get, NULL, "0x%08llx\n");
+
+#define DEFINE_SYSREG(sr, pre, post) \
+static int sysreg_##sr##_get(void *data, u64 *val) \
+{ \
+        unsigned long tmp; \
+        pre; \
+        __asm__ __volatile__("%0 = " #sr ";" : "=d"(tmp)); \
+        *val = tmp; \
+        return 0; \
+} \
+static int sysreg_##sr##_set(void *data, u64 val) \
+{ \
+        unsigned long tmp = val; \
+        __asm__ __volatile__(#sr " = %0;" : : "d"(tmp)); \
+        post; \
+        return 0; \
+} \
+DEFINE_SIMPLE_ATTRIBUTE(fops_sysreg_##sr, sysreg_##sr##_get, sysreg_##sr##_set, "0x%08llx\n")
+
+DEFINE_SYSREG(cycles, , );
+DEFINE_SYSREG(cycles2, __asm__ __volatile__("%0 = cycles;" : "=d"(tmp)), );
+DEFINE_SYSREG(emudat, , );
+DEFINE_SYSREG(seqstat, , );
+DEFINE_SYSREG(syscfg, , CSYNC());
+#define D_SYSREG(sr) debugfs_create_file(#sr, S_IRUSR|S_IWUSR, parent, NULL, &fops_sysreg_##sr)
+
+/*
+ * CAN
+ */
+#define CAN_OFF(mmr)  REGS_OFF(can, mmr)
+#define __CAN(uname, lname) __REGS(can, #uname, lname)
+static void __init __maybe_unused
+bfin_debug_mmrs_can(struct dentry *parent, unsigned long base, int num)
+{
+        static struct dentry *am, *mb;
+        int i, j;
+        char buf[32], *_buf = REGS_STR_PFX(buf, CAN, num);
+
+        if (!am) {
+                am = debugfs_create_dir("am", parent);
+                mb = debugfs_create_dir("mb", parent);
+        }
+
+        __CAN(MC1, mc1);
+        __CAN(MD1, md1);
+        __CAN(TRS1, trs1);
+        __CAN(TRR1, trr1);
+        __CAN(TA1, ta1);
+        __CAN(AA1, aa1);
+        __CAN(RMP1, rmp1);
+        __CAN(RML1, rml1);
+        __CAN(MBTIF1, mbtif1);
+        __CAN(MBRIF1, mbrif1);
+        __CAN(MBIM1, mbim1);
+        __CAN(RFH1, rfh1);
+        __CAN(OPSS1, opss1);
+
+        __CAN(MC2, mc2);
+        __CAN(MD2, md2);
+        __CAN(TRS2, trs2);
+        __CAN(TRR2, trr2);
+        __CAN(TA2, ta2);
+        __CAN(AA2, aa2);
+        __CAN(RMP2, rmp2);
+        __CAN(RML2, rml2);
+        __CAN(MBTIF2, mbtif2);
+        __CAN(MBRIF2, mbrif2);
+        __CAN(MBIM2, mbim2);
+        __CAN(RFH2, rfh2);
+        __CAN(OPSS2, opss2);
+
+        __CAN(CLOCK, clock);
+        __CAN(TIMING, timing);
+        __CAN(DEBUG, debug);
+        __CAN(STATUS, status);
+        __CAN(CEC, cec);
+        __CAN(GIS, gis);
+        __CAN(GIM, gim);
+        __CAN(GIF, gif);
+        __CAN(CONTROL, control);
+        __CAN(INTR, intr);
+        __CAN(VERSION, version);
+        __CAN(MBTD, mbtd);
+        __CAN(EWR, ewr);
+        __CAN(ESR, esr);
+        /*__CAN(UCREG, ucreg); no longer exists */
+        __CAN(UCCNT, uccnt);
+        __CAN(UCRC, ucrc);
+        __CAN(UCCNF, uccnf);
+        __CAN(VERSION2, version2);
+
+        for (i = 0; i < 32; ++i) {
+                sprintf(_buf, "AM%02iL", i);
+                debugfs_create_x16(buf, S_IRUSR|S_IWUSR, am,
+                        (u16 *)(base + CAN_OFF(msk[i].aml)));
+                sprintf(_buf, "AM%02iH", i);
+                debugfs_create_x16(buf, S_IRUSR|S_IWUSR, am,
+                        (u16 *)(base + CAN_OFF(msk[i].amh)));
+
+                for (j = 0; j < 3; ++j) {
+                        sprintf(_buf, "MB%02i_DATA%i", i, j);
+                        debugfs_create_x16(buf, S_IRUSR|S_IWUSR, mb,
+                                (u16 *)(base + CAN_OFF(chl[i].data[j*2])));
+                }
+                sprintf(_buf, "MB%02i_LENGTH", i);
+                debugfs_create_x16(buf, S_IRUSR|S_IWUSR, mb,
+                        (u16 *)(base + CAN_OFF(chl[i].dlc)));
+                sprintf(_buf, "MB%02i_TIMESTAMP", i);
+                debugfs_create_x16(buf, S_IRUSR|S_IWUSR, mb,
+                        (u16 *)(base + CAN_OFF(chl[i].tsv)));
+                sprintf(_buf, "MB%02i_ID0", i);
+                debugfs_create_x16(buf, S_IRUSR|S_IWUSR, mb,
+                        (u16 *)(base + CAN_OFF(chl[i].id0)));
+                sprintf(_buf, "MB%02i_ID1", i);
+                debugfs_create_x16(buf, S_IRUSR|S_IWUSR, mb,
+                        (u16 *)(base + CAN_OFF(chl[i].id1)));
+        }
+}
+#define CAN(num) bfin_debug_mmrs_can(parent, CAN##num##_MC1, num)
+
+/*
+ * DMA
+ */
+#define __DMA(uname, lname) __REGS(dma, #uname, lname)
+static void __init __maybe_unused
+bfin_debug_mmrs_dma(struct dentry *parent, unsigned long base, int num, char mdma, const char *pfx)
+{
+        char buf[32], *_buf;
+
+        if (mdma)
+                _buf = buf + sprintf(buf, "%s_%c%i_", pfx, mdma, num);
+        else
+                _buf = buf + sprintf(buf, "%s%i_", pfx, num);
+
+        __DMA(NEXT_DESC_PTR, next_desc_ptr);
+        __DMA(START_ADDR, start_addr);
+        __DMA(CONFIG, config);
+        __DMA(X_COUNT, x_count);
+        __DMA(X_MODIFY, x_modify);
+        __DMA(Y_COUNT, y_count);
+        __DMA(Y_MODIFY, y_modify);
+        __DMA(CURR_DESC_PTR, curr_desc_ptr);
+        __DMA(CURR_ADDR, curr_addr);
+        __DMA(IRQ_STATUS, irq_status);
+        __DMA(PERIPHERAL_MAP, peripheral_map);
+        __DMA(CURR_X_COUNT, curr_x_count);
+        __DMA(CURR_Y_COUNT, curr_y_count);
+}
+#define _DMA(num, base, mdma, pfx) bfin_debug_mmrs_dma(parent, base, num, mdma, pfx "DMA")
+#define DMA(num)  _DMA(num, DMA##num##_NEXT_DESC_PTR, 0, "")
+#define _MDMA(num, x) \
+        do { \
+                _DMA(num, x##DMA_D##num##_CONFIG, 'D', #x); \
+                _DMA(num, x##DMA_S##num##_CONFIG, 'S', #x); \
+        } while (0)
+#define MDMA(num) _MDMA(num, M)
+#define IMDMA(num) _MDMA(num, IM)
+
+/*
+ * EPPI
+ */
+#define __EPPI(uname, lname) __REGS(eppi, #uname, lname)
+static void __init __maybe_unused
+bfin_debug_mmrs_eppi(struct dentry *parent, unsigned long base, int num)
+{
+        char buf[32], *_buf = REGS_STR_PFX(buf, EPPI, num);
+        __EPPI(STATUS, status);
+        __EPPI(HCOUNT, hcount);
+        __EPPI(HDELAY, hdelay);
+        __EPPI(VCOUNT, vcount);
+        __EPPI(VDELAY, vdelay);
+        __EPPI(FRAME, frame);
+        __EPPI(LINE, line);
+        __EPPI(CLKDIV, clkdiv);
+        __EPPI(CONTROL, control);
+        __EPPI(FS1W_HBL, fs1w_hbl);
+        __EPPI(FS1P_AVPL, fs1p_avpl);
+        __EPPI(FS2W_LVB, fs2w_lvb);
+        __EPPI(FS2P_LAVF, fs2p_lavf);
+        __EPPI(CLIP, clip);
+}
+#define EPPI(num) bfin_debug_mmrs_eppi(parent, EPPI##num##_STATUS, num)
+
+/*
+ * General Purpose Timers
+ */
+#define GPTIMER_OFF(mmr) (TIMER0_##mmr - TIMER0_CONFIG)
+#define __GPTIMER(name) \
+        do { \
+                strcpy(_buf, #name); \
+                debugfs_create_x16(buf, S_IRUSR|S_IWUSR, parent, (u16 *)(base + GPTIMER_OFF(name))); \
+        } while (0)
+static void __init __maybe_unused
+bfin_debug_mmrs_gptimer(struct dentry *parent, unsigned long base, int num)
+{
+        char buf[32], *_buf = REGS_STR_PFX(buf, TIMER, num);
+        __GPTIMER(CONFIG);
+        __GPTIMER(COUNTER);
+        __GPTIMER(PERIOD);
+        __GPTIMER(WIDTH);
+}
+#define GPTIMER(num) bfin_debug_mmrs_gptimer(parent, TIMER##num##_CONFIG, num)
+
+/*
+ * Handshake MDMA
+ */
+#define __HMDMA(uname, lname) __REGS(hmdma, #uname, lname)
+static void __init __maybe_unused
+bfin_debug_mmrs_hmdma(struct dentry *parent, unsigned long base, int num)
+{
+        char buf[32], *_buf = REGS_STR_PFX(buf, HMDMA, num);
+        __HMDMA(CONTROL, control);
+        __HMDMA(ECINIT, ecinit);
+        __HMDMA(BCINIT, bcinit);
+        __HMDMA(ECURGENT, ecurgent);
+        __HMDMA(ECOVERFLOW, ecoverflow);
+        __HMDMA(ECOUNT, ecount);
+        __HMDMA(BCOUNT, bcount);
+}
+#define HMDMA(num) bfin_debug_mmrs_hmdma(parent, HMDMA##num##_CONTROL, num)
+
+/*
+ * Port/GPIO
+ */
+#define bfin_gpio_regs gpio_port_t
+#define __PORT(uname, lname) __REGS(gpio, #uname, lname)
+static void __init __maybe_unused
+bfin_debug_mmrs_port(struct dentry *parent, unsigned long base, int num)
+{
+        char buf[32], *_buf;
+#ifdef __ADSPBF54x__
+        _buf = REGS_STR_PFX_C(buf, PORT, num);
+        __PORT(FER, port_fer);
+        __PORT(SET, data_set);
+        __PORT(CLEAR, data_clear);
+        __PORT(DIR_SET, dir_set);
+        __PORT(DIR_CLEAR, dir_clear);
+        __PORT(INEN, inen);
+        __PORT(MUX, port_mux);
+#else
+        _buf = buf + sprintf(buf, "PORT%cIO_", num);
+        __PORT(CLEAR, data_clear);
+        __PORT(SET, data_set);
+        __PORT(TOGGLE, toggle);
+        __PORT(MASKA, maska);
+        __PORT(MASKA_CLEAR, maska_clear);
+        __PORT(MASKA_SET, maska_set);
+        __PORT(MASKA_TOGGLE, maska_toggle);
+        __PORT(MASKB, maskb);
+        __PORT(MASKB_CLEAR, maskb_clear);
+        __PORT(MASKB_SET, maskb_set);
+        __PORT(MASKB_TOGGLE, maskb_toggle);
+        __PORT(DIR, dir);
+        __PORT(POLAR, polar);
+        __PORT(EDGE, edge);
+        __PORT(BOTH, both);
+        __PORT(INEN, inen);
+#endif
+        _buf[-1] = '\0';
+        d(buf, 16, base + REGS_OFF(gpio, data));
+}
+#define PORT(base, num) bfin_debug_mmrs_port(parent, base, num)
+
+/*
+ * PPI
+ */
+#define __PPI(uname, lname) __REGS(ppi, #uname, lname)
+static void __init __maybe_unused
+bfin_debug_mmrs_ppi(struct dentry *parent, unsigned long base, int num)
+{
+        char buf[32], *_buf = REGS_STR_PFX(buf, PPI, num);
+        __PPI(CONTROL, control);
+        __PPI(STATUS, status);
+        __PPI(COUNT, count);
+        __PPI(DELAY, delay);
+        __PPI(FRAME, frame);
+}
+#define PPI(num) bfin_debug_mmrs_ppi(parent, PPI##num##_STATUS, num)
+
+/*
+ * SPI
+ */
+#define __SPI(uname, lname) __REGS(spi, #uname, lname)
+static void __init __maybe_unused
+bfin_debug_mmrs_spi(struct dentry *parent, unsigned long base, int num)
+{
+        char buf[32], *_buf = REGS_STR_PFX(buf, SPI, num);
+        __SPI(CTL, ctl);
+        __SPI(FLG, flg);
+        __SPI(STAT, stat);
+        __SPI(TDBR, tdbr);
+        __SPI(RDBR, rdbr);
+        __SPI(BAUD, baud);
+        __SPI(SHADOW, shadow);
+}
+#define SPI(num) bfin_debug_mmrs_spi(parent, SPI##num##_REGBASE, num)
+
+/*
+ * SPORT
+ */
+static inline int sport_width(void *mmr)
+{
+        unsigned long lmmr = (unsigned long)mmr;
+        if ((lmmr & 0xff) == 0x10)
+                /* SPORT#_TX has 0x10 offset -> SPORT#_TCR2 has 0x04 offset */
+                lmmr -= 0xc;
+        else
+                /* SPORT#_RX has 0x18 offset -> SPORT#_RCR2 has 0x24 offset */
+                lmmr += 0xc;
+        /* extract SLEN field from control register 2 and add 1 */
+        return (bfin_read16(lmmr) & 0x1f) + 1;
+}
+static int sport_set(void *mmr, u64 val)
+{
+        unsigned long flags;
+        local_irq_save(flags);
+        if (sport_width(mmr) <= 16)
+                bfin_write16(mmr, val);
+        else
+                bfin_write32(mmr, val);
+        local_irq_restore(flags);
+        return 0;
+}
+static int sport_get(void *mmr, u64 *val)
+{
+        unsigned long flags;
+        local_irq_save(flags);
+        if (sport_width(mmr) <= 16)
+                *val = bfin_read16(mmr);
+        else
+                *val = bfin_read32(mmr);
+        local_irq_restore(flags);
+        return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(fops_sport, sport_get, sport_set, "0x%08llx\n");
+/*DEFINE_SIMPLE_ATTRIBUTE(fops_sport_ro, sport_get, NULL, "0x%08llx\n");*/
+DEFINE_SIMPLE_ATTRIBUTE(fops_sport_wo, NULL, sport_set, "0x%08llx\n");
+#define SPORT_OFF(mmr) (SPORT0_##mmr - SPORT0_TCR1)
+#define _D_SPORT(name, perms, fops) \
+        do { \
+                strcpy(_buf, #name); \
+                debugfs_create_file(buf, perms, parent, (void *)(base + SPORT_OFF(name)), fops); \
+        } while (0)
+#define __SPORT_RW(name) _D_SPORT(name, S_IRUSR|S_IWUSR, &fops_sport)
+#define __SPORT_RO(name) _D_SPORT(name, S_IRUSR, &fops_sport_ro)
+#define __SPORT_WO(name) _D_SPORT(name, S_IWUSR, &fops_sport_wo)
+#define __SPORT(name, bits) \
+        do { \
+                strcpy(_buf, #name); \
+                debugfs_create_x##bits(buf, S_IRUSR|S_IWUSR, parent, (u##bits *)(base + SPORT_OFF(name))); \
+        } while (0)
+static void __init __maybe_unused
+bfin_debug_mmrs_sport(struct dentry *parent, unsigned long base, int num)
+{
+        char buf[32], *_buf = REGS_STR_PFX(buf, SPORT, num);
+        __SPORT(CHNL, 16);
+        __SPORT(MCMC1, 16);
+        __SPORT(MCMC2, 16);
+        __SPORT(MRCS0, 32);
+        __SPORT(MRCS1, 32);
+        __SPORT(MRCS2, 32);
+        __SPORT(MRCS3, 32);
+        __SPORT(MTCS0, 32);
+        __SPORT(MTCS1, 32);
+        __SPORT(MTCS2, 32);
+        __SPORT(MTCS3, 32);
+        __SPORT(RCLKDIV, 16);
+        __SPORT(RCR1, 16);
+        __SPORT(RCR2, 16);
+        __SPORT(RFSDIV, 16);
+        __SPORT_RW(RX);
+        __SPORT(STAT, 16);
+        __SPORT(TCLKDIV, 16);
+        __SPORT(TCR1, 16);
+        __SPORT(TCR2, 16);
+        __SPORT(TFSDIV, 16);
+        __SPORT_WO(TX);
+}
+#define SPORT(num) bfin_debug_mmrs_sport(parent, SPORT##num##_TCR1, num)
+
+/*
+ * TWI
+ */
+#define __TWI(uname, lname) __REGS(twi, #uname, lname)
+static void __init __maybe_unused
+bfin_debug_mmrs_twi(struct dentry *parent, unsigned long base, int num)
+{
+        char buf[32], *_buf = REGS_STR_PFX(buf, TWI, num);
+        __TWI(CLKDIV, clkdiv);
+        __TWI(CONTROL, control);
+        __TWI(SLAVE_CTL, slave_ctl);
+        __TWI(SLAVE_STAT, slave_stat);
+        __TWI(SLAVE_ADDR, slave_addr);
+        __TWI(MASTER_CTL, master_ctl);
+        __TWI(MASTER_STAT, master_stat);
+        __TWI(MASTER_ADDR, master_addr);
+        __TWI(INT_STAT, int_stat);
+        __TWI(INT_MASK, int_mask);
+        __TWI(FIFO_CTL, fifo_ctl);
+        __TWI(FIFO_STAT, fifo_stat);
+        __TWI(XMT_DATA8, xmt_data8);
+        __TWI(XMT_DATA16, xmt_data16);
+        __TWI(RCV_DATA8, rcv_data8);
+        __TWI(RCV_DATA16, rcv_data16);
+}
+#define TWI(num) bfin_debug_mmrs_twi(parent, TWI##num##_CLKDIV, num)
+
+/*
+ * UART
+ */
+#define __UART(uname, lname) __REGS(uart, #uname, lname)
+static void __init __maybe_unused
+bfin_debug_mmrs_uart(struct dentry *parent, unsigned long base, int num)
+{
+        char buf[32], *_buf = REGS_STR_PFX(buf, UART, num);
+#ifdef BFIN_UART_BF54X_STYLE
+        __UART(DLL, dll);
+        __UART(DLH, dlh);
+        __UART(GCTL, gctl);
+        __UART(LCR, lcr);
+        __UART(MCR, mcr);
+        __UART(LSR, lsr);
+        __UART(MSR, msr);
+        __UART(SCR, scr);
+        __UART(IER_SET, ier_set);
+        __UART(IER_CLEAR, ier_clear);
+        __UART(THR, thr);
+        __UART(RBR, rbr);
+#else
+        __UART(DLL, dll);
+        __UART(THR, thr);
+        __UART(RBR, rbr);
+        __UART(DLH, dlh);
+        __UART(IER, ier);
+        __UART(IIR, iir);
+        __UART(LCR, lcr);
+        __UART(MCR, mcr);
+        __UART(LSR, lsr);
+        __UART(MSR, msr);
+        __UART(SCR, scr);
+        __UART(GCTL, gctl);
+#endif
+}
+#define UART(num) bfin_debug_mmrs_uart(parent, UART##num##_DLL, num)
+
+/*
+ * The actual debugfs generation
+ */
+static struct dentry *debug_mmrs_dentry;
+
+static int __init bfin_debug_mmrs_init(void)
+{
+        struct dentry *top, *parent;
+
+        pr_info("debug-mmrs: setting up Blackfin MMR debugfs\n");
+
+        top = debugfs_create_dir("blackfin", NULL);
+        if (top == NULL)
+                return -1;
+
+        parent = debugfs_create_dir("core_regs", top);
+        debugfs_create_file("cclk", S_IRUSR, parent, NULL, &fops_debug_cclk);
+        debugfs_create_file("sclk", S_IRUSR, parent, NULL, &fops_debug_sclk);
+        debugfs_create_x32("last_seqstat", S_IRUSR, parent, &last_seqstat);
+        D_SYSREG(cycles);
+        D_SYSREG(cycles2);
+        D_SYSREG(emudat);
+        D_SYSREG(seqstat);
+        D_SYSREG(syscfg);
+
+        /* Core MMRs */
+        parent = debugfs_create_dir("ctimer", top);
+        D32(TCNTL);
+        D32(TCOUNT);
+        D32(TPERIOD);
+        D32(TSCALE);
+
+        parent = debugfs_create_dir("cec", top);
+        D32(EVT0);
+        D32(EVT1);
+        D32(EVT2);
+        D32(EVT3);
+        D32(EVT4);
+        D32(EVT5);
+        D32(EVT6);
+        D32(EVT7);
+        D32(EVT8);
+        D32(EVT9);
+        D32(EVT10);
+        D32(EVT11);
+        D32(EVT12);
+        D32(EVT13);
+        D32(EVT14);
+        D32(EVT15);
+        D32(EVT_OVERRIDE);
+        D32(IMASK);
+        D32(IPEND);
+        D32(ILAT);
+        D32(IPRIO);
+
+        parent = debugfs_create_dir("debug", top);
+        D32(DBGSTAT);
+        D32(DSPID);
+
+        parent = debugfs_create_dir("mmu", top);
+        D32(SRAM_BASE_ADDRESS);
+        D32(DCPLB_ADDR0);
+        D32(DCPLB_ADDR10);
+        D32(DCPLB_ADDR11);
+        D32(DCPLB_ADDR12);
+        D32(DCPLB_ADDR13);
+        D32(DCPLB_ADDR14);
+        D32(DCPLB_ADDR15);
+        D32(DCPLB_ADDR1);
+        D32(DCPLB_ADDR2);
+        D32(DCPLB_ADDR3);
+        D32(DCPLB_ADDR4);
+        D32(DCPLB_ADDR5);
+        D32(DCPLB_ADDR6);
+        D32(DCPLB_ADDR7);
+        D32(DCPLB_ADDR8);
+        D32(DCPLB_ADDR9);
+        D32(DCPLB_DATA0);
+        D32(DCPLB_DATA10);
+        D32(DCPLB_DATA11);
+        D32(DCPLB_DATA12);
+        D32(DCPLB_DATA13);
+        D32(DCPLB_DATA14);
+        D32(DCPLB_DATA15);
+        D32(DCPLB_DATA1);
+        D32(DCPLB_DATA2);
+        D32(DCPLB_DATA3);
+        D32(DCPLB_DATA4);
+        D32(DCPLB_DATA5);
+        D32(DCPLB_DATA6);
+        D32(DCPLB_DATA7);
+        D32(DCPLB_DATA8);
+        D32(DCPLB_DATA9);
+        D32(DCPLB_FAULT_ADDR);
+        D32(DCPLB_STATUS);
+        D32(DMEM_CONTROL);
+        D32(DTEST_COMMAND);
+        D32(DTEST_DATA0);
+        D32(DTEST_DATA1);
+
+        D32(ICPLB_ADDR0);
+        D32(ICPLB_ADDR1);
+        D32(ICPLB_ADDR2);
+        D32(ICPLB_ADDR3);
+        D32(ICPLB_ADDR4);
+        D32(ICPLB_ADDR5);
+        D32(ICPLB_ADDR6);
+        D32(ICPLB_ADDR7);
+        D32(ICPLB_ADDR8);
+        D32(ICPLB_ADDR9);
+        D32(ICPLB_ADDR10);
+        D32(ICPLB_ADDR11);
+        D32(ICPLB_ADDR12);
+        D32(ICPLB_ADDR13);
+        D32(ICPLB_ADDR14);
+        D32(ICPLB_ADDR15);
+        D32(ICPLB_DATA0);
+        D32(ICPLB_DATA1);
+        D32(ICPLB_DATA2);
+        D32(ICPLB_DATA3);
+        D32(ICPLB_DATA4);
+        D32(ICPLB_DATA5);
+        D32(ICPLB_DATA6);
+        D32(ICPLB_DATA7);
+        D32(ICPLB_DATA8);
+        D32(ICPLB_DATA9);
+        D32(ICPLB_DATA10);
+        D32(ICPLB_DATA11);
+        D32(ICPLB_DATA12);
+        D32(ICPLB_DATA13);
+        D32(ICPLB_DATA14);
+        D32(ICPLB_DATA15);
+        D32(ICPLB_FAULT_ADDR);
+        D32(ICPLB_STATUS);
+        D32(IMEM_CONTROL);
+        if (!ANOMALY_05000481) {
+                D32(ITEST_COMMAND);
+                D32(ITEST_DATA0);
+                D32(ITEST_DATA1);
+        }
+
+        parent = debugfs_create_dir("perf", top);
+        D32(PFCNTR0);
+        D32(PFCNTR1);
+        D32(PFCTL);
+
+        parent = debugfs_create_dir("trace", top);
+        D32(TBUF);
+        D32(TBUFCTL);
+        D32(TBUFSTAT);
+
+        parent = debugfs_create_dir("watchpoint", top);
+        D32(WPIACTL);
+        D32(WPIA0);
+        D32(WPIA1);
+        D32(WPIA2);
+        D32(WPIA3);
+        D32(WPIA4);
+        D32(WPIA5);
+        D32(WPIACNT0);
+        D32(WPIACNT1);
+        D32(WPIACNT2);
+        D32(WPIACNT3);
+        D32(WPIACNT4);
+        D32(WPIACNT5);
+        D32(WPDACTL);
+        D32(WPDA0);
+        D32(WPDA1);
+        D32(WPDACNT0);
+        D32(WPDACNT1);
+        D32(WPSTAT);
+
+        /* System MMRs */
+#ifdef ATAPI_CONTROL
+        parent = debugfs_create_dir("atapi", top);
+        D16(ATAPI_CONTROL);
+        D16(ATAPI_DEV_ADDR);
+        D16(ATAPI_DEV_RXBUF);
+        D16(ATAPI_DEV_TXBUF);
+        D16(ATAPI_DMA_TFRCNT);
+        D16(ATAPI_INT_MASK);
+        D16(ATAPI_INT_STATUS);
+        D16(ATAPI_LINE_STATUS);
+        D16(ATAPI_MULTI_TIM_0);
+        D16(ATAPI_MULTI_TIM_1);
+        D16(ATAPI_MULTI_TIM_2);
+        D16(ATAPI_PIO_TFRCNT);
+        D16(ATAPI_PIO_TIM_0);
+        D16(ATAPI_PIO_TIM_1);
+        D16(ATAPI_REG_TIM_0);
+        D16(ATAPI_SM_STATE);
+        D16(ATAPI_STATUS);
+        D16(ATAPI_TERMINATE);
+        D16(ATAPI_UDMAOUT_TFRCNT);
+        D16(ATAPI_ULTRA_TIM_0);
+        D16(ATAPI_ULTRA_TIM_1);
+        D16(ATAPI_ULTRA_TIM_2);
+        D16(ATAPI_ULTRA_TIM_3);
+        D16(ATAPI_UMAIN_TFRCNT);
+        D16(ATAPI_XFER_LEN);
+#endif
+
+#if defined(CAN_MC1) || defined(CAN0_MC1) || defined(CAN1_MC1)
+        parent = debugfs_create_dir("can", top);
+# ifdef CAN_MC1
+        bfin_debug_mmrs_can(parent, CAN_MC1, -1);
+# endif
+# ifdef CAN0_MC1
+        CAN(0);
+# endif
+# ifdef CAN1_MC1
+        CAN(1);
+# endif
+#endif
+
+#ifdef CNT_COMMAND
+        parent = debugfs_create_dir("counter", top);
+        D16(CNT_COMMAND);
+        D16(CNT_CONFIG);
+        D32(CNT_COUNTER);
+        D16(CNT_DEBOUNCE);
+        D16(CNT_IMASK);
+        D32(CNT_MAX);
+        D32(CNT_MIN);
+        D16(CNT_STATUS);
+#endif
+
+        parent = debugfs_create_dir("dmac", top);
+#ifdef DMA_TC_CNT
+        D16(DMAC_TC_CNT);
+        D16(DMAC_TC_PER);
+#endif
+#ifdef DMAC0_TC_CNT
+        D16(DMAC0_TC_CNT);
+        D16(DMAC0_TC_PER);
+#endif
+#ifdef DMAC1_TC_CNT
+        D16(DMAC1_TC_CNT);
+        D16(DMAC1_TC_PER);
+#endif
+#ifdef DMAC1_PERIMUX
+        D16(DMAC1_PERIMUX);
+#endif
+
+#ifdef __ADSPBF561__
+        /* XXX: should rewrite the MMR map */
+# define DMA0_NEXT_DESC_PTR DMA2_0_NEXT_DESC_PTR
+# define DMA1_NEXT_DESC_PTR DMA2_1_NEXT_DESC_PTR
+# define DMA2_NEXT_DESC_PTR DMA2_2_NEXT_DESC_PTR
+# define DMA3_NEXT_DESC_PTR DMA2_3_NEXT_DESC_PTR
+# define DMA4_NEXT_DESC_PTR DMA2_4_NEXT_DESC_PTR
+# define DMA5_NEXT_DESC_PTR DMA2_5_NEXT_DESC_PTR
+# define DMA6_NEXT_DESC_PTR DMA2_6_NEXT_DESC_PTR
+# define DMA7_NEXT_DESC_PTR DMA2_7_NEXT_DESC_PTR
+# define DMA8_NEXT_DESC_PTR DMA2_8_NEXT_DESC_PTR
+# define DMA9_NEXT_DESC_PTR DMA2_9_NEXT_DESC_PTR
+# define DMA10_NEXT_DESC_PTR DMA2_10_NEXT_DESC_PTR
+# define DMA11_NEXT_DESC_PTR DMA2_11_NEXT_DESC_PTR
+# define DMA12_NEXT_DESC_PTR DMA1_0_NEXT_DESC_PTR
+# define DMA13_NEXT_DESC_PTR DMA1_1_NEXT_DESC_PTR
+# define DMA14_NEXT_DESC_PTR DMA1_2_NEXT_DESC_PTR
+# define DMA15_NEXT_DESC_PTR DMA1_3_NEXT_DESC_PTR
+# define DMA16_NEXT_DESC_PTR DMA1_4_NEXT_DESC_PTR
+# define DMA17_NEXT_DESC_PTR DMA1_5_NEXT_DESC_PTR
+# define DMA18_NEXT_DESC_PTR DMA1_6_NEXT_DESC_PTR
+# define DMA19_NEXT_DESC_PTR DMA1_7_NEXT_DESC_PTR
+# define DMA20_NEXT_DESC_PTR DMA1_8_NEXT_DESC_PTR
+# define DMA21_NEXT_DESC_PTR DMA1_9_NEXT_DESC_PTR
+# define DMA22_NEXT_DESC_PTR DMA1_10_NEXT_DESC_PTR
+# define DMA23_NEXT_DESC_PTR DMA1_11_NEXT_DESC_PTR
+#endif
+        parent = debugfs_create_dir("dma", top);
+        DMA(0);
+        DMA(1);
+        DMA(1);
+        DMA(2);
+        DMA(3);
+        DMA(4);
+        DMA(5);
+        DMA(6);
+        DMA(7);
+#ifdef DMA8_NEXT_DESC_PTR
+        DMA(8);
+        DMA(9);
+        DMA(10);
+        DMA(11);
+#endif
+#ifdef DMA12_NEXT_DESC_PTR
+        DMA(12);
+        DMA(13);
+        DMA(14);
+        DMA(15);
+        DMA(16);
+        DMA(17);
+        DMA(18);
+        DMA(19);
+#endif
+#ifdef DMA20_NEXT_DESC_PTR
+        DMA(20);
+        DMA(21);
+        DMA(22);
+        DMA(23);
+#endif
+
+        parent = debugfs_create_dir("ebiu_amc", top);
+        D32(EBIU_AMBCTL0);
+        D32(EBIU_AMBCTL1);
+        D16(EBIU_AMGCTL);
+#ifdef EBIU_MBSCTL
+        D16(EBIU_MBSCTL);
+        D32(EBIU_ARBSTAT);
+        D32(EBIU_MODE);
+        D16(EBIU_FCTL);
+#endif
+
+#ifdef EBIU_SDGCTL
+        parent = debugfs_create_dir("ebiu_sdram", top);
+# ifdef __ADSPBF561__
+        D32(EBIU_SDBCTL);
+# else
+        D16(EBIU_SDBCTL);
+# endif
+        D32(EBIU_SDGCTL);
+        D16(EBIU_SDRRC);
+        D16(EBIU_SDSTAT);
+#endif
+
+#ifdef EBIU_DDRACCT
+        parent = debugfs_create_dir("ebiu_ddr", top);
+        D32(EBIU_DDRACCT);
+        D32(EBIU_DDRARCT);
+        D32(EBIU_DDRBRC0);
+        D32(EBIU_DDRBRC1);
+        D32(EBIU_DDRBRC2);
+        D32(EBIU_DDRBRC3);
+        D32(EBIU_DDRBRC4);
+        D32(EBIU_DDRBRC5);
+        D32(EBIU_DDRBRC6);
+        D32(EBIU_DDRBRC7);
+        D32(EBIU_DDRBWC0);
+        D32(EBIU_DDRBWC1);
+        D32(EBIU_DDRBWC2);
+        D32(EBIU_DDRBWC3);
+        D32(EBIU_DDRBWC4);
+        D32(EBIU_DDRBWC5);
+        D32(EBIU_DDRBWC6);
+        D32(EBIU_DDRBWC7);
+        D32(EBIU_DDRCTL0);
+        D32(EBIU_DDRCTL1);
+        D32(EBIU_DDRCTL2);
+        D32(EBIU_DDRCTL3);
+        D32(EBIU_DDRGC0);
+        D32(EBIU_DDRGC1);
+        D32(EBIU_DDRGC2);
+        D32(EBIU_DDRGC3);
+        D32(EBIU_DDRMCCL);
+        D32(EBIU_DDRMCEN);
+        D32(EBIU_DDRQUE);
+        D32(EBIU_DDRTACT);
+        D32(EBIU_ERRADD);
+        D16(EBIU_ERRMST);
+        D16(EBIU_RSTCTL);
+#endif
+
+#ifdef EMAC_ADDRHI
+        parent = debugfs_create_dir("emac", top);
+        D32(EMAC_ADDRHI);
+        D32(EMAC_ADDRLO);
+        D32(EMAC_FLC);
+        D32(EMAC_HASHHI);
+        D32(EMAC_HASHLO);
+        D32(EMAC_MMC_CTL);
+        D32(EMAC_MMC_RIRQE);
+        D32(EMAC_MMC_RIRQS);
+        D32(EMAC_MMC_TIRQE);
+        D32(EMAC_MMC_TIRQS);
+        D32(EMAC_OPMODE);
+        D32(EMAC_RXC_ALIGN);
+        D32(EMAC_RXC_ALLFRM);
+        D32(EMAC_RXC_ALLOCT);
+        D32(EMAC_RXC_BROAD);
+        D32(EMAC_RXC_DMAOVF);
+        D32(EMAC_RXC_EQ64);
+        D32(EMAC_RXC_FCS);
+        D32(EMAC_RXC_GE1024);
+        D32(EMAC_RXC_LNERRI);
+        D32(EMAC_RXC_LNERRO);
+        D32(EMAC_RXC_LONG);
+        D32(EMAC_RXC_LT1024);
+        D32(EMAC_RXC_LT128);
+        D32(EMAC_RXC_LT256);
+        D32(EMAC_RXC_LT512);
+        D32(EMAC_RXC_MACCTL);
+        D32(EMAC_RXC_MULTI);
+        D32(EMAC_RXC_OCTET);
+        D32(EMAC_RXC_OK);
+        D32(EMAC_RXC_OPCODE);
+        D32(EMAC_RXC_PAUSE);
+        D32(EMAC_RXC_SHORT);
+        D32(EMAC_RXC_TYPED);
+        D32(EMAC_RXC_UNICST);
+        D32(EMAC_RX_IRQE);
+        D32(EMAC_RX_STAT);
+        D32(EMAC_RX_STKY);
+        D32(EMAC_STAADD);
+        D32(EMAC_STADAT);
+        D32(EMAC_SYSCTL);
+        D32(EMAC_SYSTAT);
+        D32(EMAC_TXC_1COL);
+        D32(EMAC_TXC_ABORT);
+        D32(EMAC_TXC_ALLFRM);
+        D32(EMAC_TXC_ALLOCT);
+        D32(EMAC_TXC_BROAD);
+        D32(EMAC_TXC_CRSERR);
+        D32(EMAC_TXC_DEFER);
+        D32(EMAC_TXC_DMAUND);
+        D32(EMAC_TXC_EQ64);
+        D32(EMAC_TXC_GE1024);
+        D32(EMAC_TXC_GT1COL);
+        D32(EMAC_TXC_LATECL);
+        D32(EMAC_TXC_LT1024);
+        D32(EMAC_TXC_LT128);
+        D32(EMAC_TXC_LT256);
+        D32(EMAC_TXC_LT512);
+        D32(EMAC_TXC_MACCTL);
+        D32(EMAC_TXC_MULTI);
+        D32(EMAC_TXC_OCTET);
+        D32(EMAC_TXC_OK);
+        D32(EMAC_TXC_UNICST);
+        D32(EMAC_TXC_XS_COL);
+        D32(EMAC_TXC_XS_DFR);
+        D32(EMAC_TX_IRQE);
+        D32(EMAC_TX_STAT);
+        D32(EMAC_TX_STKY);
+        D32(EMAC_VLAN1);
+        D32(EMAC_VLAN2);
+        D32(EMAC_WKUP_CTL);
+        D32(EMAC_WKUP_FFCMD);
+        D32(EMAC_WKUP_FFCRC0);
+        D32(EMAC_WKUP_FFCRC1);
+        D32(EMAC_WKUP_FFMSK0);
+        D32(EMAC_WKUP_FFMSK1);
+        D32(EMAC_WKUP_FFMSK2);
+        D32(EMAC_WKUP_FFMSK3);
+        D32(EMAC_WKUP_FFOFF);
+# ifdef EMAC_PTP_ACCR
+        D32(EMAC_PTP_ACCR);
+        D32(EMAC_PTP_ADDEND);
+        D32(EMAC_PTP_ALARMHI);
+        D32(EMAC_PTP_ALARMLO);
+        D16(EMAC_PTP_CTL);
+        D32(EMAC_PTP_FOFF);
+        D32(EMAC_PTP_FV1);
+        D32(EMAC_PTP_FV2);
+        D32(EMAC_PTP_FV3);
+        D16(EMAC_PTP_ID_OFF);
+        D32(EMAC_PTP_ID_SNAP);
+        D16(EMAC_PTP_IE);
+        D16(EMAC_PTP_ISTAT);
+        D32(EMAC_PTP_OFFSET);
+        D32(EMAC_PTP_PPS_PERIOD);
+        D32(EMAC_PTP_PPS_STARTHI);
+        D32(EMAC_PTP_PPS_STARTLO);
+        D32(EMAC_PTP_RXSNAPHI);
+        D32(EMAC_PTP_RXSNAPLO);
+        D32(EMAC_PTP_TIMEHI);
+        D32(EMAC_PTP_TIMELO);
+        D32(EMAC_PTP_TXSNAPHI);
+        D32(EMAC_PTP_TXSNAPLO);
+# endif
+#endif
+
+#if defined(EPPI0_STATUS) || defined(EPPI1_STATUS) || defined(EPPI2_STATUS)
+        parent = debugfs_create_dir("eppi", top);
+# ifdef EPPI0_STATUS
+        EPPI(0);
+# endif
+# ifdef EPPI1_STATUS
+        EPPI(1);
+# endif
+# ifdef EPPI2_STATUS
+        EPPI(2);
+# endif
+#endif
+
+        parent = debugfs_create_dir("gptimer", top);
+#ifdef TIMER_DISABLE
+        D16(TIMER_DISABLE);
+        D16(TIMER_ENABLE);
+        D32(TIMER_STATUS);
+#endif
+#ifdef TIMER_DISABLE0
+        D16(TIMER_DISABLE0);
+        D16(TIMER_ENABLE0);
+        D32(TIMER_STATUS0);
+#endif
+#ifdef TIMER_DISABLE1
+        D16(TIMER_DISABLE1);
+        D16(TIMER_ENABLE1);
+        D32(TIMER_STATUS1);
+#endif
+        /* XXX: Should convert BF561 MMR names */
+#ifdef TMRS4_DISABLE
+        D16(TMRS4_DISABLE);
+        D16(TMRS4_ENABLE);
+        D32(TMRS4_STATUS);
+        D16(TMRS8_DISABLE);
+        D16(TMRS8_ENABLE);
+        D32(TMRS8_STATUS);
+#endif
+        GPTIMER(0);
+        GPTIMER(1);
+        GPTIMER(2);
+#ifdef TIMER3_CONFIG
+        GPTIMER(3);
+        GPTIMER(4);
+        GPTIMER(5);
+        GPTIMER(6);
+        GPTIMER(7);
+#endif
+#ifdef TIMER8_CONFIG
+        GPTIMER(8);
+        GPTIMER(9);
+        GPTIMER(10);
+#endif
+#ifdef TIMER11_CONFIG
+        GPTIMER(11);
+#endif
+
+#ifdef HMDMA0_CONTROL
+        parent = debugfs_create_dir("hmdma", top);
+        HMDMA(0);
+        HMDMA(1);
+#endif
+
+#ifdef HOST_CONTROL
+        parent = debugfs_create_dir("hostdp", top);
+        D16(HOST_CONTROL);
+        D16(HOST_STATUS);
+        D16(HOST_TIMEOUT);
+#endif
+
+#ifdef IMDMA_S0_CONFIG
+        parent = debugfs_create_dir("imdma", top);
+        IMDMA(0);
+        IMDMA(1);
+#endif
+
+#ifdef KPAD_CTL
+        parent = debugfs_create_dir("keypad", top);
+        D16(KPAD_CTL);
+        D16(KPAD_PRESCALE);
+        D16(KPAD_MSEL);
+        D16(KPAD_ROWCOL);
+        D16(KPAD_STAT);
+        D16(KPAD_SOFTEVAL);
+#endif
+
+        parent = debugfs_create_dir("mdma", top);
+        MDMA(0);
+        MDMA(1);
+#ifdef MDMA_D2_CONFIG
+        MDMA(2);
+        MDMA(3);
+#endif
+
+#ifdef MXVR_CONFIG
+        parent = debugfs_create_dir("mxvr", top);
+        D16(MXVR_CONFIG);
+# ifdef MXVR_PLL_CTL_0
+        D32(MXVR_PLL_CTL_0);
+# endif
+        D32(MXVR_STATE_0);
+        D32(MXVR_STATE_1);
+        D32(MXVR_INT_STAT_0);
+        D32(MXVR_INT_STAT_1);
+        D32(MXVR_INT_EN_0);
+        D32(MXVR_INT_EN_1);
+        D16(MXVR_POSITION);
+        D16(MXVR_MAX_POSITION);
+        D16(MXVR_DELAY);
+        D16(MXVR_MAX_DELAY);
+        D32(MXVR_LADDR);
+        D16(MXVR_GADDR);
+        D32(MXVR_AADDR);
+        D32(MXVR_ALLOC_0);
+        D32(MXVR_ALLOC_1);
+        D32(MXVR_ALLOC_2);
+        D32(MXVR_ALLOC_3);
+        D32(MXVR_ALLOC_4);
+        D32(MXVR_ALLOC_5);
+        D32(MXVR_ALLOC_6);
+        D32(MXVR_ALLOC_7);
+        D32(MXVR_ALLOC_8);
+        D32(MXVR_ALLOC_9);
+        D32(MXVR_ALLOC_10);
+        D32(MXVR_ALLOC_11);
+        D32(MXVR_ALLOC_12);
+        D32(MXVR_ALLOC_13);
+        D32(MXVR_ALLOC_14);
+        D32(MXVR_SYNC_LCHAN_0);
+        D32(MXVR_SYNC_LCHAN_1);
+        D32(MXVR_SYNC_LCHAN_2);
+        D32(MXVR_SYNC_LCHAN_3);
+        D32(MXVR_SYNC_LCHAN_4);
+        D32(MXVR_SYNC_LCHAN_5);
+        D32(MXVR_SYNC_LCHAN_6);
+        D32(MXVR_SYNC_LCHAN_7);
+        D32(MXVR_DMA0_CONFIG);
+        D32(MXVR_DMA0_START_ADDR);
+        D16(MXVR_DMA0_COUNT);
+        D32(MXVR_DMA0_CURR_ADDR);
+        D16(MXVR_DMA0_CURR_COUNT);
+        D32(MXVR_DMA1_CONFIG);
+        D32(MXVR_DMA1_START_ADDR);
+        D16(MXVR_DMA1_COUNT);
+        D32(MXVR_DMA1_CURR_ADDR);
+        D16(MXVR_DMA1_CURR_COUNT);
+        D32(MXVR_DMA2_CONFIG);
+        D32(MXVR_DMA2_START_ADDR);
+        D16(MXVR_DMA2_COUNT);
+        D32(MXVR_DMA2_CURR_ADDR);
+        D16(MXVR_DMA2_CURR_COUNT);
+        D32(MXVR_DMA3_CONFIG);
+        D32(MXVR_DMA3_START_ADDR);
+        D16(MXVR_DMA3_COUNT);
+        D32(MXVR_DMA3_CURR_ADDR);
+        D16(MXVR_DMA3_CURR_COUNT);
+        D32(MXVR_DMA4_CONFIG);
+        D32(MXVR_DMA4_START_ADDR);
+        D16(MXVR_DMA4_COUNT);
+        D32(MXVR_DMA4_CURR_ADDR);
+        D16(MXVR_DMA4_CURR_COUNT);
+        D32(MXVR_DMA5_CONFIG);
+        D32(MXVR_DMA5_START_ADDR);
+        D16(MXVR_DMA5_COUNT);
+        D32(MXVR_DMA5_CURR_ADDR);
+        D16(MXVR_DMA5_CURR_COUNT);
+        D32(MXVR_DMA6_CONFIG);
+        D32(MXVR_DMA6_START_ADDR);
+        D16(MXVR_DMA6_COUNT);
+        D32(MXVR_DMA6_CURR_ADDR);
+        D16(MXVR_DMA6_CURR_COUNT);
+        D32(MXVR_DMA7_CONFIG);
+        D32(MXVR_DMA7_START_ADDR);
+        D16(MXVR_DMA7_COUNT);
+        D32(MXVR_DMA7_CURR_ADDR);
+        D16(MXVR_DMA7_CURR_COUNT);
+        D16(MXVR_AP_CTL);
+        D32(MXVR_APRB_START_ADDR);
+        D32(MXVR_APRB_CURR_ADDR);
+        D32(MXVR_APTB_START_ADDR);
+        D32(MXVR_APTB_CURR_ADDR);
+        D32(MXVR_CM_CTL);
+        D32(MXVR_CMRB_START_ADDR);
+        D32(MXVR_CMRB_CURR_ADDR);
+        D32(MXVR_CMTB_START_ADDR);
+        D32(MXVR_CMTB_CURR_ADDR);
+        D32(MXVR_RRDB_START_ADDR);
+        D32(MXVR_RRDB_CURR_ADDR);
+        D32(MXVR_PAT_DATA_0);
+        D32(MXVR_PAT_EN_0);
+        D32(MXVR_PAT_DATA_1);
+        D32(MXVR_PAT_EN_1);
+        D16(MXVR_FRAME_CNT_0);
+        D16(MXVR_FRAME_CNT_1);
+        D32(MXVR_ROUTING_0);
+        D32(MXVR_ROUTING_1);
+        D32(MXVR_ROUTING_2);
+        D32(MXVR_ROUTING_3);
+        D32(MXVR_ROUTING_4);
+        D32(MXVR_ROUTING_5);
+        D32(MXVR_ROUTING_6);
+        D32(MXVR_ROUTING_7);
+        D32(MXVR_ROUTING_8);
+        D32(MXVR_ROUTING_9);
+        D32(MXVR_ROUTING_10);
+        D32(MXVR_ROUTING_11);
+        D32(MXVR_ROUTING_12);
+        D32(MXVR_ROUTING_13);
+        D32(MXVR_ROUTING_14);
+# ifdef MXVR_PLL_CTL_1
+        D32(MXVR_PLL_CTL_1);
+# endif
+        D16(MXVR_BLOCK_CNT);
+# ifdef MXVR_CLK_CTL
+        D32(MXVR_CLK_CTL);
+# endif
+# ifdef MXVR_CDRPLL_CTL
+        D32(MXVR_CDRPLL_CTL);
+# endif
+# ifdef MXVR_FMPLL_CTL
+        D32(MXVR_FMPLL_CTL);
+# endif
+# ifdef MXVR_PIN_CTL
+        D16(MXVR_PIN_CTL);
+# endif
+# ifdef MXVR_SCLK_CNT
+        D16(MXVR_SCLK_CNT);
+# endif
+#endif
+
+#ifdef NFC_ADDR
+        parent = debugfs_create_dir("nfc", top);
+        D_WO(NFC_ADDR, 16);
+        D_WO(NFC_CMD, 16);
+        D_RO(NFC_COUNT, 16);
+        D16(NFC_CTL);
+        D_WO(NFC_DATA_RD, 16);
+        D_WO(NFC_DATA_WR, 16);
+        D_RO(NFC_ECC0, 16);
+        D_RO(NFC_ECC1, 16);
+        D_RO(NFC_ECC2, 16);
+        D_RO(NFC_ECC3, 16);
+        D16(NFC_IRQMASK);
+        D16(NFC_IRQSTAT);
+        D_WO(NFC_PGCTL, 16);
+        D_RO(NFC_READ, 16);
+        D16(NFC_RST);
+        D_RO(NFC_STAT, 16);
+#endif
+
+#ifdef OTP_CONTROL
+        parent = debugfs_create_dir("otp", top);
+        D16(OTP_CONTROL);
+        D16(OTP_BEN);
+        D16(OTP_STATUS);
+        D32(OTP_TIMING);
+        D32(OTP_DATA0);
+        D32(OTP_DATA1);
+        D32(OTP_DATA2);
+        D32(OTP_DATA3);
+#endif
+
+#ifdef PIXC_CTL
+        parent = debugfs_create_dir("pixc", top);
+        D16(PIXC_CTL);
+        D16(PIXC_PPL);
+        D16(PIXC_LPF);
+        D16(PIXC_AHSTART);
+        D16(PIXC_AHEND);
+        D16(PIXC_AVSTART);
+        D16(PIXC_AVEND);
+        D16(PIXC_ATRANSP);
+        D16(PIXC_BHSTART);
+        D16(PIXC_BHEND);
+        D16(PIXC_BVSTART);
+        D16(PIXC_BVEND);
+        D16(PIXC_BTRANSP);
+        D16(PIXC_INTRSTAT);
+        D32(PIXC_RYCON);
+        D32(PIXC_GUCON);
+        D32(PIXC_BVCON);
+        D32(PIXC_CCBIAS);
+        D32(PIXC_TC);
+#endif
+
+        parent = debugfs_create_dir("pll", top);
+        D16(PLL_CTL);
+        D16(PLL_DIV);
+        D16(PLL_LOCKCNT);
+        D16(PLL_STAT);
+        D16(VR_CTL);
+        D32(CHIPID);    /* it's part of this hardware block */
+
+#if defined(PPI_STATUS) || defined(PPI0_STATUS) || defined(PPI1_STATUS)
+        parent = debugfs_create_dir("ppi", top);
+# ifdef PPI_STATUS
+        bfin_debug_mmrs_ppi(parent, PPI_STATUS, -1);
+# endif
+# ifdef PPI0_STATUS
+        PPI(0);
+# endif
+# ifdef PPI1_STATUS
+        PPI(1);
+# endif
+#endif
+
+#ifdef PWM_CTRL
+        parent = debugfs_create_dir("pwm", top);
+        D16(PWM_CTRL);
+        D16(PWM_STAT);
+        D16(PWM_TM);
+        D16(PWM_DT);
+        D16(PWM_GATE);
+        D16(PWM_CHA);
+        D16(PWM_CHB);
+        D16(PWM_CHC);
+        D16(PWM_SEG);
+        D16(PWM_SYNCWT);
+        D16(PWM_CHAL);
+        D16(PWM_CHBL);
+        D16(PWM_CHCL);
+        D16(PWM_LSI);
+        D16(PWM_STAT2);
+#endif
+
+#ifdef RSI_CONFIG
+        parent = debugfs_create_dir("rsi", top);
+        D32(RSI_ARGUMENT);
+        D16(RSI_CEATA_CONTROL);
+        D16(RSI_CLK_CONTROL);
+        D16(RSI_COMMAND);
+        D16(RSI_CONFIG);
+        D16(RSI_DATA_CNT);
+        D16(RSI_DATA_CONTROL);
+        D16(RSI_DATA_LGTH);
+        D32(RSI_DATA_TIMER);
+        D16(RSI_EMASK);
+        D16(RSI_ESTAT);
+        D32(RSI_FIFO);
+        D16(RSI_FIFO_CNT);
+        D32(RSI_MASK0);
+        D32(RSI_MASK1);
+        D16(RSI_PID0);
+        D16(RSI_PID1);
+        D16(RSI_PID2);
+        D16(RSI_PID3);
+        D16(RSI_PWR_CONTROL);
+        D16(RSI_RD_WAIT_EN);
+        D32(RSI_RESPONSE0);
+        D32(RSI_RESPONSE1);
+        D32(RSI_RESPONSE2);
+        D32(RSI_RESPONSE3);
+        D16(RSI_RESP_CMD);
+        D32(RSI_STATUS);
+        D_WO(RSI_STATUSCL, 16);
+#endif
+
+#ifdef RTC_ALARM
+        parent = debugfs_create_dir("rtc", top);
+        D32(RTC_ALARM);
+        D16(RTC_ICTL);
+        D16(RTC_ISTAT);
+        D16(RTC_PREN);
+        D32(RTC_STAT);
+        D16(RTC_SWCNT);
+#endif
+
+#ifdef SDH_CFG
+        parent = debugfs_create_dir("sdh", top);
+        D32(SDH_ARGUMENT);
+        D16(SDH_CFG);
+        D16(SDH_CLK_CTL);
+        D16(SDH_COMMAND);
+        D_RO(SDH_DATA_CNT, 16);
+        D16(SDH_DATA_CTL);
+        D16(SDH_DATA_LGTH);
+        D32(SDH_DATA_TIMER);
+        D16(SDH_E_MASK);
+        D16(SDH_E_STATUS);
+        D32(SDH_FIFO);
+        D_RO(SDH_FIFO_CNT, 16);
+        D32(SDH_MASK0);
+        D32(SDH_MASK1);
+        D_RO(SDH_PID0, 16);
+        D_RO(SDH_PID1, 16);
+        D_RO(SDH_PID2, 16);
+        D_RO(SDH_PID3, 16);
+        D_RO(SDH_PID4, 16);
+        D_RO(SDH_PID5, 16);
+        D_RO(SDH_PID6, 16);
+        D_RO(SDH_PID7, 16);
+        D16(SDH_PWR_CTL);
+        D16(SDH_RD_WAIT_EN);
+        D_RO(SDH_RESPONSE0, 32);
+        D_RO(SDH_RESPONSE1, 32);
+        D_RO(SDH_RESPONSE2, 32);
+        D_RO(SDH_RESPONSE3, 32);
+        D_RO(SDH_RESP_CMD, 16);
+        D_RO(SDH_STATUS, 32);
+        D_WO(SDH_STATUS_CLR, 16);
+#endif
+
+#ifdef SECURE_CONTROL
+        parent = debugfs_create_dir("security", top);
+        D16(SECURE_CONTROL);
+        D16(SECURE_STATUS);
+        D32(SECURE_SYSSWT);
+#endif
+
+        parent = debugfs_create_dir("sic", top);
+        D16(SWRST);
+        D16(SYSCR);
+        D16(SIC_RVECT);
+        D32(SIC_IAR0);
+        D32(SIC_IAR1);
+        D32(SIC_IAR2);
+#ifdef SIC_IAR3
+        D32(SIC_IAR3);
+#endif
+#ifdef SIC_IAR4
+        D32(SIC_IAR4);
+        D32(SIC_IAR5);
+        D32(SIC_IAR6);
+#endif
+#ifdef SIC_IAR7
+        D32(SIC_IAR7);
+#endif
+#ifdef SIC_IAR8
+        D32(SIC_IAR8);
+        D32(SIC_IAR9);
+        D32(SIC_IAR10);
+        D32(SIC_IAR11);
+#endif
+#ifdef SIC_IMASK
+        D32(SIC_IMASK);
+        D32(SIC_ISR);
+        D32(SIC_IWR);
+#endif
+#ifdef SIC_IMASK0
+        D32(SIC_IMASK0);
+        D32(SIC_IMASK1);
+        D32(SIC_ISR0);
+        D32(SIC_ISR1);
+        D32(SIC_IWR0);
+        D32(SIC_IWR1);
+#endif
+#ifdef SIC_IMASK2
+        D32(SIC_IMASK2);
+        D32(SIC_ISR2);
+        D32(SIC_IWR2);
+#endif
+#ifdef SICB_RVECT
+        D16(SICB_SWRST);
+        D16(SICB_SYSCR);
+        D16(SICB_RVECT);
+        D32(SICB_IAR0);
+        D32(SICB_IAR1);
+        D32(SICB_IAR2);
+        D32(SICB_IAR3);
+        D32(SICB_IAR4);
+        D32(SICB_IAR5);
+        D32(SICB_IAR6);
+        D32(SICB_IAR7);
+        D32(SICB_IMASK0);
+        D32(SICB_IMASK1);
+        D32(SICB_ISR0);
+        D32(SICB_ISR1);
+        D32(SICB_IWR0);
+        D32(SICB_IWR1);
+#endif
+
+        parent = debugfs_create_dir("spi", top);
+#ifdef SPI0_REGBASE
+        SPI(0);
+#endif
+#ifdef SPI1_REGBASE
+        SPI(1);
+#endif
+#ifdef SPI2_REGBASE
+        SPI(2);
+#endif
+
+        parent = debugfs_create_dir("sport", top);
+#ifdef SPORT0_STAT
+        SPORT(0);
+#endif
+#ifdef SPORT1_STAT
+        SPORT(1);
+#endif
+#ifdef SPORT2_STAT
+        SPORT(2);
+#endif
+#ifdef SPORT3_STAT
+        SPORT(3);
+#endif
+
+#if defined(TWI_CLKDIV) || defined(TWI0_CLKDIV) || defined(TWI1_CLKDIV)
+        parent = debugfs_create_dir("twi", top);
+# ifdef TWI_CLKDIV
+        bfin_debug_mmrs_twi(parent, TWI_CLKDIV, -1);
+# endif
+# ifdef TWI0_CLKDIV
+        TWI(0);
+# endif
+# ifdef TWI1_CLKDIV
+        TWI(1);
+# endif
+#endif
+
+        parent = debugfs_create_dir("uart", top);
+#ifdef BFIN_UART_DLL
+        bfin_debug_mmrs_uart(parent, BFIN_UART_DLL, -1);
+#endif
+#ifdef UART0_DLL
+        UART(0);
+#endif
+#ifdef UART1_DLL
+        UART(1);
+#endif
+#ifdef UART2_DLL
+        UART(2);
+#endif
+#ifdef UART3_DLL
+        UART(3);
+#endif
+
+#ifdef USB_FADDR
+        parent = debugfs_create_dir("usb", top);
+        D16(USB_FADDR);
+        D16(USB_POWER);
+        D16(USB_INTRTX);
+        D16(USB_INTRRX);
+        D16(USB_INTRTXE);
+        D16(USB_INTRRXE);
+        D16(USB_INTRUSB);
+        D16(USB_INTRUSBE);
+        D16(USB_FRAME);
+        D16(USB_INDEX);
+        D16(USB_TESTMODE);
+        D16(USB_GLOBINTR);
+        D16(USB_GLOBAL_CTL);
+        D16(USB_TX_MAX_PACKET);
+        D16(USB_CSR0);
+        D16(USB_TXCSR);
+        D16(USB_RX_MAX_PACKET);
+        D16(USB_RXCSR);
+        D16(USB_COUNT0);
+        D16(USB_RXCOUNT);
+        D16(USB_TXTYPE);
+        D16(USB_NAKLIMIT0);
+        D16(USB_TXINTERVAL);
+        D16(USB_RXTYPE);
+        D16(USB_RXINTERVAL);
+        D16(USB_TXCOUNT);
+        D16(USB_EP0_FIFO);
+        D16(USB_EP1_FIFO);
+        D16(USB_EP2_FIFO);
+        D16(USB_EP3_FIFO);
+        D16(USB_EP4_FIFO);
+        D16(USB_EP5_FIFO);
+        D16(USB_EP6_FIFO);
+        D16(USB_EP7_FIFO);
+        D16(USB_OTG_DEV_CTL);
+        D16(USB_OTG_VBUS_IRQ);
+        D16(USB_OTG_VBUS_MASK);
+        D16(USB_LINKINFO);
+        D16(USB_VPLEN);
+        D16(USB_HS_EOF1);
+        D16(USB_FS_EOF1);
+        D16(USB_LS_EOF1);
+        D16(USB_APHY_CNTRL);
+        D16(USB_APHY_CALIB);
+        D16(USB_APHY_CNTRL2);
+        D16(USB_PHY_TEST);
+        D16(USB_PLLOSC_CTRL);
+        D16(USB_SRP_CLKDIV);
+        D16(USB_EP_NI0_TXMAXP);
+        D16(USB_EP_NI0_TXCSR);
+        D16(USB_EP_NI0_RXMAXP);
+        D16(USB_EP_NI0_RXCSR);
+        D16(USB_EP_NI0_RXCOUNT);
+        D16(USB_EP_NI0_TXTYPE);
+        D16(USB_EP_NI0_TXINTERVAL);
+        D16(USB_EP_NI0_RXTYPE);
+        D16(USB_EP_NI0_RXINTERVAL);
+        D16(USB_EP_NI0_TXCOUNT);
+        D16(USB_EP_NI1_TXMAXP);
+        D16(USB_EP_NI1_TXCSR);
+        D16(USB_EP_NI1_RXMAXP);
+        D16(USB_EP_NI1_RXCSR);
+        D16(USB_EP_NI1_RXCOUNT);
+        D16(USB_EP_NI1_TXTYPE);
+        D16(USB_EP_NI1_TXINTERVAL);
+        D16(USB_EP_NI1_RXTYPE);
+        D16(USB_EP_NI1_RXINTERVAL);
+        D16(USB_EP_NI1_TXCOUNT);
+        D16(USB_EP_NI2_TXMAXP);
+        D16(USB_EP_NI2_TXCSR);
+        D16(USB_EP_NI2_RXMAXP);
+        D16(USB_EP_NI2_RXCSR);
+        D16(USB_EP_NI2_RXCOUNT);
+        D16(USB_EP_NI2_TXTYPE);
+        D16(USB_EP_NI2_TXINTERVAL);
+        D16(USB_EP_NI2_RXTYPE);
+        D16(USB_EP_NI2_RXINTERVAL);
+        D16(USB_EP_NI2_TXCOUNT);
+        D16(USB_EP_NI3_TXMAXP);
+        D16(USB_EP_NI3_TXCSR);
+        D16(USB_EP_NI3_RXMAXP);
+        D16(USB_EP_NI3_RXCSR);
+        D16(USB_EP_NI3_RXCOUNT);
+        D16(USB_EP_NI3_TXTYPE);
+        D16(USB_EP_NI3_TXINTERVAL);
+        D16(USB_EP_NI3_RXTYPE);
+        D16(USB_EP_NI3_RXINTERVAL);
+        D16(USB_EP_NI3_TXCOUNT);
+        D16(USB_EP_NI4_TXMAXP);
+        D16(USB_EP_NI4_TXCSR);
+        D16(USB_EP_NI4_RXMAXP);
+        D16(USB_EP_NI4_RXCSR);
+        D16(USB_EP_NI4_RXCOUNT);
+        D16(USB_EP_NI4_TXTYPE);
+        D16(USB_EP_NI4_TXINTERVAL);
+        D16(USB_EP_NI4_RXTYPE);
+        D16(USB_EP_NI4_RXINTERVAL);
+        D16(USB_EP_NI4_TXCOUNT);
+        D16(USB_EP_NI5_TXMAXP);
+        D16(USB_EP_NI5_TXCSR);
+        D16(USB_EP_NI5_RXMAXP);
+        D16(USB_EP_NI5_RXCSR);
+        D16(USB_EP_NI5_RXCOUNT);
+        D16(USB_EP_NI5_TXTYPE);
+        D16(USB_EP_NI5_TXINTERVAL);
+        D16(USB_EP_NI5_RXTYPE);
+        D16(USB_EP_NI5_RXINTERVAL);
+        D16(USB_EP_NI5_TXCOUNT);
+        D16(USB_EP_NI6_TXMAXP);
+        D16(USB_EP_NI6_TXCSR);
+        D16(USB_EP_NI6_RXMAXP);
+        D16(USB_EP_NI6_RXCSR);
+        D16(USB_EP_NI6_RXCOUNT);
+        D16(USB_EP_NI6_TXTYPE);
+        D16(USB_EP_NI6_TXINTERVAL);
+        D16(USB_EP_NI6_RXTYPE);
+        D16(USB_EP_NI6_RXINTERVAL);
+        D16(USB_EP_NI6_TXCOUNT);
+        D16(USB_EP_NI7_TXMAXP);
+        D16(USB_EP_NI7_TXCSR);
+        D16(USB_EP_NI7_RXMAXP);
+        D16(USB_EP_NI7_RXCSR);
+        D16(USB_EP_NI7_RXCOUNT);
+        D16(USB_EP_NI7_TXTYPE);
+        D16(USB_EP_NI7_TXINTERVAL);
+        D16(USB_EP_NI7_RXTYPE);
+        D16(USB_EP_NI7_RXINTERVAL);
+        D16(USB_EP_NI7_TXCOUNT);
+        D16(USB_DMA_INTERRUPT);
+        D16(USB_DMA0CONTROL);
+        D16(USB_DMA0ADDRLOW);
+        D16(USB_DMA0ADDRHIGH);
+        D16(USB_DMA0COUNTLOW);
+        D16(USB_DMA0COUNTHIGH);
+        D16(USB_DMA1CONTROL);
+        D16(USB_DMA1ADDRLOW);
+        D16(USB_DMA1ADDRHIGH);
+        D16(USB_DMA1COUNTLOW);
+        D16(USB_DMA1COUNTHIGH);
+        D16(USB_DMA2CONTROL);
+        D16(USB_DMA2ADDRLOW);
+        D16(USB_DMA2ADDRHIGH);
+        D16(USB_DMA2COUNTLOW);
+        D16(USB_DMA2COUNTHIGH);
+        D16(USB_DMA3CONTROL);
+        D16(USB_DMA3ADDRLOW);
+        D16(USB_DMA3ADDRHIGH);
+        D16(USB_DMA3COUNTLOW);
+        D16(USB_DMA3COUNTHIGH);
+        D16(USB_DMA4CONTROL);
+        D16(USB_DMA4ADDRLOW);
+        D16(USB_DMA4ADDRHIGH);
+        D16(USB_DMA4COUNTLOW);
+        D16(USB_DMA4COUNTHIGH);
+        D16(USB_DMA5CONTROL);
+        D16(USB_DMA5ADDRLOW);
+        D16(USB_DMA5ADDRHIGH);
+        D16(USB_DMA5COUNTLOW);
+        D16(USB_DMA5COUNTHIGH);
+        D16(USB_DMA6CONTROL);
+        D16(USB_DMA6ADDRLOW);
+        D16(USB_DMA6ADDRHIGH);
+        D16(USB_DMA6COUNTLOW);
+        D16(USB_DMA6COUNTHIGH);
+        D16(USB_DMA7CONTROL);
+        D16(USB_DMA7ADDRLOW);
+        D16(USB_DMA7ADDRHIGH);
+        D16(USB_DMA7COUNTLOW);
+        D16(USB_DMA7COUNTHIGH);
+#endif
+
+#ifdef WDOG_CNT
+        parent = debugfs_create_dir("watchdog", top);
+        D32(WDOG_CNT);
+        D16(WDOG_CTL);
+        D32(WDOG_STAT);
+#endif
+#ifdef WDOGA_CNT
+        parent = debugfs_create_dir("watchdog", top);
+        D32(WDOGA_CNT);
+        D16(WDOGA_CTL);
+        D32(WDOGA_STAT);
+        D32(WDOGB_CNT);
+        D16(WDOGB_CTL);
+        D32(WDOGB_STAT);
+#endif
+
+        /* BF533 glue */
+#ifdef FIO_FLAG_D
+#define PORTFIO FIO_FLAG_D
+#endif
+        /* BF561 glue */
+#ifdef FIO0_FLAG_D
+#define PORTFIO FIO0_FLAG_D
+#endif
+#ifdef FIO1_FLAG_D
+#define PORTGIO FIO1_FLAG_D
+#endif
+#ifdef FIO2_FLAG_D
+#define PORTHIO FIO2_FLAG_D
+#endif
+        parent = debugfs_create_dir("port", top);
+#ifdef PORTFIO
+        PORT(PORTFIO, 'F');
+#endif
+#ifdef PORTGIO
+        PORT(PORTGIO, 'G');
+#endif
+#ifdef PORTHIO
+        PORT(PORTHIO, 'H');
+#endif
+
+#ifdef __ADSPBF51x__
+        D16(PORTF_FER);
+        D16(PORTF_DRIVE);
+        D16(PORTF_HYSTERESIS);
+        D16(PORTF_MUX);
+
+        D16(PORTG_FER);
+        D16(PORTG_DRIVE);
+        D16(PORTG_HYSTERESIS);
+        D16(PORTG_MUX);
+
+        D16(PORTH_FER);
+        D16(PORTH_DRIVE);
+        D16(PORTH_HYSTERESIS);
+        D16(PORTH_MUX);
+
+        D16(MISCPORT_DRIVE);
+        D16(MISCPORT_HYSTERESIS);
+#endif  /* BF51x */
+
+#ifdef __ADSPBF52x__
+        D16(PORTF_FER);
+        D16(PORTF_DRIVE);
+        D16(PORTF_HYSTERESIS);
+        D16(PORTF_MUX);
+        D16(PORTF_SLEW);
+
+        D16(PORTG_FER);
+        D16(PORTG_DRIVE);
+        D16(PORTG_HYSTERESIS);
+        D16(PORTG_MUX);
+        D16(PORTG_SLEW);
+
+        D16(PORTH_FER);
+        D16(PORTH_DRIVE);
+        D16(PORTH_HYSTERESIS);
+        D16(PORTH_MUX);
+        D16(PORTH_SLEW);
+
+        D16(MISCPORT_DRIVE);
+        D16(MISCPORT_HYSTERESIS);
+        D16(MISCPORT_SLEW);
+#endif  /* BF52x */
+
+#ifdef BF537_FAMILY
+        D16(PORTF_FER);
+        D16(PORTG_FER);
+        D16(PORTH_FER);
+        D16(PORT_MUX);
+#endif  /* BF534 BF536 BF537 */
+
+#ifdef BF538_FAMILY
+        D16(PORTCIO_FER);
+        D16(PORTCIO);
+        D16(PORTCIO_CLEAR);
+        D16(PORTCIO_SET);
+        D16(PORTCIO_TOGGLE);
+        D16(PORTCIO_DIR);
+        D16(PORTCIO_INEN);
+
+        D16(PORTDIO);
+        D16(PORTDIO_CLEAR);
+        D16(PORTDIO_DIR);
+        D16(PORTDIO_FER);
+        D16(PORTDIO_INEN);
+        D16(PORTDIO_SET);
+        D16(PORTDIO_TOGGLE);
+
+        D16(PORTEIO);
+        D16(PORTEIO_CLEAR);
+        D16(PORTEIO_DIR);
+        D16(PORTEIO_FER);
+        D16(PORTEIO_INEN);
+        D16(PORTEIO_SET);
+        D16(PORTEIO_TOGGLE);
+#endif  /* BF538 BF539 */
+
+#ifdef __ADSPBF54x__
+        {
+                int num;
+                unsigned long base;
+                char *_buf, buf[32];
+
+                base = PORTA_FER;
+                for (num = 0; num < 10; ++num) {
+                        PORT(base, num);
+                        base += sizeof(struct bfin_gpio_regs);
+                }
+
+#define __PINT(uname, lname) __REGS(pint, #uname, lname)
+                parent = debugfs_create_dir("pint", top);
+                base = PINT0_MASK_SET;
+                for (num = 0; num < 4; ++num) {
+                        _buf = REGS_STR_PFX(buf, PINT, num);
+                        __PINT(MASK_SET, mask_set);
+                        __PINT(MASK_CLEAR, mask_clear);
+                        __PINT(IRQ, irq);
+                        __PINT(ASSIGN, assign);
+                        __PINT(EDGE_SET, edge_set);
+                        __PINT(EDGE_CLEAR, edge_clear);
+                        __PINT(INVERT_SET, invert_set);
+                        __PINT(INVERT_CLEAR, invert_clear);
+                        __PINT(PINSTATE, pinstate);
+                        __PINT(LATCH, latch);
+                        base += sizeof(struct bfin_pint_regs);
+                }
+
+        }
+#endif  /* BF54x */
+
+        debug_mmrs_dentry = top;
+
+        return 0;
+}
+module_init(bfin_debug_mmrs_init);
+
+static void __exit bfin_debug_mmrs_exit(void)
+{
+        debugfs_remove_recursive(debug_mmrs_dentry);
+}
+module_exit(bfin_debug_mmrs_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/arch/blackfin/kernel/ipipe.c b/arch/blackfin/kernel/ipipe.c
index f37019c847c9..486426f8a0d7 100644
--- a/arch/blackfin/kernel/ipipe.c
+++ b/arch/blackfin/kernel/ipipe.c
@@ -33,6 +33,7 @@
 #include <linux/io.h>
 #include <asm/system.h>
 #include <asm/atomic.h>
+#include <asm/irq_handler.h>
 
 DEFINE_PER_CPU(struct pt_regs, __ipipe_tick_regs);
 
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c
index 1696d34f51c2..ff3d747154ac 100644
--- a/arch/blackfin/kernel/irqchip.c
+++ b/arch/blackfin/kernel/irqchip.c
@@ -11,6 +11,7 @@
 #include <linux/kallsyms.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <asm/irq_handler.h>
 #include <asm/trace.h>
 #include <asm/pda.h>
 
diff --git a/arch/blackfin/kernel/nmi.c b/arch/blackfin/kernel/nmi.c
index 0b5f72f17fd0..679d0db35256 100644
--- a/arch/blackfin/kernel/nmi.c
+++ b/arch/blackfin/kernel/nmi.c
@@ -12,7 +12,7 @@
 
 #include <linux/bitops.h>
 #include <linux/hardirq.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/pm.h>
 #include <linux/nmi.h>
 #include <linux/smp.h>
@@ -145,16 +145,16 @@ int check_nmi_wdt_touched(void)
 {
         unsigned int this_cpu = smp_processor_id();
         unsigned int cpu;
+        cpumask_t mask;
 
-        cpumask_t mask = cpu_online_map;
-
+        cpumask_copy(&mask, cpu_online_mask);
         if (!atomic_read(&nmi_touched[this_cpu]))
                 return 0;
 
         atomic_set(&nmi_touched[this_cpu], 0);
 
-        cpu_clear(this_cpu, mask);
-        for_each_cpu_mask(cpu, mask) {
+        cpumask_clear_cpu(this_cpu, &mask);
+        for_each_cpu(cpu, &mask) {
                 invalidate_dcache_range((unsigned long)(&nmi_touched[cpu]),
                                 (unsigned long)(&nmi_touched[cpu]));
                 if (!atomic_read(&nmi_touched[cpu]))
@@ -196,43 +196,31 @@ void touch_nmi_watchdog(void)
 
 /* Suspend/resume support */
 #ifdef CONFIG_PM
-static int nmi_wdt_suspend(struct sys_device *dev, pm_message_t state)
+static int nmi_wdt_suspend(void)
 {
         nmi_wdt_stop();
         return 0;
 }
 
-static int nmi_wdt_resume(struct sys_device *dev)
+static void nmi_wdt_resume(void)
 {
         if (nmi_active)
                 nmi_wdt_start();
-        return 0;
 }
 
-static struct sysdev_class nmi_sysclass = {
-        .name           = DRV_NAME,
+static struct syscore_ops nmi_syscore_ops = {
         .resume         = nmi_wdt_resume,
         .suspend        = nmi_wdt_suspend,
 };
 
-static struct sys_device device_nmi_wdt = {
-        .id     = 0,
-        .cls    = &nmi_sysclass,
-};
-
-static int __init init_nmi_wdt_sysfs(void)
+static int __init init_nmi_wdt_syscore(void)
 {
-        int error;
-
-        if (!nmi_active)
-                return 0;
+        if (nmi_active)
+                register_syscore_ops(&nmi_syscore_ops);
 
-        error = sysdev_class_register(&nmi_sysclass);
-        if (!error)
-                error = sysdev_register(&device_nmi_wdt);
-        return error;
+        return 0;
 }
-late_initcall(init_nmi_wdt_sysfs);
+late_initcall(init_nmi_wdt_syscore);
 
 #endif  /* CONFIG_PM */
 
diff --git a/arch/blackfin/kernel/perf_event.c b/arch/blackfin/kernel/perf_event.c
new file mode 100644
index 000000000000..04300f29c0e7
--- /dev/null
+++ b/arch/blackfin/kernel/perf_event.c
@@ -0,0 +1,498 @@
+/*
+ * Blackfin performance counters
+ *
+ * Copyright 2011 Analog Devices Inc.
+ *
+ * Ripped from SuperH version:
+ *
+ *  Copyright (C) 2009  Paul Mundt
+ *
+ * Heavily based on the x86 and PowerPC implementations.
+ *
+ * x86:
+ *  Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
+ *  Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar
+ *  Copyright (C) 2009 Jaswinder Singh Rajput
+ *  Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter
+ *  Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
+ *  Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com>
+ *
+ * ppc:
+ *  Copyright 2008-2009 Paul Mackerras, IBM Corporation.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/perf_event.h>
+#include <asm/bfin_pfmon.h>
+
+/*
+ * We have two counters, and each counter can support an event type.
+ * The 'o' is PFCNTx=1 and 's' is PFCNTx=0
+ *
+ * 0x04 o pc invariant branches
+ * 0x06 o mispredicted branches
+ * 0x09 o predicted branches taken
+ * 0x0B o EXCPT insn
+ * 0x0C o CSYNC/SSYNC insn
+ * 0x0D o Insns committed
+ * 0x0E o Interrupts taken
+ * 0x0F o Misaligned address exceptions
+ * 0x80 o Code memory fetches stalled due to DMA
+ * 0x83 o 64bit insn fetches delivered
+ * 0x9A o data cache fills (bank a)
+ * 0x9B o data cache fills (bank b)
+ * 0x9C o data cache lines evicted (bank a)
+ * 0x9D o data cache lines evicted (bank b)
+ * 0x9E o data cache high priority fills
+ * 0x9F o data cache low priority fills
+ * 0x00 s loop 0 iterations
+ * 0x01 s loop 1 iterations
+ * 0x0A s CSYNC/SSYNC stalls
+ * 0x10 s DAG read/after write hazards
+ * 0x13 s RAW data hazards
+ * 0x81 s code TAG stalls
+ * 0x82 s code fill stalls
+ * 0x90 s processor to memory stalls
+ * 0x91 s data memory stalls not hidden by 0x90
+ * 0x92 s data store buffer full stalls
+ * 0x93 s data memory write buffer full stalls due to high->low priority
+ * 0x95 s data memory fill buffer stalls
+ * 0x96 s data TAG collision stalls
+ * 0x97 s data collision stalls
+ * 0x98 s data stalls
+ * 0x99 s data stalls sent to processor
+ */
+
+static const int event_map[] = {
+        /* use CYCLES cpu register */
+        [PERF_COUNT_HW_CPU_CYCLES]          = -1,
+        [PERF_COUNT_HW_INSTRUCTIONS]        = 0x0D,
+        [PERF_COUNT_HW_CACHE_REFERENCES]    = -1,
+        [PERF_COUNT_HW_CACHE_MISSES]        = 0x83,
+        [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = 0x09,
+        [PERF_COUNT_HW_BRANCH_MISSES]       = 0x06,
+        [PERF_COUNT_HW_BUS_CYCLES]          = -1,
+};
+
+#define C(x)    PERF_COUNT_HW_CACHE_##x
+
+static const int cache_events[PERF_COUNT_HW_CACHE_MAX]
+                             [PERF_COUNT_HW_CACHE_OP_MAX]
+                             [PERF_COUNT_HW_CACHE_RESULT_MAX] =
+{
+        [C(L1D)] = {    /* Data bank A */
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)] = 0,
+                        [C(RESULT_MISS)  ] = 0x9A,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)] = 0,
+                        [C(RESULT_MISS)  ] = 0,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)] = 0,
+                        [C(RESULT_MISS)  ] = 0,
+                },
+        },
+
+        [C(L1I)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)] = 0,
+                        [C(RESULT_MISS)  ] = 0x83,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)] = 0,
+                        [C(RESULT_MISS)  ] = 0,
+                },
+        },
+
+        [C(LL)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+        },
+
+        [C(DTLB)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+        },
+
+        [C(ITLB)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+        },
+
+        [C(BPU)] = {
+                [C(OP_READ)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+                [C(OP_WRITE)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+                [C(OP_PREFETCH)] = {
+                        [C(RESULT_ACCESS)] = -1,
+                        [C(RESULT_MISS)  ] = -1,
+                },
+        },
+};
+
+const char *perf_pmu_name(void)
+{
+        return "bfin";
+}
+EXPORT_SYMBOL(perf_pmu_name);
+
+int perf_num_counters(void)
+{
+        return ARRAY_SIZE(event_map);
+}
+EXPORT_SYMBOL(perf_num_counters);
+
+static u64 bfin_pfmon_read(int idx)
+{
+        return bfin_read32(PFCNTR0 + (idx * 4));
+}
+
+static void bfin_pfmon_disable(struct hw_perf_event *hwc, int idx)
+{
+        bfin_write_PFCTL(bfin_read_PFCTL() & ~PFCEN(idx, PFCEN_MASK));
+}
+
+static void bfin_pfmon_enable(struct hw_perf_event *hwc, int idx)
+{
+        u32 val, mask;
+
+        val = PFPWR;
+        if (idx) {
+                mask = ~(PFCNT1 | PFMON1 | PFCEN1 | PEMUSW1);
+                /* The packed config is for event0, so shift it to event1 slots */
+                val |= (hwc->config << (PFMON1_P - PFMON0_P));
+                val |= (hwc->config & PFCNT0) << (PFCNT1_P - PFCNT0_P);
+                bfin_write_PFCNTR1(0);
+        } else {
+                mask = ~(PFCNT0 | PFMON0 | PFCEN0 | PEMUSW0);
+                val |= hwc->config;
+                bfin_write_PFCNTR0(0);
+        }
+
+        bfin_write_PFCTL((bfin_read_PFCTL() & mask) | val);
+}
+
+static void bfin_pfmon_disable_all(void)
+{
+        bfin_write_PFCTL(bfin_read_PFCTL() & ~PFPWR);
+}
+
+static void bfin_pfmon_enable_all(void)
+{
+        bfin_write_PFCTL(bfin_read_PFCTL() | PFPWR);
+}
+
+struct cpu_hw_events {
+        struct perf_event *events[MAX_HWEVENTS];
+        unsigned long used_mask[BITS_TO_LONGS(MAX_HWEVENTS)];
+};
+DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events);
+
+static int hw_perf_cache_event(int config, int *evp)
+{
+        unsigned long type, op, result;
+        int ev;
+
+        /* unpack config */
+        type = config & 0xff;
+        op = (config >> 8) & 0xff;
+        result = (config >> 16) & 0xff;
+
+        if (type >= PERF_COUNT_HW_CACHE_MAX ||
+            op >= PERF_COUNT_HW_CACHE_OP_MAX ||
+            result >= PERF_COUNT_HW_CACHE_RESULT_MAX)
+                return -EINVAL;
+
+        ev = cache_events[type][op][result];
+        if (ev == 0)
+                return -EOPNOTSUPP;
+        if (ev == -1)
+                return -EINVAL;
+        *evp = ev;
+        return 0;
+}
+
+static void bfin_perf_event_update(struct perf_event *event,
+                                   struct hw_perf_event *hwc, int idx)
+{
+        u64 prev_raw_count, new_raw_count;
+        s64 delta;
+        int shift = 0;
+
+        /*
+         * Depending on the counter configuration, they may or may not
+         * be chained, in which case the previous counter value can be
+         * updated underneath us if the lower-half overflows.
+         *
+         * Our tactic to handle this is to first atomically read and
+         * exchange a new raw count - then add that new-prev delta
+         * count to the generic counter atomically.
+         *
+         * As there is no interrupt associated with the overflow events,
+         * this is the simplest approach for maintaining consistency.
+         */
+again:
+        prev_raw_count = local64_read(&hwc->prev_count);
+        new_raw_count = bfin_pfmon_read(idx);
+
+        if (local64_cmpxchg(&hwc->prev_count, prev_raw_count,
+                             new_raw_count) != prev_raw_count)
+                goto again;
+
+        /*
+         * Now we have the new raw value and have updated the prev
+         * timestamp already. We can now calculate the elapsed delta
+         * (counter-)time and add that to the generic counter.
+         *
+         * Careful, not all hw sign-extends above the physical width
+         * of the count.
+         */
+        delta = (new_raw_count << shift) - (prev_raw_count << shift);
+        delta >>= shift;
+
+        local64_add(delta, &event->count);
+}
+
+static void bfin_pmu_stop(struct perf_event *event, int flags)
+{
+        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+        struct hw_perf_event *hwc = &event->hw;
+        int idx = hwc->idx;
+
+        if (!(event->hw.state & PERF_HES_STOPPED)) {
+                bfin_pfmon_disable(hwc, idx);
+                cpuc->events[idx] = NULL;
+                event->hw.state |= PERF_HES_STOPPED;
+        }
+
+        if ((flags & PERF_EF_UPDATE) && !(event->hw.state & PERF_HES_UPTODATE)) {
+                bfin_perf_event_update(event, &event->hw, idx);
+                event->hw.state |= PERF_HES_UPTODATE;
+        }
+}
+
+static void bfin_pmu_start(struct perf_event *event, int flags)
+{
+        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+        struct hw_perf_event *hwc = &event->hw;
+        int idx = hwc->idx;
+
+        if (WARN_ON_ONCE(idx == -1))
+                return;
+
+        if (flags & PERF_EF_RELOAD)
+                WARN_ON_ONCE(!(event->hw.state & PERF_HES_UPTODATE));
+
+        cpuc->events[idx] = event;
+        event->hw.state = 0;
+        bfin_pfmon_enable(hwc, idx);
+}
+
+static void bfin_pmu_del(struct perf_event *event, int flags)
+{
+        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+
+        bfin_pmu_stop(event, PERF_EF_UPDATE);
+        __clear_bit(event->hw.idx, cpuc->used_mask);
+
+        perf_event_update_userpage(event);
+}
+
+static int bfin_pmu_add(struct perf_event *event, int flags)
+{
+        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+        struct hw_perf_event *hwc = &event->hw;
+        int idx = hwc->idx;
+        int ret = -EAGAIN;
+
+        perf_pmu_disable(event->pmu);
+
+        if (__test_and_set_bit(idx, cpuc->used_mask)) {
+                idx = find_first_zero_bit(cpuc->used_mask, MAX_HWEVENTS);
+                if (idx == MAX_HWEVENTS)
+                        goto out;
+
+                __set_bit(idx, cpuc->used_mask);
+                hwc->idx = idx;
+        }
+
+        bfin_pfmon_disable(hwc, idx);
+
+        event->hw.state = PERF_HES_UPTODATE | PERF_HES_STOPPED;
+        if (flags & PERF_EF_START)
+                bfin_pmu_start(event, PERF_EF_RELOAD);
+
+        perf_event_update_userpage(event);
+        ret = 0;
+out:
+        perf_pmu_enable(event->pmu);
+        return ret;
+}
+
+static void bfin_pmu_read(struct perf_event *event)
+{
+        bfin_perf_event_update(event, &event->hw, event->hw.idx);
+}
+
+static int bfin_pmu_event_init(struct perf_event *event)
+{
+        struct perf_event_attr *attr = &event->attr;
+        struct hw_perf_event *hwc = &event->hw;
+        int config = -1;
+        int ret;
+
+        if (attr->exclude_hv || attr->exclude_idle)
+                return -EPERM;
+
+        /*
+         * All of the on-chip counters are "limited", in that they have
+         * no interrupts, and are therefore unable to do sampling without
+         * further work and timer assistance.
+         */
+        if (hwc->sample_period)
+                return -EINVAL;
+
+        ret = 0;
+        switch (attr->type) {
+        case PERF_TYPE_RAW:
+                config = PFMON(0, attr->config & PFMON_MASK) |
+                        PFCNT(0, !(attr->config & 0x100));
+                break;
+        case PERF_TYPE_HW_CACHE:
+                ret = hw_perf_cache_event(attr->config, &config);
+                break;
+        case PERF_TYPE_HARDWARE:
+                if (attr->config >= ARRAY_SIZE(event_map))
+                        return -EINVAL;
+
+                config = event_map[attr->config];
+                break;
+        }
+
+        if (config == -1)
+                return -EINVAL;
+
+        if (!attr->exclude_kernel)
+                config |= PFCEN(0, PFCEN_ENABLE_SUPV);
+        if (!attr->exclude_user)
+                config |= PFCEN(0, PFCEN_ENABLE_USER);
+
+        hwc->config |= config;
+
+        return ret;
+}
+
+static void bfin_pmu_enable(struct pmu *pmu)
+{
+        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
+        struct perf_event *event;
+        struct hw_perf_event *hwc;
+        int i;
+
+        for (i = 0; i < MAX_HWEVENTS; ++i) {
+                event = cpuc->events[i];
+                if (!event)
+                        continue;
+                hwc = &event->hw;
+                bfin_pfmon_enable(hwc, hwc->idx);
+        }
+
+        bfin_pfmon_enable_all();
+}
+
+static void bfin_pmu_disable(struct pmu *pmu)
+{
+        bfin_pfmon_disable_all();
+}
+
+static struct pmu pmu = {
+        .pmu_enable  = bfin_pmu_enable,
+        .pmu_disable = bfin_pmu_disable,
+        .event_init  = bfin_pmu_event_init,
+        .add         = bfin_pmu_add,
+        .del         = bfin_pmu_del,
+        .start       = bfin_pmu_start,
+        .stop        = bfin_pmu_stop,
+        .read        = bfin_pmu_read,
+};
+
+static void bfin_pmu_setup(int cpu)
+{
+        struct cpu_hw_events *cpuhw = &per_cpu(cpu_hw_events, cpu);
+
+        memset(cpuhw, 0, sizeof(struct cpu_hw_events));
+}
+
+static int __cpuinit
+bfin_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu)
+{
+        unsigned int cpu = (long)hcpu;
+
+        switch (action & ~CPU_TASKS_FROZEN) {
+        case CPU_UP_PREPARE:
+                bfin_write_PFCTL(0);
+                bfin_pmu_setup(cpu);
+                break;
+
+        default:
+                break;
+        }
+
+        return NOTIFY_OK;
+}
+
+static int __init bfin_pmu_init(void)
+{
+        int ret;
+
+        ret = perf_pmu_register(&pmu, "cpu", PERF_TYPE_RAW);
+        if (!ret)
+                perf_cpu_notifier(bfin_pmu_notifier);
+
+        return ret;
+}
+early_initcall(bfin_pmu_init);
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index b407bc8ad918..6a660fa921b5 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -171,10 +171,8 @@ asmlinkage int bfin_clone(struct pt_regs *regs)
         unsigned long newsp;
 
 #ifdef __ARCH_SYNC_CORE_DCACHE
-        if (current->rt.nr_cpus_allowed == num_possible_cpus()) {
-                current->cpus_allowed = cpumask_of_cpu(smp_processor_id());
-                current->rt.nr_cpus_allowed = 1;
-        }
+        if (current->rt.nr_cpus_allowed == num_possible_cpus())
+                set_cpus_allowed_ptr(current, cpumask_of(smp_processor_id()));
 #endif
 
         /* syscall2 puts clone_flags in r0 and usp in r1 */
diff --git a/arch/blackfin/kernel/reboot.c b/arch/blackfin/kernel/reboot.c
index 53d08dee8531..488bdc51aaa5 100644
--- a/arch/blackfin/kernel/reboot.c
+++ b/arch/blackfin/kernel/reboot.c
@@ -23,6 +23,9 @@
 __attribute__ ((__l1_text__, __noreturn__))
 static void bfin_reset(void)
 {
+        if (!ANOMALY_05000353 && !ANOMALY_05000386)
+                bfrom_SoftReset((void *)(L1_SCRATCH_START + L1_SCRATCH_LENGTH - 20));
+
         /* Wait for completion of "system" events such as cache line
          * line fills so that we avoid infinite stalls later on as
          * much as possible.  This code is in L1, so it won't trigger
@@ -30,46 +33,40 @@ static void bfin_reset(void)
          */
         __builtin_bfin_ssync();
 
-        /* The bootrom checks to see how it was reset and will
-         * automatically perform a software reset for us when
-         * it starts executing after the core reset.
-         */
-        if (ANOMALY_05000353 || ANOMALY_05000386) {
-                /* Initiate System software reset. */
-                bfin_write_SWRST(0x7);
+        /* Initiate System software reset. */
+        bfin_write_SWRST(0x7);
 
-                /* Due to the way reset is handled in the hardware, we need
-                 * to delay for 10 SCLKS.  The only reliable way to do this is
-                 * to calculate the CCLK/SCLK ratio and multiply 10.  For now,
-                 * we'll assume worse case which is a 1:15 ratio.
-                 */
-                asm(
-                        "LSETUP (1f, 1f) LC0 = %0\n"
-                        "1: nop;"
-                        :
-                        : "a" (15 * 10)
-                        : "LC0", "LB0", "LT0"
-                );
+        /* Due to the way reset is handled in the hardware, we need
+         * to delay for 10 SCLKS.  The only reliable way to do this is
+         * to calculate the CCLK/SCLK ratio and multiply 10.  For now,
+         * we'll assume worse case which is a 1:15 ratio.
+         */
+        asm(
+                "LSETUP (1f, 1f) LC0 = %0\n"
+                "1: nop;"
+                :
+                : "a" (15 * 10)
+                : "LC0", "LB0", "LT0"
+        );
 
-                /* Clear System software reset */
-                bfin_write_SWRST(0);
+        /* Clear System software reset */
+        bfin_write_SWRST(0);
 
-                /* The BF526 ROM will crash during reset */
+        /* The BF526 ROM will crash during reset */
 #if defined(__ADSPBF522__) || defined(__ADSPBF524__) || defined(__ADSPBF526__)
-                bfin_read_SWRST();
+        bfin_read_SWRST();
 #endif
 
-                /* Wait for the SWRST write to complete.  Cannot rely on SSYNC
-                 * though as the System state is all reset now.
-                 */
-                asm(
-                        "LSETUP (1f, 1f) LC1 = %0\n"
-                        "1: nop;"
-                        :
-                        : "a" (15 * 1)
-                        : "LC1", "LB1", "LT1"
-                );
-        }
+        /* Wait for the SWRST write to complete.  Cannot rely on SSYNC
+         * though as the System state is all reset now.
+         */
+        asm(
+                "LSETUP (1f, 1f) LC1 = %0\n"
+                "1: nop;"
+                :
+                : "a" (15 * 1)
+                : "LC1", "LB1", "LT1"
+        );
 
         while (1)
                 /* Issue core reset */
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 805c6132c779..536bd9d7e0cf 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -29,6 +29,7 @@
 #include <asm/cpu.h>
 #include <asm/fixed_code.h>
 #include <asm/early_printk.h>
+#include <asm/irq_handler.h>
 
 u16 _bfin_swrst;
 EXPORT_SYMBOL(_bfin_swrst);
@@ -105,6 +106,8 @@ void __cpuinit bfin_setup_caches(unsigned int cpu)
         bfin_dcache_init(dcplb_tbl[cpu]);
 #endif
 
+        bfin_setup_cpudata(cpu);
+
         /*
          * In cache coherence emulation mode, we need to have the
          * D-cache enabled before running any atomic operation which
@@ -163,7 +166,6 @@ void __cpuinit bfin_setup_cpudata(unsigned int cpu)
 {
         struct blackfin_cpudata *cpudata = &per_cpu(cpu_data, cpu);
 
-        cpudata->idle = current;
         cpudata->imemctl = bfin_read_IMEM_CONTROL();
         cpudata->dmemctl = bfin_read_DMEM_CONTROL();
 }
@@ -851,6 +853,7 @@ void __init native_machine_early_platform_add_devices(void)
 
 void __init setup_arch(char **cmdline_p)
 {
+        u32 mmr;
         unsigned long sclk, cclk;
 
         native_machine_early_platform_add_devices();
@@ -902,10 +905,10 @@ void __init setup_arch(char **cmdline_p)
         bfin_write_EBIU_FCTL(CONFIG_EBIU_FCTLVAL);
 #endif
 #ifdef CONFIG_BFIN_HYSTERESIS_CONTROL
-        bfin_write_PORTF_HYSTERISIS(HYST_PORTF_0_15);
-        bfin_write_PORTG_HYSTERISIS(HYST_PORTG_0_15);
-        bfin_write_PORTH_HYSTERISIS(HYST_PORTH_0_15);
-        bfin_write_MISCPORT_HYSTERISIS((bfin_read_MISCPORT_HYSTERISIS() &
+        bfin_write_PORTF_HYSTERESIS(HYST_PORTF_0_15);
+        bfin_write_PORTG_HYSTERESIS(HYST_PORTG_0_15);
+        bfin_write_PORTH_HYSTERESIS(HYST_PORTH_0_15);
+        bfin_write_MISCPORT_HYSTERESIS((bfin_read_MISCPORT_HYSTERESIS() &
                                         ~HYST_NONEGPIO_MASK) | HYST_NONEGPIO);
 #endif
 
@@ -921,17 +924,14 @@ void __init setup_arch(char **cmdline_p)
                 bfin_read_IMDMA_D1_IRQ_STATUS();
         }
 #endif
-        printk(KERN_INFO "Hardware Trace ");
-        if (bfin_read_TBUFCTL() & 0x1)
-                printk(KERN_CONT "Active ");
-        else
-                printk(KERN_CONT "Off ");
-        if (bfin_read_TBUFCTL() & 0x2)
-                printk(KERN_CONT "and Enabled\n");
-        else
-                printk(KERN_CONT "and Disabled\n");
 
-        printk(KERN_INFO "Boot Mode: %i\n", bfin_read_SYSCR() & 0xF);
+        mmr = bfin_read_TBUFCTL();
+        printk(KERN_INFO "Hardware Trace %s and %sabled\n",
+                (mmr & 0x1) ? "active" : "off",
+                (mmr & 0x2) ? "en" : "dis");
+
+        mmr = bfin_read_SYSCR();
+        printk(KERN_INFO "Boot Mode: %i\n", mmr & 0xF);
 
         /* Newer parts mirror SWRST bits in SYSCR */
 #if defined(CONFIG_BF53x) || defined(CONFIG_BF561) || \
@@ -939,7 +939,7 @@ void __init setup_arch(char **cmdline_p)
         _bfin_swrst = bfin_read_SWRST();
 #else
         /* Clear boot mode field */
-        _bfin_swrst = bfin_read_SYSCR() & ~0xf;
+        _bfin_swrst = mmr & ~0xf;
 #endif
 
 #ifdef CONFIG_DEBUG_DOUBLEFAULT_PRINT
@@ -1036,8 +1036,6 @@ void __init setup_arch(char **cmdline_p)
 static int __init topology_init(void)
 {
         unsigned int cpu;
-        /* Record CPU-private information for the boot processor. */
-        bfin_setup_cpudata(0);
 
         for_each_possible_cpu(cpu) {
                 register_cpu(&per_cpu(cpu_data, cpu).cpu, cpu);
@@ -1283,12 +1281,14 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                    dsup_banks, BFIN_DSUBBANKS, BFIN_DWAYS,
                    BFIN_DLINES);
 #ifdef __ARCH_SYNC_CORE_DCACHE
-        seq_printf(m, "SMP Dcache Flushes\t: %lu\n\n", dcache_invld_count[cpu_num]);
+        seq_printf(m, "dcache flushes\t: %lu\n", dcache_invld_count[cpu_num]);
 #endif
 #ifdef __ARCH_SYNC_CORE_ICACHE
-        seq_printf(m, "SMP Icache Flushes\t: %lu\n\n", icache_invld_count[cpu_num]);
+        seq_printf(m, "icache flushes\t: %lu\n", icache_invld_count[cpu_num]);
 #endif
 
+        seq_printf(m, "\n");
+
         if (cpu_num != num_possible_cpus() - 1)
                 return 0;
 
@@ -1312,13 +1312,11 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                               " in data cache\n");
         }
         seq_printf(m, "board name\t: %s\n", bfin_board_name);
-        seq_printf(m, "board memory\t: %ld kB (0x%p -> 0x%p)\n",
-                 physical_mem_end >> 10, (void *)0, (void *)physical_mem_end);
-        seq_printf(m, "kernel memory\t: %d kB (0x%p -> 0x%p)\n",
+        seq_printf(m, "board memory\t: %ld kB (0x%08lx -> 0x%08lx)\n",
+                physical_mem_end >> 10, 0ul, physical_mem_end);
+        seq_printf(m, "kernel memory\t: %d kB (0x%08lx -> 0x%08lx)\n",
                 ((int)memory_end - (int)_rambase) >> 10,
-                (void *)_rambase,
-                (void *)memory_end);
-        seq_printf(m, "\n");
+                _rambase, memory_end);
 
         return 0;
 }
@@ -1326,7 +1324,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 static void *c_start(struct seq_file *m, loff_t *pos)
 {
         if (*pos == 0)
-                *pos = first_cpu(cpu_online_map);
+                *pos = cpumask_first(cpu_online_mask);
         if (*pos >= num_online_cpus())
                 return NULL;
 
@@ -1335,7 +1333,7 @@ static void *c_start(struct seq_file *m, loff_t *pos)
 
 static void *c_next(struct seq_file *m, void *v, loff_t *pos)
 {
-        *pos = next_cpu(*pos, cpu_online_map);
+        *pos = cpumask_next(*pos, cpu_online_mask);
 
         return c_start(m, pos);
 }
diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c
index cdb4beb6bc8f..9e9b60d969dc 100644
--- a/arch/blackfin/kernel/time-ts.c
+++ b/arch/blackfin/kernel/time-ts.c
@@ -23,29 +23,6 @@
 #include <asm/gptimers.h>
 #include <asm/nmi.h>
 
-/* Accelerators for sched_clock()
- * convert from cycles(64bits) => nanoseconds (64bits)
- *  basic equation:
- *              ns = cycles / (freq / ns_per_sec)
- *              ns = cycles * (ns_per_sec / freq)
- *              ns = cycles * (10^9 / (cpu_khz * 10^3))
- *              ns = cycles * (10^6 / cpu_khz)
- *
- *      Then we use scaling math (suggested by george@mvista.com) to get:
- *              ns = cycles * (10^6 * SC / cpu_khz) / SC
- *              ns = cycles * cyc2ns_scale / SC
- *
- *      And since SC is a constant power of two, we can convert the div
- *  into a shift.
- *
- *  We can use khz divisor instead of mhz to keep a better precision, since
- *  cyc2ns_scale is limited to 10^6 * 2^10, which fits in 32 bits.
- *  (mathieu.desnoyers@polymtl.ca)
- *
- *                      -johnstul@us.ibm.com "math is hard, lets go shopping!"
- */
-
-#define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */
 
 #if defined(CONFIG_CYCLES_CLOCKSOURCE)
 
@@ -63,7 +40,6 @@ static struct clocksource bfin_cs_cycles = {
         .rating         = 400,
         .read           = bfin_read_cycles,
         .mask           = CLOCKSOURCE_MASK(64),
-        .shift          = CYC2NS_SCALE_FACTOR,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -75,10 +51,7 @@ static inline unsigned long long bfin_cs_cycles_sched_clock(void)
 
 static int __init bfin_cs_cycles_init(void)
 {
-        bfin_cs_cycles.mult = \
-                clocksource_hz2mult(get_cclk(), bfin_cs_cycles.shift);
-
-        if (clocksource_register(&bfin_cs_cycles))
+        if (clocksource_register_hz(&bfin_cs_cycles, get_cclk()))
                 panic("failed to register clocksource");
 
         return 0;
@@ -111,7 +84,6 @@ static struct clocksource bfin_cs_gptimer0 = {
         .rating         = 350,
         .read           = bfin_read_gptimer0,
         .mask           = CLOCKSOURCE_MASK(32),
-        .shift          = CYC2NS_SCALE_FACTOR,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -125,10 +97,7 @@ static int __init bfin_cs_gptimer0_init(void)
 {
         setup_gptimer0();
 
-        bfin_cs_gptimer0.mult = \
-                clocksource_hz2mult(get_sclk(), bfin_cs_gptimer0.shift);
-
-        if (clocksource_register(&bfin_cs_gptimer0))
+        if (clocksource_register_hz(&bfin_cs_gptimer0, get_sclk()))
                 panic("failed to register clocksource");
 
         return 0;
diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index 854fa49f1c3e..3ac5b66d14aa 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -136,7 +136,7 @@ SECTIONS
 
         . = ALIGN(16);
         INIT_DATA_SECTION(16)
-        PERCPU(32, PAGE_SIZE)
+        PERCPU_SECTION(32)
 
         .exit.data :
         {
@@ -155,14 +155,8 @@ SECTIONS
                 SECURITY_INITCALL
                 INIT_RAM_FS
 
-                . = ALIGN(4);
                 ___per_cpu_load = .;
-                ___per_cpu_start = .;
-                *(.data.percpu.first)
-                *(.data.percpu.page_aligned)
-                *(.data.percpu)
-                *(.data.percpu.shared_aligned)
-                ___per_cpu_end = .;
+                PERCPU_INPUT(32)
 
                 EXIT_DATA
                 __einitdata = .;
diff --git a/arch/blackfin/mach-bf518/include/mach/anomaly.h b/arch/blackfin/mach-bf518/include/mach/anomaly.h
index 24918c5f7ea1..d2f076fbbc9e 100644
--- a/arch/blackfin/mach-bf518/include/mach/anomaly.h
+++ b/arch/blackfin/mach-bf518/include/mach/anomaly.h
@@ -5,7 +5,7 @@
  * and can be replaced with that version at any time
  * DO NOT EDIT THIS FILE
  *
- * Copyright 2004-2010 Analog Devices Inc.
+ * Copyright 2004-2011 Analog Devices Inc.
  * Licensed under the ADI BSD license.
  *   https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd
  */
@@ -141,6 +141,7 @@
 #define ANOMALY_05000364 (0)
 #define ANOMALY_05000371 (0)
 #define ANOMALY_05000380 (0)
+#define ANOMALY_05000383 (0)
 #define ANOMALY_05000386 (0)
 #define ANOMALY_05000389 (0)
 #define ANOMALY_05000400 (0)
@@ -155,6 +156,7 @@
 #define ANOMALY_05000467 (0)
 #define ANOMALY_05000474 (0)
 #define ANOMALY_05000475 (0)
+#define ANOMALY_05000480 (0)
 #define ANOMALY_05000485 (0)
 
 #endif
diff --git a/arch/blackfin/mach-bf518/include/mach/cdefBF512.h b/arch/blackfin/mach-bf518/include/mach/cdefBF512.h
index b657d37a3402..bb79627f0929 100644
--- a/arch/blackfin/mach-bf518/include/mach/cdefBF512.h
+++ b/arch/blackfin/mach-bf518/include/mach/cdefBF512.h
@@ -990,18 +990,18 @@
 #define bfin_write_PORTG_SLEW(val)              bfin_write16(PORTG_SLEW, val)
 #define bfin_read_PORTH_SLEW()                  bfin_read16(PORTH_SLEW)
 #define bfin_write_PORTH_SLEW(val)              bfin_write16(PORTH_SLEW, val)
-#define bfin_read_PORTF_HYSTERISIS()            bfin_read16(PORTF_HYSTERISIS)
-#define bfin_write_PORTF_HYSTERISIS(val)        bfin_write16(PORTF_HYSTERISIS, val)
-#define bfin_read_PORTG_HYSTERISIS()            bfin_read16(PORTG_HYSTERISIS)
-#define bfin_write_PORTG_HYSTERISIS(val)        bfin_write16(PORTG_HYSTERISIS, val)
-#define bfin_read_PORTH_HYSTERISIS()            bfin_read16(PORTH_HYSTERISIS)
-#define bfin_write_PORTH_HYSTERISIS(val)        bfin_write16(PORTH_HYSTERISIS, val)
+#define bfin_read_PORTF_HYSTERESIS()            bfin_read16(PORTF_HYSTERESIS)
+#define bfin_write_PORTF_HYSTERESIS(val)        bfin_write16(PORTF_HYSTERESIS, val)
+#define bfin_read_PORTG_HYSTERESIS()            bfin_read16(PORTG_HYSTERESIS)
+#define bfin_write_PORTG_HYSTERESIS(val)        bfin_write16(PORTG_HYSTERESIS, val)
+#define bfin_read_PORTH_HYSTERESIS()            bfin_read16(PORTH_HYSTERESIS)
+#define bfin_write_PORTH_HYSTERESIS(val)        bfin_write16(PORTH_HYSTERESIS, val)
 #define bfin_read_MISCPORT_DRIVE()              bfin_read16(MISCPORT_DRIVE)
 #define bfin_write_MISCPORT_DRIVE(val)          bfin_write16(MISCPORT_DRIVE, val)
 #define bfin_read_MISCPORT_SLEW()               bfin_read16(MISCPORT_SLEW)
 #define bfin_write_MISCPORT_SLEW(val)           bfin_write16(MISCPORT_SLEW, val)
-#define bfin_read_MISCPORT_HYSTERISIS()         bfin_read16(MISCPORT_HYSTERISIS)
-#define bfin_write_MISCPORT_HYSTERISIS(val)     bfin_write16(MISCPORT_HYSTERISIS, val)
+#define bfin_read_MISCPORT_HYSTERESIS()         bfin_read16(MISCPORT_HYSTERESIS)
+#define bfin_write_MISCPORT_HYSTERESIS(val)     bfin_write16(MISCPORT_HYSTERESIS, val)
 
 /* HOST Port Registers */
 
diff --git a/arch/blackfin/mach-bf518/include/mach/defBF512.h b/arch/blackfin/mach-bf518/include/mach/defBF512.h
index cb1172f50757..729704078cd7 100644
--- a/arch/blackfin/mach-bf518/include/mach/defBF512.h
+++ b/arch/blackfin/mach-bf518/include/mach/defBF512.h
@@ -561,12 +561,12 @@
 #define PORTF_SLEW              0xFFC03230      /* Port F slew control */
 #define PORTG_SLEW              0xFFC03234      /* Port G slew control */
 #define PORTH_SLEW              0xFFC03238      /* Port H slew control */
-#define PORTF_HYSTERISIS        0xFFC03240      /* Port F Schmitt trigger control */
-#define PORTG_HYSTERISIS        0xFFC03244      /* Port G Schmitt trigger control */
-#define PORTH_HYSTERISIS        0xFFC03248      /* Port H Schmitt trigger control */
+#define PORTF_HYSTERESIS        0xFFC03240      /* Port F Schmitt trigger control */
+#define PORTG_HYSTERESIS        0xFFC03244      /* Port G Schmitt trigger control */
+#define PORTH_HYSTERESIS        0xFFC03248      /* Port H Schmitt trigger control */
 #define MISCPORT_DRIVE          0xFFC03280      /* Misc Port drive strength control */
 #define MISCPORT_SLEW           0xFFC03284      /* Misc Port slew control */
-#define MISCPORT_HYSTERISIS     0xFFC03288      /* Misc Port Schmitt trigger control */
+#define MISCPORT_HYSTERESIS     0xFFC03288      /* Misc Port Schmitt trigger control */
 
 
 /***********************************************************************************
diff --git a/arch/blackfin/mach-bf518/include/mach/irq.h b/arch/blackfin/mach-bf518/include/mach/irq.h
index 435e76e31aaa..edf8efd457dc 100644
--- a/arch/blackfin/mach-bf518/include/mach/irq.h
+++ b/arch/blackfin/mach-bf518/include/mach/irq.h
@@ -7,38 +7,9 @@
 #ifndef _BF518_IRQ_H_
 #define _BF518_IRQ_H_
 
-/*
- * Interrupt source definitions
-        Event Source    Core Event Name
-        Core        Emulation               **
-        Events         (highest priority)  EMU         0
-        Reset                   RST         1
-        NMI                     NMI         2
-        Exception               EVX         3
-        Reserved                --          4
-        Hardware Error          IVHW        5
-        Core Timer              IVTMR       6 *
-
-        .....
-
-         Software Interrupt 1    IVG14       31
-         Software Interrupt 2    --
-         (lowest priority)  IVG15       32 *
-*/
-
-#define NR_PERI_INTS    (2 * 32)
-
-/* The ABSTRACT IRQ definitions */
-/** the first seven of the following are fixed, the rest you change if you need to **/
-#define IRQ_EMU                 0       /* Emulation */
-#define IRQ_RST                 1       /* reset */
-#define IRQ_NMI                 2       /* Non Maskable */
-#define IRQ_EVX                 3       /* Exception */
-#define IRQ_UNUSED              4       /* - unused interrupt */
-#define IRQ_HWERR               5       /* Hardware Error */
-#define IRQ_CORETMR             6       /* Core timer */
-
-#define BFIN_IRQ(x)             ((x) + 7)
+#include <mach-common/irq.h>
+
+#define NR_PERI_INTS            (2 * 32)
 
 #define IRQ_PLL_WAKEUP          BFIN_IRQ(0)     /* PLL Wakeup Interrupt */
 #define IRQ_DMA0_ERROR          BFIN_IRQ(1)     /* DMA Error 0 (generic) */
@@ -54,23 +25,23 @@
 #define IRQ_UART0_ERROR         BFIN_IRQ(12)    /* UART0 Status */
 #define IRQ_UART1_ERROR         BFIN_IRQ(13)    /* UART1 Status */
 #define IRQ_RTC                 BFIN_IRQ(14)    /* RTC */
-#define IRQ_PPI                 BFIN_IRQ(15)    /* DMA Channel 0 (PPI) */
+#define IRQ_PPI                 BFIN_IRQ(15)    /* DMA Channel 0 (PPI) */
 #define IRQ_SPORT0_RX           BFIN_IRQ(16)    /* DMA 3 Channel (SPORT0 RX) */
 #define IRQ_SPORT0_TX           BFIN_IRQ(17)    /* DMA 4 Channel (SPORT0 TX) */
 #define IRQ_RSI                 BFIN_IRQ(17)    /* DMA 4 Channel (RSI) */
 #define IRQ_SPORT1_RX           BFIN_IRQ(18)    /* DMA 5 Channel (SPORT1 RX/SPI) */
 #define IRQ_SPI1                BFIN_IRQ(18)    /* DMA 5 Channel (SPI1) */
 #define IRQ_SPORT1_TX           BFIN_IRQ(19)    /* DMA 6 Channel (SPORT1 TX) */
-#define IRQ_TWI                 BFIN_IRQ(20)    /* TWI */
-#define IRQ_SPI0                BFIN_IRQ(21)    /* DMA 7 Channel (SPI0) */
-#define IRQ_UART0_RX            BFIN_IRQ(22)    /* DMA8 Channel (UART0 RX) */
-#define IRQ_UART0_TX            BFIN_IRQ(23)    /* DMA9 Channel (UART0 TX) */
-#define IRQ_UART1_RX            BFIN_IRQ(24)    /* DMA10 Channel (UART1 RX) */
-#define IRQ_UART1_TX            BFIN_IRQ(25)    /* DMA11 Channel (UART1 TX) */
-#define IRQ_OPTSEC              BFIN_IRQ(26)    /* OTPSEC Interrupt */
-#define IRQ_CNT                 BFIN_IRQ(27)    /* GP Counter */
-#define IRQ_MAC_RX              BFIN_IRQ(28)    /* DMA1 Channel (MAC RX) */
-#define IRQ_PORTH_INTA          BFIN_IRQ(29)    /* Port H Interrupt A */
+#define IRQ_TWI                 BFIN_IRQ(20)    /* TWI */
+#define IRQ_SPI0                BFIN_IRQ(21)    /* DMA 7 Channel (SPI0) */
+#define IRQ_UART0_RX            BFIN_IRQ(22)    /* DMA8 Channel (UART0 RX) */
+#define IRQ_UART0_TX            BFIN_IRQ(23)    /* DMA9 Channel (UART0 TX) */
+#define IRQ_UART1_RX            BFIN_IRQ(24)    /* DMA10 Channel (UART1 RX) */
+#define IRQ_UART1_TX            BFIN_IRQ(25)    /* DMA11 Channel (UART1 TX) */
+#define IRQ_OPTSEC              BFIN_IRQ(26)    /* OTPSEC Interrupt */
+#define IRQ_CNT                 BFIN_IRQ(27)    /* GP Counter */
+#define IRQ_MAC_RX              BFIN_IRQ(28)    /* DMA1 Channel (MAC RX) */
+#define IRQ_PORTH_INTA          BFIN_IRQ(29)    /* Port H Interrupt A */
 #define IRQ_MAC_TX              BFIN_IRQ(30)    /* DMA2 Channel (MAC TX) */
 #define IRQ_PORTH_INTB          BFIN_IRQ(31)    /* Port H Interrupt B */
 #define IRQ_TIMER0              BFIN_IRQ(32)    /* Timer 0 */
@@ -96,101 +67,90 @@
 #define IRQ_PWM_SYNC            BFIN_IRQ(54)    /* PWM Sync Interrupt */
 #define IRQ_PTP_STAT            BFIN_IRQ(55)    /* PTP Stat Interrupt */
 
-#define SYS_IRQS                BFIN_IRQ(63)    /* 70 */
-
-#define IRQ_PF0         71
-#define IRQ_PF1         72
-#define IRQ_PF2         73
-#define IRQ_PF3         74
-#define IRQ_PF4         75
-#define IRQ_PF5         76
-#define IRQ_PF6         77
-#define IRQ_PF7         78
-#define IRQ_PF8         79
-#define IRQ_PF9         80
-#define IRQ_PF10        81
-#define IRQ_PF11        82
-#define IRQ_PF12        83
-#define IRQ_PF13        84
-#define IRQ_PF14        85
-#define IRQ_PF15        86
-
-#define IRQ_PG0         87
-#define IRQ_PG1         88
-#define IRQ_PG2         89
-#define IRQ_PG3         90
-#define IRQ_PG4         91
-#define IRQ_PG5         92
-#define IRQ_PG6         93
-#define IRQ_PG7         94
-#define IRQ_PG8         95
-#define IRQ_PG9         96
-#define IRQ_PG10        97
-#define IRQ_PG11        98
-#define IRQ_PG12        99
-#define IRQ_PG13        100
-#define IRQ_PG14        101
-#define IRQ_PG15        102
-
-#define IRQ_PH0         103
-#define IRQ_PH1         104
-#define IRQ_PH2         105
-#define IRQ_PH3         106
-#define IRQ_PH4         107
-#define IRQ_PH5         108
-#define IRQ_PH6         109
-#define IRQ_PH7         110
-#define IRQ_PH8         111
-#define IRQ_PH9         112
-#define IRQ_PH10        113
-#define IRQ_PH11        114
-#define IRQ_PH12        115
-#define IRQ_PH13        116
-#define IRQ_PH14        117
-#define IRQ_PH15        118
-
-#define GPIO_IRQ_BASE   IRQ_PF0
-
-#define IRQ_MAC_PHYINT          119 /* PHY_INT Interrupt */
-#define IRQ_MAC_MMCINT          120 /* MMC Counter Interrupt */
-#define IRQ_MAC_RXFSINT         121 /* RX Frame-Status Interrupt */
-#define IRQ_MAC_TXFSINT         122 /* TX Frame-Status Interrupt */
-#define IRQ_MAC_WAKEDET         123 /* Wake-Up Interrupt */
-#define IRQ_MAC_RXDMAERR        124 /* RX DMA Direction Error Interrupt */
-#define IRQ_MAC_TXDMAERR        125 /* TX DMA Direction Error Interrupt */
-#define IRQ_MAC_STMDONE         126 /* Station Mgt. Transfer Done Interrupt */
-
-#define NR_MACH_IRQS    (IRQ_MAC_STMDONE + 1)
-#define NR_IRQS         (NR_MACH_IRQS + NR_SPARE_IRQS)
-
-#define IVG7            7
-#define IVG8            8
-#define IVG9            9
-#define IVG10           10
-#define IVG11           11
-#define IVG12           12
-#define IVG13           13
-#define IVG14           14
-#define IVG15           15
+#define SYS_IRQS                BFIN_IRQ(63)    /* 70 */
+
+#define IRQ_PF0                 71
+#define IRQ_PF1                 72
+#define IRQ_PF2                 73
+#define IRQ_PF3                 74
+#define IRQ_PF4                 75
+#define IRQ_PF5                 76
+#define IRQ_PF6                 77
+#define IRQ_PF7                 78
+#define IRQ_PF8                 79
+#define IRQ_PF9                 80
+#define IRQ_PF10                81
+#define IRQ_PF11                82
+#define IRQ_PF12                83
+#define IRQ_PF13                84
+#define IRQ_PF14                85
+#define IRQ_PF15                86
+
+#define IRQ_PG0                 87
+#define IRQ_PG1                 88
+#define IRQ_PG2                 89
+#define IRQ_PG3                 90
+#define IRQ_PG4                 91
+#define IRQ_PG5                 92
+#define IRQ_PG6                 93
+#define IRQ_PG7                 94
+#define IRQ_PG8                 95
+#define IRQ_PG9                 96
+#define IRQ_PG10                97
+#define IRQ_PG11                98
+#define IRQ_PG12                99
+#define IRQ_PG13                100
+#define IRQ_PG14                101
+#define IRQ_PG15                102
+
+#define IRQ_PH0                 103
+#define IRQ_PH1                 104
+#define IRQ_PH2                 105
+#define IRQ_PH3                 106
+#define IRQ_PH4                 107
+#define IRQ_PH5                 108
+#define IRQ_PH6                 109
+#define IRQ_PH7                 110
+#define IRQ_PH8                 111
+#define IRQ_PH9                 112
+#define IRQ_PH10                113
+#define IRQ_PH11                114
+#define IRQ_PH12                115
+#define IRQ_PH13                116
+#define IRQ_PH14                117
+#define IRQ_PH15                118
+
+#define GPIO_IRQ_BASE           IRQ_PF0
+
+#define IRQ_MAC_PHYINT          119     /* PHY_INT Interrupt */
+#define IRQ_MAC_MMCINT          120     /* MMC Counter Interrupt */
+#define IRQ_MAC_RXFSINT         121     /* RX Frame-Status Interrupt */
+#define IRQ_MAC_TXFSINT         122     /* TX Frame-Status Interrupt */
+#define IRQ_MAC_WAKEDET         123     /* Wake-Up Interrupt */
+#define IRQ_MAC_RXDMAERR        124     /* RX DMA Direction Error Interrupt */
+#define IRQ_MAC_TXDMAERR        125     /* TX DMA Direction Error Interrupt */
+#define IRQ_MAC_STMDONE         126     /* Station Mgt. Transfer Done Interrupt */
+
+#define NR_MACH_IRQS            (IRQ_MAC_STMDONE + 1)
 
 /* IAR0 BIT FIELDS */
 #define IRQ_PLL_WAKEUP_POS      0
 #define IRQ_DMA0_ERROR_POS      4
-#define IRQ_DMAR0_BLK_POS       8
-#define IRQ_DMAR1_BLK_POS       12
-#define IRQ_DMAR0_OVR_POS       16
-#define IRQ_DMAR1_OVR_POS       20
-#define IRQ_PPI_ERROR_POS       24
-#define IRQ_MAC_ERROR_POS       28
+#define IRQ_DMAR0_BLK_POS       8
+#define IRQ_DMAR1_BLK_POS       12
+#define IRQ_DMAR0_OVR_POS       16
+#define IRQ_DMAR1_OVR_POS       20
+#define IRQ_PPI_ERROR_POS       24
+#define IRQ_MAC_ERROR_POS       28
 
 /* IAR1 BIT FIELDS */
 #define IRQ_SPORT0_ERROR_POS    0
 #define IRQ_SPORT1_ERROR_POS    4
 #define IRQ_PTP_ERROR_POS       8
-#define IRQ_UART0_ERROR_POS     16
-#define IRQ_UART1_ERROR_POS     20
-#define IRQ_RTC_POS             24
-#define IRQ_PPI_POS             28
+#define IRQ_UART0_ERROR_POS     16
+#define IRQ_UART1_ERROR_POS     20
+#define IRQ_RTC_POS             24
+#define IRQ_PPI_POS             28
 
 /* IAR2 BIT FIELDS */
 #define IRQ_SPORT0_RX_POS       0
@@ -199,19 +159,19 @@
 #define IRQ_SPORT1_RX_POS       8
 #define IRQ_SPI1_POS            8
 #define IRQ_SPORT1_TX_POS       12
-#define IRQ_TWI_POS             16
-#define IRQ_SPI0_POS            20
-#define IRQ_UART0_RX_POS        24
-#define IRQ_UART0_TX_POS        28
+#define IRQ_TWI_POS             16
+#define IRQ_SPI0_POS            20
+#define IRQ_UART0_RX_POS        24
+#define IRQ_UART0_TX_POS        28
 
 /* IAR3 BIT FIELDS */
-#define IRQ_UART1_RX_POS        0
-#define IRQ_UART1_TX_POS        4
-#define IRQ_OPTSEC_POS          8
-#define IRQ_CNT_POS             12
-#define IRQ_MAC_RX_POS          16
+#define IRQ_UART1_RX_POS        0
+#define IRQ_UART1_TX_POS        4
+#define IRQ_OPTSEC_POS          8
+#define IRQ_CNT_POS             12
+#define IRQ_MAC_RX_POS          16
 #define IRQ_PORTH_INTA_POS      20
-#define IRQ_MAC_TX_POS          24
+#define IRQ_MAC_TX_POS          24
 #define IRQ_PORTH_INTB_POS      28
 
 /* IAR4 BIT FIELDS */
@@ -227,19 +187,19 @@
 /* IAR5 BIT FIELDS */
 #define IRQ_PORTG_INTA_POS      0
 #define IRQ_PORTG_INTB_POS      4
-#define IRQ_MEM_DMA0_POS        8
-#define IRQ_MEM_DMA1_POS        12
-#define IRQ_WATCH_POS           16
+#define IRQ_MEM_DMA0_POS        8
+#define IRQ_MEM_DMA1_POS        12
+#define IRQ_WATCH_POS           16
 #define IRQ_PORTF_INTA_POS      20
 #define IRQ_PORTF_INTB_POS      24
-#define IRQ_SPI0_ERROR_POS      28
+#define IRQ_SPI0_ERROR_POS      28
 
 /* IAR6 BIT FIELDS */
-#define IRQ_SPI1_ERROR_POS      0
-#define IRQ_RSI_INT0_POS        12
-#define IRQ_RSI_INT1_POS        16
-#define IRQ_PWM_TRIP_POS        20
-#define IRQ_PWM_SYNC_POS        24
-#define IRQ_PTP_STAT_POS        28
-
-#endif                          /* _BF518_IRQ_H_ */
+#define IRQ_SPI1_ERROR_POS      0
+#define IRQ_RSI_INT0_POS        12
+#define IRQ_RSI_INT1_POS        16
+#define IRQ_PWM_TRIP_POS        20
+#define IRQ_PWM_SYNC_POS        24
+#define IRQ_PTP_STAT_POS        28
+
+#endif
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index 2cd2ff6f3043..e67ac7720668 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -26,6 +26,7 @@
 #include <asm/portmux.h>
 #include <asm/dpmc.h>
 #include <linux/spi/ad7877.h>
+#include <asm/bfin_sport.h>
 
 /*
  * Name the Board for the /proc/cpuinfo
@@ -526,11 +527,69 @@ static struct bfin5xx_spi_chip spidev_chip_info = {
 };
 #endif
 
+#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
+        defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)
+
+static const u16 bfin_snd_pin[][7] = {
+        {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,
+                P_SPORT0_DRPRI, P_SPORT0_RSCLK, 0, 0},
+        {P_SPORT1_DTPRI, P_SPORT1_TSCLK, P_SPORT1_RFS,
+                P_SPORT1_DRPRI, P_SPORT1_RSCLK, P_SPORT1_TFS, 0},
+};
+
+static struct bfin_snd_platform_data bfin_snd_data[] = {
+        {
+                .pin_req = &bfin_snd_pin[0][0],
+        },
+        {
+                .pin_req = &bfin_snd_pin[1][0],
+        },
+};
+
+#define BFIN_SND_RES(x) \
+        [x] = { \
+                { \
+                        .start = SPORT##x##_TCR1, \
+                        .end = SPORT##x##_TCR1, \
+                        .flags = IORESOURCE_MEM \
+                }, \
+                { \
+                        .start = CH_SPORT##x##_RX, \
+                        .end = CH_SPORT##x##_RX, \
+                        .flags = IORESOURCE_DMA, \
+                }, \
+                { \
+                        .start = CH_SPORT##x##_TX, \
+                        .end = CH_SPORT##x##_TX, \
+                        .flags = IORESOURCE_DMA, \
+                }, \
+                { \
+                        .start = IRQ_SPORT##x##_ERROR, \
+                        .end = IRQ_SPORT##x##_ERROR, \
+                        .flags = IORESOURCE_IRQ, \
+                } \
+        }
+
+static struct resource bfin_snd_resources[][4] = {
+        BFIN_SND_RES(0),
+        BFIN_SND_RES(1),
+};
+
+static struct platform_device bfin_pcm = {
+        .name = "bfin-pcm-audio",
+        .id = -1,
+};
+#endif
+
 #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
 static struct platform_device bfin_i2s = {
         .name = "bfin-i2s",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
-        /* TODO: add platform data here */
+        .num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),
+        .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],
+        .dev = {
+                .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],
+        },
 };
 #endif
 
@@ -538,7 +597,11 @@ static struct platform_device bfin_i2s = {
 static struct platform_device bfin_tdm = {
         .name = "bfin-tdm",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
-        /* TODO: add platform data here */
+        .num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),
+        .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],
+        .dev = {
+                .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],
+        },
 };
 #endif
 
@@ -583,7 +646,9 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
                 .bus_num = 0,
                 .chip_select = 4,
+                .platform_data = "ad1836",
                 .controller_data = &ad1836_spi_chip_info,
+                .mode = SPI_MODE_3,
         },
 #endif
 #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
@@ -1211,6 +1276,11 @@ static struct platform_device *stamp_devices[] __initdata = {
         &ezkit_flash_device,
 #endif
 
+#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
+        defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)
+        &bfin_pcm,
+#endif
+
 #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
         &bfin_i2s,
 #endif
diff --git a/arch/blackfin/mach-bf527/include/mach/anomaly.h b/arch/blackfin/mach-bf527/include/mach/anomaly.h
index 9358afa05c90..e66a7e89cd3c 100644
--- a/arch/blackfin/mach-bf527/include/mach/anomaly.h
+++ b/arch/blackfin/mach-bf527/include/mach/anomaly.h
@@ -5,14 +5,14 @@
  * and can be replaced with that version at any time
  * DO NOT EDIT THIS FILE
  *
- * Copyright 2004-2010 Analog Devices Inc.
+ * Copyright 2004-2011 Analog Devices Inc.
  * Licensed under the ADI BSD license.
  *   https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd
  */
 
 /* This file should be up to date with:
  *  - Revision E, 03/15/2010; ADSP-BF526 Blackfin Processor Anomaly List
- *  - Revision G, 08/25/2009; ADSP-BF527 Blackfin Processor Anomaly List
+ *  - Revision H, 04/29/2010; ADSP-BF527 Blackfin Processor Anomaly List
  */
 
 #ifndef _MACH_ANOMALY_H_
@@ -220,6 +220,8 @@
 #define ANOMALY_05000483 (1)
 /* PLL_CTL Change Using bfrom_SysControl() Can Result in Processor Overclocking */
 #define ANOMALY_05000485 (_ANOMALY_BF526_BF527(< 2, < 3))
+/* The CODEC Zero-Cross Detect Feature is not Functional */
+#define ANOMALY_05000487 (1)
 /* IFLUSH sucks at life */
 #define ANOMALY_05000491 (1)
 
@@ -268,11 +270,13 @@
 #define ANOMALY_05000323 (0)
 #define ANOMALY_05000362 (1)
 #define ANOMALY_05000363 (0)
+#define ANOMALY_05000383 (0)
 #define ANOMALY_05000400 (0)
 #define ANOMALY_05000402 (0)
 #define ANOMALY_05000412 (0)
 #define ANOMALY_05000447 (0)
 #define ANOMALY_05000448 (0)
 #define ANOMALY_05000474 (0)
+#define ANOMALY_05000480 (0)
 
 #endif
diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF522.h b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h
index 618dfcdfa91a..2c12e879aa4e 100644
--- a/arch/blackfin/mach-bf527/include/mach/cdefBF522.h
+++ b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h
@@ -1007,18 +1007,18 @@
 #define bfin_write_PORTG_SLEW(val)              bfin_write16(PORTG_SLEW, val)
 #define bfin_read_PORTH_SLEW()                  bfin_read16(PORTH_SLEW)
 #define bfin_write_PORTH_SLEW(val)              bfin_write16(PORTH_SLEW, val)
-#define bfin_read_PORTF_HYSTERISIS()            bfin_read16(PORTF_HYSTERISIS)
-#define bfin_write_PORTF_HYSTERISIS(val)        bfin_write16(PORTF_HYSTERISIS, val)
-#define bfin_read_PORTG_HYSTERISIS()            bfin_read16(PORTG_HYSTERISIS)
-#define bfin_write_PORTG_HYSTERISIS(val)        bfin_write16(PORTG_HYSTERISIS, val)
-#define bfin_read_PORTH_HYSTERISIS()            bfin_read16(PORTH_HYSTERISIS)
-#define bfin_write_PORTH_HYSTERISIS(val)        bfin_write16(PORTH_HYSTERISIS, val)
+#define bfin_read_PORTF_HYSTERESIS()            bfin_read16(PORTF_HYSTERESIS)
+#define bfin_write_PORTF_HYSTERESIS(val)        bfin_write16(PORTF_HYSTERESIS, val)
+#define bfin_read_PORTG_HYSTERESIS()            bfin_read16(PORTG_HYSTERESIS)
+#define bfin_write_PORTG_HYSTERESIS(val)        bfin_write16(PORTG_HYSTERESIS, val)
+#define bfin_read_PORTH_HYSTERESIS()            bfin_read16(PORTH_HYSTERESIS)
+#define bfin_write_PORTH_HYSTERESIS(val)        bfin_write16(PORTH_HYSTERESIS, val)
 #define bfin_read_MISCPORT_DRIVE()              bfin_read16(MISCPORT_DRIVE)
 #define bfin_write_MISCPORT_DRIVE(val)          bfin_write16(MISCPORT_DRIVE, val)
 #define bfin_read_MISCPORT_SLEW()               bfin_read16(MISCPORT_SLEW)
 #define bfin_write_MISCPORT_SLEW(val)           bfin_write16(MISCPORT_SLEW, val)
-#define bfin_read_MISCPORT_HYSTERISIS()         bfin_read16(MISCPORT_HYSTERISIS)
-#define bfin_write_MISCPORT_HYSTERISIS(val)     bfin_write16(MISCPORT_HYSTERISIS, val)
+#define bfin_read_MISCPORT_HYSTERESIS()         bfin_read16(MISCPORT_HYSTERESIS)
+#define bfin_write_MISCPORT_HYSTERESIS(val)     bfin_write16(MISCPORT_HYSTERESIS, val)
 
 /* HOST Port Registers */
 
diff --git a/arch/blackfin/mach-bf527/include/mach/defBF522.h b/arch/blackfin/mach-bf527/include/mach/defBF522.h
index 84ef11e52644..37d353a19722 100644
--- a/arch/blackfin/mach-bf527/include/mach/defBF522.h
+++ b/arch/blackfin/mach-bf527/include/mach/defBF522.h
@@ -562,12 +562,12 @@
 #define PORTF_SLEW              0xFFC03230      /* Port F slew control */
 #define PORTG_SLEW              0xFFC03234      /* Port G slew control */
 #define PORTH_SLEW              0xFFC03238      /* Port H slew control */
-#define PORTF_HYSTERISIS        0xFFC03240      /* Port F Schmitt trigger control */
-#define PORTG_HYSTERISIS        0xFFC03244      /* Port G Schmitt trigger control */
-#define PORTH_HYSTERISIS        0xFFC03248      /* Port H Schmitt trigger control */
+#define PORTF_HYSTERESIS        0xFFC03240      /* Port F Schmitt trigger control */
+#define PORTG_HYSTERESIS        0xFFC03244      /* Port G Schmitt trigger control */
+#define PORTH_HYSTERESIS        0xFFC03248      /* Port H Schmitt trigger control */
 #define MISCPORT_DRIVE          0xFFC03280      /* Misc Port drive strength control */
 #define MISCPORT_SLEW           0xFFC03284      /* Misc Port slew control */
-#define MISCPORT_HYSTERISIS     0xFFC03288      /* Misc Port Schmitt trigger control */
+#define MISCPORT_HYSTERESIS     0xFFC03288      /* Misc Port Schmitt trigger control */
 
 
 /***********************************************************************************
diff --git a/arch/blackfin/mach-bf527/include/mach/irq.h b/arch/blackfin/mach-bf527/include/mach/irq.h
index 704d9253e41d..ed7310ff819b 100644
--- a/arch/blackfin/mach-bf527/include/mach/irq.h
+++ b/arch/blackfin/mach-bf527/include/mach/irq.h
@@ -7,38 +7,9 @@
 #ifndef _BF527_IRQ_H_
 #define _BF527_IRQ_H_
 
-/*
- * Interrupt source definitions
-        Event Source    Core Event Name
-        Core        Emulation               **
-        Events         (highest priority)  EMU         0
-        Reset                   RST         1
-        NMI                     NMI         2
-        Exception               EVX         3
-        Reserved                --          4
-        Hardware Error          IVHW        5
-        Core Timer              IVTMR       6 *
-
-        .....
-
-         Software Interrupt 1    IVG14       31
-         Software Interrupt 2    --
-         (lowest priority)  IVG15       32 *
-*/
-
-#define NR_PERI_INTS    (2 * 32)
-
-/* The ABSTRACT IRQ definitions */
-/** the first seven of the following are fixed, the rest you change if you need to **/
-#define IRQ_EMU                 0       /* Emulation */
-#define IRQ_RST                 1       /* reset */
-#define IRQ_NMI                 2       /* Non Maskable */
-#define IRQ_EVX                 3       /* Exception */
-#define IRQ_UNUSED              4       /* - unused interrupt */
-#define IRQ_HWERR               5       /* Hardware Error */
-#define IRQ_CORETMR             6       /* Core timer */
-
-#define BFIN_IRQ(x)             ((x) + 7)
+#include <mach-common/irq.h>
+
+#define NR_PERI_INTS            (2 * 32)
 
 #define IRQ_PLL_WAKEUP          BFIN_IRQ(0)     /* PLL Wakeup Interrupt */
 #define IRQ_DMA0_ERROR          BFIN_IRQ(1)     /* DMA Error 0 (generic) */
@@ -53,21 +24,21 @@
 #define IRQ_UART0_ERROR         BFIN_IRQ(12)    /* UART0 Status */
 #define IRQ_UART1_ERROR         BFIN_IRQ(13)    /* UART1 Status */
 #define IRQ_RTC                 BFIN_IRQ(14)    /* RTC */
-#define IRQ_PPI                 BFIN_IRQ(15)    /* DMA Channel 0 (PPI/NAND) */
+#define IRQ_PPI                 BFIN_IRQ(15)    /* DMA Channel 0 (PPI/NAND) */
 #define IRQ_SPORT0_RX           BFIN_IRQ(16)    /* DMA 3 Channel (SPORT0 RX) */
 #define IRQ_SPORT0_TX           BFIN_IRQ(17)    /* DMA 4 Channel (SPORT0 TX) */
 #define IRQ_SPORT1_RX           BFIN_IRQ(18)    /* DMA 5 Channel (SPORT1 RX) */
 #define IRQ_SPORT1_TX           BFIN_IRQ(19)    /* DMA 6 Channel (SPORT1 TX) */
-#define IRQ_TWI                 BFIN_IRQ(20)    /* TWI */
-#define IRQ_SPI                 BFIN_IRQ(21)    /* DMA 7 Channel (SPI) */
-#define IRQ_UART0_RX            BFIN_IRQ(22)    /* DMA8 Channel (UART0 RX) */
-#define IRQ_UART0_TX            BFIN_IRQ(23)    /* DMA9 Channel (UART0 TX) */
-#define IRQ_UART1_RX            BFIN_IRQ(24)    /* DMA10 Channel (UART1 RX) */
-#define IRQ_UART1_TX            BFIN_IRQ(25)    /* DMA11 Channel (UART1 TX) */
-#define IRQ_OPTSEC              BFIN_IRQ(26)    /* OTPSEC Interrupt */
-#define IRQ_CNT                 BFIN_IRQ(27)    /* GP Counter */
-#define IRQ_MAC_RX              BFIN_IRQ(28)    /* DMA1 Channel (MAC RX/HDMA) */
-#define IRQ_PORTH_INTA          BFIN_IRQ(29)    /* Port H Interrupt A */
+#define IRQ_TWI                 BFIN_IRQ(20)    /* TWI */
+#define IRQ_SPI                 BFIN_IRQ(21)    /* DMA 7 Channel (SPI) */
+#define IRQ_UART0_RX            BFIN_IRQ(22)    /* DMA8 Channel (UART0 RX) */
+#define IRQ_UART0_TX            BFIN_IRQ(23)    /* DMA9 Channel (UART0 TX) */
+#define IRQ_UART1_RX            BFIN_IRQ(24)    /* DMA10 Channel (UART1 RX) */
+#define IRQ_UART1_TX            BFIN_IRQ(25)    /* DMA11 Channel (UART1 TX) */
+#define IRQ_OPTSEC              BFIN_IRQ(26)    /* OTPSEC Interrupt */
+#define IRQ_CNT                 BFIN_IRQ(27)    /* GP Counter */
+#define IRQ_MAC_RX              BFIN_IRQ(28)    /* DMA1 Channel (MAC RX/HDMA) */
+#define IRQ_PORTH_INTA          BFIN_IRQ(29)    /* Port H Interrupt A */
 #define IRQ_MAC_TX              BFIN_IRQ(30)    /* DMA2 Channel (MAC TX/NAND) */
 #define IRQ_NFC                 BFIN_IRQ(30)    /* DMA2 Channel (MAC TX/NAND) */
 #define IRQ_PORTH_INTB          BFIN_IRQ(31)    /* Port H Interrupt B */
@@ -96,119 +67,108 @@
 #define IRQ_USB_INT2            BFIN_IRQ(54)    /* USB_INT2 Interrupt */
 #define IRQ_USB_DMA             BFIN_IRQ(55)    /* USB_DMAINT Interrupt */
 
-#define SYS_IRQS                BFIN_IRQ(63)    /* 70 */
-
-#define IRQ_PF0         71
-#define IRQ_PF1         72
-#define IRQ_PF2         73
-#define IRQ_PF3         74
-#define IRQ_PF4         75
-#define IRQ_PF5         76
-#define IRQ_PF6         77
-#define IRQ_PF7         78
-#define IRQ_PF8         79
-#define IRQ_PF9         80
-#define IRQ_PF10        81
-#define IRQ_PF11        82
-#define IRQ_PF12        83
-#define IRQ_PF13        84
-#define IRQ_PF14        85
-#define IRQ_PF15        86
-
-#define IRQ_PG0         87
-#define IRQ_PG1         88
-#define IRQ_PG2         89
-#define IRQ_PG3         90
-#define IRQ_PG4         91
-#define IRQ_PG5         92
-#define IRQ_PG6         93
-#define IRQ_PG7         94
-#define IRQ_PG8         95
-#define IRQ_PG9         96
-#define IRQ_PG10        97
-#define IRQ_PG11        98
-#define IRQ_PG12        99
-#define IRQ_PG13        100
-#define IRQ_PG14        101
-#define IRQ_PG15        102
-
-#define IRQ_PH0         103
-#define IRQ_PH1         104
-#define IRQ_PH2         105
-#define IRQ_PH3         106
-#define IRQ_PH4         107
-#define IRQ_PH5         108
-#define IRQ_PH6         109
-#define IRQ_PH7         110
-#define IRQ_PH8         111
-#define IRQ_PH9         112
-#define IRQ_PH10        113
-#define IRQ_PH11        114
-#define IRQ_PH12        115
-#define IRQ_PH13        116
-#define IRQ_PH14        117
-#define IRQ_PH15        118
-
-#define GPIO_IRQ_BASE   IRQ_PF0
-
-#define IRQ_MAC_PHYINT          119 /* PHY_INT Interrupt */
-#define IRQ_MAC_MMCINT          120 /* MMC Counter Interrupt */
-#define IRQ_MAC_RXFSINT         121 /* RX Frame-Status Interrupt */
-#define IRQ_MAC_TXFSINT         122 /* TX Frame-Status Interrupt */
-#define IRQ_MAC_WAKEDET         123 /* Wake-Up Interrupt */
-#define IRQ_MAC_RXDMAERR        124 /* RX DMA Direction Error Interrupt */
-#define IRQ_MAC_TXDMAERR        125 /* TX DMA Direction Error Interrupt */
-#define IRQ_MAC_STMDONE         126 /* Station Mgt. Transfer Done Interrupt */
-
-#define NR_MACH_IRQS    (IRQ_MAC_STMDONE + 1)
-#define NR_IRQS         (NR_MACH_IRQS + NR_SPARE_IRQS)
-
-#define IVG7            7
-#define IVG8            8
-#define IVG9            9
-#define IVG10           10
-#define IVG11           11
-#define IVG12           12
-#define IVG13           13
-#define IVG14           14
-#define IVG15           15
+#define SYS_IRQS                BFIN_IRQ(63)    /* 70 */
+
+#define IRQ_PF0                 71
+#define IRQ_PF1                 72
+#define IRQ_PF2                 73
+#define IRQ_PF3                 74
+#define IRQ_PF4                 75
+#define IRQ_PF5                 76
+#define IRQ_PF6                 77
+#define IRQ_PF7                 78
+#define IRQ_PF8                 79
+#define IRQ_PF9                 80
+#define IRQ_PF10                81
+#define IRQ_PF11                82
+#define IRQ_PF12                83
+#define IRQ_PF13                84
+#define IRQ_PF14                85
+#define IRQ_PF15                86
+
+#define IRQ_PG0                 87
+#define IRQ_PG1                 88
+#define IRQ_PG2                 89
+#define IRQ_PG3                 90
+#define IRQ_PG4                 91
+#define IRQ_PG5                 92
+#define IRQ_PG6                 93
+#define IRQ_PG7                 94
+#define IRQ_PG8                 95
+#define IRQ_PG9                 96
+#define IRQ_PG10                97
+#define IRQ_PG11                98
+#define IRQ_PG12                99
+#define IRQ_PG13                100
+#define IRQ_PG14                101
+#define IRQ_PG15                102
+
+#define IRQ_PH0                 103
+#define IRQ_PH1                 104
+#define IRQ_PH2                 105
+#define IRQ_PH3                 106
+#define IRQ_PH4                 107
+#define IRQ_PH5                 108
+#define IRQ_PH6                 109
+#define IRQ_PH7                 110
+#define IRQ_PH8                 111
+#define IRQ_PH9                 112
+#define IRQ_PH10                113
+#define IRQ_PH11                114
+#define IRQ_PH12                115
+#define IRQ_PH13                116
+#define IRQ_PH14                117
+#define IRQ_PH15                118
+
+#define GPIO_IRQ_BASE           IRQ_PF0
+
+#define IRQ_MAC_PHYINT          119     /* PHY_INT Interrupt */
+#define IRQ_MAC_MMCINT          120     /* MMC Counter Interrupt */
+#define IRQ_MAC_RXFSINT         121     /* RX Frame-Status Interrupt */
+#define IRQ_MAC_TXFSINT         122     /* TX Frame-Status Interrupt */
+#define IRQ_MAC_WAKEDET         123     /* Wake-Up Interrupt */
+#define IRQ_MAC_RXDMAERR        124     /* RX DMA Direction Error Interrupt */
+#define IRQ_MAC_TXDMAERR        125     /* TX DMA Direction Error Interrupt */
+#define IRQ_MAC_STMDONE         126     /* Station Mgt. Transfer Done Interrupt */
+
+#define NR_MACH_IRQS            (IRQ_MAC_STMDONE + 1)
 
 /* IAR0 BIT FIELDS */
 #define IRQ_PLL_WAKEUP_POS      0
 #define IRQ_DMA0_ERROR_POS      4
-#define IRQ_DMAR0_BLK_POS       8
-#define IRQ_DMAR1_BLK_POS       12
-#define IRQ_DMAR0_OVR_POS       16
-#define IRQ_DMAR1_OVR_POS       20
-#define IRQ_PPI_ERROR_POS       24
-#define IRQ_MAC_ERROR_POS       28
+#define IRQ_DMAR0_BLK_POS       8
+#define IRQ_DMAR1_BLK_POS       12
+#define IRQ_DMAR0_OVR_POS       16
+#define IRQ_DMAR1_OVR_POS       20
+#define IRQ_PPI_ERROR_POS       24
+#define IRQ_MAC_ERROR_POS       28
 
 /* IAR1 BIT FIELDS */
 #define IRQ_SPORT0_ERROR_POS    0
 #define IRQ_SPORT1_ERROR_POS    4
-#define IRQ_UART0_ERROR_POS     16
-#define IRQ_UART1_ERROR_POS     20
-#define IRQ_RTC_POS             24
-#define IRQ_PPI_POS             28
+#define IRQ_UART0_ERROR_POS     16
+#define IRQ_UART1_ERROR_POS     20
+#define IRQ_RTC_POS             24
+#define IRQ_PPI_POS             28
 
 /* IAR2 BIT FIELDS */
 #define IRQ_SPORT0_RX_POS       0
 #define IRQ_SPORT0_TX_POS       4
 #define IRQ_SPORT1_RX_POS       8
 #define IRQ_SPORT1_TX_POS       12
-#define IRQ_TWI_POS             16
-#define IRQ_SPI_POS             20
-#define IRQ_UART0_RX_POS        24
-#define IRQ_UART0_TX_POS        28
+#define IRQ_TWI_POS             16
+#define IRQ_SPI_POS             20
+#define IRQ_UART0_RX_POS        24
+#define IRQ_UART0_TX_POS        28
 
 /* IAR3 BIT FIELDS */
-#define IRQ_UART1_RX_POS        0
-#define IRQ_UART1_TX_POS        4
-#define IRQ_OPTSEC_POS          8
-#define IRQ_CNT_POS             12
-#define IRQ_MAC_RX_POS          16
+#define IRQ_UART1_RX_POS        0
+#define IRQ_UART1_TX_POS        4
+#define IRQ_OPTSEC_POS          8
+#define IRQ_CNT_POS             12
+#define IRQ_MAC_RX_POS          16
 #define IRQ_PORTH_INTA_POS      20
-#define IRQ_MAC_TX_POS          24
+#define IRQ_MAC_TX_POS          24
 #define IRQ_PORTH_INTB_POS      28
 
 /* IAR4 BIT FIELDS */
@@ -224,21 +184,21 @@
 /* IAR5 BIT FIELDS */
 #define IRQ_PORTG_INTA_POS      0
 #define IRQ_PORTG_INTB_POS      4
-#define IRQ_MEM_DMA0_POS        8
-#define IRQ_MEM_DMA1_POS        12
-#define IRQ_WATCH_POS           16
+#define IRQ_MEM_DMA0_POS        8
+#define IRQ_MEM_DMA1_POS        12
+#define IRQ_WATCH_POS           16
 #define IRQ_PORTF_INTA_POS      20
 #define IRQ_PORTF_INTB_POS      24
-#define IRQ_SPI_ERROR_POS       28
+#define IRQ_SPI_ERROR_POS       28
 
 /* IAR6 BIT FIELDS */
-#define IRQ_NFC_ERROR_POS       0
-#define IRQ_HDMA_ERROR_POS      4
-#define IRQ_HDMA_POS            8
-#define IRQ_USB_EINT_POS        12
-#define IRQ_USB_INT0_POS        16
-#define IRQ_USB_INT1_POS        20
-#define IRQ_USB_INT2_POS        24
-#define IRQ_USB_DMA_POS         28
-
-#endif                          /* _BF527_IRQ_H_ */
+#define IRQ_NFC_ERROR_POS       0
+#define IRQ_HDMA_ERROR_POS      4
+#define IRQ_HDMA_POS            8
+#define IRQ_USB_EINT_POS        12
+#define IRQ_USB_INT0_POS        16
+#define IRQ_USB_INT1_POS        20
+#define IRQ_USB_INT2_POS        24
+#define IRQ_USB_DMA_POS         28
+
+#endif
diff --git a/arch/blackfin/mach-bf533/include/mach/anomaly.h b/arch/blackfin/mach-bf533/include/mach/anomaly.h
index 78f872187918..72aa59440f82 100644
--- a/arch/blackfin/mach-bf533/include/mach/anomaly.h
+++ b/arch/blackfin/mach-bf533/include/mach/anomaly.h
@@ -5,13 +5,13 @@
  * and can be replaced with that version at any time
  * DO NOT EDIT THIS FILE
  *
- * Copyright 2004-2010 Analog Devices Inc.
+ * Copyright 2004-2011 Analog Devices Inc.
  * Licensed under the ADI BSD license.
  *   https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd
  */
 
 /* This file should be up to date with:
- *  - Revision E, 09/18/2008; ADSP-BF531/BF532/BF533 Blackfin Processor Anomaly List
+ *  - Revision F, 05/25/2010; ADSP-BF531/BF532/BF533 Blackfin Processor Anomaly List
  */
 
 #ifndef _MACH_ANOMALY_H_
@@ -206,6 +206,10 @@
 #define ANOMALY_05000443 (1)
 /* False Hardware Error when RETI Points to Invalid Memory */
 #define ANOMALY_05000461 (1)
+/* Synchronization Problem at Startup May Cause SPORT Transmit Channels to Misalign */
+#define ANOMALY_05000462 (1)
+/* Boot Failure When SDRAM Control Signals Toggle Coming Out Of Reset */
+#define ANOMALY_05000471 (1)
 /* Interrupted 32-Bit SPORT Data Register Access Results In Underflow */
 #define ANOMALY_05000473 (1)
 /* Possible Lockup Condition whem Modifying PLL from External Memory */
@@ -351,12 +355,14 @@
 #define ANOMALY_05000362 (1)
 #define ANOMALY_05000364 (0)
 #define ANOMALY_05000380 (0)
+#define ANOMALY_05000383 (0)
 #define ANOMALY_05000386 (1)
 #define ANOMALY_05000389 (0)
 #define ANOMALY_05000412 (0)
 #define ANOMALY_05000430 (0)
 #define ANOMALY_05000432 (0)
 #define ANOMALY_05000435 (0)
+#define ANOMALY_05000440 (0)
 #define ANOMALY_05000447 (0)
 #define ANOMALY_05000448 (0)
 #define ANOMALY_05000456 (0)
@@ -364,6 +370,7 @@
 #define ANOMALY_05000465 (0)
 #define ANOMALY_05000467 (0)
 #define ANOMALY_05000474 (0)
+#define ANOMALY_05000480 (0)
 #define ANOMALY_05000485 (0)
 
 #endif
diff --git a/arch/blackfin/mach-bf533/include/mach/irq.h b/arch/blackfin/mach-bf533/include/mach/irq.h
index 1f7e9765d954..709733754142 100644
--- a/arch/blackfin/mach-bf533/include/mach/irq.h
+++ b/arch/blackfin/mach-bf533/include/mach/irq.h
@@ -7,83 +7,36 @@
 #ifndef _BF533_IRQ_H_
 #define _BF533_IRQ_H_
 
-/*
- * Interrupt source definitions
-             Event Source    Core Event Name
-Core        Emulation               **
- Events         (highest priority)  EMU         0
-            Reset                   RST         1
-            NMI                     NMI         2
-            Exception               EVX         3
-            Reserved                --          4
-            Hardware Error          IVHW        5
-            Core Timer              IVTMR       6 *
-            PLL Wakeup Interrupt    IVG7        7
-            DMA Error (generic)     IVG7        8
-            PPI Error Interrupt     IVG7        9
-            SPORT0 Error Interrupt  IVG7        10
-            SPORT1 Error Interrupt  IVG7        11
-            SPI Error Interrupt     IVG7        12
-            UART Error Interrupt    IVG7        13
-            RTC Interrupt           IVG8        14
-            DMA0 Interrupt (PPI)    IVG8        15
-            DMA1 (SPORT0 RX)        IVG9        16
-            DMA2 (SPORT0 TX)        IVG9        17
-            DMA3 (SPORT1 RX)        IVG9        18
-            DMA4 (SPORT1 TX)        IVG9        19
-            DMA5 (PPI)              IVG10       20
-            DMA6 (UART RX)          IVG10       21
-            DMA7 (UART TX)          IVG10       22
-            Timer0                  IVG11       23
-            Timer1                  IVG11       24
-            Timer2                  IVG11       25
-            PF Interrupt A          IVG12       26
-            PF Interrupt B          IVG12       27
-            DMA8/9 Interrupt        IVG13       28
-            DMA10/11 Interrupt      IVG13       29
-            Watchdog Timer          IVG13       30
+#include <mach-common/irq.h>
 
-            Softirq                 IVG14       31
-            System Call    --
-                 (lowest priority)  IVG15       32 *
- */
-#define SYS_IRQS        31
-#define NR_PERI_INTS    24
+#define NR_PERI_INTS            24
 
-/* The ABSTRACT IRQ definitions */
-/** the first seven of the following are fixed, the rest you change if you need to **/
-#define IRQ_EMU                 0       /*Emulation */
-#define IRQ_RST                 1       /*reset */
-#define IRQ_NMI                 2       /*Non Maskable */
-#define IRQ_EVX                 3       /*Exception */
-#define IRQ_UNUSED              4       /*- unused interrupt*/
-#define IRQ_HWERR               5       /*Hardware Error */
-#define IRQ_CORETMR             6       /*Core timer */
+#define IRQ_PLL_WAKEUP          BFIN_IRQ(0)     /* PLL Wakeup Interrupt */
+#define IRQ_DMA_ERROR           BFIN_IRQ(1)     /* DMA Error (general) */
+#define IRQ_PPI_ERROR           BFIN_IRQ(2)     /* PPI Error Interrupt */
+#define IRQ_SPORT0_ERROR        BFIN_IRQ(3)     /* SPORT0 Error Interrupt */
+#define IRQ_SPORT1_ERROR        BFIN_IRQ(4)     /* SPORT1 Error Interrupt */
+#define IRQ_SPI_ERROR           BFIN_IRQ(5)     /* SPI Error Interrupt */
+#define IRQ_UART0_ERROR         BFIN_IRQ(6)     /* UART Error Interrupt */
+#define IRQ_RTC                 BFIN_IRQ(7)     /* RTC Interrupt */
+#define IRQ_PPI                 BFIN_IRQ(8)     /* DMA0 Interrupt (PPI) */
+#define IRQ_SPORT0_RX           BFIN_IRQ(9)     /* DMA1 Interrupt (SPORT0 RX) */
+#define IRQ_SPORT0_TX           BFIN_IRQ(10)    /* DMA2 Interrupt (SPORT0 TX) */
+#define IRQ_SPORT1_RX           BFIN_IRQ(11)    /* DMA3 Interrupt (SPORT1 RX) */
+#define IRQ_SPORT1_TX           BFIN_IRQ(12)    /* DMA4 Interrupt (SPORT1 TX) */
+#define IRQ_SPI                 BFIN_IRQ(13)    /* DMA5 Interrupt (SPI) */
+#define IRQ_UART0_RX            BFIN_IRQ(14)    /* DMA6 Interrupt (UART RX) */
+#define IRQ_UART0_TX            BFIN_IRQ(15)    /* DMA7 Interrupt (UART TX) */
+#define IRQ_TIMER0              BFIN_IRQ(16)    /* Timer 0 */
+#define IRQ_TIMER1              BFIN_IRQ(17)    /* Timer 1 */
+#define IRQ_TIMER2              BFIN_IRQ(18)    /* Timer 2 */
+#define IRQ_PROG_INTA           BFIN_IRQ(19)    /* Programmable Flags A (8) */
+#define IRQ_PROG_INTB           BFIN_IRQ(20)    /* Programmable Flags B (8) */
+#define IRQ_MEM_DMA0            BFIN_IRQ(21)    /* DMA8/9 Interrupt (Memory DMA Stream 0) */
+#define IRQ_MEM_DMA1            BFIN_IRQ(22)    /* DMA10/11 Interrupt (Memory DMA Stream 1) */
+#define IRQ_WATCH               BFIN_IRQ(23)    /* Watch Dog Timer */
 
-#define IRQ_PLL_WAKEUP          7       /*PLL Wakeup Interrupt */
-#define IRQ_DMA_ERROR           8       /*DMA Error (general) */
-#define IRQ_PPI_ERROR           9       /*PPI Error Interrupt */
-#define IRQ_SPORT0_ERROR        10      /*SPORT0 Error Interrupt */
-#define IRQ_SPORT1_ERROR        11      /*SPORT1 Error Interrupt */
-#define IRQ_SPI_ERROR           12      /*SPI Error Interrupt */
-#define IRQ_UART0_ERROR         13      /*UART Error Interrupt */
-#define IRQ_RTC                 14      /*RTC Interrupt */
-#define IRQ_PPI                 15      /*DMA0 Interrupt (PPI) */
-#define IRQ_SPORT0_RX           16      /*DMA1 Interrupt (SPORT0 RX) */
-#define IRQ_SPORT0_TX           17      /*DMA2 Interrupt (SPORT0 TX) */
-#define IRQ_SPORT1_RX           18      /*DMA3 Interrupt (SPORT1 RX) */
-#define IRQ_SPORT1_TX           19      /*DMA4 Interrupt (SPORT1 TX) */
-#define IRQ_SPI                 20      /*DMA5 Interrupt (SPI) */
-#define IRQ_UART0_RX            21      /*DMA6 Interrupt (UART RX) */
-#define IRQ_UART0_TX            22      /*DMA7 Interrupt (UART TX) */
-#define IRQ_TIMER0              23      /*Timer 0 */
-#define IRQ_TIMER1              24      /*Timer 1 */
-#define IRQ_TIMER2              25      /*Timer 2 */
-#define IRQ_PROG_INTA           26      /*Programmable Flags A (8) */
-#define IRQ_PROG_INTB           27      /*Programmable Flags B (8) */
-#define IRQ_MEM_DMA0            28      /*DMA8/9 Interrupt (Memory DMA Stream 0) */
-#define IRQ_MEM_DMA1            29      /*DMA10/11 Interrupt (Memory DMA Stream 1) */
-#define IRQ_WATCH               30      /*Watch Dog Timer */
+#define SYS_IRQS                31
 
 #define IRQ_PF0                 33
 #define IRQ_PF1                 34
@@ -105,46 +58,35 @@ Core        Emulation               **
 #define GPIO_IRQ_BASE           IRQ_PF0
 
 #define NR_MACH_IRQS            (IRQ_PF15 + 1)
-#define NR_IRQS                 (NR_MACH_IRQS + NR_SPARE_IRQS)
-
-#define IVG7                    7
-#define IVG8                    8
-#define IVG9                    9
-#define IVG10                   10
-#define IVG11                   11
-#define IVG12                   12
-#define IVG13                   13
-#define IVG14                   14
-#define IVG15                   15
 
-/* IAR0 BIT FIELDS*/
-#define RTC_ERROR_POS                   28
-#define UART_ERROR_POS                  24
-#define SPORT1_ERROR_POS                20
-#define SPI_ERROR_POS                   16
-#define SPORT0_ERROR_POS                12
-#define PPI_ERROR_POS                   8
-#define DMA_ERROR_POS                   4
-#define PLLWAKE_ERROR_POS               0
+/* IAR0 BIT FIELDS */
+#define RTC_ERROR_POS           28
+#define UART_ERROR_POS          24
+#define SPORT1_ERROR_POS        20
+#define SPI_ERROR_POS           16
+#define SPORT0_ERROR_POS        12
+#define PPI_ERROR_POS           8
+#define DMA_ERROR_POS           4
+#define PLLWAKE_ERROR_POS       0
 
-/* IAR1 BIT FIELDS*/
-#define DMA7_UARTTX_POS                 28
-#define DMA6_UARTRX_POS                 24
-#define DMA5_SPI_POS                    20
-#define DMA4_SPORT1TX_POS               16
-#define DMA3_SPORT1RX_POS               12
-#define DMA2_SPORT0TX_POS               8
-#define DMA1_SPORT0RX_POS               4
-#define DMA0_PPI_POS                    0
+/* IAR1 BIT FIELDS */
+#define DMA7_UARTTX_POS         28
+#define DMA6_UARTRX_POS         24
+#define DMA5_SPI_POS            20
+#define DMA4_SPORT1TX_POS       16
+#define DMA3_SPORT1RX_POS       12
+#define DMA2_SPORT0TX_POS       8
+#define DMA1_SPORT0RX_POS       4
+#define DMA0_PPI_POS            0
 
-/* IAR2 BIT FIELDS*/
-#define WDTIMER_POS                     28
-#define MEMDMA1_POS                     24
-#define MEMDMA0_POS                     20
-#define PFB_POS                         16
-#define PFA_POS                         12
-#define TIMER2_POS                      8
-#define TIMER1_POS                      4
-#define TIMER0_POS                      0
+/* IAR2 BIT FIELDS */
+#define WDTIMER_POS             28
+#define MEMDMA1_POS             24
+#define MEMDMA0_POS             20
+#define PFB_POS                 16
+#define PFA_POS                 12
+#define TIMER2_POS              8
+#define TIMER1_POS              4
+#define TIMER0_POS              0
 
-#endif                          /* _BF533_IRQ_H_ */
+#endif
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 3fa335405b31..e16dc4560048 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -35,6 +35,7 @@
 #include <asm/reboot.h>
 #include <asm/portmux.h>
 #include <asm/dpmc.h>
+#include <asm/bfin_sport.h>
 #ifdef CONFIG_REGULATOR_FIXED_VOLTAGE
 #include <linux/regulator/fixed.h>
 #endif
@@ -2585,27 +2586,103 @@ static struct platform_device bfin_dpmc = {
         },
 };
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
+        defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) || \
+        defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+
+#define SPORT_REQ(x) \
+        [x] = {P_SPORT##x##_TFS, P_SPORT##x##_DTPRI, P_SPORT##x##_TSCLK, \
+                P_SPORT##x##_RFS, P_SPORT##x##_DRPRI, P_SPORT##x##_RSCLK, 0}
+
+static const u16 bfin_snd_pin[][7] = {
+        SPORT_REQ(0),
+        SPORT_REQ(1),
+};
+
+static struct bfin_snd_platform_data bfin_snd_data[] = {
+        {
+                .pin_req = &bfin_snd_pin[0][0],
+        },
+        {
+                .pin_req = &bfin_snd_pin[1][0],
+        },
+};
+
+#define BFIN_SND_RES(x) \
+        [x] = { \
+                { \
+                        .start = SPORT##x##_TCR1, \
+                        .end = SPORT##x##_TCR1, \
+                        .flags = IORESOURCE_MEM \
+                }, \
+                { \
+                        .start = CH_SPORT##x##_RX, \
+                        .end = CH_SPORT##x##_RX, \
+                        .flags = IORESOURCE_DMA, \
+                }, \
+                { \
+                        .start = CH_SPORT##x##_TX, \
+                        .end = CH_SPORT##x##_TX, \
+                        .flags = IORESOURCE_DMA, \
+                }, \
+                { \
+                        .start = IRQ_SPORT##x##_ERROR, \
+                        .end = IRQ_SPORT##x##_ERROR, \
+                        .flags = IORESOURCE_IRQ, \
+                } \
+        }
+
+static struct resource bfin_snd_resources[][4] = {
+        BFIN_SND_RES(0),
+        BFIN_SND_RES(1),
+};
+
+static struct platform_device bfin_pcm = {
+        .name = "bfin-pcm-audio",
+        .id = -1,
+};
+#endif
+
+#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)
+static struct platform_device bfin_ad73311_codec_device = {
+        .name = "ad73311",
+        .id = -1,
+};
+#endif
+
+#if defined(CONFIG_SND_BF5XX_SOC_I2S) || defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)
 static struct platform_device bfin_i2s = {
         .name = "bfin-i2s",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
-        /* TODO: add platform data here */
+        .num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),
+        .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],
+        .dev = {
+                .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],
+        },
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_TDM) || defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE)
 static struct platform_device bfin_tdm = {
         .name = "bfin-tdm",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
-        /* TODO: add platform data here */
+        .num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),
+        .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],
+        .dev = {
+                .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],
+        },
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)
 static struct platform_device bfin_ac97 = {
         .name = "bfin-ac97",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
-        /* TODO: add platform data here */
+        .num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),
+        .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],
+        .dev = {
+                .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],
+        },
 };
 #endif
 
@@ -2796,17 +2873,28 @@ static struct platform_device *stamp_devices[] __initdata = {
         &stamp_flash_device,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
+        defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) || \
+        defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+        &bfin_pcm,
+#endif
+
+#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)
+        &bfin_ad73311_codec_device,
+#endif
+
+#if defined(CONFIG_SND_BF5XX_SOC_I2S) || defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)
         &bfin_i2s,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_TDM) || defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE)
         &bfin_tdm,
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)
         &bfin_ac97,
 #endif
+
 #if defined(CONFIG_REGULATOR_AD5398) || defined(CONFIG_REGULATOR_AD5398_MODULE)
 #if defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER) || \
         defined(CONFIG_REGULATOR_VIRTUAL_CONSUMER_MODULE)
diff --git a/arch/blackfin/mach-bf537/include/mach/anomaly.h b/arch/blackfin/mach-bf537/include/mach/anomaly.h
index 43df6afd22ad..7f8e5a9f5db6 100644
--- a/arch/blackfin/mach-bf537/include/mach/anomaly.h
+++ b/arch/blackfin/mach-bf537/include/mach/anomaly.h
@@ -5,13 +5,13 @@
  * and can be replaced with that version at any time
  * DO NOT EDIT THIS FILE
  *
- * Copyright 2004-2010 Analog Devices Inc.
+ * Copyright 2004-2011 Analog Devices Inc.
  * Licensed under the ADI BSD license.
  *   https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd
  */
 
 /* This file should be up to date with:
- *  - Revision D, 09/18/2008; ADSP-BF534/ADSP-BF536/ADSP-BF537 Blackfin Processor Anomaly List
+ *  - Revision E, 05/25/2010; ADSP-BF534/ADSP-BF536/ADSP-BF537 Blackfin Processor Anomaly List
  */
 
 #ifndef _MACH_ANOMALY_H_
@@ -160,12 +160,16 @@
 #define ANOMALY_05000443 (1)
 /* False Hardware Error when RETI Points to Invalid Memory */
 #define ANOMALY_05000461 (1)
+/* Synchronization Problem at Startup May Cause SPORT Transmit Channels to Misalign */
+#define ANOMALY_05000462 (1)
 /* Interrupted 32-Bit SPORT Data Register Access Results In Underflow */
 #define ANOMALY_05000473 (1)
 /* Possible Lockup Condition whem Modifying PLL from External Memory */
 #define ANOMALY_05000475 (1)
 /* TESTSET Instruction Cannot Be Interrupted */
 #define ANOMALY_05000477 (1)
+/* Multiple Simultaneous Urgent DMA Requests May Cause DMA System Instability */
+#define ANOMALY_05000480 (__SILICON_REVISION__ < 3)
 /* Reads of ITEST_COMMAND and ITEST_DATA Registers Cause Cache Corruption */
 #define ANOMALY_05000481 (1)
 /* IFLUSH sucks at life */
@@ -204,6 +208,7 @@
 #define ANOMALY_05000363 (0)
 #define ANOMALY_05000364 (0)
 #define ANOMALY_05000380 (0)
+#define ANOMALY_05000383 (0)
 #define ANOMALY_05000386 (1)
 #define ANOMALY_05000389 (0)
 #define ANOMALY_05000400 (0)
@@ -211,6 +216,7 @@
 #define ANOMALY_05000430 (0)
 #define ANOMALY_05000432 (0)
 #define ANOMALY_05000435 (0)
+#define ANOMALY_05000440 (0)
 #define ANOMALY_05000447 (0)
 #define ANOMALY_05000448 (0)
 #define ANOMALY_05000456 (0)
diff --git a/arch/blackfin/mach-bf537/include/mach/irq.h b/arch/blackfin/mach-bf537/include/mach/irq.h
index 1a6d617c5fcf..b6ed8235bda4 100644
--- a/arch/blackfin/mach-bf537/include/mach/irq.h
+++ b/arch/blackfin/mach-bf537/include/mach/irq.h
@@ -7,193 +7,178 @@
 #ifndef _BF537_IRQ_H_
 #define _BF537_IRQ_H_
 
-/*
- * Interrupt source definitions
- *            Event Source    Core Event Name
- * Core       Emulation               **
- * Events         (highest priority)  EMU         0
- *            Reset                   RST         1
- *            NMI                     NMI         2
- *            Exception               EVX         3
- *            Reserved                --          4
- *            Hardware Error          IVHW        5
- *            Core Timer              IVTMR       6
- *  .....
- *
- *            Softirq                 IVG14
- *            System Call    --
- *               (lowest priority)    IVG15
- */
-
-#define SYS_IRQS        39
-#define NR_PERI_INTS    32
-
-/* The ABSTRACT IRQ definitions */
-/** the first seven of the following are fixed, the rest you change if you need to **/
-#define IRQ_EMU             0   /*Emulation */
-#define IRQ_RST             1   /*reset */
-#define IRQ_NMI             2   /*Non Maskable */
-#define IRQ_EVX             3   /*Exception */
-#define IRQ_UNUSED          4   /*- unused interrupt*/
-#define IRQ_HWERR           5   /*Hardware Error */
-#define IRQ_CORETMR         6   /*Core timer */
-
-#define IRQ_PLL_WAKEUP      7   /*PLL Wakeup Interrupt */
-#define IRQ_DMA_ERROR       8   /*DMA Error (general) */
-#define IRQ_GENERIC_ERROR   9   /*GENERIC Error Interrupt */
-#define IRQ_RTC             10  /*RTC Interrupt */
-#define IRQ_PPI             11  /*DMA0 Interrupt (PPI) */
-#define IRQ_SPORT0_RX       12  /*DMA3 Interrupt (SPORT0 RX) */
-#define IRQ_SPORT0_TX       13  /*DMA4 Interrupt (SPORT0 TX) */
-#define IRQ_SPORT1_RX       14  /*DMA5 Interrupt (SPORT1 RX) */
-#define IRQ_SPORT1_TX       15  /*DMA6 Interrupt (SPORT1 TX) */
-#define IRQ_TWI             16  /*TWI Interrupt */
-#define IRQ_SPI             17  /*DMA7 Interrupt (SPI) */
-#define IRQ_UART0_RX        18  /*DMA8 Interrupt (UART0 RX) */
-#define IRQ_UART0_TX        19  /*DMA9 Interrupt (UART0 TX) */
-#define IRQ_UART1_RX        20  /*DMA10 Interrupt (UART1 RX) */
-#define IRQ_UART1_TX        21  /*DMA11 Interrupt (UART1 TX) */
-#define IRQ_CAN_RX          22  /*CAN Receive Interrupt */
-#define IRQ_CAN_TX          23  /*CAN Transmit Interrupt */
-#define IRQ_MAC_RX          24  /*DMA1 (Ethernet RX) Interrupt */
-#define IRQ_MAC_TX          25  /*DMA2 (Ethernet TX) Interrupt */
-#define IRQ_TIMER0            26        /*Timer 0 */
-#define IRQ_TIMER1            27        /*Timer 1 */
-#define IRQ_TIMER2            28        /*Timer 2 */
-#define IRQ_TIMER3            29        /*Timer 3 */
-#define IRQ_TIMER4            30        /*Timer 4 */
-#define IRQ_TIMER5            31        /*Timer 5 */
-#define IRQ_TIMER6            32        /*Timer 6 */
-#define IRQ_TIMER7            33        /*Timer 7 */
-#define IRQ_PROG_INTA       34  /* PF Ports F&G (PF15:0) Interrupt A */
-#define IRQ_PORTG_INTB      35  /* PF Port G (PF15:0) Interrupt B */
-#define IRQ_MEM_DMA0        36  /*(Memory DMA Stream 0) */
-#define IRQ_MEM_DMA1        37  /*(Memory DMA Stream 1) */
-#define IRQ_PROG_INTB         38        /* PF Ports F (PF15:0) Interrupt B */
-#define IRQ_WATCH           38  /*Watch Dog Timer */
-
-#define IRQ_PPI_ERROR       42  /*PPI Error Interrupt */
-#define IRQ_CAN_ERROR       43  /*CAN Error Interrupt */
-#define IRQ_MAC_ERROR       44  /*MAC Status/Error Interrupt */
-#define IRQ_SPORT0_ERROR    45  /*SPORT0 Error Interrupt */
-#define IRQ_SPORT1_ERROR    46  /*SPORT1 Error Interrupt */
-#define IRQ_SPI_ERROR       47  /*SPI Error Interrupt */
-#define IRQ_UART0_ERROR     48  /*UART Error Interrupt */
-#define IRQ_UART1_ERROR     49  /*UART Error Interrupt */
-
-#define IRQ_PF0         50
-#define IRQ_PF1         51
-#define IRQ_PF2         52
-#define IRQ_PF3         53
-#define IRQ_PF4         54
-#define IRQ_PF5         55
-#define IRQ_PF6         56
-#define IRQ_PF7         57
-#define IRQ_PF8         58
-#define IRQ_PF9         59
-#define IRQ_PF10        60
-#define IRQ_PF11        61
-#define IRQ_PF12        62
-#define IRQ_PF13        63
-#define IRQ_PF14        64
-#define IRQ_PF15        65
-
-#define IRQ_PG0         66
-#define IRQ_PG1         67
-#define IRQ_PG2         68
-#define IRQ_PG3         69
-#define IRQ_PG4         70
-#define IRQ_PG5         71
-#define IRQ_PG6         72
-#define IRQ_PG7         73
-#define IRQ_PG8         74
-#define IRQ_PG9         75
-#define IRQ_PG10        76
-#define IRQ_PG11        77
-#define IRQ_PG12        78
-#define IRQ_PG13        79
-#define IRQ_PG14        80
-#define IRQ_PG15        81
-
-#define IRQ_PH0         82
-#define IRQ_PH1         83
-#define IRQ_PH2         84
-#define IRQ_PH3         85
-#define IRQ_PH4         86
-#define IRQ_PH5         87
-#define IRQ_PH6         88
-#define IRQ_PH7         89
-#define IRQ_PH8         90
-#define IRQ_PH9         91
-#define IRQ_PH10        92
-#define IRQ_PH11        93
-#define IRQ_PH12        94
-#define IRQ_PH13        95
-#define IRQ_PH14        96
-#define IRQ_PH15        97
-
-#define GPIO_IRQ_BASE   IRQ_PF0
-
-#define IRQ_MAC_PHYINT          98 /* PHY_INT Interrupt */
-#define IRQ_MAC_MMCINT          99 /* MMC Counter Interrupt */
-#define IRQ_MAC_RXFSINT         100 /* RX Frame-Status Interrupt */
-#define IRQ_MAC_TXFSINT         101 /* TX Frame-Status Interrupt */
-#define IRQ_MAC_WAKEDET         102 /* Wake-Up Interrupt */
-#define IRQ_MAC_RXDMAERR        103 /* RX DMA Direction Error Interrupt */
-#define IRQ_MAC_TXDMAERR        104 /* TX DMA Direction Error Interrupt */
-#define IRQ_MAC_STMDONE         105 /* Station Mgt. Transfer Done Interrupt */
-
-#define NR_MACH_IRQS    (IRQ_MAC_STMDONE + 1)
-#define NR_IRQS         (NR_MACH_IRQS + NR_SPARE_IRQS)
-
-#define IVG7            7
-#define IVG8            8
-#define IVG9            9
-#define IVG10           10
-#define IVG11           11
-#define IVG12           12
-#define IVG13           13
-#define IVG14           14
-#define IVG15           15
-
-/* IAR0 BIT FIELDS*/
-#define IRQ_PLL_WAKEUP_POS  0
-#define IRQ_DMA_ERROR_POS   4
-#define IRQ_ERROR_POS       8
-#define IRQ_RTC_POS         12
-#define IRQ_PPI_POS         16
-#define IRQ_SPORT0_RX_POS   20
-#define IRQ_SPORT0_TX_POS   24
-#define IRQ_SPORT1_RX_POS   28
-
-/* IAR1 BIT FIELDS*/
-#define IRQ_SPORT1_TX_POS   0
-#define IRQ_TWI_POS         4
-#define IRQ_SPI_POS         8
-#define IRQ_UART0_RX_POS    12
-#define IRQ_UART0_TX_POS    16
-#define IRQ_UART1_RX_POS    20
-#define IRQ_UART1_TX_POS    24
-#define IRQ_CAN_RX_POS      28
-
-/* IAR2 BIT FIELDS*/
-#define IRQ_CAN_TX_POS      0
-#define IRQ_MAC_RX_POS      4
-#define IRQ_MAC_TX_POS      8
-#define IRQ_TIMER0_POS        12
-#define IRQ_TIMER1_POS        16
-#define IRQ_TIMER2_POS        20
-#define IRQ_TIMER3_POS        24
-#define IRQ_TIMER4_POS        28
-
-/* IAR3 BIT FIELDS*/
-#define IRQ_TIMER5_POS        0
-#define IRQ_TIMER6_POS        4
-#define IRQ_TIMER7_POS        8
-#define IRQ_PROG_INTA_POS   12
-#define IRQ_PORTG_INTB_POS   16
-#define IRQ_MEM_DMA0_POS    20
-#define IRQ_MEM_DMA1_POS    24
-#define IRQ_WATCH_POS       28
-
-#endif                          /* _BF537_IRQ_H_ */
+#include <mach-common/irq.h>
+
+#define NR_PERI_INTS            32
+
+#define IRQ_PLL_WAKEUP          BFIN_IRQ(0)     /* PLL Wakeup Interrupt */
+#define IRQ_DMA_ERROR           BFIN_IRQ(1)     /* DMA Error (general) */
+#define IRQ_GENERIC_ERROR       BFIN_IRQ(2)     /* GENERIC Error Interrupt */
+#define IRQ_RTC                 BFIN_IRQ(3)     /* RTC Interrupt */
+#define IRQ_PPI                 BFIN_IRQ(4)     /* DMA0 Interrupt (PPI) */
+#define IRQ_SPORT0_RX           BFIN_IRQ(5)     /* DMA3 Interrupt (SPORT0 RX) */
+#define IRQ_SPORT0_TX           BFIN_IRQ(6)     /* DMA4 Interrupt (SPORT0 TX) */
+#define IRQ_SPORT1_RX           BFIN_IRQ(7)     /* DMA5 Interrupt (SPORT1 RX) */
+#define IRQ_SPORT1_TX           BFIN_IRQ(8)     /* DMA6 Interrupt (SPORT1 TX) */
+#define IRQ_TWI                 BFIN_IRQ(9)     /* TWI Interrupt */
+#define IRQ_SPI                 BFIN_IRQ(10)    /* DMA7 Interrupt (SPI) */
+#define IRQ_UART0_RX            BFIN_IRQ(11)    /* DMA8 Interrupt (UART0 RX) */
+#define IRQ_UART0_TX            BFIN_IRQ(12)    /* DMA9 Interrupt (UART0 TX) */
+#define IRQ_UART1_RX            BFIN_IRQ(13)    /* DMA10 Interrupt (UART1 RX) */
+#define IRQ_UART1_TX            BFIN_IRQ(14)    /* DMA11 Interrupt (UART1 TX) */
+#define IRQ_CAN_RX              BFIN_IRQ(15)    /* CAN Receive Interrupt */
+#define IRQ_CAN_TX              BFIN_IRQ(16)    /* CAN Transmit Interrupt */
+#define IRQ_PH_INTA_MAC_RX      BFIN_IRQ(17)    /* Port H Interrupt A & DMA1 Interrupt (Ethernet RX) */
+#define IRQ_PH_INTB_MAC_TX      BFIN_IRQ(18)    /* Port H Interrupt B & DMA2 Interrupt (Ethernet TX) */
+#define IRQ_TIMER0              BFIN_IRQ(19)    /* Timer 0 */
+#define IRQ_TIMER1              BFIN_IRQ(20)    /* Timer 1 */
+#define IRQ_TIMER2              BFIN_IRQ(21)    /* Timer 2 */
+#define IRQ_TIMER3              BFIN_IRQ(22)    /* Timer 3 */
+#define IRQ_TIMER4              BFIN_IRQ(23)    /* Timer 4 */
+#define IRQ_TIMER5              BFIN_IRQ(24)    /* Timer 5 */
+#define IRQ_TIMER6              BFIN_IRQ(25)    /* Timer 6 */
+#define IRQ_TIMER7              BFIN_IRQ(26)    /* Timer 7 */
+#define IRQ_PF_INTA_PG_INTA     BFIN_IRQ(27)    /* Ports F&G Interrupt A */
+#define IRQ_PORTG_INTB          BFIN_IRQ(28)    /* Port G Interrupt B */
+#define IRQ_MEM_DMA0            BFIN_IRQ(29)    /* (Memory DMA Stream 0) */
+#define IRQ_MEM_DMA1            BFIN_IRQ(30)    /* (Memory DMA Stream 1) */
+#define IRQ_PF_INTB_WATCH       BFIN_IRQ(31)    /* Watchdog & Port F Interrupt B */
+
+#define SYS_IRQS                39
+
+#define IRQ_PPI_ERROR           42      /* PPI Error Interrupt */
+#define IRQ_CAN_ERROR           43      /* CAN Error Interrupt */
+#define IRQ_MAC_ERROR           44      /* MAC Status/Error Interrupt */
+#define IRQ_SPORT0_ERROR        45      /* SPORT0 Error Interrupt */
+#define IRQ_SPORT1_ERROR        46      /* SPORT1 Error Interrupt */
+#define IRQ_SPI_ERROR           47      /* SPI Error Interrupt */
+#define IRQ_UART0_ERROR         48      /* UART Error Interrupt */
+#define IRQ_UART1_ERROR         49      /* UART Error Interrupt */
+
+#define IRQ_PF0                 50
+#define IRQ_PF1                 51
+#define IRQ_PF2                 52
+#define IRQ_PF3                 53
+#define IRQ_PF4                 54
+#define IRQ_PF5                 55
+#define IRQ_PF6                 56
+#define IRQ_PF7                 57
+#define IRQ_PF8                 58
+#define IRQ_PF9                 59
+#define IRQ_PF10                60
+#define IRQ_PF11                61
+#define IRQ_PF12                62
+#define IRQ_PF13                63
+#define IRQ_PF14                64
+#define IRQ_PF15                65
+
+#define IRQ_PG0                 66
+#define IRQ_PG1                 67
+#define IRQ_PG2                 68
+#define IRQ_PG3                 69
+#define IRQ_PG4                 70
+#define IRQ_PG5                 71
+#define IRQ_PG6                 72
+#define IRQ_PG7                 73
+#define IRQ_PG8                 74
+#define IRQ_PG9                 75
+#define IRQ_PG10                76
+#define IRQ_PG11                77
+#define IRQ_PG12                78
+#define IRQ_PG13                79
+#define IRQ_PG14                80
+#define IRQ_PG15                81
+
+#define IRQ_PH0                 82
+#define IRQ_PH1                 83
+#define IRQ_PH2                 84
+#define IRQ_PH3                 85
+#define IRQ_PH4                 86
+#define IRQ_PH5                 87
+#define IRQ_PH6                 88
+#define IRQ_PH7                 89
+#define IRQ_PH8                 90
+#define IRQ_PH9                 91
+#define IRQ_PH10                92
+#define IRQ_PH11                93
+#define IRQ_PH12                94
+#define IRQ_PH13                95
+#define IRQ_PH14                96
+#define IRQ_PH15                97
+
+#define GPIO_IRQ_BASE           IRQ_PF0
+
+#define IRQ_MAC_PHYINT          98      /* PHY_INT Interrupt */
+#define IRQ_MAC_MMCINT          99      /* MMC Counter Interrupt */
+#define IRQ_MAC_RXFSINT         100     /* RX Frame-Status Interrupt */
+#define IRQ_MAC_TXFSINT         101     /* TX Frame-Status Interrupt */
+#define IRQ_MAC_WAKEDET         102     /* Wake-Up Interrupt */
+#define IRQ_MAC_RXDMAERR        103     /* RX DMA Direction Error Interrupt */
+#define IRQ_MAC_TXDMAERR        104     /* TX DMA Direction Error Interrupt */
+#define IRQ_MAC_STMDONE         105     /* Station Mgt. Transfer Done Interrupt */
+
+#define IRQ_MAC_RX              106     /* DMA1 Interrupt (Ethernet RX) */
+#define IRQ_PORTH_INTA          107     /* Port H Interrupt A */
+
+#if 0 /* No Interrupt B support (yet) */
+#define IRQ_MAC_TX              108     /* DMA2 Interrupt (Ethernet TX) */
+#define IRQ_PORTH_INTB          109     /* Port H Interrupt B */
+#else
+#define IRQ_MAC_TX              IRQ_PH_INTB_MAC_TX
+#endif
+
+#define IRQ_PORTF_INTA          110     /* Port F Interrupt A */
+#define IRQ_PORTG_INTA          111     /* Port G Interrupt A */
+
+#if 0 /* No Interrupt B support (yet) */
+#define IRQ_WATCH               112     /* Watchdog Timer */
+#define IRQ_PORTF_INTB          113     /* Port F Interrupt B */
+#else
+#define IRQ_WATCH               IRQ_PF_INTB_WATCH
+#endif
+
+#define NR_MACH_IRQS            (113 + 1)
+
+/* IAR0 BIT FIELDS */
+#define IRQ_PLL_WAKEUP_POS      0
+#define IRQ_DMA_ERROR_POS       4
+#define IRQ_ERROR_POS           8
+#define IRQ_RTC_POS             12
+#define IRQ_PPI_POS             16
+#define IRQ_SPORT0_RX_POS       20
+#define IRQ_SPORT0_TX_POS       24
+#define IRQ_SPORT1_RX_POS       28
+
+/* IAR1 BIT FIELDS */
+#define IRQ_SPORT1_TX_POS       0
+#define IRQ_TWI_POS             4
+#define IRQ_SPI_POS             8
+#define IRQ_UART0_RX_POS        12
+#define IRQ_UART0_TX_POS        16
+#define IRQ_UART1_RX_POS        20
+#define IRQ_UART1_TX_POS        24
+#define IRQ_CAN_RX_POS          28
+
+/* IAR2 BIT FIELDS */
+#define IRQ_CAN_TX_POS          0
+#define IRQ_MAC_RX_POS          4
+#define IRQ_MAC_TX_POS          8
+#define IRQ_TIMER0_POS          12
+#define IRQ_TIMER1_POS          16
+#define IRQ_TIMER2_POS          20
+#define IRQ_TIMER3_POS          24
+#define IRQ_TIMER4_POS          28
+
+/* IAR3 BIT FIELDS */
+#define IRQ_TIMER5_POS          0
+#define IRQ_TIMER6_POS          4
+#define IRQ_TIMER7_POS          8
+#define IRQ_PROG_INTA_POS       12
+#define IRQ_PORTG_INTB_POS      16
+#define IRQ_MEM_DMA0_POS        20
+#define IRQ_MEM_DMA1_POS        24
+#define IRQ_WATCH_POS           28
+
+#define init_mach_irq init_mach_irq
+
+#endif
diff --git a/arch/blackfin/mach-bf537/ints-priority.c b/arch/blackfin/mach-bf537/ints-priority.c
index f6500622b35d..2137a209a22b 100644
--- a/arch/blackfin/mach-bf537/ints-priority.c
+++ b/arch/blackfin/mach-bf537/ints-priority.c
@@ -10,6 +10,13 @@
 #include <linux/irq.h>
 #include <asm/blackfin.h>
 
+#include <asm/irq_handler.h>
+#include <asm/bfin5xx_spi.h>
+#include <asm/bfin_sport.h>
+#include <asm/bfin_can.h>
+#include <asm/bfin_dma.h>
+#include <asm/dpmc.h>
+
 void __init program_IAR(void)
 {
         /* Program the IAR0 Register with the configured priority */
@@ -51,3 +58,159 @@ void __init program_IAR(void)
 
         SSYNC();
 }
+
+#define SPI_ERR_MASK   (BIT_STAT_TXCOL | BIT_STAT_RBSY | BIT_STAT_MODF | BIT_STAT_TXE)  /* SPI_STAT */
+#define SPORT_ERR_MASK (ROVF | RUVF | TOVF | TUVF)      /* SPORT_STAT */
+#define PPI_ERR_MASK   (0xFFFF & ~FLD)  /* PPI_STATUS */
+#define EMAC_ERR_MASK  (PHYINT | MMCINT | RXFSINT | TXFSINT | WAKEDET | RXDMAERR | TXDMAERR | STMDONE)  /* EMAC_SYSTAT */
+#define UART_ERR_MASK  (0x6)    /* UART_IIR */
+#define CAN_ERR_MASK   (EWTIF | EWRIF | EPIF | BOIF | WUIF | UIAIF | AAIF | RMLIF | UCEIF | EXTIF | ADIF)       /* CAN_GIF */
+
+static int error_int_mask;
+
+static void bf537_generic_error_mask_irq(struct irq_data *d)
+{
+        error_int_mask &= ~(1L << (d->irq - IRQ_PPI_ERROR));
+        if (!error_int_mask)
+                bfin_internal_mask_irq(IRQ_GENERIC_ERROR);
+}
+
+static void bf537_generic_error_unmask_irq(struct irq_data *d)
+{
+        bfin_internal_unmask_irq(IRQ_GENERIC_ERROR);
+        error_int_mask |= 1L << (d->irq - IRQ_PPI_ERROR);
+}
+
+static struct irq_chip bf537_generic_error_irqchip = {
+        .name = "ERROR",
+        .irq_ack = bfin_ack_noop,
+        .irq_mask_ack = bf537_generic_error_mask_irq,
+        .irq_mask = bf537_generic_error_mask_irq,
+        .irq_unmask = bf537_generic_error_unmask_irq,
+};
+
+static void bf537_demux_error_irq(unsigned int int_err_irq,
+                                  struct irq_desc *inta_desc)
+{
+        int irq = 0;
+
+#if (defined(CONFIG_BF537) || defined(CONFIG_BF536))
+        if (bfin_read_EMAC_SYSTAT() & EMAC_ERR_MASK)
+                irq = IRQ_MAC_ERROR;
+        else
+#endif
+        if (bfin_read_SPORT0_STAT() & SPORT_ERR_MASK)
+                irq = IRQ_SPORT0_ERROR;
+        else if (bfin_read_SPORT1_STAT() & SPORT_ERR_MASK)
+                irq = IRQ_SPORT1_ERROR;
+        else if (bfin_read_PPI_STATUS() & PPI_ERR_MASK)
+                irq = IRQ_PPI_ERROR;
+        else if (bfin_read_CAN_GIF() & CAN_ERR_MASK)
+                irq = IRQ_CAN_ERROR;
+        else if (bfin_read_SPI_STAT() & SPI_ERR_MASK)
+                irq = IRQ_SPI_ERROR;
+        else if ((bfin_read_UART0_IIR() & UART_ERR_MASK) == UART_ERR_MASK)
+                irq = IRQ_UART0_ERROR;
+        else if ((bfin_read_UART1_IIR() & UART_ERR_MASK) == UART_ERR_MASK)
+                irq = IRQ_UART1_ERROR;
+
+        if (irq) {
+                if (error_int_mask & (1L << (irq - IRQ_PPI_ERROR)))
+                        bfin_handle_irq(irq);
+                else {
+
+                        switch (irq) {
+                        case IRQ_PPI_ERROR:
+                                bfin_write_PPI_STATUS(PPI_ERR_MASK);
+                                break;
+#if (defined(CONFIG_BF537) || defined(CONFIG_BF536))
+                        case IRQ_MAC_ERROR:
+                                bfin_write_EMAC_SYSTAT(EMAC_ERR_MASK);
+                                break;
+#endif
+                        case IRQ_SPORT0_ERROR:
+                                bfin_write_SPORT0_STAT(SPORT_ERR_MASK);
+                                break;
+
+                        case IRQ_SPORT1_ERROR:
+                                bfin_write_SPORT1_STAT(SPORT_ERR_MASK);
+                                break;
+
+                        case IRQ_CAN_ERROR:
+                                bfin_write_CAN_GIS(CAN_ERR_MASK);
+                                break;
+
+                        case IRQ_SPI_ERROR:
+                                bfin_write_SPI_STAT(SPI_ERR_MASK);
+                                break;
+
+                        default:
+                                break;
+                        }
+
+                        pr_debug("IRQ %d:"
+                                 " MASKED PERIPHERAL ERROR INTERRUPT ASSERTED\n",
+                                 irq);
+                }
+        } else
+                pr_err("%s: IRQ ?: PERIPHERAL ERROR INTERRUPT ASSERTED BUT NO SOURCE FOUND\n",
+                       __func__);
+
+}
+
+#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+static int mac_rx_int_mask;
+
+static void bf537_mac_rx_mask_irq(struct irq_data *d)
+{
+        mac_rx_int_mask &= ~(1L << (d->irq - IRQ_MAC_RX));
+        if (!mac_rx_int_mask)
+                bfin_internal_mask_irq(IRQ_PH_INTA_MAC_RX);
+}
+
+static void bf537_mac_rx_unmask_irq(struct irq_data *d)
+{
+        bfin_internal_unmask_irq(IRQ_PH_INTA_MAC_RX);
+        mac_rx_int_mask |= 1L << (d->irq - IRQ_MAC_RX);
+}
+
+static struct irq_chip bf537_mac_rx_irqchip = {
+        .name = "ERROR",
+        .irq_ack = bfin_ack_noop,
+        .irq_mask_ack = bf537_mac_rx_mask_irq,
+        .irq_mask = bf537_mac_rx_mask_irq,
+        .irq_unmask = bf537_mac_rx_unmask_irq,
+};
+
+static void bf537_demux_mac_rx_irq(unsigned int int_irq,
+                                   struct irq_desc *desc)
+{
+        if (bfin_read_DMA1_IRQ_STATUS() & (DMA_DONE | DMA_ERR))
+                bfin_handle_irq(IRQ_MAC_RX);
+        else
+                bfin_demux_gpio_irq(int_irq, desc);
+}
+#endif
+
+void __init init_mach_irq(void)
+{
+        int irq;
+
+#if defined(CONFIG_BF537) || defined(CONFIG_BF536)
+        /* Clear EMAC Interrupt Status bits so we can demux it later */
+        bfin_write_EMAC_SYSTAT(-1);
+#endif
+
+        irq_set_chained_handler(IRQ_GENERIC_ERROR, bf537_demux_error_irq);
+        for (irq = IRQ_PPI_ERROR; irq <= IRQ_UART1_ERROR; irq++)
+                irq_set_chip_and_handler(irq, &bf537_generic_error_irqchip,
+                                         handle_level_irq);
+
+#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+        irq_set_chained_handler(IRQ_PH_INTA_MAC_RX, bf537_demux_mac_rx_irq);
+        irq_set_chip_and_handler(IRQ_MAC_RX, &bf537_mac_rx_irqchip, handle_level_irq);
+        irq_set_chip_and_handler(IRQ_PORTH_INTA, &bf537_mac_rx_irqchip, handle_level_irq);
+
+        irq_set_chained_handler(IRQ_MAC_ERROR, bfin_demux_mac_status_irq);
+#endif
+}
diff --git a/arch/blackfin/mach-bf538/include/mach/anomaly.h b/arch/blackfin/mach-bf538/include/mach/anomaly.h
index 8774b481c78e..55e7d0712a94 100644
--- a/arch/blackfin/mach-bf538/include/mach/anomaly.h
+++ b/arch/blackfin/mach-bf538/include/mach/anomaly.h
@@ -5,14 +5,14 @@
  * and can be replaced with that version at any time
  * DO NOT EDIT THIS FILE
  *
- * Copyright 2004-2010 Analog Devices Inc.
+ * Copyright 2004-2011 Analog Devices Inc.
  * Licensed under the ADI BSD license.
  *   https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd
  */
 
 /* This file should be up to date with:
- *  - Revision H, 07/10/2009; ADSP-BF538/BF538F Blackfin Processor Anomaly List
- *  - Revision M, 07/10/2009; ADSP-BF539/BF539F Blackfin Processor Anomaly List
+ *  - Revision I, 05/25/2010; ADSP-BF538/BF538F Blackfin Processor Anomaly List
+ *  - Revision N, 05/25/2010; ADSP-BF539/BF539F Blackfin Processor Anomaly List
  */
 
 #ifndef _MACH_ANOMALY_H_
@@ -179,6 +179,7 @@
 #define ANOMALY_05000363 (0)
 #define ANOMALY_05000364 (0)
 #define ANOMALY_05000380 (0)
+#define ANOMALY_05000383 (0)
 #define ANOMALY_05000386 (1)
 #define ANOMALY_05000389 (0)
 #define ANOMALY_05000400 (0)
@@ -186,6 +187,7 @@
 #define ANOMALY_05000430 (0)
 #define ANOMALY_05000432 (0)
 #define ANOMALY_05000435 (0)
+#define ANOMALY_05000440 (0)
 #define ANOMALY_05000447 (0)
 #define ANOMALY_05000448 (0)
 #define ANOMALY_05000456 (0)
@@ -193,6 +195,7 @@
 #define ANOMALY_05000465 (0)
 #define ANOMALY_05000467 (0)
 #define ANOMALY_05000474 (0)
+#define ANOMALY_05000480 (0)
 #define ANOMALY_05000485 (0)
 
 #endif
diff --git a/arch/blackfin/mach-bf538/include/mach/irq.h b/arch/blackfin/mach-bf538/include/mach/irq.h
index 7a479d224dc7..07ca069d37cd 100644
--- a/arch/blackfin/mach-bf538/include/mach/irq.h
+++ b/arch/blackfin/mach-bf538/include/mach/irq.h
@@ -7,38 +7,9 @@
 #ifndef _BF538_IRQ_H_
 #define _BF538_IRQ_H_
 
-/*
- * Interrupt source definitions
-        Event Source    Core Event Name
-        Core        Emulation               **
-        Events         (highest priority)  EMU         0
-        Reset                   RST         1
-        NMI                     NMI         2
-        Exception               EVX         3
-        Reserved                --          4
-        Hardware Error          IVHW        5
-        Core Timer              IVTMR       6 *
-
-        .....
-
-         Software Interrupt 1    IVG14       31
-         Software Interrupt 2    --
-         (lowest priority)  IVG15       32 *
-*/
-
-#define NR_PERI_INTS    (2 * 32)
-
-/* The ABSTRACT IRQ definitions */
-/** the first seven of the following are fixed, the rest you change if you need to **/
-#define IRQ_EMU                 0       /* Emulation */
-#define IRQ_RST                 1       /* reset */
-#define IRQ_NMI                 2       /* Non Maskable */
-#define IRQ_EVX                 3       /* Exception */
-#define IRQ_UNUSED              4       /* - unused interrupt */
-#define IRQ_HWERR               5       /* Hardware Error */
-#define IRQ_CORETMR             6       /* Core timer */
-
-#define BFIN_IRQ(x)             ((x) + 7)
+#include <mach-common/irq.h>
+
+#define NR_PERI_INTS            (2 * 32)
 
 #define IRQ_PLL_WAKEUP          BFIN_IRQ(0)     /* PLL Wakeup Interrupt */
 #define IRQ_DMA0_ERROR          BFIN_IRQ(1)     /* DMA Error 0 (generic) */
@@ -91,37 +62,26 @@
 
 #define SYS_IRQS                BFIN_IRQ(63)    /* 70 */
 
-#define IRQ_PF0         71
-#define IRQ_PF1         72
-#define IRQ_PF2         73
-#define IRQ_PF3         74
-#define IRQ_PF4         75
-#define IRQ_PF5         76
-#define IRQ_PF6         77
-#define IRQ_PF7         78
-#define IRQ_PF8         79
-#define IRQ_PF9         80
-#define IRQ_PF10        81
-#define IRQ_PF11        82
-#define IRQ_PF12        83
-#define IRQ_PF13        84
-#define IRQ_PF14        85
-#define IRQ_PF15        86
-
-#define GPIO_IRQ_BASE   IRQ_PF0
-
-#define NR_MACH_IRQS    (IRQ_PF15 + 1)
-#define NR_IRQS         (NR_MACH_IRQS + NR_SPARE_IRQS)
-
-#define IVG7            7
-#define IVG8            8
-#define IVG9            9
-#define IVG10           10
-#define IVG11           11
-#define IVG12           12
-#define IVG13           13
-#define IVG14           14
-#define IVG15           15
+#define IRQ_PF0                 71
+#define IRQ_PF1                 72
+#define IRQ_PF2                 73
+#define IRQ_PF3                 74
+#define IRQ_PF4                 75
+#define IRQ_PF5                 76
+#define IRQ_PF6                 77
+#define IRQ_PF7                 78
+#define IRQ_PF8                 79
+#define IRQ_PF9                 80
+#define IRQ_PF10                81
+#define IRQ_PF11                82
+#define IRQ_PF12                83
+#define IRQ_PF13                84
+#define IRQ_PF14                85
+#define IRQ_PF15                86
+
+#define GPIO_IRQ_BASE           IRQ_PF0
+
+#define NR_MACH_IRQS            (IRQ_PF15 + 1)
 
 /* IAR0 BIT FIELDS */
 #define IRQ_PLL_WAKEUP_POS      0
@@ -184,4 +144,5 @@
 #define IRQ_CAN_TX_POS          0
 #define IRQ_MEM1_DMA0_POS       4
 #define IRQ_MEM1_DMA1_POS       8
-#endif                          /* _BF538_IRQ_H_ */
+
+#endif
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 93e19a54a880..311bf9970fe7 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -22,6 +22,7 @@
 #include <asm/gpio.h>
 #include <asm/nand.h>
 #include <asm/dpmc.h>
+#include <asm/bfin_sport.h>
 #include <asm/portmux.h>
 #include <asm/bfin_sdh.h>
 #include <mach/bf54x_keys.h>
@@ -956,7 +957,15 @@ static struct mtd_partition ezkit_partitions[] = {
                 .offset     = MTDPART_OFS_APPEND,
         }, {
                 .name       = "file system(nor)",
-                .size       = MTDPART_SIZ_FULL,
+                .size       = 0x1000000 - 0x80000 - 0x400000 - 0x8000 * 4,
+                .offset     = MTDPART_OFS_APPEND,
+        }, {
+                .name       = "config(nor)",
+                .size       = 0x8000 * 3,
+                .offset     = MTDPART_OFS_APPEND,
+        }, {
+                .name       = "u-boot env(nor)",
+                .size       = 0x8000,
                 .offset     = MTDPART_OFS_APPEND,
         }
 };
@@ -1312,27 +1321,110 @@ static struct platform_device bfin_dpmc = {
         },
 };
 
-#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
+#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
+        defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) || \
+        defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+
+#define SPORT_REQ(x) \
+        [x] = {P_SPORT##x##_TFS, P_SPORT##x##_DTPRI, P_SPORT##x##_TSCLK, \
+                P_SPORT##x##_RFS, P_SPORT##x##_DRPRI, P_SPORT##x##_RSCLK, 0}
+
+static const u16 bfin_snd_pin[][7] = {
+        SPORT_REQ(0),
+        SPORT_REQ(1),
+};
+
+static struct bfin_snd_platform_data bfin_snd_data[] = {
+        {
+                .pin_req = &bfin_snd_pin[0][0],
+        },
+        {
+                .pin_req = &bfin_snd_pin[1][0],
+        },
+};
+
+#define BFIN_SND_RES(x) \
+        [x] = { \
+                { \
+                        .start = SPORT##x##_TCR1, \
+                        .end = SPORT##x##_TCR1, \
+                        .flags = IORESOURCE_MEM \
+                }, \
+                { \
+                        .start = CH_SPORT##x##_RX, \
+                        .end = CH_SPORT##x##_RX, \
+                        .flags = IORESOURCE_DMA, \
+                }, \
+                { \
+                        .start = CH_SPORT##x##_TX, \
+                        .end = CH_SPORT##x##_TX, \
+                        .flags = IORESOURCE_DMA, \
+                }, \
+                { \
+                        .start = IRQ_SPORT##x##_ERROR, \
+                        .end = IRQ_SPORT##x##_ERROR, \
+                        .flags = IORESOURCE_IRQ, \
+                } \
+        }
+
+static struct resource bfin_snd_resources[][4] = {
+        BFIN_SND_RES(0),
+        BFIN_SND_RES(1),
+};
+
+static struct platform_device bfin_pcm = {
+        .name = "bfin-pcm-audio",
+        .id = -1,
+};
+#endif
+
+#if defined(CONFIG_SND_BF5XX_SOC_AD73311) || defined(CONFIG_SND_BF5XX_SOC_AD73311_MODULE)
+static struct platform_device bfin_ad73311_codec_device = {
+        .name = "ad73311",
+        .id = -1,
+};
+#endif
+
+#if defined(CONFIG_SND_BF5XX_SOC_AD1980) || defined(CONFIG_SND_BF5XX_SOC_AD1980_MODULE)
+static struct platform_device bfin_ad1980_codec_device = {
+        .name = "ad1980",
+        .id = -1,
+};
+#endif
+
+#if defined(CONFIG_SND_BF5XX_SOC_I2S) || defined(CONFIG_SND_BF5XX_SOC_I2S_MODULE)
 static struct platform_device bfin_i2s = {
         .name = "bfin-i2s",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
-        /* TODO: add platform data here */
+        .num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),
+        .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],
+        .dev = {
+                .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],
+        },
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_TDM) || defined(CONFIG_SND_BF5XX_SOC_TDM_MODULE)
 static struct platform_device bfin_tdm = {
         .name = "bfin-tdm",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
-        /* TODO: add platform data here */
+        .num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),
+        .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],
+        .dev = {
+                .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],
+        },
 };
 #endif
 
-#if defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_AC97) || defined(CONFIG_SND_BF5XX_SOC_AC97_MODULE)
 static struct platform_device bfin_ac97 = {
         .name = "bfin-ac97",
         .id = CONFIG_SND_BF5XX_SPORT_NUM,
-        /* TODO: add platform data here */
+        .num_resources = ARRAY_SIZE(bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM]),
+        .resource = bfin_snd_resources[CONFIG_SND_BF5XX_SPORT_NUM],
+        .dev = {
+                .platform_data = &bfin_snd_data[CONFIG_SND_BF5XX_SPORT_NUM],
+        },
 };
 #endif
 
@@ -1450,6 +1542,16 @@ static struct platform_device *ezkit_devices[] __initdata = {
         &ezkit_flash_device,
 #endif
 
+#if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE) || \
+        defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE) || \
+        defined(CONFIG_SND_BF5XX_AC97) || defined(CONFIG_SND_BF5XX_AC97_MODULE)
+        &bfin_pcm,
+#endif
+
+#if defined(CONFIG_SND_BF5XX_SOC_AD1980) || defined(CONFIG_SND_BF5XX_SOC_AD1980_MODULE)
+        &bfin_ad1980_codec_device,
+#endif
+
 #if defined(CONFIG_SND_BF5XX_I2S) || defined(CONFIG_SND_BF5XX_I2S_MODULE)
         &bfin_i2s,
 #endif
diff --git a/arch/blackfin/mach-bf548/include/mach/anomaly.h b/arch/blackfin/mach-bf548/include/mach/anomaly.h
index ffd0537295ac..9e70785bdde3 100644
--- a/arch/blackfin/mach-bf548/include/mach/anomaly.h
+++ b/arch/blackfin/mach-bf548/include/mach/anomaly.h
@@ -5,13 +5,13 @@
  * and can be replaced with that version at any time
  * DO NOT EDIT THIS FILE
  *
- * Copyright 2004-2010 Analog Devices Inc.
+ * Copyright 2004-2011 Analog Devices Inc.
  * Licensed under the ADI BSD license.
  *   https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd
  */
 
 /* This file should be up to date with:
- *  - Revision I, 07/23/2009; ADSP-BF542/BF544/BF547/BF548/BF549 Blackfin Processor Anomaly List
+ *  - Revision J, 06/03/2010; ADSP-BF542/BF544/BF547/BF548/BF549 Blackfin Processor Anomaly List
  */
 
 #ifndef _MACH_ANOMALY_H_
@@ -220,6 +220,8 @@
 #define ANOMALY_05000481 (1)
 /* Possible USB Data Corruption When Multiple Endpoints Are Accessed by the Core */
 #define ANOMALY_05000483 (1)
+/* DDR Trim May Not Be Performed for Certain VLEV Values in OTP Page PBS00L */
+#define ANOMALY_05000484 (__SILICON_REVISION__ < 3)
 /* PLL_CTL Change Using bfrom_SysControl() Can Result in Processor Overclocking */
 #define ANOMALY_05000485 (__SILICON_REVISION__ >= 2)
 /* IFLUSH sucks at life */
@@ -274,6 +276,8 @@
 #define ANOMALY_05000412 (0)
 #define ANOMALY_05000432 (0)
 #define ANOMALY_05000435 (0)
+#define ANOMALY_05000440 (0)
 #define ANOMALY_05000475 (0)
+#define ANOMALY_05000480 (0)
 
 #endif
diff --git a/arch/blackfin/mach-bf548/include/mach/irq.h b/arch/blackfin/mach-bf548/include/mach/irq.h
index 7f87787e7738..533b8095b540 100644
--- a/arch/blackfin/mach-bf548/include/mach/irq.h
+++ b/arch/blackfin/mach-bf548/include/mach/irq.h
@@ -7,38 +7,9 @@
 #ifndef _BF548_IRQ_H_
 #define _BF548_IRQ_H_
 
-/*
- * Interrupt source definitions
-            Event Source    Core Event Name
-Core        Emulation               **
-Events         (highest priority)  EMU         0
-            Reset                   RST         1
-            NMI                     NMI         2
-            Exception               EVX         3
-            Reserved                --          4
-            Hardware Error          IVHW        5
-            Core Timer              IVTMR       6 *
-
-.....
-
-            Software Interrupt 1    IVG14       31
-            Software Interrupt 2    --
-                 (lowest priority)  IVG15       32 *
- */
-
-#define NR_PERI_INTS    (32 * 3)
-
-/* The ABSTRACT IRQ definitions */
-/** the first seven of the following are fixed, the rest you change if you need to **/
-#define IRQ_EMU                 0       /* Emulation */
-#define IRQ_RST                 1       /* reset */
-#define IRQ_NMI                 2       /* Non Maskable */
-#define IRQ_EVX                 3       /* Exception */
-#define IRQ_UNUSED              4       /* - unused interrupt*/
-#define IRQ_HWERR               5       /* Hardware Error */
-#define IRQ_CORETMR             6       /* Core timer */
+#include <mach-common/irq.h>
 
-#define BFIN_IRQ(x)             ((x) + 7)
+#define NR_PERI_INTS            (3 * 32)
 
 #define IRQ_PLL_WAKEUP          BFIN_IRQ(0)     /* PLL Wakeup Interrupt */
 #define IRQ_DMAC0_ERROR         BFIN_IRQ(1)     /* DMAC0 Status Interrupt */
@@ -311,49 +282,37 @@ Events         (highest priority)  EMU         0
 #define IRQ_PJ14                BFIN_PJ_IRQ(14)         /* N/A */
 #define IRQ_PJ15                BFIN_PJ_IRQ(15)         /* N/A */
 
-#define GPIO_IRQ_BASE   IRQ_PA0
+#define GPIO_IRQ_BASE           IRQ_PA0
 
-#define NR_MACH_IRQS    (IRQ_PJ15 + 1)
-#define NR_IRQS         (NR_MACH_IRQS + NR_SPARE_IRQS)
+#define NR_MACH_IRQS            (IRQ_PJ15 + 1)
 
 /* For compatibility reasons with existing code */
 
-#define IRQ_DMAC0_ERR           IRQ_DMAC0_ERROR
-#define IRQ_EPPI0_ERR           IRQ_EPPI0_ERROR
+#define IRQ_DMAC0_ERR           IRQ_DMAC0_ERROR
+#define IRQ_EPPI0_ERR           IRQ_EPPI0_ERROR
 #define IRQ_SPORT0_ERR          IRQ_SPORT0_ERROR
 #define IRQ_SPORT1_ERR          IRQ_SPORT1_ERROR
-#define IRQ_SPI0_ERR            IRQ_SPI0_ERROR
-#define IRQ_UART0_ERR           IRQ_UART0_ERROR
-#define IRQ_DMAC1_ERR           IRQ_DMAC1_ERROR
+#define IRQ_SPI0_ERR            IRQ_SPI0_ERROR
+#define IRQ_UART0_ERR           IRQ_UART0_ERROR
+#define IRQ_DMAC1_ERR           IRQ_DMAC1_ERROR
 #define IRQ_SPORT2_ERR          IRQ_SPORT2_ERROR
 #define IRQ_SPORT3_ERR          IRQ_SPORT3_ERROR
-#define IRQ_SPI1_ERR            IRQ_SPI1_ERROR
-#define IRQ_SPI2_ERR            IRQ_SPI2_ERROR
-#define IRQ_UART1_ERR           IRQ_UART1_ERROR
-#define IRQ_UART2_ERR           IRQ_UART2_ERROR
-#define IRQ_CAN0_ERR            IRQ_CAN0_ERROR
-#define IRQ_MXVR_ERR            IRQ_MXVR_ERROR
-#define IRQ_EPPI1_ERR           IRQ_EPPI1_ERROR
-#define IRQ_EPPI2_ERR           IRQ_EPPI2_ERROR
-#define IRQ_UART3_ERR           IRQ_UART3_ERROR
-#define IRQ_HOST_ERR            IRQ_HOST_ERROR
-#define IRQ_PIXC_ERR            IRQ_PIXC_ERROR
-#define IRQ_NFC_ERR             IRQ_NFC_ERROR
-#define IRQ_ATAPI_ERR           IRQ_ATAPI_ERROR
-#define IRQ_CAN1_ERR            IRQ_CAN1_ERROR
+#define IRQ_SPI1_ERR            IRQ_SPI1_ERROR
+#define IRQ_SPI2_ERR            IRQ_SPI2_ERROR
+#define IRQ_UART1_ERR           IRQ_UART1_ERROR
+#define IRQ_UART2_ERR           IRQ_UART2_ERROR
+#define IRQ_CAN0_ERR            IRQ_CAN0_ERROR
+#define IRQ_MXVR_ERR            IRQ_MXVR_ERROR
+#define IRQ_EPPI1_ERR           IRQ_EPPI1_ERROR
+#define IRQ_EPPI2_ERR           IRQ_EPPI2_ERROR
+#define IRQ_UART3_ERR           IRQ_UART3_ERROR
+#define IRQ_HOST_ERR            IRQ_HOST_ERROR
+#define IRQ_PIXC_ERR            IRQ_PIXC_ERROR
+#define IRQ_NFC_ERR             IRQ_NFC_ERROR
+#define IRQ_ATAPI_ERR           IRQ_ATAPI_ERROR
+#define IRQ_CAN1_ERR            IRQ_CAN1_ERROR
 #define IRQ_HS_DMA_ERR          IRQ_HS_DMA_ERROR
 
-
-#define IVG7            7
-#define IVG8            8
-#define IVG9            9
-#define IVG10           10
-#define IVG11           11
-#define IVG12           12
-#define IVG13           13
-#define IVG14           14
-#define IVG15           15
-
 /* IAR0 BIT FIELDS */
 #define IRQ_PLL_WAKEUP_POS      0
 #define IRQ_DMAC0_ERR_POS       4
@@ -492,4 +451,4 @@ struct bfin_pint_regs {
 
 #endif
 
-#endif /* _BF548_IRQ_H_ */
+#endif
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index f667e7704197..5067984a62e7 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -247,7 +247,15 @@ static struct mtd_partition ezkit_partitions[] = {
                 .offset     = MTDPART_OFS_APPEND,
         }, {
                 .name       = "file system(nor)",
-                .size       = MTDPART_SIZ_FULL,
+                .size       = 0x800000 - 0x40000 - 0x1C0000 - 0x2000 * 8,
+                .offset     = MTDPART_OFS_APPEND,
+        }, {
+                .name       = "config(nor)",
+                .size       = 0x2000 * 7,
+                .offset     = MTDPART_OFS_APPEND,
+        }, {
+                .name       = "u-boot env(nor)",
+                .size       = 0x2000,
                 .offset     = MTDPART_OFS_APPEND,
         }
 };
diff --git a/arch/blackfin/mach-bf561/include/mach/anomaly.h b/arch/blackfin/mach-bf561/include/mach/anomaly.h
index 6a3499b02097..22b5ab773027 100644
--- a/arch/blackfin/mach-bf561/include/mach/anomaly.h
+++ b/arch/blackfin/mach-bf561/include/mach/anomaly.h
@@ -5,13 +5,13 @@
  * and can be replaced with that version at any time
  * DO NOT EDIT THIS FILE
  *
- * Copyright 2004-2010 Analog Devices Inc.
+ * Copyright 2004-2011 Analog Devices Inc.
  * Licensed under the ADI BSD license.
  *   https://docs.blackfin.uclinux.org/doku.php?id=adi_bsd
  */
 
 /* This file should be up to date with:
- *  - Revision Q, 11/07/2008; ADSP-BF561 Blackfin Processor Anomaly List
+ *  - Revision R, 05/25/2010; ADSP-BF561 Blackfin Processor Anomaly List
  */
 
 #ifndef _MACH_ANOMALY_H_
@@ -290,12 +290,18 @@
 #define ANOMALY_05000428 (__SILICON_REVISION__ > 3)
 /* IFLUSH Instruction at End of Hardware Loop Causes Infinite Stall */
 #define ANOMALY_05000443 (1)
+/* SCKELOW Feature Is Not Functional */
+#define ANOMALY_05000458 (1)
 /* False Hardware Error when RETI Points to Invalid Memory */
 #define ANOMALY_05000461 (1)
+/* Synchronization Problem at Startup May Cause SPORT Transmit Channels to Misalign */
+#define ANOMALY_05000462 (1)
+/* Boot Failure When SDRAM Control Signals Toggle Coming Out Of Reset */
+#define ANOMALY_05000471 (1)
 /* Interrupted 32-Bit SPORT Data Register Access Results In Underflow */
 #define ANOMALY_05000473 (1)
 /* Possible Lockup Condition whem Modifying PLL from External Memory */
-#define ANOMALY_05000475 (__SILICON_REVISION__ < 4)
+#define ANOMALY_05000475 (1)
 /* TESTSET Instruction Cannot Be Interrupted */
 #define ANOMALY_05000477 (1)
 /* Reads of ITEST_COMMAND and ITEST_DATA Registers Cause Cache Corruption */
@@ -314,12 +320,14 @@
 #define ANOMALY_05000353 (1)
 #define ANOMALY_05000364 (0)
 #define ANOMALY_05000380 (0)
+#define ANOMALY_05000383 (0)
 #define ANOMALY_05000386 (1)
 #define ANOMALY_05000389 (0)
 #define ANOMALY_05000400 (0)
 #define ANOMALY_05000430 (0)
 #define ANOMALY_05000432 (0)
 #define ANOMALY_05000435 (0)
+#define ANOMALY_05000440 (0)
 #define ANOMALY_05000447 (0)
 #define ANOMALY_05000448 (0)
 #define ANOMALY_05000456 (0)
@@ -327,6 +335,7 @@
 #define ANOMALY_05000465 (0)
 #define ANOMALY_05000467 (0)
 #define ANOMALY_05000474 (0)
+#define ANOMALY_05000480 (0)
 #define ANOMALY_05000485 (0)
 
 #endif
diff --git a/arch/blackfin/mach-bf561/include/mach/irq.h b/arch/blackfin/mach-bf561/include/mach/irq.h
index c95566ade51b..d6998520f70f 100644
--- a/arch/blackfin/mach-bf561/include/mach/irq.h
+++ b/arch/blackfin/mach-bf561/include/mach/irq.h
@@ -7,212 +7,98 @@
 #ifndef _BF561_IRQ_H_
 #define _BF561_IRQ_H_
 
-/***********************************************************************
- * Interrupt source definitions:
-             Event Source               Core Event Name     IRQ No
-                                                (highest priority)
-            Emulation Events                    EMU         0
-            Reset                               RST         1
-            NMI                                 NMI         2
-            Exception                           EVX         3
-            Reserved                            --          4
-            Hardware Error                      IVHW        5
-            Core Timer                          IVTMR       6 *
-
-            PLL Wakeup Interrupt                IVG7        7
-            DMA1 Error (generic)                IVG7        8
-            DMA2 Error (generic)                IVG7        9
-            IMDMA Error (generic)               IVG7        10
-            PPI1 Error Interrupt                IVG7        11
-            PPI2 Error Interrupt                IVG7        12
-            SPORT0 Error Interrupt              IVG7        13
-            SPORT1 Error Interrupt              IVG7        14
-            SPI Error Interrupt                 IVG7        15
-            UART Error Interrupt                IVG7        16
-            Reserved Interrupt                  IVG7        17
-
-            DMA1 0  Interrupt(PPI1)             IVG8        18
-            DMA1 1  Interrupt(PPI2)             IVG8        19
-            DMA1 2  Interrupt                   IVG8        20
-            DMA1 3  Interrupt                   IVG8        21
-            DMA1 4  Interrupt                   IVG8        22
-            DMA1 5  Interrupt                   IVG8        23
-            DMA1 6  Interrupt                   IVG8        24
-            DMA1 7  Interrupt                   IVG8        25
-            DMA1 8  Interrupt                   IVG8        26
-            DMA1 9  Interrupt                   IVG8        27
-            DMA1 10 Interrupt                   IVG8        28
-            DMA1 11 Interrupt                   IVG8        29
-
-            DMA2 0  (SPORT0 RX)                 IVG9        30
-            DMA2 1  (SPORT0 TX)                 IVG9        31
-            DMA2 2  (SPORT1 RX)                 IVG9        32
-            DMA2 3  (SPORT2 TX)                 IVG9        33
-            DMA2 4  (SPI)                       IVG9        34
-            DMA2 5  (UART RX)                   IVG9        35
-            DMA2 6  (UART TX)                   IVG9        36
-            DMA2 7  Interrupt                   IVG9        37
-            DMA2 8  Interrupt                   IVG9        38
-            DMA2 9  Interrupt                   IVG9        39
-            DMA2 10 Interrupt                   IVG9        40
-            DMA2 11 Interrupt                   IVG9        41
-
-            TIMER 0  Interrupt                  IVG10       42
-            TIMER 1  Interrupt                  IVG10       43
-            TIMER 2  Interrupt                  IVG10       44
-            TIMER 3  Interrupt                  IVG10       45
-            TIMER 4  Interrupt                  IVG10       46
-            TIMER 5  Interrupt                  IVG10       47
-            TIMER 6  Interrupt                  IVG10       48
-            TIMER 7  Interrupt                  IVG10       49
-            TIMER 8  Interrupt                  IVG10       50
-            TIMER 9  Interrupt                  IVG10       51
-            TIMER 10 Interrupt                  IVG10       52
-            TIMER 11 Interrupt                  IVG10       53
-
-            Programmable Flags0 A (8)           IVG11       54
-            Programmable Flags0 B (8)           IVG11       55
-            Programmable Flags1 A (8)           IVG11       56
-            Programmable Flags1 B (8)           IVG11       57
-            Programmable Flags2 A (8)           IVG11       58
-            Programmable Flags2 B (8)           IVG11       59
-
-            MDMA1 0 write/read INT              IVG8        60
-            MDMA1 1 write/read INT              IVG8        61
-
-            MDMA2 0 write/read INT              IVG9        62
-            MDMA2 1 write/read INT              IVG9        63
-
-            IMDMA 0 write/read INT              IVG12       64
-            IMDMA 1 write/read INT              IVG12       65
-
-            Watch Dog Timer                     IVG13       66
-
-            Reserved interrupt                  IVG7        67
-            Reserved interrupt                  IVG7        68
-            Supplemental interrupt 0            IVG7        69
-            supplemental interrupt 1            IVG7        70
-
-            Softirq                             IVG14
-            System Call    --
-                 (lowest priority)              IVG15
-
- **********************************************************************/
-
-#define SYS_IRQS                71
-#define NR_PERI_INTS            64
-
-/*
- * The ABSTRACT IRQ definitions
- *  the first seven of the following are fixed,
- *  the rest you change if you need to.
- */
-/* IVG 0-6*/
-#define IRQ_EMU                 0       /* Emulation                */
-#define IRQ_RST                 1       /* Reset                    */
-#define IRQ_NMI                 2       /* Non Maskable Interrupt   */
-#define IRQ_EVX                 3       /* Exception                */
-#define IRQ_UNUSED              4       /* Reserved interrupt       */
-#define IRQ_HWERR               5       /* Hardware Error           */
-#define IRQ_CORETMR             6       /* Core timer               */
-
-#define IVG_BASE                7
-/* IVG 7  */
-#define IRQ_PLL_WAKEUP          (IVG_BASE + 0)  /* PLL Wakeup Interrupt     */
-#define IRQ_DMA1_ERROR          (IVG_BASE + 1)  /* DMA1   Error (general)   */
-#define IRQ_DMA_ERROR           IRQ_DMA1_ERROR  /* DMA1   Error (general)   */
-#define IRQ_DMA2_ERROR          (IVG_BASE + 2)  /* DMA2   Error (general)   */
-#define IRQ_IMDMA_ERROR         (IVG_BASE + 3)  /* IMDMA  Error Interrupt   */
-#define IRQ_PPI1_ERROR          (IVG_BASE + 4)  /* PPI1   Error Interrupt   */
-#define IRQ_PPI_ERROR           IRQ_PPI1_ERROR  /* PPI1   Error Interrupt   */
-#define IRQ_PPI2_ERROR          (IVG_BASE + 5)  /* PPI2   Error Interrupt   */
-#define IRQ_SPORT0_ERROR        (IVG_BASE + 6)  /* SPORT0 Error Interrupt   */
-#define IRQ_SPORT1_ERROR        (IVG_BASE + 7)  /* SPORT1 Error Interrupt   */
-#define IRQ_SPI_ERROR           (IVG_BASE + 8)  /* SPI    Error Interrupt   */
-#define IRQ_UART_ERROR          (IVG_BASE + 9)  /* UART   Error Interrupt   */
-#define IRQ_RESERVED_ERROR      (IVG_BASE + 10) /* Reversed     Interrupt   */
-/* IVG 8  */
-#define IRQ_DMA1_0              (IVG_BASE + 11) /* DMA1 0  Interrupt(PPI1)  */
-#define IRQ_PPI                 IRQ_DMA1_0      /* DMA1 0  Interrupt(PPI1)  */
-#define IRQ_PPI0                IRQ_DMA1_0      /* DMA1 0  Interrupt(PPI1)  */
-#define IRQ_DMA1_1              (IVG_BASE + 12) /* DMA1 1  Interrupt(PPI2)  */
-#define IRQ_PPI1                IRQ_DMA1_1      /* DMA1 1  Interrupt(PPI2)  */
-#define IRQ_DMA1_2              (IVG_BASE + 13) /* DMA1 2  Interrupt        */
-#define IRQ_DMA1_3              (IVG_BASE + 14) /* DMA1 3  Interrupt        */
-#define IRQ_DMA1_4              (IVG_BASE + 15) /* DMA1 4  Interrupt        */
-#define IRQ_DMA1_5              (IVG_BASE + 16) /* DMA1 5  Interrupt        */
-#define IRQ_DMA1_6              (IVG_BASE + 17) /* DMA1 6  Interrupt        */
-#define IRQ_DMA1_7              (IVG_BASE + 18) /* DMA1 7  Interrupt        */
-#define IRQ_DMA1_8              (IVG_BASE + 19) /* DMA1 8  Interrupt        */
-#define IRQ_DMA1_9              (IVG_BASE + 20) /* DMA1 9  Interrupt        */
-#define IRQ_DMA1_10             (IVG_BASE + 21) /* DMA1 10 Interrupt        */
-#define IRQ_DMA1_11             (IVG_BASE + 22) /* DMA1 11 Interrupt        */
-/* IVG 9  */
-#define IRQ_DMA2_0              (IVG_BASE + 23) /* DMA2 0  (SPORT0 RX)      */
-#define IRQ_SPORT0_RX           IRQ_DMA2_0      /* DMA2 0  (SPORT0 RX)      */
-#define IRQ_DMA2_1              (IVG_BASE + 24) /* DMA2 1  (SPORT0 TX)      */
-#define IRQ_SPORT0_TX           IRQ_DMA2_1      /* DMA2 1  (SPORT0 TX)      */
-#define IRQ_DMA2_2              (IVG_BASE + 25) /* DMA2 2  (SPORT1 RX)      */
-#define IRQ_SPORT1_RX           IRQ_DMA2_2      /* DMA2 2  (SPORT1 RX)      */
-#define IRQ_DMA2_3              (IVG_BASE + 26) /* DMA2 3  (SPORT2 TX)      */
-#define IRQ_SPORT1_TX           IRQ_DMA2_3      /* DMA2 3  (SPORT2 TX)      */
-#define IRQ_DMA2_4              (IVG_BASE + 27) /* DMA2 4  (SPI)            */
-#define IRQ_SPI                 IRQ_DMA2_4      /* DMA2 4  (SPI)            */
-#define IRQ_DMA2_5              (IVG_BASE + 28) /* DMA2 5  (UART RX)        */
-#define IRQ_UART_RX             IRQ_DMA2_5      /* DMA2 5  (UART RX)        */
-#define IRQ_DMA2_6              (IVG_BASE + 29) /* DMA2 6  (UART TX)        */
-#define IRQ_UART_TX             IRQ_DMA2_6      /* DMA2 6  (UART TX)        */
-#define IRQ_DMA2_7              (IVG_BASE + 30) /* DMA2 7  Interrupt        */
-#define IRQ_DMA2_8              (IVG_BASE + 31) /* DMA2 8  Interrupt        */
-#define IRQ_DMA2_9              (IVG_BASE + 32) /* DMA2 9  Interrupt        */
-#define IRQ_DMA2_10             (IVG_BASE + 33) /* DMA2 10 Interrupt        */
-#define IRQ_DMA2_11             (IVG_BASE + 34) /* DMA2 11 Interrupt        */
-/* IVG 10 */
-#define IRQ_TIMER0              (IVG_BASE + 35) /* TIMER 0  Interrupt       */
-#define IRQ_TIMER1              (IVG_BASE + 36) /* TIMER 1  Interrupt       */
-#define IRQ_TIMER2              (IVG_BASE + 37) /* TIMER 2  Interrupt       */
-#define IRQ_TIMER3              (IVG_BASE + 38) /* TIMER 3  Interrupt       */
-#define IRQ_TIMER4              (IVG_BASE + 39) /* TIMER 4  Interrupt       */
-#define IRQ_TIMER5              (IVG_BASE + 40) /* TIMER 5  Interrupt       */
-#define IRQ_TIMER6              (IVG_BASE + 41) /* TIMER 6  Interrupt       */
-#define IRQ_TIMER7              (IVG_BASE + 42) /* TIMER 7  Interrupt       */
-#define IRQ_TIMER8              (IVG_BASE + 43) /* TIMER 8  Interrupt       */
-#define IRQ_TIMER9              (IVG_BASE + 44) /* TIMER 9  Interrupt       */
-#define IRQ_TIMER10             (IVG_BASE + 45) /* TIMER 10 Interrupt       */
-#define IRQ_TIMER11             (IVG_BASE + 46) /* TIMER 11 Interrupt       */
-/* IVG 11 */
-#define IRQ_PROG0_INTA          (IVG_BASE + 47) /* Programmable Flags0 A (8) */
-#define IRQ_PROG_INTA           IRQ_PROG0_INTA  /* Programmable Flags0 A (8) */
-#define IRQ_PROG0_INTB          (IVG_BASE + 48) /* Programmable Flags0 B (8) */
-#define IRQ_PROG_INTB           IRQ_PROG0_INTB  /* Programmable Flags0 B (8) */
-#define IRQ_PROG1_INTA          (IVG_BASE + 49) /* Programmable Flags1 A (8) */
-#define IRQ_PROG1_INTB          (IVG_BASE + 50) /* Programmable Flags1 B (8) */
-#define IRQ_PROG2_INTA          (IVG_BASE + 51) /* Programmable Flags2 A (8) */
-#define IRQ_PROG2_INTB          (IVG_BASE + 52) /* Programmable Flags2 B (8) */
-/* IVG 8  */
-#define IRQ_DMA1_WRRD0          (IVG_BASE + 53) /* MDMA1 0 write/read INT   */
-#define IRQ_DMA_WRRD0           IRQ_DMA1_WRRD0  /* MDMA1 0 write/read INT   */
+#include <mach-common/irq.h>
+
+#define NR_PERI_INTS            (2 * 32)
+
+#define IRQ_PLL_WAKEUP          BFIN_IRQ(0)     /* PLL Wakeup Interrupt */
+#define IRQ_DMA1_ERROR          BFIN_IRQ(1)     /* DMA1   Error (general) */
+#define IRQ_DMA_ERROR           IRQ_DMA1_ERROR  /* DMA1   Error (general) */
+#define IRQ_DMA2_ERROR          BFIN_IRQ(2)     /* DMA2   Error (general) */
+#define IRQ_IMDMA_ERROR         BFIN_IRQ(3)     /* IMDMA  Error Interrupt */
+#define IRQ_PPI1_ERROR          BFIN_IRQ(4)     /* PPI1   Error Interrupt */
+#define IRQ_PPI_ERROR           IRQ_PPI1_ERROR  /* PPI1   Error Interrupt */
+#define IRQ_PPI2_ERROR          BFIN_IRQ(5)     /* PPI2   Error Interrupt */
+#define IRQ_SPORT0_ERROR        BFIN_IRQ(6)     /* SPORT0 Error Interrupt */
+#define IRQ_SPORT1_ERROR        BFIN_IRQ(7)     /* SPORT1 Error Interrupt */
+#define IRQ_SPI_ERROR           BFIN_IRQ(8)     /* SPI    Error Interrupt */
+#define IRQ_UART_ERROR          BFIN_IRQ(9)     /* UART   Error Interrupt */
+#define IRQ_RESERVED_ERROR      BFIN_IRQ(10)    /* Reversed */
+#define IRQ_DMA1_0              BFIN_IRQ(11)    /* DMA1 0  Interrupt(PPI1) */
+#define IRQ_PPI                 IRQ_DMA1_0      /* DMA1 0  Interrupt(PPI1) */
+#define IRQ_PPI0                IRQ_DMA1_0      /* DMA1 0  Interrupt(PPI1) */
+#define IRQ_DMA1_1              BFIN_IRQ(12)    /* DMA1 1  Interrupt(PPI2) */
+#define IRQ_PPI1                IRQ_DMA1_1      /* DMA1 1  Interrupt(PPI2) */
+#define IRQ_DMA1_2              BFIN_IRQ(13)    /* DMA1 2  Interrupt */
+#define IRQ_DMA1_3              BFIN_IRQ(14)    /* DMA1 3  Interrupt */
+#define IRQ_DMA1_4              BFIN_IRQ(15)    /* DMA1 4  Interrupt */
+#define IRQ_DMA1_5              BFIN_IRQ(16)    /* DMA1 5  Interrupt */
+#define IRQ_DMA1_6              BFIN_IRQ(17)    /* DMA1 6  Interrupt */
+#define IRQ_DMA1_7              BFIN_IRQ(18)    /* DMA1 7  Interrupt */
+#define IRQ_DMA1_8              BFIN_IRQ(19)    /* DMA1 8  Interrupt */
+#define IRQ_DMA1_9              BFIN_IRQ(20)    /* DMA1 9  Interrupt */
+#define IRQ_DMA1_10             BFIN_IRQ(21)    /* DMA1 10 Interrupt */
+#define IRQ_DMA1_11             BFIN_IRQ(22)    /* DMA1 11 Interrupt */
+#define IRQ_DMA2_0              BFIN_IRQ(23)    /* DMA2 0  (SPORT0 RX) */
+#define IRQ_SPORT0_RX           IRQ_DMA2_0      /* DMA2 0  (SPORT0 RX) */
+#define IRQ_DMA2_1              BFIN_IRQ(24)    /* DMA2 1  (SPORT0 TX) */
+#define IRQ_SPORT0_TX           IRQ_DMA2_1      /* DMA2 1  (SPORT0 TX) */
+#define IRQ_DMA2_2              BFIN_IRQ(25)    /* DMA2 2  (SPORT1 RX) */
+#define IRQ_SPORT1_RX           IRQ_DMA2_2      /* DMA2 2  (SPORT1 RX) */
+#define IRQ_DMA2_3              BFIN_IRQ(26)    /* DMA2 3  (SPORT2 TX) */
+#define IRQ_SPORT1_TX           IRQ_DMA2_3      /* DMA2 3  (SPORT2 TX) */
+#define IRQ_DMA2_4              BFIN_IRQ(27)    /* DMA2 4  (SPI) */
+#define IRQ_SPI                 IRQ_DMA2_4      /* DMA2 4  (SPI) */
+#define IRQ_DMA2_5              BFIN_IRQ(28)    /* DMA2 5  (UART RX) */
+#define IRQ_UART_RX             IRQ_DMA2_5      /* DMA2 5  (UART RX) */
+#define IRQ_DMA2_6              BFIN_IRQ(29)    /* DMA2 6  (UART TX) */
+#define IRQ_UART_TX             IRQ_DMA2_6      /* DMA2 6  (UART TX) */
+#define IRQ_DMA2_7              BFIN_IRQ(30)    /* DMA2 7  Interrupt */
+#define IRQ_DMA2_8              BFIN_IRQ(31)    /* DMA2 8  Interrupt */
+#define IRQ_DMA2_9              BFIN_IRQ(32)    /* DMA2 9  Interrupt */
+#define IRQ_DMA2_10             BFIN_IRQ(33)    /* DMA2 10 Interrupt */
+#define IRQ_DMA2_11             BFIN_IRQ(34)    /* DMA2 11 Interrupt */
+#define IRQ_TIMER0              BFIN_IRQ(35)    /* TIMER 0  Interrupt */
+#define IRQ_TIMER1              BFIN_IRQ(36)    /* TIMER 1  Interrupt */
+#define IRQ_TIMER2              BFIN_IRQ(37)    /* TIMER 2  Interrupt */
+#define IRQ_TIMER3              BFIN_IRQ(38)    /* TIMER 3  Interrupt */
+#define IRQ_TIMER4              BFIN_IRQ(39)    /* TIMER 4  Interrupt */
+#define IRQ_TIMER5              BFIN_IRQ(40)    /* TIMER 5  Interrupt */
+#define IRQ_TIMER6              BFIN_IRQ(41)    /* TIMER 6  Interrupt */
+#define IRQ_TIMER7              BFIN_IRQ(42)    /* TIMER 7  Interrupt */
+#define IRQ_TIMER8              BFIN_IRQ(43)    /* TIMER 8  Interrupt */
+#define IRQ_TIMER9              BFIN_IRQ(44)    /* TIMER 9  Interrupt */
+#define IRQ_TIMER10             BFIN_IRQ(45)    /* TIMER 10 Interrupt */
+#define IRQ_TIMER11             BFIN_IRQ(46)    /* TIMER 11 Interrupt */
+#define IRQ_PROG0_INTA          BFIN_IRQ(47)    /* Programmable Flags0 A (8) */
+#define IRQ_PROG_INTA           IRQ_PROG0_INTA  /* Programmable Flags0 A (8) */
+#define IRQ_PROG0_INTB          BFIN_IRQ(48)    /* Programmable Flags0 B (8) */
+#define IRQ_PROG_INTB           IRQ_PROG0_INTB  /* Programmable Flags0 B (8) */
+#define IRQ_PROG1_INTA          BFIN_IRQ(49)    /* Programmable Flags1 A (8) */
+#define IRQ_PROG1_INTB          BFIN_IRQ(50)    /* Programmable Flags1 B (8) */
+#define IRQ_PROG2_INTA          BFIN_IRQ(51)    /* Programmable Flags2 A (8) */
+#define IRQ_PROG2_INTB          BFIN_IRQ(52)    /* Programmable Flags2 B (8) */
+#define IRQ_DMA1_WRRD0          BFIN_IRQ(53)    /* MDMA1 0 write/read INT */
+#define IRQ_DMA_WRRD0           IRQ_DMA1_WRRD0  /* MDMA1 0 write/read INT */
 #define IRQ_MEM_DMA0            IRQ_DMA1_WRRD0
-#define IRQ_DMA1_WRRD1          (IVG_BASE + 54) /* MDMA1 1 write/read INT   */
-#define IRQ_DMA_WRRD1           IRQ_DMA1_WRRD1  /* MDMA1 1 write/read INT   */
+#define IRQ_DMA1_WRRD1          BFIN_IRQ(54)    /* MDMA1 1 write/read INT */
+#define IRQ_DMA_WRRD1           IRQ_DMA1_WRRD1  /* MDMA1 1 write/read INT */
 #define IRQ_MEM_DMA1            IRQ_DMA1_WRRD1
-/* IVG 9  */
-#define IRQ_DMA2_WRRD0          (IVG_BASE + 55) /* MDMA2 0 write/read INT   */
+#define IRQ_DMA2_WRRD0          BFIN_IRQ(55)    /* MDMA2 0 write/read INT */
 #define IRQ_MEM_DMA2            IRQ_DMA2_WRRD0
-#define IRQ_DMA2_WRRD1          (IVG_BASE + 56) /* MDMA2 1 write/read INT   */
+#define IRQ_DMA2_WRRD1          BFIN_IRQ(56)    /* MDMA2 1 write/read INT */
 #define IRQ_MEM_DMA3            IRQ_DMA2_WRRD1
-/* IVG 12 */
-#define IRQ_IMDMA_WRRD0         (IVG_BASE + 57) /* IMDMA 0 write/read INT   */
+#define IRQ_IMDMA_WRRD0         BFIN_IRQ(57)    /* IMDMA 0 write/read INT */
 #define IRQ_IMEM_DMA0           IRQ_IMDMA_WRRD0
-#define IRQ_IMDMA_WRRD1         (IVG_BASE + 58) /* IMDMA 1 write/read INT   */
+#define IRQ_IMDMA_WRRD1         BFIN_IRQ(58)    /* IMDMA 1 write/read INT */
 #define IRQ_IMEM_DMA1           IRQ_IMDMA_WRRD1
-/* IVG 13 */
-#define IRQ_WATCH               (IVG_BASE + 59) /* Watch Dog Timer          */
-/* IVG 7  */
-#define IRQ_RESERVED_1          (IVG_BASE + 60) /* Reserved interrupt       */
-#define IRQ_RESERVED_2          (IVG_BASE + 61) /* Reserved interrupt       */
-#define IRQ_SUPPLE_0            (IVG_BASE + 62) /* Supplemental interrupt 0 */
-#define IRQ_SUPPLE_1            (IVG_BASE + 63) /* supplemental interrupt 1 */
+#define IRQ_WATCH               BFIN_IRQ(59)    /* Watch Dog Timer */
+#define IRQ_RESERVED_1          BFIN_IRQ(60)    /* Reserved interrupt */
+#define IRQ_RESERVED_2          BFIN_IRQ(61)    /* Reserved interrupt */
+#define IRQ_SUPPLE_0            BFIN_IRQ(62)    /* Supplemental interrupt 0 */
+#define IRQ_SUPPLE_1            BFIN_IRQ(63)    /* supplemental interrupt 1 */
+
+#define SYS_IRQS                71
 
 #define IRQ_PF0                 73
 #define IRQ_PF1                 74
@@ -266,158 +152,85 @@
 #define GPIO_IRQ_BASE           IRQ_PF0
 
 #define NR_MACH_IRQS            (IRQ_PF47 + 1)
-#define NR_IRQS                 (NR_MACH_IRQS + NR_SPARE_IRQS)
-
-#define IVG7                    7
-#define IVG8                    8
-#define IVG9                    9
-#define IVG10                   10
-#define IVG11                   11
-#define IVG12                   12
-#define IVG13                   13
-#define IVG14                   14
-#define IVG15                   15
-
-/*
- * DEFAULT PRIORITIES:
- */
-
-#define CONFIG_DEF_PLL_WAKEUP           7
-#define CONFIG_DEF_DMA1_ERROR           7
-#define CONFIG_DEF_DMA2_ERROR           7
-#define CONFIG_DEF_IMDMA_ERROR          7
-#define CONFIG_DEF_PPI1_ERROR           7
-#define CONFIG_DEF_PPI2_ERROR           7
-#define CONFIG_DEF_SPORT0_ERROR         7
-#define CONFIG_DEF_SPORT1_ERROR         7
-#define CONFIG_DEF_SPI_ERROR            7
-#define CONFIG_DEF_UART_ERROR           7
-#define CONFIG_DEF_RESERVED_ERROR       7
-#define CONFIG_DEF_DMA1_0               8
-#define CONFIG_DEF_DMA1_1               8
-#define CONFIG_DEF_DMA1_2               8
-#define CONFIG_DEF_DMA1_3               8
-#define CONFIG_DEF_DMA1_4               8
-#define CONFIG_DEF_DMA1_5               8
-#define CONFIG_DEF_DMA1_6               8
-#define CONFIG_DEF_DMA1_7               8
-#define CONFIG_DEF_DMA1_8               8
-#define CONFIG_DEF_DMA1_9               8
-#define CONFIG_DEF_DMA1_10              8
-#define CONFIG_DEF_DMA1_11              8
-#define CONFIG_DEF_DMA2_0               9
-#define CONFIG_DEF_DMA2_1               9
-#define CONFIG_DEF_DMA2_2               9
-#define CONFIG_DEF_DMA2_3               9
-#define CONFIG_DEF_DMA2_4               9
-#define CONFIG_DEF_DMA2_5               9
-#define CONFIG_DEF_DMA2_6               9
-#define CONFIG_DEF_DMA2_7               9
-#define CONFIG_DEF_DMA2_8               9
-#define CONFIG_DEF_DMA2_9               9
-#define CONFIG_DEF_DMA2_10              9
-#define CONFIG_DEF_DMA2_11              9
-#define CONFIG_DEF_TIMER0               10
-#define CONFIG_DEF_TIMER1               10
-#define CONFIG_DEF_TIMER2               10
-#define CONFIG_DEF_TIMER3               10
-#define CONFIG_DEF_TIMER4               10
-#define CONFIG_DEF_TIMER5               10
-#define CONFIG_DEF_TIMER6               10
-#define CONFIG_DEF_TIMER7               10
-#define CONFIG_DEF_TIMER8               10
-#define CONFIG_DEF_TIMER9               10
-#define CONFIG_DEF_TIMER10              10
-#define CONFIG_DEF_TIMER11              10
-#define CONFIG_DEF_PROG0_INTA           11
-#define CONFIG_DEF_PROG0_INTB           11
-#define CONFIG_DEF_PROG1_INTA           11
-#define CONFIG_DEF_PROG1_INTB           11
-#define CONFIG_DEF_PROG2_INTA           11
-#define CONFIG_DEF_PROG2_INTB           11
-#define CONFIG_DEF_DMA1_WRRD0           8
-#define CONFIG_DEF_DMA1_WRRD1           8
-#define CONFIG_DEF_DMA2_WRRD0           9
-#define CONFIG_DEF_DMA2_WRRD1           9
-#define CONFIG_DEF_IMDMA_WRRD0          12
-#define CONFIG_DEF_IMDMA_WRRD1          12
-#define CONFIG_DEF_WATCH                13
-#define CONFIG_DEF_RESERVED_1           7
-#define CONFIG_DEF_RESERVED_2           7
-#define CONFIG_DEF_SUPPLE_0             7
-#define CONFIG_DEF_SUPPLE_1             7
 
 /* IAR0 BIT FIELDS */
-#define IRQ_PLL_WAKEUP_POS                      0
-#define IRQ_DMA1_ERROR_POS                      4
-#define IRQ_DMA2_ERROR_POS                      8
-#define IRQ_IMDMA_ERROR_POS                     12
-#define IRQ_PPI0_ERROR_POS                      16
-#define IRQ_PPI1_ERROR_POS                      20
-#define IRQ_SPORT0_ERROR_POS            24
-#define IRQ_SPORT1_ERROR_POS            28
+#define IRQ_PLL_WAKEUP_POS      0
+#define IRQ_DMA1_ERROR_POS      4
+#define IRQ_DMA2_ERROR_POS      8
+#define IRQ_IMDMA_ERROR_POS     12
+#define IRQ_PPI0_ERROR_POS      16
+#define IRQ_PPI1_ERROR_POS      20
+#define IRQ_SPORT0_ERROR_POS    24
+#define IRQ_SPORT1_ERROR_POS    28
+
 /* IAR1 BIT FIELDS */
-#define IRQ_SPI_ERROR_POS                       0
-#define IRQ_UART_ERROR_POS                      4
-#define IRQ_RESERVED_ERROR_POS          8
-#define IRQ_DMA1_0_POS                  12
-#define IRQ_DMA1_1_POS                  16
-#define IRQ_DMA1_2_POS                  20
-#define IRQ_DMA1_3_POS                  24
-#define IRQ_DMA1_4_POS                  28
+#define IRQ_SPI_ERROR_POS       0
+#define IRQ_UART_ERROR_POS      4
+#define IRQ_RESERVED_ERROR_POS  8
+#define IRQ_DMA1_0_POS          12
+#define IRQ_DMA1_1_POS          16
+#define IRQ_DMA1_2_POS          20
+#define IRQ_DMA1_3_POS          24
+#define IRQ_DMA1_4_POS          28
+
 /* IAR2 BIT FIELDS */
-#define IRQ_DMA1_5_POS                  0
-#define IRQ_DMA1_6_POS                  4
-#define IRQ_DMA1_7_POS                  8
-#define IRQ_DMA1_8_POS                  12
-#define IRQ_DMA1_9_POS                  16
-#define IRQ_DMA1_10_POS                 20
-#define IRQ_DMA1_11_POS                 24
-#define IRQ_DMA2_0_POS                  28
+#define IRQ_DMA1_5_POS          0
+#define IRQ_DMA1_6_POS          4
+#define IRQ_DMA1_7_POS          8
+#define IRQ_DMA1_8_POS          12
+#define IRQ_DMA1_9_POS          16
+#define IRQ_DMA1_10_POS         20
+#define IRQ_DMA1_11_POS         24
+#define IRQ_DMA2_0_POS          28
+
 /* IAR3 BIT FIELDS */
-#define IRQ_DMA2_1_POS                  0
-#define IRQ_DMA2_2_POS                  4
-#define IRQ_DMA2_3_POS                  8
-#define IRQ_DMA2_4_POS                  12
-#define IRQ_DMA2_5_POS                  16
-#define IRQ_DMA2_6_POS                  20
-#define IRQ_DMA2_7_POS                  24
-#define IRQ_DMA2_8_POS                  28
+#define IRQ_DMA2_1_POS          0
+#define IRQ_DMA2_2_POS          4
+#define IRQ_DMA2_3_POS          8
+#define IRQ_DMA2_4_POS          12
+#define IRQ_DMA2_5_POS          16
+#define IRQ_DMA2_6_POS          20
+#define IRQ_DMA2_7_POS          24
+#define IRQ_DMA2_8_POS          28
+
 /* IAR4 BIT FIELDS */
-#define IRQ_DMA2_9_POS                  0
-#define IRQ_DMA2_10_POS                 4
-#define IRQ_DMA2_11_POS                 8
-#define IRQ_TIMER0_POS                  12
-#define IRQ_TIMER1_POS                  16
-#define IRQ_TIMER2_POS                  20
-#define IRQ_TIMER3_POS                  24
-#define IRQ_TIMER4_POS                  28
+#define IRQ_DMA2_9_POS          0
+#define IRQ_DMA2_10_POS         4
+#define IRQ_DMA2_11_POS         8
+#define IRQ_TIMER0_POS          12
+#define IRQ_TIMER1_POS          16
+#define IRQ_TIMER2_POS          20
+#define IRQ_TIMER3_POS          24
+#define IRQ_TIMER4_POS          28
+
 /* IAR5 BIT FIELDS */
-#define IRQ_TIMER5_POS                  0
-#define IRQ_TIMER6_POS                  4
-#define IRQ_TIMER7_POS                  8
-#define IRQ_TIMER8_POS                  12
-#define IRQ_TIMER9_POS                  16
-#define IRQ_TIMER10_POS                 20
-#define IRQ_TIMER11_POS                 24
-#define IRQ_PROG0_INTA_POS                      28
+#define IRQ_TIMER5_POS          0
+#define IRQ_TIMER6_POS          4
+#define IRQ_TIMER7_POS          8
+#define IRQ_TIMER8_POS          12
+#define IRQ_TIMER9_POS          16
+#define IRQ_TIMER10_POS         20
+#define IRQ_TIMER11_POS         24
+#define IRQ_PROG0_INTA_POS      28
+
 /* IAR6 BIT FIELDS */
-#define IRQ_PROG0_INTB_POS                      0
-#define IRQ_PROG1_INTA_POS                      4
-#define IRQ_PROG1_INTB_POS                      8
-#define IRQ_PROG2_INTA_POS                      12
-#define IRQ_PROG2_INTB_POS                      16
-#define IRQ_DMA1_WRRD0_POS                      20
-#define IRQ_DMA1_WRRD1_POS                      24
-#define IRQ_DMA2_WRRD0_POS                      28
-/* IAR7 BIT FIELDS */
-#define IRQ_DMA2_WRRD1_POS                      0
-#define IRQ_IMDMA_WRRD0_POS                     4
-#define IRQ_IMDMA_WRRD1_POS                     8
-#define IRQ_WDTIMER_POS                 12
-#define IRQ_RESERVED_1_POS                      16
-#define IRQ_RESERVED_2_POS                      20
-#define IRQ_SUPPLE_0_POS                        24
-#define IRQ_SUPPLE_1_POS                        28
+#define IRQ_PROG0_INTB_POS      0
+#define IRQ_PROG1_INTA_POS      4
+#define IRQ_PROG1_INTB_POS      8
+#define IRQ_PROG2_INTA_POS      12
+#define IRQ_PROG2_INTB_POS      16
+#define IRQ_DMA1_WRRD0_POS      20
+#define IRQ_DMA1_WRRD1_POS      24
+#define IRQ_DMA2_WRRD0_POS      28
 
-#endif                          /* _BF561_IRQ_H_ */
+/* IAR7 BIT FIELDS */
+#define IRQ_DMA2_WRRD1_POS      0
+#define IRQ_IMDMA_WRRD0_POS     4
+#define IRQ_IMDMA_WRRD1_POS     8
+#define IRQ_WDTIMER_POS         12
+#define IRQ_RESERVED_1_POS      16
+#define IRQ_RESERVED_2_POS      20
+#define IRQ_SUPPLE_0_POS        24
+#define IRQ_SUPPLE_1_POS        28
+
+#endif
diff --git a/arch/blackfin/mach-bf561/smp.c b/arch/blackfin/mach-bf561/smp.c
index 7b07740cf68c..85abd8be1343 100644
--- a/arch/blackfin/mach-bf561/smp.c
+++ b/arch/blackfin/mach-bf561/smp.c
@@ -24,17 +24,23 @@ static DEFINE_SPINLOCK(boot_lock);
 
 void __init platform_init_cpus(void)
 {
-        cpu_set(0, cpu_possible_map); /* CoreA */
-        cpu_set(1, cpu_possible_map); /* CoreB */
+        struct cpumask mask;
+
+        cpumask_set_cpu(0, &mask); /* CoreA */
+        cpumask_set_cpu(1, &mask); /* CoreB */
+        init_cpu_possible(&mask);
 }
 
 void __init platform_prepare_cpus(unsigned int max_cpus)
 {
+        struct cpumask mask;
+
         bfin_relocate_coreb_l1_mem();
 
         /* Both cores ought to be present on a bf561! */
-        cpu_set(0, cpu_present_map); /* CoreA */
-        cpu_set(1, cpu_present_map); /* CoreB */
+        cpumask_set_cpu(0, &mask); /* CoreA */
+        cpumask_set_cpu(1, &mask); /* CoreB */
+        init_cpu_present(&mask);
 }
 
 int __init setup_profiling_timer(unsigned int multiplier) /* not supported */
@@ -62,9 +68,6 @@ void __cpuinit platform_secondary_init(unsigned int cpu)
         bfin_write_SICB_IWR1(IWR_DISABLE_ALL);
         SSYNC();
 
-        /* Store CPU-private information to the cpu_data array. */
-        bfin_setup_cpudata(cpu);
-
         /* We are done with local CPU inits, unblock the boot CPU. */
         set_cpu_online(cpu, true);
         spin_lock(&boot_lock);
diff --git a/arch/blackfin/mach-common/dpmc.c b/arch/blackfin/mach-common/dpmc.c
index 382099fd5561..f5685a496c58 100644
--- a/arch/blackfin/mach-common/dpmc.c
+++ b/arch/blackfin/mach-common/dpmc.c
@@ -19,9 +19,6 @@
 
 #define DRIVER_NAME "bfin dpmc"
 
-#define dprintk(msg...) \
-        cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, DRIVER_NAME, msg)
-
 struct bfin_dpmc_platform_data *pdata;
 
 /**
@@ -88,10 +85,11 @@ static void bfin_wakeup_cpu(void)
 {
         unsigned int cpu;
         unsigned int this_cpu = smp_processor_id();
-        cpumask_t mask = cpu_online_map;
+        cpumask_t mask;
 
-        cpu_clear(this_cpu, mask);
-        for_each_cpu_mask(cpu, mask)
+        cpumask_copy(&mask, cpu_online_mask);
+        cpumask_clear_cpu(this_cpu, &mask);
+        for_each_cpu(cpu, &mask)
                 platform_send_ipi_cpu(cpu, IRQ_SUPPLE_0);
 }
 
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index 43d9fb195c1e..1177369f9922 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -19,32 +19,14 @@
 #ifdef CONFIG_IPIPE
 #include <linux/ipipe.h>
 #endif
-#ifdef CONFIG_KGDB
-#include <linux/kgdb.h>
-#endif
 #include <asm/traps.h>
 #include <asm/blackfin.h>
 #include <asm/gpio.h>
 #include <asm/irq_handler.h>
 #include <asm/dpmc.h>
-#include <asm/bfin5xx_spi.h>
-#include <asm/bfin_sport.h>
-#include <asm/bfin_can.h>
 
 #define SIC_SYSIRQ(irq) (irq - (IRQ_CORETMR + 1))
 
-#ifdef BF537_FAMILY
-# define BF537_GENERIC_ERROR_INT_DEMUX
-# define SPI_ERR_MASK   (BIT_STAT_TXCOL | BIT_STAT_RBSY | BIT_STAT_MODF | BIT_STAT_TXE) /* SPI_STAT */
-# define SPORT_ERR_MASK (ROVF | RUVF | TOVF | TUVF)     /* SPORT_STAT */
-# define PPI_ERR_MASK   (0xFFFF & ~FLD) /* PPI_STATUS */
-# define EMAC_ERR_MASK  (PHYINT | MMCINT | RXFSINT | TXFSINT | WAKEDET | RXDMAERR | TXDMAERR | STMDONE) /* EMAC_SYSTAT */
-# define UART_ERR_MASK  (0x6)   /* UART_IIR */
-# define CAN_ERR_MASK   (EWTIF | EWRIF | EPIF | BOIF | WUIF | UIAIF | AAIF | RMLIF | UCEIF | EXTIF | ADIF)      /* CAN_GIF */
-#else
-# undef BF537_GENERIC_ERROR_INT_DEMUX
-#endif
-
 /*
  * NOTES:
  * - we have separated the physical Hardware interrupt from the
@@ -63,22 +45,19 @@ unsigned long bfin_irq_flags = 0x1f;
 EXPORT_SYMBOL(bfin_irq_flags);
 #endif
 
-/* The number of spurious interrupts */
-atomic_t num_spurious;
-
 #ifdef CONFIG_PM
 unsigned long bfin_sic_iwr[3];  /* Up to 3 SIC_IWRx registers */
 unsigned vr_wakeup;
 #endif
 
-struct ivgx {
+static struct ivgx {
         /* irq number for request_irq, available in mach-bf5xx/irq.h */
         unsigned int irqno;
         /* corresponding bit in the SIC_ISR register */
         unsigned int isrflag;
 } ivg_table[NR_PERI_INTS];
 
-struct ivg_slice {
+static struct ivg_slice {
         /* position of first irq in ivg_table for given ivg */
         struct ivgx *ifirst;
         struct ivgx *istop;
@@ -125,7 +104,7 @@ static void __init search_IAR(void)
  * This is for core internal IRQs
  */
 
-static void bfin_ack_noop(struct irq_data *d)
+void bfin_ack_noop(struct irq_data *d)
 {
         /* Dummy function.  */
 }
@@ -154,26 +133,24 @@ static void bfin_core_unmask_irq(struct irq_data *d)
         return;
 }
 
-static void bfin_internal_mask_irq(unsigned int irq)
+void bfin_internal_mask_irq(unsigned int irq)
 {
-        unsigned long flags;
+        unsigned long flags = hard_local_irq_save();
 
-#ifdef CONFIG_BF53x
-        flags = hard_local_irq_save();
-        bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() &
-                             ~(1 << SIC_SYSIRQ(irq)));
-#else
-        unsigned mask_bank, mask_bit;
-        flags = hard_local_irq_save();
-        mask_bank = SIC_SYSIRQ(irq) / 32;
-        mask_bit = SIC_SYSIRQ(irq) % 32;
+#ifdef SIC_IMASK0
+        unsigned mask_bank = SIC_SYSIRQ(irq) / 32;
+        unsigned mask_bit = SIC_SYSIRQ(irq) % 32;
         bfin_write_SIC_IMASK(mask_bank, bfin_read_SIC_IMASK(mask_bank) &
                              ~(1 << mask_bit));
-#ifdef CONFIG_SMP
+# ifdef CONFIG_SMP
         bfin_write_SICB_IMASK(mask_bank, bfin_read_SICB_IMASK(mask_bank) &
                              ~(1 << mask_bit));
+# endif
+#else
+        bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() &
+                             ~(1 << SIC_SYSIRQ(irq)));
 #endif
-#endif
+
         hard_local_irq_restore(flags);
 }
 
@@ -186,33 +163,31 @@ static void bfin_internal_mask_irq_chip(struct irq_data *d)
 static void bfin_internal_unmask_irq_affinity(unsigned int irq,
                 const struct cpumask *affinity)
 #else
-static void bfin_internal_unmask_irq(unsigned int irq)
+void bfin_internal_unmask_irq(unsigned int irq)
 #endif
 {
-        unsigned long flags;
+        unsigned long flags = hard_local_irq_save();
 
-#ifdef CONFIG_BF53x
-        flags = hard_local_irq_save();
-        bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() |
-                             (1 << SIC_SYSIRQ(irq)));
-#else
-        unsigned mask_bank, mask_bit;
-        flags = hard_local_irq_save();
-        mask_bank = SIC_SYSIRQ(irq) / 32;
-        mask_bit = SIC_SYSIRQ(irq) % 32;
-#ifdef CONFIG_SMP
+#ifdef SIC_IMASK0
+        unsigned mask_bank = SIC_SYSIRQ(irq) / 32;
+        unsigned mask_bit = SIC_SYSIRQ(irq) % 32;
+# ifdef CONFIG_SMP
         if (cpumask_test_cpu(0, affinity))
-#endif
+# endif
                 bfin_write_SIC_IMASK(mask_bank,
                         bfin_read_SIC_IMASK(mask_bank) |
                         (1 << mask_bit));
-#ifdef CONFIG_SMP
+# ifdef CONFIG_SMP
         if (cpumask_test_cpu(1, affinity))
                 bfin_write_SICB_IMASK(mask_bank,
                         bfin_read_SICB_IMASK(mask_bank) |
                         (1 << mask_bit));
+# endif
+#else
+        bfin_write_SIC_IMASK(bfin_read_SIC_IMASK() |
+                             (1 << SIC_SYSIRQ(irq)));
 #endif
-#endif
+
         hard_local_irq_restore(flags);
 }
 
@@ -295,6 +270,8 @@ static int bfin_internal_set_wake_chip(struct irq_data *d, unsigned int state)
 {
         return bfin_internal_set_wake(d->irq, state);
 }
+#else
+# define bfin_internal_set_wake_chip NULL
 #endif
 
 static struct irq_chip bfin_core_irqchip = {
@@ -315,12 +292,10 @@ static struct irq_chip bfin_internal_irqchip = {
 #ifdef CONFIG_SMP
         .irq_set_affinity = bfin_internal_set_affinity,
 #endif
-#ifdef CONFIG_PM
         .irq_set_wake = bfin_internal_set_wake_chip,
-#endif
 };
 
-static void bfin_handle_irq(unsigned irq)
+void bfin_handle_irq(unsigned irq)
 {
 #ifdef CONFIG_IPIPE
         struct pt_regs regs;    /* Contents not used. */
@@ -332,102 +307,6 @@ static void bfin_handle_irq(unsigned irq)
 #endif  /* !CONFIG_IPIPE */
 }
 
-#ifdef BF537_GENERIC_ERROR_INT_DEMUX
-static int error_int_mask;
-
-static void bfin_generic_error_mask_irq(struct irq_data *d)
-{
-        error_int_mask &= ~(1L << (d->irq - IRQ_PPI_ERROR));
-        if (!error_int_mask)
-                bfin_internal_mask_irq(IRQ_GENERIC_ERROR);
-}
-
-static void bfin_generic_error_unmask_irq(struct irq_data *d)
-{
-        bfin_internal_unmask_irq(IRQ_GENERIC_ERROR);
-        error_int_mask |= 1L << (d->irq - IRQ_PPI_ERROR);
-}
-
-static struct irq_chip bfin_generic_error_irqchip = {
-        .name = "ERROR",
-        .irq_ack = bfin_ack_noop,
-        .irq_mask_ack = bfin_generic_error_mask_irq,
-        .irq_mask = bfin_generic_error_mask_irq,
-        .irq_unmask = bfin_generic_error_unmask_irq,
-};
-
-static void bfin_demux_error_irq(unsigned int int_err_irq,
-                                 struct irq_desc *inta_desc)
-{
-        int irq = 0;
-
-#if (defined(CONFIG_BF537) || defined(CONFIG_BF536))
-        if (bfin_read_EMAC_SYSTAT() & EMAC_ERR_MASK)
-                irq = IRQ_MAC_ERROR;
-        else
-#endif
-        if (bfin_read_SPORT0_STAT() & SPORT_ERR_MASK)
-                irq = IRQ_SPORT0_ERROR;
-        else if (bfin_read_SPORT1_STAT() & SPORT_ERR_MASK)
-                irq = IRQ_SPORT1_ERROR;
-        else if (bfin_read_PPI_STATUS() & PPI_ERR_MASK)
-                irq = IRQ_PPI_ERROR;
-        else if (bfin_read_CAN_GIF() & CAN_ERR_MASK)
-                irq = IRQ_CAN_ERROR;
-        else if (bfin_read_SPI_STAT() & SPI_ERR_MASK)
-                irq = IRQ_SPI_ERROR;
-        else if ((bfin_read_UART0_IIR() & UART_ERR_MASK) == UART_ERR_MASK)
-                irq = IRQ_UART0_ERROR;
-        else if ((bfin_read_UART1_IIR() & UART_ERR_MASK) == UART_ERR_MASK)
-                irq = IRQ_UART1_ERROR;
-
-        if (irq) {
-                if (error_int_mask & (1L << (irq - IRQ_PPI_ERROR)))
-                        bfin_handle_irq(irq);
-                else {
-
-                        switch (irq) {
-                        case IRQ_PPI_ERROR:
-                                bfin_write_PPI_STATUS(PPI_ERR_MASK);
-                                break;
-#if (defined(CONFIG_BF537) || defined(CONFIG_BF536))
-                        case IRQ_MAC_ERROR:
-                                bfin_write_EMAC_SYSTAT(EMAC_ERR_MASK);
-                                break;
-#endif
-                        case IRQ_SPORT0_ERROR:
-                                bfin_write_SPORT0_STAT(SPORT_ERR_MASK);
-                                break;
-
-                        case IRQ_SPORT1_ERROR:
-                                bfin_write_SPORT1_STAT(SPORT_ERR_MASK);
-                                break;
-
-                        case IRQ_CAN_ERROR:
-                                bfin_write_CAN_GIS(CAN_ERR_MASK);
-                                break;
-
-                        case IRQ_SPI_ERROR:
-                                bfin_write_SPI_STAT(SPI_ERR_MASK);
-                                break;
-
-                        default:
-                                break;
-                        }
-
-                        pr_debug("IRQ %d:"
-                                 " MASKED PERIPHERAL ERROR INTERRUPT ASSERTED\n",
-                                 irq);
-                }
-        } else
-                printk(KERN_ERR
-                       "%s : %s : LINE %d :\nIRQ ?: PERIPHERAL ERROR"
-                       " INTERRUPT ASSERTED BUT NO SOURCE FOUND\n",
-                       __func__, __FILE__, __LINE__);
-
-}
-#endif                          /* BF537_GENERIC_ERROR_INT_DEMUX */
-
 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
 static int mac_stat_int_mask;
 
@@ -468,7 +347,7 @@ static void bfin_mac_status_mask_irq(struct irq_data *d)
         unsigned int irq = d->irq;
 
         mac_stat_int_mask &= ~(1L << (irq - IRQ_MAC_PHYINT));
-#ifdef BF537_GENERIC_ERROR_INT_DEMUX
+#ifdef BF537_FAMILY
         switch (irq) {
         case IRQ_MAC_PHYINT:
                 bfin_write_EMAC_SYSCTL(bfin_read_EMAC_SYSCTL() & ~PHYIE);
@@ -487,7 +366,7 @@ static void bfin_mac_status_unmask_irq(struct irq_data *d)
 {
         unsigned int irq = d->irq;
 
-#ifdef BF537_GENERIC_ERROR_INT_DEMUX
+#ifdef BF537_FAMILY
         switch (irq) {
         case IRQ_MAC_PHYINT:
                 bfin_write_EMAC_SYSCTL(bfin_read_EMAC_SYSCTL() | PHYIE);
@@ -505,12 +384,14 @@ static void bfin_mac_status_unmask_irq(struct irq_data *d)
 #ifdef CONFIG_PM
 int bfin_mac_status_set_wake(struct irq_data *d, unsigned int state)
 {
-#ifdef BF537_GENERIC_ERROR_INT_DEMUX
+#ifdef BF537_FAMILY
         return bfin_internal_set_wake(IRQ_GENERIC_ERROR, state);
 #else
         return bfin_internal_set_wake(IRQ_MAC_ERROR, state);
 #endif
 }
+#else
+# define bfin_mac_status_set_wake NULL
 #endif
 
 static struct irq_chip bfin_mac_status_irqchip = {
@@ -519,13 +400,11 @@ static struct irq_chip bfin_mac_status_irqchip = {
         .irq_mask_ack = bfin_mac_status_mask_irq,
         .irq_mask = bfin_mac_status_mask_irq,
         .irq_unmask = bfin_mac_status_unmask_irq,
-#ifdef CONFIG_PM
         .irq_set_wake = bfin_mac_status_set_wake,
-#endif
 };
 
-static void bfin_demux_mac_status_irq(unsigned int int_err_irq,
-                                 struct irq_desc *inta_desc)
+void bfin_demux_mac_status_irq(unsigned int int_err_irq,
+                               struct irq_desc *inta_desc)
 {
         int i, irq = 0;
         u32 status = bfin_read_EMAC_SYSTAT();
@@ -680,29 +559,48 @@ static int bfin_gpio_irq_type(struct irq_data *d, unsigned int type)
 }
 
 #ifdef CONFIG_PM
-int bfin_gpio_set_wake(struct irq_data *d, unsigned int state)
+static int bfin_gpio_set_wake(struct irq_data *d, unsigned int state)
 {
         return gpio_pm_wakeup_ctrl(irq_to_gpio(d->irq), state);
 }
+#else
+# define bfin_gpio_set_wake NULL
 #endif
 
-static void bfin_demux_gpio_irq(unsigned int inta_irq,
-                                struct irq_desc *desc)
+static void bfin_demux_gpio_block(unsigned int irq)
 {
-        unsigned int i, gpio, mask, irq, search = 0;
+        unsigned int gpio, mask;
+
+        gpio = irq_to_gpio(irq);
+        mask = get_gpiop_data(gpio) & get_gpiop_maska(gpio);
+
+        while (mask) {
+                if (mask & 1)
+                        bfin_handle_irq(irq);
+                irq++;
+                mask >>= 1;
+        }
+}
+
+void bfin_demux_gpio_irq(unsigned int inta_irq,
+                         struct irq_desc *desc)
+{
+        unsigned int irq;
 
         switch (inta_irq) {
-#if defined(CONFIG_BF53x)
-        case IRQ_PROG_INTA:
-                irq = IRQ_PF0;
-                search = 1;
+#if defined(BF537_FAMILY)
+        case IRQ_PF_INTA_PG_INTA:
+                bfin_demux_gpio_block(IRQ_PF0);
+                irq = IRQ_PG0;
                 break;
-# if defined(BF537_FAMILY) && !(defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE))
-        case IRQ_MAC_RX:
+        case IRQ_PH_INTA_MAC_RX:
                 irq = IRQ_PH0;
                 break;
-# endif
-#elif defined(CONFIG_BF538) || defined(CONFIG_BF539)
+#elif defined(BF533_FAMILY)
+        case IRQ_PROG_INTA:
+                irq = IRQ_PF0;
+                break;
+#elif defined(BF538_FAMILY)
         case IRQ_PORTF_INTA:
                 irq = IRQ_PF0;
                 break;
@@ -732,31 +630,7 @@ static void bfin_demux_gpio_irq(unsigned int inta_irq,
                 return;
         }
 
-        if (search) {
-                for (i = 0; i < MAX_BLACKFIN_GPIOS; i += GPIO_BANKSIZE) {
-                        irq += i;
-
-                        mask = get_gpiop_data(i) & get_gpiop_maska(i);
-
-                        while (mask) {
-                                if (mask & 1)
-                                        bfin_handle_irq(irq);
-                                irq++;
-                                mask >>= 1;
-                        }
-                }
-        } else {
-                        gpio = irq_to_gpio(irq);
-                        mask = get_gpiop_data(gpio) & get_gpiop_maska(gpio);
-
-                        do {
-                                if (mask & 1)
-                                        bfin_handle_irq(irq);
-                                irq++;
-                                mask >>= 1;
-                        } while (mask);
-        }
-
+        bfin_demux_gpio_block(irq);
 }
 
 #else                           /* CONFIG_BF54x */
@@ -974,15 +848,11 @@ static int bfin_gpio_irq_type(struct irq_data *d, unsigned int type)
 }
 
 #ifdef CONFIG_PM
-u32 pint_saved_masks[NR_PINT_SYS_IRQS];
-u32 pint_wakeup_masks[NR_PINT_SYS_IRQS];
-
-int bfin_gpio_set_wake(struct irq_data *d, unsigned int state)
+static int bfin_gpio_set_wake(struct irq_data *d, unsigned int state)
 {
         u32 pint_irq;
         u32 pint_val = irq2pint_lut[d->irq - SYS_IRQS];
         u32 bank = PINT_2_BANK(pint_val);
-        u32 pintbit = PINT_BIT(pint_val);
 
         switch (bank) {
         case 0:
@@ -1003,46 +873,14 @@ int bfin_gpio_set_wake(struct irq_data *d, unsigned int state)
 
         bfin_internal_set_wake(pint_irq, state);
 
-        if (state)
-                pint_wakeup_masks[bank] |= pintbit;
-        else
-                pint_wakeup_masks[bank] &= ~pintbit;
-
         return 0;
 }
-
-u32 bfin_pm_setup(void)
-{
-        u32 val, i;
-
-        for (i = 0; i < NR_PINT_SYS_IRQS; i++) {
-                val = pint[i]->mask_clear;
-                pint_saved_masks[i] = val;
-                if (val ^ pint_wakeup_masks[i]) {
-                        pint[i]->mask_clear = val;
-                        pint[i]->mask_set = pint_wakeup_masks[i];
-                }
-        }
-
-        return 0;
-}
-
-void bfin_pm_restore(void)
-{
-        u32 i, val;
-
-        for (i = 0; i < NR_PINT_SYS_IRQS; i++) {
-                val = pint_saved_masks[i];
-                if (val ^ pint_wakeup_masks[i]) {
-                        pint[i]->mask_clear = pint[i]->mask_clear;
-                        pint[i]->mask_set = val;
-                }
-        }
-}
+#else
+# define bfin_gpio_set_wake NULL
 #endif
 
-static void bfin_demux_gpio_irq(unsigned int inta_irq,
-                                struct irq_desc *desc)
+void bfin_demux_gpio_irq(unsigned int inta_irq,
+                         struct irq_desc *desc)
 {
         u32 bank, pint_val;
         u32 request, irq;
@@ -1091,9 +929,7 @@ static struct irq_chip bfin_gpio_irqchip = {
         .irq_set_type = bfin_gpio_irq_type,
         .irq_startup = bfin_gpio_irq_startup,
         .irq_shutdown = bfin_gpio_irq_shutdown,
-#ifdef CONFIG_PM
         .irq_set_wake = bfin_gpio_set_wake,
-#endif
 };
 
 void __cpuinit init_exception_vectors(void)
@@ -1127,12 +963,12 @@ int __init init_arch_irq(void)
 {
         int irq;
         unsigned long ilat = 0;
+
         /*  Disable all the peripheral intrs  - page 4-29 HW Ref manual */
-#if defined(CONFIG_BF54x) || defined(CONFIG_BF52x) || defined(CONFIG_BF561) \
-        || defined(BF538_FAMILY) || defined(CONFIG_BF51x)
+#ifdef SIC_IMASK0
         bfin_write_SIC_IMASK0(SIC_UNMASK_ALL);
         bfin_write_SIC_IMASK1(SIC_UNMASK_ALL);
-# ifdef CONFIG_BF54x
+# ifdef SIC_IMASK2
         bfin_write_SIC_IMASK2(SIC_UNMASK_ALL);
 # endif
 # ifdef CONFIG_SMP
@@ -1145,11 +981,6 @@ int __init init_arch_irq(void)
 
         local_irq_disable();
 
-#if (defined(CONFIG_BF537) || defined(CONFIG_BF536))
-        /* Clear EMAC Interrupt Status bits so we can demux it later */
-        bfin_write_EMAC_SYSTAT(-1);
-#endif
-
 #ifdef CONFIG_BF54x
 # ifdef CONFIG_PINTx_REASSIGN
         pint[0]->assign = CONFIG_PINT0_ASSIGN;
@@ -1168,11 +999,11 @@ int __init init_arch_irq(void)
                         irq_set_chip(irq, &bfin_internal_irqchip);
 
                 switch (irq) {
-#if defined(CONFIG_BF53x)
+#if defined(BF537_FAMILY)
+                case IRQ_PH_INTA_MAC_RX:
+                case IRQ_PF_INTA_PG_INTA:
+#elif defined(BF533_FAMILY)
                 case IRQ_PROG_INTA:
-# if defined(BF537_FAMILY) && !(defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE))
-                case IRQ_MAC_RX:
-# endif
 #elif defined(CONFIG_BF54x)
                 case IRQ_PINT0:
                 case IRQ_PINT1:
@@ -1186,16 +1017,11 @@ int __init init_arch_irq(void)
                 case IRQ_PROG0_INTA:
                 case IRQ_PROG1_INTA:
                 case IRQ_PROG2_INTA:
-#elif defined(CONFIG_BF538) || defined(CONFIG_BF539)
+#elif defined(BF538_FAMILY)
                 case IRQ_PORTF_INTA:
 #endif
                         irq_set_chained_handler(irq, bfin_demux_gpio_irq);
                         break;
-#ifdef BF537_GENERIC_ERROR_INT_DEMUX
-                case IRQ_GENERIC_ERROR:
-                        irq_set_chained_handler(irq, bfin_demux_error_irq);
-                        break;
-#endif
 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
                 case IRQ_MAC_ERROR:
                         irq_set_chained_handler(irq,
@@ -1213,11 +1039,10 @@ int __init init_arch_irq(void)
                 case IRQ_CORETMR:
 # ifdef CONFIG_SMP
                         irq_set_handler(irq, handle_percpu_irq);
-                        break;
 # else
                         irq_set_handler(irq, handle_simple_irq);
-                        break;
 # endif
+                        break;
 #endif
 
 #ifdef CONFIG_TICKSOURCE_GPTMR0
@@ -1226,26 +1051,17 @@ int __init init_arch_irq(void)
                         break;
 #endif
 
-#ifdef CONFIG_IPIPE
                 default:
+#ifdef CONFIG_IPIPE
                         irq_set_handler(irq, handle_level_irq);
-                        break;
-#else /* !CONFIG_IPIPE */
-                default:
+#else
                         irq_set_handler(irq, handle_simple_irq);
+#endif
                         break;
-#endif /* !CONFIG_IPIPE */
                 }
         }
 
-#ifdef BF537_GENERIC_ERROR_INT_DEMUX
-        for (irq = IRQ_PPI_ERROR; irq <= IRQ_UART1_ERROR; irq++)
-                irq_set_chip_and_handler(irq, &bfin_generic_error_irqchip,
-                                         handle_level_irq);
-#if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
-        irq_set_chained_handler(IRQ_MAC_ERROR, bfin_demux_mac_status_irq);
-#endif
-#endif
+        init_mach_irq();
 
 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
         for (irq = IRQ_MAC_PHYINT; irq <= IRQ_MAC_STMDONE; irq++)
@@ -1307,53 +1123,54 @@ int __init init_arch_irq(void)
 #ifdef CONFIG_DO_IRQ_L1
 __attribute__((l1_text))
 #endif
-void do_irq(int vec, struct pt_regs *fp)
+static int vec_to_irq(int vec)
 {
-        if (vec == EVT_IVTMR_P) {
-                vec = IRQ_CORETMR;
-        } else {
-                struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst;
-                struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop;
-#if defined(SIC_ISR0)
-                unsigned long sic_status[3];
+        struct ivgx *ivg = ivg7_13[vec - IVG7].ifirst;
+        struct ivgx *ivg_stop = ivg7_13[vec - IVG7].istop;
+        unsigned long sic_status[3];
+
+        if (likely(vec == EVT_IVTMR_P))
+                return IRQ_CORETMR;
 
-                if (smp_processor_id()) {
+#ifdef SIC_ISR
+        sic_status[0] = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR();
+#else
+        if (smp_processor_id()) {
 # ifdef SICB_ISR0
-                        /* This will be optimized out in UP mode. */
-                        sic_status[0] = bfin_read_SICB_ISR0() & bfin_read_SICB_IMASK0();
-                        sic_status[1] = bfin_read_SICB_ISR1() & bfin_read_SICB_IMASK1();
-# endif
-                } else {
-                        sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0();
-                        sic_status[1] = bfin_read_SIC_ISR1() & bfin_read_SIC_IMASK1();
-                }
-# ifdef SIC_ISR2
-                sic_status[2] = bfin_read_SIC_ISR2() & bfin_read_SIC_IMASK2();
+                /* This will be optimized out in UP mode. */
+                sic_status[0] = bfin_read_SICB_ISR0() & bfin_read_SICB_IMASK0();
+                sic_status[1] = bfin_read_SICB_ISR1() & bfin_read_SICB_IMASK1();
 # endif
-                for (;; ivg++) {
-                        if (ivg >= ivg_stop) {
-                                atomic_inc(&num_spurious);
-                                return;
-                        }
-                        if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag)
-                                break;
-                }
-#else
-                unsigned long sic_status;
-
-                sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR();
+        } else {
+                sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0();
+                sic_status[1] = bfin_read_SIC_ISR1() & bfin_read_SIC_IMASK1();
+        }
+#endif
+#ifdef SIC_ISR2
+        sic_status[2] = bfin_read_SIC_ISR2() & bfin_read_SIC_IMASK2();
+#endif
 
-                for (;; ivg++) {
-                        if (ivg >= ivg_stop) {
-                                atomic_inc(&num_spurious);
-                                return;
-                        } else if (sic_status & ivg->isrflag)
-                                break;
-                }
+        for (;; ivg++) {
+                if (ivg >= ivg_stop)
+                        return -1;
+#ifdef SIC_ISR
+                if (sic_status[0] & ivg->isrflag)
+#else
+                if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag)
 #endif
-                vec = ivg->irqno;
+                        return ivg->irqno;
         }
-        asm_do_IRQ(vec, fp);
+}
+
+#ifdef CONFIG_DO_IRQ_L1
+__attribute__((l1_text))
+#endif
+void do_irq(int vec, struct pt_regs *fp)
+{
+        int irq = vec_to_irq(vec);
+        if (irq == -1)
+                return;
+        asm_do_IRQ(irq, fp);
 }
 
 #ifdef CONFIG_IPIPE
@@ -1391,40 +1208,9 @@ asmlinkage int __ipipe_grab_irq(int vec, struct pt_regs *regs)
         struct ivgx *ivg = ivg7_13[vec-IVG7].ifirst;
         int irq, s = 0;
 
-        if (likely(vec == EVT_IVTMR_P))
-                irq = IRQ_CORETMR;
-        else {
-#if defined(SIC_ISR0)
-                unsigned long sic_status[3];
-
-                sic_status[0] = bfin_read_SIC_ISR0() & bfin_read_SIC_IMASK0();
-                sic_status[1] = bfin_read_SIC_ISR1() & bfin_read_SIC_IMASK1();
-# ifdef SIC_ISR2
-                sic_status[2] = bfin_read_SIC_ISR2() & bfin_read_SIC_IMASK2();
-# endif
-                for (;; ivg++) {
-                        if (ivg >= ivg_stop) {
-                                atomic_inc(&num_spurious);
-                                return 0;
-                        }
-                        if (sic_status[(ivg->irqno - IVG7) / 32] & ivg->isrflag)
-                                break;
-                }
-#else
-                unsigned long sic_status;
-
-                sic_status = bfin_read_SIC_IMASK() & bfin_read_SIC_ISR();
-
-                for (;; ivg++) {
-                        if (ivg >= ivg_stop) {
-                                atomic_inc(&num_spurious);
-                                return 0;
-                        } else if (sic_status & ivg->isrflag)
-                                break;
-                }
-#endif
-                irq = ivg->irqno;
-        }
+        irq = vec_to_irq(vec);
+        if (irq == -1)
+                return 0;
 
         if (irq == IRQ_SYSTMR) {
 #if !defined(CONFIG_GENERIC_CLOCKEVENTS) || defined(CONFIG_TICKSOURCE_GPTMR0)
diff --git a/arch/blackfin/mach-common/smp.c b/arch/blackfin/mach-common/smp.c
index 8bce5ed031e4..35e7e1eb0188 100644
--- a/arch/blackfin/mach-common/smp.c
+++ b/arch/blackfin/mach-common/smp.c
@@ -25,6 +25,7 @@
 #include <linux/slab.h>
 #include <asm/atomic.h>
 #include <asm/cacheflush.h>
+#include <asm/irq_handler.h>
 #include <asm/mmu_context.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
@@ -96,7 +97,7 @@ static void ipi_cpu_stop(unsigned int cpu)
         dump_stack();
         spin_unlock(&stop_lock);
 
-        cpu_clear(cpu, cpu_online_map);
+        set_cpu_online(cpu, false);
 
         local_irq_disable();
 
@@ -146,7 +147,7 @@ static void ipi_call_function(unsigned int cpu, struct ipi_message *msg)
                  */
                 resync_core_dcache();
 #endif
-                cpu_clear(cpu, *msg->call_struct.waitmask);
+                cpumask_clear_cpu(cpu, msg->call_struct.waitmask);
         }
 }
 
@@ -177,6 +178,9 @@ static irqreturn_t ipi_handler_int1(int irq, void *dev_instance)
         while (msg_queue->count) {
                 msg = &msg_queue->ipi_message[msg_queue->head];
                 switch (msg->type) {
+                case BFIN_IPI_RESCHEDULE:
+                        scheduler_ipi();
+                        break;
                 case BFIN_IPI_CALL_FUNC:
                         spin_unlock_irqrestore(&msg_queue->lock, flags);
                         ipi_call_function(cpu, msg);
@@ -219,9 +223,10 @@ static inline void smp_send_message(cpumask_t callmap, unsigned long type,
         struct ipi_message_queue *msg_queue;
         struct ipi_message *msg;
         unsigned long flags, next_msg;
-        cpumask_t waitmask = callmap; /* waitmask is shared by all cpus */
+        cpumask_t waitmask; /* waitmask is shared by all cpus */
 
-        for_each_cpu_mask(cpu, callmap) {
+        cpumask_copy(&waitmask, &callmap);
+        for_each_cpu(cpu, &callmap) {
                 msg_queue = &per_cpu(ipi_msg_queue, cpu);
                 spin_lock_irqsave(&msg_queue->lock, flags);
                 if (msg_queue->count < BFIN_IPI_MSGQ_LEN) {
@@ -243,7 +248,7 @@ static inline void smp_send_message(cpumask_t callmap, unsigned long type,
         }
 
         if (wait) {
-                while (!cpus_empty(waitmask))
+                while (!cpumask_empty(&waitmask))
                         blackfin_dcache_invalidate_range(
                                 (unsigned long)(&waitmask),
                                 (unsigned long)(&waitmask));
@@ -262,9 +267,9 @@ int smp_call_function(void (*func)(void *info), void *info, int wait)
         cpumask_t callmap;
 
         preempt_disable();
-        callmap = cpu_online_map;
-        cpu_clear(smp_processor_id(), callmap);
-        if (!cpus_empty(callmap))
+        cpumask_copy(&callmap, cpu_online_mask);
+        cpumask_clear_cpu(smp_processor_id(), &callmap);
+        if (!cpumask_empty(&callmap))
                 smp_send_message(callmap, BFIN_IPI_CALL_FUNC, func, info, wait);
 
         preempt_enable();
@@ -281,8 +286,8 @@ int smp_call_function_single(int cpuid, void (*func) (void *info), void *info,
 
         if (cpu_is_offline(cpu))
                 return 0;
-        cpus_clear(callmap);
-        cpu_set(cpu, callmap);
+        cpumask_clear(&callmap);
+        cpumask_set_cpu(cpu, &callmap);
 
         smp_send_message(callmap, BFIN_IPI_CALL_FUNC, func, info, wait);
 
@@ -305,9 +310,9 @@ void smp_send_stop(void)
         cpumask_t callmap;
 
         preempt_disable();
-        callmap = cpu_online_map;
-        cpu_clear(smp_processor_id(), callmap);
-        if (!cpus_empty(callmap))
+        cpumask_copy(&callmap, cpu_online_mask);
+        cpumask_clear_cpu(smp_processor_id(), &callmap);
+        if (!cpumask_empty(&callmap))
                 smp_send_message(callmap, BFIN_IPI_CPU_STOP, NULL, NULL, 0);
 
         preempt_enable();
diff --git a/arch/blackfin/mm/sram-alloc.c b/arch/blackfin/mm/sram-alloc.c
index dfd304a4a3ea..29d98faa1efd 100644
--- a/arch/blackfin/mm/sram-alloc.c
+++ b/arch/blackfin/mm/sram-alloc.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/poll.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/spinlock.h>
 #include <linux/rtc.h>
 #include <linux/slab.h>
@@ -764,7 +765,7 @@ EXPORT_SYMBOL(sram_alloc_with_lsl);
 /* Need to keep line of output the same.  Currently, that is 44 bytes
  * (including newline).
  */
-static int _sram_proc_read(char *buf, int *len, int count, const char *desc,
+static int _sram_proc_show(struct seq_file *m, const char *desc,
                 struct sram_piece *pfree_head,
                 struct sram_piece *pused_head)
 {
@@ -773,13 +774,13 @@ static int _sram_proc_read(char *buf, int *len, int count, const char *desc,
         if (!pfree_head || !pused_head)
                 return -1;
 
-        *len += sprintf(&buf[*len], "--- SRAM %-14s Size   PID State     \n", desc);
+        seq_printf(m, "--- SRAM %-14s Size   PID State     \n", desc);
 
         /* search the relevant memory slot */
         pslot = pused_head->next;
 
         while (pslot != NULL) {
-                *len += sprintf(&buf[*len], "%p-%p %10i %5i %-10s\n",
+                seq_printf(m, "%p-%p %10i %5i %-10s\n",
                         pslot->paddr, pslot->paddr + pslot->size,
                         pslot->size, pslot->pid, "ALLOCATED");
 
@@ -789,7 +790,7 @@ static int _sram_proc_read(char *buf, int *len, int count, const char *desc,
         pslot = pfree_head->next;
 
         while (pslot != NULL) {
-                *len += sprintf(&buf[*len], "%p-%p %10i %5i %-10s\n",
+                seq_printf(m, "%p-%p %10i %5i %-10s\n",
                         pslot->paddr, pslot->paddr + pslot->size,
                         pslot->size, pslot->pid, "FREE");
 
@@ -798,54 +799,62 @@ static int _sram_proc_read(char *buf, int *len, int count, const char *desc,
 
         return 0;
 }
-static int sram_proc_read(char *buf, char **start, off_t offset, int count,
-                int *eof, void *data)
+static int sram_proc_show(struct seq_file *m, void *v)
 {
-        int len = 0;
         unsigned int cpu;
 
         for (cpu = 0; cpu < num_possible_cpus(); ++cpu) {
-                if (_sram_proc_read(buf, &len, count, "Scratchpad",
+                if (_sram_proc_show(m, "Scratchpad",
                         &per_cpu(free_l1_ssram_head, cpu), &per_cpu(used_l1_ssram_head, cpu)))
                         goto not_done;
 #if L1_DATA_A_LENGTH != 0
-                if (_sram_proc_read(buf, &len, count, "L1 Data A",
+                if (_sram_proc_show(m, "L1 Data A",
                         &per_cpu(free_l1_data_A_sram_head, cpu),
                         &per_cpu(used_l1_data_A_sram_head, cpu)))
                         goto not_done;
 #endif
 #if L1_DATA_B_LENGTH != 0
-                if (_sram_proc_read(buf, &len, count, "L1 Data B",
+                if (_sram_proc_show(m, "L1 Data B",
                         &per_cpu(free_l1_data_B_sram_head, cpu),
                         &per_cpu(used_l1_data_B_sram_head, cpu)))
                         goto not_done;
 #endif
 #if L1_CODE_LENGTH != 0
-                if (_sram_proc_read(buf, &len, count, "L1 Instruction",
+                if (_sram_proc_show(m, "L1 Instruction",
                         &per_cpu(free_l1_inst_sram_head, cpu),
                         &per_cpu(used_l1_inst_sram_head, cpu)))
                         goto not_done;
 #endif
         }
 #if L2_LENGTH != 0
-        if (_sram_proc_read(buf, &len, count, "L2", &free_l2_sram_head,
-                &used_l2_sram_head))
+        if (_sram_proc_show(m, "L2", &free_l2_sram_head, &used_l2_sram_head))
                 goto not_done;
 #endif
-        *eof = 1;
  not_done:
-        return len;
+        return 0;
+}
+
+static int sram_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, sram_proc_show, NULL);
 }
 
+static const struct file_operations sram_proc_ops = {
+        .open           = sram_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 static int __init sram_proc_init(void)
 {
         struct proc_dir_entry *ptr;
-        ptr = create_proc_entry("sram", S_IFREG | S_IRUGO, NULL);
+
+        ptr = proc_create("sram", S_IRUGO, NULL, &sram_proc_ops);
         if (!ptr) {
                 printk(KERN_WARNING "unable to create /proc/sram\n");
                 return -1;
         }
-        ptr->read_proc = sram_proc_read;
         return 0;
 }
 late_initcall(sram_proc_init);
diff --git a/arch/cris/arch-v32/kernel/irq.c b/arch/cris/arch-v32/kernel/irq.c
index 68a1a5901ca5..5ebe6e841820 100644
--- a/arch/cris/arch-v32/kernel/irq.c
+++ b/arch/cris/arch-v32/kernel/irq.c
@@ -266,11 +266,11 @@ static int irq_cpu(int irq)
 
 
         /* Let the interrupt stay if possible */
-        if (cpu_isset(cpu, irq_allocations[irq - FIRST_IRQ].mask))
+        if (cpumask_test_cpu(cpu, &irq_allocations[irq - FIRST_IRQ].mask))
                 goto out;
 
         /* IRQ must be moved to another CPU. */
-        cpu = first_cpu(irq_allocations[irq - FIRST_IRQ].mask);
+        cpu = cpumask_first(&irq_allocations[irq - FIRST_IRQ].mask);
         irq_allocations[irq - FIRST_IRQ].cpu = cpu;
 out:
         spin_unlock_irqrestore(&irq_lock, flags);
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index 4c9e3e1ba5d1..a0843a71aaee 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -81,7 +81,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 
         /* Mark all possible CPUs as present */
         for (i = 0; i < max_cpus; i++)
-            cpu_set(i, phys_cpu_present_map);
+                cpumask_set_cpu(i, &phys_cpu_present_map);
 }
 
 void __devinit smp_prepare_boot_cpu(void)
@@ -98,7 +98,7 @@ void __devinit smp_prepare_boot_cpu(void)
         SUPP_REG_WR(RW_MM_TLB_PGD, pgd);
 
         set_cpu_online(0, true);
-        cpu_set(0, phys_cpu_present_map);
+        cpumask_set_cpu(0, &phys_cpu_present_map);
         set_cpu_possible(0, true);
 }
 
@@ -112,8 +112,9 @@ smp_boot_one_cpu(int cpuid)
 {
         unsigned timeout;
         struct task_struct *idle;
-        cpumask_t cpu_mask = CPU_MASK_NONE;
+        cpumask_t cpu_mask;
 
+        cpumask_clear(&cpu_mask);
         idle = fork_idle(cpuid);
         if (IS_ERR(idle))
                 panic("SMP: fork failed for CPU:%d", cpuid);
@@ -125,10 +126,10 @@ smp_boot_one_cpu(int cpuid)
         cpu_now_booting = cpuid;
 
         /* Kick it */
-        cpu_set(cpuid, cpu_online_map);
-        cpu_set(cpuid, cpu_mask);
+        set_cpu_online(cpuid, true);
+        cpumask_set_cpu(cpuid, &cpu_mask);
         send_ipi(IPI_BOOT, 0, cpu_mask);
-        cpu_clear(cpuid, cpu_online_map);
+        set_cpu_online(cpuid, false);
 
         /* Wait for CPU to come online */
         for (timeout = 0; timeout < 10000; timeout++) {
@@ -176,7 +177,7 @@ void __init smp_callin(void)
         notify_cpu_starting(cpu);
         local_irq_enable();
 
-        cpu_set(cpu, cpu_online_map);
+        set_cpu_online(cpu, true);
         cpu_idle();
 }
 
@@ -214,8 +215,9 @@ int __cpuinit __cpu_up(unsigned int cpu)
 
 void smp_send_reschedule(int cpu)
 {
-        cpumask_t cpu_mask = CPU_MASK_NONE;
-        cpu_set(cpu, cpu_mask);
+        cpumask_t cpu_mask;
+        cpumask_clear(&cpu_mask);
+        cpumask_set_cpu(cpu, &cpu_mask);
         send_ipi(IPI_SCHEDULE, 0, cpu_mask);
 }
 
@@ -232,7 +234,7 @@ void flush_tlb_common(struct mm_struct* mm, struct vm_area_struct* vma, unsigned
 
         spin_lock_irqsave(&tlbstate_lock, flags);
         cpu_mask = (mm == FLUSH_ALL ? cpu_all_mask : *mm_cpumask(mm));
-        cpu_clear(smp_processor_id(), cpu_mask);
+        cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
         flush_mm = mm;
         flush_vma = vma;
         flush_addr = addr;
@@ -277,10 +279,10 @@ int send_ipi(int vector, int wait, cpumask_t cpu_mask)
         int ret = 0;
 
         /* Calculate CPUs to send to. */
-        cpus_and(cpu_mask, cpu_mask, cpu_online_map);
+        cpumask_and(&cpu_mask, &cpu_mask, cpu_online_mask);
 
         /* Send the IPI. */
-        for_each_cpu_mask(i, cpu_mask)
+        for_each_cpu(i, &cpu_mask)
         {
                 ipi.vector |= vector;
                 REG_WR(intr_vect, irq_regs[i], rw_ipi, ipi);
@@ -288,7 +290,7 @@ int send_ipi(int vector, int wait, cpumask_t cpu_mask)
 
         /* Wait for IPI to finish on other CPUS */
         if (wait) {
-                for_each_cpu_mask(i, cpu_mask) {
+                for_each_cpu(i, &cpu_mask) {
                         int j;
                         for (j = 0 ; j < 1000; j++) {
                                 ipi = REG_RD(intr_vect, irq_regs[i], rw_ipi);
@@ -314,11 +316,12 @@ int send_ipi(int vector, int wait, cpumask_t cpu_mask)
  */
 int smp_call_function(void (*func)(void *info), void *info, int wait)
 {
-        cpumask_t cpu_mask = CPU_MASK_ALL;
+        cpumask_t cpu_mask;
         struct call_data_struct data;
         int ret;
 
-        cpu_clear(smp_processor_id(), cpu_mask);
+        cpumask_setall(&cpu_mask);
+        cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
 
         WARN_ON(irqs_disabled());
 
@@ -342,15 +345,18 @@ irqreturn_t crisv32_ipi_interrupt(int irq, void *dev_id)
 
         ipi = REG_RD(intr_vect, irq_regs[smp_processor_id()], rw_ipi);
 
+        if (ipi.vector & IPI_SCHEDULE) {
+                scheduler_ipi();
+        }
         if (ipi.vector & IPI_CALL) {
-                 func(info);
+                func(info);
         }
         if (ipi.vector & IPI_FLUSH_TLB) {
-                     if (flush_mm == FLUSH_ALL)
-                         __flush_tlb_all();
-                     else if (flush_vma == FLUSH_ALL)
+                if (flush_mm == FLUSH_ALL)
+                        __flush_tlb_all();
+                else if (flush_vma == FLUSH_ALL)
                         __flush_tlb_mm(flush_mm);
-                     else
+                else
                         __flush_tlb_page(flush_vma, flush_addr);
         }
 
diff --git a/arch/cris/arch-v32/mach-fs/Makefile b/arch/cris/arch-v32/mach-fs/Makefile
index 4ff407a1b931..41fa6a6893a9 100644
--- a/arch/cris/arch-v32/mach-fs/Makefile
+++ b/arch/cris/arch-v32/mach-fs/Makefile
@@ -4,7 +4,7 @@
 #
 
 obj-y   := dma.o pinmux.o io.o arbiter.o
-bj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o
+obj-$(CONFIG_ETRAX_VCS_SIM) += vcs_hook.o
 obj-$(CONFIG_CPU_FREQ)   += cpufreq.o
 
 clean:
diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S
index 728bbd9e7d4c..a6990cb0f098 100644
--- a/arch/cris/kernel/vmlinux.lds.S
+++ b/arch/cris/kernel/vmlinux.lds.S
@@ -102,7 +102,7 @@ SECTIONS
 #endif
         __vmlinux_end = .;              /* Last address of the physical file. */
 #ifdef CONFIG_ETRAX_ARCH_V32
-        PERCPU(32, PAGE_SIZE)
+        PERCPU_SECTION(32)
 
         .init.ramfs : {
                 INIT_RAM_FS
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c
index df33ab89d70f..d72ab58fd83e 100644
--- a/arch/cris/mm/init.c
+++ b/arch/cris/mm/init.c
@@ -13,8 +13,6 @@
 #include <linux/bootmem.h>
 #include <asm/tlb.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 unsigned long empty_zero_page;
 
 extern char _stext, _edata, _etext; /* From linkerscript */
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S
index 0daae8af5787..7e958d829ec9 100644
--- a/arch/frv/kernel/vmlinux.lds.S
+++ b/arch/frv/kernel/vmlinux.lds.S
@@ -37,7 +37,7 @@ SECTIONS
   _einittext = .;
 
   INIT_DATA_SECTION(8)
-  PERCPU(L1_CACHE_BYTES, 4096)
+  PERCPU_SECTION(L1_CACHE_BYTES)
 
   . = ALIGN(PAGE_SIZE);
   __init_end = .;
diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c
index ed64588ac3a7..fbe5f0dbae06 100644
--- a/arch/frv/mm/init.c
+++ b/arch/frv/mm/init.c
@@ -41,8 +41,6 @@
 
 #undef DEBUG
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 /*
  * BAD_PAGE is the page that is used for page faults when linux
  * is out-of-memory. Older versions of linux just did a
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 4ce8d1358fee..80241fe03f50 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -37,6 +37,7 @@
 #include <linux/crash_dump.h>
 #include <linux/iommu-helper.h>
 #include <linux/dma-mapping.h>
+#include <linux/prefetch.h>
 
 #include <asm/delay.h>          /* ia64_get_itc() */
 #include <asm/io.h>
@@ -1063,7 +1064,7 @@ static void sba_unmap_page(struct device *dev, dma_addr_t iova, size_t size,
                 /*
                 ** Address does not fall w/in IOVA, must be bypassing
                 */
-                DBG_BYPASS("sba_unmap_single_atttrs() bypass addr: 0x%lx\n",
+                DBG_BYPASS("sba_unmap_single_attrs() bypass addr: 0x%lx\n",
                            iova);
 
 #ifdef ENABLE_MARK_CLEAN
diff --git a/arch/ia64/include/asm/tlb.h b/arch/ia64/include/asm/tlb.h
index 23cce999eb1c..c3ffe3e54edc 100644
--- a/arch/ia64/include/asm/tlb.h
+++ b/arch/ia64/include/asm/tlb.h
@@ -47,21 +47,27 @@
 #include <asm/machvec.h>
 
 #ifdef CONFIG_SMP
-# define FREE_PTE_NR            2048
 # define tlb_fast_mode(tlb)     ((tlb)->nr == ~0U)
 #else
-# define FREE_PTE_NR            0
 # define tlb_fast_mode(tlb)     (1)
 #endif
 
+/*
+ * If we can't allocate a page to make a big batch of page pointers
+ * to work on, then just handle a few from the on-stack structure.
+ */
+#define IA64_GATHER_BUNDLE      8
+
 struct mmu_gather {
         struct mm_struct        *mm;
         unsigned int            nr;             /* == ~0U => fast mode */
+        unsigned int            max;
         unsigned char           fullmm;         /* non-zero means full mm flush */
         unsigned char           need_flush;     /* really unmapped some PTEs? */
         unsigned long           start_addr;
         unsigned long           end_addr;
-        struct page             *pages[FREE_PTE_NR];
+        struct page             **pages;
+        struct page             *local[IA64_GATHER_BUNDLE];
 };
 
 struct ia64_tr_entry {
@@ -90,9 +96,6 @@ extern struct ia64_tr_entry *ia64_idtrs[NR_CPUS];
 #define RR_RID_MASK     0x00000000ffffff00L
 #define RR_TO_RID(val)  ((val >> 8) & 0xffffff)
 
-/* Users of the generic TLB shootdown code must declare this storage space. */
-DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 /*
  * Flush the TLB for address range START to END and, if not in fast mode, release the
  * freed pages that where gathered up to this point.
@@ -147,15 +150,23 @@ ia64_tlb_flush_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long e
         }
 }
 
-/*
- * Return a pointer to an initialized struct mmu_gather.
- */
-static inline struct mmu_gather *
-tlb_gather_mmu (struct mm_struct *mm, unsigned int full_mm_flush)
+static inline void __tlb_alloc_page(struct mmu_gather *tlb)
 {
-        struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
+        unsigned long addr = __get_free_pages(GFP_NOWAIT | __GFP_NOWARN, 0);
 
+        if (addr) {
+                tlb->pages = (void *)addr;
+                tlb->max = PAGE_SIZE / sizeof(void *);
+        }
+}
+
+
+static inline void
+tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned int full_mm_flush)
+{
         tlb->mm = mm;
+        tlb->max = ARRAY_SIZE(tlb->local);
+        tlb->pages = tlb->local;
         /*
          * Use fast mode if only 1 CPU is online.
          *
@@ -172,7 +183,6 @@ tlb_gather_mmu (struct mm_struct *mm, unsigned int full_mm_flush)
         tlb->nr = (num_online_cpus() == 1) ? ~0U : 0;
         tlb->fullmm = full_mm_flush;
         tlb->start_addr = ~0UL;
-        return tlb;
 }
 
 /*
@@ -180,7 +190,7 @@ tlb_gather_mmu (struct mm_struct *mm, unsigned int full_mm_flush)
  * collected.
  */
 static inline void
-tlb_finish_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long end)
+tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
 {
         /*
          * Note: tlb->nr may be 0 at this point, so we can't rely on tlb->start_addr and
@@ -191,7 +201,8 @@ tlb_finish_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long end)
         /* keep the page table cache within bounds */
         check_pgt_cache();
 
-        put_cpu_var(mmu_gathers);
+        if (tlb->pages != tlb->local)
+                free_pages((unsigned long)tlb->pages, 0);
 }
 
 /*
@@ -199,18 +210,33 @@ tlb_finish_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long end)
  * must be delayed until after the TLB has been flushed (see comments at the beginning of
  * this file).
  */
-static inline void
-tlb_remove_page (struct mmu_gather *tlb, struct page *page)
+static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)
 {
         tlb->need_flush = 1;
 
         if (tlb_fast_mode(tlb)) {
                 free_page_and_swap_cache(page);
-                return;
+                return 1; /* avoid calling tlb_flush_mmu */
         }
+
+        if (!tlb->nr && tlb->pages == tlb->local)
+                __tlb_alloc_page(tlb);
+
         tlb->pages[tlb->nr++] = page;
-        if (tlb->nr >= FREE_PTE_NR)
-                ia64_tlb_flush_mmu(tlb, tlb->start_addr, tlb->end_addr);
+        VM_BUG_ON(tlb->nr > tlb->max);
+
+        return tlb->max - tlb->nr;
+}
+
+static inline void tlb_flush_mmu(struct mmu_gather *tlb)
+{
+        ia64_tlb_flush_mmu(tlb, tlb->start_addr, tlb->end_addr);
+}
+
+static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+{
+        if (!__tlb_remove_page(tlb, page))
+                tlb_flush_mmu(tlb);
 }
 
 /*
diff --git a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
index 22f61526a8e1..f09b174244d5 100644
--- a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
+++ b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
@@ -23,8 +23,6 @@
 #include <linux/acpi.h>
 #include <acpi/processor.h>
 
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "acpi-cpufreq", msg)
-
 MODULE_AUTHOR("Venkatesh Pallipadi");
 MODULE_DESCRIPTION("ACPI Processor P-States Driver");
 MODULE_LICENSE("GPL");
@@ -47,12 +45,12 @@ processor_set_pstate (
 {
         s64 retval;
 
-        dprintk("processor_set_pstate\n");
+        pr_debug("processor_set_pstate\n");
 
         retval = ia64_pal_set_pstate((u64)value);
 
         if (retval) {
-                dprintk("Failed to set freq to 0x%x, with error 0x%lx\n",
+                pr_debug("Failed to set freq to 0x%x, with error 0x%lx\n",
                         value, retval);
                 return -ENODEV;
         }
@@ -67,14 +65,14 @@ processor_get_pstate (
         u64     pstate_index = 0;
         s64     retval;
 
-        dprintk("processor_get_pstate\n");
+        pr_debug("processor_get_pstate\n");
 
         retval = ia64_pal_get_pstate(&pstate_index,
                                      PAL_GET_PSTATE_TYPE_INSTANT);
         *value = (u32) pstate_index;
 
         if (retval)
-                dprintk("Failed to get current freq with "
+                pr_debug("Failed to get current freq with "
                         "error 0x%lx, idx 0x%x\n", retval, *value);
 
         return (int)retval;
@@ -90,7 +88,7 @@ extract_clock (
 {
         unsigned long i;
 
-        dprintk("extract_clock\n");
+        pr_debug("extract_clock\n");
 
         for (i = 0; i < data->acpi_data.state_count; i++) {
                 if (value == data->acpi_data.states[i].status)
@@ -110,7 +108,7 @@ processor_get_freq (
         cpumask_t               saved_mask;
         unsigned long           clock_freq;
 
-        dprintk("processor_get_freq\n");
+        pr_debug("processor_get_freq\n");
 
         saved_mask = current->cpus_allowed;
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
@@ -148,7 +146,7 @@ processor_set_freq (
         cpumask_t               saved_mask;
         int                     retval;
 
-        dprintk("processor_set_freq\n");
+        pr_debug("processor_set_freq\n");
 
         saved_mask = current->cpus_allowed;
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
@@ -159,16 +157,16 @@ processor_set_freq (
 
         if (state == data->acpi_data.state) {
                 if (unlikely(data->resume)) {
-                        dprintk("Called after resume, resetting to P%d\n", state);
+                        pr_debug("Called after resume, resetting to P%d\n", state);
                         data->resume = 0;
                 } else {
-                        dprintk("Already at target state (P%d)\n", state);
+                        pr_debug("Already at target state (P%d)\n", state);
                         retval = 0;
                         goto migrate_end;
                 }
         }
 
-        dprintk("Transitioning from P%d to P%d\n",
+        pr_debug("Transitioning from P%d to P%d\n",
                 data->acpi_data.state, state);
 
         /* cpufreq frequency struct */
@@ -186,7 +184,7 @@ processor_set_freq (
 
         value = (u32) data->acpi_data.states[state].control;
 
-        dprintk("Transitioning to state: 0x%08x\n", value);
+        pr_debug("Transitioning to state: 0x%08x\n", value);
 
         ret = processor_set_pstate(value);
         if (ret) {
@@ -219,7 +217,7 @@ acpi_cpufreq_get (
 {
         struct cpufreq_acpi_io *data = acpi_io_data[cpu];
 
-        dprintk("acpi_cpufreq_get\n");
+        pr_debug("acpi_cpufreq_get\n");
 
         return processor_get_freq(data, cpu);
 }
@@ -235,7 +233,7 @@ acpi_cpufreq_target (
         unsigned int next_state = 0;
         unsigned int result = 0;
 
-        dprintk("acpi_cpufreq_setpolicy\n");
+        pr_debug("acpi_cpufreq_setpolicy\n");
 
         result = cpufreq_frequency_table_target(policy,
                         data->freq_table, target_freq, relation, &next_state);
@@ -255,7 +253,7 @@ acpi_cpufreq_verify (
         unsigned int result = 0;
         struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
 
-        dprintk("acpi_cpufreq_verify\n");
+        pr_debug("acpi_cpufreq_verify\n");
 
         result = cpufreq_frequency_table_verify(policy,
                         data->freq_table);
@@ -273,7 +271,7 @@ acpi_cpufreq_cpu_init (
         struct cpufreq_acpi_io  *data;
         unsigned int            result = 0;
 
-        dprintk("acpi_cpufreq_cpu_init\n");
+        pr_debug("acpi_cpufreq_cpu_init\n");
 
         data = kzalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL);
         if (!data)
@@ -288,7 +286,7 @@ acpi_cpufreq_cpu_init (
 
         /* capability check */
         if (data->acpi_data.state_count <= 1) {
-                dprintk("No P-States\n");
+                pr_debug("No P-States\n");
                 result = -ENODEV;
                 goto err_unreg;
         }
@@ -297,7 +295,7 @@ acpi_cpufreq_cpu_init (
                                         ACPI_ADR_SPACE_FIXED_HARDWARE) ||
             (data->acpi_data.status_register.space_id !=
                                         ACPI_ADR_SPACE_FIXED_HARDWARE)) {
-                dprintk("Unsupported address space [%d, %d]\n",
+                pr_debug("Unsupported address space [%d, %d]\n",
                         (u32) (data->acpi_data.control_register.space_id),
                         (u32) (data->acpi_data.status_register.space_id));
                 result = -ENODEV;
@@ -348,7 +346,7 @@ acpi_cpufreq_cpu_init (
                "activated.\n", cpu);
 
         for (i = 0; i < data->acpi_data.state_count; i++)
-                dprintk("     %cP%d: %d MHz, %d mW, %d uS, %d uS, 0x%x 0x%x\n",
+                pr_debug("     %cP%d: %d MHz, %d mW, %d uS, %d uS, 0x%x 0x%x\n",
                         (i == data->acpi_data.state?'*':' '), i,
                         (u32) data->acpi_data.states[i].core_frequency,
                         (u32) data->acpi_data.states[i].power,
@@ -383,7 +381,7 @@ acpi_cpufreq_cpu_exit (
 {
         struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
 
-        dprintk("acpi_cpufreq_cpu_exit\n");
+        pr_debug("acpi_cpufreq_cpu_exit\n");
 
         if (data) {
                 cpufreq_frequency_table_put_attr(policy->cpu);
@@ -418,7 +416,7 @@ static struct cpufreq_driver acpi_cpufreq_driver = {
 static int __init
 acpi_cpufreq_init (void)
 {
-        dprintk("acpi_cpufreq_init\n");
+        pr_debug("acpi_cpufreq_init\n");
 
         return cpufreq_register_driver(&acpi_cpufreq_driver);
 }
@@ -427,7 +425,7 @@ acpi_cpufreq_init (void)
 static void __exit
 acpi_cpufreq_exit (void)
 {
-        dprintk("acpi_cpufreq_exit\n");
+        pr_debug("acpi_cpufreq_exit\n");
 
         cpufreq_unregister_driver(&acpi_cpufreq_driver);
         return;
diff --git a/arch/ia64/kernel/cyclone.c b/arch/ia64/kernel/cyclone.c
index 1b811c61bdc6..f64097b5118a 100644
--- a/arch/ia64/kernel/cyclone.c
+++ b/arch/ia64/kernel/cyclone.c
@@ -31,8 +31,6 @@ static struct clocksource clocksource_cyclone = {
         .rating         = 300,
         .read           = read_cyclone,
         .mask           = (1LL << 40) - 1,
-        .mult           = 0, /*to be calculated*/
-        .shift          = 16,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -118,9 +116,7 @@ int __init init_cyclone_clock(void)
         /* initialize last tick */
         cyclone_mc = cyclone_timer;
         clocksource_cyclone.fsys_mmio = cyclone_timer;
-        clocksource_cyclone.mult = clocksource_hz2mult(CYCLONE_TIMER_FREQ,
-                                                clocksource_cyclone.shift);
-        clocksource_register(&clocksource_cyclone);
+        clocksource_register_hz(&clocksource_cyclone, CYCLONE_TIMER_FREQ);
 
         return 0;
 }
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 5b704740f160..782c3a357f24 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -31,6 +31,7 @@
 #include <linux/irq.h>
 #include <linux/ratelimit.h>
 #include <linux/acpi.h>
+#include <linux/sched.h>
 
 #include <asm/delay.h>
 #include <asm/intrinsics.h>
@@ -496,6 +497,7 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)
                         smp_local_flush_tlb();
                         kstat_incr_irqs_this_cpu(irq, desc);
                 } else if (unlikely(IS_RESCHEDULE(vector))) {
+                        scheduler_ipi();
                         kstat_incr_irqs_this_cpu(irq, desc);
                 } else {
                         ia64_setreg(_IA64_REG_CR_TPR, vector);
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 156ad803d5b7..04440cc09b40 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -73,8 +73,6 @@ static struct clocksource clocksource_itc = {
         .rating         = 350,
         .read           = itc_get_cycles,
         .mask           = CLOCKSOURCE_MASK(64),
-        .mult           = 0, /*to be calculated*/
-        .shift          = 16,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 #ifdef CONFIG_PARAVIRT
         .resume         = paravirt_clocksource_resume,
@@ -365,11 +363,8 @@ ia64_init_itm (void)
         ia64_cpu_local_tick();
 
         if (!itc_clocksource) {
-                /* Sort out mult/shift values: */
-                clocksource_itc.mult =
-                        clocksource_hz2mult(local_cpu_data->itc_freq,
-                                                clocksource_itc.shift);
-                clocksource_register(&clocksource_itc);
+                clocksource_register_hz(&clocksource_itc,
+                                                local_cpu_data->itc_freq);
                 itc_clocksource = &clocksource_itc;
         }
 }
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 787de4a77d82..53c0ba004e9e 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -209,6 +209,7 @@ SECTIONS {
         data : {
         } :data
         .data : AT(ADDR(.data) - LOAD_OFFSET) {
+                _sdata  =  .;
                 INIT_TASK_DATA(PAGE_SIZE)
                 CACHELINE_ALIGNED_DATA(SMP_CACHE_BYTES)
                 READ_MOSTLY_DATA(SMP_CACHE_BYTES)
diff --git a/arch/ia64/kvm/vti.h b/arch/ia64/kvm/vti.h
index f6c5617e16af..b214b5b0432d 100644
--- a/arch/ia64/kvm/vti.h
+++ b/arch/ia64/kvm/vti.h
@@ -83,13 +83,13 @@
 union vac {
         unsigned long value;
         struct {
-                int a_int:1;
-                int a_from_int_cr:1;
-                int a_to_int_cr:1;
-                int a_from_psr:1;
-                int a_from_cpuid:1;
-                int a_cover:1;
-                int a_bsw:1;
+                unsigned int a_int:1;
+                unsigned int a_from_int_cr:1;
+                unsigned int a_to_int_cr:1;
+                unsigned int a_from_psr:1;
+                unsigned int a_from_cpuid:1;
+                unsigned int a_cover:1;
+                unsigned int a_bsw:1;
                 long reserved:57;
         };
 };
@@ -97,12 +97,12 @@ union vac {
 union vdc {
         unsigned long value;
         struct {
-                int d_vmsw:1;
-                int d_extint:1;
-                int d_ibr_dbr:1;
-                int d_pmc:1;
-                int d_to_pmd:1;
-                int d_itm:1;
+                unsigned int d_vmsw:1;
+                unsigned int d_extint:1;
+                unsigned int d_ibr_dbr:1;
+                unsigned int d_pmc:1;
+                unsigned int d_to_pmd:1;
+                unsigned int d_itm:1;
                 long reserved:58;
         };
 };
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 9a018cde5d84..f114a3b14c6a 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -44,13 +44,16 @@ void show_mem(unsigned int filter)
         pg_data_t *pgdat;
 
         printk(KERN_INFO "Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
         printk(KERN_INFO "Node memory in pages:\n");
         for_each_online_pgdat(pgdat) {
                 unsigned long present;
                 unsigned long flags;
                 int shared = 0, cached = 0, reserved = 0;
+                int nid = pgdat->node_id;
 
+                if (skip_free_areas_node(filter, nid))
+                        continue;
                 pgdat_resize_lock(pgdat, &flags);
                 present = pgdat->node_present_pages;
                 for(i = 0; i < pgdat->node_spanned_pages; i++) {
@@ -64,8 +67,7 @@ void show_mem(unsigned int filter)
                                 if (max_gap < LARGE_GAP)
                                         continue;
 #endif
-                                i = vmemmap_find_next_valid_pfn(pgdat->node_id,
-                                         i) - 1;
+                                i = vmemmap_find_next_valid_pfn(nid, i) - 1;
                                 continue;
                         }
                         if (PageReserved(page))
@@ -81,7 +83,7 @@ void show_mem(unsigned int filter)
                 total_cached += cached;
                 total_shared += shared;
                 printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, "
-                       "shrd: %10d, swpd: %10d\n", pgdat->node_id,
+                       "shrd: %10d, swpd: %10d\n", nid,
                        present, reserved, shared, cached);
         }
         printk(KERN_INFO "%ld pages of RAM\n", total_present);
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 82ab1bc6afb1..c641333cd997 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -622,13 +622,16 @@ void show_mem(unsigned int filter)
         pg_data_t *pgdat;
 
         printk(KERN_INFO "Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
         printk(KERN_INFO "Node memory in pages:\n");
         for_each_online_pgdat(pgdat) {
                 unsigned long present;
                 unsigned long flags;
                 int shared = 0, cached = 0, reserved = 0;
+                int nid = pgdat->node_id;
 
+                if (skip_free_areas_node(filter, nid))
+                        continue;
                 pgdat_resize_lock(pgdat, &flags);
                 present = pgdat->node_present_pages;
                 for(i = 0; i < pgdat->node_spanned_pages; i++) {
@@ -638,8 +641,7 @@ void show_mem(unsigned int filter)
                         if (pfn_valid(pgdat->node_start_pfn + i))
                                 page = pfn_to_page(pgdat->node_start_pfn + i);
                         else {
-                                i = vmemmap_find_next_valid_pfn(pgdat->node_id,
-                                         i) - 1;
+                                i = vmemmap_find_next_valid_pfn(nid, i) - 1;
                                 continue;
                         }
                         if (PageReserved(page))
@@ -655,7 +657,7 @@ void show_mem(unsigned int filter)
                 total_cached += cached;
                 total_shared += shared;
                 printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, "
-                       "shrd: %10d, swpd: %10d\n", pgdat->node_id,
+                       "shrd: %10d, swpd: %10d\n", nid,
                        present, reserved, shared, cached);
         }
         printk(KERN_INFO "%ld pages of RAM\n", total_present);
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 0799fea4c588..20b359376128 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
+#include <linux/prefetch.h>
 
 #include <asm/pgtable.h>
 #include <asm/processor.h>
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index ed41759efcac..00cb0e26c64e 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -36,8 +36,6 @@
 #include <asm/mca.h>
 #include <asm/paravirt.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 extern void ia64_tlb_init (void);
 
 unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL;
diff --git a/arch/ia64/oprofile/backtrace.c b/arch/ia64/oprofile/backtrace.c
index 5cdd7e4a597c..f7b798993cea 100644
--- a/arch/ia64/oprofile/backtrace.c
+++ b/arch/ia64/oprofile/backtrace.c
@@ -29,7 +29,7 @@ typedef struct
         unsigned int depth;
         struct pt_regs *regs;
         struct unw_frame_info frame;
-        u64 *prev_pfs_loc;      /* state for WAR for old spinlock ool code */
+        unsigned long *prev_pfs_loc;    /* state for WAR for old spinlock ool code */
 } ia64_backtrace_t;
 
 /* Returns non-zero if the PC is in the Interrupt Vector Table */
diff --git a/arch/ia64/sn/kernel/sn2/timer.c b/arch/ia64/sn/kernel/sn2/timer.c
index 21d6f09e3447..c34efda122e1 100644
--- a/arch/ia64/sn/kernel/sn2/timer.c
+++ b/arch/ia64/sn/kernel/sn2/timer.c
@@ -33,8 +33,6 @@ static struct clocksource clocksource_sn2 = {
         .rating         = 450,
         .read           = read_sn2,
         .mask           = (1LL << 55) - 1,
-        .mult           = 0,
-        .shift          = 10,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -57,9 +55,7 @@ ia64_sn_udelay (unsigned long usecs)
 void __init sn_timer_init(void)
 {
         clocksource_sn2.fsys_mmio = RTC_COUNTER_ADDR;
-        clocksource_sn2.mult = clocksource_hz2mult(sn_rtc_cycles_per_second,
-                                                        clocksource_sn2.shift);
-        clocksource_register(&clocksource_sn2);
+        clocksource_register_hz(&clocksource_sn2, sn_rtc_cycles_per_second);
 
         ia64_udelay = &ia64_sn_udelay;
 }
diff --git a/arch/ia64/xen/irq_xen.c b/arch/ia64/xen/irq_xen.c
index 108bb858acf2..b279e142c633 100644
--- a/arch/ia64/xen/irq_xen.c
+++ b/arch/ia64/xen/irq_xen.c
@@ -92,6 +92,8 @@ static unsigned short saved_irq_cnt;
 static int xen_slab_ready;
 
 #ifdef CONFIG_SMP
+#include <linux/sched.h>
+
 /* Dummy stub. Though we may check XEN_RESCHEDULE_VECTOR before __do_IRQ,
  * it ends up to issue several memory accesses upon percpu data and
  * thus adds unnecessary traffic to other paths.
@@ -99,7 +101,13 @@ static int xen_slab_ready;
 static irqreturn_t
 xen_dummy_handler(int irq, void *dev_id)
 {
+        return IRQ_HANDLED;
+}
 
+static irqreturn_t
+xen_resched_handler(int irq, void *dev_id)
+{
+        scheduler_ipi();
         return IRQ_HANDLED;
 }
 
@@ -110,7 +118,7 @@ static struct irqaction xen_ipi_irqaction = {
 };
 
 static struct irqaction xen_resched_irqaction = {
-        .handler =      xen_dummy_handler,
+        .handler =      xen_resched_handler,
         .flags =        IRQF_DISABLED,
         .name =         "resched"
 };
diff --git a/arch/m32r/Kconfig.debug b/arch/m32r/Kconfig.debug
index 2e1019ddbb22..bb1afc1a31cc 100644
--- a/arch/m32r/Kconfig.debug
+++ b/arch/m32r/Kconfig.debug
@@ -9,15 +9,6 @@ config DEBUG_STACKOVERFLOW
           This option will cause messages to be printed if free stack space
           drops below a certain limit.
 
-config DEBUG_STACK_USAGE
-        bool "Stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        help
-          Enables the display of the minimum amount of free stack which each
-          task has ever had available in the sysrq-T and sysrq-P debug output.
-
-          This option will slow down process creation somewhat.
-
 config DEBUG_PAGEALLOC
         bool "Debug page memory allocations"
         depends on DEBUG_KERNEL && BROKEN
diff --git a/arch/m32r/include/asm/smp.h b/arch/m32r/include/asm/smp.h
index e67ded1aab91..8accc1bb0263 100644
--- a/arch/m32r/include/asm/smp.h
+++ b/arch/m32r/include/asm/smp.h
@@ -94,8 +94,6 @@ extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
 
 #define NO_PROC_ID (0xff)       /* No processor magic marker */
 
-#define PROC_CHANGE_PENALTY     (15)    /* Schedule penalty */
-
 /*
  * M32R-mp IPI
  */
diff --git a/arch/m32r/kernel/smp.c b/arch/m32r/kernel/smp.c
index 31cef20b2996..fc10b39893d4 100644
--- a/arch/m32r/kernel/smp.c
+++ b/arch/m32r/kernel/smp.c
@@ -122,8 +122,6 @@ void smp_send_reschedule(int cpu_id)
  *
  * Description:  This routine executes on CPU which received
  *               'RESCHEDULE_IPI'.
- *               Rescheduling is processed at the exit of interrupt
- *               operation.
  *
  * Born on Date: 2002.02.05
  *
@@ -138,7 +136,7 @@ void smp_send_reschedule(int cpu_id)
  *==========================================================================*/
 void smp_reschedule_interrupt(void)
 {
-        /* nothing to do */
+        scheduler_ipi();
 }
 
 /*==========================================================================*
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S
index c194d64cdbb9..018e4a711d79 100644
--- a/arch/m32r/kernel/vmlinux.lds.S
+++ b/arch/m32r/kernel/vmlinux.lds.S
@@ -44,6 +44,7 @@ SECTIONS
   EXCEPTION_TABLE(16)
   NOTES
 
+  _sdata = .;                   /* Start of data section */
   RODATA
   RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)
   _edata = .;                   /* End of data section */
@@ -53,7 +54,7 @@ SECTIONS
   __init_begin = .;
   INIT_TEXT_SECTION(PAGE_SIZE)
   INIT_DATA_SECTION(16)
-  PERCPU(32, PAGE_SIZE)
+  PERCPU_SECTION(32)
   . = ALIGN(PAGE_SIZE);
   __init_end = .;
   /* freed after init ends here */
diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c
index 5d2858f6eede..2c468e8b5853 100644
--- a/arch/m32r/mm/discontig.c
+++ b/arch/m32r/mm/discontig.c
@@ -149,6 +149,7 @@ unsigned long __init zone_sizes_init(void)
                 zholes_size[ZONE_DMA] = mp->holes;
                 holes += zholes_size[ZONE_DMA];
 
+                node_set_state(nid, N_NORMAL_MEMORY);
                 free_area_init_node(nid, zones_size, start_pfn, zholes_size);
         }
 
diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c
index 73e2205ebf5a..78b660e903da 100644
--- a/arch/m32r/mm/init.c
+++ b/arch/m32r/mm/init.c
@@ -35,8 +35,6 @@ extern char __init_begin, __init_end;
 
 pgd_t swapper_pg_dir[1024];
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 /*
  * Cache of MMU context last used.
  */
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 75531da02a40..d66e34c718d0 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -5,6 +5,7 @@ config M68K
         select HAVE_AOUT if MMU
         select GENERIC_ATOMIC64 if MMU
         select HAVE_GENERIC_HARDIRQS if !MMU
+        select GENERIC_IRQ_SHOW if !MMU
 
 config RWSEM_GENERIC_SPINLOCK
         bool
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c
index b995513d527f..95022b04b62d 100644
--- a/arch/m68k/atari/atakeyb.c
+++ b/arch/m68k/atari/atakeyb.c
@@ -36,13 +36,10 @@
 
 /* Hook for MIDI serial driver */
 void (*atari_MIDI_interrupt_hook) (void);
-/* Hook for mouse driver */
-void (*atari_mouse_interrupt_hook) (char *);
 /* Hook for keyboard inputdev  driver */
 void (*atari_input_keyboard_interrupt_hook) (unsigned char, char);
 /* Hook for mouse inputdev  driver */
 void (*atari_input_mouse_interrupt_hook) (char *);
-EXPORT_SYMBOL(atari_mouse_interrupt_hook);
 EXPORT_SYMBOL(atari_input_keyboard_interrupt_hook);
 EXPORT_SYMBOL(atari_input_mouse_interrupt_hook);
 
@@ -263,8 +260,8 @@ repeat:
                         kb_state.buf[kb_state.len++] = scancode;
                         if (kb_state.len == 3) {
                                 kb_state.state = KEYBOARD;
-                                if (atari_mouse_interrupt_hook)
-                                        atari_mouse_interrupt_hook(kb_state.buf);
+                                if (atari_input_mouse_interrupt_hook)
+                                        atari_input_mouse_interrupt_hook(kb_state.buf);
                         }
                         break;
 
@@ -575,7 +572,7 @@ int atari_keyb_init(void)
         kb_state.len = 0;
 
         error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt,
-                            IRQ_TYPE_SLOW, "keyboard/mouse/MIDI",
+                            IRQ_TYPE_SLOW, "keyboard,mouse,MIDI",
                             atari_keyboard_interrupt);
         if (error)
                 return error;
diff --git a/arch/m68k/atari/stdma.c b/arch/m68k/atari/stdma.c
index 604329fafbb8..ddbf43ca8858 100644
--- a/arch/m68k/atari/stdma.c
+++ b/arch/m68k/atari/stdma.c
@@ -180,7 +180,7 @@ void __init stdma_init(void)
 {
         stdma_isr = NULL;
         if (request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | IRQF_SHARED,
-                        "ST-DMA: floppy/ACSI/IDE/Falcon-SCSI", stdma_int))
+                        "ST-DMA floppy,ACSI,IDE,Falcon-SCSI", stdma_int))
                 pr_err("Couldn't register ST-DMA interrupt\n");
 }
 
diff --git a/arch/m68k/include/asm/MC68EZ328.h b/arch/m68k/include/asm/MC68EZ328.h
index 69b7f9139e5e..d1bde58ab0dd 100644
--- a/arch/m68k/include/asm/MC68EZ328.h
+++ b/arch/m68k/include/asm/MC68EZ328.h
@@ -1047,7 +1047,7 @@ typedef volatile struct {
 
 #define WATCHDOG_EN     0x0001  /* Watchdog Enabled */
 #define WATCHDOG_ISEL   0x0002  /* Select the watchdog interrupt */
-#define WATCHDOG_INTF   0x0080  /* Watchdog interrupt occcured */
+#define WATCHDOG_INTF   0x0080  /* Watchdog interrupt occurred */
 #define WATCHDOG_CNT_MASK  0x0300       /* Watchdog Counter */
 #define WATCHDOG_CNT_SHIFT 8
 
diff --git a/arch/m68k/include/asm/MC68VZ328.h b/arch/m68k/include/asm/MC68VZ328.h
index 2b9bf626a0a5..6bd1bf1f85ea 100644
--- a/arch/m68k/include/asm/MC68VZ328.h
+++ b/arch/m68k/include/asm/MC68VZ328.h
@@ -1143,7 +1143,7 @@ typedef struct {
 
 #define WATCHDOG_EN     0x0001  /* Watchdog Enabled */
 #define WATCHDOG_ISEL   0x0002  /* Select the watchdog interrupt */
-#define WATCHDOG_INTF   0x0080  /* Watchdog interrupt occcured */
+#define WATCHDOG_INTF   0x0080  /* Watchdog interrupt occurred */
 #define WATCHDOG_CNT_MASK  0x0300       /* Watchdog Counter */
 #define WATCHDOG_CNT_SHIFT 8
 
diff --git a/arch/m68k/include/asm/atarikb.h b/arch/m68k/include/asm/atarikb.h
index 546e7da5804f..68f3622bf591 100644
--- a/arch/m68k/include/asm/atarikb.h
+++ b/arch/m68k/include/asm/atarikb.h
@@ -34,8 +34,6 @@ void ikbd_joystick_disable(void);
 
 /* Hook for MIDI serial driver */
 extern void (*atari_MIDI_interrupt_hook) (void);
-/* Hook for mouse driver */
-extern void (*atari_mouse_interrupt_hook) (char *);
 /* Hook for keyboard inputdev  driver */
 extern void (*atari_input_keyboard_interrupt_hook) (unsigned char, char);
 /* Hook for mouse inputdev  driver */
diff --git a/arch/m68k/include/asm/bitops_mm.h b/arch/m68k/include/asm/bitops_mm.h
index 9d69f6e62365..e9020f88a748 100644
--- a/arch/m68k/include/asm/bitops_mm.h
+++ b/arch/m68k/include/asm/bitops_mm.h
@@ -181,14 +181,15 @@ static inline int find_first_zero_bit(const unsigned long *vaddr,
 {
         const unsigned long *p = vaddr;
         int res = 32;
+        unsigned int words;
         unsigned long num;
 
         if (!size)
                 return 0;
 
-        size = (size + 31) >> 5;
+        words = (size + 31) >> 5;
         while (!(num = ~*p++)) {
-                if (!--size)
+                if (!--words)
                         goto out;
         }
 
@@ -196,7 +197,8 @@ static inline int find_first_zero_bit(const unsigned long *vaddr,
                               : "=d" (res) : "d" (num & -num));
         res ^= 31;
 out:
-        return ((long)p - (long)vaddr - 4) * 8 + res;
+        res += ((long)p - (long)vaddr - 4) * 8;
+        return res < size ? res : size;
 }
 
 static inline int find_next_zero_bit(const unsigned long *vaddr, int size,
@@ -215,27 +217,32 @@ static inline int find_next_zero_bit(const unsigned long *vaddr, int size,
                 /* Look for zero in first longword */
                 __asm__ __volatile__ ("bfffo %1{#0,#0},%0"
                                       : "=d" (res) : "d" (num & -num));
-                if (res < 32)
-                        return offset + (res ^ 31);
+                if (res < 32) {
+                        offset += res ^ 31;
+                        return offset < size ? offset : size;
+                }
                 offset += 32;
+
+                if (offset >= size)
+                        return size;
         }
         /* No zero yet, search remaining full bytes for a zero */
-        res = find_first_zero_bit(p, size - ((long)p - (long)vaddr) * 8);
-        return offset + res;
+        return offset + find_first_zero_bit(p, size - offset);
 }
 
 static inline int find_first_bit(const unsigned long *vaddr, unsigned size)
 {
         const unsigned long *p = vaddr;
         int res = 32;
+        unsigned int words;
         unsigned long num;
 
         if (!size)
                 return 0;
 
-        size = (size + 31) >> 5;
+        words = (size + 31) >> 5;
         while (!(num = *p++)) {
-                if (!--size)
+                if (!--words)
                         goto out;
         }
 
@@ -243,7 +250,8 @@ static inline int find_first_bit(const unsigned long *vaddr, unsigned size)
                               : "=d" (res) : "d" (num & -num));
         res ^= 31;
 out:
-        return ((long)p - (long)vaddr - 4) * 8 + res;
+        res += ((long)p - (long)vaddr - 4) * 8;
+        return res < size ? res : size;
 }
 
 static inline int find_next_bit(const unsigned long *vaddr, int size,
@@ -262,13 +270,17 @@ static inline int find_next_bit(const unsigned long *vaddr, int size,
                 /* Look for one in first longword */
                 __asm__ __volatile__ ("bfffo %1{#0,#0},%0"
                                       : "=d" (res) : "d" (num & -num));
-                if (res < 32)
-                        return offset + (res ^ 31);
+                if (res < 32) {
+                        offset += res ^ 31;
+                        return offset < size ? offset : size;
+                }
                 offset += 32;
+
+                if (offset >= size)
+                        return size;
         }
         /* No one yet, search remaining full bytes for a one */
-        res = find_first_bit(p, size - ((long)p - (long)vaddr) * 8);
-        return offset + res;
+        return offset + find_first_bit(p, size - offset);
 }
 
 /*
@@ -366,23 +378,25 @@ static inline int test_bit_le(int nr, const void *vaddr)
 static inline int find_first_zero_bit_le(const void *vaddr, unsigned size)
 {
         const unsigned long *p = vaddr, *addr = vaddr;
-        int res;
+        int res = 0;
+        unsigned int words;
 
         if (!size)
                 return 0;
 
-        size = (size >> 5) + ((size & 31) > 0);
-        while (*p++ == ~0UL)
-        {
-                if (--size == 0)
-                        return (p - addr) << 5;
+        words = (size >> 5) + ((size & 31) > 0);
+        while (*p++ == ~0UL) {
+                if (--words == 0)
+                        goto out;
         }
 
         --p;
         for (res = 0; res < 32; res++)
                 if (!test_bit_le(res, p))
                         break;
-        return (p - addr) * 32 + res;
+out:
+        res += (p - addr) * 32;
+        return res < size ? res : size;
 }
 
 static inline unsigned long find_next_zero_bit_le(const void *addr,
@@ -400,10 +414,15 @@ static inline unsigned long find_next_zero_bit_le(const void *addr,
                 offset -= bit;
                 /* Look for zero in first longword */
                 for (res = bit; res < 32; res++)
-                        if (!test_bit_le(res, p))
-                                return offset + res;
+                        if (!test_bit_le(res, p)) {
+                                offset += res;
+                                return offset < size ? offset : size;
+                        }
                 p++;
                 offset += 32;
+
+                if (offset >= size)
+                        return size;
         }
         /* No zero yet, search remaining full bytes for a zero */
         return offset + find_first_zero_bit_le(p, size - offset);
@@ -412,22 +431,25 @@ static inline unsigned long find_next_zero_bit_le(const void *addr,
 static inline int find_first_bit_le(const void *vaddr, unsigned size)
 {
         const unsigned long *p = vaddr, *addr = vaddr;
-        int res;
+        int res = 0;
+        unsigned int words;
 
         if (!size)
                 return 0;
 
-        size = (size >> 5) + ((size & 31) > 0);
+        words = (size >> 5) + ((size & 31) > 0);
         while (*p++ == 0UL) {
-                if (--size == 0)
-                        return (p - addr) << 5;
+                if (--words == 0)
+                        goto out;
         }
 
         --p;
         for (res = 0; res < 32; res++)
                 if (test_bit_le(res, p))
                         break;
-        return (p - addr) * 32 + res;
+out:
+        res += (p - addr) * 32;
+        return res < size ? res : size;
 }
 
 static inline unsigned long find_next_bit_le(const void *addr,
@@ -445,10 +467,15 @@ static inline unsigned long find_next_bit_le(const void *addr,
                 offset -= bit;
                 /* Look for one in first longword */
                 for (res = bit; res < 32; res++)
-                        if (test_bit_le(res, p))
-                                return offset + res;
+                        if (test_bit_le(res, p)) {
+                                offset += res;
+                                return offset < size ? offset : size;
+                        }
                 p++;
                 offset += 32;
+
+                if (offset >= size)
+                        return size;
         }
         /* No set bit yet, search remaining full bytes for a set bit */
         return offset + find_first_bit_le(p, size - offset);
diff --git a/arch/m68k/include/asm/bitops_no.h b/arch/m68k/include/asm/bitops_no.h
index 7d3779fdc5b6..6b0e2d349f0e 100644
--- a/arch/m68k/include/asm/bitops_no.h
+++ b/arch/m68k/include/asm/bitops_no.h
@@ -246,23 +246,7 @@ static inline int __test_and_clear_bit_le(int nr, volatile void *addr)
         return retval;
 }
 
-#define ext2_set_bit_atomic(lock, nr, addr)             \
-        ({                                              \
-                int ret;                                \
-                spin_lock(lock);                        \
-                ret = __test_and_set_bit_le((nr), (addr));      \
-                spin_unlock(lock);                      \
-                ret;                                    \
-        })
-
-#define ext2_clear_bit_atomic(lock, nr, addr)           \
-        ({                                              \
-                int ret;                                \
-                spin_lock(lock);                        \
-                ret = __test_and_clear_bit_le((nr), (addr));    \
-                spin_unlock(lock);                      \
-                ret;                                    \
-        })
+#include <asm-generic/bitops/ext2-atomic.h>
 
 static inline int test_bit_le(int nr, const volatile void *addr)
 {
diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h
index cf20f3097af6..353bf754a972 100644
--- a/arch/m68k/include/asm/io_no.h
+++ b/arch/m68k/include/asm/io_no.h
@@ -144,8 +144,10 @@ static inline void io_insl(unsigned int addr, void *buf, int len)
 #define IOMAP_NOCACHE_NONSER            2
 #define IOMAP_WRITETHROUGH              3
 
-extern void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag);
-
+static inline void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)
+{
+        return (void *) physaddr;
+}
 static inline void *ioremap(unsigned long physaddr, unsigned long size)
 {
         return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
@@ -163,7 +165,7 @@ static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size
         return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
 }
 
-extern void iounmap(void *addr);
+#define iounmap(addr)   do { } while(0)
 
 /*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
index 29e17907d9f2..f3b649de2a1b 100644
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
@@ -22,7 +22,7 @@
 #define __NR_mknod               14
 #define __NR_chmod               15
 #define __NR_chown               16
-#define __NR_break               17
+/*#define __NR_break             17*/
 #define __NR_oldstat             18
 #define __NR_lseek               19
 #define __NR_getpid              20
@@ -36,11 +36,11 @@
 #define __NR_oldfstat            28
 #define __NR_pause               29
 #define __NR_utime               30
-#define __NR_stty                31
-#define __NR_gtty                32
+/*#define __NR_stty              31*/
+/*#define __NR_gtty              32*/
 #define __NR_access              33
 #define __NR_nice                34
-#define __NR_ftime               35
+/*#define __NR_ftime             35*/
 #define __NR_sync                36
 #define __NR_kill                37
 #define __NR_rename              38
@@ -49,7 +49,7 @@
 #define __NR_dup                 41
 #define __NR_pipe                42
 #define __NR_times               43
-#define __NR_prof                44
+/*#define __NR_prof              44*/
 #define __NR_brk                 45
 #define __NR_setgid              46
 #define __NR_getgid              47
@@ -58,13 +58,13 @@
 #define __NR_getegid             50
 #define __NR_acct                51
 #define __NR_umount2             52
-#define __NR_lock                53
+/*#define __NR_lock              53*/
 #define __NR_ioctl               54
 #define __NR_fcntl               55
-#define __NR_mpx                 56
+/*#define __NR_mpx               56*/
 #define __NR_setpgid             57
-#define __NR_ulimit              58
-#define __NR_oldolduname         59
+/*#define __NR_ulimit            58*/
+/*#define __NR_oldolduname       59*/
 #define __NR_umask               60
 #define __NR_chroot              61
 #define __NR_ustat               62
@@ -103,10 +103,10 @@
 #define __NR_fchown              95
 #define __NR_getpriority         96
 #define __NR_setpriority         97
-#define __NR_profil              98
+/*#define __NR_profil            98*/
 #define __NR_statfs              99
 #define __NR_fstatfs            100
-#define __NR_ioperm             101
+/*#define __NR_ioperm           101*/
 #define __NR_socketcall         102
 #define __NR_syslog             103
 #define __NR_setitimer          104
@@ -114,11 +114,11 @@
 #define __NR_stat               106
 #define __NR_lstat              107
 #define __NR_fstat              108
-#define __NR_olduname           109
-#define __NR_iopl               /* 110 */ not supported
+/*#define __NR_olduname         109*/
+/*#define __NR_iopl             110*/ /* not supported */
 #define __NR_vhangup            111
-#define __NR_idle               /* 112 */ Obsolete
-#define __NR_vm86               /* 113 */ not supported
+/*#define __NR_idle             112*/ /* Obsolete */
+/*#define __NR_vm86             113*/ /* not supported */
 #define __NR_wait4              114
 #define __NR_swapoff            115
 #define __NR_sysinfo            116
@@ -132,17 +132,17 @@
 #define __NR_adjtimex           124
 #define __NR_mprotect           125
 #define __NR_sigprocmask        126
-#define __NR_create_module      127
+/*#define __NR_create_module    127*/
 #define __NR_init_module        128
 #define __NR_delete_module      129
-#define __NR_get_kernel_syms    130
+/*#define __NR_get_kernel_syms  130*/
 #define __NR_quotactl           131
 #define __NR_getpgid            132
 #define __NR_fchdir             133
 #define __NR_bdflush            134
 #define __NR_sysfs              135
 #define __NR_personality        136
-#define __NR_afs_syscall        137 /* Syscall for Andrew File System */
+/*#define __NR_afs_syscall      137*/ /* Syscall for Andrew File System */
 #define __NR_setfsuid           138
 #define __NR_setfsgid           139
 #define __NR__llseek            140
@@ -172,7 +172,7 @@
 #define __NR_setresuid          164
 #define __NR_getresuid          165
 #define __NR_getpagesize        166
-#define __NR_query_module       167
+/*#define __NR_query_module     167*/
 #define __NR_poll               168
 #define __NR_nfsservctl         169
 #define __NR_setresgid          170
@@ -193,8 +193,8 @@
 #define __NR_capset             185
 #define __NR_sigaltstack        186
 #define __NR_sendfile           187
-#define __NR_getpmsg            188     /* some people actually want streams */
-#define __NR_putpmsg            189     /* some people actually want streams */
+/*#define __NR_getpmsg          188*/   /* some people actually want streams */
+/*#define __NR_putpmsg          189*/   /* some people actually want streams */
 #define __NR_vfork              190
 #define __NR_ugetrlimit         191
 #define __NR_mmap2              192
@@ -223,6 +223,8 @@
 #define __NR_setfsuid32         215
 #define __NR_setfsgid32         216
 #define __NR_pivot_root         217
+/* 218*/
+/* 219*/
 #define __NR_getdents64         220
 #define __NR_gettid             221
 #define __NR_tkill              222
@@ -281,7 +283,7 @@
 #define __NR_mq_notify          275
 #define __NR_mq_getsetattr      276
 #define __NR_waitid             277
-#define __NR_vserver            278
+/*#define __NR_vserver          278*/
 #define __NR_add_key            279
 #define __NR_request_key        280
 #define __NR_keyctl             281
diff --git a/arch/m68k/kernel/Makefile_mm b/arch/m68k/kernel/Makefile_mm
index 55d5d6b680a2..aced67804579 100644
--- a/arch/m68k/kernel/Makefile_mm
+++ b/arch/m68k/kernel/Makefile_mm
@@ -10,7 +10,7 @@ endif
 extra-y += vmlinux.lds
 
 obj-y   := entry.o process.o traps.o ints.o signal.o ptrace.o module.o \
-           sys_m68k.o time.o setup.o m68k_ksyms.o devres.o
+           sys_m68k.o time.o setup.o m68k_ksyms.o devres.o syscalltable.o
 
 devres-y = ../../../kernel/irq/devres.o
 
diff --git a/arch/m68k/kernel/asm-offsets.c b/arch/m68k/kernel/asm-offsets.c
index 59a69a5c62f2..983fed9d469b 100644
--- a/arch/m68k/kernel/asm-offsets.c
+++ b/arch/m68k/kernel/asm-offsets.c
@@ -1,5 +1,105 @@
-#ifdef CONFIG_MMU
-#include "asm-offsets_mm.c"
+/*
+ * This program is used to generate definitions needed by
+ * assembly language modules.
+ *
+ * We use the technique used in the OSF Mach kernel code:
+ * generate asm statements containing #defines,
+ * compile this file to assembler, and then extract the
+ * #defines from the assembly-language output.
+ */
+
+#define ASM_OFFSETS_C
+
+#include <linux/stddef.h>
+#include <linux/sched.h>
+#include <linux/kernel_stat.h>
+#include <linux/kbuild.h>
+#include <asm/bootinfo.h>
+#include <asm/irq.h>
+#include <asm/amigahw.h>
+#include <linux/font.h>
+
+int main(void)
+{
+        /* offsets into the task struct */
+        DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));
+        DEFINE(TASK_MM, offsetof(struct task_struct, mm));
+        DEFINE(TASK_INFO, offsetof(struct task_struct, thread.info));
+        DEFINE(TASK_TINFO, offsetof(struct task_struct, thread.info));
+
+        /* offsets into the thread struct */
+        DEFINE(THREAD_KSP, offsetof(struct thread_struct, ksp));
+        DEFINE(THREAD_USP, offsetof(struct thread_struct, usp));
+        DEFINE(THREAD_SR, offsetof(struct thread_struct, sr));
+        DEFINE(THREAD_FS, offsetof(struct thread_struct, fs));
+        DEFINE(THREAD_CRP, offsetof(struct thread_struct, crp));
+        DEFINE(THREAD_ESP0, offsetof(struct thread_struct, esp0));
+        DEFINE(THREAD_FPREG, offsetof(struct thread_struct, fp));
+        DEFINE(THREAD_FPCNTL, offsetof(struct thread_struct, fpcntl));
+        DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate));
+
+        /* offsets into the thread_info struct */
+        DEFINE(TINFO_PREEMPT, offsetof(struct thread_info, preempt_count));
+        DEFINE(TINFO_FLAGS, offsetof(struct thread_info, flags));
+
+        /* offsets into the pt_regs */
+        DEFINE(PT_OFF_D0, offsetof(struct pt_regs, d0));
+        DEFINE(PT_OFF_ORIG_D0, offsetof(struct pt_regs, orig_d0));
+        DEFINE(PT_OFF_D1, offsetof(struct pt_regs, d1));
+        DEFINE(PT_OFF_D2, offsetof(struct pt_regs, d2));
+        DEFINE(PT_OFF_D3, offsetof(struct pt_regs, d3));
+        DEFINE(PT_OFF_D4, offsetof(struct pt_regs, d4));
+        DEFINE(PT_OFF_D5, offsetof(struct pt_regs, d5));
+        DEFINE(PT_OFF_A0, offsetof(struct pt_regs, a0));
+        DEFINE(PT_OFF_A1, offsetof(struct pt_regs, a1));
+        DEFINE(PT_OFF_A2, offsetof(struct pt_regs, a2));
+        DEFINE(PT_OFF_PC, offsetof(struct pt_regs, pc));
+        DEFINE(PT_OFF_SR, offsetof(struct pt_regs, sr));
+
+        /* bitfields are a bit difficult */
+#ifdef CONFIG_COLDFIRE
+        DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, sr) - 2);
 #else
-#include "asm-offsets_no.c"
+        DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, pc) + 4);
+#endif
+
+        /* offsets into the irq_cpustat_t struct */
+        DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending));
+
+        /* signal defines */
+        DEFINE(LSIGSEGV, SIGSEGV);
+        DEFINE(LSEGV_MAPERR, SEGV_MAPERR);
+        DEFINE(LSIGTRAP, SIGTRAP);
+        DEFINE(LTRAP_TRACE, TRAP_TRACE);
+
+#ifdef CONFIG_MMU
+        /* offsets into the bi_record struct */
+        DEFINE(BIR_TAG, offsetof(struct bi_record, tag));
+        DEFINE(BIR_SIZE, offsetof(struct bi_record, size));
+        DEFINE(BIR_DATA, offsetof(struct bi_record, data));
+
+        /* offsets into font_desc (drivers/video/console/font.h) */
+        DEFINE(FONT_DESC_IDX, offsetof(struct font_desc, idx));
+        DEFINE(FONT_DESC_NAME, offsetof(struct font_desc, name));
+        DEFINE(FONT_DESC_WIDTH, offsetof(struct font_desc, width));
+        DEFINE(FONT_DESC_HEIGHT, offsetof(struct font_desc, height));
+        DEFINE(FONT_DESC_DATA, offsetof(struct font_desc, data));
+        DEFINE(FONT_DESC_PREF, offsetof(struct font_desc, pref));
+
+        /* offsets into the custom struct */
+        DEFINE(CUSTOMBASE, &amiga_custom);
+        DEFINE(C_INTENAR, offsetof(struct CUSTOM, intenar));
+        DEFINE(C_INTREQR, offsetof(struct CUSTOM, intreqr));
+        DEFINE(C_INTENA, offsetof(struct CUSTOM, intena));
+        DEFINE(C_INTREQ, offsetof(struct CUSTOM, intreq));
+        DEFINE(C_SERDATR, offsetof(struct CUSTOM, serdatr));
+        DEFINE(C_SERDAT, offsetof(struct CUSTOM, serdat));
+        DEFINE(C_SERPER, offsetof(struct CUSTOM, serper));
+        DEFINE(CIAABASE, &ciaa);
+        DEFINE(CIABBASE, &ciab);
+        DEFINE(C_PRA, offsetof(struct CIA, pra));
+        DEFINE(ZTWOBASE, zTwoBase);
 #endif
+
+        return 0;
+}
diff --git a/arch/m68k/kernel/asm-offsets_mm.c b/arch/m68k/kernel/asm-offsets_mm.c
deleted file mode 100644
index 78e59b82ebc3..000000000000
--- a/arch/m68k/kernel/asm-offsets_mm.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * This program is used to generate definitions needed by
- * assembly language modules.
- *
- * We use the technique used in the OSF Mach kernel code:
- * generate asm statements containing #defines,
- * compile this file to assembler, and then extract the
- * #defines from the assembly-language output.
- */
-
-#define ASM_OFFSETS_C
-
-#include <linux/stddef.h>
-#include <linux/sched.h>
-#include <linux/kernel_stat.h>
-#include <linux/kbuild.h>
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
-#include <asm/amigahw.h>
-#include <linux/font.h>
-
-int main(void)
-{
-        /* offsets into the task struct */
-        DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));
-        DEFINE(TASK_INFO, offsetof(struct task_struct, thread.info));
-        DEFINE(TASK_MM, offsetof(struct task_struct, mm));
-#ifdef CONFIG_MMU
-        DEFINE(TASK_TINFO, offsetof(struct task_struct, thread.info));
-#endif
-
-        /* offsets into the thread struct */
-        DEFINE(THREAD_KSP, offsetof(struct thread_struct, ksp));
-        DEFINE(THREAD_USP, offsetof(struct thread_struct, usp));
-        DEFINE(THREAD_SR, offsetof(struct thread_struct, sr));
-        DEFINE(THREAD_FS, offsetof(struct thread_struct, fs));
-        DEFINE(THREAD_CRP, offsetof(struct thread_struct, crp));
-        DEFINE(THREAD_ESP0, offsetof(struct thread_struct, esp0));
-        DEFINE(THREAD_FPREG, offsetof(struct thread_struct, fp));
-        DEFINE(THREAD_FPCNTL, offsetof(struct thread_struct, fpcntl));
-        DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate));
-
-        /* offsets into the thread_info struct */
-        DEFINE(TINFO_PREEMPT, offsetof(struct thread_info, preempt_count));
-        DEFINE(TINFO_FLAGS, offsetof(struct thread_info, flags));
-
-        /* offsets into the pt_regs */
-        DEFINE(PT_OFF_D0, offsetof(struct pt_regs, d0));
-        DEFINE(PT_OFF_ORIG_D0, offsetof(struct pt_regs, orig_d0));
-        DEFINE(PT_OFF_D1, offsetof(struct pt_regs, d1));
-        DEFINE(PT_OFF_D2, offsetof(struct pt_regs, d2));
-        DEFINE(PT_OFF_D3, offsetof(struct pt_regs, d3));
-        DEFINE(PT_OFF_D4, offsetof(struct pt_regs, d4));
-        DEFINE(PT_OFF_D5, offsetof(struct pt_regs, d5));
-        DEFINE(PT_OFF_A0, offsetof(struct pt_regs, a0));
-        DEFINE(PT_OFF_A1, offsetof(struct pt_regs, a1));
-        DEFINE(PT_OFF_A2, offsetof(struct pt_regs, a2));
-        DEFINE(PT_OFF_PC, offsetof(struct pt_regs, pc));
-        DEFINE(PT_OFF_SR, offsetof(struct pt_regs, sr));
-        /* bitfields are a bit difficult */
-        DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, pc) + 4);
-
-        /* offsets into the irq_cpustat_t struct */
-        DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending));
-
-        /* offsets into the bi_record struct */
-        DEFINE(BIR_TAG, offsetof(struct bi_record, tag));
-        DEFINE(BIR_SIZE, offsetof(struct bi_record, size));
-        DEFINE(BIR_DATA, offsetof(struct bi_record, data));
-
-        /* offsets into font_desc (drivers/video/console/font.h) */
-        DEFINE(FONT_DESC_IDX, offsetof(struct font_desc, idx));
-        DEFINE(FONT_DESC_NAME, offsetof(struct font_desc, name));
-        DEFINE(FONT_DESC_WIDTH, offsetof(struct font_desc, width));
-        DEFINE(FONT_DESC_HEIGHT, offsetof(struct font_desc, height));
-        DEFINE(FONT_DESC_DATA, offsetof(struct font_desc, data));
-        DEFINE(FONT_DESC_PREF, offsetof(struct font_desc, pref));
-
-        /* signal defines */
-        DEFINE(LSIGSEGV, SIGSEGV);
-        DEFINE(LSEGV_MAPERR, SEGV_MAPERR);
-        DEFINE(LSIGTRAP, SIGTRAP);
-        DEFINE(LTRAP_TRACE, TRAP_TRACE);
-
-        /* offsets into the custom struct */
-        DEFINE(CUSTOMBASE, &amiga_custom);
-        DEFINE(C_INTENAR, offsetof(struct CUSTOM, intenar));
-        DEFINE(C_INTREQR, offsetof(struct CUSTOM, intreqr));
-        DEFINE(C_INTENA, offsetof(struct CUSTOM, intena));
-        DEFINE(C_INTREQ, offsetof(struct CUSTOM, intreq));
-        DEFINE(C_SERDATR, offsetof(struct CUSTOM, serdatr));
-        DEFINE(C_SERDAT, offsetof(struct CUSTOM, serdat));
-        DEFINE(C_SERPER, offsetof(struct CUSTOM, serper));
-        DEFINE(CIAABASE, &ciaa);
-        DEFINE(CIABBASE, &ciab);
-        DEFINE(C_PRA, offsetof(struct CIA, pra));
-        DEFINE(ZTWOBASE, zTwoBase);
-
-        return 0;
-}
diff --git a/arch/m68k/kernel/asm-offsets_no.c b/arch/m68k/kernel/asm-offsets_no.c
deleted file mode 100644
index ffe02f41ad46..000000000000
--- a/arch/m68k/kernel/asm-offsets_no.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * This program is used to generate definitions needed by
- * assembly language modules.
- *
- * We use the technique used in the OSF Mach kernel code:
- * generate asm statements containing #defines,
- * compile this file to assembler, and then extract the
- * #defines from the assembly-language output.
- */
-
-#include <linux/stddef.h>
-#include <linux/sched.h>
-#include <linux/kernel_stat.h>
-#include <linux/ptrace.h>
-#include <linux/hardirq.h>
-#include <linux/kbuild.h>
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
-#include <asm/thread_info.h>
-
-int main(void)
-{
-        /* offsets into the task struct */
-        DEFINE(TASK_THREAD, offsetof(struct task_struct, thread));
-        DEFINE(TASK_MM, offsetof(struct task_struct, mm));
-
-        /* offsets into the irq_cpustat_t struct */
-        DEFINE(CPUSTAT_SOFTIRQ_PENDING, offsetof(irq_cpustat_t, __softirq_pending));
-
-        /* offsets into the thread struct */
-        DEFINE(THREAD_KSP, offsetof(struct thread_struct, ksp));
-        DEFINE(THREAD_USP, offsetof(struct thread_struct, usp));
-        DEFINE(THREAD_SR, offsetof(struct thread_struct, sr));
-        DEFINE(THREAD_FS, offsetof(struct thread_struct, fs));
-        DEFINE(THREAD_CRP, offsetof(struct thread_struct, crp));
-        DEFINE(THREAD_ESP0, offsetof(struct thread_struct, esp0));
-        DEFINE(THREAD_FPREG, offsetof(struct thread_struct, fp));
-        DEFINE(THREAD_FPCNTL, offsetof(struct thread_struct, fpcntl));
-        DEFINE(THREAD_FPSTATE, offsetof(struct thread_struct, fpstate));
-
-        /* offsets into the pt_regs */
-        DEFINE(PT_OFF_D0, offsetof(struct pt_regs, d0));
-        DEFINE(PT_OFF_ORIG_D0, offsetof(struct pt_regs, orig_d0));
-        DEFINE(PT_OFF_D1, offsetof(struct pt_regs, d1));
-        DEFINE(PT_OFF_D2, offsetof(struct pt_regs, d2));
-        DEFINE(PT_OFF_D3, offsetof(struct pt_regs, d3));
-        DEFINE(PT_OFF_D4, offsetof(struct pt_regs, d4));
-        DEFINE(PT_OFF_D5, offsetof(struct pt_regs, d5));
-        DEFINE(PT_OFF_A0, offsetof(struct pt_regs, a0));
-        DEFINE(PT_OFF_A1, offsetof(struct pt_regs, a1));
-        DEFINE(PT_OFF_A2, offsetof(struct pt_regs, a2));
-        DEFINE(PT_OFF_PC, offsetof(struct pt_regs, pc));
-        DEFINE(PT_OFF_SR, offsetof(struct pt_regs, sr));
-
-#ifdef CONFIG_COLDFIRE
-        /* bitfields are a bit difficult */
-        DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, sr) - 2);
-#else
-        /* bitfields are a bit difficult */
-        DEFINE(PT_OFF_FORMATVEC, offsetof(struct pt_regs, pc) + 4);
-#endif
-
-        /* signal defines */
-        DEFINE(SIGSEGV, SIGSEGV);
-        DEFINE(SEGV_MAPERR, SEGV_MAPERR);
-        DEFINE(SIGTRAP, SIGTRAP);
-        DEFINE(TRAP_TRACE, TRAP_TRACE);
-
-        DEFINE(PT_PTRACED, PT_PTRACED);
-
-        /* Offsets in thread_info structure */
-        DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
-        DEFINE(TI_PREEMPTCOUNT, offsetof(struct thread_info, preempt_count));
-
-        return 0;
-}
diff --git a/arch/m68k/kernel/entry_mm.S b/arch/m68k/kernel/entry_mm.S
index 1359ee659574..bd0ec05263b2 100644
--- a/arch/m68k/kernel/entry_mm.S
+++ b/arch/m68k/kernel/entry_mm.S
@@ -407,351 +407,3 @@ resume:
 
         rts
 
-.data
-ALIGN
-sys_call_table:
-        .long sys_restart_syscall       /* 0 - old "setup()" system call, used for restarting */
-        .long sys_exit
-        .long sys_fork
-        .long sys_read
-        .long sys_write
-        .long sys_open          /* 5 */
-        .long sys_close
-        .long sys_waitpid
-        .long sys_creat
-        .long sys_link
-        .long sys_unlink        /* 10 */
-        .long sys_execve
-        .long sys_chdir
-        .long sys_time
-        .long sys_mknod
-        .long sys_chmod         /* 15 */
-        .long sys_chown16
-        .long sys_ni_syscall                            /* old break syscall holder */
-        .long sys_stat
-        .long sys_lseek
-        .long sys_getpid        /* 20 */
-        .long sys_mount
-        .long sys_oldumount
-        .long sys_setuid16
-        .long sys_getuid16
-        .long sys_stime         /* 25 */
-        .long sys_ptrace
-        .long sys_alarm
-        .long sys_fstat
-        .long sys_pause
-        .long sys_utime         /* 30 */
-        .long sys_ni_syscall                            /* old stty syscall holder */
-        .long sys_ni_syscall                            /* old gtty syscall holder */
-        .long sys_access
-        .long sys_nice
-        .long sys_ni_syscall    /* 35 */        /* old ftime syscall holder */
-        .long sys_sync
-        .long sys_kill
-        .long sys_rename
-        .long sys_mkdir
-        .long sys_rmdir         /* 40 */
-        .long sys_dup
-        .long sys_pipe
-        .long sys_times
-        .long sys_ni_syscall                            /* old prof syscall holder */
-        .long sys_brk           /* 45 */
-        .long sys_setgid16
-        .long sys_getgid16
-        .long sys_signal
-        .long sys_geteuid16
-        .long sys_getegid16     /* 50 */
-        .long sys_acct
-        .long sys_umount                                /* recycled never used phys() */
-        .long sys_ni_syscall                            /* old lock syscall holder */
-        .long sys_ioctl
-        .long sys_fcntl         /* 55 */
-        .long sys_ni_syscall                            /* old mpx syscall holder */
-        .long sys_setpgid
-        .long sys_ni_syscall                            /* old ulimit syscall holder */
-        .long sys_ni_syscall
-        .long sys_umask         /* 60 */
-        .long sys_chroot
-        .long sys_ustat
-        .long sys_dup2
-        .long sys_getppid
-        .long sys_getpgrp       /* 65 */
-        .long sys_setsid
-        .long sys_sigaction
-        .long sys_sgetmask
-        .long sys_ssetmask
-        .long sys_setreuid16    /* 70 */
-        .long sys_setregid16
-        .long sys_sigsuspend
-        .long sys_sigpending
-        .long sys_sethostname
-        .long sys_setrlimit     /* 75 */
-        .long sys_old_getrlimit
-        .long sys_getrusage
-        .long sys_gettimeofday
-        .long sys_settimeofday
-        .long sys_getgroups16   /* 80 */
-        .long sys_setgroups16
-        .long sys_old_select
-        .long sys_symlink
-        .long sys_lstat
-        .long sys_readlink      /* 85 */
-        .long sys_uselib
-        .long sys_swapon
-        .long sys_reboot
-        .long sys_old_readdir
-        .long sys_old_mmap      /* 90 */
-        .long sys_munmap
-        .long sys_truncate
-        .long sys_ftruncate
-        .long sys_fchmod
-        .long sys_fchown16      /* 95 */
-        .long sys_getpriority
-        .long sys_setpriority
-        .long sys_ni_syscall                            /* old profil syscall holder */
-        .long sys_statfs
-        .long sys_fstatfs       /* 100 */
-        .long sys_ni_syscall                            /* ioperm for i386 */
-        .long sys_socketcall
-        .long sys_syslog
-        .long sys_setitimer
-        .long sys_getitimer     /* 105 */
-        .long sys_newstat
-        .long sys_newlstat
-        .long sys_newfstat
-        .long sys_ni_syscall
-        .long sys_ni_syscall    /* 110 */       /* iopl for i386 */
-        .long sys_vhangup
-        .long sys_ni_syscall                            /* obsolete idle() syscall */
-        .long sys_ni_syscall                            /* vm86old for i386 */
-        .long sys_wait4
-        .long sys_swapoff       /* 115 */
-        .long sys_sysinfo
-        .long sys_ipc
-        .long sys_fsync
-        .long sys_sigreturn
-        .long sys_clone         /* 120 */
-        .long sys_setdomainname
-        .long sys_newuname
-        .long sys_cacheflush                            /* modify_ldt for i386 */
-        .long sys_adjtimex
-        .long sys_mprotect      /* 125 */
-        .long sys_sigprocmask
-        .long sys_ni_syscall            /* old "create_module" */
-        .long sys_init_module
-        .long sys_delete_module
-        .long sys_ni_syscall    /* 130 - old "get_kernel_syms" */
-        .long sys_quotactl
-        .long sys_getpgid
-        .long sys_fchdir
-        .long sys_bdflush
-        .long sys_sysfs         /* 135 */
-        .long sys_personality
-        .long sys_ni_syscall                            /* for afs_syscall */
-        .long sys_setfsuid16
-        .long sys_setfsgid16
-        .long sys_llseek        /* 140 */
-        .long sys_getdents
-        .long sys_select
-        .long sys_flock
-        .long sys_msync
-        .long sys_readv         /* 145 */
-        .long sys_writev
-        .long sys_getsid
-        .long sys_fdatasync
-        .long sys_sysctl
-        .long sys_mlock         /* 150 */
-        .long sys_munlock
-        .long sys_mlockall
-        .long sys_munlockall
-        .long sys_sched_setparam
-        .long sys_sched_getparam        /* 155 */
-        .long sys_sched_setscheduler
-        .long sys_sched_getscheduler
-        .long sys_sched_yield
-        .long sys_sched_get_priority_max
-        .long sys_sched_get_priority_min  /* 160 */
-        .long sys_sched_rr_get_interval
-        .long sys_nanosleep
-        .long sys_mremap
-        .long sys_setresuid16
-        .long sys_getresuid16   /* 165 */
-        .long sys_getpagesize
-        .long sys_ni_syscall            /* old sys_query_module */
-        .long sys_poll
-        .long sys_nfsservctl
-        .long sys_setresgid16   /* 170 */
-        .long sys_getresgid16
-        .long sys_prctl
-        .long sys_rt_sigreturn
-        .long sys_rt_sigaction
-        .long sys_rt_sigprocmask        /* 175 */
-        .long sys_rt_sigpending
-        .long sys_rt_sigtimedwait
-        .long sys_rt_sigqueueinfo
-        .long sys_rt_sigsuspend
-        .long sys_pread64       /* 180 */
-        .long sys_pwrite64
-        .long sys_lchown16;
-        .long sys_getcwd
-        .long sys_capget
-        .long sys_capset        /* 185 */
-        .long sys_sigaltstack
-        .long sys_sendfile
-        .long sys_ni_syscall                            /* streams1 */
-        .long sys_ni_syscall                            /* streams2 */
-        .long sys_vfork         /* 190 */
-        .long sys_getrlimit
-        .long sys_mmap2
-        .long sys_truncate64
-        .long sys_ftruncate64
-        .long sys_stat64        /* 195 */
-        .long sys_lstat64
-        .long sys_fstat64
-        .long sys_chown
-        .long sys_getuid
-        .long sys_getgid        /* 200 */
-        .long sys_geteuid
-        .long sys_getegid
-        .long sys_setreuid
-        .long sys_setregid
-        .long sys_getgroups     /* 205 */
-        .long sys_setgroups
-        .long sys_fchown
-        .long sys_setresuid
-        .long sys_getresuid
-        .long sys_setresgid     /* 210 */
-        .long sys_getresgid
-        .long sys_lchown
-        .long sys_setuid
-        .long sys_setgid
-        .long sys_setfsuid      /* 215 */
-        .long sys_setfsgid
-        .long sys_pivot_root
-        .long sys_ni_syscall
-        .long sys_ni_syscall
-        .long sys_getdents64    /* 220 */
-        .long sys_gettid
-        .long sys_tkill
-        .long sys_setxattr
-        .long sys_lsetxattr
-        .long sys_fsetxattr     /* 225 */
-        .long sys_getxattr
-        .long sys_lgetxattr
-        .long sys_fgetxattr
-        .long sys_listxattr
-        .long sys_llistxattr    /* 230 */
-        .long sys_flistxattr
-        .long sys_removexattr
-        .long sys_lremovexattr
-        .long sys_fremovexattr
-        .long sys_futex         /* 235 */
-        .long sys_sendfile64
-        .long sys_mincore
-        .long sys_madvise
-        .long sys_fcntl64
-        .long sys_readahead     /* 240 */
-        .long sys_io_setup
-        .long sys_io_destroy
-        .long sys_io_getevents
-        .long sys_io_submit
-        .long sys_io_cancel     /* 245 */
-        .long sys_fadvise64
-        .long sys_exit_group
-        .long sys_lookup_dcookie
-        .long sys_epoll_create
-        .long sys_epoll_ctl     /* 250 */
-        .long sys_epoll_wait
-        .long sys_remap_file_pages
-        .long sys_set_tid_address
-        .long sys_timer_create
-        .long sys_timer_settime /* 255 */
-        .long sys_timer_gettime
-        .long sys_timer_getoverrun
-        .long sys_timer_delete
-        .long sys_clock_settime
-        .long sys_clock_gettime /* 260 */
-        .long sys_clock_getres
-        .long sys_clock_nanosleep
-        .long sys_statfs64
-        .long sys_fstatfs64
-        .long sys_tgkill        /* 265 */
-        .long sys_utimes
-        .long sys_fadvise64_64
-        .long sys_mbind
-        .long sys_get_mempolicy
-        .long sys_set_mempolicy /* 270 */
-        .long sys_mq_open
-        .long sys_mq_unlink
-        .long sys_mq_timedsend
-        .long sys_mq_timedreceive
-        .long sys_mq_notify     /* 275 */
-        .long sys_mq_getsetattr
-        .long sys_waitid
-        .long sys_ni_syscall    /* for sys_vserver */
-        .long sys_add_key
-        .long sys_request_key   /* 280 */
-        .long sys_keyctl
-        .long sys_ioprio_set
-        .long sys_ioprio_get
-        .long sys_inotify_init
-        .long sys_inotify_add_watch     /* 285 */
-        .long sys_inotify_rm_watch
-        .long sys_migrate_pages
-        .long sys_openat
-        .long sys_mkdirat
-        .long sys_mknodat               /* 290 */
-        .long sys_fchownat
-        .long sys_futimesat
-        .long sys_fstatat64
-        .long sys_unlinkat
-        .long sys_renameat              /* 295 */
-        .long sys_linkat
-        .long sys_symlinkat
-        .long sys_readlinkat
-        .long sys_fchmodat
-        .long sys_faccessat             /* 300 */
-        .long sys_ni_syscall            /* Reserved for pselect6 */
-        .long sys_ni_syscall            /* Reserved for ppoll */
-        .long sys_unshare
-        .long sys_set_robust_list
-        .long sys_get_robust_list       /* 305 */
-        .long sys_splice
-        .long sys_sync_file_range
-        .long sys_tee
-        .long sys_vmsplice
-        .long sys_move_pages            /* 310 */
-        .long sys_sched_setaffinity
-        .long sys_sched_getaffinity
-        .long sys_kexec_load
-        .long sys_getcpu
-        .long sys_epoll_pwait           /* 315 */
-        .long sys_utimensat
-        .long sys_signalfd
-        .long sys_timerfd_create
-        .long sys_eventfd
-        .long sys_fallocate             /* 320 */
-        .long sys_timerfd_settime
-        .long sys_timerfd_gettime
-        .long sys_signalfd4
-        .long sys_eventfd2
-        .long sys_epoll_create1         /* 325 */
-        .long sys_dup3
-        .long sys_pipe2
-        .long sys_inotify_init1
-        .long sys_preadv
-        .long sys_pwritev               /* 330 */
-        .long sys_rt_tgsigqueueinfo
-        .long sys_perf_event_open
-        .long sys_get_thread_area
-        .long sys_set_thread_area
-        .long sys_atomic_cmpxchg_32     /* 335 */
-        .long sys_atomic_barrier
-        .long sys_fanotify_init
-        .long sys_fanotify_mark
-        .long sys_prlimit64
-        .long sys_name_to_handle_at     /* 340 */
-        .long sys_open_by_handle_at
-        .long sys_clock_adjtime
-        .long sys_syncfs
-
diff --git a/arch/m68k/kernel/entry_no.S b/arch/m68k/kernel/entry_no.S
index 2783f25e38bd..5f0f6b598b5a 100644
--- a/arch/m68k/kernel/entry_no.S
+++ b/arch/m68k/kernel/entry_no.S
@@ -24,7 +24,6 @@
  * linux 2.4 support David McCullough <davidm@snapgear.com>
  */
 
-#include <linux/sys.h>
 #include <linux/linkage.h>
 #include <asm/errno.h>
 #include <asm/setup.h>
diff --git a/arch/m68k/kernel/irq.c b/arch/m68k/kernel/irq.c
index 15dbc3e9d20c..544b8717d499 100644
--- a/arch/m68k/kernel/irq.c
+++ b/arch/m68k/kernel/irq.c
@@ -28,31 +28,3 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
 
         set_irq_regs(oldregs);
 }
-
-int show_interrupts(struct seq_file *p, void *v)
-{
-        struct irqaction *ap;
-        int irq = *((loff_t *) v);
-
-        if (irq == 0)
-                seq_puts(p, "           CPU0\n");
-
-        if (irq < NR_IRQS) {
-                struct irq_desc *desc = irq_to_desc(irq);
-
-                ap = desc->action;
-                if (ap) {
-                        seq_printf(p, "%3d: ", irq);
-                        seq_printf(p, "%10u ", kstat_irqs(irq));
-                        seq_printf(p, "%14s  ", irq_desc_get_chip(desc)->name);
-
-                        seq_printf(p, "%s", ap->name);
-                        for (ap = ap->next; ap; ap = ap->next)
-                                seq_printf(p, ", %s", ap->name);
-                        seq_putc(p, '\n');
-                }
-        }
-
-        return 0;
-}
-
diff --git a/arch/m68k/kernel/m68k_ksyms.c b/arch/m68k/kernel/m68k_ksyms.c
index 4752c28ce0ac..33f82769547c 100644
--- a/arch/m68k/kernel/m68k_ksyms.c
+++ b/arch/m68k/kernel/m68k_ksyms.c
@@ -1,5 +1,33 @@
-#ifdef CONFIG_MMU
-#include "m68k_ksyms_mm.c"
-#else
-#include "m68k_ksyms_no.c"
+#include <linux/module.h>
+
+asmlinkage long long __ashldi3 (long long, int);
+asmlinkage long long __ashrdi3 (long long, int);
+asmlinkage long long __lshrdi3 (long long, int);
+asmlinkage long long __muldi3 (long long, long long);
+
+/* The following are special because they're not called
+   explicitly (the C compiler generates them).  Fortunately,
+   their interface isn't gonna change any time soon now, so
+   it's OK to leave it out of version control.  */
+EXPORT_SYMBOL(__ashldi3);
+EXPORT_SYMBOL(__ashrdi3);
+EXPORT_SYMBOL(__lshrdi3);
+EXPORT_SYMBOL(__muldi3);
+
+#if !defined(__mc68020__) && !defined(__mc68030__) && \
+    !defined(__mc68040__) && !defined(__mc68060__) && !defined(__mcpu32__)
+/*
+ * Simpler 68k and ColdFire parts also need a few other gcc functions.
+ */
+extern long long __divsi3(long long, long long);
+extern long long __modsi3(long long, long long);
+extern long long __mulsi3(long long, long long);
+extern long long __udivsi3(long long, long long);
+extern long long __umodsi3(long long, long long);
+
+EXPORT_SYMBOL(__divsi3);
+EXPORT_SYMBOL(__modsi3);
+EXPORT_SYMBOL(__mulsi3);
+EXPORT_SYMBOL(__udivsi3);
+EXPORT_SYMBOL(__umodsi3);
 #endif
diff --git a/arch/m68k/kernel/m68k_ksyms_mm.c b/arch/m68k/kernel/m68k_ksyms_mm.c
deleted file mode 100644
index d900e77e5363..000000000000
--- a/arch/m68k/kernel/m68k_ksyms_mm.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <linux/module.h>
-
-asmlinkage long long __ashldi3 (long long, int);
-asmlinkage long long __ashrdi3 (long long, int);
-asmlinkage long long __lshrdi3 (long long, int);
-asmlinkage long long __muldi3 (long long, long long);
-
-/* The following are special because they're not called
-   explicitly (the C compiler generates them).  Fortunately,
-   their interface isn't gonna change any time soon now, so
-   it's OK to leave it out of version control.  */
-EXPORT_SYMBOL(__ashldi3);
-EXPORT_SYMBOL(__ashrdi3);
-EXPORT_SYMBOL(__lshrdi3);
-EXPORT_SYMBOL(__muldi3);
-
diff --git a/arch/m68k/kernel/m68k_ksyms_no.c b/arch/m68k/kernel/m68k_ksyms_no.c
deleted file mode 100644
index 39fe0a7aec32..000000000000
--- a/arch/m68k/kernel/m68k_ksyms_no.c
+++ /dev/null
@@ -1,78 +0,0 @@
-#include <linux/module.h>
-#include <linux/linkage.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/user.h>
-#include <linux/elfcore.h>
-#include <linux/in6.h>
-#include <linux/interrupt.h>
-
-#include <asm/setup.h>
-#include <asm/machdep.h>
-#include <asm/pgalloc.h>
-#include <asm/irq.h>
-#include <asm/io.h>
-#include <asm/checksum.h>
-#include <asm/current.h>
-
-extern int dump_fpu(struct pt_regs *, elf_fpregset_t *);
-
-/* platform dependent support */
-
-EXPORT_SYMBOL(__ioremap);
-EXPORT_SYMBOL(iounmap);
-EXPORT_SYMBOL(dump_fpu);
-
-EXPORT_SYMBOL(ip_fast_csum);
-
-EXPORT_SYMBOL(kernel_thread);
-
-/* Networking helper routines. */
-EXPORT_SYMBOL(csum_partial_copy_nocheck);
-
-/* The following are special because they're not called
-   explicitly (the C compiler generates them).  Fortunately,
-   their interface isn't gonna change any time soon now, so
-   it's OK to leave it out of version control.  */
-EXPORT_SYMBOL(memcpy);
-EXPORT_SYMBOL(memset);
-
-/*
- * libgcc functions - functions that are used internally by the
- * compiler...  (prototypes are not correct though, but that
- * doesn't really matter since they're not versioned).
- */
-extern void __ashldi3(void);
-extern void __ashrdi3(void);
-extern void __divsi3(void);
-extern void __lshrdi3(void);
-extern void __modsi3(void);
-extern void __muldi3(void);
-extern void __mulsi3(void);
-extern void __udivsi3(void);
-extern void __umodsi3(void);
-
-        /* gcc lib functions */
-EXPORT_SYMBOL(__ashldi3);
-EXPORT_SYMBOL(__ashrdi3);
-EXPORT_SYMBOL(__divsi3);
-EXPORT_SYMBOL(__lshrdi3);
-EXPORT_SYMBOL(__modsi3);
-EXPORT_SYMBOL(__muldi3);
-EXPORT_SYMBOL(__mulsi3);
-EXPORT_SYMBOL(__udivsi3);
-EXPORT_SYMBOL(__umodsi3);
-
-#ifdef CONFIG_COLDFIRE
-extern unsigned int *dma_device_address;
-extern unsigned long dma_base_addr, _ramend;
-EXPORT_SYMBOL(dma_base_addr);
-EXPORT_SYMBOL(dma_device_address);
-EXPORT_SYMBOL(_ramend);
-
-extern asmlinkage void trap(void);
-extern void     *_ramvec;
-EXPORT_SYMBOL(trap);
-EXPORT_SYMBOL(_ramvec);
-#endif /* CONFIG_COLDFIRE */
diff --git a/arch/m68k/kernel/process_no.c b/arch/m68k/kernel/process_no.c
index e2a63af5d517..9b86ad11c68e 100644
--- a/arch/m68k/kernel/process_no.c
+++ b/arch/m68k/kernel/process_no.c
@@ -151,6 +151,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
         set_fs(fs);
         return retval;
 }
+EXPORT_SYMBOL(kernel_thread);
 
 void flush_thread(void)
 {
@@ -283,6 +284,7 @@ int dump_fpu(struct pt_regs *regs, struct user_m68kfp_struct *fpu)
 #endif
         return 1;
 }
+EXPORT_SYMBOL(dump_fpu);
 
 /*
  *      Generic dumping code. Used for panic and debug.
diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c
index 63013df33584..8623f8dc16f8 100644
--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
@@ -1,5 +1,580 @@
+/*
+ * linux/arch/m68k/kernel/sys_m68k.c
+ *
+ * This file contains various random system calls that
+ * have a non-standard calling sequence on the Linux/m68k
+ * platform.
+ */
+
+#include <linux/capability.h>
+#include <linux/errno.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <linux/fs.h>
+#include <linux/smp.h>
+#include <linux/sem.h>
+#include <linux/msg.h>
+#include <linux/shm.h>
+#include <linux/stat.h>
+#include <linux/syscalls.h>
+#include <linux/mman.h>
+#include <linux/file.h>
+#include <linux/ipc.h>
+
+#include <asm/setup.h>
+#include <asm/uaccess.h>
+#include <asm/cachectl.h>
+#include <asm/traps.h>
+#include <asm/page.h>
+#include <asm/unistd.h>
+#include <asm/cacheflush.h>
+
 #ifdef CONFIG_MMU
-#include "sys_m68k_mm.c"
+
+#include <asm/tlb.h>
+
+asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
+                             unsigned long error_code);
+
+asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
+        unsigned long prot, unsigned long flags,
+        unsigned long fd, unsigned long pgoff)
+{
+        /*
+         * This is wrong for sun3 - there PAGE_SIZE is 8Kb,
+         * so we need to shift the argument down by 1; m68k mmap64(3)
+         * (in libc) expects the last argument of mmap2 in 4Kb units.
+         */
+        return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
+}
+
+/* Convert virtual (user) address VADDR to physical address PADDR */
+#define virt_to_phys_040(vaddr)                                         \
+({                                                                      \
+  unsigned long _mmusr, _paddr;                                         \
+                                                                        \
+  __asm__ __volatile__ (".chip 68040\n\t"                               \
+                        "ptestr (%1)\n\t"                               \
+                        "movec %%mmusr,%0\n\t"                          \
+                        ".chip 68k"                                     \
+                        : "=r" (_mmusr)                                 \
+                        : "a" (vaddr));                                 \
+  _paddr = (_mmusr & MMU_R_040) ? (_mmusr & PAGE_MASK) : 0;             \
+  _paddr;                                                               \
+})
+
+static inline int
+cache_flush_040 (unsigned long addr, int scope, int cache, unsigned long len)
+{
+  unsigned long paddr, i;
+
+  switch (scope)
+    {
+    case FLUSH_SCOPE_ALL:
+      switch (cache)
+        {
+        case FLUSH_CACHE_DATA:
+          /* This nop is needed for some broken versions of the 68040.  */
+          __asm__ __volatile__ ("nop\n\t"
+                                ".chip 68040\n\t"
+                                "cpusha %dc\n\t"
+                                ".chip 68k");
+          break;
+        case FLUSH_CACHE_INSN:
+          __asm__ __volatile__ ("nop\n\t"
+                                ".chip 68040\n\t"
+                                "cpusha %ic\n\t"
+                                ".chip 68k");
+          break;
+        default:
+        case FLUSH_CACHE_BOTH:
+          __asm__ __volatile__ ("nop\n\t"
+                                ".chip 68040\n\t"
+                                "cpusha %bc\n\t"
+                                ".chip 68k");
+          break;
+        }
+      break;
+
+    case FLUSH_SCOPE_LINE:
+      /* Find the physical address of the first mapped page in the
+         address range.  */
+      if ((paddr = virt_to_phys_040(addr))) {
+        paddr += addr & ~(PAGE_MASK | 15);
+        len = (len + (addr & 15) + 15) >> 4;
+      } else {
+        unsigned long tmp = PAGE_SIZE - (addr & ~PAGE_MASK);
+
+        if (len <= tmp)
+          return 0;
+        addr += tmp;
+        len -= tmp;
+        tmp = PAGE_SIZE;
+        for (;;)
+          {
+            if ((paddr = virt_to_phys_040(addr)))
+              break;
+            if (len <= tmp)
+              return 0;
+            addr += tmp;
+            len -= tmp;
+          }
+        len = (len + 15) >> 4;
+      }
+      i = (PAGE_SIZE - (paddr & ~PAGE_MASK)) >> 4;
+      while (len--)
+        {
+          switch (cache)
+            {
+            case FLUSH_CACHE_DATA:
+              __asm__ __volatile__ ("nop\n\t"
+                                    ".chip 68040\n\t"
+                                    "cpushl %%dc,(%0)\n\t"
+                                    ".chip 68k"
+                                    : : "a" (paddr));
+              break;
+            case FLUSH_CACHE_INSN:
+              __asm__ __volatile__ ("nop\n\t"
+                                    ".chip 68040\n\t"
+                                    "cpushl %%ic,(%0)\n\t"
+                                    ".chip 68k"
+                                    : : "a" (paddr));
+              break;
+            default:
+            case FLUSH_CACHE_BOTH:
+              __asm__ __volatile__ ("nop\n\t"
+                                    ".chip 68040\n\t"
+                                    "cpushl %%bc,(%0)\n\t"
+                                    ".chip 68k"
+                                    : : "a" (paddr));
+              break;
+            }
+          if (!--i && len)
+            {
+              /*
+               * No need to page align here since it is done by
+               * virt_to_phys_040().
+               */
+              addr += PAGE_SIZE;
+              i = PAGE_SIZE / 16;
+              /* Recompute physical address when crossing a page
+                 boundary. */
+              for (;;)
+                {
+                  if ((paddr = virt_to_phys_040(addr)))
+                    break;
+                  if (len <= i)
+                    return 0;
+                  len -= i;
+                  addr += PAGE_SIZE;
+                }
+            }
+          else
+            paddr += 16;
+        }
+      break;
+
+    default:
+    case FLUSH_SCOPE_PAGE:
+      len += (addr & ~PAGE_MASK) + (PAGE_SIZE - 1);
+      for (len >>= PAGE_SHIFT; len--; addr += PAGE_SIZE)
+        {
+          if (!(paddr = virt_to_phys_040(addr)))
+            continue;
+          switch (cache)
+            {
+            case FLUSH_CACHE_DATA:
+              __asm__ __volatile__ ("nop\n\t"
+                                    ".chip 68040\n\t"
+                                    "cpushp %%dc,(%0)\n\t"
+                                    ".chip 68k"
+                                    : : "a" (paddr));
+              break;
+            case FLUSH_CACHE_INSN:
+              __asm__ __volatile__ ("nop\n\t"
+                                    ".chip 68040\n\t"
+                                    "cpushp %%ic,(%0)\n\t"
+                                    ".chip 68k"
+                                    : : "a" (paddr));
+              break;
+            default:
+            case FLUSH_CACHE_BOTH:
+              __asm__ __volatile__ ("nop\n\t"
+                                    ".chip 68040\n\t"
+                                    "cpushp %%bc,(%0)\n\t"
+                                    ".chip 68k"
+                                    : : "a" (paddr));
+              break;
+            }
+        }
+      break;
+    }
+  return 0;
+}
+
+#define virt_to_phys_060(vaddr)                         \
+({                                                      \
+  unsigned long paddr;                                  \
+  __asm__ __volatile__ (".chip 68060\n\t"               \
+                        "plpar (%0)\n\t"                \
+                        ".chip 68k"                     \
+                        : "=a" (paddr)                  \
+                        : "0" (vaddr));                 \
+  (paddr); /* XXX */                                    \
+})
+
+static inline int
+cache_flush_060 (unsigned long addr, int scope, int cache, unsigned long len)
+{
+  unsigned long paddr, i;
+
+  /*
+   * 68060 manual says:
+   *  cpush %dc : flush DC, remains valid (with our %cacr setup)
+   *  cpush %ic : invalidate IC
+   *  cpush %bc : flush DC + invalidate IC
+   */
+  switch (scope)
+    {
+    case FLUSH_SCOPE_ALL:
+      switch (cache)
+        {
+        case FLUSH_CACHE_DATA:
+          __asm__ __volatile__ (".chip 68060\n\t"
+                                "cpusha %dc\n\t"
+                                ".chip 68k");
+          break;
+        case FLUSH_CACHE_INSN:
+          __asm__ __volatile__ (".chip 68060\n\t"
+                                "cpusha %ic\n\t"
+                                ".chip 68k");
+          break;
+        default:
+        case FLUSH_CACHE_BOTH:
+          __asm__ __volatile__ (".chip 68060\n\t"
+                                "cpusha %bc\n\t"
+                                ".chip 68k");
+          break;
+        }
+      break;
+
+    case FLUSH_SCOPE_LINE:
+      /* Find the physical address of the first mapped page in the
+         address range.  */
+      len += addr & 15;
+      addr &= -16;
+      if (!(paddr = virt_to_phys_060(addr))) {
+        unsigned long tmp = PAGE_SIZE - (addr & ~PAGE_MASK);
+
+        if (len <= tmp)
+          return 0;
+        addr += tmp;
+        len -= tmp;
+        tmp = PAGE_SIZE;
+        for (;;)
+          {
+            if ((paddr = virt_to_phys_060(addr)))
+              break;
+            if (len <= tmp)
+              return 0;
+            addr += tmp;
+            len -= tmp;
+          }
+      }
+      len = (len + 15) >> 4;
+      i = (PAGE_SIZE - (paddr & ~PAGE_MASK)) >> 4;
+      while (len--)
+        {
+          switch (cache)
+            {
+            case FLUSH_CACHE_DATA:
+              __asm__ __volatile__ (".chip 68060\n\t"
+                                    "cpushl %%dc,(%0)\n\t"
+                                    ".chip 68k"
+                                    : : "a" (paddr));
+              break;
+            case FLUSH_CACHE_INSN:
+              __asm__ __volatile__ (".chip 68060\n\t"
+                                    "cpushl %%ic,(%0)\n\t"
+                                    ".chip 68k"
+                                    : : "a" (paddr));
+              break;
+            default:
+            case FLUSH_CACHE_BOTH:
+              __asm__ __volatile__ (".chip 68060\n\t"
+                                    "cpushl %%bc,(%0)\n\t"
+                                    ".chip 68k"
+                                    : : "a" (paddr));
+              break;
+            }
+          if (!--i && len)
+            {
+
+              /*
+               * We just want to jump to the first cache line
+               * in the next page.
+               */
+              addr += PAGE_SIZE;
+              addr &= PAGE_MASK;
+
+              i = PAGE_SIZE / 16;
+              /* Recompute physical address when crossing a page
+                 boundary. */
+              for (;;)
+                {
+                  if ((paddr = virt_to_phys_060(addr)))
+                    break;
+                  if (len <= i)
+                    return 0;
+                  len -= i;
+                  addr += PAGE_SIZE;
+                }
+            }
+          else
+            paddr += 16;
+        }
+      break;
+
+    default:
+    case FLUSH_SCOPE_PAGE:
+      len += (addr & ~PAGE_MASK) + (PAGE_SIZE - 1);
+      addr &= PAGE_MASK;        /* Workaround for bug in some
+                                   revisions of the 68060 */
+      for (len >>= PAGE_SHIFT; len--; addr += PAGE_SIZE)
+        {
+          if (!(paddr = virt_to_phys_060(addr)))
+            continue;
+          switch (cache)
+            {
+            case FLUSH_CACHE_DATA:
+              __asm__ __volatile__ (".chip 68060\n\t"
+                                    "cpushp %%dc,(%0)\n\t"
+                                    ".chip 68k"
+                                    : : "a" (paddr));
+              break;
+            case FLUSH_CACHE_INSN:
+              __asm__ __volatile__ (".chip 68060\n\t"
+                                    "cpushp %%ic,(%0)\n\t"
+                                    ".chip 68k"
+                                    : : "a" (paddr));
+              break;
+            default:
+            case FLUSH_CACHE_BOTH:
+              __asm__ __volatile__ (".chip 68060\n\t"
+                                    "cpushp %%bc,(%0)\n\t"
+                                    ".chip 68k"
+                                    : : "a" (paddr));
+              break;
+            }
+        }
+      break;
+    }
+  return 0;
+}
+
+/* sys_cacheflush -- flush (part of) the processor cache.  */
+asmlinkage int
+sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)
+{
+        struct vm_area_struct *vma;
+        int ret = -EINVAL;
+
+        if (scope < FLUSH_SCOPE_LINE || scope > FLUSH_SCOPE_ALL ||
+            cache & ~FLUSH_CACHE_BOTH)
+                goto out;
+
+        if (scope == FLUSH_SCOPE_ALL) {
+                /* Only the superuser may explicitly flush the whole cache. */
+                ret = -EPERM;
+                if (!capable(CAP_SYS_ADMIN))
+                        goto out;
+        } else {
+                /*
+                 * Verify that the specified address region actually belongs
+                 * to this process.
+                 */
+                vma = find_vma (current->mm, addr);
+                ret = -EINVAL;
+                /* Check for overflow.  */
+                if (addr + len < addr)
+                        goto out;
+                if (vma == NULL || addr < vma->vm_start || addr + len > vma->vm_end)
+                        goto out;
+        }
+
+        if (CPU_IS_020_OR_030) {
+                if (scope == FLUSH_SCOPE_LINE && len < 256) {
+                        unsigned long cacr;
+                        __asm__ ("movec %%cacr, %0" : "=r" (cacr));
+                        if (cache & FLUSH_CACHE_INSN)
+                                cacr |= 4;
+                        if (cache & FLUSH_CACHE_DATA)
+                                cacr |= 0x400;
+                        len >>= 2;
+                        while (len--) {
+                                __asm__ __volatile__ ("movec %1, %%caar\n\t"
+                                                      "movec %0, %%cacr"
+                                                      : /* no outputs */
+                                                      : "r" (cacr), "r" (addr));
+                                addr += 4;
+                        }
+                } else {
+                        /* Flush the whole cache, even if page granularity requested. */
+                        unsigned long cacr;
+                        __asm__ ("movec %%cacr, %0" : "=r" (cacr));
+                        if (cache & FLUSH_CACHE_INSN)
+                                cacr |= 8;
+                        if (cache & FLUSH_CACHE_DATA)
+                                cacr |= 0x800;
+                        __asm__ __volatile__ ("movec %0, %%cacr" : : "r" (cacr));
+                }
+                ret = 0;
+                goto out;
+        } else {
+            /*
+             * 040 or 060: don't blindly trust 'scope', someone could
+             * try to flush a few megs of memory.
+             */
+
+            if (len>=3*PAGE_SIZE && scope<FLUSH_SCOPE_PAGE)
+                scope=FLUSH_SCOPE_PAGE;
+            if (len>=10*PAGE_SIZE && scope<FLUSH_SCOPE_ALL)
+                scope=FLUSH_SCOPE_ALL;
+            if (CPU_IS_040) {
+                ret = cache_flush_040 (addr, scope, cache, len);
+            } else if (CPU_IS_060) {
+                ret = cache_flush_060 (addr, scope, cache, len);
+            }
+        }
+out:
+        return ret;
+}
+
+/* This syscall gets its arguments in A0 (mem), D2 (oldval) and
+   D1 (newval).  */
+asmlinkage int
+sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5,
+                      unsigned long __user * mem)
+{
+        /* This was borrowed from ARM's implementation.  */
+        for (;;) {
+                struct mm_struct *mm = current->mm;
+                pgd_t *pgd;
+                pmd_t *pmd;
+                pte_t *pte;
+                spinlock_t *ptl;
+                unsigned long mem_value;
+
+                down_read(&mm->mmap_sem);
+                pgd = pgd_offset(mm, (unsigned long)mem);
+                if (!pgd_present(*pgd))
+                        goto bad_access;
+                pmd = pmd_offset(pgd, (unsigned long)mem);
+                if (!pmd_present(*pmd))
+                        goto bad_access;
+                pte = pte_offset_map_lock(mm, pmd, (unsigned long)mem, &ptl);
+                if (!pte_present(*pte) || !pte_dirty(*pte)
+                    || !pte_write(*pte)) {
+                        pte_unmap_unlock(pte, ptl);
+                        goto bad_access;
+                }
+
+                mem_value = *mem;
+                if (mem_value == oldval)
+                        *mem = newval;
+
+                pte_unmap_unlock(pte, ptl);
+                up_read(&mm->mmap_sem);
+                return mem_value;
+
+              bad_access:
+                up_read(&mm->mmap_sem);
+                /* This is not necessarily a bad access, we can get here if
+                   a memory we're trying to write to should be copied-on-write.
+                   Make the kernel do the necessary page stuff, then re-iterate.
+                   Simulate a write access fault to do that.  */
+                {
+                        /* The first argument of the function corresponds to
+                           D1, which is the first field of struct pt_regs.  */
+                        struct pt_regs *fp = (struct pt_regs *)&newval;
+
+                        /* '3' is an RMW flag.  */
+                        if (do_page_fault(fp, (unsigned long)mem, 3))
+                                /* If the do_page_fault() failed, we don't
+                                   have anything meaningful to return.
+                                   There should be a SIGSEGV pending for
+                                   the process.  */
+                                return 0xdeadbeef;
+                }
+        }
+}
+
 #else
-#include "sys_m68k_no.c"
-#endif
+
+/* sys_cacheflush -- flush (part of) the processor cache.  */
+asmlinkage int
+sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)
+{
+        flush_cache_all();
+        return 0;
+}
+
+/* This syscall gets its arguments in A0 (mem), D2 (oldval) and
+   D1 (newval).  */
+asmlinkage int
+sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5,
+                      unsigned long __user * mem)
+{
+        struct mm_struct *mm = current->mm;
+        unsigned long mem_value;
+
+        down_read(&mm->mmap_sem);
+
+        mem_value = *mem;
+        if (mem_value == oldval)
+                *mem = newval;
+
+        up_read(&mm->mmap_sem);
+        return mem_value;
+}
+
+#endif /* CONFIG_MMU */
+
+asmlinkage int sys_getpagesize(void)
+{
+        return PAGE_SIZE;
+}
+
+/*
+ * Do a system call from kernel instead of calling sys_execve so we
+ * end up with proper pt_regs.
+ */
+int kernel_execve(const char *filename,
+                  const char *const argv[],
+                  const char *const envp[])
+{
+        register long __res asm ("%d0") = __NR_execve;
+        register long __a asm ("%d1") = (long)(filename);
+        register long __b asm ("%d2") = (long)(argv);
+        register long __c asm ("%d3") = (long)(envp);
+        asm volatile ("trap  #0" : "+d" (__res)
+                        : "d" (__a), "d" (__b), "d" (__c));
+        return __res;
+}
+
+asmlinkage unsigned long sys_get_thread_area(void)
+{
+        return current_thread_info()->tp_value;
+}
+
+asmlinkage int sys_set_thread_area(unsigned long tp)
+{
+        current_thread_info()->tp_value = tp;
+        return 0;
+}
+
+asmlinkage int sys_atomic_barrier(void)
+{
+        /* no code needed for uniprocs */
+        return 0;
+}
diff --git a/arch/m68k/kernel/sys_m68k_mm.c b/arch/m68k/kernel/sys_m68k_mm.c
deleted file mode 100644
index 3db2e7f902aa..000000000000
--- a/arch/m68k/kernel/sys_m68k_mm.c
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * linux/arch/m68k/kernel/sys_m68k.c
- *
- * This file contains various random system calls that
- * have a non-standard calling sequence on the Linux/m68k
- * platform.
- */
-
-#include <linux/capability.h>
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/fs.h>
-#include <linux/smp.h>
-#include <linux/sem.h>
-#include <linux/msg.h>
-#include <linux/shm.h>
-#include <linux/stat.h>
-#include <linux/syscalls.h>
-#include <linux/mman.h>
-#include <linux/file.h>
-#include <linux/ipc.h>
-
-#include <asm/setup.h>
-#include <asm/uaccess.h>
-#include <asm/cachectl.h>
-#include <asm/traps.h>
-#include <asm/page.h>
-#include <asm/unistd.h>
-#include <linux/elf.h>
-#include <asm/tlb.h>
-
-asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address,
-                             unsigned long error_code);
-
-asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
-        unsigned long prot, unsigned long flags,
-        unsigned long fd, unsigned long pgoff)
-{
-        /*
-         * This is wrong for sun3 - there PAGE_SIZE is 8Kb,
-         * so we need to shift the argument down by 1; m68k mmap64(3)
-         * (in libc) expects the last argument of mmap2 in 4Kb units.
-         */
-        return sys_mmap_pgoff(addr, len, prot, flags, fd, pgoff);
-}
-
-/* Convert virtual (user) address VADDR to physical address PADDR */
-#define virt_to_phys_040(vaddr)                                         \
-({                                                                      \
-  unsigned long _mmusr, _paddr;                                         \
-                                                                        \
-  __asm__ __volatile__ (".chip 68040\n\t"                               \
-                        "ptestr (%1)\n\t"                               \
-                        "movec %%mmusr,%0\n\t"                          \
-                        ".chip 68k"                                     \
-                        : "=r" (_mmusr)                                 \
-                        : "a" (vaddr));                                 \
-  _paddr = (_mmusr & MMU_R_040) ? (_mmusr & PAGE_MASK) : 0;             \
-  _paddr;                                                               \
-})
-
-static inline int
-cache_flush_040 (unsigned long addr, int scope, int cache, unsigned long len)
-{
-  unsigned long paddr, i;
-
-  switch (scope)
-    {
-    case FLUSH_SCOPE_ALL:
-      switch (cache)
-        {
-        case FLUSH_CACHE_DATA:
-          /* This nop is needed for some broken versions of the 68040.  */
-          __asm__ __volatile__ ("nop\n\t"
-                                ".chip 68040\n\t"
-                                "cpusha %dc\n\t"
-                                ".chip 68k");
-          break;
-        case FLUSH_CACHE_INSN:
-          __asm__ __volatile__ ("nop\n\t"
-                                ".chip 68040\n\t"
-                                "cpusha %ic\n\t"
-                                ".chip 68k");
-          break;
-        default:
-        case FLUSH_CACHE_BOTH:
-          __asm__ __volatile__ ("nop\n\t"
-                                ".chip 68040\n\t"
-                                "cpusha %bc\n\t"
-                                ".chip 68k");
-          break;
-        }
-      break;
-
-    case FLUSH_SCOPE_LINE:
-      /* Find the physical address of the first mapped page in the
-         address range.  */
-      if ((paddr = virt_to_phys_040(addr))) {
-        paddr += addr & ~(PAGE_MASK | 15);
-        len = (len + (addr & 15) + 15) >> 4;
-      } else {
-        unsigned long tmp = PAGE_SIZE - (addr & ~PAGE_MASK);
-
-        if (len <= tmp)
-          return 0;
-        addr += tmp;
-        len -= tmp;
-        tmp = PAGE_SIZE;
-        for (;;)
-          {
-            if ((paddr = virt_to_phys_040(addr)))
-              break;
-            if (len <= tmp)
-              return 0;
-            addr += tmp;
-            len -= tmp;
-          }
-        len = (len + 15) >> 4;
-      }
-      i = (PAGE_SIZE - (paddr & ~PAGE_MASK)) >> 4;
-      while (len--)
-        {
-          switch (cache)
-            {
-            case FLUSH_CACHE_DATA:
-              __asm__ __volatile__ ("nop\n\t"
-                                    ".chip 68040\n\t"
-                                    "cpushl %%dc,(%0)\n\t"
-                                    ".chip 68k"
-                                    : : "a" (paddr));
-              break;
-            case FLUSH_CACHE_INSN:
-              __asm__ __volatile__ ("nop\n\t"
-                                    ".chip 68040\n\t"
-                                    "cpushl %%ic,(%0)\n\t"
-                                    ".chip 68k"
-                                    : : "a" (paddr));
-              break;
-            default:
-            case FLUSH_CACHE_BOTH:
-              __asm__ __volatile__ ("nop\n\t"
-                                    ".chip 68040\n\t"
-                                    "cpushl %%bc,(%0)\n\t"
-                                    ".chip 68k"
-                                    : : "a" (paddr));
-              break;
-            }
-          if (!--i && len)
-            {
-              /*
-               * No need to page align here since it is done by
-               * virt_to_phys_040().
-               */
-              addr += PAGE_SIZE;
-              i = PAGE_SIZE / 16;
-              /* Recompute physical address when crossing a page
-                 boundary. */
-              for (;;)
-                {
-                  if ((paddr = virt_to_phys_040(addr)))
-                    break;
-                  if (len <= i)
-                    return 0;
-                  len -= i;
-                  addr += PAGE_SIZE;
-                }
-            }
-          else
-            paddr += 16;
-        }
-      break;
-
-    default:
-    case FLUSH_SCOPE_PAGE:
-      len += (addr & ~PAGE_MASK) + (PAGE_SIZE - 1);
-      for (len >>= PAGE_SHIFT; len--; addr += PAGE_SIZE)
-        {
-          if (!(paddr = virt_to_phys_040(addr)))
-            continue;
-          switch (cache)
-            {
-            case FLUSH_CACHE_DATA:
-              __asm__ __volatile__ ("nop\n\t"
-                                    ".chip 68040\n\t"
-                                    "cpushp %%dc,(%0)\n\t"
-                                    ".chip 68k"
-                                    : : "a" (paddr));
-              break;
-            case FLUSH_CACHE_INSN:
-              __asm__ __volatile__ ("nop\n\t"
-                                    ".chip 68040\n\t"
-                                    "cpushp %%ic,(%0)\n\t"
-                                    ".chip 68k"
-                                    : : "a" (paddr));
-              break;
-            default:
-            case FLUSH_CACHE_BOTH:
-              __asm__ __volatile__ ("nop\n\t"
-                                    ".chip 68040\n\t"
-                                    "cpushp %%bc,(%0)\n\t"
-                                    ".chip 68k"
-                                    : : "a" (paddr));
-              break;
-            }
-        }
-      break;
-    }
-  return 0;
-}
-
-#define virt_to_phys_060(vaddr)                         \
-({                                                      \
-  unsigned long paddr;                                  \
-  __asm__ __volatile__ (".chip 68060\n\t"               \
-                        "plpar (%0)\n\t"                \
-                        ".chip 68k"                     \
-                        : "=a" (paddr)                  \
-                        : "0" (vaddr));                 \
-  (paddr); /* XXX */                                    \
-})
-
-static inline int
-cache_flush_060 (unsigned long addr, int scope, int cache, unsigned long len)
-{
-  unsigned long paddr, i;
-
-  /*
-   * 68060 manual says:
-   *  cpush %dc : flush DC, remains valid (with our %cacr setup)
-   *  cpush %ic : invalidate IC
-   *  cpush %bc : flush DC + invalidate IC
-   */
-  switch (scope)
-    {
-    case FLUSH_SCOPE_ALL:
-      switch (cache)
-        {
-        case FLUSH_CACHE_DATA:
-          __asm__ __volatile__ (".chip 68060\n\t"
-                                "cpusha %dc\n\t"
-                                ".chip 68k");
-          break;
-        case FLUSH_CACHE_INSN:
-          __asm__ __volatile__ (".chip 68060\n\t"
-                                "cpusha %ic\n\t"
-                                ".chip 68k");
-          break;
-        default:
-        case FLUSH_CACHE_BOTH:
-          __asm__ __volatile__ (".chip 68060\n\t"
-                                "cpusha %bc\n\t"
-                                ".chip 68k");
-          break;
-        }
-      break;
-
-    case FLUSH_SCOPE_LINE:
-      /* Find the physical address of the first mapped page in the
-         address range.  */
-      len += addr & 15;
-      addr &= -16;
-      if (!(paddr = virt_to_phys_060(addr))) {
-        unsigned long tmp = PAGE_SIZE - (addr & ~PAGE_MASK);
-
-        if (len <= tmp)
-          return 0;
-        addr += tmp;
-        len -= tmp;
-        tmp = PAGE_SIZE;
-        for (;;)
-          {
-            if ((paddr = virt_to_phys_060(addr)))
-              break;
-            if (len <= tmp)
-              return 0;
-            addr += tmp;
-            len -= tmp;
-          }
-      }
-      len = (len + 15) >> 4;
-      i = (PAGE_SIZE - (paddr & ~PAGE_MASK)) >> 4;
-      while (len--)
-        {
-          switch (cache)
-            {
-            case FLUSH_CACHE_DATA:
-              __asm__ __volatile__ (".chip 68060\n\t"
-                                    "cpushl %%dc,(%0)\n\t"
-                                    ".chip 68k"
-                                    : : "a" (paddr));
-              break;
-            case FLUSH_CACHE_INSN:
-              __asm__ __volatile__ (".chip 68060\n\t"
-                                    "cpushl %%ic,(%0)\n\t"
-                                    ".chip 68k"
-                                    : : "a" (paddr));
-              break;
-            default:
-            case FLUSH_CACHE_BOTH:
-              __asm__ __volatile__ (".chip 68060\n\t"
-                                    "cpushl %%bc,(%0)\n\t"
-                                    ".chip 68k"
-                                    : : "a" (paddr));
-              break;
-            }
-          if (!--i && len)
-            {
-
-              /*
-               * We just want to jump to the first cache line
-               * in the next page.
-               */
-              addr += PAGE_SIZE;
-              addr &= PAGE_MASK;
-
-              i = PAGE_SIZE / 16;
-              /* Recompute physical address when crossing a page
-                 boundary. */
-              for (;;)
-                {
-                  if ((paddr = virt_to_phys_060(addr)))
-                    break;
-                  if (len <= i)
-                    return 0;
-                  len -= i;
-                  addr += PAGE_SIZE;
-                }
-            }
-          else
-            paddr += 16;
-        }
-      break;
-
-    default:
-    case FLUSH_SCOPE_PAGE:
-      len += (addr & ~PAGE_MASK) + (PAGE_SIZE - 1);
-      addr &= PAGE_MASK;        /* Workaround for bug in some
-                                   revisions of the 68060 */
-      for (len >>= PAGE_SHIFT; len--; addr += PAGE_SIZE)
-        {
-          if (!(paddr = virt_to_phys_060(addr)))
-            continue;
-          switch (cache)
-            {
-            case FLUSH_CACHE_DATA:
-              __asm__ __volatile__ (".chip 68060\n\t"
-                                    "cpushp %%dc,(%0)\n\t"
-                                    ".chip 68k"
-                                    : : "a" (paddr));
-              break;
-            case FLUSH_CACHE_INSN:
-              __asm__ __volatile__ (".chip 68060\n\t"
-                                    "cpushp %%ic,(%0)\n\t"
-                                    ".chip 68k"
-                                    : : "a" (paddr));
-              break;
-            default:
-            case FLUSH_CACHE_BOTH:
-              __asm__ __volatile__ (".chip 68060\n\t"
-                                    "cpushp %%bc,(%0)\n\t"
-                                    ".chip 68k"
-                                    : : "a" (paddr));
-              break;
-            }
-        }
-      break;
-    }
-  return 0;
-}
-
-/* sys_cacheflush -- flush (part of) the processor cache.  */
-asmlinkage int
-sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)
-{
-        struct vm_area_struct *vma;
-        int ret = -EINVAL;
-
-        if (scope < FLUSH_SCOPE_LINE || scope > FLUSH_SCOPE_ALL ||
-            cache & ~FLUSH_CACHE_BOTH)
-                goto out;
-
-        if (scope == FLUSH_SCOPE_ALL) {
-                /* Only the superuser may explicitly flush the whole cache. */
-                ret = -EPERM;
-                if (!capable(CAP_SYS_ADMIN))
-                        goto out;
-        } else {
-                /*
-                 * Verify that the specified address region actually belongs
-                 * to this process.
-                 */
-                vma = find_vma (current->mm, addr);
-                ret = -EINVAL;
-                /* Check for overflow.  */
-                if (addr + len < addr)
-                        goto out;
-                if (vma == NULL || addr < vma->vm_start || addr + len > vma->vm_end)
-                        goto out;
-        }
-
-        if (CPU_IS_020_OR_030) {
-                if (scope == FLUSH_SCOPE_LINE && len < 256) {
-                        unsigned long cacr;
-                        __asm__ ("movec %%cacr, %0" : "=r" (cacr));
-                        if (cache & FLUSH_CACHE_INSN)
-                                cacr |= 4;
-                        if (cache & FLUSH_CACHE_DATA)
-                                cacr |= 0x400;
-                        len >>= 2;
-                        while (len--) {
-                                __asm__ __volatile__ ("movec %1, %%caar\n\t"
-                                                      "movec %0, %%cacr"
-                                                      : /* no outputs */
-                                                      : "r" (cacr), "r" (addr));
-                                addr += 4;
-                        }
-                } else {
-                        /* Flush the whole cache, even if page granularity requested. */
-                        unsigned long cacr;
-                        __asm__ ("movec %%cacr, %0" : "=r" (cacr));
-                        if (cache & FLUSH_CACHE_INSN)
-                                cacr |= 8;
-                        if (cache & FLUSH_CACHE_DATA)
-                                cacr |= 0x800;
-                        __asm__ __volatile__ ("movec %0, %%cacr" : : "r" (cacr));
-                }
-                ret = 0;
-                goto out;
-        } else {
-            /*
-             * 040 or 060: don't blindly trust 'scope', someone could
-             * try to flush a few megs of memory.
-             */
-
-            if (len>=3*PAGE_SIZE && scope<FLUSH_SCOPE_PAGE)
-                scope=FLUSH_SCOPE_PAGE;
-            if (len>=10*PAGE_SIZE && scope<FLUSH_SCOPE_ALL)
-                scope=FLUSH_SCOPE_ALL;
-            if (CPU_IS_040) {
-                ret = cache_flush_040 (addr, scope, cache, len);
-            } else if (CPU_IS_060) {
-                ret = cache_flush_060 (addr, scope, cache, len);
-            }
-        }
-out:
-        return ret;
-}
-
-asmlinkage int sys_getpagesize(void)
-{
-        return PAGE_SIZE;
-}
-
-/*
- * Do a system call from kernel instead of calling sys_execve so we
- * end up with proper pt_regs.
- */
-int kernel_execve(const char *filename,
-                  const char *const argv[],
-                  const char *const envp[])
-{
-        register long __res asm ("%d0") = __NR_execve;
-        register long __a asm ("%d1") = (long)(filename);
-        register long __b asm ("%d2") = (long)(argv);
-        register long __c asm ("%d3") = (long)(envp);
-        asm volatile ("trap  #0" : "+d" (__res)
-                        : "d" (__a), "d" (__b), "d" (__c));
-        return __res;
-}
-
-asmlinkage unsigned long sys_get_thread_area(void)
-{
-        return current_thread_info()->tp_value;
-}
-
-asmlinkage int sys_set_thread_area(unsigned long tp)
-{
-        current_thread_info()->tp_value = tp;
-        return 0;
-}
-
-/* This syscall gets its arguments in A0 (mem), D2 (oldval) and
-   D1 (newval).  */
-asmlinkage int
-sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5,
-                      unsigned long __user * mem)
-{
-        /* This was borrowed from ARM's implementation.  */
-        for (;;) {
-                struct mm_struct *mm = current->mm;
-                pgd_t *pgd;
-                pmd_t *pmd;
-                pte_t *pte;
-                spinlock_t *ptl;
-                unsigned long mem_value;
-
-                down_read(&mm->mmap_sem);
-                pgd = pgd_offset(mm, (unsigned long)mem);
-                if (!pgd_present(*pgd))
-                        goto bad_access;
-                pmd = pmd_offset(pgd, (unsigned long)mem);
-                if (!pmd_present(*pmd))
-                        goto bad_access;
-                pte = pte_offset_map_lock(mm, pmd, (unsigned long)mem, &ptl);
-                if (!pte_present(*pte) || !pte_dirty(*pte)
-                    || !pte_write(*pte)) {
-                        pte_unmap_unlock(pte, ptl);
-                        goto bad_access;
-                }
-
-                mem_value = *mem;
-                if (mem_value == oldval)
-                        *mem = newval;
-
-                pte_unmap_unlock(pte, ptl);
-                up_read(&mm->mmap_sem);
-                return mem_value;
-
-              bad_access:
-                up_read(&mm->mmap_sem);
-                /* This is not necessarily a bad access, we can get here if
-                   a memory we're trying to write to should be copied-on-write.
-                   Make the kernel do the necessary page stuff, then re-iterate.
-                   Simulate a write access fault to do that.  */
-                {
-                        /* The first argument of the function corresponds to
-                           D1, which is the first field of struct pt_regs.  */
-                        struct pt_regs *fp = (struct pt_regs *)&newval;
-
-                        /* '3' is an RMW flag.  */
-                        if (do_page_fault(fp, (unsigned long)mem, 3))
-                                /* If the do_page_fault() failed, we don't
-                                   have anything meaningful to return.
-                                   There should be a SIGSEGV pending for
-                                   the process.  */
-                                return 0xdeadbeef;
-                }
-        }
-}
-
-asmlinkage int sys_atomic_barrier(void)
-{
-        /* no code needed for uniprocs */
-        return 0;
-}
diff --git a/arch/m68k/kernel/sys_m68k_no.c b/arch/m68k/kernel/sys_m68k_no.c
deleted file mode 100644
index 68488ae47f0a..000000000000
--- a/arch/m68k/kernel/sys_m68k_no.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * linux/arch/m68knommu/kernel/sys_m68k.c
- *
- * This file contains various random system calls that
- * have a non-standard calling sequence on the Linux/m68k
- * platform.
- */
-
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/sem.h>
-#include <linux/msg.h>
-#include <linux/shm.h>
-#include <linux/stat.h>
-#include <linux/syscalls.h>
-#include <linux/mman.h>
-#include <linux/file.h>
-#include <linux/ipc.h>
-#include <linux/fs.h>
-
-#include <asm/setup.h>
-#include <asm/uaccess.h>
-#include <asm/cachectl.h>
-#include <asm/traps.h>
-#include <asm/cacheflush.h>
-#include <asm/unistd.h>
-
-/* sys_cacheflush -- flush (part of) the processor cache.  */
-asmlinkage int
-sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)
-{
-        flush_cache_all();
-        return(0);
-}
-
-asmlinkage int sys_getpagesize(void)
-{
-        return PAGE_SIZE;
-}
-
-/*
- * Do a system call from kernel instead of calling sys_execve so we
- * end up with proper pt_regs.
- */
-int kernel_execve(const char *filename,
-                  const char *const argv[],
-                  const char *const envp[])
-{
-        register long __res asm ("%d0") = __NR_execve;
-        register long __a asm ("%d1") = (long)(filename);
-        register long __b asm ("%d2") = (long)(argv);
-        register long __c asm ("%d3") = (long)(envp);
-        asm volatile ("trap  #0" : "+d" (__res)
-                        : "d" (__a), "d" (__b), "d" (__c));
-        return __res;
-}
-
-asmlinkage unsigned long sys_get_thread_area(void)
-{
-        return current_thread_info()->tp_value;
-}
-
-asmlinkage int sys_set_thread_area(unsigned long tp)
-{
-        current_thread_info()->tp_value = tp;
-        return 0;
-}
-
-/* This syscall gets its arguments in A0 (mem), D2 (oldval) and
-   D1 (newval).  */
-asmlinkage int
-sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5,
-                      unsigned long __user * mem)
-{
-        struct mm_struct *mm = current->mm;
-        unsigned long mem_value;
-
-        down_read(&mm->mmap_sem);
-
-        mem_value = *mem;
-        if (mem_value == oldval)
-                *mem = newval;
-
-        up_read(&mm->mmap_sem);
-        return mem_value;
-}
-
-asmlinkage int sys_atomic_barrier(void)
-{
-        /* no code needed for uniprocs */
-        return 0;
-}
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S
index 9b8393d8adb8..6f7b09122a00 100644
--- a/arch/m68k/kernel/syscalltable.S
+++ b/arch/m68k/kernel/syscalltable.S
@@ -1,6 +1,4 @@
 /*
- *  linux/arch/m68knommu/kernel/syscalltable.S
- *
  *  Copyright (C) 2002, Greg Ungerer (gerg@snapgear.com)
  *
  *  Based on older entry.S files, the following copyrights apply:
@@ -9,171 +7,175 @@
  *                      Kenneth Albanowski <kjahds@kjahds.com>,
  *  Copyright (C) 2000  Lineo Inc. (www.lineo.com) 
  *  Copyright (C) 1991, 1992  Linus Torvalds
+ *
+ *  Linux/m68k support by Hamish Macdonald
  */
 
-#include <linux/sys.h>
 #include <linux/linkage.h>
-#include <asm/unistd.h>
 
-.text
+#ifndef CONFIG_MMU
+#define sys_mmap2               sys_mmap_pgoff
+#endif
+
+.section .rodata
 ALIGN
 ENTRY(sys_call_table)
-        .long sys_restart_syscall       /* 0  -  old "setup()" system call */
+        .long sys_restart_syscall       /* 0 - old "setup()" system call, used for restarting */
         .long sys_exit
         .long sys_fork
         .long sys_read
         .long sys_write
-        .long sys_open          /* 5 */
+        .long sys_open                  /* 5 */
         .long sys_close
         .long sys_waitpid
         .long sys_creat
         .long sys_link
-        .long sys_unlink        /* 10 */
+        .long sys_unlink                /* 10 */
         .long sys_execve
         .long sys_chdir
         .long sys_time
         .long sys_mknod
-        .long sys_chmod         /* 15 */
+        .long sys_chmod                 /* 15 */
         .long sys_chown16
-        .long sys_ni_syscall    /* old break syscall holder */
+        .long sys_ni_syscall            /* old break syscall holder */
         .long sys_stat
         .long sys_lseek
-        .long sys_getpid        /* 20 */
+        .long sys_getpid                /* 20 */
         .long sys_mount
         .long sys_oldumount
         .long sys_setuid16
         .long sys_getuid16
-        .long sys_stime         /* 25 */
+        .long sys_stime                 /* 25 */
         .long sys_ptrace
         .long sys_alarm
         .long sys_fstat
         .long sys_pause
-        .long sys_utime         /* 30 */
-        .long sys_ni_syscall    /* old stty syscall holder */
-        .long sys_ni_syscall    /* old gtty syscall holder */
+        .long sys_utime                 /* 30 */
+        .long sys_ni_syscall            /* old stty syscall holder */
+        .long sys_ni_syscall            /* old gtty syscall holder */
         .long sys_access
         .long sys_nice
-        .long sys_ni_syscall    /* 35 */ /* old ftime syscall holder */
+        .long sys_ni_syscall            /* 35 - old ftime syscall holder */
         .long sys_sync
         .long sys_kill
         .long sys_rename
         .long sys_mkdir
-        .long sys_rmdir         /* 40 */
+        .long sys_rmdir                 /* 40 */
         .long sys_dup
         .long sys_pipe
         .long sys_times
-        .long sys_ni_syscall    /* old prof syscall holder */
-        .long sys_brk           /* 45 */
+        .long sys_ni_syscall            /* old prof syscall holder */
+        .long sys_brk                   /* 45 */
         .long sys_setgid16
         .long sys_getgid16
         .long sys_signal
         .long sys_geteuid16
-        .long sys_getegid16     /* 50 */
+        .long sys_getegid16             /* 50 */
         .long sys_acct
-        .long sys_umount        /* recycled never used phys() */
-        .long sys_ni_syscall    /* old lock syscall holder */
+        .long sys_umount                /* recycled never used phys() */
+        .long sys_ni_syscall            /* old lock syscall holder */
         .long sys_ioctl
-        .long sys_fcntl         /* 55 */
-        .long sys_ni_syscall    /* old mpx syscall holder */
+        .long sys_fcntl                 /* 55 */
+        .long sys_ni_syscall            /* old mpx syscall holder */
         .long sys_setpgid
-        .long sys_ni_syscall    /* old ulimit syscall holder */
+        .long sys_ni_syscall            /* old ulimit syscall holder */
         .long sys_ni_syscall
-        .long sys_umask         /* 60 */
+        .long sys_umask                 /* 60 */
         .long sys_chroot
         .long sys_ustat
         .long sys_dup2
         .long sys_getppid
-        .long sys_getpgrp       /* 65 */
+        .long sys_getpgrp               /* 65 */
         .long sys_setsid
         .long sys_sigaction
         .long sys_sgetmask
         .long sys_ssetmask
-        .long sys_setreuid16    /* 70 */
+        .long sys_setreuid16            /* 70 */
         .long sys_setregid16
         .long sys_sigsuspend
         .long sys_sigpending
         .long sys_sethostname
-        .long sys_setrlimit     /* 75 */
+        .long sys_setrlimit             /* 75 */
         .long sys_old_getrlimit
         .long sys_getrusage
         .long sys_gettimeofday
         .long sys_settimeofday
-        .long sys_getgroups16   /* 80 */
+        .long sys_getgroups16           /* 80 */
         .long sys_setgroups16
         .long sys_old_select
         .long sys_symlink
         .long sys_lstat
-        .long sys_readlink      /* 85 */
+        .long sys_readlink              /* 85 */
         .long sys_uselib
-        .long sys_ni_syscall    /* sys_swapon */
+        .long sys_swapon
         .long sys_reboot
         .long sys_old_readdir
-        .long sys_old_mmap      /* 90 */
+        .long sys_old_mmap              /* 90 */
         .long sys_munmap
         .long sys_truncate
         .long sys_ftruncate
         .long sys_fchmod
-        .long sys_fchown16      /* 95 */
+        .long sys_fchown16              /* 95 */
         .long sys_getpriority
         .long sys_setpriority
-        .long sys_ni_syscall    /* old profil syscall holder */
+        .long sys_ni_syscall            /* old profil syscall holder */
         .long sys_statfs
-        .long sys_fstatfs       /* 100 */
-        .long sys_ni_syscall    /* ioperm for i386 */
+        .long sys_fstatfs               /* 100 */
+        .long sys_ni_syscall            /* ioperm for i386 */
         .long sys_socketcall
         .long sys_syslog
         .long sys_setitimer
-        .long sys_getitimer     /* 105 */
+        .long sys_getitimer             /* 105 */
         .long sys_newstat
         .long sys_newlstat
         .long sys_newfstat
         .long sys_ni_syscall
-        .long sys_ni_syscall    /* iopl for i386 */ /* 110 */
+        .long sys_ni_syscall            /* 110 - iopl for i386 */
         .long sys_vhangup
-        .long sys_ni_syscall    /* obsolete idle() syscall */
-        .long sys_ni_syscall    /* vm86old for i386 */
+        .long sys_ni_syscall            /* obsolete idle() syscall */
+        .long sys_ni_syscall            /* vm86old for i386 */
         .long sys_wait4
-        .long sys_ni_syscall    /* 115 */ /* sys_swapoff */
+        .long sys_swapoff               /* 115 */
         .long sys_sysinfo
         .long sys_ipc
         .long sys_fsync
         .long sys_sigreturn
-        .long sys_clone         /* 120 */
+        .long sys_clone                 /* 120 */
         .long sys_setdomainname
         .long sys_newuname
-        .long sys_cacheflush    /* modify_ldt for i386 */
+        .long sys_cacheflush            /* modify_ldt for i386 */
         .long sys_adjtimex
-        .long sys_ni_syscall    /* 125 */ /* sys_mprotect */
+        .long sys_mprotect              /* 125 */
         .long sys_sigprocmask
-        .long sys_ni_syscall    /* old "creat_module" */
+        .long sys_ni_syscall            /* old "create_module" */
         .long sys_init_module
         .long sys_delete_module
-        .long sys_ni_syscall    /* 130: old "get_kernel_syms" */
+        .long sys_ni_syscall            /* 130 - old "get_kernel_syms" */
         .long sys_quotactl
         .long sys_getpgid
         .long sys_fchdir
         .long sys_bdflush
-        .long sys_sysfs         /* 135 */
+        .long sys_sysfs                 /* 135 */
         .long sys_personality
-        .long sys_ni_syscall    /* for afs_syscall */
+        .long sys_ni_syscall            /* for afs_syscall */
         .long sys_setfsuid16
         .long sys_setfsgid16
-        .long sys_llseek        /* 140 */
+        .long sys_llseek                /* 140 */
         .long sys_getdents
         .long sys_select
         .long sys_flock
-        .long sys_ni_syscall    /* sys_msync */
-        .long sys_readv         /* 145 */
+        .long sys_msync
+        .long sys_readv                 /* 145 */
         .long sys_writev
         .long sys_getsid
         .long sys_fdatasync
         .long sys_sysctl
-        .long sys_ni_syscall    /* 150 */ /* sys_mlock */
-        .long sys_ni_syscall    /* sys_munlock */
-        .long sys_ni_syscall    /* sys_mlockall */
-        .long sys_ni_syscall    /* sys_munlockall */
+        .long sys_mlock                 /* 150 */
+        .long sys_munlock
+        .long sys_mlockall
+        .long sys_munlockall
         .long sys_sched_setparam
-        .long sys_sched_getparam /* 155 */
+        .long sys_sched_getparam        /* 155 */
         .long sys_sched_setscheduler
         .long sys_sched_getscheduler
         .long sys_sched_yield
@@ -181,124 +183,124 @@ ENTRY(sys_call_table)
         .long sys_sched_get_priority_min  /* 160 */
         .long sys_sched_rr_get_interval
         .long sys_nanosleep
-        .long sys_ni_syscall    /* sys_mremap */
+        .long sys_mremap
         .long sys_setresuid16
-        .long sys_getresuid16   /* 165 */
-        .long sys_getpagesize   /* sys_getpagesize */
-        .long sys_ni_syscall    /* old "query_module" */
+        .long sys_getresuid16           /* 165 */
+        .long sys_getpagesize
+        .long sys_ni_syscall            /* old "query_module" */
         .long sys_poll
-        .long sys_ni_syscall    /* sys_nfsservctl */
-        .long sys_setresgid16   /* 170 */
+        .long sys_nfsservctl
+        .long sys_setresgid16           /* 170 */
         .long sys_getresgid16
         .long sys_prctl
         .long sys_rt_sigreturn
         .long sys_rt_sigaction
-        .long sys_rt_sigprocmask /* 175 */
+        .long sys_rt_sigprocmask        /* 175 */
         .long sys_rt_sigpending
         .long sys_rt_sigtimedwait
         .long sys_rt_sigqueueinfo
         .long sys_rt_sigsuspend
-        .long sys_pread64       /* 180 */
+        .long sys_pread64               /* 180 */
         .long sys_pwrite64
         .long sys_lchown16
         .long sys_getcwd
         .long sys_capget
-        .long sys_capset        /* 185 */
+        .long sys_capset                /* 185 */
         .long sys_sigaltstack
         .long sys_sendfile
-        .long sys_ni_syscall    /* streams1 */
-        .long sys_ni_syscall    /* streams2 */
-        .long sys_vfork         /* 190 */
+        .long sys_ni_syscall            /* streams1 */
+        .long sys_ni_syscall            /* streams2 */
+        .long sys_vfork                 /* 190 */
         .long sys_getrlimit
-        .long sys_mmap_pgoff
+        .long sys_mmap2
         .long sys_truncate64
         .long sys_ftruncate64
-        .long sys_stat64        /* 195 */
+        .long sys_stat64                /* 195 */
         .long sys_lstat64
         .long sys_fstat64
         .long sys_chown
         .long sys_getuid
-        .long sys_getgid        /* 200 */
+        .long sys_getgid                /* 200 */
         .long sys_geteuid
         .long sys_getegid
         .long sys_setreuid
         .long sys_setregid
-        .long sys_getgroups     /* 205 */
+        .long sys_getgroups             /* 205 */
         .long sys_setgroups
         .long sys_fchown
         .long sys_setresuid
         .long sys_getresuid
-        .long sys_setresgid     /* 210 */
+        .long sys_setresgid             /* 210 */
         .long sys_getresgid
         .long sys_lchown
         .long sys_setuid
         .long sys_setgid
-        .long sys_setfsuid      /* 215 */
+        .long sys_setfsuid              /* 215 */
         .long sys_setfsgid
         .long sys_pivot_root
         .long sys_ni_syscall
         .long sys_ni_syscall
-        .long sys_getdents64    /* 220 */
+        .long sys_getdents64            /* 220 */
         .long sys_gettid
         .long sys_tkill
         .long sys_setxattr
         .long sys_lsetxattr
-        .long sys_fsetxattr     /* 225 */
+        .long sys_fsetxattr             /* 225 */
         .long sys_getxattr
         .long sys_lgetxattr
         .long sys_fgetxattr
         .long sys_listxattr
-        .long sys_llistxattr    /* 230 */
+        .long sys_llistxattr            /* 230 */
         .long sys_flistxattr
         .long sys_removexattr
         .long sys_lremovexattr
         .long sys_fremovexattr
-        .long sys_futex         /* 235 */
+        .long sys_futex                 /* 235 */
         .long sys_sendfile64
-        .long sys_ni_syscall    /* sys_mincore */
-        .long sys_ni_syscall    /* sys_madvise */
+        .long sys_mincore
+        .long sys_madvise
         .long sys_fcntl64
-        .long sys_readahead     /* 240 */
+        .long sys_readahead             /* 240 */
         .long sys_io_setup
         .long sys_io_destroy
         .long sys_io_getevents
         .long sys_io_submit
-        .long sys_io_cancel     /* 245 */
+        .long sys_io_cancel             /* 245 */
         .long sys_fadvise64
         .long sys_exit_group
         .long sys_lookup_dcookie
         .long sys_epoll_create
-        .long sys_epoll_ctl     /* 250 */
+        .long sys_epoll_ctl             /* 250 */
         .long sys_epoll_wait
-        .long sys_ni_syscall    /* sys_remap_file_pages */
+        .long sys_remap_file_pages
         .long sys_set_tid_address
         .long sys_timer_create
-        .long sys_timer_settime /* 255 */
+        .long sys_timer_settime         /* 255 */
         .long sys_timer_gettime
         .long sys_timer_getoverrun
         .long sys_timer_delete
         .long sys_clock_settime
-        .long sys_clock_gettime /* 260 */
+        .long sys_clock_gettime         /* 260 */
         .long sys_clock_getres
         .long sys_clock_nanosleep
         .long sys_statfs64
         .long sys_fstatfs64
-        .long sys_tgkill        /* 265 */
+        .long sys_tgkill                /* 265 */
         .long sys_utimes
         .long sys_fadvise64_64
-        .long sys_mbind 
+        .long sys_mbind
         .long sys_get_mempolicy
-        .long sys_set_mempolicy /* 270 */
+        .long sys_set_mempolicy         /* 270 */
         .long sys_mq_open
         .long sys_mq_unlink
         .long sys_mq_timedsend
         .long sys_mq_timedreceive
-        .long sys_mq_notify     /* 275 */
+        .long sys_mq_notify             /* 275 */
         .long sys_mq_getsetattr
         .long sys_waitid
-        .long sys_ni_syscall    /* for sys_vserver */
+        .long sys_ni_syscall            /* for sys_vserver */
         .long sys_add_key
-        .long sys_request_key   /* 280 */
+        .long sys_request_key           /* 280 */
         .long sys_keyctl
         .long sys_ioprio_set
         .long sys_ioprio_get
@@ -319,8 +321,8 @@ ENTRY(sys_call_table)
         .long sys_readlinkat
         .long sys_fchmodat
         .long sys_faccessat             /* 300 */
-        .long sys_ni_syscall            /* Reserved for pselect6 */
-        .long sys_ni_syscall            /* Reserved for ppoll */
+        .long sys_pselect6
+        .long sys_ppoll
         .long sys_unshare
         .long sys_set_robust_list
         .long sys_get_robust_list       /* 305 */
@@ -363,7 +365,3 @@ ENTRY(sys_call_table)
         .long sys_clock_adjtime
         .long sys_syncfs
 
-        .rept NR_syscalls-(.-sys_call_table)/4
-                .long sys_ni_syscall
-        .endr
-
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds
index 878be5f38cad..d0993594f558 100644
--- a/arch/m68k/kernel/vmlinux-std.lds
+++ b/arch/m68k/kernel/vmlinux-std.lds
@@ -25,6 +25,8 @@ SECTIONS
 
   EXCEPTION_TABLE(16)
 
+  _sdata = .;                   /* Start of data section */
+
   RODATA
 
   RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE)
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds
index 1ad6b7ad2c17..8080469ee6c1 100644
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@@ -25,6 +25,7 @@ SECTIONS
   _etext = .;                   /* End of text section */
 
   EXCEPTION_TABLE(16) :data
+  _sdata = .;                   /* Start of rw data section */
   RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE) :data
   /* End of data goes *here* so that freeing init code works properly. */
   _edata = .;
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
index 1f95881d8437..df421e501436 100644
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
@@ -1,5 +1,14 @@
+
+#
+# Makefile for m68k-specific library files..
+#
+
+lib-y   := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
+           memcpy.o memset.o memmove.o
+
 ifdef CONFIG_MMU
-include arch/m68k/lib/Makefile_mm
+lib-y   += string.o uaccess.o checksum_mm.o
 else
-include arch/m68k/lib/Makefile_no
+lib-y   += mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o delay.o checksum_no.o
 endif
+
diff --git a/arch/m68k/lib/Makefile_mm b/arch/m68k/lib/Makefile_mm
deleted file mode 100644
index af9abf8d9d98..000000000000
--- a/arch/m68k/lib/Makefile_mm
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for m68k-specific library files..
-#
-
-lib-y   := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
-           checksum.o string.o uaccess.o
diff --git a/arch/m68k/lib/Makefile_no b/arch/m68k/lib/Makefile_no
deleted file mode 100644
index 32d852e586d7..000000000000
--- a/arch/m68k/lib/Makefile_no
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Makefile for m68knommu specific library files..
-#
-
-lib-y   := ashldi3.o ashrdi3.o lshrdi3.o \
-           muldi3.o mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o \
-           checksum.o memcpy.o memmove.o memset.o delay.o
diff --git a/arch/m68k/lib/checksum.c b/arch/m68k/lib/checksum.c
deleted file mode 100644
index 1297536060de..000000000000
--- a/arch/m68k/lib/checksum.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef CONFIG_MMU
-#include "checksum_mm.c"
-#else
-#include "checksum_no.c"
-#endif
diff --git a/arch/m68k/lib/checksum_no.c b/arch/m68k/lib/checksum_no.c
index eccf25d3d73e..e4c6354da765 100644
--- a/arch/m68k/lib/checksum_no.c
+++ b/arch/m68k/lib/checksum_no.c
@@ -101,6 +101,7 @@ __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 {
         return (__force __sum16)~do_csum(iph,ihl*4);
 }
+EXPORT_SYMBOL(ip_fast_csum);
 #endif
 
 /*
@@ -140,6 +141,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
         memcpy(dst, (__force const void *)src, len);
         return csum_partial(dst, len, sum);
 }
+EXPORT_SYMBOL(csum_partial_copy_from_user);
 
 /*
  * copy from ds while checksumming, otherwise like csum_partial
@@ -151,3 +153,4 @@ csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
         memcpy(dst, src, len);
         return csum_partial(dst, len, sum);
 }
+EXPORT_SYMBOL(csum_partial_copy_nocheck);
diff --git a/arch/m68k/lib/memcpy.c b/arch/m68k/lib/memcpy.c
index b50dbcad4746..62182c81e91c 100644
--- a/arch/m68k/lib/memcpy.c
+++ b/arch/m68k/lib/memcpy.c
@@ -1,62 +1,80 @@
+/*
+ * 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/module.h>
+#include <linux/string.h>
 
-void * memcpy(void * to, const void * from, size_t n)
+void *memcpy(void *to, const void *from, size_t n)
 {
-#ifdef CONFIG_COLDFIRE
-  void *xto = to;
-  size_t temp;
+        void *xto = to;
+        size_t temp, temp1;
 
-  if (!n)
-    return xto;
-  if ((long) to & 1)
-    {
-      char *cto = to;
-      const char *cfrom = from;
-      *cto++ = *cfrom++;
-      to = cto;
-      from = cfrom;
-      n--;
-    }
-  if (n > 2 && (long) to & 2)
-    {
-      short *sto = to;
-      const short *sfrom = from;
-      *sto++ = *sfrom++;
-      to = sto;
-      from = sfrom;
-      n -= 2;
-    }
-  temp = n >> 2;
-  if (temp)
-    {
-      long *lto = to;
-      const long *lfrom = from;
-      for (; temp; temp--)
-        *lto++ = *lfrom++;
-      to = lto;
-      from = lfrom;
-    }
-  if (n & 2)
-    {
-      short *sto = to;
-      const short *sfrom = from;
-      *sto++ = *sfrom++;
-      to = sto;
-      from = sfrom;
-    }
-  if (n & 1)
-    {
-      char *cto = to;
-      const char *cfrom = from;
-      *cto = *cfrom;
-    }
-  return xto;
+        if (!n)
+                return xto;
+        if ((long)to & 1) {
+                char *cto = to;
+                const char *cfrom = from;
+                *cto++ = *cfrom++;
+                to = cto;
+                from = cfrom;
+                n--;
+        }
+        if (n > 2 && (long)to & 2) {
+                short *sto = to;
+                const short *sfrom = from;
+                *sto++ = *sfrom++;
+                to = sto;
+                from = sfrom;
+                n -= 2;
+        }
+        temp = n >> 2;
+        if (temp) {
+                long *lto = to;
+                const long *lfrom = from;
+#if defined(__mc68020__) || defined(__mc68030__) || \
+    defined(__mc68040__) || defined(__mc68060__) || defined(__mcpu32__)
+                asm volatile (
+                        "       movel %2,%3\n"
+                        "       andw  #7,%3\n"
+                        "       lsrl  #3,%2\n"
+                        "       negw  %3\n"
+                        "       jmp   %%pc@(1f,%3:w:2)\n"
+                        "4:     movel %0@+,%1@+\n"
+                        "       movel %0@+,%1@+\n"
+                        "       movel %0@+,%1@+\n"
+                        "       movel %0@+,%1@+\n"
+                        "       movel %0@+,%1@+\n"
+                        "       movel %0@+,%1@+\n"
+                        "       movel %0@+,%1@+\n"
+                        "       movel %0@+,%1@+\n"
+                        "1:     dbra  %2,4b\n"
+                        "       clrw  %2\n"
+                        "       subql #1,%2\n"
+                        "       jpl   4b"
+                        : "=a" (lfrom), "=a" (lto), "=d" (temp), "=&d" (temp1)
+                        : "0" (lfrom), "1" (lto), "2" (temp));
 #else
-  const char *c_from = from;
-  char *c_to = to;
-  while (n-- > 0)
-    *c_to++ = *c_from++;
-  return((void *) to);
+                for (; temp; temp--)
+                        *lto++ = *lfrom++;
 #endif
+                to = lto;
+                from = lfrom;
+        }
+        if (n & 2) {
+                short *sto = to;
+                const short *sfrom = from;
+                *sto++ = *sfrom++;
+                to = sto;
+                from = sfrom;
+        }
+        if (n & 1) {
+                char *cto = to;
+                const char *cfrom = from;
+                *cto = *cfrom;
+        }
+        return xto;
 }
+EXPORT_SYMBOL(memcpy);
diff --git a/arch/m68k/lib/memmove.c b/arch/m68k/lib/memmove.c
index b3dcfe9dab7e..6519f7f349f6 100644
--- a/arch/m68k/lib/memmove.c
+++ b/arch/m68k/lib/memmove.c
@@ -4,8 +4,6 @@
  * for more details.
  */
 
-#define __IN_STRING_C
-
 #include <linux/module.h>
 #include <linux/string.h>
 
diff --git a/arch/m68k/lib/memset.c b/arch/m68k/lib/memset.c
index 1389bf455633..f649e6a2e644 100644
--- a/arch/m68k/lib/memset.c
+++ b/arch/m68k/lib/memset.c
@@ -1,47 +1,75 @@
-#include <linux/types.h>
+/*
+ * 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.
+ */
 
-void * memset(void * s, int c, size_t count)
+#include <linux/module.h>
+#include <linux/string.h>
+
+void *memset(void *s, int c, size_t count)
 {
-  void *xs = s;
-  size_t temp;
+        void *xs = s;
+        size_t temp;
 
-  if (!count)
-    return xs;
-  c &= 0xff;
-  c |= c << 8;
-  c |= c << 16;
-  if ((long) s & 1)
-    {
-      char *cs = s;
-      *cs++ = c;
-      s = cs;
-      count--;
-    }
-  if (count > 2 && (long) s & 2)
-    {
-      short *ss = s;
-      *ss++ = c;
-      s = ss;
-      count -= 2;
-    }
-  temp = count >> 2;
-  if (temp)
-    {
-      long *ls = s;
-      for (; temp; temp--)
-        *ls++ = c;
-      s = ls;
-    }
-  if (count & 2)
-    {
-      short *ss = s;
-      *ss++ = c;
-      s = ss;
-    }
-  if (count & 1)
-    {
-      char *cs = s;
-      *cs = c;
-    }
-  return xs;
+        if (!count)
+                return xs;
+        c &= 0xff;
+        c |= c << 8;
+        c |= c << 16;
+        if ((long)s & 1) {
+                char *cs = s;
+                *cs++ = c;
+                s = cs;
+                count--;
+        }
+        if (count > 2 && (long)s & 2) {
+                short *ss = s;
+                *ss++ = c;
+                s = ss;
+                count -= 2;
+        }
+        temp = count >> 2;
+        if (temp) {
+                long *ls = s;
+#if defined(__mc68020__) || defined(__mc68030__) || \
+    defined(__mc68040__) || defined(__mc68060__) || defined(__mcpu32__)
+                size_t temp1;
+                asm volatile (
+                        "       movel %1,%2\n"
+                        "       andw  #7,%2\n"
+                        "       lsrl  #3,%1\n"
+                        "       negw  %2\n"
+                        "       jmp   %%pc@(2f,%2:w:2)\n"
+                        "1:     movel %3,%0@+\n"
+                        "       movel %3,%0@+\n"
+                        "       movel %3,%0@+\n"
+                        "       movel %3,%0@+\n"
+                        "       movel %3,%0@+\n"
+                        "       movel %3,%0@+\n"
+                        "       movel %3,%0@+\n"
+                        "       movel %3,%0@+\n"
+                        "2:     dbra  %1,1b\n"
+                        "       clrw  %1\n"
+                        "       subql #1,%1\n"
+                        "       jpl   1b"
+                        : "=a" (ls), "=d" (temp), "=&d" (temp1)
+                        : "d" (c), "0" (ls), "1" (temp));
+#else
+                for (; temp; temp--)
+                        *ls++ = c;
+#endif
+                s = ls;
+        }
+        if (count & 2) {
+                short *ss = s;
+                *ss++ = c;
+                s = ss;
+        }
+        if (count & 1) {
+                char *cs = s;
+                *cs = c;
+        }
+        return xs;
 }
+EXPORT_SYMBOL(memset);
diff --git a/arch/m68k/lib/muldi3.c b/arch/m68k/lib/muldi3.c
index 16e0eb338ee0..079bafca073e 100644
--- a/arch/m68k/lib/muldi3.c
+++ b/arch/m68k/lib/muldi3.c
@@ -1,5 +1,98 @@
-#ifdef CONFIG_MMU
-#include "muldi3_mm.c"
+/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and 
+                           gcc-2.7.2.3/longlong.h which is: */
+/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+
+This file is part of GNU CC.
+
+GNU CC 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.
+
+GNU CC 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 GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#if defined(__mc68020__) || defined(__mc68030__) || \
+    defined(__mc68040__) || defined(__mc68060__) || defined(__mcpu32__)
+
+#define umul_ppmm(w1, w0, u, v) \
+  __asm__ ("mulu%.l %3,%1:%0"                                           \
+           : "=d" ((USItype)(w0)),                                      \
+             "=d" ((USItype)(w1))                                       \
+           : "%0" ((USItype)(u)),                                       \
+             "dmi" ((USItype)(v)))
+
 #else
-#include "muldi3_no.c"
+
+#define SI_TYPE_SIZE 32
+#define __BITS4 (SI_TYPE_SIZE / 4)
+#define __ll_B (1L << (SI_TYPE_SIZE / 2))
+#define __ll_lowpart(t) ((USItype) (t) % __ll_B)
+#define __ll_highpart(t) ((USItype) (t) / __ll_B)
+
+#define umul_ppmm(w1, w0, u, v)                                         \
+  do {                                                                  \
+    USItype __x0, __x1, __x2, __x3;                                     \
+    USItype __ul, __vl, __uh, __vh;                                     \
+                                                                        \
+    __ul = __ll_lowpart (u);                                            \
+    __uh = __ll_highpart (u);                                           \
+    __vl = __ll_lowpart (v);                                            \
+    __vh = __ll_highpart (v);                                           \
+                                                                        \
+    __x0 = (USItype) __ul * __vl;                                       \
+    __x1 = (USItype) __ul * __vh;                                       \
+    __x2 = (USItype) __uh * __vl;                                       \
+    __x3 = (USItype) __uh * __vh;                                       \
+                                                                        \
+    __x1 += __ll_highpart (__x0);/* this can't give carry */            \
+    __x1 += __x2;               /* but this indeed can */               \
+    if (__x1 < __x2)            /* did we get it? */                    \
+      __x3 += __ll_B;           /* yes, add it in the proper pos. */    \
+                                                                        \
+    (w1) = __x3 + __ll_highpart (__x1);                                 \
+    (w0) = __ll_lowpart (__x1) * __ll_B + __ll_lowpart (__x0);          \
+  } while (0)
+
 #endif
+
+#define __umulsidi3(u, v) \
+  ({DIunion __w;                                                        \
+    umul_ppmm (__w.s.high, __w.s.low, u, v);                            \
+    __w.ll; })
+
+typedef          int SItype     __attribute__ ((mode (SI)));
+typedef unsigned int USItype    __attribute__ ((mode (SI)));
+typedef          int DItype     __attribute__ ((mode (DI)));
+typedef int word_type __attribute__ ((mode (__word__)));
+
+struct DIstruct {SItype high, low;};
+
+typedef union
+{
+  struct DIstruct s;
+  DItype ll;
+} DIunion;
+
+DItype
+__muldi3 (DItype u, DItype v)
+{
+  DIunion w;
+  DIunion uu, vv;
+
+  uu.ll = u,
+  vv.ll = v;
+
+  w.ll = __umulsidi3 (uu.s.low, vv.s.low);
+  w.s.high += ((USItype) uu.s.low * (USItype) vv.s.high
+               + (USItype) uu.s.high * (USItype) vv.s.low);
+
+  return w.ll;
+}
diff --git a/arch/m68k/lib/muldi3_mm.c b/arch/m68k/lib/muldi3_mm.c
deleted file mode 100644
index be4f275649e3..000000000000
--- a/arch/m68k/lib/muldi3_mm.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and
-                           gcc-2.7.2.3/longlong.h which is: */
-/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC 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.
-
-GNU CC 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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#define BITS_PER_UNIT 8
-
-#define umul_ppmm(w1, w0, u, v) \
-  __asm__ ("mulu%.l %3,%1:%0"                                           \
-           : "=d" ((USItype)(w0)),                                      \
-             "=d" ((USItype)(w1))                                       \
-           : "%0" ((USItype)(u)),                                       \
-             "dmi" ((USItype)(v)))
-
-#define __umulsidi3(u, v) \
-  ({DIunion __w;                                                        \
-    umul_ppmm (__w.s.high, __w.s.low, u, v);                            \
-    __w.ll; })
-
-typedef          int SItype     __attribute__ ((mode (SI)));
-typedef unsigned int USItype    __attribute__ ((mode (SI)));
-typedef          int DItype     __attribute__ ((mode (DI)));
-typedef int word_type __attribute__ ((mode (__word__)));
-
-struct DIstruct {SItype high, low;};
-
-typedef union
-{
-  struct DIstruct s;
-  DItype ll;
-} DIunion;
-
-DItype
-__muldi3 (DItype u, DItype v)
-{
-  DIunion w;
-  DIunion uu, vv;
-
-  uu.ll = u,
-  vv.ll = v;
-
-  w.ll = __umulsidi3 (uu.s.low, vv.s.low);
-  w.s.high += ((USItype) uu.s.low * (USItype) vv.s.high
-               + (USItype) uu.s.high * (USItype) vv.s.low);
-
-  return w.ll;
-}
diff --git a/arch/m68k/lib/muldi3_no.c b/arch/m68k/lib/muldi3_no.c
deleted file mode 100644
index 34af72c30303..000000000000
--- a/arch/m68k/lib/muldi3_no.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and 
-                           gcc-2.7.2.3/longlong.h which is: */
-/* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC 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.
-
-GNU CC 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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#define BITS_PER_UNIT 8
-#define SI_TYPE_SIZE 32
-
-#define __BITS4 (SI_TYPE_SIZE / 4)
-#define __ll_B (1L << (SI_TYPE_SIZE / 2))
-#define __ll_lowpart(t) ((USItype) (t) % __ll_B)
-#define __ll_highpart(t) ((USItype) (t) / __ll_B)
-
-#define umul_ppmm(w1, w0, u, v)                                         \
-  do {                                                                  \
-    USItype __x0, __x1, __x2, __x3;                                     \
-    USItype __ul, __vl, __uh, __vh;                                     \
-                                                                        \
-    __ul = __ll_lowpart (u);                                            \
-    __uh = __ll_highpart (u);                                           \
-    __vl = __ll_lowpart (v);                                            \
-    __vh = __ll_highpart (v);                                           \
-                                                                        \
-    __x0 = (USItype) __ul * __vl;                                       \
-    __x1 = (USItype) __ul * __vh;                                       \
-    __x2 = (USItype) __uh * __vl;                                       \
-    __x3 = (USItype) __uh * __vh;                                       \
-                                                                        \
-    __x1 += __ll_highpart (__x0);/* this can't give carry */            \
-    __x1 += __x2;               /* but this indeed can */               \
-    if (__x1 < __x2)            /* did we get it? */                    \
-      __x3 += __ll_B;           /* yes, add it in the proper pos. */    \
-                                                                        \
-    (w1) = __x3 + __ll_highpart (__x1);                                 \
-    (w0) = __ll_lowpart (__x1) * __ll_B + __ll_lowpart (__x0);          \
-  } while (0)
-
-#define __umulsidi3(u, v) \
-  ({DIunion __w;                                                        \
-    umul_ppmm (__w.s.high, __w.s.low, u, v);                            \
-    __w.ll; })
-
-typedef          int SItype     __attribute__ ((mode (SI)));
-typedef unsigned int USItype    __attribute__ ((mode (SI)));
-typedef          int DItype     __attribute__ ((mode (DI)));
-typedef int word_type __attribute__ ((mode (__word__)));
-
-struct DIstruct {SItype high, low;};
-
-typedef union
-{
-  struct DIstruct s;
-  DItype ll;
-} DIunion;
-
-DItype
-__muldi3 (DItype u, DItype v)
-{
-  DIunion w;
-  DIunion uu, vv;
-
-  uu.ll = u,
-  vv.ll = v;
-
-  w.ll = __umulsidi3 (uu.s.low, vv.s.low);
-  w.s.high += ((USItype) uu.s.low * (USItype) vv.s.high
-               + (USItype) uu.s.high * (USItype) vv.s.low);
-
-  return w.ll;
-}
diff --git a/arch/m68k/lib/string.c b/arch/m68k/lib/string.c
index d399c5f25636..b9a57abfad08 100644
--- a/arch/m68k/lib/string.c
+++ b/arch/m68k/lib/string.c
@@ -20,226 +20,3 @@ char *strcat(char *dest, const char *src)
         return __kernel_strcpy(dest + __kernel_strlen(dest), src);
 }
 EXPORT_SYMBOL(strcat);
-
-void *memset(void *s, int c, size_t count)
-{
-        void *xs = s;
-        size_t temp, temp1;
-
-        if (!count)
-                return xs;
-        c &= 0xff;
-        c |= c << 8;
-        c |= c << 16;
-        if ((long)s & 1) {
-                char *cs = s;
-                *cs++ = c;
-                s = cs;
-                count--;
-        }
-        if (count > 2 && (long)s & 2) {
-                short *ss = s;
-                *ss++ = c;
-                s = ss;
-                count -= 2;
-        }
-        temp = count >> 2;
-        if (temp) {
-                long *ls = s;
-
-                asm volatile (
-                        "       movel %1,%2\n"
-                        "       andw  #7,%2\n"
-                        "       lsrl  #3,%1\n"
-                        "       negw  %2\n"
-                        "       jmp   %%pc@(2f,%2:w:2)\n"
-                        "1:     movel %3,%0@+\n"
-                        "       movel %3,%0@+\n"
-                        "       movel %3,%0@+\n"
-                        "       movel %3,%0@+\n"
-                        "       movel %3,%0@+\n"
-                        "       movel %3,%0@+\n"
-                        "       movel %3,%0@+\n"
-                        "       movel %3,%0@+\n"
-                        "2:     dbra  %1,1b\n"
-                        "       clrw  %1\n"
-                        "       subql #1,%1\n"
-                        "       jpl   1b"
-                        : "=a" (ls), "=d" (temp), "=&d" (temp1)
-                        : "d" (c), "0" (ls), "1" (temp));
-                s = ls;
-        }
-        if (count & 2) {
-                short *ss = s;
-                *ss++ = c;
-                s = ss;
-        }
-        if (count & 1) {
-                char *cs = s;
-                *cs = c;
-        }
-        return xs;
-}
-EXPORT_SYMBOL(memset);
-
-void *memcpy(void *to, const void *from, size_t n)
-{
-        void *xto = to;
-        size_t temp, temp1;
-
-        if (!n)
-                return xto;
-        if ((long)to & 1) {
-                char *cto = to;
-                const char *cfrom = from;
-                *cto++ = *cfrom++;
-                to = cto;
-                from = cfrom;
-                n--;
-        }
-        if (n > 2 && (long)to & 2) {
-                short *sto = to;
-                const short *sfrom = from;
-                *sto++ = *sfrom++;
-                to = sto;
-                from = sfrom;
-                n -= 2;
-        }
-        temp = n >> 2;
-        if (temp) {
-                long *lto = to;
-                const long *lfrom = from;
-
-                asm volatile (
-                        "       movel %2,%3\n"
-                        "       andw  #7,%3\n"
-                        "       lsrl  #3,%2\n"
-                        "       negw  %3\n"
-                        "       jmp   %%pc@(1f,%3:w:2)\n"
-                        "4:     movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "       movel %0@+,%1@+\n"
-                        "1:     dbra  %2,4b\n"
-                        "       clrw  %2\n"
-                        "       subql #1,%2\n"
-                        "       jpl   4b"
-                        : "=a" (lfrom), "=a" (lto), "=d" (temp), "=&d" (temp1)
-                        : "0" (lfrom), "1" (lto), "2" (temp));
-                to = lto;
-                from = lfrom;
-        }
-        if (n & 2) {
-                short *sto = to;
-                const short *sfrom = from;
-                *sto++ = *sfrom++;
-                to = sto;
-                from = sfrom;
-        }
-        if (n & 1) {
-                char *cto = to;
-                const char *cfrom = from;
-                *cto = *cfrom;
-        }
-        return xto;
-}
-EXPORT_SYMBOL(memcpy);
-
-void *memmove(void *dest, const void *src, size_t n)
-{
-        void *xdest = dest;
-        size_t temp;
-
-        if (!n)
-                return xdest;
-
-        if (dest < src) {
-                if ((long)dest & 1) {
-                        char *cdest = dest;
-                        const char *csrc = src;
-                        *cdest++ = *csrc++;
-                        dest = cdest;
-                        src = csrc;
-                        n--;
-                }
-                if (n > 2 && (long)dest & 2) {
-                        short *sdest = dest;
-                        const short *ssrc = src;
-                        *sdest++ = *ssrc++;
-                        dest = sdest;
-                        src = ssrc;
-                        n -= 2;
-                }
-                temp = n >> 2;
-                if (temp) {
-                        long *ldest = dest;
-                        const long *lsrc = src;
-                        temp--;
-                        do
-                                *ldest++ = *lsrc++;
-                        while (temp--);
-                        dest = ldest;
-                        src = lsrc;
-                }
-                if (n & 2) {
-                        short *sdest = dest;
-                        const short *ssrc = src;
-                        *sdest++ = *ssrc++;
-                        dest = sdest;
-                        src = ssrc;
-                }
-                if (n & 1) {
-                        char *cdest = dest;
-                        const char *csrc = src;
-                        *cdest = *csrc;
-                }
-        } else {
-                dest = (char *)dest + n;
-                src = (const char *)src + n;
-                if ((long)dest & 1) {
-                        char *cdest = dest;
-                        const char *csrc = src;
-                        *--cdest = *--csrc;
-                        dest = cdest;
-                        src = csrc;
-                        n--;
-                }
-                if (n > 2 && (long)dest & 2) {
-                        short *sdest = dest;
-                        const short *ssrc = src;
-                        *--sdest = *--ssrc;
-                        dest = sdest;
-                        src = ssrc;
-                        n -= 2;
-                }
-                temp = n >> 2;
-                if (temp) {
-                        long *ldest = dest;
-                        const long *lsrc = src;
-                        temp--;
-                        do
-                                *--ldest = *--lsrc;
-                        while (temp--);
-                        dest = ldest;
-                        src = lsrc;
-                }
-                if (n & 2) {
-                        short *sdest = dest;
-                        const short *ssrc = src;
-                        *--sdest = *--ssrc;
-                        dest = sdest;
-                        src = ssrc;
-                }
-                if (n & 1) {
-                        char *cdest = dest;
-                        const char *csrc = src;
-                        *--cdest = *--csrc;
-                }
-        }
-        return xdest;
-}
-EXPORT_SYMBOL(memmove);
diff --git a/arch/m68k/mm/Makefile b/arch/m68k/mm/Makefile
index b60270e4954b..09cadf1058d5 100644
--- a/arch/m68k/mm/Makefile
+++ b/arch/m68k/mm/Makefile
@@ -1,5 +1,9 @@
-ifdef CONFIG_MMU
-include arch/m68k/mm/Makefile_mm
-else
-include arch/m68k/mm/Makefile_no
-endif
+#
+# Makefile for the linux m68k-specific parts of the memory manager.
+#
+
+obj-y   := init.o
+
+obj-$(CONFIG_MMU)               += cache.o fault.o hwtest.o
+obj-$(CONFIG_MMU_MOTOROLA)      += kmap.o memory.o motorola.o
+obj-$(CONFIG_MMU_SUN3)          += sun3kmap.o sun3mmu.o
diff --git a/arch/m68k/mm/Makefile_mm b/arch/m68k/mm/Makefile_mm
deleted file mode 100644
index 5eaa43c4cb3c..000000000000
--- a/arch/m68k/mm/Makefile_mm
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Makefile for the linux m68k-specific parts of the memory manager.
-#
-
-obj-y           := cache.o init.o fault.o hwtest.o
-
-obj-$(CONFIG_MMU_MOTOROLA)      += kmap.o memory.o motorola.o
-obj-$(CONFIG_MMU_SUN3)          += sun3kmap.o sun3mmu.o
diff --git a/arch/m68k/mm/Makefile_no b/arch/m68k/mm/Makefile_no
deleted file mode 100644
index b54ab6b4b523..000000000000
--- a/arch/m68k/mm/Makefile_no
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the linux m68knommu specific parts of the memory manager.
-#
-
-obj-y += init.o kmap.o
diff --git a/arch/m68k/mm/init_mm.c b/arch/m68k/mm/init_mm.c
index 8bc842554e5b..9113c2f17607 100644
--- a/arch/m68k/mm/init_mm.c
+++ b/arch/m68k/mm/init_mm.c
@@ -32,8 +32,6 @@
 #include <asm/sections.h>
 #include <asm/tlb.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 pg_data_t pg_data_map[MAX_NUMNODES];
 EXPORT_SYMBOL(pg_data_map);
 
diff --git a/arch/m68k/mm/init_no.c b/arch/m68k/mm/init_no.c
index 8a6653f56bd8..7cbd7bd1f8bc 100644
--- a/arch/m68k/mm/init_no.c
+++ b/arch/m68k/mm/init_no.c
@@ -38,28 +38,10 @@
 #include <asm/system.h>
 #include <asm/machdep.h>
 
-#undef DEBUG
-
-extern void die_if_kernel(char *,struct pt_regs *,long);
-extern void free_initmem(void);
-
 /*
- * BAD_PAGE is the page that is used for page faults when linux
- * is out-of-memory. Older versions of linux just did a
- * do_exit(), but using this instead means there is less risk
- * for a process dying in kernel mode, possibly leaving a inode
- * unused etc..
- *
- * BAD_PAGETABLE is the accompanying page-table: it is initialized
- * to point to BAD_PAGE entries.
- *
  * ZERO_PAGE is a special page that is used for zero-initialized
  * data and COW.
  */
-static unsigned long empty_bad_page_table;
-
-static unsigned long empty_bad_page;
-
 unsigned long empty_zero_page;
 
 extern unsigned long memory_start;
@@ -77,22 +59,9 @@ void __init paging_init(void)
          * Make sure start_mem is page aligned, otherwise bootmem and
          * page_alloc get different views of the world.
          */
-#ifdef DEBUG
-        unsigned long start_mem = PAGE_ALIGN(memory_start);
-#endif
         unsigned long end_mem   = memory_end & PAGE_MASK;
+        unsigned long zones_size[MAX_NR_ZONES] = {0, };
 
-#ifdef DEBUG
-        printk (KERN_DEBUG "start_mem is %#lx\nvirtual_end is %#lx\n",
-                start_mem, end_mem);
-#endif
-
-        /*
-         * Initialize the bad page table and bad page to point
-         * to a couple of allocated pages.
-         */
-        empty_bad_page_table = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
-        empty_bad_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
         empty_zero_page = (unsigned long)alloc_bootmem_pages(PAGE_SIZE);
         memset((void *)empty_zero_page, 0, PAGE_SIZE);
 
@@ -101,19 +70,8 @@ void __init paging_init(void)
          */
         set_fs (USER_DS);
 
-#ifdef DEBUG
-        printk (KERN_DEBUG "before free_area_init\n");
-
-        printk (KERN_DEBUG "free_area_init -> start_mem is %#lx\nvirtual_end is %#lx\n",
-                start_mem, end_mem);
-#endif
-
-        {
-                unsigned long zones_size[MAX_NR_ZONES] = {0, };
-
-                zones_size[ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
-                free_area_init(zones_size);
-        }
+        zones_size[ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
+        free_area_init(zones_size);
 }
 
 void __init mem_init(void)
@@ -166,8 +124,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 }
 #endif
 
-void
-free_initmem()
+void free_initmem(void)
 {
 #ifdef CONFIG_RAMKERNEL
         unsigned long addr;
diff --git a/arch/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c
index a373d136b2b2..69345849454b 100644
--- a/arch/m68k/mm/kmap.c
+++ b/arch/m68k/mm/kmap.c
@@ -1,5 +1,367 @@
-#ifdef CONFIG_MMU
-#include "kmap_mm.c"
+/*
+ *  linux/arch/m68k/mm/kmap.c
+ *
+ *  Copyright (C) 1997 Roman Hodek
+ *
+ *  10/01/99 cleaned up the code and changing to the same interface
+ *           used by other architectures                /Roman Zippel
+ */
+
+#include <linux/module.h>
+#include <linux/mm.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+
+#include <asm/setup.h>
+#include <asm/segment.h>
+#include <asm/page.h>
+#include <asm/pgalloc.h>
+#include <asm/io.h>
+#include <asm/system.h>
+
+#undef DEBUG
+
+#define PTRTREESIZE     (256*1024)
+
+/*
+ * For 040/060 we can use the virtual memory area like other architectures,
+ * but for 020/030 we want to use early termination page descriptor and we
+ * can't mix this with normal page descriptors, so we have to copy that code
+ * (mm/vmalloc.c) and return appriorate aligned addresses.
+ */
+
+#ifdef CPU_M68040_OR_M68060_ONLY
+
+#define IO_SIZE         PAGE_SIZE
+
+static inline struct vm_struct *get_io_area(unsigned long size)
+{
+        return get_vm_area(size, VM_IOREMAP);
+}
+
+
+static inline void free_io_area(void *addr)
+{
+        vfree((void *)(PAGE_MASK & (unsigned long)addr));
+}
+
 #else
-#include "kmap_no.c"
+
+#define IO_SIZE         (256*1024)
+
+static struct vm_struct *iolist;
+
+static struct vm_struct *get_io_area(unsigned long size)
+{
+        unsigned long addr;
+        struct vm_struct **p, *tmp, *area;
+
+        area = kmalloc(sizeof(*area), GFP_KERNEL);
+        if (!area)
+                return NULL;
+        addr = KMAP_START;
+        for (p = &iolist; (tmp = *p) ; p = &tmp->next) {
+                if (size + addr < (unsigned long)tmp->addr)
+                        break;
+                if (addr > KMAP_END-size) {
+                        kfree(area);
+                        return NULL;
+                }
+                addr = tmp->size + (unsigned long)tmp->addr;
+        }
+        area->addr = (void *)addr;
+        area->size = size + IO_SIZE;
+        area->next = *p;
+        *p = area;
+        return area;
+}
+
+static inline void free_io_area(void *addr)
+{
+        struct vm_struct **p, *tmp;
+
+        if (!addr)
+                return;
+        addr = (void *)((unsigned long)addr & -IO_SIZE);
+        for (p = &iolist ; (tmp = *p) ; p = &tmp->next) {
+                if (tmp->addr == addr) {
+                        *p = tmp->next;
+                        __iounmap(tmp->addr, tmp->size);
+                        kfree(tmp);
+                        return;
+                }
+        }
+}
+
 #endif
+
+/*
+ * Map some physical address range into the kernel address space.
+ */
+/* Rewritten by Andreas Schwab to remove all races. */
+
+void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)
+{
+        struct vm_struct *area;
+        unsigned long virtaddr, retaddr;
+        long offset;
+        pgd_t *pgd_dir;
+        pmd_t *pmd_dir;
+        pte_t *pte_dir;
+
+        /*
+         * Don't allow mappings that wrap..
+         */
+        if (!size || physaddr > (unsigned long)(-size))
+                return NULL;
+
+#ifdef CONFIG_AMIGA
+        if (MACH_IS_AMIGA) {
+                if ((physaddr >= 0x40000000) && (physaddr + size < 0x60000000)
+                    && (cacheflag == IOMAP_NOCACHE_SER))
+                        return (void __iomem *)physaddr;
+        }
+#endif
+
+#ifdef DEBUG
+        printk("ioremap: 0x%lx,0x%lx(%d) - ", physaddr, size, cacheflag);
+#endif
+        /*
+         * Mappings have to be aligned
+         */
+        offset = physaddr & (IO_SIZE - 1);
+        physaddr &= -IO_SIZE;
+        size = (size + offset + IO_SIZE - 1) & -IO_SIZE;
+
+        /*
+         * Ok, go for it..
+         */
+        area = get_io_area(size);
+        if (!area)
+                return NULL;
+
+        virtaddr = (unsigned long)area->addr;
+        retaddr = virtaddr + offset;
+#ifdef DEBUG
+        printk("0x%lx,0x%lx,0x%lx", physaddr, virtaddr, retaddr);
+#endif
+
+        /*
+         * add cache and table flags to physical address
+         */
+        if (CPU_IS_040_OR_060) {
+                physaddr |= (_PAGE_PRESENT | _PAGE_GLOBAL040 |
+                             _PAGE_ACCESSED | _PAGE_DIRTY);
+                switch (cacheflag) {
+                case IOMAP_FULL_CACHING:
+                        physaddr |= _PAGE_CACHE040;
+                        break;
+                case IOMAP_NOCACHE_SER:
+                default:
+                        physaddr |= _PAGE_NOCACHE_S;
+                        break;
+                case IOMAP_NOCACHE_NONSER:
+                        physaddr |= _PAGE_NOCACHE;
+                        break;
+                case IOMAP_WRITETHROUGH:
+                        physaddr |= _PAGE_CACHE040W;
+                        break;
+                }
+        } else {
+                physaddr |= (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY);
+                switch (cacheflag) {
+                case IOMAP_NOCACHE_SER:
+                case IOMAP_NOCACHE_NONSER:
+                default:
+                        physaddr |= _PAGE_NOCACHE030;
+                        break;
+                case IOMAP_FULL_CACHING:
+                case IOMAP_WRITETHROUGH:
+                        break;
+                }
+        }
+
+        while ((long)size > 0) {
+#ifdef DEBUG
+                if (!(virtaddr & (PTRTREESIZE-1)))
+                        printk ("\npa=%#lx va=%#lx ", physaddr, virtaddr);
+#endif
+                pgd_dir = pgd_offset_k(virtaddr);
+                pmd_dir = pmd_alloc(&init_mm, pgd_dir, virtaddr);
+                if (!pmd_dir) {
+                        printk("ioremap: no mem for pmd_dir\n");
+                        return NULL;
+                }
+
+                if (CPU_IS_020_OR_030) {
+                        pmd_dir->pmd[(virtaddr/PTRTREESIZE) & 15] = physaddr;
+                        physaddr += PTRTREESIZE;
+                        virtaddr += PTRTREESIZE;
+                        size -= PTRTREESIZE;
+                } else {
+                        pte_dir = pte_alloc_kernel(pmd_dir, virtaddr);
+                        if (!pte_dir) {
+                                printk("ioremap: no mem for pte_dir\n");
+                                return NULL;
+                        }
+
+                        pte_val(*pte_dir) = physaddr;
+                        virtaddr += PAGE_SIZE;
+                        physaddr += PAGE_SIZE;
+                        size -= PAGE_SIZE;
+                }
+        }
+#ifdef DEBUG
+        printk("\n");
+#endif
+        flush_tlb_all();
+
+        return (void __iomem *)retaddr;
+}
+EXPORT_SYMBOL(__ioremap);
+
+/*
+ * Unmap a ioremap()ed region again
+ */
+void iounmap(void __iomem *addr)
+{
+#ifdef CONFIG_AMIGA
+        if ((!MACH_IS_AMIGA) ||
+            (((unsigned long)addr < 0x40000000) ||
+             ((unsigned long)addr > 0x60000000)))
+                        free_io_area((__force void *)addr);
+#else
+        free_io_area((__force void *)addr);
+#endif
+}
+EXPORT_SYMBOL(iounmap);
+
+/*
+ * __iounmap unmaps nearly everything, so be careful
+ * it doesn't free currently pointer/page tables anymore but it
+ * wans't used anyway and might be added later.
+ */
+void __iounmap(void *addr, unsigned long size)
+{
+        unsigned long virtaddr = (unsigned long)addr;
+        pgd_t *pgd_dir;
+        pmd_t *pmd_dir;
+        pte_t *pte_dir;
+
+        while ((long)size > 0) {
+                pgd_dir = pgd_offset_k(virtaddr);
+                if (pgd_bad(*pgd_dir)) {
+                        printk("iounmap: bad pgd(%08lx)\n", pgd_val(*pgd_dir));
+                        pgd_clear(pgd_dir);
+                        return;
+                }
+                pmd_dir = pmd_offset(pgd_dir, virtaddr);
+
+                if (CPU_IS_020_OR_030) {
+                        int pmd_off = (virtaddr/PTRTREESIZE) & 15;
+                        int pmd_type = pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK;
+
+                        if (pmd_type == _PAGE_PRESENT) {
+                                pmd_dir->pmd[pmd_off] = 0;
+                                virtaddr += PTRTREESIZE;
+                                size -= PTRTREESIZE;
+                                continue;
+                        } else if (pmd_type == 0)
+                                continue;
+                }
+
+                if (pmd_bad(*pmd_dir)) {
+                        printk("iounmap: bad pmd (%08lx)\n", pmd_val(*pmd_dir));
+                        pmd_clear(pmd_dir);
+                        return;
+                }
+                pte_dir = pte_offset_kernel(pmd_dir, virtaddr);
+
+                pte_val(*pte_dir) = 0;
+                virtaddr += PAGE_SIZE;
+                size -= PAGE_SIZE;
+        }
+
+        flush_tlb_all();
+}
+
+/*
+ * Set new cache mode for some kernel address space.
+ * The caller must push data for that range itself, if such data may already
+ * be in the cache.
+ */
+void kernel_set_cachemode(void *addr, unsigned long size, int cmode)
+{
+        unsigned long virtaddr = (unsigned long)addr;
+        pgd_t *pgd_dir;
+        pmd_t *pmd_dir;
+        pte_t *pte_dir;
+
+        if (CPU_IS_040_OR_060) {
+                switch (cmode) {
+                case IOMAP_FULL_CACHING:
+                        cmode = _PAGE_CACHE040;
+                        break;
+                case IOMAP_NOCACHE_SER:
+                default:
+                        cmode = _PAGE_NOCACHE_S;
+                        break;
+                case IOMAP_NOCACHE_NONSER:
+                        cmode = _PAGE_NOCACHE;
+                        break;
+                case IOMAP_WRITETHROUGH:
+                        cmode = _PAGE_CACHE040W;
+                        break;
+                }
+        } else {
+                switch (cmode) {
+                case IOMAP_NOCACHE_SER:
+                case IOMAP_NOCACHE_NONSER:
+                default:
+                        cmode = _PAGE_NOCACHE030;
+                        break;
+                case IOMAP_FULL_CACHING:
+                case IOMAP_WRITETHROUGH:
+                        cmode = 0;
+                }
+        }
+
+        while ((long)size > 0) {
+                pgd_dir = pgd_offset_k(virtaddr);
+                if (pgd_bad(*pgd_dir)) {
+                        printk("iocachemode: bad pgd(%08lx)\n", pgd_val(*pgd_dir));
+                        pgd_clear(pgd_dir);
+                        return;
+                }
+                pmd_dir = pmd_offset(pgd_dir, virtaddr);
+
+                if (CPU_IS_020_OR_030) {
+                        int pmd_off = (virtaddr/PTRTREESIZE) & 15;
+
+                        if ((pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK) == _PAGE_PRESENT) {
+                                pmd_dir->pmd[pmd_off] = (pmd_dir->pmd[pmd_off] &
+                                                         _CACHEMASK040) | cmode;
+                                virtaddr += PTRTREESIZE;
+                                size -= PTRTREESIZE;
+                                continue;
+                        }
+                }
+
+                if (pmd_bad(*pmd_dir)) {
+                        printk("iocachemode: bad pmd (%08lx)\n", pmd_val(*pmd_dir));
+                        pmd_clear(pmd_dir);
+                        return;
+                }
+                pte_dir = pte_offset_kernel(pmd_dir, virtaddr);
+
+                pte_val(*pte_dir) = (pte_val(*pte_dir) & _CACHEMASK040) | cmode;
+                virtaddr += PAGE_SIZE;
+                size -= PAGE_SIZE;
+        }
+
+        flush_tlb_all();
+}
+EXPORT_SYMBOL(kernel_set_cachemode);
diff --git a/arch/m68k/mm/kmap_mm.c b/arch/m68k/mm/kmap_mm.c
deleted file mode 100644
index 69345849454b..000000000000
--- a/arch/m68k/mm/kmap_mm.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- *  linux/arch/m68k/mm/kmap.c
- *
- *  Copyright (C) 1997 Roman Hodek
- *
- *  10/01/99 cleaned up the code and changing to the same interface
- *           used by other architectures                /Roman Zippel
- */
-
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-
-#include <asm/setup.h>
-#include <asm/segment.h>
-#include <asm/page.h>
-#include <asm/pgalloc.h>
-#include <asm/io.h>
-#include <asm/system.h>
-
-#undef DEBUG
-
-#define PTRTREESIZE     (256*1024)
-
-/*
- * For 040/060 we can use the virtual memory area like other architectures,
- * but for 020/030 we want to use early termination page descriptor and we
- * can't mix this with normal page descriptors, so we have to copy that code
- * (mm/vmalloc.c) and return appriorate aligned addresses.
- */
-
-#ifdef CPU_M68040_OR_M68060_ONLY
-
-#define IO_SIZE         PAGE_SIZE
-
-static inline struct vm_struct *get_io_area(unsigned long size)
-{
-        return get_vm_area(size, VM_IOREMAP);
-}
-
-
-static inline void free_io_area(void *addr)
-{
-        vfree((void *)(PAGE_MASK & (unsigned long)addr));
-}
-
-#else
-
-#define IO_SIZE         (256*1024)
-
-static struct vm_struct *iolist;
-
-static struct vm_struct *get_io_area(unsigned long size)
-{
-        unsigned long addr;
-        struct vm_struct **p, *tmp, *area;
-
-        area = kmalloc(sizeof(*area), GFP_KERNEL);
-        if (!area)
-                return NULL;
-        addr = KMAP_START;
-        for (p = &iolist; (tmp = *p) ; p = &tmp->next) {
-                if (size + addr < (unsigned long)tmp->addr)
-                        break;
-                if (addr > KMAP_END-size) {
-                        kfree(area);
-                        return NULL;
-                }
-                addr = tmp->size + (unsigned long)tmp->addr;
-        }
-        area->addr = (void *)addr;
-        area->size = size + IO_SIZE;
-        area->next = *p;
-        *p = area;
-        return area;
-}
-
-static inline void free_io_area(void *addr)
-{
-        struct vm_struct **p, *tmp;
-
-        if (!addr)
-                return;
-        addr = (void *)((unsigned long)addr & -IO_SIZE);
-        for (p = &iolist ; (tmp = *p) ; p = &tmp->next) {
-                if (tmp->addr == addr) {
-                        *p = tmp->next;
-                        __iounmap(tmp->addr, tmp->size);
-                        kfree(tmp);
-                        return;
-                }
-        }
-}
-
-#endif
-
-/*
- * Map some physical address range into the kernel address space.
- */
-/* Rewritten by Andreas Schwab to remove all races. */
-
-void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)
-{
-        struct vm_struct *area;
-        unsigned long virtaddr, retaddr;
-        long offset;
-        pgd_t *pgd_dir;
-        pmd_t *pmd_dir;
-        pte_t *pte_dir;
-
-        /*
-         * Don't allow mappings that wrap..
-         */
-        if (!size || physaddr > (unsigned long)(-size))
-                return NULL;
-
-#ifdef CONFIG_AMIGA
-        if (MACH_IS_AMIGA) {
-                if ((physaddr >= 0x40000000) && (physaddr + size < 0x60000000)
-                    && (cacheflag == IOMAP_NOCACHE_SER))
-                        return (void __iomem *)physaddr;
-        }
-#endif
-
-#ifdef DEBUG
-        printk("ioremap: 0x%lx,0x%lx(%d) - ", physaddr, size, cacheflag);
-#endif
-        /*
-         * Mappings have to be aligned
-         */
-        offset = physaddr & (IO_SIZE - 1);
-        physaddr &= -IO_SIZE;
-        size = (size + offset + IO_SIZE - 1) & -IO_SIZE;
-
-        /*
-         * Ok, go for it..
-         */
-        area = get_io_area(size);
-        if (!area)
-                return NULL;
-
-        virtaddr = (unsigned long)area->addr;
-        retaddr = virtaddr + offset;
-#ifdef DEBUG
-        printk("0x%lx,0x%lx,0x%lx", physaddr, virtaddr, retaddr);
-#endif
-
-        /*
-         * add cache and table flags to physical address
-         */
-        if (CPU_IS_040_OR_060) {
-                physaddr |= (_PAGE_PRESENT | _PAGE_GLOBAL040 |
-                             _PAGE_ACCESSED | _PAGE_DIRTY);
-                switch (cacheflag) {
-                case IOMAP_FULL_CACHING:
-                        physaddr |= _PAGE_CACHE040;
-                        break;
-                case IOMAP_NOCACHE_SER:
-                default:
-                        physaddr |= _PAGE_NOCACHE_S;
-                        break;
-                case IOMAP_NOCACHE_NONSER:
-                        physaddr |= _PAGE_NOCACHE;
-                        break;
-                case IOMAP_WRITETHROUGH:
-                        physaddr |= _PAGE_CACHE040W;
-                        break;
-                }
-        } else {
-                physaddr |= (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY);
-                switch (cacheflag) {
-                case IOMAP_NOCACHE_SER:
-                case IOMAP_NOCACHE_NONSER:
-                default:
-                        physaddr |= _PAGE_NOCACHE030;
-                        break;
-                case IOMAP_FULL_CACHING:
-                case IOMAP_WRITETHROUGH:
-                        break;
-                }
-        }
-
-        while ((long)size > 0) {
-#ifdef DEBUG
-                if (!(virtaddr & (PTRTREESIZE-1)))
-                        printk ("\npa=%#lx va=%#lx ", physaddr, virtaddr);
-#endif
-                pgd_dir = pgd_offset_k(virtaddr);
-                pmd_dir = pmd_alloc(&init_mm, pgd_dir, virtaddr);
-                if (!pmd_dir) {
-                        printk("ioremap: no mem for pmd_dir\n");
-                        return NULL;
-                }
-
-                if (CPU_IS_020_OR_030) {
-                        pmd_dir->pmd[(virtaddr/PTRTREESIZE) & 15] = physaddr;
-                        physaddr += PTRTREESIZE;
-                        virtaddr += PTRTREESIZE;
-                        size -= PTRTREESIZE;
-                } else {
-                        pte_dir = pte_alloc_kernel(pmd_dir, virtaddr);
-                        if (!pte_dir) {
-                                printk("ioremap: no mem for pte_dir\n");
-                                return NULL;
-                        }
-
-                        pte_val(*pte_dir) = physaddr;
-                        virtaddr += PAGE_SIZE;
-                        physaddr += PAGE_SIZE;
-                        size -= PAGE_SIZE;
-                }
-        }
-#ifdef DEBUG
-        printk("\n");
-#endif
-        flush_tlb_all();
-
-        return (void __iomem *)retaddr;
-}
-EXPORT_SYMBOL(__ioremap);
-
-/*
- * Unmap a ioremap()ed region again
- */
-void iounmap(void __iomem *addr)
-{
-#ifdef CONFIG_AMIGA
-        if ((!MACH_IS_AMIGA) ||
-            (((unsigned long)addr < 0x40000000) ||
-             ((unsigned long)addr > 0x60000000)))
-                        free_io_area((__force void *)addr);
-#else
-        free_io_area((__force void *)addr);
-#endif
-}
-EXPORT_SYMBOL(iounmap);
-
-/*
- * __iounmap unmaps nearly everything, so be careful
- * it doesn't free currently pointer/page tables anymore but it
- * wans't used anyway and might be added later.
- */
-void __iounmap(void *addr, unsigned long size)
-{
-        unsigned long virtaddr = (unsigned long)addr;
-        pgd_t *pgd_dir;
-        pmd_t *pmd_dir;
-        pte_t *pte_dir;
-
-        while ((long)size > 0) {
-                pgd_dir = pgd_offset_k(virtaddr);
-                if (pgd_bad(*pgd_dir)) {
-                        printk("iounmap: bad pgd(%08lx)\n", pgd_val(*pgd_dir));
-                        pgd_clear(pgd_dir);
-                        return;
-                }
-                pmd_dir = pmd_offset(pgd_dir, virtaddr);
-
-                if (CPU_IS_020_OR_030) {
-                        int pmd_off = (virtaddr/PTRTREESIZE) & 15;
-                        int pmd_type = pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK;
-
-                        if (pmd_type == _PAGE_PRESENT) {
-                                pmd_dir->pmd[pmd_off] = 0;
-                                virtaddr += PTRTREESIZE;
-                                size -= PTRTREESIZE;
-                                continue;
-                        } else if (pmd_type == 0)
-                                continue;
-                }
-
-                if (pmd_bad(*pmd_dir)) {
-                        printk("iounmap: bad pmd (%08lx)\n", pmd_val(*pmd_dir));
-                        pmd_clear(pmd_dir);
-                        return;
-                }
-                pte_dir = pte_offset_kernel(pmd_dir, virtaddr);
-
-                pte_val(*pte_dir) = 0;
-                virtaddr += PAGE_SIZE;
-                size -= PAGE_SIZE;
-        }
-
-        flush_tlb_all();
-}
-
-/*
- * Set new cache mode for some kernel address space.
- * The caller must push data for that range itself, if such data may already
- * be in the cache.
- */
-void kernel_set_cachemode(void *addr, unsigned long size, int cmode)
-{
-        unsigned long virtaddr = (unsigned long)addr;
-        pgd_t *pgd_dir;
-        pmd_t *pmd_dir;
-        pte_t *pte_dir;
-
-        if (CPU_IS_040_OR_060) {
-                switch (cmode) {
-                case IOMAP_FULL_CACHING:
-                        cmode = _PAGE_CACHE040;
-                        break;
-                case IOMAP_NOCACHE_SER:
-                default:
-                        cmode = _PAGE_NOCACHE_S;
-                        break;
-                case IOMAP_NOCACHE_NONSER:
-                        cmode = _PAGE_NOCACHE;
-                        break;
-                case IOMAP_WRITETHROUGH:
-                        cmode = _PAGE_CACHE040W;
-                        break;
-                }
-        } else {
-                switch (cmode) {
-                case IOMAP_NOCACHE_SER:
-                case IOMAP_NOCACHE_NONSER:
-                default:
-                        cmode = _PAGE_NOCACHE030;
-                        break;
-                case IOMAP_FULL_CACHING:
-                case IOMAP_WRITETHROUGH:
-                        cmode = 0;
-                }
-        }
-
-        while ((long)size > 0) {
-                pgd_dir = pgd_offset_k(virtaddr);
-                if (pgd_bad(*pgd_dir)) {
-                        printk("iocachemode: bad pgd(%08lx)\n", pgd_val(*pgd_dir));
-                        pgd_clear(pgd_dir);
-                        return;
-                }
-                pmd_dir = pmd_offset(pgd_dir, virtaddr);
-
-                if (CPU_IS_020_OR_030) {
-                        int pmd_off = (virtaddr/PTRTREESIZE) & 15;
-
-                        if ((pmd_dir->pmd[pmd_off] & _DESCTYPE_MASK) == _PAGE_PRESENT) {
-                                pmd_dir->pmd[pmd_off] = (pmd_dir->pmd[pmd_off] &
-                                                         _CACHEMASK040) | cmode;
-                                virtaddr += PTRTREESIZE;
-                                size -= PTRTREESIZE;
-                                continue;
-                        }
-                }
-
-                if (pmd_bad(*pmd_dir)) {
-                        printk("iocachemode: bad pmd (%08lx)\n", pmd_val(*pmd_dir));
-                        pmd_clear(pmd_dir);
-                        return;
-                }
-                pte_dir = pte_offset_kernel(pmd_dir, virtaddr);
-
-                pte_val(*pte_dir) = (pte_val(*pte_dir) & _CACHEMASK040) | cmode;
-                virtaddr += PAGE_SIZE;
-                size -= PAGE_SIZE;
-        }
-
-        flush_tlb_all();
-}
-EXPORT_SYMBOL(kernel_set_cachemode);
diff --git a/arch/m68k/mm/kmap_no.c b/arch/m68k/mm/kmap_no.c
deleted file mode 100644
index ece8d5ad4e6c..000000000000
--- a/arch/m68k/mm/kmap_no.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  linux/arch/m68knommu/mm/kmap.c
- *
- *  Copyright (C) 2000 Lineo, <davidm@snapgear.com>
- *  Copyright (C) 2000-2002 David McCullough <davidm@snapgear.com>
- */
-
-#include <linux/mm.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/types.h>
-#include <linux/vmalloc.h>
-
-#include <asm/setup.h>
-#include <asm/segment.h>
-#include <asm/page.h>
-#include <asm/pgalloc.h>
-#include <asm/io.h>
-#include <asm/system.h>
-
-#undef DEBUG
-
-/*
- * Map some physical address range into the kernel address space.
- */
-void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag)
-{
-        return (void *)physaddr;
-}
-
-/*
- * Unmap a ioremap()ed region again.
- */
-void iounmap(void *addr)
-{
-}
-
-/*
- * Set new cache mode for some kernel address space.
- * The caller must push data for that range itself, if such data may already
- * be in the cache.
- */
-void kernel_set_cachemode(void *addr, unsigned long size, int cmode)
-{
-}
diff --git a/arch/m68k/platform/68328/entry.S b/arch/m68k/platform/68328/entry.S
index 676960cf022a..f68dce766c0a 100644
--- a/arch/m68k/platform/68328/entry.S
+++ b/arch/m68k/platform/68328/entry.S
@@ -10,7 +10,6 @@
  * Linux/m68k support by Hamish Macdonald
  */
 
-#include <linux/sys.h>
 #include <linux/linkage.h>
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
@@ -80,7 +79,7 @@ ENTRY(system_call)
         movel   %sp,%d1                 /* get thread_info pointer */
         andl    #-THREAD_SIZE,%d1
         movel   %d1,%a2
-        btst    #(TIF_SYSCALL_TRACE%8),%a2@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
+        btst    #(TIF_SYSCALL_TRACE%8),%a2@(TINFO_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
         jne     do_trace
         cmpl    #NR_syscalls,%d0
         jcc     badsys
@@ -107,12 +106,12 @@ Luser_return:
         andl    #-THREAD_SIZE,%d1
         movel   %d1,%a2
 1:
-        move    %a2@(TI_FLAGS),%d1      /* thread_info->flags */
+        move    %a2@(TINFO_FLAGS),%d1   /* thread_info->flags */
         jne     Lwork_to_do
         RESTORE_ALL
 
 Lwork_to_do:
-        movel   %a2@(TI_FLAGS),%d1      /* thread_info->flags */
+        movel   %a2@(TINFO_FLAGS),%d1   /* thread_info->flags */
         btst    #TIF_NEED_RESCHED,%d1
         jne     reschedule
 
diff --git a/arch/m68k/platform/68360/entry.S b/arch/m68k/platform/68360/entry.S
index 46c1b18c9dcb..a07b14feed92 100644
--- a/arch/m68k/platform/68360/entry.S
+++ b/arch/m68k/platform/68360/entry.S
@@ -12,7 +12,6 @@
  * M68360 Port by SED Systems, and Lineo.
  */
 
-#include <linux/sys.h>
 #include <linux/linkage.h>
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
@@ -76,7 +75,7 @@ ENTRY(system_call)
         movel   %sp,%d1                 /* get thread_info pointer */
         andl    #-THREAD_SIZE,%d1
         movel   %d1,%a2
-        btst    #(TIF_SYSCALL_TRACE%8),%a2@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
+        btst    #(TIF_SYSCALL_TRACE%8),%a2@(TINFO_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
         jne     do_trace
         cmpl    #NR_syscalls,%d0
         jcc     badsys
@@ -103,12 +102,12 @@ Luser_return:
         andl    #-THREAD_SIZE,%d1
         movel   %d1,%a2
 1:
-        move    %a2@(TI_FLAGS),%d1      /* thread_info->flags */
+        move    %a2@(TINFO_FLAGS),%d1   /* thread_info->flags */
         jne     Lwork_to_do
         RESTORE_ALL
 
 Lwork_to_do:
-        movel   %a2@(TI_FLAGS),%d1      /* thread_info->flags */
+        movel   %a2@(TINFO_FLAGS),%d1   /* thread_info->flags */
         btst    #TIF_NEED_RESCHED,%d1
         jne     reschedule
 
diff --git a/arch/m68k/platform/coldfire/dma.c b/arch/m68k/platform/coldfire/dma.c
index e88b95e2cc62..df5ce20d181c 100644
--- a/arch/m68k/platform/coldfire/dma.c
+++ b/arch/m68k/platform/coldfire/dma.c
@@ -9,6 +9,7 @@
 /***************************************************************************/
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <asm/dma.h>
 #include <asm/coldfire.h>
 #include <asm/mcfsim.h>
@@ -33,7 +34,9 @@ unsigned int dma_base_addr[MAX_M68K_DMA_CHANNELS] = {
         MCFDMA_BASE3,
 #endif
 };
+EXPORT_SYMBOL(dma_base_addr);
 
 unsigned int dma_device_address[MAX_M68K_DMA_CHANNELS];
+EXPORT_SYMBOL(dma_device_address);
 
 /***************************************************************************/
diff --git a/arch/m68k/platform/coldfire/entry.S b/arch/m68k/platform/coldfire/entry.S
index eab63f09965b..27c2b001161e 100644
--- a/arch/m68k/platform/coldfire/entry.S
+++ b/arch/m68k/platform/coldfire/entry.S
@@ -26,7 +26,6 @@
  * Bug, speed and maintainability fixes by Philippe De Muyter <phdm@macqel.be>
  */
 
-#include <linux/sys.h>
 #include <linux/linkage.h>
 #include <asm/unistd.h>
 #include <asm/thread_info.h>
@@ -78,7 +77,7 @@ ENTRY(system_call)
         movel   %d2,%a0
         movel   %a0@,%a1                /* save top of frame */
         movel   %sp,%a1@(TASK_THREAD+THREAD_ESP0)
-        btst    #(TIF_SYSCALL_TRACE%8),%a0@(TI_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
+        btst    #(TIF_SYSCALL_TRACE%8),%a0@(TINFO_FLAGS+(31-TIF_SYSCALL_TRACE)/8)
         bnes    1f
 
         movel   %d3,%a0
@@ -113,11 +112,11 @@ ret_from_exception:
         movel   %sp,%d1                 /* get thread_info pointer */
         andl    #-THREAD_SIZE,%d1       /* at base of kernel stack */
         movel   %d1,%a0
-        movel   %a0@(TI_FLAGS),%d1      /* get thread_info->flags */
+        movel   %a0@(TINFO_FLAGS),%d1   /* get thread_info->flags */
         andl    #(1<<TIF_NEED_RESCHED),%d1
         jeq     Lkernel_return
 
-        movel   %a0@(TI_PREEMPTCOUNT),%d1
+        movel   %a0@(TINFO_PREEMPT),%d1
         cmpl    #0,%d1
         jne     Lkernel_return
 
@@ -137,14 +136,14 @@ Luser_return:
         movel   %sp,%d1                 /* get thread_info pointer */
         andl    #-THREAD_SIZE,%d1       /* at base of kernel stack */
         movel   %d1,%a0
-        movel   %a0@(TI_FLAGS),%d1      /* get thread_info->flags */
+        movel   %a0@(TINFO_FLAGS),%d1   /* get thread_info->flags */
         jne     Lwork_to_do             /* still work to do */
 
 Lreturn:
         RESTORE_USER
 
 Lwork_to_do:
-        movel   %a0@(TI_FLAGS),%d1      /* get thread_info->flags */
+        movel   %a0@(TINFO_FLAGS),%d1   /* get thread_info->flags */
         move    #0x2000,%sr             /* enable intrs again */
         btst    #TIF_NEED_RESCHED,%d1
         jne     reschedule
diff --git a/arch/m68k/platform/coldfire/head.S b/arch/m68k/platform/coldfire/head.S
index 6ae91a499184..c33483824a2e 100644
--- a/arch/m68k/platform/coldfire/head.S
+++ b/arch/m68k/platform/coldfire/head.S
@@ -8,7 +8,6 @@
 
 /*****************************************************************************/
 
-#include <linux/sys.h>
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/asm-offsets.h>
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index d8a214f11ac2..e5550ce4e0eb 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -217,16 +217,12 @@ static struct clocksource clocksource_microblaze = {
         .rating         = 300,
         .read           = microblaze_read,
         .mask           = CLOCKSOURCE_MASK(32),
-        .shift          = 8, /* I can shift it */
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
 static int __init microblaze_clocksource_init(void)
 {
-        clocksource_microblaze.mult =
-                        clocksource_hz2mult(timer_clock_freq,
-                                                clocksource_microblaze.shift);
-        if (clocksource_register(&clocksource_microblaze))
+        if (clocksource_register_hz(&clocksource_microblaze, timer_clock_freq))
                 panic("failed to register clocksource");
 
         /* stop timer1 */
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index c8437866d3b7..213f2d671669 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -32,8 +32,6 @@ unsigned int __page_offset;
 EXPORT_SYMBOL(__page_offset);
 
 #else
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 static int init_bootmem_done;
 #endif /* CONFIG_MMU */
 
diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index 7ff9b5492041..aef6c917b45a 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -11,6 +11,7 @@ platforms += dec
 platforms += emma
 platforms += jazz
 platforms += jz4740
+platforms += lantiq
 platforms += lasat
 platforms += loongson
 platforms += mipssim
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 351c80fbba7e..cef1a854487d 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -212,6 +212,24 @@ config MACH_JZ4740
         select HAVE_PWM
         select HAVE_CLK
 
+config LANTIQ
+        bool "Lantiq based platforms"
+        select DMA_NONCOHERENT
+        select IRQ_CPU
+        select CEVT_R4K
+        select CSRC_R4K
+        select SYS_HAS_CPU_MIPS32_R1
+        select SYS_HAS_CPU_MIPS32_R2
+        select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_MULTITHREADING
+        select SYS_HAS_EARLY_PRINTK
+        select ARCH_REQUIRE_GPIOLIB
+        select SWAP_IO_SPACE
+        select BOOT_RAW
+        select HAVE_CLK
+        select MIPS_MACHINE
+
 config LASAT
         bool "LASAT Networks platforms"
         select CEVT_R4K
@@ -736,6 +754,33 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
                 Hikari
           Say Y here for most Octeon reference boards.
 
+config NLM_XLR_BOARD
+        bool "Netlogic XLR/XLS based systems"
+        depends on EXPERIMENTAL
+        select BOOT_ELF32
+        select NLM_COMMON
+        select NLM_XLR
+        select SYS_HAS_CPU_XLR
+        select SYS_SUPPORTS_SMP
+        select HW_HAS_PCI
+        select SWAP_IO_SPACE
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_64BIT_KERNEL
+        select 64BIT_PHYS_ADDR
+        select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_HIGHMEM
+        select DMA_COHERENT
+        select NR_CPUS_DEFAULT_32
+        select CEVT_R4K
+        select CSRC_R4K
+        select IRQ_CPU
+        select ZONE_DMA if 64BIT
+        select SYNC_R4K
+        select SYS_HAS_EARLY_PRINTK
+        help
+          Support for systems based on Netlogic XLR and XLS processors.
+          Say Y here if you have a XLR or XLS based board.
+
 endchoice
 
 source "arch/mips/alchemy/Kconfig"
@@ -743,6 +788,7 @@ source "arch/mips/ath79/Kconfig"
 source "arch/mips/bcm63xx/Kconfig"
 source "arch/mips/jazz/Kconfig"
 source "arch/mips/jz4740/Kconfig"
+source "arch/mips/lantiq/Kconfig"
 source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
 source "arch/mips/powertv/Kconfig"
@@ -752,6 +798,7 @@ source "arch/mips/txx9/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
 source "arch/mips/cavium-octeon/Kconfig"
 source "arch/mips/loongson/Kconfig"
+source "arch/mips/netlogic/Kconfig"
 
 endmenu
 
@@ -1420,6 +1467,17 @@ config CPU_BMIPS5000
         help
           Broadcom BMIPS5000 processors.
 
+config CPU_XLR
+        bool "Netlogic XLR SoC"
+        depends on SYS_HAS_CPU_XLR
+        select CPU_SUPPORTS_32BIT_KERNEL
+        select CPU_SUPPORTS_64BIT_KERNEL
+        select CPU_SUPPORTS_HIGHMEM
+        select WEAK_ORDERING
+        select WEAK_REORDERING_BEYOND_LLSC
+        select CPU_SUPPORTS_HUGEPAGES
+        help
+          Netlogic Microsystems XLR/XLS processors.
 endchoice
 
 if CPU_LOONGSON2F
@@ -1550,6 +1608,9 @@ config SYS_HAS_CPU_BMIPS4380
 config SYS_HAS_CPU_BMIPS5000
         bool
 
+config SYS_HAS_CPU_XLR
+        bool
+
 #
 # CPU may reorder R->R, R->W, W->R, W->W
 # Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC
@@ -2334,6 +2395,7 @@ config MMU
 
 config I8253
         bool
+        select CLKSRC_I8253
         select MIPS_EXTERNAL_TIMER
 
 config ZONE_DMA32
diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 5358f90b4dd2..83ed00a5644a 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -76,15 +76,6 @@ config DEBUG_STACKOVERFLOW
           provides another way to check stack overflow happened on kernel mode
           stack usually caused by nested interruption.
 
-config DEBUG_STACK_USAGE
-        bool "Enable stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        help
-          Enables the display of the minimum amount of free stack which each
-          task has ever had available in the sysrq-T and sysrq-P debug output.
-
-          This option will slow down process creation somewhat.
-
 config SMTC_IDLE_HOOK_DEBUG
         bool "Enable additional debug checks before going into CPU idle loop"
         depends on DEBUG_KERNEL && MIPS_MT_SMTC
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 53e3514ba10e..884819cd0607 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -191,6 +191,18 @@ endif
 #
 include $(srctree)/arch/mips/Kbuild.platforms
 
+#
+# NETLOGIC SOC Common (common)
+#
+cflags-$(CONFIG_NLM_COMMON)             += -I$(srctree)/arch/mips/include/asm/mach-netlogic
+cflags-$(CONFIG_NLM_COMMON)             += -I$(srctree)/arch/mips/include/asm/netlogic
+
+#
+# NETLOGIC XLR/XLS SoC, Simulator and boards
+#
+core-$(CONFIG_NLM_XLR)                  += arch/mips/netlogic/xlr/
+load-$(CONFIG_NLM_XLR_BOARD)            += 0xffffffff84000000
+
 cflags-y                        += -I$(srctree)/arch/mips/include/asm/mach-generic
 drivers-$(CONFIG_PCI)           += arch/mips/pci/
 
diff --git a/arch/mips/alchemy/common/dbdma.c b/arch/mips/alchemy/common/dbdma.c
index ca0506a8585a..3a5abb54d505 100644
--- a/arch/mips/alchemy/common/dbdma.c
+++ b/arch/mips/alchemy/common/dbdma.c
@@ -36,7 +36,7 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
 
@@ -58,7 +58,8 @@ static DEFINE_SPINLOCK(au1xxx_dbdma_spin_lock);
 /* I couldn't find a macro that did this... */
 #define ALIGN_ADDR(x, a)        ((((u32)(x)) + (a-1)) & ~(a-1))
 
-static dbdma_global_t *dbdma_gptr = (dbdma_global_t *)DDMA_GLOBAL_BASE;
+static dbdma_global_t *dbdma_gptr =
+                        (dbdma_global_t *)KSEG1ADDR(AU1550_DBDMA_CONF_PHYS_ADDR);
 static int dbdma_initialized;
 
 static dbdev_tab_t dbdev_tab[] = {
@@ -299,7 +300,7 @@ u32 au1xxx_dbdma_chan_alloc(u32 srcid, u32 destid,
         if (ctp != NULL) {
                 memset(ctp, 0, sizeof(chan_tab_t));
                 ctp->chan_index = chan = i;
-                dcp = DDMA_CHANNEL_BASE;
+                dcp = KSEG1ADDR(AU1550_DBDMA_PHYS_ADDR);
                 dcp += (0x0100 * chan);
                 ctp->chan_ptr = (au1x_dma_chan_t *)dcp;
                 cp = (au1x_dma_chan_t *)dcp;
@@ -958,105 +959,75 @@ u32 au1xxx_dbdma_put_dscr(u32 chanid, au1x_ddma_desc_t *dscr)
 }
 
 
-struct alchemy_dbdma_sysdev {
-        struct sys_device sysdev;
-        u32 pm_regs[NUM_DBDMA_CHANS + 1][6];
-};
+static unsigned long alchemy_dbdma_pm_data[NUM_DBDMA_CHANS + 1][6];
 
-static int alchemy_dbdma_suspend(struct sys_device *dev,
-                                 pm_message_t state)
+static int alchemy_dbdma_suspend(void)
 {
-        struct alchemy_dbdma_sysdev *sdev =
-                container_of(dev, struct alchemy_dbdma_sysdev, sysdev);
         int i;
-        u32 addr;
+        void __iomem *addr;
 
-        addr = DDMA_GLOBAL_BASE;
-        sdev->pm_regs[0][0] = au_readl(addr + 0x00);
-        sdev->pm_regs[0][1] = au_readl(addr + 0x04);
-        sdev->pm_regs[0][2] = au_readl(addr + 0x08);
-        sdev->pm_regs[0][3] = au_readl(addr + 0x0c);
+        addr = (void __iomem *)KSEG1ADDR(AU1550_DBDMA_CONF_PHYS_ADDR);
+        alchemy_dbdma_pm_data[0][0] = __raw_readl(addr + 0x00);
+        alchemy_dbdma_pm_data[0][1] = __raw_readl(addr + 0x04);
+        alchemy_dbdma_pm_data[0][2] = __raw_readl(addr + 0x08);
+        alchemy_dbdma_pm_data[0][3] = __raw_readl(addr + 0x0c);
 
         /* save channel configurations */
-        for (i = 1, addr = DDMA_CHANNEL_BASE; i <= NUM_DBDMA_CHANS; i++) {
-                sdev->pm_regs[i][0] = au_readl(addr + 0x00);
-                sdev->pm_regs[i][1] = au_readl(addr + 0x04);
-                sdev->pm_regs[i][2] = au_readl(addr + 0x08);
-                sdev->pm_regs[i][3] = au_readl(addr + 0x0c);
-                sdev->pm_regs[i][4] = au_readl(addr + 0x10);
-                sdev->pm_regs[i][5] = au_readl(addr + 0x14);
+        addr = (void __iomem *)KSEG1ADDR(AU1550_DBDMA_PHYS_ADDR);
+        for (i = 1; i <= NUM_DBDMA_CHANS; i++) {
+                alchemy_dbdma_pm_data[i][0] = __raw_readl(addr + 0x00);
+                alchemy_dbdma_pm_data[i][1] = __raw_readl(addr + 0x04);
+                alchemy_dbdma_pm_data[i][2] = __raw_readl(addr + 0x08);
+                alchemy_dbdma_pm_data[i][3] = __raw_readl(addr + 0x0c);
+                alchemy_dbdma_pm_data[i][4] = __raw_readl(addr + 0x10);
+                alchemy_dbdma_pm_data[i][5] = __raw_readl(addr + 0x14);
 
                 /* halt channel */
-                au_writel(sdev->pm_regs[i][0] & ~1, addr + 0x00);
-                au_sync();
-                while (!(au_readl(addr + 0x14) & 1))
-                        au_sync();
+                __raw_writel(alchemy_dbdma_pm_data[i][0] & ~1, addr + 0x00);
+                wmb();
+                while (!(__raw_readl(addr + 0x14) & 1))
+                        wmb();
 
                 addr += 0x100;  /* next channel base */
         }
         /* disable channel interrupts */
-        au_writel(0, DDMA_GLOBAL_BASE + 0x0c);
-        au_sync();
+        addr = (void __iomem *)KSEG1ADDR(AU1550_DBDMA_CONF_PHYS_ADDR);
+        __raw_writel(0, addr + 0x0c);
+        wmb();
 
         return 0;
 }
 
-static int alchemy_dbdma_resume(struct sys_device *dev)
+static void alchemy_dbdma_resume(void)
 {
-        struct alchemy_dbdma_sysdev *sdev =
-                container_of(dev, struct alchemy_dbdma_sysdev, sysdev);
         int i;
-        u32 addr;
+        void __iomem *addr;
 
-        addr = DDMA_GLOBAL_BASE;
-        au_writel(sdev->pm_regs[0][0], addr + 0x00);
-        au_writel(sdev->pm_regs[0][1], addr + 0x04);
-        au_writel(sdev->pm_regs[0][2], addr + 0x08);
-        au_writel(sdev->pm_regs[0][3], addr + 0x0c);
+        addr = (void __iomem *)KSEG1ADDR(AU1550_DBDMA_CONF_PHYS_ADDR);
+        __raw_writel(alchemy_dbdma_pm_data[0][0], addr + 0x00);
+        __raw_writel(alchemy_dbdma_pm_data[0][1], addr + 0x04);
+        __raw_writel(alchemy_dbdma_pm_data[0][2], addr + 0x08);
+        __raw_writel(alchemy_dbdma_pm_data[0][3], addr + 0x0c);
 
         /* restore channel configurations */
-        for (i = 1, addr = DDMA_CHANNEL_BASE; i <= NUM_DBDMA_CHANS; i++) {
-                au_writel(sdev->pm_regs[i][0], addr + 0x00);
-                au_writel(sdev->pm_regs[i][1], addr + 0x04);
-                au_writel(sdev->pm_regs[i][2], addr + 0x08);
-                au_writel(sdev->pm_regs[i][3], addr + 0x0c);
-                au_writel(sdev->pm_regs[i][4], addr + 0x10);
-                au_writel(sdev->pm_regs[i][5], addr + 0x14);
-                au_sync();
+        addr = (void __iomem *)KSEG1ADDR(AU1550_DBDMA_PHYS_ADDR);
+        for (i = 1; i <= NUM_DBDMA_CHANS; i++) {
+                __raw_writel(alchemy_dbdma_pm_data[i][0], addr + 0x00);
+                __raw_writel(alchemy_dbdma_pm_data[i][1], addr + 0x04);
+                __raw_writel(alchemy_dbdma_pm_data[i][2], addr + 0x08);
+                __raw_writel(alchemy_dbdma_pm_data[i][3], addr + 0x0c);
+                __raw_writel(alchemy_dbdma_pm_data[i][4], addr + 0x10);
+                __raw_writel(alchemy_dbdma_pm_data[i][5], addr + 0x14);
+                wmb();
                 addr += 0x100;  /* next channel base */
         }
-
-        return 0;
 }
 
-static struct sysdev_class alchemy_dbdma_sysdev_class = {
-        .name           = "dbdma",
+static struct syscore_ops alchemy_dbdma_syscore_ops = {
         .suspend        = alchemy_dbdma_suspend,
         .resume         = alchemy_dbdma_resume,
 };
 
-static int __init alchemy_dbdma_sysdev_init(void)
-{
-        struct alchemy_dbdma_sysdev *sdev;
-        int ret;
-
-        ret = sysdev_class_register(&alchemy_dbdma_sysdev_class);
-        if (ret)
-                return ret;
-
-        sdev = kzalloc(sizeof(struct alchemy_dbdma_sysdev), GFP_KERNEL);
-        if (!sdev)
-                return -ENOMEM;
-
-        sdev->sysdev.id = -1;
-        sdev->sysdev.cls = &alchemy_dbdma_sysdev_class;
-        ret = sysdev_register(&sdev->sysdev);
-        if (ret)
-                kfree(sdev);
-
-        return ret;
-}
-
 static int __init au1xxx_dbdma_init(void)
 {
         int irq_nr, ret;
@@ -1084,11 +1055,7 @@ static int __init au1xxx_dbdma_init(void)
         else {
                 dbdma_initialized = 1;
                 printk(KERN_INFO "Alchemy DBDMA initialized\n");
-                ret = alchemy_dbdma_sysdev_init();
-                if (ret) {
-                        printk(KERN_ERR "DBDMA PM init failed\n");
-                        ret = 0;
-                }
+                register_syscore_ops(&alchemy_dbdma_syscore_ops);
         }
 
         return ret;
diff --git a/arch/mips/alchemy/common/dma.c b/arch/mips/alchemy/common/dma.c
index d5278877891d..347980e79a89 100644
--- a/arch/mips/alchemy/common/dma.c
+++ b/arch/mips/alchemy/common/dma.c
@@ -58,6 +58,9 @@
  * returned from request_dma.
  */
 
+/* DMA Channel register block spacing */
+#define DMA_CHANNEL_LEN         0x00000100
+
 DEFINE_SPINLOCK(au1000_dma_spin_lock);
 
 struct dma_chan au1000_dma_table[NUM_AU1000_DMA_CHANNELS] = {
@@ -77,22 +80,23 @@ static const struct dma_dev {
         unsigned int fifo_addr;
         unsigned int dma_mode;
 } dma_dev_table[DMA_NUM_DEV] = {
-        {UART0_ADDR + UART_TX, 0},
-        {UART0_ADDR + UART_RX, 0},
-        {0, 0},
-        {0, 0},
-        {AC97C_DATA, DMA_DW16 },          /* coherent */
-        {AC97C_DATA, DMA_DR | DMA_DW16 }, /* coherent */
-        {UART3_ADDR + UART_TX, DMA_DW8 | DMA_NC},
-        {UART3_ADDR + UART_RX, DMA_DR | DMA_DW8 | DMA_NC},
-        {USBD_EP0RD, DMA_DR | DMA_DW8 | DMA_NC},
-        {USBD_EP0WR, DMA_DW8 | DMA_NC},
-        {USBD_EP2WR, DMA_DW8 | DMA_NC},
-        {USBD_EP3WR, DMA_DW8 | DMA_NC},
-        {USBD_EP4RD, DMA_DR | DMA_DW8 | DMA_NC},
-        {USBD_EP5RD, DMA_DR | DMA_DW8 | DMA_NC},
-        {I2S_DATA, DMA_DW32 | DMA_NC},
-        {I2S_DATA, DMA_DR | DMA_DW32 | DMA_NC}
+        { AU1000_UART0_PHYS_ADDR + 0x04, DMA_DW8 },             /* UART0_TX */
+        { AU1000_UART0_PHYS_ADDR + 0x00, DMA_DW8 | DMA_DR },    /* UART0_RX */
+        { 0, 0 },       /* DMA_REQ0 */
+        { 0, 0 },       /* DMA_REQ1 */
+        { AU1000_AC97_PHYS_ADDR + 0x08, DMA_DW16 },             /* AC97 TX c */
+        { AU1000_AC97_PHYS_ADDR + 0x08, DMA_DW16 | DMA_DR },    /* AC97 RX c */
+        { AU1000_UART3_PHYS_ADDR + 0x04, DMA_DW8 | DMA_NC },    /* UART3_TX */
+        { AU1000_UART3_PHYS_ADDR + 0x00, DMA_DW8 | DMA_NC | DMA_DR }, /* UART3_RX */
+        { AU1000_USBD_PHYS_ADDR + 0x00, DMA_DW8 | DMA_NC | DMA_DR }, /* EP0RD */
+        { AU1000_USBD_PHYS_ADDR + 0x04, DMA_DW8 | DMA_NC }, /* EP0WR */
+        { AU1000_USBD_PHYS_ADDR + 0x08, DMA_DW8 | DMA_NC }, /* EP2WR */
+        { AU1000_USBD_PHYS_ADDR + 0x0c, DMA_DW8 | DMA_NC }, /* EP3WR */
+        { AU1000_USBD_PHYS_ADDR + 0x10, DMA_DW8 | DMA_NC | DMA_DR }, /* EP4RD */
+        { AU1000_USBD_PHYS_ADDR + 0x14, DMA_DW8 | DMA_NC | DMA_DR }, /* EP5RD */
+        /* on Au1500, these 2 are DMA_REQ2/3 (GPIO208/209) instead! */
+        { AU1000_I2S_PHYS_ADDR + 0x00, DMA_DW32 | DMA_NC},      /* I2S TX */
+        { AU1000_I2S_PHYS_ADDR + 0x00, DMA_DW32 | DMA_NC | DMA_DR}, /* I2S RX */
 };
 
 int au1000_dma_read_proc(char *buf, char **start, off_t fpos,
@@ -123,10 +127,10 @@ int au1000_dma_read_proc(char *buf, char **start, off_t fpos,
 
 /* Device FIFO addresses and default DMA modes - 2nd bank */
 static const struct dma_dev dma_dev_table_bank2[DMA_NUM_DEV_BANK2] = {
-        { SD0_XMIT_FIFO, DMA_DS | DMA_DW8 },            /* coherent */
-        { SD0_RECV_FIFO, DMA_DS | DMA_DR | DMA_DW8 },   /* coherent */
-        { SD1_XMIT_FIFO, DMA_DS | DMA_DW8 },            /* coherent */
-        { SD1_RECV_FIFO, DMA_DS | DMA_DR | DMA_DW8 }    /* coherent */
+        { AU1100_SD0_PHYS_ADDR + 0x00, DMA_DS | DMA_DW8 },              /* coherent */
+        { AU1100_SD0_PHYS_ADDR + 0x04, DMA_DS | DMA_DW8 | DMA_DR },     /* coherent */
+        { AU1100_SD1_PHYS_ADDR + 0x00, DMA_DS | DMA_DW8 },              /* coherent */
+        { AU1100_SD1_PHYS_ADDR + 0x04, DMA_DS | DMA_DW8 | DMA_DR }      /* coherent */
 };
 
 void dump_au1000_dma_channel(unsigned int dmanr)
@@ -202,7 +206,7 @@ int request_au1000_dma(int dev_id, const char *dev_str,
         }
 
         /* fill it in */
-        chan->io = DMA_CHANNEL_BASE + i * DMA_CHANNEL_LEN;
+        chan->io = KSEG1ADDR(AU1000_DMA_PHYS_ADDR) + i * DMA_CHANNEL_LEN;
         chan->dev_id = dev_id;
         chan->dev_str = dev_str;
         chan->fifo_addr = dev->fifo_addr;
diff --git a/arch/mips/alchemy/common/irq.c b/arch/mips/alchemy/common/irq.c
index 55dd7c888517..8b60ba0675e2 100644
--- a/arch/mips/alchemy/common/irq.c
+++ b/arch/mips/alchemy/common/irq.c
@@ -30,7 +30,7 @@
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/slab.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 
 #include <asm/irq_cpu.h>
 #include <asm/mipsregs.h>
@@ -39,6 +39,36 @@
 #include <asm/mach-pb1x00/pb1000.h>
 #endif
 
+/* Interrupt Controller register offsets */
+#define IC_CFG0RD       0x40
+#define IC_CFG0SET      0x40
+#define IC_CFG0CLR      0x44
+#define IC_CFG1RD       0x48
+#define IC_CFG1SET      0x48
+#define IC_CFG1CLR      0x4C
+#define IC_CFG2RD       0x50
+#define IC_CFG2SET      0x50
+#define IC_CFG2CLR      0x54
+#define IC_REQ0INT      0x54
+#define IC_SRCRD        0x58
+#define IC_SRCSET       0x58
+#define IC_SRCCLR       0x5C
+#define IC_REQ1INT      0x5C
+#define IC_ASSIGNRD     0x60
+#define IC_ASSIGNSET    0x60
+#define IC_ASSIGNCLR    0x64
+#define IC_WAKERD       0x68
+#define IC_WAKESET      0x68
+#define IC_WAKECLR      0x6C
+#define IC_MASKRD       0x70
+#define IC_MASKSET      0x70
+#define IC_MASKCLR      0x74
+#define IC_RISINGRD     0x78
+#define IC_RISINGCLR    0x78
+#define IC_FALLINGRD    0x7C
+#define IC_FALLINGCLR   0x7C
+#define IC_TESTBIT      0x80
+
 static int au1x_ic_settype(struct irq_data *d, unsigned int flow_type);
 
 /* NOTE on interrupt priorities: The original writers of this code said:
@@ -221,89 +251,101 @@ struct au1xxx_irqmap au1200_irqmap[] __initdata = {
 static void au1x_ic0_unmask(struct irq_data *d)
 {
         unsigned int bit = d->irq - AU1000_INTC0_INT_BASE;
-        au_writel(1 << bit, IC0_MASKSET);
-        au_writel(1 << bit, IC0_WAKESET);
-        au_sync();
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR);
+
+        __raw_writel(1 << bit, base + IC_MASKSET);
+        __raw_writel(1 << bit, base + IC_WAKESET);
+        wmb();
 }
 
 static void au1x_ic1_unmask(struct irq_data *d)
 {
         unsigned int bit = d->irq - AU1000_INTC1_INT_BASE;
-        au_writel(1 << bit, IC1_MASKSET);
-        au_writel(1 << bit, IC1_WAKESET);
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR);
+
+        __raw_writel(1 << bit, base + IC_MASKSET);
+        __raw_writel(1 << bit, base + IC_WAKESET);
 
 /* very hacky. does the pb1000 cpld auto-disable this int?
  * nowhere in the current kernel sources is it disabled.        --mlau
  */
 #if defined(CONFIG_MIPS_PB1000)
         if (d->irq == AU1000_GPIO15_INT)
-                au_writel(0x4000, PB1000_MDR); /* enable int */
+                __raw_writel(0x4000, (void __iomem *)PB1000_MDR); /* enable int */
 #endif
-        au_sync();
+        wmb();
 }
 
 static void au1x_ic0_mask(struct irq_data *d)
 {
         unsigned int bit = d->irq - AU1000_INTC0_INT_BASE;
-        au_writel(1 << bit, IC0_MASKCLR);
-        au_writel(1 << bit, IC0_WAKECLR);
-        au_sync();
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR);
+
+        __raw_writel(1 << bit, base + IC_MASKCLR);
+        __raw_writel(1 << bit, base + IC_WAKECLR);
+        wmb();
 }
 
 static void au1x_ic1_mask(struct irq_data *d)
 {
         unsigned int bit = d->irq - AU1000_INTC1_INT_BASE;
-        au_writel(1 << bit, IC1_MASKCLR);
-        au_writel(1 << bit, IC1_WAKECLR);
-        au_sync();
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR);
+
+        __raw_writel(1 << bit, base + IC_MASKCLR);
+        __raw_writel(1 << bit, base + IC_WAKECLR);
+        wmb();
 }
 
 static void au1x_ic0_ack(struct irq_data *d)
 {
         unsigned int bit = d->irq - AU1000_INTC0_INT_BASE;
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR);
 
         /*
          * This may assume that we don't get interrupts from
          * both edges at once, or if we do, that we don't care.
          */
-        au_writel(1 << bit, IC0_FALLINGCLR);
-        au_writel(1 << bit, IC0_RISINGCLR);
-        au_sync();
+        __raw_writel(1 << bit, base + IC_FALLINGCLR);
+        __raw_writel(1 << bit, base + IC_RISINGCLR);
+        wmb();
 }
 
 static void au1x_ic1_ack(struct irq_data *d)
 {
         unsigned int bit = d->irq - AU1000_INTC1_INT_BASE;
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR);
 
         /*
          * This may assume that we don't get interrupts from
          * both edges at once, or if we do, that we don't care.
          */
-        au_writel(1 << bit, IC1_FALLINGCLR);
-        au_writel(1 << bit, IC1_RISINGCLR);
-        au_sync();
+        __raw_writel(1 << bit, base + IC_FALLINGCLR);
+        __raw_writel(1 << bit, base + IC_RISINGCLR);
+        wmb();
 }
 
 static void au1x_ic0_maskack(struct irq_data *d)
 {
         unsigned int bit = d->irq - AU1000_INTC0_INT_BASE;
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR);
 
-        au_writel(1 << bit, IC0_WAKECLR);
-        au_writel(1 << bit, IC0_MASKCLR);
-        au_writel(1 << bit, IC0_RISINGCLR);
-        au_writel(1 << bit, IC0_FALLINGCLR);
-        au_sync();
+        __raw_writel(1 << bit, base + IC_WAKECLR);
+        __raw_writel(1 << bit, base + IC_MASKCLR);
+        __raw_writel(1 << bit, base + IC_RISINGCLR);
+        __raw_writel(1 << bit, base + IC_FALLINGCLR);
+        wmb();
 }
 
 static void au1x_ic1_maskack(struct irq_data *d)
 {
         unsigned int bit = d->irq - AU1000_INTC1_INT_BASE;
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR);
 
-        au_writel(1 << bit, IC1_WAKECLR);
-        au_writel(1 << bit, IC1_MASKCLR);
-        au_writel(1 << bit, IC1_RISINGCLR);
-        au_writel(1 << bit, IC1_FALLINGCLR);
-        au_sync();
+        __raw_writel(1 << bit, base + IC_WAKECLR);
+        __raw_writel(1 << bit, base + IC_MASKCLR);
+        __raw_writel(1 << bit, base + IC_RISINGCLR);
+        __raw_writel(1 << bit, base + IC_FALLINGCLR);
+        wmb();
 }
 
 static int au1x_ic1_setwake(struct irq_data *d, unsigned int on)
@@ -318,13 +360,13 @@ static int au1x_ic1_setwake(struct irq_data *d, unsigned int on)
                 return -EINVAL;
 
         local_irq_save(flags);
-        wakemsk = au_readl(SYS_WAKEMSK);
+        wakemsk = __raw_readl((void __iomem *)SYS_WAKEMSK);
         if (on)
                 wakemsk |= 1 << bit;
         else
                 wakemsk &= ~(1 << bit);
-        au_writel(wakemsk, SYS_WAKEMSK);
-        au_sync();
+        __raw_writel(wakemsk, (void __iomem *)SYS_WAKEMSK);
+        wmb();
         local_irq_restore(flags);
 
         return 0;
@@ -356,81 +398,74 @@ static struct irq_chip au1x_ic1_chip = {
 static int au1x_ic_settype(struct irq_data *d, unsigned int flow_type)
 {
         struct irq_chip *chip;
-        unsigned long icr[6];
-        unsigned int bit, ic, irq = d->irq;
+        unsigned int bit, irq = d->irq;
         irq_flow_handler_t handler = NULL;
         unsigned char *name = NULL;
+        void __iomem *base;
         int ret;
 
         if (irq >= AU1000_INTC1_INT_BASE) {
                 bit = irq - AU1000_INTC1_INT_BASE;
                 chip = &au1x_ic1_chip;
-                ic = 1;
+                base = (void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR);
         } else {
                 bit = irq - AU1000_INTC0_INT_BASE;
                 chip = &au1x_ic0_chip;
-                ic = 0;
+                base = (void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR);
         }
 
         if (bit > 31)
                 return -EINVAL;
 
-        icr[0] = ic ? IC1_CFG0SET : IC0_CFG0SET;
-        icr[1] = ic ? IC1_CFG1SET : IC0_CFG1SET;
-        icr[2] = ic ? IC1_CFG2SET : IC0_CFG2SET;
-        icr[3] = ic ? IC1_CFG0CLR : IC0_CFG0CLR;
-        icr[4] = ic ? IC1_CFG1CLR : IC0_CFG1CLR;
-        icr[5] = ic ? IC1_CFG2CLR : IC0_CFG2CLR;
-
         ret = 0;
 
         switch (flow_type) {    /* cfgregs 2:1:0 */
         case IRQ_TYPE_EDGE_RISING:      /* 0:0:1 */
-                au_writel(1 << bit, icr[5]);
-                au_writel(1 << bit, icr[4]);
-                au_writel(1 << bit, icr[0]);
+                __raw_writel(1 << bit, base + IC_CFG2CLR);
+                __raw_writel(1 << bit, base + IC_CFG1CLR);
+                __raw_writel(1 << bit, base + IC_CFG0SET);
                 handler = handle_edge_irq;
                 name = "riseedge";
                 break;
         case IRQ_TYPE_EDGE_FALLING:     /* 0:1:0 */
-                au_writel(1 << bit, icr[5]);
-                au_writel(1 << bit, icr[1]);
-                au_writel(1 << bit, icr[3]);
+                __raw_writel(1 << bit, base + IC_CFG2CLR);
+                __raw_writel(1 << bit, base + IC_CFG1SET);
+                __raw_writel(1 << bit, base + IC_CFG0CLR);
                 handler = handle_edge_irq;
                 name = "falledge";
                 break;
         case IRQ_TYPE_EDGE_BOTH:        /* 0:1:1 */
-                au_writel(1 << bit, icr[5]);
-                au_writel(1 << bit, icr[1]);
-                au_writel(1 << bit, icr[0]);
+                __raw_writel(1 << bit, base + IC_CFG2CLR);
+                __raw_writel(1 << bit, base + IC_CFG1SET);
+                __raw_writel(1 << bit, base + IC_CFG0SET);
                 handler = handle_edge_irq;
                 name = "bothedge";
                 break;
         case IRQ_TYPE_LEVEL_HIGH:       /* 1:0:1 */
-                au_writel(1 << bit, icr[2]);
-                au_writel(1 << bit, icr[4]);
-                au_writel(1 << bit, icr[0]);
+                __raw_writel(1 << bit, base + IC_CFG2SET);
+                __raw_writel(1 << bit, base + IC_CFG1CLR);
+                __raw_writel(1 << bit, base + IC_CFG0SET);
                 handler = handle_level_irq;
                 name = "hilevel";
                 break;
         case IRQ_TYPE_LEVEL_LOW:        /* 1:1:0 */
-                au_writel(1 << bit, icr[2]);
-                au_writel(1 << bit, icr[1]);
-                au_writel(1 << bit, icr[3]);
+                __raw_writel(1 << bit, base + IC_CFG2SET);
+                __raw_writel(1 << bit, base + IC_CFG1SET);
+                __raw_writel(1 << bit, base + IC_CFG0CLR);
                 handler = handle_level_irq;
                 name = "lowlevel";
                 break;
         case IRQ_TYPE_NONE:             /* 0:0:0 */
-                au_writel(1 << bit, icr[5]);
-                au_writel(1 << bit, icr[4]);
-                au_writel(1 << bit, icr[3]);
+                __raw_writel(1 << bit, base + IC_CFG2CLR);
+                __raw_writel(1 << bit, base + IC_CFG1CLR);
+                __raw_writel(1 << bit, base + IC_CFG0CLR);
                 break;
         default:
                 ret = -EINVAL;
         }
         __irq_set_chip_handler_name_locked(d->irq, chip, handler, name);
 
-        au_sync();
+        wmb();
 
         return ret;
 }
@@ -444,21 +479,21 @@ asmlinkage void plat_irq_dispatch(void)
                 off = MIPS_CPU_IRQ_BASE + 7;
                 goto handle;
         } else if (pending & CAUSEF_IP2) {
-                s = IC0_REQ0INT;
+                s = KSEG1ADDR(AU1000_IC0_PHYS_ADDR) + IC_REQ0INT;
                 off = AU1000_INTC0_INT_BASE;
         } else if (pending & CAUSEF_IP3) {
-                s = IC0_REQ1INT;
+                s = KSEG1ADDR(AU1000_IC0_PHYS_ADDR) + IC_REQ1INT;
                 off = AU1000_INTC0_INT_BASE;
         } else if (pending & CAUSEF_IP4) {
-                s = IC1_REQ0INT;
+                s = KSEG1ADDR(AU1000_IC1_PHYS_ADDR) + IC_REQ0INT;
                 off = AU1000_INTC1_INT_BASE;
         } else if (pending & CAUSEF_IP5) {
-                s = IC1_REQ1INT;
+                s = KSEG1ADDR(AU1000_IC1_PHYS_ADDR) + IC_REQ1INT;
                 off = AU1000_INTC1_INT_BASE;
         } else
                 goto spurious;
 
-        s = au_readl(s);
+        s = __raw_readl((void __iomem *)s);
         if (unlikely(!s)) {
 spurious:
                 spurious_interrupt();
@@ -469,48 +504,42 @@ handle:
         do_IRQ(off);
 }
 
+
+static inline void ic_init(void __iomem *base)
+{
+        /* initialize interrupt controller to a safe state */
+        __raw_writel(0xffffffff, base + IC_CFG0CLR);
+        __raw_writel(0xffffffff, base + IC_CFG1CLR);
+        __raw_writel(0xffffffff, base + IC_CFG2CLR);
+        __raw_writel(0xffffffff, base + IC_MASKCLR);
+        __raw_writel(0xffffffff, base + IC_ASSIGNCLR);
+        __raw_writel(0xffffffff, base + IC_WAKECLR);
+        __raw_writel(0xffffffff, base + IC_SRCSET);
+        __raw_writel(0xffffffff, base + IC_FALLINGCLR);
+        __raw_writel(0xffffffff, base + IC_RISINGCLR);
+        __raw_writel(0x00000000, base + IC_TESTBIT);
+        wmb();
+}
+
 static void __init au1000_init_irq(struct au1xxx_irqmap *map)
 {
         unsigned int bit, irq_nr;
-        int i;
-
-        /*
-         * Initialize interrupt controllers to a safe state.
-         */
-        au_writel(0xffffffff, IC0_CFG0CLR);
-        au_writel(0xffffffff, IC0_CFG1CLR);
-        au_writel(0xffffffff, IC0_CFG2CLR);
-        au_writel(0xffffffff, IC0_MASKCLR);
-        au_writel(0xffffffff, IC0_ASSIGNCLR);
-        au_writel(0xffffffff, IC0_WAKECLR);
-        au_writel(0xffffffff, IC0_SRCSET);
-        au_writel(0xffffffff, IC0_FALLINGCLR);
-        au_writel(0xffffffff, IC0_RISINGCLR);
-        au_writel(0x00000000, IC0_TESTBIT);
-
-        au_writel(0xffffffff, IC1_CFG0CLR);
-        au_writel(0xffffffff, IC1_CFG1CLR);
-        au_writel(0xffffffff, IC1_CFG2CLR);
-        au_writel(0xffffffff, IC1_MASKCLR);
-        au_writel(0xffffffff, IC1_ASSIGNCLR);
-        au_writel(0xffffffff, IC1_WAKECLR);
-        au_writel(0xffffffff, IC1_SRCSET);
-        au_writel(0xffffffff, IC1_FALLINGCLR);
-        au_writel(0xffffffff, IC1_RISINGCLR);
-        au_writel(0x00000000, IC1_TESTBIT);
+        void __iomem *base;
 
+        ic_init((void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR));
+        ic_init((void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR));
         mips_cpu_irq_init();
 
         /* register all 64 possible IC0+IC1 irq sources as type "none".
          * Use set_irq_type() to set edge/level behaviour at runtime.
          */
-        for (i = AU1000_INTC0_INT_BASE;
-             (i < AU1000_INTC0_INT_BASE + 32); i++)
-                au1x_ic_settype(irq_get_irq_data(i), IRQ_TYPE_NONE);
+        for (irq_nr = AU1000_INTC0_INT_BASE;
+             (irq_nr < AU1000_INTC0_INT_BASE + 32); irq_nr++)
+                au1x_ic_settype(irq_get_irq_data(irq_nr), IRQ_TYPE_NONE);
 
-        for (i = AU1000_INTC1_INT_BASE;
-             (i < AU1000_INTC1_INT_BASE + 32); i++)
-                au1x_ic_settype(irq_get_irq_data(i), IRQ_TYPE_NONE);
+        for (irq_nr = AU1000_INTC1_INT_BASE;
+             (irq_nr < AU1000_INTC1_INT_BASE + 32); irq_nr++)
+                au1x_ic_settype(irq_get_irq_data(irq_nr), IRQ_TYPE_NONE);
 
         /*
          * Initialize IC0, which is fixed per processor.
@@ -520,13 +549,13 @@ static void __init au1000_init_irq(struct au1xxx_irqmap *map)
 
                 if (irq_nr >= AU1000_INTC1_INT_BASE) {
                         bit = irq_nr - AU1000_INTC1_INT_BASE;
-                        if (map->im_request)
-                                au_writel(1 << bit, IC1_ASSIGNSET);
+                        base = (void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR);
                 } else {
                         bit = irq_nr - AU1000_INTC0_INT_BASE;
-                        if (map->im_request)
-                                au_writel(1 << bit, IC0_ASSIGNSET);
+                        base = (void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR);
                 }
+                if (map->im_request)
+                        __raw_writel(1 << bit, base + IC_ASSIGNSET);
 
                 au1x_ic_settype(irq_get_irq_data(irq_nr), map->im_type);
                 ++map;
@@ -556,90 +585,62 @@ void __init arch_init_irq(void)
         }
 }
 
-struct alchemy_ic_sysdev {
-        struct sys_device sysdev;
-        void __iomem *base;
-        unsigned long pmdata[7];
-};
 
-static int alchemy_ic_suspend(struct sys_device *dev, pm_message_t state)
-{
-        struct alchemy_ic_sysdev *icdev =
-                        container_of(dev, struct alchemy_ic_sysdev, sysdev);
+static unsigned long alchemy_ic_pmdata[7 * 2];
 
-        icdev->pmdata[0] = __raw_readl(icdev->base + IC_CFG0RD);
-        icdev->pmdata[1] = __raw_readl(icdev->base + IC_CFG1RD);
-        icdev->pmdata[2] = __raw_readl(icdev->base + IC_CFG2RD);
-        icdev->pmdata[3] = __raw_readl(icdev->base + IC_SRCRD);
-        icdev->pmdata[4] = __raw_readl(icdev->base + IC_ASSIGNRD);
-        icdev->pmdata[5] = __raw_readl(icdev->base + IC_WAKERD);
-        icdev->pmdata[6] = __raw_readl(icdev->base + IC_MASKRD);
-
-        return 0;
+static inline void alchemy_ic_suspend_one(void __iomem *base, unsigned long *d)
+{
+        d[0] = __raw_readl(base + IC_CFG0RD);
+        d[1] = __raw_readl(base + IC_CFG1RD);
+        d[2] = __raw_readl(base + IC_CFG2RD);
+        d[3] = __raw_readl(base + IC_SRCRD);
+        d[4] = __raw_readl(base + IC_ASSIGNRD);
+        d[5] = __raw_readl(base + IC_WAKERD);
+        d[6] = __raw_readl(base + IC_MASKRD);
+        ic_init(base);          /* shut it up too while at it */
 }
 
-static int alchemy_ic_resume(struct sys_device *dev)
+static inline void alchemy_ic_resume_one(void __iomem *base, unsigned long *d)
 {
-        struct alchemy_ic_sysdev *icdev =
-                        container_of(dev, struct alchemy_ic_sysdev, sysdev);
-
-        __raw_writel(0xffffffff, icdev->base + IC_MASKCLR);
-        __raw_writel(0xffffffff, icdev->base + IC_CFG0CLR);
-        __raw_writel(0xffffffff, icdev->base + IC_CFG1CLR);
-        __raw_writel(0xffffffff, icdev->base + IC_CFG2CLR);
-        __raw_writel(0xffffffff, icdev->base + IC_SRCCLR);
-        __raw_writel(0xffffffff, icdev->base + IC_ASSIGNCLR);
-        __raw_writel(0xffffffff, icdev->base + IC_WAKECLR);
-        __raw_writel(0xffffffff, icdev->base + IC_RISINGCLR);
-        __raw_writel(0xffffffff, icdev->base + IC_FALLINGCLR);
-        __raw_writel(0x00000000, icdev->base + IC_TESTBIT);
-        wmb();
-        __raw_writel(icdev->pmdata[0], icdev->base + IC_CFG0SET);
-        __raw_writel(icdev->pmdata[1], icdev->base + IC_CFG1SET);
-        __raw_writel(icdev->pmdata[2], icdev->base + IC_CFG2SET);
-        __raw_writel(icdev->pmdata[3], icdev->base + IC_SRCSET);
-        __raw_writel(icdev->pmdata[4], icdev->base + IC_ASSIGNSET);
-        __raw_writel(icdev->pmdata[5], icdev->base + IC_WAKESET);
+        ic_init(base);
+
+        __raw_writel(d[0], base + IC_CFG0SET);
+        __raw_writel(d[1], base + IC_CFG1SET);
+        __raw_writel(d[2], base + IC_CFG2SET);
+        __raw_writel(d[3], base + IC_SRCSET);
+        __raw_writel(d[4], base + IC_ASSIGNSET);
+        __raw_writel(d[5], base + IC_WAKESET);
         wmb();
 
-        __raw_writel(icdev->pmdata[6], icdev->base + IC_MASKSET);
+        __raw_writel(d[6], base + IC_MASKSET);
         wmb();
+}
 
+static int alchemy_ic_suspend(void)
+{
+        alchemy_ic_suspend_one((void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR),
+                               alchemy_ic_pmdata);
+        alchemy_ic_suspend_one((void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR),
+                               &alchemy_ic_pmdata[7]);
         return 0;
 }
 
-static struct sysdev_class alchemy_ic_sysdev_class = {
-        .name           = "ic",
+static void alchemy_ic_resume(void)
+{
+        alchemy_ic_resume_one((void __iomem *)KSEG1ADDR(AU1000_IC1_PHYS_ADDR),
+                              &alchemy_ic_pmdata[7]);
+        alchemy_ic_resume_one((void __iomem *)KSEG1ADDR(AU1000_IC0_PHYS_ADDR),
+                              alchemy_ic_pmdata);
+}
+
+static struct syscore_ops alchemy_ic_syscore_ops = {
         .suspend        = alchemy_ic_suspend,
         .resume         = alchemy_ic_resume,
 };
 
-static int __init alchemy_ic_sysdev_init(void)
+static int __init alchemy_ic_pm_init(void)
 {
-        struct alchemy_ic_sysdev *icdev;
-        unsigned long icbase[2] = { IC0_PHYS_ADDR, IC1_PHYS_ADDR };
-        int err, i;
-
-        err = sysdev_class_register(&alchemy_ic_sysdev_class);
-        if (err)
-                return err;
-
-        for (i = 0; i < 2; i++) {
-                icdev = kzalloc(sizeof(struct alchemy_ic_sysdev), GFP_KERNEL);
-                if (!icdev)
-                        return -ENOMEM;
-
-                icdev->base = ioremap(icbase[i], 0x1000);
-
-                icdev->sysdev.id = i;
-                icdev->sysdev.cls = &alchemy_ic_sysdev_class;
-                err = sysdev_register(&icdev->sysdev);
-                if (err) {
-                        kfree(icdev);
-                        return err;
-                }
-        }
-
+        register_syscore_ops(&alchemy_ic_syscore_ops);
         return 0;
 }
-device_initcall(alchemy_ic_sysdev_init);
+device_initcall(alchemy_ic_pm_init);
diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c
index 9e7814db3d03..3b2c18b14341 100644
--- a/arch/mips/alchemy/common/platform.c
+++ b/arch/mips/alchemy/common/platform.c
@@ -13,9 +13,10 @@
 
 #include <linux/dma-mapping.h>
 #include <linux/etherdevice.h>
+#include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
-#include <linux/init.h>
+#include <linux/slab.h>
 
 #include <asm/mach-au1x00/au1xxx.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
@@ -30,21 +31,12 @@ static void alchemy_8250_pm(struct uart_port *port, unsigned int state,
 #ifdef CONFIG_SERIAL_8250
         switch (state) {
         case 0:
-                if ((__raw_readl(port->membase + UART_MOD_CNTRL) & 3) != 3) {
-                        /* power-on sequence as suggested in the databooks */
-                        __raw_writel(0, port->membase + UART_MOD_CNTRL);
-                        wmb();
-                        __raw_writel(1, port->membase + UART_MOD_CNTRL);
-                        wmb();
-                }
-                __raw_writel(3, port->membase + UART_MOD_CNTRL); /* full on */
-                wmb();
+                alchemy_uart_enable(CPHYSADDR(port->membase));
                 serial8250_do_pm(port, state, old_state);
                 break;
         case 3:         /* power off */
                 serial8250_do_pm(port, state, old_state);
-                __raw_writel(0, port->membase + UART_MOD_CNTRL);
-                wmb();
+                alchemy_uart_disable(CPHYSADDR(port->membase));
                 break;
         default:
                 serial8250_do_pm(port, state, old_state);
@@ -65,38 +57,60 @@ static void alchemy_8250_pm(struct uart_port *port, unsigned int state,
                 .pm             = alchemy_8250_pm,              \
         }
 
-static struct plat_serial8250_port au1x00_uart_data[] = {
-#if defined(CONFIG_SOC_AU1000)
-        PORT(UART0_PHYS_ADDR, AU1000_UART0_INT),
-        PORT(UART1_PHYS_ADDR, AU1000_UART1_INT),
-        PORT(UART2_PHYS_ADDR, AU1000_UART2_INT),
-        PORT(UART3_PHYS_ADDR, AU1000_UART3_INT),
-#elif defined(CONFIG_SOC_AU1500)
-        PORT(UART0_PHYS_ADDR, AU1500_UART0_INT),
-        PORT(UART3_PHYS_ADDR, AU1500_UART3_INT),
-#elif defined(CONFIG_SOC_AU1100)
-        PORT(UART0_PHYS_ADDR, AU1100_UART0_INT),
-        PORT(UART1_PHYS_ADDR, AU1100_UART1_INT),
-        PORT(UART3_PHYS_ADDR, AU1100_UART3_INT),
-#elif defined(CONFIG_SOC_AU1550)
-        PORT(UART0_PHYS_ADDR, AU1550_UART0_INT),
-        PORT(UART1_PHYS_ADDR, AU1550_UART1_INT),
-        PORT(UART3_PHYS_ADDR, AU1550_UART3_INT),
-#elif defined(CONFIG_SOC_AU1200)
-        PORT(UART0_PHYS_ADDR, AU1200_UART0_INT),
-        PORT(UART1_PHYS_ADDR, AU1200_UART1_INT),
-#endif
-        { },
+static struct plat_serial8250_port au1x00_uart_data[][4] __initdata = {
+        [ALCHEMY_CPU_AU1000] = {
+                PORT(AU1000_UART0_PHYS_ADDR, AU1000_UART0_INT),
+                PORT(AU1000_UART1_PHYS_ADDR, AU1000_UART1_INT),
+                PORT(AU1000_UART2_PHYS_ADDR, AU1000_UART2_INT),
+                PORT(AU1000_UART3_PHYS_ADDR, AU1000_UART3_INT),
+        },
+        [ALCHEMY_CPU_AU1500] = {
+                PORT(AU1000_UART0_PHYS_ADDR, AU1500_UART0_INT),
+                PORT(AU1000_UART3_PHYS_ADDR, AU1500_UART3_INT),
+        },
+        [ALCHEMY_CPU_AU1100] = {
+                PORT(AU1000_UART0_PHYS_ADDR, AU1100_UART0_INT),
+                PORT(AU1000_UART1_PHYS_ADDR, AU1100_UART1_INT),
+                PORT(AU1000_UART3_PHYS_ADDR, AU1100_UART3_INT),
+        },
+        [ALCHEMY_CPU_AU1550] = {
+                PORT(AU1000_UART0_PHYS_ADDR, AU1550_UART0_INT),
+                PORT(AU1000_UART1_PHYS_ADDR, AU1550_UART1_INT),
+                PORT(AU1000_UART3_PHYS_ADDR, AU1550_UART3_INT),
+        },
+        [ALCHEMY_CPU_AU1200] = {
+                PORT(AU1000_UART0_PHYS_ADDR, AU1200_UART0_INT),
+                PORT(AU1000_UART1_PHYS_ADDR, AU1200_UART1_INT),
+        },
 };
 
 static struct platform_device au1xx0_uart_device = {
         .name                   = "serial8250",
         .id                     = PLAT8250_DEV_AU1X00,
-        .dev                    = {
-                .platform_data  = au1x00_uart_data,
-        },
 };
 
+static void __init alchemy_setup_uarts(int ctype)
+{
+        unsigned int uartclk = get_au1x00_uart_baud_base() * 16;
+        int s = sizeof(struct plat_serial8250_port);
+        int c = alchemy_get_uarts(ctype);
+        struct plat_serial8250_port *ports;
+
+        ports = kzalloc(s * (c + 1), GFP_KERNEL);
+        if (!ports) {
+                printk(KERN_INFO "Alchemy: no memory for UART data\n");
+                return;
+        }
+        memcpy(ports, au1x00_uart_data[ctype], s * c);
+        au1xx0_uart_device.dev.platform_data = ports;
+
+        /* Fill up uartclk. */
+        for (s = 0; s < c; s++)
+                ports[s].uartclk = uartclk;
+        if (platform_device_register(&au1xx0_uart_device))
+                printk(KERN_INFO "Alchemy: failed to register UARTs\n");
+}
+
 /* OHCI (USB full speed host controller) */
 static struct resource au1xxx_usb_ohci_resources[] = {
         [0] = {
@@ -269,8 +283,8 @@ extern struct au1xmmc_platform_data au1xmmc_platdata[2];
 
 static struct resource au1200_mmc0_resources[] = {
         [0] = {
-                .start          = SD0_PHYS_ADDR,
-                .end            = SD0_PHYS_ADDR + 0x7ffff,
+                .start          = AU1100_SD0_PHYS_ADDR,
+                .end            = AU1100_SD0_PHYS_ADDR + 0xfff,
                 .flags          = IORESOURCE_MEM,
         },
         [1] = {
@@ -305,8 +319,8 @@ static struct platform_device au1200_mmc0_device = {
 #ifndef CONFIG_MIPS_DB1200
 static struct resource au1200_mmc1_resources[] = {
         [0] = {
-                .start          = SD1_PHYS_ADDR,
-                .end            = SD1_PHYS_ADDR + 0x7ffff,
+                .start          = AU1100_SD1_PHYS_ADDR,
+                .end            = AU1100_SD1_PHYS_ADDR + 0xfff,
                 .flags          = IORESOURCE_MEM,
         },
         [1] = {
@@ -359,15 +373,16 @@ static struct platform_device pbdb_smbus_device = {
 #endif
 
 /* Macro to help defining the Ethernet MAC resources */
+#define MAC_RES_COUNT   3       /* MAC regs base, MAC enable reg, MAC INT */
 #define MAC_RES(_base, _enable, _irq)                   \
         {                                               \
-                .start  = CPHYSADDR(_base),             \
-                .end    = CPHYSADDR(_base + 0xffff),    \
+                .start  = _base,                        \
+                .end    = _base + 0xffff,               \
                 .flags  = IORESOURCE_MEM,               \
         },                                              \
         {                                               \
-                .start  = CPHYSADDR(_enable),           \
-                .end    = CPHYSADDR(_enable + 0x3),     \
+                .start  = _enable,                      \
+                .end    = _enable + 0x3,                \
                 .flags  = IORESOURCE_MEM,               \
         },                                              \
         {                                               \
@@ -376,19 +391,29 @@ static struct platform_device pbdb_smbus_device = {
                 .flags  = IORESOURCE_IRQ                \
         }
 
-static struct resource au1xxx_eth0_resources[] = {
-#if defined(CONFIG_SOC_AU1000)
-        MAC_RES(AU1000_ETH0_BASE, AU1000_MAC0_ENABLE, AU1000_MAC0_DMA_INT),
-#elif defined(CONFIG_SOC_AU1100)
-        MAC_RES(AU1100_ETH0_BASE, AU1100_MAC0_ENABLE, AU1100_MAC0_DMA_INT),
-#elif defined(CONFIG_SOC_AU1550)
-        MAC_RES(AU1550_ETH0_BASE, AU1550_MAC0_ENABLE, AU1550_MAC0_DMA_INT),
-#elif defined(CONFIG_SOC_AU1500)
-        MAC_RES(AU1500_ETH0_BASE, AU1500_MAC0_ENABLE, AU1500_MAC0_DMA_INT),
-#endif
+static struct resource au1xxx_eth0_resources[][MAC_RES_COUNT] __initdata = {
+        [ALCHEMY_CPU_AU1000] = {
+                MAC_RES(AU1000_MAC0_PHYS_ADDR,
+                        AU1000_MACEN_PHYS_ADDR,
+                        AU1000_MAC0_DMA_INT)
+        },
+        [ALCHEMY_CPU_AU1500] = {
+                MAC_RES(AU1500_MAC0_PHYS_ADDR,
+                        AU1500_MACEN_PHYS_ADDR,
+                        AU1500_MAC0_DMA_INT)
+        },
+        [ALCHEMY_CPU_AU1100] = {
+                MAC_RES(AU1000_MAC0_PHYS_ADDR,
+                        AU1000_MACEN_PHYS_ADDR,
+                        AU1100_MAC0_DMA_INT)
+        },
+        [ALCHEMY_CPU_AU1550] = {
+                MAC_RES(AU1000_MAC0_PHYS_ADDR,
+                        AU1000_MACEN_PHYS_ADDR,
+                        AU1550_MAC0_DMA_INT)
+        },
 };
 
-
 static struct au1000_eth_platform_data au1xxx_eth0_platform_data = {
         .phy1_search_mac0 = 1,
 };
@@ -396,20 +421,26 @@ static struct au1000_eth_platform_data au1xxx_eth0_platform_data = {
 static struct platform_device au1xxx_eth0_device = {
         .name           = "au1000-eth",
         .id             = 0,
-        .num_resources  = ARRAY_SIZE(au1xxx_eth0_resources),
-        .resource       = au1xxx_eth0_resources,
+        .num_resources  = MAC_RES_COUNT,
         .dev.platform_data = &au1xxx_eth0_platform_data,
 };
 
-#ifndef CONFIG_SOC_AU1100
-static struct resource au1xxx_eth1_resources[] = {
-#if defined(CONFIG_SOC_AU1000)
-        MAC_RES(AU1000_ETH1_BASE, AU1000_MAC1_ENABLE, AU1000_MAC1_DMA_INT),
-#elif defined(CONFIG_SOC_AU1550)
-        MAC_RES(AU1550_ETH1_BASE, AU1550_MAC1_ENABLE, AU1550_MAC1_DMA_INT),
-#elif defined(CONFIG_SOC_AU1500)
-        MAC_RES(AU1500_ETH1_BASE, AU1500_MAC1_ENABLE, AU1500_MAC1_DMA_INT),
-#endif
+static struct resource au1xxx_eth1_resources[][MAC_RES_COUNT] __initdata = {
+        [ALCHEMY_CPU_AU1000] = {
+                MAC_RES(AU1000_MAC1_PHYS_ADDR,
+                        AU1000_MACEN_PHYS_ADDR + 4,
+                        AU1000_MAC1_DMA_INT)
+        },
+        [ALCHEMY_CPU_AU1500] = {
+                MAC_RES(AU1500_MAC1_PHYS_ADDR,
+                        AU1500_MACEN_PHYS_ADDR + 4,
+                        AU1500_MAC1_DMA_INT)
+        },
+        [ALCHEMY_CPU_AU1550] = {
+                MAC_RES(AU1000_MAC1_PHYS_ADDR,
+                        AU1000_MACEN_PHYS_ADDR + 4,
+                        AU1550_MAC1_DMA_INT)
+        },
 };
 
 static struct au1000_eth_platform_data au1xxx_eth1_platform_data = {
@@ -419,11 +450,9 @@ static struct au1000_eth_platform_data au1xxx_eth1_platform_data = {
 static struct platform_device au1xxx_eth1_device = {
         .name           = "au1000-eth",
         .id             = 1,
-        .num_resources  = ARRAY_SIZE(au1xxx_eth1_resources),
-        .resource       = au1xxx_eth1_resources,
+        .num_resources  = MAC_RES_COUNT,
         .dev.platform_data = &au1xxx_eth1_platform_data,
 };
-#endif
 
 void __init au1xxx_override_eth_cfg(unsigned int port,
                         struct au1000_eth_platform_data *eth_data)
@@ -434,15 +463,65 @@ void __init au1xxx_override_eth_cfg(unsigned int port,
         if (port == 0)
                 memcpy(&au1xxx_eth0_platform_data, eth_data,
                         sizeof(struct au1000_eth_platform_data));
-#ifndef CONFIG_SOC_AU1100
         else
                 memcpy(&au1xxx_eth1_platform_data, eth_data,
                         sizeof(struct au1000_eth_platform_data));
-#endif
+}
+
+static void __init alchemy_setup_macs(int ctype)
+{
+        int ret, i;
+        unsigned char ethaddr[6];
+        struct resource *macres;
+
+        /* Handle 1st MAC */
+        if (alchemy_get_macs(ctype) < 1)
+                return;
+
+        macres = kmalloc(sizeof(struct resource) * MAC_RES_COUNT, GFP_KERNEL);
+        if (!macres) {
+                printk(KERN_INFO "Alchemy: no memory for MAC0 resources\n");
+                return;
+        }
+        memcpy(macres, au1xxx_eth0_resources[ctype],
+               sizeof(struct resource) * MAC_RES_COUNT);
+        au1xxx_eth0_device.resource = macres;
+
+        i = prom_get_ethernet_addr(ethaddr);
+        if (!i && !is_valid_ether_addr(au1xxx_eth0_platform_data.mac))
+                memcpy(au1xxx_eth0_platform_data.mac, ethaddr, 6);
+
+        ret = platform_device_register(&au1xxx_eth0_device);
+        if (!ret)
+                printk(KERN_INFO "Alchemy: failed to register MAC0\n");
+
+
+        /* Handle 2nd MAC */
+        if (alchemy_get_macs(ctype) < 2)
+                return;
+
+        macres = kmalloc(sizeof(struct resource) * MAC_RES_COUNT, GFP_KERNEL);
+        if (!macres) {
+                printk(KERN_INFO "Alchemy: no memory for MAC1 resources\n");
+                return;
+        }
+        memcpy(macres, au1xxx_eth1_resources[ctype],
+               sizeof(struct resource) * MAC_RES_COUNT);
+        au1xxx_eth1_device.resource = macres;
+
+        ethaddr[5] += 1;        /* next addr for 2nd MAC */
+        if (!i && !is_valid_ether_addr(au1xxx_eth1_platform_data.mac))
+                memcpy(au1xxx_eth1_platform_data.mac, ethaddr, 6);
+
+        /* Register second MAC if enabled in pinfunc */
+        if (!(au_readl(SYS_PINFUNC) & (u32)SYS_PF_NI2)) {
+                ret = platform_device_register(&au1xxx_eth1_device);
+                if (ret)
+                        printk(KERN_INFO "Alchemy: failed to register MAC1\n");
+        }
 }
 
 static struct platform_device *au1xxx_platform_devices[] __initdata = {
-        &au1xx0_uart_device,
         &au1xxx_usb_ohci_device,
 #ifdef CONFIG_FB_AU1100
         &au1100_lcd_device,
@@ -460,36 +539,17 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = {
 #ifdef SMBUS_PSC_BASE
         &pbdb_smbus_device,
 #endif
-        &au1xxx_eth0_device,
 };
 
 static int __init au1xxx_platform_init(void)
 {
-        unsigned int uartclk = get_au1x00_uart_baud_base() * 16;
-        int err, i;
-        unsigned char ethaddr[6];
+        int err, ctype = alchemy_get_cputype();
 
-        /* Fill up uartclk. */
-        for (i = 0; au1x00_uart_data[i].flags; i++)
-                au1x00_uart_data[i].uartclk = uartclk;
-
-        /* use firmware-provided mac addr if available and necessary */
-        i = prom_get_ethernet_addr(ethaddr);
-        if (!i && !is_valid_ether_addr(au1xxx_eth0_platform_data.mac))
-                memcpy(au1xxx_eth0_platform_data.mac, ethaddr, 6);
+        alchemy_setup_uarts(ctype);
+        alchemy_setup_macs(ctype);
 
         err = platform_add_devices(au1xxx_platform_devices,
                                    ARRAY_SIZE(au1xxx_platform_devices));
-#ifndef CONFIG_SOC_AU1100
-        ethaddr[5] += 1;        /* next addr for 2nd MAC */
-        if (!i && !is_valid_ether_addr(au1xxx_eth1_platform_data.mac))
-                memcpy(au1xxx_eth1_platform_data.mac, ethaddr, 6);
-
-        /* Register second MAC if enabled in pinfunc */
-        if (!err && !(au_readl(SYS_PINFUNC) & (u32)SYS_PF_NI2))
-                err = platform_device_register(&au1xxx_eth1_device);
-#endif
-
         return err;
 }
 
diff --git a/arch/mips/alchemy/common/setup.c b/arch/mips/alchemy/common/setup.c
index 561e5da2658b..1b887c868417 100644
--- a/arch/mips/alchemy/common/setup.c
+++ b/arch/mips/alchemy/common/setup.c
@@ -52,8 +52,6 @@ void __init plat_mem_setup(void)
         /* this is faster than wasting cycles trying to approximate it */
         preset_lpj = (est_freq >> 1) / HZ;
 
-        board_setup();  /* board specific setup */
-
         if (au1xxx_cpu_needs_config_od())
                 /* Various early Au1xx0 errata corrected by this */
                 set_c0_config(1 << 19); /* Set Config[OD] */
@@ -61,6 +59,8 @@ void __init plat_mem_setup(void)
                 /* Clear to obtain best system bus performance */
                 clear_c0_config(1 << 19); /* Clear Config[OD] */
 
+        board_setup();  /* board specific setup */
+
         /* IO/MEM resources. */
         set_io_port_base(0);
         ioport_resource.start = IOPORT_RESOURCE_START;
diff --git a/arch/mips/alchemy/common/time.c b/arch/mips/alchemy/common/time.c
index 2aecb2fdf982..d5da6adbf634 100644
--- a/arch/mips/alchemy/common/time.c
+++ b/arch/mips/alchemy/common/time.c
@@ -141,8 +141,7 @@ static int __init alchemy_time_init(unsigned int m2int)
                 goto cntr_err;
 
         /* register counter1 clocksource and event device */
-        clocksource_set_clock(&au1x_counter1_clocksource, 32768);
-        clocksource_register(&au1x_counter1_clocksource);
+        clocksource_register_hz(&au1x_counter1_clocksource, 32768);
 
         cd->shift = 32;
         cd->mult = div_sc(32768, NSEC_PER_SEC, cd->shift);
diff --git a/arch/mips/alchemy/devboards/db1200/setup.c b/arch/mips/alchemy/devboards/db1200/setup.c
index 4a8980027ecf..1dac4f27d334 100644
--- a/arch/mips/alchemy/devboards/db1200/setup.c
+++ b/arch/mips/alchemy/devboards/db1200/setup.c
@@ -23,6 +23,13 @@ void __init board_setup(void)
         unsigned long freq0, clksrc, div, pfc;
         unsigned short whoami;
 
+        /* Set Config[OD] (disable overlapping bus transaction):
+         * This gets rid of a _lot_ of spurious interrupts (especially
+         * wrt. IDE); but incurs ~10% performance hit in some
+         * cpu-bound applications.
+         */
+        set_c0_config(1 << 19);
+
         bcsr_init(DB1200_BCSR_PHYS_ADDR,
                   DB1200_BCSR_PHYS_ADDR + DB1200_BCSR_HEXLED_OFS);
 
diff --git a/arch/mips/alchemy/devboards/pb1000/board_setup.c b/arch/mips/alchemy/devboards/pb1000/board_setup.c
index 2d85c4b5be09..e64fdcbf75d0 100644
--- a/arch/mips/alchemy/devboards/pb1000/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1000/board_setup.c
@@ -65,7 +65,7 @@ void __init board_setup(void)
 
         /* Set AUX clock to 12 MHz * 8 = 96 MHz */
         au_writel(8, SYS_AUXPLL);
-        au_writel(0, SYS_PINSTATERD);
+        alchemy_gpio1_input_enable();
         udelay(100);
 
 #if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
diff --git a/arch/mips/alchemy/devboards/pb1500/board_setup.c b/arch/mips/alchemy/devboards/pb1500/board_setup.c
index 83f46215eb0c..3b4fa3206969 100644
--- a/arch/mips/alchemy/devboards/pb1500/board_setup.c
+++ b/arch/mips/alchemy/devboards/pb1500/board_setup.c
@@ -56,7 +56,7 @@ void __init board_setup(void)
         sys_clksrc = sys_freqctrl = pin_func = 0;
         /* Set AUX clock to 12 MHz * 8 = 96 MHz */
         au_writel(8, SYS_AUXPLL);
-        au_writel(0, SYS_PINSTATERD);
+        alchemy_gpio1_input_enable();
         udelay(100);
 
         /* GPIO201 is input for PCMCIA card detect */
diff --git a/arch/mips/alchemy/devboards/prom.c b/arch/mips/alchemy/devboards/prom.c
index baeb21385058..e5306b56da6d 100644
--- a/arch/mips/alchemy/devboards/prom.c
+++ b/arch/mips/alchemy/devboards/prom.c
@@ -62,5 +62,5 @@ void __init prom_init(void)
 
 void prom_putchar(unsigned char c)
 {
-    alchemy_uart_putchar(UART0_PHYS_ADDR, c);
+        alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
 }
diff --git a/arch/mips/alchemy/gpr/board_setup.c b/arch/mips/alchemy/gpr/board_setup.c
index ad2e3f137933..5f8f0691ed2d 100644
--- a/arch/mips/alchemy/gpr/board_setup.c
+++ b/arch/mips/alchemy/gpr/board_setup.c
@@ -36,9 +36,6 @@
 
 #include <prom.h>
 
-#define UART1_ADDR      KSEG1ADDR(UART1_PHYS_ADDR)
-#define UART3_ADDR      KSEG1ADDR(UART3_PHYS_ADDR)
-
 char irq_tab_alchemy[][5] __initdata = {
         [0] = { -1, AU1500_PCI_INTA, AU1500_PCI_INTB, 0xff, 0xff },
 };
@@ -67,18 +64,15 @@ static void gpr_power_off(void)
 
 void __init board_setup(void)
 {
-        printk(KERN_INFO "Tarpeze ITS GPR board\n");
+        printk(KERN_INFO "Trapeze ITS GPR board\n");
 
         pm_power_off = gpr_power_off;
         _machine_halt = gpr_power_off;
         _machine_restart = gpr_reset;
 
-        /* Enable UART3 */
-        au_writel(0x1, UART3_ADDR + UART_MOD_CNTRL);/* clock enable (CE) */
-        au_writel(0x3, UART3_ADDR + UART_MOD_CNTRL); /* CE and "enable" */
-        /* Enable UART1 */
-        au_writel(0x1, UART1_ADDR + UART_MOD_CNTRL); /* clock enable (CE) */
-        au_writel(0x3, UART1_ADDR + UART_MOD_CNTRL); /* CE and "enable" */
+        /* Enable UART1/3 */
+        alchemy_uart_enable(AU1000_UART3_PHYS_ADDR);
+        alchemy_uart_enable(AU1000_UART1_PHYS_ADDR);
 
         /* Take away Reset of UMTS-card */
         alchemy_gpio_direction_output(215, 1);
diff --git a/arch/mips/alchemy/gpr/init.c b/arch/mips/alchemy/gpr/init.c
index f044f4c541d7..229aafae680c 100644
--- a/arch/mips/alchemy/gpr/init.c
+++ b/arch/mips/alchemy/gpr/init.c
@@ -59,5 +59,5 @@ void __init prom_init(void)
 
 void prom_putchar(unsigned char c)
 {
-        alchemy_uart_putchar(UART0_PHYS_ADDR, c);
+        alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
 }
diff --git a/arch/mips/alchemy/mtx-1/board_setup.c b/arch/mips/alchemy/mtx-1/board_setup.c
index cf436ab679ae..3ae984cf98cf 100644
--- a/arch/mips/alchemy/mtx-1/board_setup.c
+++ b/arch/mips/alchemy/mtx-1/board_setup.c
@@ -87,7 +87,7 @@ void __init board_setup(void)
         au_writel(SYS_PF_NI2, SYS_PINFUNC);
 
         /* Initialize GPIO */
-        au_writel(0xFFFFFFFF, SYS_TRIOUTCLR);
+        au_writel(~0, KSEG1ADDR(AU1000_SYS_PHYS_ADDR) + SYS_TRIOUTCLR);
         alchemy_gpio_direction_output(0, 0);    /* Disable M66EN (PCI 66MHz) */
         alchemy_gpio_direction_output(3, 1);    /* Disable PCI CLKRUN# */
         alchemy_gpio_direction_output(1, 1);    /* Enable EXT_IO3 */
diff --git a/arch/mips/alchemy/mtx-1/init.c b/arch/mips/alchemy/mtx-1/init.c
index f8d25575fa05..2e81cc7f3422 100644
--- a/arch/mips/alchemy/mtx-1/init.c
+++ b/arch/mips/alchemy/mtx-1/init.c
@@ -62,5 +62,5 @@ void __init prom_init(void)
 
 void prom_putchar(unsigned char c)
 {
-        alchemy_uart_putchar(UART0_PHYS_ADDR, c);
+        alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
 }
diff --git a/arch/mips/alchemy/mtx-1/platform.c b/arch/mips/alchemy/mtx-1/platform.c
index 956f946218c5..55628e390fd7 100644
--- a/arch/mips/alchemy/mtx-1/platform.c
+++ b/arch/mips/alchemy/mtx-1/platform.c
@@ -53,8 +53,8 @@ static struct platform_device mtx1_button = {
 
 static struct resource mtx1_wdt_res[] = {
         [0] = {
-                .start  = 15,
-                .end    = 15,
+                .start  = 215,
+                .end    = 215,
                 .name   = "mtx1-wdt-gpio",
                 .flags  = IORESOURCE_IRQ,
         }
diff --git a/arch/mips/alchemy/xxs1500/board_setup.c b/arch/mips/alchemy/xxs1500/board_setup.c
index febfb0fb0896..81e57fad07ab 100644
--- a/arch/mips/alchemy/xxs1500/board_setup.c
+++ b/arch/mips/alchemy/xxs1500/board_setup.c
@@ -66,13 +66,10 @@ void __init board_setup(void)
         au_writel(pin_func, SYS_PINFUNC);
 
         /* Enable UART */
-        au_writel(0x01, UART3_ADDR + UART_MOD_CNTRL); /* clock enable (CE) */
-        mdelay(10);
-        au_writel(0x03, UART3_ADDR + UART_MOD_CNTRL); /* CE and "enable" */
-        mdelay(10);
-
-        /* Enable DTR = USB power up */
-        au_writel(0x01, UART3_ADDR + UART_MCR); /* UART_MCR_DTR is 0x01??? */
+        alchemy_uart_enable(AU1000_UART3_PHYS_ADDR);
+        /* Enable DTR (MCR bit 0) = USB power up */
+        __raw_writel(1, (void __iomem *)KSEG1ADDR(AU1000_UART3_PHYS_ADDR + 0x18));
+        wmb();
 
 #ifdef CONFIG_PCI
 #if defined(__MIPSEB__)
diff --git a/arch/mips/alchemy/xxs1500/init.c b/arch/mips/alchemy/xxs1500/init.c
index 34a90a4bb6f4..0ee02cfa989d 100644
--- a/arch/mips/alchemy/xxs1500/init.c
+++ b/arch/mips/alchemy/xxs1500/init.c
@@ -59,5 +59,5 @@ void __init prom_init(void)
 
 void prom_putchar(unsigned char c)
 {
-        alchemy_uart_putchar(UART0_PHYS_ADDR, c);
+        alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
 }
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index b05828260f7f..47707410582c 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -26,12 +26,17 @@ config ATH79_MACH_PB44
 endmenu
 
 config SOC_AR71XX
+        select USB_ARCH_HAS_EHCI
+        select USB_ARCH_HAS_OHCI
         def_bool n
 
 config SOC_AR724X
+        select USB_ARCH_HAS_EHCI
+        select USB_ARCH_HAS_OHCI
         def_bool n
 
 config SOC_AR913X
+        select USB_ARCH_HAS_EHCI
         def_bool n
 
 config ATH79_DEV_AR913X_WMAC
diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c
index e5b6615731e5..54db815bc86c 100644
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2005 Broadcom Corporation
  * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2010-2011 Hauke Mehrtens <hauke@hauke-m.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
@@ -23,7 +24,7 @@
 static char nvram_buf[NVRAM_SPACE];
 
 /* Probe for NVRAM header */
-static void __init early_nvram_init(void)
+static void early_nvram_init(void)
 {
         struct ssb_mipscore *mcore = &ssb_bcm47xx.mipscore;
         struct nvram_header *header;
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index c95f90bf734c..73b529b57433 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -3,6 +3,7 @@
  *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
  *  Copyright (C) 2006 Michael Buesch <mb@bu3sch.de>
  *  Copyright (C) 2010 Waldemar Brodkorb <wbx@openadk.org>
+ *  Copyright (C) 2010-2011 Hauke Mehrtens <hauke@hauke-m.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
@@ -57,10 +58,49 @@ static void bcm47xx_machine_halt(void)
 }
 
 #define READ_FROM_NVRAM(_outvar, name, buf) \
-        if (nvram_getenv(name, buf, sizeof(buf)) >= 0)\
+        if (nvram_getprefix(prefix, name, buf, sizeof(buf)) >= 0)\
                 sprom->_outvar = simple_strtoul(buf, NULL, 0);
 
-static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
+#define READ_FROM_NVRAM2(_outvar, name1, name2, buf) \
+        if (nvram_getprefix(prefix, name1, buf, sizeof(buf)) >= 0 || \
+            nvram_getprefix(prefix, name2, buf, sizeof(buf)) >= 0)\
+                sprom->_outvar = simple_strtoul(buf, NULL, 0);
+
+static inline int nvram_getprefix(const char *prefix, char *name,
+                                  char *buf, int len)
+{
+        if (prefix) {
+                char key[100];
+
+                snprintf(key, sizeof(key), "%s%s", prefix, name);
+                return nvram_getenv(key, buf, len);
+        }
+
+        return nvram_getenv(name, buf, len);
+}
+
+static u32 nvram_getu32(const char *name, char *buf, int len)
+{
+        int rv;
+        char key[100];
+        u16 var0, var1;
+
+        snprintf(key, sizeof(key), "%s0", name);
+        rv = nvram_getenv(key, buf, len);
+        /* return 0 here so this looks like unset */
+        if (rv < 0)
+                return 0;
+        var0 = simple_strtoul(buf, NULL, 0);
+
+        snprintf(key, sizeof(key), "%s1", name);
+        rv = nvram_getenv(key, buf, len);
+        if (rv < 0)
+                return 0;
+        var1 = simple_strtoul(buf, NULL, 0);
+        return var1 << 16 | var0;
+}
+
+static void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix)
 {
         char buf[100];
         u32 boardflags;
@@ -69,11 +109,12 @@ static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
 
         sprom->revision = 1; /* Fallback: Old hardware does not define this. */
         READ_FROM_NVRAM(revision, "sromrev", buf);
-        if (nvram_getenv("il0macaddr", buf, sizeof(buf)) >= 0)
+        if (nvram_getprefix(prefix, "il0macaddr", buf, sizeof(buf)) >= 0 ||
+            nvram_getprefix(prefix, "macaddr", buf, sizeof(buf)) >= 0)
                 nvram_parse_macaddr(buf, sprom->il0mac);
-        if (nvram_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
+        if (nvram_getprefix(prefix, "et0macaddr", buf, sizeof(buf)) >= 0)
                 nvram_parse_macaddr(buf, sprom->et0mac);
-        if (nvram_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
+        if (nvram_getprefix(prefix, "et1macaddr", buf, sizeof(buf)) >= 0)
                 nvram_parse_macaddr(buf, sprom->et1mac);
         READ_FROM_NVRAM(et0phyaddr, "et0phyaddr", buf);
         READ_FROM_NVRAM(et1phyaddr, "et1phyaddr", buf);
@@ -95,20 +136,36 @@ static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
         READ_FROM_NVRAM(pa1hib0, "pa1hib0", buf);
         READ_FROM_NVRAM(pa1hib2, "pa1hib1", buf);
         READ_FROM_NVRAM(pa1hib1, "pa1hib2", buf);
-        READ_FROM_NVRAM(gpio0, "wl0gpio0", buf);
-        READ_FROM_NVRAM(gpio1, "wl0gpio1", buf);
-        READ_FROM_NVRAM(gpio2, "wl0gpio2", buf);
-        READ_FROM_NVRAM(gpio3, "wl0gpio3", buf);
-        READ_FROM_NVRAM(maxpwr_bg, "pa0maxpwr", buf);
-        READ_FROM_NVRAM(maxpwr_al, "pa1lomaxpwr", buf);
-        READ_FROM_NVRAM(maxpwr_a, "pa1maxpwr", buf);
-        READ_FROM_NVRAM(maxpwr_ah, "pa1himaxpwr", buf);
-        READ_FROM_NVRAM(itssi_a, "pa1itssit", buf);
-        READ_FROM_NVRAM(itssi_bg, "pa0itssit", buf);
+        READ_FROM_NVRAM2(gpio0, "ledbh0", "wl0gpio0", buf);
+        READ_FROM_NVRAM2(gpio1, "ledbh1", "wl0gpio1", buf);
+        READ_FROM_NVRAM2(gpio2, "ledbh2", "wl0gpio2", buf);
+        READ_FROM_NVRAM2(gpio3, "ledbh3", "wl0gpio3", buf);
+        READ_FROM_NVRAM2(maxpwr_bg, "maxp2ga0", "pa0maxpwr", buf);
+        READ_FROM_NVRAM2(maxpwr_al, "maxp5gla0", "pa1lomaxpwr", buf);
+        READ_FROM_NVRAM2(maxpwr_a, "maxp5ga0", "pa1maxpwr", buf);
+        READ_FROM_NVRAM2(maxpwr_ah, "maxp5gha0", "pa1himaxpwr", buf);
+        READ_FROM_NVRAM2(itssi_bg, "itt5ga0", "pa0itssit", buf);
+        READ_FROM_NVRAM2(itssi_a, "itt2ga0", "pa1itssit", buf);
         READ_FROM_NVRAM(tri2g, "tri2g", buf);
         READ_FROM_NVRAM(tri5gl, "tri5gl", buf);
         READ_FROM_NVRAM(tri5g, "tri5g", buf);
         READ_FROM_NVRAM(tri5gh, "tri5gh", buf);
+        READ_FROM_NVRAM(txpid2g[0], "txpid2ga0", buf);
+        READ_FROM_NVRAM(txpid2g[1], "txpid2ga1", buf);
+        READ_FROM_NVRAM(txpid2g[2], "txpid2ga2", buf);
+        READ_FROM_NVRAM(txpid2g[3], "txpid2ga3", buf);
+        READ_FROM_NVRAM(txpid5g[0], "txpid5ga0", buf);
+        READ_FROM_NVRAM(txpid5g[1], "txpid5ga1", buf);
+        READ_FROM_NVRAM(txpid5g[2], "txpid5ga2", buf);
+        READ_FROM_NVRAM(txpid5g[3], "txpid5ga3", buf);
+        READ_FROM_NVRAM(txpid5gl[0], "txpid5gla0", buf);
+        READ_FROM_NVRAM(txpid5gl[1], "txpid5gla1", buf);
+        READ_FROM_NVRAM(txpid5gl[2], "txpid5gla2", buf);
+        READ_FROM_NVRAM(txpid5gl[3], "txpid5gla3", buf);
+        READ_FROM_NVRAM(txpid5gh[0], "txpid5gha0", buf);
+        READ_FROM_NVRAM(txpid5gh[1], "txpid5gha1", buf);
+        READ_FROM_NVRAM(txpid5gh[2], "txpid5gha2", buf);
+        READ_FROM_NVRAM(txpid5gh[3], "txpid5gha3", buf);
         READ_FROM_NVRAM(rxpo2g, "rxpo2g", buf);
         READ_FROM_NVRAM(rxpo5g, "rxpo5g", buf);
         READ_FROM_NVRAM(rssisav2g, "rssisav2g", buf);
@@ -120,19 +177,27 @@ static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
         READ_FROM_NVRAM(rssismf5g, "rssismf5g", buf);
         READ_FROM_NVRAM(bxa5g, "bxa5g", buf);
         READ_FROM_NVRAM(cck2gpo, "cck2gpo", buf);
-        READ_FROM_NVRAM(ofdm2gpo, "ofdm2gpo", buf);
-        READ_FROM_NVRAM(ofdm5glpo, "ofdm5glpo", buf);
-        READ_FROM_NVRAM(ofdm5gpo, "ofdm5gpo", buf);
-        READ_FROM_NVRAM(ofdm5ghpo, "ofdm5ghpo", buf);
 
-        if (nvram_getenv("boardflags", buf, sizeof(buf)) >= 0) {
+        sprom->ofdm2gpo = nvram_getu32("ofdm2gpo", buf, sizeof(buf));
+        sprom->ofdm5glpo = nvram_getu32("ofdm5glpo", buf, sizeof(buf));
+        sprom->ofdm5gpo = nvram_getu32("ofdm5gpo", buf, sizeof(buf));
+        sprom->ofdm5ghpo = nvram_getu32("ofdm5ghpo", buf, sizeof(buf));
+
+        READ_FROM_NVRAM(antenna_gain.ghz24.a0, "ag0", buf);
+        READ_FROM_NVRAM(antenna_gain.ghz24.a1, "ag1", buf);
+        READ_FROM_NVRAM(antenna_gain.ghz24.a2, "ag2", buf);
+        READ_FROM_NVRAM(antenna_gain.ghz24.a3, "ag3", buf);
+        memcpy(&sprom->antenna_gain.ghz5, &sprom->antenna_gain.ghz24,
+               sizeof(sprom->antenna_gain.ghz5));
+
+        if (nvram_getprefix(prefix, "boardflags", buf, sizeof(buf)) >= 0) {
                 boardflags = simple_strtoul(buf, NULL, 0);
                 if (boardflags) {
                         sprom->boardflags_lo = (boardflags & 0x0000FFFFU);
                         sprom->boardflags_hi = (boardflags & 0xFFFF0000U) >> 16;
                 }
         }
-        if (nvram_getenv("boardflags2", buf, sizeof(buf)) >= 0) {
+        if (nvram_getprefix(prefix, "boardflags2", buf, sizeof(buf)) >= 0) {
                 boardflags = simple_strtoul(buf, NULL, 0);
                 if (boardflags) {
                         sprom->boardflags2_lo = (boardflags & 0x0000FFFFU);
@@ -141,6 +206,22 @@ static void bcm47xx_fill_sprom(struct ssb_sprom *sprom)
         }
 }
 
+int bcm47xx_get_sprom(struct ssb_bus *bus, struct ssb_sprom *out)
+{
+        char prefix[10];
+
+        if (bus->bustype == SSB_BUSTYPE_PCI) {
+                snprintf(prefix, sizeof(prefix), "pci/%u/%u/",
+                         bus->host_pci->bus->number + 1,
+                         PCI_SLOT(bus->host_pci->devfn));
+                bcm47xx_fill_sprom(out, prefix);
+                return 0;
+        } else {
+                printk(KERN_WARNING "bcm47xx: unable to fill SPROM for given bustype.\n");
+                return -EINVAL;
+        }
+}
+
 static int bcm47xx_get_invariants(struct ssb_bus *bus,
                                    struct ssb_init_invariants *iv)
 {
@@ -158,7 +239,7 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus,
         if (nvram_getenv("boardrev", buf, sizeof(buf)) >= 0)
                 iv->boardinfo.rev = (u16)simple_strtoul(buf, NULL, 0);
 
-        bcm47xx_fill_sprom(&iv->sprom);
+        bcm47xx_fill_sprom(&iv->sprom, NULL);
 
         if (nvram_getenv("cardbus", buf, sizeof(buf)) >= 0)
                 iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10);
@@ -172,6 +253,11 @@ void __init plat_mem_setup(void)
         char buf[100];
         struct ssb_mipscore *mcore;
 
+        err = ssb_arch_register_fallback_sprom(&bcm47xx_get_sprom);
+        if (err)
+                printk(KERN_WARNING "bcm47xx: someone else already registered"
+                        " a ssb SPROM callback handler (err %d)\n", err);
+
         err = ssb_bus_ssbbus_register(&ssb_bcm47xx, SSB_ENUM_BASE,
                                       bcm47xx_get_invariants);
         if (err)
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c
index 8dba8cfb752f..40b223b603be 100644
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -643,6 +643,17 @@ static struct ssb_sprom bcm63xx_sprom = {
         .boardflags_lo          = 0x2848,
         .boardflags_hi          = 0x0000,
 };
+
+int bcm63xx_get_fallback_sprom(struct ssb_bus *bus, struct ssb_sprom *out)
+{
+        if (bus->bustype == SSB_BUSTYPE_PCI) {
+                memcpy(out, &bcm63xx_sprom, sizeof(struct ssb_sprom));
+                return 0;
+        } else {
+                printk(KERN_ERR PFX "unable to fill SPROM for given bustype.\n");
+                return -EINVAL;
+        }
+}
 #endif
 
 /*
@@ -793,8 +804,9 @@ void __init board_prom_init(void)
         if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
                 memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
                 memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
-                if (ssb_arch_set_fallback_sprom(&bcm63xx_sprom) < 0)
-                        printk(KERN_ERR "failed to register fallback SPROM\n");
+                if (ssb_arch_register_fallback_sprom(
+                                &bcm63xx_get_fallback_sprom) < 0)
+                        printk(KERN_ERR PFX "failed to register fallback SPROM\n");
         }
 #endif
 }
diff --git a/arch/mips/boot/compressed/uart-alchemy.c b/arch/mips/boot/compressed/uart-alchemy.c
index 1bff22fa089b..eb063e6dead9 100644
--- a/arch/mips/boot/compressed/uart-alchemy.c
+++ b/arch/mips/boot/compressed/uart-alchemy.c
@@ -3,5 +3,5 @@
 void putc(char c)
 {
         /* all current (Jan. 2010) in-kernel boards */
-        alchemy_uart_putchar(UART0_PHYS_ADDR, c);
+        alchemy_uart_putchar(AU1000_UART0_PHYS_ADDR, c);
 }
diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c
index 26bf71130bf8..29d56afbb02d 100644
--- a/arch/mips/cavium-octeon/csrc-octeon.c
+++ b/arch/mips/cavium-octeon/csrc-octeon.c
@@ -105,8 +105,7 @@ unsigned long long notrace sched_clock(void)
 void __init plat_time_init(void)
 {
         clocksource_mips.rating = 300;
-        clocksource_set_clock(&clocksource_mips, octeon_get_clock_rate());
-        clocksource_register(&clocksource_mips);
+        clocksource_register_hz(&clocksource_mips, octeon_get_clock_rate());
 }
 
 static u64 octeon_udelay_factor;
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 0707fae3f0ee..2d9028f1474c 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -288,7 +288,6 @@ void octeon_user_io_init(void)
         union octeon_cvmemctl cvmmemctl;
         union cvmx_iob_fau_timeout fau_timeout;
         union cvmx_pow_nw_tim nm_tim;
-        uint64_t cvmctl;
 
         /* Get the current settings for CP0_CVMMEMCTL_REG */
         cvmmemctl.u64 = read_c0_cvmmemctl();
@@ -392,12 +391,6 @@ void octeon_user_io_init(void)
                           CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE,
                           CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE * 128);
 
-        /* Move the performance counter interrupts to IRQ 6 */
-        cvmctl = read_c0_cvmctl();
-        cvmctl &= ~(7 << 7);
-        cvmctl |= 6 << 7;
-        write_c0_cvmctl(cvmctl);
-
         /* Set a default for the hardware timeouts */
         fau_timeout.u64 = 0;
         fau_timeout.s.tout_val = 0xfff;
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index ba78b21cc8d0..8b606423bbd7 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -37,13 +37,15 @@ static irqreturn_t mailbox_interrupt(int irq, void *dev_id)
         uint64_t action;
 
         /* Load the mailbox register to figure out what we're supposed to do */
-        action = cvmx_read_csr(CVMX_CIU_MBOX_CLRX(coreid));
+        action = cvmx_read_csr(CVMX_CIU_MBOX_CLRX(coreid)) & 0xffff;
 
         /* Clear the mailbox to clear the interrupt */
         cvmx_write_csr(CVMX_CIU_MBOX_CLRX(coreid), action);
 
         if (action & SMP_CALL_FUNCTION)
                 smp_call_function_interrupt();
+        if (action & SMP_RESCHEDULE_YOURSELF)
+                scheduler_ipi();
 
         /* Check if we've been told to flush the icache */
         if (action & SMP_ICACHE_FLUSH)
@@ -200,16 +202,15 @@ void octeon_prepare_cpus(unsigned int max_cpus)
         if (labi->labi_signature != LABI_SIGNATURE)
                 panic("The bootloader version on this board is incorrect.");
 #endif
-
-        cvmx_write_csr(CVMX_CIU_MBOX_CLRX(cvmx_get_core_num()), 0xffffffff);
+        /*
+         * Only the low order mailbox bits are used for IPIs, leave
+         * the other bits alone.
+         */
+        cvmx_write_csr(CVMX_CIU_MBOX_CLRX(cvmx_get_core_num()), 0xffff);
         if (request_irq(OCTEON_IRQ_MBOX0, mailbox_interrupt, IRQF_DISABLED,
-                        "mailbox0", mailbox_interrupt)) {
+                        "SMP-IPI", mailbox_interrupt)) {
                 panic("Cannot request_irq(OCTEON_IRQ_MBOX0)\n");
         }
-        if (request_irq(OCTEON_IRQ_MBOX1, mailbox_interrupt, IRQF_DISABLED,
-                        "mailbox1", mailbox_interrupt)) {
-                panic("Cannot request_irq(OCTEON_IRQ_MBOX1)\n");
-        }
 }
 
 /**
diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig
index 167c1d07b809..b6acd2f256b6 100644
--- a/arch/mips/configs/lemote2f_defconfig
+++ b/arch/mips/configs/lemote2f_defconfig
@@ -86,8 +86,8 @@ CONFIG_NET_SCHED=y
 CONFIG_NET_EMATCH=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -329,7 +329,7 @@ CONFIG_USB_LED=m
 CONFIG_USB_GADGET=m
 CONFIG_USB_GADGET_M66592=y
 CONFIG_MMC=m
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
 CONFIG_STAGING=y
 # CONFIG_STAGING_EXCLUDE_BUILD is not set
 CONFIG_FB_SM7XX=y
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig
index 7270f3183bda..5527abbb7dea 100644
--- a/arch/mips/configs/malta_defconfig
+++ b/arch/mips/configs/malta_defconfig
@@ -374,7 +374,7 @@ CONFIG_FB_CIRRUS=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_HID=m
-CONFIG_LEDS_CLASS=m
+CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig
index a97a42c6b2c8..37862b2ce363 100644
--- a/arch/mips/configs/mtx1_defconfig
+++ b/arch/mips/configs/mtx1_defconfig
@@ -225,8 +225,8 @@ 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_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig
new file mode 100644
index 000000000000..e4b399fdaa61
--- /dev/null
+++ b/arch/mips/configs/nlm_xlr_defconfig
@@ -0,0 +1,574 @@
+CONFIG_NLM_XLR_BOARD=y
+CONFIG_HIGHMEM=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_SMP=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_KEXEC=y
+CONFIG_EXPERIMENTAL=y
+CONFIG_CROSS_COMPILE="mips64-unknown-linux-gnu-"
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_NAMESPACES=y
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="usr/dev_file_list usr/rootfs"
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_INITRAMFS_COMPRESSION_GZIP=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_EXPERT=y
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_ELF_CORE is not set
+# CONFIG_PCSPKR_PLATFORM is not set
+# CONFIG_PERF_EVENTS is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_PROFILING=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BINFMT_MISC=m
+CONFIG_PM_RUNTIME=y
+CONFIG_PM_DEBUG=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM_USER=m
+CONFIG_NET_KEY=m
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_NET_IPIP=m
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=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=y
+CONFIG_NETLABEL=y
+CONFIG_NETFILTER=y
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=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_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+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
+CONFIG_IP_VS_FTP=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=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_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_DECNET_NF_GRABULATOR=m
+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_IP6=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_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_RDS=m
+CONFIG_RDS_TCP=m
+CONFIG_TIPC=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_DECNET=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+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
+CONFIG_PHONET=m
+CONFIG_IEEE802154=m
+CONFIG_NET_SCHED=y
+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_MULTIQ=m
+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_DRR=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_EMATCH=y
+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=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_DCB=y
+CONFIG_NET_PKTGEN=m
+# CONFIG_WIRELESS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
+CONFIG_CONNECTOR=y
+CONFIG_MTD=m
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_CDROM_PKTCDVD=y
+CONFIG_MISC_DEVICES=y
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=y
+CONFIG_SCSI_TGT=m
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_ISCSI_TCP=m
+CONFIG_LIBFCOE=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+# CONFIG_INPUT_MOUSEDEV is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVBUG=m
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO_I8042 is not set
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_LEGACY_PTY_COUNT=0
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_N_HDLC=m
+# CONFIG_DEVKMEM is not set
+CONFIG_STALDRV=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=48
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_RAW_DRIVER=m
+# CONFIG_HWMON is not set
+# CONFIG_VGA_CONSOLE is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_UIO=y
+CONFIG_UIO_PDRV=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_NILFS2_FS=m
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=y
+CONFIG_CUSE=m
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_FSCACHE_HISTOGRAM=y
+CONFIG_CACHEFILES=m
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_NTFS_FS=m
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_ADFS_FS=m
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_ROMFS_FS=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+CONFIG_EXOFS_FS=m
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_CIFS=m
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_EXPERIMENTAL=y
+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_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_ACORN_PARTITION=y
+CONFIG_ACORN_PARTITION_ICS=y
+CONFIG_ACORN_PARTITION_RISCIX=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+CONFIG_SGI_PARTITION=y
+CONFIG_ULTRIX_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_SYSV68_PARTITION=y
+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_PRINTK_TIME=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_SCHED_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KGDB=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_LSM_MMAP_MIN_ADDR=0
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SMACK=y
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+CONFIG_CRC_CCITT=m
+CONFIG_CRC7=m
diff --git a/arch/mips/fw/arc/cmdline.c b/arch/mips/fw/arc/cmdline.c
index 5c8603c85f20..9fdf07e50f1b 100644
--- a/arch/mips/fw/arc/cmdline.c
+++ b/arch/mips/fw/arc/cmdline.c
@@ -5,7 +5,7 @@
  *
  * cmdline.c: Kernel command line creation using ARCS argc/argv.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/arch/mips/fw/arc/env.c b/arch/mips/fw/arc/env.c
index 6f5dd42b96e2..1118a26b32ee 100644
--- a/arch/mips/fw/arc/env.c
+++ b/arch/mips/fw/arc/env.c
@@ -5,7 +5,7 @@
  *
  * env.c: ARCS environment variable routines.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/arch/mips/fw/arc/identify.c b/arch/mips/fw/arc/identify.c
index 0ce9acf10c39..788060a53dce 100644
--- a/arch/mips/fw/arc/identify.c
+++ b/arch/mips/fw/arc/identify.c
@@ -9,7 +9,7 @@
  *
  * This code is based on arch/mips/sgi/kernel/system.c, which is
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/arch/mips/fw/arc/init.c b/arch/mips/fw/arc/init.c
index 3ad8788b6eaa..629b24db0d3a 100644
--- a/arch/mips/fw/arc/init.c
+++ b/arch/mips/fw/arc/init.c
@@ -5,7 +5,7 @@
  *
  * PROM library initialisation code.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/arch/mips/fw/arc/misc.c b/arch/mips/fw/arc/misc.c
index e527c5fd5a32..29627fbae7ad 100644
--- a/arch/mips/fw/arc/misc.c
+++ b/arch/mips/fw/arc/misc.c
@@ -5,7 +5,7 @@
  *
  * Miscellaneous ARCS PROM routines.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org)
  * Copyright (C) 1999 Silicon Graphics, Inc.
  */
diff --git a/arch/mips/fw/arc/salone.c b/arch/mips/fw/arc/salone.c
index e6afb64723d0..9b568950d1fd 100644
--- a/arch/mips/fw/arc/salone.c
+++ b/arch/mips/fw/arc/salone.c
@@ -2,7 +2,7 @@
  * Routines to load into memory and execute stand-along program images using
  * ARCS PROM firmware.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  */
 #include <linux/init.h>
 #include <asm/sgialib.h>
diff --git a/arch/mips/fw/arc/time.c b/arch/mips/fw/arc/time.c
index 42138c837d48..190cdb50b895 100644
--- a/arch/mips/fw/arc/time.c
+++ b/arch/mips/fw/arc/time.c
@@ -5,7 +5,7 @@
  *
  * Extracting time information from ARCS prom.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  */
 #include <linux/init.h>
 
diff --git a/arch/mips/fw/arc/tree.c b/arch/mips/fw/arc/tree.c
index d68e5a59c1f6..924a37dc2569 100644
--- a/arch/mips/fw/arc/tree.c
+++ b/arch/mips/fw/arc/tree.c
@@ -5,7 +5,7 @@
  *
  * PROM component device tree code.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org)
  * Copyright (C) 1999 Silicon Graphics, Inc.
  */
diff --git a/arch/mips/include/asm/asmmacro-32.h b/arch/mips/include/asm/asmmacro-32.h
index 5de3963f511e..2413afe21b33 100644
--- a/arch/mips/include/asm/asmmacro-32.h
+++ b/arch/mips/include/asm/asmmacro-32.h
@@ -1,7 +1,7 @@
 /*
  * asmmacro.h: Assembler macros to make things easier to read.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1998, 1999, 2003 Ralf Baechle
  */
 #ifndef _ASM_ASMMACRO_32_H
diff --git a/arch/mips/include/asm/asmmacro-64.h b/arch/mips/include/asm/asmmacro-64.h
index 225feefcb25d..08a527dfe4a3 100644
--- a/arch/mips/include/asm/asmmacro-64.h
+++ b/arch/mips/include/asm/asmmacro-64.h
@@ -1,7 +1,7 @@
 /*
  * asmmacro.h: Assembler macros to make things easier to read.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1998, 1999 Ralf Baechle
  * Copyright (C) 1999 Silicon Graphics, Inc.
  */
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 86877539c6e8..5f95a4bfc735 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -2,7 +2,7 @@
  * cpu.h: Values of the PRId register used to match up
  *        various MIPS cpu types.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 2004  Maciej W. Rozycki
  */
 #ifndef _ASM_CPU_H
@@ -33,6 +33,7 @@
 #define PRID_COMP_TOSHIBA       0x070000
 #define PRID_COMP_LSI           0x080000
 #define PRID_COMP_LEXRA         0x0b0000
+#define PRID_COMP_NETLOGIC      0x0c0000
 #define PRID_COMP_CAVIUM        0x0d0000
 #define PRID_COMP_INGENIC       0xd00000
 
@@ -142,6 +143,31 @@
 #define PRID_IMP_JZRISC        0x0200
 
 /*
+ * These are the PRID's for when 23:16 == PRID_COMP_NETLOGIC
+ */
+#define PRID_IMP_NETLOGIC_XLR732        0x0000
+#define PRID_IMP_NETLOGIC_XLR716        0x0200
+#define PRID_IMP_NETLOGIC_XLR532        0x0900
+#define PRID_IMP_NETLOGIC_XLR308        0x0600
+#define PRID_IMP_NETLOGIC_XLR532C       0x0800
+#define PRID_IMP_NETLOGIC_XLR516C       0x0a00
+#define PRID_IMP_NETLOGIC_XLR508C       0x0b00
+#define PRID_IMP_NETLOGIC_XLR308C       0x0f00
+#define PRID_IMP_NETLOGIC_XLS608        0x8000
+#define PRID_IMP_NETLOGIC_XLS408        0x8800
+#define PRID_IMP_NETLOGIC_XLS404        0x8c00
+#define PRID_IMP_NETLOGIC_XLS208        0x8e00
+#define PRID_IMP_NETLOGIC_XLS204        0x8f00
+#define PRID_IMP_NETLOGIC_XLS108        0xce00
+#define PRID_IMP_NETLOGIC_XLS104        0xcf00
+#define PRID_IMP_NETLOGIC_XLS616B       0x4000
+#define PRID_IMP_NETLOGIC_XLS608B       0x4a00
+#define PRID_IMP_NETLOGIC_XLS416B       0x4400
+#define PRID_IMP_NETLOGIC_XLS412B       0x4c00
+#define PRID_IMP_NETLOGIC_XLS408B       0x4e00
+#define PRID_IMP_NETLOGIC_XLS404B       0x4f00
+
+/*
  * Definitions for 7:0 on legacy processors
  */
 
@@ -234,6 +260,7 @@ enum cpu_type_enum {
          */
         CPU_5KC, CPU_20KC, CPU_25KF, CPU_SB1, CPU_SB1A, CPU_LOONGSON2,
         CPU_CAVIUM_OCTEON, CPU_CAVIUM_OCTEON_PLUS, CPU_CAVIUM_OCTEON2,
+        CPU_XLR,
 
         CPU_LAST
 };
diff --git a/arch/mips/include/asm/i8253.h b/arch/mips/include/asm/i8253.h
index 48bb82372994..9ad011366f73 100644
--- a/arch/mips/include/asm/i8253.h
+++ b/arch/mips/include/asm/i8253.h
@@ -12,8 +12,13 @@
 #define PIT_CH0                 0x40
 #define PIT_CH2                 0x42
 
+#define PIT_LATCH               LATCH
+
 extern raw_spinlock_t i8253_lock;
 
 extern void setup_pit_timer(void);
 
+#define inb_pit inb_p
+#define outb_pit outb_p
+
 #endif /* __ASM_I8253_H */
diff --git a/arch/mips/include/asm/jump_label.h b/arch/mips/include/asm/jump_label.h
index 7622ccf75076..1881b316ca45 100644
--- a/arch/mips/include/asm/jump_label.h
+++ b/arch/mips/include/asm/jump_label.h
@@ -20,16 +20,18 @@
 #define WORD_INSN ".word"
 #endif
 
-#define JUMP_LABEL(key, label)                                          \
-        do {                                                            \
-                asm goto("1:\tnop\n\t"                                  \
-                        "nop\n\t"                                       \
-                        ".pushsection __jump_table,  \"a\"\n\t"         \
-                        WORD_INSN " 1b, %l[" #label "], %0\n\t"         \
-                        ".popsection\n\t"                               \
-                        : :  "i" (key) :  : label);                     \
-        } while (0)
-
+static __always_inline bool arch_static_branch(struct jump_label_key *key)
+{
+        asm goto("1:\tnop\n\t"
+                "nop\n\t"
+                ".pushsection __jump_table,  \"aw\"\n\t"
+                WORD_INSN " 1b, %l[l_yes], %0\n\t"
+                ".popsection\n\t"
+                : :  "i" (key) : : l_yes);
+        return false;
+l_yes:
+        return true;
+}
 
 #endif /* __KERNEL__ */
 
diff --git a/arch/mips/include/asm/mach-au1x00/au1000.h b/arch/mips/include/asm/mach-au1x00/au1000.h
index a6976619160a..f260ebed713b 100644
--- a/arch/mips/include/asm/mach-au1x00/au1000.h
+++ b/arch/mips/include/asm/mach-au1x00/au1000.h
@@ -161,6 +161,45 @@ static inline int alchemy_get_cputype(void)
         return ALCHEMY_CPU_UNKNOWN;
 }
 
+/* return number of uarts on a given cputype */
+static inline int alchemy_get_uarts(int type)
+{
+        switch (type) {
+        case ALCHEMY_CPU_AU1000:
+                return 4;
+        case ALCHEMY_CPU_AU1500:
+        case ALCHEMY_CPU_AU1200:
+                return 2;
+        case ALCHEMY_CPU_AU1100:
+        case ALCHEMY_CPU_AU1550:
+                return 3;
+        }
+        return 0;
+}
+
+/* enable an UART block if it isn't already */
+static inline void alchemy_uart_enable(u32 uart_phys)
+{
+        void __iomem *addr = (void __iomem *)KSEG1ADDR(uart_phys);
+
+        /* reset, enable clock, deassert reset */
+        if ((__raw_readl(addr + 0x100) & 3) != 3) {
+                __raw_writel(0, addr + 0x100);
+                wmb();
+                __raw_writel(1, addr + 0x100);
+                wmb();
+        }
+        __raw_writel(3, addr + 0x100);
+        wmb();
+}
+
+static inline void alchemy_uart_disable(u32 uart_phys)
+{
+        void __iomem *addr = (void __iomem *)KSEG1ADDR(uart_phys);
+        __raw_writel(0, addr + 0x100);  /* UART_MOD_CNTRL */
+        wmb();
+}
+
 static inline void alchemy_uart_putchar(u32 uart_phys, u8 c)
 {
         void __iomem *base = (void __iomem *)KSEG1ADDR(uart_phys);
@@ -180,6 +219,20 @@ static inline void alchemy_uart_putchar(u32 uart_phys, u8 c)
         wmb();
 }
 
+/* return number of ethernet MACs on a given cputype */
+static inline int alchemy_get_macs(int type)
+{
+        switch (type) {
+        case ALCHEMY_CPU_AU1000:
+        case ALCHEMY_CPU_AU1500:
+        case ALCHEMY_CPU_AU1550:
+                return 2;
+        case ALCHEMY_CPU_AU1100:
+                return 1;
+        }
+        return 0;
+}
+
 /* arch/mips/au1000/common/clocks.c */
 extern void set_au1x00_speed(unsigned int new_freq);
 extern unsigned int get_au1x00_speed(void);
@@ -630,38 +683,42 @@ enum soc_au1200_ints {
 
 /*
  * Physical base addresses for integrated peripherals
+ * 0..au1000 1..au1500 2..au1100 3..au1550 4..au1200
  */
 
+#define AU1000_AC97_PHYS_ADDR           0x10000000 /* 012 */
+#define AU1000_USBD_PHYS_ADDR           0x10200000 /* 0123 */
+#define AU1000_IC0_PHYS_ADDR            0x10400000 /* 01234 */
+#define AU1000_MAC0_PHYS_ADDR           0x10500000 /* 023 */
+#define AU1000_MAC1_PHYS_ADDR           0x10510000 /* 023 */
+#define AU1000_MACEN_PHYS_ADDR          0x10520000 /* 023 */
+#define AU1100_SD0_PHYS_ADDR            0x10600000 /* 24 */
+#define AU1100_SD1_PHYS_ADDR            0x10680000 /* 24 */
+#define AU1000_I2S_PHYS_ADDR            0x11000000 /* 02 */
+#define AU1500_MAC0_PHYS_ADDR           0x11500000 /* 1 */
+#define AU1500_MAC1_PHYS_ADDR           0x11510000 /* 1 */
+#define AU1500_MACEN_PHYS_ADDR          0x11520000 /* 1 */
+#define AU1000_UART0_PHYS_ADDR          0x11100000 /* 01234 */
+#define AU1000_UART1_PHYS_ADDR          0x11200000 /* 0234 */
+#define AU1000_UART2_PHYS_ADDR          0x11300000 /* 0 */
+#define AU1000_UART3_PHYS_ADDR          0x11400000 /* 0123 */
+#define AU1500_GPIO2_PHYS_ADDR          0x11700000 /* 1234 */
+#define AU1000_IC1_PHYS_ADDR            0x11800000 /* 01234 */
+#define AU1000_SYS_PHYS_ADDR            0x11900000 /* 01234 */
+#define AU1000_DMA_PHYS_ADDR            0x14002000 /* 012 */
+#define AU1550_DBDMA_PHYS_ADDR          0x14002000 /* 34 */
+#define AU1550_DBDMA_CONF_PHYS_ADDR     0x14003000 /* 34 */
+#define AU1000_MACDMA0_PHYS_ADDR        0x14004000 /* 0123 */
+#define AU1000_MACDMA1_PHYS_ADDR        0x14004200 /* 0123 */
+
+
 #ifdef CONFIG_SOC_AU1000
 #define MEM_PHYS_ADDR           0x14000000
 #define STATIC_MEM_PHYS_ADDR    0x14001000
-#define DMA0_PHYS_ADDR          0x14002000
-#define DMA1_PHYS_ADDR          0x14002100
-#define DMA2_PHYS_ADDR          0x14002200
-#define DMA3_PHYS_ADDR          0x14002300
-#define DMA4_PHYS_ADDR          0x14002400
-#define DMA5_PHYS_ADDR          0x14002500
-#define DMA6_PHYS_ADDR          0x14002600
-#define DMA7_PHYS_ADDR          0x14002700
-#define IC0_PHYS_ADDR           0x10400000
-#define IC1_PHYS_ADDR           0x11800000
-#define AC97_PHYS_ADDR          0x10000000
 #define USBH_PHYS_ADDR          0x10100000
-#define USBD_PHYS_ADDR          0x10200000
 #define IRDA_PHYS_ADDR          0x10300000
-#define MAC0_PHYS_ADDR          0x10500000
-#define MAC1_PHYS_ADDR          0x10510000
-#define MACEN_PHYS_ADDR         0x10520000
-#define MACDMA0_PHYS_ADDR       0x14004000
-#define MACDMA1_PHYS_ADDR       0x14004200
-#define I2S_PHYS_ADDR           0x11000000
-#define UART0_PHYS_ADDR         0x11100000
-#define UART1_PHYS_ADDR         0x11200000
-#define UART2_PHYS_ADDR         0x11300000
-#define UART3_PHYS_ADDR         0x11400000
 #define SSI0_PHYS_ADDR          0x11600000
 #define SSI1_PHYS_ADDR          0x11680000
-#define SYS_PHYS_ADDR           0x11900000
 #define PCMCIA_IO_PHYS_ADDR     0xF00000000ULL
 #define PCMCIA_ATTR_PHYS_ADDR   0xF40000000ULL
 #define PCMCIA_MEM_PHYS_ADDR    0xF80000000ULL
@@ -672,30 +729,8 @@ enum soc_au1200_ints {
 #ifdef CONFIG_SOC_AU1500
 #define MEM_PHYS_ADDR           0x14000000
 #define STATIC_MEM_PHYS_ADDR    0x14001000
-#define DMA0_PHYS_ADDR          0x14002000
-#define DMA1_PHYS_ADDR          0x14002100
-#define DMA2_PHYS_ADDR          0x14002200
-#define DMA3_PHYS_ADDR          0x14002300
-#define DMA4_PHYS_ADDR          0x14002400
-#define DMA5_PHYS_ADDR          0x14002500
-#define DMA6_PHYS_ADDR          0x14002600
-#define DMA7_PHYS_ADDR          0x14002700
-#define IC0_PHYS_ADDR           0x10400000
-#define IC1_PHYS_ADDR           0x11800000
-#define AC97_PHYS_ADDR          0x10000000
 #define USBH_PHYS_ADDR          0x10100000
-#define USBD_PHYS_ADDR          0x10200000
 #define PCI_PHYS_ADDR           0x14005000
-#define MAC0_PHYS_ADDR          0x11500000
-#define MAC1_PHYS_ADDR          0x11510000
-#define MACEN_PHYS_ADDR         0x11520000
-#define MACDMA0_PHYS_ADDR       0x14004000
-#define MACDMA1_PHYS_ADDR       0x14004200
-#define I2S_PHYS_ADDR           0x11000000
-#define UART0_PHYS_ADDR         0x11100000
-#define UART3_PHYS_ADDR         0x11400000
-#define GPIO2_PHYS_ADDR         0x11700000
-#define SYS_PHYS_ADDR           0x11900000
 #define PCI_MEM_PHYS_ADDR       0x400000000ULL
 #define PCI_IO_PHYS_ADDR        0x500000000ULL
 #define PCI_CONFIG0_PHYS_ADDR   0x600000000ULL
@@ -710,34 +745,10 @@ enum soc_au1200_ints {
 #ifdef CONFIG_SOC_AU1100
 #define MEM_PHYS_ADDR           0x14000000
 #define STATIC_MEM_PHYS_ADDR    0x14001000
-#define DMA0_PHYS_ADDR          0x14002000
-#define DMA1_PHYS_ADDR          0x14002100
-#define DMA2_PHYS_ADDR          0x14002200
-#define DMA3_PHYS_ADDR          0x14002300
-#define DMA4_PHYS_ADDR          0x14002400
-#define DMA5_PHYS_ADDR          0x14002500
-#define DMA6_PHYS_ADDR          0x14002600
-#define DMA7_PHYS_ADDR          0x14002700
-#define IC0_PHYS_ADDR           0x10400000
-#define SD0_PHYS_ADDR           0x10600000
-#define SD1_PHYS_ADDR           0x10680000
-#define IC1_PHYS_ADDR           0x11800000
-#define AC97_PHYS_ADDR          0x10000000
 #define USBH_PHYS_ADDR          0x10100000
-#define USBD_PHYS_ADDR          0x10200000
 #define IRDA_PHYS_ADDR          0x10300000
-#define MAC0_PHYS_ADDR          0x10500000
-#define MACEN_PHYS_ADDR         0x10520000
-#define MACDMA0_PHYS_ADDR       0x14004000
-#define MACDMA1_PHYS_ADDR       0x14004200
-#define I2S_PHYS_ADDR           0x11000000
-#define UART0_PHYS_ADDR         0x11100000
-#define UART1_PHYS_ADDR         0x11200000
-#define UART3_PHYS_ADDR         0x11400000
 #define SSI0_PHYS_ADDR          0x11600000
 #define SSI1_PHYS_ADDR          0x11680000
-#define GPIO2_PHYS_ADDR         0x11700000
-#define SYS_PHYS_ADDR           0x11900000
 #define LCD_PHYS_ADDR           0x15000000
 #define PCMCIA_IO_PHYS_ADDR     0xF00000000ULL
 #define PCMCIA_ATTR_PHYS_ADDR   0xF40000000ULL
@@ -749,22 +760,8 @@ enum soc_au1200_ints {
 #ifdef CONFIG_SOC_AU1550
 #define MEM_PHYS_ADDR           0x14000000
 #define STATIC_MEM_PHYS_ADDR    0x14001000
-#define IC0_PHYS_ADDR           0x10400000
-#define IC1_PHYS_ADDR           0x11800000
 #define USBH_PHYS_ADDR          0x14020000
-#define USBD_PHYS_ADDR          0x10200000
 #define PCI_PHYS_ADDR           0x14005000
-#define MAC0_PHYS_ADDR          0x10500000
-#define MAC1_PHYS_ADDR          0x10510000
-#define MACEN_PHYS_ADDR         0x10520000
-#define MACDMA0_PHYS_ADDR       0x14004000
-#define MACDMA1_PHYS_ADDR       0x14004200
-#define UART0_PHYS_ADDR         0x11100000
-#define UART1_PHYS_ADDR         0x11200000
-#define UART3_PHYS_ADDR         0x11400000
-#define GPIO2_PHYS_ADDR         0x11700000
-#define SYS_PHYS_ADDR           0x11900000
-#define DDMA_PHYS_ADDR          0x14002000
 #define PE_PHYS_ADDR            0x14008000
 #define PSC0_PHYS_ADDR          0x11A00000
 #define PSC1_PHYS_ADDR          0x11B00000
@@ -786,19 +783,10 @@ enum soc_au1200_ints {
 #define STATIC_MEM_PHYS_ADDR    0x14001000
 #define AES_PHYS_ADDR           0x10300000
 #define CIM_PHYS_ADDR           0x14004000
-#define IC0_PHYS_ADDR           0x10400000
-#define IC1_PHYS_ADDR           0x11800000
 #define USBM_PHYS_ADDR          0x14020000
 #define USBH_PHYS_ADDR          0x14020100
-#define UART0_PHYS_ADDR         0x11100000
-#define UART1_PHYS_ADDR         0x11200000
-#define GPIO2_PHYS_ADDR         0x11700000
-#define SYS_PHYS_ADDR           0x11900000
-#define DDMA_PHYS_ADDR          0x14002000
 #define PSC0_PHYS_ADDR          0x11A00000
 #define PSC1_PHYS_ADDR          0x11B00000
-#define SD0_PHYS_ADDR           0x10600000
-#define SD1_PHYS_ADDR           0x10680000
 #define LCD_PHYS_ADDR           0x15000000
 #define SWCNT_PHYS_ADDR         0x1110010C
 #define MAEFE_PHYS_ADDR         0x14012000
@@ -835,183 +823,43 @@ enum soc_au1200_ints {
 #endif
 
 
-/* Interrupt Controller register offsets */
-#define IC_CFG0RD               0x40
-#define IC_CFG0SET              0x40
-#define IC_CFG0CLR              0x44
-#define IC_CFG1RD               0x48
-#define IC_CFG1SET              0x48
-#define IC_CFG1CLR              0x4C
-#define IC_CFG2RD               0x50
-#define IC_CFG2SET              0x50
-#define IC_CFG2CLR              0x54
-#define IC_REQ0INT              0x54
-#define IC_SRCRD                0x58
-#define IC_SRCSET               0x58
-#define IC_SRCCLR               0x5C
-#define IC_REQ1INT              0x5C
-#define IC_ASSIGNRD             0x60
-#define IC_ASSIGNSET            0x60
-#define IC_ASSIGNCLR            0x64
-#define IC_WAKERD               0x68
-#define IC_WAKESET              0x68
-#define IC_WAKECLR              0x6C
-#define IC_MASKRD               0x70
-#define IC_MASKSET              0x70
-#define IC_MASKCLR              0x74
-#define IC_RISINGRD             0x78
-#define IC_RISINGCLR            0x78
-#define IC_FALLINGRD            0x7C
-#define IC_FALLINGCLR           0x7C
-#define IC_TESTBIT              0x80
-
-
-/* Interrupt Controller 0 */
-#define IC0_CFG0RD              0xB0400040
-#define IC0_CFG0SET             0xB0400040
-#define IC0_CFG0CLR             0xB0400044
-
-#define IC0_CFG1RD              0xB0400048
-#define IC0_CFG1SET             0xB0400048
-#define IC0_CFG1CLR             0xB040004C
-
-#define IC0_CFG2RD              0xB0400050
-#define IC0_CFG2SET             0xB0400050
-#define IC0_CFG2CLR             0xB0400054
-
-#define IC0_REQ0INT             0xB0400054
-#define IC0_SRCRD               0xB0400058
-#define IC0_SRCSET              0xB0400058
-#define IC0_SRCCLR              0xB040005C
-#define IC0_REQ1INT             0xB040005C
-
-#define IC0_ASSIGNRD            0xB0400060
-#define IC0_ASSIGNSET           0xB0400060
-#define IC0_ASSIGNCLR           0xB0400064
-
-#define IC0_WAKERD              0xB0400068
-#define IC0_WAKESET             0xB0400068
-#define IC0_WAKECLR             0xB040006C
-
-#define IC0_MASKRD              0xB0400070
-#define IC0_MASKSET             0xB0400070
-#define IC0_MASKCLR             0xB0400074
-
-#define IC0_RISINGRD            0xB0400078
-#define IC0_RISINGCLR           0xB0400078
-#define IC0_FALLINGRD           0xB040007C
-#define IC0_FALLINGCLR          0xB040007C
-
-#define IC0_TESTBIT             0xB0400080
-
-/* Interrupt Controller 1 */
-#define IC1_CFG0RD              0xB1800040
-#define IC1_CFG0SET             0xB1800040
-#define IC1_CFG0CLR             0xB1800044
-
-#define IC1_CFG1RD              0xB1800048
-#define IC1_CFG1SET             0xB1800048
-#define IC1_CFG1CLR             0xB180004C
-
-#define IC1_CFG2RD              0xB1800050
-#define IC1_CFG2SET             0xB1800050
-#define IC1_CFG2CLR             0xB1800054
-
-#define IC1_REQ0INT             0xB1800054
-#define IC1_SRCRD               0xB1800058
-#define IC1_SRCSET              0xB1800058
-#define IC1_SRCCLR              0xB180005C
-#define IC1_REQ1INT             0xB180005C
-
-#define IC1_ASSIGNRD            0xB1800060
-#define IC1_ASSIGNSET           0xB1800060
-#define IC1_ASSIGNCLR           0xB1800064
-
-#define IC1_WAKERD              0xB1800068
-#define IC1_WAKESET             0xB1800068
-#define IC1_WAKECLR             0xB180006C
-
-#define IC1_MASKRD              0xB1800070
-#define IC1_MASKSET             0xB1800070
-#define IC1_MASKCLR             0xB1800074
-
-#define IC1_RISINGRD            0xB1800078
-#define IC1_RISINGCLR           0xB1800078
-#define IC1_FALLINGRD           0xB180007C
-#define IC1_FALLINGCLR          0xB180007C
-
-#define IC1_TESTBIT             0xB1800080
 
 
 /* Au1000 */
 #ifdef CONFIG_SOC_AU1000
 
-#define UART0_ADDR              0xB1100000
-#define UART3_ADDR              0xB1400000
-
 #define USB_OHCI_BASE           0x10100000      /* phys addr for ioremap */
 #define USB_HOST_CONFIG         0xB017FFFC
 #define FOR_PLATFORM_C_USB_HOST_INT AU1000_USB_HOST_INT
-
-#define AU1000_ETH0_BASE        0xB0500000
-#define AU1000_ETH1_BASE        0xB0510000
-#define AU1000_MAC0_ENABLE      0xB0520000
-#define AU1000_MAC1_ENABLE      0xB0520004
-#define NUM_ETH_INTERFACES 2
 #endif /* CONFIG_SOC_AU1000 */
 
 /* Au1500 */
 #ifdef CONFIG_SOC_AU1500
 
-#define UART0_ADDR              0xB1100000
-#define UART3_ADDR              0xB1400000
-
 #define USB_OHCI_BASE           0x10100000      /* phys addr for ioremap */
 #define USB_HOST_CONFIG         0xB017fffc
 #define FOR_PLATFORM_C_USB_HOST_INT AU1500_USB_HOST_INT
-
-#define AU1500_ETH0_BASE        0xB1500000
-#define AU1500_ETH1_BASE        0xB1510000
-#define AU1500_MAC0_ENABLE      0xB1520000
-#define AU1500_MAC1_ENABLE      0xB1520004
-#define NUM_ETH_INTERFACES 2
 #endif /* CONFIG_SOC_AU1500 */
 
 /* Au1100 */
 #ifdef CONFIG_SOC_AU1100
 
-#define UART0_ADDR              0xB1100000
-#define UART3_ADDR              0xB1400000
-
 #define USB_OHCI_BASE           0x10100000      /* phys addr for ioremap */
 #define USB_HOST_CONFIG         0xB017FFFC
 #define FOR_PLATFORM_C_USB_HOST_INT AU1100_USB_HOST_INT
-
-#define AU1100_ETH0_BASE        0xB0500000
-#define AU1100_MAC0_ENABLE      0xB0520000
-#define NUM_ETH_INTERFACES 1
 #endif /* CONFIG_SOC_AU1100 */
 
 #ifdef CONFIG_SOC_AU1550
-#define UART0_ADDR              0xB1100000
 
 #define USB_OHCI_BASE           0x14020000      /* phys addr for ioremap */
 #define USB_OHCI_LEN            0x00060000
 #define USB_HOST_CONFIG         0xB4027ffc
 #define FOR_PLATFORM_C_USB_HOST_INT AU1550_USB_HOST_INT
-
-#define AU1550_ETH0_BASE        0xB0500000
-#define AU1550_ETH1_BASE        0xB0510000
-#define AU1550_MAC0_ENABLE      0xB0520000
-#define AU1550_MAC1_ENABLE      0xB0520004
-#define NUM_ETH_INTERFACES 2
 #endif /* CONFIG_SOC_AU1550 */
 
 
 #ifdef CONFIG_SOC_AU1200
 
-#define UART0_ADDR              0xB1100000
-
 #define USB_UOC_BASE            0x14020020
 #define USB_UOC_LEN             0x20
 #define USB_OHCI_BASE           0x14020100
@@ -1504,22 +1352,6 @@ enum soc_au1200_ints {
 #define SYS_PINFUNC_S1B         (1 << 2)
 #endif
 
-#define SYS_TRIOUTRD            0xB1900100
-#define SYS_TRIOUTCLR           0xB1900100
-#define SYS_OUTPUTRD            0xB1900108
-#define SYS_OUTPUTSET           0xB1900108
-#define SYS_OUTPUTCLR           0xB190010C
-#define SYS_PINSTATERD          0xB1900110
-#define SYS_PININPUTEN          0xB1900110
-
-/* GPIO2, Au1500, Au1550 only */
-#define GPIO2_BASE              0xB1700000
-#define GPIO2_DIR               (GPIO2_BASE + 0)
-#define GPIO2_OUTPUT            (GPIO2_BASE + 8)
-#define GPIO2_PINSTATE          (GPIO2_BASE + 0xC)
-#define GPIO2_INTENABLE         (GPIO2_BASE + 0x10)
-#define GPIO2_ENABLE            (GPIO2_BASE + 0x14)
-
 /* Power Management */
 #define SYS_SCRATCH0            0xB1900018
 #define SYS_SCRATCH1            0xB190001C
@@ -1635,12 +1467,6 @@ enum soc_au1200_ints {
 #  define AC97C_RS              (1 << 1)
 #  define AC97C_CE              (1 << 0)
 
-/* Secure Digital (SD) Controller */
-#define SD0_XMIT_FIFO   0xB0600000
-#define SD0_RECV_FIFO   0xB0600004
-#define SD1_XMIT_FIFO   0xB0680000
-#define SD1_RECV_FIFO   0xB0680004
-
 #if defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550)
 /* Au1500 PCI Controller */
 #define Au1500_CFG_BASE         0xB4005000      /* virtual, KSEG1 addr */
diff --git a/arch/mips/include/asm/mach-au1x00/au1000_dma.h b/arch/mips/include/asm/mach-au1x00/au1000_dma.h
index c333b4e1cd44..59f5b55b2200 100644
--- a/arch/mips/include/asm/mach-au1x00/au1000_dma.h
+++ b/arch/mips/include/asm/mach-au1x00/au1000_dma.h
@@ -37,10 +37,6 @@
 
 #define NUM_AU1000_DMA_CHANNELS 8
 
-/* DMA Channel Base Addresses */
-#define DMA_CHANNEL_BASE        0xB4002000
-#define DMA_CHANNEL_LEN         0x00000100
-
 /* DMA Channel Register Offsets */
 #define DMA_MODE_SET            0x00000000
 #define DMA_MODE_READ           DMA_MODE_SET
diff --git a/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h
index c8a553a36ba4..2fdacfe85e23 100644
--- a/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h
+++ b/arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h
@@ -37,14 +37,6 @@
 
 #ifndef _LANGUAGE_ASSEMBLY
 
-/*
- * The DMA base addresses.
- * The channels are every 256 bytes (0x0100) from the channel 0 base.
- * Interrupt status/enable is bits 15:0 for channels 15 to zero.
- */
-#define DDMA_GLOBAL_BASE        0xb4003000
-#define DDMA_CHANNEL_BASE       0xb4002000
-
 typedef volatile struct dbdma_global {
         u32     ddma_config;
         u32     ddma_intstat;
diff --git a/arch/mips/include/asm/mach-au1x00/gpio-au1000.h b/arch/mips/include/asm/mach-au1x00/gpio-au1000.h
index 62d2f136d941..1f41a522906d 100644
--- a/arch/mips/include/asm/mach-au1x00/gpio-au1000.h
+++ b/arch/mips/include/asm/mach-au1x00/gpio-au1000.h
@@ -24,6 +24,23 @@
 
 #define MAKE_IRQ(intc, off)     (AU1000_INTC##intc##_INT_BASE + (off))
 
+/* GPIO1 registers within SYS_ area */
+#define SYS_TRIOUTRD            0x100
+#define SYS_TRIOUTCLR           0x100
+#define SYS_OUTPUTRD            0x108
+#define SYS_OUTPUTSET           0x108
+#define SYS_OUTPUTCLR           0x10C
+#define SYS_PINSTATERD          0x110
+#define SYS_PININPUTEN          0x110
+
+/* register offsets within GPIO2 block */
+#define GPIO2_DIR               0x00
+#define GPIO2_OUTPUT            0x08
+#define GPIO2_PINSTATE          0x0C
+#define GPIO2_INTENABLE         0x10
+#define GPIO2_ENABLE            0x14
+
+struct gpio;
 
 static inline int au1000_gpio1_to_irq(int gpio)
 {
@@ -200,23 +217,26 @@ static inline int au1200_irq_to_gpio(int irq)
  */
 static inline void alchemy_gpio1_set_value(int gpio, int v)
 {
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
         unsigned long mask = 1 << (gpio - ALCHEMY_GPIO1_BASE);
         unsigned long r = v ? SYS_OUTPUTSET : SYS_OUTPUTCLR;
-        au_writel(mask, r);
-        au_sync();
+        __raw_writel(mask, base + r);
+        wmb();
 }
 
 static inline int alchemy_gpio1_get_value(int gpio)
 {
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
         unsigned long mask = 1 << (gpio - ALCHEMY_GPIO1_BASE);
-        return au_readl(SYS_PINSTATERD) & mask;
+        return __raw_readl(base + SYS_PINSTATERD) & mask;
 }
 
 static inline int alchemy_gpio1_direction_input(int gpio)
 {
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
         unsigned long mask = 1 << (gpio - ALCHEMY_GPIO1_BASE);
-        au_writel(mask, SYS_TRIOUTCLR);
-        au_sync();
+        __raw_writel(mask, base + SYS_TRIOUTCLR);
+        wmb();
         return 0;
 }
 
@@ -257,27 +277,31 @@ static inline int alchemy_gpio1_to_irq(int gpio)
  */
 static inline void __alchemy_gpio2_mod_dir(int gpio, int to_out)
 {
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1500_GPIO2_PHYS_ADDR);
         unsigned long mask = 1 << (gpio - ALCHEMY_GPIO2_BASE);
-        unsigned long d = au_readl(GPIO2_DIR);
+        unsigned long d = __raw_readl(base + GPIO2_DIR);
+
         if (to_out)
                 d |= mask;
         else
                 d &= ~mask;
-        au_writel(d, GPIO2_DIR);
-        au_sync();
+        __raw_writel(d, base + GPIO2_DIR);
+        wmb();
 }
 
 static inline void alchemy_gpio2_set_value(int gpio, int v)
 {
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1500_GPIO2_PHYS_ADDR);
         unsigned long mask;
         mask = ((v) ? 0x00010001 : 0x00010000) << (gpio - ALCHEMY_GPIO2_BASE);
-        au_writel(mask, GPIO2_OUTPUT);
-        au_sync();
+        __raw_writel(mask, base + GPIO2_OUTPUT);
+        wmb();
 }
 
 static inline int alchemy_gpio2_get_value(int gpio)
 {
-        return au_readl(GPIO2_PINSTATE) & (1 << (gpio - ALCHEMY_GPIO2_BASE));
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1500_GPIO2_PHYS_ADDR);
+        return __raw_readl(base + GPIO2_PINSTATE) & (1 << (gpio - ALCHEMY_GPIO2_BASE));
 }
 
 static inline int alchemy_gpio2_direction_input(int gpio)
@@ -329,21 +353,23 @@ static inline int alchemy_gpio2_to_irq(int gpio)
  */
 static inline void alchemy_gpio1_input_enable(void)
 {
-        au_writel(0, SYS_PININPUTEN);   /* the write op is key */
-        au_sync();
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1000_SYS_PHYS_ADDR);
+        __raw_writel(0, base + SYS_PININPUTEN); /* the write op is key */
+        wmb();
 }
 
 /* GPIO2 shared interrupts and control */
 
 static inline void __alchemy_gpio2_mod_int(int gpio2, int en)
 {
-        unsigned long r = au_readl(GPIO2_INTENABLE);
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1500_GPIO2_PHYS_ADDR);
+        unsigned long r = __raw_readl(base + GPIO2_INTENABLE);
         if (en)
                 r |= 1 << gpio2;
         else
                 r &= ~(1 << gpio2);
-        au_writel(r, GPIO2_INTENABLE);
-        au_sync();
+        __raw_writel(r, base + GPIO2_INTENABLE);
+        wmb();
 }
 
 /**
@@ -418,10 +444,11 @@ static inline void alchemy_gpio2_disable_int(int gpio2)
  */
 static inline void alchemy_gpio2_enable(void)
 {
-        au_writel(3, GPIO2_ENABLE);     /* reset, clock enabled */
-        au_sync();
-        au_writel(1, GPIO2_ENABLE);     /* clock enabled */
-        au_sync();
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1500_GPIO2_PHYS_ADDR);
+        __raw_writel(3, base + GPIO2_ENABLE);   /* reset, clock enabled */
+        wmb();
+        __raw_writel(1, base + GPIO2_ENABLE);   /* clock enabled */
+        wmb();
 }
 
 /**
@@ -431,8 +458,9 @@ static inline void alchemy_gpio2_enable(void)
  */
 static inline void alchemy_gpio2_disable(void)
 {
-        au_writel(2, GPIO2_ENABLE);     /* reset, clock disabled */
-        au_sync();
+        void __iomem *base = (void __iomem *)KSEG1ADDR(AU1500_GPIO2_PHYS_ADDR);
+        __raw_writel(2, base + GPIO2_ENABLE);   /* reset, clock disabled */
+        wmb();
 }
 
 /**********************************************************************/
@@ -556,6 +584,16 @@ static inline void gpio_set_value(int gpio, int v)
         alchemy_gpio_set_value(gpio, v);
 }
 
+static inline int gpio_get_value_cansleep(unsigned gpio)
+{
+        return gpio_get_value(gpio);
+}
+
+static inline void gpio_set_value_cansleep(unsigned gpio, int value)
+{
+        gpio_set_value(gpio, value);
+}
+
 static inline int gpio_is_valid(int gpio)
 {
         return alchemy_gpio_is_valid(gpio);
@@ -581,10 +619,50 @@ static inline int gpio_request(unsigned gpio, const char *label)
         return 0;
 }
 
+static inline int gpio_request_one(unsigned gpio,
+                                        unsigned long flags, const char *label)
+{
+        return 0;
+}
+
+static inline int gpio_request_array(struct gpio *array, size_t num)
+{
+        return 0;
+}
+
 static inline void gpio_free(unsigned gpio)
 {
 }
 
+static inline void gpio_free_array(struct gpio *array, size_t num)
+{
+}
+
+static inline int gpio_set_debounce(unsigned gpio, unsigned debounce)
+{
+        return -ENOSYS;
+}
+
+static inline int gpio_export(unsigned gpio, bool direction_may_change)
+{
+        return -ENOSYS;
+}
+
+static inline int gpio_export_link(struct device *dev, const char *name,
+                                   unsigned gpio)
+{
+        return -ENOSYS;
+}
+
+static inline int gpio_sysfs_set_active_low(unsigned gpio, int value)
+{
+        return -ENOSYS;
+}
+
+static inline void gpio_unexport(unsigned gpio)
+{
+}
+
 #endif  /* !CONFIG_ALCHEMY_GPIO_INDIRECT */
 
 
diff --git a/arch/mips/include/asm/mach-bcm47xx/nvram.h b/arch/mips/include/asm/mach-bcm47xx/nvram.h
index 9759588ba3cf..184d5ecb5f51 100644
--- a/arch/mips/include/asm/mach-bcm47xx/nvram.h
+++ b/arch/mips/include/asm/mach-bcm47xx/nvram.h
@@ -39,8 +39,16 @@ extern int nvram_getenv(char *name, char *val, size_t val_len);
 
 static inline void nvram_parse_macaddr(char *buf, u8 *macaddr)
 {
-        sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0], &macaddr[1],
-               &macaddr[2], &macaddr[3], &macaddr[4], &macaddr[5]);
+        if (strchr(buf, ':'))
+                sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &macaddr[0],
+                        &macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4],
+                        &macaddr[5]);
+        else if (strchr(buf, '-'))
+                sscanf(buf, "%hhx-%hhx-%hhx-%hhx-%hhx-%hhx", &macaddr[0],
+                        &macaddr[1], &macaddr[2], &macaddr[3], &macaddr[4],
+                        &macaddr[5]);
+        else
+                printk(KERN_WARNING "Can not parse mac address: %s\n", buf);
 }
 
 #endif
diff --git a/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h b/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
index 0b2b5eb22e9b..dedef7d2b01f 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/kernel-entry-init.h
@@ -63,6 +63,11 @@
         # CN30XX Disable instruction prefetching
         or  v0, v0, 0x2000
 skip:
+        # First clear off CvmCtl[IPPCI] bit and move the performance
+        # counters interrupt to IRQ 6
+        li      v1, ~(7 << 7)
+        and     v0, v0, v1
+        ori     v0, v0, (6 << 7)
         # Write the cavium control register
         dmtc0   v0, CP0_CVMCTL_REG
         sync
diff --git a/arch/mips/include/asm/mach-lantiq/lantiq.h b/arch/mips/include/asm/mach-lantiq/lantiq.h
new file mode 100644
index 000000000000..ce2f02929d22
--- /dev/null
+++ b/arch/mips/include/asm/mach-lantiq/lantiq.h
@@ -0,0 +1,63 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+#ifndef _LANTIQ_H__
+#define _LANTIQ_H__
+
+#include <linux/irq.h>
+
+/* generic reg access functions */
+#define ltq_r32(reg)            __raw_readl(reg)
+#define ltq_w32(val, reg)       __raw_writel(val, reg)
+#define ltq_w32_mask(clear, set, reg)   \
+        ltq_w32((ltq_r32(reg) & ~(clear)) | (set), reg)
+#define ltq_r8(reg)             __raw_readb(reg)
+#define ltq_w8(val, reg)        __raw_writeb(val, reg)
+
+/* register access macros for EBU and CGU */
+#define ltq_ebu_w32(x, y)       ltq_w32((x), ltq_ebu_membase + (y))
+#define ltq_ebu_r32(x)          ltq_r32(ltq_ebu_membase + (x))
+#define ltq_cgu_w32(x, y)       ltq_w32((x), ltq_cgu_membase + (y))
+#define ltq_cgu_r32(x)          ltq_r32(ltq_cgu_membase + (x))
+
+extern __iomem void *ltq_ebu_membase;
+extern __iomem void *ltq_cgu_membase;
+
+extern unsigned int ltq_get_cpu_ver(void);
+extern unsigned int ltq_get_soc_type(void);
+
+/* clock speeds */
+#define CLOCK_60M       60000000
+#define CLOCK_83M       83333333
+#define CLOCK_111M      111111111
+#define CLOCK_133M      133333333
+#define CLOCK_167M      166666667
+#define CLOCK_200M      200000000
+#define CLOCK_266M      266666666
+#define CLOCK_333M      333333333
+#define CLOCK_400M      400000000
+
+/* spinlock all ebu i/o */
+extern spinlock_t ebu_lock;
+
+/* some irq helpers */
+extern void ltq_disable_irq(struct irq_data *data);
+extern void ltq_mask_and_ack_irq(struct irq_data *data);
+extern void ltq_enable_irq(struct irq_data *data);
+
+/* find out what caused the last cpu reset */
+extern int ltq_reset_cause(void);
+#define LTQ_RST_CAUSE_WDTRST    0x20
+
+#define IOPORT_RESOURCE_START   0x10000000
+#define IOPORT_RESOURCE_END     0xffffffff
+#define IOMEM_RESOURCE_START    0x10000000
+#define IOMEM_RESOURCE_END      0xffffffff
+#define LTQ_FLASH_START         0x10000000
+#define LTQ_FLASH_MAX           0x04000000
+
+#endif
diff --git a/arch/mips/include/asm/mach-lantiq/lantiq_platform.h b/arch/mips/include/asm/mach-lantiq/lantiq_platform.h
new file mode 100644
index 000000000000..a305f1d0259e
--- /dev/null
+++ b/arch/mips/include/asm/mach-lantiq/lantiq_platform.h
@@ -0,0 +1,53 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef _LANTIQ_PLATFORM_H__
+#define _LANTIQ_PLATFORM_H__
+
+#include <linux/mtd/partitions.h>
+#include <linux/socket.h>
+
+/* struct used to pass info to the pci core */
+enum {
+        PCI_CLOCK_INT = 0,
+        PCI_CLOCK_EXT
+};
+
+#define PCI_EXIN0       0x0001
+#define PCI_EXIN1       0x0002
+#define PCI_EXIN2       0x0004
+#define PCI_EXIN3       0x0008
+#define PCI_EXIN4       0x0010
+#define PCI_EXIN5       0x0020
+#define PCI_EXIN_MAX    6
+
+#define PCI_GNT1        0x0040
+#define PCI_GNT2        0x0080
+#define PCI_GNT3        0x0100
+#define PCI_GNT4        0x0200
+
+#define PCI_REQ1        0x0400
+#define PCI_REQ2        0x0800
+#define PCI_REQ3        0x1000
+#define PCI_REQ4        0x2000
+#define PCI_REQ_SHIFT   10
+#define PCI_REQ_MASK    0xf
+
+struct ltq_pci_data {
+        int clock;
+        int gpio;
+        int irq[16];
+};
+
+/* struct used to pass info to network drivers */
+struct ltq_eth_data {
+        struct sockaddr mac;
+        int mii_mode;
+};
+
+#endif
diff --git a/arch/mips/include/asm/mach-lantiq/war.h b/arch/mips/include/asm/mach-lantiq/war.h
new file mode 100644
index 000000000000..01b08ef368d1
--- /dev/null
+++ b/arch/mips/include/asm/mach-lantiq/war.h
@@ -0,0 +1,24 @@
+/*
+ * 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 __ASM_MIPS_MACH_LANTIQ_WAR_H
+#define __ASM_MIPS_MACH_LANTIQ_WAR_H
+
+#define R4600_V1_INDEX_ICACHEOP_WAR     0
+#define R4600_V1_HIT_CACHEOP_WAR        0
+#define R4600_V2_HIT_CACHEOP_WAR        0
+#define R5432_CP0_INTERRUPT_WAR         0
+#define BCM1250_M3_WAR                  0
+#define SIBYTE_1956_WAR                 0
+#define MIPS4K_ICACHE_REFILL_WAR        0
+#define MIPS_CACHE_SYNC_WAR             0
+#define TX49XX_ICACHE_INDEX_INV_WAR     0
+#define RM9000_CDEX_SMP_WAR             0
+#define ICACHE_REFILLS_WORKAROUND_WAR   0
+#define R10000_LLSC_WAR                 0
+#define MIPS34K_MISSED_ITLB_WAR         0
+
+#endif
diff --git a/arch/mips/include/asm/mach-lantiq/xway/irq.h b/arch/mips/include/asm/mach-lantiq/xway/irq.h
new file mode 100644
index 000000000000..a1471d2dd0d2
--- /dev/null
+++ b/arch/mips/include/asm/mach-lantiq/xway/irq.h
@@ -0,0 +1,18 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef __LANTIQ_IRQ_H
+#define __LANTIQ_IRQ_H
+
+#include <lantiq_irq.h>
+
+#define NR_IRQS 256
+
+#include_next <irq.h>
+
+#endif
diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h b/arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h
new file mode 100644
index 000000000000..b4465a888e20
--- /dev/null
+++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h
@@ -0,0 +1,66 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef _LANTIQ_XWAY_IRQ_H__
+#define _LANTIQ_XWAY_IRQ_H__
+
+#define INT_NUM_IRQ0            8
+#define INT_NUM_IM0_IRL0        (INT_NUM_IRQ0 + 0)
+#define INT_NUM_IM1_IRL0        (INT_NUM_IRQ0 + 32)
+#define INT_NUM_IM2_IRL0        (INT_NUM_IRQ0 + 64)
+#define INT_NUM_IM3_IRL0        (INT_NUM_IRQ0 + 96)
+#define INT_NUM_IM4_IRL0        (INT_NUM_IRQ0 + 128)
+#define INT_NUM_IM_OFFSET       (INT_NUM_IM1_IRL0 - INT_NUM_IM0_IRL0)
+
+#define LTQ_ASC_TIR(x)          (INT_NUM_IM3_IRL0 + (x * 8))
+#define LTQ_ASC_RIR(x)          (INT_NUM_IM3_IRL0 + (x * 8) + 1)
+#define LTQ_ASC_EIR(x)          (INT_NUM_IM3_IRL0 + (x * 8) + 2)
+
+#define LTQ_ASC_ASE_TIR         INT_NUM_IM2_IRL0
+#define LTQ_ASC_ASE_RIR         (INT_NUM_IM2_IRL0 + 2)
+#define LTQ_ASC_ASE_EIR         (INT_NUM_IM2_IRL0 + 3)
+
+#define LTQ_SSC_TIR             (INT_NUM_IM0_IRL0 + 15)
+#define LTQ_SSC_RIR             (INT_NUM_IM0_IRL0 + 14)
+#define LTQ_SSC_EIR             (INT_NUM_IM0_IRL0 + 16)
+
+#define LTQ_MEI_DYING_GASP_INT  (INT_NUM_IM1_IRL0 + 21)
+#define LTQ_MEI_INT             (INT_NUM_IM1_IRL0 + 23)
+
+#define LTQ_TIMER6_INT          (INT_NUM_IM1_IRL0 + 23)
+#define LTQ_USB_INT             (INT_NUM_IM1_IRL0 + 22)
+#define LTQ_USB_OC_INT          (INT_NUM_IM4_IRL0 + 23)
+
+#define MIPS_CPU_TIMER_IRQ              7
+
+#define LTQ_DMA_CH0_INT         (INT_NUM_IM2_IRL0)
+#define LTQ_DMA_CH1_INT         (INT_NUM_IM2_IRL0 + 1)
+#define LTQ_DMA_CH2_INT         (INT_NUM_IM2_IRL0 + 2)
+#define LTQ_DMA_CH3_INT         (INT_NUM_IM2_IRL0 + 3)
+#define LTQ_DMA_CH4_INT         (INT_NUM_IM2_IRL0 + 4)
+#define LTQ_DMA_CH5_INT         (INT_NUM_IM2_IRL0 + 5)
+#define LTQ_DMA_CH6_INT         (INT_NUM_IM2_IRL0 + 6)
+#define LTQ_DMA_CH7_INT         (INT_NUM_IM2_IRL0 + 7)
+#define LTQ_DMA_CH8_INT         (INT_NUM_IM2_IRL0 + 8)
+#define LTQ_DMA_CH9_INT         (INT_NUM_IM2_IRL0 + 9)
+#define LTQ_DMA_CH10_INT        (INT_NUM_IM2_IRL0 + 10)
+#define LTQ_DMA_CH11_INT        (INT_NUM_IM2_IRL0 + 11)
+#define LTQ_DMA_CH12_INT        (INT_NUM_IM2_IRL0 + 25)
+#define LTQ_DMA_CH13_INT        (INT_NUM_IM2_IRL0 + 26)
+#define LTQ_DMA_CH14_INT        (INT_NUM_IM2_IRL0 + 27)
+#define LTQ_DMA_CH15_INT        (INT_NUM_IM2_IRL0 + 28)
+#define LTQ_DMA_CH16_INT        (INT_NUM_IM2_IRL0 + 29)
+#define LTQ_DMA_CH17_INT        (INT_NUM_IM2_IRL0 + 30)
+#define LTQ_DMA_CH18_INT        (INT_NUM_IM2_IRL0 + 16)
+#define LTQ_DMA_CH19_INT        (INT_NUM_IM2_IRL0 + 21)
+
+#define LTQ_PPE_MBOX_INT        (INT_NUM_IM2_IRL0 + 24)
+
+#define INT_NUM_IM4_IRL14       (INT_NUM_IM4_IRL0 + 14)
+
+#endif
diff --git a/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
new file mode 100644
index 000000000000..8a3c6be669d2
--- /dev/null
+++ b/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
@@ -0,0 +1,141 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef _LTQ_XWAY_H__
+#define _LTQ_XWAY_H__
+
+#ifdef CONFIG_SOC_TYPE_XWAY
+
+#include <lantiq.h>
+
+/* Chip IDs */
+#define SOC_ID_DANUBE1          0x129
+#define SOC_ID_DANUBE2          0x12B
+#define SOC_ID_TWINPASS         0x12D
+#define SOC_ID_AMAZON_SE        0x152
+#define SOC_ID_ARX188           0x16C
+#define SOC_ID_ARX168           0x16D
+#define SOC_ID_ARX182           0x16F
+
+/* SoC Types */
+#define SOC_TYPE_DANUBE         0x01
+#define SOC_TYPE_TWINPASS       0x02
+#define SOC_TYPE_AR9            0x03
+#define SOC_TYPE_VR9            0x04
+#define SOC_TYPE_AMAZON_SE      0x05
+
+/* ASC0/1 - serial port */
+#define LTQ_ASC0_BASE_ADDR      0x1E100400
+#define LTQ_ASC1_BASE_ADDR      0x1E100C00
+#define LTQ_ASC_SIZE            0x400
+
+/* RCU - reset control unit */
+#define LTQ_RCU_BASE_ADDR       0x1F203000
+#define LTQ_RCU_SIZE            0x1000
+
+/* GPTU - general purpose timer unit */
+#define LTQ_GPTU_BASE_ADDR      0x18000300
+#define LTQ_GPTU_SIZE           0x100
+
+/* EBU - external bus unit */
+#define LTQ_EBU_GPIO_START      0x14000000
+#define LTQ_EBU_GPIO_SIZE       0x1000
+
+#define LTQ_EBU_BASE_ADDR       0x1E105300
+#define LTQ_EBU_SIZE            0x100
+
+#define LTQ_EBU_BUSCON0         0x0060
+#define LTQ_EBU_PCC_CON         0x0090
+#define LTQ_EBU_PCC_IEN         0x00A4
+#define LTQ_EBU_PCC_ISTAT       0x00A0
+#define LTQ_EBU_BUSCON1         0x0064
+#define LTQ_EBU_ADDRSEL1        0x0024
+#define EBU_WRDIS               0x80000000
+
+/* CGU - clock generation unit */
+#define LTQ_CGU_BASE_ADDR       0x1F103000
+#define LTQ_CGU_SIZE            0x1000
+
+/* ICU - interrupt control unit */
+#define LTQ_ICU_BASE_ADDR       0x1F880200
+#define LTQ_ICU_SIZE            0x100
+
+/* EIU - external interrupt unit */
+#define LTQ_EIU_BASE_ADDR       0x1F101000
+#define LTQ_EIU_SIZE            0x1000
+
+/* PMU - power management unit */
+#define LTQ_PMU_BASE_ADDR       0x1F102000
+#define LTQ_PMU_SIZE            0x1000
+
+#define PMU_DMA                 0x0020
+#define PMU_USB                 0x8041
+#define PMU_LED                 0x0800
+#define PMU_GPT                 0x1000
+#define PMU_PPE                 0x2000
+#define PMU_FPI                 0x4000
+#define PMU_SWITCH              0x10000000
+
+/* ETOP - ethernet */
+#define LTQ_ETOP_BASE_ADDR      0x1E180000
+#define LTQ_ETOP_SIZE           0x40000
+
+/* DMA */
+#define LTQ_DMA_BASE_ADDR       0x1E104100
+#define LTQ_DMA_SIZE            0x800
+
+/* PCI */
+#define PCI_CR_BASE_ADDR        0x1E105400
+#define PCI_CR_SIZE             0x400
+
+/* WDT */
+#define LTQ_WDT_BASE_ADDR       0x1F8803F0
+#define LTQ_WDT_SIZE            0x10
+
+/* STP - serial to parallel conversion unit */
+#define LTQ_STP_BASE_ADDR       0x1E100BB0
+#define LTQ_STP_SIZE            0x40
+
+/* GPIO */
+#define LTQ_GPIO0_BASE_ADDR     0x1E100B10
+#define LTQ_GPIO1_BASE_ADDR     0x1E100B40
+#define LTQ_GPIO2_BASE_ADDR     0x1E100B70
+#define LTQ_GPIO_SIZE           0x30
+
+/* SSC */
+#define LTQ_SSC_BASE_ADDR       0x1e100800
+#define LTQ_SSC_SIZE            0x100
+
+/* MEI - dsl core */
+#define LTQ_MEI_BASE_ADDR       0x1E116000
+
+/* DEU - data encryption unit */
+#define LTQ_DEU_BASE_ADDR       0x1E103100
+
+/* MPS - multi processor unit (voice) */
+#define LTQ_MPS_BASE_ADDR       (KSEG1 + 0x1F107000)
+#define LTQ_MPS_CHIPID          ((u32 *)(LTQ_MPS_BASE_ADDR + 0x0344))
+
+/* request a non-gpio and set the PIO config */
+extern int  ltq_gpio_request(unsigned int pin, unsigned int alt0,
+        unsigned int alt1, unsigned int dir, const char *name);
+extern void ltq_pmu_enable(unsigned int module);
+extern void ltq_pmu_disable(unsigned int module);
+
+static inline int ltq_is_ar9(void)
+{
+        return (ltq_get_soc_type() == SOC_TYPE_AR9);
+}
+
+static inline int ltq_is_vr9(void)
+{
+        return (ltq_get_soc_type() == SOC_TYPE_VR9);
+}
+
+#endif /* CONFIG_SOC_TYPE_XWAY */
+#endif /* _LTQ_XWAY_H__ */
diff --git a/arch/mips/include/asm/mach-lantiq/xway/xway_dma.h b/arch/mips/include/asm/mach-lantiq/xway/xway_dma.h
new file mode 100644
index 000000000000..872943a4b90e
--- /dev/null
+++ b/arch/mips/include/asm/mach-lantiq/xway/xway_dma.h
@@ -0,0 +1,60 @@
+/*
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License version 2 as published
+ *   by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *   Copyright (C) 2011 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef LTQ_DMA_H__
+#define LTQ_DMA_H__
+
+#define LTQ_DESC_SIZE           0x08    /* each descriptor is 64bit */
+#define LTQ_DESC_NUM            0x40    /* 64 descriptors / channel */
+
+#define LTQ_DMA_OWN             BIT(31) /* owner bit */
+#define LTQ_DMA_C               BIT(30) /* complete bit */
+#define LTQ_DMA_SOP             BIT(29) /* start of packet */
+#define LTQ_DMA_EOP             BIT(28) /* end of packet */
+#define LTQ_DMA_TX_OFFSET(x)    ((x & 0x1f) << 23) /* data bytes offset */
+#define LTQ_DMA_RX_OFFSET(x)    ((x & 0x7) << 23) /* data bytes offset */
+#define LTQ_DMA_SIZE_MASK       (0xffff) /* the size field is 16 bit */
+
+struct ltq_dma_desc {
+        u32 ctl;
+        u32 addr;
+};
+
+struct ltq_dma_channel {
+        int nr;                         /* the channel number */
+        int irq;                        /* the mapped irq */
+        int desc;                       /* the current descriptor */
+        struct ltq_dma_desc *desc_base; /* the descriptor base */
+        int phys;                       /* physical addr */
+};
+
+enum {
+        DMA_PORT_ETOP = 0,
+        DMA_PORT_DEU,
+};
+
+extern void ltq_dma_enable_irq(struct ltq_dma_channel *ch);
+extern void ltq_dma_disable_irq(struct ltq_dma_channel *ch);
+extern void ltq_dma_ack_irq(struct ltq_dma_channel *ch);
+extern void ltq_dma_open(struct ltq_dma_channel *ch);
+extern void ltq_dma_close(struct ltq_dma_channel *ch);
+extern void ltq_dma_alloc_tx(struct ltq_dma_channel *ch);
+extern void ltq_dma_alloc_rx(struct ltq_dma_channel *ch);
+extern void ltq_dma_free(struct ltq_dma_channel *ch);
+extern void ltq_dma_init_port(int p);
+
+#endif
diff --git a/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h b/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h
new file mode 100644
index 000000000000..3b728275b9b0
--- /dev/null
+++ b/arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h
@@ -0,0 +1,47 @@
+/*
+ * 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) 2011 Netlogic Microsystems
+ * Copyright (C) 2003 Ralf Baechle
+ */
+#ifndef __ASM_MACH_NETLOGIC_CPU_FEATURE_OVERRIDES_H
+#define __ASM_MACH_NETLOGIC_CPU_FEATURE_OVERRIDES_H
+
+#define cpu_has_4kex            1
+#define cpu_has_4k_cache        1
+#define cpu_has_watch           1
+#define cpu_has_mips16          0
+#define cpu_has_counter         1
+#define cpu_has_divec           1
+#define cpu_has_vce             0
+#define cpu_has_cache_cdex_p    0
+#define cpu_has_cache_cdex_s    0
+#define cpu_has_prefetch        1
+#define cpu_has_mcheck          1
+#define cpu_has_ejtag           1
+
+#define cpu_has_llsc            1
+#define cpu_has_vtag_icache     0
+#define cpu_has_dc_aliases      0
+#define cpu_has_ic_fills_f_dc   0
+#define cpu_has_dsp             0
+#define cpu_has_mipsmt          0
+#define cpu_has_userlocal       0
+#define cpu_icache_snoops_remote_store  0
+
+#define cpu_has_nofpuex         0
+#define cpu_has_64bits          1
+
+#define cpu_has_mips32r1        1
+#define cpu_has_mips32r2        0
+#define cpu_has_mips64r1        1
+#define cpu_has_mips64r2        0
+
+#define cpu_has_inclusive_pcaches       0
+
+#define cpu_dcache_line_size()  32
+#define cpu_icache_line_size()  32
+
+#endif /* __ASM_MACH_NETLOGIC_CPU_FEATURE_OVERRIDES_H */
diff --git a/arch/mips/include/asm/mach-netlogic/irq.h b/arch/mips/include/asm/mach-netlogic/irq.h
new file mode 100644
index 000000000000..b5902458e7c1
--- /dev/null
+++ b/arch/mips/include/asm/mach-netlogic/irq.h
@@ -0,0 +1,14 @@
+/*
+ * 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) 2011 Netlogic Microsystems.
+ */
+#ifndef __ASM_NETLOGIC_IRQ_H
+#define __ASM_NETLOGIC_IRQ_H
+
+#define NR_IRQS                 64
+#define MIPS_CPU_IRQ_BASE       0
+
+#endif /* __ASM_NETLOGIC_IRQ_H */
diff --git a/arch/mips/include/asm/mach-netlogic/war.h b/arch/mips/include/asm/mach-netlogic/war.h
new file mode 100644
index 000000000000..22da89327352
--- /dev/null
+++ b/arch/mips/include/asm/mach-netlogic/war.h
@@ -0,0 +1,26 @@
+/*
+ * 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) 2011 Netlogic Microsystems.
+ * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
+ */
+#ifndef __ASM_MIPS_MACH_NLM_WAR_H
+#define __ASM_MIPS_MACH_NLM_WAR_H
+
+#define R4600_V1_INDEX_ICACHEOP_WAR     0
+#define R4600_V1_HIT_CACHEOP_WAR        0
+#define R4600_V2_HIT_CACHEOP_WAR        0
+#define R5432_CP0_INTERRUPT_WAR         0
+#define BCM1250_M3_WAR                  0
+#define SIBYTE_1956_WAR                 0
+#define MIPS4K_ICACHE_REFILL_WAR        0
+#define MIPS_CACHE_SYNC_WAR             0
+#define TX49XX_ICACHE_INDEX_INV_WAR     0
+#define RM9000_CDEX_SMP_WAR             0
+#define ICACHE_REFILLS_WORKAROUND_WAR   0
+#define R10000_LLSC_WAR                 0
+#define MIPS34K_MISSED_ITLB_WAR         0
+
+#endif /* __ASM_MIPS_MACH_NLM_WAR_H */
diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h
index d94085a3eafb..bc01a02cacd8 100644
--- a/arch/mips/include/asm/module.h
+++ b/arch/mips/include/asm/module.h
@@ -118,6 +118,8 @@ search_module_dbetables(unsigned long addr)
 #define MODULE_PROC_FAMILY "LOONGSON2 "
 #elif defined CONFIG_CPU_CAVIUM_OCTEON
 #define MODULE_PROC_FAMILY "OCTEON "
+#elif defined CONFIG_CPU_XLR
+#define MODULE_PROC_FAMILY "XLR "
 #else
 #error MODULE_PROC_FAMILY undefined for your processor configuration
 #endif
diff --git a/arch/mips/include/asm/netlogic/interrupt.h b/arch/mips/include/asm/netlogic/interrupt.h
new file mode 100644
index 000000000000..a85aadb6cfd7
--- /dev/null
+++ b/arch/mips/include/asm/netlogic/interrupt.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ASM_NLM_INTERRUPT_H
+#define _ASM_NLM_INTERRUPT_H
+
+/* Defines for the IRQ numbers */
+
+#define IRQ_IPI_SMP_FUNCTION    3
+#define IRQ_IPI_SMP_RESCHEDULE  4
+#define IRQ_MSGRING             6
+#define IRQ_TIMER               7
+
+#endif
diff --git a/arch/mips/include/asm/netlogic/mips-extns.h b/arch/mips/include/asm/netlogic/mips-extns.h
new file mode 100644
index 000000000000..8c53d0ba4bf2
--- /dev/null
+++ b/arch/mips/include/asm/netlogic/mips-extns.h
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ASM_NLM_MIPS_EXTS_H
+#define _ASM_NLM_MIPS_EXTS_H
+
+/*
+ * XLR and XLP interrupt request and interrupt mask registers
+ */
+#define read_c0_eirr()          __read_64bit_c0_register($9, 6)
+#define read_c0_eimr()          __read_64bit_c0_register($9, 7)
+#define write_c0_eirr(val)      __write_64bit_c0_register($9, 6, val)
+
+/*
+ * Writing EIMR in 32 bit is a special case, the lower 8 bit of the
+ * EIMR is shadowed in the status register, so we cannot save and
+ * restore status register for split read.
+ */
+#define write_c0_eimr(val)                                              \
+do {                                                                    \
+        if (sizeof(unsigned long) == 4) {                               \
+                unsigned long __flags;                                  \
+                                                                        \
+                local_irq_save(__flags);                                \
+                __asm__ __volatile__(                                   \
+                        ".set\tmips64\n\t"                              \
+                        "dsll\t%L0, %L0, 32\n\t"                        \
+                        "dsrl\t%L0, %L0, 32\n\t"                        \
+                        "dsll\t%M0, %M0, 32\n\t"                        \
+                        "or\t%L0, %L0, %M0\n\t"                         \
+                        "dmtc0\t%L0, $9, 7\n\t"                         \
+                        ".set\tmips0"                                   \
+                        : : "r" (val));                                 \
+                __flags = (__flags & 0xffff00ff) | (((val) & 0xff) << 8);\
+                local_irq_restore(__flags);                             \
+        } else                                                          \
+                __write_64bit_c0_register($9, 7, (val));                \
+} while (0)
+
+static inline int hard_smp_processor_id(void)
+{
+        return __read_32bit_c0_register($15, 1) & 0x3ff;
+}
+
+#endif /*_ASM_NLM_MIPS_EXTS_H */
diff --git a/arch/mips/include/asm/netlogic/psb-bootinfo.h b/arch/mips/include/asm/netlogic/psb-bootinfo.h
new file mode 100644
index 000000000000..6878307f0ee6
--- /dev/null
+++ b/arch/mips/include/asm/netlogic/psb-bootinfo.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ASM_NETLOGIC_BOOTINFO_H
+#define _ASM_NETLOGIC_BOOTINFO_H
+
+struct psb_info {
+        uint64_t boot_level;
+        uint64_t io_base;
+        uint64_t output_device;
+        uint64_t uart_print;
+        uint64_t led_output;
+        uint64_t init;
+        uint64_t exit;
+        uint64_t warm_reset;
+        uint64_t wakeup;
+        uint64_t online_cpu_map;
+        uint64_t master_reentry_sp;
+        uint64_t master_reentry_gp;
+        uint64_t master_reentry_fn;
+        uint64_t slave_reentry_fn;
+        uint64_t magic_dword;
+        uint64_t uart_putchar;
+        uint64_t size;
+        uint64_t uart_getchar;
+        uint64_t nmi_handler;
+        uint64_t psb_version;
+        uint64_t mac_addr;
+        uint64_t cpu_frequency;
+        uint64_t board_version;
+        uint64_t malloc;
+        uint64_t free;
+        uint64_t global_shmem_addr;
+        uint64_t global_shmem_size;
+        uint64_t psb_os_cpu_map;
+        uint64_t userapp_cpu_map;
+        uint64_t wakeup_os;
+        uint64_t psb_mem_map;
+        uint64_t board_major_version;
+        uint64_t board_minor_version;
+        uint64_t board_manf_revision;
+        uint64_t board_serial_number;
+        uint64_t psb_physaddr_map;
+        uint64_t xlr_loaderip_config;
+        uint64_t bldr_envp;
+        uint64_t avail_mem_map;
+};
+
+enum {
+        NETLOGIC_IO_SPACE = 0x10,
+        PCIX_IO_SPACE,
+        PCIX_CFG_SPACE,
+        PCIX_MEMORY_SPACE,
+        HT_IO_SPACE,
+        HT_CFG_SPACE,
+        HT_MEMORY_SPACE,
+        SRAM_SPACE,
+        FLASH_CONTROLLER_SPACE
+};
+
+#define NLM_MAX_ARGS    64
+#define NLM_MAX_ENVS    32
+
+/* This is what netlboot passes and linux boot_mem_map is subtly different */
+#define NLM_BOOT_MEM_MAP_MAX    32
+struct nlm_boot_mem_map {
+        int nr_map;
+        struct nlm_boot_mem_map_entry {
+                uint64_t addr;          /* start of memory segment */
+                uint64_t size;          /* size of memory segment */
+                uint32_t type;          /* type of memory segment */
+        } map[NLM_BOOT_MEM_MAP_MAX];
+};
+
+/* Pointer to saved boot loader info */
+extern struct psb_info nlm_prom_info;
+
+#endif
diff --git a/arch/mips/include/asm/netlogic/xlr/gpio.h b/arch/mips/include/asm/netlogic/xlr/gpio.h
new file mode 100644
index 000000000000..51f6ad4aeb14
--- /dev/null
+++ b/arch/mips/include/asm/netlogic/xlr/gpio.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ASM_NLM_GPIO_H
+#define _ASM_NLM_GPIO_H
+
+#define NETLOGIC_GPIO_INT_EN_REG                0
+#define NETLOGIC_GPIO_INPUT_INVERSION_REG       1
+#define NETLOGIC_GPIO_IO_DIR_REG                2
+#define NETLOGIC_GPIO_IO_DATA_WR_REG            3
+#define NETLOGIC_GPIO_IO_DATA_RD_REG            4
+
+#define NETLOGIC_GPIO_SWRESET_REG               8
+#define NETLOGIC_GPIO_DRAM1_CNTRL_REG           9
+#define NETLOGIC_GPIO_DRAM1_RATIO_REG           10
+#define NETLOGIC_GPIO_DRAM1_RESET_REG           11
+#define NETLOGIC_GPIO_DRAM1_STATUS_REG          12
+#define NETLOGIC_GPIO_DRAM2_CNTRL_REG           13
+#define NETLOGIC_GPIO_DRAM2_RATIO_REG           14
+#define NETLOGIC_GPIO_DRAM2_RESET_REG           15
+#define NETLOGIC_GPIO_DRAM2_STATUS_REG          16
+
+#define NETLOGIC_GPIO_PWRON_RESET_CFG_REG       21
+#define NETLOGIC_GPIO_BIST_ALL_GO_STATUS_REG    24
+#define NETLOGIC_GPIO_BIST_CPU_GO_STATUS_REG    25
+#define NETLOGIC_GPIO_BIST_DEV_GO_STATUS_REG    26
+
+#define NETLOGIC_GPIO_FUSE_BANK_REG             35
+#define NETLOGIC_GPIO_CPU_RESET_REG             40
+#define NETLOGIC_GPIO_RNG_REG                   43
+
+#define NETLOGIC_PWRON_RESET_PCMCIA_BOOT        17
+#define NETLOGIC_GPIO_LED_BITMAP        0x1700000
+#define NETLOGIC_GPIO_LED_0_SHIFT               20
+#define NETLOGIC_GPIO_LED_1_SHIFT               24
+
+#define NETLOGIC_GPIO_LED_OUTPUT_CODE_RESET     0x01
+#define NETLOGIC_GPIO_LED_OUTPUT_CODE_HARD_RESET 0x02
+#define NETLOGIC_GPIO_LED_OUTPUT_CODE_SOFT_RESET 0x03
+#define NETLOGIC_GPIO_LED_OUTPUT_CODE_MAIN      0x04
+
+#endif
diff --git a/arch/mips/include/asm/netlogic/xlr/iomap.h b/arch/mips/include/asm/netlogic/xlr/iomap.h
new file mode 100644
index 000000000000..2e3a4dd53045
--- /dev/null
+++ b/arch/mips/include/asm/netlogic/xlr/iomap.h
@@ -0,0 +1,131 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ASM_NLM_IOMAP_H
+#define _ASM_NLM_IOMAP_H
+
+#define DEFAULT_NETLOGIC_IO_BASE           CKSEG1ADDR(0x1ef00000)
+#define NETLOGIC_IO_DDR2_CHN0_OFFSET       0x01000
+#define NETLOGIC_IO_DDR2_CHN1_OFFSET       0x02000
+#define NETLOGIC_IO_DDR2_CHN2_OFFSET       0x03000
+#define NETLOGIC_IO_DDR2_CHN3_OFFSET       0x04000
+#define NETLOGIC_IO_PIC_OFFSET             0x08000
+#define NETLOGIC_IO_UART_0_OFFSET          0x14000
+#define NETLOGIC_IO_UART_1_OFFSET          0x15100
+
+#define NETLOGIC_IO_SIZE                   0x1000
+
+#define NETLOGIC_IO_BRIDGE_OFFSET          0x00000
+
+#define NETLOGIC_IO_RLD2_CHN0_OFFSET       0x05000
+#define NETLOGIC_IO_RLD2_CHN1_OFFSET       0x06000
+
+#define NETLOGIC_IO_SRAM_OFFSET            0x07000
+
+#define NETLOGIC_IO_PCIX_OFFSET            0x09000
+#define NETLOGIC_IO_HT_OFFSET              0x0A000
+
+#define NETLOGIC_IO_SECURITY_OFFSET        0x0B000
+
+#define NETLOGIC_IO_GMAC_0_OFFSET          0x0C000
+#define NETLOGIC_IO_GMAC_1_OFFSET          0x0D000
+#define NETLOGIC_IO_GMAC_2_OFFSET          0x0E000
+#define NETLOGIC_IO_GMAC_3_OFFSET          0x0F000
+
+/* XLS devices */
+#define NETLOGIC_IO_GMAC_4_OFFSET          0x20000
+#define NETLOGIC_IO_GMAC_5_OFFSET          0x21000
+#define NETLOGIC_IO_GMAC_6_OFFSET          0x22000
+#define NETLOGIC_IO_GMAC_7_OFFSET          0x23000
+
+#define NETLOGIC_IO_PCIE_0_OFFSET          0x1E000
+#define NETLOGIC_IO_PCIE_1_OFFSET          0x1F000
+#define NETLOGIC_IO_SRIO_0_OFFSET          0x1E000
+#define NETLOGIC_IO_SRIO_1_OFFSET          0x1F000
+
+#define NETLOGIC_IO_USB_0_OFFSET           0x24000
+#define NETLOGIC_IO_USB_1_OFFSET           0x25000
+
+#define NETLOGIC_IO_COMP_OFFSET            0x1D000
+/* end XLS devices */
+
+/* XLR devices */
+#define NETLOGIC_IO_SPI4_0_OFFSET          0x10000
+#define NETLOGIC_IO_XGMAC_0_OFFSET         0x11000
+#define NETLOGIC_IO_SPI4_1_OFFSET          0x12000
+#define NETLOGIC_IO_XGMAC_1_OFFSET         0x13000
+/* end XLR devices */
+
+#define NETLOGIC_IO_I2C_0_OFFSET           0x16000
+#define NETLOGIC_IO_I2C_1_OFFSET           0x17000
+
+#define NETLOGIC_IO_GPIO_OFFSET            0x18000
+#define NETLOGIC_IO_FLASH_OFFSET           0x19000
+#define NETLOGIC_IO_TB_OFFSET              0x1C000
+
+#define NETLOGIC_CPLD_OFFSET               KSEG1ADDR(0x1d840000)
+
+/*
+ * Base Address (Virtual) of the PCI Config address space
+ * For now, choose 256M phys in kseg1 = 0xA0000000 + (1<<28)
+ * Config space spans 256 (num of buses) * 256 (num functions) * 256 bytes
+ * ie 1<<24 = 16M
+ */
+#define DEFAULT_PCI_CONFIG_BASE         0x18000000
+#define DEFAULT_HT_TYPE0_CFG_BASE       0x16000000
+#define DEFAULT_HT_TYPE1_CFG_BASE       0x17000000
+
+#ifndef __ASSEMBLY__
+#include <linux/types.h>
+#include <asm/byteorder.h>
+
+typedef volatile __u32 nlm_reg_t;
+extern unsigned long netlogic_io_base;
+
+/* FIXME read once in write_reg */
+#ifdef CONFIG_CPU_LITTLE_ENDIAN
+#define netlogic_read_reg(base, offset)         ((base)[(offset)])
+#define netlogic_write_reg(base, offset, value) ((base)[(offset)] = (value))
+#else
+#define netlogic_read_reg(base, offset)         (be32_to_cpu((base)[(offset)]))
+#define netlogic_write_reg(base, offset, value) \
+                                ((base)[(offset)] = cpu_to_be32((value)))
+#endif
+
+#define netlogic_read_reg_le32(base, offset) (le32_to_cpu((base)[(offset)]))
+#define netlogic_write_reg_le32(base, offset, value) \
+                                ((base)[(offset)] = cpu_to_le32((value)))
+#define netlogic_io_mmio(offset) ((nlm_reg_t *)(netlogic_io_base+(offset)))
+#endif /* __ASSEMBLY__ */
+#endif
diff --git a/arch/mips/include/asm/netlogic/xlr/pic.h b/arch/mips/include/asm/netlogic/xlr/pic.h
new file mode 100644
index 000000000000..5cceb746f080
--- /dev/null
+++ b/arch/mips/include/asm/netlogic/xlr/pic.h
@@ -0,0 +1,231 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ASM_NLM_XLR_PIC_H
+#define _ASM_NLM_XLR_PIC_H
+
+#define PIC_CLKS_PER_SEC                66666666ULL
+/* PIC hardware interrupt numbers */
+#define PIC_IRT_WD_INDEX                0
+#define PIC_IRT_TIMER_0_INDEX           1
+#define PIC_IRT_TIMER_1_INDEX           2
+#define PIC_IRT_TIMER_2_INDEX           3
+#define PIC_IRT_TIMER_3_INDEX           4
+#define PIC_IRT_TIMER_4_INDEX           5
+#define PIC_IRT_TIMER_5_INDEX           6
+#define PIC_IRT_TIMER_6_INDEX           7
+#define PIC_IRT_TIMER_7_INDEX           8
+#define PIC_IRT_CLOCK_INDEX             PIC_IRT_TIMER_7_INDEX
+#define PIC_IRT_UART_0_INDEX            9
+#define PIC_IRT_UART_1_INDEX            10
+#define PIC_IRT_I2C_0_INDEX             11
+#define PIC_IRT_I2C_1_INDEX             12
+#define PIC_IRT_PCMCIA_INDEX            13
+#define PIC_IRT_GPIO_INDEX              14
+#define PIC_IRT_HYPER_INDEX             15
+#define PIC_IRT_PCIX_INDEX              16
+/* XLS */
+#define PIC_IRT_CDE_INDEX               15
+#define PIC_IRT_BRIDGE_TB_XLS_INDEX     16
+/* XLS */
+#define PIC_IRT_GMAC0_INDEX             17
+#define PIC_IRT_GMAC1_INDEX             18
+#define PIC_IRT_GMAC2_INDEX             19
+#define PIC_IRT_GMAC3_INDEX             20
+#define PIC_IRT_XGS0_INDEX              21
+#define PIC_IRT_XGS1_INDEX              22
+#define PIC_IRT_HYPER_FATAL_INDEX       23
+#define PIC_IRT_PCIX_FATAL_INDEX        24
+#define PIC_IRT_BRIDGE_AERR_INDEX       25
+#define PIC_IRT_BRIDGE_BERR_INDEX       26
+#define PIC_IRT_BRIDGE_TB_XLR_INDEX     27
+#define PIC_IRT_BRIDGE_AERR_NMI_INDEX   28
+/* XLS */
+#define PIC_IRT_GMAC4_INDEX             21
+#define PIC_IRT_GMAC5_INDEX             22
+#define PIC_IRT_GMAC6_INDEX             23
+#define PIC_IRT_GMAC7_INDEX             24
+#define PIC_IRT_BRIDGE_ERR_INDEX        25
+#define PIC_IRT_PCIE_LINK0_INDEX        26
+#define PIC_IRT_PCIE_LINK1_INDEX        27
+#define PIC_IRT_PCIE_LINK2_INDEX        23
+#define PIC_IRT_PCIE_LINK3_INDEX        24
+#define PIC_IRT_PCIE_XLSB0_LINK2_INDEX  28
+#define PIC_IRT_PCIE_XLSB0_LINK3_INDEX  29
+#define PIC_IRT_SRIO_LINK0_INDEX        26
+#define PIC_IRT_SRIO_LINK1_INDEX        27
+#define PIC_IRT_SRIO_LINK2_INDEX        28
+#define PIC_IRT_SRIO_LINK3_INDEX        29
+#define PIC_IRT_PCIE_INT_INDEX          28
+#define PIC_IRT_PCIE_FATAL_INDEX        29
+#define PIC_IRT_GPIO_B_INDEX            30
+#define PIC_IRT_USB_INDEX               31
+/* XLS */
+#define PIC_NUM_IRTS                    32
+
+
+#define PIC_CLOCK_TIMER                 7
+
+/* PIC Registers */
+#define PIC_CTRL                        0x00
+#define PIC_IPI                         0x04
+#define PIC_INT_ACK                     0x06
+
+#define WD_MAX_VAL_0                    0x08
+#define WD_MAX_VAL_1                    0x09
+#define WD_MASK_0                       0x0a
+#define WD_MASK_1                       0x0b
+#define WD_HEARBEAT_0                   0x0c
+#define WD_HEARBEAT_1                   0x0d
+
+#define PIC_IRT_0_BASE                  0x40
+#define PIC_IRT_1_BASE                  0x80
+#define PIC_TIMER_MAXVAL_0_BASE         0x100
+#define PIC_TIMER_MAXVAL_1_BASE         0x110
+#define PIC_TIMER_COUNT_0_BASE          0x120
+#define PIC_TIMER_COUNT_1_BASE          0x130
+
+#define PIC_IRT_0(picintr)      (PIC_IRT_0_BASE + (picintr))
+#define PIC_IRT_1(picintr)      (PIC_IRT_1_BASE + (picintr))
+
+#define PIC_TIMER_MAXVAL_0(i)   (PIC_TIMER_MAXVAL_0_BASE + (i))
+#define PIC_TIMER_MAXVAL_1(i)   (PIC_TIMER_MAXVAL_1_BASE + (i))
+#define PIC_TIMER_COUNT_0(i)    (PIC_TIMER_COUNT_0_BASE + (i))
+#define PIC_TIMER_COUNT_1(i)    (PIC_TIMER_COUNT_0_BASE + (i))
+
+/*
+ * Mapping between hardware interrupt numbers and IRQs on CPU
+ * we use a simple scheme to map PIC interrupts 0-31 to IRQs
+ * 8-39. This leaves the IRQ 0-7 for cpu interrupts like
+ * count/compare and FMN
+ */
+#define PIC_IRQ_BASE            8
+#define PIC_INTR_TO_IRQ(i)      (PIC_IRQ_BASE + (i))
+#define PIC_IRQ_TO_INTR(i)      ((i) - PIC_IRQ_BASE)
+
+#define PIC_IRT_FIRST_IRQ       PIC_IRQ_BASE
+#define PIC_WD_IRQ              PIC_INTR_TO_IRQ(PIC_IRT_WD_INDEX)
+#define PIC_TIMER_0_IRQ         PIC_INTR_TO_IRQ(PIC_IRT_TIMER_0_INDEX)
+#define PIC_TIMER_1_IRQ         PIC_INTR_TO_IRQ(PIC_IRT_TIMER_1_INDEX)
+#define PIC_TIMER_2_IRQ         PIC_INTR_TO_IRQ(PIC_IRT_TIMER_2_INDEX)
+#define PIC_TIMER_3_IRQ         PIC_INTR_TO_IRQ(PIC_IRT_TIMER_3_INDEX)
+#define PIC_TIMER_4_IRQ         PIC_INTR_TO_IRQ(PIC_IRT_TIMER_4_INDEX)
+#define PIC_TIMER_5_IRQ         PIC_INTR_TO_IRQ(PIC_IRT_TIMER_5_INDEX)
+#define PIC_TIMER_6_IRQ         PIC_INTR_TO_IRQ(PIC_IRT_TIMER_6_INDEX)
+#define PIC_TIMER_7_IRQ         PIC_INTR_TO_IRQ(PIC_IRT_TIMER_7_INDEX)
+#define PIC_CLOCK_IRQ           (PIC_TIMER_7_IRQ)
+#define PIC_UART_0_IRQ          PIC_INTR_TO_IRQ(PIC_IRT_UART_0_INDEX)
+#define PIC_UART_1_IRQ          PIC_INTR_TO_IRQ(PIC_IRT_UART_1_INDEX)
+#define PIC_I2C_0_IRQ           PIC_INTR_TO_IRQ(PIC_IRT_I2C_0_INDEX)
+#define PIC_I2C_1_IRQ           PIC_INTR_TO_IRQ(PIC_IRT_I2C_1_INDEX)
+#define PIC_PCMCIA_IRQ          PIC_INTR_TO_IRQ(PIC_IRT_PCMCIA_INDEX)
+#define PIC_GPIO_IRQ            PIC_INTR_TO_IRQ(PIC_IRT_GPIO_INDEX)
+#define PIC_HYPER_IRQ           PIC_INTR_TO_IRQ(PIC_IRT_HYPER_INDEX)
+#define PIC_PCIX_IRQ            PIC_INTR_TO_IRQ(PIC_IRT_PCIX_INDEX)
+/* XLS */
+#define PIC_CDE_IRQ             PIC_INTR_TO_IRQ(PIC_IRT_CDE_INDEX)
+#define PIC_BRIDGE_TB_XLS_IRQ   PIC_INTR_TO_IRQ(PIC_IRT_BRIDGE_TB_XLS_INDEX)
+/* end XLS */
+#define PIC_GMAC_0_IRQ          PIC_INTR_TO_IRQ(PIC_IRT_GMAC0_INDEX)
+#define PIC_GMAC_1_IRQ          PIC_INTR_TO_IRQ(PIC_IRT_GMAC1_INDEX)
+#define PIC_GMAC_2_IRQ          PIC_INTR_TO_IRQ(PIC_IRT_GMAC2_INDEX)
+#define PIC_GMAC_3_IRQ          PIC_INTR_TO_IRQ(PIC_IRT_GMAC3_INDEX)
+#define PIC_XGS_0_IRQ           PIC_INTR_TO_IRQ(PIC_IRT_XGS0_INDEX)
+#define PIC_XGS_1_IRQ           PIC_INTR_TO_IRQ(PIC_IRT_XGS1_INDEX)
+#define PIC_HYPER_FATAL_IRQ     PIC_INTR_TO_IRQ(PIC_IRT_HYPER_FATAL_INDEX)
+#define PIC_PCIX_FATAL_IRQ      PIC_INTR_TO_IRQ(PIC_IRT_PCIX_FATAL_INDEX)
+#define PIC_BRIDGE_AERR_IRQ     PIC_INTR_TO_IRQ(PIC_IRT_BRIDGE_AERR_INDEX)
+#define PIC_BRIDGE_BERR_IRQ     PIC_INTR_TO_IRQ(PIC_IRT_BRIDGE_BERR_INDEX)
+#define PIC_BRIDGE_TB_XLR_IRQ   PIC_INTR_TO_IRQ(PIC_IRT_BRIDGE_TB_XLR_INDEX)
+#define PIC_BRIDGE_AERR_NMI_IRQ PIC_INTR_TO_IRQ(PIC_IRT_BRIDGE_AERR_NMI_INDEX)
+/* XLS defines */
+#define PIC_GMAC_4_IRQ          PIC_INTR_TO_IRQ(PIC_IRT_GMAC4_INDEX)
+#define PIC_GMAC_5_IRQ          PIC_INTR_TO_IRQ(PIC_IRT_GMAC5_INDEX)
+#define PIC_GMAC_6_IRQ          PIC_INTR_TO_IRQ(PIC_IRT_GMAC6_INDEX)
+#define PIC_GMAC_7_IRQ          PIC_INTR_TO_IRQ(PIC_IRT_GMAC7_INDEX)
+#define PIC_BRIDGE_ERR_IRQ      PIC_INTR_TO_IRQ(PIC_IRT_BRIDGE_ERR_INDEX)
+#define PIC_PCIE_LINK0_IRQ      PIC_INTR_TO_IRQ(PIC_IRT_PCIE_LINK0_INDEX)
+#define PIC_PCIE_LINK1_IRQ      PIC_INTR_TO_IRQ(PIC_IRT_PCIE_LINK1_INDEX)
+#define PIC_PCIE_LINK2_IRQ      PIC_INTR_TO_IRQ(PIC_IRT_PCIE_LINK2_INDEX)
+#define PIC_PCIE_LINK3_IRQ      PIC_INTR_TO_IRQ(PIC_IRT_PCIE_LINK3_INDEX)
+#define PIC_PCIE_XLSB0_LINK2_IRQ PIC_INTR_TO_IRQ(PIC_IRT_PCIE_XLSB0_LINK2_INDEX)
+#define PIC_PCIE_XLSB0_LINK3_IRQ PIC_INTR_TO_IRQ(PIC_IRT_PCIE_XLSB0_LINK3_INDEX)
+#define PIC_SRIO_LINK0_IRQ      PIC_INTR_TO_IRQ(PIC_IRT_SRIO_LINK0_INDEX)
+#define PIC_SRIO_LINK1_IRQ      PIC_INTR_TO_IRQ(PIC_IRT_SRIO_LINK1_INDEX)
+#define PIC_SRIO_LINK2_IRQ      PIC_INTR_TO_IRQ(PIC_IRT_SRIO_LINK2_INDEX)
+#define PIC_SRIO_LINK3_IRQ      PIC_INTR_TO_IRQ(PIC_IRT_SRIO_LINK3_INDEX)
+#define PIC_PCIE_INT_IRQ        PIC_INTR_TO_IRQ(PIC_IRT_PCIE_INT__INDEX)
+#define PIC_PCIE_FATAL_IRQ      PIC_INTR_TO_IRQ(PIC_IRT_PCIE_FATAL_INDEX)
+#define PIC_GPIO_B_IRQ          PIC_INTR_TO_IRQ(PIC_IRT_GPIO_B_INDEX)
+#define PIC_USB_IRQ             PIC_INTR_TO_IRQ(PIC_IRT_USB_INDEX)
+#define PIC_IRT_LAST_IRQ        PIC_USB_IRQ
+/* end XLS */
+
+#ifndef __ASSEMBLY__
+static inline void pic_send_ipi(u32 ipi)
+{
+        nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);
+
+        netlogic_write_reg(mmio, PIC_IPI, ipi);
+}
+
+static inline u32 pic_read_control(void)
+{
+        nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);
+
+        return netlogic_read_reg(mmio, PIC_CTRL);
+}
+
+static inline void pic_write_control(u32 control)
+{
+        nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);
+
+        netlogic_write_reg(mmio, PIC_CTRL, control);
+}
+
+static inline void pic_update_control(u32 control)
+{
+        nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);
+
+        netlogic_write_reg(mmio, PIC_CTRL,
+                (control | netlogic_read_reg(mmio, PIC_CTRL)));
+}
+
+#define PIC_IRQ_IS_EDGE_TRIGGERED(irq)  (((irq) >= PIC_TIMER_0_IRQ) && \
+                                        ((irq) <= PIC_TIMER_7_IRQ))
+#define PIC_IRQ_IS_IRT(irq)             (((irq) >= PIC_IRT_FIRST_IRQ) && \
+                                        ((irq) <= PIC_IRT_LAST_IRQ))
+#endif
+
+#endif /* _ASM_NLM_XLR_PIC_H */
diff --git a/arch/mips/include/asm/netlogic/xlr/xlr.h b/arch/mips/include/asm/netlogic/xlr/xlr.h
new file mode 100644
index 000000000000..3e6372692a04
--- /dev/null
+++ b/arch/mips/include/asm/netlogic/xlr/xlr.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ASM_NLM_XLR_H
+#define _ASM_NLM_XLR_H
+
+/* Platform UART functions */
+struct uart_port;
+unsigned int nlm_xlr_uart_in(struct uart_port *, int);
+void nlm_xlr_uart_out(struct uart_port *, int, int);
+
+/* SMP support functions */
+struct irq_desc;
+void nlm_smp_function_ipi_handler(unsigned int irq, struct irq_desc *desc);
+void nlm_smp_resched_ipi_handler(unsigned int irq, struct irq_desc *desc);
+int nlm_wakeup_secondary_cpus(u32 wakeup_mask);
+void nlm_smp_irq_init(void);
+void nlm_boot_smp_nmi(void);
+void prom_pre_boot_secondary_cpus(void);
+
+extern struct plat_smp_ops nlm_smp_ops;
+extern unsigned long nlm_common_ebase;
+
+/* XLS B silicon "Rook" */
+static inline unsigned int nlm_chip_is_xls_b(void)
+{
+        uint32_t prid = read_c0_prid();
+
+        return ((prid & 0xf000) == 0x4000);
+}
+
+/*
+ *  XLR chip types
+ */
+ /* The XLS product line has chip versions 0x[48c]? */
+static inline unsigned int nlm_chip_is_xls(void)
+{
+        uint32_t prid = read_c0_prid();
+
+        return ((prid & 0xf000) == 0x8000 || (prid & 0xf000) == 0x4000 ||
+                (prid & 0xf000) == 0xc000);
+}
+
+#endif /* _ASM_NLM_XLR_H */
diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h
index 9f1b8dba2c81..de39b1f343ea 100644
--- a/arch/mips/include/asm/ptrace.h
+++ b/arch/mips/include/asm/ptrace.h
@@ -141,7 +141,8 @@ extern int ptrace_set_watch_regs(struct task_struct *child,
 #define instruction_pointer(regs) ((regs)->cp0_epc)
 #define profile_pc(regs) instruction_pointer(regs)
 
-extern asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit);
+extern asmlinkage void syscall_trace_enter(struct pt_regs *regs);
+extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);
 
 extern NORET_TYPE void die(const char *, struct pt_regs *) ATTRIB_NORET;
 
diff --git a/arch/mips/include/asm/r4kcache.h b/arch/mips/include/asm/r4kcache.h
index 387bf59f1e37..54ea47da59a1 100644
--- a/arch/mips/include/asm/r4kcache.h
+++ b/arch/mips/include/asm/r4kcache.h
@@ -5,7 +5,7 @@
  *
  * Inline assembly cache operations.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1997 - 2002 Ralf Baechle (ralf@gnu.org)
  * Copyright (C) 2004 Ralf Baechle (ralf@linux-mips.org)
  */
diff --git a/arch/mips/include/asm/sgialib.h b/arch/mips/include/asm/sgialib.h
index 2a2f1bddc276..f58115769457 100644
--- a/arch/mips/include/asm/sgialib.h
+++ b/arch/mips/include/asm/sgialib.h
@@ -5,7 +5,7 @@
  *
  * SGI ARCS firmware interface library for the Linux kernel.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 2001, 2002 Ralf Baechle (ralf@gnu.org)
  */
 #ifndef _ASM_SGIALIB_H
diff --git a/arch/mips/include/asm/sgiarcs.h b/arch/mips/include/asm/sgiarcs.h
index 721327f88601..149342951436 100644
--- a/arch/mips/include/asm/sgiarcs.h
+++ b/arch/mips/include/asm/sgiarcs.h
@@ -5,7 +5,7 @@
  *
  * ARC firmware interface defines.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1999, 2001 Ralf Baechle (ralf@gnu.org)
  * Copyright (C) 1999 Silicon Graphics, Inc.
  */
diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
index d71160de4d10..97f8bf6639e7 100644
--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
@@ -149,6 +149,9 @@ register struct thread_info *__current_thread_info __asm__("$28");
 #define _TIF_FPUBOUND           (1<<TIF_FPUBOUND)
 #define _TIF_LOAD_WATCH         (1<<TIF_LOAD_WATCH)
 
+/* work to do in syscall_trace_leave() */
+#define _TIF_WORK_SYSCALL_EXIT  (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT)
+
 /* work to do on interrupt/exception return */
 #define _TIF_WORK_MASK          (0x0000ffef &                           \
                                         ~(_TIF_SECCOMP | _TIF_SYSCALL_AUDIT))
diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h
index c7f1bfef1574..bc14447e69b5 100644
--- a/arch/mips/include/asm/time.h
+++ b/arch/mips/include/asm/time.h
@@ -84,12 +84,6 @@ static inline int init_mips_clocksource(void)
 #endif
 }
 
-static inline void clocksource_set_clock(struct clocksource *cs,
-                                         unsigned int clock)
-{
-        clocksource_calc_mult_shift(cs, clock, 4);
-}
-
 static inline void clockevent_set_clock(struct clock_event_device *cd,
                                         unsigned int clock)
 {
diff --git a/arch/mips/jz4740/setup.c b/arch/mips/jz4740/setup.c
index 6a9e14dab91e..d97cfbf882f5 100644
--- a/arch/mips/jz4740/setup.c
+++ b/arch/mips/jz4740/setup.c
@@ -1,5 +1,6 @@
 /*
  *  Copyright (C) 2009-2010, Lars-Peter Clausen <lars@metafoo.de>
+ *  Copyright (C) 2011, Maarten ter Huurne <maarten@treewalker.org>
  *  JZ4740 setup code
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -14,13 +15,44 @@
  */
 
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/kernel.h>
 
+#include <asm/bootinfo.h>
+
+#include <asm/mach-jz4740/base.h>
+
 #include "reset.h"
 
+
+#define JZ4740_EMC_SDRAM_CTRL 0x80
+
+
+static void __init jz4740_detect_mem(void)
+{
+        void __iomem *jz_emc_base;
+        u32 ctrl, bus, bank, rows, cols;
+        phys_t size;
+
+        jz_emc_base = ioremap(JZ4740_EMC_BASE_ADDR, 0x100);
+        ctrl = readl(jz_emc_base + JZ4740_EMC_SDRAM_CTRL);
+        bus = 2 - ((ctrl >> 31) & 1);
+        bank = 1 + ((ctrl >> 19) & 1);
+        cols = 8 + ((ctrl >> 26) & 7);
+        rows = 11 + ((ctrl >> 20) & 3);
+        printk(KERN_DEBUG
+                "SDRAM preconfigured: bus:%u bank:%u rows:%u cols:%u\n",
+                bus, bank, rows, cols);
+        iounmap(jz_emc_base);
+
+        size = 1 << (bus + bank + cols + rows);
+        add_memory_region(0, size, BOOT_MEM_RAM);
+}
+
 void __init plat_mem_setup(void)
 {
         jz4740_reset_init();
+        jz4740_detect_mem();
 }
 
 const char *get_system_type(void)
diff --git a/arch/mips/jz4740/time.c b/arch/mips/jz4740/time.c
index eaa853a54af6..f83c2dd07a27 100644
--- a/arch/mips/jz4740/time.c
+++ b/arch/mips/jz4740/time.c
@@ -121,8 +121,7 @@ void __init plat_time_init(void)
 
         clockevents_register_device(&jz4740_clockevent);
 
-        clocksource_set_clock(&jz4740_clocksource, clk_rate);
-        ret = clocksource_register(&jz4740_clocksource);
+        ret = clocksource_register_hz(&jz4740_clocksource, clk_rate);
 
         if (ret)
                 printk(KERN_ERR "Failed to register clocksource: %d\n", ret);
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index cedee2bcbd18..83bba332bbfc 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_CPU_TX39XX)	+= r2300_fpu.o r2300_switch.o
 obj-$(CONFIG_CPU_TX49XX)        += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_VR41XX)        += r4k_fpu.o r4k_switch.o
 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += octeon_switch.o
+obj-$(CONFIG_CPU_XLR)           += r4k_fpu.o r4k_switch.o
 
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_SMP_UP)            += smp-up.o
diff --git a/arch/mips/kernel/cevt-txx9.c b/arch/mips/kernel/cevt-txx9.c
index 0b7377361e22..f0ab92a1b057 100644
--- a/arch/mips/kernel/cevt-txx9.c
+++ b/arch/mips/kernel/cevt-txx9.c
@@ -51,8 +51,7 @@ void __init txx9_clocksource_init(unsigned long baseaddr,
 {
         struct txx9_tmr_reg __iomem *tmrptr;
 
-        clocksource_set_clock(&txx9_clocksource.cs, TIMER_CLK(imbusclk));
-        clocksource_register(&txx9_clocksource.cs);
+        clocksource_register_hz(&txx9_clocksource.cs, TIMER_CLK(imbusclk));
 
         tmrptr = ioremap(baseaddr, sizeof(struct txx9_tmr_reg));
         __raw_writel(TCR_BASE, &tmrptr->tcr);
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index f65d4c8c65a6..bb133d10b145 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -291,6 +291,12 @@ static inline int cpu_has_confreg(void)
 #endif
 }
 
+static inline void set_elf_platform(int cpu, const char *plat)
+{
+        if (cpu == 0)
+                __elf_platform = plat;
+}
+
 /*
  * Get the FPU Implementation/Revision.
  */
@@ -614,6 +620,16 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
         case PRID_IMP_LOONGSON2:
                 c->cputype = CPU_LOONGSON2;
                 __cpu_name[cpu] = "ICT Loongson-2";
+
+                switch (c->processor_id & PRID_REV_MASK) {
+                case PRID_REV_LOONGSON2E:
+                        set_elf_platform(cpu, "loongson2e");
+                        break;
+                case PRID_REV_LOONGSON2F:
+                        set_elf_platform(cpu, "loongson2f");
+                        break;
+                }
+
                 c->isa_level = MIPS_CPU_ISA_III;
                 c->options = R4K_OPTS |
                              MIPS_CPU_FPU | MIPS_CPU_LLSC |
@@ -911,12 +927,14 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu)
         case PRID_IMP_BMIPS32_REV8:
                 c->cputype = CPU_BMIPS32;
                 __cpu_name[cpu] = "Broadcom BMIPS32";
+                set_elf_platform(cpu, "bmips32");
                 break;
         case PRID_IMP_BMIPS3300:
         case PRID_IMP_BMIPS3300_ALT:
         case PRID_IMP_BMIPS3300_BUG:
                 c->cputype = CPU_BMIPS3300;
                 __cpu_name[cpu] = "Broadcom BMIPS3300";
+                set_elf_platform(cpu, "bmips3300");
                 break;
         case PRID_IMP_BMIPS43XX: {
                 int rev = c->processor_id & 0xff;
@@ -925,15 +943,18 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu)
                                 rev <= PRID_REV_BMIPS4380_HI) {
                         c->cputype = CPU_BMIPS4380;
                         __cpu_name[cpu] = "Broadcom BMIPS4380";
+                        set_elf_platform(cpu, "bmips4380");
                 } else {
                         c->cputype = CPU_BMIPS4350;
                         __cpu_name[cpu] = "Broadcom BMIPS4350";
+                        set_elf_platform(cpu, "bmips4350");
                 }
                 break;
         }
         case PRID_IMP_BMIPS5000:
                 c->cputype = CPU_BMIPS5000;
                 __cpu_name[cpu] = "Broadcom BMIPS5000";
+                set_elf_platform(cpu, "bmips5000");
                 c->options |= MIPS_CPU_ULRI;
                 break;
         }
@@ -956,14 +977,12 @@ static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu)
                 c->cputype = CPU_CAVIUM_OCTEON_PLUS;
                 __cpu_name[cpu] = "Cavium Octeon+";
 platform:
-                if (cpu == 0)
-                        __elf_platform = "octeon";
+                set_elf_platform(cpu, "octeon");
                 break;
         case PRID_IMP_CAVIUM_CN63XX:
                 c->cputype = CPU_CAVIUM_OCTEON2;
                 __cpu_name[cpu] = "Cavium Octeon II";
-                if (cpu == 0)
-                        __elf_platform = "octeon2";
+                set_elf_platform(cpu, "octeon2");
                 break;
         default:
                 printk(KERN_INFO "Unknown Octeon chip!\n");
@@ -988,6 +1007,59 @@ static inline void cpu_probe_ingenic(struct cpuinfo_mips *c, unsigned int cpu)
         }
 }
 
+static inline void cpu_probe_netlogic(struct cpuinfo_mips *c, int cpu)
+{
+        decode_configs(c);
+
+        c->options = (MIPS_CPU_TLB       |
+                        MIPS_CPU_4KEX    |
+                        MIPS_CPU_COUNTER |
+                        MIPS_CPU_DIVEC   |
+                        MIPS_CPU_WATCH   |
+                        MIPS_CPU_EJTAG   |
+                        MIPS_CPU_LLSC);
+
+        switch (c->processor_id & 0xff00) {
+        case PRID_IMP_NETLOGIC_XLR732:
+        case PRID_IMP_NETLOGIC_XLR716:
+        case PRID_IMP_NETLOGIC_XLR532:
+        case PRID_IMP_NETLOGIC_XLR308:
+        case PRID_IMP_NETLOGIC_XLR532C:
+        case PRID_IMP_NETLOGIC_XLR516C:
+        case PRID_IMP_NETLOGIC_XLR508C:
+        case PRID_IMP_NETLOGIC_XLR308C:
+                c->cputype = CPU_XLR;
+                __cpu_name[cpu] = "Netlogic XLR";
+                break;
+
+        case PRID_IMP_NETLOGIC_XLS608:
+        case PRID_IMP_NETLOGIC_XLS408:
+        case PRID_IMP_NETLOGIC_XLS404:
+        case PRID_IMP_NETLOGIC_XLS208:
+        case PRID_IMP_NETLOGIC_XLS204:
+        case PRID_IMP_NETLOGIC_XLS108:
+        case PRID_IMP_NETLOGIC_XLS104:
+        case PRID_IMP_NETLOGIC_XLS616B:
+        case PRID_IMP_NETLOGIC_XLS608B:
+        case PRID_IMP_NETLOGIC_XLS416B:
+        case PRID_IMP_NETLOGIC_XLS412B:
+        case PRID_IMP_NETLOGIC_XLS408B:
+        case PRID_IMP_NETLOGIC_XLS404B:
+                c->cputype = CPU_XLR;
+                __cpu_name[cpu] = "Netlogic XLS";
+                break;
+
+        default:
+                printk(KERN_INFO "Unknown Netlogic chip id [%02x]!\n",
+                       c->processor_id);
+                c->cputype = CPU_XLR;
+                break;
+        }
+
+        c->isa_level = MIPS_CPU_ISA_M64R1;
+        c->tlbsize = ((read_c0_config1() >> 25) & 0x3f) + 1;
+}
+
 #ifdef CONFIG_64BIT
 /* For use by uaccess.h */
 u64 __ua_limit;
@@ -1035,6 +1107,9 @@ __cpuinit void cpu_probe(void)
         case PRID_COMP_INGENIC:
                 cpu_probe_ingenic(c, cpu);
                 break;
+        case PRID_COMP_NETLOGIC:
+                cpu_probe_netlogic(c, cpu);
+                break;
         }
 
         BUG_ON(!__cpu_name[cpu]);
diff --git a/arch/mips/kernel/csrc-bcm1480.c b/arch/mips/kernel/csrc-bcm1480.c
index 51489f8a825e..f96f99c794a3 100644
--- a/arch/mips/kernel/csrc-bcm1480.c
+++ b/arch/mips/kernel/csrc-bcm1480.c
@@ -49,6 +49,5 @@ void __init sb1480_clocksource_init(void)
 
         plldiv = G_BCM1480_SYS_PLL_DIV(__raw_readq(IOADDR(A_SCD_SYSTEM_CFG)));
         zbbus = ((plldiv >> 1) * 50000000) + ((plldiv & 1) * 25000000);
-        clocksource_set_clock(cs, zbbus);
-        clocksource_register(cs);
+        clocksource_register_hz(cs, zbbus);
 }
diff --git a/arch/mips/kernel/csrc-ioasic.c b/arch/mips/kernel/csrc-ioasic.c
index 23da108506b0..46bd7fa98d6c 100644
--- a/arch/mips/kernel/csrc-ioasic.c
+++ b/arch/mips/kernel/csrc-ioasic.c
@@ -59,7 +59,5 @@ void __init dec_ioasic_clocksource_init(void)
         printk(KERN_INFO "I/O ASIC clock frequency %dHz\n", freq);
 
         clocksource_dec.rating = 200 + freq / 10000000;
-        clocksource_set_clock(&clocksource_dec, freq);
-
-        clocksource_register(&clocksource_dec);
+        clocksource_register_hz(&clocksource_dec, freq);
 }
diff --git a/arch/mips/kernel/csrc-powertv.c b/arch/mips/kernel/csrc-powertv.c
index a27c16c8690e..2e7c5232da8d 100644
--- a/arch/mips/kernel/csrc-powertv.c
+++ b/arch/mips/kernel/csrc-powertv.c
@@ -78,9 +78,7 @@ static void __init powertv_c0_hpt_clocksource_init(void)
 
         clocksource_mips.rating = 200 + mips_hpt_frequency / 10000000;
 
-        clocksource_set_clock(&clocksource_mips, mips_hpt_frequency);
-
-        clocksource_register(&clocksource_mips);
+        clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);
 }
 
 /**
@@ -130,43 +128,16 @@ static struct clocksource clocksource_tim_c = {
 /**
  * powertv_tim_c_clocksource_init - set up a clock source for the TIM_C clock
  *
- * The hard part here is coming up with a constant k and shift s such that
- * the 48-bit TIM_C value multiplied by k doesn't overflow and that value,
- * when shifted right by s, yields the corresponding number of nanoseconds.
  * We know that TIM_C counts at 27 MHz/8, so each cycle corresponds to
- * 1 / (27,000,000/8) seconds. Multiply that by a billion and you get the
- * number of nanoseconds. Since the TIM_C value has 48 bits and the math is
- * done in 64 bits, avoiding an overflow means that k must be less than
- * 64 - 48 = 16 bits.
+ * 1 / (27,000,000/8) seconds.
  */
 static void __init powertv_tim_c_clocksource_init(void)
 {
-        int                     prescale;
-        unsigned long           dividend;
-        unsigned long           k;
-        int                     s;
-        const int               max_k_bits = (64 - 48) - 1;
-        const unsigned long     billion = 1000000000;
         const unsigned long     counts_per_second = 27000000 / 8;
 
-        prescale = BITS_PER_LONG - ilog2(billion) - 1;
-        dividend = billion << prescale;
-        k = dividend / counts_per_second;
-        s = ilog2(k) - max_k_bits;
-
-        if (s < 0)
-                s = prescale;
-
-        else {
-                k >>= s;
-                s += prescale;
-        }
-
-        clocksource_tim_c.mult = k;
-        clocksource_tim_c.shift = s;
         clocksource_tim_c.rating = 200;
 
-        clocksource_register(&clocksource_tim_c);
+        clocksource_register_hz(&clocksource_tim_c, counts_per_second);
         tim_c = (struct tim_c *) asic_reg_addr(tim_ch);
 }
 
diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c
index e95a3cd48eea..decd1fa38d55 100644
--- a/arch/mips/kernel/csrc-r4k.c
+++ b/arch/mips/kernel/csrc-r4k.c
@@ -30,9 +30,7 @@ int __init init_r4k_clocksource(void)
         /* Calculate a somewhat reasonable rating value */
         clocksource_mips.rating = 200 + mips_hpt_frequency / 10000000;
 
-        clocksource_set_clock(&clocksource_mips, mips_hpt_frequency);
-
-        clocksource_register(&clocksource_mips);
+        clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);
 
         return 0;
 }
diff --git a/arch/mips/kernel/csrc-sb1250.c b/arch/mips/kernel/csrc-sb1250.c
index d14d3d1907fa..e9606d907685 100644
--- a/arch/mips/kernel/csrc-sb1250.c
+++ b/arch/mips/kernel/csrc-sb1250.c
@@ -65,6 +65,5 @@ void __init sb1250_clocksource_init(void)
                      IOADDR(A_SCD_TIMER_REGISTER(SB1250_HPT_NUM,
                                                  R_SCD_TIMER_CFG)));
 
-        clocksource_set_clock(cs, V_SCD_TIMER_FREQ);
-        clocksource_register(cs);
+        clocksource_register_hz(cs, V_SCD_TIMER_FREQ);
 }
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index ffa331029e08..37acfa036d44 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -167,14 +167,13 @@ work_notifysig:				# deal with pending signals and
 FEXPORT(syscall_exit_work_partial)
         SAVE_STATIC
 syscall_exit_work:
-        li      t0, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
+        li      t0, _TIF_WORK_SYSCALL_EXIT
         and     t0, a2                  # a2 is preloaded with TI_FLAGS
         beqz    t0, work_pending        # trace bit set?
-        local_irq_enable                # could let do_syscall_trace()
+        local_irq_enable                # could let syscall_trace_leave()
                                         # call schedule() instead
         move    a0, sp
-        li      a1, 1
-        jal     do_syscall_trace
+        jal     syscall_trace_leave
         b       resume_userspace
 
 #if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_MIPS_MT)
diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c
index 2392a7a296d4..391221b6a6aa 100644
--- a/arch/mips/kernel/i8253.c
+++ b/arch/mips/kernel/i8253.c
@@ -125,87 +125,11 @@ void __init setup_pit_timer(void)
         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(struct clocksource *cs)
-{
-        unsigned long flags;
-        int count;
-        u32 jifs;
-        static int old_count;
-        static u32 old_jifs;
-
-        raw_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;
-
-        raw_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);
+        return clocksource_i8253_init();
 }
 arch_initcall(init_pit_clocksource);
diff --git a/arch/mips/kernel/octeon_switch.S b/arch/mips/kernel/octeon_switch.S
index dd18b26a358a..ce89c8061708 100644
--- a/arch/mips/kernel/octeon_switch.S
+++ b/arch/mips/kernel/octeon_switch.S
@@ -4,7 +4,7 @@
  * for more details.
  *
  * Copyright (C) 1994, 1995, 1996, 1998, 1999, 2002, 2003 Ralf Baechle
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1994, 1995, 1996, by Andreas Busse
  * Copyright (C) 1999 Silicon Graphics, Inc.
  * Copyright (C) 2000 MIPS Technologies, Inc.
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index 584e6b55c865..4e6ea1ffad46 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -533,15 +533,10 @@ static inline int audit_arch(void)
  * Notification of system call entry/exit
  * - triggered by current->work.syscall_trace
  */
-asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)
+asmlinkage void syscall_trace_enter(struct pt_regs *regs)
 {
         /* do the secure computing check first */
-        if (!entryexit)
-                secure_computing(regs->regs[2]);
-
-        if (unlikely(current->audit_context) && entryexit)
-                audit_syscall_exit(AUDITSC_RESULT(regs->regs[7]),
-                                   -regs->regs[2]);
+        secure_computing(regs->regs[2]);
 
         if (!(current->ptrace & PT_PTRACED))
                 goto out;
@@ -565,8 +560,40 @@ asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)
         }
 
 out:
-        if (unlikely(current->audit_context) && !entryexit)
+        if (unlikely(current->audit_context))
                 audit_syscall_entry(audit_arch(), regs->regs[2],
                                     regs->regs[4], regs->regs[5],
                                     regs->regs[6], regs->regs[7]);
 }
+
+/*
+ * Notification of system call entry/exit
+ * - triggered by current->work.syscall_trace
+ */
+asmlinkage void syscall_trace_leave(struct pt_regs *regs)
+{
+        if (unlikely(current->audit_context))
+                audit_syscall_exit(AUDITSC_RESULT(regs->regs[7]),
+                                   -regs->regs[2]);
+
+        if (!(current->ptrace & PT_PTRACED))
+                return;
+
+        if (!test_thread_flag(TIF_SYSCALL_TRACE))
+                return;
+
+        /* The 0x80 provides a way for the tracing parent to distinguish
+           between a syscall stop and SIGTRAP delivery */
+        ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) ?
+                                 0x80 : 0));
+
+        /*
+         * this isn't the same as continuing with a signal, but it will do
+         * for normal use.  strace only continues with a signal if the
+         * stopping signal is not SIGTRAP.  -brl
+         */
+        if (current->exit_code) {
+                send_sig(current->exit_code, current, 1);
+                current->exit_code = 0;
+        }
+}
diff --git a/arch/mips/kernel/r2300_fpu.S b/arch/mips/kernel/r2300_fpu.S
index ac68e68339db..61c8a0f2a60c 100644
--- a/arch/mips/kernel/r2300_fpu.S
+++ b/arch/mips/kernel/r2300_fpu.S
@@ -6,7 +6,7 @@
  * Copyright (C) 1996, 1998 by Ralf Baechle
  *
  * Multi-arch abstraction and asm macros for easier reading:
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  *
  * Further modifications to make this work:
  * Copyright (c) 1998 Harald Koerfgen
diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S
index 698414b7a253..293898391e67 100644
--- a/arch/mips/kernel/r2300_switch.S
+++ b/arch/mips/kernel/r2300_switch.S
@@ -5,7 +5,7 @@
  * Copyright (C) 1994, 1995, 1996 by Andreas Busse
  *
  * Multi-cpu abstraction and macros for easier reading:
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  *
  * Further modifications to make this work:
  * Copyright (c) 1998-2000 Harald Koerfgen
diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S
index dbd42adc52ed..55ffe149dae9 100644
--- a/arch/mips/kernel/r4k_fpu.S
+++ b/arch/mips/kernel/r4k_fpu.S
@@ -6,7 +6,7 @@
  * Copyright (C) 1996, 98, 99, 2000, 01 Ralf Baechle
  *
  * Multi-arch abstraction and asm macros for easier reading:
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  *
  * Carsten Langgaard, carstenl@mips.com
  * Copyright (C) 2000 MIPS Technologies, Inc.
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S
index 8893ee1a2368..9414f9354469 100644
--- a/arch/mips/kernel/r4k_switch.S
+++ b/arch/mips/kernel/r4k_switch.S
@@ -4,7 +4,7 @@
  * for more details.
  *
  * Copyright (C) 1994, 1995, 1996, 1998, 1999, 2002, 2003 Ralf Baechle
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1994, 1995, 1996, by Andreas Busse
  * Copyright (C) 1999 Silicon Graphics, Inc.
  * Copyright (C) 2000 MIPS Technologies, Inc.
diff --git a/arch/mips/kernel/r6000_fpu.S b/arch/mips/kernel/r6000_fpu.S
index 43cda53f5af6..da0fbe46d83b 100644
--- a/arch/mips/kernel/r6000_fpu.S
+++ b/arch/mips/kernel/r6000_fpu.S
@@ -8,7 +8,7 @@
  * Copyright (C) 1996 by Ralf Baechle
  *
  * Multi-arch abstraction and asm macros for easier reading:
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  */
 #include <asm/asm.h>
 #include <asm/fpregdef.h>
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 7f1377eb22d3..7a8e1dd7f6f2 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -88,8 +88,7 @@ syscall_trace_entry:
         SAVE_STATIC
         move    s0, t2
         move    a0, sp
-        li      a1, 0
-        jal     do_syscall_trace
+        jal     syscall_trace_enter
 
         move    t0, s0
         RESTORE_STATIC
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 7c0ef7f128bf..2d31c83224f9 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -91,8 +91,7 @@ syscall_trace_entry:
         SAVE_STATIC
         move    s0, t2
         move    a0, sp
-        li      a1, 0
-        jal     do_syscall_trace
+        jal     syscall_trace_enter
 
         move    t0, s0
         RESTORE_STATIC
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index de6c5563beab..38a0503b9a4a 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -89,8 +89,7 @@ n32_syscall_trace_entry:
         SAVE_STATIC
         move    s0, t2
         move    a0, sp
-        li      a1, 0
-        jal     do_syscall_trace
+        jal     syscall_trace_enter
 
         move    t0, s0
         RESTORE_STATIC
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index b0541dda8830..91ea5e4041dd 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -123,8 +123,7 @@ trace_a_syscall:
 
         move    s0, t2                  # Save syscall pointer
         move    a0, sp
-        li      a1, 0
-        jal     do_syscall_trace
+        jal     syscall_trace_enter
 
         move    t0, s0
         RESTORE_STATIC
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
index 5a88cc4ccd5a..cedac4633741 100644
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -929,7 +929,7 @@ static void post_direct_ipi(int cpu, struct smtc_ipi *pipi)
 
 static void ipi_resched_interrupt(void)
 {
-        /* Return from interrupt should be enough to cause scheduler check */
+        scheduler_ipi();
 }
 
 static void ipi_call_interrupt(void)
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index 58beabf50b3c..d02765708ddb 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -10,12 +10,9 @@
 #include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/linkage.h>
-#include <linux/mm.h>
 #include <linux/fs.h>
 #include <linux/smp.h>
-#include <linux/mman.h>
 #include <linux/ptrace.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/syscalls.h>
 #include <linux/file.h>
@@ -25,11 +22,9 @@
 #include <linux/msg.h>
 #include <linux/shm.h>
 #include <linux/compiler.h>
-#include <linux/module.h>
 #include <linux/ipc.h>
 #include <linux/uaccess.h>
 #include <linux/slab.h>
-#include <linux/random.h>
 #include <linux/elf.h>
 
 #include <asm/asm.h>
@@ -66,121 +61,6 @@ out:
         return res;
 }
 
-unsigned long shm_align_mask = PAGE_SIZE - 1;   /* Sane caches */
-
-EXPORT_SYMBOL(shm_align_mask);
-
-#define COLOUR_ALIGN(addr,pgoff)                                \
-        ((((addr) + shm_align_mask) & ~shm_align_mask) +        \
-         (((pgoff) << PAGE_SHIFT) & shm_align_mask))
-
-unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
-        unsigned long len, unsigned long pgoff, unsigned long flags)
-{
-        struct vm_area_struct * vmm;
-        int do_color_align;
-        unsigned long task_size;
-
-#ifdef CONFIG_32BIT
-        task_size = TASK_SIZE;
-#else /* Must be CONFIG_64BIT*/
-        task_size = test_thread_flag(TIF_32BIT_ADDR) ? TASK_SIZE32 : TASK_SIZE;
-#endif
-
-        if (len > task_size)
-                return -ENOMEM;
-
-        if (flags & MAP_FIXED) {
-                /* Even MAP_FIXED mappings must reside within task_size.  */
-                if (task_size - len < addr)
-                        return -EINVAL;
-
-                /*
-                 * We do not accept a shared mapping if it would violate
-                 * cache aliasing constraints.
-                 */
-                if ((flags & MAP_SHARED) &&
-                    ((addr - (pgoff << PAGE_SHIFT)) & shm_align_mask))
-                        return -EINVAL;
-                return addr;
-        }
-
-        do_color_align = 0;
-        if (filp || (flags & MAP_SHARED))
-                do_color_align = 1;
-        if (addr) {
-                if (do_color_align)
-                        addr = COLOUR_ALIGN(addr, pgoff);
-                else
-                        addr = PAGE_ALIGN(addr);
-                vmm = find_vma(current->mm, addr);
-                if (task_size - len >= addr &&
-                    (!vmm || addr + len <= vmm->vm_start))
-                        return addr;
-        }
-        addr = current->mm->mmap_base;
-        if (do_color_align)
-                addr = COLOUR_ALIGN(addr, pgoff);
-        else
-                addr = PAGE_ALIGN(addr);
-
-        for (vmm = find_vma(current->mm, addr); ; vmm = vmm->vm_next) {
-                /* At this point:  (!vmm || addr < vmm->vm_end). */
-                if (task_size - len < addr)
-                        return -ENOMEM;
-                if (!vmm || addr + len <= vmm->vm_start)
-                        return addr;
-                addr = vmm->vm_end;
-                if (do_color_align)
-                        addr = COLOUR_ALIGN(addr, pgoff);
-        }
-}
-
-void arch_pick_mmap_layout(struct mm_struct *mm)
-{
-        unsigned long random_factor = 0UL;
-
-        if (current->flags & PF_RANDOMIZE) {
-                random_factor = get_random_int();
-                random_factor = random_factor << PAGE_SHIFT;
-                if (TASK_IS_32BIT_ADDR)
-                        random_factor &= 0xfffffful;
-                else
-                        random_factor &= 0xffffffful;
-        }
-
-        mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
-        mm->get_unmapped_area = arch_get_unmapped_area;
-        mm->unmap_area = arch_unmap_area;
-}
-
-static inline unsigned long brk_rnd(void)
-{
-        unsigned long rnd = get_random_int();
-
-        rnd = rnd << PAGE_SHIFT;
-        /* 8MB for 32bit, 256MB for 64bit */
-        if (TASK_IS_32BIT_ADDR)
-                rnd = rnd & 0x7ffffful;
-        else
-                rnd = rnd & 0xffffffful;
-
-        return rnd;
-}
-
-unsigned long arch_randomize_brk(struct mm_struct *mm)
-{
-        unsigned long base = mm->brk;
-        unsigned long ret;
-
-        ret = PAGE_ALIGN(base + brk_rnd());
-
-        if (ret < mm->brk)
-                return mm->brk;
-
-        return ret;
-}
-
 SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len,
         unsigned long, prot, unsigned long, flags, unsigned long,
         fd, off_t, offset)
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index e4b0b0bec039..a81176f44c74 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -65,9 +65,11 @@ SECTIONS
         NOTES :text :note
         .dummy : { *(.dummy) } :text
 
+        _sdata = .;                     /* Start of data section */
         RODATA
 
         /* writeable */
+        _sdata = .;                             /* Start of data section */
         .data : {       /* Data */
                 . = . + DATAOFFSET;             /* for CONFIG_MAPPED_KERNEL */
 
@@ -116,7 +118,7 @@ SECTIONS
                 EXIT_DATA
         }
 
-        PERCPU(1 << CONFIG_MIPS_L1_CACHE_SHIFT, PAGE_SIZE)
+        PERCPU_SECTION(1 << CONFIG_MIPS_L1_CACHE_SHIFT)
         . = ALIGN(PAGE_SIZE);
         __init_end = .;
         /* freed after init ends here */
diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig
new file mode 100644
index 000000000000..3fccf2104513
--- /dev/null
+++ b/arch/mips/lantiq/Kconfig
@@ -0,0 +1,23 @@
+if LANTIQ
+
+config SOC_TYPE_XWAY
+        bool
+        default n
+
+choice
+        prompt "SoC Type"
+        default SOC_XWAY
+
+config SOC_AMAZON_SE
+        bool "Amazon SE"
+        select SOC_TYPE_XWAY
+
+config SOC_XWAY
+        bool "XWAY"
+        select SOC_TYPE_XWAY
+        select HW_HAS_PCI
+endchoice
+
+source "arch/mips/lantiq/xway/Kconfig"
+
+endif
diff --git a/arch/mips/lantiq/Makefile b/arch/mips/lantiq/Makefile
new file mode 100644
index 000000000000..e5dae0e24b00
--- /dev/null
+++ b/arch/mips/lantiq/Makefile
@@ -0,0 +1,11 @@
+# Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+#
+# 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.
+
+obj-y := irq.o setup.o clk.o prom.o devices.o
+
+obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+
+obj-$(CONFIG_SOC_TYPE_XWAY) += xway/
diff --git a/arch/mips/lantiq/Platform b/arch/mips/lantiq/Platform
new file mode 100644
index 000000000000..f3dff05722de
--- /dev/null
+++ b/arch/mips/lantiq/Platform
@@ -0,0 +1,8 @@
+#
+# Lantiq
+#
+
+platform-$(CONFIG_LANTIQ)       += lantiq/
+cflags-$(CONFIG_LANTIQ)         += -I$(srctree)/arch/mips/include/asm/mach-lantiq
+load-$(CONFIG_LANTIQ)           = 0xffffffff80002000
+cflags-$(CONFIG_SOC_TYPE_XWAY)  += -I$(srctree)/arch/mips/include/asm/mach-lantiq/xway
diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c
new file mode 100644
index 000000000000..94560899d13e
--- /dev/null
+++ b/arch/mips/lantiq/clk.c
@@ -0,0 +1,140 @@
+/*
+ *  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.
+ *
+ * Copyright (C) 2010 Thomas Langer <thomas.langer@lantiq.com>
+ * Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/list.h>
+
+#include <asm/time.h>
+#include <asm/irq.h>
+#include <asm/div64.h>
+
+#include <lantiq_soc.h>
+
+#include "clk.h"
+
+struct clk {
+        const char *name;
+        unsigned long rate;
+        unsigned long (*get_rate) (void);
+};
+
+static struct clk *cpu_clk;
+static int cpu_clk_cnt;
+
+/* lantiq socs have 3 static clocks */
+static struct clk cpu_clk_generic[] = {
+        {
+                .name = "cpu",
+                .get_rate = ltq_get_cpu_hz,
+        }, {
+                .name = "fpi",
+                .get_rate = ltq_get_fpi_hz,
+        }, {
+                .name = "io",
+                .get_rate = ltq_get_io_region_clock,
+        },
+};
+
+static struct resource ltq_cgu_resource = {
+        .name   = "cgu",
+        .start  = LTQ_CGU_BASE_ADDR,
+        .end    = LTQ_CGU_BASE_ADDR + LTQ_CGU_SIZE - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+/* remapped clock register range */
+void __iomem *ltq_cgu_membase;
+
+void clk_init(void)
+{
+        cpu_clk = cpu_clk_generic;
+        cpu_clk_cnt = ARRAY_SIZE(cpu_clk_generic);
+}
+
+static inline int clk_good(struct clk *clk)
+{
+        return clk && !IS_ERR(clk);
+}
+
+unsigned long clk_get_rate(struct clk *clk)
+{
+        if (unlikely(!clk_good(clk)))
+                return 0;
+
+        if (clk->rate != 0)
+                return clk->rate;
+
+        if (clk->get_rate != NULL)
+                return clk->get_rate();
+
+        return 0;
+}
+EXPORT_SYMBOL(clk_get_rate);
+
+struct clk *clk_get(struct device *dev, const char *id)
+{
+        int i;
+
+        for (i = 0; i < cpu_clk_cnt; i++)
+                if (!strcmp(id, cpu_clk[i].name))
+                        return &cpu_clk[i];
+        BUG();
+        return ERR_PTR(-ENOENT);
+}
+EXPORT_SYMBOL(clk_get);
+
+void clk_put(struct clk *clk)
+{
+        /* not used */
+}
+EXPORT_SYMBOL(clk_put);
+
+static inline u32 ltq_get_counter_resolution(void)
+{
+        u32 res;
+
+        __asm__ __volatile__(
+                ".set   push\n"
+                ".set   mips32r2\n"
+                "rdhwr  %0, $3\n"
+                ".set pop\n"
+                : "=&r" (res)
+                : /* no input */
+                : "memory");
+
+        return res;
+}
+
+void __init plat_time_init(void)
+{
+        struct clk *clk;
+
+        if (insert_resource(&iomem_resource, &ltq_cgu_resource) < 0)
+                panic("Failed to insert cgu memory\n");
+
+        if (request_mem_region(ltq_cgu_resource.start,
+                        resource_size(&ltq_cgu_resource), "cgu") < 0)
+                panic("Failed to request cgu memory\n");
+
+        ltq_cgu_membase = ioremap_nocache(ltq_cgu_resource.start,
+                                resource_size(&ltq_cgu_resource));
+        if (!ltq_cgu_membase) {
+                pr_err("Failed to remap cgu memory\n");
+                unreachable();
+        }
+        clk = clk_get(0, "cpu");
+        mips_hpt_frequency = clk_get_rate(clk) / ltq_get_counter_resolution();
+        write_c0_compare(read_c0_count());
+        clk_put(clk);
+}
diff --git a/arch/mips/lantiq/clk.h b/arch/mips/lantiq/clk.h
new file mode 100644
index 000000000000..3328925f2c3f
--- /dev/null
+++ b/arch/mips/lantiq/clk.h
@@ -0,0 +1,18 @@
+/*
+ *  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.
+ *
+ * Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef _LTQ_CLK_H__
+#define _LTQ_CLK_H__
+
+extern void clk_init(void);
+
+extern unsigned long ltq_get_cpu_hz(void);
+extern unsigned long ltq_get_fpi_hz(void);
+extern unsigned long ltq_get_io_region_clock(void);
+
+#endif
diff --git a/arch/mips/lantiq/devices.c b/arch/mips/lantiq/devices.c
new file mode 100644
index 000000000000..7b82c34cb169
--- /dev/null
+++ b/arch/mips/lantiq/devices.c
@@ -0,0 +1,122 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <linux/reboot.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
+#include <linux/etherdevice.h>
+#include <linux/reboot.h>
+#include <linux/time.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
+
+#include <asm/bootinfo.h>
+#include <asm/irq.h>
+
+#include <lantiq_soc.h>
+
+#include "devices.h"
+
+/* nor flash */
+static struct resource ltq_nor_resource = {
+        .name   = "nor",
+        .start  = LTQ_FLASH_START,
+        .end    = LTQ_FLASH_START + LTQ_FLASH_MAX - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+static struct platform_device ltq_nor = {
+        .name           = "ltq_nor",
+        .resource       = &ltq_nor_resource,
+        .num_resources  = 1,
+};
+
+void __init ltq_register_nor(struct physmap_flash_data *data)
+{
+        ltq_nor.dev.platform_data = data;
+        platform_device_register(&ltq_nor);
+}
+
+/* watchdog */
+static struct resource ltq_wdt_resource = {
+        .name   = "watchdog",
+        .start  = LTQ_WDT_BASE_ADDR,
+        .end    = LTQ_WDT_BASE_ADDR + LTQ_WDT_SIZE - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+void __init ltq_register_wdt(void)
+{
+        platform_device_register_simple("ltq_wdt", 0, &ltq_wdt_resource, 1);
+}
+
+/* asc ports */
+static struct resource ltq_asc0_resources[] = {
+        {
+                .name   = "asc0",
+                .start  = LTQ_ASC0_BASE_ADDR,
+                .end    = LTQ_ASC0_BASE_ADDR + LTQ_ASC_SIZE - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        IRQ_RES(tx, LTQ_ASC_TIR(0)),
+        IRQ_RES(rx, LTQ_ASC_RIR(0)),
+        IRQ_RES(err, LTQ_ASC_EIR(0)),
+};
+
+static struct resource ltq_asc1_resources[] = {
+        {
+                .name   = "asc1",
+                .start  = LTQ_ASC1_BASE_ADDR,
+                .end    = LTQ_ASC1_BASE_ADDR + LTQ_ASC_SIZE - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        IRQ_RES(tx, LTQ_ASC_TIR(1)),
+        IRQ_RES(rx, LTQ_ASC_RIR(1)),
+        IRQ_RES(err, LTQ_ASC_EIR(1)),
+};
+
+void __init ltq_register_asc(int port)
+{
+        switch (port) {
+        case 0:
+                platform_device_register_simple("ltq_asc", 0,
+                        ltq_asc0_resources, ARRAY_SIZE(ltq_asc0_resources));
+                break;
+        case 1:
+                platform_device_register_simple("ltq_asc", 1,
+                        ltq_asc1_resources, ARRAY_SIZE(ltq_asc1_resources));
+                break;
+        default:
+                break;
+        }
+}
+
+#ifdef CONFIG_PCI
+/* pci */
+static struct platform_device ltq_pci = {
+        .name           = "ltq_pci",
+        .num_resources  = 0,
+};
+
+void __init ltq_register_pci(struct ltq_pci_data *data)
+{
+        ltq_pci.dev.platform_data = data;
+        platform_device_register(&ltq_pci);
+}
+#else
+void __init ltq_register_pci(struct ltq_pci_data *data)
+{
+        pr_err("kernel is compiled without PCI support\n");
+}
+#endif
diff --git a/arch/mips/lantiq/devices.h b/arch/mips/lantiq/devices.h
new file mode 100644
index 000000000000..2947bb19a528
--- /dev/null
+++ b/arch/mips/lantiq/devices.h
@@ -0,0 +1,23 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef _LTQ_DEVICES_H__
+#define _LTQ_DEVICES_H__
+
+#include <lantiq_platform.h>
+#include <linux/mtd/physmap.h>
+
+#define IRQ_RES(resname, irq) \
+        {.name = #resname, .start = (irq), .flags = IORESOURCE_IRQ}
+
+extern void ltq_register_nor(struct physmap_flash_data *data);
+extern void ltq_register_wdt(void);
+extern void ltq_register_asc(int port);
+extern void ltq_register_pci(struct ltq_pci_data *data);
+
+#endif
diff --git a/arch/mips/lantiq/early_printk.c b/arch/mips/lantiq/early_printk.c
new file mode 100644
index 000000000000..972e05f87631
--- /dev/null
+++ b/arch/mips/lantiq/early_printk.c
@@ -0,0 +1,33 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/init.h>
+#include <linux/cpu.h>
+
+#include <lantiq.h>
+#include <lantiq_soc.h>
+
+/* no ioremap possible at this early stage, lets use KSEG1 instead  */
+#define LTQ_ASC_BASE    KSEG1ADDR(LTQ_ASC1_BASE_ADDR)
+#define ASC_BUF         1024
+#define LTQ_ASC_FSTAT   ((u32 *)(LTQ_ASC_BASE + 0x0048))
+#define LTQ_ASC_TBUF    ((u32 *)(LTQ_ASC_BASE + 0x0020))
+#define TXMASK          0x3F00
+#define TXOFFSET        8
+
+void prom_putchar(char c)
+{
+        unsigned long flags;
+
+        local_irq_save(flags);
+        do { } while ((ltq_r32(LTQ_ASC_FSTAT) & TXMASK) >> TXOFFSET);
+        if (c == '\n')
+                ltq_w32('\r', LTQ_ASC_TBUF);
+        ltq_w32(c, LTQ_ASC_TBUF);
+        local_irq_restore(flags);
+}
diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c
new file mode 100644
index 000000000000..fc89795cafdb
--- /dev/null
+++ b/arch/mips/lantiq/irq.c
@@ -0,0 +1,326 @@
+/*
+ *  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.
+ *
+ * Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ * Copyright (C) 2010 Thomas Langer <thomas.langer@lantiq.com>
+ */
+
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+
+#include <asm/bootinfo.h>
+#include <asm/irq_cpu.h>
+
+#include <lantiq_soc.h>
+#include <irq.h>
+
+/* register definitions */
+#define LTQ_ICU_IM0_ISR         0x0000
+#define LTQ_ICU_IM0_IER         0x0008
+#define LTQ_ICU_IM0_IOSR        0x0010
+#define LTQ_ICU_IM0_IRSR        0x0018
+#define LTQ_ICU_IM0_IMR         0x0020
+#define LTQ_ICU_IM1_ISR         0x0028
+#define LTQ_ICU_OFFSET          (LTQ_ICU_IM1_ISR - LTQ_ICU_IM0_ISR)
+
+#define LTQ_EIU_EXIN_C          0x0000
+#define LTQ_EIU_EXIN_INIC       0x0004
+#define LTQ_EIU_EXIN_INEN       0x000C
+
+/* irq numbers used by the external interrupt unit (EIU) */
+#define LTQ_EIU_IR0             (INT_NUM_IM4_IRL0 + 30)
+#define LTQ_EIU_IR1             (INT_NUM_IM3_IRL0 + 31)
+#define LTQ_EIU_IR2             (INT_NUM_IM1_IRL0 + 26)
+#define LTQ_EIU_IR3             INT_NUM_IM1_IRL0
+#define LTQ_EIU_IR4             (INT_NUM_IM1_IRL0 + 1)
+#define LTQ_EIU_IR5             (INT_NUM_IM1_IRL0 + 2)
+#define LTQ_EIU_IR6             (INT_NUM_IM2_IRL0 + 30)
+
+#define MAX_EIU                 6
+
+/* irqs generated by device attached to the EBU need to be acked in
+ * a special manner
+ */
+#define LTQ_ICU_EBU_IRQ         22
+
+#define ltq_icu_w32(x, y)       ltq_w32((x), ltq_icu_membase + (y))
+#define ltq_icu_r32(x)          ltq_r32(ltq_icu_membase + (x))
+
+#define ltq_eiu_w32(x, y)       ltq_w32((x), ltq_eiu_membase + (y))
+#define ltq_eiu_r32(x)          ltq_r32(ltq_eiu_membase + (x))
+
+static unsigned short ltq_eiu_irq[MAX_EIU] = {
+        LTQ_EIU_IR0,
+        LTQ_EIU_IR1,
+        LTQ_EIU_IR2,
+        LTQ_EIU_IR3,
+        LTQ_EIU_IR4,
+        LTQ_EIU_IR5,
+};
+
+static struct resource ltq_icu_resource = {
+        .name   = "icu",
+        .start  = LTQ_ICU_BASE_ADDR,
+        .end    = LTQ_ICU_BASE_ADDR + LTQ_ICU_SIZE - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+static struct resource ltq_eiu_resource = {
+        .name   = "eiu",
+        .start  = LTQ_EIU_BASE_ADDR,
+        .end    = LTQ_EIU_BASE_ADDR + LTQ_ICU_SIZE - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+static void __iomem *ltq_icu_membase;
+static void __iomem *ltq_eiu_membase;
+
+void ltq_disable_irq(struct irq_data *d)
+{
+        u32 ier = LTQ_ICU_IM0_IER;
+        int irq_nr = d->irq - INT_NUM_IRQ0;
+
+        ier += LTQ_ICU_OFFSET * (irq_nr / INT_NUM_IM_OFFSET);
+        irq_nr %= INT_NUM_IM_OFFSET;
+        ltq_icu_w32(ltq_icu_r32(ier) & ~(1 << irq_nr), ier);
+}
+
+void ltq_mask_and_ack_irq(struct irq_data *d)
+{
+        u32 ier = LTQ_ICU_IM0_IER;
+        u32 isr = LTQ_ICU_IM0_ISR;
+        int irq_nr = d->irq - INT_NUM_IRQ0;
+
+        ier += LTQ_ICU_OFFSET * (irq_nr / INT_NUM_IM_OFFSET);
+        isr += LTQ_ICU_OFFSET * (irq_nr / INT_NUM_IM_OFFSET);
+        irq_nr %= INT_NUM_IM_OFFSET;
+        ltq_icu_w32(ltq_icu_r32(ier) & ~(1 << irq_nr), ier);
+        ltq_icu_w32((1 << irq_nr), isr);
+}
+
+static void ltq_ack_irq(struct irq_data *d)
+{
+        u32 isr = LTQ_ICU_IM0_ISR;
+        int irq_nr = d->irq - INT_NUM_IRQ0;
+
+        isr += LTQ_ICU_OFFSET * (irq_nr / INT_NUM_IM_OFFSET);
+        irq_nr %= INT_NUM_IM_OFFSET;
+        ltq_icu_w32((1 << irq_nr), isr);
+}
+
+void ltq_enable_irq(struct irq_data *d)
+{
+        u32 ier = LTQ_ICU_IM0_IER;
+        int irq_nr = d->irq - INT_NUM_IRQ0;
+
+        ier += LTQ_ICU_OFFSET  * (irq_nr / INT_NUM_IM_OFFSET);
+        irq_nr %= INT_NUM_IM_OFFSET;
+        ltq_icu_w32(ltq_icu_r32(ier) | (1 << irq_nr), ier);
+}
+
+static unsigned int ltq_startup_eiu_irq(struct irq_data *d)
+{
+        int i;
+        int irq_nr = d->irq - INT_NUM_IRQ0;
+
+        ltq_enable_irq(d);
+        for (i = 0; i < MAX_EIU; i++) {
+                if (irq_nr == ltq_eiu_irq[i]) {
+                        /* low level - we should really handle set_type */
+                        ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_C) |
+                                (0x6 << (i * 4)), LTQ_EIU_EXIN_C);
+                        /* clear all pending */
+                        ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_INIC) & ~(1 << i),
+                                LTQ_EIU_EXIN_INIC);
+                        /* enable */
+                        ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_INEN) | (1 << i),
+                                LTQ_EIU_EXIN_INEN);
+                        break;
+                }
+        }
+
+        return 0;
+}
+
+static void ltq_shutdown_eiu_irq(struct irq_data *d)
+{
+        int i;
+        int irq_nr = d->irq - INT_NUM_IRQ0;
+
+        ltq_disable_irq(d);
+        for (i = 0; i < MAX_EIU; i++) {
+                if (irq_nr == ltq_eiu_irq[i]) {
+                        /* disable */
+                        ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_INEN) & ~(1 << i),
+                                LTQ_EIU_EXIN_INEN);
+                        break;
+                }
+        }
+}
+
+static struct irq_chip ltq_irq_type = {
+        "icu",
+        .irq_enable = ltq_enable_irq,
+        .irq_disable = ltq_disable_irq,
+        .irq_unmask = ltq_enable_irq,
+        .irq_ack = ltq_ack_irq,
+        .irq_mask = ltq_disable_irq,
+        .irq_mask_ack = ltq_mask_and_ack_irq,
+};
+
+static struct irq_chip ltq_eiu_type = {
+        "eiu",
+        .irq_startup = ltq_startup_eiu_irq,
+        .irq_shutdown = ltq_shutdown_eiu_irq,
+        .irq_enable = ltq_enable_irq,
+        .irq_disable = ltq_disable_irq,
+        .irq_unmask = ltq_enable_irq,
+        .irq_ack = ltq_ack_irq,
+        .irq_mask = ltq_disable_irq,
+        .irq_mask_ack = ltq_mask_and_ack_irq,
+};
+
+static void ltq_hw_irqdispatch(int module)
+{
+        u32 irq;
+
+        irq = ltq_icu_r32(LTQ_ICU_IM0_IOSR + (module * LTQ_ICU_OFFSET));
+        if (irq == 0)
+                return;
+
+        /* silicon bug causes only the msb set to 1 to be valid. all
+         * other bits might be bogus
+         */
+        irq = __fls(irq);
+        do_IRQ((int)irq + INT_NUM_IM0_IRL0 + (INT_NUM_IM_OFFSET * module));
+
+        /* if this is a EBU irq, we need to ack it or get a deadlock */
+        if ((irq == LTQ_ICU_EBU_IRQ) && (module == 0))
+                ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_PCC_ISTAT) | 0x10,
+                        LTQ_EBU_PCC_ISTAT);
+}
+
+#define DEFINE_HWx_IRQDISPATCH(x)                                       \
+        static void ltq_hw ## x ## _irqdispatch(void)                   \
+        {                                                               \
+                ltq_hw_irqdispatch(x);                                  \
+        }
+DEFINE_HWx_IRQDISPATCH(0)
+DEFINE_HWx_IRQDISPATCH(1)
+DEFINE_HWx_IRQDISPATCH(2)
+DEFINE_HWx_IRQDISPATCH(3)
+DEFINE_HWx_IRQDISPATCH(4)
+
+static void ltq_hw5_irqdispatch(void)
+{
+        do_IRQ(MIPS_CPU_TIMER_IRQ);
+}
+
+asmlinkage void plat_irq_dispatch(void)
+{
+        unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;
+        unsigned int i;
+
+        if (pending & CAUSEF_IP7) {
+                do_IRQ(MIPS_CPU_TIMER_IRQ);
+                goto out;
+        } else {
+                for (i = 0; i < 5; i++) {
+                        if (pending & (CAUSEF_IP2 << i)) {
+                                ltq_hw_irqdispatch(i);
+                                goto out;
+                        }
+                }
+        }
+        pr_alert("Spurious IRQ: CAUSE=0x%08x\n", read_c0_status());
+
+out:
+        return;
+}
+
+static struct irqaction cascade = {
+        .handler = no_action,
+        .flags = IRQF_DISABLED,
+        .name = "cascade",
+};
+
+void __init arch_init_irq(void)
+{
+        int i;
+
+        if (insert_resource(&iomem_resource, &ltq_icu_resource) < 0)
+                panic("Failed to insert icu memory\n");
+
+        if (request_mem_region(ltq_icu_resource.start,
+                        resource_size(&ltq_icu_resource), "icu") < 0)
+                panic("Failed to request icu memory\n");
+
+        ltq_icu_membase = ioremap_nocache(ltq_icu_resource.start,
+                                resource_size(&ltq_icu_resource));
+        if (!ltq_icu_membase)
+                panic("Failed to remap icu memory\n");
+
+        if (insert_resource(&iomem_resource, &ltq_eiu_resource) < 0)
+                panic("Failed to insert eiu memory\n");
+
+        if (request_mem_region(ltq_eiu_resource.start,
+                        resource_size(&ltq_eiu_resource), "eiu") < 0)
+                panic("Failed to request eiu memory\n");
+
+        ltq_eiu_membase = ioremap_nocache(ltq_eiu_resource.start,
+                                resource_size(&ltq_eiu_resource));
+        if (!ltq_eiu_membase)
+                panic("Failed to remap eiu memory\n");
+
+        /* make sure all irqs are turned off by default */
+        for (i = 0; i < 5; i++)
+                ltq_icu_w32(0, LTQ_ICU_IM0_IER + (i * LTQ_ICU_OFFSET));
+
+        /* clear all possibly pending interrupts */
+        ltq_icu_w32(~0, LTQ_ICU_IM0_ISR + (i * LTQ_ICU_OFFSET));
+
+        mips_cpu_irq_init();
+
+        for (i = 2; i <= 6; i++)
+                setup_irq(i, &cascade);
+
+        if (cpu_has_vint) {
+                pr_info("Setting up vectored interrupts\n");
+                set_vi_handler(2, ltq_hw0_irqdispatch);
+                set_vi_handler(3, ltq_hw1_irqdispatch);
+                set_vi_handler(4, ltq_hw2_irqdispatch);
+                set_vi_handler(5, ltq_hw3_irqdispatch);
+                set_vi_handler(6, ltq_hw4_irqdispatch);
+                set_vi_handler(7, ltq_hw5_irqdispatch);
+        }
+
+        for (i = INT_NUM_IRQ0;
+                i <= (INT_NUM_IRQ0 + (5 * INT_NUM_IM_OFFSET)); i++)
+                if ((i == LTQ_EIU_IR0) || (i == LTQ_EIU_IR1) ||
+                        (i == LTQ_EIU_IR2))
+                        irq_set_chip_and_handler(i, &ltq_eiu_type,
+                                handle_level_irq);
+                /* EIU3-5 only exist on ar9 and vr9 */
+                else if (((i == LTQ_EIU_IR3) || (i == LTQ_EIU_IR4) ||
+                        (i == LTQ_EIU_IR5)) && (ltq_is_ar9() || ltq_is_vr9()))
+                        irq_set_chip_and_handler(i, &ltq_eiu_type,
+                                handle_level_irq);
+                else
+                        irq_set_chip_and_handler(i, &ltq_irq_type,
+                                handle_level_irq);
+
+#if !defined(CONFIG_MIPS_MT_SMP) && !defined(CONFIG_MIPS_MT_SMTC)
+        set_c0_status(IE_IRQ0 | IE_IRQ1 | IE_IRQ2 |
+                IE_IRQ3 | IE_IRQ4 | IE_IRQ5);
+#else
+        set_c0_status(IE_SW0 | IE_SW1 | IE_IRQ0 | IE_IRQ1 |
+                IE_IRQ2 | IE_IRQ3 | IE_IRQ4 | IE_IRQ5);
+#endif
+}
+
+unsigned int __cpuinit get_c0_compare_int(void)
+{
+        return CP0_LEGACY_COMPARE_IRQ;
+}
diff --git a/arch/mips/lantiq/machtypes.h b/arch/mips/lantiq/machtypes.h
new file mode 100644
index 000000000000..7e01b8c484eb
--- /dev/null
+++ b/arch/mips/lantiq/machtypes.h
@@ -0,0 +1,20 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef _LANTIQ_MACH_H__
+#define _LANTIQ_MACH_H__
+
+#include <asm/mips_machine.h>
+
+enum lantiq_mach_type {
+        LTQ_MACH_GENERIC = 0,
+        LTQ_MACH_EASY50712,     /* Danube evaluation board */
+        LTQ_MACH_EASY50601,     /* Amazon SE evaluation board */
+};
+
+#endif
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c
new file mode 100644
index 000000000000..56ba007bf1e5
--- /dev/null
+++ b/arch/mips/lantiq/prom.c
@@ -0,0 +1,71 @@
+/*
+ *  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.
+ *
+ * Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <asm/bootinfo.h>
+#include <asm/time.h>
+
+#include <lantiq.h>
+
+#include "prom.h"
+#include "clk.h"
+
+static struct ltq_soc_info soc_info;
+
+unsigned int ltq_get_cpu_ver(void)
+{
+        return soc_info.rev;
+}
+EXPORT_SYMBOL(ltq_get_cpu_ver);
+
+unsigned int ltq_get_soc_type(void)
+{
+        return soc_info.type;
+}
+EXPORT_SYMBOL(ltq_get_soc_type);
+
+const char *get_system_type(void)
+{
+        return soc_info.sys_type;
+}
+
+void prom_free_prom_memory(void)
+{
+}
+
+static void __init prom_init_cmdline(void)
+{
+        int argc = fw_arg0;
+        char **argv = (char **) KSEG1ADDR(fw_arg1);
+        int i;
+
+        for (i = 0; i < argc; i++) {
+                char *p = (char *)  KSEG1ADDR(argv[i]);
+
+                if (p && *p) {
+                        strlcat(arcs_cmdline, p, sizeof(arcs_cmdline));
+                        strlcat(arcs_cmdline, " ", sizeof(arcs_cmdline));
+                }
+        }
+}
+
+void __init prom_init(void)
+{
+        struct clk *clk;
+
+        ltq_soc_detect(&soc_info);
+        clk_init();
+        clk = clk_get(0, "cpu");
+        snprintf(soc_info.sys_type, LTQ_SYS_TYPE_LEN - 1, "%s rev1.%d",
+                soc_info.name, soc_info.rev);
+        clk_put(clk);
+        soc_info.sys_type[LTQ_SYS_TYPE_LEN - 1] = '\0';
+        pr_info("SoC: %s\n", soc_info.sys_type);
+        prom_init_cmdline();
+}
diff --git a/arch/mips/lantiq/prom.h b/arch/mips/lantiq/prom.h
new file mode 100644
index 000000000000..b4229d94280f
--- /dev/null
+++ b/arch/mips/lantiq/prom.h
@@ -0,0 +1,25 @@
+/*
+ *  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.
+ *
+ * Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef _LTQ_PROM_H__
+#define _LTQ_PROM_H__
+
+#define LTQ_SYS_TYPE_LEN        0x100
+
+struct ltq_soc_info {
+        unsigned char *name;
+        unsigned int rev;
+        unsigned int partnum;
+        unsigned int type;
+        unsigned char sys_type[LTQ_SYS_TYPE_LEN];
+};
+
+extern void ltq_soc_detect(struct ltq_soc_info *i);
+extern void ltq_soc_setup(void);
+
+#endif
diff --git a/arch/mips/lantiq/setup.c b/arch/mips/lantiq/setup.c
new file mode 100644
index 000000000000..9b8af77ed0f9
--- /dev/null
+++ b/arch/mips/lantiq/setup.c
@@ -0,0 +1,66 @@
+/*
+ *  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.
+ *
+ * Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <asm/bootinfo.h>
+
+#include <lantiq_soc.h>
+
+#include "machtypes.h"
+#include "devices.h"
+#include "prom.h"
+
+void __init plat_mem_setup(void)
+{
+        /* assume 16M as default incase uboot fails to pass proper ramsize */
+        unsigned long memsize = 16;
+        char **envp = (char **) KSEG1ADDR(fw_arg2);
+
+        ioport_resource.start = IOPORT_RESOURCE_START;
+        ioport_resource.end = IOPORT_RESOURCE_END;
+        iomem_resource.start = IOMEM_RESOURCE_START;
+        iomem_resource.end = IOMEM_RESOURCE_END;
+
+        set_io_port_base((unsigned long) KSEG1);
+
+        while (*envp) {
+                char *e = (char *)KSEG1ADDR(*envp);
+                if (!strncmp(e, "memsize=", 8)) {
+                        e += 8;
+                        if (strict_strtoul(e, 0, &memsize))
+                                pr_warn("bad memsize specified\n");
+                }
+                envp++;
+        }
+        memsize *= 1024 * 1024;
+        add_memory_region(0x00000000, memsize, BOOT_MEM_RAM);
+}
+
+static int __init
+lantiq_setup(void)
+{
+        ltq_soc_setup();
+        mips_machine_setup();
+        return 0;
+}
+
+arch_initcall(lantiq_setup);
+
+static void __init
+lantiq_generic_init(void)
+{
+        /* Nothing to do */
+}
+
+MIPS_MACHINE(LTQ_MACH_GENERIC,
+             "Generic",
+             "Generic Lantiq based board",
+             lantiq_generic_init);
diff --git a/arch/mips/lantiq/xway/Kconfig b/arch/mips/lantiq/xway/Kconfig
new file mode 100644
index 000000000000..2b857de36620
--- /dev/null
+++ b/arch/mips/lantiq/xway/Kconfig
@@ -0,0 +1,23 @@
+if SOC_XWAY
+
+menu "MIPS Machine"
+
+config LANTIQ_MACH_EASY50712
+        bool "Easy50712 - Danube"
+        default y
+
+endmenu
+
+endif
+
+if SOC_AMAZON_SE
+
+menu "MIPS Machine"
+
+config LANTIQ_MACH_EASY50601
+        bool "Easy50601 - Amazon SE"
+        default y
+
+endmenu
+
+endif
diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile
new file mode 100644
index 000000000000..c517f2e77563
--- /dev/null
+++ b/arch/mips/lantiq/xway/Makefile
@@ -0,0 +1,7 @@
+obj-y := pmu.o ebu.o reset.o gpio.o gpio_stp.o gpio_ebu.o devices.o dma.o
+
+obj-$(CONFIG_SOC_XWAY) += clk-xway.o prom-xway.o setup-xway.o
+obj-$(CONFIG_SOC_AMAZON_SE) += clk-ase.o prom-ase.o setup-ase.o
+
+obj-$(CONFIG_LANTIQ_MACH_EASY50712) += mach-easy50712.o
+obj-$(CONFIG_LANTIQ_MACH_EASY50601) += mach-easy50601.o
diff --git a/arch/mips/lantiq/xway/clk-ase.c b/arch/mips/lantiq/xway/clk-ase.c
new file mode 100644
index 000000000000..22d823acd536
--- /dev/null
+++ b/arch/mips/lantiq/xway/clk-ase.c
@@ -0,0 +1,48 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2011 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/clk.h>
+
+#include <asm/time.h>
+#include <asm/irq.h>
+#include <asm/div64.h>
+
+#include <lantiq_soc.h>
+
+/* cgu registers */
+#define LTQ_CGU_SYS     0x0010
+
+unsigned int ltq_get_io_region_clock(void)
+{
+        return CLOCK_133M;
+}
+EXPORT_SYMBOL(ltq_get_io_region_clock);
+
+unsigned int ltq_get_fpi_bus_clock(int fpi)
+{
+        return CLOCK_133M;
+}
+EXPORT_SYMBOL(ltq_get_fpi_bus_clock);
+
+unsigned int ltq_get_cpu_hz(void)
+{
+        if (ltq_cgu_r32(LTQ_CGU_SYS) & (1 << 5))
+                return CLOCK_266M;
+        else
+                return CLOCK_133M;
+}
+EXPORT_SYMBOL(ltq_get_cpu_hz);
+
+unsigned int ltq_get_fpi_hz(void)
+{
+        return CLOCK_133M;
+}
+EXPORT_SYMBOL(ltq_get_fpi_hz);
diff --git a/arch/mips/lantiq/xway/clk-xway.c b/arch/mips/lantiq/xway/clk-xway.c
new file mode 100644
index 000000000000..ddd39593c581
--- /dev/null
+++ b/arch/mips/lantiq/xway/clk-xway.c
@@ -0,0 +1,223 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/clk.h>
+
+#include <asm/time.h>
+#include <asm/irq.h>
+#include <asm/div64.h>
+
+#include <lantiq_soc.h>
+
+static unsigned int ltq_ram_clocks[] = {
+        CLOCK_167M, CLOCK_133M, CLOCK_111M, CLOCK_83M };
+#define DDR_HZ ltq_ram_clocks[ltq_cgu_r32(LTQ_CGU_SYS) & 0x3]
+
+#define BASIC_FREQUENCY_1       35328000
+#define BASIC_FREQUENCY_2       36000000
+#define BASIS_REQUENCY_USB      12000000
+
+#define GET_BITS(x, msb, lsb) \
+        (((x) & ((1 << ((msb) + 1)) - 1)) >> (lsb))
+
+#define LTQ_CGU_PLL0_CFG        0x0004
+#define LTQ_CGU_PLL1_CFG        0x0008
+#define LTQ_CGU_PLL2_CFG        0x000C
+#define LTQ_CGU_SYS             0x0010
+#define LTQ_CGU_UPDATE          0x0014
+#define LTQ_CGU_IF_CLK          0x0018
+#define LTQ_CGU_OSC_CON         0x001C
+#define LTQ_CGU_SMD             0x0020
+#define LTQ_CGU_CT1SR           0x0028
+#define LTQ_CGU_CT2SR           0x002C
+#define LTQ_CGU_PCMCR           0x0030
+#define LTQ_CGU_PCI_CR          0x0034
+#define LTQ_CGU_PD_PC           0x0038
+#define LTQ_CGU_FMR             0x003C
+
+#define CGU_PLL0_PHASE_DIVIDER_ENABLE   \
+        (ltq_cgu_r32(LTQ_CGU_PLL0_CFG) & (1 << 31))
+#define CGU_PLL0_BYPASS                 \
+        (ltq_cgu_r32(LTQ_CGU_PLL0_CFG) & (1 << 30))
+#define CGU_PLL0_CFG_DSMSEL             \
+        (ltq_cgu_r32(LTQ_CGU_PLL0_CFG) & (1 << 28))
+#define CGU_PLL0_CFG_FRAC_EN            \
+        (ltq_cgu_r32(LTQ_CGU_PLL0_CFG) & (1 << 27))
+#define CGU_PLL1_SRC                    \
+        (ltq_cgu_r32(LTQ_CGU_PLL1_CFG) & (1 << 31))
+#define CGU_PLL2_PHASE_DIVIDER_ENABLE   \
+        (ltq_cgu_r32(LTQ_CGU_PLL2_CFG) & (1 << 20))
+#define CGU_SYS_FPI_SEL                 (1 << 6)
+#define CGU_SYS_DDR_SEL                 0x3
+#define CGU_PLL0_SRC                    (1 << 29)
+
+#define CGU_PLL0_CFG_PLLK       GET_BITS(ltq_cgu_r32(LTQ_CGU_PLL0_CFG), 26, 17)
+#define CGU_PLL0_CFG_PLLN       GET_BITS(ltq_cgu_r32(LTQ_CGU_PLL0_CFG), 12, 6)
+#define CGU_PLL0_CFG_PLLM       GET_BITS(ltq_cgu_r32(LTQ_CGU_PLL0_CFG), 5, 2)
+#define CGU_PLL2_SRC            GET_BITS(ltq_cgu_r32(LTQ_CGU_PLL2_CFG), 18, 17)
+#define CGU_PLL2_CFG_INPUT_DIV  GET_BITS(ltq_cgu_r32(LTQ_CGU_PLL2_CFG), 16, 13)
+
+static unsigned int ltq_get_pll0_fdiv(void);
+
+static inline unsigned int get_input_clock(int pll)
+{
+        switch (pll) {
+        case 0:
+                if (ltq_cgu_r32(LTQ_CGU_PLL0_CFG) & CGU_PLL0_SRC)
+                        return BASIS_REQUENCY_USB;
+                else if (CGU_PLL0_PHASE_DIVIDER_ENABLE)
+                        return BASIC_FREQUENCY_1;
+                else
+                        return BASIC_FREQUENCY_2;
+        case 1:
+                if (CGU_PLL1_SRC)
+                        return BASIS_REQUENCY_USB;
+                else if (CGU_PLL0_PHASE_DIVIDER_ENABLE)
+                        return BASIC_FREQUENCY_1;
+                else
+                        return BASIC_FREQUENCY_2;
+        case 2:
+                switch (CGU_PLL2_SRC) {
+                case 0:
+                        return ltq_get_pll0_fdiv();
+                case 1:
+                        return CGU_PLL2_PHASE_DIVIDER_ENABLE ?
+                                BASIC_FREQUENCY_1 :
+                                BASIC_FREQUENCY_2;
+                case 2:
+                        return BASIS_REQUENCY_USB;
+                }
+        default:
+                return 0;
+        }
+}
+
+static inline unsigned int cal_dsm(int pll, unsigned int num, unsigned int den)
+{
+        u64 res, clock = get_input_clock(pll);
+
+        res = num * clock;
+        do_div(res, den);
+        return res;
+}
+
+static inline unsigned int mash_dsm(int pll, unsigned int M, unsigned int N,
+        unsigned int K)
+{
+        unsigned int num = ((N + 1) << 10) + K;
+        unsigned int den = (M + 1) << 10;
+
+        return cal_dsm(pll, num, den);
+}
+
+static inline unsigned int ssff_dsm_1(int pll, unsigned int M, unsigned int N,
+        unsigned int K)
+{
+        unsigned int num = ((N + 1) << 11) + K + 512;
+        unsigned int den = (M + 1) << 11;
+
+        return cal_dsm(pll, num, den);
+}
+
+static inline unsigned int ssff_dsm_2(int pll, unsigned int M, unsigned int N,
+        unsigned int K)
+{
+        unsigned int num = K >= 512 ?
+                ((N + 1) << 12) + K - 512 : ((N + 1) << 12) + K + 3584;
+        unsigned int den = (M + 1) << 12;
+
+        return cal_dsm(pll, num, den);
+}
+
+static inline unsigned int dsm(int pll, unsigned int M, unsigned int N,
+        unsigned int K, unsigned int dsmsel, unsigned int phase_div_en)
+{
+        if (!dsmsel)
+                return mash_dsm(pll, M, N, K);
+        else if (!phase_div_en)
+                return mash_dsm(pll, M, N, K);
+        else
+                return ssff_dsm_2(pll, M, N, K);
+}
+
+static inline unsigned int ltq_get_pll0_fosc(void)
+{
+        if (CGU_PLL0_BYPASS)
+                return get_input_clock(0);
+        else
+                return !CGU_PLL0_CFG_FRAC_EN
+                        ? dsm(0, CGU_PLL0_CFG_PLLM, CGU_PLL0_CFG_PLLN, 0,
+                                CGU_PLL0_CFG_DSMSEL,
+                                CGU_PLL0_PHASE_DIVIDER_ENABLE)
+                        : dsm(0, CGU_PLL0_CFG_PLLM, CGU_PLL0_CFG_PLLN,
+                                CGU_PLL0_CFG_PLLK, CGU_PLL0_CFG_DSMSEL,
+                                CGU_PLL0_PHASE_DIVIDER_ENABLE);
+}
+
+static unsigned int ltq_get_pll0_fdiv(void)
+{
+        unsigned int div = CGU_PLL2_CFG_INPUT_DIV + 1;
+
+        return (ltq_get_pll0_fosc() + (div >> 1)) / div;
+}
+
+unsigned int ltq_get_io_region_clock(void)
+{
+        unsigned int ret = ltq_get_pll0_fosc();
+
+        switch (ltq_cgu_r32(LTQ_CGU_PLL2_CFG) & CGU_SYS_DDR_SEL) {
+        default:
+        case 0:
+                return (ret + 1) / 2;
+        case 1:
+                return (ret * 2 + 2) / 5;
+        case 2:
+                return (ret + 1) / 3;
+        case 3:
+                return (ret + 2) / 4;
+        }
+}
+EXPORT_SYMBOL(ltq_get_io_region_clock);
+
+unsigned int ltq_get_fpi_bus_clock(int fpi)
+{
+        unsigned int ret = ltq_get_io_region_clock();
+
+        if ((fpi == 2) && (ltq_cgu_r32(LTQ_CGU_SYS) & CGU_SYS_FPI_SEL))
+                ret >>= 1;
+        return ret;
+}
+EXPORT_SYMBOL(ltq_get_fpi_bus_clock);
+
+unsigned int ltq_get_cpu_hz(void)
+{
+        switch (ltq_cgu_r32(LTQ_CGU_SYS) & 0xc) {
+        case 0:
+                return CLOCK_333M;
+        case 4:
+                return DDR_HZ;
+        case 8:
+                return DDR_HZ << 1;
+        default:
+                return DDR_HZ >> 1;
+        }
+}
+EXPORT_SYMBOL(ltq_get_cpu_hz);
+
+unsigned int ltq_get_fpi_hz(void)
+{
+        unsigned int ddr_clock = DDR_HZ;
+
+        if (ltq_cgu_r32(LTQ_CGU_SYS) & 0x40)
+                return ddr_clock >> 1;
+        return ddr_clock;
+}
+EXPORT_SYMBOL(ltq_get_fpi_hz);
diff --git a/arch/mips/lantiq/xway/devices.c b/arch/mips/lantiq/xway/devices.c
new file mode 100644
index 000000000000..e09e789dfc27
--- /dev/null
+++ b/arch/mips/lantiq/xway/devices.c
@@ -0,0 +1,121 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/mtd/physmap.h>
+#include <linux/kernel.h>
+#include <linux/reboot.h>
+#include <linux/platform_device.h>
+#include <linux/leds.h>
+#include <linux/etherdevice.h>
+#include <linux/reboot.h>
+#include <linux/time.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
+
+#include <asm/bootinfo.h>
+#include <asm/irq.h>
+
+#include <lantiq_soc.h>
+#include <lantiq_irq.h>
+#include <lantiq_platform.h>
+
+#include "devices.h"
+
+/* gpio */
+static struct resource ltq_gpio_resource[] = {
+        {
+                .name   = "gpio0",
+                .start  = LTQ_GPIO0_BASE_ADDR,
+                .end    = LTQ_GPIO0_BASE_ADDR + LTQ_GPIO_SIZE - 1,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .name   = "gpio1",
+                .start  = LTQ_GPIO1_BASE_ADDR,
+                .end    = LTQ_GPIO1_BASE_ADDR + LTQ_GPIO_SIZE - 1,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .name   = "gpio2",
+                .start  = LTQ_GPIO2_BASE_ADDR,
+                .end    = LTQ_GPIO2_BASE_ADDR + LTQ_GPIO_SIZE - 1,
+                .flags  = IORESOURCE_MEM,
+        }
+};
+
+void __init ltq_register_gpio(void)
+{
+        platform_device_register_simple("ltq_gpio", 0,
+                &ltq_gpio_resource[0], 1);
+        platform_device_register_simple("ltq_gpio", 1,
+                &ltq_gpio_resource[1], 1);
+
+        /* AR9 and VR9 have an extra gpio block */
+        if (ltq_is_ar9() || ltq_is_vr9()) {
+                platform_device_register_simple("ltq_gpio", 2,
+                        &ltq_gpio_resource[2], 1);
+        }
+}
+
+/* serial to parallel conversion */
+static struct resource ltq_stp_resource = {
+        .name   = "stp",
+        .start  = LTQ_STP_BASE_ADDR,
+        .end    = LTQ_STP_BASE_ADDR + LTQ_STP_SIZE - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+void __init ltq_register_gpio_stp(void)
+{
+        platform_device_register_simple("ltq_stp", 0, &ltq_stp_resource, 1);
+}
+
+/* asc ports - amazon se has its own serial mapping */
+static struct resource ltq_ase_asc_resources[] = {
+        {
+                .name   = "asc0",
+                .start  = LTQ_ASC1_BASE_ADDR,
+                .end    = LTQ_ASC1_BASE_ADDR + LTQ_ASC_SIZE - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        IRQ_RES(tx, LTQ_ASC_ASE_TIR),
+        IRQ_RES(rx, LTQ_ASC_ASE_RIR),
+        IRQ_RES(err, LTQ_ASC_ASE_EIR),
+};
+
+void __init ltq_register_ase_asc(void)
+{
+        platform_device_register_simple("ltq_asc", 0,
+                ltq_ase_asc_resources, ARRAY_SIZE(ltq_ase_asc_resources));
+}
+
+/* ethernet */
+static struct resource ltq_etop_resources = {
+        .name   = "etop",
+        .start  = LTQ_ETOP_BASE_ADDR,
+        .end    = LTQ_ETOP_BASE_ADDR + LTQ_ETOP_SIZE - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+static struct platform_device ltq_etop = {
+        .name           = "ltq_etop",
+        .resource       = &ltq_etop_resources,
+        .num_resources  = 1,
+};
+
+void __init
+ltq_register_etop(struct ltq_eth_data *eth)
+{
+        if (eth) {
+                ltq_etop.dev.platform_data = eth;
+                platform_device_register(&ltq_etop);
+        }
+}
diff --git a/arch/mips/lantiq/xway/devices.h b/arch/mips/lantiq/xway/devices.h
new file mode 100644
index 000000000000..e90493471bc1
--- /dev/null
+++ b/arch/mips/lantiq/xway/devices.h
@@ -0,0 +1,20 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef _LTQ_DEVICES_XWAY_H__
+#define _LTQ_DEVICES_XWAY_H__
+
+#include "../devices.h"
+#include <linux/phy.h>
+
+extern void ltq_register_gpio(void);
+extern void ltq_register_gpio_stp(void);
+extern void ltq_register_ase_asc(void);
+extern void ltq_register_etop(struct ltq_eth_data *eth);
+
+#endif
diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c
new file mode 100644
index 000000000000..4278a459d6c4
--- /dev/null
+++ b/arch/mips/lantiq/xway/dma.c
@@ -0,0 +1,253 @@
+/*
+ *   This program is free software; you can redistribute it and/or modify it
+ *   under the terms of the GNU General Public License version 2 as published
+ *   by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ *   Copyright (C) 2011 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/dma-mapping.h>
+
+#include <lantiq_soc.h>
+#include <xway_dma.h>
+
+#define LTQ_DMA_CTRL            0x10
+#define LTQ_DMA_CPOLL           0x14
+#define LTQ_DMA_CS              0x18
+#define LTQ_DMA_CCTRL           0x1C
+#define LTQ_DMA_CDBA            0x20
+#define LTQ_DMA_CDLEN           0x24
+#define LTQ_DMA_CIS             0x28
+#define LTQ_DMA_CIE             0x2C
+#define LTQ_DMA_PS              0x40
+#define LTQ_DMA_PCTRL           0x44
+#define LTQ_DMA_IRNEN           0xf4
+
+#define DMA_DESCPT              BIT(3)          /* descriptor complete irq */
+#define DMA_TX                  BIT(8)          /* TX channel direction */
+#define DMA_CHAN_ON             BIT(0)          /* channel on / off bit */
+#define DMA_PDEN                BIT(6)          /* enable packet drop */
+#define DMA_CHAN_RST            BIT(1)          /* channel on / off bit */
+#define DMA_RESET               BIT(0)          /* channel on / off bit */
+#define DMA_IRQ_ACK             0x7e            /* IRQ status register */
+#define DMA_POLL                BIT(31)         /* turn on channel polling */
+#define DMA_CLK_DIV4            BIT(6)          /* polling clock divider */
+#define DMA_2W_BURST            BIT(1)          /* 2 word burst length */
+#define DMA_MAX_CHANNEL         20              /* the soc has 20 channels */
+#define DMA_ETOP_ENDIANESS      (0xf << 8) /* endianess swap etop channels */
+#define DMA_WEIGHT      (BIT(17) | BIT(16))     /* default channel wheight */
+
+#define ltq_dma_r32(x)                  ltq_r32(ltq_dma_membase + (x))
+#define ltq_dma_w32(x, y)               ltq_w32(x, ltq_dma_membase + (y))
+#define ltq_dma_w32_mask(x, y, z)       ltq_w32_mask(x, y, \
+                                                ltq_dma_membase + (z))
+
+static struct resource ltq_dma_resource = {
+        .name   = "dma",
+        .start  = LTQ_DMA_BASE_ADDR,
+        .end    = LTQ_DMA_BASE_ADDR + LTQ_DMA_SIZE - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+static void __iomem *ltq_dma_membase;
+
+void
+ltq_dma_enable_irq(struct ltq_dma_channel *ch)
+{
+        unsigned long flags;
+
+        local_irq_save(flags);
+        ltq_dma_w32(ch->nr, LTQ_DMA_CS);
+        ltq_dma_w32_mask(0, 1 << ch->nr, LTQ_DMA_IRNEN);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL_GPL(ltq_dma_enable_irq);
+
+void
+ltq_dma_disable_irq(struct ltq_dma_channel *ch)
+{
+        unsigned long flags;
+
+        local_irq_save(flags);
+        ltq_dma_w32(ch->nr, LTQ_DMA_CS);
+        ltq_dma_w32_mask(1 << ch->nr, 0, LTQ_DMA_IRNEN);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL_GPL(ltq_dma_disable_irq);
+
+void
+ltq_dma_ack_irq(struct ltq_dma_channel *ch)
+{
+        unsigned long flags;
+
+        local_irq_save(flags);
+        ltq_dma_w32(ch->nr, LTQ_DMA_CS);
+        ltq_dma_w32(DMA_IRQ_ACK, LTQ_DMA_CIS);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL_GPL(ltq_dma_ack_irq);
+
+void
+ltq_dma_open(struct ltq_dma_channel *ch)
+{
+        unsigned long flag;
+
+        local_irq_save(flag);
+        ltq_dma_w32(ch->nr, LTQ_DMA_CS);
+        ltq_dma_w32_mask(0, DMA_CHAN_ON, LTQ_DMA_CCTRL);
+        ltq_dma_enable_irq(ch);
+        local_irq_restore(flag);
+}
+EXPORT_SYMBOL_GPL(ltq_dma_open);
+
+void
+ltq_dma_close(struct ltq_dma_channel *ch)
+{
+        unsigned long flag;
+
+        local_irq_save(flag);
+        ltq_dma_w32(ch->nr, LTQ_DMA_CS);
+        ltq_dma_w32_mask(DMA_CHAN_ON, 0, LTQ_DMA_CCTRL);
+        ltq_dma_disable_irq(ch);
+        local_irq_restore(flag);
+}
+EXPORT_SYMBOL_GPL(ltq_dma_close);
+
+static void
+ltq_dma_alloc(struct ltq_dma_channel *ch)
+{
+        unsigned long flags;
+
+        ch->desc = 0;
+        ch->desc_base = dma_alloc_coherent(NULL,
+                                LTQ_DESC_NUM * LTQ_DESC_SIZE,
+                                &ch->phys, GFP_ATOMIC);
+        memset(ch->desc_base, 0, LTQ_DESC_NUM * LTQ_DESC_SIZE);
+
+        local_irq_save(flags);
+        ltq_dma_w32(ch->nr, LTQ_DMA_CS);
+        ltq_dma_w32(ch->phys, LTQ_DMA_CDBA);
+        ltq_dma_w32(LTQ_DESC_NUM, LTQ_DMA_CDLEN);
+        ltq_dma_w32_mask(DMA_CHAN_ON, 0, LTQ_DMA_CCTRL);
+        wmb();
+        ltq_dma_w32_mask(0, DMA_CHAN_RST, LTQ_DMA_CCTRL);
+        while (ltq_dma_r32(LTQ_DMA_CCTRL) & DMA_CHAN_RST)
+                ;
+        local_irq_restore(flags);
+}
+
+void
+ltq_dma_alloc_tx(struct ltq_dma_channel *ch)
+{
+        unsigned long flags;
+
+        ltq_dma_alloc(ch);
+
+        local_irq_save(flags);
+        ltq_dma_w32(DMA_DESCPT, LTQ_DMA_CIE);
+        ltq_dma_w32_mask(0, 1 << ch->nr, LTQ_DMA_IRNEN);
+        ltq_dma_w32(DMA_WEIGHT | DMA_TX, LTQ_DMA_CCTRL);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL_GPL(ltq_dma_alloc_tx);
+
+void
+ltq_dma_alloc_rx(struct ltq_dma_channel *ch)
+{
+        unsigned long flags;
+
+        ltq_dma_alloc(ch);
+
+        local_irq_save(flags);
+        ltq_dma_w32(DMA_DESCPT, LTQ_DMA_CIE);
+        ltq_dma_w32_mask(0, 1 << ch->nr, LTQ_DMA_IRNEN);
+        ltq_dma_w32(DMA_WEIGHT, LTQ_DMA_CCTRL);
+        local_irq_restore(flags);
+}
+EXPORT_SYMBOL_GPL(ltq_dma_alloc_rx);
+
+void
+ltq_dma_free(struct ltq_dma_channel *ch)
+{
+        if (!ch->desc_base)
+                return;
+        ltq_dma_close(ch);
+        dma_free_coherent(NULL, LTQ_DESC_NUM * LTQ_DESC_SIZE,
+                ch->desc_base, ch->phys);
+}
+EXPORT_SYMBOL_GPL(ltq_dma_free);
+
+void
+ltq_dma_init_port(int p)
+{
+        ltq_dma_w32(p, LTQ_DMA_PS);
+        switch (p) {
+        case DMA_PORT_ETOP:
+                /*
+                 * Tell the DMA engine to swap the endianess of data frames and
+                 * drop packets if the channel arbitration fails.
+                 */
+                ltq_dma_w32_mask(0, DMA_ETOP_ENDIANESS | DMA_PDEN,
+                        LTQ_DMA_PCTRL);
+                break;
+
+        case DMA_PORT_DEU:
+                ltq_dma_w32((DMA_2W_BURST << 4) | (DMA_2W_BURST << 2),
+                        LTQ_DMA_PCTRL);
+                break;
+
+        default:
+                break;
+        }
+}
+EXPORT_SYMBOL_GPL(ltq_dma_init_port);
+
+int __init
+ltq_dma_init(void)
+{
+        int i;
+
+        /* insert and request the memory region */
+        if (insert_resource(&iomem_resource, &ltq_dma_resource) < 0)
+                panic("Failed to insert dma memory\n");
+
+        if (request_mem_region(ltq_dma_resource.start,
+                        resource_size(&ltq_dma_resource), "dma") < 0)
+                panic("Failed to request dma memory\n");
+
+        /* remap dma register range */
+        ltq_dma_membase = ioremap_nocache(ltq_dma_resource.start,
+                                resource_size(&ltq_dma_resource));
+        if (!ltq_dma_membase)
+                panic("Failed to remap dma memory\n");
+
+        /* power up and reset the dma engine */
+        ltq_pmu_enable(PMU_DMA);
+        ltq_dma_w32_mask(0, DMA_RESET, LTQ_DMA_CTRL);
+
+        /* disable all interrupts */
+        ltq_dma_w32(0, LTQ_DMA_IRNEN);
+
+        /* reset/configure each channel */
+        for (i = 0; i < DMA_MAX_CHANNEL; i++) {
+                ltq_dma_w32(i, LTQ_DMA_CS);
+                ltq_dma_w32(DMA_CHAN_RST, LTQ_DMA_CCTRL);
+                ltq_dma_w32(DMA_POLL | DMA_CLK_DIV4, LTQ_DMA_CPOLL);
+                ltq_dma_w32_mask(DMA_CHAN_ON, 0, LTQ_DMA_CCTRL);
+        }
+        return 0;
+}
+
+postcore_initcall(ltq_dma_init);
diff --git a/arch/mips/lantiq/xway/ebu.c b/arch/mips/lantiq/xway/ebu.c
new file mode 100644
index 000000000000..66eb52fa50a1
--- /dev/null
+++ b/arch/mips/lantiq/xway/ebu.c
@@ -0,0 +1,53 @@
+/*
+ *  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.
+ *
+ *  EBU - the external bus unit attaches PCI, NOR and NAND
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/ioport.h>
+
+#include <lantiq_soc.h>
+
+/* all access to the ebu must be locked */
+DEFINE_SPINLOCK(ebu_lock);
+EXPORT_SYMBOL_GPL(ebu_lock);
+
+static struct resource ltq_ebu_resource = {
+        .name   = "ebu",
+        .start  = LTQ_EBU_BASE_ADDR,
+        .end    = LTQ_EBU_BASE_ADDR + LTQ_EBU_SIZE - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+/* remapped base addr of the clock unit and external bus unit */
+void __iomem *ltq_ebu_membase;
+
+static int __init lantiq_ebu_init(void)
+{
+        /* insert and request the memory region */
+        if (insert_resource(&iomem_resource, &ltq_ebu_resource) < 0)
+                panic("Failed to insert ebu memory\n");
+
+        if (request_mem_region(ltq_ebu_resource.start,
+                        resource_size(&ltq_ebu_resource), "ebu") < 0)
+                panic("Failed to request ebu memory\n");
+
+        /* remap ebu register range */
+        ltq_ebu_membase = ioremap_nocache(ltq_ebu_resource.start,
+                                resource_size(&ltq_ebu_resource));
+        if (!ltq_ebu_membase)
+                panic("Failed to remap ebu memory\n");
+
+        /* make sure to unprotect the memory region where flash is located */
+        ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_BUSCON0) & ~EBU_WRDIS, LTQ_EBU_BUSCON0);
+        return 0;
+}
+
+postcore_initcall(lantiq_ebu_init);
diff --git a/arch/mips/lantiq/xway/gpio.c b/arch/mips/lantiq/xway/gpio.c
new file mode 100644
index 000000000000..a321451a5455
--- /dev/null
+++ b/arch/mips/lantiq/xway/gpio.c
@@ -0,0 +1,195 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <linux/ioport.h>
+#include <linux/io.h>
+
+#include <lantiq_soc.h>
+
+#define LTQ_GPIO_OUT            0x00
+#define LTQ_GPIO_IN             0x04
+#define LTQ_GPIO_DIR            0x08
+#define LTQ_GPIO_ALTSEL0        0x0C
+#define LTQ_GPIO_ALTSEL1        0x10
+#define LTQ_GPIO_OD             0x14
+
+#define PINS_PER_PORT           16
+#define MAX_PORTS               3
+
+#define ltq_gpio_getbit(m, r, p)        (!!(ltq_r32(m + r) & (1 << p)))
+#define ltq_gpio_setbit(m, r, p)        ltq_w32_mask(0, (1 << p), m + r)
+#define ltq_gpio_clearbit(m, r, p)      ltq_w32_mask((1 << p), 0, m + r)
+
+struct ltq_gpio {
+        void __iomem *membase;
+        struct gpio_chip chip;
+};
+
+static struct ltq_gpio ltq_gpio_port[MAX_PORTS];
+
+int gpio_to_irq(unsigned int gpio)
+{
+        return -EINVAL;
+}
+EXPORT_SYMBOL(gpio_to_irq);
+
+int irq_to_gpio(unsigned int gpio)
+{
+        return -EINVAL;
+}
+EXPORT_SYMBOL(irq_to_gpio);
+
+int ltq_gpio_request(unsigned int pin, unsigned int alt0,
+        unsigned int alt1, unsigned int dir, const char *name)
+{
+        int id = 0;
+
+        if (pin >= (MAX_PORTS * PINS_PER_PORT))
+                return -EINVAL;
+        if (gpio_request(pin, name)) {
+                pr_err("failed to setup lantiq gpio: %s\n", name);
+                return -EBUSY;
+        }
+        if (dir)
+                gpio_direction_output(pin, 1);
+        else
+                gpio_direction_input(pin);
+        while (pin >= PINS_PER_PORT) {
+                pin -= PINS_PER_PORT;
+                id++;
+        }
+        if (alt0)
+                ltq_gpio_setbit(ltq_gpio_port[id].membase,
+                        LTQ_GPIO_ALTSEL0, pin);
+        else
+                ltq_gpio_clearbit(ltq_gpio_port[id].membase,
+                        LTQ_GPIO_ALTSEL0, pin);
+        if (alt1)
+                ltq_gpio_setbit(ltq_gpio_port[id].membase,
+                        LTQ_GPIO_ALTSEL1, pin);
+        else
+                ltq_gpio_clearbit(ltq_gpio_port[id].membase,
+                        LTQ_GPIO_ALTSEL1, pin);
+        return 0;
+}
+EXPORT_SYMBOL(ltq_gpio_request);
+
+static void ltq_gpio_set(struct gpio_chip *chip, unsigned int offset, int value)
+{
+        struct ltq_gpio *ltq_gpio = container_of(chip, struct ltq_gpio, chip);
+
+        if (value)
+                ltq_gpio_setbit(ltq_gpio->membase, LTQ_GPIO_OUT, offset);
+        else
+                ltq_gpio_clearbit(ltq_gpio->membase, LTQ_GPIO_OUT, offset);
+}
+
+static int ltq_gpio_get(struct gpio_chip *chip, unsigned int offset)
+{
+        struct ltq_gpio *ltq_gpio = container_of(chip, struct ltq_gpio, chip);
+
+        return ltq_gpio_getbit(ltq_gpio->membase, LTQ_GPIO_IN, offset);
+}
+
+static int ltq_gpio_direction_input(struct gpio_chip *chip, unsigned int offset)
+{
+        struct ltq_gpio *ltq_gpio = container_of(chip, struct ltq_gpio, chip);
+
+        ltq_gpio_clearbit(ltq_gpio->membase, LTQ_GPIO_OD, offset);
+        ltq_gpio_clearbit(ltq_gpio->membase, LTQ_GPIO_DIR, offset);
+
+        return 0;
+}
+
+static int ltq_gpio_direction_output(struct gpio_chip *chip,
+        unsigned int offset, int value)
+{
+        struct ltq_gpio *ltq_gpio = container_of(chip, struct ltq_gpio, chip);
+
+        ltq_gpio_setbit(ltq_gpio->membase, LTQ_GPIO_OD, offset);
+        ltq_gpio_setbit(ltq_gpio->membase, LTQ_GPIO_DIR, offset);
+        ltq_gpio_set(chip, offset, value);
+
+        return 0;
+}
+
+static int ltq_gpio_req(struct gpio_chip *chip, unsigned offset)
+{
+        struct ltq_gpio *ltq_gpio = container_of(chip, struct ltq_gpio, chip);
+
+        ltq_gpio_clearbit(ltq_gpio->membase, LTQ_GPIO_ALTSEL0, offset);
+        ltq_gpio_clearbit(ltq_gpio->membase, LTQ_GPIO_ALTSEL1, offset);
+        return 0;
+}
+
+static int ltq_gpio_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+
+        if (pdev->id >= MAX_PORTS) {
+                dev_err(&pdev->dev, "invalid gpio port %d\n",
+                        pdev->id);
+                return -EINVAL;
+        }
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(&pdev->dev, "failed to get memory for gpio port %d\n",
+                        pdev->id);
+                return -ENOENT;
+        }
+        res = devm_request_mem_region(&pdev->dev, res->start,
+                resource_size(res), dev_name(&pdev->dev));
+        if (!res) {
+                dev_err(&pdev->dev,
+                        "failed to request memory for gpio port %d\n",
+                        pdev->id);
+                return -EBUSY;
+        }
+        ltq_gpio_port[pdev->id].membase = devm_ioremap_nocache(&pdev->dev,
+                res->start, resource_size(res));
+        if (!ltq_gpio_port[pdev->id].membase) {
+                dev_err(&pdev->dev, "failed to remap memory for gpio port %d\n",
+                        pdev->id);
+                return -ENOMEM;
+        }
+        ltq_gpio_port[pdev->id].chip.label = "ltq_gpio";
+        ltq_gpio_port[pdev->id].chip.direction_input = ltq_gpio_direction_input;
+        ltq_gpio_port[pdev->id].chip.direction_output =
+                ltq_gpio_direction_output;
+        ltq_gpio_port[pdev->id].chip.get = ltq_gpio_get;
+        ltq_gpio_port[pdev->id].chip.set = ltq_gpio_set;
+        ltq_gpio_port[pdev->id].chip.request = ltq_gpio_req;
+        ltq_gpio_port[pdev->id].chip.base = PINS_PER_PORT * pdev->id;
+        ltq_gpio_port[pdev->id].chip.ngpio = PINS_PER_PORT;
+        platform_set_drvdata(pdev, &ltq_gpio_port[pdev->id]);
+        return gpiochip_add(&ltq_gpio_port[pdev->id].chip);
+}
+
+static struct platform_driver
+ltq_gpio_driver = {
+        .probe = ltq_gpio_probe,
+        .driver = {
+                .name = "ltq_gpio",
+                .owner = THIS_MODULE,
+        },
+};
+
+int __init ltq_gpio_init(void)
+{
+        int ret = platform_driver_register(&ltq_gpio_driver);
+
+        if (ret)
+                pr_info("ltq_gpio : Error registering platfom driver!");
+        return ret;
+}
+
+postcore_initcall(ltq_gpio_init);
diff --git a/arch/mips/lantiq/xway/gpio_ebu.c b/arch/mips/lantiq/xway/gpio_ebu.c
new file mode 100644
index 000000000000..a479355abdb9
--- /dev/null
+++ b/arch/mips/lantiq/xway/gpio_ebu.c
@@ -0,0 +1,126 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/platform_device.h>
+#include <linux/mutex.h>
+#include <linux/gpio.h>
+#include <linux/io.h>
+
+#include <lantiq_soc.h>
+
+/*
+ * By attaching hardware latches to the EBU it is possible to create output
+ * only gpios. This driver configures a special memory address, which when
+ * written to outputs 16 bit to the latches.
+ */
+
+#define LTQ_EBU_BUSCON  0x1e7ff         /* 16 bit access, slowest timing */
+#define LTQ_EBU_WP      0x80000000      /* write protect bit */
+
+/* we keep a shadow value of the last value written to the ebu */
+static int ltq_ebu_gpio_shadow = 0x0;
+static void __iomem *ltq_ebu_gpio_membase;
+
+static void ltq_ebu_apply(void)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&ebu_lock, flags);
+        ltq_ebu_w32(LTQ_EBU_BUSCON, LTQ_EBU_BUSCON1);
+        *((__u16 *)ltq_ebu_gpio_membase) = ltq_ebu_gpio_shadow;
+        ltq_ebu_w32(LTQ_EBU_BUSCON | LTQ_EBU_WP, LTQ_EBU_BUSCON1);
+        spin_unlock_irqrestore(&ebu_lock, flags);
+}
+
+static void ltq_ebu_set(struct gpio_chip *chip, unsigned offset, int value)
+{
+        if (value)
+                ltq_ebu_gpio_shadow |= (1 << offset);
+        else
+                ltq_ebu_gpio_shadow &= ~(1 << offset);
+        ltq_ebu_apply();
+}
+
+static int ltq_ebu_direction_output(struct gpio_chip *chip, unsigned offset,
+        int value)
+{
+        ltq_ebu_set(chip, offset, value);
+
+        return 0;
+}
+
+static struct gpio_chip ltq_ebu_chip = {
+        .label = "ltq_ebu",
+        .direction_output = ltq_ebu_direction_output,
+        .set = ltq_ebu_set,
+        .base = 72,
+        .ngpio = 16,
+        .can_sleep = 1,
+        .owner = THIS_MODULE,
+};
+
+static int ltq_ebu_probe(struct platform_device *pdev)
+{
+        int ret = 0;
+        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+
+        if (!res) {
+                dev_err(&pdev->dev, "failed to get memory resource\n");
+                return -ENOENT;
+        }
+
+        res = devm_request_mem_region(&pdev->dev, res->start,
+                resource_size(res), dev_name(&pdev->dev));
+        if (!res) {
+                dev_err(&pdev->dev, "failed to request memory resource\n");
+                return -EBUSY;
+        }
+
+        ltq_ebu_gpio_membase = devm_ioremap_nocache(&pdev->dev, res->start,
+                resource_size(res));
+        if (!ltq_ebu_gpio_membase) {
+                dev_err(&pdev->dev, "Failed to ioremap mem region\n");
+                return -ENOMEM;
+        }
+
+        /* grab the default shadow value passed form the platform code */
+        ltq_ebu_gpio_shadow = (unsigned int) pdev->dev.platform_data;
+
+        /* tell the ebu controller which memory address we will be using */
+        ltq_ebu_w32(pdev->resource->start | 0x1, LTQ_EBU_ADDRSEL1);
+
+        /* write protect the region */
+        ltq_ebu_w32(LTQ_EBU_BUSCON | LTQ_EBU_WP, LTQ_EBU_BUSCON1);
+
+        ret = gpiochip_add(&ltq_ebu_chip);
+        if (!ret)
+                ltq_ebu_apply();
+        return ret;
+}
+
+static struct platform_driver ltq_ebu_driver = {
+        .probe = ltq_ebu_probe,
+        .driver = {
+                .name = "ltq_ebu",
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init ltq_ebu_init(void)
+{
+        int ret = platform_driver_register(&ltq_ebu_driver);
+
+        if (ret)
+                pr_info("ltq_ebu : Error registering platfom driver!");
+        return ret;
+}
+
+postcore_initcall(ltq_ebu_init);
diff --git a/arch/mips/lantiq/xway/gpio_stp.c b/arch/mips/lantiq/xway/gpio_stp.c
new file mode 100644
index 000000000000..67d59d690340
--- /dev/null
+++ b/arch/mips/lantiq/xway/gpio_stp.c
@@ -0,0 +1,157 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2007 John Crispin <blogic@openwrt.org>
+ *
+ */
+
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/platform_device.h>
+#include <linux/mutex.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+
+#include <lantiq_soc.h>
+
+#define LTQ_STP_CON0            0x00
+#define LTQ_STP_CON1            0x04
+#define LTQ_STP_CPU0            0x08
+#define LTQ_STP_CPU1            0x0C
+#define LTQ_STP_AR              0x10
+
+#define LTQ_STP_CON_SWU         (1 << 31)
+#define LTQ_STP_2HZ             0
+#define LTQ_STP_4HZ             (1 << 23)
+#define LTQ_STP_8HZ             (2 << 23)
+#define LTQ_STP_10HZ            (3 << 23)
+#define LTQ_STP_SPEED_MASK      (0xf << 23)
+#define LTQ_STP_UPD_FPI         (1 << 31)
+#define LTQ_STP_UPD_MASK        (3 << 30)
+#define LTQ_STP_ADSL_SRC        (3 << 24)
+
+#define LTQ_STP_GROUP0          (1 << 0)
+
+#define LTQ_STP_RISING          0
+#define LTQ_STP_FALLING         (1 << 26)
+#define LTQ_STP_EDGE_MASK       (1 << 26)
+
+#define ltq_stp_r32(reg)        __raw_readl(ltq_stp_membase + reg)
+#define ltq_stp_w32(val, reg)   __raw_writel(val, ltq_stp_membase + reg)
+#define ltq_stp_w32_mask(clear, set, reg) \
+                ltq_w32((ltq_r32(ltq_stp_membase + reg) & ~(clear)) | (set), \
+                ltq_stp_membase + (reg))
+
+static int ltq_stp_shadow = 0xffff;
+static void __iomem *ltq_stp_membase;
+
+static void ltq_stp_set(struct gpio_chip *chip, unsigned offset, int value)
+{
+        if (value)
+                ltq_stp_shadow |= (1 << offset);
+        else
+                ltq_stp_shadow &= ~(1 << offset);
+        ltq_stp_w32(ltq_stp_shadow, LTQ_STP_CPU0);
+}
+
+static int ltq_stp_direction_output(struct gpio_chip *chip, unsigned offset,
+        int value)
+{
+        ltq_stp_set(chip, offset, value);
+
+        return 0;
+}
+
+static struct gpio_chip ltq_stp_chip = {
+        .label = "ltq_stp",
+        .direction_output = ltq_stp_direction_output,
+        .set = ltq_stp_set,
+        .base = 48,
+        .ngpio = 24,
+        .can_sleep = 1,
+        .owner = THIS_MODULE,
+};
+
+static int ltq_stp_hw_init(void)
+{
+        /* the 3 pins used to control the external stp */
+        ltq_gpio_request(4, 1, 0, 1, "stp-st");
+        ltq_gpio_request(5, 1, 0, 1, "stp-d");
+        ltq_gpio_request(6, 1, 0, 1, "stp-sh");
+
+        /* sane defaults */
+        ltq_stp_w32(0, LTQ_STP_AR);
+        ltq_stp_w32(0, LTQ_STP_CPU0);
+        ltq_stp_w32(0, LTQ_STP_CPU1);
+        ltq_stp_w32(LTQ_STP_CON_SWU, LTQ_STP_CON0);
+        ltq_stp_w32(0, LTQ_STP_CON1);
+
+        /* rising or falling edge */
+        ltq_stp_w32_mask(LTQ_STP_EDGE_MASK, LTQ_STP_FALLING, LTQ_STP_CON0);
+
+        /* per default stp 15-0 are set */
+        ltq_stp_w32_mask(0, LTQ_STP_GROUP0, LTQ_STP_CON1);
+
+        /* stp are update periodically by the FPI bus */
+        ltq_stp_w32_mask(LTQ_STP_UPD_MASK, LTQ_STP_UPD_FPI, LTQ_STP_CON1);
+
+        /* set stp update speed */
+        ltq_stp_w32_mask(LTQ_STP_SPEED_MASK, LTQ_STP_8HZ, LTQ_STP_CON1);
+
+        /* tell the hardware that pin (led) 0 and 1 are controlled
+         *  by the dsl arc
+         */
+        ltq_stp_w32_mask(0, LTQ_STP_ADSL_SRC, LTQ_STP_CON0);
+
+        ltq_pmu_enable(PMU_LED);
+        return 0;
+}
+
+static int __devinit ltq_stp_probe(struct platform_device *pdev)
+{
+        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        int ret = 0;
+
+        if (!res)
+                return -ENOENT;
+        res = devm_request_mem_region(&pdev->dev, res->start,
+                resource_size(res), dev_name(&pdev->dev));
+        if (!res) {
+                dev_err(&pdev->dev, "failed to request STP memory\n");
+                return -EBUSY;
+        }
+        ltq_stp_membase = devm_ioremap_nocache(&pdev->dev, res->start,
+                resource_size(res));
+        if (!ltq_stp_membase) {
+                dev_err(&pdev->dev, "failed to remap STP memory\n");
+                return -ENOMEM;
+        }
+        ret = gpiochip_add(&ltq_stp_chip);
+        if (!ret)
+                ret = ltq_stp_hw_init();
+
+        return ret;
+}
+
+static struct platform_driver ltq_stp_driver = {
+        .probe = ltq_stp_probe,
+        .driver = {
+                .name = "ltq_stp",
+                .owner = THIS_MODULE,
+        },
+};
+
+int __init ltq_stp_init(void)
+{
+        int ret = platform_driver_register(&ltq_stp_driver);
+
+        if (ret)
+                pr_info("ltq_stp: error registering platfom driver");
+        return ret;
+}
+
+postcore_initcall(ltq_stp_init);
diff --git a/arch/mips/lantiq/xway/mach-easy50601.c b/arch/mips/lantiq/xway/mach-easy50601.c
new file mode 100644
index 000000000000..d5aaf637ab19
--- /dev/null
+++ b/arch/mips/lantiq/xway/mach-easy50601.c
@@ -0,0 +1,57 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <linux/input.h>
+
+#include <lantiq.h>
+
+#include "../machtypes.h"
+#include "devices.h"
+
+static struct mtd_partition easy50601_partitions[] = {
+        {
+                .name   = "uboot",
+                .offset = 0x0,
+                .size   = 0x10000,
+        },
+        {
+                .name   = "uboot_env",
+                .offset = 0x10000,
+                .size   = 0x10000,
+        },
+        {
+                .name   = "linux",
+                .offset = 0x20000,
+                .size   = 0xE0000,
+        },
+        {
+                .name   = "rootfs",
+                .offset = 0x100000,
+                .size   = 0x300000,
+        },
+};
+
+static struct physmap_flash_data easy50601_flash_data = {
+        .nr_parts       = ARRAY_SIZE(easy50601_partitions),
+        .parts          = easy50601_partitions,
+};
+
+static void __init easy50601_init(void)
+{
+        ltq_register_nor(&easy50601_flash_data);
+}
+
+MIPS_MACHINE(LTQ_MACH_EASY50601,
+                        "EASY50601",
+                        "EASY50601 Eval Board",
+                        easy50601_init);
diff --git a/arch/mips/lantiq/xway/mach-easy50712.c b/arch/mips/lantiq/xway/mach-easy50712.c
new file mode 100644
index 000000000000..ea5027b3239d
--- /dev/null
+++ b/arch/mips/lantiq/xway/mach-easy50712.c
@@ -0,0 +1,74 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <linux/input.h>
+#include <linux/phy.h>
+
+#include <lantiq_soc.h>
+#include <irq.h>
+
+#include "../machtypes.h"
+#include "devices.h"
+
+static struct mtd_partition easy50712_partitions[] = {
+        {
+                .name   = "uboot",
+                .offset = 0x0,
+                .size   = 0x10000,
+        },
+        {
+                .name   = "uboot_env",
+                .offset = 0x10000,
+                .size   = 0x10000,
+        },
+        {
+                .name   = "linux",
+                .offset = 0x20000,
+                .size   = 0xe0000,
+        },
+        {
+                .name   = "rootfs",
+                .offset = 0x100000,
+                .size   = 0x300000,
+        },
+};
+
+static struct physmap_flash_data easy50712_flash_data = {
+        .nr_parts       = ARRAY_SIZE(easy50712_partitions),
+        .parts          = easy50712_partitions,
+};
+
+static struct ltq_pci_data ltq_pci_data = {
+        .clock  = PCI_CLOCK_INT,
+        .gpio   = PCI_GNT1 | PCI_REQ1,
+        .irq    = {
+                [14] = INT_NUM_IM0_IRL0 + 22,
+        },
+};
+
+static struct ltq_eth_data ltq_eth_data = {
+        .mii_mode = PHY_INTERFACE_MODE_MII,
+};
+
+static void __init easy50712_init(void)
+{
+        ltq_register_gpio_stp();
+        ltq_register_nor(&easy50712_flash_data);
+        ltq_register_pci(&ltq_pci_data);
+        ltq_register_etop(&ltq_eth_data);
+}
+
+MIPS_MACHINE(LTQ_MACH_EASY50712,
+             "EASY50712",
+             "EASY50712 Eval Board",
+              easy50712_init);
diff --git a/arch/mips/lantiq/xway/pmu.c b/arch/mips/lantiq/xway/pmu.c
new file mode 100644
index 000000000000..9d69f01e352b
--- /dev/null
+++ b/arch/mips/lantiq/xway/pmu.c
@@ -0,0 +1,70 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/ioport.h>
+
+#include <lantiq_soc.h>
+
+/* PMU - the power management unit allows us to turn part of the core
+ * on and off
+ */
+
+/* the enable / disable registers */
+#define LTQ_PMU_PWDCR   0x1C
+#define LTQ_PMU_PWDSR   0x20
+
+#define ltq_pmu_w32(x, y)       ltq_w32((x), ltq_pmu_membase + (y))
+#define ltq_pmu_r32(x)          ltq_r32(ltq_pmu_membase + (x))
+
+static struct resource ltq_pmu_resource = {
+        .name   = "pmu",
+        .start  = LTQ_PMU_BASE_ADDR,
+        .end    = LTQ_PMU_BASE_ADDR + LTQ_PMU_SIZE - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+static void __iomem *ltq_pmu_membase;
+
+void ltq_pmu_enable(unsigned int module)
+{
+        int err = 1000000;
+
+        ltq_pmu_w32(ltq_pmu_r32(LTQ_PMU_PWDCR) & ~module, LTQ_PMU_PWDCR);
+        do {} while (--err && (ltq_pmu_r32(LTQ_PMU_PWDSR) & module));
+
+        if (!err)
+                panic("activating PMU module failed!\n");
+}
+EXPORT_SYMBOL(ltq_pmu_enable);
+
+void ltq_pmu_disable(unsigned int module)
+{
+        ltq_pmu_w32(ltq_pmu_r32(LTQ_PMU_PWDCR) | module, LTQ_PMU_PWDCR);
+}
+EXPORT_SYMBOL(ltq_pmu_disable);
+
+int __init ltq_pmu_init(void)
+{
+        if (insert_resource(&iomem_resource, &ltq_pmu_resource) < 0)
+                panic("Failed to insert pmu memory\n");
+
+        if (request_mem_region(ltq_pmu_resource.start,
+                        resource_size(&ltq_pmu_resource), "pmu") < 0)
+                panic("Failed to request pmu memory\n");
+
+        ltq_pmu_membase = ioremap_nocache(ltq_pmu_resource.start,
+                                resource_size(&ltq_pmu_resource));
+        if (!ltq_pmu_membase)
+                panic("Failed to remap pmu memory\n");
+        return 0;
+}
+
+core_initcall(ltq_pmu_init);
diff --git a/arch/mips/lantiq/xway/prom-ase.c b/arch/mips/lantiq/xway/prom-ase.c
new file mode 100644
index 000000000000..abe49f4db57f
--- /dev/null
+++ b/arch/mips/lantiq/xway/prom-ase.c
@@ -0,0 +1,39 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <asm/bootinfo.h>
+#include <asm/time.h>
+
+#include <lantiq_soc.h>
+
+#include "../prom.h"
+
+#define SOC_AMAZON_SE   "Amazon_SE"
+
+#define PART_SHIFT      12
+#define PART_MASK       0x0FFFFFFF
+#define REV_SHIFT       28
+#define REV_MASK        0xF0000000
+
+void __init ltq_soc_detect(struct ltq_soc_info *i)
+{
+        i->partnum = (ltq_r32(LTQ_MPS_CHIPID) & PART_MASK) >> PART_SHIFT;
+        i->rev = (ltq_r32(LTQ_MPS_CHIPID) & REV_MASK) >> REV_SHIFT;
+        switch (i->partnum) {
+        case SOC_ID_AMAZON_SE:
+                i->name = SOC_AMAZON_SE;
+                i->type = SOC_TYPE_AMAZON_SE;
+                break;
+
+        default:
+                unreachable();
+                break;
+        }
+}
diff --git a/arch/mips/lantiq/xway/prom-xway.c b/arch/mips/lantiq/xway/prom-xway.c
new file mode 100644
index 000000000000..1686692ac24d
--- /dev/null
+++ b/arch/mips/lantiq/xway/prom-xway.c
@@ -0,0 +1,54 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/module.h>
+#include <linux/clk.h>
+#include <asm/bootinfo.h>
+#include <asm/time.h>
+
+#include <lantiq_soc.h>
+
+#include "../prom.h"
+
+#define SOC_DANUBE      "Danube"
+#define SOC_TWINPASS    "Twinpass"
+#define SOC_AR9         "AR9"
+
+#define PART_SHIFT      12
+#define PART_MASK       0x0FFFFFFF
+#define REV_SHIFT       28
+#define REV_MASK        0xF0000000
+
+void __init ltq_soc_detect(struct ltq_soc_info *i)
+{
+        i->partnum = (ltq_r32(LTQ_MPS_CHIPID) & PART_MASK) >> PART_SHIFT;
+        i->rev = (ltq_r32(LTQ_MPS_CHIPID) & REV_MASK) >> REV_SHIFT;
+        switch (i->partnum) {
+        case SOC_ID_DANUBE1:
+        case SOC_ID_DANUBE2:
+                i->name = SOC_DANUBE;
+                i->type = SOC_TYPE_DANUBE;
+                break;
+
+        case SOC_ID_TWINPASS:
+                i->name = SOC_TWINPASS;
+                i->type = SOC_TYPE_DANUBE;
+                break;
+
+        case SOC_ID_ARX188:
+        case SOC_ID_ARX168:
+        case SOC_ID_ARX182:
+                i->name = SOC_AR9;
+                i->type = SOC_TYPE_AR9;
+                break;
+
+        default:
+                unreachable();
+                break;
+        }
+}
diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c
new file mode 100644
index 000000000000..a1be36d0e490
--- /dev/null
+++ b/arch/mips/lantiq/xway/reset.c
@@ -0,0 +1,91 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/pm.h>
+#include <linux/module.h>
+#include <asm/reboot.h>
+
+#include <lantiq_soc.h>
+
+#define ltq_rcu_w32(x, y)       ltq_w32((x), ltq_rcu_membase + (y))
+#define ltq_rcu_r32(x)          ltq_r32(ltq_rcu_membase + (x))
+
+/* register definitions */
+#define LTQ_RCU_RST             0x0010
+#define LTQ_RCU_RST_ALL         0x40000000
+
+#define LTQ_RCU_RST_STAT        0x0014
+#define LTQ_RCU_STAT_SHIFT      26
+
+static struct resource ltq_rcu_resource = {
+        .name   = "rcu",
+        .start  = LTQ_RCU_BASE_ADDR,
+        .end    = LTQ_RCU_BASE_ADDR + LTQ_RCU_SIZE - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+/* remapped base addr of the reset control unit */
+static void __iomem *ltq_rcu_membase;
+
+/* This function is used by the watchdog driver */
+int ltq_reset_cause(void)
+{
+        u32 val = ltq_rcu_r32(LTQ_RCU_RST_STAT);
+        return val >> LTQ_RCU_STAT_SHIFT;
+}
+EXPORT_SYMBOL_GPL(ltq_reset_cause);
+
+static void ltq_machine_restart(char *command)
+{
+        pr_notice("System restart\n");
+        local_irq_disable();
+        ltq_rcu_w32(ltq_rcu_r32(LTQ_RCU_RST) | LTQ_RCU_RST_ALL, LTQ_RCU_RST);
+        unreachable();
+}
+
+static void ltq_machine_halt(void)
+{
+        pr_notice("System halted.\n");
+        local_irq_disable();
+        unreachable();
+}
+
+static void ltq_machine_power_off(void)
+{
+        pr_notice("Please turn off the power now.\n");
+        local_irq_disable();
+        unreachable();
+}
+
+static int __init mips_reboot_setup(void)
+{
+        /* insert and request the memory region */
+        if (insert_resource(&iomem_resource, &ltq_rcu_resource) < 0)
+                panic("Failed to insert rcu memory\n");
+
+        if (request_mem_region(ltq_rcu_resource.start,
+                        resource_size(&ltq_rcu_resource), "rcu") < 0)
+                panic("Failed to request rcu memory\n");
+
+        /* remap rcu register range */
+        ltq_rcu_membase = ioremap_nocache(ltq_rcu_resource.start,
+                                resource_size(&ltq_rcu_resource));
+        if (!ltq_rcu_membase)
+                panic("Failed to remap rcu memory\n");
+
+        _machine_restart = ltq_machine_restart;
+        _machine_halt = ltq_machine_halt;
+        pm_power_off = ltq_machine_power_off;
+
+        return 0;
+}
+
+arch_initcall(mips_reboot_setup);
diff --git a/arch/mips/lantiq/xway/setup-ase.c b/arch/mips/lantiq/xway/setup-ase.c
new file mode 100644
index 000000000000..f6f326798a39
--- /dev/null
+++ b/arch/mips/lantiq/xway/setup-ase.c
@@ -0,0 +1,19 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2011 John Crispin <blogic@openwrt.org>
+ */
+
+#include <lantiq_soc.h>
+
+#include "../prom.h"
+#include "devices.h"
+
+void __init ltq_soc_setup(void)
+{
+        ltq_register_ase_asc();
+        ltq_register_gpio();
+        ltq_register_wdt();
+}
diff --git a/arch/mips/lantiq/xway/setup-xway.c b/arch/mips/lantiq/xway/setup-xway.c
new file mode 100644
index 000000000000..c292f643a858
--- /dev/null
+++ b/arch/mips/lantiq/xway/setup-xway.c
@@ -0,0 +1,20 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2011 John Crispin <blogic@openwrt.org>
+ */
+
+#include <lantiq_soc.h>
+
+#include "../prom.h"
+#include "devices.h"
+
+void __init ltq_soc_setup(void)
+{
+        ltq_register_asc(0);
+        ltq_register_asc(1);
+        ltq_register_gpio();
+        ltq_register_wdt();
+}
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile
index 2adead5a8a37..b2cad4fd5fc4 100644
--- a/arch/mips/lib/Makefile
+++ b/arch/mips/lib/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_CPU_TX39XX)	+= r3k_dump_tlb.o
 obj-$(CONFIG_CPU_TX49XX)        += dump_tlb.o
 obj-$(CONFIG_CPU_VR41XX)        += dump_tlb.o
 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += dump_tlb.o
+obj-$(CONFIG_CPU_XLR)           += dump_tlb.o
 
 # libgcc-style stuff needed in the kernel
 obj-y += ashldi3.o ashrdi3.o cmpdi2.o lshrdi3.o ucmpdi2.o
diff --git a/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c b/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c
index 8c807c965199..0cb1b9760e34 100644
--- a/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c
+++ b/arch/mips/loongson/common/cs5536/cs5536_mfgpt.c
@@ -201,8 +201,6 @@ static struct clocksource clocksource_mfgpt = {
         .rating = 120, /* Functional for real use, but not desired */
         .read = mfgpt_read,
         .mask = CLOCKSOURCE_MASK(32),
-        .mult = 0,
-        .shift = 22,
 };
 
 int __init init_mfgpt_clocksource(void)
@@ -210,8 +208,7 @@ int __init init_mfgpt_clocksource(void)
         if (num_possible_cpus() > 1)    /* MFGPT does not scale! */
                 return 0;
 
-        clocksource_mfgpt.mult = clocksource_hz2mult(MFGPT_TICK_RATE, 22);
-        return clocksource_register(&clocksource_mfgpt);
+        return clocksource_register_hz(&clocksource_mfgpt, MFGPT_TICK_RATE);
 }
 
 arch_initcall(init_mfgpt_clocksource);
diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
index d679c772d082..4d8c1623eee2 100644
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -3,7 +3,8 @@
 #
 
 obj-y                           += cache.o dma-default.o extable.o fault.o \
-                                   init.o tlbex.o tlbex-fault.o uasm.o page.o
+                                   init.o mmap.o tlbex.o tlbex-fault.o uasm.o \
+                                   page.o
 
 obj-$(CONFIG_32BIT)             += ioremap.o pgtable-32.o
 obj-$(CONFIG_64BIT)             += pgtable-64.o
@@ -29,6 +30,7 @@ obj-$(CONFIG_CPU_TX39XX)	+= c-tx39.o tlb-r3k.o
 obj-$(CONFIG_CPU_TX49XX)        += c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_VR41XX)        += c-r4k.o cex-gen.o tlb-r4k.o
 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += c-octeon.o cex-oct.o tlb-r4k.o
+obj-$(CONFIG_CPU_XLR)           += c-r4k.o tlb-r4k.o cex-gen.o
 
 obj-$(CONFIG_IP22_CPU_SCACHE)   += sc-ip22.o
 obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o
diff --git a/arch/mips/mm/c-r3k.c b/arch/mips/mm/c-r3k.c
index 54e5f7b9f440..e6b0efd3f6a4 100644
--- a/arch/mips/mm/c-r3k.c
+++ b/arch/mips/mm/c-r3k.c
@@ -1,7 +1,7 @@
 /*
  * r2300.c: R2000 and R3000 specific mmu/cache code.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  *
  * with a lot of changes to make this thing work for R3000s
  * Tx39XX R4k style caches added. HK
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 71bddf8f7d25..eeb642e4066e 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Ralf Baechle (ralf@gnu.org)
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  */
@@ -1006,6 +1006,7 @@ static void __cpuinit probe_pcache(void)
         case CPU_25KF:
         case CPU_SB1:
         case CPU_SB1A:
+        case CPU_XLR:
                 c->dcache.flags |= MIPS_CACHE_PINDEX;
                 break;
 
diff --git a/arch/mips/mm/c-tx39.c b/arch/mips/mm/c-tx39.c
index 6515b4418714..d352fad3e451 100644
--- a/arch/mips/mm/c-tx39.c
+++ b/arch/mips/mm/c-tx39.c
@@ -1,7 +1,7 @@
 /*
  * r2300.c: R2000 and R3000 specific mmu/cache code.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  *
  * with a lot of changes to make this thing work for R3000s
  * Tx39XX R4k style caches added. HK
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 279599e9a779..1aadeb42c5a5 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -64,8 +64,6 @@
 
 #endif /* CONFIG_MIPS_MT_SMTC */
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 /*
  * We have up to 8 empty zeroed pages so we can map one of the right colour
  * when needed.  This is necessary only on R4000 / R4400 SC and MC versions
diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
new file mode 100644
index 000000000000..ae3c20a9556e
--- /dev/null
+++ b/arch/mips/mm/mmap.c
@@ -0,0 +1,122 @@
+/*
+ * 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) 2011 Wind River Systems,
+ *   written by Ralf Baechle <ralf@linux-mips.org>
+ */
+#include <linux/errno.h>
+#include <linux/mm.h>
+#include <linux/mman.h>
+#include <linux/module.h>
+#include <linux/random.h>
+#include <linux/sched.h>
+
+unsigned long shm_align_mask = PAGE_SIZE - 1;   /* Sane caches */
+
+EXPORT_SYMBOL(shm_align_mask);
+
+#define COLOUR_ALIGN(addr,pgoff)                                \
+        ((((addr) + shm_align_mask) & ~shm_align_mask) +        \
+         (((pgoff) << PAGE_SHIFT) & shm_align_mask))
+
+unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+        unsigned long len, unsigned long pgoff, unsigned long flags)
+{
+        struct vm_area_struct * vmm;
+        int do_color_align;
+
+        if (len > TASK_SIZE)
+                return -ENOMEM;
+
+        if (flags & MAP_FIXED) {
+                /* Even MAP_FIXED mappings must reside within TASK_SIZE.  */
+                if (TASK_SIZE - len < addr)
+                        return -EINVAL;
+
+                /*
+                 * We do not accept a shared mapping if it would violate
+                 * cache aliasing constraints.
+                 */
+                if ((flags & MAP_SHARED) &&
+                    ((addr - (pgoff << PAGE_SHIFT)) & shm_align_mask))
+                        return -EINVAL;
+                return addr;
+        }
+
+        do_color_align = 0;
+        if (filp || (flags & MAP_SHARED))
+                do_color_align = 1;
+        if (addr) {
+                if (do_color_align)
+                        addr = COLOUR_ALIGN(addr, pgoff);
+                else
+                        addr = PAGE_ALIGN(addr);
+                vmm = find_vma(current->mm, addr);
+                if (TASK_SIZE - len >= addr &&
+                    (!vmm || addr + len <= vmm->vm_start))
+                        return addr;
+        }
+        addr = current->mm->mmap_base;
+        if (do_color_align)
+                addr = COLOUR_ALIGN(addr, pgoff);
+        else
+                addr = PAGE_ALIGN(addr);
+
+        for (vmm = find_vma(current->mm, addr); ; vmm = vmm->vm_next) {
+                /* At this point:  (!vmm || addr < vmm->vm_end). */
+                if (TASK_SIZE - len < addr)
+                        return -ENOMEM;
+                if (!vmm || addr + len <= vmm->vm_start)
+                        return addr;
+                addr = vmm->vm_end;
+                if (do_color_align)
+                        addr = COLOUR_ALIGN(addr, pgoff);
+        }
+}
+
+void arch_pick_mmap_layout(struct mm_struct *mm)
+{
+        unsigned long random_factor = 0UL;
+
+        if (current->flags & PF_RANDOMIZE) {
+                random_factor = get_random_int();
+                random_factor = random_factor << PAGE_SHIFT;
+                if (TASK_IS_32BIT_ADDR)
+                        random_factor &= 0xfffffful;
+                else
+                        random_factor &= 0xffffffful;
+        }
+
+        mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
+        mm->get_unmapped_area = arch_get_unmapped_area;
+        mm->unmap_area = arch_unmap_area;
+}
+
+static inline unsigned long brk_rnd(void)
+{
+        unsigned long rnd = get_random_int();
+
+        rnd = rnd << PAGE_SHIFT;
+        /* 8MB for 32bit, 256MB for 64bit */
+        if (TASK_IS_32BIT_ADDR)
+                rnd = rnd & 0x7ffffful;
+        else
+                rnd = rnd & 0xffffffful;
+
+        return rnd;
+}
+
+unsigned long arch_randomize_brk(struct mm_struct *mm)
+{
+        unsigned long base = mm->brk;
+        unsigned long ret;
+
+        ret = PAGE_ALIGN(base + brk_rnd());
+
+        if (ret < mm->brk)
+                return mm->brk;
+
+        return ret;
+}
diff --git a/arch/mips/mm/sc-ip22.c b/arch/mips/mm/sc-ip22.c
index 13adb5782110..a6bd11fba7bf 100644
--- a/arch/mips/mm/sc-ip22.c
+++ b/arch/mips/mm/sc-ip22.c
@@ -2,7 +2,7 @@
  * sc-ip22.c: Indy cache management functions.
  *
  * Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org),
- * derived from r4xx0.c by David S. Miller (dm@engr.sgi.com).
+ * derived from r4xx0.c by David S. Miller (davem@davemloft.net).
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/arch/mips/mm/sc-r5k.c b/arch/mips/mm/sc-r5k.c
index f330d38e5575..ae1e533a096e 100644
--- a/arch/mips/mm/sc-r5k.c
+++ b/arch/mips/mm/sc-r5k.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1997, 2001 Ralf Baechle (ralf@gnu.org),
- * derived from r4xx0.c by David S. Miller (dm@engr.sgi.com).
+ * derived from r4xx0.c by David S. Miller (davem@davemloft.net).
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/arch/mips/mm/tlb-r3k.c b/arch/mips/mm/tlb-r3k.c
index 0f5ab236ab69..40424affef83 100644
--- a/arch/mips/mm/tlb-r3k.c
+++ b/arch/mips/mm/tlb-r3k.c
@@ -1,7 +1,7 @@
 /*
  * r2300.c: R2000 and R3000 specific mmu/cache code.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  *
  * with a lot of changes to make this thing work for R3000s
  * Tx39XX R4k style caches added. HK
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index c618eed933a1..ba40325caea6 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org
  * Carsten Langgaard, carstenl@mips.com
  * Copyright (C) 2002 MIPS Technologies, Inc.  All rights reserved.
diff --git a/arch/mips/mm/tlb-r8k.c b/arch/mips/mm/tlb-r8k.c
index 2b82f23df1a1..3d95f76c106b 100644
--- a/arch/mips/mm/tlb-r8k.c
+++ b/arch/mips/mm/tlb-r8k.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1997, 1998, 1999, 2000 Ralf Baechle ralf@gnu.org
  * Carsten Langgaard, carstenl@mips.com
  * Copyright (C) 2002 MIPS Technologies, Inc.  All rights reserved.
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index f5734c2c8097..424ed4b92e6d 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -404,6 +404,7 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l,
         case CPU_5KC:
         case CPU_TX49XX:
         case CPU_PR4450:
+        case CPU_XLR:
                 uasm_i_nop(p);
                 tlbw(p);
                 break;
diff --git a/arch/mips/mti-malta/malta-int.c b/arch/mips/mti-malta/malta-int.c
index e85c977328da..1d36c511a7a5 100644
--- a/arch/mips/mti-malta/malta-int.c
+++ b/arch/mips/mti-malta/malta-int.c
@@ -308,6 +308,8 @@ static void ipi_call_dispatch(void)
 
 static irqreturn_t ipi_resched_interrupt(int irq, void *dev_id)
 {
+        scheduler_ipi();
+
         return IRQ_HANDLED;
 }
 
diff --git a/arch/mips/netlogic/Kconfig b/arch/mips/netlogic/Kconfig
new file mode 100644
index 000000000000..a5ca743613f2
--- /dev/null
+++ b/arch/mips/netlogic/Kconfig
@@ -0,0 +1,5 @@
+config NLM_COMMON
+        bool
+
+config NLM_XLR
+        bool
diff --git a/arch/mips/netlogic/xlr/Makefile b/arch/mips/netlogic/xlr/Makefile
new file mode 100644
index 000000000000..9bd3f731f62e
--- /dev/null
+++ b/arch/mips/netlogic/xlr/Makefile
@@ -0,0 +1,5 @@
+obj-y                           += setup.o platform.o irq.o setup.o time.o
+obj-$(CONFIG_SMP)               += smp.o smpboot.o
+obj-$(CONFIG_EARLY_PRINTK)      += xlr_console.o
+
+EXTRA_CFLAGS                    += -Werror
diff --git a/arch/mips/netlogic/xlr/irq.c b/arch/mips/netlogic/xlr/irq.c
new file mode 100644
index 000000000000..1446d58e364c
--- /dev/null
+++ b/arch/mips/netlogic/xlr/irq.c
@@ -0,0 +1,300 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/linkage.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/mm.h>
+
+#include <asm/mipsregs.h>
+
+#include <asm/netlogic/xlr/iomap.h>
+#include <asm/netlogic/xlr/pic.h>
+#include <asm/netlogic/xlr/xlr.h>
+
+#include <asm/netlogic/interrupt.h>
+#include <asm/netlogic/mips-extns.h>
+
+static u64 nlm_irq_mask;
+static DEFINE_SPINLOCK(nlm_pic_lock);
+
+static void xlr_pic_enable(struct irq_data *d)
+{
+        nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);
+        unsigned long flags;
+        nlm_reg_t reg;
+        int irq = d->irq;
+
+        WARN(!PIC_IRQ_IS_IRT(irq), "Bad irq %d", irq);
+
+        spin_lock_irqsave(&nlm_pic_lock, flags);
+        reg = netlogic_read_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE);
+        netlogic_write_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE,
+                          reg | (1 << 6) | (1 << 30) | (1 << 31));
+        spin_unlock_irqrestore(&nlm_pic_lock, flags);
+}
+
+static void xlr_pic_mask(struct irq_data *d)
+{
+        nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);
+        unsigned long flags;
+        nlm_reg_t reg;
+        int irq = d->irq;
+
+        WARN(!PIC_IRQ_IS_IRT(irq), "Bad irq %d", irq);
+
+        spin_lock_irqsave(&nlm_pic_lock, flags);
+        reg = netlogic_read_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE);
+        netlogic_write_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE,
+                          reg | (1 << 6) | (1 << 30) | (0 << 31));
+        spin_unlock_irqrestore(&nlm_pic_lock, flags);
+}
+
+#ifdef CONFIG_PCI
+/* Extra ACK needed for XLR on chip PCI controller */
+static void xlr_pci_ack(struct irq_data *d)
+{
+        nlm_reg_t *pci_mmio = netlogic_io_mmio(NETLOGIC_IO_PCIX_OFFSET);
+
+        netlogic_read_reg(pci_mmio, (0x140 >> 2));
+}
+
+/* Extra ACK needed for XLS on chip PCIe controller */
+static void xls_pcie_ack(struct irq_data *d)
+{
+        nlm_reg_t *pcie_mmio_le = netlogic_io_mmio(NETLOGIC_IO_PCIE_1_OFFSET);
+
+        switch (d->irq) {
+        case PIC_PCIE_LINK0_IRQ:
+                netlogic_write_reg(pcie_mmio_le, (0x90 >> 2), 0xffffffff);
+                break;
+        case PIC_PCIE_LINK1_IRQ:
+                netlogic_write_reg(pcie_mmio_le, (0x94 >> 2), 0xffffffff);
+                break;
+        case PIC_PCIE_LINK2_IRQ:
+                netlogic_write_reg(pcie_mmio_le, (0x190 >> 2), 0xffffffff);
+                break;
+        case PIC_PCIE_LINK3_IRQ:
+                netlogic_write_reg(pcie_mmio_le, (0x194 >> 2), 0xffffffff);
+                break;
+        }
+}
+
+/* For XLS B silicon, the 3,4 PCI interrupts are different */
+static void xls_pcie_ack_b(struct irq_data *d)
+{
+        nlm_reg_t *pcie_mmio_le = netlogic_io_mmio(NETLOGIC_IO_PCIE_1_OFFSET);
+
+        switch (d->irq) {
+        case PIC_PCIE_LINK0_IRQ:
+                netlogic_write_reg(pcie_mmio_le, (0x90 >> 2), 0xffffffff);
+                break;
+        case PIC_PCIE_LINK1_IRQ:
+                netlogic_write_reg(pcie_mmio_le, (0x94 >> 2), 0xffffffff);
+                break;
+        case PIC_PCIE_XLSB0_LINK2_IRQ:
+                netlogic_write_reg(pcie_mmio_le, (0x190 >> 2), 0xffffffff);
+                break;
+        case PIC_PCIE_XLSB0_LINK3_IRQ:
+                netlogic_write_reg(pcie_mmio_le, (0x194 >> 2), 0xffffffff);
+                break;
+        }
+}
+#endif
+
+static void xlr_pic_ack(struct irq_data *d)
+{
+        unsigned long flags;
+        nlm_reg_t *mmio;
+        int irq = d->irq;
+        void *hd = irq_data_get_irq_handler_data(d);
+
+        WARN(!PIC_IRQ_IS_IRT(irq), "Bad irq %d", irq);
+
+        if (hd) {
+                void (*extra_ack)(void *) = hd;
+                extra_ack(d);
+        }
+        mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);
+        spin_lock_irqsave(&nlm_pic_lock, flags);
+        netlogic_write_reg(mmio, PIC_INT_ACK, (1 << (irq - PIC_IRQ_BASE)));
+        spin_unlock_irqrestore(&nlm_pic_lock, flags);
+}
+
+/*
+ * This chip definition handles interrupts routed thru the XLR
+ * hardware PIC, currently IRQs 8-39 are mapped to hardware intr
+ * 0-31 wired the XLR PIC
+ */
+static struct irq_chip xlr_pic = {
+        .name           = "XLR-PIC",
+        .irq_enable     = xlr_pic_enable,
+        .irq_mask       = xlr_pic_mask,
+        .irq_ack        = xlr_pic_ack,
+};
+
+static void rsvd_irq_handler(struct irq_data *d)
+{
+        WARN(d->irq >= PIC_IRQ_BASE, "Bad irq %d", d->irq);
+}
+
+/*
+ * Chip definition for CPU originated interrupts(timer, msg) and
+ * IPIs
+ */
+struct irq_chip nlm_cpu_intr = {
+        .name           = "XLR-CPU-INTR",
+        .irq_enable     = rsvd_irq_handler,
+        .irq_mask       = rsvd_irq_handler,
+        .irq_ack        = rsvd_irq_handler,
+};
+
+void __init init_xlr_irqs(void)
+{
+        nlm_reg_t *mmio = netlogic_io_mmio(NETLOGIC_IO_PIC_OFFSET);
+        uint32_t thread_mask = 1;
+        int level, i;
+
+        pr_info("Interrupt thread mask [%x]\n", thread_mask);
+        for (i = 0; i < PIC_NUM_IRTS; i++) {
+                level = PIC_IRQ_IS_EDGE_TRIGGERED(i);
+
+                /* Bind all PIC irqs to boot cpu */
+                netlogic_write_reg(mmio, PIC_IRT_0_BASE + i, thread_mask);
+
+                /*
+                 * Use local scheduling and high polarity for all IRTs
+                 * Invalidate all IRTs, by default
+                 */
+                netlogic_write_reg(mmio, PIC_IRT_1_BASE + i,
+                                (level << 30) | (1 << 6) | (PIC_IRQ_BASE + i));
+        }
+
+        /* Make all IRQs as level triggered by default */
+        for (i = 0; i < NR_IRQS; i++) {
+                if (PIC_IRQ_IS_IRT(i))
+                        irq_set_chip_and_handler(i, &xlr_pic, handle_level_irq);
+                else
+                        irq_set_chip_and_handler(i, &nlm_cpu_intr,
+                                                handle_level_irq);
+        }
+#ifdef CONFIG_SMP
+        irq_set_chip_and_handler(IRQ_IPI_SMP_FUNCTION, &nlm_cpu_intr,
+                         nlm_smp_function_ipi_handler);
+        irq_set_chip_and_handler(IRQ_IPI_SMP_RESCHEDULE, &nlm_cpu_intr,
+                         nlm_smp_resched_ipi_handler);
+        nlm_irq_mask |=
+            ((1ULL << IRQ_IPI_SMP_FUNCTION) | (1ULL << IRQ_IPI_SMP_RESCHEDULE));
+#endif
+
+#ifdef CONFIG_PCI
+        /*
+         * For PCI interrupts, we need to ack the PIC controller too, overload
+         * irq handler data to do this
+         */
+        if (nlm_chip_is_xls()) {
+                if (nlm_chip_is_xls_b()) {
+                        irq_set_handler_data(PIC_PCIE_LINK0_IRQ,
+                                                        xls_pcie_ack_b);
+                        irq_set_handler_data(PIC_PCIE_LINK1_IRQ,
+                                                        xls_pcie_ack_b);
+                        irq_set_handler_data(PIC_PCIE_XLSB0_LINK2_IRQ,
+                                                        xls_pcie_ack_b);
+                        irq_set_handler_data(PIC_PCIE_XLSB0_LINK3_IRQ,
+                                                        xls_pcie_ack_b);
+                } else {
+                        irq_set_handler_data(PIC_PCIE_LINK0_IRQ, xls_pcie_ack);
+                        irq_set_handler_data(PIC_PCIE_LINK1_IRQ, xls_pcie_ack);
+                        irq_set_handler_data(PIC_PCIE_LINK2_IRQ, xls_pcie_ack);
+                        irq_set_handler_data(PIC_PCIE_LINK3_IRQ, xls_pcie_ack);
+                }
+        } else {
+                /* XLR PCI controller ACK */
+                irq_set_handler_data(PIC_PCIE_XLSB0_LINK3_IRQ, xlr_pci_ack);
+        }
+#endif
+        /* unmask all PIC related interrupts. If no handler is installed by the
+         * drivers, it'll just ack the interrupt and return
+         */
+        for (i = PIC_IRT_FIRST_IRQ; i <= PIC_IRT_LAST_IRQ; i++)
+                nlm_irq_mask |= (1ULL << i);
+
+        nlm_irq_mask |= (1ULL << IRQ_TIMER);
+}
+
+void __init arch_init_irq(void)
+{
+        /* Initialize the irq descriptors */
+        init_xlr_irqs();
+        write_c0_eimr(nlm_irq_mask);
+}
+
+void __cpuinit nlm_smp_irq_init(void)
+{
+        /* set interrupt mask for non-zero cpus */
+        write_c0_eimr(nlm_irq_mask);
+}
+
+asmlinkage void plat_irq_dispatch(void)
+{
+        uint64_t eirr;
+        int i;
+
+        eirr = read_c0_eirr() & read_c0_eimr();
+        if (!eirr)
+                return;
+
+        /* no need of EIRR here, writing compare clears interrupt */
+        if (eirr & (1 << IRQ_TIMER)) {
+                do_IRQ(IRQ_TIMER);
+                return;
+        }
+
+        /* use dcltz: optimize below code */
+        for (i = 63; i != -1; i--) {
+                if (eirr & (1ULL << i))
+                        break;
+        }
+        if (i == -1) {
+                pr_err("no interrupt !!\n");
+                return;
+        }
+
+        /* Ack eirr */
+        write_c0_eirr(1ULL << i);
+
+        do_IRQ(i);
+}
diff --git a/arch/mips/netlogic/xlr/platform.c b/arch/mips/netlogic/xlr/platform.c
new file mode 100644
index 000000000000..609ec2534642
--- /dev/null
+++ b/arch/mips/netlogic/xlr/platform.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2011, Netlogic Microsystems.
+ * Copyright 2004, Matt Porter <mporter@kernel.crashing.org>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/resource.h>
+#include <linux/serial_8250.h>
+#include <linux/serial_reg.h>
+
+#include <asm/netlogic/xlr/iomap.h>
+#include <asm/netlogic/xlr/pic.h>
+#include <asm/netlogic/xlr/xlr.h>
+
+unsigned int nlm_xlr_uart_in(struct uart_port *p, int offset)
+{
+        nlm_reg_t *mmio;
+        unsigned int value;
+
+        /* XLR uart does not need any mapping of regs */
+        mmio = (nlm_reg_t *)(p->membase + (offset << p->regshift));
+        value = netlogic_read_reg(mmio, 0);
+
+        /* See XLR/XLS errata */
+        if (offset == UART_MSR)
+                value ^= 0xF0;
+        else if (offset == UART_MCR)
+                value ^= 0x3;
+
+        return value;
+}
+
+void nlm_xlr_uart_out(struct uart_port *p, int offset, int value)
+{
+        nlm_reg_t *mmio;
+
+        /* XLR uart does not need any mapping of regs */
+        mmio = (nlm_reg_t *)(p->membase + (offset << p->regshift));
+
+        /* See XLR/XLS errata */
+        if (offset == UART_MSR)
+                value ^= 0xF0;
+        else if (offset == UART_MCR)
+                value ^= 0x3;
+
+        netlogic_write_reg(mmio, 0, value);
+}
+
+#define PORT(_irq)                                      \
+        {                                               \
+                .irq            = _irq,                 \
+                .regshift       = 2,                    \
+                .iotype         = UPIO_MEM32,           \
+                .flags          = (UPF_SKIP_TEST |      \
+                         UPF_FIXED_TYPE | UPF_BOOT_AUTOCONF),\
+                .uartclk        = PIC_CLKS_PER_SEC,     \
+                .type           = PORT_16550A,          \
+                .serial_in      = nlm_xlr_uart_in,      \
+                .serial_out     = nlm_xlr_uart_out,     \
+        }
+
+static struct plat_serial8250_port xlr_uart_data[] = {
+        PORT(PIC_UART_0_IRQ),
+        PORT(PIC_UART_1_IRQ),
+        {},
+};
+
+static struct platform_device uart_device = {
+        .name           = "serial8250",
+        .id             = PLAT8250_DEV_PLATFORM,
+        .dev = {
+                .platform_data = xlr_uart_data,
+        },
+};
+
+static int __init nlm_uart_init(void)
+{
+        nlm_reg_t *mmio;
+
+        mmio = netlogic_io_mmio(NETLOGIC_IO_UART_0_OFFSET);
+        xlr_uart_data[0].membase = (void __iomem *)mmio;
+        xlr_uart_data[0].mapbase = CPHYSADDR((unsigned long)mmio);
+
+        mmio = netlogic_io_mmio(NETLOGIC_IO_UART_1_OFFSET);
+        xlr_uart_data[1].membase = (void __iomem *)mmio;
+        xlr_uart_data[1].mapbase = CPHYSADDR((unsigned long)mmio);
+
+        return platform_device_register(&uart_device);
+}
+
+arch_initcall(nlm_uart_init);
diff --git a/arch/mips/netlogic/xlr/setup.c b/arch/mips/netlogic/xlr/setup.c
new file mode 100644
index 000000000000..482802569e74
--- /dev/null
+++ b/arch/mips/netlogic/xlr/setup.c
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/serial_8250.h>
+#include <linux/pm.h>
+
+#include <asm/reboot.h>
+#include <asm/time.h>
+#include <asm/bootinfo.h>
+#include <asm/smp-ops.h>
+
+#include <asm/netlogic/interrupt.h>
+#include <asm/netlogic/psb-bootinfo.h>
+
+#include <asm/netlogic/xlr/xlr.h>
+#include <asm/netlogic/xlr/iomap.h>
+#include <asm/netlogic/xlr/pic.h>
+#include <asm/netlogic/xlr/gpio.h>
+
+unsigned long netlogic_io_base = (unsigned long)(DEFAULT_NETLOGIC_IO_BASE);
+unsigned long nlm_common_ebase = 0x0;
+struct psb_info nlm_prom_info;
+
+static void nlm_early_serial_setup(void)
+{
+        struct uart_port s;
+        nlm_reg_t *uart_base;
+
+        uart_base = netlogic_io_mmio(NETLOGIC_IO_UART_0_OFFSET);
+        memset(&s, 0, sizeof(s));
+        s.flags         = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST;
+        s.iotype        = UPIO_MEM32;
+        s.regshift      = 2;
+        s.irq           = PIC_UART_0_IRQ;
+        s.uartclk       = PIC_CLKS_PER_SEC;
+        s.serial_in     = nlm_xlr_uart_in;
+        s.serial_out    = nlm_xlr_uart_out;
+        s.mapbase       = (unsigned long)uart_base;
+        s.membase       = (unsigned char __iomem *)uart_base;
+        early_serial_setup(&s);
+}
+
+static void nlm_linux_exit(void)
+{
+        nlm_reg_t *mmio;
+
+        mmio = netlogic_io_mmio(NETLOGIC_IO_GPIO_OFFSET);
+        /* trigger a chip reset by writing 1 to GPIO_SWRESET_REG */
+        netlogic_write_reg(mmio, NETLOGIC_GPIO_SWRESET_REG, 1);
+        for ( ; ; )
+                cpu_wait();
+}
+
+void __init plat_mem_setup(void)
+{
+        panic_timeout   = 5;
+        _machine_restart = (void (*)(char *))nlm_linux_exit;
+        _machine_halt   = nlm_linux_exit;
+        pm_power_off    = nlm_linux_exit;
+}
+
+const char *get_system_type(void)
+{
+        return "Netlogic XLR/XLS Series";
+}
+
+void __init prom_free_prom_memory(void)
+{
+        /* Nothing yet */
+}
+
+static void build_arcs_cmdline(int *argv)
+{
+        int i, remain, len;
+        char *arg;
+
+        remain = sizeof(arcs_cmdline) - 1;
+        arcs_cmdline[0] = '\0';
+        for (i = 0; argv[i] != 0; i++) {
+                arg = (char *)(long)argv[i];
+                len = strlen(arg);
+                if (len + 1 > remain)
+                        break;
+                strcat(arcs_cmdline, arg);
+                strcat(arcs_cmdline, " ");
+                remain -=  len + 1;
+        }
+
+        /* Add the default options here */
+        if ((strstr(arcs_cmdline, "console=")) == NULL) {
+                arg = "console=ttyS0,38400 ";
+                len = strlen(arg);
+                if (len > remain)
+                        goto fail;
+                strcat(arcs_cmdline, arg);
+                remain -= len;
+        }
+#ifdef CONFIG_BLK_DEV_INITRD
+        if ((strstr(arcs_cmdline, "rdinit=")) == NULL) {
+                arg = "rdinit=/sbin/init ";
+                len = strlen(arg);
+                if (len > remain)
+                        goto fail;
+                strcat(arcs_cmdline, arg);
+                remain -= len;
+        }
+#endif
+        return;
+fail:
+        panic("Cannot add %s, command line too big!", arg);
+}
+
+static void prom_add_memory(void)
+{
+        struct nlm_boot_mem_map *bootm;
+        u64 start, size;
+        u64 pref_backup = 512;  /* avoid pref walking beyond end */
+        int i;
+
+        bootm = (void *)(long)nlm_prom_info.psb_mem_map;
+        for (i = 0; i < bootm->nr_map; i++) {
+                if (bootm->map[i].type != BOOT_MEM_RAM)
+                        continue;
+                start = bootm->map[i].addr;
+                size   = bootm->map[i].size;
+
+                /* Work around for using bootloader mem */
+                if (i == 0 && start == 0 && size == 0x0c000000)
+                        size = 0x0ff00000;
+
+                add_memory_region(start, size - pref_backup, BOOT_MEM_RAM);
+        }
+}
+
+void __init prom_init(void)
+{
+        int *argv, *envp;               /* passed as 32 bit ptrs */
+        struct psb_info *prom_infop;
+
+        /* truncate to 32 bit and sign extend all args */
+        argv = (int *)(long)(int)fw_arg1;
+        envp = (int *)(long)(int)fw_arg2;
+        prom_infop = (struct psb_info *)(long)(int)fw_arg3;
+
+        nlm_prom_info = *prom_infop;
+
+        nlm_early_serial_setup();
+        build_arcs_cmdline(argv);
+        nlm_common_ebase = read_c0_ebase() & (~((1 << 12) - 1));
+        prom_add_memory();
+
+#ifdef CONFIG_SMP
+        nlm_wakeup_secondary_cpus(nlm_prom_info.online_cpu_map);
+        register_smp_ops(&nlm_smp_ops);
+#endif
+}
diff --git a/arch/mips/netlogic/xlr/smp.c b/arch/mips/netlogic/xlr/smp.c
new file mode 100644
index 000000000000..b495a7f1433b
--- /dev/null
+++ b/arch/mips/netlogic/xlr/smp.c
@@ -0,0 +1,225 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/smp.h>
+#include <linux/irq.h>
+
+#include <asm/mmu_context.h>
+
+#include <asm/netlogic/interrupt.h>
+#include <asm/netlogic/mips-extns.h>
+
+#include <asm/netlogic/xlr/iomap.h>
+#include <asm/netlogic/xlr/pic.h>
+#include <asm/netlogic/xlr/xlr.h>
+
+void core_send_ipi(int logical_cpu, unsigned int action)
+{
+        int cpu = cpu_logical_map(logical_cpu);
+        u32 tid = cpu & 0x3;
+        u32 pid = (cpu >> 2) & 0x07;
+        u32 ipi = (tid << 16) | (pid << 20);
+
+        if (action & SMP_CALL_FUNCTION)
+                ipi |= IRQ_IPI_SMP_FUNCTION;
+        else if (action & SMP_RESCHEDULE_YOURSELF)
+                ipi |= IRQ_IPI_SMP_RESCHEDULE;
+        else
+                return;
+
+        pic_send_ipi(ipi);
+}
+
+void nlm_send_ipi_single(int cpu, unsigned int action)
+{
+        core_send_ipi(cpu, action);
+}
+
+void nlm_send_ipi_mask(const struct cpumask *mask, unsigned int action)
+{
+        int cpu;
+
+        for_each_cpu(cpu, mask) {
+                core_send_ipi(cpu, action);
+        }
+}
+
+/* IRQ_IPI_SMP_FUNCTION Handler */
+void nlm_smp_function_ipi_handler(unsigned int irq, struct irq_desc *desc)
+{
+        smp_call_function_interrupt();
+}
+
+/* IRQ_IPI_SMP_RESCHEDULE  handler */
+void nlm_smp_resched_ipi_handler(unsigned int irq, struct irq_desc *desc)
+{
+        set_need_resched();
+}
+
+void nlm_common_ipi_handler(int irq, struct pt_regs *regs)
+{
+        if (irq == IRQ_IPI_SMP_FUNCTION) {
+                smp_call_function_interrupt();
+        } else {
+                /* Announce that we are for reschduling */
+                set_need_resched();
+        }
+}
+
+/*
+ * Called before going into mips code, early cpu init
+ */
+void nlm_early_init_secondary(void)
+{
+        write_c0_ebase((uint32_t)nlm_common_ebase);
+        /* TLB partition here later */
+}
+
+/*
+ * Code to run on secondary just after probing the CPU
+ */
+static void __cpuinit nlm_init_secondary(void)
+{
+        nlm_smp_irq_init();
+}
+
+void nlm_smp_finish(void)
+{
+#ifdef notyet
+        nlm_common_msgring_cpu_init();
+#endif
+}
+
+void nlm_cpus_done(void)
+{
+}
+
+/*
+ * Boot all other cpus in the system, initialize them, and bring them into
+ * the boot function
+ */
+int nlm_cpu_unblock[NR_CPUS];
+int nlm_cpu_ready[NR_CPUS];
+unsigned long nlm_next_gp;
+unsigned long nlm_next_sp;
+cpumask_t phys_cpu_present_map;
+
+void nlm_boot_secondary(int logical_cpu, struct task_struct *idle)
+{
+        unsigned long gp = (unsigned long)task_thread_info(idle);
+        unsigned long sp = (unsigned long)__KSTK_TOS(idle);
+        int cpu = cpu_logical_map(logical_cpu);
+
+        nlm_next_sp = sp;
+        nlm_next_gp = gp;
+
+        /* barrier */
+        __sync();
+        nlm_cpu_unblock[cpu] = 1;
+}
+
+void __init nlm_smp_setup(void)
+{
+        unsigned int boot_cpu;
+        int num_cpus, i;
+
+        boot_cpu = hard_smp_processor_id();
+        cpus_clear(phys_cpu_present_map);
+
+        cpu_set(boot_cpu, phys_cpu_present_map);
+        __cpu_number_map[boot_cpu] = 0;
+        __cpu_logical_map[0] = boot_cpu;
+        cpu_set(0, cpu_possible_map);
+
+        num_cpus = 1;
+        for (i = 0; i < NR_CPUS; i++) {
+                if (nlm_cpu_ready[i]) {
+                        cpu_set(i, phys_cpu_present_map);
+                        __cpu_number_map[i] = num_cpus;
+                        __cpu_logical_map[num_cpus] = i;
+                        cpu_set(num_cpus, cpu_possible_map);
+                        ++num_cpus;
+                }
+        }
+
+        pr_info("Phys CPU present map: %lx, possible map %lx\n",
+                (unsigned long)phys_cpu_present_map.bits[0],
+                (unsigned long)cpu_possible_map.bits[0]);
+
+        pr_info("Detected %i Slave CPU(s)\n", num_cpus);
+}
+
+void nlm_prepare_cpus(unsigned int max_cpus)
+{
+}
+
+struct plat_smp_ops nlm_smp_ops = {
+        .send_ipi_single        = nlm_send_ipi_single,
+        .send_ipi_mask          = nlm_send_ipi_mask,
+        .init_secondary         = nlm_init_secondary,
+        .smp_finish             = nlm_smp_finish,
+        .cpus_done              = nlm_cpus_done,
+        .boot_secondary         = nlm_boot_secondary,
+        .smp_setup              = nlm_smp_setup,
+        .prepare_cpus           = nlm_prepare_cpus,
+};
+
+unsigned long secondary_entry_point;
+
+int nlm_wakeup_secondary_cpus(u32 wakeup_mask)
+{
+        unsigned int tid, pid, ipi, i, boot_cpu;
+        void *reset_vec;
+
+        secondary_entry_point = (unsigned long)prom_pre_boot_secondary_cpus;
+        reset_vec = (void *)CKSEG1ADDR(0x1fc00000);
+        memcpy(reset_vec, nlm_boot_smp_nmi, 0x80);
+        boot_cpu = hard_smp_processor_id();
+
+        for (i = 0; i < NR_CPUS; i++) {
+                if (i == boot_cpu)
+                        continue;
+                if (wakeup_mask & (1u << i)) {
+                        tid = i & 0x3;
+                        pid = (i >> 2) & 0x7;
+                        ipi = (tid << 16) | (pid << 20) | (1 << 8);
+                        pic_send_ipi(ipi);
+                }
+        }
+
+        return 0;
+}
diff --git a/arch/mips/netlogic/xlr/smpboot.S b/arch/mips/netlogic/xlr/smpboot.S
new file mode 100644
index 000000000000..b8e074402c99
--- /dev/null
+++ b/arch/mips/netlogic/xlr/smpboot.S
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <asm/asm.h>
+#include <asm/asm-offsets.h>
+#include <asm/regdef.h>
+#include <asm/mipsregs.h>
+
+
+/* Don't jump to linux function from Bootloader stack. Change it
+ * here. Kernel might allocate bootloader memory before all the CPUs are
+ * brought up (eg: Inode cache region) and we better don't overwrite this
+ * memory
+ */
+NESTED(prom_pre_boot_secondary_cpus, 16, sp)
+        .set    mips64
+        mfc0    t0, $15, 1      # read ebase
+        andi    t0, 0x1f        # t0 has the processor_id()
+        sll     t0, 2           # offset in cpu array
+
+        PTR_LA  t1, nlm_cpu_ready # mark CPU ready
+        PTR_ADDU t1, t0
+        li      t2, 1
+        sw      t2, 0(t1)
+
+        PTR_LA  t1, nlm_cpu_unblock
+        PTR_ADDU t1, t0
+1:      lw      t2, 0(t1)       # wait till unblocked
+        beqz    t2, 1b
+        nop
+
+        PTR_LA  t1, nlm_next_sp
+        PTR_L   sp, 0(t1)
+        PTR_LA  t1, nlm_next_gp
+        PTR_L   gp, 0(t1)
+
+        PTR_LA  t0, nlm_early_init_secondary
+        jalr    t0
+        nop
+
+        PTR_LA  t0, smp_bootstrap
+        jr      t0
+        nop
+END(prom_pre_boot_secondary_cpus)
+
+NESTED(nlm_boot_smp_nmi, 0, sp)
+        .set push
+        .set noat
+        .set mips64
+        .set noreorder
+
+        /* Clear the  NMI and BEV bits */
+        MFC0    k0, CP0_STATUS
+        li      k1, 0xffb7ffff
+        and     k0, k0, k1
+        MTC0    k0, CP0_STATUS
+
+        PTR_LA  k1, secondary_entry_point
+        PTR_L   k0, 0(k1)
+        jr      k0
+        nop
+        .set pop
+END(nlm_boot_smp_nmi)
diff --git a/arch/mips/netlogic/xlr/time.c b/arch/mips/netlogic/xlr/time.c
new file mode 100644
index 000000000000..0d81b262593c
--- /dev/null
+++ b/arch/mips/netlogic/xlr/time.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/init.h>
+
+#include <asm/time.h>
+#include <asm/netlogic/interrupt.h>
+#include <asm/netlogic/psb-bootinfo.h>
+
+unsigned int __cpuinit get_c0_compare_int(void)
+{
+        return IRQ_TIMER;
+}
+
+void __init plat_time_init(void)
+{
+        mips_hpt_frequency = nlm_prom_info.cpu_frequency;
+        pr_info("MIPS counter frequency [%ld]\n",
+                (unsigned long)mips_hpt_frequency);
+}
diff --git a/arch/mips/netlogic/xlr/xlr_console.c b/arch/mips/netlogic/xlr/xlr_console.c
new file mode 100644
index 000000000000..759df0692201
--- /dev/null
+++ b/arch/mips/netlogic/xlr/xlr_console.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/types.h>
+#include <asm/netlogic/xlr/iomap.h>
+
+void prom_putchar(char c)
+{
+        nlm_reg_t *mmio;
+
+        mmio = netlogic_io_mmio(NETLOGIC_IO_UART_0_OFFSET);
+        while (netlogic_read_reg(mmio, 0x5) == 0)
+                ;
+        netlogic_write_reg(mmio, 0x0, c);
+}
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index c9209ca6c8e7..4df879937446 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_SIBYTE_SB1250)	+= fixup-sb1250.o pci-sb1250.o
 obj-$(CONFIG_SIBYTE_BCM112X)    += fixup-sb1250.o pci-sb1250.o
 obj-$(CONFIG_SIBYTE_BCM1x80)    += pci-bcm1480.o pci-bcm1480ht.o
 obj-$(CONFIG_SNI_RM)            += fixup-sni.o ops-sni.o
+obj-$(CONFIG_SOC_XWAY)          += pci-lantiq.o ops-lantiq.o
 obj-$(CONFIG_TANBAC_TB0219)     += fixup-tb0219.o
 obj-$(CONFIG_TANBAC_TB0226)     += fixup-tb0226.o
 obj-$(CONFIG_TANBAC_TB0287)     += fixup-tb0287.o
@@ -55,6 +56,7 @@ obj-$(CONFIG_ZAO_CAPCELLA)	+= fixup-capcella.o
 obj-$(CONFIG_WR_PPMC)           += fixup-wrppmc.o
 obj-$(CONFIG_MIKROTIK_RB532)    += pci-rc32434.o ops-rc32434.o fixup-rc32434.o
 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += pci-octeon.o pcie-octeon.o
+obj-$(CONFIG_NLM_XLR)           += pci-xlr.o
 
 ifdef CONFIG_PCI_MSI
 obj-$(CONFIG_CPU_CAVIUM_OCTEON) += msi-octeon.o
diff --git a/arch/mips/pci/ops-lantiq.c b/arch/mips/pci/ops-lantiq.c
new file mode 100644
index 000000000000..1f2afb55cc71
--- /dev/null
+++ b/arch/mips/pci/ops-lantiq.c
@@ -0,0 +1,116 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <asm/addrspace.h>
+#include <linux/vmalloc.h>
+
+#include <lantiq_soc.h>
+
+#include "pci-lantiq.h"
+
+#define LTQ_PCI_CFG_BUSNUM_SHF 16
+#define LTQ_PCI_CFG_DEVNUM_SHF 11
+#define LTQ_PCI_CFG_FUNNUM_SHF 8
+
+#define PCI_ACCESS_READ  0
+#define PCI_ACCESS_WRITE 1
+
+static int ltq_pci_config_access(unsigned char access_type, struct pci_bus *bus,
+        unsigned int devfn, unsigned int where, u32 *data)
+{
+        unsigned long cfg_base;
+        unsigned long flags;
+        u32 temp;
+
+        /* we support slot from 0 to 15 dev_fn & 0x68 (AD29) is the
+           SoC itself */
+        if ((bus->number != 0) || ((devfn & 0xf8) > 0x78)
+                || ((devfn & 0xf8) == 0) || ((devfn & 0xf8) == 0x68))
+                return 1;
+
+        spin_lock_irqsave(&ebu_lock, flags);
+
+        cfg_base = (unsigned long) ltq_pci_mapped_cfg;
+        cfg_base |= (bus->number << LTQ_PCI_CFG_BUSNUM_SHF) | (devfn <<
+                        LTQ_PCI_CFG_FUNNUM_SHF) | (where & ~0x3);
+
+        /* Perform access */
+        if (access_type == PCI_ACCESS_WRITE) {
+                ltq_w32(swab32(*data), ((u32 *)cfg_base));
+        } else {
+                *data = ltq_r32(((u32 *)(cfg_base)));
+                *data = swab32(*data);
+        }
+        wmb();
+
+        /* clean possible Master abort */
+        cfg_base = (unsigned long) ltq_pci_mapped_cfg;
+        cfg_base |= (0x0 << LTQ_PCI_CFG_FUNNUM_SHF) + 4;
+        temp = ltq_r32(((u32 *)(cfg_base)));
+        temp = swab32(temp);
+        cfg_base = (unsigned long) ltq_pci_mapped_cfg;
+        cfg_base |= (0x68 << LTQ_PCI_CFG_FUNNUM_SHF) + 4;
+        ltq_w32(temp, ((u32 *)cfg_base));
+
+        spin_unlock_irqrestore(&ebu_lock, flags);
+
+        if (((*data) == 0xffffffff) && (access_type == PCI_ACCESS_READ))
+                return 1;
+
+        return 0;
+}
+
+int ltq_pci_read_config_dword(struct pci_bus *bus, unsigned int devfn,
+        int where, int size, u32 *val)
+{
+        u32 data = 0;
+
+        if (ltq_pci_config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
+                return PCIBIOS_DEVICE_NOT_FOUND;
+
+        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;
+}
+
+int ltq_pci_write_config_dword(struct pci_bus *bus, unsigned int devfn,
+        int where, int size, u32 val)
+{
+        u32 data = 0;
+
+        if (size == 4) {
+                data = val;
+        } else {
+                if (ltq_pci_config_access(PCI_ACCESS_READ, bus,
+                                devfn, where, &data))
+                        return PCIBIOS_DEVICE_NOT_FOUND;
+
+                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));
+        }
+
+        if (ltq_pci_config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
+                return PCIBIOS_DEVICE_NOT_FOUND;
+
+        return PCIBIOS_SUCCESSFUL;
+}
diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c
new file mode 100644
index 000000000000..603d7493e966
--- /dev/null
+++ b/arch/mips/pci/pci-lantiq.c
@@ -0,0 +1,297 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/mm.h>
+#include <linux/vmalloc.h>
+#include <linux/platform_device.h>
+
+#include <asm/pci.h>
+#include <asm/gpio.h>
+#include <asm/addrspace.h>
+
+#include <lantiq_soc.h>
+#include <lantiq_irq.h>
+#include <lantiq_platform.h>
+
+#include "pci-lantiq.h"
+
+#define LTQ_PCI_CFG_BASE                0x17000000
+#define LTQ_PCI_CFG_SIZE                0x00008000
+#define LTQ_PCI_MEM_BASE                0x18000000
+#define LTQ_PCI_MEM_SIZE                0x02000000
+#define LTQ_PCI_IO_BASE                 0x1AE00000
+#define LTQ_PCI_IO_SIZE                 0x00200000
+
+#define PCI_CR_FCI_ADDR_MAP0            0x00C0
+#define PCI_CR_FCI_ADDR_MAP1            0x00C4
+#define PCI_CR_FCI_ADDR_MAP2            0x00C8
+#define PCI_CR_FCI_ADDR_MAP3            0x00CC
+#define PCI_CR_FCI_ADDR_MAP4            0x00D0
+#define PCI_CR_FCI_ADDR_MAP5            0x00D4
+#define PCI_CR_FCI_ADDR_MAP6            0x00D8
+#define PCI_CR_FCI_ADDR_MAP7            0x00DC
+#define PCI_CR_CLK_CTRL                 0x0000
+#define PCI_CR_PCI_MOD                  0x0030
+#define PCI_CR_PC_ARB                   0x0080
+#define PCI_CR_FCI_ADDR_MAP11hg         0x00E4
+#define PCI_CR_BAR11MASK                0x0044
+#define PCI_CR_BAR12MASK                0x0048
+#define PCI_CR_BAR13MASK                0x004C
+#define PCI_CS_BASE_ADDR1               0x0010
+#define PCI_CR_PCI_ADDR_MAP11           0x0064
+#define PCI_CR_FCI_BURST_LENGTH         0x00E8
+#define PCI_CR_PCI_EOI                  0x002C
+#define PCI_CS_STS_CMD                  0x0004
+
+#define PCI_MASTER0_REQ_MASK_2BITS      8
+#define PCI_MASTER1_REQ_MASK_2BITS      10
+#define PCI_MASTER2_REQ_MASK_2BITS      12
+#define INTERNAL_ARB_ENABLE_BIT         0
+
+#define LTQ_CGU_IFCCR           0x0018
+#define LTQ_CGU_PCICR           0x0034
+
+#define ltq_pci_w32(x, y)       ltq_w32((x), ltq_pci_membase + (y))
+#define ltq_pci_r32(x)          ltq_r32(ltq_pci_membase + (x))
+
+#define ltq_pci_cfg_w32(x, y)   ltq_w32((x), ltq_pci_mapped_cfg + (y))
+#define ltq_pci_cfg_r32(x)      ltq_r32(ltq_pci_mapped_cfg + (x))
+
+struct ltq_pci_gpio_map {
+        int pin;
+        int alt0;
+        int alt1;
+        int dir;
+        char *name;
+};
+
+/* the pci core can make use of the following gpios */
+static struct ltq_pci_gpio_map ltq_pci_gpio_map[] = {
+        { 0, 1, 0, 0, "pci-exin0" },
+        { 1, 1, 0, 0, "pci-exin1" },
+        { 2, 1, 0, 0, "pci-exin2" },
+        { 39, 1, 0, 0, "pci-exin3" },
+        { 10, 1, 0, 0, "pci-exin4" },
+        { 9, 1, 0, 0, "pci-exin5" },
+        { 30, 1, 0, 1, "pci-gnt1" },
+        { 23, 1, 0, 1, "pci-gnt2" },
+        { 19, 1, 0, 1, "pci-gnt3" },
+        { 38, 1, 0, 1, "pci-gnt4" },
+        { 29, 1, 0, 0, "pci-req1" },
+        { 31, 1, 0, 0, "pci-req2" },
+        { 3, 1, 0, 0, "pci-req3" },
+        { 37, 1, 0, 0, "pci-req4" },
+};
+
+__iomem void *ltq_pci_mapped_cfg;
+static __iomem void *ltq_pci_membase;
+
+int (*ltqpci_plat_dev_init)(struct pci_dev *dev) = NULL;
+
+/* Since the PCI REQ pins can be reused for other functionality, make it
+   possible to exclude those from interpretation by the PCI controller */
+static int ltq_pci_req_mask = 0xf;
+
+static int *ltq_pci_irq_map;
+
+struct pci_ops ltq_pci_ops = {
+        .read   = ltq_pci_read_config_dword,
+        .write  = ltq_pci_write_config_dword
+};
+
+static struct resource pci_io_resource = {
+        .name   = "pci io space",
+        .start  = LTQ_PCI_IO_BASE,
+        .end    = LTQ_PCI_IO_BASE + LTQ_PCI_IO_SIZE - 1,
+        .flags  = IORESOURCE_IO
+};
+
+static struct resource pci_mem_resource = {
+        .name   = "pci memory space",
+        .start  = LTQ_PCI_MEM_BASE,
+        .end    = LTQ_PCI_MEM_BASE + LTQ_PCI_MEM_SIZE - 1,
+        .flags  = IORESOURCE_MEM
+};
+
+static struct pci_controller ltq_pci_controller = {
+        .pci_ops        = &ltq_pci_ops,
+        .mem_resource   = &pci_mem_resource,
+        .mem_offset     = 0x00000000UL,
+        .io_resource    = &pci_io_resource,
+        .io_offset      = 0x00000000UL,
+};
+
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+        if (ltqpci_plat_dev_init)
+                return ltqpci_plat_dev_init(dev);
+
+        return 0;
+}
+
+static u32 ltq_calc_bar11mask(void)
+{
+        u32 mem, bar11mask;
+
+        /* BAR11MASK value depends on available memory on system. */
+        mem = num_physpages * PAGE_SIZE;
+        bar11mask = (0x0ffffff0 & ~((1 << (fls(mem) - 1)) - 1)) | 8;
+
+        return bar11mask;
+}
+
+static void ltq_pci_setup_gpio(int gpio)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(ltq_pci_gpio_map); i++) {
+                if (gpio & (1 << i)) {
+                        ltq_gpio_request(ltq_pci_gpio_map[i].pin,
+                                ltq_pci_gpio_map[i].alt0,
+                                ltq_pci_gpio_map[i].alt1,
+                                ltq_pci_gpio_map[i].dir,
+                                ltq_pci_gpio_map[i].name);
+                }
+        }
+        ltq_gpio_request(21, 0, 0, 1, "pci-reset");
+        ltq_pci_req_mask = (gpio >> PCI_REQ_SHIFT) & PCI_REQ_MASK;
+}
+
+static int __devinit ltq_pci_startup(struct ltq_pci_data *conf)
+{
+        u32 temp_buffer;
+
+        /* set clock to 33Mhz */
+        ltq_cgu_w32(ltq_cgu_r32(LTQ_CGU_IFCCR) & ~0xf00000, LTQ_CGU_IFCCR);
+        ltq_cgu_w32(ltq_cgu_r32(LTQ_CGU_IFCCR) | 0x800000, LTQ_CGU_IFCCR);
+
+        /* external or internal clock ? */
+        if (conf->clock) {
+                ltq_cgu_w32(ltq_cgu_r32(LTQ_CGU_IFCCR) & ~(1 << 16),
+                        LTQ_CGU_IFCCR);
+                ltq_cgu_w32((1 << 30), LTQ_CGU_PCICR);
+        } else {
+                ltq_cgu_w32(ltq_cgu_r32(LTQ_CGU_IFCCR) | (1 << 16),
+                        LTQ_CGU_IFCCR);
+                ltq_cgu_w32((1 << 31) | (1 << 30), LTQ_CGU_PCICR);
+        }
+
+        /* setup pci clock and gpis used by pci */
+        ltq_pci_setup_gpio(conf->gpio);
+
+        /* enable auto-switching between PCI and EBU */
+        ltq_pci_w32(0xa, PCI_CR_CLK_CTRL);
+
+        /* busy, i.e. configuration is not done, PCI access has to be retried */
+        ltq_pci_w32(ltq_pci_r32(PCI_CR_PCI_MOD) & ~(1 << 24), PCI_CR_PCI_MOD);
+        wmb();
+        /* BUS Master/IO/MEM access */
+        ltq_pci_cfg_w32(ltq_pci_cfg_r32(PCI_CS_STS_CMD) | 7, PCI_CS_STS_CMD);
+
+        /* enable external 2 PCI masters */
+        temp_buffer = ltq_pci_r32(PCI_CR_PC_ARB);
+        temp_buffer &= (~(ltq_pci_req_mask << 16));
+        /* enable internal arbiter */
+        temp_buffer |= (1 << INTERNAL_ARB_ENABLE_BIT);
+        /* enable internal PCI master reqest */
+        temp_buffer &= (~(3 << PCI_MASTER0_REQ_MASK_2BITS));
+
+        /* enable EBU request */
+        temp_buffer &= (~(3 << PCI_MASTER1_REQ_MASK_2BITS));
+
+        /* enable all external masters request */
+        temp_buffer &= (~(3 << PCI_MASTER2_REQ_MASK_2BITS));
+        ltq_pci_w32(temp_buffer, PCI_CR_PC_ARB);
+        wmb();
+
+        /* setup BAR memory regions */
+        ltq_pci_w32(0x18000000, PCI_CR_FCI_ADDR_MAP0);
+        ltq_pci_w32(0x18400000, PCI_CR_FCI_ADDR_MAP1);
+        ltq_pci_w32(0x18800000, PCI_CR_FCI_ADDR_MAP2);
+        ltq_pci_w32(0x18c00000, PCI_CR_FCI_ADDR_MAP3);
+        ltq_pci_w32(0x19000000, PCI_CR_FCI_ADDR_MAP4);
+        ltq_pci_w32(0x19400000, PCI_CR_FCI_ADDR_MAP5);
+        ltq_pci_w32(0x19800000, PCI_CR_FCI_ADDR_MAP6);
+        ltq_pci_w32(0x19c00000, PCI_CR_FCI_ADDR_MAP7);
+        ltq_pci_w32(0x1ae00000, PCI_CR_FCI_ADDR_MAP11hg);
+        ltq_pci_w32(ltq_calc_bar11mask(), PCI_CR_BAR11MASK);
+        ltq_pci_w32(0, PCI_CR_PCI_ADDR_MAP11);
+        ltq_pci_w32(0, PCI_CS_BASE_ADDR1);
+        /* both TX and RX endian swap are enabled */
+        ltq_pci_w32(ltq_pci_r32(PCI_CR_PCI_EOI) | 3, PCI_CR_PCI_EOI);
+        wmb();
+        ltq_pci_w32(ltq_pci_r32(PCI_CR_BAR12MASK) | 0x80000000,
+                PCI_CR_BAR12MASK);
+        ltq_pci_w32(ltq_pci_r32(PCI_CR_BAR13MASK) | 0x80000000,
+                PCI_CR_BAR13MASK);
+        /*use 8 dw burst length */
+        ltq_pci_w32(0x303, PCI_CR_FCI_BURST_LENGTH);
+        ltq_pci_w32(ltq_pci_r32(PCI_CR_PCI_MOD) | (1 << 24), PCI_CR_PCI_MOD);
+        wmb();
+
+        /* setup irq line */
+        ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_PCC_CON) | 0xc, LTQ_EBU_PCC_CON);
+        ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_PCC_IEN) | 0x10, LTQ_EBU_PCC_IEN);
+
+        /* toggle reset pin */
+        __gpio_set_value(21, 0);
+        wmb();
+        mdelay(1);
+        __gpio_set_value(21, 1);
+        return 0;
+}
+
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+        if (ltq_pci_irq_map[slot])
+                return ltq_pci_irq_map[slot];
+        printk(KERN_ERR "lq_pci: trying to map irq for unknown slot %d\n",
+                slot);
+
+        return 0;
+}
+
+static int __devinit ltq_pci_probe(struct platform_device *pdev)
+{
+        struct ltq_pci_data *ltq_pci_data =
+                (struct ltq_pci_data *) pdev->dev.platform_data;
+        pci_probe_only = 0;
+        ltq_pci_irq_map = ltq_pci_data->irq;
+        ltq_pci_membase = ioremap_nocache(PCI_CR_BASE_ADDR, PCI_CR_SIZE);
+        ltq_pci_mapped_cfg =
+                ioremap_nocache(LTQ_PCI_CFG_BASE, LTQ_PCI_CFG_BASE);
+        ltq_pci_controller.io_map_base =
+                (unsigned long)ioremap(LTQ_PCI_IO_BASE, LTQ_PCI_IO_SIZE - 1);
+        ltq_pci_startup(ltq_pci_data);
+        register_pci_controller(&ltq_pci_controller);
+
+        return 0;
+}
+
+static struct platform_driver
+ltq_pci_driver = {
+        .probe = ltq_pci_probe,
+        .driver = {
+                .name = "ltq_pci",
+                .owner = THIS_MODULE,
+        },
+};
+
+int __init pcibios_init(void)
+{
+        int ret = platform_driver_register(&ltq_pci_driver);
+        if (ret)
+                printk(KERN_INFO "ltq_pci: Error registering platfom driver!");
+        return ret;
+}
+
+arch_initcall(pcibios_init);
diff --git a/arch/mips/pci/pci-lantiq.h b/arch/mips/pci/pci-lantiq.h
new file mode 100644
index 000000000000..66bf6cd6be3c
--- /dev/null
+++ b/arch/mips/pci/pci-lantiq.h
@@ -0,0 +1,18 @@
+/*
+ *  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.
+ *
+ *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
+ */
+
+#ifndef _LTQ_PCI_H__
+#define _LTQ_PCI_H__
+
+extern __iomem void *ltq_pci_mapped_cfg;
+extern int ltq_pci_read_config_dword(struct pci_bus *bus,
+        unsigned int devfn, int where, int size, u32 *val);
+extern int ltq_pci_write_config_dword(struct pci_bus *bus,
+        unsigned int devfn, int where, int size, u32 val);
+
+#endif
diff --git a/arch/mips/pci/pci-xlr.c b/arch/mips/pci/pci-xlr.c
new file mode 100644
index 000000000000..38fece16c435
--- /dev/null
+++ b/arch/mips/pci/pci-xlr.c
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2003-2011 NetLogic Microsystems, Inc. (NetLogic). All rights
+ * reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the NetLogic
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY NETLOGIC ``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 NETLOGIC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/mm.h>
+#include <linux/console.h>
+
+#include <asm/io.h>
+
+#include <asm/netlogic/interrupt.h>
+#include <asm/netlogic/xlr/iomap.h>
+#include <asm/netlogic/xlr/pic.h>
+#include <asm/netlogic/xlr/xlr.h>
+
+static void *pci_config_base;
+
+#define pci_cfg_addr(bus, devfn, off) (((bus) << 16) | ((devfn) << 8) | (off))
+
+/* PCI ops */
+static inline u32 pci_cfg_read_32bit(struct pci_bus *bus, unsigned int devfn,
+        int where)
+{
+        u32 data;
+        u32 *cfgaddr;
+
+        cfgaddr = (u32 *)(pci_config_base +
+                        pci_cfg_addr(bus->number, devfn, where & ~3));
+        data = *cfgaddr;
+        return cpu_to_le32(data);
+}
+
+static inline void pci_cfg_write_32bit(struct pci_bus *bus, unsigned int devfn,
+        int where, u32 data)
+{
+        u32 *cfgaddr;
+
+        cfgaddr = (u32 *)(pci_config_base +
+                        pci_cfg_addr(bus->number, devfn, where & ~3));
+        *cfgaddr = cpu_to_le32(data);
+}
+
+static int nlm_pcibios_read(struct pci_bus *bus, unsigned int devfn,
+        int where, int size, u32 *val)
+{
+        u32 data;
+
+        if ((size == 2) && (where & 1))
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+        else if ((size == 4) && (where & 3))
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+
+        data = pci_cfg_read_32bit(bus, devfn, where);
+
+        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 nlm_pcibios_write(struct pci_bus *bus, unsigned int devfn,
+                int where, int size, u32 val)
+{
+        u32 data;
+
+        if ((size == 2) && (where & 1))
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+        else if ((size == 4) && (where & 3))
+                return PCIBIOS_BAD_REGISTER_NUMBER;
+
+        data = pci_cfg_read_32bit(bus, devfn, where);
+
+        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;
+
+        pci_cfg_write_32bit(bus, devfn, where, data);
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+struct pci_ops nlm_pci_ops = {
+        .read  = nlm_pcibios_read,
+        .write = nlm_pcibios_write
+};
+
+static struct resource nlm_pci_mem_resource = {
+        .name           = "XLR PCI MEM",
+        .start          = 0xd0000000UL, /* 256MB PCI mem @ 0xd000_0000 */
+        .end            = 0xdfffffffUL,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct resource nlm_pci_io_resource = {
+        .name           = "XLR IO MEM",
+        .start          = 0x10000000UL, /* 16MB PCI IO @ 0x1000_0000 */
+        .end            = 0x100fffffUL,
+        .flags          = IORESOURCE_IO,
+};
+
+struct pci_controller nlm_pci_controller = {
+        .index          = 0,
+        .pci_ops        = &nlm_pci_ops,
+        .mem_resource   = &nlm_pci_mem_resource,
+        .mem_offset     = 0x00000000UL,
+        .io_resource    = &nlm_pci_io_resource,
+        .io_offset      = 0x00000000UL,
+};
+
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+        if (!nlm_chip_is_xls())
+                return  PIC_PCIX_IRQ;   /* for XLR just one IRQ*/
+
+        /*
+         * For XLS PCIe, there is an IRQ per Link, find out which
+         * link the device is on to assign interrupts
+        */
+        if (dev->bus->self == NULL)
+                return 0;
+
+        switch  (dev->bus->self->devfn) {
+        case 0x0:
+                return PIC_PCIE_LINK0_IRQ;
+        case 0x8:
+                return PIC_PCIE_LINK1_IRQ;
+        case 0x10:
+                if (nlm_chip_is_xls_b())
+                        return PIC_PCIE_XLSB0_LINK2_IRQ;
+                else
+                        return PIC_PCIE_LINK2_IRQ;
+        case 0x18:
+                if (nlm_chip_is_xls_b())
+                        return PIC_PCIE_XLSB0_LINK3_IRQ;
+                else
+                        return PIC_PCIE_LINK3_IRQ;
+        }
+        WARN(1, "Unexpected devfn %d\n", dev->bus->self->devfn);
+        return 0;
+}
+
+/* Do platform specific device initialization at pci_enable_device() time */
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+        return 0;
+}
+
+static int __init pcibios_init(void)
+{
+        /* PSB assigns PCI resources */
+        pci_probe_only = 1;
+        pci_config_base = ioremap(DEFAULT_PCI_CONFIG_BASE, 16 << 20);
+
+        /* Extend IO port for memory mapped io */
+        ioport_resource.start =  0;
+        ioport_resource.end   = ~0;
+
+        set_io_port_base(CKSEG1);
+        nlm_pci_controller.io_map_base = CKSEG1;
+
+        pr_info("Registering XLR/XLS PCIX/PCIE Controller.\n");
+        register_pci_controller(&nlm_pci_controller);
+
+        return 0;
+}
+
+arch_initcall(pcibios_init);
+
+struct pci_fixup pcibios_fixups[] = {
+        {0}
+};
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c
index efc9e889b349..2608752898c0 100644
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
@@ -55,6 +55,8 @@ void titan_mailbox_irq(void)
 
                 if (status & 0x2)
                         smp_call_function_interrupt();
+                if (status & 0x4)
+                        scheduler_ipi();
                 break;
 
         case 1:
@@ -63,6 +65,8 @@ void titan_mailbox_irq(void)
 
                 if (status & 0x2)
                         smp_call_function_interrupt();
+                if (status & 0x4)
+                        scheduler_ipi();
                 break;
         }
 }
diff --git a/arch/mips/sgi-ip22/ip22-hpc.c b/arch/mips/sgi-ip22/ip22-hpc.c
index 5c00cdd20d8e..bb70589b5f74 100644
--- a/arch/mips/sgi-ip22/ip22-hpc.c
+++ b/arch/mips/sgi-ip22/ip22-hpc.c
@@ -1,7 +1,7 @@
 /*
  * ip22-hpc.c: Routines for generic manipulation of the HPC controllers.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1998 Ralf Baechle
  */
 
diff --git a/arch/mips/sgi-ip22/ip22-int.c b/arch/mips/sgi-ip22/ip22-int.c
index 476423a01296..b4d08e4d2ea9 100644
--- a/arch/mips/sgi-ip22/ip22-int.c
+++ b/arch/mips/sgi-ip22/ip22-int.c
@@ -2,7 +2,7 @@
  * ip22-int.c: Routines for generic manipulation of the INT[23] ASIC
  *             found on INDY and Indigo2 workstations.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org)
  * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu)
  *                    - Indigo2 changes
diff --git a/arch/mips/sgi-ip22/ip22-mc.c b/arch/mips/sgi-ip22/ip22-mc.c
index 5268ac187bbd..d22262ee6853 100644
--- a/arch/mips/sgi-ip22/ip22-mc.c
+++ b/arch/mips/sgi-ip22/ip22-mc.c
@@ -1,7 +1,7 @@
 /*
  * ip22-mc.c: Routines for manipulating SGI Memory Controller.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) - Indigo2 changes
  * Copyright (C) 2003 Ladislav Michl  (ladis@linux-mips.org)
  * Copyright (C) 2004 Peter Fuerst    (pf@net.alphadv.de) - IP28
diff --git a/arch/mips/sgi-ip22/ip22-setup.c b/arch/mips/sgi-ip22/ip22-setup.c
index 5deeb68b6c9c..5e6621349471 100644
--- a/arch/mips/sgi-ip22/ip22-setup.c
+++ b/arch/mips/sgi-ip22/ip22-setup.c
@@ -1,7 +1,7 @@
 /*
  * ip22-setup.c: SGI specific setup, including init of the feature struct.
  *
- * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
+ * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1997, 1998 Ralf Baechle (ralf@gnu.org)
  */
 #include <linux/init.h>
diff --git a/arch/mips/sgi-ip27/ip27-irq.c b/arch/mips/sgi-ip27/ip27-irq.c
index 0a04603d577c..b18b04e48577 100644
--- a/arch/mips/sgi-ip27/ip27-irq.c
+++ b/arch/mips/sgi-ip27/ip27-irq.c
@@ -147,8 +147,10 @@ static void ip27_do_irq_mask0(void)
 #ifdef CONFIG_SMP
         if (pend0 & (1UL << CPU_RESCHED_A_IRQ)) {
                 LOCAL_HUB_CLR_INTR(CPU_RESCHED_A_IRQ);
+                scheduler_ipi();
         } else if (pend0 & (1UL << CPU_RESCHED_B_IRQ)) {
                 LOCAL_HUB_CLR_INTR(CPU_RESCHED_B_IRQ);
+                scheduler_ipi();
         } else if (pend0 & (1UL << CPU_CALL_A_IRQ)) {
                 LOCAL_HUB_CLR_INTR(CPU_CALL_A_IRQ);
                 smp_call_function_interrupt();
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index a152538d3c97..ef74f3267f91 100644
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -66,18 +66,7 @@ static int rt_next_event(unsigned long delta, struct clock_event_device *evt)
 static void rt_set_mode(enum clock_event_mode mode,
                 struct clock_event_device *evt)
 {
-        switch (mode) {
-        case CLOCK_EVT_MODE_ONESHOT:
-                /* The only mode supported */
-                break;
-
-        case CLOCK_EVT_MODE_PERIODIC:
-        case CLOCK_EVT_MODE_UNUSED:
-        case CLOCK_EVT_MODE_SHUTDOWN:
-        case CLOCK_EVT_MODE_RESUME:
-                /* Nothing to do  */
-                break;
-        }
+        /* Nothing to do ...  */
 }
 
 int rt_timer_irq;
@@ -174,8 +163,7 @@ static void __init hub_rt_clocksource_init(void)
 {
         struct clocksource *cs = &hub_rt_clocksource;
 
-        clocksource_set_clock(cs, CYCLES_PER_SEC);
-        clocksource_register(cs);
+        clocksource_register_hz(cs, CYCLES_PER_SEC);
 }
 
 void __init plat_time_init(void)
diff --git a/arch/mips/sibyte/bcm1480/smp.c b/arch/mips/sibyte/bcm1480/smp.c
index 47b347c992ea..d667875be564 100644
--- a/arch/mips/sibyte/bcm1480/smp.c
+++ b/arch/mips/sibyte/bcm1480/smp.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/smp.h>
 #include <linux/kernel_stat.h>
+#include <linux/sched.h>
 
 #include <asm/mmu_context.h>
 #include <asm/io.h>
@@ -189,10 +190,8 @@ void bcm1480_mailbox_interrupt(void)
         /* Clear the mailbox to clear the interrupt */
         __raw_writeq(((u64)action)<<48, mailbox_0_clear_regs[cpu]);
 
-        /*
-         * Nothing to do for SMP_RESCHEDULE_YOURSELF; returning from the
-         * interrupt will do the reschedule for us
-         */
+        if (action & SMP_RESCHEDULE_YOURSELF)
+                scheduler_ipi();
 
         if (action & SMP_CALL_FUNCTION)
                 smp_call_function_interrupt();
diff --git a/arch/mips/sibyte/sb1250/smp.c b/arch/mips/sibyte/sb1250/smp.c
index c00a5cb1128d..38e7f6bd7922 100644
--- a/arch/mips/sibyte/sb1250/smp.c
+++ b/arch/mips/sibyte/sb1250/smp.c
@@ -21,6 +21,7 @@
 #include <linux/interrupt.h>
 #include <linux/smp.h>
 #include <linux/kernel_stat.h>
+#include <linux/sched.h>
 
 #include <asm/mmu_context.h>
 #include <asm/io.h>
@@ -177,10 +178,8 @@ void sb1250_mailbox_interrupt(void)
         /* Clear the mailbox to clear the interrupt */
         ____raw_writeq(((u64)action) << 48, mailbox_clear_regs[cpu]);
 
-        /*
-         * Nothing to do for SMP_RESCHEDULE_YOURSELF; returning from the
-         * interrupt will do the reschedule for us
-         */
+        if (action & SMP_RESCHEDULE_YOURSELF)
+                scheduler_ipi();
 
         if (action & SMP_CALL_FUNCTION)
                 smp_call_function_interrupt();
diff --git a/arch/mips/txx9/generic/setup_tx4939.c b/arch/mips/txx9/generic/setup_tx4939.c
index 3dc19f482959..e9f95dcde379 100644
--- a/arch/mips/txx9/generic/setup_tx4939.c
+++ b/arch/mips/txx9/generic/setup_tx4939.c
@@ -318,19 +318,15 @@ void __init tx4939_sio_init(unsigned int sclk, unsigned int cts_mask)
 }
 
 #if defined(CONFIG_TC35815) || defined(CONFIG_TC35815_MODULE)
-static int tx4939_get_eth_speed(struct net_device *dev)
+static u32 tx4939_get_eth_speed(struct net_device *dev)
 {
-        struct ethtool_cmd cmd = { ETHTOOL_GSET };
-        int speed = 100;        /* default 100Mbps */
-        int err;
-        if (!dev->ethtool_ops || !dev->ethtool_ops->get_settings)
-                return speed;
-        err = dev->ethtool_ops->get_settings(dev, &cmd);
-        if (err < 0)
-                return speed;
-        speed = cmd.speed == SPEED_100 ? 100 : 10;
-        return speed;
+        struct ethtool_cmd cmd;
+        if (dev_ethtool_get_settings(dev, &cmd))
+                return 100;     /* default 100Mbps */
+
+        return ethtool_cmd_speed(&cmd);
 }
+
 static int tx4939_netdev_event(struct notifier_block *this,
                                unsigned long event,
                                void *ptr)
@@ -343,8 +339,7 @@ static int tx4939_netdev_event(struct notifier_block *this,
                 else if (dev->irq == TXX9_IRQ_BASE + TX4939_IR_ETH(1))
                         bit = TX4939_PCFG_SPEED1;
                 if (bit) {
-                        int speed = tx4939_get_eth_speed(dev);
-                        if (speed == 100)
+                        if (tx4939_get_eth_speed(dev) == 100)
                                 txx9_set64(&tx4939_ccfgptr->pcfg, bit);
                         else
                                 txx9_clear64(&tx4939_ccfgptr->pcfg, bit);
diff --git a/arch/mn10300/kernel/irq.c b/arch/mn10300/kernel/irq.c
index 86af0d7d0771..2623d19f4f4c 100644
--- a/arch/mn10300/kernel/irq.c
+++ b/arch/mn10300/kernel/irq.c
@@ -87,7 +87,7 @@ static void mn10300_cpupic_mask_ack(struct irq_data *d)
                 tmp2 = GxICR(irq);
 
                 irq_affinity_online[irq] =
-                        any_online_cpu(*d->affinity);
+                        cpumask_any_and(d->affinity, cpu_online_mask);
                 CROSS_GxICR(irq, irq_affinity_online[irq]) =
                         (tmp & (GxICR_LEVEL | GxICR_ENABLE)) | GxICR_DETECT;
                 tmp = CROSS_GxICR(irq, irq_affinity_online[irq]);
@@ -124,7 +124,8 @@ static void mn10300_cpupic_unmask_clear(struct irq_data *d)
         } else {
                 tmp = GxICR(irq);
 
-                irq_affinity_online[irq] = any_online_cpu(*d->affinity);
+                irq_affinity_online[irq] = cpumask_any_and(d->affinity,
+                                                           cpu_online_mask);
                 CROSS_GxICR(irq, irq_affinity_online[irq]) = (tmp & GxICR_LEVEL) | GxICR_ENABLE | GxICR_DETECT;
                 tmp = CROSS_GxICR(irq, irq_affinity_online[irq]);
         }
@@ -366,11 +367,11 @@ void migrate_irqs(void)
                 if (irqd_is_per_cpu(data))
                         continue;
 
-                if (cpu_isset(self, data->affinity) &&
-                    !cpus_intersects(irq_affinity[irq], cpu_online_map)) {
+                if (cpumask_test_cpu(self, &data->affinity) &&
+                    !cpumask_intersects(&irq_affinity[irq], cpu_online_mask)) {
                         int cpu_id;
-                        cpu_id = first_cpu(cpu_online_map);
-                        cpu_set(cpu_id, data->affinity);
+                        cpu_id = cpumask_first(cpu_online_mask);
+                        cpumask_set_cpu(cpu_id, &data->affinity);
                 }
                 /* We need to operate irq_affinity_online atomically. */
                 arch_local_cli_save(flags);
@@ -381,7 +382,8 @@ void migrate_irqs(void)
                         GxICR(irq) = x & GxICR_LEVEL;
                         tmp = GxICR(irq);
 
-                        new = any_online_cpu(data->affinity);
+                        new = cpumask_any_and(&data->affinity,
+                                              cpu_online_mask);
                         irq_affinity_online[irq] = new;
 
                         CROSS_GxICR(irq, new) =
diff --git a/arch/mn10300/kernel/smp.c b/arch/mn10300/kernel/smp.c
index 226c826a2194..9242e9fcc564 100644
--- a/arch/mn10300/kernel/smp.c
+++ b/arch/mn10300/kernel/smp.c
@@ -309,7 +309,7 @@ static void send_IPI_mask(const cpumask_t *cpumask, int irq)
         u16 tmp;
 
         for (i = 0; i < NR_CPUS; i++) {
-                if (cpu_isset(i, *cpumask)) {
+                if (cpumask_test_cpu(i, cpumask)) {
                         /* send IPI */
                         tmp = CROSS_GxICR(irq, i);
                         CROSS_GxICR(irq, i) =
@@ -342,8 +342,8 @@ void send_IPI_allbutself(int irq)
 {
         cpumask_t cpumask;
 
-        cpumask = cpu_online_map;
-        cpu_clear(smp_processor_id(), cpumask);
+        cpumask_copy(&cpumask, cpu_online_mask);
+        cpumask_clear_cpu(smp_processor_id(), &cpumask);
         send_IPI_mask(&cpumask, irq);
 }
 
@@ -393,8 +393,8 @@ int smp_nmi_call_function(smp_call_func_t func, void *info, int wait)
 
         data.func = func;
         data.info = info;
-        data.started = cpu_online_map;
-        cpu_clear(smp_processor_id(), data.started);
+        cpumask_copy(&data.started, cpu_online_mask);
+        cpumask_clear_cpu(smp_processor_id(), &data.started);
         data.wait = wait;
         if (wait)
                 data.finished = data.started;
@@ -410,14 +410,14 @@ int smp_nmi_call_function(smp_call_func_t func, void *info, int wait)
         if (CALL_FUNCTION_NMI_IPI_TIMEOUT > 0) {
                 for (cnt = 0;
                      cnt < CALL_FUNCTION_NMI_IPI_TIMEOUT &&
-                             !cpus_empty(data.started);
+                             !cpumask_empty(&data.started);
                      cnt++)
                         mdelay(1);
 
                 if (wait && cnt < CALL_FUNCTION_NMI_IPI_TIMEOUT) {
                         for (cnt = 0;
                              cnt < CALL_FUNCTION_NMI_IPI_TIMEOUT &&
-                                     !cpus_empty(data.finished);
+                                     !cpumask_empty(&data.finished);
                              cnt++)
                                 mdelay(1);
                 }
@@ -428,10 +428,10 @@ int smp_nmi_call_function(smp_call_func_t func, void *info, int wait)
         } else {
                 /* If timeout value is zero, wait until cpumask has been
                  * cleared */
-                while (!cpus_empty(data.started))
+                while (!cpumask_empty(&data.started))
                         barrier();
                 if (wait)
-                        while (!cpus_empty(data.finished))
+                        while (!cpumask_empty(&data.finished))
                                 barrier();
         }
 
@@ -472,12 +472,12 @@ void stop_this_cpu(void *unused)
 #endif  /* CONFIG_GDBSTUB */
 
         flags = arch_local_cli_save();
-        cpu_clear(smp_processor_id(), cpu_online_map);
+        set_cpu_online(smp_processor_id(), false);
 
         while (!stopflag)
                 cpu_relax();
 
-        cpu_set(smp_processor_id(), cpu_online_map);
+        set_cpu_online(smp_processor_id(), true);
         arch_local_irq_restore(flags);
 }
 
@@ -494,14 +494,11 @@ void smp_send_stop(void)
  * @irq: The interrupt number.
  * @dev_id: The device ID.
  *
- * We need do nothing here, since the scheduling will be effected on our way
- * back through entry.S.
- *
  * Returns IRQ_HANDLED to indicate we handled the interrupt successfully.
  */
 static irqreturn_t smp_reschedule_interrupt(int irq, void *dev_id)
 {
-        /* do nothing */
+        scheduler_ipi();
         return IRQ_HANDLED;
 }
 
@@ -532,12 +529,13 @@ void smp_nmi_call_function_interrupt(void)
          * execute the function
          */
         smp_mb();
-        cpu_clear(smp_processor_id(), nmi_call_data->started);
+        cpumask_clear_cpu(smp_processor_id(), &nmi_call_data->started);
         (*func)(info);
 
         if (wait) {
                 smp_mb();
-                cpu_clear(smp_processor_id(), nmi_call_data->finished);
+                cpumask_clear_cpu(smp_processor_id(),
+                                  &nmi_call_data->finished);
         }
 }
 
@@ -660,7 +658,7 @@ int __init start_secondary(void *unused)
 {
         smp_cpu_init();
         smp_callin();
-        while (!cpu_isset(smp_processor_id(), smp_commenced_mask))
+        while (!cpumask_test_cpu(smp_processor_id(), &smp_commenced_mask))
                 cpu_relax();
 
         local_flush_tlb();
@@ -783,13 +781,14 @@ static int __init do_boot_cpu(int phy_id)
 
         if (send_status == 0) {
                 /* Allow AP to start initializing */
-                cpu_set(cpu_id, cpu_callout_map);
+                cpumask_set_cpu(cpu_id, &cpu_callout_map);
 
                 /* Wait for setting cpu_callin_map */
                 timeout = 0;
                 do {
                         udelay(1000);
-                        callin_status = cpu_isset(cpu_id, cpu_callin_map);
+                        callin_status = cpumask_test_cpu(cpu_id,
+                                                         &cpu_callin_map);
                 } while (callin_status == 0 && timeout++ < 5000);
 
                 if (callin_status == 0)
@@ -799,9 +798,9 @@ static int __init do_boot_cpu(int phy_id)
         }
 
         if (send_status == GxICR_REQUEST || callin_status == 0) {
-                cpu_clear(cpu_id, cpu_callout_map);
-                cpu_clear(cpu_id, cpu_callin_map);
-                cpu_clear(cpu_id, cpu_initialized);
+                cpumask_clear_cpu(cpu_id, &cpu_callout_map);
+                cpumask_clear_cpu(cpu_id, &cpu_callin_map);
+                cpumask_clear_cpu(cpu_id, &cpu_initialized);
                 cpucount--;
                 return 1;
         }
@@ -836,7 +835,7 @@ static void __init smp_callin(void)
         cpu = smp_processor_id();
         timeout = jiffies + (2 * HZ);
 
-        if (cpu_isset(cpu, cpu_callin_map)) {
+        if (cpumask_test_cpu(cpu, &cpu_callin_map)) {
                 printk(KERN_ERR "CPU#%d already present.\n", cpu);
                 BUG();
         }
@@ -844,7 +843,7 @@ static void __init smp_callin(void)
 
         /* Wait for AP startup 2s total */
         while (time_before(jiffies, timeout)) {
-                if (cpu_isset(cpu, cpu_callout_map))
+                if (cpumask_test_cpu(cpu, &cpu_callout_map))
                         break;
                 cpu_relax();
         }
@@ -864,11 +863,11 @@ static void __init smp_callin(void)
         smp_store_cpu_info(cpu);
 
         /* Allow the boot processor to continue */
-        cpu_set(cpu, cpu_callin_map);
+        cpumask_set_cpu(cpu, &cpu_callin_map);
 }
 
 /**
- * smp_online - Set cpu_online_map
+ * smp_online - Set cpu_online_mask
  */
 static void __init smp_online(void)
 {
@@ -878,7 +877,7 @@ static void __init smp_online(void)
 
         local_irq_enable();
 
-        cpu_set(cpu, cpu_online_map);
+        set_cpu_online(cpu, true);
         smp_wmb();
 }
 
@@ -895,13 +894,13 @@ void __init smp_cpus_done(unsigned int max_cpus)
 /*
  * smp_prepare_boot_cpu - Set up stuff for the boot processor.
  *
- * Set up the cpu_online_map, cpu_callout_map and cpu_callin_map of the boot
+ * Set up the cpu_online_mask, cpu_callout_map and cpu_callin_map of the boot
  * processor (CPU 0).
  */
 void __devinit smp_prepare_boot_cpu(void)
 {
-        cpu_set(0, cpu_callout_map);
-        cpu_set(0, cpu_callin_map);
+        cpumask_set_cpu(0, &cpu_callout_map);
+        cpumask_set_cpu(0, &cpu_callin_map);
         current_thread_info()->cpu = 0;
 }
 
@@ -934,16 +933,16 @@ int __devinit __cpu_up(unsigned int cpu)
                 run_wakeup_cpu(cpu);
 #endif /* CONFIG_HOTPLUG_CPU */
 
-        cpu_set(cpu, smp_commenced_mask);
+        cpumask_set_cpu(cpu, &smp_commenced_mask);
 
         /* Wait 5s total for a response */
         for (timeout = 0 ; timeout < 5000 ; timeout++) {
-                if (cpu_isset(cpu, cpu_online_map))
+                if (cpu_online(cpu))
                         break;
                 udelay(1000);
         }
 
-        BUG_ON(!cpu_isset(cpu, cpu_online_map));
+        BUG_ON(!cpu_online(cpu));
         return 0;
 }
 
@@ -989,7 +988,7 @@ int __cpu_disable(void)
                 return -EBUSY;
 
         migrate_irqs();
-        cpu_clear(cpu, current->active_mm->cpu_vm_mask);
+        cpumask_clear_cpu(cpu, &mm_cpumask(current->active_mm));
         return 0;
 }
 
@@ -1094,13 +1093,13 @@ static int hotplug_cpu_nmi_call_function(cpumask_t cpumask,
         do {
                 mn10300_local_dcache_inv_range(start, end);
                 barrier();
-        } while (!cpus_empty(nmi_call_func_mask_data.started));
+        } while (!cpumask_empty(&nmi_call_func_mask_data.started));
 
         if (wait) {
                 do {
                         mn10300_local_dcache_inv_range(start, end);
                         barrier();
-                } while (!cpus_empty(nmi_call_func_mask_data.finished));
+                } while (!cpumask_empty(&nmi_call_func_mask_data.finished));
         }
 
         spin_unlock(&smp_nmi_call_lock);
@@ -1111,9 +1110,9 @@ static void restart_wakeup_cpu(void)
 {
         unsigned int cpu = smp_processor_id();
 
-        cpu_set(cpu, cpu_callin_map);
+        cpumask_set_cpu(cpu, &cpu_callin_map);
         local_flush_tlb();
-        cpu_set(cpu, cpu_online_map);
+        set_cpu_online(cpu, true);
         smp_wmb();
 }
 
@@ -1144,8 +1143,9 @@ static void sleep_cpu(void *unused)
 static void run_sleep_cpu(unsigned int cpu)
 {
         unsigned long flags;
-        cpumask_t cpumask = cpumask_of(cpu);
+        cpumask_t cpumask;
 
+        cpumask_copy(&cpumask, &cpumask_of(cpu));
         flags = arch_local_cli_save();
         hotplug_cpu_nmi_call_function(cpumask, prepare_sleep_cpu, NULL, 1);
         hotplug_cpu_nmi_call_function(cpumask, sleep_cpu, NULL, 0);
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S
index 968bcd2cb022..6f702a6ab395 100644
--- a/arch/mn10300/kernel/vmlinux.lds.S
+++ b/arch/mn10300/kernel/vmlinux.lds.S
@@ -70,7 +70,7 @@ SECTIONS
         .exit.text : { EXIT_TEXT; }
         .exit.data : { EXIT_DATA; }
 
-  PERCPU(32, PAGE_SIZE)
+  PERCPU_SECTION(32)
   . = ALIGN(PAGE_SIZE);
   __init_end = .;
   /* freed after init ends here */
diff --git a/arch/mn10300/mm/cache-smp.c b/arch/mn10300/mm/cache-smp.c
index 4a6e9a4b5b27..2d23b9eeee62 100644
--- a/arch/mn10300/mm/cache-smp.c
+++ b/arch/mn10300/mm/cache-smp.c
@@ -74,7 +74,7 @@ void smp_cache_interrupt(void)
                 break;
         }
 
-        cpu_clear(smp_processor_id(), smp_cache_ipi_map);
+        cpumask_clear_cpu(smp_processor_id(), &smp_cache_ipi_map);
 }
 
 /**
@@ -94,12 +94,12 @@ void smp_cache_call(unsigned long opr_mask,
         smp_cache_mask = opr_mask;
         smp_cache_start = start;
         smp_cache_end = end;
-        smp_cache_ipi_map = cpu_online_map;
-        cpu_clear(smp_processor_id(), smp_cache_ipi_map);
+        cpumask_copy(&smp_cache_ipi_map, cpu_online_mask);
+        cpumask_clear_cpu(smp_processor_id(), &smp_cache_ipi_map);
 
         send_IPI_allbutself(FLUSH_CACHE_IPI);
 
-        while (!cpus_empty(smp_cache_ipi_map))
+        while (!cpumask_empty(&smp_cache_ipi_map))
                 /* nothing. lockup detection does not belong here */
                 mb();
 }
diff --git a/arch/mn10300/mm/init.c b/arch/mn10300/mm/init.c
index 48907cc3bdb7..13801824e3ee 100644
--- a/arch/mn10300/mm/init.c
+++ b/arch/mn10300/mm/init.c
@@ -37,8 +37,6 @@
 #include <asm/tlb.h>
 #include <asm/sections.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 unsigned long highstart_pfn, highend_pfn;
 
 #ifdef CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT
diff --git a/arch/mn10300/mm/tlb-smp.c b/arch/mn10300/mm/tlb-smp.c
index 0b6a5ad1960e..9a777498a916 100644
--- a/arch/mn10300/mm/tlb-smp.c
+++ b/arch/mn10300/mm/tlb-smp.c
@@ -64,7 +64,7 @@ void smp_flush_tlb(void *unused)
 
         cpu_id = get_cpu();
 
-        if (!cpu_isset(cpu_id, flush_cpumask))
+        if (!cpumask_test_cpu(cpu_id, &flush_cpumask))
                 /* This was a BUG() but until someone can quote me the line
                  * from the intel manual that guarantees an IPI to multiple
                  * CPUs is retried _only_ on the erroring CPUs its staying as a
@@ -80,7 +80,7 @@ void smp_flush_tlb(void *unused)
                 local_flush_tlb_page(flush_mm, flush_va);
 
         smp_mb__before_clear_bit();
-        cpu_clear(cpu_id, flush_cpumask);
+        cpumask_clear_cpu(cpu_id, &flush_cpumask);
         smp_mb__after_clear_bit();
 out:
         put_cpu();
@@ -103,11 +103,11 @@ static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm,
          * - we do not send IPIs to as-yet unbooted CPUs.
          */
         BUG_ON(!mm);
-        BUG_ON(cpus_empty(cpumask));
-        BUG_ON(cpu_isset(smp_processor_id(), cpumask));
+        BUG_ON(cpumask_empty(&cpumask));
+        BUG_ON(cpumask_test_cpu(smp_processor_id(), &cpumask));
 
-        cpus_and(tmp, cpumask, cpu_online_map);
-        BUG_ON(!cpus_equal(cpumask, tmp));
+        cpumask_and(&tmp, &cpumask, cpu_online_mask);
+        BUG_ON(!cpumask_equal(&cpumask, &tmp));
 
         /* I'm not happy about this global shared spinlock in the MM hot path,
          * but we'll see how contended it is.
@@ -128,7 +128,7 @@ static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm,
         /* FIXME: if NR_CPUS>=3, change send_IPI_mask */
         smp_call_function(smp_flush_tlb, NULL, 1);
 
-        while (!cpus_empty(flush_cpumask))
+        while (!cpumask_empty(&flush_cpumask))
                 /* Lockup detection does not belong here */
                 smp_mb();
 
@@ -146,11 +146,11 @@ void flush_tlb_mm(struct mm_struct *mm)
         cpumask_t cpu_mask;
 
         preempt_disable();
-        cpu_mask = mm->cpu_vm_mask;
-        cpu_clear(smp_processor_id(), cpu_mask);
+        cpumask_copy(&cpu_mask, mm_cpumask(mm));
+        cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
 
         local_flush_tlb();
-        if (!cpus_empty(cpu_mask))
+        if (!cpumask_empty(&cpu_mask))
                 flush_tlb_others(cpu_mask, mm, FLUSH_ALL);
 
         preempt_enable();
@@ -165,11 +165,11 @@ void flush_tlb_current_task(void)
         cpumask_t cpu_mask;
 
         preempt_disable();
-        cpu_mask = mm->cpu_vm_mask;
-        cpu_clear(smp_processor_id(), cpu_mask);
+        cpumask_copy(&cpu_mask, mm_cpumask(mm));
+        cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
 
         local_flush_tlb();
-        if (!cpus_empty(cpu_mask))
+        if (!cpumask_empty(&cpu_mask))
                 flush_tlb_others(cpu_mask, mm, FLUSH_ALL);
 
         preempt_enable();
@@ -186,11 +186,11 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long va)
         cpumask_t cpu_mask;
 
         preempt_disable();
-        cpu_mask = mm->cpu_vm_mask;
-        cpu_clear(smp_processor_id(), cpu_mask);
+        cpumask_copy(&cpu_mask, mm_cpumask(mm));
+        cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
 
         local_flush_tlb_page(mm, va);
-        if (!cpus_empty(cpu_mask))
+        if (!cpumask_empty(&cpu_mask))
                 flush_tlb_others(cpu_mask, mm, va);
 
         preempt_enable();
diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h
index d18328b3f938..da601dd34c05 100644
--- a/arch/parisc/include/asm/cacheflush.h
+++ b/arch/parisc/include/asm/cacheflush.h
@@ -3,6 +3,7 @@
 
 #include <linux/mm.h>
 #include <linux/uaccess.h>
+#include <asm/tlbflush.h>
 
 /* The usual comment is "Caches aren't brain-dead on the <architecture>".
  * Unfortunately, that doesn't apply to PA-RISC. */
@@ -112,8 +113,10 @@ void flush_dcache_page_asm(unsigned long phys_addr, unsigned long vaddr);
 static inline void
 flush_anon_page(struct vm_area_struct *vma, struct page *page, unsigned long vmaddr)
 {
-        if (PageAnon(page))
+        if (PageAnon(page)) {
+                flush_tlb_page(vma, vmaddr);
                 flush_dcache_page_asm(page_to_phys(page), vmaddr);
+        }
 }
 
 #ifdef CONFIG_DEBUG_RODATA
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index 5d7b8ce9fdf3..22dadeb58695 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -177,7 +177,10 @@ struct vm_area_struct;
 
 #define _PAGE_TABLE     (_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE |  _PAGE_DIRTY | _PAGE_ACCESSED)
 #define _PAGE_CHG_MASK  (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
-#define _PAGE_KERNEL    (_PAGE_PRESENT | _PAGE_EXEC | _PAGE_READ | _PAGE_WRITE | _PAGE_DIRTY | _PAGE_ACCESSED)
+#define _PAGE_KERNEL_RO (_PAGE_PRESENT | _PAGE_READ | _PAGE_DIRTY | _PAGE_ACCESSED)
+#define _PAGE_KERNEL_EXEC       (_PAGE_KERNEL_RO | _PAGE_EXEC)
+#define _PAGE_KERNEL_RWX        (_PAGE_KERNEL_EXEC | _PAGE_WRITE)
+#define _PAGE_KERNEL            (_PAGE_KERNEL_RO | _PAGE_WRITE)
 
 /* The pgd/pmd contains a ptr (in phys addr space); since all pgds/pmds
  * are page-aligned, we don't care about the PAGE_OFFSET bits, except
@@ -208,7 +211,9 @@ struct vm_area_struct;
 #define PAGE_COPY       PAGE_EXECREAD
 #define PAGE_RWX        __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
 #define PAGE_KERNEL     __pgprot(_PAGE_KERNEL)
-#define PAGE_KERNEL_RO  __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
+#define PAGE_KERNEL_EXEC        __pgprot(_PAGE_KERNEL_EXEC)
+#define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
+#define PAGE_KERNEL_RO  __pgprot(_PAGE_KERNEL_RO)
 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
 #define PAGE_GATEWAY    __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_GATEWAY| _PAGE_READ)
 
diff --git a/arch/parisc/include/asm/smp.h b/arch/parisc/include/asm/smp.h
index 2e73623feb6b..e8f8037d872b 100644
--- a/arch/parisc/include/asm/smp.h
+++ b/arch/parisc/include/asm/smp.h
@@ -33,15 +33,6 @@ extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
 
 #endif /* !ASSEMBLY */
 
-/*
- *      This magic constant controls our willingness to transfer
- *      a process across CPUs. Such a transfer incurs cache and tlb
- *      misses. The current value is inherited from i386. Still needs
- *      to be tuned for parisc.
- */
- 
-#define PROC_CHANGE_PENALTY     15              /* Schedule penalty */
-
 #define raw_smp_processor_id()  (current_thread_info()->cpu)
 
 #else /* CONFIG_SMP */
diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h
index 3eb82c2a5ec3..9cbc2c3bf630 100644
--- a/arch/parisc/include/asm/unistd.h
+++ b/arch/parisc/include/asm/unistd.h
@@ -814,8 +814,14 @@
 #define __NR_recvmmsg           (__NR_Linux + 319)
 #define __NR_accept4            (__NR_Linux + 320)
 #define __NR_prlimit64          (__NR_Linux + 321)
-
-#define __NR_Linux_syscalls     (__NR_prlimit64 + 1)
+#define __NR_fanotify_init      (__NR_Linux + 322)
+#define __NR_fanotify_mark      (__NR_Linux + 323)
+#define __NR_clock_adjtime      (__NR_Linux + 324)
+#define __NR_name_to_handle_at  (__NR_Linux + 325)
+#define __NR_open_by_handle_at  (__NR_Linux + 326)
+#define __NR_syncfs             (__NR_Linux + 327)
+
+#define __NR_Linux_syscalls     (__NR_syncfs + 1)
 
 
 #define __IGNORE_select         /* newselect */
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 3f11331c2775..83335f3da5fc 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -304,10 +304,20 @@ void flush_dcache_page(struct page *page)
                 offset = (pgoff - mpnt->vm_pgoff) << PAGE_SHIFT;
                 addr = mpnt->vm_start + offset;
 
+                /* The TLB is the engine of coherence on parisc: The
+                 * CPU is entitled to speculate any page with a TLB
+                 * mapping, so here we kill the mapping then flush the
+                 * page along a special flush only alias mapping.
+                 * This guarantees that the page is no-longer in the
+                 * cache for any process and nor may it be
+                 * speculatively read in (until the user or kernel
+                 * specifically accesses it, of course) */
+
+                flush_tlb_page(mpnt, addr);
                 if (old_addr == 0 || (old_addr & (SHMLBA - 1)) != (addr & (SHMLBA - 1))) {
                         __flush_cache_page(mpnt, addr, page_to_phys(page));
                         if (old_addr)
-                                printk(KERN_ERR "INEQUIVALENT ALIASES 0x%lx and 0x%lx in file %s\n", old_addr, addr, mpnt->vm_file ? mpnt->vm_file->f_path.dentry->d_name.name : "(null)");
+                                printk(KERN_ERR "INEQUIVALENT ALIASES 0x%lx and 0x%lx in file %s\n", old_addr, addr, mpnt->vm_file ? (char *)mpnt->vm_file->f_path.dentry->d_name.name : "(null)");
                         old_addr = addr;
                 }
         }
@@ -499,6 +509,7 @@ flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long
 {
         BUG_ON(!vma->vm_mm->context);
 
+        flush_tlb_page(vma, vmaddr);
         __flush_cache_page(vma, vmaddr, page_to_phys(pfn_to_page(pfn)));
 
 }
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index ead8d2a1034c..6f0594439143 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -692,6 +692,9 @@ ENTRY(fault_vector_11)
 END(fault_vector_11)
 
 #endif
+        /* Fault vector is separately protected and *must* be on its own page */
+        .align          PAGE_SIZE
+ENTRY(end_fault_vector)
 
         .import         handle_interruption,code
         .import         do_cpu_irq_mask,code
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S
index 145c5e4caaa0..37aabd772fbb 100644
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
@@ -106,8 +106,9 @@ $bss_loop:
 #endif
 
 
-        /* Now initialize the PTEs themselves */
-        ldo             0+_PAGE_KERNEL(%r0),%r3 /* Hardwired 0 phys addr start */
+        /* Now initialize the PTEs themselves.  We use RWX for
+         * everything ... it will get remapped correctly later */
+        ldo             0+_PAGE_KERNEL_RWX(%r0),%r3 /* Hardwired 0 phys addr start */
         ldi             (1<<(KERNEL_INITIAL_ORDER-PAGE_SHIFT)),%r11 /* PFN count */
         load32          PA(pg0),%r1
 
diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
index 6e81bb596e5b..cedbbb8b18d9 100644
--- a/arch/parisc/kernel/module.c
+++ b/arch/parisc/kernel/module.c
@@ -61,8 +61,10 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/bug.h>
+#include <linux/mm.h>
 #include <linux/slab.h>
 
+#include <asm/pgtable.h>
 #include <asm/unwind.h>
 
 #if 0
@@ -214,7 +216,13 @@ void *module_alloc(unsigned long size)
 {
         if (size == 0)
                 return NULL;
-        return vmalloc(size);
+        /* using RWX means less protection for modules, but it's
+         * easier than trying to map the text, data, init_text and
+         * init_data correctly */
+        return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END,
+                                    GFP_KERNEL | __GFP_HIGHMEM,
+                                    PAGE_KERNEL_RWX, -1,
+                                    __builtin_return_address(0));
 }
 
 #ifndef CONFIG_64BIT
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S
index a85823668cba..93ff3d90edd1 100644
--- a/arch/parisc/kernel/pacache.S
+++ b/arch/parisc/kernel/pacache.S
@@ -817,10 +817,7 @@ ENTRY(purge_kernel_dcache_page)
         .procend
 ENDPROC(purge_kernel_dcache_page)
 
-
-        .export flush_user_dcache_range_asm
-
-flush_user_dcache_range_asm:
+ENTRY(flush_user_dcache_range_asm)
         .proc
         .callinfo NO_CALLS
         .entry
@@ -839,6 +836,7 @@ flush_user_dcache_range_asm:
         .exit
 
         .procend
+ENDPROC(flush_user_dcache_range_asm)
 
 ENTRY(flush_kernel_dcache_range_asm)
         .proc
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 69d63d354ef0..828305f19cff 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -155,10 +155,7 @@ ipi_interrupt(int irq, void *dev_id)
                                 
                         case IPI_RESCHEDULE:
                                 smp_debug(100, KERN_DEBUG "CPU%d IPI_RESCHEDULE\n", this_cpu);
-                                /*
-                                 * Reschedule callback.  Everything to be
-                                 * done is done by the interrupt return path.
-                                 */
+                                scheduler_ipi();
                                 break;
 
                         case IPI_CALL_FUNC:
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index 88a0ad14a9c9..dc9a62462323 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -228,3 +228,11 @@ asmlinkage long compat_sys_fallocate(int fd, int mode, u32 offhi, u32 offlo,
         return sys_fallocate(fd, mode, ((loff_t)offhi << 32) | offlo,
                              ((loff_t)lenhi << 32) | lenlo);
 }
+
+asmlinkage long compat_sys_fanotify_mark(int fan_fd, int flags, u32 mask_hi,
+                                         u32 mask_lo, int fd,
+                                         const char __user *pathname)
+{
+        return sys_fanotify_mark(fan_fd, flags, ((u64)mask_hi << 32) | mask_lo,
+                                 fd, pathname);
+}
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index 4be85ee10b85..a5b02ce4d41e 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -420,6 +420,12 @@
         ENTRY_COMP(recvmmsg)
         ENTRY_SAME(accept4)             /* 320 */
         ENTRY_SAME(prlimit64)
+        ENTRY_SAME(fanotify_init)
+        ENTRY_COMP(fanotify_mark)
+        ENTRY_COMP(clock_adjtime)
+        ENTRY_SAME(name_to_handle_at)   /* 325 */
+        ENTRY_COMP(open_by_handle_at)
+        ENTRY_SAME(syncfs)
 
         /* Nothing yet */
 
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index 8f1e4efd143e..fa6f2b8163e0 100644
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -69,6 +69,9 @@ SECTIONS
         /* End of text section */
         _etext = .;
 
+        /* Start of data section */
+        _sdata = .;
+
         RODATA
 
         /* writeable */
@@ -134,6 +137,7 @@ SECTIONS
         . = ALIGN(16384);
         __init_begin = .;
         INIT_TEXT_SECTION(16384)
+        . = ALIGN(PAGE_SIZE);
         INIT_DATA_SECTION(16)
         /* we have to discard exit text and such at runtime, not link time */
         .exit.text :
@@ -145,7 +149,7 @@ SECTIONS
                 EXIT_DATA
         }
 
-        PERCPU(L1_CACHE_BYTES, PAGE_SIZE)
+        PERCPU_SECTION(L1_CACHE_BYTES)
         . = ALIGN(PAGE_SIZE);
         __init_end = .;
         /* freed after init ends here */
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index b1d126258dee..82f364e209fc 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -31,8 +31,6 @@
 #include <asm/mmzone.h>
 #include <asm/sections.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 extern int  data_start;
 
 #ifdef CONFIG_DISCONTIGMEM
@@ -371,24 +369,158 @@ static void __init setup_bootmem(void)
         request_resource(&sysram_resources[0], &pdcdata_resource);
 }
 
+static void __init map_pages(unsigned long start_vaddr,
+                             unsigned long start_paddr, unsigned long size,
+                             pgprot_t pgprot, int force)
+{
+        pgd_t *pg_dir;
+        pmd_t *pmd;
+        pte_t *pg_table;
+        unsigned long end_paddr;
+        unsigned long start_pmd;
+        unsigned long start_pte;
+        unsigned long tmp1;
+        unsigned long tmp2;
+        unsigned long address;
+        unsigned long vaddr;
+        unsigned long ro_start;
+        unsigned long ro_end;
+        unsigned long fv_addr;
+        unsigned long gw_addr;
+        extern const unsigned long fault_vector_20;
+        extern void * const linux_gateway_page;
+
+        ro_start = __pa((unsigned long)_text);
+        ro_end   = __pa((unsigned long)&data_start);
+        fv_addr  = __pa((unsigned long)&fault_vector_20) & PAGE_MASK;
+        gw_addr  = __pa((unsigned long)&linux_gateway_page) & PAGE_MASK;
+
+        end_paddr = start_paddr + size;
+
+        pg_dir = pgd_offset_k(start_vaddr);
+
+#if PTRS_PER_PMD == 1
+        start_pmd = 0;
+#else
+        start_pmd = ((start_vaddr >> PMD_SHIFT) & (PTRS_PER_PMD - 1));
+#endif
+        start_pte = ((start_vaddr >> PAGE_SHIFT) & (PTRS_PER_PTE - 1));
+
+        address = start_paddr;
+        vaddr = start_vaddr;
+        while (address < end_paddr) {
+#if PTRS_PER_PMD == 1
+                pmd = (pmd_t *)__pa(pg_dir);
+#else
+                pmd = (pmd_t *)pgd_address(*pg_dir);
+
+                /*
+                 * pmd is physical at this point
+                 */
+
+                if (!pmd) {
+                        pmd = (pmd_t *) alloc_bootmem_low_pages_node(NODE_DATA(0), PAGE_SIZE << PMD_ORDER);
+                        pmd = (pmd_t *) __pa(pmd);
+                }
+
+                pgd_populate(NULL, pg_dir, __va(pmd));
+#endif
+                pg_dir++;
+
+                /* now change pmd to kernel virtual addresses */
+
+                pmd = (pmd_t *)__va(pmd) + start_pmd;
+                for (tmp1 = start_pmd; tmp1 < PTRS_PER_PMD; tmp1++, pmd++) {
+
+                        /*
+                         * pg_table is physical at this point
+                         */
+
+                        pg_table = (pte_t *)pmd_address(*pmd);
+                        if (!pg_table) {
+                                pg_table = (pte_t *)
+                                        alloc_bootmem_low_pages_node(NODE_DATA(0), PAGE_SIZE);
+                                pg_table = (pte_t *) __pa(pg_table);
+                        }
+
+                        pmd_populate_kernel(NULL, pmd, __va(pg_table));
+
+                        /* now change pg_table to kernel virtual addresses */
+
+                        pg_table = (pte_t *) __va(pg_table) + start_pte;
+                        for (tmp2 = start_pte; tmp2 < PTRS_PER_PTE; tmp2++, pg_table++) {
+                                pte_t pte;
+
+                                /*
+                                 * Map the fault vector writable so we can
+                                 * write the HPMC checksum.
+                                 */
+                                if (force)
+                                        pte =  __mk_pte(address, pgprot);
+                                else if (core_kernel_text(vaddr) &&
+                                         address != fv_addr)
+                                        pte = __mk_pte(address, PAGE_KERNEL_EXEC);
+                                else
+#if defined(CONFIG_PARISC_PAGE_SIZE_4KB)
+                                if (address >= ro_start && address < ro_end
+                                                        && address != fv_addr
+                                                        && address != gw_addr)
+                                        pte = __mk_pte(address, PAGE_KERNEL_RO);
+                                else
+#endif
+                                        pte = __mk_pte(address, pgprot);
+
+                                if (address >= end_paddr) {
+                                        if (force)
+                                                break;
+                                        else
+                                                pte_val(pte) = 0;
+                                }
+
+                                set_pte(pg_table, pte);
+
+                                address += PAGE_SIZE;
+                                vaddr += PAGE_SIZE;
+                        }
+                        start_pte = 0;
+
+                        if (address >= end_paddr)
+                            break;
+                }
+                start_pmd = 0;
+        }
+}
+
 void free_initmem(void)
 {
         unsigned long addr;
         unsigned long init_begin = (unsigned long)__init_begin;
         unsigned long init_end = (unsigned long)__init_end;
 
-#ifdef CONFIG_DEBUG_KERNEL
+        /* The init text pages are marked R-X.  We have to
+         * flush the icache and mark them RW-
+         *
+         * This is tricky, because map_pages is in the init section.
+         * Do a dummy remap of the data section first (the data
+         * section is already PAGE_KERNEL) to pull in the TLB entries
+         * for map_kernel */
+        map_pages(init_begin, __pa(init_begin), init_end - init_begin,
+                  PAGE_KERNEL_RWX, 1);
+        /* now remap at PAGE_KERNEL since the TLB is pre-primed to execute
+         * map_pages */
+        map_pages(init_begin, __pa(init_begin), init_end - init_begin,
+                  PAGE_KERNEL, 1);
+
+        /* force the kernel to see the new TLB entries */
+        __flush_tlb_range(0, init_begin, init_end);
         /* Attempt to catch anyone trying to execute code here
          * by filling the page with BRK insns.
          */
         memset((void *)init_begin, 0x00, init_end - init_begin);
+        /* finally dump all the instructions which were cached, since the
+         * pages are no-longer executable */
         flush_icache_range(init_begin, init_end);
-#endif
         
-        /* align __init_begin and __init_end to page size,
-           ignoring linker script where we might have tried to save RAM */
-        init_begin = PAGE_ALIGN(init_begin);
-        init_end = PAGE_ALIGN(init_end);
         for (addr = init_begin; addr < init_end; addr += PAGE_SIZE) {
                 ClearPageReserved(virt_to_page(addr));
                 init_page_count(virt_to_page(addr));
@@ -552,7 +684,7 @@ void show_mem(unsigned int filter)
         int shared = 0, cached = 0;
 
         printk(KERN_INFO "Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
 #ifndef CONFIG_DISCONTIGMEM
         i = max_mapnr;
         while (i-- > 0) {
@@ -618,114 +750,6 @@ void show_mem(unsigned int filter)
 #endif
 }
 
-
-static void __init map_pages(unsigned long start_vaddr, unsigned long start_paddr, unsigned long size, pgprot_t pgprot)
-{
-        pgd_t *pg_dir;
-        pmd_t *pmd;
-        pte_t *pg_table;
-        unsigned long end_paddr;
-        unsigned long start_pmd;
-        unsigned long start_pte;
-        unsigned long tmp1;
-        unsigned long tmp2;
-        unsigned long address;
-        unsigned long ro_start;
-        unsigned long ro_end;
-        unsigned long fv_addr;
-        unsigned long gw_addr;
-        extern const unsigned long fault_vector_20;
-        extern void * const linux_gateway_page;
-
-        ro_start = __pa((unsigned long)_text);
-        ro_end   = __pa((unsigned long)&data_start);
-        fv_addr  = __pa((unsigned long)&fault_vector_20) & PAGE_MASK;
-        gw_addr  = __pa((unsigned long)&linux_gateway_page) & PAGE_MASK;
-
-        end_paddr = start_paddr + size;
-
-        pg_dir = pgd_offset_k(start_vaddr);
-
-#if PTRS_PER_PMD == 1
-        start_pmd = 0;
-#else
-        start_pmd = ((start_vaddr >> PMD_SHIFT) & (PTRS_PER_PMD - 1));
-#endif
-        start_pte = ((start_vaddr >> PAGE_SHIFT) & (PTRS_PER_PTE - 1));
-
-        address = start_paddr;
-        while (address < end_paddr) {
-#if PTRS_PER_PMD == 1
-                pmd = (pmd_t *)__pa(pg_dir);
-#else
-                pmd = (pmd_t *)pgd_address(*pg_dir);
-
-                /*
-                 * pmd is physical at this point
-                 */
-
-                if (!pmd) {
-                        pmd = (pmd_t *) alloc_bootmem_low_pages_node(NODE_DATA(0),PAGE_SIZE << PMD_ORDER);
-                        pmd = (pmd_t *) __pa(pmd);
-                }
-
-                pgd_populate(NULL, pg_dir, __va(pmd));
-#endif
-                pg_dir++;
-
-                /* now change pmd to kernel virtual addresses */
-
-                pmd = (pmd_t *)__va(pmd) + start_pmd;
-                for (tmp1 = start_pmd; tmp1 < PTRS_PER_PMD; tmp1++,pmd++) {
-
-                        /*
-                         * pg_table is physical at this point
-                         */
-
-                        pg_table = (pte_t *)pmd_address(*pmd);
-                        if (!pg_table) {
-                                pg_table = (pte_t *)
-                                        alloc_bootmem_low_pages_node(NODE_DATA(0),PAGE_SIZE);
-                                pg_table = (pte_t *) __pa(pg_table);
-                        }
-
-                        pmd_populate_kernel(NULL, pmd, __va(pg_table));
-
-                        /* now change pg_table to kernel virtual addresses */
-
-                        pg_table = (pte_t *) __va(pg_table) + start_pte;
-                        for (tmp2 = start_pte; tmp2 < PTRS_PER_PTE; tmp2++,pg_table++) {
-                                pte_t pte;
-
-                                /*
-                                 * Map the fault vector writable so we can
-                                 * write the HPMC checksum.
-                                 */
-#if defined(CONFIG_PARISC_PAGE_SIZE_4KB)
-                                if (address >= ro_start && address < ro_end
-                                                        && address != fv_addr
-                                                        && address != gw_addr)
-                                    pte = __mk_pte(address, PAGE_KERNEL_RO);
-                                else
-#endif
-                                    pte = __mk_pte(address, pgprot);
-
-                                if (address >= end_paddr)
-                                        pte_val(pte) = 0;
-
-                                set_pte(pg_table, pte);
-
-                                address += PAGE_SIZE;
-                        }
-                        start_pte = 0;
-
-                        if (address >= end_paddr)
-                            break;
-                }
-                start_pmd = 0;
-        }
-}
-
 /*
  * pagetable_init() sets up the page tables
  *
@@ -750,14 +774,14 @@ static void __init pagetable_init(void)
                 size = pmem_ranges[range].pages << PAGE_SHIFT;
 
                 map_pages((unsigned long)__va(start_paddr), start_paddr,
-                        size, PAGE_KERNEL);
+                          size, PAGE_KERNEL, 0);
         }
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_end && initrd_end > mem_limit) {
                 printk(KERN_INFO "initrd: mapping %08lx-%08lx\n", initrd_start, initrd_end);
                 map_pages(initrd_start, __pa(initrd_start),
-                        initrd_end - initrd_start, PAGE_KERNEL);
+                          initrd_end - initrd_start, PAGE_KERNEL, 0);
         }
 #endif
 
@@ -782,7 +806,7 @@ static void __init gateway_init(void)
          */
 
         map_pages(linux_gateway_page_addr, __pa(&linux_gateway_page),
-                PAGE_SIZE, PAGE_GATEWAY);
+                  PAGE_SIZE, PAGE_GATEWAY, 1);
 }
 
 #ifdef CONFIG_HPUX
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8f4d50b0adfa..423145a6f7ba 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -140,6 +140,7 @@ config PPC
         select IRQ_PER_CPU
         select GENERIC_IRQ_SHOW
         select GENERIC_IRQ_SHOW_LEVEL
+        select HAVE_RCU_TABLE_FREE if SMP
 
 config EARLY_PRINTK
         bool
@@ -193,6 +194,12 @@ config SYS_SUPPORTS_APM_EMULATION
         default y if PMAC_APM_EMU
         bool
 
+config EPAPR_BOOT
+        bool
+        help
+          Used to allow a board to specify it wants an ePAPR compliant wrapper.
+        default n
+
 config DEFAULT_UIMAGE
         bool
         help
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 2d38a50e66ba..e72dcf6a421d 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -35,27 +35,6 @@ config DEBUG_STACKOVERFLOW
           This option will cause messages to be printed if free stack space
           drops below a certain limit.
 
-config DEBUG_STACK_USAGE
-        bool "Stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        help
-          Enables the display of the minimum amount of free stack which each
-          task has ever had available in the sysrq-T and sysrq-P debug output.
-
-          This option will slow down process creation somewhat.
-
-config DEBUG_PER_CPU_MAPS
-        bool "Debug access to per_cpu maps"
-        depends on DEBUG_KERNEL
-        depends on SMP
-        default n
-        ---help---
-          Say Y to verify that the per_cpu map being accessed has
-          been setup.  Adds a fair amount of code to kernel memory
-          and decreases performance.
-
-          Say N if unsure.
-
 config HCALL_STATS
         bool "Hypervisor call instrumentation"
         depends on PPC_PSERIES && DEBUG_FS && TRACEPOINTS
@@ -267,6 +246,11 @@ config PPC_EARLY_DEBUG_USBGECKO
           Select this to enable early debugging for Nintendo GameCube/Wii
           consoles via an external USB Gecko adapter.
 
+config PPC_EARLY_DEBUG_WSP
+        bool "Early debugging via WSP's internal UART"
+        depends on PPC_WSP
+        select PPC_UDBG_16550
+
 endchoice
 
 config PPC_EARLY_DEBUG_44x_PHYSLOW
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 89178164af5e..c26200b40a47 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -69,7 +69,8 @@ src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
                 cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \
                 fsl-soc.c mpc8xx.c pq2.c ugecon.c
 src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \
-                cuboot-ebony.c cuboot-hotfoot.c treeboot-ebony.c prpmc2800.c \
+                cuboot-ebony.c cuboot-hotfoot.c epapr.c treeboot-ebony.c \
+                prpmc2800.c \
                 ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \
                 cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c \
                 cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
@@ -127,7 +128,7 @@ quiet_cmd_bootas = BOOTAS  $@
       cmd_bootas = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<
 
 quiet_cmd_bootar = BOOTAR  $@
-      cmd_bootar = $(CROSS32AR) -cr $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@
+      cmd_bootar = $(CROSS32AR) -cr$(KBUILD_ARFLAGS) $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@
 
 $(obj-libfdt): $(obj)/%.o: $(srctree)/scripts/dtc/libfdt/%.c FORCE
         $(call if_changed_dep,bootcc)
@@ -182,6 +183,7 @@ image-$(CONFIG_PPC_HOLLY)		+= dtbImage.holly
 image-$(CONFIG_PPC_PRPMC2800)           += dtbImage.prpmc2800
 image-$(CONFIG_PPC_ISERIES)             += zImage.iseries
 image-$(CONFIG_DEFAULT_UIMAGE)          += uImage
+image-$(CONFIG_EPAPR_BOOT)              += zImage.epapr
 
 #
 # Targets which embed a device tree blob
diff --git a/arch/powerpc/boot/crt0.S b/arch/powerpc/boot/crt0.S
index f1c4dfc635be..0f7428a37efb 100644
--- a/arch/powerpc/boot/crt0.S
+++ b/arch/powerpc/boot/crt0.S
@@ -6,16 +6,28 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  *
- * NOTE: this code runs in 32 bit mode and is packaged as ELF32.
+ * NOTE: this code runs in 32 bit mode, is position-independent,
+ * and is packaged as ELF32.
  */
 
 #include "ppc_asm.h"
 
         .text
-        /* a procedure descriptor used when booting this as a COFF file */
+        /* A procedure descriptor used when booting this as a COFF file.
+         * When making COFF, this comes first in the link and we're
+         * linked at 0x500000.
+         */
         .globl  _zimage_start_opd
 _zimage_start_opd:
-        .long   _zimage_start, 0, 0, 0
+        .long   0x500000, 0, 0, 0
+
+p_start:        .long   _start
+p_etext:        .long   _etext
+p_bss_start:    .long   __bss_start
+p_end:          .long   _end
+
+        .weak   _platform_stack_top
+p_pstack:       .long   _platform_stack_top
 
         .weak   _zimage_start
         .globl  _zimage_start
@@ -24,37 +36,65 @@ _zimage_start:
 _zimage_start_lib:
         /* Work out the offset between the address we were linked at
            and the address where we're running. */
-        bl      1f
-1:      mflr    r0
-        lis     r9,1b@ha
-        addi    r9,r9,1b@l
-        subf.   r0,r9,r0
-        beq     3f              /* if running at same address as linked */
+        bl      .+4
+p_base: mflr    r10             /* r10 now points to runtime addr of p_base */
+        /* grab the link address of the dynamic section in r11 */
+        addis   r11,r10,(_GLOBAL_OFFSET_TABLE_-p_base)@ha
+        lwz     r11,(_GLOBAL_OFFSET_TABLE_-p_base)@l(r11)
+        cmpwi   r11,0
+        beq     3f              /* if not linked -pie */
+        /* get the runtime address of the dynamic section in r12 */
+        .weak   __dynamic_start
+        addis   r12,r10,(__dynamic_start-p_base)@ha
+        addi    r12,r12,(__dynamic_start-p_base)@l
+        subf    r11,r11,r12     /* runtime - linktime offset */
+
+        /* The dynamic section contains a series of tagged entries.
+         * We need the RELA and RELACOUNT entries. */
+RELA = 7
+RELACOUNT = 0x6ffffff9
+        li      r9,0
+        li      r0,0
+9:      lwz     r8,0(r12)       /* get tag */
+        cmpwi   r8,0
+        beq     10f             /* end of list */
+        cmpwi   r8,RELA
+        bne     11f
+        lwz     r9,4(r12)       /* get RELA pointer in r9 */
+        b       12f
+11:     addis   r8,r8,(-RELACOUNT)@ha
+        cmpwi   r8,RELACOUNT@l
+        bne     12f
+        lwz     r0,4(r12)       /* get RELACOUNT value in r0 */
+12:     addi    r12,r12,8
+        b       9b
 
-        /* The .got2 section contains a list of addresses, so add
-           the address offset onto each entry. */
-        lis     r9,__got2_start@ha
-        addi    r9,r9,__got2_start@l
-        lis     r8,__got2_end@ha
-        addi    r8,r8,__got2_end@l
-        subf.   r8,r9,r8
+        /* The relocation section contains a list of relocations.
+         * We now do the R_PPC_RELATIVE ones, which point to words
+         * which need to be initialized with addend + offset.
+         * The R_PPC_RELATIVE ones come first and there are RELACOUNT
+         * of them. */
+10:     /* skip relocation if we don't have both */
+        cmpwi   r0,0
         beq     3f
-        srwi.   r8,r8,2
-        mtctr   r8
-        add     r9,r0,r9
-2:      lwz     r8,0(r9)
-        add     r8,r8,r0
-        stw     r8,0(r9)
-        addi    r9,r9,4
+        cmpwi   r9,0
+        beq     3f
+
+        add     r9,r9,r11       /* Relocate RELA pointer */
+        mtctr   r0
+2:      lbz     r0,4+3(r9)      /* ELF32_R_INFO(reloc->r_info) */
+        cmpwi   r0,22           /* R_PPC_RELATIVE */
+        bne     3f
+        lwz     r12,0(r9)       /* reloc->r_offset */
+        lwz     r0,8(r9)        /* reloc->r_addend */
+        add     r0,r0,r11
+        stwx    r0,r11,r12
+        addi    r9,r9,12
         bdnz    2b
 
         /* Do a cache flush for our text, in case the loader didn't */
-3:      lis     r9,_start@ha
-        addi    r9,r9,_start@l
-        add     r9,r0,r9
-        lis     r8,_etext@ha
-        addi    r8,r8,_etext@l
-        add     r8,r0,r8
+3:      lwz     r9,p_start-p_base(r10)  /* note: these are relocated now */
+        lwz     r8,p_etext-p_base(r10)
 4:      dcbf    r0,r9
         icbi    r0,r9
         addi    r9,r9,0x20
@@ -64,27 +104,19 @@ _zimage_start_lib:
         isync
 
         /* Clear the BSS */
-        lis     r9,__bss_start@ha
-        addi    r9,r9,__bss_start@l
-        add     r9,r0,r9
-        lis     r8,_end@ha
-        addi    r8,r8,_end@l
-        add     r8,r0,r8
-        li      r10,0
-5:      stw     r10,0(r9)
+        lwz     r9,p_bss_start-p_base(r10)
+        lwz     r8,p_end-p_base(r10)
+        li      r0,0
+5:      stw     r0,0(r9)
         addi    r9,r9,4
         cmplw   cr0,r9,r8
         blt     5b
 
         /* Possibly set up a custom stack */
-.weak   _platform_stack_top
-        lis     r8,_platform_stack_top@ha
-        addi    r8,r8,_platform_stack_top@l
+        lwz     r8,p_pstack-p_base(r10)
         cmpwi   r8,0
         beq     6f
-        add     r8,r0,r8
         lwz     r1,0(r8)
-        add     r1,r0,r1
         li      r0,0
         stwu    r0,-16(r1)      /* establish a stack frame */
 6:
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index 761faa7b6964..ac1eb320c7b4 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -176,6 +176,19 @@
                         sleep = <&pmc 0x00300000>;
                 };
 
+                ptp_clock@24E00 {
+                        compatible = "fsl,etsec-ptp";
+                        reg = <0x24E00 0xB0>;
+                        interrupts = <12 0x8 13 0x8>;
+                        interrupt-parent = < &ipic >;
+                        fsl,tclk-period = <10>;
+                        fsl,tmr-prsc    = <100>;
+                        fsl,tmr-add     = <0x999999A4>;
+                        fsl,tmr-fiper1  = <0x3B9AC9F6>;
+                        fsl,tmr-fiper2  = <0x00018696>;
+                        fsl,max-adj     = <659999998>;
+                };
+
                 enet0: ethernet@24000 {
                         #address-cells = <1>;
                         #size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
index cafc1285c140..f6c04d25e916 100644
--- a/arch/powerpc/boot/dts/mpc8572ds.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -324,6 +324,19 @@
                         };
                 };
 
+                ptp_clock@24E00 {
+                        compatible = "fsl,etsec-ptp";
+                        reg = <0x24E00 0xB0>;
+                        interrupts = <68 2 69 2 70 2 71 2>;
+                        interrupt-parent = < &mpic >;
+                        fsl,tclk-period = <5>;
+                        fsl,tmr-prsc = <200>;
+                        fsl,tmr-add = <0xAAAAAAAB>;
+                        fsl,tmr-fiper1 = <0x3B9AC9FB>;
+                        fsl,tmr-fiper2 = <0x3B9AC9FB>;
+                        fsl,max-adj = <499999999>;
+                };
+
                 enet0: ethernet@24000 {
                         #address-cells = <1>;
                         #size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/p1020rdb.dts b/arch/powerpc/boot/dts/p1020rdb.dts
index e0668f877794..d6a8ae458137 100644
--- a/arch/powerpc/boot/dts/p1020rdb.dts
+++ b/arch/powerpc/boot/dts/p1020rdb.dts
@@ -9,12 +9,11 @@
  * option) any later version.
  */
 
-/dts-v1/;
+/include/ "p1020si.dtsi"
+
 / {
-        model = "fsl,P1020";
+        model = "fsl,P1020RDB";
         compatible = "fsl,P1020RDB";
-        #address-cells = <2>;
-        #size-cells = <2>;
 
         aliases {
                 serial0 = &serial0;
@@ -26,34 +25,11 @@
                 pci1 = &pci1;
         };
 
-        cpus {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                PowerPC,P1020@0 {
-                        device_type = "cpu";
-                        reg = <0x0>;
-                        next-level-cache = <&L2>;
-                };
-
-                PowerPC,P1020@1 {
-                        device_type = "cpu";
-                        reg = <0x1>;
-                        next-level-cache = <&L2>;
-                };
-        };
-
         memory {
                 device_type = "memory";
         };
 
         localbus@ffe05000 {
-                #address-cells = <2>;
-                #size-cells = <1>;
-                compatible = "fsl,p1020-elbc", "fsl,elbc", "simple-bus";
-                reg = <0 0xffe05000 0 0x1000>;
-                interrupts = <19 2>;
-                interrupt-parent = <&mpic>;
 
                 /* NOR, NAND Flashes and Vitesse 5 port L2 switch */
                 ranges = <0x0 0x0 0x0 0xef000000 0x01000000
@@ -165,88 +141,14 @@
         };
 
         soc@ffe00000 {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                device_type = "soc";
-                compatible = "fsl,p1020-immr", "simple-bus";
-                ranges = <0x0  0x0 0xffe00000 0x100000>;
-                bus-frequency = <0>;            // Filled out by uboot.
-
-                ecm-law@0 {
-                        compatible = "fsl,ecm-law";
-                        reg = <0x0 0x1000>;
-                        fsl,num-laws = <12>;
-                };
-
-                ecm@1000 {
-                        compatible = "fsl,p1020-ecm", "fsl,ecm";
-                        reg = <0x1000 0x1000>;
-                        interrupts = <16 2>;
-                        interrupt-parent = <&mpic>;
-                };
-
-                memory-controller@2000 {
-                        compatible = "fsl,p1020-memory-controller";
-                        reg = <0x2000 0x1000>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <16 2>;
-                };
-
                 i2c@3000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        cell-index = <0>;
-                        compatible = "fsl-i2c";
-                        reg = <0x3000 0x100>;
-                        interrupts = <43 2>;
-                        interrupt-parent = <&mpic>;
-                        dfsrr;
                         rtc@68 {
                                 compatible = "dallas,ds1339";
                                 reg = <0x68>;
                         };
                 };
 
-                i2c@3100 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        cell-index = <1>;
-                        compatible = "fsl-i2c";
-                        reg = <0x3100 0x100>;
-                        interrupts = <43 2>;
-                        interrupt-parent = <&mpic>;
-                        dfsrr;
-                };
-
-                serial0: serial@4500 {
-                        cell-index = <0>;
-                        device_type = "serial";
-                        compatible = "ns16550";
-                        reg = <0x4500 0x100>;
-                        clock-frequency = <0>;
-                        interrupts = <42 2>;
-                        interrupt-parent = <&mpic>;
-                };
-
-                serial1: serial@4600 {
-                        cell-index = <1>;
-                        device_type = "serial";
-                        compatible = "ns16550";
-                        reg = <0x4600 0x100>;
-                        clock-frequency = <0>;
-                        interrupts = <42 2>;
-                        interrupt-parent = <&mpic>;
-                };
-
                 spi@7000 {
-                        cell-index = <0>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,espi";
-                        reg = <0x7000 0x1000>;
-                        interrupts = <59 0x2>;
-                        interrupt-parent = <&mpic>;
-                        mode = "cpu";
 
                         fsl_m25p80@0 {
                                 #address-cells = <1>;
@@ -294,66 +196,7 @@
                         };
                 };
 
-                gpio: gpio-controller@f000 {
-                        #gpio-cells = <2>;
-                        compatible = "fsl,mpc8572-gpio";
-                        reg = <0xf000 0x100>;
-                        interrupts = <47 0x2>;
-                        interrupt-parent = <&mpic>;
-                        gpio-controller;
-                };
-
-                L2: l2-cache-controller@20000 {
-                        compatible = "fsl,p1020-l2-cache-controller";
-                        reg = <0x20000 0x1000>;
-                        cache-line-size = <32>; // 32 bytes
-                        cache-size = <0x40000>; // L2,256K
-                        interrupt-parent = <&mpic>;
-                        interrupts = <16 2>;
-                };
-
-                dma@21300 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "fsl,eloplus-dma";
-                        reg = <0x21300 0x4>;
-                        ranges = <0x0 0x21100 0x200>;
-                        cell-index = <0>;
-                        dma-channel@0 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x0 0x80>;
-                                cell-index = <0>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <20 2>;
-                        };
-                        dma-channel@80 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x80 0x80>;
-                                cell-index = <1>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <21 2>;
-                        };
-                        dma-channel@100 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x100 0x80>;
-                                cell-index = <2>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <22 2>;
-                        };
-                        dma-channel@180 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x180 0x80>;
-                                cell-index = <3>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <23 2>;
-                        };
-                };
-
                 mdio@24000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,etsec2-mdio";
-                        reg = <0x24000 0x1000 0xb0030 0x4>;
 
                         phy0: ethernet-phy@0 {
                                 interrupt-parent = <&mpic>;
@@ -369,10 +212,6 @@
                 };
 
                 mdio@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,etsec2-tbi";
-                        reg = <0x25000 0x1000 0xb1030 0x4>;
 
                         tbi0: tbi-phy@11 {
                                 reg = <0x11>;
@@ -381,97 +220,25 @@
                 };
 
                 enet0: ethernet@b0000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        device_type = "network";
-                        model = "eTSEC";
-                        compatible = "fsl,etsec2";
-                        fsl,num_rx_queues = <0x8>;
-                        fsl,num_tx_queues = <0x8>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupt-parent = <&mpic>;
                         fixed-link = <1 1 1000 0 0>;
                         phy-connection-type = "rgmii-id";
 
-                        queue-group@0 {
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                reg = <0xb0000 0x1000>;
-                                interrupts = <29 2 30 2 34 2>;
-                        };
-
-                        queue-group@1 {
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                reg = <0xb4000 0x1000>;
-                                interrupts = <17 2 18 2 24 2>;
-                        };
                 };
 
                 enet1: ethernet@b1000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        device_type = "network";
-                        model = "eTSEC";
-                        compatible = "fsl,etsec2";
-                        fsl,num_rx_queues = <0x8>;
-                        fsl,num_tx_queues = <0x8>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupt-parent = <&mpic>;
                         phy-handle = <&phy0>;
                         tbi-handle = <&tbi0>;
                         phy-connection-type = "sgmii";
 
-                        queue-group@0 {
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                reg = <0xb1000 0x1000>;
-                                interrupts = <35 2 36 2 40 2>;
-                        };
-
-                        queue-group@1 {
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                reg = <0xb5000 0x1000>;
-                                interrupts = <51 2 52 2 67 2>;
-                        };
                 };
 
                 enet2: ethernet@b2000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        device_type = "network";
-                        model = "eTSEC";
-                        compatible = "fsl,etsec2";
-                        fsl,num_rx_queues = <0x8>;
-                        fsl,num_tx_queues = <0x8>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupt-parent = <&mpic>;
                         phy-handle = <&phy1>;
                         phy-connection-type = "rgmii-id";
 
-                        queue-group@0 {
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                reg = <0xb2000 0x1000>;
-                                interrupts = <31 2 32 2 33 2>;
-                        };
-
-                        queue-group@1 {
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                reg = <0xb6000 0x1000>;
-                                interrupts = <25 2 26 2 27 2>;
-                        };
                 };
 
                 usb@22000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl-usb2-dr";
-                        reg = <0x22000 0x1000>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <28 0x2>;
                         phy_type = "ulpi";
                 };
 
@@ -481,82 +248,23 @@
                    it enables USB2. OTOH, U-Boot does create a new node
                    when there isn't any. So, just comment it out.
                 usb@23000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl-usb2-dr";
-                        reg = <0x23000 0x1000>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <46 0x2>;
                         phy_type = "ulpi";
                 };
                 */
 
-                sdhci@2e000 {
-                        compatible = "fsl,p1020-esdhc", "fsl,esdhc";
-                        reg = <0x2e000 0x1000>;
-                        interrupts = <72 0x2>;
-                        interrupt-parent = <&mpic>;
-                        /* Filled in by U-Boot */
-                        clock-frequency = <0>;
-                };
-
-                crypto@30000 {
-                        compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4",
-                                     "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
-                        reg = <0x30000 0x10000>;
-                        interrupts = <45 2 58 2>;
-                        interrupt-parent = <&mpic>;
-                        fsl,num-channels = <4>;
-                        fsl,channel-fifo-len = <24>;
-                        fsl,exec-units-mask = <0xbfe>;
-                        fsl,descriptor-types-mask = <0x3ab0ebf>;
-                };
-
-                mpic: pic@40000 {
-                        interrupt-controller;
-                        #address-cells = <0>;
-                        #interrupt-cells = <2>;
-                        reg = <0x40000 0x40000>;
-                        compatible = "chrp,open-pic";
-                        device_type = "open-pic";
-                };
-
-                msi@41600 {
-                        compatible = "fsl,p1020-msi", "fsl,mpic-msi";
-                        reg = <0x41600 0x80>;
-                        msi-available-ranges = <0 0x100>;
-                        interrupts = <
-                                0xe0 0
-                                0xe1 0
-                                0xe2 0
-                                0xe3 0
-                                0xe4 0
-                                0xe5 0
-                                0xe6 0
-                                0xe7 0>;
-                        interrupt-parent = <&mpic>;
-                };
-
-                global-utilities@e0000 {        //global utilities block
-                        compatible = "fsl,p1020-guts";
-                        reg = <0xe0000 0x1000>;
-                        fsl,has-rstcr;
-                };
         };
 
         pci0: pcie@ffe09000 {
-                compatible = "fsl,mpc8548-pcie";
-                device_type = "pci";
-                #interrupt-cells = <1>;
-                #size-cells = <2>;
-                #address-cells = <3>;
-                reg = <0 0xffe09000 0 0x1000>;
-                bus-range = <0 255>;
                 ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
-                clock-frequency = <33333333>;
-                interrupt-parent = <&mpic>;
-                interrupts = <16 2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0x0 0x0 0x1 &mpic 0x4 0x1
+                        0000 0x0 0x0 0x2 &mpic 0x5 0x1
+                        0000 0x0 0x0 0x3 &mpic 0x6 0x1
+                        0000 0x0 0x0 0x4 &mpic 0x7 0x1
+                        >;
                 pcie@0 {
                         reg = <0x0 0x0 0x0 0x0 0x0>;
                         #size-cells = <2>;
@@ -573,18 +281,16 @@
         };
 
         pci1: pcie@ffe0a000 {
-                compatible = "fsl,mpc8548-pcie";
-                device_type = "pci";
-                #interrupt-cells = <1>;
-                #size-cells = <2>;
-                #address-cells = <3>;
-                reg = <0 0xffe0a000 0 0x1000>;
-                bus-range = <0 255>;
                 ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
-                clock-frequency = <33333333>;
-                interrupt-parent = <&mpic>;
-                interrupts = <16 2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0x0 0x0 0x1 &mpic 0x0 0x1
+                        0000 0x0 0x0 0x2 &mpic 0x1 0x1
+                        0000 0x0 0x0 0x3 &mpic 0x2 0x1
+                        0000 0x0 0x0 0x4 &mpic 0x3 0x1
+                        >;
                 pcie@0 {
                         reg = <0x0 0x0 0x0 0x0 0x0>;
                         #size-cells = <2>;
diff --git a/arch/powerpc/boot/dts/p1020rdb_camp_core0.dts b/arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
new file mode 100644
index 000000000000..f0bf7f42f097
--- /dev/null
+++ b/arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
@@ -0,0 +1,213 @@
+/*
+ * P1020 RDB  Core0 Device Tree Source in CAMP mode.
+ *
+ * In CAMP mode, each core needs to have its own dts. Only mpic and L2 cache
+ * can be shared, all the other devices must be assigned to one core only.
+ * This dts file allows core0 to have memory, l2, i2c, spi, gpio, tdm, dma, usb,
+ * eth1, eth2, sdhc, crypto, global-util, message, pci0, pci1, msi.
+ *
+ * Please note to add "-b 0" for core0's dts compiling.
+ *
+ * Copyright 2011 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/ "p1020si.dtsi"
+
+/ {
+        model = "fsl,P1020RDB";
+        compatible = "fsl,P1020RDB", "fsl,MPC85XXRDB-CAMP";
+
+        aliases {
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                serial0 = &serial0;
+                pci0 = &pci0;
+                pci1 = &pci1;
+        };
+
+        cpus {
+                PowerPC,P1020@1 {
+                status = "disabled";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+        };
+
+        localbus@ffe05000 {
+                status = "disabled";
+        };
+
+        soc@ffe00000 {
+                i2c@3000 {
+                        rtc@68 {
+                                compatible = "dallas,ds1339";
+                                reg = <0x68>;
+                        };
+                };
+
+                serial1: serial@4600 {
+                        status = "disabled";
+                };
+
+                spi@7000 {
+                        fsl_m25p80@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "fsl,espi-flash";
+                                reg = <0>;
+                                linux,modalias = "fsl_m25p80";
+                                spi-max-frequency = <40000000>;
+
+                                partition@0 {
+                                        /* 512KB for u-boot Bootloader Image */
+                                        reg = <0x0 0x00080000>;
+                                        label = "SPI (RO) U-Boot Image";
+                                        read-only;
+                                };
+
+                                partition@80000 {
+                                        /* 512KB for DTB Image */
+                                        reg = <0x00080000 0x00080000>;
+                                        label = "SPI (RO) DTB Image";
+                                        read-only;
+                                };
+
+                                partition@100000 {
+                                        /* 4MB for Linux Kernel Image */
+                                        reg = <0x00100000 0x00400000>;
+                                        label = "SPI (RO) Linux Kernel Image";
+                                        read-only;
+                                };
+
+                                partition@500000 {
+                                        /* 4MB for Compressed RFS Image */
+                                        reg = <0x00500000 0x00400000>;
+                                        label = "SPI (RO) Compressed RFS Image";
+                                        read-only;
+                                };
+
+                                partition@900000 {
+                                        /* 7MB for JFFS2 based RFS */
+                                        reg = <0x00900000 0x00700000>;
+                                        label = "SPI (RW) JFFS2 RFS";
+                                };
+                        };
+                };
+
+                mdio@24000 {
+                        phy0: ethernet-phy@0 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <3 1>;
+                                reg = <0x0>;
+                        };
+                        phy1: ethernet-phy@1 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <2 1>;
+                                reg = <0x1>;
+                        };
+                };
+
+                mdio@25000 {
+                        tbi0: tbi-phy@11 {
+                                reg = <0x11>;
+                                device_type = "tbi-phy";
+                        };
+                };
+
+                enet0: ethernet@b0000 {
+                        status = "disabled";
+                };
+
+                enet1: ethernet@b1000 {
+                        phy-handle = <&phy0>;
+                        tbi-handle = <&tbi0>;
+                        phy-connection-type = "sgmii";
+                };
+
+                enet2: ethernet@b2000 {
+                        phy-handle = <&phy1>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                usb@22000 {
+                        phy_type = "ulpi";
+                };
+
+                /* USB2 is shared with localbus, so it must be disabled
+                   by default. We can't put 'status = "disabled";' here
+                   since U-Boot doesn't clear the status property when
+                   it enables USB2. OTOH, U-Boot does create a new node
+                   when there isn't any. So, just comment it out.
+                usb@23000 {
+                        phy_type = "ulpi";
+                };
+                */
+
+                mpic: pic@40000 {
+                        protected-sources = <
+                        42 29 30 34     /* serial1, enet0-queue-group0 */
+                        17 18 24 45     /* enet0-queue-group1, crypto */
+                        >;
+                };
+
+        };
+
+        pci0: pcie@ffe09000 {
+                ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
+                          0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0x0 0x0 0x1 &mpic 0x4 0x1
+                        0000 0x0 0x0 0x2 &mpic 0x5 0x1
+                        0000 0x0 0x0 0x3 &mpic 0x6 0x1
+                        0000 0x0 0x0 0x4 &mpic 0x7 0x1
+                        >;
+                pcie@0 {
+                        reg = <0x0 0x0 0x0 0x0 0x0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x2000000 0x0 0xa0000000
+                                  0x2000000 0x0 0xa0000000
+                                  0x0 0x20000000
+
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x100000>;
+                };
+        };
+
+        pci1: pcie@ffe0a000 {
+                ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
+                          0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0x0 0x0 0x1 &mpic 0x0 0x1
+                        0000 0x0 0x0 0x2 &mpic 0x1 0x1
+                        0000 0x0 0x0 0x3 &mpic 0x2 0x1
+                        0000 0x0 0x0 0x4 &mpic 0x3 0x1
+                        >;
+                pcie@0 {
+                        reg = <0x0 0x0 0x0 0x0 0x0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x2000000 0x0 0x80000000
+                                  0x2000000 0x0 0x80000000
+                                  0x0 0x20000000
+
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x100000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/p1020rdb_camp_core1.dts b/arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
new file mode 100644
index 000000000000..6ec02204a44e
--- /dev/null
+++ b/arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
@@ -0,0 +1,148 @@
+/*
+ * P1020 RDB Core1 Device Tree Source in CAMP mode.
+ *
+ * In CAMP mode, each core needs to have its own dts. Only mpic and L2 cache
+ * can be shared, all the other devices must be assigned to one core only.
+ * This dts allows core1 to have l2, eth0, crypto.
+ *
+ * Please note to add "-b 1" for core1's dts compiling.
+ *
+ * Copyright 2011 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/ "p1020si.dtsi"
+
+/ {
+        model = "fsl,P1020RDB";
+        compatible = "fsl,P1020RDB", "fsl,MPC85XXRDB-CAMP";
+
+        aliases {
+                ethernet0 = &enet0;
+                serial0 = &serial1;
+                };
+
+        cpus {
+                PowerPC,P1020@0 {
+                status = "disabled";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+        };
+
+        localbus@ffe05000 {
+                status = "disabled";
+        };
+
+        soc@ffe00000 {
+                ecm-law@0 {
+                        status = "disabled";
+                };
+
+                ecm@1000 {
+                        status = "disabled";
+                };
+
+                memory-controller@2000 {
+                        status = "disabled";
+                };
+
+                i2c@3000 {
+                        status = "disabled";
+                };
+
+                i2c@3100 {
+                        status = "disabled";
+                };
+
+                serial0: serial@4500 {
+                        status = "disabled";
+                };
+
+                spi@7000 {
+                        status = "disabled";
+                };
+
+                gpio: gpio-controller@f000 {
+                        status = "disabled";
+                };
+
+                dma@21300 {
+                        status = "disabled";
+                };
+
+                mdio@24000 {
+                        status = "disabled";
+                };
+
+                mdio@25000 {
+                        status = "disabled";
+                };
+
+                enet0: ethernet@b0000 {
+                        fixed-link = <1 1 1000 0 0>;
+                        phy-connection-type = "rgmii-id";
+
+                };
+
+                enet1: ethernet@b1000 {
+                        status = "disabled";
+                };
+
+                enet2: ethernet@b2000 {
+                        status = "disabled";
+                };
+
+                usb@22000 {
+                        status = "disabled";
+                };
+
+                sdhci@2e000 {
+                        status = "disabled";
+                };
+
+                mpic: pic@40000 {
+                        protected-sources = <
+                        16              /* ecm, mem, L2, pci0, pci1 */
+                        43 42 59        /* i2c, serial0, spi */
+                        47 63 62        /* gpio, tdm */
+                        20 21 22 23     /* dma */
+                        03 02           /* mdio */
+                        35 36 40        /* enet1-queue-group0 */
+                        51 52 67        /* enet1-queue-group1 */
+                        31 32 33        /* enet2-queue-group0 */
+                        25 26 27        /* enet2-queue-group1 */
+                        28 72 58        /* usb, sdhci, crypto */
+                        0xb0 0xb1 0xb2  /* message */
+                        0xb3 0xb4 0xb5
+                        0xb6 0xb7
+                        0xe0 0xe1 0xe2  /* msi */
+                        0xe3 0xe4 0xe5
+                        0xe6 0xe7               /* sdhci, crypto , pci */
+                        >;
+                };
+
+                msi@41600 {
+                        status = "disabled";
+                };
+
+                global-utilities@e0000 {        //global utilities block
+                        status = "disabled";
+                };
+
+        };
+
+        pci0: pcie@ffe09000 {
+                status = "disabled";
+        };
+
+        pci1: pcie@ffe0a000 {
+                status = "disabled";
+        };
+};
diff --git a/arch/powerpc/boot/dts/p1020si.dtsi b/arch/powerpc/boot/dts/p1020si.dtsi
new file mode 100644
index 000000000000..5c5acb66c3fc
--- /dev/null
+++ b/arch/powerpc/boot/dts/p1020si.dtsi
@@ -0,0 +1,377 @@
+/*
+ * P1020si Device Tree Source
+ *
+ * Copyright 2011 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+/ {
+        compatible = "fsl,P1020";
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,P1020@0 {
+                        device_type = "cpu";
+                        reg = <0x0>;
+                        next-level-cache = <&L2>;
+                };
+
+                PowerPC,P1020@1 {
+                        device_type = "cpu";
+                        reg = <0x1>;
+                        next-level-cache = <&L2>;
+                };
+        };
+
+        localbus@ffe05000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,p1020-elbc", "fsl,elbc", "simple-bus";
+                reg = <0 0xffe05000 0 0x1000>;
+                interrupts = <19 2>;
+                interrupt-parent = <&mpic>;
+        };
+
+        soc@ffe00000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "fsl,p1020-immr", "simple-bus";
+                ranges = <0x0  0x0 0xffe00000 0x100000>;
+                bus-frequency = <0>;            // Filled out by uboot.
+
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <12>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,p1020-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <16 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                memory-controller@2000 {
+                        compatible = "fsl,p1020-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <16 2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                spi@7000 {
+                        cell-index = <0>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,espi";
+                        reg = <0x7000 0x1000>;
+                        interrupts = <59 0x2>;
+                        interrupt-parent = <&mpic>;
+                        mode = "cpu";
+                };
+
+                gpio: gpio-controller@f000 {
+                        #gpio-cells = <2>;
+                        compatible = "fsl,mpc8572-gpio";
+                        reg = <0xf000 0x100>;
+                        interrupts = <47 0x2>;
+                        interrupt-parent = <&mpic>;
+                        gpio-controller;
+                };
+
+                L2: l2-cache-controller@20000 {
+                        compatible = "fsl,p1020-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <32>; // 32 bytes
+                        cache-size = <0x40000>; // L2,256K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <16 2>;
+                };
+
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
+                mdio@24000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,etsec2-mdio";
+                        reg = <0x24000 0x1000 0xb0030 0x4>;
+
+                };
+
+                mdio@25000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,etsec2-tbi";
+                        reg = <0x25000 0x1000 0xb1030 0x4>;
+
+                };
+
+                enet0: ethernet@b0000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "fsl,etsec2";
+                        fsl,num_rx_queues = <0x8>;
+                        fsl,num_tx_queues = <0x8>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupt-parent = <&mpic>;
+
+                        queue-group@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0xb0000 0x1000>;
+                                interrupts = <29 2 30 2 34 2>;
+                        };
+
+                        queue-group@1 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0xb4000 0x1000>;
+                                interrupts = <17 2 18 2 24 2>;
+                        };
+                };
+
+                enet1: ethernet@b1000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "fsl,etsec2";
+                        fsl,num_rx_queues = <0x8>;
+                        fsl,num_tx_queues = <0x8>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupt-parent = <&mpic>;
+
+                        queue-group@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0xb1000 0x1000>;
+                                interrupts = <35 2 36 2 40 2>;
+                        };
+
+                        queue-group@1 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0xb5000 0x1000>;
+                                interrupts = <51 2 52 2 67 2>;
+                        };
+                };
+
+                enet2: ethernet@b2000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "fsl,etsec2";
+                        fsl,num_rx_queues = <0x8>;
+                        fsl,num_tx_queues = <0x8>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupt-parent = <&mpic>;
+
+                        queue-group@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0xb2000 0x1000>;
+                                interrupts = <31 2 32 2 33 2>;
+                        };
+
+                        queue-group@1 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0xb6000 0x1000>;
+                                interrupts = <25 2 26 2 27 2>;
+                        };
+                };
+
+                usb@22000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl-usb2-dr";
+                        reg = <0x22000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <28 0x2>;
+                };
+
+                /* USB2 is shared with localbus, so it must be disabled
+                   by default. We can't put 'status = "disabled";' here
+                   since U-Boot doesn't clear the status property when
+                   it enables USB2. OTOH, U-Boot does create a new node
+                   when there isn't any. So, just comment it out.
+                usb@23000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl-usb2-dr";
+                        reg = <0x23000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <46 0x2>;
+                        phy_type = "ulpi";
+                };
+                */
+
+                sdhci@2e000 {
+                        compatible = "fsl,p1020-esdhc", "fsl,esdhc";
+                        reg = <0x2e000 0x1000>;
+                        interrupts = <72 0x2>;
+                        interrupt-parent = <&mpic>;
+                        /* Filled in by U-Boot */
+                        clock-frequency = <0>;
+                };
+
+                crypto@30000 {
+                        compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4",
+                                     "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2 58 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0xbfe>;
+                        fsl,descriptor-types-mask = <0x3ab0ebf>;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                };
+
+                msi@41600 {
+                        compatible = "fsl,p1020-msi", "fsl,mpic-msi";
+                        reg = <0x41600 0x80>;
+                        msi-available-ranges = <0 0x100>;
+                        interrupts = <
+                                0xe0 0
+                                0xe1 0
+                                0xe2 0
+                                0xe3 0
+                                0xe4 0
+                                0xe5 0
+                                0xe6 0
+                                0xe7 0>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                global-utilities@e0000 {        //global utilities block
+                        compatible = "fsl,p1020-guts","fsl,p2020-guts";
+                        reg = <0xe0000 0x1000>;
+                        fsl,has-rstcr;
+                };
+        };
+
+        pci0: pcie@ffe09000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0 0xffe09000 0 0x1000>;
+                bus-range = <0 255>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <16 2>;
+        };
+
+        pci1: pcie@ffe0a000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0 0xffe0a000 0 0x1000>;
+                bus-range = <0 255>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <16 2>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/p1022ds.dts b/arch/powerpc/boot/dts/p1022ds.dts
index 59ef405c1c91..4f685a779f4c 100644
--- a/arch/powerpc/boot/dts/p1022ds.dts
+++ b/arch/powerpc/boot/dts/p1022ds.dts
@@ -52,7 +52,7 @@
                 #size-cells = <1>;
                 compatible = "fsl,p1022-elbc", "fsl,elbc", "simple-bus";
                 reg = <0 0xffe05000 0 0x1000>;
-                interrupts = <19 2>;
+                interrupts = <19 2 0 0>;
 
                 ranges = <0x0 0x0 0xf 0xe8000000 0x08000000
                           0x1 0x0 0xf 0xe0000000 0x08000000
@@ -157,7 +157,7 @@
                          * IRQ8 is generated if the "EVENT" switch is pressed
                          * and PX_CTL[EVESEL] is set to 00.
                          */
-                        interrupts = <8 8>;
+                        interrupts = <8 8 0 0>;
                 };
         };
 
@@ -178,13 +178,13 @@
                 ecm@1000 {
                         compatible = "fsl,p1022-ecm", "fsl,ecm";
                         reg = <0x1000 0x1000>;
-                        interrupts = <16 2>;
+                        interrupts = <16 2 0 0>;
                 };
 
                 memory-controller@2000 {
                         compatible = "fsl,p1022-memory-controller";
                         reg = <0x2000 0x1000>;
-                        interrupts = <16 2>;
+                        interrupts = <16 2 0 0>;
                 };
 
                 i2c@3000 {
@@ -193,7 +193,7 @@
                         cell-index = <0>;
                         compatible = "fsl-i2c";
                         reg = <0x3000 0x100>;
-                        interrupts = <43 2>;
+                        interrupts = <43 2 0 0>;
                         dfsrr;
                 };
 
@@ -203,7 +203,7 @@
                         cell-index = <1>;
                         compatible = "fsl-i2c";
                         reg = <0x3100 0x100>;
-                        interrupts = <43 2>;
+                        interrupts = <43 2 0 0>;
                         dfsrr;
 
                         wm8776:codec@1a {
@@ -220,7 +220,7 @@
                         compatible = "ns16550";
                         reg = <0x4500 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <42 2>;
+                        interrupts = <42 2 0 0>;
                 };
 
                 serial1: serial@4600 {
@@ -229,7 +229,7 @@
                         compatible = "ns16550";
                         reg = <0x4600 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <42 2>;
+                        interrupts = <42 2 0 0>;
                 };
 
                 spi@7000 {
@@ -238,7 +238,7 @@
                         #size-cells = <0>;
                         compatible = "fsl,espi";
                         reg = <0x7000 0x1000>;
-                        interrupts = <59 0x2>;
+                        interrupts = <59 0x2 0 0>;
                         espi,num-ss-bits = <4>;
                         mode = "cpu";
 
@@ -275,7 +275,7 @@
                         compatible = "fsl,mpc8610-ssi";
                         cell-index = <0>;
                         reg = <0x15000 0x100>;
-                        interrupts = <75 2>;
+                        interrupts = <75 2 0 0>;
                         fsl,mode = "i2s-slave";
                         codec-handle = <&wm8776>;
                         fsl,playback-dma = <&dma00>;
@@ -294,25 +294,25 @@
                                 compatible = "fsl,ssi-dma-channel";
                                 reg = <0x0 0x80>;
                                 cell-index = <0>;
-                                interrupts = <76 2>;
+                                interrupts = <76 2 0 0>;
                         };
                         dma01: dma-channel@80 {
                                 compatible = "fsl,ssi-dma-channel";
                                 reg = <0x80 0x80>;
                                 cell-index = <1>;
-                                interrupts = <77 2>;
+                                interrupts = <77 2 0 0>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,eloplus-dma-channel";
                                 reg = <0x100 0x80>;
                                 cell-index = <2>;
-                                interrupts = <78 2>;
+                                interrupts = <78 2 0 0>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,eloplus-dma-channel";
                                 reg = <0x180 0x80>;
                                 cell-index = <3>;
-                                interrupts = <79 2>;
+                                interrupts = <79 2 0 0>;
                         };
                 };
 
@@ -320,7 +320,7 @@
                         #gpio-cells = <2>;
                         compatible = "fsl,mpc8572-gpio";
                         reg = <0xf000 0x100>;
-                        interrupts = <47 0x2>;
+                        interrupts = <47 0x2 0 0>;
                         gpio-controller;
                 };
 
@@ -329,7 +329,7 @@
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>; // 32 bytes
                         cache-size = <0x40000>; // L2, 256K
-                        interrupts = <16 2>;
+                        interrupts = <16 2 0 0>;
                 };
 
                 dma@21300 {
@@ -343,25 +343,25 @@
                                 compatible = "fsl,eloplus-dma-channel";
                                 reg = <0x0 0x80>;
                                 cell-index = <0>;
-                                interrupts = <20 2>;
+                                interrupts = <20 2 0 0>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,eloplus-dma-channel";
                                 reg = <0x80 0x80>;
                                 cell-index = <1>;
-                                interrupts = <21 2>;
+                                interrupts = <21 2 0 0>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,eloplus-dma-channel";
                                 reg = <0x100 0x80>;
                                 cell-index = <2>;
-                                interrupts = <22 2>;
+                                interrupts = <22 2 0 0>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,eloplus-dma-channel";
                                 reg = <0x180 0x80>;
                                 cell-index = <3>;
-                                interrupts = <23 2>;
+                                interrupts = <23 2 0 0>;
                         };
                 };
 
@@ -370,7 +370,7 @@
                         #size-cells = <0>;
                         compatible = "fsl-usb2-dr";
                         reg = <0x22000 0x1000>;
-                        interrupts = <28 0x2>;
+                        interrupts = <28 0x2 0 0>;
                         phy_type = "ulpi";
                 };
 
@@ -381,11 +381,11 @@
                         reg = <0x24000 0x1000 0xb0030 0x4>;
 
                         phy0: ethernet-phy@0 {
-                                interrupts = <3 1>;
+                                interrupts = <3 1 0 0>;
                                 reg = <0x1>;
                         };
                         phy1: ethernet-phy@1 {
-                                interrupts = <9 1>;
+                                interrupts = <9 1 0 0>;
                                 reg = <0x2>;
                         };
                 };
@@ -416,13 +416,13 @@
                                 #address-cells = <1>;
                                 #size-cells = <1>;
                                 reg = <0xB0000 0x1000>;
-                                interrupts = <29 2 30 2 34 2>;
+                                interrupts = <29 2 0 0 30 2 0 0 34 2 0 0>;
                         };
                         queue-group@1{
                                 #address-cells = <1>;
                                 #size-cells = <1>;
                                 reg = <0xB4000 0x1000>;
-                                interrupts = <17 2 18 2 24 2>;
+                                interrupts = <17 2 0 0 18 2 0 0 24 2 0 0>;
                         };
                 };
 
@@ -443,20 +443,20 @@
                                 #address-cells = <1>;
                                 #size-cells = <1>;
                                 reg = <0xB1000 0x1000>;
-                                interrupts = <35 2 36 2 40 2>;
+                                interrupts = <35 2 0 0 36 2 0 0 40 2 0 0>;
                         };
                         queue-group@1{
                                 #address-cells = <1>;
                                 #size-cells = <1>;
                                 reg = <0xB5000 0x1000>;
-                                interrupts = <51 2 52 2 67 2>;
+                                interrupts = <51 2 0 0 52 2 0 0 67 2 0 0>;
                         };
                 };
 
                 sdhci@2e000 {
                         compatible = "fsl,p1022-esdhc", "fsl,esdhc";
                         reg = <0x2e000 0x1000>;
-                        interrupts = <72 0x2>;
+                        interrupts = <72 0x2 0 0>;
                         fsl,sdhci-auto-cmd12;
                         /* Filled in by U-Boot */
                         clock-frequency = <0>;
@@ -467,7 +467,7 @@
                                      "fsl,sec2.4", "fsl,sec2.2", "fsl,sec2.1",
                                      "fsl,sec2.0";
                         reg = <0x30000 0x10000>;
-                        interrupts = <45 2 58 2>;
+                        interrupts = <45 2 0 0 58 2 0 0>;
                         fsl,num-channels = <4>;
                         fsl,channel-fifo-len = <24>;
                         fsl,exec-units-mask = <0x97c>;
@@ -478,14 +478,14 @@
                         compatible = "fsl,p1022-sata", "fsl,pq-sata-v2";
                         reg = <0x18000 0x1000>;
                         cell-index = <1>;
-                        interrupts = <74 0x2>;
+                        interrupts = <74 0x2 0 0>;
                 };
 
                 sata@19000 {
                         compatible = "fsl,p1022-sata", "fsl,pq-sata-v2";
                         reg = <0x19000 0x1000>;
                         cell-index = <2>;
-                        interrupts = <41 0x2>;
+                        interrupts = <41 0x2 0 0>;
                 };
 
                 power@e0070{
@@ -496,21 +496,33 @@
                 display@10000 {
                         compatible = "fsl,diu", "fsl,p1022-diu";
                         reg = <0x10000 1000>;
-                        interrupts = <64 2>;
+                        interrupts = <64 2 0 0>;
                 };
 
                 timer@41100 {
                         compatible = "fsl,mpic-global-timer";
-                        reg = <0x41100 0x204>;
-                        interrupts = <0xf7 0x2>;
+                        reg = <0x41100 0x100 0x41300 4>;
+                        interrupts = <0 0 3 0
+                                      1 0 3 0
+                                      2 0 3 0
+                                      3 0 3 0>;
+                };
+
+                timer@42100 {
+                        compatible = "fsl,mpic-global-timer";
+                        reg = <0x42100 0x100 0x42300 4>;
+                        interrupts = <4 0 3 0
+                                      5 0 3 0
+                                      6 0 3 0
+                                      7 0 3 0>;
                 };
 
                 mpic: pic@40000 {
                         interrupt-controller;
                         #address-cells = <0>;
-                        #interrupt-cells = <2>;
+                        #interrupt-cells = <4>;
                         reg = <0x40000 0x40000>;
-                        compatible = "chrp,open-pic";
+                        compatible = "fsl,mpic";
                         device_type = "open-pic";
                 };
 
@@ -519,14 +531,14 @@
                         reg = <0x41600 0x80>;
                         msi-available-ranges = <0 0x100>;
                         interrupts = <
-                                0xe0 0
-                                0xe1 0
-                                0xe2 0
-                                0xe3 0
-                                0xe4 0
-                                0xe5 0
-                                0xe6 0
-                                0xe7 0>;
+                                0xe0 0 0 0
+                                0xe1 0 0 0
+                                0xe2 0 0 0
+                                0xe3 0 0 0
+                                0xe4 0 0 0
+                                0xe5 0 0 0
+                                0xe6 0 0 0
+                                0xe7 0 0 0>;
                 };
 
                 global-utilities@e0000 {        //global utilities block
@@ -547,7 +559,7 @@
                 ranges = <0x2000000 0x0 0xa0000000 0xc 0x20000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0xf 0xffc10000 0x0 0x10000>;
                 clock-frequency = <33333333>;
-                interrupts = <16 2>;
+                interrupts = <16 2 0 0>;
                 interrupt-map-mask = <0xf800 0 0 7>;
                 interrupt-map = <
                         /* IDSEL 0x0 */
@@ -582,7 +594,7 @@
                 ranges = <0x2000000 0x0 0xc0000000 0xc 0x40000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0xf 0xffc20000 0x0 0x10000>;
                 clock-frequency = <33333333>;
-                interrupts = <16 2>;
+                interrupts = <16 2 0 0>;
                 interrupt-map-mask = <0xf800 0 0 7>;
                 interrupt-map = <
                         /* IDSEL 0x0 */
@@ -618,7 +630,7 @@
                 ranges = <0x2000000 0x0 0x80000000 0xc 0x00000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0xf 0xffc00000 0x0 0x10000>;
                 clock-frequency = <33333333>;
-                interrupts = <16 2>;
+                interrupts = <16 2 0 0>;
                 interrupt-map-mask = <0xf800 0 0 7>;
                 interrupt-map = <
                         /* IDSEL 0x0 */
diff --git a/arch/powerpc/boot/dts/p2020ds.dts b/arch/powerpc/boot/dts/p2020ds.dts
index 11019142813c..dae403100f2f 100644
--- a/arch/powerpc/boot/dts/p2020ds.dts
+++ b/arch/powerpc/boot/dts/p2020ds.dts
@@ -1,7 +1,7 @@
 /*
  * P2020 DS Device Tree Source
  *
- * Copyright 2009 Freescale Semiconductor Inc.
+ * Copyright 2009-2011 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
@@ -9,12 +9,11 @@
  * option) any later version.
  */
 
-/dts-v1/;
+/include/ "p2020si.dtsi"
+
 / {
-        model = "fsl,P2020";
+        model = "fsl,P2020DS";
         compatible = "fsl,P2020DS";
-        #address-cells = <2>;
-        #size-cells = <2>;
 
         aliases {
                 ethernet0 = &enet0;
@@ -27,35 +26,13 @@
                 pci2 = &pci2;
         };
 
-        cpus {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                PowerPC,P2020@0 {
-                        device_type = "cpu";
-                        reg = <0x0>;
-                        next-level-cache = <&L2>;
-                };
-
-                PowerPC,P2020@1 {
-                        device_type = "cpu";
-                        reg = <0x1>;
-                        next-level-cache = <&L2>;
-                };
-        };
 
         memory {
                 device_type = "memory";
         };
 
         localbus@ffe05000 {
-                #address-cells = <2>;
-                #size-cells = <1>;
                 compatible = "fsl,elbc", "simple-bus";
-                reg = <0 0xffe05000 0 0x1000>;
-                interrupts = <19 2>;
-                interrupt-parent = <&mpic>;
-
                 ranges = <0x0 0x0 0x0 0xe8000000 0x08000000
                           0x1 0x0 0x0 0xe0000000 0x08000000
                           0x2 0x0 0x0 0xffa00000 0x00040000
@@ -158,352 +135,90 @@
         };
 
         soc@ffe00000 {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                device_type = "soc";
-                compatible = "fsl,p2020-immr", "simple-bus";
-                ranges = <0x0 0 0xffe00000 0x100000>;
-                bus-frequency = <0>;            // Filled out by uboot.
-
-                ecm-law@0 {
-                        compatible = "fsl,ecm-law";
-                        reg = <0x0 0x1000>;
-                        fsl,num-laws = <12>;
-                };
-
-                ecm@1000 {
-                        compatible = "fsl,p2020-ecm", "fsl,ecm";
-                        reg = <0x1000 0x1000>;
-                        interrupts = <17 2>;
-                        interrupt-parent = <&mpic>;
-                };
-
-                memory-controller@2000 {
-                        compatible = "fsl,p2020-memory-controller";
-                        reg = <0x2000 0x1000>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <18 2>;
-                };
-
-                i2c@3000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        cell-index = <0>;
-                        compatible = "fsl-i2c";
-                        reg = <0x3000 0x100>;
-                        interrupts = <43 2>;
-                        interrupt-parent = <&mpic>;
-                        dfsrr;
-                };
-
-                i2c@3100 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        cell-index = <1>;
-                        compatible = "fsl-i2c";
-                        reg = <0x3100 0x100>;
-                        interrupts = <43 2>;
-                        interrupt-parent = <&mpic>;
-                        dfsrr;
-                };
 
-                serial0: serial@4500 {
-                        cell-index = <0>;
-                        device_type = "serial";
-                        compatible = "ns16550";
-                        reg = <0x4500 0x100>;
-                        clock-frequency = <0>;
-                        interrupts = <42 2>;
-                        interrupt-parent = <&mpic>;
-                };
-
-                serial1: serial@4600 {
-                        cell-index = <1>;
-                        device_type = "serial";
-                        compatible = "ns16550";
-                        reg = <0x4600 0x100>;
-                        clock-frequency = <0>;
-                        interrupts = <42 2>;
-                        interrupt-parent = <&mpic>;
-                };
-
-                spi@7000 {
-                        compatible = "fsl,espi";
-                        reg = <0x7000 0x1000>;
-                        interrupts = <59 0x2>;
-                        interrupt-parent = <&mpic>;
+                usb@22000 {
+                        phy_type = "ulpi";
                 };
 
-                dma@c300 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "fsl,eloplus-dma";
-                        reg = <0xc300 0x4>;
-                        ranges = <0x0 0xc100 0x200>;
-                        cell-index = <1>;
-                        dma-channel@0 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x0 0x80>;
-                                cell-index = <0>;
+                mdio@24520 {
+                        phy0: ethernet-phy@0 {
                                 interrupt-parent = <&mpic>;
-                                interrupts = <76 2>;
+                                interrupts = <3 1>;
+                                reg = <0x0>;
                         };
-                        dma-channel@80 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x80 0x80>;
-                                cell-index = <1>;
+                        phy1: ethernet-phy@1 {
                                 interrupt-parent = <&mpic>;
-                                interrupts = <77 2>;
+                                interrupts = <3 1>;
+                                reg = <0x1>;
                         };
-                        dma-channel@100 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x100 0x80>;
-                                cell-index = <2>;
+                        phy2: ethernet-phy@2 {
                                 interrupt-parent = <&mpic>;
-                                interrupts = <78 2>;
+                                interrupts = <3 1>;
+                                reg = <0x2>;
                         };
-                        dma-channel@180 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x180 0x80>;
-                                cell-index = <3>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <79 2>;
+                        tbi0: tbi-phy@11 {
+                                reg = <0x11>;
+                                device_type = "tbi-phy";
                         };
-                };
 
-                gpio: gpio-controller@f000 {
-                        #gpio-cells = <2>;
-                        compatible = "fsl,mpc8572-gpio";
-                        reg = <0xf000 0x100>;
-                        interrupts = <47 0x2>;
-                        interrupt-parent = <&mpic>;
-                        gpio-controller;
                 };
 
-                L2: l2-cache-controller@20000 {
-                        compatible = "fsl,p2020-l2-cache-controller";
-                        reg = <0x20000 0x1000>;
-                        cache-line-size = <32>; // 32 bytes
-                        cache-size = <0x80000>; // L2, 512k
-                        interrupt-parent = <&mpic>;
-                        interrupts = <16 2>;
+                mdio@25520 {
+                        tbi1: tbi-phy@11 {
+                                reg = <0x11>;
+                                device_type = "tbi-phy";
+                        };
                 };
 
-                dma@21300 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "fsl,eloplus-dma";
-                        reg = <0x21300 0x4>;
-                        ranges = <0x0 0x21100 0x200>;
-                        cell-index = <0>;
-                        dma-channel@0 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x0 0x80>;
-                                cell-index = <0>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <20 2>;
-                        };
-                        dma-channel@80 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x80 0x80>;
-                                cell-index = <1>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <21 2>;
-                        };
-                        dma-channel@100 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x100 0x80>;
-                                cell-index = <2>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <22 2>;
-                        };
-                        dma-channel@180 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x180 0x80>;
-                                cell-index = <3>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <23 2>;
+                mdio@26520 {
+                        tbi2: tbi-phy@11 {
+                                reg = <0x11>;
+                                device_type = "tbi-phy";
                         };
+
                 };
 
-                usb@22000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl-usb2-dr";
-                        reg = <0x22000 0x1000>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <28 0x2>;
-                        phy_type = "ulpi";
+                ptp_clock@24E00 {
+                        compatible = "fsl,etsec-ptp";
+                        reg = <0x24E00 0xB0>;
+                        interrupts = <68 2 69 2 70 2>;
+                        interrupt-parent = < &mpic >;
+                        fsl,tclk-period = <5>;
+                        fsl,tmr-prsc = <200>;
+                        fsl,tmr-add = <0xCCCCCCCD>;
+                        fsl,tmr-fiper1 = <0x3B9AC9FB>;
+                        fsl,tmr-fiper2 = <0x0001869B>;
+                        fsl,max-adj = <249999999>;
                 };
 
                 enet0: ethernet@24000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        cell-index = <0>;
-                        device_type = "network";
-                        model = "eTSEC";
-                        compatible = "gianfar";
-                        reg = <0x24000 0x1000>;
-                        ranges = <0x0 0x24000 0x1000>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <29 2 30 2 34 2>;
-                        interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi0>;
                         phy-handle = <&phy0>;
                         phy-connection-type = "rgmii-id";
-
-                        mdio@520 {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-                                compatible = "fsl,gianfar-mdio";
-                                reg = <0x520 0x20>;
-
-                                phy0: ethernet-phy@0 {
-                                        interrupt-parent = <&mpic>;
-                                        interrupts = <3 1>;
-                                        reg = <0x0>;
-                                };
-                                phy1: ethernet-phy@1 {
-                                        interrupt-parent = <&mpic>;
-                                        interrupts = <3 1>;
-                                        reg = <0x1>;
-                                };
-                                phy2: ethernet-phy@2 {
-                                        interrupt-parent = <&mpic>;
-                                        interrupts = <3 1>;
-                                        reg = <0x2>;
-                                };
-                                tbi0: tbi-phy@11 {
-                                        reg = <0x11>;
-                                        device_type = "tbi-phy";
-                                };
-                        };
                 };
 
                 enet1: ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        cell-index = <1>;
-                        device_type = "network";
-                        model = "eTSEC";
-                        compatible = "gianfar";
-                        reg = <0x25000 0x1000>;
-                        ranges = <0x0 0x25000 0x1000>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <35 2 36 2 40 2>;
-                        interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi1>;
                         phy-handle = <&phy1>;
                         phy-connection-type = "rgmii-id";
 
-                        mdio@520 {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-                                compatible = "fsl,gianfar-tbi";
-                                reg = <0x520 0x20>;
-
-                                tbi1: tbi-phy@11 {
-                                        reg = <0x11>;
-                                        device_type = "tbi-phy";
-                                };
-                        };
                 };
 
                 enet2: ethernet@26000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        cell-index = <2>;
-                        device_type = "network";
-                        model = "eTSEC";
-                        compatible = "gianfar";
-                        reg = <0x26000 0x1000>;
-                        ranges = <0x0 0x26000 0x1000>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <31 2 32 2 33 2>;
-                        interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi2>;
                         phy-handle = <&phy2>;
                         phy-connection-type = "rgmii-id";
-
-                        mdio@520 {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-                                compatible = "fsl,gianfar-tbi";
-                                reg = <0x520 0x20>;
-
-                                tbi2: tbi-phy@11 {
-                                        reg = <0x11>;
-                                        device_type = "tbi-phy";
-                                };
-                        };
-                };
-
-                sdhci@2e000 {
-                        compatible = "fsl,p2020-esdhc", "fsl,esdhc";
-                        reg = <0x2e000 0x1000>;
-                        interrupts = <72 0x2>;
-                        interrupt-parent = <&mpic>;
-                        /* Filled in by U-Boot */
-                        clock-frequency = <0>;
-                };
-
-                crypto@30000 {
-                        compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4",
-                                     "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
-                        reg = <0x30000 0x10000>;
-                        interrupts = <45 2 58 2>;
-                        interrupt-parent = <&mpic>;
-                        fsl,num-channels = <4>;
-                        fsl,channel-fifo-len = <24>;
-                        fsl,exec-units-mask = <0xbfe>;
-                        fsl,descriptor-types-mask = <0x3ab0ebf>;
                 };
 
-                mpic: pic@40000 {
-                        interrupt-controller;
-                        #address-cells = <0>;
-                        #interrupt-cells = <2>;
-                        reg = <0x40000 0x40000>;
-                        compatible = "chrp,open-pic";
-                        device_type = "open-pic";
-                };
 
                 msi@41600 {
                         compatible = "fsl,mpic-msi";
-                        reg = <0x41600 0x80>;
-                        msi-available-ranges = <0 0x100>;
-                        interrupts = <
-                                0xe0 0
-                                0xe1 0
-                                0xe2 0
-                                0xe3 0
-                                0xe4 0
-                                0xe5 0
-                                0xe6 0
-                                0xe7 0>;
-                        interrupt-parent = <&mpic>;
-                };
-
-                global-utilities@e0000 {        //global utilities block
-                        compatible = "fsl,p2020-guts";
-                        reg = <0xe0000 0x1000>;
-                        fsl,has-rstcr;
                 };
         };
 
         pci0: pcie@ffe08000 {
-                compatible = "fsl,mpc8548-pcie";
-                device_type = "pci";
-                #interrupt-cells = <1>;
-                #size-cells = <2>;
-                #address-cells = <3>;
-                reg = <0 0xffe08000 0 0x1000>;
-                bus-range = <0 255>;
                 ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
-                clock-frequency = <33333333>;
-                interrupt-parent = <&mpic>;
-                interrupts = <24 2>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                         /* IDSEL 0x0 */
@@ -528,18 +243,8 @@
         };
 
         pci1: pcie@ffe09000 {
-                compatible = "fsl,mpc8548-pcie";
-                device_type = "pci";
-                #interrupt-cells = <1>;
-                #size-cells = <2>;
-                #address-cells = <3>;
-                reg = <0 0xffe09000 0 0x1000>;
-                bus-range = <0 255>;
                 ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
-                clock-frequency = <33333333>;
-                interrupt-parent = <&mpic>;
-                interrupts = <25 2>;
                 interrupt-map-mask = <0xff00 0x0 0x0 0x7>;
                 interrupt-map = <
 
@@ -667,18 +372,8 @@
         };
 
         pci2: pcie@ffe0a000 {
-                compatible = "fsl,mpc8548-pcie";
-                device_type = "pci";
-                #interrupt-cells = <1>;
-                #size-cells = <2>;
-                #address-cells = <3>;
-                reg = <0 0xffe0a000 0 0x1000>;
-                bus-range = <0 255>;
                 ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000>;
-                clock-frequency = <33333333>;
-                interrupt-parent = <&mpic>;
-                interrupts = <26 2>;
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                         /* IDSEL 0x0 */
diff --git a/arch/powerpc/boot/dts/p2020rdb.dts b/arch/powerpc/boot/dts/p2020rdb.dts
index e2d48fd4416e..1d7a05f3021e 100644
--- a/arch/powerpc/boot/dts/p2020rdb.dts
+++ b/arch/powerpc/boot/dts/p2020rdb.dts
@@ -9,12 +9,11 @@
  * option) any later version.
  */
 
-/dts-v1/;
+/include/ "p2020si.dtsi"
+
 / {
-        model = "fsl,P2020";
+        model = "fsl,P2020RDB";
         compatible = "fsl,P2020RDB";
-        #address-cells = <2>;
-        #size-cells = <2>;
 
         aliases {
                 ethernet0 = &enet0;
@@ -26,34 +25,11 @@
                 pci1 = &pci1;
         };
 
-        cpus {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                PowerPC,P2020@0 {
-                        device_type = "cpu";
-                        reg = <0x0>;
-                        next-level-cache = <&L2>;
-                };
-
-                PowerPC,P2020@1 {
-                        device_type = "cpu";
-                        reg = <0x1>;
-                        next-level-cache = <&L2>;
-                };
-        };
-
         memory {
                 device_type = "memory";
         };
 
         localbus@ffe05000 {
-                #address-cells = <2>;
-                #size-cells = <1>;
-                compatible = "fsl,p2020-elbc", "fsl,elbc", "simple-bus";
-                reg = <0 0xffe05000 0 0x1000>;
-                interrupts = <19 2>;
-                interrupt-parent = <&mpic>;
 
                 /* NOR and NAND Flashes */
                 ranges = <0x0 0x0 0x0 0xef000000 0x01000000
@@ -165,90 +141,16 @@
         };
 
         soc@ffe00000 {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                device_type = "soc";
-                compatible = "fsl,p2020-immr", "simple-bus";
-                ranges = <0x0  0x0 0xffe00000 0x100000>;
-                bus-frequency = <0>;            // Filled out by uboot.
-
-                ecm-law@0 {
-                        compatible = "fsl,ecm-law";
-                        reg = <0x0 0x1000>;
-                        fsl,num-laws = <12>;
-                };
-
-                ecm@1000 {
-                        compatible = "fsl,p2020-ecm", "fsl,ecm";
-                        reg = <0x1000 0x1000>;
-                        interrupts = <17 2>;
-                        interrupt-parent = <&mpic>;
-                };
-
-                memory-controller@2000 {
-                        compatible = "fsl,p2020-memory-controller";
-                        reg = <0x2000 0x1000>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <18 2>;
-                };
-
                 i2c@3000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        cell-index = <0>;
-                        compatible = "fsl-i2c";
-                        reg = <0x3000 0x100>;
-                        interrupts = <43 2>;
-                        interrupt-parent = <&mpic>;
-                        dfsrr;
                         rtc@68 {
                                 compatible = "dallas,ds1339";
                                 reg = <0x68>;
                         };
                 };
 
-                i2c@3100 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        cell-index = <1>;
-                        compatible = "fsl-i2c";
-                        reg = <0x3100 0x100>;
-                        interrupts = <43 2>;
-                        interrupt-parent = <&mpic>;
-                        dfsrr;
-                };
-
-                serial0: serial@4500 {
-                        cell-index = <0>;
-                        device_type = "serial";
-                        compatible = "ns16550";
-                        reg = <0x4500 0x100>;
-                        clock-frequency = <0>;
-                        interrupts = <42 2>;
-                        interrupt-parent = <&mpic>;
-                };
-
-                serial1: serial@4600 {
-                        cell-index = <1>;
-                        device_type = "serial";
-                        compatible = "ns16550";
-                        reg = <0x4600 0x100>;
-                        clock-frequency = <0>;
-                        interrupts = <42 2>;
-                        interrupt-parent = <&mpic>;
-                };
+        spi@7000 {
 
-                spi@7000 {
-                        cell-index = <0>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,espi";
-                        reg = <0x7000 0x1000>;
-                        interrupts = <59 0x2>;
-                        interrupt-parent = <&mpic>;
-                        mode = "cpu";
-
-                        fsl_m25p80@0 {
+                fsl_m25p80@0 {
                                 #address-cells = <1>;
                                 #size-cells = <1>;
                                 compatible = "fsl,espi-flash";
@@ -294,254 +196,81 @@
                         };
                 };
 
-                dma@c300 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "fsl,eloplus-dma";
-                        reg = <0xc300 0x4>;
-                        ranges = <0x0 0xc100 0x200>;
-                        cell-index = <1>;
-                        dma-channel@0 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x0 0x80>;
-                                cell-index = <0>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <76 2>;
-                        };
-                        dma-channel@80 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x80 0x80>;
-                                cell-index = <1>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <77 2>;
-                        };
-                        dma-channel@100 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x100 0x80>;
-                                cell-index = <2>;
+                usb@22000 {
+                        phy_type = "ulpi";
+                };
+
+                mdio@24520 {
+                        phy0: ethernet-phy@0 {
                                 interrupt-parent = <&mpic>;
-                                interrupts = <78 2>;
-                        };
-                        dma-channel@180 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x180 0x80>;
-                                cell-index = <3>;
+                                interrupts = <3 1>;
+                                reg = <0x0>;
+                                };
+                        phy1: ethernet-phy@1 {
                                 interrupt-parent = <&mpic>;
-                                interrupts = <79 2>;
-                        };
+                                interrupts = <3 1>;
+                                reg = <0x1>;
+                                };
                 };
 
-                gpio: gpio-controller@f000 {
-                        #gpio-cells = <2>;
-                        compatible = "fsl,mpc8572-gpio";
-                        reg = <0xf000 0x100>;
-                        interrupts = <47 0x2>;
-                        interrupt-parent = <&mpic>;
-                        gpio-controller;
+                mdio@25520 {
+                        tbi0: tbi-phy@11 {
+                                reg = <0x11>;
+                                device_type = "tbi-phy";
+                        };
                 };
 
-                L2: l2-cache-controller@20000 {
-                        compatible = "fsl,p2020-l2-cache-controller";
-                        reg = <0x20000 0x1000>;
-                        cache-line-size = <32>; // 32 bytes
-                        cache-size = <0x80000>; // L2,512K
-                        interrupt-parent = <&mpic>;
-                        interrupts = <16 2>;
+                mdio@26520 {
+                        status = "disabled";
                 };
 
-                dma@21300 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "fsl,eloplus-dma";
-                        reg = <0x21300 0x4>;
-                        ranges = <0x0 0x21100 0x200>;
-                        cell-index = <0>;
-                        dma-channel@0 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x0 0x80>;
-                                cell-index = <0>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <20 2>;
-                        };
-                        dma-channel@80 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x80 0x80>;
-                                cell-index = <1>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <21 2>;
-                        };
-                        dma-channel@100 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x100 0x80>;
-                                cell-index = <2>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <22 2>;
-                        };
-                        dma-channel@180 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x180 0x80>;
-                                cell-index = <3>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <23 2>;
-                        };
-                };
-
-                usb@22000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl-usb2-dr";
-                        reg = <0x22000 0x1000>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <28 0x2>;
-                        phy_type = "ulpi";
+                ptp_clock@24E00 {
+                        compatible = "fsl,etsec-ptp";
+                        reg = <0x24E00 0xB0>;
+                        interrupts = <68 2 69 2 70 2>;
+                        interrupt-parent = < &mpic >;
+                        fsl,tclk-period = <5>;
+                        fsl,tmr-prsc = <200>;
+                        fsl,tmr-add = <0xCCCCCCCD>;
+                        fsl,tmr-fiper1 = <0x3B9AC9FB>;
+                        fsl,tmr-fiper2 = <0x0001869B>;
+                        fsl,max-adj = <249999999>;
                 };
 
                 enet0: ethernet@24000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        cell-index = <0>;
-                        device_type = "network";
-                        model = "eTSEC";
-                        compatible = "gianfar";
-                        reg = <0x24000 0x1000>;
-                        ranges = <0x0 0x24000 0x1000>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <29 2 30 2 34 2>;
-                        interrupt-parent = <&mpic>;
                         fixed-link = <1 1 1000 0 0>;
                         phy-connection-type = "rgmii-id";
-
-                        mdio@520 {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-                                compatible = "fsl,gianfar-mdio";
-                                reg = <0x520 0x20>;
-
-                                phy0: ethernet-phy@0 {
-                                        interrupt-parent = <&mpic>;
-                                        interrupts = <3 1>;
-                                        reg = <0x0>;
-                                };
-                                phy1: ethernet-phy@1 {
-                                        interrupt-parent = <&mpic>;
-                                        interrupts = <3 1>;
-                                        reg = <0x1>;
-                                };
-                        };
                 };
 
                 enet1: ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        cell-index = <1>;
-                        device_type = "network";
-                        model = "eTSEC";
-                        compatible = "gianfar";
-                        reg = <0x25000 0x1000>;
-                        ranges = <0x0 0x25000 0x1000>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <35 2 36 2 40 2>;
-                        interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi0>;
                         phy-handle = <&phy0>;
                         phy-connection-type = "sgmii";
-
-                        mdio@520 {
-                                #address-cells = <1>;
-                                #size-cells = <0>;
-                                compatible = "fsl,gianfar-tbi";
-                                reg = <0x520 0x20>;
-
-                                tbi0: tbi-phy@11 {
-                                        reg = <0x11>;
-                                        device_type = "tbi-phy";
-                                };
-                        };
                 };
 
                 enet2: ethernet@26000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        cell-index = <2>;
-                        device_type = "network";
-                        model = "eTSEC";
-                        compatible = "gianfar";
-                        reg = <0x26000 0x1000>;
-                        ranges = <0x0 0x26000 0x1000>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <31 2 32 2 33 2>;
-                        interrupt-parent = <&mpic>;
                         phy-handle = <&phy1>;
                         phy-connection-type = "rgmii-id";
                 };
 
-                sdhci@2e000 {
-                        compatible = "fsl,p2020-esdhc", "fsl,esdhc";
-                        reg = <0x2e000 0x1000>;
-                        interrupts = <72 0x2>;
-                        interrupt-parent = <&mpic>;
-                        /* Filled in by U-Boot */
-                        clock-frequency = <0>;
-                };
-
-                crypto@30000 {
-                        compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4",
-                                     "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
-                        reg = <0x30000 0x10000>;
-                        interrupts = <45 2 58 2>;
-                        interrupt-parent = <&mpic>;
-                        fsl,num-channels = <4>;
-                        fsl,channel-fifo-len = <24>;
-                        fsl,exec-units-mask = <0xbfe>;
-                        fsl,descriptor-types-mask = <0x3ab0ebf>;
-                };
-
-                mpic: pic@40000 {
-                        interrupt-controller;
-                        #address-cells = <0>;
-                        #interrupt-cells = <2>;
-                        reg = <0x40000 0x40000>;
-                        compatible = "chrp,open-pic";
-                        device_type = "open-pic";
-                };
-
-                msi@41600 {
-                        compatible = "fsl,p2020-msi", "fsl,mpic-msi";
-                        reg = <0x41600 0x80>;
-                        msi-available-ranges = <0 0x100>;
-                        interrupts = <
-                                0xe0 0
-                                0xe1 0
-                                0xe2 0
-                                0xe3 0
-                                0xe4 0
-                                0xe5 0
-                                0xe6 0
-                                0xe7 0>;
-                        interrupt-parent = <&mpic>;
-                };
+        };
 
-                global-utilities@e0000 {        //global utilities block
-                        compatible = "fsl,p2020-guts";
-                        reg = <0xe0000 0x1000>;
-                        fsl,has-rstcr;
-                };
+        pci0: pcie@ffe08000 {
+                status = "disabled";
         };
 
-        pci0: pcie@ffe09000 {
-                compatible = "fsl,mpc8548-pcie";
-                device_type = "pci";
-                #interrupt-cells = <1>;
-                #size-cells = <2>;
-                #address-cells = <3>;
-                reg = <0 0xffe09000 0 0x1000>;
-                bus-range = <0 255>;
+        pci1: pcie@ffe09000 {
                 ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
-                clock-frequency = <33333333>;
-                interrupt-parent = <&mpic>;
-                interrupts = <25 2>;
-                pcie@0 {
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0x0 0x0 0x1 &mpic 0x4 0x1
+                        0000 0x0 0x0 0x2 &mpic 0x5 0x1
+                        0000 0x0 0x0 0x3 &mpic 0x6 0x1
+                        0000 0x0 0x0 0x4 &mpic 0x7 0x1
+                        >;
+                        pcie@0 {
                         reg = <0x0 0x0 0x0 0x0 0x0>;
                         #size-cells = <2>;
                         #address-cells = <3>;
@@ -556,19 +285,17 @@
                 };
         };
 
-        pci1: pcie@ffe0a000 {
-                compatible = "fsl,mpc8548-pcie";
-                device_type = "pci";
-                #interrupt-cells = <1>;
-                #size-cells = <2>;
-                #address-cells = <3>;
-                reg = <0 0xffe0a000 0 0x1000>;
-                bus-range = <0 255>;
+        pci2: pcie@ffe0a000 {
                 ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
-                clock-frequency = <33333333>;
-                interrupt-parent = <&mpic>;
-                interrupts = <26 2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0x0 0x0 0x1 &mpic 0x0 0x1
+                        0000 0x0 0x0 0x2 &mpic 0x1 0x1
+                        0000 0x0 0x0 0x3 &mpic 0x2 0x1
+                        0000 0x0 0x0 0x4 &mpic 0x3 0x1
+                        >;
                 pcie@0 {
                         reg = <0x0 0x0 0x0 0x0 0x0>;
                         #size-cells = <2>;
diff --git a/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts b/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
index b69c3a5dc858..fc8ddddfccb6 100644
--- a/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
+++ b/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
@@ -14,12 +14,11 @@
  * option) any later version.
  */
 
-/dts-v1/;
+/include/ "p2020si.dtsi"
+
 / {
-        model = "fsl,P2020";
+        model = "fsl,P2020RDB";
         compatible = "fsl,P2020RDB", "fsl,MPC85XXRDB-CAMP";
-        #address-cells = <2>;
-        #size-cells = <2>;
 
         aliases {
                 ethernet1 = &enet1;
@@ -29,91 +28,33 @@
         };
 
         cpus {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                PowerPC,P2020@0 {
-                        device_type = "cpu";
-                        reg = <0x0>;
-                        next-level-cache = <&L2>;
+                PowerPC,P2020@1 {
+                status = "disabled";
                 };
+
         };
 
         memory {
                 device_type = "memory";
         };
 
-        soc@ffe00000 {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                device_type = "soc";
-                compatible = "fsl,p2020-immr", "simple-bus";
-                ranges = <0x0  0x0 0xffe00000 0x100000>;
-                bus-frequency = <0>;            // Filled out by uboot.
-
-                ecm-law@0 {
-                        compatible = "fsl,ecm-law";
-                        reg = <0x0 0x1000>;
-                        fsl,num-laws = <12>;
-                };
-
-                ecm@1000 {
-                        compatible = "fsl,p2020-ecm", "fsl,ecm";
-                        reg = <0x1000 0x1000>;
-                        interrupts = <17 2>;
-                        interrupt-parent = <&mpic>;
-                };
-
-                memory-controller@2000 {
-                        compatible = "fsl,p2020-memory-controller";
-                        reg = <0x2000 0x1000>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <18 2>;
-                };
+        localbus@ffe05000 {
+                status = "disabled";
+        };
 
+        soc@ffe00000 {
                 i2c@3000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        cell-index = <0>;
-                        compatible = "fsl-i2c";
-                        reg = <0x3000 0x100>;
-                        interrupts = <43 2>;
-                        interrupt-parent = <&mpic>;
-                        dfsrr;
                         rtc@68 {
                                 compatible = "dallas,ds1339";
                                 reg = <0x68>;
                         };
                 };
 
-                i2c@3100 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        cell-index = <1>;
-                        compatible = "fsl-i2c";
-                        reg = <0x3100 0x100>;
-                        interrupts = <43 2>;
-                        interrupt-parent = <&mpic>;
-                        dfsrr;
-                };
-
-                serial0: serial@4500 {
-                        cell-index = <0>;
-                        device_type = "serial";
-                        compatible = "ns16550";
-                        reg = <0x4500 0x100>;
-                        clock-frequency = <0>;
+                serial1: serial@4600 {
+                        status = "disabled";
                 };
 
                 spi@7000 {
-                        cell-index = <0>;
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,espi";
-                        reg = <0x7000 0x1000>;
-                        interrupts = <59 0x2>;
-                        interrupt-parent = <&mpic>;
-                        mode = "cpu";
 
                         fsl_m25p80@0 {
                                 #address-cells = <1>;
@@ -161,76 +102,15 @@
                         };
                 };
 
-                gpio: gpio-controller@f000 {
-                        #gpio-cells = <2>;
-                        compatible = "fsl,mpc8572-gpio";
-                        reg = <0xf000 0x100>;
-                        interrupts = <47 0x2>;
-                        interrupt-parent = <&mpic>;
-                        gpio-controller;
-                };
-
-                L2: l2-cache-controller@20000 {
-                        compatible = "fsl,p2020-l2-cache-controller";
-                        reg = <0x20000 0x1000>;
-                        cache-line-size = <32>; // 32 bytes
-                        cache-size = <0x80000>; // L2,512K
-                        interrupt-parent = <&mpic>;
-                        interrupts = <16 2>;
-                };
-
-                dma@21300 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        compatible = "fsl,eloplus-dma";
-                        reg = <0x21300 0x4>;
-                        ranges = <0x0 0x21100 0x200>;
-                        cell-index = <0>;
-                        dma-channel@0 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x0 0x80>;
-                                cell-index = <0>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <20 2>;
-                        };
-                        dma-channel@80 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x80 0x80>;
-                                cell-index = <1>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <21 2>;
-                        };
-                        dma-channel@100 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x100 0x80>;
-                                cell-index = <2>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <22 2>;
-                        };
-                        dma-channel@180 {
-                                compatible = "fsl,eloplus-dma-channel";
-                                reg = <0x180 0x80>;
-                                cell-index = <3>;
-                                interrupt-parent = <&mpic>;
-                                interrupts = <23 2>;
-                        };
+                dma@c300 {
+                        status = "disabled";
                 };
 
                 usb@22000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl-usb2-dr";
-                        reg = <0x22000 0x1000>;
-                        interrupt-parent = <&mpic>;
-                        interrupts = <28 0x2>;
                         phy_type = "ulpi";
                 };
 
                 mdio@24520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-mdio";
-                        reg = <0x24520 0x20>;
 
                         phy0: ethernet-phy@0 {
                                 interrupt-parent = <&mpic>;
@@ -245,29 +125,21 @@
                 };
 
                 mdio@25520 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
-                        compatible = "fsl,gianfar-tbi";
-                        reg = <0x26520 0x20>;
-
                         tbi0: tbi-phy@11 {
                                 reg = <0x11>;
                                 device_type = "tbi-phy";
                         };
                 };
 
+                mdio@26520 {
+                        status = "disabled";
+                };
+
+                enet0: ethernet@24000 {
+                        status = "disabled";
+                };
+
                 enet1: ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        cell-index = <1>;
-                        device_type = "network";
-                        model = "eTSEC";
-                        compatible = "gianfar";
-                        reg = <0x25000 0x1000>;
-                        ranges = <0x0 0x25000 0x1000>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <35 2 36 2 40 2>;
-                        interrupt-parent = <&mpic>;
                         tbi-handle = <&tbi0>;
                         phy-handle = <&phy0>;
                         phy-connection-type = "sgmii";
@@ -275,49 +147,12 @@
                 };
 
                 enet2: ethernet@26000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        cell-index = <2>;
-                        device_type = "network";
-                        model = "eTSEC";
-                        compatible = "gianfar";
-                        reg = <0x26000 0x1000>;
-                        ranges = <0x0 0x26000 0x1000>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <31 2 32 2 33 2>;
-                        interrupt-parent = <&mpic>;
                         phy-handle = <&phy1>;
                         phy-connection-type = "rgmii-id";
                 };
 
-                sdhci@2e000 {
-                        compatible = "fsl,p2020-esdhc", "fsl,esdhc";
-                        reg = <0x2e000 0x1000>;
-                        interrupts = <72 0x2>;
-                        interrupt-parent = <&mpic>;
-                        /* Filled in by U-Boot */
-                        clock-frequency = <0>;
-                };
-
-                crypto@30000 {
-                        compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4",
-                                     "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
-                        reg = <0x30000 0x10000>;
-                        interrupts = <45 2 58 2>;
-                        interrupt-parent = <&mpic>;
-                        fsl,num-channels = <4>;
-                        fsl,channel-fifo-len = <24>;
-                        fsl,exec-units-mask = <0xbfe>;
-                        fsl,descriptor-types-mask = <0x3ab0ebf>;
-                };
 
                 mpic: pic@40000 {
-                        interrupt-controller;
-                        #address-cells = <0>;
-                        #interrupt-cells = <2>;
-                        reg = <0x40000 0x40000>;
-                        compatible = "chrp,open-pic";
-                        device_type = "open-pic";
                         protected-sources = <
                         42 76 77 78 79 /* serial1 , dma2 */
                         29 30 34 26 /* enet0, pci1 */
@@ -326,26 +161,28 @@
                         >;
                 };
 
-                global-utilities@e0000 {
-                        compatible = "fsl,p2020-guts";
-                        reg = <0xe0000 0x1000>;
-                        fsl,has-rstcr;
+                msi@41600 {
+                        status = "disabled";
                 };
+
+
         };
 
-        pci0: pcie@ffe09000 {
-                compatible = "fsl,mpc8548-pcie";
-                device_type = "pci";
-                #interrupt-cells = <1>;
-                #size-cells = <2>;
-                #address-cells = <3>;
-                reg = <0 0xffe09000 0 0x1000>;
-                bus-range = <0 255>;
+        pci0: pcie@ffe08000 {
+                status = "disabled";
+        };
+
+        pci1: pcie@ffe09000 {
                 ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
-                clock-frequency = <33333333>;
-                interrupt-parent = <&mpic>;
-                interrupts = <25 2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0x0 0x0 0x1 &mpic 0x4 0x1
+                        0000 0x0 0x0 0x2 &mpic 0x5 0x1
+                        0000 0x0 0x0 0x3 &mpic 0x6 0x1
+                        0000 0x0 0x0 0x4 &mpic 0x7 0x1
+                        >;
                 pcie@0 {
                         reg = <0x0 0x0 0x0 0x0 0x0>;
                         #size-cells = <2>;
@@ -360,4 +197,8 @@
                                   0x0 0x100000>;
                 };
         };
+
+        pci2: pcie@ffe0a000 {
+                status = "disabled";
+        };
 };
diff --git a/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts b/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
index 7a31d46c01b0..261c34ba45ec 100644
--- a/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
+++ b/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
@@ -15,27 +15,21 @@
  * option) any later version.
  */
 
-/dts-v1/;
+/include/ "p2020si.dtsi"
+
 / {
-        model = "fsl,P2020";
+        model = "fsl,P2020RDB";
         compatible = "fsl,P2020RDB", "fsl,MPC85XXRDB-CAMP";
-        #address-cells = <2>;
-        #size-cells = <2>;
 
         aliases {
                 ethernet0 = &enet0;
-                serial0 = &serial0;
+                serial0 = &serial1;
                 pci1 = &pci1;
         };
 
         cpus {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                PowerPC,P2020@1 {
-                        device_type = "cpu";
-                        reg = <0x1>;
-                        next-level-cache = <&L2>;
+                PowerPC,P2020@0 {
+                status = "disabled";
                 };
         };
 
@@ -43,20 +37,37 @@
                 device_type = "memory";
         };
 
+        localbus@ffe05000 {
+                status = "disabled";
+        };
+
         soc@ffe00000 {
-                #address-cells = <1>;
-                #size-cells = <1>;
-                device_type = "soc";
-                compatible = "fsl,p2020-immr", "simple-bus";
-                ranges = <0x0  0x0 0xffe00000 0x100000>;
-                bus-frequency = <0>;            // Filled out by uboot.
-
-                serial0: serial@4600 {
-                        cell-index = <1>;
-                        device_type = "serial";
-                        compatible = "ns16550";
-                        reg = <0x4600 0x100>;
-                        clock-frequency = <0>;
+                ecm-law@0 {
+                        status = "disabled";
+                };
+
+                ecm@1000 {
+                        status = "disabled";
+                };
+
+                memory-controller@2000 {
+                        status = "disabled";
+                };
+
+                i2c@3000 {
+                        status = "disabled";
+                };
+
+                i2c@3100 {
+                        status = "disabled";
+                };
+
+                serial0: serial@4500 {
+                        status = "disabled";
+                };
+
+                spi@7000 {
+                        status = "disabled";
                 };
 
                 dma@c300 {
@@ -96,6 +107,10 @@
                         };
                 };
 
+                gpio: gpio-controller@f000 {
+                        status = "disabled";
+                };
+
                 L2: l2-cache-controller@20000 {
                         compatible = "fsl,p2020-l2-cache-controller";
                         reg = <0x20000 0x1000>;
@@ -104,31 +119,49 @@
                         interrupt-parent = <&mpic>;
                 };
 
+                dma@21300 {
+                        status = "disabled";
+                };
+
+                usb@22000 {
+                        status = "disabled";
+                };
+
+                mdio@24520 {
+                        status = "disabled";
+                };
+
+                mdio@25520 {
+                        status = "disabled";
+                };
+
+                mdio@26520 {
+                        status = "disabled";
+                };
 
                 enet0: ethernet@24000 {
-                        #address-cells = <1>;
-                        #size-cells = <1>;
-                        cell-index = <0>;
-                        device_type = "network";
-                        model = "eTSEC";
-                        compatible = "gianfar";
-                        reg = <0x24000 0x1000>;
-                        ranges = <0x0 0x24000 0x1000>;
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <29 2 30 2 34 2>;
-                        interrupt-parent = <&mpic>;
                         fixed-link = <1 1 1000 0 0>;
                         phy-connection-type = "rgmii-id";
 
                 };
 
+                enet1: ethernet@25000 {
+                        status = "disabled";
+                };
+
+                enet2: ethernet@26000 {
+                        status = "disabled";
+                };
+
+                sdhci@2e000 {
+                        status = "disabled";
+                };
+
+                crypto@30000 {
+                        status = "disabled";
+                };
+
                 mpic: pic@40000 {
-                        interrupt-controller;
-                        #address-cells = <0>;
-                        #interrupt-cells = <2>;
-                        reg = <0x40000 0x40000>;
-                        compatible = "chrp,open-pic";
-                        device_type = "open-pic";
                         protected-sources = <
                         17 18 43 42 59 47 /*ecm, mem, i2c, serial0, spi,gpio */
                         16 20 21 22 23 28       /* L2, dma1, USB */
@@ -152,21 +185,32 @@
                                 0xe7 0>;
                         interrupt-parent = <&mpic>;
                 };
+
+                global-utilities@e0000 {        //global utilities block
+                        status = "disabled";
+                };
+
         };
 
-        pci1: pcie@ffe0a000 {
-                compatible = "fsl,mpc8548-pcie";
-                device_type = "pci";
-                #interrupt-cells = <1>;
-                #size-cells = <2>;
-                #address-cells = <3>;
-                reg = <0 0xffe0a000 0 0x1000>;
-                bus-range = <0 255>;
+        pci0: pcie@ffe08000 {
+                status = "disabled";
+        };
+
+        pci1: pcie@ffe09000 {
+                status = "disabled";
+        };
+
+        pci2: pcie@ffe0a000 {
                 ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
                           0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
-                clock-frequency = <33333333>;
-                interrupt-parent = <&mpic>;
-                interrupts = <26 2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0x0 0x0 0x1 &mpic 0x0 0x1
+                        0000 0x0 0x0 0x2 &mpic 0x1 0x1
+                        0000 0x0 0x0 0x3 &mpic 0x2 0x1
+                        0000 0x0 0x0 0x4 &mpic 0x3 0x1
+                        >;
                 pcie@0 {
                         reg = <0x0 0x0 0x0 0x0 0x0>;
                         #size-cells = <2>;
diff --git a/arch/powerpc/boot/dts/p2020si.dtsi b/arch/powerpc/boot/dts/p2020si.dtsi
new file mode 100644
index 000000000000..6def17f265d3
--- /dev/null
+++ b/arch/powerpc/boot/dts/p2020si.dtsi
@@ -0,0 +1,382 @@
+/*
+ * P2020 Device Tree Source
+ *
+ * Copyright 2011 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+/ {
+        compatible = "fsl,P2020";
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,P2020@0 {
+                        device_type = "cpu";
+                        reg = <0x0>;
+                        next-level-cache = <&L2>;
+                };
+
+                PowerPC,P2020@1 {
+                        device_type = "cpu";
+                        reg = <0x1>;
+                        next-level-cache = <&L2>;
+                };
+        };
+
+        localbus@ffe05000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,p2020-elbc", "fsl,elbc", "simple-bus";
+                reg = <0 0xffe05000 0 0x1000>;
+                interrupts = <19 2>;
+                interrupt-parent = <&mpic>;
+        };
+
+        soc@ffe00000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "fsl,p2020-immr", "simple-bus";
+                ranges = <0x0  0x0 0xffe00000 0x100000>;
+                bus-frequency = <0>;            // Filled out by uboot.
+
+                ecm-law@0 {
+                        compatible = "fsl,ecm-law";
+                        reg = <0x0 0x1000>;
+                        fsl,num-laws = <12>;
+                };
+
+                ecm@1000 {
+                        compatible = "fsl,p2020-ecm", "fsl,ecm";
+                        reg = <0x1000 0x1000>;
+                        interrupts = <17 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                memory-controller@2000 {
+                        compatible = "fsl,p2020-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <18 2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                spi@7000 {
+                        cell-index = <0>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,espi";
+                        reg = <0x7000 0x1000>;
+                        interrupts = <59 0x2>;
+                        interrupt-parent = <&mpic>;
+                        mode = "cpu";
+                };
+
+                dma@c300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,eloplus-dma";
+                        reg = <0xc300 0x4>;
+                        ranges = <0x0 0xc100 0x200>;
+                        cell-index = <1>;
+                        dma-channel@0 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <76 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <77 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <78 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <79 2>;
+                        };
+                };
+
+                gpio: gpio-controller@f000 {
+                        #gpio-cells = <2>;
+                        compatible = "fsl,mpc8572-gpio";
+                        reg = <0xf000 0x100>;
+                        interrupts = <47 0x2>;
+                        interrupt-parent = <&mpic>;
+                        gpio-controller;
+                };
+
+                L2: l2-cache-controller@20000 {
+                        compatible = "fsl,p2020-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <32>; // 32 bytes
+                        cache-size = <0x80000>; // L2,512K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <16 2>;
+                };
+
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
+                usb@22000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl-usb2-dr";
+                        reg = <0x22000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <28 0x2>;
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+                };
+
+                mdio@25520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-tbi";
+                        reg = <0x26520 0x20>;
+                };
+
+                mdio@26520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-tbi";
+                        reg = <0x520 0x20>;
+                };
+
+                enet0: ethernet@24000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        ranges = <0x0 0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2 30 2 34 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                enet1: ethernet@25000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x25000 0x1000>;
+                        ranges = <0x0 0x25000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <35 2 36 2 40 2>;
+                        interrupt-parent = <&mpic>;
+
+                };
+
+                enet2: ethernet@26000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        cell-index = <2>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x26000 0x1000>;
+                        ranges = <0x0 0x26000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <31 2 32 2 33 2>;
+                        interrupt-parent = <&mpic>;
+
+                };
+
+                sdhci@2e000 {
+                        compatible = "fsl,p2020-esdhc", "fsl,esdhc";
+                        reg = <0x2e000 0x1000>;
+                        interrupts = <72 0x2>;
+                        interrupt-parent = <&mpic>;
+                        /* Filled in by U-Boot */
+                        clock-frequency = <0>;
+                };
+
+                crypto@30000 {
+                        compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4",
+                                     "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2 58 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0xbfe>;
+                        fsl,descriptor-types-mask = <0x3ab0ebf>;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                };
+
+                msi@41600 {
+                        compatible = "fsl,p2020-msi", "fsl,mpic-msi";
+                        reg = <0x41600 0x80>;
+                        msi-available-ranges = <0 0x100>;
+                        interrupts = <
+                                0xe0 0
+                                0xe1 0
+                                0xe2 0
+                                0xe3 0
+                                0xe4 0
+                                0xe5 0
+                                0xe6 0
+                                0xe7 0>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                global-utilities@e0000 {        //global utilities block
+                        compatible = "fsl,p2020-guts";
+                        reg = <0xe0000 0x1000>;
+                        fsl,has-rstcr;
+                };
+        };
+
+        pci0: pcie@ffe08000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0 0xffe08000 0 0x1000>;
+                bus-range = <0 255>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <24 2>;
+        };
+
+        pci1: pcie@ffe09000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0 0xffe09000 0 0x1000>;
+                bus-range = <0 255>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <25 2>;
+        };
+
+        pci2: pcie@ffe0a000 {
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0 0xffe0a000 0 0x1000>;
+                bus-range = <0 255>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <26 2>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts
index 5b7fc29dd6cf..927f94d16e9b 100644
--- a/arch/powerpc/boot/dts/p4080ds.dts
+++ b/arch/powerpc/boot/dts/p4080ds.dts
@@ -1,7 +1,7 @@
 /*
  * P4080DS Device Tree Source
  *
- * Copyright 2009 Freescale Semiconductor Inc.
+ * Copyright 2009-2011 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
@@ -33,6 +33,17 @@
                 dma1 = &dma1;
                 sdhc = &sdhc;
 
+                crypto = &crypto;
+                sec_jr0 = &sec_jr0;
+                sec_jr1 = &sec_jr1;
+                sec_jr2 = &sec_jr2;
+                sec_jr3 = &sec_jr3;
+                rtic_a = &rtic_a;
+                rtic_b = &rtic_b;
+                rtic_c = &rtic_c;
+                rtic_d = &rtic_d;
+                sec_mon = &sec_mon;
+
                 rio0 = &rapidio0;
         };
 
@@ -410,6 +421,79 @@
                         dr_mode = "host";
                         phy_type = "ulpi";
                 };
+
+                crypto: crypto@300000 {
+                        compatible = "fsl,sec-v4.0";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        reg = <0x300000 0x10000>;
+                        ranges = <0 0x300000 0x10000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <92 2>;
+
+                        sec_jr0: jr@1000 {
+                                compatible = "fsl,sec-v4.0-job-ring";
+                                reg = <0x1000 0x1000>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <88 2>;
+                        };
+
+                        sec_jr1: jr@2000 {
+                                compatible = "fsl,sec-v4.0-job-ring";
+                                reg = <0x2000 0x1000>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <89 2>;
+                        };
+
+                        sec_jr2: jr@3000 {
+                                compatible = "fsl,sec-v4.0-job-ring";
+                                reg = <0x3000 0x1000>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <90 2>;
+                        };
+
+                        sec_jr3: jr@4000 {
+                                compatible = "fsl,sec-v4.0-job-ring";
+                                reg = <0x4000 0x1000>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <91 2>;
+                        };
+
+                        rtic@6000 {
+                                compatible = "fsl,sec-v4.0-rtic";
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <0x6000 0x100>;
+                                ranges = <0x0 0x6100 0xe00>;
+
+                                rtic_a: rtic-a@0 {
+                                        compatible = "fsl,sec-v4.0-rtic-memory";
+                                        reg = <0x00 0x20 0x100 0x80>;
+                                };
+
+                                rtic_b: rtic-b@20 {
+                                        compatible = "fsl,sec-v4.0-rtic-memory";
+                                        reg = <0x20 0x20 0x200 0x80>;
+                                };
+
+                                rtic_c: rtic-c@40 {
+                                        compatible = "fsl,sec-v4.0-rtic-memory";
+                                        reg = <0x40 0x20 0x300 0x80>;
+                                };
+
+                                rtic_d: rtic-d@60 {
+                                        compatible = "fsl,sec-v4.0-rtic-memory";
+                                        reg = <0x60 0x20 0x500 0x80>;
+                                };
+                        };
+                };
+
+                sec_mon: sec_mon@314000 {
+                        compatible = "fsl,sec-v4.0-mon";
+                        reg = <0x314000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <93 2>;
+                };
         };
 
         rapidio0: rapidio@ffe0c0000 {
diff --git a/arch/powerpc/boot/epapr.c b/arch/powerpc/boot/epapr.c
new file mode 100644
index 000000000000..06c1961bd124
--- /dev/null
+++ b/arch/powerpc/boot/epapr.c
@@ -0,0 +1,66 @@
+/*
+ * Bootwrapper for ePAPR compliant firmwares
+ *
+ * Copyright 2010 David Gibson <david@gibson.dropbear.id.au>, IBM Corporation.
+ *
+ * Based on earlier bootwrappers by:
+ * (c) Benjamin Herrenschmidt <benh@kernel.crashing.org>, IBM Corp,\
+ *   and
+ * 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 "io.h"
+#include <libfdt.h>
+
+BSS_STACK(4096);
+
+#define EPAPR_SMAGIC    0x65504150
+#define EPAPR_EMAGIC    0x45504150
+
+static unsigned epapr_magic;
+static unsigned long ima_size;
+static unsigned long fdt_addr;
+
+static void platform_fixups(void)
+{
+        if ((epapr_magic != EPAPR_EMAGIC)
+            && (epapr_magic != EPAPR_SMAGIC))
+                fatal("r6 contained 0x%08x instead of ePAPR magic number\n",
+                      epapr_magic);
+
+        if (ima_size < (unsigned long)_end)
+                printf("WARNING: Image loaded outside IMA!"
+                       " (_end=%p, ima_size=0x%lx)\n", _end, ima_size);
+        if (ima_size < fdt_addr)
+                printf("WARNING: Device tree address is outside IMA!"
+                       "(fdt_addr=0x%lx, ima_size=0x%lx)\n", fdt_addr,
+                       ima_size);
+        if (ima_size < fdt_addr + fdt_totalsize((void *)fdt_addr))
+                printf("WARNING: Device tree extends outside IMA!"
+                       " (fdt_addr=0x%lx, size=0x%x, ima_size=0x%lx\n",
+                       fdt_addr, fdt_totalsize((void *)fdt_addr), ima_size);
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        epapr_magic = r6;
+        ima_size = r7;
+        fdt_addr = r3;
+
+        /* FIXME: we should process reserve entries */
+
+        simple_alloc_init(_end, ima_size - (unsigned long)_end, 32, 64);
+
+        fdt_init((void *)fdt_addr);
+
+        serial_console_init();
+        platform_ops.fixups = platform_fixups;
+}
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index cb97e7511d7e..c74531af72c0 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -39,6 +39,7 @@ dts=
 cacheit=
 binary=
 gzip=.gz
+pie=
 
 # cross-compilation prefix
 CROSS=
@@ -157,9 +158,10 @@ pmac|chrp)
     platformo=$object/of.o
     ;;
 coff)
-    platformo=$object/of.o
+    platformo="$object/crt0.o $object/of.o"
     lds=$object/zImage.coff.lds
     link_address='0x500000'
+    pie=
     ;;
 miboot|uboot)
     # miboot and U-boot want just the bare bits, not an ELF binary
@@ -208,6 +210,7 @@ ps3)
     ksection=.kernel:vmlinux.bin
     isection=.kernel:initrd
     link_address=''
+    pie=
     ;;
 ep88xc|ep405|ep8248e)
     platformo="$object/fixed-head.o $object/$platform.o"
@@ -244,6 +247,10 @@ gamecube|wii)
 treeboot-iss4xx-mpic)
     platformo="$object/treeboot-iss4xx.o"
     ;;
+epapr)
+    link_address='0x20000000'
+    pie=-pie
+    ;;
 esac
 
 vmz="$tmpdir/`basename \"$kernel\"`.$ext"
@@ -251,7 +258,7 @@ if [ -z "$cacheit" -o ! -f "$vmz$gzip" -o "$vmz$gzip" -ot "$kernel" ]; then
     ${CROSS}objcopy $objflags "$kernel" "$vmz.$$"
 
     if [ -n "$gzip" ]; then
-        gzip -f -9 "$vmz.$$"
+        gzip -n -f -9 "$vmz.$$"
     fi
 
     if [ -n "$cacheit" ]; then
@@ -310,9 +317,9 @@ fi
 
 if [ "$platform" != "miboot" ]; then
     if [ -n "$link_address" ] ; then
-        text_start="-Ttext $link_address --defsym _start=$link_address"
+        text_start="-Ttext $link_address"
     fi
-    ${CROSS}ld -m elf32ppc -T $lds $text_start -o "$ofile" \
+    ${CROSS}ld -m elf32ppc -T $lds $text_start $pie -o "$ofile" \
         $platformo $tmp $object/wrapper.a
     rm $tmp
 fi
@@ -336,7 +343,7 @@ coff)
     $objbin/hack-coff "$ofile"
     ;;
 cuboot*)
-    gzip -f -9 "$ofile"
+    gzip -n -f -9 "$ofile"
     ${MKIMAGE} -A ppc -O linux -T kernel -C gzip -a "$base" -e "$entry" \
             $uboot_version -d "$ofile".gz "$ofile"
     ;;
@@ -383,6 +390,6 @@ ps3)
 
     odir="$(dirname "$ofile.bin")"
     rm -f "$odir/otheros.bld"
-    gzip --force -9 --stdout "$ofile.bin" > "$odir/otheros.bld"
+    gzip -n --force -9 --stdout "$ofile.bin" > "$odir/otheros.bld"
     ;;
 esac
diff --git a/arch/powerpc/boot/zImage.coff.lds.S b/arch/powerpc/boot/zImage.coff.lds.S
index 856dc78b14ef..de4c9e3c9344 100644
--- a/arch/powerpc/boot/zImage.coff.lds.S
+++ b/arch/powerpc/boot/zImage.coff.lds.S
@@ -3,13 +3,13 @@ ENTRY(_zimage_start_opd)
 EXTERN(_zimage_start_opd)
 SECTIONS
 {
-  _start = .;
   .text      :
   {
+    _start = .;
     *(.text)
     *(.fixup)
+    _etext = .;
   }
-  _etext = .;
   . = ALIGN(4096);
   .data    :
   {
@@ -17,9 +17,7 @@ SECTIONS
     *(.data*)
     *(__builtin_*)
     *(.sdata*)
-    __got2_start = .;
     *(.got2)
-    __got2_end = .;
 
     _dtb_start = .;
     *(.kernel:dtb)
diff --git a/arch/powerpc/boot/zImage.lds.S b/arch/powerpc/boot/zImage.lds.S
index 0962d62bdb50..2bd8731f1365 100644
--- a/arch/powerpc/boot/zImage.lds.S
+++ b/arch/powerpc/boot/zImage.lds.S
@@ -3,49 +3,64 @@ ENTRY(_zimage_start)
 EXTERN(_zimage_start)
 SECTIONS
 {
-  _start = .;
   .text      :
   {
+    _start = .;
     *(.text)
     *(.fixup)
+    _etext = .;
   }
-  _etext = .;
   . = ALIGN(4096);
   .data    :
   {
     *(.rodata*)
     *(.data*)
     *(.sdata*)
-    __got2_start = .;
     *(.got2)
-    __got2_end = .;
   }
+  .dynsym : { *(.dynsym) }
+  .dynstr : { *(.dynstr) }
+  .dynamic :
+  {
+    __dynamic_start = .;
+    *(.dynamic)
+  }
+  .hash : { *(.hash) }
+  .interp : { *(.interp) }
+  .rela.dyn : { *(.rela*) }
 
   . = ALIGN(8);
-  _dtb_start = .;
-  .kernel:dtb : { *(.kernel:dtb) }
-  _dtb_end = .;
-
-  . = ALIGN(4096);
-  _vmlinux_start =  .;
-  .kernel:vmlinux.strip : { *(.kernel:vmlinux.strip) }
-  _vmlinux_end =  .;
+  .kernel:dtb :
+  {
+    _dtb_start = .;
+    *(.kernel:dtb)
+    _dtb_end = .;
+  }
 
   . = ALIGN(4096);
-  _initrd_start =  .;
-  .kernel:initrd : { *(.kernel:initrd) }
-  _initrd_end =  .;
+  .kernel:vmlinux.strip :
+  {
+    _vmlinux_start =  .;
+    *(.kernel:vmlinux.strip)
+    _vmlinux_end =  .;
+  }
 
   . = ALIGN(4096);
-  _edata  =  .;
+  .kernel:initrd :
+  {
+    _initrd_start =  .;
+    *(.kernel:initrd)
+    _initrd_end =  .;
+  }
 
   . = ALIGN(4096);
-  __bss_start = .;
   .bss       :
   {
-   *(.sbss)
-   *(.bss)
+    _edata  =  .;
+    __bss_start = .;
+    *(.sbss)
+    *(.bss)
+    *(COMMON)
+    _end = . ;
   }
-  . = ALIGN(4096);
-  _end = . ;
 }
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index c683bce4c26e..126ef1b08a01 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -104,7 +104,6 @@ CONFIG_ROOT_NFS=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_CRYPTO_PCBC=m
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index a721cd3d793f..abcf00ad939e 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -101,7 +101,6 @@ CONFIG_ROOT_NFS=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_CRYPTO_PCBC=m
diff --git a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
index 55e0725500dc..11662c217ac0 100644
--- a/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8540_ads_defconfig
@@ -58,7 +58,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
index d724095530a6..ebe9b30b0721 100644
--- a/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/85xx/mpc8560_ads_defconfig
@@ -59,7 +59,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
index 4b44beaa21ae..eb25229b387a 100644
--- a/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/85xx/mpc85xx_cds_defconfig
@@ -63,7 +63,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
diff --git a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
index b614508d6fd2..f51c7ebc181e 100644
--- a/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
@@ -168,7 +168,6 @@ CONFIG_MAC_PARTITION=y
 CONFIG_CRC_T10DIF=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
index f9e6a3ea5a64..2a84fd7f631c 100644
--- a/arch/powerpc/configs/c2k_defconfig
+++ b/arch/powerpc/configs/c2k_defconfig
@@ -132,8 +132,8 @@ CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_IND=y
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
diff --git a/arch/powerpc/configs/e55xx_smp_defconfig b/arch/powerpc/configs/e55xx_smp_defconfig
index 9fa1613e5e2b..d32283555b53 100644
--- a/arch/powerpc/configs/e55xx_smp_defconfig
+++ b/arch/powerpc/configs/e55xx_smp_defconfig
@@ -6,10 +6,10 @@ CONFIG_NR_CPUS=2
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SPARSE_IRQ=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_EXPERT=y
@@ -25,8 +25,32 @@ CONFIG_P5020_DS=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BINFMT_MISC=m
-CONFIG_SPARSE_IRQ=y
 # CONFIG_PCI is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM_USER=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=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_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+CONFIG_INET_ESP=y
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_IPV6=y
+CONFIG_IP_SCTP=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
@@ -34,6 +58,9 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=131072
 CONFIG_MISC_DEVICES=y
 CONFIG_EEPROM_LEGACY=y
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=y
+CONFIG_NET_ETHERNET=y
 CONFIG_INPUT_FF_MEMLESS=m
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_KEYBOARD is not set
@@ -64,22 +91,14 @@ CONFIG_NLS=y
 CONFIG_NLS_UTF8=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=m
-CONFIG_LIBCRC32C=m
 CONFIG_FRAME_WARN=1024
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_VIRQ_DEBUG=y
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DEV_TALITOS=y
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index c06a86c33098..96b89df7752a 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -204,7 +204,6 @@ CONFIG_CRC_T10DIF=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index 942ced90557c..de65841aa04e 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -206,7 +206,6 @@ CONFIG_CRC_T10DIF=y
 CONFIG_DEBUG_FS=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig
index 038a308cbfc4..a1cc8179e9fd 100644
--- a/arch/powerpc/configs/mpc86xx_defconfig
+++ b/arch/powerpc/configs/mpc86xx_defconfig
@@ -171,7 +171,6 @@ CONFIG_MAC_PARTITION=y
 CONFIG_CRC_T10DIF=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
 # CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index ac4fc41035f6..f8b394a76ac3 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -112,8 +112,8 @@ CONFIG_IRDA_CACHE_LAST_LSAP=y
 CONFIG_IRDA_FAST_RR=y
 CONFIG_IRTTY_SIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index 0a10fb009ef7..214208924a9c 100644
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -351,8 +351,8 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index caba919f65d8..6472322bf13b 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -52,8 +52,8 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_DIAG is not set
 CONFIG_IPV6=y
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 249ddd0a27cd..7de13865508c 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -146,12 +146,18 @@ CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_FC_ATTRS=y
 CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_BE2ISCSI=m
 CONFIG_SCSI_IBMVSCSI=y
 CONFIG_SCSI_IBMVFC=m
 CONFIG_SCSI_SYM53C8XX_2=y
 CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
 CONFIG_SCSI_IPR=y
 CONFIG_SCSI_QLA_FC=m
+CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 CONFIG_ATA=y
 # CONFIG_ATA_SFF is not set
@@ -197,6 +203,8 @@ CONFIG_S2IO=m
 CONFIG_MYRI10GE=m
 CONFIG_NETXEN_NIC=m
 CONFIG_MLX4_EN=m
+CONFIG_QLGE=m
+CONFIG_BE2NET=m
 CONFIG_PPP=m
 CONFIG_PPP_ASYNC=m
 CONFIG_PPP_SYNC_TTY=m
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 1833d1a07e79..c0d842cfd012 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -157,6 +157,7 @@ extern const char *powerpc_base_platform;
 #define CPU_FTR_476_DD2                 ASM_CONST(0x0000000000010000)
 #define CPU_FTR_NEED_COHERENT           ASM_CONST(0x0000000000020000)
 #define CPU_FTR_NO_BTIC                 ASM_CONST(0x0000000000040000)
+#define CPU_FTR_DEBUG_LVL_EXC           ASM_CONST(0x0000000000080000)
 #define CPU_FTR_NODSISRALIGN            ASM_CONST(0x0000000000100000)
 #define CPU_FTR_PPC_LE                  ASM_CONST(0x0000000000200000)
 #define CPU_FTR_REAL_LE                 ASM_CONST(0x0000000000400000)
@@ -178,22 +179,18 @@ extern const char *powerpc_base_platform;
 #define LONG_ASM_CONST(x)               0
 #endif
 
-#define CPU_FTR_SLB                     LONG_ASM_CONST(0x0000000100000000)
-#define CPU_FTR_16M_PAGE                LONG_ASM_CONST(0x0000000200000000)
-#define CPU_FTR_TLBIEL                  LONG_ASM_CONST(0x0000000400000000)
+
+#define CPU_FTR_HVMODE_206              LONG_ASM_CONST(0x0000000800000000)
+#define CPU_FTR_CFAR                    LONG_ASM_CONST(0x0000001000000000)
 #define CPU_FTR_IABR                    LONG_ASM_CONST(0x0000002000000000)
 #define CPU_FTR_MMCRA                   LONG_ASM_CONST(0x0000004000000000)
 #define CPU_FTR_CTRL                    LONG_ASM_CONST(0x0000008000000000)
 #define CPU_FTR_SMT                     LONG_ASM_CONST(0x0000010000000000)
-#define CPU_FTR_LOCKLESS_TLBIE          LONG_ASM_CONST(0x0000040000000000)
-#define CPU_FTR_CI_LARGE_PAGE           LONG_ASM_CONST(0x0000100000000000)
 #define CPU_FTR_PAUSE_ZERO              LONG_ASM_CONST(0x0000200000000000)
 #define CPU_FTR_PURR                    LONG_ASM_CONST(0x0000400000000000)
 #define CPU_FTR_CELL_TB_BUG             LONG_ASM_CONST(0x0000800000000000)
 #define CPU_FTR_SPURR                   LONG_ASM_CONST(0x0001000000000000)
 #define CPU_FTR_DSCR                    LONG_ASM_CONST(0x0002000000000000)
-#define CPU_FTR_1T_SEGMENT              LONG_ASM_CONST(0x0004000000000000)
-#define CPU_FTR_NO_SLBIE_B              LONG_ASM_CONST(0x0008000000000000)
 #define CPU_FTR_VSX                     LONG_ASM_CONST(0x0010000000000000)
 #define CPU_FTR_SAO                     LONG_ASM_CONST(0x0020000000000000)
 #define CPU_FTR_CP_USE_DCBTZ            LONG_ASM_CONST(0x0040000000000000)
@@ -202,12 +199,14 @@ extern const char *powerpc_base_platform;
 #define CPU_FTR_STCX_CHECKS_ADDRESS     LONG_ASM_CONST(0x0200000000000000)
 #define CPU_FTR_POPCNTB                 LONG_ASM_CONST(0x0400000000000000)
 #define CPU_FTR_POPCNTD                 LONG_ASM_CONST(0x0800000000000000)
+#define CPU_FTR_ICSWX                   LONG_ASM_CONST(0x1000000000000000)
 
 #ifndef __ASSEMBLY__
 
-#define CPU_FTR_PPCAS_ARCH_V2   (CPU_FTR_SLB | \
-                                 CPU_FTR_TLBIEL | CPU_FTR_NOEXECUTE | \
-                                 CPU_FTR_NODSISRALIGN | CPU_FTR_16M_PAGE)
+#define CPU_FTR_PPCAS_ARCH_V2   (CPU_FTR_NOEXECUTE | CPU_FTR_NODSISRALIGN)
+
+#define MMU_FTR_PPCAS_ARCH_V2   (MMU_FTR_SLB | MMU_FTR_TLBIEL | \
+                                 MMU_FTR_16M_PAGE)
 
 /* We only set the altivec features if the kernel was compiled with altivec
  * support
@@ -387,7 +386,8 @@ extern const char *powerpc_base_platform;
             CPU_FTR_DBELL)
 #define CPU_FTRS_E5500  (CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \
             CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \
-            CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD)
+            CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \
+            CPU_FTR_DEBUG_LVL_EXC)
 #define CPU_FTRS_GENERIC_32     (CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN)
 
 /* 64-bit CPUs */
@@ -407,44 +407,45 @@ extern const char *powerpc_base_platform;
 #define CPU_FTRS_POWER5 (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
             CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
             CPU_FTR_MMCRA | CPU_FTR_SMT | \
-            CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \
-            CPU_FTR_PURR | CPU_FTR_STCX_CHECKS_ADDRESS | \
-            CPU_FTR_POPCNTB)
+            CPU_FTR_COHERENT_ICACHE | CPU_FTR_PURR | \
+            CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB)
 #define CPU_FTRS_POWER6 (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
             CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
             CPU_FTR_MMCRA | CPU_FTR_SMT | \
-            CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \
+            CPU_FTR_COHERENT_ICACHE | \
             CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \
             CPU_FTR_DSCR | CPU_FTR_UNALIGNED_LD_STD | \
-            CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB)
+            CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_CFAR)
 #define CPU_FTRS_POWER7 (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
-            CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
+            CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | CPU_FTR_HVMODE_206 |\
             CPU_FTR_MMCRA | CPU_FTR_SMT | \
-            CPU_FTR_COHERENT_ICACHE | CPU_FTR_LOCKLESS_TLBIE | \
+            CPU_FTR_COHERENT_ICACHE | \
             CPU_FTR_PURR | CPU_FTR_SPURR | CPU_FTR_REAL_LE | \
             CPU_FTR_DSCR | CPU_FTR_SAO  | CPU_FTR_ASYM_SMT | \
-            CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD)
+            CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \
+            CPU_FTR_ICSWX | CPU_FTR_CFAR)
 #define CPU_FTRS_CELL   (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
             CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
             CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \
-            CPU_FTR_PAUSE_ZERO | CPU_FTR_CI_LARGE_PAGE | \
-            CPU_FTR_CELL_TB_BUG | CPU_FTR_CP_USE_DCBTZ | \
+            CPU_FTR_PAUSE_ZERO  | CPU_FTR_CELL_TB_BUG | CPU_FTR_CP_USE_DCBTZ | \
             CPU_FTR_UNALIGNED_LD_STD)
 #define CPU_FTRS_PA6T (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
-            CPU_FTR_PPCAS_ARCH_V2 | \
-            CPU_FTR_ALTIVEC_COMP | CPU_FTR_CI_LARGE_PAGE | \
-            CPU_FTR_PURR | CPU_FTR_REAL_LE | CPU_FTR_NO_SLBIE_B)
+            CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_ALTIVEC_COMP | \
+            CPU_FTR_PURR | CPU_FTR_REAL_LE)
 #define CPU_FTRS_COMPATIBLE     (CPU_FTR_USE_TB | CPU_FTR_PPCAS_ARCH_V2)
 
+#define CPU_FTRS_A2 (CPU_FTR_USE_TB | CPU_FTR_SMT | CPU_FTR_DBELL | \
+                     CPU_FTR_NOEXECUTE | CPU_FTR_NODSISRALIGN)
+
 #ifdef __powerpc64__
 #ifdef CONFIG_PPC_BOOK3E
-#define CPU_FTRS_POSSIBLE       (CPU_FTRS_E5500)
+#define CPU_FTRS_POSSIBLE       (CPU_FTRS_E5500 | CPU_FTRS_A2)
 #else
 #define CPU_FTRS_POSSIBLE       \
             (CPU_FTRS_POWER3 | CPU_FTRS_RS64 | CPU_FTRS_POWER4 |        \
             CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | CPU_FTRS_POWER6 |       \
             CPU_FTRS_POWER7 | CPU_FTRS_CELL | CPU_FTRS_PA6T |           \
-            CPU_FTR_1T_SEGMENT | CPU_FTR_VSX)
+            CPU_FTR_VSX)
 #endif
 #else
 enum {
@@ -487,7 +488,7 @@ enum {
 
 #ifdef __powerpc64__
 #ifdef CONFIG_PPC_BOOK3E
-#define CPU_FTRS_ALWAYS         (CPU_FTRS_E5500)
+#define CPU_FTRS_ALWAYS         (CPU_FTRS_E5500 & CPU_FTRS_A2)
 #else
 #define CPU_FTRS_ALWAYS         \
             (CPU_FTRS_POWER3 & CPU_FTRS_RS64 & CPU_FTRS_POWER4 &        \
diff --git a/arch/powerpc/include/asm/cputhreads.h b/arch/powerpc/include/asm/cputhreads.h
index f71bb4c118b4..ce516e5eb0d3 100644
--- a/arch/powerpc/include/asm/cputhreads.h
+++ b/arch/powerpc/include/asm/cputhreads.h
@@ -37,16 +37,16 @@ extern cpumask_t threads_core_mask;
  * This can typically be used for things like IPI for tlb invalidations
  * since those need to be done only once per core/TLB
  */
-static inline cpumask_t cpu_thread_mask_to_cores(cpumask_t threads)
+static inline cpumask_t cpu_thread_mask_to_cores(const struct cpumask *threads)
 {
         cpumask_t       tmp, res;
         int             i;
 
-        res = CPU_MASK_NONE;
+        cpumask_clear(&res);
         for (i = 0; i < NR_CPUS; i += threads_per_core) {
-                cpus_shift_left(tmp, threads_core_mask, i);
-                if (cpus_intersects(threads, tmp))
-                        cpu_set(i, res);
+                cpumask_shift_left(&tmp, &threads_core_mask, i);
+                if (cpumask_intersects(threads, &tmp))
+                        cpumask_set_cpu(i, &res);
         }
         return res;
 }
@@ -58,7 +58,7 @@ static inline int cpu_nr_cores(void)
 
 static inline cpumask_t cpu_online_cores_map(void)
 {
-        return cpu_thread_mask_to_cores(cpu_online_map);
+        return cpu_thread_mask_to_cores(cpu_online_mask);
 }
 
 #ifdef CONFIG_SMP
diff --git a/arch/powerpc/include/asm/dbell.h b/arch/powerpc/include/asm/dbell.h
index 0893ab9343a6..9c70d0ca96d4 100644
--- a/arch/powerpc/include/asm/dbell.h
+++ b/arch/powerpc/include/asm/dbell.h
@@ -27,9 +27,8 @@ enum ppc_dbell {
         PPC_G_DBELL_MC = 4,     /* guest mcheck doorbell */
 };
 
-extern void doorbell_message_pass(int target, int msg);
+extern void doorbell_cause_ipi(int cpu, unsigned long data);
 extern void doorbell_exception(struct pt_regs *regs);
-extern void doorbell_check_self(void);
 extern void doorbell_setup_this_cpu(void);
 
 static inline void ppc_msgsnd(enum ppc_dbell type, u32 flags, u32 tag)
diff --git a/arch/powerpc/include/asm/emulated_ops.h b/arch/powerpc/include/asm/emulated_ops.h
index f0fb4fc1f6e6..45921672b97a 100644
--- a/arch/powerpc/include/asm/emulated_ops.h
+++ b/arch/powerpc/include/asm/emulated_ops.h
@@ -52,6 +52,10 @@ extern struct ppc_emulated {
 #ifdef CONFIG_VSX
         struct ppc_emulated_entry vsx;
 #endif
+#ifdef CONFIG_PPC64
+        struct ppc_emulated_entry mfdscr;
+        struct ppc_emulated_entry mtdscr;
+#endif
 } ppc_emulated;
 
 extern u32 ppc_warn_emulated;
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 7778d6f0c878..f5dfe3411f64 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -46,6 +46,7 @@
 #define EX_CCR          60
 #define EX_R3           64
 #define EX_LR           72
+#define EX_CFAR         80
 
 /*
  * We're short on space and time in the exception prolog, so we can't
@@ -56,30 +57,40 @@
 #define LOAD_HANDLER(reg, label)                                        \
         addi    reg,reg,(label)-_stext; /* virt addr of handler ... */
 
-#define EXCEPTION_PROLOG_1(area)                                \
-        mfspr   r13,SPRN_SPRG_PACA;     /* get paca address into r13 */ \
+/* Exception register prefixes */
+#define EXC_HV  H
+#define EXC_STD
+
+#define EXCEPTION_PROLOG_1(area)                                        \
+        GET_PACA(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_SPRG_SCRATCH0;                                  \
+        BEGIN_FTR_SECTION_NESTED(66);                                   \
+        mfspr   r10,SPRN_CFAR;                                          \
+        std     r10,area+EX_CFAR(r13);                                  \
+        END_FTR_SECTION_NESTED(CPU_FTR_CFAR, CPU_FTR_CFAR, 66);         \
+        GET_SCRATCH0(r9);                                               \
         std     r9,area+EX_R13(r13);                                    \
         mfcr    r9
 
-#define EXCEPTION_PROLOG_PSERIES_1(label)                               \
+#define __EXCEPTION_PROLOG_PSERIES_1(label, h)                          \
         ld      r12,PACAKBASE(r13);     /* get high part of &label */   \
         ld      r10,PACAKMSR(r13);      /* get MSR value for kernel */  \
-        mfspr   r11,SPRN_SRR0;          /* save SRR0 */                 \
+        mfspr   r11,SPRN_##h##SRR0;     /* save SRR0 */                 \
         LOAD_HANDLER(r12,label)                                         \
-        mtspr   SPRN_SRR0,r12;                                          \
-        mfspr   r12,SPRN_SRR1;          /* and SRR1 */                  \
-        mtspr   SPRN_SRR1,r10;                                          \
-        rfid;                                                           \
+        mtspr   SPRN_##h##SRR0,r12;                                     \
+        mfspr   r12,SPRN_##h##SRR1;     /* and SRR1 */                  \
+        mtspr   SPRN_##h##SRR1,r10;                                     \
+        h##rfid;                                                        \
         b       .       /* prevent speculative execution */
+#define EXCEPTION_PROLOG_PSERIES_1(label, h) \
+        __EXCEPTION_PROLOG_PSERIES_1(label, h)
 
-#define EXCEPTION_PROLOG_PSERIES(area, label)                           \
+#define EXCEPTION_PROLOG_PSERIES(area, label, h)                        \
         EXCEPTION_PROLOG_1(area);                                       \
-        EXCEPTION_PROLOG_PSERIES_1(label);
+        EXCEPTION_PROLOG_PSERIES_1(label, h);
 
 /*
  * The common exception prolog is used for all except a few exceptions
@@ -98,10 +109,11 @@
         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       */ \
+        blt+    cr1,3f;                 /* abort if it is               */ \
+        li      r1,(n);                 /* will be reloaded later       */ \
         sth     r1,PACA_TRAP_SAVE(r13);                                    \
+        std     r3,area+EX_R3(r13);                                        \
+        addi    r3,r13,area;            /* r3 -> where regs are saved*/    \
         b       bad_stack;                                                 \
 3:      std     r9,_CCR(r1);            /* save CR in stackframe        */ \
         std     r11,_NIP(r1);           /* save SRR0 in stackframe      */ \
@@ -123,6 +135,10 @@
         std     r9,GPR11(r1);                                              \
         std     r10,GPR12(r1);                                             \
         std     r11,GPR13(r1);                                             \
+        BEGIN_FTR_SECTION_NESTED(66);                                      \
+        ld      r10,area+EX_CFAR(r13);                                     \
+        std     r10,ORIG_GPR3(r1);                                         \
+        END_FTR_SECTION_NESTED(CPU_FTR_CFAR, CPU_FTR_CFAR, 66);            \
         ld      r2,PACATOC(r13);        /* get kernel TOC into r2       */ \
         mflr    r9;                     /* save LR in stackframe        */ \
         std     r9,_LINK(r1);                                              \
@@ -143,57 +159,62 @@
 /*
  * Exception vectors.
  */
-#define STD_EXCEPTION_PSERIES(n, label)                 \
-        . = n;                                          \
+#define STD_EXCEPTION_PSERIES(loc, vec, label)          \
+        . = loc;                                        \
         .globl label##_pSeries;                         \
 label##_pSeries:                                        \
         HMT_MEDIUM;                                     \
-        DO_KVM  n;                                      \
-        mtspr   SPRN_SPRG_SCRATCH0,r13;         /* save r13 */  \
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common)
+        DO_KVM  vec;                                    \
+        SET_SCRATCH0(r13);              /* save r13 */          \
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common, EXC_STD)
 
-#define HSTD_EXCEPTION_PSERIES(n, label)                \
-        . = n;                                          \
-        .globl label##_pSeries;                         \
-label##_pSeries:                                        \
+#define STD_EXCEPTION_HV(loc, vec, label)               \
+        . = loc;                                        \
+        .globl label##_hv;                              \
+label##_hv:                                             \
         HMT_MEDIUM;                                     \
-        mtspr   SPRN_SPRG_SCRATCH0,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_SPRG_SCRATCH0; /* restore r20 */ \
-        mtspr   SPRN_SPRG_SCRATCH0,r13;         /* save r13 */  \
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common)
+        DO_KVM  vec;                                    \
+        SET_SCRATCH0(r13);      /* save r13 */          \
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common, EXC_HV)
 
-
-#define MASKABLE_EXCEPTION_PSERIES(n, label)                            \
-        . = n;                                                          \
-        .globl label##_pSeries;                                         \
-label##_pSeries:                                                        \
+#define __MASKABLE_EXCEPTION_PSERIES(vec, label, h)                     \
         HMT_MEDIUM;                                                     \
-        DO_KVM  n;                                                      \
-        mtspr   SPRN_SPRG_SCRATCH0,r13; /* save r13 */                  \
-        mfspr   r13,SPRN_SPRG_PACA;     /* get paca address into r13 */ \
+        DO_KVM  vec;                                                    \
+        SET_SCRATCH0(r13);    /* save r13 */                            \
+        GET_PACA(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_SPRG_SCRATCH0;                                 \
+        beq     masked_##h##interrupt;                                  \
+        GET_SCRATCH0(r10);                                              \
         std     r10,PACA_EXGEN+EX_R13(r13);                             \
         std     r11,PACA_EXGEN+EX_R11(r13);                             \
         std     r12,PACA_EXGEN+EX_R12(r13);                             \
         ld      r12,PACAKBASE(r13);     /* get high part of &label */   \
         ld      r10,PACAKMSR(r13);      /* get MSR value for kernel */  \
-        mfspr   r11,SPRN_SRR0;          /* save SRR0 */                 \
+        mfspr   r11,SPRN_##h##SRR0;     /* save SRR0 */                 \
         LOAD_HANDLER(r12,label##_common)                                \
-        mtspr   SPRN_SRR0,r12;                                          \
-        mfspr   r12,SPRN_SRR1;          /* and SRR1 */                  \
-        mtspr   SPRN_SRR1,r10;                                          \
-        rfid;                                                           \
+        mtspr   SPRN_##h##SRR0,r12;                                     \
+        mfspr   r12,SPRN_##h##SRR1;     /* and SRR1 */                  \
+        mtspr   SPRN_##h##SRR1,r10;                                     \
+        h##rfid;                                                        \
         b       .       /* prevent speculative execution */
+#define _MASKABLE_EXCEPTION_PSERIES(vec, label, h)                      \
+        __MASKABLE_EXCEPTION_PSERIES(vec, label, h)
+
+#define MASKABLE_EXCEPTION_PSERIES(loc, vec, label)                     \
+        . = loc;                                                        \
+        .globl label##_pSeries;                                         \
+label##_pSeries:                                                        \
+        _MASKABLE_EXCEPTION_PSERIES(vec, label, EXC_STD)
+
+#define MASKABLE_EXCEPTION_HV(loc, vec, label)                          \
+        . = loc;                                                        \
+        .globl label##_hv;                                              \
+label##_hv:                                                             \
+        _MASKABLE_EXCEPTION_PSERIES(vec, label, EXC_HV)
 
 #ifdef CONFIG_PPC_ISERIES
 #define DISABLE_INTS                            \
diff --git a/arch/powerpc/include/asm/feature-fixups.h b/arch/powerpc/include/asm/feature-fixups.h
index 921a8470e18a..9a67a38bf7b9 100644
--- a/arch/powerpc/include/asm/feature-fixups.h
+++ b/arch/powerpc/include/asm/feature-fixups.h
@@ -49,7 +49,7 @@ label##5:							\
         FTR_ENTRY_OFFSET label##2b-label##5b;                   \
         FTR_ENTRY_OFFSET label##3b-label##5b;                   \
         FTR_ENTRY_OFFSET label##4b-label##5b;                   \
-        .ifgt (label##4b-label##3b)-(label##2b-label##1b);      \
+        .ifgt (label##4b- label##3b)-(label##2b- label##1b);    \
         .error "Feature section else case larger than body";    \
         .endif;                                                 \
         .popsection;
@@ -146,6 +146,19 @@ label##5:							\
 
 #ifndef __ASSEMBLY__
 
+#define ASM_FTR_IF(section_if, section_else, msk, val)  \
+        stringify_in_c(BEGIN_FTR_SECTION)                       \
+        section_if "; "                                         \
+        stringify_in_c(FTR_SECTION_ELSE)                        \
+        section_else "; "                                       \
+        stringify_in_c(ALT_FTR_SECTION_END((msk), (val)))
+
+#define ASM_FTR_IFSET(section_if, section_else, msk)    \
+        ASM_FTR_IF(section_if, section_else, (msk), (msk))
+
+#define ASM_FTR_IFCLR(section_if, section_else, msk)    \
+        ASM_FTR_IF(section_if, section_else, (msk), 0)
+
 #define ASM_MMU_FTR_IF(section_if, section_else, msk, val)      \
         stringify_in_c(BEGIN_MMU_FTR_SECTION)                   \
         section_if "; "                                         \
diff --git a/arch/powerpc/include/asm/firmware.h b/arch/powerpc/include/asm/firmware.h
index 4ef662e4a31d..3a6c586c4e40 100644
--- a/arch/powerpc/include/asm/firmware.h
+++ b/arch/powerpc/include/asm/firmware.h
@@ -47,6 +47,7 @@
 #define FW_FEATURE_BEAT         ASM_CONST(0x0000000001000000)
 #define FW_FEATURE_CMO          ASM_CONST(0x0000000002000000)
 #define FW_FEATURE_VPHN         ASM_CONST(0x0000000004000000)
+#define FW_FEATURE_XCMO         ASM_CONST(0x0000000008000000)
 
 #ifndef __ASSEMBLY__
 
@@ -60,7 +61,7 @@ enum {
                 FW_FEATURE_VIO | FW_FEATURE_RDMA | FW_FEATURE_LLAN |
                 FW_FEATURE_BULK_REMOVE | FW_FEATURE_XDABR |
                 FW_FEATURE_MULTITCE | FW_FEATURE_SPLPAR | FW_FEATURE_LPAR |
-                FW_FEATURE_CMO | FW_FEATURE_VPHN,
+                FW_FEATURE_CMO | FW_FEATURE_VPHN | FW_FEATURE_XCMO,
         FW_FEATURE_PSERIES_ALWAYS = 0,
         FW_FEATURE_ISERIES_POSSIBLE = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,
         FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,
diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h
index 8edec710cc6d..852b8c1c09db 100644
--- a/arch/powerpc/include/asm/hvcall.h
+++ b/arch/powerpc/include/asm/hvcall.h
@@ -102,6 +102,7 @@
 #define H_ANDCOND               (1UL<<(63-33))
 #define H_ICACHE_INVALIDATE     (1UL<<(63-40))  /* icbi, etc.  (ignored for IO pages) */
 #define H_ICACHE_SYNCHRONIZE    (1UL<<(63-41))  /* dcbst, icbi, etc (ignored for IO pages */
+#define H_COALESCE_CAND (1UL<<(63-42))  /* page is a good candidate for coalescing */
 #define H_ZERO_PAGE             (1UL<<(63-48))  /* zero the page before mapping (ignored for IO pages) */
 #define H_COPY_PAGE             (1UL<<(63-49))
 #define H_N                     (1UL<<(63-61))
@@ -234,6 +235,7 @@
 #define H_GET_MPP               0x2D4
 #define H_HOME_NODE_ASSOCIATIVITY 0x2EC
 #define H_BEST_ENERGY           0x2F4
+#define H_GET_MPP_X             0x314
 #define MAX_HCALL_OPCODE        H_BEST_ENERGY
 
 #ifndef __ASSEMBLY__
@@ -312,6 +314,16 @@ struct hvcall_mpp_data {
 
 int h_get_mpp(struct hvcall_mpp_data *);
 
+struct hvcall_mpp_x_data {
+        unsigned long coalesced_bytes;
+        unsigned long pool_coalesced_bytes;
+        unsigned long pool_purr_cycles;
+        unsigned long pool_spurr_cycles;
+        unsigned long reserved[3];
+};
+
+int h_get_mpp_x(struct hvcall_mpp_x_data *mpp_x_data);
+
 #ifdef CONFIG_PPC_PSERIES
 extern int CMO_PrPSP;
 extern int CMO_SecPSP;
diff --git a/arch/powerpc/platforms/cell/io-workarounds.h b/arch/powerpc/include/asm/io-workarounds.h
index 6efc7782ebf2..fbae49286926 100644
--- a/arch/powerpc/platforms/cell/io-workarounds.h
+++ b/arch/powerpc/include/asm/io-workarounds.h
@@ -31,7 +31,6 @@ struct iowa_bus {
         void   *private;
 };
 
-void __devinit io_workaround_init(void);
 void __devinit iowa_register_bus(struct pci_controller *, struct ppc_pci_io *,
                                  int (*)(struct iowa_bus *, void *), void *);
 struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR);
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index 001f2f11c19b..45698d55cd6a 100644
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
@@ -2,6 +2,8 @@
 #define _ASM_POWERPC_IO_H
 #ifdef __KERNEL__
 
+#define ARCH_HAS_IOREMAP_WC
+
 /*
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -481,10 +483,16 @@ __do_out_asm(_rec_outl, "stwbrx")
                                 _memcpy_fromio(dst,PCI_FIX_ADDR(src),n)
 #endif /* !CONFIG_EEH */
 
-#ifdef CONFIG_PPC_INDIRECT_IO
-#define DEF_PCI_HOOK(x)         x
+#ifdef CONFIG_PPC_INDIRECT_PIO
+#define DEF_PCI_HOOK_pio(x)     x
+#else
+#define DEF_PCI_HOOK_pio(x)     NULL
+#endif
+
+#ifdef CONFIG_PPC_INDIRECT_MMIO
+#define DEF_PCI_HOOK_mem(x)     x
 #else
-#define DEF_PCI_HOOK(x)         NULL
+#define DEF_PCI_HOOK_mem(x)     NULL
 #endif
 
 /* Structure containing all the hooks */
@@ -504,7 +512,7 @@ extern struct ppc_pci_io {
 #define DEF_PCI_AC_RET(name, ret, at, al, space, aa)            \
 static inline ret name at                                       \
 {                                                               \
-        if (DEF_PCI_HOOK(ppc_pci_io.name) != NULL)              \
+        if (DEF_PCI_HOOK_##space(ppc_pci_io.name) != NULL)      \
                 return ppc_pci_io.name al;                      \
         return __do_##name al;                                  \
 }
@@ -512,7 +520,7 @@ static inline ret name at					\
 #define DEF_PCI_AC_NORET(name, at, al, space, aa)               \
 static inline void name at                                      \
 {                                                               \
-        if (DEF_PCI_HOOK(ppc_pci_io.name) != NULL)              \
+        if (DEF_PCI_HOOK_##space(ppc_pci_io.name) != NULL)              \
                 ppc_pci_io.name al;                             \
         else                                                    \
                 __do_##name al;                                 \
@@ -616,12 +624,13 @@ static inline void iosync(void)
  * * ioremap is the standard one and provides non-cacheable guarded mappings
  *   and can be hooked by the platform via ppc_md
  *
- * * ioremap_flags allows to specify the page flags as an argument and can
- *   also be hooked by the platform via ppc_md. ioremap_prot is the exact
- *   same thing as ioremap_flags.
+ * * ioremap_prot allows to specify the page flags as an argument and can
+ *   also be hooked by the platform via ppc_md.
  *
  * * ioremap_nocache is identical to ioremap
  *
+ * * ioremap_wc enables write combining
+ *
  * * iounmap undoes such a mapping and can be hooked
  *
  * * __ioremap_at (and the pending __iounmap_at) are low level functions to
@@ -629,7 +638,7 @@ static inline void iosync(void)
  *   currently be hooked. Must be page aligned.
  *
  * * __ioremap is the low level implementation used by ioremap and
- *   ioremap_flags and cannot be hooked (but can be used by a hook on one
+ *   ioremap_prot and cannot be hooked (but can be used by a hook on one
  *   of the previous ones)
  *
  * * __ioremap_caller is the same as above but takes an explicit caller
@@ -640,10 +649,10 @@ static inline void iosync(void)
  *
  */
 extern void __iomem *ioremap(phys_addr_t address, unsigned long size);
-extern void __iomem *ioremap_flags(phys_addr_t address, unsigned long size,
-                                   unsigned long flags);
+extern void __iomem *ioremap_prot(phys_addr_t address, unsigned long size,
+                                  unsigned long flags);
+extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long size);
 #define ioremap_nocache(addr, size)     ioremap((addr), (size))
-#define ioremap_prot(addr, size, prot)  ioremap_flags((addr), (size), (prot))
 
 extern void iounmap(volatile void __iomem *addr);
 
diff --git a/arch/powerpc/include/asm/io_event_irq.h b/arch/powerpc/include/asm/io_event_irq.h
new file mode 100644
index 000000000000..b1a9a1be3c21
--- /dev/null
+++ b/arch/powerpc/include/asm/io_event_irq.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2010, 2011 Mark Nelson and Tseng-Hui (Frank) Lin, 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.
+ */
+
+#ifndef _ASM_POWERPC_IO_EVENT_IRQ_H
+#define _ASM_POWERPC_IO_EVENT_IRQ_H
+
+#include <linux/types.h>
+#include <linux/notifier.h>
+
+#define PSERIES_IOEI_RPC_MAX_LEN 216
+
+#define PSERIES_IOEI_TYPE_ERR_DETECTED          0x01
+#define PSERIES_IOEI_TYPE_ERR_RECOVERED         0x02
+#define PSERIES_IOEI_TYPE_EVENT                 0x03
+#define PSERIES_IOEI_TYPE_RPC_PASS_THRU         0x04
+
+#define PSERIES_IOEI_SUBTYPE_NOT_APP            0x00
+#define PSERIES_IOEI_SUBTYPE_REBALANCE_REQ      0x01
+#define PSERIES_IOEI_SUBTYPE_NODE_ONLINE        0x03
+#define PSERIES_IOEI_SUBTYPE_NODE_OFFLINE       0x04
+#define PSERIES_IOEI_SUBTYPE_DUMP_SIZE_CHANGE   0x05
+#define PSERIES_IOEI_SUBTYPE_TORRENT_IRV_UPDATE 0x06
+#define PSERIES_IOEI_SUBTYPE_TORRENT_HFI_CFGED  0x07
+
+#define PSERIES_IOEI_SCOPE_NOT_APP              0x00
+#define PSERIES_IOEI_SCOPE_RIO_HUB              0x36
+#define PSERIES_IOEI_SCOPE_RIO_BRIDGE           0x37
+#define PSERIES_IOEI_SCOPE_PHB                  0x38
+#define PSERIES_IOEI_SCOPE_EADS_GLOBAL          0x39
+#define PSERIES_IOEI_SCOPE_EADS_SLOT            0x3A
+#define PSERIES_IOEI_SCOPE_TORRENT_HUB          0x3B
+#define PSERIES_IOEI_SCOPE_SERVICE_PROC         0x51
+
+/* Platform Event Log Format, Version 6, data portition of IO event section */
+struct pseries_io_event {
+        uint8_t event_type;             /* 0x00 IO-Event Type           */
+        uint8_t rpc_data_len;           /* 0x01 RPC data length         */
+        uint8_t scope;                  /* 0x02 Error/Event Scope       */
+        uint8_t event_subtype;          /* 0x03 I/O-Event Sub-Type      */
+        uint32_t drc_index;             /* 0x04 DRC Index               */
+        uint8_t rpc_data[PSERIES_IOEI_RPC_MAX_LEN];
+                                        /* 0x08 RPC Data (0-216 bytes,  */
+                                        /* padded to 4 bytes alignment) */
+};
+
+extern struct atomic_notifier_head pseries_ioei_notifier_list;
+
+#endif /* _ASM_POWERPC_IO_EVENT_IRQ_H */
diff --git a/arch/powerpc/include/asm/irq.h b/arch/powerpc/include/asm/irq.h
index 67ab5fb7d153..1bff591f7f72 100644
--- a/arch/powerpc/include/asm/irq.h
+++ b/arch/powerpc/include/asm/irq.h
@@ -88,9 +88,6 @@ struct irq_host_ops {
         /* Dispose of such a mapping */
         void (*unmap)(struct irq_host *h, unsigned int virq);
 
-        /* Update of such a mapping  */
-        void (*remap)(struct irq_host *h, unsigned int virq, irq_hw_number_t hw);
-
         /* Translate device-tree interrupt specifier from raw format coming
          * from the firmware to a irq_hw_number_t (interrupt line number) and
          * type (sense) that can be passed to set_irq_type(). In the absence
@@ -128,19 +125,10 @@ struct irq_host {
         struct device_node      *of_node;
 };
 
-/* The main irq map itself is an array of NR_IRQ entries containing the
- * associate host and irq number. An entry with a host of NULL is free.
- * An entry can be allocated if it's free, the allocator always then sets
- * hwirq first to the host's invalid irq number and then fills ops.
- */
-struct irq_map_entry {
-        irq_hw_number_t hwirq;
-        struct irq_host *host;
-};
-
-extern struct irq_map_entry irq_map[NR_IRQS];
-
+struct irq_data;
+extern irq_hw_number_t irqd_to_hwirq(struct irq_data *d);
 extern irq_hw_number_t virq_to_hw(unsigned int virq);
+extern bool virq_is_host(unsigned int virq, struct irq_host *host);
 
 /**
  * irq_alloc_host - Allocate a new irq_host data structure
diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
index f54408d995b5..8a33698c61bd 100644
--- a/arch/powerpc/include/asm/kexec.h
+++ b/arch/powerpc/include/asm/kexec.h
@@ -76,7 +76,7 @@ extern void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *));
 extern cpumask_t cpus_in_sr;
 static inline int kexec_sr_activated(int cpu)
 {
-        return cpu_isset(cpu,cpus_in_sr);
+        return cpumask_test_cpu(cpu, &cpus_in_sr);
 }
 
 struct kimage;
diff --git a/arch/powerpc/include/asm/kvm.h b/arch/powerpc/include/asm/kvm.h
index 18ea6963ad77..d2ca5ed3877b 100644
--- a/arch/powerpc/include/asm/kvm.h
+++ b/arch/powerpc/include/asm/kvm.h
@@ -45,6 +45,114 @@ struct kvm_regs {
         __u64 gpr[32];
 };
 
+#define KVM_SREGS_E_IMPL_NONE   0
+#define KVM_SREGS_E_IMPL_FSL    1
+
+#define KVM_SREGS_E_FSL_PIDn    (1 << 0) /* PID1/PID2 */
+
+/*
+ * Feature bits indicate which sections of the sregs struct are valid,
+ * both in KVM_GET_SREGS and KVM_SET_SREGS.  On KVM_SET_SREGS, registers
+ * corresponding to unset feature bits will not be modified.  This allows
+ * restoring a checkpoint made without that feature, while keeping the
+ * default values of the new registers.
+ *
+ * KVM_SREGS_E_BASE contains:
+ * CSRR0/1 (refers to SRR2/3 on 40x)
+ * ESR
+ * DEAR
+ * MCSR
+ * TSR
+ * TCR
+ * DEC
+ * TB
+ * VRSAVE (USPRG0)
+ */
+#define KVM_SREGS_E_BASE                (1 << 0)
+
+/*
+ * KVM_SREGS_E_ARCH206 contains:
+ *
+ * PIR
+ * MCSRR0/1
+ * DECAR
+ * IVPR
+ */
+#define KVM_SREGS_E_ARCH206             (1 << 1)
+
+/*
+ * Contains EPCR, plus the upper half of 64-bit registers
+ * that are 32-bit on 32-bit implementations.
+ */
+#define KVM_SREGS_E_64                  (1 << 2)
+
+#define KVM_SREGS_E_SPRG8               (1 << 3)
+#define KVM_SREGS_E_MCIVPR              (1 << 4)
+
+/*
+ * IVORs are used -- contains IVOR0-15, plus additional IVORs
+ * in combination with an appropriate feature bit.
+ */
+#define KVM_SREGS_E_IVOR                (1 << 5)
+
+/*
+ * Contains MAS0-4, MAS6-7, TLBnCFG, MMUCFG.
+ * Also TLBnPS if MMUCFG[MAVN] = 1.
+ */
+#define KVM_SREGS_E_ARCH206_MMU         (1 << 6)
+
+/* DBSR, DBCR, IAC, DAC, DVC */
+#define KVM_SREGS_E_DEBUG               (1 << 7)
+
+/* Enhanced debug -- DSRR0/1, SPRG9 */
+#define KVM_SREGS_E_ED                  (1 << 8)
+
+/* Embedded Floating Point (SPE) -- IVOR32-34 if KVM_SREGS_E_IVOR */
+#define KVM_SREGS_E_SPE                 (1 << 9)
+
+/* External Proxy (EXP) -- EPR */
+#define KVM_SREGS_EXP                   (1 << 10)
+
+/* External PID (E.PD) -- EPSC/EPLC */
+#define KVM_SREGS_E_PD                  (1 << 11)
+
+/* Processor Control (E.PC) -- IVOR36-37 if KVM_SREGS_E_IVOR */
+#define KVM_SREGS_E_PC                  (1 << 12)
+
+/* Page table (E.PT) -- EPTCFG */
+#define KVM_SREGS_E_PT                  (1 << 13)
+
+/* Embedded Performance Monitor (E.PM) -- IVOR35 if KVM_SREGS_E_IVOR */
+#define KVM_SREGS_E_PM                  (1 << 14)
+
+/*
+ * Special updates:
+ *
+ * Some registers may change even while a vcpu is not running.
+ * To avoid losing these changes, by default these registers are
+ * not updated by KVM_SET_SREGS.  To force an update, set the bit
+ * in u.e.update_special corresponding to the register to be updated.
+ *
+ * The update_special field is zero on return from KVM_GET_SREGS.
+ *
+ * When restoring a checkpoint, the caller can set update_special
+ * to 0xffffffff to ensure that everything is restored, even new features
+ * that the caller doesn't know about.
+ */
+#define KVM_SREGS_E_UPDATE_MCSR         (1 << 0)
+#define KVM_SREGS_E_UPDATE_TSR          (1 << 1)
+#define KVM_SREGS_E_UPDATE_DEC          (1 << 2)
+#define KVM_SREGS_E_UPDATE_DBSR         (1 << 3)
+
+/*
+ * In KVM_SET_SREGS, reserved/pad fields must be left untouched from a
+ * previous KVM_GET_REGS.
+ *
+ * Unless otherwise indicated, setting any register with KVM_SET_SREGS
+ * directly sets its value.  It does not trigger any special semantics such
+ * as write-one-to-clear.  Calling KVM_SET_SREGS on an unmodified struct
+ * just received from KVM_GET_SREGS is always a no-op.
+ */
 struct kvm_sregs {
         __u32 pvr;
         union {
@@ -62,6 +170,82 @@ struct kvm_sregs {
                                 __u64 dbat[8]; 
                         } ppc32;
                 } s;
+                struct {
+                        union {
+                                struct { /* KVM_SREGS_E_IMPL_FSL */
+                                        __u32 features; /* KVM_SREGS_E_FSL_ */
+                                        __u32 svr;
+                                        __u64 mcar;
+                                        __u32 hid0;
+
+                                        /* KVM_SREGS_E_FSL_PIDn */
+                                        __u32 pid1, pid2;
+                                } fsl;
+                                __u8 pad[256];
+                        } impl;
+
+                        __u32 features; /* KVM_SREGS_E_ */
+                        __u32 impl_id;  /* KVM_SREGS_E_IMPL_ */
+                        __u32 update_special; /* KVM_SREGS_E_UPDATE_ */
+                        __u32 pir;      /* read-only */
+                        __u64 sprg8;
+                        __u64 sprg9;    /* E.ED */
+                        __u64 csrr0;
+                        __u64 dsrr0;    /* E.ED */
+                        __u64 mcsrr0;
+                        __u32 csrr1;
+                        __u32 dsrr1;    /* E.ED */
+                        __u32 mcsrr1;
+                        __u32 esr;
+                        __u64 dear;
+                        __u64 ivpr;
+                        __u64 mcivpr;
+                        __u64 mcsr;     /* KVM_SREGS_E_UPDATE_MCSR */
+
+                        __u32 tsr;      /* KVM_SREGS_E_UPDATE_TSR */
+                        __u32 tcr;
+                        __u32 decar;
+                        __u32 dec;      /* KVM_SREGS_E_UPDATE_DEC */
+
+                        /*
+                         * Userspace can read TB directly, but the
+                         * value reported here is consistent with "dec".
+                         *
+                         * Read-only.
+                         */
+                        __u64 tb;
+
+                        __u32 dbsr;     /* KVM_SREGS_E_UPDATE_DBSR */
+                        __u32 dbcr[3];
+                        __u32 iac[4];
+                        __u32 dac[2];
+                        __u32 dvc[2];
+                        __u8 num_iac;   /* read-only */
+                        __u8 num_dac;   /* read-only */
+                        __u8 num_dvc;   /* read-only */
+                        __u8 pad;
+
+                        __u32 epr;      /* EXP */
+                        __u32 vrsave;   /* a.k.a. USPRG0 */
+                        __u32 epcr;     /* KVM_SREGS_E_64 */
+
+                        __u32 mas0;
+                        __u32 mas1;
+                        __u64 mas2;
+                        __u64 mas7_3;
+                        __u32 mas4;
+                        __u32 mas6;
+
+                        __u32 ivor_low[16]; /* IVOR0-15 */
+                        __u32 ivor_high[18]; /* IVOR32+, plus room to expand */
+
+                        __u32 mmucfg;   /* read-only */
+                        __u32 eptcfg;   /* E.PT, read-only */
+                        __u32 tlbcfg[4];/* read-only */
+                        __u32 tlbps[4]; /* read-only */
+
+                        __u32 eplc, epsc; /* E.PD */
+                } e;
                 __u8 pad[1020];
         } u;
 };
diff --git a/arch/powerpc/include/asm/kvm_44x.h b/arch/powerpc/include/asm/kvm_44x.h
index d22d39942a92..a0e57618ff33 100644
--- a/arch/powerpc/include/asm/kvm_44x.h
+++ b/arch/powerpc/include/asm/kvm_44x.h
@@ -61,7 +61,6 @@ static inline struct kvmppc_vcpu_44x *to_44x(struct kvm_vcpu *vcpu)
         return container_of(vcpu, struct kvmppc_vcpu_44x, vcpu);
 }
 
-void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 new_pid);
 void kvmppc_44x_tlb_put(struct kvm_vcpu *vcpu);
 void kvmppc_44x_tlb_load(struct kvm_vcpu *vcpu);
 
diff --git a/arch/powerpc/include/asm/kvm_asm.h b/arch/powerpc/include/asm/kvm_asm.h
index 5b7504674397..0951b17f4eb5 100644
--- a/arch/powerpc/include/asm/kvm_asm.h
+++ b/arch/powerpc/include/asm/kvm_asm.h
@@ -59,6 +59,7 @@
 #define BOOK3S_INTERRUPT_INST_SEGMENT   0x480
 #define BOOK3S_INTERRUPT_EXTERNAL       0x500
 #define BOOK3S_INTERRUPT_EXTERNAL_LEVEL 0x501
+#define BOOK3S_INTERRUPT_EXTERNAL_HV    0x502
 #define BOOK3S_INTERRUPT_ALIGNMENT      0x600
 #define BOOK3S_INTERRUPT_PROGRAM        0x700
 #define BOOK3S_INTERRUPT_FP_UNAVAIL     0x800
diff --git a/arch/powerpc/include/asm/kvm_book3s_asm.h b/arch/powerpc/include/asm/kvm_book3s_asm.h
index 36fdb3aff30b..d5a8a3861635 100644
--- a/arch/powerpc/include/asm/kvm_book3s_asm.h
+++ b/arch/powerpc/include/asm/kvm_book3s_asm.h
@@ -34,6 +34,7 @@
             (\intno == BOOK3S_INTERRUPT_DATA_SEGMENT) || \
             (\intno == BOOK3S_INTERRUPT_INST_SEGMENT) || \
             (\intno == BOOK3S_INTERRUPT_EXTERNAL) || \
+            (\intno == BOOK3S_INTERRUPT_EXTERNAL_HV) || \
             (\intno == BOOK3S_INTERRUPT_ALIGNMENT) || \
             (\intno == BOOK3S_INTERRUPT_PROGRAM) || \
             (\intno == BOOK3S_INTERRUPT_FP_UNAVAIL) || \
diff --git a/arch/powerpc/include/asm/kvm_e500.h b/arch/powerpc/include/asm/kvm_e500.h
index 7fea26fffb25..7a2a565f88c4 100644
--- a/arch/powerpc/include/asm/kvm_e500.h
+++ b/arch/powerpc/include/asm/kvm_e500.h
@@ -43,6 +43,7 @@ struct kvmppc_vcpu_e500 {
 
         u32 host_pid[E500_PID_NUM];
         u32 pid[E500_PID_NUM];
+        u32 svr;
 
         u32 mas0;
         u32 mas1;
@@ -58,6 +59,7 @@ struct kvmppc_vcpu_e500 {
         u32 hid1;
         u32 tlb0cfg;
         u32 tlb1cfg;
+        u64 mcar;
 
         struct kvm_vcpu vcpu;
 };
diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index bba3b9b72a39..186f150b9b89 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -223,6 +223,7 @@ struct kvm_vcpu_arch {
         ulong hflags;
         ulong guest_owned_ext;
 #endif
+        u32 vrsave; /* also USPRG0 */
         u32 mmucr;
         ulong sprg4;
         ulong sprg5;
@@ -232,6 +233,9 @@ struct kvm_vcpu_arch {
         ulong csrr1;
         ulong dsrr0;
         ulong dsrr1;
+        ulong mcsrr0;
+        ulong mcsrr1;
+        ulong mcsr;
         ulong esr;
         u32 dec;
         u32 decar;
@@ -255,6 +259,7 @@ struct kvm_vcpu_arch {
         u32 dbsr;
 
 #ifdef CONFIG_KVM_EXIT_TIMING
+        struct mutex exit_timing_lock;
         struct kvmppc_exit_timing timing_exit;
         struct kvmppc_exit_timing timing_last_enter;
         u32 last_exit_type;
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
index ecb3bc74c344..9345238edecf 100644
--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
@@ -61,6 +61,7 @@ extern int kvmppc_emulate_instruction(struct kvm_run *run,
                                       struct kvm_vcpu *vcpu);
 extern int kvmppc_emulate_mmio(struct kvm_run *run, struct kvm_vcpu *vcpu);
 extern void kvmppc_emulate_dec(struct kvm_vcpu *vcpu);
+extern u32 kvmppc_get_dec(struct kvm_vcpu *vcpu, u64 tb);
 
 /* Core-specific hooks */
 
@@ -142,4 +143,12 @@ static inline u32 kvmppc_set_field(u64 inst, int msb, int lsb, int value)
         return r;
 }
 
+void kvmppc_core_get_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs);
+int kvmppc_core_set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs);
+
+void kvmppc_get_sregs_ivor(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs);
+int kvmppc_set_sregs_ivor(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs);
+
+void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 pid);
+
 #endif /* __POWERPC_KVM_PPC_H__ */
diff --git a/arch/powerpc/include/asm/lppaca.h b/arch/powerpc/include/asm/lppaca.h
index a077adc0b35e..e0298d26ce5d 100644
--- a/arch/powerpc/include/asm/lppaca.h
+++ b/arch/powerpc/include/asm/lppaca.h
@@ -210,6 +210,8 @@ struct dtl_entry {
 #define DISPATCH_LOG_BYTES      4096    /* bytes per cpu */
 #define N_DISPATCH_LOG          (DISPATCH_LOG_BYTES / sizeof(struct dtl_entry))
 
+extern struct kmem_cache *dtl_cache;
+
 /*
  * When CONFIG_VIRT_CPU_ACCOUNTING = y, the cpu accounting code controls
  * reading from the dispatch trace log.  If other code wants to consume
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index e4f01915fbb0..47cacddb14cf 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -29,21 +29,6 @@ struct file;
 struct pci_controller;
 struct kimage;
 
-#ifdef CONFIG_SMP
-struct smp_ops_t {
-        void  (*message_pass)(int target, int msg);
-        int   (*probe)(void);
-        void  (*kick_cpu)(int nr);
-        void  (*setup_cpu)(int nr);
-        void  (*bringup_done)(void);
-        void  (*take_timebase)(void);
-        void  (*give_timebase)(void);
-        int   (*cpu_disable)(void);
-        void  (*cpu_die)(unsigned int nr);
-        int   (*cpu_bootable)(unsigned int nr);
-};
-#endif
-
 struct machdep_calls {
         char            *name;
 #ifdef CONFIG_PPC64
@@ -267,6 +252,7 @@ struct machdep_calls {
 
 extern void e500_idle(void);
 extern void power4_idle(void);
+extern void power7_idle(void);
 extern void ppc6xx_idle(void);
 extern void book3e_idle(void);
 
@@ -311,12 +297,6 @@ extern sys_ctrler_t sys_ctrler;
 
 #endif /* CONFIG_PPC_PMAC */
 
-#ifdef CONFIG_SMP
-/* Poor default implementations */
-extern void __devinit smp_generic_give_timebase(void);
-extern void __devinit smp_generic_take_timebase(void);
-#endif /* CONFIG_SMP */
-
 
 /* Functions to produce codes on the leds.
  * The SRC code should be unique for the message category and should
diff --git a/arch/powerpc/include/asm/mmu-book3e.h b/arch/powerpc/include/asm/mmu-book3e.h
index 17194fcd4040..3ea0f9a259d8 100644
--- a/arch/powerpc/include/asm/mmu-book3e.h
+++ b/arch/powerpc/include/asm/mmu-book3e.h
@@ -43,6 +43,7 @@
 #define MAS0_TLBSEL(x)          (((x) << 28) & 0x30000000)
 #define MAS0_ESEL(x)            (((x) << 16) & 0x0FFF0000)
 #define MAS0_NV(x)              ((x) & 0x00000FFF)
+#define MAS0_ESEL_MASK          0x0FFF0000
 #define MAS0_HES                0x00004000
 #define MAS0_WQ_ALLWAYS         0x00000000
 #define MAS0_WQ_COND            0x00001000
@@ -137,6 +138,21 @@
 #define MMUCSR0_TLB2PS  0x00078000      /* TLB2 Page Size */
 #define MMUCSR0_TLB3PS  0x00780000      /* TLB3 Page Size */
 
+/* MMUCFG bits */
+#define MMUCFG_MAVN_NASK        0x00000003
+#define MMUCFG_MAVN_V1_0        0x00000000
+#define MMUCFG_MAVN_V2_0        0x00000001
+#define MMUCFG_NTLB_MASK        0x0000000c
+#define MMUCFG_NTLB_SHIFT       2
+#define MMUCFG_PIDSIZE_MASK     0x000007c0
+#define MMUCFG_PIDSIZE_SHIFT    6
+#define MMUCFG_TWC              0x00008000
+#define MMUCFG_LRAT             0x00010000
+#define MMUCFG_RASIZE_MASK      0x00fe0000
+#define MMUCFG_RASIZE_SHIFT     17
+#define MMUCFG_LPIDSIZE_MASK    0x0f000000
+#define MMUCFG_LPIDSIZE_SHIFT   24
+
 /* TLBnCFG encoding */
 #define TLBnCFG_N_ENTRY         0x00000fff      /* number of entries */
 #define TLBnCFG_HES             0x00002000      /* HW select supported */
@@ -229,6 +245,10 @@ extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];
 extern int mmu_linear_psize;
 extern int mmu_vmemmap_psize;
 
+#ifdef CONFIG_PPC64
+extern unsigned long linear_map_top;
+#endif
+
 #endif /* !__ASSEMBLY__ */
 
 #endif /* _ASM_POWERPC_MMU_BOOK3E_H_ */
diff --git a/arch/powerpc/include/asm/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h
index ae7b3efec8e5..d865bd909c7d 100644
--- a/arch/powerpc/include/asm/mmu-hash64.h
+++ b/arch/powerpc/include/asm/mmu-hash64.h
@@ -408,6 +408,7 @@ static inline void subpage_prot_init_new_context(struct mm_struct *mm) { }
 #endif /* CONFIG_PPC_SUBPAGE_PROT */
 
 typedef unsigned long mm_context_id_t;
+struct spinlock;
 
 typedef struct {
         mm_context_id_t id;
@@ -423,6 +424,11 @@ typedef struct {
 #ifdef CONFIG_PPC_SUBPAGE_PROT
         struct subpage_prot_table spt;
 #endif /* CONFIG_PPC_SUBPAGE_PROT */
+#ifdef CONFIG_PPC_ICSWX
+        struct spinlock *cop_lockp; /* guard acop and cop_pid */
+        unsigned long acop;     /* mask of enabled coprocessor types */
+        unsigned int cop_pid;   /* pid value used with coprocessors */
+#endif /* CONFIG_PPC_ICSWX */
 } mm_context_t;
 
 
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index bb40a06d3b77..4138b21ae80a 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -56,11 +56,6 @@
  */
 #define MMU_FTR_NEED_DTLB_SW_LRU        ASM_CONST(0x00200000)
 
-/* This indicates that the processor uses the ISA 2.06 server tlbie
- * mnemonics
- */
-#define MMU_FTR_TLBIE_206               ASM_CONST(0x00400000)
-
 /* Enable use of TLB reservation.  Processor should support tlbsrx.
  * instruction and MAS0[WQ].
  */
@@ -70,6 +65,53 @@
  */
 #define MMU_FTR_USE_PAIRED_MAS          ASM_CONST(0x01000000)
 
+/* MMU is SLB-based
+ */
+#define MMU_FTR_SLB                     ASM_CONST(0x02000000)
+
+/* Support 16M large pages
+ */
+#define MMU_FTR_16M_PAGE                ASM_CONST(0x04000000)
+
+/* Supports TLBIEL variant
+ */
+#define MMU_FTR_TLBIEL                  ASM_CONST(0x08000000)
+
+/* Supports tlbies w/o locking
+ */
+#define MMU_FTR_LOCKLESS_TLBIE          ASM_CONST(0x10000000)
+
+/* Large pages can be marked CI
+ */
+#define MMU_FTR_CI_LARGE_PAGE           ASM_CONST(0x20000000)
+
+/* 1T segments available
+ */
+#define MMU_FTR_1T_SEGMENT              ASM_CONST(0x40000000)
+
+/* Doesn't support the B bit (1T segment) in SLBIE
+ */
+#define MMU_FTR_NO_SLBIE_B              ASM_CONST(0x80000000)
+
+/* MMU feature bit sets for various CPUs */
+#define MMU_FTRS_DEFAULT_HPTE_ARCH_V2   \
+        MMU_FTR_HPTE_TABLE | MMU_FTR_PPCAS_ARCH_V2
+#define MMU_FTRS_POWER4         MMU_FTRS_DEFAULT_HPTE_ARCH_V2
+#define MMU_FTRS_PPC970         MMU_FTRS_POWER4
+#define MMU_FTRS_POWER5         MMU_FTRS_POWER4 | MMU_FTR_LOCKLESS_TLBIE
+#define MMU_FTRS_POWER6         MMU_FTRS_POWER4 | MMU_FTR_LOCKLESS_TLBIE
+#define MMU_FTRS_POWER7         MMU_FTRS_POWER4 | MMU_FTR_LOCKLESS_TLBIE
+#define MMU_FTRS_CELL           MMU_FTRS_DEFAULT_HPTE_ARCH_V2 | \
+                                MMU_FTR_CI_LARGE_PAGE
+#define MMU_FTRS_PA6T           MMU_FTRS_DEFAULT_HPTE_ARCH_V2 | \
+                                MMU_FTR_CI_LARGE_PAGE | MMU_FTR_NO_SLBIE_B
+#define MMU_FTRS_A2             MMU_FTR_TYPE_3E | MMU_FTR_USE_TLBILX | \
+                                MMU_FTR_USE_TLBIVAX_BCAST | \
+                                MMU_FTR_LOCK_BCAST_INVAL | \
+                                MMU_FTR_USE_TLBRSRV | \
+                                MMU_FTR_USE_PAIRED_MAS | \
+                                MMU_FTR_TLBIEL | \
+                                MMU_FTR_16M_PAGE
 #ifndef __ASSEMBLY__
 #include <asm/cputable.h>
 
diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h
index 81fb41289d6c..a73668a5f30d 100644
--- a/arch/powerpc/include/asm/mmu_context.h
+++ b/arch/powerpc/include/asm/mmu_context.h
@@ -32,6 +32,10 @@ extern void __destroy_context(unsigned long context_id);
 extern void mmu_context_init(void);
 #endif
 
+extern void switch_cop(struct mm_struct *next);
+extern int use_cop(unsigned long acop, struct mm_struct *mm);
+extern void drop_cop(unsigned long acop, struct mm_struct *mm);
+
 /*
  * switch_mm is the entry point called from the architecture independent
  * code in kernel/sched.c
@@ -55,6 +59,12 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
         if (prev == next)
                 return;
 
+#ifdef CONFIG_PPC_ICSWX
+        /* Switch coprocessor context only if prev or next uses a coprocessor */
+        if (prev->context.acop || next->context.acop)
+                switch_cop(next);
+#endif /* CONFIG_PPC_ICSWX */
+
         /* We must stop all altivec streams before changing the HW
          * context
          */
@@ -67,7 +77,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
          * sub architectures.
          */
 #ifdef CONFIG_PPC_STD_MMU_64
-        if (cpu_has_feature(CPU_FTR_SLB))
+        if (mmu_has_feature(MMU_FTR_SLB))
                 switch_slb(tsk, next);
         else
                 switch_stab(tsk, next);
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h
index 7005ee0b074d..df18989e78d4 100644
--- a/arch/powerpc/include/asm/mpic.h
+++ b/arch/powerpc/include/asm/mpic.h
@@ -3,7 +3,6 @@
 #ifdef __KERNEL__
 
 #include <linux/irq.h>
-#include <linux/sysdev.h>
 #include <asm/dcr.h>
 #include <asm/msi_bitmap.h>
 
@@ -263,6 +262,7 @@ struct mpic
 #ifdef CONFIG_SMP
         struct irq_chip         hc_ipi;
 #endif
+        struct irq_chip         hc_tm;
         const char              *name;
         /* Flags */
         unsigned int            flags;
@@ -281,7 +281,7 @@ struct mpic
 
         /* vector numbers used for internal sources (ipi/timers) */
         unsigned int            ipi_vecs[4];
-        unsigned int            timer_vecs[4];
+        unsigned int            timer_vecs[8];
 
         /* Spurious vector to program into unused sources */
         unsigned int            spurious_vec;
@@ -320,8 +320,6 @@ struct mpic
         /* link */
         struct mpic             *next;
 
-        struct sys_device       sysdev;
-
 #ifdef CONFIG_PM
         struct mpic_irq_save    *save_data;
 #endif
@@ -371,6 +369,8 @@ struct mpic
  * NOTE: This flag trumps MPIC_WANTS_RESET.
  */
 #define MPIC_NO_RESET                   0x00004000
+/* Freescale MPIC (compatible includes "fsl,mpic") */
+#define MPIC_FSL                        0x00008000
 
 /* MPIC HW modification ID */
 #define MPIC_REGSET_MASK                0xf0000000
diff --git a/arch/powerpc/include/asm/pSeries_reconfig.h b/arch/powerpc/include/asm/pSeries_reconfig.h
index d4b4bfa26fb3..89d2f99c1bf4 100644
--- a/arch/powerpc/include/asm/pSeries_reconfig.h
+++ b/arch/powerpc/include/asm/pSeries_reconfig.h
@@ -18,13 +18,18 @@
 extern int pSeries_reconfig_notifier_register(struct notifier_block *);
 extern void pSeries_reconfig_notifier_unregister(struct notifier_block *);
 extern struct blocking_notifier_head pSeries_reconfig_chain;
+/* Not the best place to put this, will be fixed when we move some
+ * of the rtas suspend-me stuff to pseries */
+extern void pSeries_coalesce_init(void);
 #else /* !CONFIG_PPC_PSERIES */
 static inline int pSeries_reconfig_notifier_register(struct notifier_block *nb)
 {
         return 0;
 }
 static inline void pSeries_reconfig_notifier_unregister(struct notifier_block *nb) { }
+static inline void pSeries_coalesce_init(void) { }
 #endif /* CONFIG_PPC_PSERIES */
 
+
 #endif /* __KERNEL__ */
 #endif /* _PPC64_PSERIES_RECONFIG_H */
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index ec57540cd7af..74126765106a 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -92,9 +92,9 @@ struct paca_struct {
          * Now, starting in cacheline 2, the exception save areas
          */
         /* used for most interrupts/exceptions */
-        u64 exgen[10] __attribute__((aligned(0x80)));
-        u64 exmc[10];           /* used for machine checks */
-        u64 exslb[10];          /* used for SLB/segment table misses
+        u64 exgen[11] __attribute__((aligned(0x80)));
+        u64 exmc[11];           /* used for machine checks */
+        u64 exslb[11];          /* used for SLB/segment table misses
                                  * on the linear mapping */
         /* SLB related definitions */
         u16 vmalloc_sllp;
@@ -106,7 +106,8 @@ struct paca_struct {
         pgd_t *pgd;                     /* Current PGD */
         pgd_t *kernel_pgd;              /* Kernel PGD */
         u64 exgen[8] __attribute__((aligned(0x80)));
-        u64 extlb[EX_TLB_SIZE*3] __attribute__((aligned(0x80)));
+        /* We can have up to 3 levels of reentrancy in the TLB miss handler */
+        u64 extlb[3][EX_TLB_SIZE / sizeof(u64)] __attribute__((aligned(0x80)));
         u64 exmc[8];            /* used for machine checks */
         u64 excrit[8];          /* used for crit interrupts */
         u64 exdbg[8];           /* used for debug interrupts */
@@ -125,7 +126,7 @@ struct paca_struct {
         struct task_struct *__current;  /* Pointer to current */
         u64 kstack;                     /* Saved Kernel stack addr */
         u64 stab_rr;                    /* stab/slb round-robin counter */
-        u64 saved_r1;                   /* r1 save for RTAS calls */
+        u64 saved_r1;                   /* r1 save for RTAS calls or PM */
         u64 saved_msr;                  /* MSR saved here by enter_rtas */
         u16 trap_save;                  /* Used when bad stack is encountered */
         u8 soft_enabled;                /* irq soft-enable flag */
diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
index 812b2cd80aed..9356262fd3cc 100644
--- a/arch/powerpc/include/asm/page_64.h
+++ b/arch/powerpc/include/asm/page_64.h
@@ -59,24 +59,7 @@ static __inline__ void clear_page(void *addr)
         : "ctr", "memory");
 }
 
-extern void copy_4K_page(void *to, void *from);
-
-#ifdef CONFIG_PPC_64K_PAGES
-static inline void copy_page(void *to, void *from)
-{
-        unsigned int i;
-        for (i=0; i < (1 << (PAGE_SHIFT - 12)); i++) {
-                copy_4K_page(to, from);
-                to += 4096;
-                from += 4096;
-        }
-}
-#else /* CONFIG_PPC_64K_PAGES */
-static inline void copy_page(void *to, void *from)
-{
-        copy_4K_page(to, from);
-}
-#endif /* CONFIG_PPC_64K_PAGES */
+extern void copy_page(void *to, void *from);
 
 /* Log 2 of page table size */
 extern u64 ppc64_pft_size;
@@ -130,7 +113,7 @@ extern void slice_set_user_psize(struct mm_struct *mm, unsigned int psize);
 extern void slice_set_range_psize(struct mm_struct *mm, unsigned long start,
                                   unsigned long len, unsigned int psize);
 
-#define slice_mm_new_context(mm)        ((mm)->context.id == 0)
+#define slice_mm_new_context(mm)        ((mm)->context.id == MMU_NO_CONTEXT)
 
 #endif /* __ASSEMBLY__ */
 #else
diff --git a/arch/powerpc/include/asm/pgalloc.h b/arch/powerpc/include/asm/pgalloc.h
index abe8532bd14e..bf301ac62f35 100644
--- a/arch/powerpc/include/asm/pgalloc.h
+++ b/arch/powerpc/include/asm/pgalloc.h
@@ -31,14 +31,29 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t ptepage)
 #endif
 
 #ifdef CONFIG_SMP
-extern void pgtable_free_tlb(struct mmu_gather *tlb, void *table, unsigned shift);
-extern void pte_free_finish(void);
+struct mmu_gather;
+extern void tlb_remove_table(struct mmu_gather *, void *);
+
+static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, int shift)
+{
+        unsigned long pgf = (unsigned long)table;
+        BUG_ON(shift > MAX_PGTABLE_INDEX_SIZE);
+        pgf |= shift;
+        tlb_remove_table(tlb, (void *)pgf);
+}
+
+static inline void __tlb_remove_table(void *_table)
+{
+        void *table = (void *)((unsigned long)_table & ~MAX_PGTABLE_INDEX_SIZE);
+        unsigned shift = (unsigned long)_table & MAX_PGTABLE_INDEX_SIZE;
+
+        pgtable_free(table, shift);
+}
 #else /* CONFIG_SMP */
 static inline void pgtable_free_tlb(struct mmu_gather *tlb, void *table, unsigned shift)
 {
         pgtable_free(table, shift);
 }
-static inline void pte_free_finish(void) { }
 #endif /* !CONFIG_SMP */
 
 static inline void __pte_free_tlb(struct mmu_gather *tlb, struct page *ptepage,
diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h
index 2b09cd522d33..81576ee0cfb1 100644
--- a/arch/powerpc/include/asm/pgtable-ppc64.h
+++ b/arch/powerpc/include/asm/pgtable-ppc64.h
@@ -257,21 +257,20 @@ static inline int __ptep_test_and_clear_young(struct mm_struct *mm,
 static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,
                                       pte_t *ptep)
 {
-        unsigned long old;
 
-        if ((pte_val(*ptep) & _PAGE_RW) == 0)
-                return;
-        old = pte_update(mm, addr, ptep, _PAGE_RW, 0);
+        if ((pte_val(*ptep) & _PAGE_RW) == 0)
+                return;
+
+        pte_update(mm, addr, ptep, _PAGE_RW, 0);
 }
 
 static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
                                            unsigned long addr, pte_t *ptep)
 {
-        unsigned long old;
-
         if ((pte_val(*ptep) & _PAGE_RW) == 0)
                 return;
-        old = pte_update(mm, addr, ptep, _PAGE_RW, 1);
+
+        pte_update(mm, addr, ptep, _PAGE_RW, 1);
 }
 
 /*
diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
index 1255569387b6..e472659d906c 100644
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -41,6 +41,10 @@
 #define PPC_INST_RFCI                   0x4c000066
 #define PPC_INST_RFDI                   0x4c00004e
 #define PPC_INST_RFMCI                  0x4c00004c
+#define PPC_INST_MFSPR_DSCR             0x7c1102a6
+#define PPC_INST_MFSPR_DSCR_MASK        0xfc1fffff
+#define PPC_INST_MTSPR_DSCR             0x7c1103a6
+#define PPC_INST_MTSPR_DSCR_MASK        0xfc1fffff
 
 #define PPC_INST_STRING                 0x7c00042a
 #define PPC_INST_STRING_MASK            0xfc0007fe
@@ -56,6 +60,17 @@
 #define PPC_INST_TLBSRX_DOT             0x7c0006a5
 #define PPC_INST_XXLOR                  0xf0000510
 
+#define PPC_INST_NAP                    0x4c000364
+#define PPC_INST_SLEEP                  0x4c0003a4
+
+/* A2 specific instructions */
+#define PPC_INST_ERATWE                 0x7c0001a6
+#define PPC_INST_ERATRE                 0x7c000166
+#define PPC_INST_ERATILX                0x7c000066
+#define PPC_INST_ERATIVAX               0x7c000666
+#define PPC_INST_ERATSX                 0x7c000126
+#define PPC_INST_ERATSX_DOT             0x7c000127
+
 /* macros to insert fields into opcodes */
 #define __PPC_RA(a)     (((a) & 0x1f) << 16)
 #define __PPC_RB(b)     (((b) & 0x1f) << 11)
@@ -67,6 +82,8 @@
 #define __PPC_XT(s)     __PPC_XS(s)
 #define __PPC_T_TLB(t)  (((t) & 0x3) << 21)
 #define __PPC_WC(w)     (((w) & 0x3) << 21)
+#define __PPC_WS(w)     (((w) & 0x1f) << 11)
+
 /*
  * Only use the larx hint bit on 64bit CPUs. e500v1/v2 based CPUs will treat a
  * larx with EH set as an illegal instruction.
@@ -113,6 +130,21 @@
 #define PPC_TLBIVAX(a,b)        stringify_in_c(.long PPC_INST_TLBIVAX | \
                                         __PPC_RA(a) | __PPC_RB(b))
 
+#define PPC_ERATWE(s, a, w)     stringify_in_c(.long PPC_INST_ERATWE | \
+                                        __PPC_RS(s) | __PPC_RA(a) | __PPC_WS(w))
+#define PPC_ERATRE(s, a, w)     stringify_in_c(.long PPC_INST_ERATRE | \
+                                        __PPC_RS(s) | __PPC_RA(a) | __PPC_WS(w))
+#define PPC_ERATILX(t, a, b)    stringify_in_c(.long PPC_INST_ERATILX | \
+                                        __PPC_T_TLB(t) | __PPC_RA(a) | \
+                                        __PPC_RB(b))
+#define PPC_ERATIVAX(s, a, b)   stringify_in_c(.long PPC_INST_ERATIVAX | \
+                                        __PPC_RS(s) | __PPC_RA(a) | __PPC_RB(b))
+#define PPC_ERATSX(t, a, w)     stringify_in_c(.long PPC_INST_ERATSX | \
+                                        __PPC_RS(t) | __PPC_RA(a) | __PPC_RB(b))
+#define PPC_ERATSX_DOT(t, a, w) stringify_in_c(.long PPC_INST_ERATSX_DOT | \
+                                        __PPC_RS(t) | __PPC_RA(a) | __PPC_RB(b))
+
+
 /*
  * Define what the VSX XX1 form instructions will look like, then add
  * the 128 bit load store instructions based on that.
@@ -126,4 +158,7 @@
 #define XXLOR(t, a, b)          stringify_in_c(.long PPC_INST_XXLOR | \
                                                VSX_XX3((t), (a), (b)))
 
+#define PPC_NAP                 stringify_in_c(.long PPC_INST_NAP)
+#define PPC_SLEEP               stringify_in_c(.long PPC_INST_SLEEP)
+
 #endif /* _ASM_POWERPC_PPC_OPCODE_H */
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index 98210067c1cc..1b422381fc16 100644
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -170,6 +170,7 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR)
 #define HMT_MEDIUM      or      2,2,2
 #define HMT_MEDIUM_HIGH or      5,5,5           # medium high priority
 #define HMT_HIGH        or      3,3,3
+#define HMT_EXTRA_HIGH  or      7,7,7           # power7 only
 
 #ifdef __KERNEL__
 #ifdef CONFIG_PPC64
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index de1967a1ff57..d50c2b6d9bc3 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -238,6 +238,10 @@ struct thread_struct {
 #ifdef CONFIG_KVM_BOOK3S_32_HANDLER
         void*           kvm_shadow_vcpu; /* KVM internal data */
 #endif /* CONFIG_KVM_BOOK3S_32_HANDLER */
+#ifdef CONFIG_PPC64
+        unsigned long   dscr;
+        int             dscr_inherit;
+#endif
 };
 
 #define ARCH_MIN_TASKALIGN 16
diff --git a/arch/powerpc/include/asm/pte-hash64-64k.h b/arch/powerpc/include/asm/pte-hash64-64k.h
index c4490f9c67c4..59247e816ac5 100644
--- a/arch/powerpc/include/asm/pte-hash64-64k.h
+++ b/arch/powerpc/include/asm/pte-hash64-64k.h
@@ -22,7 +22,7 @@
 #define _PAGE_HASHPTE   _PAGE_HPTE_SUB
 
 /* Note the full page bits must be in the same location as for normal
- * 4k pages as the same asssembly will be used to insert 64K pages
+ * 4k pages as the same assembly will be used to insert 64K pages
  * wether the kernel has CONFIG_PPC_64K_PAGES or not
  */
 #define _PAGE_F_SECOND  0x00008000 /* full page: hidx bits */
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 7e4abebe76c0..c5cae0dd176c 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -99,17 +99,23 @@
 #define MSR_LE          __MASK(MSR_LE_LG)       /* Little Endian */
 
 #if defined(CONFIG_PPC_BOOK3S_64)
+#define MSR_64BIT       MSR_SF
+
 /* Server variant */
 #define MSR_            MSR_ME | MSR_RI | MSR_IR | MSR_DR | MSR_ISF |MSR_HV
-#define MSR_KERNEL      MSR_ | MSR_SF
+#define MSR_KERNEL      MSR_ | MSR_64BIT
 #define MSR_USER32      MSR_ | MSR_PR | MSR_EE
-#define MSR_USER64      MSR_USER32 | MSR_SF
+#define MSR_USER64      MSR_USER32 | MSR_64BIT
 #elif defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_8xx)
 /* Default MSR for kernel mode. */
 #define MSR_KERNEL      (MSR_ME|MSR_RI|MSR_IR|MSR_DR)
 #define MSR_USER        (MSR_KERNEL|MSR_PR|MSR_EE)
 #endif
 
+#ifndef MSR_64BIT
+#define MSR_64BIT       0
+#endif
+
 /* Floating Point Status and Control Register (FPSCR) Fields */
 #define FPSCR_FX        0x80000000      /* FPU exception summary */
 #define FPSCR_FEX       0x40000000      /* FPU enabled exception summary */
@@ -182,6 +188,8 @@
 
 #define SPRN_CTR        0x009   /* Count Register */
 #define SPRN_DSCR       0x11
+#define SPRN_CFAR       0x1c    /* Come From Address Register */
+#define SPRN_ACOP       0x1F    /* Available Coprocessor Register */
 #define SPRN_CTRLF      0x088
 #define SPRN_CTRLT      0x098
 #define   CTRL_CT       0xc0000000      /* current thread */
@@ -210,8 +218,43 @@
 #define SPRN_TBWL       0x11C   /* Time Base Lower Register (super, R/W) */
 #define SPRN_TBWU       0x11D   /* Time Base Upper Register (super, R/W) */
 #define SPRN_SPURR      0x134   /* Scaled PURR */
+#define SPRN_HSPRG0     0x130   /* Hypervisor Scratch 0 */
+#define SPRN_HSPRG1     0x131   /* Hypervisor Scratch 1 */
+#define SPRN_HDSISR     0x132
+#define SPRN_HDAR       0x133
+#define SPRN_HDEC       0x136   /* Hypervisor Decrementer */
 #define SPRN_HIOR       0x137   /* 970 Hypervisor interrupt offset */
+#define SPRN_RMOR       0x138   /* Real mode offset register */
+#define SPRN_HRMOR      0x139   /* Real mode offset register */
+#define SPRN_HSRR0      0x13A   /* Hypervisor Save/Restore 0 */
+#define SPRN_HSRR1      0x13B   /* Hypervisor Save/Restore 1 */
 #define SPRN_LPCR       0x13E   /* LPAR Control Register */
+#define   LPCR_VPM0     (1ul << (63-0))
+#define   LPCR_VPM1     (1ul << (63-1))
+#define   LPCR_ISL      (1ul << (63-2))
+#define   LPCR_DPFD_SH  (63-11)
+#define   LPCR_VRMA_L   (1ul << (63-12))
+#define   LPCR_VRMA_LP0 (1ul << (63-15))
+#define   LPCR_VRMA_LP1 (1ul << (63-16))
+#define   LPCR_RMLS    0x1C000000      /* impl dependent rmo limit sel */
+#define   LPCR_ILE     0x02000000      /* !HV irqs set MSR:LE */
+#define   LPCR_PECE     0x00007000      /* powersave exit cause enable */
+#define     LPCR_PECE0  0x00004000      /* ext. exceptions can cause exit */
+#define     LPCR_PECE1  0x00002000      /* decrementer can cause exit */
+#define     LPCR_PECE2  0x00001000      /* machine check etc can cause exit */
+#define   LPCR_MER      0x00000800      /* Mediated External Exception */
+#define   LPCR_LPES0   0x00000008      /* LPAR Env selector 0 */
+#define   LPCR_LPES1   0x00000004      /* LPAR Env selector 1 */
+#define   LPCR_RMI     0x00000002      /* real mode is cache inhibit */
+#define   LPCR_HDICE   0x00000001      /* Hyp Decr enable (HV,PR,EE) */
+#define SPRN_LPID       0x13F   /* Logical Partition Identifier */
+#define SPRN_HMER       0x150   /* Hardware m? error recovery */
+#define SPRN_HMEER      0x151   /* Hardware m? enable error recovery */
+#define SPRN_HEIR       0x153   /* Hypervisor Emulated Instruction Register */
+#define SPRN_TLBINDEXR  0x154   /* P7 TLB control register */
+#define SPRN_TLBVPNR    0x155   /* P7 TLB control register */
+#define SPRN_TLBRPNR    0x156   /* P7 TLB control register */
+#define SPRN_TLBLPIDR   0x157   /* P7 TLB control register */
 #define SPRN_DBAT0L     0x219   /* Data BAT 0 Lower Register */
 #define SPRN_DBAT0U     0x218   /* Data BAT 0 Upper Register */
 #define SPRN_DBAT1L     0x21B   /* Data BAT 1 Lower Register */
@@ -434,16 +477,23 @@
 #define SPRN_SRR0       0x01A   /* Save/Restore Register 0 */
 #define SPRN_SRR1       0x01B   /* Save/Restore Register 1 */
 #define   SRR1_WAKEMASK         0x00380000 /* reason for wakeup */
-#define   SRR1_WAKERESET        0x00380000 /* System reset */
 #define   SRR1_WAKESYSERR       0x00300000 /* System error */
 #define   SRR1_WAKEEE           0x00200000 /* External interrupt */
 #define   SRR1_WAKEMT           0x00280000 /* mtctrl */
+#define   SRR1_WAKEHMI          0x00280000 /* Hypervisor maintenance */
 #define   SRR1_WAKEDEC          0x00180000 /* Decrementer interrupt */
 #define   SRR1_WAKETHERM        0x00100000 /* Thermal management interrupt */
+#define   SRR1_WAKERESET        0x00100000 /* System reset */
+#define   SRR1_WAKESTATE        0x00030000 /* Powersave exit mask [46:47] */
+#define   SRR1_WS_DEEPEST       0x00030000 /* Some resources not maintained,
+                                          * may not be recoverable */
+#define   SRR1_WS_DEEPER        0x00020000 /* Some resources not maintained */
+#define   SRR1_WS_DEEP          0x00010000 /* All resources maintained */
 #define   SRR1_PROGFPE          0x00100000 /* Floating Point Enabled */
 #define   SRR1_PROGPRIV         0x00040000 /* Privileged instruction */
 #define   SRR1_PROGTRAP         0x00020000 /* Trap */
 #define   SRR1_PROGADDR         0x00010000 /* SRR0 contains subsequent addr */
+
 #define SPRN_HSRR0      0x13A   /* Save/Restore Register 0 */
 #define SPRN_HSRR1      0x13B   /* Save/Restore Register 1 */
 
@@ -673,12 +723,15 @@
  * SPRG usage:
  *
  * All 64-bit:
- *      - SPRG1 stores PACA pointer
+ *      - SPRG1 stores PACA pointer except 64-bit server in
+ *        HV mode in which case it is HSPRG0
  *
  * 64-bit server:
  *      - SPRG0 unused (reserved for HV on Power4)
  *      - SPRG2 scratch for exception vectors
  *      - SPRG3 unused (user visible)
+ *      - HSPRG0 stores PACA in HV mode
+ *      - HSPRG1 scratch for "HV" exceptions
  *
  * 64-bit embedded
  *      - SPRG0 generic exception scratch
@@ -741,6 +794,41 @@
 
 #ifdef CONFIG_PPC_BOOK3S_64
 #define SPRN_SPRG_SCRATCH0      SPRN_SPRG2
+#define SPRN_SPRG_HPACA         SPRN_HSPRG0
+#define SPRN_SPRG_HSCRATCH0     SPRN_HSPRG1
+
+#define GET_PACA(rX)                                    \
+        BEGIN_FTR_SECTION_NESTED(66);                   \
+        mfspr   rX,SPRN_SPRG_PACA;                      \
+        FTR_SECTION_ELSE_NESTED(66);                    \
+        mfspr   rX,SPRN_SPRG_HPACA;                     \
+        ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_HVMODE_206, 66)
+
+#define SET_PACA(rX)                                    \
+        BEGIN_FTR_SECTION_NESTED(66);                   \
+        mtspr   SPRN_SPRG_PACA,rX;                      \
+        FTR_SECTION_ELSE_NESTED(66);                    \
+        mtspr   SPRN_SPRG_HPACA,rX;                     \
+        ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_HVMODE_206, 66)
+
+#define GET_SCRATCH0(rX)                                \
+        BEGIN_FTR_SECTION_NESTED(66);                   \
+        mfspr   rX,SPRN_SPRG_SCRATCH0;                  \
+        FTR_SECTION_ELSE_NESTED(66);                    \
+        mfspr   rX,SPRN_SPRG_HSCRATCH0;                 \
+        ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_HVMODE_206, 66)
+
+#define SET_SCRATCH0(rX)                                \
+        BEGIN_FTR_SECTION_NESTED(66);                   \
+        mtspr   SPRN_SPRG_SCRATCH0,rX;                  \
+        FTR_SECTION_ELSE_NESTED(66);                    \
+        mtspr   SPRN_SPRG_HSCRATCH0,rX;                 \
+        ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_HVMODE_206, 66)
+
+#else /* CONFIG_PPC_BOOK3S_64 */
+#define GET_SCRATCH0(rX)        mfspr   rX,SPRN_SPRG_SCRATCH0
+#define SET_SCRATCH0(rX)        mtspr   SPRN_SPRG_SCRATCH0,rX
+
 #endif
 
 #ifdef CONFIG_PPC_BOOK3E_64
@@ -750,6 +838,10 @@
 #define SPRN_SPRG_TLB_EXFRAME   SPRN_SPRG2
 #define SPRN_SPRG_TLB_SCRATCH   SPRN_SPRG6
 #define SPRN_SPRG_GEN_SCRATCH   SPRN_SPRG0
+
+#define SET_PACA(rX)    mtspr   SPRN_SPRG_PACA,rX
+#define GET_PACA(rX)    mfspr   rX,SPRN_SPRG_PACA
+
 #endif
 
 #ifdef CONFIG_PPC_BOOK3S_32
@@ -800,6 +892,8 @@
 #define SPRN_SPRG_SCRATCH1      SPRN_SPRG1
 #endif
 
+
+
 /*
  * An mtfsf instruction with the L bit set. On CPUs that support this a
  * full 64bits of FPSCR is restored and on other CPUs the L bit is ignored.
@@ -894,6 +988,8 @@
 #define PV_POWER5p      0x003B
 #define PV_POWER7       0x003F
 #define PV_970FX        0x003C
+#define PV_POWER6       0x003E
+#define PV_POWER7       0x003F
 #define PV_630          0x0040
 #define PV_630p 0x0041
 #define PV_970MP        0x0044
diff --git a/arch/powerpc/include/asm/reg_a2.h b/arch/powerpc/include/asm/reg_a2.h
new file mode 100644
index 000000000000..3d52a1132f3d
--- /dev/null
+++ b/arch/powerpc/include/asm/reg_a2.h
@@ -0,0 +1,165 @@
+/*
+ *  Register definitions specific to the A2 core
+ *
+ *  Copyright (C) 2008 Ben. Herrenschmidt (benh@kernel.crashing.org), IBM Corp.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+
+#ifndef __ASM_POWERPC_REG_A2_H__
+#define __ASM_POWERPC_REG_A2_H__
+
+#define SPRN_TENSR      0x1b5
+#define SPRN_TENS       0x1b6   /* Thread ENable Set */
+#define SPRN_TENC       0x1b7   /* Thread ENable Clear */
+
+#define SPRN_A2_CCR0    0x3f0   /* Core Configuration Register 0 */
+#define SPRN_A2_CCR1    0x3f1   /* Core Configuration Register 1 */
+#define SPRN_A2_CCR2    0x3f2   /* Core Configuration Register 2 */
+#define SPRN_MMUCR0     0x3fc   /* MMU Control Register 0 */
+#define SPRN_MMUCR1     0x3fd   /* MMU Control Register 1 */
+#define SPRN_MMUCR2     0x3fe   /* MMU Control Register 2 */
+#define SPRN_MMUCR3     0x3ff   /* MMU Control Register 3 */
+
+#define SPRN_IAR        0x372
+
+#define SPRN_IUCR0      0x3f3
+#define IUCR0_ICBI_ACK  0x1000
+
+#define SPRN_XUCR0      0x3f6   /* Execution Unit Config Register 0 */
+
+#define A2_IERAT_SIZE   16
+#define A2_DERAT_SIZE   32
+
+/* A2 MMUCR0 bits */
+#define MMUCR0_ECL      0x80000000      /* Extended Class for TLB fills */
+#define MMUCR0_TID_NZ   0x40000000      /* TID is non-zero */
+#define MMUCR0_TS       0x10000000      /* Translation space for TLB fills */
+#define MMUCR0_TGS      0x20000000      /* Guest space for TLB fills */
+#define MMUCR0_TLBSEL   0x0c000000      /* TLB or ERAT target for TLB fills */
+#define MMUCR0_TLBSEL_U 0x00000000      /*  TLBSEL = UTLB */
+#define MMUCR0_TLBSEL_I 0x08000000      /*  TLBSEL = I-ERAT */
+#define MMUCR0_TLBSEL_D 0x0c000000      /*  TLBSEL = D-ERAT */
+#define MMUCR0_LOCKSRSH 0x02000000      /* Use TLB lock on tlbsx. */
+#define MMUCR0_TID_MASK 0x000000ff      /* TID field */
+
+/* A2 MMUCR1 bits */
+#define MMUCR1_IRRE             0x80000000      /* I-ERAT round robin enable */
+#define MMUCR1_DRRE             0x40000000      /* D-ERAT round robin enable */
+#define MMUCR1_REE              0x20000000      /* Reference Exception Enable*/
+#define MMUCR1_CEE              0x10000000      /* Change exception enable */
+#define MMUCR1_CSINV_ALL        0x00000000      /* Inval ERAT on all CS evts */
+#define MMUCR1_CSINV_NISYNC     0x04000000      /* Inval ERAT on all ex isync*/
+#define MMUCR1_CSINV_NEVER      0x0c000000      /* Don't inval ERAT on CS */
+#define MMUCR1_ICTID            0x00080000      /* IERAT class field as TID */
+#define MMUCR1_ITTID            0x00040000      /* IERAT thdid field as TID */
+#define MMUCR1_DCTID            0x00020000      /* DERAT class field as TID */
+#define MMUCR1_DTTID            0x00010000      /* DERAT thdid field as TID */
+#define MMUCR1_DCCD             0x00008000      /* DERAT class ignore */
+#define MMUCR1_TLBWE_BINV       0x00004000      /* back invalidate on tlbwe */
+
+/* A2 MMUCR2 bits */
+#define MMUCR2_PSSEL_SHIFT      4
+
+/* A2 MMUCR3 bits */
+#define MMUCR3_THID             0x0000000f      /* Thread ID */
+
+/* *** ERAT TLB bits definitions */
+#define TLB0_EPN_MASK           ASM_CONST(0xfffffffffffff000)
+#define TLB0_CLASS_MASK         ASM_CONST(0x0000000000000c00)
+#define TLB0_CLASS_00           ASM_CONST(0x0000000000000000)
+#define TLB0_CLASS_01           ASM_CONST(0x0000000000000400)
+#define TLB0_CLASS_10           ASM_CONST(0x0000000000000800)
+#define TLB0_CLASS_11           ASM_CONST(0x0000000000000c00)
+#define TLB0_V                  ASM_CONST(0x0000000000000200)
+#define TLB0_X                  ASM_CONST(0x0000000000000100)
+#define TLB0_SIZE_MASK          ASM_CONST(0x00000000000000f0)
+#define TLB0_SIZE_4K            ASM_CONST(0x0000000000000010)
+#define TLB0_SIZE_64K           ASM_CONST(0x0000000000000030)
+#define TLB0_SIZE_1M            ASM_CONST(0x0000000000000050)
+#define TLB0_SIZE_16M           ASM_CONST(0x0000000000000070)
+#define TLB0_SIZE_1G            ASM_CONST(0x00000000000000a0)
+#define TLB0_THDID_MASK         ASM_CONST(0x000000000000000f)
+#define TLB0_THDID_0            ASM_CONST(0x0000000000000001)
+#define TLB0_THDID_1            ASM_CONST(0x0000000000000002)
+#define TLB0_THDID_2            ASM_CONST(0x0000000000000004)
+#define TLB0_THDID_3            ASM_CONST(0x0000000000000008)
+#define TLB0_THDID_ALL          ASM_CONST(0x000000000000000f)
+
+#define TLB1_RESVATTR           ASM_CONST(0x00f0000000000000)
+#define TLB1_U0                 ASM_CONST(0x0008000000000000)
+#define TLB1_U1                 ASM_CONST(0x0004000000000000)
+#define TLB1_U2                 ASM_CONST(0x0002000000000000)
+#define TLB1_U3                 ASM_CONST(0x0001000000000000)
+#define TLB1_R                  ASM_CONST(0x0000800000000000)
+#define TLB1_C                  ASM_CONST(0x0000400000000000)
+#define TLB1_RPN_MASK           ASM_CONST(0x000003fffffff000)
+#define TLB1_W                  ASM_CONST(0x0000000000000800)
+#define TLB1_I                  ASM_CONST(0x0000000000000400)
+#define TLB1_M                  ASM_CONST(0x0000000000000200)
+#define TLB1_G                  ASM_CONST(0x0000000000000100)
+#define TLB1_E                  ASM_CONST(0x0000000000000080)
+#define TLB1_VF                 ASM_CONST(0x0000000000000040)
+#define TLB1_UX                 ASM_CONST(0x0000000000000020)
+#define TLB1_SX                 ASM_CONST(0x0000000000000010)
+#define TLB1_UW                 ASM_CONST(0x0000000000000008)
+#define TLB1_SW                 ASM_CONST(0x0000000000000004)
+#define TLB1_UR                 ASM_CONST(0x0000000000000002)
+#define TLB1_SR                 ASM_CONST(0x0000000000000001)
+
+#ifdef CONFIG_PPC_EARLY_DEBUG_WSP
+#define WSP_UART_PHYS   0xffc000c000
+/* This needs to be careful chosen to hit a !0 congruence class
+ * in the TLB since we bolt it in way 3, which is already occupied
+ * by our linear mapping primary bolted entry in CC 0.
+ */
+#define WSP_UART_VIRT   0xf000000000001000
+#endif
+
+/* A2 erativax attributes definitions */
+#define ERATIVAX_RS_IS_ALL              0x000
+#define ERATIVAX_RS_IS_TID              0x040
+#define ERATIVAX_RS_IS_CLASS            0x080
+#define ERATIVAX_RS_IS_FULLMATCH        0x0c0
+#define ERATIVAX_CLASS_00               0x000
+#define ERATIVAX_CLASS_01               0x010
+#define ERATIVAX_CLASS_10               0x020
+#define ERATIVAX_CLASS_11               0x030
+#define ERATIVAX_PSIZE_4K               (TLB_PSIZE_4K >> 1)
+#define ERATIVAX_PSIZE_64K              (TLB_PSIZE_64K >> 1)
+#define ERATIVAX_PSIZE_1M               (TLB_PSIZE_1M >> 1)
+#define ERATIVAX_PSIZE_16M              (TLB_PSIZE_16M >> 1)
+#define ERATIVAX_PSIZE_1G               (TLB_PSIZE_1G >> 1)
+
+/* A2 eratilx attributes definitions */
+#define ERATILX_T_ALL                   0
+#define ERATILX_T_TID                   1
+#define ERATILX_T_TGS                   2
+#define ERATILX_T_FULLMATCH             3
+#define ERATILX_T_CLASS0                4
+#define ERATILX_T_CLASS1                5
+#define ERATILX_T_CLASS2                6
+#define ERATILX_T_CLASS3                7
+
+/* XUCR0 bits */
+#define XUCR0_TRACE_UM_T0               0x40000000      /* Thread 0 */
+#define XUCR0_TRACE_UM_T1               0x20000000      /* Thread 1 */
+#define XUCR0_TRACE_UM_T2               0x10000000      /* Thread 2 */
+#define XUCR0_TRACE_UM_T3               0x08000000      /* Thread 3 */
+
+/* A2 CCR0 register */
+#define A2_CCR0_PME_DISABLED            0x00000000
+#define A2_CCR0_PME_SLEEP               0x40000000
+#define A2_CCR0_PME_RVW                 0x80000000
+#define A2_CCR0_PME_DISABLED2           0xc0000000
+
+/* A2 CCR2 register */
+#define A2_CCR2_ERAT_ONLY_MODE          0x00000001
+#define A2_CCR2_ENABLE_ICSWX            0x00000002
+#define A2_CCR2_ENABLE_PC               0x20000000
+#define A2_CCR2_ENABLE_TRACE            0x40000000
+
+#endif /* __ASM_POWERPC_REG_A2_H__ */
diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h
index b316794aa2b5..0f0ad9fa01c1 100644
--- a/arch/powerpc/include/asm/reg_booke.h
+++ b/arch/powerpc/include/asm/reg_booke.h
@@ -27,10 +27,12 @@
 #define MSR_CM          (1<<31) /* Computation Mode (0=32-bit, 1=64-bit) */
 
 #if defined(CONFIG_PPC_BOOK3E_64)
+#define MSR_64BIT       MSR_CM
+
 #define MSR_            MSR_ME | MSR_CE
-#define MSR_KERNEL      MSR_ | MSR_CM
+#define MSR_KERNEL      MSR_ | MSR_64BIT
 #define MSR_USER32      MSR_ | MSR_PR | MSR_EE | MSR_DE
-#define MSR_USER64      MSR_USER32 | MSR_CM | MSR_DE
+#define MSR_USER64      MSR_USER32 | MSR_64BIT
 #elif defined (CONFIG_40x)
 #define MSR_KERNEL      (MSR_ME|MSR_RI|MSR_IR|MSR_DR|MSR_CE)
 #define MSR_USER        (MSR_KERNEL|MSR_PR|MSR_EE)
@@ -81,6 +83,10 @@
 #define SPRN_IVOR13     0x19D   /* Interrupt Vector Offset Register 13 */
 #define SPRN_IVOR14     0x19E   /* Interrupt Vector Offset Register 14 */
 #define SPRN_IVOR15     0x19F   /* Interrupt Vector Offset Register 15 */
+#define SPRN_IVOR38     0x1B0   /* Interrupt Vector Offset Register 38 */
+#define SPRN_IVOR39     0x1B1   /* Interrupt Vector Offset Register 39 */
+#define SPRN_IVOR40     0x1B2   /* Interrupt Vector Offset Register 40 */
+#define SPRN_IVOR41     0x1B3   /* Interrupt Vector Offset Register 41 */
 #define SPRN_SPEFSCR    0x200   /* SPE & Embedded FP Status & Control */
 #define SPRN_BBEAR      0x201   /* Branch Buffer Entry Address Register */
 #define SPRN_BBTAR      0x202   /* Branch Buffer Target Address Register */
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index 9a1193e30f26..58625d1e7802 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -158,7 +158,50 @@ struct rtas_error_log {
         unsigned long target:4;                 /* Target of failed operation */
         unsigned long type:8;                   /* General event or error*/
         unsigned long extended_log_length:32;   /* length in bytes */
-        unsigned char buffer[1];
+        unsigned char buffer[1];                /* Start of extended log */
+                                                /* Variable length.      */
+};
+
+#define RTAS_V6EXT_LOG_FORMAT_EVENT_LOG 14
+
+#define RTAS_V6EXT_COMPANY_ID_IBM       (('I' << 24) | ('B' << 16) | ('M' << 8))
+
+/* RTAS general extended event log, Version 6. The extended log starts
+ * from "buffer" field of struct rtas_error_log defined above.
+ */
+struct rtas_ext_event_log_v6 {
+        /* Byte 0 */
+        uint32_t log_valid:1;           /* 1:Log valid */
+        uint32_t unrecoverable_error:1; /* 1:Unrecoverable error */
+        uint32_t recoverable_error:1;   /* 1:recoverable (correctable   */
+                                        /*   or successfully retried)   */
+        uint32_t degraded_operation:1;  /* 1:Unrecoverable err, bypassed*/
+                                        /*   - degraded operation (e.g. */
+                                        /*   CPU or mem taken off-line) */
+        uint32_t predictive_error:1;
+        uint32_t new_log:1;             /* 1:"New" log (Always 1 for    */
+                                        /*   data returned from RTAS    */
+        uint32_t big_endian:1;          /* 1: Big endian */
+        uint32_t :1;                    /* reserved */
+        /* Byte 1 */
+        uint32_t :8;                    /* reserved */
+        /* Byte 2 */
+        uint32_t powerpc_format:1;      /* Set to 1 (indicating log is  */
+                                        /* in PowerPC format            */
+        uint32_t :3;                    /* reserved */
+        uint32_t log_format:4;          /* Log format indicator. Define */
+                                        /* format used for byte 12-2047 */
+        /* Byte 3 */
+        uint32_t :8;                    /* reserved */
+        /* Byte 4-11 */
+        uint8_t reserved[8];            /* reserved */
+        /* Byte 12-15 */
+        uint32_t company_id;            /* Company ID of the company    */
+                                        /* that defines the format for  */
+                                        /* the vendor specific log type */
+        /* Byte 16-end of log */
+        uint8_t vendor_log[1];          /* Start of vendor specific log */
+                                        /* Variable length.             */
 };
 
 /*
diff --git a/arch/powerpc/include/asm/scom.h b/arch/powerpc/include/asm/scom.h
new file mode 100644
index 000000000000..0cabfd7bc2d1
--- /dev/null
+++ b/arch/powerpc/include/asm/scom.h
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2010 Benjamin Herrenschmidt, IBM Corp
+ *                <benh@kernel.crashing.org>
+ *     and        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; 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
+ */
+
+#ifndef _ASM_POWERPC_SCOM_H
+#define _ASM_POWERPC_SCOM_H
+
+#ifdef __KERNEL__
+#ifndef __ASSEMBLY__
+#ifdef CONFIG_PPC_SCOM
+
+/*
+ * The SCOM bus is a sideband bus used for accessing various internal
+ * registers of the processor or the chipset. The implementation details
+ * differ between processors and platforms, and the access method as
+ * well.
+ *
+ * This API allows to "map" ranges of SCOM register numbers associated
+ * with a given SCOM controller. The later must be represented by a
+ * device node, though some implementations might support NULL if there
+ * is no possible ambiguity
+ *
+ * Then, scom_read/scom_write can be used to accesses registers inside
+ * that range. The argument passed is a register number relative to
+ * the beginning of the range mapped.
+ */
+
+typedef void *scom_map_t;
+
+/* Value for an invalid SCOM map */
+#define SCOM_MAP_INVALID        (NULL)
+
+/* The scom_controller data structure is what the platform passes
+ * to the core code in scom_init, it provides the actual implementation
+ * of all the SCOM functions
+ */
+struct scom_controller {
+        scom_map_t (*map)(struct device_node *ctrl_dev, u64 reg, u64 count);
+        void (*unmap)(scom_map_t map);
+
+        u64 (*read)(scom_map_t map, u32 reg);
+        void (*write)(scom_map_t map, u32 reg, u64 value);
+};
+
+extern const struct scom_controller *scom_controller;
+
+/**
+ * scom_init - Initialize the SCOM backend, called by the platform
+ * @controller: The platform SCOM controller
+ */
+static inline void scom_init(const struct scom_controller *controller)
+{
+        scom_controller = controller;
+}
+
+/**
+ * scom_map_ok - Test is a SCOM mapping is successful
+ * @map: The result of scom_map to test
+ */
+static inline int scom_map_ok(scom_map_t map)
+{
+        return map != SCOM_MAP_INVALID;
+}
+
+/**
+ * scom_map - Map a block of SCOM registers
+ * @ctrl_dev: Device node of the SCOM controller
+ *            some implementations allow NULL here
+ * @reg: first SCOM register to map
+ * @count: Number of SCOM registers to map
+ */
+
+static inline scom_map_t scom_map(struct device_node *ctrl_dev,
+                                  u64 reg, u64 count)
+{
+        return scom_controller->map(ctrl_dev, reg, count);
+}
+
+/**
+ * scom_find_parent - Find the SCOM controller for a device
+ * @dev: OF node of the device
+ *
+ * This is not meant for general usage, but in combination with
+ * scom_map() allows to map registers not represented by the
+ * device own scom-reg property. Useful for applying HW workarounds
+ * on things not properly represented in the device-tree for example.
+ */
+struct device_node *scom_find_parent(struct device_node *dev);
+
+
+/**
+ * scom_map_device - Map a device's block of SCOM registers
+ * @dev: OF node of the device
+ * @index: Register bank index (index in "scom-reg" property)
+ *
+ * This function will use the device-tree binding for SCOM which
+ * is to follow "scom-parent" properties until it finds a node with
+ * a "scom-controller" property to find the controller. It will then
+ * use the "scom-reg" property which is made of reg/count pairs,
+ * each of them having a size defined by the controller's #scom-cells
+ * property
+ */
+extern scom_map_t scom_map_device(struct device_node *dev, int index);
+
+
+/**
+ * scom_unmap - Unmap a block of SCOM registers
+ * @map: Result of scom_map is to be unmapped
+ */
+static inline void scom_unmap(scom_map_t map)
+{
+        if (scom_map_ok(map))
+                scom_controller->unmap(map);
+}
+
+/**
+ * scom_read - Read a SCOM register
+ * @map: Result of scom_map
+ * @reg: Register index within that map
+ */
+static inline u64 scom_read(scom_map_t map, u32 reg)
+{
+        return scom_controller->read(map, reg);
+}
+
+/**
+ * scom_write - Write to a SCOM register
+ * @map: Result of scom_map
+ * @reg: Register index within that map
+ * @value: Value to write
+ */
+static inline void scom_write(scom_map_t map, u32 reg, u64 value)
+{
+        scom_controller->write(map, reg, value);
+}
+
+#endif /* CONFIG_PPC_SCOM */
+#endif /* __ASSEMBLY__ */
+#endif /* __KERNEL__ */
+#endif /* _ASM_POWERPC_SCOM_H */
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
index a902a0d3ae0d..880b8c1e6e53 100644
--- a/arch/powerpc/include/asm/smp.h
+++ b/arch/powerpc/include/asm/smp.h
@@ -20,6 +20,7 @@
 #include <linux/threads.h>
 #include <linux/cpumask.h>
 #include <linux/kernel.h>
+#include <linux/irqreturn.h>
 
 #ifndef __ASSEMBLY__
 
@@ -29,14 +30,32 @@
 #include <asm/percpu.h>
 
 extern int boot_cpuid;
+extern int boot_cpu_count;
 
 extern void cpu_die(void);
 
 #ifdef CONFIG_SMP
 
-extern void smp_send_debugger_break(int cpu);
-extern void smp_message_recv(int);
+struct smp_ops_t {
+        void  (*message_pass)(int cpu, int msg);
+#ifdef CONFIG_PPC_SMP_MUXED_IPI
+        void  (*cause_ipi)(int cpu, unsigned long data);
+#endif
+        int   (*probe)(void);
+        int   (*kick_cpu)(int nr);
+        void  (*setup_cpu)(int nr);
+        void  (*bringup_done)(void);
+        void  (*take_timebase)(void);
+        void  (*give_timebase)(void);
+        int   (*cpu_disable)(void);
+        void  (*cpu_die)(unsigned int nr);
+        int   (*cpu_bootable)(unsigned int nr);
+};
+
+extern void smp_send_debugger_break(void);
 extern void start_secondary_resume(void);
+extern void __devinit smp_generic_give_timebase(void);
+extern void __devinit smp_generic_take_timebase(void);
 
 DECLARE_PER_CPU(unsigned int, cpu_pvr);
 
@@ -93,13 +112,16 @@ extern int cpu_to_core_id(int cpu);
 #define PPC_MSG_CALL_FUNC_SINGLE        2
 #define PPC_MSG_DEBUGGER_BREAK  3
 
-/*
- * irq controllers that have dedicated ipis per message and don't
- * need additional code in the action handler may use this
- */
+/* for irq controllers that have dedicated ipis per message (4) */
 extern int smp_request_message_ipi(int virq, int message);
 extern const char *smp_ipi_name[];
 
+/* for irq controllers with only a single ipi */
+extern void smp_muxed_ipi_set_data(int cpu, unsigned long data);
+extern void smp_muxed_ipi_message_pass(int cpu, int msg);
+extern void smp_muxed_ipi_resend(void);
+extern irqreturn_t smp_ipi_demux(void);
+
 void smp_init_iSeries(void);
 void smp_init_pSeries(void);
 void smp_init_cell(void);
@@ -149,7 +171,7 @@ extern int smt_enabled_at_boot;
 
 extern int smp_mpic_probe(void);
 extern void smp_mpic_setup_cpu(int cpu);
-extern void smp_generic_kick_cpu(int nr);
+extern int smp_generic_kick_cpu(int nr);
 
 extern void smp_generic_give_timebase(void);
 extern void smp_generic_take_timebase(void);
@@ -169,6 +191,8 @@ extern unsigned long __secondary_hold_spinloop;
 extern unsigned long __secondary_hold_acknowledge;
 extern char __secondary_hold;
 
+extern irqreturn_t debug_ipi_action(int irq, void *data);
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h
index 60f64b132bd4..8489d372077f 100644
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
@@ -352,3 +352,4 @@ SYSCALL_SPU(name_to_handle_at)
 COMPAT_SYS_SPU(open_by_handle_at)
 COMPAT_SYS_SPU(clock_adjtime)
 SYSCALL_SPU(syncfs)
+COMPAT_SYS_SPU(sendmmsg)
diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
index 5e474ddd2273..2dc595dda03b 100644
--- a/arch/powerpc/include/asm/system.h
+++ b/arch/powerpc/include/asm/system.h
@@ -219,8 +219,6 @@ extern int mem_init_done;	/* set on boot once kmalloc can be called */
 extern int init_bootmem_done;   /* set once bootmem is available */
 extern phys_addr_t memory_limit;
 extern unsigned long klimit;
-
-extern void *alloc_maybe_bootmem(size_t size, gfp_t mask);
 extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
 
 extern int powersave_nap;       /* set if nap mode can be used in idle loop */
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index d8529ef13b23..37c353e8af7c 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -139,10 +139,12 @@ static inline struct thread_info *current_thread_info(void)
 #define TLF_NAPPING             0       /* idle thread enabled NAP mode */
 #define TLF_SLEEPING            1       /* suspend code enabled SLEEP mode */
 #define TLF_RESTORE_SIGMASK     2       /* Restore signal mask in do_signal */
+#define TLF_LAZY_MMU            3       /* tlb_batch is active */
 
 #define _TLF_NAPPING            (1 << TLF_NAPPING)
 #define _TLF_SLEEPING           (1 << TLF_SLEEPING)
 #define _TLF_RESTORE_SIGMASK    (1 << TLF_RESTORE_SIGMASK)
+#define _TLF_LAZY_MMU           (1 << TLF_LAZY_MMU)
 
 #ifndef __ASSEMBLY__
 #define HAVE_SET_RESTORE_SIGMASK        1
diff --git a/arch/powerpc/include/asm/tlbflush.h b/arch/powerpc/include/asm/tlbflush.h
index d50a380b2b6f..81143fcbd113 100644
--- a/arch/powerpc/include/asm/tlbflush.h
+++ b/arch/powerpc/include/asm/tlbflush.h
@@ -79,6 +79,8 @@ static inline void local_flush_tlb_mm(struct mm_struct *mm)
 
 #elif defined(CONFIG_PPC_STD_MMU_64)
 
+#define MMU_NO_CONTEXT          0
+
 /*
  * TLB flushing for 64-bit hash-MMU CPUs
  */
diff --git a/arch/powerpc/include/asm/udbg.h b/arch/powerpc/include/asm/udbg.h
index 11ae699135ba..58580e94a2bb 100644
--- a/arch/powerpc/include/asm/udbg.h
+++ b/arch/powerpc/include/asm/udbg.h
@@ -52,6 +52,7 @@ extern void __init udbg_init_44x_as1(void);
 extern void __init udbg_init_40x_realmode(void);
 extern void __init udbg_init_cpm(void);
 extern void __init udbg_init_usbgecko(void);
+extern void __init udbg_init_wsp(void);
 
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_UDBG_H */
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index 3c215648ce6d..6d23c8193caa 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -371,10 +371,11 @@
 #define __NR_open_by_handle_at  346
 #define __NR_clock_adjtime      347
 #define __NR_syncfs             348
+#define __NR_sendmmsg           349
 
 #ifdef __KERNEL__
 
-#define __NR_syscalls           349
+#define __NR_syscalls           350
 
 #define __NR__exit __NR_exit
 #define NR_syscalls     __NR_syscalls
diff --git a/arch/powerpc/include/asm/wsp.h b/arch/powerpc/include/asm/wsp.h
new file mode 100644
index 000000000000..c7dc83088a33
--- /dev/null
+++ b/arch/powerpc/include/asm/wsp.h
@@ -0,0 +1,14 @@
+/*
+ *  Copyright 2011 Michael Ellerman, IBM Corp.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+#ifndef __ASM_POWERPC_WSP_H
+#define __ASM_POWERPC_WSP_H
+
+extern int wsp_get_chip_id(struct device_node *dn);
+
+#endif /* __ASM_POWERPC_WSP_H */
diff --git a/arch/powerpc/include/asm/xics.h b/arch/powerpc/include/asm/xics.h
new file mode 100644
index 000000000000..b183a4062011
--- /dev/null
+++ b/arch/powerpc/include/asm/xics.h
@@ -0,0 +1,142 @@
+/*
+ * Common definitions accross all variants of ICP and ICS interrupt
+ * controllers.
+ */
+
+#ifndef _XICS_H
+#define _XICS_H
+
+#include <linux/interrupt.h>
+
+#define XICS_IPI                2
+#define XICS_IRQ_SPURIOUS       0
+
+/* Want a priority other than 0.  Various HW issues require this. */
+#define DEFAULT_PRIORITY        5
+
+/*
+ * Mark IPIs as higher priority so we can take them inside interrupts that
+ * arent marked IRQF_DISABLED
+ */
+#define IPI_PRIORITY            4
+
+/* The least favored priority */
+#define LOWEST_PRIORITY         0xFF
+
+/* The number of priorities defined above */
+#define MAX_NUM_PRIORITIES      3
+
+/* Native ICP */
+extern int icp_native_init(void);
+
+/* PAPR ICP */
+extern int icp_hv_init(void);
+
+/* ICP ops */
+struct icp_ops {
+        unsigned int (*get_irq)(void);
+        void (*eoi)(struct irq_data *d);
+        void (*set_priority)(unsigned char prio);
+        void (*teardown_cpu)(void);
+        void (*flush_ipi)(void);
+#ifdef CONFIG_SMP
+        void (*cause_ipi)(int cpu, unsigned long data);
+        irq_handler_t ipi_action;
+#endif
+};
+
+extern const struct icp_ops *icp_ops;
+
+/* Native ICS */
+extern int ics_native_init(void);
+
+/* RTAS ICS */
+extern int ics_rtas_init(void);
+
+/* ICS instance, hooked up to chip_data of an irq */
+struct ics {
+        struct list_head link;
+        int (*map)(struct ics *ics, unsigned int virq);
+        void (*mask_unknown)(struct ics *ics, unsigned long vec);
+        long (*get_server)(struct ics *ics, unsigned long vec);
+        int (*host_match)(struct ics *ics, struct device_node *node);
+        char data[];
+};
+
+/* Commons */
+extern unsigned int xics_default_server;
+extern unsigned int xics_default_distrib_server;
+extern unsigned int xics_interrupt_server_size;
+extern struct irq_host *xics_host;
+
+struct xics_cppr {
+        unsigned char stack[MAX_NUM_PRIORITIES];
+        int index;
+};
+
+DECLARE_PER_CPU(struct xics_cppr, xics_cppr);
+
+static inline void xics_push_cppr(unsigned int vec)
+{
+        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+
+        if (WARN_ON(os_cppr->index >= MAX_NUM_PRIORITIES - 1))
+                return;
+
+        if (vec == XICS_IPI)
+                os_cppr->stack[++os_cppr->index] = IPI_PRIORITY;
+        else
+                os_cppr->stack[++os_cppr->index] = DEFAULT_PRIORITY;
+}
+
+static inline unsigned char xics_pop_cppr(void)
+{
+        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+
+        if (WARN_ON(os_cppr->index < 1))
+                return LOWEST_PRIORITY;
+
+        return os_cppr->stack[--os_cppr->index];
+}
+
+static inline void xics_set_base_cppr(unsigned char cppr)
+{
+        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+
+        /* we only really want to set the priority when there's
+         * just one cppr value on the stack
+         */
+        WARN_ON(os_cppr->index != 0);
+
+        os_cppr->stack[0] = cppr;
+}
+
+static inline unsigned char xics_cppr_top(void)
+{
+        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+        
+        return os_cppr->stack[os_cppr->index];
+}
+
+DECLARE_PER_CPU_SHARED_ALIGNED(unsigned long, xics_ipi_message);
+
+extern void xics_init(void);
+extern void xics_setup_cpu(void);
+extern void xics_update_irq_servers(void);
+extern void xics_set_cpu_giq(unsigned int gserver, unsigned int join);
+extern void xics_mask_unknown_vec(unsigned int vec);
+extern irqreturn_t xics_ipi_dispatch(int cpu);
+extern int xics_smp_probe(void);
+extern void xics_register_ics(struct ics *ics);
+extern void xics_teardown_cpu(void);
+extern void xics_kexec_teardown_cpu(int secondary);
+extern void xics_migrate_irqs_away(void);
+#ifdef CONFIG_SMP
+extern int xics_get_irq_server(unsigned int virq, const struct cpumask *cpumask,
+                               unsigned int strict_check);
+#else
+#define xics_get_irq_server(virq, cpumask, strict_check) (xics_default_server)
+#endif
+
+
+#endif /* _XICS_H */
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 3bb2a3e6a337..9aab36312572 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -38,11 +38,14 @@ obj-$(CONFIG_PPC64)		+= setup_64.o sys_ppc32.o \
                                    paca.o nvram_64.o firmware.o
 obj-$(CONFIG_HAVE_HW_BREAKPOINT)        += hw_breakpoint.o
 obj-$(CONFIG_PPC_BOOK3S_64)     += cpu_setup_ppc970.o cpu_setup_pa6t.o
+obj-$(CONFIG_PPC_BOOK3S_64)     += cpu_setup_power7.o
 obj64-$(CONFIG_RELOCATABLE)     += reloc_64.o
 obj-$(CONFIG_PPC_BOOK3E_64)     += exceptions-64e.o idle_book3e.o
+obj-$(CONFIG_PPC_A2)            += cpu_setup_a2.o
 obj-$(CONFIG_PPC64)             += vdso64/
 obj-$(CONFIG_ALTIVEC)           += vecemu.o
 obj-$(CONFIG_PPC_970_NAP)       += idle_power4.o
+obj-$(CONFIG_PPC_P7_NAP)        += idle_power7.o
 obj-$(CONFIG_PPC_OF)            += of_platform.o prom_parse.o
 obj-$(CONFIG_PPC_CLOCK)         += clock.o
 procfs-y                        := proc_powerpc.o
@@ -75,7 +78,6 @@ obj-$(CONFIG_PPC_FSL_BOOK3E)	+= cpu_setup_fsl_booke.o dbell.o
 obj-$(CONFIG_PPC_BOOK3E_64)     += dbell.o
 
 extra-y                         := head_$(CONFIG_WORD_SIZE).o
-extra-$(CONFIG_PPC_BOOK3E_32)   := head_new_booke.o
 extra-$(CONFIG_40x)             := head_40x.o
 extra-$(CONFIG_44x)             := head_44x.o
 extra-$(CONFIG_FSL_BOOKE)       := head_fsl_booke.o
@@ -103,6 +105,8 @@ obj-$(CONFIG_KEXEC)		+= machine_kexec.o crash.o \
 obj-$(CONFIG_AUDIT)             += audit.o
 obj64-$(CONFIG_AUDIT)           += compat_audit.o
 
+obj-$(CONFIG_PPC_IO_WORKAROUNDS)        += io-workarounds.o
+
 obj-$(CONFIG_DYNAMIC_FTRACE)    += ftrace.o
 obj-$(CONFIG_FUNCTION_GRAPH_TRACER)     += ftrace.o
 obj-$(CONFIG_PERF_EVENTS)       += perf_callchain.o
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 23e6a93145ab..36e1c8a29be8 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -74,6 +74,7 @@ int main(void)
         DEFINE(AUDITCONTEXT, offsetof(struct task_struct, audit_context));
         DEFINE(SIGSEGV, SIGSEGV);
         DEFINE(NMI_MASK, NMI_MASK);
+        DEFINE(THREAD_DSCR, offsetof(struct thread_struct, dscr));
 #else
         DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));
 #endif /* CONFIG_PPC64 */
@@ -395,6 +396,7 @@ int main(void)
         DEFINE(VCPU_HOST_STACK, offsetof(struct kvm_vcpu, arch.host_stack));
         DEFINE(VCPU_HOST_PID, offsetof(struct kvm_vcpu, arch.host_pid));
         DEFINE(VCPU_GPRS, offsetof(struct kvm_vcpu, arch.gpr));
+        DEFINE(VCPU_VRSAVE, offsetof(struct kvm_vcpu, arch.vrsave));
         DEFINE(VCPU_SPRG4, offsetof(struct kvm_vcpu, arch.sprg4));
         DEFINE(VCPU_SPRG5, offsetof(struct kvm_vcpu, arch.sprg5));
         DEFINE(VCPU_SPRG6, offsetof(struct kvm_vcpu, arch.sprg6));
diff --git a/arch/powerpc/kernel/cpu_setup_a2.S b/arch/powerpc/kernel/cpu_setup_a2.S
new file mode 100644
index 000000000000..7f818feaa7a5
--- /dev/null
+++ b/arch/powerpc/kernel/cpu_setup_a2.S
@@ -0,0 +1,114 @@
+/*
+ *  A2 specific assembly support code
+ *
+ *  Copyright 2009 Ben Herrenschmidt, 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/asm-offsets.h>
+#include <asm/ppc_asm.h>
+#include <asm/ppc-opcode.h>
+#include <asm/processor.h>
+#include <asm/reg_a2.h>
+#include <asm/reg.h>
+#include <asm/thread_info.h>
+
+/*
+ * Disable thdid and class fields in ERATs to bump PID to full 14 bits capacity.
+ * This also prevents external LPID accesses but that isn't a problem when not a
+ * guest. Under PV, this setting will be ignored and MMUCR will return the right
+ * number of PID bits we can use.
+ */
+#define MMUCR1_EXTEND_PID \
+        (MMUCR1_ICTID | MMUCR1_ITTID | MMUCR1_DCTID | \
+         MMUCR1_DTTID | MMUCR1_DCCD)
+
+/*
+ * Use extended PIDs if enabled.
+ * Don't clear the ERATs on context sync events and enable I & D LRU.
+ * Enable ERAT back invalidate when tlbwe overwrites an entry.
+ */
+#define INITIAL_MMUCR1 \
+        (MMUCR1_EXTEND_PID | MMUCR1_CSINV_NEVER | MMUCR1_IRRE | \
+         MMUCR1_DRRE | MMUCR1_TLBWE_BINV)
+
+_GLOBAL(__setup_cpu_a2)
+        /* Some of these are actually thread local and some are
+         * core local but doing it always won't hurt
+         */
+
+#ifdef CONFIG_PPC_WSP_COPRO
+        /* Make sure ACOP starts out as zero */
+        li      r3,0
+        mtspr   SPRN_ACOP,r3
+
+        /* Enable icswx instruction */
+        mfspr   r3,SPRN_A2_CCR2
+        ori     r3,r3,A2_CCR2_ENABLE_ICSWX
+        mtspr   SPRN_A2_CCR2,r3
+
+        /* Unmask all CTs in HACOP */
+        li      r3,-1
+        mtspr   SPRN_HACOP,r3
+#endif /* CONFIG_PPC_WSP_COPRO */
+
+        /* Enable doorbell */
+        mfspr   r3,SPRN_A2_CCR2
+        oris     r3,r3,A2_CCR2_ENABLE_PC@h
+        mtspr   SPRN_A2_CCR2,r3
+        isync
+
+        /* Setup CCR0 to disable power saving for now as it's busted
+         * in the current implementations. Setup CCR1 to wake on
+         * interrupts normally (we write the default value but who
+         * knows what FW may have clobbered...)
+         */
+        li      r3,0
+        mtspr   SPRN_A2_CCR0, r3
+        LOAD_REG_IMMEDIATE(r3,0x0f0f0f0f)
+        mtspr   SPRN_A2_CCR1, r3
+
+        /* Initialise MMUCR1 */
+        lis     r3,INITIAL_MMUCR1@h
+        ori     r3,r3,INITIAL_MMUCR1@l
+        mtspr   SPRN_MMUCR1,r3
+
+        /* Set MMUCR2 to enable 4K, 64K, 1M, 16M and 1G pages */
+        LOAD_REG_IMMEDIATE(r3, 0x000a7531)
+        mtspr   SPRN_MMUCR2,r3
+
+        /* Set MMUCR3 to write all thids bit to the TLB */
+        LOAD_REG_IMMEDIATE(r3, 0x0000000f)
+        mtspr   SPRN_MMUCR3,r3
+
+        /* Don't do ERAT stuff if running guest mode */
+        mfmsr   r3
+        andis.  r0,r3,MSR_GS@h
+        bne     1f
+
+        /* Now set the I-ERAT watermark to 15 */
+        lis     r4,(MMUCR0_TLBSEL_I|MMUCR0_ECL)@h
+        mtspr   SPRN_MMUCR0, r4
+        li      r4,A2_IERAT_SIZE-1
+        PPC_ERATWE(r4,r4,3)
+
+        /* Now set the D-ERAT watermark to 31 */
+        lis     r4,(MMUCR0_TLBSEL_D|MMUCR0_ECL)@h
+        mtspr   SPRN_MMUCR0, r4
+        li      r4,A2_DERAT_SIZE-1
+        PPC_ERATWE(r4,r4,3)
+
+        /* And invalidate the beast just in case. That won't get rid of
+         * a bolted entry though it will be in LRU and so will go away eventually
+         * but let's not bother for now
+         */
+        PPC_ERATILX(0,0,0)
+1:
+        blr
+
+_GLOBAL(__restore_cpu_a2)
+        b       __setup_cpu_a2
diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
index 913611105c1f..8053db02b85e 100644
--- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S
+++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
@@ -88,6 +88,9 @@ _GLOBAL(__setup_cpu_e5500)
         bl      __e500_dcache_setup
 #ifdef CONFIG_PPC_BOOK3E_64
         bl      .__setup_base_ivors
+        bl      .setup_perfmon_ivor
+        bl      .setup_doorbell_ivors
+        bl      .setup_ehv_ivors
 #else
         bl      __setup_e500mc_ivors
 #endif
diff --git a/arch/powerpc/kernel/cpu_setup_power7.S b/arch/powerpc/kernel/cpu_setup_power7.S
new file mode 100644
index 000000000000..4f9a93fcfe07
--- /dev/null
+++ b/arch/powerpc/kernel/cpu_setup_power7.S
@@ -0,0 +1,91 @@
+/*
+ * This file contains low level CPU setup functions.
+ *    Copyright (C) 2003 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/page.h>
+#include <asm/cputable.h>
+#include <asm/ppc_asm.h>
+#include <asm/asm-offsets.h>
+#include <asm/cache.h>
+
+/* Entry: r3 = crap, r4 = ptr to cputable entry
+ *
+ * Note that we can be called twice for pseudo-PVRs
+ */
+_GLOBAL(__setup_cpu_power7)
+        mflr    r11
+        bl      __init_hvmode_206
+        mtlr    r11
+        beqlr
+        li      r0,0
+        mtspr   SPRN_LPID,r0
+        bl      __init_LPCR
+        bl      __init_TLB
+        mtlr    r11
+        blr
+
+_GLOBAL(__restore_cpu_power7)
+        mflr    r11
+        mfmsr   r3
+        rldicl. r0,r3,4,63
+        beqlr
+        li      r0,0
+        mtspr   SPRN_LPID,r0
+        bl      __init_LPCR
+        bl      __init_TLB
+        mtlr    r11
+        blr
+
+__init_hvmode_206:
+        /* Disable CPU_FTR_HVMODE_206 and exit if MSR:HV is not set */
+        mfmsr   r3
+        rldicl. r0,r3,4,63
+        bnelr
+        ld      r5,CPU_SPEC_FEATURES(r4)
+        LOAD_REG_IMMEDIATE(r6,CPU_FTR_HVMODE_206)
+        xor     r5,r5,r6
+        std     r5,CPU_SPEC_FEATURES(r4)
+        blr
+
+__init_LPCR:
+        /* Setup a sane LPCR:
+         *
+         *   LPES = 0b01 (HSRR0/1 used for 0x500)
+         *   PECE = 0b111
+         *   DPFD = 4
+         *
+         * Other bits untouched for now
+         */
+        mfspr   r3,SPRN_LPCR
+        ori     r3,r3,(LPCR_LPES0|LPCR_LPES1)
+        xori    r3,r3, LPCR_LPES0
+        ori     r3,r3,(LPCR_PECE0|LPCR_PECE1|LPCR_PECE2)
+        li      r5,7
+        sldi    r5,r5,LPCR_DPFD_SH
+        andc    r3,r3,r5
+        li      r5,4
+        sldi    r5,r5,LPCR_DPFD_SH
+        or      r3,r3,r5
+        mtspr   SPRN_LPCR,r3
+        isync
+        blr
+
+__init_TLB:
+        /* Clear the TLB */
+        li      r6,128
+        mtctr   r6
+        li      r7,0xc00        /* IS field = 0b11 */
+        ptesync
+2:      tlbiel  r7
+        addi    r7,r7,0x1000
+        bdnz    2b
+        ptesync
+1:      blr
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index b9602ee06deb..34d2722b9451 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -62,10 +62,12 @@ extern void __setup_cpu_745x(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_ppc970MP(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_pa6t(unsigned long offset, struct cpu_spec* spec);
+extern void __setup_cpu_a2(unsigned long offset, struct cpu_spec* spec);
 extern void __restore_cpu_pa6t(void);
 extern void __restore_cpu_ppc970(void);
 extern void __setup_cpu_power7(unsigned long offset, struct cpu_spec* spec);
 extern void __restore_cpu_power7(void);
+extern void __restore_cpu_a2(void);
 #endif /* CONFIG_PPC64 */
 #if defined(CONFIG_E500)
 extern void __setup_cpu_e5500(unsigned long offset, struct cpu_spec* spec);
@@ -199,7 +201,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER4 (gp)",
                 .cpu_features           = CPU_FTRS_POWER4,
                 .cpu_user_features      = COMMON_USER_POWER4,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_POWER4,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
@@ -214,7 +216,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER4+ (gq)",
                 .cpu_features           = CPU_FTRS_POWER4,
                 .cpu_user_features      = COMMON_USER_POWER4,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_POWER4,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
@@ -230,7 +232,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_features           = CPU_FTRS_PPC970,
                 .cpu_user_features      = COMMON_USER_POWER4 |
                         PPC_FEATURE_HAS_ALTIVEC_COMP,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_PPC970,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
@@ -248,7 +250,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_features           = CPU_FTRS_PPC970,
                 .cpu_user_features      = COMMON_USER_POWER4 |
                         PPC_FEATURE_HAS_ALTIVEC_COMP,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_PPC970,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
@@ -284,7 +286,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_features           = CPU_FTRS_PPC970,
                 .cpu_user_features      = COMMON_USER_POWER4 |
                         PPC_FEATURE_HAS_ALTIVEC_COMP,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_PPC970,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
@@ -302,7 +304,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_features           = CPU_FTRS_PPC970,
                 .cpu_user_features      = COMMON_USER_POWER4 |
                         PPC_FEATURE_HAS_ALTIVEC_COMP,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_PPC970,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 8,
@@ -318,7 +320,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER5 (gr)",
                 .cpu_features           = CPU_FTRS_POWER5,
                 .cpu_user_features      = COMMON_USER_POWER5,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_POWER5,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
@@ -338,7 +340,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER5+ (gs)",
                 .cpu_features           = CPU_FTRS_POWER5,
                 .cpu_user_features      = COMMON_USER_POWER5_PLUS,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_POWER5,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
@@ -354,7 +356,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER5+ (gs)",
                 .cpu_features           = CPU_FTRS_POWER5,
                 .cpu_user_features      = COMMON_USER_POWER5_PLUS,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_POWER5,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
@@ -371,7 +373,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER5+",
                 .cpu_features           = CPU_FTRS_POWER5,
                 .cpu_user_features      = COMMON_USER_POWER5_PLUS,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_POWER5,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .oprofile_cpu_type      = "ppc64/ibm-compat-v1",
@@ -385,7 +387,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_features           = CPU_FTRS_POWER6,
                 .cpu_user_features      = COMMON_USER_POWER6 |
                         PPC_FEATURE_POWER6_EXT,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_POWER6,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
@@ -404,7 +406,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER6 (architected)",
                 .cpu_features           = CPU_FTRS_POWER6,
                 .cpu_user_features      = COMMON_USER_POWER6,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_POWER6,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .oprofile_cpu_type      = "ppc64/ibm-compat-v1",
@@ -417,12 +419,13 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER7 (architected)",
                 .cpu_features           = CPU_FTRS_POWER7,
                 .cpu_user_features      = COMMON_USER_POWER7,
-                .mmu_features           = MMU_FTR_HPTE_TABLE |
-                        MMU_FTR_TLBIE_206,
+                .mmu_features           = MMU_FTRS_POWER7,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .oprofile_type          = PPC_OPROFILE_POWER4,
                 .oprofile_cpu_type      = "ppc64/ibm-compat-v1",
+                .cpu_setup              = __setup_cpu_power7,
+                .cpu_restore            = __restore_cpu_power7,
                 .platform               = "power7",
         },
         {       /* Power7 */
@@ -431,14 +434,15 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER7 (raw)",
                 .cpu_features           = CPU_FTRS_POWER7,
                 .cpu_user_features      = COMMON_USER_POWER7,
-                .mmu_features           = MMU_FTR_HPTE_TABLE |
-                        MMU_FTR_TLBIE_206,
+                .mmu_features           = MMU_FTRS_POWER7,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
                 .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/power7",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
+                .cpu_setup              = __setup_cpu_power7,
+                .cpu_restore            = __restore_cpu_power7,
                 .platform               = "power7",
         },
         {       /* Power7+ */
@@ -447,14 +451,15 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER7+ (raw)",
                 .cpu_features           = CPU_FTRS_POWER7,
                 .cpu_user_features      = COMMON_USER_POWER7,
-                .mmu_features           = MMU_FTR_HPTE_TABLE |
-                        MMU_FTR_TLBIE_206,
+                .mmu_features           = MMU_FTRS_POWER7,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
                 .pmc_type               = PPC_PMC_IBM,
                 .oprofile_cpu_type      = "ppc64/power7",
                 .oprofile_type          = PPC_OPROFILE_POWER4,
+                .cpu_setup              = __setup_cpu_power7,
+                .cpu_restore            = __restore_cpu_power7,
                 .platform               = "power7+",
         },
         {       /* Cell Broadband Engine */
@@ -465,7 +470,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64 |
                         PPC_FEATURE_CELL | PPC_FEATURE_HAS_ALTIVEC_COMP |
                         PPC_FEATURE_SMT,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_CELL,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 4,
@@ -480,7 +485,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "PA6T",
                 .cpu_features           = CPU_FTRS_PA6T,
                 .cpu_user_features      = COMMON_USER_PA6T,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_PA6T,
                 .icache_bsize           = 64,
                 .dcache_bsize           = 64,
                 .num_pmcs               = 6,
@@ -497,7 +502,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .cpu_name               = "POWER4 (compatible)",
                 .cpu_features           = CPU_FTRS_COMPATIBLE,
                 .cpu_user_features      = COMMON_USER_PPC64,
-                .mmu_features           = MMU_FTR_HPTE_TABLE,
+                .mmu_features           = MMU_FTRS_DEFAULT_HPTE_ARCH_V2,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .num_pmcs               = 6,
@@ -2005,7 +2010,22 @@ static struct cpu_spec __initdata cpu_specs[] = {
 #endif /* CONFIG_PPC32 */
 #endif /* CONFIG_E500 */
 
-#ifdef CONFIG_PPC_BOOK3E_64
+#ifdef CONFIG_PPC_A2
+        {       /* Standard A2 (>= DD2) + FPU core */
+                .pvr_mask               = 0xffff0000,
+                .pvr_value              = 0x00480000,
+                .cpu_name               = "A2 (>= DD2)",
+                .cpu_features           = CPU_FTRS_A2,
+                .cpu_user_features      = COMMON_USER_PPC64,
+                .mmu_features           = MMU_FTRS_A2,
+                .icache_bsize           = 64,
+                .dcache_bsize           = 64,
+                .num_pmcs               = 0,
+                .cpu_setup              = __setup_cpu_a2,
+                .cpu_restore            = __restore_cpu_a2,
+                .machine_check          = machine_check_generic,
+                .platform               = "ppca2",
+        },
         {       /* This is a default entry to get going, to be replaced by
                  * a real one at some stage
                  */
@@ -2026,7 +2046,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_generic,
                 .platform               = "power6",
         },
-#endif
+#endif /* CONFIG_PPC_A2 */
 };
 
 static struct cpu_spec the_cpu_spec;
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 5b5e1f002a8e..4e6ee944495a 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -64,9 +64,9 @@ void crash_ipi_callback(struct pt_regs *regs)
                 return;
 
         hard_irq_disable();
-        if (!cpu_isset(cpu, cpus_in_crash))
+        if (!cpumask_test_cpu(cpu, &cpus_in_crash))
                 crash_save_cpu(regs, cpu);
-        cpu_set(cpu, cpus_in_crash);
+        cpumask_set_cpu(cpu, &cpus_in_crash);
 
         /*
          * Entered via soft-reset - could be the kdump
@@ -77,8 +77,8 @@ void crash_ipi_callback(struct pt_regs *regs)
          * Tell the kexec CPU that entered via soft-reset and ready
          * to go down.
          */
-        if (cpu_isset(cpu, cpus_in_sr)) {
-                cpu_clear(cpu, cpus_in_sr);
+        if (cpumask_test_cpu(cpu, &cpus_in_sr)) {
+                cpumask_clear_cpu(cpu, &cpus_in_sr);
                 atomic_inc(&enter_on_soft_reset);
         }
 
@@ -87,7 +87,7 @@ void crash_ipi_callback(struct pt_regs *regs)
          * This barrier is needed to make sure that all CPUs are stopped.
          * If not, soft-reset will be invoked to bring other CPUs.
          */
-        while (!cpu_isset(crashing_cpu, cpus_in_crash))
+        while (!cpumask_test_cpu(crashing_cpu, &cpus_in_crash))
                 cpu_relax();
 
         if (ppc_md.kexec_cpu_down)
@@ -109,7 +109,7 @@ static void crash_soft_reset_check(int cpu)
 {
         unsigned int ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */
 
-        cpu_clear(cpu, cpus_in_sr);
+        cpumask_clear_cpu(cpu, &cpus_in_sr);
         while (atomic_read(&enter_on_soft_reset) != ncpus)
                 cpu_relax();
 }
@@ -132,7 +132,7 @@ static void crash_kexec_prepare_cpus(int cpu)
          */
         printk(KERN_EMERG "Sending IPI to other cpus...\n");
         msecs = 10000;
-        while ((cpus_weight(cpus_in_crash) < ncpus) && (--msecs > 0)) {
+        while ((cpumask_weight(&cpus_in_crash) < ncpus) && (--msecs > 0)) {
                 cpu_relax();
                 mdelay(1);
         }
@@ -144,52 +144,24 @@ static void crash_kexec_prepare_cpus(int cpu)
          * user to do soft reset such that we get all.
          * Soft-reset will be used until better mechanism is implemented.
          */
-        if (cpus_weight(cpus_in_crash) < ncpus) {
+        if (cpumask_weight(&cpus_in_crash) < ncpus) {
                 printk(KERN_EMERG "done waiting: %d cpu(s) not responding\n",
-                        ncpus - cpus_weight(cpus_in_crash));
+                        ncpus - cpumask_weight(&cpus_in_crash));
                 printk(KERN_EMERG "Activate soft-reset to stop other cpu(s)\n");
-                cpus_in_sr = CPU_MASK_NONE;
+                cpumask_clear(&cpus_in_sr);
                 atomic_set(&enter_on_soft_reset, 0);
-                while (cpus_weight(cpus_in_crash) < ncpus)
+                while (cpumask_weight(&cpus_in_crash) < ncpus)
                         cpu_relax();
         }
         /*
          * Make sure all CPUs are entered via soft-reset if the kdump is
          * invoked using soft-reset.
          */
-        if (cpu_isset(cpu, cpus_in_sr))
+        if (cpumask_test_cpu(cpu, &cpus_in_sr))
                 crash_soft_reset_check(cpu);
         /* Leave the IPI callback set */
 }
 
-/* wait for all the CPUs to hit real mode but timeout if they don't come in */
-#ifdef CONFIG_PPC_STD_MMU_64
-static void crash_kexec_wait_realmode(int cpu)
-{
-        unsigned int msecs;
-        int i;
-
-        msecs = 10000;
-        for (i=0; i < NR_CPUS && msecs > 0; i++) {
-                if (i == cpu)
-                        continue;
-
-                while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {
-                        barrier();
-                        if (!cpu_possible(i)) {
-                                break;
-                        }
-                        if (!cpu_online(i)) {
-                                break;
-                        }
-                        msecs--;
-                        mdelay(1);
-                }
-        }
-        mb();
-}
-#endif  /* CONFIG_PPC_STD_MMU_64 */
-
 /*
  * This function will be called by secondary cpus or by kexec cpu
  * if soft-reset is activated to stop some CPUs.
@@ -210,7 +182,7 @@ void crash_kexec_secondary(struct pt_regs *regs)
                          * exited using 'x'(exit and recover) or
                          * kexec_should_crash() failed for all running tasks.
                          */
-                        cpu_clear(cpu, cpus_in_sr);
+                        cpumask_clear_cpu(cpu, &cpus_in_sr);
                         local_irq_restore(flags);
                         return;
                 }
@@ -224,7 +196,7 @@ void crash_kexec_secondary(struct pt_regs *regs)
                  * then start kexec boot.
                  */
                 crash_soft_reset_check(cpu);
-                cpu_set(crashing_cpu, cpus_in_crash);
+                cpumask_set_cpu(crashing_cpu, &cpus_in_crash);
                 if (ppc_md.kexec_cpu_down)
                         ppc_md.kexec_cpu_down(1, 0);
                 machine_kexec(kexec_crash_image);
@@ -234,7 +206,6 @@ void crash_kexec_secondary(struct pt_regs *regs)
 }
 
 #else   /* ! CONFIG_SMP */
-static inline void crash_kexec_wait_realmode(int cpu) {}
 
 static void crash_kexec_prepare_cpus(int cpu)
 {
@@ -253,10 +224,40 @@ static void crash_kexec_prepare_cpus(int cpu)
 
 void crash_kexec_secondary(struct pt_regs *regs)
 {
-        cpus_in_sr = CPU_MASK_NONE;
+        cpumask_clear(&cpus_in_sr);
 }
 #endif  /* CONFIG_SMP */
 
+/* wait for all the CPUs to hit real mode but timeout if they don't come in */
+#if defined(CONFIG_SMP) && defined(CONFIG_PPC_STD_MMU_64)
+static void crash_kexec_wait_realmode(int cpu)
+{
+        unsigned int msecs;
+        int i;
+
+        msecs = 10000;
+        for (i=0; i < nr_cpu_ids && msecs > 0; i++) {
+                if (i == cpu)
+                        continue;
+
+                while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {
+                        barrier();
+                        if (!cpu_possible(i)) {
+                                break;
+                        }
+                        if (!cpu_online(i)) {
+                                break;
+                        }
+                        msecs--;
+                        mdelay(1);
+                }
+        }
+        mb();
+}
+#else
+static inline void crash_kexec_wait_realmode(int cpu) {}
+#endif  /* CONFIG_SMP && CONFIG_PPC_STD_MMU_64 */
+
 /*
  * Register a function to be called on shutdown.  Only use this if you
  * can't reset your device in the second kernel.
@@ -345,7 +346,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
         crashing_cpu = smp_processor_id();
         crash_save_cpu(regs, crashing_cpu);
         crash_kexec_prepare_cpus(crashing_cpu);
-        cpu_set(crashing_cpu, cpus_in_crash);
+        cpumask_set_cpu(crashing_cpu, &cpus_in_crash);
         crash_kexec_wait_realmode(crashing_cpu);
 
         machine_kexec_mask_interrupts();
diff --git a/arch/powerpc/kernel/dbell.c b/arch/powerpc/kernel/dbell.c
index 3307a52d797f..2cc451aaaca7 100644
--- a/arch/powerpc/kernel/dbell.c
+++ b/arch/powerpc/kernel/dbell.c
@@ -13,84 +13,35 @@
 #include <linux/kernel.h>
 #include <linux/smp.h>
 #include <linux/threads.h>
-#include <linux/percpu.h>
+#include <linux/hardirq.h>
 
 #include <asm/dbell.h>
 #include <asm/irq_regs.h>
 
 #ifdef CONFIG_SMP
-struct doorbell_cpu_info {
-        unsigned long   messages;       /* current messages bits */
-        unsigned int    tag;            /* tag value */
-};
-
-static DEFINE_PER_CPU(struct doorbell_cpu_info, doorbell_cpu_info);
-
 void doorbell_setup_this_cpu(void)
 {
-        struct doorbell_cpu_info *info = &__get_cpu_var(doorbell_cpu_info);
+        unsigned long tag = mfspr(SPRN_PIR) & 0x3fff;
 
-        info->messages = 0;
-        info->tag = mfspr(SPRN_PIR) & 0x3fff;
+        smp_muxed_ipi_set_data(smp_processor_id(), tag);
 }
 
-void doorbell_message_pass(int target, int msg)
+void doorbell_cause_ipi(int cpu, unsigned long data)
 {
-        struct doorbell_cpu_info *info;
-        int i;
-
-        if (target < NR_CPUS) {
-                info = &per_cpu(doorbell_cpu_info, target);
-                set_bit(msg, &info->messages);
-                ppc_msgsnd(PPC_DBELL, 0, info->tag);
-        }
-        else if (target == MSG_ALL_BUT_SELF) {
-                for_each_online_cpu(i) {
-                        if (i == smp_processor_id())
-                                continue;
-                        info = &per_cpu(doorbell_cpu_info, i);
-                        set_bit(msg, &info->messages);
-                        ppc_msgsnd(PPC_DBELL, 0, info->tag);
-                }
-        }
-        else { /* target == MSG_ALL */
-                for_each_online_cpu(i) {
-                        info = &per_cpu(doorbell_cpu_info, i);
-                        set_bit(msg, &info->messages);
-                }
-                ppc_msgsnd(PPC_DBELL, PPC_DBELL_MSG_BRDCAST, 0);
-        }
+        ppc_msgsnd(PPC_DBELL, 0, data);
 }
 
 void doorbell_exception(struct pt_regs *regs)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
-        struct doorbell_cpu_info *info = &__get_cpu_var(doorbell_cpu_info);
-        int msg;
 
-        /* Warning: regs can be NULL when called from irq enable */
+        irq_enter();
 
-        if (!info->messages || (num_online_cpus() < 2))
-                goto out;
+        smp_ipi_demux();
 
-        for (msg = 0; msg < 4; msg++)
-                if (test_and_clear_bit(msg, &info->messages))
-                        smp_message_recv(msg);
-
-out:
+        irq_exit();
         set_irq_regs(old_regs);
 }
-
-void doorbell_check_self(void)
-{
-        struct doorbell_cpu_info *info = &__get_cpu_var(doorbell_cpu_info);
-
-        if (!info->messages)
-                return;
-
-        ppc_msgsnd(PPC_DBELL, 0, info->tag);
-}
-
 #else /* CONFIG_SMP */
 void doorbell_exception(struct pt_regs *regs)
 {
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index d82878c4daa6..d834425186ae 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -421,6 +421,12 @@ BEGIN_FTR_SECTION
         std     r24,THREAD_VRSAVE(r3)
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_PPC64
+BEGIN_FTR_SECTION
+        mfspr   r25,SPRN_DSCR
+        std     r25,THREAD_DSCR(r3)
+END_FTR_SECTION_IFSET(CPU_FTR_DSCR)
+#endif
         and.    r0,r0,r22
         beq+    1f
         andc    r22,r22,r0
@@ -462,10 +468,10 @@ BEGIN_FTR_SECTION
   FTR_SECTION_ELSE_NESTED(95)
         clrrdi  r6,r8,40        /* get its 1T ESID */
         clrrdi  r9,r1,40        /* get current sp 1T ESID */
-  ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_1T_SEGMENT, 95)
+  ALT_MMU_FTR_SECTION_END_NESTED_IFCLR(MMU_FTR_1T_SEGMENT, 95)
 FTR_SECTION_ELSE
         b       2f
-ALT_FTR_SECTION_END_IFSET(CPU_FTR_SLB)
+ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_SLB)
         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
@@ -479,7 +485,7 @@ 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)
+END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
 
         /* Update the last bolted SLB.  No write barriers are needed
          * here, provided we only update the current CPU's SLB shadow
@@ -491,7 +497,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
         std     r7,SLBSHADOW_STACKVSID(r9)  /* Save VSID */
         std     r0,SLBSHADOW_STACKESID(r9)  /* Save ESID */
 
-        /* No need to check for CPU_FTR_NO_SLBIE_B here, since when
+        /* No need to check for MMU_FTR_NO_SLBIE_B here, since when
          * we have 1TB segments, the only CPUs known to have the errata
          * only support less than 1TB of system memory and we'll never
          * actually hit this code path.
@@ -522,6 +528,15 @@ BEGIN_FTR_SECTION
         mtspr   SPRN_VRSAVE,r0          /* if G4, restore VRSAVE reg */
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_PPC64
+BEGIN_FTR_SECTION
+        ld      r0,THREAD_DSCR(r4)
+        cmpd    r0,r25
+        beq     1f
+        mtspr   SPRN_DSCR,r0
+1:      
+END_FTR_SECTION_IFSET(CPU_FTR_DSCR)
+#endif
 
         /* r3-r13 are destroyed -- Cort */
         REST_8GPRS(14, r1)
@@ -838,7 +853,7 @@ _GLOBAL(enter_rtas)
 
 _STATIC(rtas_return_loc)
         /* relocation is off at this point */
-        mfspr   r4,SPRN_SPRG_PACA       /* Get PACA */
+        GET_PACA(r4)
         clrldi  r4,r4,2                 /* convert to realmode address */
 
         bcl     20,31,$+4
@@ -869,7 +884,7 @@ _STATIC(rtas_restore_regs)
         REST_8GPRS(14, r1)              /* Restore the non-volatiles */
         REST_10GPRS(22, r1)             /* ditto */
 
-        mfspr   r13,SPRN_SPRG_PACA
+        GET_PACA(r13)
 
         ld      r4,_CCR(r1)
         mtcr    r4
diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
index 9651acc3504a..d24d4400cc79 100644
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -17,6 +17,7 @@
 #include <asm/cputable.h>
 #include <asm/setup.h>
 #include <asm/thread_info.h>
+#include <asm/reg_a2.h>
 #include <asm/exception-64e.h>
 #include <asm/bug.h>
 #include <asm/irqflags.h>
@@ -252,9 +253,6 @@ exception_marker:
         .balign 0x1000
         .globl interrupt_base_book3e
 interrupt_base_book3e:                                  /* fake trap */
-        /* Note: If real debug exceptions are supported by the HW, the vector
-         * below will have to be patched up to point to an appropriate handler
-         */
         EXCEPTION_STUB(0x000, machine_check)            /* 0x0200 */
         EXCEPTION_STUB(0x020, critical_input)           /* 0x0580 */
         EXCEPTION_STUB(0x040, debug_crit)               /* 0x0d00 */
@@ -271,8 +269,13 @@ interrupt_base_book3e:					/* fake trap */
         EXCEPTION_STUB(0x1a0, watchdog)                 /* 0x09f0 */
         EXCEPTION_STUB(0x1c0, data_tlb_miss)
         EXCEPTION_STUB(0x1e0, instruction_tlb_miss)
+        EXCEPTION_STUB(0x260, perfmon)
         EXCEPTION_STUB(0x280, doorbell)
         EXCEPTION_STUB(0x2a0, doorbell_crit)
+        EXCEPTION_STUB(0x2c0, guest_doorbell)
+        EXCEPTION_STUB(0x2e0, guest_doorbell_crit)
+        EXCEPTION_STUB(0x300, hypercall)
+        EXCEPTION_STUB(0x320, ehpriv)
 
         .globl interrupt_end_book3e
 interrupt_end_book3e:
@@ -454,6 +457,70 @@ interrupt_end_book3e:
 kernel_dbg_exc:
         b       .       /* NYI */
 
+/* Debug exception as a debug interrupt*/
+        START_EXCEPTION(debug_debug);
+        DBG_EXCEPTION_PROLOG(0xd00, PROLOG_ADDITION_2REGS)
+
+        /*
+         * If there is a single step or branch-taken exception in an
+         * exception entry sequence, it was probably meant to apply to
+         * the code where the exception occurred (since exception entry
+         * doesn't turn off DE automatically).  We simulate the effect
+         * of turning off DE on entry to an exception handler by turning
+         * off DE in the DSRR1 value and clearing the debug status.
+         */
+
+        mfspr   r14,SPRN_DBSR           /* check single-step/branch taken */
+        andis.  r15,r14,DBSR_IC@h
+        beq+    1f
+
+        LOAD_REG_IMMEDIATE(r14,interrupt_base_book3e)
+        LOAD_REG_IMMEDIATE(r15,interrupt_end_book3e)
+        cmpld   cr0,r10,r14
+        cmpld   cr1,r10,r15
+        blt+    cr0,1f
+        bge+    cr1,1f
+
+        /* here it looks like we got an inappropriate debug exception. */
+        lis     r14,DBSR_IC@h           /* clear the IC event */
+        rlwinm  r11,r11,0,~MSR_DE       /* clear DE in the DSRR1 value */
+        mtspr   SPRN_DBSR,r14
+        mtspr   SPRN_DSRR1,r11
+        lwz     r10,PACA_EXDBG+EX_CR(r13)       /* restore registers */
+        ld      r1,PACA_EXDBG+EX_R1(r13)
+        ld      r14,PACA_EXDBG+EX_R14(r13)
+        ld      r15,PACA_EXDBG+EX_R15(r13)
+        mtcr    r10
+        ld      r10,PACA_EXDBG+EX_R10(r13)      /* restore registers */
+        ld      r11,PACA_EXDBG+EX_R11(r13)
+        mfspr   r13,SPRN_SPRG_DBG_SCRATCH
+        rfdi
+
+        /* Normal debug exception */
+        /* XXX We only handle coming from userspace for now since we can't
+         *     quite save properly an interrupted kernel state yet
+         */
+1:      andi.   r14,r11,MSR_PR;         /* check for userspace again */
+        beq     kernel_dbg_exc;         /* if from kernel mode */
+
+        /* Now we mash up things to make it look like we are coming on a
+         * normal exception
+         */
+        mfspr   r15,SPRN_SPRG_DBG_SCRATCH
+        mtspr   SPRN_SPRG_GEN_SCRATCH,r15
+        mfspr   r14,SPRN_DBSR
+        EXCEPTION_COMMON(0xd00, PACA_EXDBG, INTS_DISABLE_ALL)
+        std     r14,_DSISR(r1)
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        mr      r4,r14
+        ld      r14,PACA_EXDBG+EX_R14(r13)
+        ld      r15,PACA_EXDBG+EX_R15(r13)
+        bl      .save_nvgprs
+        bl      .DebugException
+        b       .ret_from_except
+
+        MASKABLE_EXCEPTION(0x260, perfmon, .performance_monitor_exception, ACK_NONE)
+
 /* Doorbell interrupt */
         MASKABLE_EXCEPTION(0x2070, doorbell, .doorbell_exception, ACK_NONE)
 
@@ -468,6 +535,11 @@ kernel_dbg_exc:
 //      b       ret_from_crit_except
         b       .
 
+        MASKABLE_EXCEPTION(0x2c0, guest_doorbell, .unknown_exception, ACK_NONE)
+        MASKABLE_EXCEPTION(0x2e0, guest_doorbell_crit, .unknown_exception, ACK_NONE)
+        MASKABLE_EXCEPTION(0x310, hypercall, .unknown_exception, ACK_NONE)
+        MASKABLE_EXCEPTION(0x320, ehpriv, .unknown_exception, ACK_NONE)
+
 
 /*
  * An interrupt came in while soft-disabled; clear EE in SRR1,
@@ -587,7 +659,12 @@ fast_exception_return:
 BAD_STACK_TRAMPOLINE(0x000)
 BAD_STACK_TRAMPOLINE(0x100)
 BAD_STACK_TRAMPOLINE(0x200)
+BAD_STACK_TRAMPOLINE(0x260)
+BAD_STACK_TRAMPOLINE(0x2c0)
+BAD_STACK_TRAMPOLINE(0x2e0)
 BAD_STACK_TRAMPOLINE(0x300)
+BAD_STACK_TRAMPOLINE(0x310)
+BAD_STACK_TRAMPOLINE(0x320)
 BAD_STACK_TRAMPOLINE(0x400)
 BAD_STACK_TRAMPOLINE(0x500)
 BAD_STACK_TRAMPOLINE(0x600)
@@ -864,8 +941,23 @@ have_hes:
          * that will have to be made dependent on whether we are running under
          * a hypervisor I suppose.
          */
-        ori     r3,r3,MAS0_HES | MAS0_WQ_ALLWAYS
-        mtspr   SPRN_MAS0,r3
+
+        /* BEWARE, MAGIC
+         * This code is called as an ordinary function on the boot CPU. But to
+         * avoid duplication, this code is also used in SCOM bringup of
+         * secondary CPUs. We read the code between the initial_tlb_code_start
+         * and initial_tlb_code_end labels one instruction at a time and RAM it
+         * into the new core via SCOM. That doesn't process branches, so there
+         * must be none between those two labels. It also means if this code
+         * ever takes any parameters, the SCOM code must also be updated to
+         * provide them.
+         */
+        .globl a2_tlbinit_code_start
+a2_tlbinit_code_start:
+
+        ori     r11,r3,MAS0_WQ_ALLWAYS
+        oris    r11,r11,MAS0_ESEL(3)@h /* Use way 3: workaround A2 erratum 376 */
+        mtspr   SPRN_MAS0,r11
         lis     r3,(MAS1_VALID | MAS1_IPROT)@h
         ori     r3,r3,BOOK3E_PAGESZ_1GB << MAS1_TSIZE_SHIFT
         mtspr   SPRN_MAS1,r3
@@ -879,18 +971,86 @@ have_hes:
         /* Write the TLB entry */
         tlbwe
 
+        .globl a2_tlbinit_after_linear_map
+a2_tlbinit_after_linear_map:
+
         /* Now we branch the new virtual address mapped by this entry */
         LOAD_REG_IMMEDIATE(r3,1f)
         mtctr   r3
         bctr
 
 1:      /* We are now running at PAGE_OFFSET, clean the TLB of everything
-         * else (XXX we should scan for bolted crap from the firmware too)
+         * else (including IPROTed things left by firmware)
+         * r4 = TLBnCFG
+         * r3 = current address (more or less)
          */
+
+        li      r5,0
+        mtspr   SPRN_MAS6,r5
+        tlbsx   0,r3
+
+        rlwinm  r9,r4,0,TLBnCFG_N_ENTRY
+        rlwinm  r10,r4,8,0xff
+        addi    r10,r10,-1      /* Get inner loop mask */
+
+        li      r3,1
+
+        mfspr   r5,SPRN_MAS1
+        rlwinm  r5,r5,0,(~(MAS1_VALID|MAS1_IPROT))
+
+        mfspr   r6,SPRN_MAS2
+        rldicr  r6,r6,0,51              /* Extract EPN */
+
+        mfspr   r7,SPRN_MAS0
+        rlwinm  r7,r7,0,0xffff0fff      /* Clear HES and WQ */
+
+        rlwinm  r8,r7,16,0xfff          /* Extract ESEL */
+
+2:      add     r4,r3,r8
+        and     r4,r4,r10
+
+        rlwimi  r7,r4,16,MAS0_ESEL_MASK
+
+        mtspr   SPRN_MAS0,r7
+        mtspr   SPRN_MAS1,r5
+        mtspr   SPRN_MAS2,r6
+        tlbwe
+
+        addi    r3,r3,1
+        and.    r4,r3,r10
+
+        bne     3f
+        addis   r6,r6,(1<<30)@h
+3:
+        cmpw    r3,r9
+        blt     2b
+
+        .globl  a2_tlbinit_after_iprot_flush
+a2_tlbinit_after_iprot_flush:
+
+#ifdef CONFIG_PPC_EARLY_DEBUG_WSP
+        /* Now establish early debug mappings if applicable */
+        /* Restore the MAS0 we used for linear mapping load */
+        mtspr   SPRN_MAS0,r11
+
+        lis     r3,(MAS1_VALID | MAS1_IPROT)@h
+        ori     r3,r3,(BOOK3E_PAGESZ_4K << MAS1_TSIZE_SHIFT)
+        mtspr   SPRN_MAS1,r3
+        LOAD_REG_IMMEDIATE(r3, WSP_UART_VIRT | MAS2_I | MAS2_G)
+        mtspr   SPRN_MAS2,r3
+        LOAD_REG_IMMEDIATE(r3, WSP_UART_PHYS | MAS3_SR | MAS3_SW)
+        mtspr   SPRN_MAS7_MAS3,r3
+        /* re-use the MAS8 value from the linear mapping */
+        tlbwe
+#endif /* CONFIG_PPC_EARLY_DEBUG_WSP */
+
         PPC_TLBILX(0,0,0)
         sync
         isync
 
+        .globl a2_tlbinit_code_end
+a2_tlbinit_code_end:
+
         /* We translate LR and return */
         mflr    r3
         tovirt(r3,r3)
@@ -1040,3 +1200,33 @@ _GLOBAL(__setup_base_ivors)
         sync
 
         blr
+
+_GLOBAL(setup_perfmon_ivor)
+        SET_IVOR(35, 0x260) /* Performance Monitor */
+        blr
+
+_GLOBAL(setup_doorbell_ivors)
+        SET_IVOR(36, 0x280) /* Processor Doorbell */
+        SET_IVOR(37, 0x2a0) /* Processor Doorbell Crit */
+
+        /* Check MMUCFG[LPIDSIZE] to determine if we have category E.HV */
+        mfspr   r10,SPRN_MMUCFG
+        rlwinm. r10,r10,0,MMUCFG_LPIDSIZE
+        beqlr
+
+        SET_IVOR(38, 0x2c0) /* Guest Processor Doorbell */
+        SET_IVOR(39, 0x2e0) /* Guest Processor Doorbell Crit/MC */
+        blr
+
+_GLOBAL(setup_ehv_ivors)
+        /*
+         * We may be running as a guest and lack E.HV even on a chip
+         * that normally has it.
+         */
+        mfspr   r10,SPRN_MMUCFG
+        rlwinm. r10,r10,0,MMUCFG_LPIDSIZE
+        beqlr
+
+        SET_IVOR(40, 0x300) /* Embedded Hypervisor System Call */
+        SET_IVOR(41, 0x320) /* Embedded Hypervisor Privilege */
+        blr
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index aeb739e18769..a85f4874cba7 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -37,23 +37,51 @@
         .globl __start_interrupts
 __start_interrupts:
 
-        STD_EXCEPTION_PSERIES(0x100, system_reset)
+        .globl system_reset_pSeries;
+system_reset_pSeries:
+        HMT_MEDIUM;
+        DO_KVM  0x100;
+        SET_SCRATCH0(r13)
+#ifdef CONFIG_PPC_P7_NAP
+BEGIN_FTR_SECTION
+        /* Running native on arch 2.06 or later, check if we are
+         * waking up from nap. We only handle no state loss and
+         * supervisor state loss. We do -not- handle hypervisor
+         * state loss at this time.
+         */
+        mfspr   r13,SPRN_SRR1
+        rlwinm  r13,r13,47-31,30,31
+        cmpwi   cr0,r13,1
+        bne     1f
+        b       .power7_wakeup_noloss
+1:      cmpwi   cr0,r13,2
+        bne     1f
+        b       .power7_wakeup_loss
+        /* Total loss of HV state is fatal, we could try to use the
+         * PIR to locate a PACA, then use an emergency stack etc...
+         * but for now, let's just stay stuck here
+         */
+1:      cmpwi   cr0,r13,3
+        beq     .
+END_FTR_SECTION_IFSET(CPU_FTR_HVMODE_206)
+#endif /* CONFIG_PPC_P7_NAP */
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common, EXC_STD)
 
         . = 0x200
 _machine_check_pSeries:
         HMT_MEDIUM
         DO_KVM  0x200
-        mtspr   SPRN_SPRG_SCRATCH0,r13          /* save r13 */
-        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
+        SET_SCRATCH0(r13)
+        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common, EXC_STD)
 
         . = 0x300
         .globl data_access_pSeries
 data_access_pSeries:
         HMT_MEDIUM
         DO_KVM  0x300
-        mtspr   SPRN_SPRG_SCRATCH0,r13
+        SET_SCRATCH0(r13)
 BEGIN_FTR_SECTION
-        mfspr   r13,SPRN_SPRG_PACA
+        GET_PACA(r13)
         std     r9,PACA_EXSLB+EX_R9(r13)
         std     r10,PACA_EXSLB+EX_R10(r13)
         mfspr   r10,SPRN_DAR
@@ -67,22 +95,22 @@ BEGIN_FTR_SECTION
         std     r11,PACA_EXGEN+EX_R11(r13)
         ld      r11,PACA_EXSLB+EX_R9(r13)
         std     r12,PACA_EXGEN+EX_R12(r13)
-        mfspr   r12,SPRN_SPRG_SCRATCH0
+        GET_SCRATCH0(r12)
         std     r10,PACA_EXGEN+EX_R10(r13)
         std     r11,PACA_EXGEN+EX_R9(r13)
         std     r12,PACA_EXGEN+EX_R13(r13)
-        EXCEPTION_PROLOG_PSERIES_1(data_access_common)
+        EXCEPTION_PROLOG_PSERIES_1(data_access_common, EXC_STD)
 FTR_SECTION_ELSE
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, data_access_common)
-ALT_FTR_SECTION_END_IFCLR(CPU_FTR_SLB)
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, data_access_common, EXC_STD)
+ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_SLB)
 
         . = 0x380
         .globl data_access_slb_pSeries
 data_access_slb_pSeries:
         HMT_MEDIUM
         DO_KVM  0x380
-        mtspr   SPRN_SPRG_SCRATCH0,r13
-        mfspr   r13,SPRN_SPRG_PACA              /* get paca address into r13 */
+        SET_SCRATCH0(r13)
+        GET_PACA(r13)
         std     r3,PACA_EXSLB+EX_R3(r13)
         mfspr   r3,SPRN_DAR
         std     r9,PACA_EXSLB+EX_R9(r13)        /* save r9 - r12 */
@@ -95,7 +123,7 @@ data_access_slb_pSeries:
         std     r10,PACA_EXSLB+EX_R10(r13)
         std     r11,PACA_EXSLB+EX_R11(r13)
         std     r12,PACA_EXSLB+EX_R12(r13)
-        mfspr   r10,SPRN_SPRG_SCRATCH0
+        GET_SCRATCH0(r10)
         std     r10,PACA_EXSLB+EX_R13(r13)
         mfspr   r12,SPRN_SRR1           /* and SRR1 */
 #ifndef CONFIG_RELOCATABLE
@@ -113,15 +141,15 @@ data_access_slb_pSeries:
         bctr
 #endif
 
-        STD_EXCEPTION_PSERIES(0x400, instruction_access)
+        STD_EXCEPTION_PSERIES(0x400, 0x400, instruction_access)
 
         . = 0x480
         .globl instruction_access_slb_pSeries
 instruction_access_slb_pSeries:
         HMT_MEDIUM
         DO_KVM  0x480
-        mtspr   SPRN_SPRG_SCRATCH0,r13
-        mfspr   r13,SPRN_SPRG_PACA              /* get paca address into r13 */
+        SET_SCRATCH0(r13)
+        GET_PACA(r13)
         std     r3,PACA_EXSLB+EX_R3(r13)
         mfspr   r3,SPRN_SRR0            /* SRR0 is faulting address */
         std     r9,PACA_EXSLB+EX_R9(r13)        /* save r9 - r12 */
@@ -134,7 +162,7 @@ instruction_access_slb_pSeries:
         std     r10,PACA_EXSLB+EX_R10(r13)
         std     r11,PACA_EXSLB+EX_R11(r13)
         std     r12,PACA_EXSLB+EX_R12(r13)
-        mfspr   r10,SPRN_SPRG_SCRATCH0
+        GET_SCRATCH0(r10)
         std     r10,PACA_EXSLB+EX_R13(r13)
         mfspr   r12,SPRN_SRR1           /* and SRR1 */
 #ifndef CONFIG_RELOCATABLE
@@ -147,13 +175,29 @@ instruction_access_slb_pSeries:
         bctr
 #endif
 
-        MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt)
-        STD_EXCEPTION_PSERIES(0x600, alignment)
-        STD_EXCEPTION_PSERIES(0x700, program_check)
-        STD_EXCEPTION_PSERIES(0x800, fp_unavailable)
-        MASKABLE_EXCEPTION_PSERIES(0x900, decrementer)
-        STD_EXCEPTION_PSERIES(0xa00, trap_0a)
-        STD_EXCEPTION_PSERIES(0xb00, trap_0b)
+        /* We open code these as we can't have a ". = x" (even with
+         * x = "." within a feature section
+         */
+        . = 0x500;
+        .globl hardware_interrupt_pSeries;
+        .globl hardware_interrupt_hv;
+hardware_interrupt_pSeries:
+hardware_interrupt_hv:
+        BEGIN_FTR_SECTION
+                _MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt, EXC_STD)
+        FTR_SECTION_ELSE
+                _MASKABLE_EXCEPTION_PSERIES(0x502, hardware_interrupt, EXC_HV)
+        ALT_FTR_SECTION_END_IFCLR(CPU_FTR_HVMODE_206)
+
+        STD_EXCEPTION_PSERIES(0x600, 0x600, alignment)
+        STD_EXCEPTION_PSERIES(0x700, 0x700, program_check)
+        STD_EXCEPTION_PSERIES(0x800, 0x800, fp_unavailable)
+
+        MASKABLE_EXCEPTION_PSERIES(0x900, 0x900, decrementer)
+        MASKABLE_EXCEPTION_HV(0x980, 0x980, decrementer)
+
+        STD_EXCEPTION_PSERIES(0xa00, 0xa00, trap_0a)
+        STD_EXCEPTION_PSERIES(0xb00, 0xb00, trap_0b)
 
         . = 0xc00
         .globl  system_call_pSeries
@@ -165,13 +209,13 @@ BEGIN_FTR_SECTION
         beq-    1f
 END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
         mr      r9,r13
-        mfspr   r13,SPRN_SPRG_PACA
+        GET_PACA(r13)
         mfspr   r11,SPRN_SRR0
-        ld      r12,PACAKBASE(r13)
-        ld      r10,PACAKMSR(r13)
-        LOAD_HANDLER(r12, system_call_entry)
-        mtspr   SPRN_SRR0,r12
         mfspr   r12,SPRN_SRR1
+        ld      r10,PACAKBASE(r13)
+        LOAD_HANDLER(r10, system_call_entry)
+        mtspr   SPRN_SRR0,r10
+        ld      r10,PACAKMSR(r13)
         mtspr   SPRN_SRR1,r10
         rfid
         b       .       /* prevent speculative execution */
@@ -183,8 +227,21 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
         rfid            /* return to userspace */
         b       .
 
-        STD_EXCEPTION_PSERIES(0xd00, single_step)
-        STD_EXCEPTION_PSERIES(0xe00, trap_0e)
+        STD_EXCEPTION_PSERIES(0xd00, 0xd00, single_step)
+
+        /* At 0xe??? we have a bunch of hypervisor exceptions, we branch
+         * out of line to handle them
+         */
+        . = 0xe00
+        b       h_data_storage_hv
+        . = 0xe20
+        b       h_instr_storage_hv
+        . = 0xe40
+        b       emulation_assist_hv
+        . = 0xe50
+        b       hmi_exception_hv
+        . = 0xe60
+        b       hmi_exception_hv
 
         /* We need to deal with the Altivec unavailable exception
          * here which is at 0xf20, thus in the middle of the
@@ -193,39 +250,42 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
          */
 performance_monitor_pSeries_1:
         . = 0xf00
-        DO_KVM  0xf00
         b       performance_monitor_pSeries
 
 altivec_unavailable_pSeries_1:
         . = 0xf20
-        DO_KVM  0xf20
         b       altivec_unavailable_pSeries
 
 vsx_unavailable_pSeries_1:
         . = 0xf40
-        DO_KVM  0xf40
         b       vsx_unavailable_pSeries
 
 #ifdef CONFIG_CBE_RAS
-        HSTD_EXCEPTION_PSERIES(0x1200, cbe_system_error)
+        STD_EXCEPTION_HV(0x1200, 0x1202, cbe_system_error)
 #endif /* CONFIG_CBE_RAS */
-        STD_EXCEPTION_PSERIES(0x1300, instruction_breakpoint)
+        STD_EXCEPTION_PSERIES(0x1300, 0x1300, instruction_breakpoint)
 #ifdef CONFIG_CBE_RAS
-        HSTD_EXCEPTION_PSERIES(0x1600, cbe_maintenance)
+        STD_EXCEPTION_HV(0x1600, 0x1602, cbe_maintenance)
 #endif /* CONFIG_CBE_RAS */
-        STD_EXCEPTION_PSERIES(0x1700, altivec_assist)
+        STD_EXCEPTION_PSERIES(0x1700, 0x1700, altivec_assist)
 #ifdef CONFIG_CBE_RAS
-        HSTD_EXCEPTION_PSERIES(0x1800, cbe_thermal)
+        STD_EXCEPTION_HV(0x1800, 0x1802, cbe_thermal)
 #endif /* CONFIG_CBE_RAS */
 
         . = 0x3000
 
-/*** pSeries interrupt support ***/
+/*** Out of line interrupts support ***/
+
+        /* moved from 0xe00 */
+        STD_EXCEPTION_HV(., 0xe00, h_data_storage)
+        STD_EXCEPTION_HV(., 0xe20, h_instr_storage)
+        STD_EXCEPTION_HV(., 0xe40, emulation_assist)
+        STD_EXCEPTION_HV(., 0xe60, hmi_exception) /* need to flush cache ? */
 
         /* moved from 0xf00 */
-        STD_EXCEPTION_PSERIES(., performance_monitor)
-        STD_EXCEPTION_PSERIES(., altivec_unavailable)
-        STD_EXCEPTION_PSERIES(., vsx_unavailable)
+        STD_EXCEPTION_PSERIES(., 0xf00, performance_monitor)
+        STD_EXCEPTION_PSERIES(., 0xf20, altivec_unavailable)
+        STD_EXCEPTION_PSERIES(., 0xf40, vsx_unavailable)
 
 /*
  * An interrupt came in while soft-disabled; clear EE in SRR1,
@@ -240,17 +300,30 @@ masked_interrupt:
         rotldi  r10,r10,16
         mtspr   SPRN_SRR1,r10
         ld      r10,PACA_EXGEN+EX_R10(r13)
-        mfspr   r13,SPRN_SPRG_SCRATCH0
+        GET_SCRATCH0(r13)
         rfid
         b       .
 
+masked_Hinterrupt:
+        stb     r10,PACAHARDIRQEN(r13)
+        mtcrf   0x80,r9
+        ld      r9,PACA_EXGEN+EX_R9(r13)
+        mfspr   r10,SPRN_HSRR1
+        rldicl  r10,r10,48,1            /* clear MSR_EE */
+        rotldi  r10,r10,16
+        mtspr   SPRN_HSRR1,r10
+        ld      r10,PACA_EXGEN+EX_R10(r13)
+        GET_SCRATCH0(r13)
+        hrfid
+        b       .
+
         .align  7
 do_stab_bolted_pSeries:
         std     r11,PACA_EXSLB+EX_R11(r13)
         std     r12,PACA_EXSLB+EX_R12(r13)
-        mfspr   r10,SPRN_SPRG_SCRATCH0
+        GET_SCRATCH0(r10)
         std     r10,PACA_EXSLB+EX_R13(r13)
-        EXCEPTION_PROLOG_PSERIES_1(.do_stab_bolted)
+        EXCEPTION_PROLOG_PSERIES_1(.do_stab_bolted, EXC_STD)
 
 #ifdef CONFIG_PPC_PSERIES
 /*
@@ -260,15 +333,15 @@ do_stab_bolted_pSeries:
       .align 7
 system_reset_fwnmi:
         HMT_MEDIUM
-        mtspr   SPRN_SPRG_SCRATCH0,r13          /* save r13 */
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common)
+        SET_SCRATCH0(r13)               /* save r13 */
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common, EXC_STD)
 
         .globl machine_check_fwnmi
       .align 7
 machine_check_fwnmi:
         HMT_MEDIUM
-        mtspr   SPRN_SPRG_SCRATCH0,r13          /* save r13 */
-        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
+        SET_SCRATCH0(r13)               /* save r13 */
+        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common, EXC_STD)
 
 #endif /* CONFIG_PPC_PSERIES */
 
@@ -282,7 +355,7 @@ slb_miss_user_pseries:
         std     r10,PACA_EXGEN+EX_R10(r13)
         std     r11,PACA_EXGEN+EX_R11(r13)
         std     r12,PACA_EXGEN+EX_R12(r13)
-        mfspr   r10,SPRG_SCRATCH0
+        GET_SCRATCH0(r10)
         ld      r11,PACA_EXSLB+EX_R9(r13)
         ld      r12,PACA_EXSLB+EX_R3(r13)
         std     r10,PACA_EXGEN+EX_R13(r13)
@@ -342,6 +415,8 @@ machine_check_common:
         STD_EXCEPTION_COMMON(0xb00, trap_0b, .unknown_exception)
         STD_EXCEPTION_COMMON(0xd00, single_step, .single_step_exception)
         STD_EXCEPTION_COMMON(0xe00, trap_0e, .unknown_exception)
+        STD_EXCEPTION_COMMON(0xe40, emulation_assist, .program_check_exception)
+        STD_EXCEPTION_COMMON(0xe60, hmi_exception, .unknown_exception)
         STD_EXCEPTION_COMMON_IDLE(0xf00, performance_monitor, .performance_monitor_exception)
         STD_EXCEPTION_COMMON(0x1300, instruction_breakpoint, .instruction_breakpoint_exception)
 #ifdef CONFIG_ALTIVEC
@@ -386,9 +461,24 @@ bad_stack:
         std     r12,_XER(r1)
         SAVE_GPR(0,r1)
         SAVE_GPR(2,r1)
-        SAVE_4GPRS(3,r1)
-        SAVE_2GPRS(7,r1)
-        SAVE_10GPRS(12,r1)
+        ld      r10,EX_R3(r3)
+        std     r10,GPR3(r1)
+        SAVE_GPR(4,r1)
+        SAVE_4GPRS(5,r1)
+        ld      r9,EX_R9(r3)
+        ld      r10,EX_R10(r3)
+        SAVE_2GPRS(9,r1)
+        ld      r9,EX_R11(r3)
+        ld      r10,EX_R12(r3)
+        ld      r11,EX_R13(r3)
+        std     r9,GPR11(r1)
+        std     r10,GPR12(r1)
+        std     r11,GPR13(r1)
+BEGIN_FTR_SECTION
+        ld      r10,EX_CFAR(r3)
+        std     r10,ORIG_GPR3(r1)
+END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
+        SAVE_8GPRS(14,r1)
         SAVE_10GPRS(22,r1)
         lhz     r12,PACA_TRAP_SAVE(r13)
         std     r12,_TRAP(r1)
@@ -397,6 +487,9 @@ bad_stack:
         li      r12,0
         std     r12,0(r11)
         ld      r2,PACATOC(r13)
+        ld      r11,exception_marker@toc(r2)
+        std     r12,RESULT(r1)
+        std     r11,STACK_FRAME_OVERHEAD-16(r1)
 1:      addi    r3,r1,STACK_FRAME_OVERHEAD
         bl      .kernel_bad_stack
         b       1b
@@ -419,6 +512,19 @@ data_access_common:
         li      r5,0x300
         b       .do_hash_page           /* Try to handle as hpte fault */
 
+        .align  7
+        .globl  h_data_storage_common
+h_data_storage_common:
+        mfspr   r10,SPRN_HDAR
+        std     r10,PACA_EXGEN+EX_DAR(r13)
+        mfspr   r10,SPRN_HDSISR
+        stw     r10,PACA_EXGEN+EX_DSISR(r13)
+        EXCEPTION_PROLOG_COMMON(0xe00, PACA_EXGEN)
+        bl      .save_nvgprs
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .unknown_exception
+        b       .ret_from_except
+
         .align  7
         .globl instruction_access_common
 instruction_access_common:
@@ -428,6 +534,8 @@ instruction_access_common:
         li      r5,0x400
         b       .do_hash_page           /* Try to handle as hpte fault */
 
+        STD_EXCEPTION_COMMON(0xe20, h_instr_storage, .unknown_exception)
+
 /*
  * Here is the common SLB miss user that is used when going to virtual
  * mode for SLB misses, that is currently not used
@@ -750,7 +858,7 @@ _STATIC(do_hash_page)
 BEGIN_FTR_SECTION
         andis.  r0,r4,0x0020            /* Is it a segment table fault? */
         bne-    do_ste_alloc            /* If so handle it */
-END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
+END_MMU_FTR_SECTION_IFCLR(MMU_FTR_SLB)
 
         clrrdi  r11,r1,THREAD_SHIFT
         lwz     r0,TI_PREEMPT(r11)      /* If we're in an "NMI" */
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index c5c24beb8387..ba250d505e07 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -805,19 +805,6 @@ _ENTRY(copy_and_flush)
         blr
 
 #ifdef CONFIG_SMP
-#ifdef CONFIG_GEMINI
-        .globl  __secondary_start_gemini
-__secondary_start_gemini:
-        mfspr   r4,SPRN_HID0
-        ori     r4,r4,HID0_ICFI
-        li      r3,0
-        ori     r3,r3,HID0_ICE
-        andc    r4,r4,r3
-        mtspr   SPRN_HID0,r4
-        sync
-        b       __secondary_start
-#endif /* CONFIG_GEMINI */
-
         .globl __secondary_start_mpc86xx
 __secondary_start_mpc86xx:
         mfspr   r3, SPRN_PIR
@@ -890,15 +877,6 @@ __secondary_start:
         mtspr   SPRN_SRR1,r4
         SYNC
         RFI
-
-_GLOBAL(start_secondary_resume)
-        /* Reset stack */
-        rlwinm  r1,r1,0,0,(31-THREAD_SHIFT)     /* current_thread_info() */
-        addi    r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
-        li      r3,0
-        std     r3,0(r1)                /* Zero the stack frame pointer */
-        bl      start_secondary
-        b       .
 #endif /* CONFIG_SMP */
 
 #ifdef CONFIG_KVM_BOOK3S_HANDLER
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 3a319f9c9d3e..ba504099844a 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -147,6 +147,8 @@ __secondary_hold:
         mtctr   r4
         mr      r3,r24
         li      r4,0
+        /* Make sure that patched code is visible */
+        isync
         bctr
 #else
         BUG_OPCODE
@@ -216,19 +218,25 @@ generic_secondary_common_init:
          */
         LOAD_REG_ADDR(r13, paca)        /* Load paca pointer             */
         ld      r13,0(r13)              /* Get base vaddr of paca array  */
+#ifndef CONFIG_SMP
+        addi    r13,r13,PACA_SIZE       /* know r13 if used accidentally */
+        b       .kexec_wait             /* wait for next kernel if !SMP  */
+#else
+        LOAD_REG_ADDR(r7, nr_cpu_ids)   /* Load nr_cpu_ids address       */
+        lwz     r7,0(r7)                /* also the max paca allocated   */
         li      r5,0                    /* logical cpu id                */
 1:      lhz     r6,PACAHWCPUID(r13)     /* Load HW procid from paca      */
         cmpw    r6,r24                  /* Compare to our id             */
         beq     2f
         addi    r13,r13,PACA_SIZE       /* Loop to next PACA on miss     */
         addi    r5,r5,1
-        cmpwi   r5,NR_CPUS
+        cmpw    r5,r7                   /* Check if more pacas exist     */
         blt     1b
 
         mr      r3,r24                  /* not found, copy phys to r3    */
         b       .kexec_wait             /* next kernel might do better   */
 
-2:      mtspr   SPRN_SPRG_PACA,r13      /* Save vaddr of paca in an SPRG */
+2:      SET_PACA(r13)
 #ifdef CONFIG_PPC_BOOK3E
         addi    r12,r13,PACA_EXTLB      /* and TLB exc frame in another  */
         mtspr   SPRN_SPRG_TLB_EXFRAME,r12
@@ -236,34 +244,39 @@ generic_secondary_common_init:
 
         /* From now on, r24 is expected to be logical cpuid */
         mr      r24,r5
-3:      HMT_LOW
-        lbz     r23,PACAPROCSTART(r13)  /* Test if this processor should */
-                                        /* start.                        */
-
-#ifndef CONFIG_SMP
-        b       3b                      /* Never go on non-SMP           */
-#else
-        cmpwi   0,r23,0
-        beq     3b                      /* Loop until told to go         */
-
-        sync                            /* order paca.run and cur_cpu_spec */
 
         /* See if we need to call a cpu state restore handler */
         LOAD_REG_ADDR(r23, cur_cpu_spec)
         ld      r23,0(r23)
         ld      r23,CPU_SPEC_RESTORE(r23)
         cmpdi   0,r23,0
-        beq     4f
+        beq     3f
         ld      r23,0(r23)
         mtctr   r23
         bctrl
 
-4:      /* Create a temp kernel stack for use before relocation is on.  */
+3:      LOAD_REG_ADDR(r3, boot_cpu_count) /* Decrement boot_cpu_count */
+        lwarx   r4,0,r3
+        subi    r4,r4,1
+        stwcx.  r4,0,r3
+        bne     3b
+        isync
+
+4:      HMT_LOW
+        lbz     r23,PACAPROCSTART(r13)  /* Test if this processor should */
+                                        /* start.                        */
+        cmpwi   0,r23,0
+        beq     4b                      /* Loop until told to go         */
+
+        sync                            /* order paca.run and cur_cpu_spec */
+        isync                           /* In case code patching happened */
+
+        /* Create a temp kernel stack for use before relocation is on.  */
         ld      r1,PACAEMERGSP(r13)
         subi    r1,r1,STACK_FRAME_OVERHEAD
 
         b       __secondary_start
-#endif
+#endif /* SMP */
 
 /*
  * Turn the MMU off.
@@ -534,7 +547,7 @@ _GLOBAL(pmac_secondary_start)
         ld      r4,0(r4)                /* Get base vaddr of paca array */
         mulli   r13,r24,PACA_SIZE       /* Calculate vaddr of right paca */
         add     r13,r13,r4              /* for this processor.          */
-        mtspr   SPRN_SPRG_PACA,r13      /* Save vaddr of paca in an SPRG*/
+        SET_PACA(r13)                   /* Save vaddr of paca in an SPRG*/
 
         /* Mark interrupts soft and hard disabled (they might be enabled
          * in the PACA when doing hotplug)
@@ -645,7 +658,7 @@ _GLOBAL(enable_64b_mode)
         oris    r11,r11,0x8000          /* CM bit set, we'll set ICM later */
         mtmsr   r11
 #else /* CONFIG_PPC_BOOK3E */
-        li      r12,(MSR_SF | MSR_ISF)@highest
+        li      r12,(MSR_64BIT | MSR_ISF)@highest
         sldi    r12,r12,48
         or      r11,r11,r12
         mtmsrd  r11
diff --git a/arch/powerpc/kernel/idle_power7.S b/arch/powerpc/kernel/idle_power7.S
new file mode 100644
index 000000000000..f8f0bc7f1d4f
--- /dev/null
+++ b/arch/powerpc/kernel/idle_power7.S
@@ -0,0 +1,97 @@
+/*
+ *  This file contains the power_save function for 970-family CPUs.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/threads.h>
+#include <asm/processor.h>
+#include <asm/page.h>
+#include <asm/cputable.h>
+#include <asm/thread_info.h>
+#include <asm/ppc_asm.h>
+#include <asm/asm-offsets.h>
+#include <asm/ppc-opcode.h>
+
+#undef DEBUG
+
+        .text
+
+_GLOBAL(power7_idle)
+        /* Now check if user or arch enabled NAP mode */
+        LOAD_REG_ADDRBASE(r3,powersave_nap)
+        lwz     r4,ADDROFF(powersave_nap)(r3)
+        cmpwi   0,r4,0
+        beqlr
+
+        /* NAP is a state loss, we create a regs frame on the
+         * stack, fill it up with the state we care about and
+         * stick a pointer to it in PACAR1. We really only
+         * need to save PC, some CR bits and the NV GPRs,
+         * but for now an interrupt frame will do.
+         */
+        mflr    r0
+        std     r0,16(r1)
+        stdu    r1,-INT_FRAME_SIZE(r1)
+        std     r0,_LINK(r1)
+        std     r0,_NIP(r1)
+
+#ifndef CONFIG_SMP
+        /* Make sure FPU, VSX etc... are flushed as we may lose
+         * state when going to nap mode
+         */
+        bl      .discard_lazy_cpu_state
+#endif /* CONFIG_SMP */
+
+        /* Hard disable interrupts */
+        mfmsr   r9
+        rldicl  r9,r9,48,1
+        rotldi  r9,r9,16
+        mtmsrd  r9,1                    /* hard-disable interrupts */
+        li      r0,0
+        stb     r0,PACASOFTIRQEN(r13)   /* we'll hard-enable shortly */
+        stb     r0,PACAHARDIRQEN(r13)
+
+        /* Continue saving state */
+        SAVE_GPR(2, r1)
+        SAVE_NVGPRS(r1)
+        mfcr    r3
+        std     r3,_CCR(r1)
+        std     r9,_MSR(r1)
+        std     r1,PACAR1(r13)
+
+        /* Magic NAP mode enter sequence */
+        std     r0,0(r1)
+        ptesync
+        ld      r0,0(r1)
+1:      cmp     cr0,r0,r0
+        bne     1b
+        PPC_NAP
+        b       .
+
+_GLOBAL(power7_wakeup_loss)
+        GET_PACA(r13)
+        ld      r1,PACAR1(r13)
+        REST_NVGPRS(r1)
+        REST_GPR(2, r1)
+        ld      r3,_CCR(r1)
+        ld      r4,_MSR(r1)
+        ld      r5,_NIP(r1)
+        addi    r1,r1,INT_FRAME_SIZE
+        mtcr    r3
+        mtspr   SPRN_SRR1,r4
+        mtspr   SPRN_SRR0,r5
+        rfid
+
+_GLOBAL(power7_wakeup_noloss)
+        GET_PACA(r13)
+        ld      r1,PACAR1(r13)
+        ld      r4,_MSR(r1)
+        ld      r5,_NIP(r1)
+        addi    r1,r1,INT_FRAME_SIZE
+        mtspr   SPRN_SRR1,r4
+        mtspr   SPRN_SRR0,r5
+        rfid
diff --git a/arch/powerpc/platforms/cell/io-workarounds.c b/arch/powerpc/kernel/io-workarounds.c
index 5c1118e31940..ffafaea3d261 100644
--- a/arch/powerpc/platforms/cell/io-workarounds.c
+++ b/arch/powerpc/kernel/io-workarounds.c
@@ -17,8 +17,7 @@
 #include <asm/machdep.h>
 #include <asm/pgtable.h>
 #include <asm/ppc-pci.h>
-
-#include "io-workarounds.h"
+#include <asm/io-workarounds.h>
 
 #define IOWA_MAX_BUS    8
 
@@ -145,7 +144,19 @@ static void __iomem *iowa_ioremap(phys_addr_t addr, unsigned long size,
         return res;
 }
 
-/* Regist new bus to support workaround */
+/* Enable IO workaround */
+static void __devinit io_workaround_init(void)
+{
+        static int io_workaround_inited;
+
+        if (io_workaround_inited)
+                return;
+        ppc_pci_io = iowa_pci_io;
+        ppc_md.ioremap = iowa_ioremap;
+        io_workaround_inited = 1;
+}
+
+/* Register new bus to support workaround */
 void __devinit iowa_register_bus(struct pci_controller *phb,
                         struct ppc_pci_io *ops,
                         int (*initfunc)(struct iowa_bus *, void *), void *data)
@@ -153,6 +164,8 @@ void __devinit iowa_register_bus(struct pci_controller *phb,
         struct iowa_bus *bus;
         struct device_node *np = phb->dn;
 
+        io_workaround_init();
+
         if (iowa_bus_count >= IOWA_MAX_BUS) {
                 pr_err("IOWA:Too many pci bridges, "
                        "workarounds disabled for %s\n", np->full_name);
@@ -162,6 +175,7 @@ void __devinit iowa_register_bus(struct pci_controller *phb,
         bus = &iowa_busses[iowa_bus_count];
         bus->phb = phb;
         bus->ops = ops;
+        bus->private = data;
 
         if (initfunc)
                 if ((*initfunc)(bus, data))
@@ -172,14 +186,3 @@ void __devinit iowa_register_bus(struct pci_controller *phb,
         pr_debug("IOWA:[%d]Add bus, %s.\n", iowa_bus_count-1, np->full_name);
 }
 
-/* enable IO workaround */
-void __devinit io_workaround_init(void)
-{
-        static int io_workaround_inited;
-
-        if (io_workaround_inited)
-                return;
-        ppc_pci_io = iowa_pci_io;
-        ppc_md.ioremap = iowa_ioremap;
-        io_workaround_inited = 1;
-}
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index f621b7d2d869..a24d37d4cf51 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -66,7 +66,6 @@
 #include <asm/ptrace.h>
 #include <asm/machdep.h>
 #include <asm/udbg.h>
-#include <asm/dbell.h>
 #include <asm/smp.h>
 
 #ifdef CONFIG_PPC64
@@ -160,7 +159,8 @@ notrace void arch_local_irq_restore(unsigned long en)
 
 #if defined(CONFIG_BOOKE) && defined(CONFIG_SMP)
         /* Check for pending doorbell interrupts and resend to ourself */
-        doorbell_check_self();
+        if (cpu_has_feature(CPU_FTR_DBELL))
+                smp_muxed_ipi_resend();
 #endif
 
         /*
@@ -397,24 +397,28 @@ struct thread_info *mcheckirq_ctx[NR_CPUS] __read_mostly;
 void exc_lvl_ctx_init(void)
 {
         struct thread_info *tp;
-        int i, hw_cpu;
+        int i, cpu_nr;
 
         for_each_possible_cpu(i) {
-                hw_cpu = get_hard_smp_processor_id(i);
-                memset((void *)critirq_ctx[hw_cpu], 0, THREAD_SIZE);
-                tp = critirq_ctx[hw_cpu];
-                tp->cpu = i;
+#ifdef CONFIG_PPC64
+                cpu_nr = i;
+#else
+                cpu_nr = get_hard_smp_processor_id(i);
+#endif
+                memset((void *)critirq_ctx[cpu_nr], 0, THREAD_SIZE);
+                tp = critirq_ctx[cpu_nr];
+                tp->cpu = cpu_nr;
                 tp->preempt_count = 0;
 
 #ifdef CONFIG_BOOKE
-                memset((void *)dbgirq_ctx[hw_cpu], 0, THREAD_SIZE);
-                tp = dbgirq_ctx[hw_cpu];
-                tp->cpu = i;
+                memset((void *)dbgirq_ctx[cpu_nr], 0, THREAD_SIZE);
+                tp = dbgirq_ctx[cpu_nr];
+                tp->cpu = cpu_nr;
                 tp->preempt_count = 0;
 
-                memset((void *)mcheckirq_ctx[hw_cpu], 0, THREAD_SIZE);
-                tp = mcheckirq_ctx[hw_cpu];
-                tp->cpu = i;
+                memset((void *)mcheckirq_ctx[cpu_nr], 0, THREAD_SIZE);
+                tp = mcheckirq_ctx[cpu_nr];
+                tp->cpu = cpu_nr;
                 tp->preempt_count = HARDIRQ_OFFSET;
 #endif
         }
@@ -477,20 +481,41 @@ void do_softirq(void)
  * IRQ controller and virtual interrupts
  */
 
+/* The main irq map itself is an array of NR_IRQ entries containing the
+ * associate host and irq number. An entry with a host of NULL is free.
+ * An entry can be allocated if it's free, the allocator always then sets
+ * hwirq first to the host's invalid irq number and then fills ops.
+ */
+struct irq_map_entry {
+        irq_hw_number_t hwirq;
+        struct irq_host *host;
+};
+
 static LIST_HEAD(irq_hosts);
 static DEFINE_RAW_SPINLOCK(irq_big_lock);
-static unsigned int revmap_trees_allocated;
 static DEFINE_MUTEX(revmap_trees_mutex);
-struct irq_map_entry irq_map[NR_IRQS];
+static struct irq_map_entry irq_map[NR_IRQS];
 static unsigned int irq_virq_count = NR_IRQS;
 static struct irq_host *irq_default_host;
 
+irq_hw_number_t irqd_to_hwirq(struct irq_data *d)
+{
+        return irq_map[d->irq].hwirq;
+}
+EXPORT_SYMBOL_GPL(irqd_to_hwirq);
+
 irq_hw_number_t virq_to_hw(unsigned int virq)
 {
         return irq_map[virq].hwirq;
 }
 EXPORT_SYMBOL_GPL(virq_to_hw);
 
+bool virq_is_host(unsigned int virq, struct irq_host *host)
+{
+        return irq_map[virq].host == host;
+}
+EXPORT_SYMBOL_GPL(virq_is_host);
+
 static int default_irq_host_match(struct irq_host *h, struct device_node *np)
 {
         return h->of_node != NULL && h->of_node == np;
@@ -511,7 +536,7 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
         /* Allocate structure and revmap table if using linear mapping */
         if (revmap_type == IRQ_HOST_MAP_LINEAR)
                 size += revmap_arg * sizeof(unsigned int);
-        host = zalloc_maybe_bootmem(size, GFP_KERNEL);
+        host = kzalloc(size, GFP_KERNEL);
         if (host == NULL)
                 return NULL;
 
@@ -561,14 +586,14 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
                         irq_map[i].host = host;
                         smp_wmb();
 
-                        /* Clear norequest flags */
-                        irq_clear_status_flags(i, IRQ_NOREQUEST);
-
                         /* Legacy flags are left to default at this point,
                          * one can then use irq_create_mapping() to
                          * explicitly change them
                          */
                         ops->map(host, i, i);
+
+                        /* Clear norequest flags */
+                        irq_clear_status_flags(i, IRQ_NOREQUEST);
                 }
                 break;
         case IRQ_HOST_MAP_LINEAR:
@@ -579,6 +604,9 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
                 smp_wmb();
                 host->revmap_data.linear.revmap = rmap;
                 break;
+        case IRQ_HOST_MAP_TREE:
+                INIT_RADIX_TREE(&host->revmap_data.tree, GFP_KERNEL);
+                break;
         default:
                 break;
         }
@@ -636,8 +664,6 @@ static int irq_setup_virq(struct irq_host *host, unsigned int virq,
                 goto error;
         }
 
-        irq_clear_status_flags(virq, IRQ_NOREQUEST);
-
         /* map it */
         smp_wmb();
         irq_map[virq].hwirq = hwirq;
@@ -648,6 +674,8 @@ static int irq_setup_virq(struct irq_host *host, unsigned int virq,
                 goto errdesc;
         }
 
+        irq_clear_status_flags(virq, IRQ_NOREQUEST);
+
         return 0;
 
 errdesc:
@@ -704,8 +732,6 @@ unsigned int irq_create_mapping(struct irq_host *host,
          */
         virq = irq_find_mapping(host, hwirq);
         if (virq != NO_IRQ) {
-                if (host->ops->remap)
-                        host->ops->remap(host, virq, hwirq);
                 pr_debug("irq: -> existing mapping on virq %d\n", virq);
                 return virq;
         }
@@ -786,14 +812,15 @@ void irq_dispose_mapping(unsigned int virq)
                 return;
 
         host = irq_map[virq].host;
-        WARN_ON (host == NULL);
-        if (host == NULL)
+        if (WARN_ON(host == NULL))
                 return;
 
         /* Never unmap legacy interrupts */
         if (host->revmap_type == IRQ_HOST_MAP_LEGACY)
                 return;
 
+        irq_set_status_flags(virq, IRQ_NOREQUEST);
+
         /* remove chip and handler */
         irq_set_chip_and_handler(virq, NULL, NULL);
 
@@ -813,13 +840,6 @@ void irq_dispose_mapping(unsigned int virq)
                         host->revmap_data.linear.revmap[hwirq] = NO_IRQ;
                 break;
         case IRQ_HOST_MAP_TREE:
-                /*
-                 * Check if radix tree allocated yet, if not then nothing to
-                 * remove.
-                 */
-                smp_rmb();
-                if (revmap_trees_allocated < 1)
-                        break;
                 mutex_lock(&revmap_trees_mutex);
                 radix_tree_delete(&host->revmap_data.tree, hwirq);
                 mutex_unlock(&revmap_trees_mutex);
@@ -830,8 +850,6 @@ void irq_dispose_mapping(unsigned int virq)
         smp_mb();
         irq_map[virq].hwirq = host->inval_irq;
 
-        irq_set_status_flags(virq, IRQ_NOREQUEST);
-
         irq_free_descs(virq, 1);
         /* Free it */
         irq_free_virt(virq, 1);
@@ -877,16 +895,9 @@ unsigned int irq_radix_revmap_lookup(struct irq_host *host,
         struct irq_map_entry *ptr;
         unsigned int virq;
 
-        WARN_ON(host->revmap_type != IRQ_HOST_MAP_TREE);
-
-        /*
-         * Check if the radix tree exists and has bee initialized.
-         * If not, we fallback to slow mode
-         */
-        if (revmap_trees_allocated < 2)
+        if (WARN_ON_ONCE(host->revmap_type != IRQ_HOST_MAP_TREE))
                 return irq_find_mapping(host, hwirq);
 
-        /* Now try to resolve */
         /*
          * No rcu_read_lock(ing) needed, the ptr returned can't go under us
          * as it's referencing an entry in the static irq_map table.
@@ -909,16 +920,7 @@ unsigned int irq_radix_revmap_lookup(struct irq_host *host,
 void irq_radix_revmap_insert(struct irq_host *host, unsigned int virq,
                              irq_hw_number_t hwirq)
 {
-
-        WARN_ON(host->revmap_type != IRQ_HOST_MAP_TREE);
-
-        /*
-         * Check if the radix tree exists yet.
-         * If not, then the irq will be inserted into the tree when it gets
-         * initialized.
-         */
-        smp_rmb();
-        if (revmap_trees_allocated < 1)
+        if (WARN_ON(host->revmap_type != IRQ_HOST_MAP_TREE))
                 return;
 
         if (virq != NO_IRQ) {
@@ -934,7 +936,8 @@ unsigned int irq_linear_revmap(struct irq_host *host,
 {
         unsigned int *revmap;
 
-        WARN_ON(host->revmap_type != IRQ_HOST_MAP_LINEAR);
+        if (WARN_ON_ONCE(host->revmap_type != IRQ_HOST_MAP_LINEAR))
+                return irq_find_mapping(host, hwirq);
 
         /* Check revmap bounds */
         if (unlikely(hwirq >= host->revmap_data.linear.size))
@@ -1028,53 +1031,6 @@ int arch_early_irq_init(void)
         return 0;
 }
 
-/* We need to create the radix trees late */
-static int irq_late_init(void)
-{
-        struct irq_host *h;
-        unsigned int i;
-
-        /*
-         * No mutual exclusion with respect to accessors of the tree is needed
-         * here as the synchronization is done via the state variable
-         * revmap_trees_allocated.
-         */
-        list_for_each_entry(h, &irq_hosts, link) {
-                if (h->revmap_type == IRQ_HOST_MAP_TREE)
-                        INIT_RADIX_TREE(&h->revmap_data.tree, GFP_KERNEL);
-        }
-
-        /*
-         * Make sure the radix trees inits are visible before setting
-         * the flag
-         */
-        smp_wmb();
-        revmap_trees_allocated = 1;
-
-        /*
-         * Insert the reverse mapping for those interrupts already present
-         * in irq_map[].
-         */
-        mutex_lock(&revmap_trees_mutex);
-        for (i = 0; i < irq_virq_count; i++) {
-                if (irq_map[i].host &&
-                    (irq_map[i].host->revmap_type == IRQ_HOST_MAP_TREE))
-                        radix_tree_insert(&irq_map[i].host->revmap_data.tree,
-                                          irq_map[i].hwirq, &irq_map[i]);
-        }
-        mutex_unlock(&revmap_trees_mutex);
-
-        /*
-         * Make sure the radix trees insertions are visible before setting
-         * the flag
-         */
-        smp_wmb();
-        revmap_trees_allocated = 2;
-
-        return 0;
-}
-arch_initcall(irq_late_init);
-
 #ifdef CONFIG_VIRQ_DEBUG
 static int virq_debug_show(struct seq_file *m, void *private)
 {
@@ -1082,10 +1038,11 @@ static int virq_debug_show(struct seq_file *m, void *private)
         struct irq_desc *desc;
         const char *p;
         static const char none[] = "none";
+        void *data;
         int i;
 
-        seq_printf(m, "%-5s  %-7s  %-15s  %s\n", "virq", "hwirq",
-                      "chip name", "host name");
+        seq_printf(m, "%-5s  %-7s  %-15s  %-18s  %s\n", "virq", "hwirq",
+                      "chip name", "chip data", "host name");
 
         for (i = 1; i < nr_irqs; i++) {
                 desc = irq_to_desc(i);
@@ -1098,7 +1055,7 @@ static int virq_debug_show(struct seq_file *m, void *private)
                         struct irq_chip *chip;
 
                         seq_printf(m, "%5d  ", i);
-                        seq_printf(m, "0x%05lx  ", virq_to_hw(i));
+                        seq_printf(m, "0x%05lx  ", irq_map[i].hwirq);
 
                         chip = irq_desc_get_chip(desc);
                         if (chip && chip->name)
@@ -1107,6 +1064,9 @@ static int virq_debug_show(struct seq_file *m, void *private)
                                 p = none;
                         seq_printf(m, "%-15s  ", p);
 
+                        data = irq_desc_get_chip_data(desc);
+                        seq_printf(m, "0x%16p  ", data);
+
                         if (irq_map[i].host && irq_map[i].host->of_node)
                                 p = irq_map[i].host->of_node->full_name;
                         else
diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
index 42850ee00ada..76a6e40a6f7c 100644
--- a/arch/powerpc/kernel/kgdb.c
+++ b/arch/powerpc/kernel/kgdb.c
@@ -109,7 +109,7 @@ static int kgdb_call_nmi_hook(struct pt_regs *regs)
 #ifdef CONFIG_SMP
 void kgdb_roundup_cpus(unsigned long flags)
 {
-        smp_send_debugger_break(MSG_ALL_BUT_SELF);
+        smp_send_debugger_break();
 }
 #endif
 
@@ -142,7 +142,7 @@ static int kgdb_singlestep(struct pt_regs *regs)
                 return 0;
 
         /*
-         * On Book E and perhaps other processsors, singlestep is handled on
+         * On Book E and perhaps other processors, singlestep is handled on
          * the critical exception stack.  This causes current_thread_info()
          * to fail, since it it locates the thread_info by masking off
          * the low bits of the current stack pointer.  We work around
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 301db65f05a1..84daabe2fcba 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -132,34 +132,6 @@ static int iseries_lparcfg_data(struct seq_file *m, void *v)
 /*
  * Methods used to fetch LPAR data when running on a pSeries platform.
  */
-/**
- * h_get_mpp
- * H_GET_MPP hcall returns info in 7 parms
- */
-int h_get_mpp(struct hvcall_mpp_data *mpp_data)
-{
-        int rc;
-        unsigned long retbuf[PLPAR_HCALL9_BUFSIZE];
-
-        rc = plpar_hcall9(H_GET_MPP, retbuf);
-
-        mpp_data->entitled_mem = retbuf[0];
-        mpp_data->mapped_mem = retbuf[1];
-
-        mpp_data->group_num = (retbuf[2] >> 2 * 8) & 0xffff;
-        mpp_data->pool_num = retbuf[2] & 0xffff;
-
-        mpp_data->mem_weight = (retbuf[3] >> 7 * 8) & 0xff;
-        mpp_data->unallocated_mem_weight = (retbuf[3] >> 6 * 8) & 0xff;
-        mpp_data->unallocated_entitlement = retbuf[3] & 0xffffffffffff;
-
-        mpp_data->pool_size = retbuf[4];
-        mpp_data->loan_request = retbuf[5];
-        mpp_data->backing_mem = retbuf[6];
-
-        return rc;
-}
-EXPORT_SYMBOL(h_get_mpp);
 
 struct hvcall_ppp_data {
         u64     entitlement;
@@ -345,6 +317,30 @@ static void parse_mpp_data(struct seq_file *m)
         seq_printf(m, "backing_memory=%ld bytes\n", mpp_data.backing_mem);
 }
 
+/**
+ * parse_mpp_x_data
+ * Parse out data returned from h_get_mpp_x
+ */
+static void parse_mpp_x_data(struct seq_file *m)
+{
+        struct hvcall_mpp_x_data mpp_x_data;
+
+        if (!firmware_has_feature(FW_FEATURE_XCMO))
+                return;
+        if (h_get_mpp_x(&mpp_x_data))
+                return;
+
+        seq_printf(m, "coalesced_bytes=%ld\n", mpp_x_data.coalesced_bytes);
+
+        if (mpp_x_data.pool_coalesced_bytes)
+                seq_printf(m, "pool_coalesced_bytes=%ld\n",
+                           mpp_x_data.pool_coalesced_bytes);
+        if (mpp_x_data.pool_purr_cycles)
+                seq_printf(m, "coalesce_pool_purr=%ld\n", mpp_x_data.pool_purr_cycles);
+        if (mpp_x_data.pool_spurr_cycles)
+                seq_printf(m, "coalesce_pool_spurr=%ld\n", mpp_x_data.pool_spurr_cycles);
+}
+
 #define SPLPAR_CHARACTERISTICS_TOKEN 20
 #define SPLPAR_MAXLENGTH 1026*(sizeof(char))
 
@@ -520,6 +516,7 @@ static int pseries_lparcfg_data(struct seq_file *m, void *v)
                 parse_system_parameter_string(m);
                 parse_ppp_data(m);
                 parse_mpp_data(m);
+                parse_mpp_x_data(m);
                 pseries_cmo_data(m);
                 splpar_dispatch_data(m);
 
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 094bd9821ad4..998a10028608 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -694,6 +694,17 @@ _GLOBAL(kernel_thread)
         addi    r1,r1,16
         blr
 
+#ifdef CONFIG_SMP
+_GLOBAL(start_secondary_resume)
+        /* Reset stack */
+        rlwinm  r1,r1,0,0,(31-THREAD_SHIFT)     /* current_thread_info() */
+        addi    r1,r1,THREAD_SIZE-STACK_FRAME_OVERHEAD
+        li      r3,0
+        stw     r3,0(r1)                /* Zero the stack frame pointer */
+        bl      start_secondary
+        b       .
+#endif /* CONFIG_SMP */
+        
 /*
  * This routine is just here to keep GCC happy - sigh...
  */
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index 206a321a71d3..e89df59cdc5a 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -462,7 +462,8 @@ _GLOBAL(disable_kernel_fp)
  * wait for the flag to change, indicating this kernel is going away but
  * the slave code for the next one is at addresses 0 to 100.
  *
- * This is used by all slaves.
+ * This is used by all slaves, even those that did not find a matching
+ * paca in the secondary startup code.
  *
  * Physical (hardware) cpu id should be in r3.
  */
@@ -471,10 +472,6 @@ _GLOBAL(kexec_wait)
 1:      mflr    r5
         addi    r5,r5,kexec_flag-1b
 
-        li      r4,KEXEC_STATE_REAL_MODE
-        stb     r4,PACAKEXECSTATE(r13)
-        SYNC
-
 99:     HMT_LOW
 #ifdef CONFIG_KEXEC             /* use no memory without kexec */
         lwz     r4,0(r5)
@@ -499,11 +496,17 @@ kexec_flag:
  *
  * get phys id from paca
  * switch to real mode
+ * mark the paca as no longer used
  * join other cpus in kexec_wait(phys_id)
  */
 _GLOBAL(kexec_smp_wait)
         lhz     r3,PACAHWCPUID(r13)
         bl      real_mode
+
+        li      r4,KEXEC_STATE_REAL_MODE
+        stb     r4,PACAKEXECSTATE(r13)
+        SYNC
+
         b       .kexec_wait
 
 /*
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index 10f0aadee95b..efeb88184182 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -7,7 +7,7 @@
  *      2 of the License, or (at your option) any later version.
  */
 
-#include <linux/threads.h>
+#include <linux/smp.h>
 #include <linux/module.h>
 #include <linux/memblock.h>
 
@@ -156,18 +156,29 @@ void __init initialise_paca(struct paca_struct *new_paca, int cpu)
 /* Put the paca pointer into r13 and SPRG_PACA */
 void setup_paca(struct paca_struct *new_paca)
 {
+        /* Setup r13 */
         local_paca = new_paca;
-        mtspr(SPRN_SPRG_PACA, local_paca);
+
 #ifdef CONFIG_PPC_BOOK3E
+        /* On Book3E, initialize the TLB miss exception frames */
         mtspr(SPRN_SPRG_TLB_EXFRAME, local_paca->extlb);
+#else
+        /* In HV mode, we setup both HPACA and PACA to avoid problems
+         * if we do a GET_PACA() before the feature fixups have been
+         * applied
+         */
+        if (cpu_has_feature(CPU_FTR_HVMODE_206))
+                mtspr(SPRN_SPRG_HPACA, local_paca);
 #endif
+        mtspr(SPRN_SPRG_PACA, local_paca);
+
 }
 
 static int __initdata paca_size;
 
 void __init allocate_pacas(void)
 {
-        int nr_cpus, cpu, limit;
+        int cpu, limit;
 
         /*
          * We can't take SLB misses on the paca, and we want to access them
@@ -179,23 +190,18 @@ void __init allocate_pacas(void)
         if (firmware_has_feature(FW_FEATURE_ISERIES))
                 limit = min(limit, HvPagesToMap * HVPAGESIZE);
 
-        nr_cpus = NR_CPUS;
-        /* On iSeries we know we can never have more than 64 cpus */
-        if (firmware_has_feature(FW_FEATURE_ISERIES))
-                nr_cpus = min(64, nr_cpus);
-
-        paca_size = PAGE_ALIGN(sizeof(struct paca_struct) * nr_cpus);
+        paca_size = PAGE_ALIGN(sizeof(struct paca_struct) * nr_cpu_ids);
 
         paca = __va(memblock_alloc_base(paca_size, PAGE_SIZE, limit));
         memset(paca, 0, paca_size);
 
         printk(KERN_DEBUG "Allocated %u bytes for %d pacas at %p\n",
-                paca_size, nr_cpus, paca);
+                paca_size, nr_cpu_ids, paca);
 
-        allocate_lppacas(nr_cpus, limit);
+        allocate_lppacas(nr_cpu_ids, limit);
 
         /* Can't use for_each_*_cpu, as they aren't functional yet */
-        for (cpu = 0; cpu < nr_cpus; cpu++)
+        for (cpu = 0; cpu < nr_cpu_ids; cpu++)
                 initialise_paca(&paca[cpu], cpu);
 }
 
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index d225d99fe39d..6baabc13306a 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -43,10 +43,9 @@ void * __devinit update_dn_pci_info(struct device_node *dn, void *data)
         const u32 *regs;
         struct pci_dn *pdn;
 
-        pdn = alloc_maybe_bootmem(sizeof(*pdn), GFP_KERNEL);
+        pdn = zalloc_maybe_bootmem(sizeof(*pdn), GFP_KERNEL);
         if (pdn == NULL)
                 return NULL;
-        memset(pdn, 0, sizeof(*pdn));
         dn->data = pdn;
         pdn->node = dn;
         pdn->phb = phb;
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index ef3ef566235e..7d28f540200c 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -54,7 +54,6 @@ extern void single_step_exception(struct pt_regs *regs);
 extern int sys_sigreturn(struct pt_regs *regs);
 
 EXPORT_SYMBOL(clear_pages);
-EXPORT_SYMBOL(copy_page);
 EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
 EXPORT_SYMBOL(DMA_MODE_READ);
 EXPORT_SYMBOL(DMA_MODE_WRITE);
@@ -88,9 +87,7 @@ EXPORT_SYMBOL(__copy_tofrom_user);
 EXPORT_SYMBOL(__clear_user);
 EXPORT_SYMBOL(__strncpy_from_user);
 EXPORT_SYMBOL(__strnlen_user);
-#ifdef CONFIG_PPC64
-EXPORT_SYMBOL(copy_4K_page);
-#endif
+EXPORT_SYMBOL(copy_page);
 
 #if defined(CONFIG_PCI) && defined(CONFIG_PPC32)
 EXPORT_SYMBOL(isa_io_base);
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index f74f355a9617..91e52df3d81d 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -395,6 +395,9 @@ struct task_struct *__switch_to(struct task_struct *prev,
         struct thread_struct *new_thread, *old_thread;
         unsigned long flags;
         struct task_struct *last;
+#ifdef CONFIG_PPC_BOOK3S_64
+        struct ppc64_tlb_batch *batch;
+#endif
 
 #ifdef CONFIG_SMP
         /* avoid complexity of lazy save/restore of fpu
@@ -513,7 +516,17 @@ struct task_struct *__switch_to(struct task_struct *prev,
                 old_thread->accum_tb += (current_tb - start_tb);
                 new_thread->start_tb = current_tb;
         }
-#endif
+#endif /* CONFIG_PPC64 */
+
+#ifdef CONFIG_PPC_BOOK3S_64
+        batch = &__get_cpu_var(ppc64_tlb_batch);
+        if (batch->active) {
+                current_thread_info()->local_flags |= _TLF_LAZY_MMU;
+                if (batch->index)
+                        __flush_tlb_pending(batch);
+                batch->active = 0;
+        }
+#endif /* CONFIG_PPC_BOOK3S_64 */
 
         local_irq_save(flags);
 
@@ -528,6 +541,14 @@ struct task_struct *__switch_to(struct task_struct *prev,
         hard_irq_disable();
         last = _switch(old_thread, new_thread);
 
+#ifdef CONFIG_PPC_BOOK3S_64
+        if (current_thread_info()->local_flags & _TLF_LAZY_MMU) {
+                current_thread_info()->local_flags &= ~_TLF_LAZY_MMU;
+                batch = &__get_cpu_var(ppc64_tlb_batch);
+                batch->active = 1;
+        }
+#endif /* CONFIG_PPC_BOOK3S_64 */
+
         local_irq_restore(flags);
 
         return last;
@@ -702,6 +723,8 @@ void prepare_to_copy(struct task_struct *tsk)
 /*
  * Copy a thread..
  */
+extern unsigned long dscr_default; /* defined in arch/powerpc/kernel/sysfs.c */
+
 int copy_thread(unsigned long clone_flags, unsigned long usp,
                 unsigned long unused, struct task_struct *p,
                 struct pt_regs *regs)
@@ -755,11 +778,11 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
                                 _ALIGN_UP(sizeof(struct thread_info), 16);
 
 #ifdef CONFIG_PPC_STD_MMU_64
-        if (cpu_has_feature(CPU_FTR_SLB)) {
+        if (mmu_has_feature(MMU_FTR_SLB)) {
                 unsigned long sp_vsid;
                 unsigned long llp = mmu_psize_defs[mmu_linear_psize].sllp;
 
-                if (cpu_has_feature(CPU_FTR_1T_SEGMENT))
+                if (mmu_has_feature(MMU_FTR_1T_SEGMENT))
                         sp_vsid = get_kernel_vsid(sp, MMU_SEGSIZE_1T)
                                 << SLB_VSID_SHIFT_1T;
                 else
@@ -769,6 +792,20 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
                 p->thread.ksp_vsid = sp_vsid;
         }
 #endif /* CONFIG_PPC_STD_MMU_64 */
+#ifdef CONFIG_PPC64 
+        if (cpu_has_feature(CPU_FTR_DSCR)) {
+                if (current->thread.dscr_inherit) {
+                        p->thread.dscr_inherit = 1;
+                        p->thread.dscr = current->thread.dscr;
+                } else if (0 != dscr_default) {
+                        p->thread.dscr_inherit = 1;
+                        p->thread.dscr = dscr_default;
+                } else {
+                        p->thread.dscr_inherit = 0;
+                        p->thread.dscr = 0;
+                }
+        }
+#endif
 
         /*
          * The PPC64 ABI makes use of a TOC to contain function 
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index e74fa12afc82..48aeb55faae9 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -68,6 +68,7 @@ int __initdata iommu_force_on;
 unsigned long tce_alloc_start, tce_alloc_end;
 u64 ppc64_rma_size;
 #endif
+static phys_addr_t first_memblock_size;
 
 static int __init early_parse_mem(char *p)
 {
@@ -123,18 +124,19 @@ static void __init move_device_tree(void)
  */
 static struct ibm_pa_feature {
         unsigned long   cpu_features;   /* CPU_FTR_xxx bit */
+        unsigned long   mmu_features;   /* MMU_FTR_xxx bit */
         unsigned int    cpu_user_ftrs;  /* PPC_FEATURE_xxx bit */
         unsigned char   pabyte;         /* byte number in ibm,pa-features */
         unsigned char   pabit;          /* bit number (big-endian) */
         unsigned char   invert;         /* if 1, pa bit set => clear feature */
 } ibm_pa_features[] __initdata = {
-        {0, PPC_FEATURE_HAS_MMU,        0, 0, 0},
-        {0, PPC_FEATURE_HAS_FPU,        0, 1, 0},
-        {CPU_FTR_SLB, 0,                0, 2, 0},
-        {CPU_FTR_CTRL, 0,               0, 3, 0},
-        {CPU_FTR_NOEXECUTE, 0,          0, 6, 0},
-        {CPU_FTR_NODSISRALIGN, 0,       1, 1, 1},
-        {CPU_FTR_CI_LARGE_PAGE, 0,      1, 2, 0},
+        {0, 0, PPC_FEATURE_HAS_MMU,     0, 0, 0},
+        {0, 0, PPC_FEATURE_HAS_FPU,     0, 1, 0},
+        {0, MMU_FTR_SLB, 0,             0, 2, 0},
+        {CPU_FTR_CTRL, 0, 0,            0, 3, 0},
+        {CPU_FTR_NOEXECUTE, 0, 0,       0, 6, 0},
+        {CPU_FTR_NODSISRALIGN, 0, 0,    1, 1, 1},
+        {0, MMU_FTR_CI_LARGE_PAGE, 0,   1, 2, 0},
         {CPU_FTR_REAL_LE, PPC_FEATURE_TRUE_LE, 5, 0, 0},
 };
 
@@ -166,9 +168,11 @@ static void __init scan_features(unsigned long node, unsigned char *ftrs,
                 if (bit ^ fp->invert) {
                         cur_cpu_spec->cpu_features |= fp->cpu_features;
                         cur_cpu_spec->cpu_user_features |= fp->cpu_user_ftrs;
+                        cur_cpu_spec->mmu_features |= fp->mmu_features;
                 } else {
                         cur_cpu_spec->cpu_features &= ~fp->cpu_features;
                         cur_cpu_spec->cpu_user_features &= ~fp->cpu_user_ftrs;
+                        cur_cpu_spec->mmu_features &= ~fp->mmu_features;
                 }
         }
 }
@@ -268,13 +272,13 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
                                           const char *uname, int depth,
                                           void *data)
 {
-        static int logical_cpuid = 0;
         char *type = of_get_flat_dt_prop(node, "device_type", NULL);
         const u32 *prop;
         const u32 *intserv;
         int i, nthreads;
         unsigned long len;
-        int found = 0;
+        int found = -1;
+        int found_thread = 0;
 
         /* We are scanning "cpu" nodes only */
         if (type == NULL || strcmp(type, "cpu") != 0)
@@ -298,11 +302,10 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
                  * version 2 of the kexec param format adds the phys cpuid of
                  * booted proc.
                  */
-                if (initial_boot_params && initial_boot_params->version >= 2) {
-                        if (intserv[i] ==
-                                        initial_boot_params->boot_cpuid_phys) {
-                                found = 1;
-                                break;
+                if (initial_boot_params->version >= 2) {
+                        if (intserv[i] == initial_boot_params->boot_cpuid_phys) {
+                                found = boot_cpu_count;
+                                found_thread = i;
                         }
                 } else {
                         /*
@@ -311,23 +314,20 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
                          * off secondary threads.
                          */
                         if (of_get_flat_dt_prop(node,
-                                        "linux,boot-cpu", NULL) != NULL) {
-                                found = 1;
-                                break;
-                        }
+                                        "linux,boot-cpu", NULL) != NULL)
+                                found = boot_cpu_count;
                 }
-
 #ifdef CONFIG_SMP
                 /* logical cpu id is always 0 on UP kernels */
-                logical_cpuid++;
+                boot_cpu_count++;
 #endif
         }
 
-        if (found) {
-                DBG("boot cpu: logical %d physical %d\n", logical_cpuid,
-                        intserv[i]);
-                boot_cpuid = logical_cpuid;
-                set_hard_smp_processor_id(boot_cpuid, intserv[i]);
+        if (found >= 0) {
+                DBG("boot cpu: logical %d physical %d\n", found,
+                        intserv[found_thread]);
+                boot_cpuid = found;
+                set_hard_smp_processor_id(found, intserv[found_thread]);
 
                 /*
                  * PAPR defines "logical" PVR values for cpus that
@@ -509,11 +509,14 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
                         size = 0x80000000ul - base;
         }
 #endif
-
-        /* First MEMBLOCK added, do some special initializations */
-        if (memstart_addr == ~(phys_addr_t)0)
-                setup_initial_memory_limit(base, size);
-        memstart_addr = min((u64)memstart_addr, base);
+        /* Keep track of the beginning of memory -and- the size of
+         * the very first block in the device-tree as it represents
+         * the RMA on ppc64 server
+         */
+        if (base < memstart_addr) {
+                memstart_addr = base;
+                first_memblock_size = size;
+        }
 
         /* Add the chunk to the MEMBLOCK list */
         memblock_add(base, size);
@@ -698,6 +701,7 @@ void __init early_init_devtree(void *params)
 
         of_scan_flat_dt(early_init_dt_scan_root, NULL);
         of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL);
+        setup_initial_memory_limit(memstart_addr, first_memblock_size);
 
         /* Save command line for /proc/cmdline and then parse parameters */
         strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 941ff4dbc567..c016033ba78d 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -335,6 +335,7 @@ static void __init prom_printf(const char *format, ...)
         const char *p, *q, *s;
         va_list args;
         unsigned long v;
+        long vs;
         struct prom_t *_prom = &RELOC(prom);
 
         va_start(args, format);
@@ -368,12 +369,35 @@ static void __init prom_printf(const char *format, ...)
                         v = va_arg(args, unsigned long);
                         prom_print_hex(v);
                         break;
+                case 'd':
+                        ++q;
+                        vs = va_arg(args, int);
+                        if (vs < 0) {
+                                prom_print(RELOC("-"));
+                                vs = -vs;
+                        }
+                        prom_print_dec(vs);
+                        break;
                 case 'l':
                         ++q;
-                        if (*q == 'u') { /* '%lu' */
+                        if (*q == 0)
+                                break;
+                        else if (*q == 'x') {
+                                ++q;
+                                v = va_arg(args, unsigned long);
+                                prom_print_hex(v);
+                        } else if (*q == 'u') { /* '%lu' */
                                 ++q;
                                 v = va_arg(args, unsigned long);
                                 prom_print_dec(v);
+                        } else if (*q == 'd') { /* %ld */
+                                ++q;
+                                vs = va_arg(args, long);
+                                if (vs < 0) {
+                                        prom_print(RELOC("-"));
+                                        vs = -vs;
+                                }
+                                prom_print_dec(vs);
                         }
                         break;
                 }
@@ -676,8 +700,10 @@ static void __init early_cmdline_parse(void)
 #endif /* CONFIG_PCI_MSI */
 #ifdef CONFIG_PPC_SMLPAR
 #define OV5_CMO                 0x80    /* Cooperative Memory Overcommitment */
+#define OV5_XCMO                        0x40    /* Page Coalescing */
 #else
 #define OV5_CMO                 0x00
+#define OV5_XCMO                        0x00
 #endif
 #define OV5_TYPE1_AFFINITY      0x80    /* Type 1 NUMA affinity */
 
@@ -732,7 +758,7 @@ static unsigned char ibm_architecture_vec[] = {
         OV5_LPAR | OV5_SPLPAR | OV5_LARGE_PAGES | OV5_DRCONF_MEMORY |
         OV5_DONATE_DEDICATE_CPU | OV5_MSI,
         0,
-        OV5_CMO,
+        OV5_CMO | OV5_XCMO,
         OV5_TYPE1_AFFINITY,
         0,
         0,
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 2097f2b3cba8..271ff6318eda 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -42,6 +42,7 @@
 #include <asm/time.h>
 #include <asm/mmu.h>
 #include <asm/topology.h>
+#include <asm/pSeries_reconfig.h>
 
 struct rtas_t rtas = {
         .lock = __ARCH_SPIN_LOCK_UNLOCKED
@@ -494,7 +495,7 @@ unsigned int rtas_busy_delay(int status)
 
         might_sleep();
         ms = rtas_busy_delay_time(status);
-        if (ms)
+        if (ms && need_resched())
                 msleep(ms);
 
         return ms;
@@ -731,6 +732,7 @@ static int __rtas_suspend_last_cpu(struct rtas_suspend_me_data *data, int wake_w
 
         atomic_set(&data->error, rc);
         start_topology_update();
+        pSeries_coalesce_init();
 
         if (wake_when_done) {
                 atomic_set(&data->done, 1);
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 21f30cb68077..79fca2651b65 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -381,7 +381,7 @@ static void __init cpu_init_thread_core_maps(int tpc)
         int i;
 
         threads_per_core = tpc;
-        threads_core_mask = CPU_MASK_NONE;
+        cpumask_clear(&threads_core_mask);
 
         /* This implementation only supports power of 2 number of threads
          * for simplicity and performance
@@ -390,7 +390,7 @@ static void __init cpu_init_thread_core_maps(int tpc)
         BUG_ON(tpc != (1 << threads_shift));
 
         for (i = 0; i < tpc; i++)
-                cpu_set(i, threads_core_mask);
+                cpumask_set_cpu(i, &threads_core_mask);
 
         printk(KERN_INFO "CPU maps initialized for %d thread%s per core\n",
                tpc, tpc > 1 ? "s" : "");
@@ -404,7 +404,7 @@ static void __init cpu_init_thread_core_maps(int tpc)
  *                  cpu_present_mask
  *
  * Having the possible map set up early allows us to restrict allocations
- * of things like irqstacks to num_possible_cpus() rather than NR_CPUS.
+ * of things like irqstacks to nr_cpu_ids rather than NR_CPUS.
  *
  * We do not initialize the online map here; cpus set their own bits in
  * cpu_online_mask as they come up.
@@ -424,7 +424,7 @@ void __init smp_setup_cpu_maps(void)
 
         DBG("smp_setup_cpu_maps()\n");
 
-        while ((dn = of_find_node_by_type(dn, "cpu")) && cpu < NR_CPUS) {
+        while ((dn = of_find_node_by_type(dn, "cpu")) && cpu < nr_cpu_ids) {
                 const int *intserv;
                 int j, len;
 
@@ -443,7 +443,7 @@ void __init smp_setup_cpu_maps(void)
                                 intserv = &cpu; /* assume logical == phys */
                 }
 
-                for (j = 0; j < nthreads && cpu < NR_CPUS; j++) {
+                for (j = 0; j < nthreads && cpu < nr_cpu_ids; j++) {
                         DBG("    thread %d -> cpu %d (hard id %d)\n",
                             j, cpu, intserv[j]);
                         set_cpu_present(cpu, true);
@@ -483,12 +483,12 @@ void __init smp_setup_cpu_maps(void)
                 if (cpu_has_feature(CPU_FTR_SMT))
                         maxcpus *= nthreads;
 
-                if (maxcpus > NR_CPUS) {
+                if (maxcpus > nr_cpu_ids) {
                         printk(KERN_WARNING
                                "Partition configured for %d cpus, "
                                "operating system maximum is %d.\n",
-                               maxcpus, NR_CPUS);
-                        maxcpus = NR_CPUS;
+                               maxcpus, nr_cpu_ids);
+                        maxcpus = nr_cpu_ids;
                 } else
                         printk(KERN_INFO "Partition configured for %d cpus.\n",
                                maxcpus);
@@ -510,7 +510,7 @@ void __init smp_setup_cpu_maps(void)
         cpu_init_thread_core_maps(nthreads);
 
         /* Now that possible cpus are set, set nr_cpu_ids for later use */
-        nr_cpu_ids = find_last_bit(cpumask_bits(cpu_possible_mask),NR_CPUS) + 1;
+        setup_nr_cpu_ids();
 
         free_unused_pacas();
 }
@@ -602,6 +602,10 @@ int check_legacy_ioport(unsigned long base_port)
                  * name instead */
                 if (!np)
                         np = of_find_node_by_name(NULL, "8042");
+                if (np) {
+                        of_i8042_kbd_irq = 1;
+                        of_i8042_aux_irq = 12;
+                }
                 break;
         case FDC_BASE: /* FDC1 */
                 np = of_find_node_by_type(NULL, "fdc");
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 1d2fbc905303..620d792b52e4 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -48,6 +48,7 @@ extern void bootx_init(unsigned long r4, unsigned long phys);
 
 int boot_cpuid = -1;
 EXPORT_SYMBOL_GPL(boot_cpuid);
+int __initdata boot_cpu_count;
 int boot_cpuid_phys;
 
 int smp_hw_index[NR_CPUS];
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 5a0401fcaebd..a88bf2713d41 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -62,6 +62,7 @@
 #include <asm/udbg.h>
 #include <asm/kexec.h>
 #include <asm/mmu_context.h>
+#include <asm/code-patching.h>
 
 #include "setup.h"
 
@@ -72,6 +73,7 @@
 #endif
 
 int boot_cpuid = 0;
+int __initdata boot_cpu_count;
 u64 ppc64_pft_size;
 
 /* Pick defaults since we might want to patch instructions
@@ -233,6 +235,7 @@ void early_setup_secondary(void)
 void smp_release_cpus(void)
 {
         unsigned long *ptr;
+        int i;
 
         DBG(" -> smp_release_cpus()\n");
 
@@ -245,7 +248,16 @@ void smp_release_cpus(void)
         ptr  = (unsigned long *)((unsigned long)&__secondary_hold_spinloop
                         - PHYSICAL_START);
         *ptr = __pa(generic_secondary_smp_init);
-        mb();
+
+        /* And wait a bit for them to catch up */
+        for (i = 0; i < 100000; i++) {
+                mb();
+                HMT_low();
+                if (boot_cpu_count == 0)
+                        break;
+                udelay(1);
+        }
+        DBG("boot_cpu_count = %d\n", boot_cpu_count);
 
         DBG(" <- smp_release_cpus()\n");
 }
@@ -423,17 +435,30 @@ void __init setup_system(void)
         DBG(" <- setup_system()\n");
 }
 
-static u64 slb0_limit(void)
+/* This returns the limit below which memory accesses to the linear
+ * mapping are guarnateed not to cause a TLB or SLB miss. This is
+ * used to allocate interrupt or emergency stacks for which our
+ * exception entry path doesn't deal with being interrupted.
+ */
+static u64 safe_stack_limit(void)
 {
-        if (cpu_has_feature(CPU_FTR_1T_SEGMENT)) {
+#ifdef CONFIG_PPC_BOOK3E
+        /* Freescale BookE bolts the entire linear mapping */
+        if (mmu_has_feature(MMU_FTR_TYPE_FSL_E))
+                return linear_map_top;
+        /* Other BookE, we assume the first GB is bolted */
+        return 1ul << 30;
+#else
+        /* BookS, the first segment is bolted */
+        if (mmu_has_feature(MMU_FTR_1T_SEGMENT))
                 return 1UL << SID_SHIFT_1T;
-        }
         return 1UL << SID_SHIFT;
+#endif
 }
 
 static void __init irqstack_early_init(void)
 {
-        u64 limit = slb0_limit();
+        u64 limit = safe_stack_limit();
         unsigned int i;
 
         /*
@@ -453,6 +478,9 @@ static void __init irqstack_early_init(void)
 #ifdef CONFIG_PPC_BOOK3E
 static void __init exc_lvl_early_init(void)
 {
+        extern unsigned int interrupt_base_book3e;
+        extern unsigned int exc_debug_debug_book3e;
+
         unsigned int i;
 
         for_each_possible_cpu(i) {
@@ -463,6 +491,10 @@ static void __init exc_lvl_early_init(void)
                 mcheckirq_ctx[i] = (struct thread_info *)
                         __va(memblock_alloc(THREAD_SIZE, THREAD_SIZE));
         }
+
+        if (cpu_has_feature(CPU_FTR_DEBUG_LVL_EXC))
+                patch_branch(&interrupt_base_book3e + (0x040 / 4) + 1,
+                             (unsigned long)&exc_debug_debug_book3e, 0);
 }
 #else
 #define exc_lvl_early_init()
@@ -486,7 +518,7 @@ static void __init emergency_stack_init(void)
          * bringup, we need to get at them in real mode. This means they
          * must also be within the RMO region.
          */
-        limit = min(slb0_limit(), ppc64_rma_size);
+        limit = min(safe_stack_limit(), ppc64_rma_size);
 
         for_each_possible_cpu(i) {
                 unsigned long sp;
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 27c4a4584f80..da989fff19cc 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -381,7 +381,7 @@ badframe:
                regs, uc, &uc->uc_mcontext);
 #endif
         if (show_unhandled_signals && printk_ratelimit())
-                printk(regs->msr & MSR_SF ? fmt64 : fmt32,
+                printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
                         current->comm, current->pid, "rt_sigreturn",
                         (long)uc, regs->nip, regs->link);
 
@@ -469,7 +469,7 @@ badframe:
                regs, frame, newsp);
 #endif
         if (show_unhandled_signals && printk_ratelimit())
-                printk(regs->msr & MSR_SF ? fmt64 : fmt32,
+                printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
                         current->comm, current->pid, "setup_rt_frame",
                         (long)frame, regs->nip, regs->link);
 
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index cbdbb14be4b0..4a6f2ec7e761 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -95,7 +95,7 @@ int smt_enabled_at_boot = 1;
 static void (*crash_ipi_function_ptr)(struct pt_regs *) = NULL;
 
 #ifdef CONFIG_PPC64
-void __devinit smp_generic_kick_cpu(int nr)
+int __devinit smp_generic_kick_cpu(int nr)
 {
         BUG_ON(nr < 0 || nr >= NR_CPUS);
 
@@ -106,37 +106,10 @@ void __devinit smp_generic_kick_cpu(int nr)
          */
         paca[nr].cpu_start = 1;
         smp_mb();
-}
-#endif
 
-void smp_message_recv(int msg)
-{
-        switch(msg) {
-        case PPC_MSG_CALL_FUNCTION:
-                generic_smp_call_function_interrupt();
-                break;
-        case PPC_MSG_RESCHEDULE:
-                /* we notice need_resched on exit */
-                break;
-        case PPC_MSG_CALL_FUNC_SINGLE:
-                generic_smp_call_function_single_interrupt();
-                break;
-        case PPC_MSG_DEBUGGER_BREAK:
-                if (crash_ipi_function_ptr) {
-                        crash_ipi_function_ptr(get_irq_regs());
-                        break;
-                }
-#ifdef CONFIG_DEBUGGER
-                debugger_ipi(get_irq_regs());
-                break;
-#endif /* CONFIG_DEBUGGER */
-                /* FALLTHROUGH */
-        default:
-                printk("SMP %d: smp_message_recv(): unknown msg %d\n",
-                       smp_processor_id(), msg);
-                break;
-        }
+        return 0;
 }
+#endif
 
 static irqreturn_t call_function_action(int irq, void *data)
 {
@@ -146,7 +119,7 @@ static irqreturn_t call_function_action(int irq, void *data)
 
 static irqreturn_t reschedule_action(int irq, void *data)
 {
-        /* we just need the return path side effect of checking need_resched */
+        scheduler_ipi();
         return IRQ_HANDLED;
 }
 
@@ -156,9 +129,17 @@ static irqreturn_t call_function_single_action(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-static irqreturn_t debug_ipi_action(int irq, void *data)
+irqreturn_t debug_ipi_action(int irq, void *data)
 {
-        smp_message_recv(PPC_MSG_DEBUGGER_BREAK);
+        if (crash_ipi_function_ptr) {
+                crash_ipi_function_ptr(get_irq_regs());
+                return IRQ_HANDLED;
+        }
+
+#ifdef CONFIG_DEBUGGER
+        debugger_ipi(get_irq_regs());
+#endif /* CONFIG_DEBUGGER */
+
         return IRQ_HANDLED;
 }
 
@@ -197,6 +178,66 @@ int smp_request_message_ipi(int virq, int msg)
         return err;
 }
 
+#ifdef CONFIG_PPC_SMP_MUXED_IPI
+struct cpu_messages {
+        int messages;                   /* current messages */
+        unsigned long data;             /* data for cause ipi */
+};
+static DEFINE_PER_CPU_SHARED_ALIGNED(struct cpu_messages, ipi_message);
+
+void smp_muxed_ipi_set_data(int cpu, unsigned long data)
+{
+        struct cpu_messages *info = &per_cpu(ipi_message, cpu);
+
+        info->data = data;
+}
+
+void smp_muxed_ipi_message_pass(int cpu, int msg)
+{
+        struct cpu_messages *info = &per_cpu(ipi_message, cpu);
+        char *message = (char *)&info->messages;
+
+        message[msg] = 1;
+        mb();
+        smp_ops->cause_ipi(cpu, info->data);
+}
+
+void smp_muxed_ipi_resend(void)
+{
+        struct cpu_messages *info = &__get_cpu_var(ipi_message);
+
+        if (info->messages)
+                smp_ops->cause_ipi(smp_processor_id(), info->data);
+}
+
+irqreturn_t smp_ipi_demux(void)
+{
+        struct cpu_messages *info = &__get_cpu_var(ipi_message);
+        unsigned int all;
+
+        mb();   /* order any irq clear */
+
+        do {
+                all = xchg_local(&info->messages, 0);
+
+#ifdef __BIG_ENDIAN
+                if (all & (1 << (24 - 8 * PPC_MSG_CALL_FUNCTION)))
+                        generic_smp_call_function_interrupt();
+                if (all & (1 << (24 - 8 * PPC_MSG_RESCHEDULE)))
+                        scheduler_ipi();
+                if (all & (1 << (24 - 8 * PPC_MSG_CALL_FUNC_SINGLE)))
+                        generic_smp_call_function_single_interrupt();
+                if (all & (1 << (24 - 8 * PPC_MSG_DEBUGGER_BREAK)))
+                        debug_ipi_action(0, NULL);
+#else
+#error Unsupported ENDIAN
+#endif
+        } while (info->messages);
+
+        return IRQ_HANDLED;
+}
+#endif /* CONFIG_PPC_SMP_MUXED_IPI */
+
 void smp_send_reschedule(int cpu)
 {
         if (likely(smp_ops))
@@ -216,11 +257,18 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask)
                 smp_ops->message_pass(cpu, PPC_MSG_CALL_FUNCTION);
 }
 
-#ifdef CONFIG_DEBUGGER
-void smp_send_debugger_break(int cpu)
+#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
+void smp_send_debugger_break(void)
 {
-        if (likely(smp_ops))
-                smp_ops->message_pass(cpu, PPC_MSG_DEBUGGER_BREAK);
+        int cpu;
+        int me = raw_smp_processor_id();
+
+        if (unlikely(!smp_ops))
+                return;
+
+        for_each_online_cpu(cpu)
+                if (cpu != me)
+                        smp_ops->message_pass(cpu, PPC_MSG_DEBUGGER_BREAK);
 }
 #endif
 
@@ -228,9 +276,9 @@ void smp_send_debugger_break(int cpu)
 void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *))
 {
         crash_ipi_function_ptr = crash_ipi_callback;
-        if (crash_ipi_callback && smp_ops) {
+        if (crash_ipi_callback) {
                 mb();
-                smp_ops->message_pass(MSG_ALL_BUT_SELF, PPC_MSG_DEBUGGER_BREAK);
+                smp_send_debugger_break();
         }
 }
 #endif
@@ -410,8 +458,6 @@ int __cpuinit __cpu_up(unsigned int cpu)
 {
         int rc, c;
 
-        secondary_ti = current_set[cpu];
-
         if (smp_ops == NULL ||
             (smp_ops->cpu_bootable && !smp_ops->cpu_bootable(cpu)))
                 return -EINVAL;
@@ -421,6 +467,8 @@ int __cpuinit __cpu_up(unsigned int cpu)
         if (rc)
                 return rc;
 
+        secondary_ti = current_set[cpu];
+
         /* Make sure callin-map entry is 0 (can be leftover a CPU
          * hotplug
          */
@@ -434,7 +482,11 @@ int __cpuinit __cpu_up(unsigned int cpu)
 
         /* wake up cpus */
         DBG("smp: kicking cpu %d\n", cpu);
-        smp_ops->kick_cpu(cpu);
+        rc = smp_ops->kick_cpu(cpu);
+        if (rc) {
+                pr_err("smp: failed starting cpu %d (rc %d)\n", cpu, rc);
+                return rc;
+        }
 
         /*
          * wait to see if the cpu made a callin (is actually up).
@@ -507,7 +559,7 @@ int cpu_first_thread_of_core(int core)
 }
 EXPORT_SYMBOL_GPL(cpu_first_thread_of_core);
 
-/* Must be called when no change can occur to cpu_present_map,
+/* Must be called when no change can occur to cpu_present_mask,
  * i.e. during cpu online or offline.
  */
 static struct device_node *cpu_to_l2cache(int cpu)
@@ -608,7 +660,7 @@ void __init smp_cpus_done(unsigned int max_cpus)
          * se we pin us down to CPU 0 for a short while
          */
         alloc_cpumask_var(&old_mask, GFP_NOWAIT);
-        cpumask_copy(old_mask, &current->cpus_allowed);
+        cpumask_copy(old_mask, tsk_cpus_allowed(current));
         set_cpus_allowed_ptr(current, cpumask_of(boot_cpuid));
         
         if (smp_ops && smp_ops->setup_cpu)
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index c0d8c2006bf4..f0f2199e64e1 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -182,6 +182,41 @@ static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
 static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);
 static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr);
 static SYSDEV_ATTR(purr, 0600, show_purr, store_purr);
+
+unsigned long dscr_default = 0;
+EXPORT_SYMBOL(dscr_default);
+
+static ssize_t show_dscr_default(struct sysdev_class *class,
+                struct sysdev_class_attribute *attr, char *buf)
+{
+        return sprintf(buf, "%lx\n", dscr_default);
+}
+
+static ssize_t __used store_dscr_default(struct sysdev_class *class,
+                struct sysdev_class_attribute *attr, const char *buf,
+                size_t count)
+{
+        unsigned long val;
+        int ret = 0;
+        
+        ret = sscanf(buf, "%lx", &val);
+        if (ret != 1)
+                return -EINVAL;
+        dscr_default = val;
+
+        return count;
+}
+
+static SYSDEV_CLASS_ATTR(dscr_default, 0600,
+                show_dscr_default, store_dscr_default);
+
+static void sysfs_create_dscr_default(void)
+{
+        int err = 0;
+        if (cpu_has_feature(CPU_FTR_DSCR))
+                err = sysfs_create_file(&cpu_sysdev_class.kset.kobj,
+                        &attr_dscr_default.attr);
+}
 #endif /* CONFIG_PPC64 */
 
 #ifdef HAS_PPC_PMC_PA6T
@@ -617,6 +652,9 @@ static int __init topology_init(void)
                 if (cpu_online(cpu))
                         register_cpu_online(cpu);
         }
+#ifdef CONFIG_PPC64
+        sysfs_create_dscr_default();
+#endif /* CONFIG_PPC64 */
 
         return 0;
 }
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 5ddb801bc154..b13306b0d925 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -143,7 +143,6 @@ int die(const char *str, struct pt_regs *regs, long err)
 #endif
                 printk("%s\n", ppc_md.name ? ppc_md.name : "");
 
-                sysfs_printk_last_file();
                 if (notify_die(DIE_OOPS, str, regs, err, 255,
                                SIGSEGV) == NOTIFY_STOP)
                         return 1;
@@ -199,7 +198,7 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
         } else if (show_unhandled_signals &&
                     unhandled_signal(current, signr) &&
                     printk_ratelimit()) {
-                        printk(regs->msr & MSR_SF ? fmt64 : fmt32,
+                        printk(regs->msr & MSR_64BIT ? fmt64 : fmt32,
                                 current->comm, current->pid, signr,
                                 addr, regs->nip, regs->link, code);
                 }
@@ -221,7 +220,7 @@ void system_reset_exception(struct pt_regs *regs)
         }
 
 #ifdef CONFIG_KEXEC
-        cpu_set(smp_processor_id(), cpus_in_sr);
+        cpumask_set_cpu(smp_processor_id(), &cpus_in_sr);
 #endif
 
         die("System Reset", regs, SIGABRT);
@@ -909,6 +908,26 @@ static int emulate_instruction(struct pt_regs *regs)
                 return emulate_isel(regs, instword);
         }
 
+#ifdef CONFIG_PPC64
+        /* Emulate the mfspr rD, DSCR. */
+        if (((instword & PPC_INST_MFSPR_DSCR_MASK) == PPC_INST_MFSPR_DSCR) &&
+                        cpu_has_feature(CPU_FTR_DSCR)) {
+                PPC_WARN_EMULATED(mfdscr, regs);
+                rd = (instword >> 21) & 0x1f;
+                regs->gpr[rd] = mfspr(SPRN_DSCR);
+                return 0;
+        }
+        /* Emulate the mtspr DSCR, rD. */
+        if (((instword & PPC_INST_MTSPR_DSCR_MASK) == PPC_INST_MTSPR_DSCR) &&
+                        cpu_has_feature(CPU_FTR_DSCR)) {
+                PPC_WARN_EMULATED(mtdscr, regs);
+                rd = (instword >> 21) & 0x1f;
+                mtspr(SPRN_DSCR, regs->gpr[rd]);
+                current->thread.dscr_inherit = 1;
+                return 0;
+        }
+#endif
+
         return -EINVAL;
 }
 
@@ -1506,6 +1525,10 @@ struct ppc_emulated ppc_emulated = {
 #ifdef CONFIG_VSX
         WARN_EMULATED_SETUP(vsx),
 #endif
+#ifdef CONFIG_PPC64
+        WARN_EMULATED_SETUP(mfdscr),
+        WARN_EMULATED_SETUP(mtdscr),
+#endif
 };
 
 u32 ppc_warn_emulated;
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index e39cad83c884..23d65abbedce 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -62,6 +62,8 @@ void __init udbg_early_init(void)
         udbg_init_cpm();
 #elif defined(CONFIG_PPC_EARLY_DEBUG_USBGECKO)
         udbg_init_usbgecko();
+#elif defined(CONFIG_PPC_EARLY_DEBUG_WSP)
+        udbg_init_wsp();
 #endif
 
 #ifdef CONFIG_PPC_EARLY_DEBUG
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c
index baa33a7517bc..6837f839ab78 100644
--- a/arch/powerpc/kernel/udbg_16550.c
+++ b/arch/powerpc/kernel/udbg_16550.c
@@ -11,6 +11,7 @@
 #include <linux/types.h>
 #include <asm/udbg.h>
 #include <asm/io.h>
+#include <asm/reg_a2.h>
 
 extern u8 real_readb(volatile u8 __iomem  *addr);
 extern void real_writeb(u8 data, volatile u8 __iomem *addr);
@@ -298,3 +299,53 @@ void __init udbg_init_40x_realmode(void)
         udbg_getc_poll = NULL;
 }
 #endif /* CONFIG_PPC_EARLY_DEBUG_40x */
+
+#ifdef CONFIG_PPC_EARLY_DEBUG_WSP
+static void udbg_wsp_flush(void)
+{
+        if (udbg_comport) {
+                while ((readb(&udbg_comport->lsr) & LSR_THRE) == 0)
+                        /* wait for idle */;
+        }
+}
+
+static void udbg_wsp_putc(char c)
+{
+        if (udbg_comport) {
+                if (c == '\n')
+                        udbg_wsp_putc('\r');
+                udbg_wsp_flush();
+                writeb(c, &udbg_comport->thr); eieio();
+        }
+}
+
+static int udbg_wsp_getc(void)
+{
+        if (udbg_comport) {
+                while ((readb(&udbg_comport->lsr) & LSR_DR) == 0)
+                        ; /* wait for char */
+                return readb(&udbg_comport->rbr);
+        }
+        return -1;
+}
+
+static int udbg_wsp_getc_poll(void)
+{
+        if (udbg_comport)
+                if (readb(&udbg_comport->lsr) & LSR_DR)
+                        return readb(&udbg_comport->rbr);
+        return -1;
+}
+
+void __init udbg_init_wsp(void)
+{
+        udbg_comport = (struct NS16550 __iomem *)WSP_UART_VIRT;
+
+        udbg_init_uart(udbg_comport, 57600, 50000000);
+
+        udbg_putc = udbg_wsp_putc;
+        udbg_flush = udbg_wsp_flush;
+        udbg_getc = udbg_wsp_getc;
+        udbg_getc_poll = udbg_wsp_getc_poll;
+}
+#endif /* CONFIG_PPC_EARLY_DEBUG_WSP */
diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S
index 9de6f396cf85..4d5a3edff49e 100644
--- a/arch/powerpc/kernel/vector.S
+++ b/arch/powerpc/kernel/vector.S
@@ -102,7 +102,7 @@ _GLOBAL(giveup_altivec)
         MTMSRD(r5)                      /* enable use of VMX now */
         isync
         PPC_LCMPI       0,r3,0
-        beqlr-                          /* if no previous owner, done */
+        beqlr                           /* if no previous owner, done */
         addi    r3,r3,THREAD            /* want THREAD of task */
         PPC_LL  r5,PT_REGS(r3)
         PPC_LCMPI       0,r5,0
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index b9150f07d266..920276c0f6a1 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -160,7 +160,7 @@ SECTIONS
                 INIT_RAM_FS
         }
 
-        PERCPU(L1_CACHE_BYTES, PAGE_SIZE)
+        PERCPU_SECTION(L1_CACHE_BYTES)
 
         . = ALIGN(8);
         .machine.desc : AT(ADDR(.machine.desc) - LOAD_OFFSET) {
diff --git a/arch/powerpc/kvm/44x.c b/arch/powerpc/kvm/44x.c
index 74d0e7421143..da3a1225c0ac 100644
--- a/arch/powerpc/kvm/44x.c
+++ b/arch/powerpc/kvm/44x.c
@@ -107,6 +107,16 @@ int kvmppc_core_vcpu_translate(struct kvm_vcpu *vcpu,
         return 0;
 }
 
+void kvmppc_core_get_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+        kvmppc_get_sregs_ivor(vcpu, sregs);
+}
+
+int kvmppc_core_set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+        return kvmppc_set_sregs_ivor(vcpu, sregs);
+}
+
 struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
 {
         struct kvmppc_vcpu_44x *vcpu_44x;
diff --git a/arch/powerpc/kvm/44x_emulate.c b/arch/powerpc/kvm/44x_emulate.c
index 65ea083a5b27..549bb2c9a47a 100644
--- a/arch/powerpc/kvm/44x_emulate.c
+++ b/arch/powerpc/kvm/44x_emulate.c
@@ -158,7 +158,6 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
                 emulated = kvmppc_booke_emulate_mtspr(vcpu, sprn, rs);
         }
 
-        kvmppc_set_exit_type(vcpu, EMULATED_MTSPR_EXITS);
         return emulated;
 }
 
@@ -179,7 +178,6 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
                 emulated = kvmppc_booke_emulate_mfspr(vcpu, sprn, rt);
         }
 
-        kvmppc_set_exit_type(vcpu, EMULATED_MFSPR_EXITS);
         return emulated;
 }
 
diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c
index c961de40c676..0f95b5cce033 100644
--- a/arch/powerpc/kvm/book3s.c
+++ b/arch/powerpc/kvm/book3s.c
@@ -236,7 +236,7 @@ void kvmppc_core_queue_dec(struct kvm_vcpu *vcpu)
 
 int kvmppc_core_pending_dec(struct kvm_vcpu *vcpu)
 {
-        return test_bit(BOOK3S_INTERRUPT_DECREMENTER >> 7, &vcpu->arch.pending_exceptions);
+        return test_bit(BOOK3S_IRQPRIO_DECREMENTER, &vcpu->arch.pending_exceptions);
 }
 
 void kvmppc_core_dequeue_dec(struct kvm_vcpu *vcpu)
diff --git a/arch/powerpc/kvm/book3s_rmhandlers.S b/arch/powerpc/kvm/book3s_rmhandlers.S
index 2b9c9088d00e..1a1b34487e71 100644
--- a/arch/powerpc/kvm/book3s_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_rmhandlers.S
@@ -35,9 +35,7 @@
 
 #if defined(CONFIG_PPC_BOOK3S_64)
 
-#define LOAD_SHADOW_VCPU(reg)                           \
-        mfspr   reg, SPRN_SPRG_PACA
-
+#define LOAD_SHADOW_VCPU(reg)   GET_PACA(reg)                                   
 #define SHADOW_VCPU_OFF         PACA_KVM_SVCPU
 #define MSR_NOIRQ               MSR_KERNEL & ~(MSR_IR | MSR_DR)
 #define FUNC(name)              GLUE(.,name)
@@ -72,7 +70,7 @@
 .global kvmppc_trampoline_\intno
 kvmppc_trampoline_\intno:
 
-        mtspr   SPRN_SPRG_SCRATCH0, r13         /* Save r13 */
+        SET_SCRATCH0(r13)               /* Save r13 */
 
         /*
          * First thing to do is to find out if we're coming
@@ -91,7 +89,7 @@ kvmppc_trampoline_\intno:
         lwz     r12, (SHADOW_VCPU_OFF + SVCPU_SCRATCH1)(r13)
         mtcr    r12
         PPC_LL  r12, (SHADOW_VCPU_OFF + SVCPU_SCRATCH0)(r13)
-        mfspr   r13, SPRN_SPRG_SCRATCH0         /* r13 = original r13 */
+        GET_SCRATCH0(r13)                       /* r13 = original r13 */
         b       kvmppc_resume_\intno            /* Get back original handler */
 
         /* Now we know we're handling a KVM guest */
@@ -114,6 +112,9 @@ INTERRUPT_TRAMPOLINE	BOOK3S_INTERRUPT_MACHINE_CHECK
 INTERRUPT_TRAMPOLINE    BOOK3S_INTERRUPT_DATA_STORAGE
 INTERRUPT_TRAMPOLINE    BOOK3S_INTERRUPT_INST_STORAGE
 INTERRUPT_TRAMPOLINE    BOOK3S_INTERRUPT_EXTERNAL
+#ifdef CONFIG_PPC_BOOK3S_64
+INTERRUPT_TRAMPOLINE    BOOK3S_INTERRUPT_EXTERNAL_HV
+#endif
 INTERRUPT_TRAMPOLINE    BOOK3S_INTERRUPT_ALIGNMENT
 INTERRUPT_TRAMPOLINE    BOOK3S_INTERRUPT_PROGRAM
 INTERRUPT_TRAMPOLINE    BOOK3S_INTERRUPT_FP_UNAVAIL
@@ -158,7 +159,7 @@ kvmppc_handler_skip_ins:
         lwz     r12, (SHADOW_VCPU_OFF + SVCPU_SCRATCH1)(r13)
         mtcr    r12
         PPC_LL  r12, (SHADOW_VCPU_OFF + SVCPU_SCRATCH0)(r13)
-        mfspr   r13, SPRN_SPRG_SCRATCH0
+        GET_SCRATCH0(r13)
 
         /* And get back into the code */
         RFI
diff --git a/arch/powerpc/kvm/book3s_segment.S b/arch/powerpc/kvm/book3s_segment.S
index 7c52ed0b7051..451264274b8c 100644
--- a/arch/powerpc/kvm/book3s_segment.S
+++ b/arch/powerpc/kvm/book3s_segment.S
@@ -155,14 +155,20 @@ kvmppc_handler_trampoline_exit:
         PPC_LL  r2, (SHADOW_VCPU_OFF + SVCPU_HOST_R2)(r13)
 
         /* Save guest PC and MSR */
-        mfsrr0  r3
+        andi.   r0,r12,0x2
+        beq     1f
+        mfspr   r3,SPRN_HSRR0
+        mfspr   r4,SPRN_HSRR1
+        andi.   r12,r12,0x3ffd
+        b       2f
+1:      mfsrr0  r3
         mfsrr1  r4
-
+2:
         PPC_STL r3, (SHADOW_VCPU_OFF + SVCPU_PC)(r13)
         PPC_STL r4, (SHADOW_VCPU_OFF + SVCPU_SHADOW_SRR1)(r13)
 
         /* Get scratch'ed off registers */
-        mfspr   r9, SPRN_SPRG_SCRATCH0
+        GET_SCRATCH0(r9)
         PPC_LL  r8, (SHADOW_VCPU_OFF + SVCPU_SCRATCH0)(r13)
         lwz     r7, (SHADOW_VCPU_OFF + SVCPU_SCRATCH1)(r13)
 
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index ef76acb455c3..8462b3a1c1c7 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -569,6 +569,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         kvmppc_set_msr(vcpu, regs->msr);
         vcpu->arch.shared->srr0 = regs->srr0;
         vcpu->arch.shared->srr1 = regs->srr1;
+        kvmppc_set_pid(vcpu, regs->pid);
         vcpu->arch.shared->sprg0 = regs->sprg0;
         vcpu->arch.shared->sprg1 = regs->sprg1;
         vcpu->arch.shared->sprg2 = regs->sprg2;
@@ -584,16 +585,165 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         return 0;
 }
 
+static void get_sregs_base(struct kvm_vcpu *vcpu,
+                           struct kvm_sregs *sregs)
+{
+        u64 tb = get_tb();
+
+        sregs->u.e.features |= KVM_SREGS_E_BASE;
+
+        sregs->u.e.csrr0 = vcpu->arch.csrr0;
+        sregs->u.e.csrr1 = vcpu->arch.csrr1;
+        sregs->u.e.mcsr = vcpu->arch.mcsr;
+        sregs->u.e.esr = vcpu->arch.esr;
+        sregs->u.e.dear = vcpu->arch.shared->dar;
+        sregs->u.e.tsr = vcpu->arch.tsr;
+        sregs->u.e.tcr = vcpu->arch.tcr;
+        sregs->u.e.dec = kvmppc_get_dec(vcpu, tb);
+        sregs->u.e.tb = tb;
+        sregs->u.e.vrsave = vcpu->arch.vrsave;
+}
+
+static int set_sregs_base(struct kvm_vcpu *vcpu,
+                          struct kvm_sregs *sregs)
+{
+        if (!(sregs->u.e.features & KVM_SREGS_E_BASE))
+                return 0;
+
+        vcpu->arch.csrr0 = sregs->u.e.csrr0;
+        vcpu->arch.csrr1 = sregs->u.e.csrr1;
+        vcpu->arch.mcsr = sregs->u.e.mcsr;
+        vcpu->arch.esr = sregs->u.e.esr;
+        vcpu->arch.shared->dar = sregs->u.e.dear;
+        vcpu->arch.vrsave = sregs->u.e.vrsave;
+        vcpu->arch.tcr = sregs->u.e.tcr;
+
+        if (sregs->u.e.update_special & KVM_SREGS_E_UPDATE_DEC)
+                vcpu->arch.dec = sregs->u.e.dec;
+
+        kvmppc_emulate_dec(vcpu);
+
+        if (sregs->u.e.update_special & KVM_SREGS_E_UPDATE_TSR) {
+                /*
+                 * FIXME: existing KVM timer handling is incomplete.
+                 * TSR cannot be read by the guest, and its value in
+                 * vcpu->arch is always zero.  For now, just handle
+                 * the case where the caller is trying to inject a
+                 * decrementer interrupt.
+                 */
+
+                if ((sregs->u.e.tsr & TSR_DIS) &&
+                    (vcpu->arch.tcr & TCR_DIE))
+                        kvmppc_core_queue_dec(vcpu);
+        }
+
+        return 0;
+}
+
+static void get_sregs_arch206(struct kvm_vcpu *vcpu,
+                              struct kvm_sregs *sregs)
+{
+        sregs->u.e.features |= KVM_SREGS_E_ARCH206;
+
+        sregs->u.e.pir = 0;
+        sregs->u.e.mcsrr0 = vcpu->arch.mcsrr0;
+        sregs->u.e.mcsrr1 = vcpu->arch.mcsrr1;
+        sregs->u.e.decar = vcpu->arch.decar;
+        sregs->u.e.ivpr = vcpu->arch.ivpr;
+}
+
+static int set_sregs_arch206(struct kvm_vcpu *vcpu,
+                             struct kvm_sregs *sregs)
+{
+        if (!(sregs->u.e.features & KVM_SREGS_E_ARCH206))
+                return 0;
+
+        if (sregs->u.e.pir != 0)
+                return -EINVAL;
+
+        vcpu->arch.mcsrr0 = sregs->u.e.mcsrr0;
+        vcpu->arch.mcsrr1 = sregs->u.e.mcsrr1;
+        vcpu->arch.decar = sregs->u.e.decar;
+        vcpu->arch.ivpr = sregs->u.e.ivpr;
+
+        return 0;
+}
+
+void kvmppc_get_sregs_ivor(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+        sregs->u.e.features |= KVM_SREGS_E_IVOR;
+
+        sregs->u.e.ivor_low[0] = vcpu->arch.ivor[BOOKE_IRQPRIO_CRITICAL];
+        sregs->u.e.ivor_low[1] = vcpu->arch.ivor[BOOKE_IRQPRIO_MACHINE_CHECK];
+        sregs->u.e.ivor_low[2] = vcpu->arch.ivor[BOOKE_IRQPRIO_DATA_STORAGE];
+        sregs->u.e.ivor_low[3] = vcpu->arch.ivor[BOOKE_IRQPRIO_INST_STORAGE];
+        sregs->u.e.ivor_low[4] = vcpu->arch.ivor[BOOKE_IRQPRIO_EXTERNAL];
+        sregs->u.e.ivor_low[5] = vcpu->arch.ivor[BOOKE_IRQPRIO_ALIGNMENT];
+        sregs->u.e.ivor_low[6] = vcpu->arch.ivor[BOOKE_IRQPRIO_PROGRAM];
+        sregs->u.e.ivor_low[7] = vcpu->arch.ivor[BOOKE_IRQPRIO_FP_UNAVAIL];
+        sregs->u.e.ivor_low[8] = vcpu->arch.ivor[BOOKE_IRQPRIO_SYSCALL];
+        sregs->u.e.ivor_low[9] = vcpu->arch.ivor[BOOKE_IRQPRIO_AP_UNAVAIL];
+        sregs->u.e.ivor_low[10] = vcpu->arch.ivor[BOOKE_IRQPRIO_DECREMENTER];
+        sregs->u.e.ivor_low[11] = vcpu->arch.ivor[BOOKE_IRQPRIO_FIT];
+        sregs->u.e.ivor_low[12] = vcpu->arch.ivor[BOOKE_IRQPRIO_WATCHDOG];
+        sregs->u.e.ivor_low[13] = vcpu->arch.ivor[BOOKE_IRQPRIO_DTLB_MISS];
+        sregs->u.e.ivor_low[14] = vcpu->arch.ivor[BOOKE_IRQPRIO_ITLB_MISS];
+        sregs->u.e.ivor_low[15] = vcpu->arch.ivor[BOOKE_IRQPRIO_DEBUG];
+}
+
+int kvmppc_set_sregs_ivor(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+        if (!(sregs->u.e.features & KVM_SREGS_E_IVOR))
+                return 0;
+
+        vcpu->arch.ivor[BOOKE_IRQPRIO_CRITICAL] = sregs->u.e.ivor_low[0];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_MACHINE_CHECK] = sregs->u.e.ivor_low[1];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_DATA_STORAGE] = sregs->u.e.ivor_low[2];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_INST_STORAGE] = sregs->u.e.ivor_low[3];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_EXTERNAL] = sregs->u.e.ivor_low[4];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_ALIGNMENT] = sregs->u.e.ivor_low[5];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_PROGRAM] = sregs->u.e.ivor_low[6];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_FP_UNAVAIL] = sregs->u.e.ivor_low[7];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_SYSCALL] = sregs->u.e.ivor_low[8];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_AP_UNAVAIL] = sregs->u.e.ivor_low[9];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_DECREMENTER] = sregs->u.e.ivor_low[10];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_FIT] = sregs->u.e.ivor_low[11];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_WATCHDOG] = sregs->u.e.ivor_low[12];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_DTLB_MISS] = sregs->u.e.ivor_low[13];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_ITLB_MISS] = sregs->u.e.ivor_low[14];
+        vcpu->arch.ivor[BOOKE_IRQPRIO_DEBUG] = sregs->u.e.ivor_low[15];
+
+        return 0;
+}
+
 int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
                                   struct kvm_sregs *sregs)
 {
-        return -ENOTSUPP;
+        sregs->pvr = vcpu->arch.pvr;
+
+        get_sregs_base(vcpu, sregs);
+        get_sregs_arch206(vcpu, sregs);
+        kvmppc_core_get_sregs(vcpu, sregs);
+        return 0;
 }
 
 int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
                                   struct kvm_sregs *sregs)
 {
-        return -ENOTSUPP;
+        int ret;
+
+        if (vcpu->arch.pvr != sregs->pvr)
+                return -EINVAL;
+
+        ret = set_sregs_base(vcpu, sregs);
+        if (ret < 0)
+                return ret;
+
+        ret = set_sregs_arch206(vcpu, sregs);
+        if (ret < 0)
+                return ret;
+
+        return kvmppc_core_set_sregs(vcpu, sregs);
 }
 
 int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)
diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S
index 1cc471faac2d..b58ccae95904 100644
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@ -380,7 +380,6 @@ lightweight_exit:
          * because host interrupt handlers would get confused. */
         lwz     r1, VCPU_GPR(r1)(r4)
 
-        /* XXX handle USPRG0 */
         /* Host interrupt handlers may have clobbered these guest-readable
          * SPRGs, so we need to reload them here with the guest's values. */
         lwz     r3, VCPU_SPRG4(r4)
diff --git a/arch/powerpc/kvm/e500.c b/arch/powerpc/kvm/e500.c
index e3768ee9b595..318dbc61ba44 100644
--- a/arch/powerpc/kvm/e500.c
+++ b/arch/powerpc/kvm/e500.c
@@ -63,6 +63,7 @@ int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu)
 
         /* Registers init */
         vcpu->arch.pvr = mfspr(SPRN_PVR);
+        vcpu_e500->svr = mfspr(SPRN_SVR);
 
         /* Since booke kvm only support one core, update all vcpus' PIR to 0 */
         vcpu->vcpu_id = 0;
@@ -96,6 +97,81 @@ int kvmppc_core_vcpu_translate(struct kvm_vcpu *vcpu,
         return 0;
 }
 
+void kvmppc_core_get_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+        struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);
+
+        sregs->u.e.features |= KVM_SREGS_E_ARCH206_MMU | KVM_SREGS_E_SPE |
+                               KVM_SREGS_E_PM;
+        sregs->u.e.impl_id = KVM_SREGS_E_IMPL_FSL;
+
+        sregs->u.e.impl.fsl.features = 0;
+        sregs->u.e.impl.fsl.svr = vcpu_e500->svr;
+        sregs->u.e.impl.fsl.hid0 = vcpu_e500->hid0;
+        sregs->u.e.impl.fsl.mcar = vcpu_e500->mcar;
+
+        sregs->u.e.mas0 = vcpu_e500->mas0;
+        sregs->u.e.mas1 = vcpu_e500->mas1;
+        sregs->u.e.mas2 = vcpu_e500->mas2;
+        sregs->u.e.mas7_3 = ((u64)vcpu_e500->mas7 << 32) | vcpu_e500->mas3;
+        sregs->u.e.mas4 = vcpu_e500->mas4;
+        sregs->u.e.mas6 = vcpu_e500->mas6;
+
+        sregs->u.e.mmucfg = mfspr(SPRN_MMUCFG);
+        sregs->u.e.tlbcfg[0] = vcpu_e500->tlb0cfg;
+        sregs->u.e.tlbcfg[1] = vcpu_e500->tlb1cfg;
+        sregs->u.e.tlbcfg[2] = 0;
+        sregs->u.e.tlbcfg[3] = 0;
+
+        sregs->u.e.ivor_high[0] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL];
+        sregs->u.e.ivor_high[1] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA];
+        sregs->u.e.ivor_high[2] = vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND];
+        sregs->u.e.ivor_high[3] =
+                vcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR];
+
+        kvmppc_get_sregs_ivor(vcpu, sregs);
+}
+
+int kvmppc_core_set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
+{
+        struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);
+
+        if (sregs->u.e.impl_id == KVM_SREGS_E_IMPL_FSL) {
+                vcpu_e500->svr = sregs->u.e.impl.fsl.svr;
+                vcpu_e500->hid0 = sregs->u.e.impl.fsl.hid0;
+                vcpu_e500->mcar = sregs->u.e.impl.fsl.mcar;
+        }
+
+        if (sregs->u.e.features & KVM_SREGS_E_ARCH206_MMU) {
+                vcpu_e500->mas0 = sregs->u.e.mas0;
+                vcpu_e500->mas1 = sregs->u.e.mas1;
+                vcpu_e500->mas2 = sregs->u.e.mas2;
+                vcpu_e500->mas7 = sregs->u.e.mas7_3 >> 32;
+                vcpu_e500->mas3 = (u32)sregs->u.e.mas7_3;
+                vcpu_e500->mas4 = sregs->u.e.mas4;
+                vcpu_e500->mas6 = sregs->u.e.mas6;
+        }
+
+        if (!(sregs->u.e.features & KVM_SREGS_E_IVOR))
+                return 0;
+
+        if (sregs->u.e.features & KVM_SREGS_E_SPE) {
+                vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_UNAVAIL] =
+                        sregs->u.e.ivor_high[0];
+                vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_DATA] =
+                        sregs->u.e.ivor_high[1];
+                vcpu->arch.ivor[BOOKE_IRQPRIO_SPE_FP_ROUND] =
+                        sregs->u.e.ivor_high[2];
+        }
+
+        if (sregs->u.e.features & KVM_SREGS_E_PM) {
+                vcpu->arch.ivor[BOOKE_IRQPRIO_PERFORMANCE_MONITOR] =
+                        sregs->u.e.ivor_high[3];
+        }
+
+        return kvmppc_set_sregs_ivor(vcpu, sregs);
+}
+
 struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
 {
         struct kvmppc_vcpu_e500 *vcpu_e500;
diff --git a/arch/powerpc/kvm/e500_emulate.c b/arch/powerpc/kvm/e500_emulate.c
index 8e3edfbc9634..69cd665a0caf 100644
--- a/arch/powerpc/kvm/e500_emulate.c
+++ b/arch/powerpc/kvm/e500_emulate.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (C) 2008-2011 Freescale Semiconductor, Inc. All rights reserved.
  *
  * Author: Yu Liu, <yu.liu@freescale.com>
  *
@@ -78,8 +78,7 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, int rs)
 
         switch (sprn) {
         case SPRN_PID:
-                vcpu_e500->pid[0] = vcpu->arch.shadow_pid =
-                        vcpu->arch.pid = spr_val;
+                kvmppc_set_pid(vcpu, spr_val);
                 break;
         case SPRN_PID1:
                 vcpu_e500->pid[1] = spr_val; break;
@@ -175,6 +174,8 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, int rt)
                 kvmppc_set_gpr(vcpu, rt, vcpu_e500->hid0); break;
         case SPRN_HID1:
                 kvmppc_set_gpr(vcpu, rt, vcpu_e500->hid1); break;
+        case SPRN_SVR:
+                kvmppc_set_gpr(vcpu, rt, vcpu_e500->svr); break;
 
         case SPRN_MMUCSR0:
                 kvmppc_set_gpr(vcpu, rt, 0); break;
diff --git a/arch/powerpc/kvm/e500_tlb.c b/arch/powerpc/kvm/e500_tlb.c
index d6d6d47a75a9..b18fe353397d 100644
--- a/arch/powerpc/kvm/e500_tlb.c
+++ b/arch/powerpc/kvm/e500_tlb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (C) 2008-2011 Freescale Semiconductor, Inc. All rights reserved.
  *
  * Author: Yu Liu, yu.liu@freescale.com
  *
@@ -24,6 +24,7 @@
 #include "../mm/mmu_decl.h"
 #include "e500_tlb.h"
 #include "trace.h"
+#include "timing.h"
 
 #define to_htlb1_esel(esel) (tlb1_entry_num - (esel) - 1)
 
@@ -506,6 +507,7 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, int rb)
                 vcpu_e500->mas7 = 0;
         }
 
+        kvmppc_set_exit_type(vcpu, EMULATED_TLBSX_EXITS);
         return EMULATE_DONE;
 }
 
@@ -571,6 +573,7 @@ int kvmppc_e500_emul_tlbwe(struct kvm_vcpu *vcpu)
                 write_host_tlbe(vcpu_e500, stlbsel, sesel);
         }
 
+        kvmppc_set_exit_type(vcpu, EMULATED_TLBWE_EXITS);
         return EMULATE_DONE;
 }
 
@@ -672,6 +675,14 @@ int kvmppc_e500_tlb_search(struct kvm_vcpu *vcpu,
         return -1;
 }
 
+void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 pid)
+{
+        struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);
+
+        vcpu_e500->pid[0] = vcpu->arch.shadow_pid =
+                vcpu->arch.pid = pid;
+}
+
 void kvmppc_e500_tlb_setup(struct kvmppc_vcpu_e500 *vcpu_e500)
 {
         struct tlbe *tlbe;
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index c64fd2909bb2..141dce3c6810 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -114,6 +114,12 @@ void kvmppc_emulate_dec(struct kvm_vcpu *vcpu)
         }
 }
 
+u32 kvmppc_get_dec(struct kvm_vcpu *vcpu, u64 tb)
+{
+        u64 jd = tb - vcpu->arch.dec_jiffies;
+        return vcpu->arch.dec - jd;
+}
+
 /* XXX to do:
  * lhax
  * lhaux
@@ -279,11 +285,8 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
 
                         case SPRN_DEC:
                         {
-                                u64 jd = get_tb() - vcpu->arch.dec_jiffies;
-                                kvmppc_set_gpr(vcpu, rt, vcpu->arch.dec - jd);
-                                pr_debug("mfDEC: %x - %llx = %lx\n",
-                                         vcpu->arch.dec, jd,
-                                         kvmppc_get_gpr(vcpu, rt));
+                                kvmppc_set_gpr(vcpu, rt,
+                                               kvmppc_get_dec(vcpu, get_tb()));
                                 break;
                         }
                         default:
@@ -294,6 +297,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                                 }
                                 break;
                         }
+                        kvmppc_set_exit_type(vcpu, EMULATED_MFSPR_EXITS);
                         break;
 
                 case OP_31_XOP_STHX:
@@ -363,6 +367,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu)
                                         printk("mtspr: unknown spr %x\n", sprn);
                                 break;
                         }
+                        kvmppc_set_exit_type(vcpu, EMULATED_MTSPR_EXITS);
                         break;
 
                 case OP_31_XOP_DCBI:
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 99758460efde..616dd516ca1f 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -175,7 +175,11 @@ int kvm_dev_ioctl_check_extension(long ext)
         int r;
 
         switch (ext) {
+#ifdef CONFIG_BOOKE
+        case KVM_CAP_PPC_BOOKE_SREGS:
+#else
         case KVM_CAP_PPC_SEGSTATE:
+#endif
         case KVM_CAP_PPC_PAIRED_SINGLES:
         case KVM_CAP_PPC_UNSET_IRQ:
         case KVM_CAP_PPC_IRQ_LEVEL:
@@ -284,6 +288,10 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
         tasklet_init(&vcpu->arch.tasklet, kvmppc_decrementer_func, (ulong)vcpu);
         vcpu->arch.dec_timer.function = kvmppc_decrementer_wakeup;
 
+#ifdef CONFIG_KVM_EXIT_TIMING
+        mutex_init(&vcpu->arch.exit_timing_lock);
+#endif
+
         return 0;
 }
 
@@ -294,12 +302,25 @@ void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu)
 
 void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 {
+#ifdef CONFIG_BOOKE
+        /*
+         * vrsave (formerly usprg0) isn't used by Linux, but may
+         * be used by the guest.
+         *
+         * On non-booke this is associated with Altivec and
+         * is handled by code in book3s.c.
+         */
+        mtspr(SPRN_VRSAVE, vcpu->arch.vrsave);
+#endif
         kvmppc_core_vcpu_load(vcpu, cpu);
 }
 
 void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
 {
         kvmppc_core_vcpu_put(vcpu);
+#ifdef CONFIG_BOOKE
+        vcpu->arch.vrsave = mfspr(SPRN_VRSAVE);
+#endif
 }
 
 int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
diff --git a/arch/powerpc/kvm/timing.c b/arch/powerpc/kvm/timing.c
index a021f5827a33..319177df9587 100644
--- a/arch/powerpc/kvm/timing.c
+++ b/arch/powerpc/kvm/timing.c
@@ -34,8 +34,8 @@ void kvmppc_init_timing_stats(struct kvm_vcpu *vcpu)
 {
         int i;
 
-        /* pause guest execution to avoid concurrent updates */
-        mutex_lock(&vcpu->mutex);
+        /* Take a lock to avoid concurrent updates */
+        mutex_lock(&vcpu->arch.exit_timing_lock);
 
         vcpu->arch.last_exit_type = 0xDEAD;
         for (i = 0; i < __NUMBER_OF_KVM_EXIT_TYPES; i++) {
@@ -49,7 +49,7 @@ void kvmppc_init_timing_stats(struct kvm_vcpu *vcpu)
         vcpu->arch.timing_exit.tv64 = 0;
         vcpu->arch.timing_last_enter.tv64 = 0;
 
-        mutex_unlock(&vcpu->mutex);
+        mutex_unlock(&vcpu->arch.exit_timing_lock);
 }
 
 static void add_exit_timing(struct kvm_vcpu *vcpu, u64 duration, int type)
@@ -65,6 +65,8 @@ static void add_exit_timing(struct kvm_vcpu *vcpu, u64 duration, int type)
                 return;
         }
 
+        mutex_lock(&vcpu->arch.exit_timing_lock);
+
         vcpu->arch.timing_count_type[type]++;
 
         /* sum */
@@ -93,6 +95,8 @@ static void add_exit_timing(struct kvm_vcpu *vcpu, u64 duration, int type)
                 vcpu->arch.timing_min_duration[type] = duration;
         if (unlikely(duration > vcpu->arch.timing_max_duration[type]))
                 vcpu->arch.timing_max_duration[type] = duration;
+
+        mutex_unlock(&vcpu->arch.exit_timing_lock);
 }
 
 void kvmppc_update_timing_stats(struct kvm_vcpu *vcpu)
@@ -147,17 +151,30 @@ static int kvmppc_exit_timing_show(struct seq_file *m, void *private)
 {
         struct kvm_vcpu *vcpu = m->private;
         int i;
+        u64 min, max, sum, sum_quad;
 
         seq_printf(m, "%s", "type       count   min     max     sum     sum_squared\n");
 
+
         for (i = 0; i < __NUMBER_OF_KVM_EXIT_TYPES; i++) {
+
+                min = vcpu->arch.timing_min_duration[i];
+                do_div(min, tb_ticks_per_usec);
+                max = vcpu->arch.timing_max_duration[i];
+                do_div(max, tb_ticks_per_usec);
+                sum = vcpu->arch.timing_sum_duration[i];
+                do_div(sum, tb_ticks_per_usec);
+                sum_quad = vcpu->arch.timing_sum_quad_duration[i];
+                do_div(sum_quad, tb_ticks_per_usec);
+
                 seq_printf(m, "%12s     %10d    %10lld  %10lld  %20lld  %20lld\n",
                         kvm_exit_names[i],
                         vcpu->arch.timing_count_type[i],
-                        vcpu->arch.timing_min_duration[i],
-                        vcpu->arch.timing_max_duration[i],
-                        vcpu->arch.timing_sum_duration[i],
-                        vcpu->arch.timing_sum_quad_duration[i]);
+                        min,
+                        max,
+                        sum,
+                        sum_quad);
+
         }
         return 0;
 }
diff --git a/arch/powerpc/lib/alloc.c b/arch/powerpc/lib/alloc.c
index f53e09c7dac7..13b676c20d12 100644
--- a/arch/powerpc/lib/alloc.c
+++ b/arch/powerpc/lib/alloc.c
@@ -6,14 +6,6 @@
 
 #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;
diff --git a/arch/powerpc/lib/copypage_64.S b/arch/powerpc/lib/copypage_64.S
index 4d4eeb900486..53dcb6b1b708 100644
--- a/arch/powerpc/lib/copypage_64.S
+++ b/arch/powerpc/lib/copypage_64.S
@@ -6,6 +6,7 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  */
+#include <asm/page.h>
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
@@ -15,9 +16,9 @@ PPC64_CACHES:
         .tc             ppc64_caches[TC],ppc64_caches
         .section        ".text"
 
-
-_GLOBAL(copy_4K_page)
-        li      r5,4096         /* 4K page size */
+_GLOBAL(copy_page)
+        lis     r5,PAGE_SIZE@h
+        ori     r5,r5,PAGE_SIZE@l
 BEGIN_FTR_SECTION
         ld      r10,PPC64_CACHES@toc(r2)
         lwz     r11,DCACHEL1LOGLINESIZE(r10)    /* log2 of cache line size */
diff --git a/arch/powerpc/lib/devres.c b/arch/powerpc/lib/devres.c
index deac4d30daf4..e91615abae66 100644
--- a/arch/powerpc/lib/devres.c
+++ b/arch/powerpc/lib/devres.c
@@ -9,11 +9,11 @@
 
 #include <linux/device.h>       /* devres_*(), devm_ioremap_release() */
 #include <linux/gfp.h>
-#include <linux/io.h>           /* ioremap_flags() */
+#include <linux/io.h>           /* ioremap_prot() */
 #include <linux/module.h>       /* EXPORT_SYMBOL() */
 
 /**
- * devm_ioremap_prot - Managed ioremap_flags()
+ * devm_ioremap_prot - Managed ioremap_prot()
  * @dev: Generic device to remap IO address for
  * @offset: BUS offset to map
  * @size: Size of map
@@ -31,7 +31,7 @@ void __iomem *devm_ioremap_prot(struct device *dev, resource_size_t offset,
         if (!ptr)
                 return NULL;
 
-        addr = ioremap_flags(offset, size, flags);
+        addr = ioremap_prot(offset, size, flags);
         if (addr) {
                 *ptr = addr;
                 devres_add(dev, ptr);
diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index ae5189ab0049..9a52349874ee 100644
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/kprobes.h>
 #include <linux/ptrace.h>
+#include <linux/prefetch.h>
 #include <asm/sstep.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
@@ -45,6 +46,18 @@ extern int do_stxvd2x(int rn, unsigned long ea);
 #endif
 
 /*
+ * Emulate the truncation of 64 bit values in 32-bit mode.
+ */
+static unsigned long truncate_if_32bit(unsigned long msr, unsigned long val)
+{
+#ifdef __powerpc64__
+        if ((msr & MSR_64BIT) == 0)
+                val &= 0xffffffffUL;
+#endif
+        return val;
+}
+
+/*
  * Determine whether a conditional branch instruction would branch.
  */
 static int __kprobes branch_taken(unsigned int instr, struct pt_regs *regs)
@@ -90,11 +103,8 @@ static unsigned long __kprobes dform_ea(unsigned int instr, struct pt_regs *regs
                 if (instr & 0x04000000)         /* update forms */
                         regs->gpr[ra] = ea;
         }
-#ifdef __powerpc64__
-        if (!(regs->msr & MSR_SF))
-                ea &= 0xffffffffUL;
-#endif
-        return ea;
+
+        return truncate_if_32bit(regs->msr, ea);
 }
 
 #ifdef __powerpc64__
@@ -113,9 +123,8 @@ static unsigned long __kprobes dsform_ea(unsigned int instr, struct pt_regs *reg
                 if ((instr & 3) == 1)           /* update forms */
                         regs->gpr[ra] = ea;
         }
-        if (!(regs->msr & MSR_SF))
-                ea &= 0xffffffffUL;
-        return ea;
+
+        return truncate_if_32bit(regs->msr, ea);
 }
 #endif /* __powerpc64 */
 
@@ -136,11 +145,8 @@ static unsigned long __kprobes xform_ea(unsigned int instr, struct pt_regs *regs
                 if (do_update)          /* update forms */
                         regs->gpr[ra] = ea;
         }
-#ifdef __powerpc64__
-        if (!(regs->msr & MSR_SF))
-                ea &= 0xffffffffUL;
-#endif
-        return ea;
+
+        return truncate_if_32bit(regs->msr, ea);
 }
 
 /*
@@ -466,7 +472,7 @@ static void __kprobes set_cr0(struct pt_regs *regs, int rd)
 
         regs->ccr = (regs->ccr & 0x0fffffff) | ((regs->xer >> 3) & 0x10000000);
 #ifdef __powerpc64__
-        if (!(regs->msr & MSR_SF))
+        if (!(regs->msr & MSR_64BIT))
                 val = (int) val;
 #endif
         if (val < 0)
@@ -487,7 +493,7 @@ static void __kprobes add_with_carry(struct pt_regs *regs, int rd,
                 ++val;
         regs->gpr[rd] = val;
 #ifdef __powerpc64__
-        if (!(regs->msr & MSR_SF)) {
+        if (!(regs->msr & MSR_64BIT)) {
                 val = (unsigned int) val;
                 val1 = (unsigned int) val1;
         }
@@ -570,8 +576,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                 if ((instr & 2) == 0)
                         imm += regs->nip;
                 regs->nip += 4;
-                if ((regs->msr & MSR_SF) == 0)
-                        regs->nip &= 0xffffffffUL;
+                regs->nip = truncate_if_32bit(regs->msr, regs->nip);
                 if (instr & 1)
                         regs->link = regs->nip;
                 if (branch_taken(instr, regs))
@@ -604,13 +609,9 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                         imm -= 0x04000000;
                 if ((instr & 2) == 0)
                         imm += regs->nip;
-                if (instr & 1) {
-                        regs->link = regs->nip + 4;
-                        if ((regs->msr & MSR_SF) == 0)
-                                regs->link &= 0xffffffffUL;
-                }
-                if ((regs->msr & MSR_SF) == 0)
-                        imm &= 0xffffffffUL;
+                if (instr & 1)
+                        regs->link = truncate_if_32bit(regs->msr, regs->nip + 4);
+                imm = truncate_if_32bit(regs->msr, imm);
                 regs->nip = imm;
                 return 1;
         case 19:
@@ -618,11 +619,8 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                 case 16:        /* bclr */
                 case 528:       /* bcctr */
                         imm = (instr & 0x400)? regs->ctr: regs->link;
-                        regs->nip += 4;
-                        if ((regs->msr & MSR_SF) == 0) {
-                                regs->nip &= 0xffffffffUL;
-                                imm &= 0xffffffffUL;
-                        }
+                        regs->nip = truncate_if_32bit(regs->msr, regs->nip + 4);
+                        imm = truncate_if_32bit(regs->msr, imm);
                         if (instr & 1)
                                 regs->link = regs->nip;
                         if (branch_taken(instr, regs))
@@ -1616,11 +1614,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                 return 0;       /* invoke DSI if -EFAULT? */
         }
  instr_done:
-        regs->nip += 4;
-#ifdef __powerpc64__
-        if ((regs->msr & MSR_SF) == 0)
-                regs->nip &= 0xffffffffUL;
-#endif
+        regs->nip = truncate_if_32bit(regs->msr, regs->nip + 4);
         return 1;
 
  logical_done:
diff --git a/arch/powerpc/mm/hash_low_64.S b/arch/powerpc/mm/hash_low_64.S
index 5b7dd4ea02b5..a242b5d7cbe4 100644
--- a/arch/powerpc/mm/hash_low_64.S
+++ b/arch/powerpc/mm/hash_low_64.S
@@ -118,7 +118,7 @@ _GLOBAL(__hash_page_4K)
 BEGIN_FTR_SECTION
         cmpdi   r9,0                    /* check segment size */
         bne     3f
-END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
+END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
         /* Calc va and put it in r29 */
         rldicr  r29,r5,28,63-28
         rldicl  r3,r3,0,36
@@ -401,7 +401,7 @@ _GLOBAL(__hash_page_4K)
 BEGIN_FTR_SECTION
         cmpdi   r9,0                    /* check segment size */
         bne     3f
-END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
+END_MMU_FTR_SECTION_IFSET(MMU_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) */
@@ -715,7 +715,7 @@ BEGIN_FTR_SECTION
         andi.   r0,r31,_PAGE_NO_CACHE
         /* If so, bail out and refault as a 4k page */
         bne-    ht64_bail_ok
-END_FTR_SECTION_IFCLR(CPU_FTR_CI_LARGE_PAGE)
+END_MMU_FTR_SECTION_IFCLR(MMU_FTR_CI_LARGE_PAGE)
         /* Prepare new PTE value (turn access RW into DIRTY, then
          * add BUSY and ACCESSED)
          */
@@ -736,7 +736,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_CI_LARGE_PAGE)
 BEGIN_FTR_SECTION
         cmpdi   r9,0                    /* check segment size */
         bne     3f
-END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
+END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
         /* Calc va and put it in r29 */
         rldicr  r29,r5,28,63-28
         rldicl  r3,r3,0,36
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index 784a400e0781..dfd764896db0 100644
--- a/arch/powerpc/mm/hash_native_64.c
+++ b/arch/powerpc/mm/hash_native_64.c
@@ -50,9 +50,8 @@ static inline void __tlbie(unsigned long va, int psize, int ssize)
         case MMU_PAGE_4K:
                 va &= ~0xffful;
                 va |= ssize << 8;
-                asm volatile(ASM_MMU_FTR_IFCLR("tlbie %0,0", PPC_TLBIE(%1,%0),
-                                               %2)
-                             : : "r" (va), "r"(0), "i" (MMU_FTR_TLBIE_206)
+                asm volatile(ASM_FTR_IFCLR("tlbie %0,0", PPC_TLBIE(%1,%0), %2)
+                             : : "r" (va), "r"(0), "i" (CPU_FTR_HVMODE_206)
                              : "memory");
                 break;
         default:
@@ -61,9 +60,8 @@ static inline void __tlbie(unsigned long va, int psize, int ssize)
                 va |= penc << 12;
                 va |= ssize << 8;
                 va |= 1; /* L */
-                asm volatile(ASM_MMU_FTR_IFCLR("tlbie %0,1", PPC_TLBIE(%1,%0),
-                                               %2)
-                             : : "r" (va), "r"(0), "i" (MMU_FTR_TLBIE_206)
+                asm volatile(ASM_FTR_IFCLR("tlbie %0,1", PPC_TLBIE(%1,%0), %2)
+                             : : "r" (va), "r"(0), "i" (CPU_FTR_HVMODE_206)
                              : "memory");
                 break;
         }
@@ -98,8 +96,8 @@ static inline void __tlbiel(unsigned long va, int psize, int ssize)
 
 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);
+        unsigned int use_local = local && mmu_has_feature(MMU_FTR_TLBIEL);
+        int lock_tlbie = !mmu_has_feature(MMU_FTR_LOCKLESS_TLBIE);
 
         if (use_local)
                 use_local = mmu_psize_defs[psize].tlbiel;
@@ -503,7 +501,7 @@ static void native_flush_hash_range(unsigned long number, int local)
                 } pte_iterate_hashed_end();
         }
 
-        if (cpu_has_feature(CPU_FTR_TLBIEL) &&
+        if (mmu_has_feature(MMU_FTR_TLBIEL) &&
             mmu_psize_defs[psize].tlbiel && local) {
                 asm volatile("ptesync":::"memory");
                 for (i = 0; i < number; i++) {
@@ -517,7 +515,7 @@ static void native_flush_hash_range(unsigned long number, int local)
                 }
                 asm volatile("ptesync":::"memory");
         } else {
-                int lock_tlbie = !cpu_has_feature(CPU_FTR_LOCKLESS_TLBIE);
+                int lock_tlbie = !mmu_has_feature(MMU_FTR_LOCKLESS_TLBIE);
 
                 if (lock_tlbie)
                         raw_spin_lock(&native_tlbie_lock);
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 58a022d0f463..26b2872b3d00 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -53,6 +53,7 @@
 #include <asm/sections.h>
 #include <asm/spu.h>
 #include <asm/udbg.h>
+#include <asm/code-patching.h>
 
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
@@ -258,11 +259,11 @@ static int __init htab_dt_scan_seg_sizes(unsigned long node,
         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;
+                        cur_cpu_spec->mmu_features |= MMU_FTR_1T_SEGMENT;
                         return 1;
                 }
         }
-        cur_cpu_spec->cpu_features &= ~CPU_FTR_NO_SLBIE_B;
+        cur_cpu_spec->mmu_features &= ~MMU_FTR_NO_SLBIE_B;
         return 0;
 }
 
@@ -288,7 +289,7 @@ static int __init htab_dt_scan_page_sizes(unsigned long node,
         if (prop != NULL) {
                 DBG("Page sizes from device-tree:\n");
                 size /= 4;
-                cur_cpu_spec->cpu_features &= ~(CPU_FTR_16M_PAGE);
+                cur_cpu_spec->mmu_features &= ~(MMU_FTR_16M_PAGE);
                 while(size > 0) {
                         unsigned int shift = prop[0];
                         unsigned int slbenc = prop[1];
@@ -316,7 +317,7 @@ static int __init htab_dt_scan_page_sizes(unsigned long node,
                                 break;
                         case 0x18:
                                 idx = MMU_PAGE_16M;
-                                cur_cpu_spec->cpu_features |= CPU_FTR_16M_PAGE;
+                                cur_cpu_spec->mmu_features |= MMU_FTR_16M_PAGE;
                                 break;
                         case 0x22:
                                 idx = MMU_PAGE_16G;
@@ -411,7 +412,7 @@ static void __init htab_init_page_sizes(void)
          * Not in the device-tree, let's fallback on known size
          * list for 16M capable GP & GR
          */
-        if (cpu_has_feature(CPU_FTR_16M_PAGE))
+        if (mmu_has_feature(MMU_FTR_16M_PAGE))
                 memcpy(mmu_psize_defs, mmu_psize_defaults_gp,
                        sizeof(mmu_psize_defaults_gp));
  found:
@@ -441,7 +442,7 @@ static void __init htab_init_page_sizes(void)
                 mmu_vmalloc_psize = MMU_PAGE_64K;
                 if (mmu_linear_psize == MMU_PAGE_4K)
                         mmu_linear_psize = MMU_PAGE_64K;
-                if (cpu_has_feature(CPU_FTR_CI_LARGE_PAGE)) {
+                if (mmu_has_feature(MMU_FTR_CI_LARGE_PAGE)) {
                         /*
                          * Don't use 64k pages for ioremap on pSeries, since
                          * that would stop us accessing the HEA ethernet.
@@ -547,15 +548,7 @@ int remove_section_mapping(unsigned long start, unsigned long end)
 }
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
-static inline void make_bl(unsigned int *insn_addr, void *func)
-{
-        unsigned long funcp = *((unsigned long *)func);
-        int offset = funcp - (unsigned long)insn_addr;
-
-        *insn_addr = (unsigned int)(0x48000001 | (offset & 0x03fffffc));
-        flush_icache_range((unsigned long)insn_addr, 4+
-                           (unsigned long)insn_addr);
-}
+#define FUNCTION_TEXT(A)        ((*(unsigned long *)(A)))
 
 static void __init htab_finish_init(void)
 {
@@ -570,16 +563,33 @@ static void __init htab_finish_init(void)
         extern unsigned int *ht64_call_hpte_remove;
         extern unsigned int *ht64_call_hpte_updatepp;
 
-        make_bl(ht64_call_hpte_insert1, ppc_md.hpte_insert);
-        make_bl(ht64_call_hpte_insert2, ppc_md.hpte_insert);
-        make_bl(ht64_call_hpte_remove, ppc_md.hpte_remove);
-        make_bl(ht64_call_hpte_updatepp, ppc_md.hpte_updatepp);
+        patch_branch(ht64_call_hpte_insert1,
+                FUNCTION_TEXT(ppc_md.hpte_insert),
+                BRANCH_SET_LINK);
+        patch_branch(ht64_call_hpte_insert2,
+                FUNCTION_TEXT(ppc_md.hpte_insert),
+                BRANCH_SET_LINK);
+        patch_branch(ht64_call_hpte_remove,
+                FUNCTION_TEXT(ppc_md.hpte_remove),
+                BRANCH_SET_LINK);
+        patch_branch(ht64_call_hpte_updatepp,
+                FUNCTION_TEXT(ppc_md.hpte_updatepp),
+                BRANCH_SET_LINK);
+
 #endif /* CONFIG_PPC_HAS_HASH_64K */
 
-        make_bl(htab_call_hpte_insert1, ppc_md.hpte_insert);
-        make_bl(htab_call_hpte_insert2, ppc_md.hpte_insert);
-        make_bl(htab_call_hpte_remove, ppc_md.hpte_remove);
-        make_bl(htab_call_hpte_updatepp, ppc_md.hpte_updatepp);
+        patch_branch(htab_call_hpte_insert1,
+                FUNCTION_TEXT(ppc_md.hpte_insert),
+                BRANCH_SET_LINK);
+        patch_branch(htab_call_hpte_insert2,
+                FUNCTION_TEXT(ppc_md.hpte_insert),
+                BRANCH_SET_LINK);
+        patch_branch(htab_call_hpte_remove,
+                FUNCTION_TEXT(ppc_md.hpte_remove),
+                BRANCH_SET_LINK);
+        patch_branch(htab_call_hpte_updatepp,
+                FUNCTION_TEXT(ppc_md.hpte_updatepp),
+                BRANCH_SET_LINK);
 }
 
 static void __init htab_initialize(void)
@@ -598,7 +608,7 @@ static void __init htab_initialize(void)
         /* Initialize page sizes */
         htab_init_page_sizes();
 
-        if (cpu_has_feature(CPU_FTR_1T_SEGMENT)) {
+        if (mmu_has_feature(MMU_FTR_1T_SEGMENT)) {
                 mmu_kernel_ssize = MMU_SEGSIZE_1T;
                 mmu_highuser_ssize = MMU_SEGSIZE_1T;
                 printk(KERN_INFO "Using 1TB segments\n");
@@ -739,7 +749,7 @@ void __init early_init_mmu(void)
 
         /* Initialize stab / SLB management except on iSeries
          */
-        if (cpu_has_feature(CPU_FTR_SLB))
+        if (mmu_has_feature(MMU_FTR_SLB))
                 slb_initialize();
         else if (!firmware_has_feature(FW_FEATURE_ISERIES))
                 stab_initialize(get_paca()->stab_real);
@@ -756,7 +766,7 @@ void __cpuinit early_init_mmu_secondary(void)
          * in real mode on pSeries and we want a virtual address on
          * iSeries anyway
          */
-        if (cpu_has_feature(CPU_FTR_SLB))
+        if (mmu_has_feature(MMU_FTR_SLB))
                 slb_initialize();
         else
                 stab_initialize(get_paca()->stab_addr);
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 9bb249c3046e..0b9a5c1901b9 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -529,7 +529,7 @@ static int __init hugetlbpage_init(void)
 {
         int psize;
 
-        if (!cpu_has_feature(CPU_FTR_16M_PAGE))
+        if (!mmu_has_feature(MMU_FTR_16M_PAGE))
                 return -ENODEV;
 
         for (psize = 0; psize < MMU_PAGE_COUNT; ++psize) {
diff --git a/arch/powerpc/mm/mmu_context_hash64.c b/arch/powerpc/mm/mmu_context_hash64.c
index 2535828aa84b..3bafc3deca6d 100644
--- a/arch/powerpc/mm/mmu_context_hash64.c
+++ b/arch/powerpc/mm/mmu_context_hash64.c
@@ -20,9 +20,205 @@
 #include <linux/idr.h>
 #include <linux/module.h>
 #include <linux/gfp.h>
+#include <linux/slab.h>
 
 #include <asm/mmu_context.h>
 
+#ifdef CONFIG_PPC_ICSWX
+/*
+ * The processor and its L2 cache cause the icswx instruction to
+ * generate a COP_REQ transaction on PowerBus. The transaction has
+ * no address, and the processor does not perform an MMU access
+ * to authenticate the transaction. The command portion of the
+ * PowerBus COP_REQ transaction includes the LPAR_ID (LPID) and
+ * the coprocessor Process ID (PID), which the coprocessor compares
+ * to the authorized LPID and PID held in the coprocessor, to determine
+ * if the process is authorized to generate the transaction.
+ * The data of the COP_REQ transaction is 128-byte or less and is
+ * placed in cacheable memory on a 128-byte cache line boundary.
+ *
+ * The task to use a coprocessor should use use_cop() to allocate
+ * a coprocessor PID before executing icswx instruction. use_cop()
+ * also enables the coprocessor context switching. Drop_cop() is
+ * used to free the coprocessor PID.
+ *
+ * Example:
+ * Host Fabric Interface (HFI) is a PowerPC network coprocessor.
+ * Each HFI have multiple windows. Each HFI window serves as a
+ * network device sending to and receiving from HFI network.
+ * HFI immediate send function uses icswx instruction. The immediate
+ * send function allows small (single cache-line) packets be sent
+ * without using the regular HFI send FIFO and doorbell, which are
+ * much slower than immediate send.
+ *
+ * For each task intending to use HFI immediate send, the HFI driver
+ * calls use_cop() to obtain a coprocessor PID for the task.
+ * The HFI driver then allocate a free HFI window and save the
+ * coprocessor PID to the HFI window to allow the task to use the
+ * HFI window.
+ *
+ * The HFI driver repeatedly creates immediate send packets and
+ * issues icswx instruction to send data through the HFI window.
+ * The HFI compares the coprocessor PID in the CPU PID register
+ * to the PID held in the HFI window to determine if the transaction
+ * is allowed.
+ *
+ * When the task to release the HFI window, the HFI driver calls
+ * drop_cop() to release the coprocessor PID.
+ */
+
+#define COP_PID_NONE 0
+#define COP_PID_MIN (COP_PID_NONE + 1)
+#define COP_PID_MAX (0xFFFF)
+
+static DEFINE_SPINLOCK(mmu_context_acop_lock);
+static DEFINE_IDA(cop_ida);
+
+void switch_cop(struct mm_struct *next)
+{
+        mtspr(SPRN_PID, next->context.cop_pid);
+        mtspr(SPRN_ACOP, next->context.acop);
+}
+
+static int new_cop_pid(struct ida *ida, int min_id, int max_id,
+                       spinlock_t *lock)
+{
+        int index;
+        int err;
+
+again:
+        if (!ida_pre_get(ida, GFP_KERNEL))
+                return -ENOMEM;
+
+        spin_lock(lock);
+        err = ida_get_new_above(ida, min_id, &index);
+        spin_unlock(lock);
+
+        if (err == -EAGAIN)
+                goto again;
+        else if (err)
+                return err;
+
+        if (index > max_id) {
+                spin_lock(lock);
+                ida_remove(ida, index);
+                spin_unlock(lock);
+                return -ENOMEM;
+        }
+
+        return index;
+}
+
+static void sync_cop(void *arg)
+{
+        struct mm_struct *mm = arg;
+
+        if (mm == current->active_mm)
+                switch_cop(current->active_mm);
+}
+
+/**
+ * Start using a coprocessor.
+ * @acop: mask of coprocessor to be used.
+ * @mm: The mm the coprocessor to associate with. Most likely current mm.
+ *
+ * Return a positive PID if successful. Negative errno otherwise.
+ * The returned PID will be fed to the coprocessor to determine if an
+ * icswx transaction is authenticated.
+ */
+int use_cop(unsigned long acop, struct mm_struct *mm)
+{
+        int ret;
+
+        if (!cpu_has_feature(CPU_FTR_ICSWX))
+                return -ENODEV;
+
+        if (!mm || !acop)
+                return -EINVAL;
+
+        /* We need to make sure mm_users doesn't change */
+        down_read(&mm->mmap_sem);
+        spin_lock(mm->context.cop_lockp);
+
+        if (mm->context.cop_pid == COP_PID_NONE) {
+                ret = new_cop_pid(&cop_ida, COP_PID_MIN, COP_PID_MAX,
+                                  &mmu_context_acop_lock);
+                if (ret < 0)
+                        goto out;
+
+                mm->context.cop_pid = ret;
+        }
+        mm->context.acop |= acop;
+
+        sync_cop(mm);
+
+        /*
+         * If this is a threaded process then there might be other threads
+         * running. We need to send an IPI to force them to pick up any
+         * change in PID and ACOP.
+         */
+        if (atomic_read(&mm->mm_users) > 1)
+                smp_call_function(sync_cop, mm, 1);
+
+        ret = mm->context.cop_pid;
+
+out:
+        spin_unlock(mm->context.cop_lockp);
+        up_read(&mm->mmap_sem);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(use_cop);
+
+/**
+ * Stop using a coprocessor.
+ * @acop: mask of coprocessor to be stopped.
+ * @mm: The mm the coprocessor associated with.
+ */
+void drop_cop(unsigned long acop, struct mm_struct *mm)
+{
+        int free_pid = COP_PID_NONE;
+
+        if (!cpu_has_feature(CPU_FTR_ICSWX))
+                return;
+
+        if (WARN_ON_ONCE(!mm))
+                return;
+
+        /* We need to make sure mm_users doesn't change */
+        down_read(&mm->mmap_sem);
+        spin_lock(mm->context.cop_lockp);
+
+        mm->context.acop &= ~acop;
+
+        if ((!mm->context.acop) && (mm->context.cop_pid != COP_PID_NONE)) {
+                free_pid = mm->context.cop_pid;
+                mm->context.cop_pid = COP_PID_NONE;
+        }
+
+        sync_cop(mm);
+
+        /*
+         * If this is a threaded process then there might be other threads
+         * running. We need to send an IPI to force them to pick up any
+         * change in PID and ACOP.
+         */
+        if (atomic_read(&mm->mm_users) > 1)
+                smp_call_function(sync_cop, mm, 1);
+
+        if (free_pid != COP_PID_NONE) {
+                spin_lock(&mmu_context_acop_lock);
+                ida_remove(&cop_ida, free_pid);
+                spin_unlock(&mmu_context_acop_lock);
+        }
+
+        spin_unlock(mm->context.cop_lockp);
+        up_read(&mm->mmap_sem);
+}
+EXPORT_SYMBOL_GPL(drop_cop);
+
+#endif /* CONFIG_PPC_ICSWX */
+
 static DEFINE_SPINLOCK(mmu_context_lock);
 static DEFINE_IDA(mmu_context_ida);
 
@@ -31,7 +227,6 @@ static DEFINE_IDA(mmu_context_ida);
  * Each segment contains 2^28 bytes.  Each context maps 2^44 bytes,
  * so we can support 2^19-1 contexts (19 == 35 + 28 - 44).
  */
-#define NO_CONTEXT      0
 #define MAX_CONTEXT     ((1UL << 19) - 1)
 
 int __init_new_context(void)
@@ -79,6 +274,16 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
                 slice_set_user_psize(mm, mmu_virtual_psize);
         subpage_prot_init_new_context(mm);
         mm->context.id = index;
+#ifdef CONFIG_PPC_ICSWX
+        mm->context.cop_lockp = kmalloc(sizeof(spinlock_t), GFP_KERNEL);
+        if (!mm->context.cop_lockp) {
+                __destroy_context(index);
+                subpage_prot_free(mm);
+                mm->context.id = MMU_NO_CONTEXT;
+                return -ENOMEM;
+        }
+        spin_lock_init(mm->context.cop_lockp);
+#endif /* CONFIG_PPC_ICSWX */
 
         return 0;
 }
@@ -93,7 +298,12 @@ EXPORT_SYMBOL_GPL(__destroy_context);
 
 void destroy_context(struct mm_struct *mm)
 {
+#ifdef CONFIG_PPC_ICSWX
+        drop_cop(mm->context.acop, mm);
+        kfree(mm->context.cop_lockp);
+        mm->context.cop_lockp = NULL;
+#endif /* CONFIG_PPC_ICSWX */
         __destroy_context(mm->context.id);
         subpage_prot_free(mm);
-        mm->context.id = NO_CONTEXT;
+        mm->context.id = MMU_NO_CONTEXT;
 }
diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c
index c0aab52da3a5..336807de550e 100644
--- a/arch/powerpc/mm/mmu_context_nohash.c
+++ b/arch/powerpc/mm/mmu_context_nohash.c
@@ -338,12 +338,14 @@ static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
                 return NOTIFY_OK;
 
         switch (action) {
-        case CPU_ONLINE:
-        case CPU_ONLINE_FROZEN:
+        case CPU_UP_PREPARE:
+        case CPU_UP_PREPARE_FROZEN:
                 pr_devel("MMU: Allocating stale context map for CPU %d\n", cpu);
                 stale_map[cpu] = kzalloc(CTX_MAP_SIZE, GFP_KERNEL);
                 break;
 #ifdef CONFIG_HOTPLUG_CPU
+        case CPU_UP_CANCELED:
+        case CPU_UP_CANCELED_FROZEN:
         case CPU_DEAD:
         case CPU_DEAD_FROZEN:
                 pr_devel("MMU: Freeing stale context map for CPU %d\n", cpu);
@@ -407,7 +409,17 @@ void __init mmu_context_init(void)
         } else if (mmu_has_feature(MMU_FTR_TYPE_47x)) {
                 first_context = 1;
                 last_context = 65535;
-        } else {
+        } else
+#ifdef CONFIG_PPC_BOOK3E_MMU
+        if (mmu_has_feature(MMU_FTR_TYPE_3E)) {
+                u32 mmucfg = mfspr(SPRN_MMUCFG);
+                u32 pid_bits = (mmucfg & MMUCFG_PIDSIZE_MASK)
+                                >> MMUCFG_PIDSIZE_SHIFT;
+                first_context = 1;
+                last_context = (1UL << (pid_bits + 1)) - 1;
+        } else
+#endif
+        {
                 first_context = 1;
                 last_context = 255;
         }
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 5ec1dad2a19d..2164006fe170 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -311,14 +311,13 @@ EXPORT_SYMBOL_GPL(of_node_to_nid);
 static int __init find_min_common_depth(void)
 {
         int depth;
-        struct device_node *rtas_root;
         struct device_node *chosen;
+        struct device_node *root;
         const char *vec5;
 
-        rtas_root = of_find_node_by_path("/rtas");
-
-        if (!rtas_root)
-                return -1;
+        root = of_find_node_by_path("/rtas");
+        if (!root)
+                root = of_find_node_by_path("/");
 
         /*
          * This property is a set of 32-bit integers, each representing
@@ -332,7 +331,7 @@ static int __init find_min_common_depth(void)
          * NUMA boundary and the following are progressively less significant
          * boundaries. There can be more than one level of NUMA.
          */
-        distance_ref_points = of_get_property(rtas_root,
+        distance_ref_points = of_get_property(root,
                                         "ibm,associativity-reference-points",
                                         &distance_ref_points_depth);
 
@@ -376,11 +375,11 @@ static int __init find_min_common_depth(void)
                 distance_ref_points_depth = MAX_DISTANCE_REF_POINTS;
         }
 
-        of_node_put(rtas_root);
+        of_node_put(root);
         return depth;
 
 err:
-        of_node_put(rtas_root);
+        of_node_put(root);
         return -1;
 }
 
@@ -1453,7 +1452,7 @@ int arch_update_cpu_topology(void)
         unsigned int associativity[VPHN_ASSOC_BUFSIZE] = {0};
         struct sys_device *sysdev;
 
-        for_each_cpu_mask(cpu, cpu_associativity_changes_mask) {
+        for_each_cpu(cpu,&cpu_associativity_changes_mask) {
                 vphn_get_associativity(cpu, associativity);
                 nid = associativity_to_nid(associativity);
 
diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c
index 6a3997f98dfb..af40c8768a78 100644
--- a/arch/powerpc/mm/pgtable.c
+++ b/arch/powerpc/mm/pgtable.c
@@ -33,110 +33,6 @@
 
 #include "mmu_decl.h"
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
-#ifdef CONFIG_SMP
-
-/*
- * Handle batching of page table freeing on SMP. Page tables are
- * queued up and send to be freed later by RCU in order to avoid
- * freeing a page table page that is being walked without locks
- */
-
-static DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);
-static unsigned long pte_freelist_forced_free;
-
-struct pte_freelist_batch
-{
-        struct rcu_head rcu;
-        unsigned int    index;
-        unsigned long   tables[0];
-};
-
-#define PTE_FREELIST_SIZE \
-        ((PAGE_SIZE - sizeof(struct pte_freelist_batch)) \
-          / sizeof(unsigned long))
-
-static void pte_free_smp_sync(void *arg)
-{
-        /* Do nothing, just ensure we sync with all CPUs */
-}
-
-/* This is only called when we are critically out of memory
- * (and fail to get a page in pte_free_tlb).
- */
-static void pgtable_free_now(void *table, unsigned shift)
-{
-        pte_freelist_forced_free++;
-
-        smp_call_function(pte_free_smp_sync, NULL, 1);
-
-        pgtable_free(table, shift);
-}
-
-static void pte_free_rcu_callback(struct rcu_head *head)
-{
-        struct pte_freelist_batch *batch =
-                container_of(head, struct pte_freelist_batch, rcu);
-        unsigned int i;
-
-        for (i = 0; i < batch->index; i++) {
-                void *table = (void *)(batch->tables[i] & ~MAX_PGTABLE_INDEX_SIZE);
-                unsigned shift = batch->tables[i] & MAX_PGTABLE_INDEX_SIZE;
-
-                pgtable_free(table, shift);
-        }
-
-        free_page((unsigned long)batch);
-}
-
-static void pte_free_submit(struct pte_freelist_batch *batch)
-{
-        call_rcu_sched(&batch->rcu, pte_free_rcu_callback);
-}
-
-void pgtable_free_tlb(struct mmu_gather *tlb, void *table, unsigned shift)
-{
-        /* This is safe since tlb_gather_mmu has disabled preemption */
-        struct pte_freelist_batch **batchp = &__get_cpu_var(pte_freelist_cur);
-        unsigned long pgf;
-
-        if (atomic_read(&tlb->mm->mm_users) < 2 ||
-            cpumask_equal(mm_cpumask(tlb->mm), cpumask_of(smp_processor_id()))){
-                pgtable_free(table, shift);
-                return;
-        }
-
-        if (*batchp == NULL) {
-                *batchp = (struct pte_freelist_batch *)__get_free_page(GFP_ATOMIC);
-                if (*batchp == NULL) {
-                        pgtable_free_now(table, shift);
-                        return;
-                }
-                (*batchp)->index = 0;
-        }
-        BUG_ON(shift > MAX_PGTABLE_INDEX_SIZE);
-        pgf = (unsigned long)table | shift;
-        (*batchp)->tables[(*batchp)->index++] = pgf;
-        if ((*batchp)->index == PTE_FREELIST_SIZE) {
-                pte_free_submit(*batchp);
-                *batchp = NULL;
-        }
-}
-
-void pte_free_finish(void)
-{
-        /* This is safe since tlb_gather_mmu has disabled preemption */
-        struct pte_freelist_batch **batchp = &__get_cpu_var(pte_freelist_cur);
-
-        if (*batchp == NULL)
-                return;
-        pte_free_submit(*batchp);
-        *batchp = NULL;
-}
-
-#endif /* CONFIG_SMP */
-
 static inline int is_exec_fault(void)
 {
         return current->thread.regs && TRAP(current->thread.regs) == 0x400;
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 8dc41c0157fe..51f87956f8f8 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -133,7 +133,15 @@ ioremap(phys_addr_t addr, unsigned long size)
 EXPORT_SYMBOL(ioremap);
 
 void __iomem *
-ioremap_flags(phys_addr_t addr, unsigned long size, unsigned long flags)
+ioremap_wc(phys_addr_t addr, unsigned long size)
+{
+        return __ioremap_caller(addr, size, _PAGE_NO_CACHE,
+                                __builtin_return_address(0));
+}
+EXPORT_SYMBOL(ioremap_wc);
+
+void __iomem *
+ioremap_prot(phys_addr_t addr, unsigned long size, unsigned long flags)
 {
         /* writeable implies dirty for kernel addresses */
         if (flags & _PAGE_RW)
@@ -152,7 +160,7 @@ ioremap_flags(phys_addr_t addr, unsigned long size, unsigned long flags)
 
         return __ioremap_caller(addr, size, flags, __builtin_return_address(0));
 }
-EXPORT_SYMBOL(ioremap_flags);
+EXPORT_SYMBOL(ioremap_prot);
 
 void __iomem *
 __ioremap(phys_addr_t addr, unsigned long size, unsigned long flags)
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index 88927a05cdc2..6e595f6496d4 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -255,7 +255,17 @@ void __iomem * ioremap(phys_addr_t addr, unsigned long size)
         return __ioremap_caller(addr, size, flags, caller);
 }
 
-void __iomem * ioremap_flags(phys_addr_t addr, unsigned long size,
+void __iomem * ioremap_wc(phys_addr_t addr, unsigned long size)
+{
+        unsigned long flags = _PAGE_NO_CACHE;
+        void *caller = __builtin_return_address(0);
+
+        if (ppc_md.ioremap)
+                return ppc_md.ioremap(addr, size, flags, caller);
+        return __ioremap_caller(addr, size, flags, caller);
+}
+
+void __iomem * ioremap_prot(phys_addr_t addr, unsigned long size,
                              unsigned long flags)
 {
         void *caller = __builtin_return_address(0);
@@ -311,7 +321,8 @@ void iounmap(volatile void __iomem *token)
 }
 
 EXPORT_SYMBOL(ioremap);
-EXPORT_SYMBOL(ioremap_flags);
+EXPORT_SYMBOL(ioremap_wc);
+EXPORT_SYMBOL(ioremap_prot);
 EXPORT_SYMBOL(__ioremap);
 EXPORT_SYMBOL(__ioremap_at);
 EXPORT_SYMBOL(iounmap);
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index 1d98ecc8eecd..e22276cb67a4 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -24,6 +24,7 @@
 #include <asm/firmware.h>
 #include <linux/compiler.h>
 #include <asm/udbg.h>
+#include <asm/code-patching.h>
 
 
 extern void slb_allocate_realmode(unsigned long ea);
@@ -166,7 +167,7 @@ static inline int esids_match(unsigned long addr1, unsigned long addr2)
         int esid_1t_count;
 
         /* System is not 1T segment size capable. */
-        if (!cpu_has_feature(CPU_FTR_1T_SEGMENT))
+        if (!mmu_has_feature(MMU_FTR_1T_SEGMENT))
                 return (GET_ESID(addr1) == GET_ESID(addr2));
 
         esid_1t_count = (((addr1 >> SID_SHIFT_1T) != 0) +
@@ -201,7 +202,7 @@ void switch_slb(struct task_struct *tsk, struct mm_struct *mm)
          */
         hard_irq_disable();
         offset = get_paca()->slb_cache_ptr;
-        if (!cpu_has_feature(CPU_FTR_NO_SLBIE_B) &&
+        if (!mmu_has_feature(MMU_FTR_NO_SLBIE_B) &&
             offset <= SLB_CACHE_ENTRIES) {
                 int i;
                 asm volatile("isync" : : : "memory");
@@ -249,9 +250,8 @@ void switch_slb(struct task_struct *tsk, struct mm_struct *mm)
 static inline void patch_slb_encoding(unsigned int *insn_addr,
                                       unsigned int immed)
 {
-        *insn_addr = (*insn_addr & 0xffff0000) | immed;
-        flush_icache_range((unsigned long)insn_addr, 4+
-                           (unsigned long)insn_addr);
+        int insn = (*insn_addr & 0xffff0000) | immed;
+        patch_instruction(insn_addr, insn);
 }
 
 void slb_set_size(u16 size)
diff --git a/arch/powerpc/mm/slb_low.S b/arch/powerpc/mm/slb_low.S
index 95ce35581696..ef653dc95b65 100644
--- a/arch/powerpc/mm/slb_low.S
+++ b/arch/powerpc/mm/slb_low.S
@@ -58,7 +58,7 @@ _GLOBAL(slb_miss_kernel_load_linear)
         li      r11,0
 BEGIN_FTR_SECTION
         b       slb_finish_load
-END_FTR_SECTION_IFCLR(CPU_FTR_1T_SEGMENT)
+END_MMU_FTR_SECTION_IFCLR(MMU_FTR_1T_SEGMENT)
         b       slb_finish_load_1T
 
 1:
@@ -87,7 +87,7 @@ _GLOBAL(slb_miss_kernel_load_vmemmap)
 6:
 BEGIN_FTR_SECTION
         b       slb_finish_load
-END_FTR_SECTION_IFCLR(CPU_FTR_1T_SEGMENT)
+END_MMU_FTR_SECTION_IFCLR(MMU_FTR_1T_SEGMENT)
         b       slb_finish_load_1T
 
 0:      /* user address: proto-VSID = context << 15 | ESID. First check
@@ -138,11 +138,11 @@ END_FTR_SECTION_IFCLR(CPU_FTR_1T_SEGMENT)
         ld      r9,PACACONTEXTID(r13)
 BEGIN_FTR_SECTION
         cmpldi  r10,0x1000
-END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
+END_MMU_FTR_SECTION_IFSET(MMU_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)
+END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
         b       slb_finish_load
 
 8:      /* invalid EA */
diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c
index 446a01842a73..41e31642a86a 100644
--- a/arch/powerpc/mm/stab.c
+++ b/arch/powerpc/mm/stab.c
@@ -243,7 +243,7 @@ void __init stabs_alloc(void)
 {
         int cpu;
 
-        if (cpu_has_feature(CPU_FTR_SLB))
+        if (mmu_has_feature(MMU_FTR_SLB))
                 return;
 
         for_each_possible_cpu(cpu) {
diff --git a/arch/powerpc/mm/tlb_hash32.c b/arch/powerpc/mm/tlb_hash32.c
index 690566b66e8e..27b863c14941 100644
--- a/arch/powerpc/mm/tlb_hash32.c
+++ b/arch/powerpc/mm/tlb_hash32.c
@@ -71,9 +71,6 @@ void tlb_flush(struct mmu_gather *tlb)
                  */
                 _tlbia();
         }
-
-        /* Push out batch of freed page tables */
-        pte_free_finish();
 }
 
 /*
diff --git a/arch/powerpc/mm/tlb_hash64.c b/arch/powerpc/mm/tlb_hash64.c
index c14d09f614f3..31f18207970b 100644
--- a/arch/powerpc/mm/tlb_hash64.c
+++ b/arch/powerpc/mm/tlb_hash64.c
@@ -155,7 +155,7 @@ void __flush_tlb_pending(struct ppc64_tlb_batch *batch)
 
 void tlb_flush(struct mmu_gather *tlb)
 {
-        struct ppc64_tlb_batch *tlbbatch = &__get_cpu_var(ppc64_tlb_batch);
+        struct ppc64_tlb_batch *tlbbatch = &get_cpu_var(ppc64_tlb_batch);
 
         /* If there's a TLB batch pending, then we must flush it because the
          * pages are going to be freed and we really don't want to have a CPU
@@ -164,8 +164,7 @@ void tlb_flush(struct mmu_gather *tlb)
         if (tlbbatch->index)
                 __flush_tlb_pending(tlbbatch);
 
-        /* Push out batch of freed page tables */
-        pte_free_finish();
+        put_cpu_var(ppc64_tlb_batch);
 }
 
 /**
diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c
index 2a030d89bbc6..0bdad3aecc67 100644
--- a/arch/powerpc/mm/tlb_nohash.c
+++ b/arch/powerpc/mm/tlb_nohash.c
@@ -299,9 +299,6 @@ EXPORT_SYMBOL(flush_tlb_range);
 void tlb_flush(struct mmu_gather *tlb)
 {
         flush_tlb_mm(tlb->mm);
-
-        /* Push out batch of freed page tables */
-        pte_free_finish();
 }
 
 /*
diff --git a/arch/powerpc/platforms/44x/iss4xx.c b/arch/powerpc/platforms/44x/iss4xx.c
index aa46e9d1e771..19395f18b1db 100644
--- a/arch/powerpc/platforms/44x/iss4xx.c
+++ b/arch/powerpc/platforms/44x/iss4xx.c
@@ -87,7 +87,7 @@ static void __cpuinit smp_iss4xx_setup_cpu(int cpu)
         mpic_setup_this_cpu();
 }
 
-static void __cpuinit smp_iss4xx_kick_cpu(int cpu)
+static int __cpuinit smp_iss4xx_kick_cpu(int cpu)
 {
         struct device_node *cpunode = of_get_cpu_node(cpu, NULL);
         const u64 *spin_table_addr_prop;
@@ -104,7 +104,7 @@ static void __cpuinit smp_iss4xx_kick_cpu(int cpu)
                                                NULL);
         if (spin_table_addr_prop == NULL) {
                 pr_err("CPU%d: Can't start, missing cpu-release-addr !\n", cpu);
-                return;
+                return -ENOENT;
         }
 
         /* Assume it's mapped as part of the linear mapping. This is a bit
@@ -117,6 +117,8 @@ static void __cpuinit smp_iss4xx_kick_cpu(int cpu)
         smp_wmb();
         spin_table[1] = __pa(start_secondary_47x);
         mb();
+
+        return 0;
 }
 
 static struct smp_ops_t iss_smp_ops = {
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
index cfc4b2009982..9f09319352c0 100644
--- a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
@@ -61,7 +61,7 @@ irq_to_pic_bit(unsigned int irq)
 static void
 cpld_mask_irq(struct irq_data *d)
 {
-        unsigned int cpld_irq = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int cpld_irq = (unsigned int)irqd_to_hwirq(d);
         void __iomem *pic_mask = irq_to_pic_mask(cpld_irq);
 
         out_8(pic_mask,
@@ -71,7 +71,7 @@ cpld_mask_irq(struct irq_data *d)
 static void
 cpld_unmask_irq(struct irq_data *d)
 {
-        unsigned int cpld_irq = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int cpld_irq = (unsigned int)irqd_to_hwirq(d);
         void __iomem *pic_mask = irq_to_pic_mask(cpld_irq);
 
         out_8(pic_mask,
@@ -97,7 +97,7 @@ cpld_pic_get_irq(int offset, u8 ignore, u8 __iomem *statusp,
         status |= (ignore | mask);
 
         if (status == 0xff)
-                return NO_IRQ_IGNORE;
+                return NO_IRQ;
 
         cpld_irq = ffz(status) + offset;
 
@@ -109,14 +109,14 @@ cpld_pic_cascade(unsigned int irq, struct irq_desc *desc)
 {
         irq = cpld_pic_get_irq(0, PCI_IGNORE, &cpld_regs->pci_status,
                 &cpld_regs->pci_mask);
-        if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) {
+        if (irq != NO_IRQ) {
                 generic_handle_irq(irq);
                 return;
         }
 
         irq = cpld_pic_get_irq(8, MISC_IGNORE, &cpld_regs->misc_status,
                 &cpld_regs->misc_mask);
-        if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) {
+        if (irq != NO_IRQ) {
                 generic_handle_irq(irq);
                 return;
         }
diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index 57a6a349e932..96f85e5e0cd3 100644
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -56,7 +56,7 @@ static void media5200_irq_unmask(struct irq_data *d)
 
         spin_lock_irqsave(&media5200_irq.lock, flags);
         val = in_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE);
-        val |= 1 << (MEDIA5200_IRQ_SHIFT + irq_map[d->irq].hwirq);
+        val |= 1 << (MEDIA5200_IRQ_SHIFT + irqd_to_hwirq(d));
         out_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE, val);
         spin_unlock_irqrestore(&media5200_irq.lock, flags);
 }
@@ -68,7 +68,7 @@ static void media5200_irq_mask(struct irq_data *d)
 
         spin_lock_irqsave(&media5200_irq.lock, flags);
         val = in_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE);
-        val &= ~(1 << (MEDIA5200_IRQ_SHIFT + irq_map[d->irq].hwirq));
+        val &= ~(1 << (MEDIA5200_IRQ_SHIFT + irqd_to_hwirq(d)));
         out_be32(media5200_irq.regs + MEDIA5200_IRQ_ENABLE, val);
         spin_unlock_irqrestore(&media5200_irq.lock, flags);
 }
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index 1dd15400f6f0..1a9a49570579 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -157,48 +157,30 @@ static inline void io_be_clrbit(u32 __iomem *addr, int bitno)
  */
 static void mpc52xx_extirq_mask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[d->irq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_clrbit(&intr->ctrl, 11 - l2irq);
 }
 
 static void mpc52xx_extirq_unmask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[d->irq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_setbit(&intr->ctrl, 11 - l2irq);
 }
 
 static void mpc52xx_extirq_ack(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[d->irq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_setbit(&intr->ctrl, 27-l2irq);
 }
 
 static int mpc52xx_extirq_set_type(struct irq_data *d, unsigned int flow_type)
 {
         u32 ctrl_reg, type;
-        int irq;
-        int l2irq;
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         void *handler = handle_level_irq;
 
-        irq = irq_map[d->irq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
-        pr_debug("%s: irq=%x. l2=%d flow_type=%d\n", __func__, irq, l2irq, flow_type);
+        pr_debug("%s: irq=%x. l2=%d flow_type=%d\n", __func__,
+                (int) irqd_to_hwirq(d), l2irq, flow_type);
 
         switch (flow_type) {
         case IRQF_TRIGGER_HIGH: type = 0; break;
@@ -237,23 +219,13 @@ static int mpc52xx_null_set_type(struct irq_data *d, unsigned int flow_type)
 
 static void mpc52xx_main_mask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[d->irq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_setbit(&intr->main_mask, 16 - l2irq);
 }
 
 static void mpc52xx_main_unmask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[d->irq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_clrbit(&intr->main_mask, 16 - l2irq);
 }
 
@@ -270,23 +242,13 @@ static struct irq_chip mpc52xx_main_irqchip = {
  */
 static void mpc52xx_periph_mask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[d->irq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_setbit(&intr->per_mask, 31 - l2irq);
 }
 
 static void mpc52xx_periph_unmask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[d->irq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_clrbit(&intr->per_mask, 31 - l2irq);
 }
 
@@ -303,34 +265,19 @@ static struct irq_chip mpc52xx_periph_irqchip = {
  */
 static void mpc52xx_sdma_mask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[d->irq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_setbit(&sdma->IntMask, l2irq);
 }
 
 static void mpc52xx_sdma_unmask(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[d->irq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         io_be_clrbit(&sdma->IntMask, l2irq);
 }
 
 static void mpc52xx_sdma_ack(struct irq_data *d)
 {
-        int irq;
-        int l2irq;
-
-        irq = irq_map[d->irq].hwirq;
-        l2irq = irq & MPC52xx_IRQ_L2_MASK;
-
+        int l2irq = irqd_to_hwirq(d) & MPC52xx_IRQ_L2_MASK;
         out_be32(&sdma->IntPend, 1 << l2irq);
 }
 
@@ -539,7 +486,7 @@ void __init mpc52xx_init_irq(void)
 unsigned int mpc52xx_get_irq(void)
 {
         u32 status;
-        int irq = NO_IRQ_IGNORE;
+        int irq;
 
         status = in_be32(&intr->enc_status);
         if (status & 0x00000400) {      /* critical */
@@ -562,6 +509,8 @@ unsigned int mpc52xx_get_irq(void)
                 } else {
                         irq |= (MPC52xx_IRQ_L1_PERP << MPC52xx_IRQ_L1_OFFSET);
                 }
+        } else {
+                return NO_IRQ;
         }
 
         return irq_linear_revmap(mpc52xx_irqhost, irq);
diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
index 4a4eb6ffa12f..8ccf9ed62fe2 100644
--- a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
+++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
@@ -42,7 +42,7 @@ struct pq2ads_pci_pic {
 static void pq2ads_pci_mask_irq(struct irq_data *d)
 {
         struct pq2ads_pci_pic *priv = irq_data_get_irq_chip_data(d);
-        int irq = NUM_IRQS - virq_to_hw(d->irq) - 1;
+        int irq = NUM_IRQS - irqd_to_hwirq(d) - 1;
 
         if (irq != -1) {
                 unsigned long flags;
@@ -58,7 +58,7 @@ static void pq2ads_pci_mask_irq(struct irq_data *d)
 static void pq2ads_pci_unmask_irq(struct irq_data *d)
 {
         struct pq2ads_pci_pic *priv = irq_data_get_irq_chip_data(d);
-        int irq = NUM_IRQS - virq_to_hw(d->irq) - 1;
+        int irq = NUM_IRQS - irqd_to_hwirq(d) - 1;
 
         if (irq != -1) {
                 unsigned long flags;
@@ -112,16 +112,8 @@ static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
         return 0;
 }
 
-static void pci_host_unmap(struct irq_host *h, unsigned int virq)
-{
-        /* remove chip and handler */
-        irq_set_chip_data(virq, NULL);
-        irq_set_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)
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index 0d00ff9d05a0..d6a93a10c0f5 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -41,7 +41,7 @@ extern void __early_start(void);
 #define NUM_BOOT_ENTRY          8
 #define SIZE_BOOT_ENTRY         (NUM_BOOT_ENTRY * sizeof(u32))
 
-static void __init
+static int __init
 smp_85xx_kick_cpu(int nr)
 {
         unsigned long flags;
@@ -60,7 +60,7 @@ smp_85xx_kick_cpu(int nr)
 
         if (cpu_rel_addr == NULL) {
                 printk(KERN_ERR "No cpu-release-addr for cpu %d\n", nr);
-                return;
+                return -ENOENT;
         }
 
         /*
@@ -107,6 +107,8 @@ smp_85xx_kick_cpu(int nr)
                 iounmap(bptr_vaddr);
 
         pr_debug("waited %d msecs for CPU #%d.\n", n, nr);
+
+        return 0;
 }
 
 static void __init
@@ -233,8 +235,10 @@ void __init mpc85xx_smp_init(void)
                 smp_85xx_ops.message_pass = smp_mpic_message_pass;
         }
 
-        if (cpu_has_feature(CPU_FTR_DBELL))
-                smp_85xx_ops.message_pass = doorbell_message_pass;
+        if (cpu_has_feature(CPU_FTR_DBELL)) {
+                smp_85xx_ops.message_pass = smp_muxed_ipi_message_pass;
+                smp_85xx_ops.cause_ipi = doorbell_cause_ipi;
+        }
 
         BUG_ON(!smp_85xx_ops.message_pass);
 
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
index db864623b4ae..12cb9bb2cc68 100644
--- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -48,8 +48,6 @@ static struct socrates_fpga_irq_info fpga_irqs[SOCRATES_FPGA_NUM_IRQS] = {
         [8] = {0, IRQ_TYPE_LEVEL_HIGH},
 };
 
-#define socrates_fpga_irq_to_hw(virq)    ((unsigned int)irq_map[virq].hwirq)
-
 static DEFINE_RAW_SPINLOCK(socrates_fpga_pic_lock);
 
 static void __iomem *socrates_fpga_pic_iobase;
@@ -110,11 +108,9 @@ void socrates_fpga_pic_cascade(unsigned int irq, struct irq_desc *desc)
 static void socrates_fpga_pic_ack(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq, irq_line;
+        unsigned int irq_line, hwirq = irqd_to_hwirq(d);
         uint32_t mask;
 
-        hwirq = socrates_fpga_irq_to_hw(d->irq);
-
         irq_line = fpga_irqs[hwirq].irq_line;
         raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
         mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
@@ -127,12 +123,10 @@ static void socrates_fpga_pic_ack(struct irq_data *d)
 static void socrates_fpga_pic_mask(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         int irq_line;
         u32 mask;
 
-        hwirq = socrates_fpga_irq_to_hw(d->irq);
-
         irq_line = fpga_irqs[hwirq].irq_line;
         raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
         mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
@@ -145,12 +139,10 @@ static void socrates_fpga_pic_mask(struct irq_data *d)
 static void socrates_fpga_pic_mask_ack(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         int irq_line;
         u32 mask;
 
-        hwirq = socrates_fpga_irq_to_hw(d->irq);
-
         irq_line = fpga_irqs[hwirq].irq_line;
         raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
         mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
@@ -164,12 +156,10 @@ static void socrates_fpga_pic_mask_ack(struct irq_data *d)
 static void socrates_fpga_pic_unmask(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         int irq_line;
         u32 mask;
 
-        hwirq = socrates_fpga_irq_to_hw(d->irq);
-
         irq_line = fpga_irqs[hwirq].irq_line;
         raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
         mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
@@ -182,12 +172,10 @@ static void socrates_fpga_pic_unmask(struct irq_data *d)
 static void socrates_fpga_pic_eoi(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         int irq_line;
         u32 mask;
 
-        hwirq = socrates_fpga_irq_to_hw(d->irq);
-
         irq_line = fpga_irqs[hwirq].irq_line;
         raw_spin_lock_irqsave(&socrates_fpga_pic_lock, flags);
         mask = socrates_fpga_pic_read(FPGA_PIC_IRQMASK(irq_line))
@@ -201,12 +189,10 @@ static int socrates_fpga_pic_set_type(struct irq_data *d,
                 unsigned int flow_type)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         int polarity;
         u32 mask;
 
-        hwirq = socrates_fpga_irq_to_hw(d->irq);
-
         if (fpga_irqs[hwirq].type != IRQ_TYPE_NONE)
                 return -EINVAL;
 
diff --git a/arch/powerpc/platforms/86xx/gef_pic.c b/arch/powerpc/platforms/86xx/gef_pic.c
index 0beec7d5566b..94594e58594c 100644
--- a/arch/powerpc/platforms/86xx/gef_pic.c
+++ b/arch/powerpc/platforms/86xx/gef_pic.c
@@ -46,8 +46,6 @@
 #define GEF_PIC_CPU0_MCP_MASK   GEF_PIC_MCP_MASK(0)
 #define GEF_PIC_CPU1_MCP_MASK   GEF_PIC_MCP_MASK(1)
 
-#define gef_irq_to_hw(virq)    ((unsigned int)irq_map[virq].hwirq)
-
 
 static DEFINE_RAW_SPINLOCK(gef_pic_lock);
 
@@ -113,11 +111,9 @@ void gef_pic_cascade(unsigned int irq, struct irq_desc *desc)
 static void gef_pic_mask(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         u32 mask;
 
-        hwirq = gef_irq_to_hw(d->irq);
-
         raw_spin_lock_irqsave(&gef_pic_lock, flags);
         mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));
         mask &= ~(1 << hwirq);
@@ -136,11 +132,9 @@ static void gef_pic_mask_ack(struct irq_data *d)
 static void gef_pic_unmask(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int hwirq;
+        unsigned int hwirq = irqd_to_hwirq(d);
         u32 mask;
 
-        hwirq = gef_irq_to_hw(d->irq);
-
         raw_spin_lock_irqsave(&gef_pic_lock, flags);
         mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));
         mask |= (1 << hwirq);
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 018cc67be426..a896511690c2 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -66,7 +66,7 @@ static void __init mpc8610_suspend_init(void)
                 return;
         }
 
-        ret = request_irq(irq, mpc8610_sw9_irq, 0, "sw9/wakeup", NULL);
+        ret = request_irq(irq, mpc8610_sw9_irq, 0, "sw9:wakeup", NULL);
         if (ret) {
                 pr_err("%s: can't request pixis event IRQ: %d\n",
                        __func__, ret);
@@ -105,45 +105,77 @@ machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);
 
 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
 
-static u32 get_busfreq(void)
-{
-        struct device_node *node;
-
-        u32 fs_busfreq = 0;
-        node = of_find_node_by_type(NULL, "cpu");
-        if (node) {
-                unsigned int size;
-                const unsigned int *prop =
-                        of_get_property(node, "bus-frequency", &size);
-                if (prop)
-                        fs_busfreq = *prop;
-                of_node_put(node);
-        };
-        return fs_busfreq;
-}
+/*
+ * DIU Area Descriptor
+ *
+ * The MPC8610 reference manual shows the bits of the AD register in
+ * little-endian order, which causes the BLUE_C field to be split into two
+ * parts. To simplify the definition of the MAKE_AD() macro, we define the
+ * fields in big-endian order and byte-swap the result.
+ *
+ * So even though the registers don't look like they're in the
+ * same bit positions as they are on the P1022, the same value is written to
+ * the AD register on the MPC8610 and on the P1022.
+ */
+#define AD_BYTE_F               0x10000000
+#define AD_ALPHA_C_MASK         0x0E000000
+#define AD_ALPHA_C_SHIFT        25
+#define AD_BLUE_C_MASK          0x01800000
+#define AD_BLUE_C_SHIFT         23
+#define AD_GREEN_C_MASK         0x00600000
+#define AD_GREEN_C_SHIFT        21
+#define AD_RED_C_MASK           0x00180000
+#define AD_RED_C_SHIFT          19
+#define AD_PALETTE              0x00040000
+#define AD_PIXEL_S_MASK         0x00030000
+#define AD_PIXEL_S_SHIFT        16
+#define AD_COMP_3_MASK          0x0000F000
+#define AD_COMP_3_SHIFT         12
+#define AD_COMP_2_MASK          0x00000F00
+#define AD_COMP_2_SHIFT         8
+#define AD_COMP_1_MASK          0x000000F0
+#define AD_COMP_1_SHIFT         4
+#define AD_COMP_0_MASK          0x0000000F
+#define AD_COMP_0_SHIFT         0
+
+#define MAKE_AD(alpha, red, blue, green, size, c0, c1, c2, c3) \
+        cpu_to_le32(AD_BYTE_F | (alpha << AD_ALPHA_C_SHIFT) | \
+        (blue << AD_BLUE_C_SHIFT) | (green << AD_GREEN_C_SHIFT) | \
+        (red << AD_RED_C_SHIFT) | (c3 << AD_COMP_3_SHIFT) | \
+        (c2 << AD_COMP_2_SHIFT) | (c1 << AD_COMP_1_SHIFT) | \
+        (c0 << AD_COMP_0_SHIFT) | (size << AD_PIXEL_S_SHIFT))
 
 unsigned int mpc8610hpcd_get_pixel_format(unsigned int bits_per_pixel,
                                                 int monitor_port)
 {
         static const unsigned long pixelformat[][3] = {
-                {0x88882317, 0x88083218, 0x65052119},
-                {0x88883316, 0x88082219, 0x65053118},
+                {
+                        MAKE_AD(3, 0, 2, 1, 3, 8, 8, 8, 8),
+                        MAKE_AD(4, 2, 0, 1, 2, 8, 8, 8, 0),
+                        MAKE_AD(4, 0, 2, 1, 1, 5, 6, 5, 0)
+                },
+                {
+                        MAKE_AD(3, 2, 0, 1, 3, 8, 8, 8, 8),
+                        MAKE_AD(4, 0, 2, 1, 2, 8, 8, 8, 0),
+                        MAKE_AD(4, 2, 0, 1, 1, 5, 6, 5, 0)
+                },
         };
-        unsigned int pix_fmt, arch_monitor;
+        unsigned int arch_monitor;
 
+        /* The DVI port is mis-wired on revision 1 of this board. */
         arch_monitor = ((*pixis_arch == 0x01) && (monitor_port == 0))? 0 : 1;
-                /* DVI port for board version 0x01 */
-
-        if (bits_per_pixel == 32)
-                pix_fmt = pixelformat[arch_monitor][0];
-        else if (bits_per_pixel == 24)
-                pix_fmt = pixelformat[arch_monitor][1];
-        else if (bits_per_pixel == 16)
-                pix_fmt = pixelformat[arch_monitor][2];
-        else
-                pix_fmt = pixelformat[1][0];
-
-        return pix_fmt;
+
+        switch (bits_per_pixel) {
+        case 32:
+                return pixelformat[arch_monitor][0];
+        case 24:
+                return pixelformat[arch_monitor][1];
+        case 16:
+                return pixelformat[arch_monitor][2];
+        default:
+                pr_err("fsl-diu: unsupported pixel depth %u\n", bits_per_pixel);
+                return 0;
+        }
 }
 
 void mpc8610hpcd_set_gamma_table(int monitor_port, char *gamma_table_base)
@@ -190,8 +222,7 @@ void mpc8610hpcd_set_pixel_clock(unsigned int pixclock)
         }
 
         /* Pixel Clock configuration */
-        pr_debug("DIU: Bus Frequency = %d\n", get_busfreq());
-        speed_ccb = get_busfreq();
+        speed_ccb = fsl_get_sys_freq();
 
         /* Calculate the pixel clock with the smallest error */
         /* calculate the following in steps to avoid overflow */
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_smp.c b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
index eacea0e3fcc8..af09baee22cb 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_smp.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
@@ -56,7 +56,7 @@ smp_86xx_release_core(int nr)
 }
 
 
-static void __init
+static int __init
 smp_86xx_kick_cpu(int nr)
 {
         unsigned int save_vector;
@@ -65,7 +65,7 @@ smp_86xx_kick_cpu(int nr)
         unsigned int *vector = (unsigned int *)(KERNELBASE + 0x100);
 
         if (nr < 0 || nr >= NR_CPUS)
-                return;
+                return -ENOENT;
 
         pr_debug("smp_86xx_kick_cpu: kick CPU #%d\n", nr);
 
@@ -92,6 +92,8 @@ smp_86xx_kick_cpu(int nr)
         local_irq_restore(flags);
 
         pr_debug("wait CPU #%d for %d msecs.\n", nr, n);
+
+        return 0;
 }
 
 
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index 9ecce995dd4b..1e121088826f 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -150,7 +150,7 @@ void __init mpc8xx_calibrate_decr(void)
          */
         cpu = of_find_node_by_type(NULL, "cpu");
         virq= irq_of_parse_and_map(cpu, 0);
-        irq = irq_map[virq].hwirq;
+        irq = virq_to_hw(virq);
 
         sys_tmr2 = immr_map(im_sit);
         out_be16(&sys_tmr2->sit_tbscr, ((1 << (7 - (irq/2))) << 8) |
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index f7b07720aa30..f970ca2b180c 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -20,6 +20,7 @@ source "arch/powerpc/platforms/embedded6xx/Kconfig"
 source "arch/powerpc/platforms/44x/Kconfig"
 source "arch/powerpc/platforms/40x/Kconfig"
 source "arch/powerpc/platforms/amigaone/Kconfig"
+source "arch/powerpc/platforms/wsp/Kconfig"
 
 config KVM_GUEST
         bool "KVM Guest support"
@@ -56,16 +57,19 @@ config UDBG_RTAS_CONSOLE
         depends on PPC_RTAS
         default n
 
+config PPC_SMP_MUXED_IPI
+        bool
+        help
+          Select this opton if your platform supports SMP and your
+          interrupt controller provides less than 4 interrupts to each
+          cpu.  This will enable the generic code to multiplex the 4
+          messages on to one ipi.
+
 config PPC_UDBG_BEAT
         bool "BEAT based debug console"
         depends on PPC_CELLEB
         default n
 
-config XICS
-        depends on PPC_PSERIES
-        bool
-        default y
-
 config IPIC
         bool
         default n
@@ -147,14 +151,27 @@ config PPC_970_NAP
         bool
         default n
 
+config PPC_P7_NAP
+        bool
+        default n
+
 config PPC_INDIRECT_IO
         bool
         select GENERIC_IOMAP
-        default n
+
+config PPC_INDIRECT_PIO
+        bool
+        select PPC_INDIRECT_IO
+
+config PPC_INDIRECT_MMIO
+        bool
+        select PPC_INDIRECT_IO
+
+config PPC_IO_WORKAROUNDS
+        bool
 
 config GENERIC_IOMAP
         bool
-        default n
 
 source "drivers/cpufreq/Kconfig"
 
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 111138c55f9c..2165b65876f9 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -73,6 +73,7 @@ config PPC_BOOK3S_64
 config PPC_BOOK3E_64
         bool "Embedded processors"
         select PPC_FPU # Make it a choice ?
+        select PPC_SMP_MUXED_IPI
 
 endchoice
 
@@ -107,6 +108,10 @@ config POWER4
         depends on PPC64 && PPC_BOOK3S
         def_bool y
 
+config PPC_A2
+        bool
+        depends on PPC_BOOK3E_64
+
 config TUNE_CELL
         bool "Optimize for Cell Broadband Engine"
         depends on PPC64 && PPC_BOOK3S
@@ -174,6 +179,7 @@ config FSL_BOOKE
 config PPC_FSL_BOOK3E
         bool
         select FSL_EMB_PERFMON
+        select PPC_SMP_MUXED_IPI
         default y if FSL_BOOKE
 
 config PTE_64BIT
@@ -226,6 +232,24 @@ config VSX
 
           If in doubt, say Y here.
 
+config PPC_ICSWX
+        bool "Support for PowerPC icswx coprocessor instruction"
+        depends on POWER4
+        default n
+        ---help---
+
+          This option enables kernel support for the PowerPC Initiate
+          Coprocessor Store Word (icswx) coprocessor instruction on POWER7
+          or newer processors.
+
+          This option is only useful if you have a processor that supports
+          the icswx coprocessor instruction. It does not have any effect
+          on processors without the icswx coprocessor instruction.
+
+          This option slightly increases kernel memory usage.
+
+          If in doubt, say N here.
+
 config SPE
         bool "SPE Support"
         depends on E200 || (E500 && !PPC_E500MC)
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index fdb9f0b0d7a8..73e2116cfeed 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -22,3 +22,4 @@ obj-$(CONFIG_PPC_CELL)		+= cell/
 obj-$(CONFIG_PPC_PS3)           += ps3/
 obj-$(CONFIG_EMBEDDED6xx)       += embedded6xx/
 obj-$(CONFIG_AMIGAONE)          += amigaone/
+obj-$(CONFIG_PPC_WSP)           += wsp/
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 81239ebed83f..67d5009b4e86 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -6,7 +6,8 @@ config PPC_CELL_COMMON
         bool
         select PPC_CELL
         select PPC_DCR_MMIO
-        select PPC_INDIRECT_IO
+        select PPC_INDIRECT_PIO
+        select PPC_INDIRECT_MMIO
         select PPC_NATIVE
         select PPC_RTAS
         select IRQ_EDGE_EOI_HANDLER
@@ -15,6 +16,7 @@ config PPC_CELL_NATIVE
         bool
         select PPC_CELL_COMMON
         select MPIC
+        select PPC_IO_WORKAROUNDS
         select IBM_NEW_EMAC_EMAC4
         select IBM_NEW_EMAC_RGMII
         select IBM_NEW_EMAC_ZMII #test only
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 83fafe922641..a4a89350bcfc 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -1,7 +1,7 @@
 obj-$(CONFIG_PPC_CELL_COMMON)           += cbe_regs.o interrupt.o pervasive.o
 
 obj-$(CONFIG_PPC_CELL_NATIVE)           += iommu.o setup.o spider-pic.o \
-                                           pmu.o io-workarounds.o spider-pci.o
+                                           pmu.o spider-pci.o
 obj-$(CONFIG_CBE_RAS)                   += ras.o
 
 obj-$(CONFIG_CBE_THERM)                 += cbe_thermal.o
@@ -39,11 +39,10 @@ obj-y					+= celleb_setup.o \
                                            celleb_pci.o celleb_scc_epci.o \
                                            celleb_scc_pciex.o \
                                            celleb_scc_uhc.o \
-                                           io-workarounds.o spider-pci.o \
-                                           beat.o beat_htab.o beat_hvCall.o \
-                                           beat_interrupt.o beat_iommu.o
+                                           spider-pci.o beat.o beat_htab.o \
+                                           beat_hvCall.o beat_interrupt.o \
+                                           beat_iommu.o
 
-obj-$(CONFIG_SMP)                       += beat_smp.o
 obj-$(CONFIG_PPC_UDBG_BEAT)             += beat_udbg.o
 obj-$(CONFIG_SERIAL_TXX9)               += celleb_scc_sio.o
 obj-$(CONFIG_SPU_BASE)                  += beat_spu_priv1.o
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index bb5ebf8fa80b..ac06903e136a 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -113,7 +113,7 @@ static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
                 pr_devel("axon_msi: woff %x roff %x msi %x\n",
                           write_offset, msic->read_offset, msi);
 
-                if (msi < NR_IRQS && irq_map[msi].host == msic->irq_host) {
+                if (msi < NR_IRQS && irq_get_chip_data(msi) == msic) {
                         generic_handle_irq(msi);
                         msic->fifo_virt[idx] = cpu_to_le32(0xffffffff);
                 } else {
@@ -320,6 +320,7 @@ static struct irq_chip msic_irq_chip = {
 static int msic_host_map(struct irq_host *h, unsigned int virq,
                          irq_hw_number_t hw)
 {
+        irq_set_chip_data(virq, h->host_data);
         irq_set_chip_and_handler(virq, &msic_irq_chip, handle_simple_irq);
 
         return 0;
diff --git a/arch/powerpc/platforms/cell/beat_interrupt.c b/arch/powerpc/platforms/cell/beat_interrupt.c
index 4cb9e147c307..55015e1f6939 100644
--- a/arch/powerpc/platforms/cell/beat_interrupt.c
+++ b/arch/powerpc/platforms/cell/beat_interrupt.c
@@ -148,16 +148,6 @@ static int beatic_pic_host_map(struct irq_host *h, unsigned int virq,
 }
 
 /*
- * Update binding hardware IRQ number (hw) and Virtuql
- * IRQ number (virq). This is called only once for a given mapping.
- */
-static void beatic_pic_host_remap(struct irq_host *h, unsigned int virq,
-                               irq_hw_number_t hw)
-{
-        beat_construct_and_connect_irq_plug(virq, hw);
-}
-
-/*
  * Translate device-tree interrupt spec to irq_hw_number_t style (ulong),
  * to pass away to irq_create_mapping().
  *
@@ -184,7 +174,6 @@ static int beatic_pic_host_match(struct irq_host *h, struct device_node *np)
 
 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,
@@ -257,22 +246,6 @@ void __init beatic_init_IRQ(void)
         irq_set_default_host(beatic_host);
 }
 
-#ifdef CONFIG_SMP
-
-/* Nullified to compile with SMP mode */
-void beatic_setup_cpu(int cpu)
-{
-}
-
-void beatic_cause_IPI(int cpu, int mesg)
-{
-}
-
-void beatic_request_IPIs(void)
-{
-}
-#endif /* CONFIG_SMP */
-
 void beatic_deinit_IRQ(void)
 {
         int     i;
diff --git a/arch/powerpc/platforms/cell/beat_interrupt.h b/arch/powerpc/platforms/cell/beat_interrupt.h
index b470fd0051f1..a7e52f91a078 100644
--- a/arch/powerpc/platforms/cell/beat_interrupt.h
+++ b/arch/powerpc/platforms/cell/beat_interrupt.h
@@ -24,9 +24,6 @@
 
 extern void beatic_init_IRQ(void);
 extern unsigned int beatic_get_irq(void);
-extern void beatic_cause_IPI(int cpu, int mesg);
-extern void beatic_request_IPIs(void);
-extern void beatic_setup_cpu(int);
 extern void beatic_deinit_IRQ(void);
 
 #endif
diff --git a/arch/powerpc/platforms/cell/beat_smp.c b/arch/powerpc/platforms/cell/beat_smp.c
deleted file mode 100644
index 26efc204c47f..000000000000
--- a/arch/powerpc/platforms/cell/beat_smp.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * SMP support for Celleb platform. (Incomplete)
- *
- * (C) Copyright 2006 TOSHIBA CORPORATION
- *
- * This code is based on arch/powerpc/platforms/cell/smp.c:
- * Dave Engebretsen, Peter Bergner, and
- * Mike Corrigan {engebret|bergner|mikec}@us.ibm.com
- * Plus various changes from other IBM teams...
- *
- * 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/kernel.h>
-#include <linux/smp.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/threads.h>
-#include <linux/cpu.h>
-
-#include <asm/irq.h>
-#include <asm/smp.h>
-#include <asm/machdep.h>
-#include <asm/udbg.h>
-
-#include "beat_interrupt.h"
-
-#ifdef DEBUG
-#define DBG(fmt...) udbg_printf(fmt)
-#else
-#define DBG(fmt...)
-#endif
-
-/*
- * The primary thread of each non-boot processor is recorded here before
- * smp init.
- */
-/* static cpumask_t of_spin_map; */
-
-/**
- * smp_startup_cpu() - start the given cpu
- *
- * At boot time, there is nothing to do for primary threads which were
- * started from Open Firmware.  For anything else, call RTAS with the
- * appropriate start location.
- *
- * Returns:
- *      0       - failure
- *      1       - success
- */
-static inline int __devinit smp_startup_cpu(unsigned int lcpu)
-{
-        return 0;
-}
-
-static void smp_beatic_message_pass(int target, int msg)
-{
-        unsigned int i;
-
-        if (target < NR_CPUS) {
-                beatic_cause_IPI(target, msg);
-        } else {
-                for_each_online_cpu(i) {
-                        if (target == MSG_ALL_BUT_SELF
-                            && i == smp_processor_id())
-                                continue;
-                        beatic_cause_IPI(i, msg);
-                }
-        }
-}
-
-static int __init smp_beatic_probe(void)
-{
-        return cpus_weight(cpu_possible_map);
-}
-
-static void __devinit smp_beatic_setup_cpu(int cpu)
-{
-        beatic_setup_cpu(cpu);
-}
-
-static void __devinit smp_celleb_kick_cpu(int nr)
-{
-        BUG_ON(nr < 0 || nr >= NR_CPUS);
-
-        if (!smp_startup_cpu(nr))
-                return;
-}
-
-static int smp_celleb_cpu_bootable(unsigned int nr)
-{
-        return 1;
-}
-static struct smp_ops_t bpa_beatic_smp_ops = {
-        .message_pass   = smp_beatic_message_pass,
-        .probe          = smp_beatic_probe,
-        .kick_cpu       = smp_celleb_kick_cpu,
-        .setup_cpu      = smp_beatic_setup_cpu,
-        .cpu_bootable   = smp_celleb_cpu_bootable,
-};
-
-/* This is called very early */
-void __init smp_init_celleb(void)
-{
-        DBG(" -> smp_init_celleb()\n");
-
-        smp_ops = &bpa_beatic_smp_ops;
-
-        DBG(" <- smp_init_celleb()\n");
-}
diff --git a/arch/powerpc/platforms/cell/cbe_regs.c b/arch/powerpc/platforms/cell/cbe_regs.c
index dbc338f187a2..f3917e7a5b44 100644
--- a/arch/powerpc/platforms/cell/cbe_regs.c
+++ b/arch/powerpc/platforms/cell/cbe_regs.c
@@ -45,8 +45,8 @@ static struct cbe_thread_map
         unsigned int cbe_id;
 } cbe_thread_map[NR_CPUS];
 
-static cpumask_t cbe_local_mask[MAX_CBE] = { [0 ... MAX_CBE-1] = CPU_MASK_NONE };
-static cpumask_t cbe_first_online_cpu = CPU_MASK_NONE;
+static cpumask_t cbe_local_mask[MAX_CBE] = { [0 ... MAX_CBE-1] = {CPU_BITS_NONE} };
+static cpumask_t cbe_first_online_cpu = { CPU_BITS_NONE };
 
 static struct cbe_regs_map *cbe_find_map(struct device_node *np)
 {
@@ -159,7 +159,8 @@ EXPORT_SYMBOL_GPL(cbe_cpu_to_node);
 
 u32 cbe_node_to_cpu(int node)
 {
-        return find_first_bit( (unsigned long *) &cbe_local_mask[node], sizeof(cpumask_t));
+        return cpumask_first(&cbe_local_mask[node]);
+
 }
 EXPORT_SYMBOL_GPL(cbe_node_to_cpu);
 
@@ -268,9 +269,9 @@ void __init cbe_regs_init(void)
                                 thread->regs = map;
                                 thread->cbe_id = cbe_id;
                                 map->be_node = thread->be_node;
-                                cpu_set(i, cbe_local_mask[cbe_id]);
+                                cpumask_set_cpu(i, &cbe_local_mask[cbe_id]);
                                 if(thread->thread_id == 0)
-                                        cpu_set(i, cbe_first_online_cpu);
+                                        cpumask_set_cpu(i, &cbe_first_online_cpu);
                         }
                 }
 
diff --git a/arch/powerpc/platforms/cell/celleb_pci.c b/arch/powerpc/platforms/cell/celleb_pci.c
index 404d1fc04d59..5822141aa63f 100644
--- a/arch/powerpc/platforms/cell/celleb_pci.c
+++ b/arch/powerpc/platforms/cell/celleb_pci.c
@@ -41,7 +41,6 @@
 #include <asm/pci-bridge.h>
 #include <asm/ppc-pci.h>
 
-#include "io-workarounds.h"
 #include "celleb_pci.h"
 
 #define MAX_PCI_DEVICES    32
@@ -320,7 +319,7 @@ static int __init celleb_setup_fake_pci_device(struct device_node *node,
 
         size = 256;
         config = &private->fake_config[devno][fn];
-        *config = alloc_maybe_bootmem(size, GFP_KERNEL);
+        *config = zalloc_maybe_bootmem(size, GFP_KERNEL);
         if (*config == NULL) {
                 printk(KERN_ERR "PCI: "
                        "not enough memory for fake configuration space\n");
@@ -331,7 +330,7 @@ static int __init celleb_setup_fake_pci_device(struct device_node *node,
 
         size = sizeof(struct celleb_pci_resource);
         res = &private->res[devno][fn];
-        *res = alloc_maybe_bootmem(size, GFP_KERNEL);
+        *res = zalloc_maybe_bootmem(size, GFP_KERNEL);
         if (*res == NULL) {
                 printk(KERN_ERR
                        "PCI: not enough memory for resource data space\n");
@@ -432,7 +431,7 @@ static int __init phb_set_bus_ranges(struct device_node *dev,
 static void __init celleb_alloc_private_mem(struct pci_controller *hose)
 {
         hose->private_data =
-                alloc_maybe_bootmem(sizeof(struct celleb_pci_private),
+                zalloc_maybe_bootmem(sizeof(struct celleb_pci_private),
                         GFP_KERNEL);
 }
 
@@ -469,18 +468,6 @@ static struct of_device_id celleb_phb_match[] __initdata = {
         },
 };
 
-static int __init celleb_io_workaround_init(struct pci_controller *phb,
-                                            struct celleb_phb_spec *phb_spec)
-{
-        if (phb_spec->ops) {
-                iowa_register_bus(phb, phb_spec->ops, phb_spec->iowa_init,
-                                  phb_spec->iowa_data);
-                io_workaround_init();
-        }
-
-        return 0;
-}
-
 int __init celleb_setup_phb(struct pci_controller *phb)
 {
         struct device_node *dev = phb->dn;
@@ -500,7 +487,11 @@ int __init celleb_setup_phb(struct pci_controller *phb)
         if (rc)
                 return 1;
 
-        return celleb_io_workaround_init(phb, phb_spec);
+        if (phb_spec->ops)
+                iowa_register_bus(phb, phb_spec->ops,
+                                  phb_spec->iowa_init,
+                                  phb_spec->iowa_data);
+        return 0;
 }
 
 int celleb_pci_probe_mode(struct pci_bus *bus)
diff --git a/arch/powerpc/platforms/cell/celleb_pci.h b/arch/powerpc/platforms/cell/celleb_pci.h
index 4cba1523ec50..a801fcc5f389 100644
--- a/arch/powerpc/platforms/cell/celleb_pci.h
+++ b/arch/powerpc/platforms/cell/celleb_pci.h
@@ -26,8 +26,9 @@
 #include <asm/pci-bridge.h>
 #include <asm/prom.h>
 #include <asm/ppc-pci.h>
+#include <asm/io-workarounds.h>
 
-#include "io-workarounds.h"
+struct iowa_bus;
 
 struct celleb_phb_spec {
         int (*setup)(struct device_node *, struct pci_controller *);
diff --git a/arch/powerpc/platforms/cell/celleb_setup.c b/arch/powerpc/platforms/cell/celleb_setup.c
index e53845579770..d58d9bae4b9b 100644
--- a/arch/powerpc/platforms/cell/celleb_setup.c
+++ b/arch/powerpc/platforms/cell/celleb_setup.c
@@ -128,10 +128,6 @@ static void __init celleb_setup_arch_beat(void)
         spu_management_ops      = &spu_management_of_ops;
 #endif
 
-#ifdef CONFIG_SMP
-        smp_init_celleb();
-#endif
-
         celleb_setup_arch_common();
 }
 
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 44cfd1bef89b..449c08c15862 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -196,8 +196,20 @@ static irqreturn_t iic_ipi_action(int irq, void *dev_id)
 {
         int ipi = (int)(long)dev_id;
 
-        smp_message_recv(ipi);
-
+        switch(ipi) {
+        case PPC_MSG_CALL_FUNCTION:
+                generic_smp_call_function_interrupt();
+                break;
+        case PPC_MSG_RESCHEDULE:
+                scheduler_ipi();
+                break;
+        case PPC_MSG_CALL_FUNC_SINGLE:
+                generic_smp_call_function_single_interrupt();
+                break;
+        case PPC_MSG_DEBUGGER_BREAK:
+                debug_ipi_action(0, NULL);
+                break;
+        }
         return IRQ_HANDLED;
 }
 static void iic_request_ipi(int ipi, const char *name)
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c
index d31c594cfdf3..51e290126bc1 100644
--- a/arch/powerpc/platforms/cell/qpace_setup.c
+++ b/arch/powerpc/platforms/cell/qpace_setup.c
@@ -42,7 +42,6 @@
 #include "interrupt.h"
 #include "pervasive.h"
 #include "ras.h"
-#include "io-workarounds.h"
 
 static void qpace_show_cpuinfo(struct seq_file *m)
 {
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index fd57bfe00edf..c73cf4c43fc2 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -51,11 +51,11 @@
 #include <asm/udbg.h>
 #include <asm/mpic.h>
 #include <asm/cell-regs.h>
+#include <asm/io-workarounds.h>
 
 #include "interrupt.h"
 #include "pervasive.h"
 #include "ras.h"
-#include "io-workarounds.h"
 
 #ifdef DEBUG
 #define DBG(fmt...) udbg_printf(fmt)
@@ -136,8 +136,6 @@ static int __devinit cell_setup_phb(struct pci_controller *phb)
 
         iowa_register_bus(phb, &spiderpci_ops, &spiderpci_iowa_init,
                                   (void *)SPIDER_PCI_REG_BASE);
-        io_workaround_init();
-
         return 0;
 }
 
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c
index f774530075b7..d176e6148e3f 100644
--- a/arch/powerpc/platforms/cell/smp.c
+++ b/arch/powerpc/platforms/cell/smp.c
@@ -77,7 +77,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
         unsigned int pcpu;
         int start_cpu;
 
-        if (cpu_isset(lcpu, of_spin_map))
+        if (cpumask_test_cpu(lcpu, &of_spin_map))
                 /* Already started by OF and sitting in spin loop */
                 return 1;
 
@@ -103,27 +103,11 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
         return 1;
 }
 
-static void smp_iic_message_pass(int target, int msg)
-{
-        unsigned int i;
-
-        if (target < NR_CPUS) {
-                iic_cause_IPI(target, msg);
-        } else {
-                for_each_online_cpu(i) {
-                        if (target == MSG_ALL_BUT_SELF
-                            && i == smp_processor_id())
-                                continue;
-                        iic_cause_IPI(i, msg);
-                }
-        }
-}
-
 static int __init smp_iic_probe(void)
 {
         iic_request_IPIs();
 
-        return cpus_weight(cpu_possible_map);
+        return cpumask_weight(cpu_possible_mask);
 }
 
 static void __devinit smp_cell_setup_cpu(int cpu)
@@ -137,12 +121,12 @@ static void __devinit smp_cell_setup_cpu(int cpu)
         mtspr(SPRN_DABRX, DABRX_KERNEL | DABRX_USER);
 }
 
-static void __devinit smp_cell_kick_cpu(int nr)
+static int __devinit smp_cell_kick_cpu(int nr)
 {
         BUG_ON(nr < 0 || nr >= NR_CPUS);
 
         if (!smp_startup_cpu(nr))
-                return;
+                return -ENOENT;
 
         /*
          * The processor is currently spinning, waiting for the
@@ -150,6 +134,8 @@ static void __devinit smp_cell_kick_cpu(int nr)
          * the processor will continue on to secondary_start
          */
         paca[nr].cpu_start = 1;
+
+        return 0;
 }
 
 static int smp_cell_cpu_bootable(unsigned int nr)
@@ -166,7 +152,7 @@ static int smp_cell_cpu_bootable(unsigned int nr)
         return 1;
 }
 static struct smp_ops_t bpa_iic_smp_ops = {
-        .message_pass   = smp_iic_message_pass,
+        .message_pass   = iic_cause_IPI,
         .probe          = smp_iic_probe,
         .kick_cpu       = smp_cell_kick_cpu,
         .setup_cpu      = smp_cell_setup_cpu,
@@ -186,13 +172,12 @@ void __init smp_init_cell(void)
         if (cpu_has_feature(CPU_FTR_SMT)) {
                 for_each_present_cpu(i) {
                         if (cpu_thread_in_core(i) == 0)
-                                cpu_set(i, of_spin_map);
+                                cpumask_set_cpu(i, &of_spin_map);
                 }
-        } else {
-                of_spin_map = cpu_present_map;
-        }
+        } else
+                cpumask_copy(&of_spin_map, cpu_present_mask);
 
-        cpu_clear(boot_cpuid, of_spin_map);
+        cpumask_clear_cpu(boot_cpuid, &of_spin_map);
 
         /* Non-lpar has additional take/give timebase */
         if (rtas_token("freeze-time-base") != RTAS_UNKNOWN_SERVICE) {
diff --git a/arch/powerpc/platforms/cell/spider-pci.c b/arch/powerpc/platforms/cell/spider-pci.c
index ca7731c0b595..f1f7878893f3 100644
--- a/arch/powerpc/platforms/cell/spider-pci.c
+++ b/arch/powerpc/platforms/cell/spider-pci.c
@@ -27,8 +27,7 @@
 
 #include <asm/ppc-pci.h>
 #include <asm/pci-bridge.h>
-
-#include "io-workarounds.h"
+#include <asm/io-workarounds.h>
 
 #define SPIDER_PCI_DISABLE_PREFETCH
 
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index c5cf50e6b45a..442c28c00f88 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -68,9 +68,9 @@ struct spider_pic {
 };
 static struct spider_pic spider_pics[SPIDER_CHIP_COUNT];
 
-static struct spider_pic *spider_virq_to_pic(unsigned int virq)
+static struct spider_pic *spider_irq_data_to_pic(struct irq_data *d)
 {
-        return irq_map[virq].host->host_data;
+        return irq_data_get_irq_chip_data(d);
 }
 
 static void __iomem *spider_get_irq_config(struct spider_pic *pic,
@@ -81,24 +81,24 @@ static void __iomem *spider_get_irq_config(struct spider_pic *pic,
 
 static void spider_unmask_irq(struct irq_data *d)
 {
-        struct spider_pic *pic = spider_virq_to_pic(d->irq);
-        void __iomem *cfg = spider_get_irq_config(pic, irq_map[d->irq].hwirq);
+        struct spider_pic *pic = spider_irq_data_to_pic(d);
+        void __iomem *cfg = spider_get_irq_config(pic, irqd_to_hwirq(d));
 
         out_be32(cfg, in_be32(cfg) | 0x30000000u);
 }
 
 static void spider_mask_irq(struct irq_data *d)
 {
-        struct spider_pic *pic = spider_virq_to_pic(d->irq);
-        void __iomem *cfg = spider_get_irq_config(pic, irq_map[d->irq].hwirq);
+        struct spider_pic *pic = spider_irq_data_to_pic(d);
+        void __iomem *cfg = spider_get_irq_config(pic, irqd_to_hwirq(d));
 
         out_be32(cfg, in_be32(cfg) & ~0x30000000u);
 }
 
 static void spider_ack_irq(struct irq_data *d)
 {
-        struct spider_pic *pic = spider_virq_to_pic(d->irq);
-        unsigned int src = irq_map[d->irq].hwirq;
+        struct spider_pic *pic = spider_irq_data_to_pic(d);
+        unsigned int src = irqd_to_hwirq(d);
 
         /* Reset edge detection logic if necessary
          */
@@ -116,8 +116,8 @@ static void spider_ack_irq(struct irq_data *d)
 static int spider_set_irq_type(struct irq_data *d, unsigned int type)
 {
         unsigned int sense = type & IRQ_TYPE_SENSE_MASK;
-        struct spider_pic *pic = spider_virq_to_pic(d->irq);
-        unsigned int hw = irq_map[d->irq].hwirq;
+        struct spider_pic *pic = spider_irq_data_to_pic(d);
+        unsigned int hw = irqd_to_hwirq(d);
         void __iomem *cfg = spider_get_irq_config(pic, hw);
         u32 old_mask;
         u32 ic;
@@ -171,6 +171,7 @@ static struct irq_chip spider_pic = {
 static int spider_host_map(struct irq_host *h, unsigned int virq,
                         irq_hw_number_t hw)
 {
+        irq_set_chip_data(virq, h->host_data);
         irq_set_chip_and_handler(virq, &spider_pic, handle_level_irq);
 
         /* Set default irq type */
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index acfaccea5f4f..3675da73623f 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -32,6 +32,7 @@
 #include <linux/io.h>
 #include <linux/mutex.h>
 #include <linux/linux_logo.h>
+#include <linux/syscore_ops.h>
 #include <asm/spu.h>
 #include <asm/spu_priv1.h>
 #include <asm/spu_csa.h>
@@ -521,18 +522,8 @@ void spu_init_channels(struct spu *spu)
 }
 EXPORT_SYMBOL_GPL(spu_init_channels);
 
-static int spu_shutdown(struct sys_device *sysdev)
-{
-        struct spu *spu = container_of(sysdev, struct spu, sysdev);
-
-        spu_free_irqs(spu);
-        spu_destroy_spu(spu);
-        return 0;
-}
-
 static struct sysdev_class spu_sysdev_class = {
         .name = "spu",
-        .shutdown = spu_shutdown,
 };
 
 int spu_add_sysdev_attr(struct sysdev_attribute *attr)
@@ -797,6 +788,22 @@ static inline void crash_register_spus(struct list_head *list)
 }
 #endif
 
+static void spu_shutdown(void)
+{
+        struct spu *spu;
+
+        mutex_lock(&spu_full_list_mutex);
+        list_for_each_entry(spu, &spu_full_list, full_list) {
+                spu_free_irqs(spu);
+                spu_destroy_spu(spu);
+        }
+        mutex_unlock(&spu_full_list_mutex);
+}
+
+static struct syscore_ops spu_syscore_ops = {
+        .shutdown = spu_shutdown,
+};
+
 static int __init init_spu_base(void)
 {
         int i, ret = 0;
@@ -830,6 +837,7 @@ static int __init init_spu_base(void)
         crash_register_spus(&spu_full_list);
         mutex_unlock(&spu_full_list_mutex);
         spu_add_sysdev_attr(&attr_stat);
+        register_syscore_ops(&spu_syscore_ops);
 
         spu_init_affinity();
 
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 65203857b0ce..32cb4e66d2cd 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -141,7 +141,7 @@ void __spu_update_sched_info(struct spu_context *ctx)
          * runqueue. The context will be rescheduled on the proper node
          * if it is timesliced or preempted.
          */
-        ctx->cpus_allowed = current->cpus_allowed;
+        cpumask_copy(&ctx->cpus_allowed, tsk_cpus_allowed(current));
 
         /* Save the current cpu id for spu interrupt routing. */
         ctx->last_ran = raw_smp_processor_id();
diff --git a/arch/powerpc/platforms/chrp/smp.c b/arch/powerpc/platforms/chrp/smp.c
index 02cafecc90e3..a800122e4dda 100644
--- a/arch/powerpc/platforms/chrp/smp.c
+++ b/arch/powerpc/platforms/chrp/smp.c
@@ -30,10 +30,12 @@
 #include <asm/mpic.h>
 #include <asm/rtas.h>
 
-static void __devinit smp_chrp_kick_cpu(int nr)
+static int __devinit smp_chrp_kick_cpu(int nr)
 {
         *(unsigned long *)KERNELBASE = nr;
         asm volatile("dcbf 0,%0"::"r"(KERNELBASE):"memory");
+
+        return 0;
 }
 
 static void __devinit smp_chrp_setup_cpu(int cpu_nr)
diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
index 12aa62b6f227..f61a2dd96b99 100644
--- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
@@ -48,7 +48,7 @@
 
 static void flipper_pic_mask_and_ack(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void __iomem *io_base = irq_data_get_irq_chip_data(d);
         u32 mask = 1 << irq;
 
@@ -59,7 +59,7 @@ static void flipper_pic_mask_and_ack(struct irq_data *d)
 
 static void flipper_pic_ack(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         /* this is at least needed for RSW */
@@ -68,7 +68,7 @@ static void flipper_pic_ack(struct irq_data *d)
 
 static void flipper_pic_mask(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         clrbits32(io_base + FLIPPER_IMR, 1 << irq);
@@ -76,7 +76,7 @@ static void flipper_pic_mask(struct irq_data *d)
 
 static void flipper_pic_unmask(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         setbits32(io_base + FLIPPER_IMR, 1 << irq);
@@ -107,12 +107,6 @@ static int flipper_pic_map(struct irq_host *h, unsigned int virq,
         return 0;
 }
 
-static void flipper_pic_unmap(struct irq_host *h, unsigned int irq)
-{
-        irq_set_chip_data(irq, NULL);
-        irq_set_chip(irq, NULL);
-}
-
 static int flipper_pic_match(struct irq_host *h, struct device_node *np)
 {
         return 1;
@@ -121,7 +115,6 @@ static int flipper_pic_match(struct irq_host *h, struct device_node *np)
 
 static struct irq_host_ops flipper_irq_host_ops = {
         .map = flipper_pic_map,
-        .unmap = flipper_pic_unmap,
         .match = flipper_pic_match,
 };
 
diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
index 2bdddfc9d520..e4919170c6bc 100644
--- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
@@ -43,7 +43,7 @@
 
 static void hlwd_pic_mask_and_ack(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void __iomem *io_base = irq_data_get_irq_chip_data(d);
         u32 mask = 1 << irq;
 
@@ -53,7 +53,7 @@ static void hlwd_pic_mask_and_ack(struct irq_data *d)
 
 static void hlwd_pic_ack(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         out_be32(io_base + HW_BROADWAY_ICR, 1 << irq);
@@ -61,7 +61,7 @@ static void hlwd_pic_ack(struct irq_data *d)
 
 static void hlwd_pic_mask(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         clrbits32(io_base + HW_BROADWAY_IMR, 1 << irq);
@@ -69,7 +69,7 @@ static void hlwd_pic_mask(struct irq_data *d)
 
 static void hlwd_pic_unmask(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void __iomem *io_base = irq_data_get_irq_chip_data(d);
 
         setbits32(io_base + HW_BROADWAY_IMR, 1 << irq);
@@ -100,15 +100,8 @@ static int hlwd_pic_map(struct irq_host *h, unsigned int virq,
         return 0;
 }
 
-static void hlwd_pic_unmap(struct irq_host *h, unsigned int irq)
-{
-        irq_set_chip_data(irq, NULL);
-        irq_set_chip(irq, NULL);
-}
-
 static struct irq_host_ops hlwd_irq_host_ops = {
         .map = hlwd_pic_map,
-        .unmap = hlwd_pic_unmap,
 };
 
 static unsigned int __hlwd_pic_get_irq(struct irq_host *h)
diff --git a/arch/powerpc/platforms/iseries/Kconfig b/arch/powerpc/platforms/iseries/Kconfig
index e5bc9f75d474..b57cda3a0817 100644
--- a/arch/powerpc/platforms/iseries/Kconfig
+++ b/arch/powerpc/platforms/iseries/Kconfig
@@ -1,7 +1,9 @@
 config PPC_ISERIES
         bool "IBM Legacy iSeries"
         depends on PPC64 && PPC_BOOK3S
-        select PPC_INDIRECT_IO
+        select PPC_SMP_MUXED_IPI
+        select PPC_INDIRECT_PIO
+        select PPC_INDIRECT_MMIO
         select PPC_PCI_CHOICE if EXPERT
 
 menu "iSeries device drivers"
diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S
index 32a56c6dfa72..29c02f36b32f 100644
--- a/arch/powerpc/platforms/iseries/exception.S
+++ b/arch/powerpc/platforms/iseries/exception.S
@@ -31,6 +31,7 @@
 #include <asm/thread_info.h>
 #include <asm/ptrace.h>
 #include <asm/cputable.h>
+#include <asm/mmu.h>
 
 #include "exception.h"
 
@@ -60,29 +61,31 @@ system_reset_iSeries:
 /* Spin on __secondary_hold_spinloop until it is updated by the boot cpu. */
 /* In the UP case we'll yield() later, and we will not access the paca anyway */
 #ifdef CONFIG_SMP
-1:
+iSeries_secondary_wait_paca:
         HMT_LOW
         LOAD_REG_ADDR(r23, __secondary_hold_spinloop)
         ld      r23,0(r23)
-        sync
-        LOAD_REG_ADDR(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                 /* Keep poking the Hypervisor until */
-        bne     2f                      /* we're released */
-        /* Let the Hypervisor know we are alive */
+        cmpdi   0,r23,0
+        bne     2f                      /* go on when the master is ready */
+
+        /* Keep poking the Hypervisor until we're released */
         /* 8002 is a call to HvCallCfg::getLps, a harmless Hypervisor function */
         lis     r3,0x8002
         rldicr  r3,r3,32,15             /* r0 = (r3 << 32) & 0xffff000000000000 */
         li      r0,-1                   /* r0=-1 indicates a Hypervisor call */
         sc                              /* Invoke the hypervisor via a system call */
-        b       1b
-#endif
+        b       iSeries_secondary_wait_paca
 
 2:
+        HMT_MEDIUM
+        sync
+
+        LOAD_REG_ADDR(r3, nr_cpu_ids)   /* get number of pacas allocated */
+        lwz     r3,0(r3)                /* nr_cpus= or NR_CPUS can limit */
+        cmpld   0,r24,r3                /* is our cpu number allocated? */
+        bge     iSeries_secondary_yield /* no, yield forever */
+
         /* Load our paca now that it's been allocated */
         LOAD_REG_ADDR(r13, paca)
         ld      r13,0(r13)
@@ -93,10 +96,24 @@ system_reset_iSeries:
         ori     r23,r23,MSR_RI
         mtmsrd  r23                     /* RI on */
 
-        HMT_LOW
-#ifdef CONFIG_SMP
+iSeries_secondary_smp_loop:
         lbz     r23,PACAPROCSTART(r13)  /* Test if this processor
                                          * should start */
+        cmpwi   0,r23,0
+        bne     3f                      /* go on when we are told */
+
+        HMT_LOW
+        /* 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 */
+        li      r0,-1                   /* r0=-1 indicates a Hypervisor call */
+        sc                              /* Invoke the hypervisor via a system call */
+        mfspr   r13,SPRN_SPRG_PACA      /* Put r13 back ???? */
+        b       iSeries_secondary_smp_loop /* wait for signal to start */
+
+3:
+        HMT_MEDIUM
         sync
         LOAD_REG_ADDR(r3,current_set)
         sldi    r28,r24,3               /* get current_set[cpu#] */
@@ -104,27 +121,22 @@ system_reset_iSeries:
         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 */
+#endif /* CONFIG_SMP */
+
+iSeries_secondary_yield:
         /* Yield the processor.  This is required for non-SMP kernels
                 which are running on multi-threaded machines. */
+        HMT_LOW
         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_SPRG_PACA      /* Put r13 back ???? */
-        b       2b                      /* If SMP not configured, secondaries
+        b       iSeries_secondary_yield /* If SMP not configured, secondaries
                                          * loop forever */
 
 /***  ISeries-LPAR interrupt handlers ***/
@@ -157,7 +169,7 @@ BEGIN_FTR_SECTION
 FTR_SECTION_ELSE
         EXCEPTION_PROLOG_1(PACA_EXGEN)
         EXCEPTION_PROLOG_ISERIES_1
-ALT_FTR_SECTION_END_IFCLR(CPU_FTR_SLB)
+ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_SLB)
         b       data_access_common
 
 .do_stab_bolted_iSeries:
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 52a6889832c7..b2103453eb01 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -42,7 +42,6 @@
 #include "irq.h"
 #include "pci.h"
 #include "call_pci.h"
-#include "smp.h"
 
 #ifdef CONFIG_PCI
 
@@ -171,7 +170,7 @@ static void iseries_enable_IRQ(struct irq_data *d)
 {
         u32 bus, dev_id, function, mask;
         const u32 sub_bus = 0;
-        unsigned int rirq = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         /* The IRQ has already been locked by the caller */
         bus = REAL_IRQ_TO_BUS(rirq);
@@ -188,7 +187,7 @@ static unsigned int iseries_startup_IRQ(struct irq_data *d)
 {
         u32 bus, dev_id, function, mask;
         const u32 sub_bus = 0;
-        unsigned int rirq = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         bus = REAL_IRQ_TO_BUS(rirq);
         function = REAL_IRQ_TO_FUNC(rirq);
@@ -234,7 +233,7 @@ static void iseries_shutdown_IRQ(struct irq_data *d)
 {
         u32 bus, dev_id, function, mask;
         const u32 sub_bus = 0;
-        unsigned int rirq = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         /* irq should be locked by the caller */
         bus = REAL_IRQ_TO_BUS(rirq);
@@ -257,7 +256,7 @@ static void iseries_disable_IRQ(struct irq_data *d)
 {
         u32 bus, dev_id, function, mask;
         const u32 sub_bus = 0;
-        unsigned int rirq = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         /* The IRQ has already been locked by the caller */
         bus = REAL_IRQ_TO_BUS(rirq);
@@ -271,7 +270,7 @@ static void iseries_disable_IRQ(struct irq_data *d)
 
 static void iseries_end_IRQ(struct irq_data *d)
 {
-        unsigned int rirq = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int rirq = (unsigned int)irqd_to_hwirq(d);
 
         HvCallPci_eoi(REAL_IRQ_TO_BUS(rirq), REAL_IRQ_TO_SUBBUS(rirq),
                 (REAL_IRQ_TO_IDSEL(rirq) << 4) + REAL_IRQ_TO_FUNC(rirq));
@@ -316,7 +315,7 @@ unsigned int iSeries_get_irq(void)
 #ifdef CONFIG_SMP
         if (get_lppaca()->int_dword.fields.ipi_cnt) {
                 get_lppaca()->int_dword.fields.ipi_cnt = 0;
-                iSeries_smp_message_recv();
+                smp_ipi_demux();
         }
 #endif /* CONFIG_SMP */
         if (hvlpevent_is_pending())
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 2946ae10fbfd..c25a0815c26b 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -249,7 +249,7 @@ static unsigned long iSeries_process_mainstore_vpd(struct MemoryBlock *mb_array,
         unsigned long i;
         unsigned long mem_blocks = 0;
 
-        if (cpu_has_feature(CPU_FTR_SLB))
+        if (mmu_has_feature(MMU_FTR_SLB))
                 mem_blocks = iSeries_process_Regatta_mainstore_vpd(mb_array,
                                 max_entries);
         else
@@ -634,7 +634,7 @@ static int __init iseries_probe(void)
 
         hpte_init_iSeries();
         /* iSeries does not support 16M pages */
-        cur_cpu_spec->cpu_features &= ~CPU_FTR_16M_PAGE;
+        cur_cpu_spec->mmu_features &= ~MMU_FTR_16M_PAGE;
 
         return 1;
 }
@@ -685,6 +685,11 @@ void * __init iSeries_early_setup(void)
         powerpc_firmware_features |= FW_FEATURE_ISERIES;
         powerpc_firmware_features |= FW_FEATURE_LPAR;
 
+#ifdef CONFIG_SMP
+        /* On iSeries we know we can never have more than 64 cpus */
+        nr_cpu_ids = max(nr_cpu_ids, 64);
+#endif
+
         iSeries_fixup_klimit();
 
         /*
diff --git a/arch/powerpc/platforms/iseries/smp.c b/arch/powerpc/platforms/iseries/smp.c
index 6c6029914dbc..e3265adde5d3 100644
--- a/arch/powerpc/platforms/iseries/smp.c
+++ b/arch/powerpc/platforms/iseries/smp.c
@@ -42,57 +42,23 @@
 #include <asm/cputable.h>
 #include <asm/system.h>
 
-#include "smp.h"
-
-static unsigned long iSeries_smp_message[NR_CPUS];
-
-void iSeries_smp_message_recv(void)
-{
-        int cpu = smp_processor_id();
-        int msg;
-
-        if (num_online_cpus() < 2)
-                return;
-
-        for (msg = 0; msg < 4; msg++)
-                if (test_and_clear_bit(msg, &iSeries_smp_message[cpu]))
-                        smp_message_recv(msg);
-}
-
-static inline void smp_iSeries_do_message(int cpu, int msg)
+static void smp_iSeries_cause_ipi(int cpu, unsigned long data)
 {
-        set_bit(msg, &iSeries_smp_message[cpu]);
         HvCall_sendIPI(&(paca[cpu]));
 }
 
-static void smp_iSeries_message_pass(int target, int msg)
-{
-        int i;
-
-        if (target < NR_CPUS)
-                smp_iSeries_do_message(target, msg);
-        else {
-                for_each_online_cpu(i) {
-                        if ((target == MSG_ALL_BUT_SELF) &&
-                                        (i == smp_processor_id()))
-                                continue;
-                        smp_iSeries_do_message(i, msg);
-                }
-        }
-}
-
 static int smp_iSeries_probe(void)
 {
         return cpumask_weight(cpu_possible_mask);
 }
 
-static void smp_iSeries_kick_cpu(int nr)
+static int smp_iSeries_kick_cpu(int nr)
 {
         BUG_ON((nr < 0) || (nr >= NR_CPUS));
 
         /* Verify that our partition has a processor nr */
         if (lppaca_of(nr).dyn_proc_status >= 2)
-                return;
+                return -ENOENT;
 
         /* The processor is currently spinning, waiting
          * for the cpu_start field to become non-zero
@@ -100,6 +66,8 @@ static void smp_iSeries_kick_cpu(int nr)
          * continue on to secondary_start in iSeries_head.S
          */
         paca[nr].cpu_start = 1;
+
+        return 0;
 }
 
 static void __devinit smp_iSeries_setup_cpu(int nr)
@@ -107,7 +75,8 @@ static void __devinit smp_iSeries_setup_cpu(int nr)
 }
 
 static struct smp_ops_t iSeries_smp_ops = {
-        .message_pass = smp_iSeries_message_pass,
+        .message_pass = smp_muxed_ipi_message_pass,
+        .cause_ipi    = smp_iSeries_cause_ipi,
         .probe        = smp_iSeries_probe,
         .kick_cpu     = smp_iSeries_kick_cpu,
         .setup_cpu    = smp_iSeries_setup_cpu,
diff --git a/arch/powerpc/platforms/iseries/smp.h b/arch/powerpc/platforms/iseries/smp.h
deleted file mode 100644
index d501f7de01e7..000000000000
--- a/arch/powerpc/platforms/iseries/smp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _PLATFORMS_ISERIES_SMP_H
-#define _PLATFORMS_ISERIES_SMP_H
-
-extern void iSeries_smp_message_recv(void);
-
-#endif  /* _PLATFORMS_ISERIES_SMP_H */
diff --git a/arch/powerpc/platforms/powermac/Kconfig b/arch/powerpc/platforms/powermac/Kconfig
index 1e1a0873e1dd..1afd10f67858 100644
--- a/arch/powerpc/platforms/powermac/Kconfig
+++ b/arch/powerpc/platforms/powermac/Kconfig
@@ -18,4 +18,13 @@ config PPC_PMAC64
         select PPC_970_NAP
         default y
 
-
+config PPC_PMAC32_PSURGE
+        bool "Support for powersurge upgrade cards" if EXPERT
+        depends on SMP && PPC32 && PPC_PMAC
+        select PPC_SMP_MUXED_IPI
+        default y
+        help
+          The powersurge cpu boards can be used in the generation
+          of powermacs that have a socket for an upgradeable cpu card,
+          including the 7500, 8500, 9500, 9600.  Support exists for
+          both dual and quad socket upgrade cards.
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 023f24086a0a..9089b0421191 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -21,7 +21,7 @@
 #include <linux/signal.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/adb.h>
 #include <linux/pmu.h>
 #include <linux/module.h>
@@ -84,7 +84,7 @@ static void __pmac_retrigger(unsigned int irq_nr)
 
 static void pmac_mask_and_ack_irq(struct irq_data *d)
 {
-        unsigned int src = irq_map[d->irq].hwirq;
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long bit = 1UL << (src & 0x1f);
         int i = src >> 5;
         unsigned long flags;
@@ -106,7 +106,7 @@ static void pmac_mask_and_ack_irq(struct irq_data *d)
 
 static void pmac_ack_irq(struct irq_data *d)
 {
-        unsigned int src = irq_map[d->irq].hwirq;
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long bit = 1UL << (src & 0x1f);
         int i = src >> 5;
         unsigned long flags;
@@ -152,7 +152,7 @@ static void __pmac_set_irq_mask(unsigned int irq_nr, int nokicklost)
 static unsigned int pmac_startup_irq(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int src = irq_map[d->irq].hwirq;
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long bit = 1UL << (src & 0x1f);
         int i = src >> 5;
 
@@ -169,7 +169,7 @@ static unsigned int pmac_startup_irq(struct irq_data *d)
 static void pmac_mask_irq(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int src = irq_map[d->irq].hwirq;
+        unsigned int src = irqd_to_hwirq(d);
 
         raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         __clear_bit(src, ppc_cached_irq_mask);
@@ -180,7 +180,7 @@ static void pmac_mask_irq(struct irq_data *d)
 static void pmac_unmask_irq(struct irq_data *d)
 {
         unsigned long flags;
-        unsigned int src = irq_map[d->irq].hwirq;
+        unsigned int src = irqd_to_hwirq(d);
 
         raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         __set_bit(src, ppc_cached_irq_mask);
@@ -193,7 +193,7 @@ static int pmac_retrigger(struct irq_data *d)
         unsigned long flags;
 
         raw_spin_lock_irqsave(&pmac_pic_lock, flags);
-        __pmac_retrigger(irq_map[d->irq].hwirq);
+        __pmac_retrigger(irqd_to_hwirq(d));
         raw_spin_unlock_irqrestore(&pmac_pic_lock, flags);
         return 1;
 }
@@ -239,15 +239,12 @@ static unsigned int pmac_pic_get_irq(void)
         unsigned long bits = 0;
         unsigned long flags;
 
-#ifdef CONFIG_SMP
-        void psurge_smp_message_recv(void);
-
-        /* IPI's are a hack on the powersurge -- Cort */
-        if ( smp_processor_id() != 0 ) {
-                psurge_smp_message_recv();
-                return NO_IRQ_IGNORE;   /* ignore, already handled */
+#ifdef CONFIG_PPC_PMAC32_PSURGE
+        /* IPI's are a hack on the powersurge -- Cort */
+        if (smp_processor_id() != 0) {
+                return  psurge_secondary_virq;
         }
-#endif /* CONFIG_SMP */
+#endif /* CONFIG_PPC_PMAC32_PSURGE */
         raw_spin_lock_irqsave(&pmac_pic_lock, flags);
         for (irq = max_real_irqs; (irq -= 32) >= 0; ) {
                 int i = irq >> 5;
@@ -677,7 +674,7 @@ not_found:
         return viaint;
 }
 
-static int pmacpic_suspend(struct sys_device *sysdev, pm_message_t state)
+static int pmacpic_suspend(void)
 {
         int viaint = pmacpic_find_viaint();
 
@@ -698,7 +695,7 @@ static int pmacpic_suspend(struct sys_device *sysdev, pm_message_t state)
         return 0;
 }
 
-static int pmacpic_resume(struct sys_device *sysdev)
+static void pmacpic_resume(void)
 {
         int i;
 
@@ -709,39 +706,19 @@ static int pmacpic_resume(struct sys_device *sysdev)
         for (i = 0; i < max_real_irqs; ++i)
                 if (test_bit(i, sleep_save_mask))
                         pmac_unmask_irq(irq_get_irq_data(i));
-
-        return 0;
 }
 
-#endif /* CONFIG_PM && CONFIG_PPC32 */
-
-static struct sysdev_class pmacpic_sysclass = {
-        .name = "pmac_pic",
-};
-
-static struct sys_device device_pmacpic = {
-        .id             = 0,
-        .cls            = &pmacpic_sysclass,
-};
-
-static struct sysdev_driver driver_pmacpic = {
-#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
-        .suspend        = &pmacpic_suspend,
-        .resume         = &pmacpic_resume,
-#endif /* CONFIG_PM && CONFIG_PPC32 */
+static struct syscore_ops pmacpic_syscore_ops = {
+        .suspend        = pmacpic_suspend,
+        .resume         = pmacpic_resume,
 };
 
-static int __init init_pmacpic_sysfs(void)
+static int __init init_pmacpic_syscore(void)
 {
-#ifdef CONFIG_PPC32
-        if (max_irqs == 0)
-                return -ENODEV;
-#endif
-        printk(KERN_DEBUG "Registering pmac pic with sysfs...\n");
-        sysdev_class_register(&pmacpic_sysclass);
-        sysdev_register(&device_pmacpic);
-        sysdev_driver_register(&pmacpic_sysclass, &driver_pmacpic);
+        register_syscore_ops(&pmacpic_syscore_ops);
         return 0;
 }
-machine_subsys_initcall(powermac, init_pmacpic_sysfs);
 
+machine_subsys_initcall(powermac, init_pmacpic_syscore);
+
+#endif /* CONFIG_PM && CONFIG_PPC32 */
diff --git a/arch/powerpc/platforms/powermac/pic.h b/arch/powerpc/platforms/powermac/pic.h
deleted file mode 100644
index d622a8345aaa..000000000000
--- a/arch/powerpc/platforms/powermac/pic.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __PPC_PLATFORMS_PMAC_PIC_H
-#define __PPC_PLATFORMS_PMAC_PIC_H
-
-#include <linux/irq.h>
-
-extern struct irq_chip pmac_pic;
-
-extern void pmac_pic_init(void);
-extern int pmac_get_irq(void);
-
-#endif /* __PPC_PLATFORMS_PMAC_PIC_H */
diff --git a/arch/powerpc/platforms/powermac/pmac.h b/arch/powerpc/platforms/powermac/pmac.h
index 20468f49aec0..8327cce2bdb0 100644
--- a/arch/powerpc/platforms/powermac/pmac.h
+++ b/arch/powerpc/platforms/powermac/pmac.h
@@ -33,6 +33,7 @@ extern void pmac_setup_pci_dma(void);
 extern void pmac_check_ht_link(void);
 
 extern void pmac_setup_smp(void);
+extern int psurge_secondary_virq;
 extern void low_cpu_die(void) __attribute__((noreturn));
 
 extern int pmac_nvram_init(void);
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index bc5f0dc6ae1e..db092d7c4c5b 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -70,7 +70,7 @@ static void (*pmac_tb_freeze)(int freeze);
 static u64 timebase;
 static int tb_req;
 
-#ifdef CONFIG_PPC32
+#ifdef CONFIG_PPC_PMAC32_PSURGE
 
 /*
  * Powersurge (old powermac SMP) support.
@@ -124,6 +124,10 @@ static volatile u32 __iomem *psurge_start;
 /* what sort of powersurge board we have */
 static int psurge_type = PSURGE_NONE;
 
+/* irq for secondary cpus to report */
+static struct irq_host *psurge_host;
+int psurge_secondary_virq;
+
 /*
  * Set and clear IPIs for powersurge.
  */
@@ -156,51 +160,52 @@ static inline void psurge_clr_ipi(int cpu)
 /*
  * On powersurge (old SMP powermac architecture) we don't have
  * separate IPIs for separate messages like openpic does.  Instead
- * we have a bitmap for each processor, where a 1 bit means that
- * the corresponding message is pending for that processor.
- * Ideally each cpu's entry would be in a different cache line.
+ * use the generic demux helpers
  *  -- paulus.
  */
-static unsigned long psurge_smp_message[NR_CPUS];
-
-void psurge_smp_message_recv(void)
+static irqreturn_t psurge_ipi_intr(int irq, void *d)
 {
-        int cpu = smp_processor_id();
-        int msg;
+        psurge_clr_ipi(smp_processor_id());
+        smp_ipi_demux();
 
-        /* clear interrupt */
-        psurge_clr_ipi(cpu);
-
-        if (num_online_cpus() < 2)
-                return;
+        return IRQ_HANDLED;
+}
 
-        /* make sure there is a message there */
-        for (msg = 0; msg < 4; msg++)
-                if (test_and_clear_bit(msg, &psurge_smp_message[cpu]))
-                        smp_message_recv(msg);
+static void smp_psurge_cause_ipi(int cpu, unsigned long data)
+{
+        psurge_set_ipi(cpu);
 }
 
-irqreturn_t psurge_primary_intr(int irq, void *d)
+static int psurge_host_map(struct irq_host *h, unsigned int virq,
+                         irq_hw_number_t hw)
 {
-        psurge_smp_message_recv();
-        return IRQ_HANDLED;
+        irq_set_chip_and_handler(virq, &dummy_irq_chip, handle_percpu_irq);
+
+        return 0;
 }
 
-static void smp_psurge_message_pass(int target, int msg)
+struct irq_host_ops psurge_host_ops = {
+        .map    = psurge_host_map,
+};
+
+static int psurge_secondary_ipi_init(void)
 {
-        int i;
+        int rc = -ENOMEM;
 
-        if (num_online_cpus() < 2)
-                return;
+        psurge_host = irq_alloc_host(NULL, IRQ_HOST_MAP_NOMAP, 0,
+                &psurge_host_ops, 0);
 
-        for_each_online_cpu(i) {
-                if (target == MSG_ALL
-                    || (target == MSG_ALL_BUT_SELF && i != smp_processor_id())
-                    || target == i) {
-                        set_bit(msg, &psurge_smp_message[i]);
-                        psurge_set_ipi(i);
-                }
-        }
+        if (psurge_host)
+                psurge_secondary_virq = irq_create_direct_mapping(psurge_host);
+
+        if (psurge_secondary_virq)
+                rc = request_irq(psurge_secondary_virq, psurge_ipi_intr,
+                        IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);
+
+        if (rc)
+                pr_err("Failed to setup secondary cpu IPI\n");
+
+        return rc;
 }
 
 /*
@@ -311,6 +316,9 @@ static int __init smp_psurge_probe(void)
                 ncpus = 2;
         }
 
+        if (psurge_secondary_ipi_init())
+                return 1;
+
         psurge_start = ioremap(PSURGE_START, 4);
         psurge_pri_intr = ioremap(PSURGE_PRI_INTR, 4);
 
@@ -329,7 +337,7 @@ static int __init smp_psurge_probe(void)
         return ncpus;
 }
 
-static void __init smp_psurge_kick_cpu(int nr)
+static int __init smp_psurge_kick_cpu(int nr)
 {
         unsigned long start = __pa(__secondary_start_pmac_0) + nr * 8;
         unsigned long a, flags;
@@ -394,11 +402,13 @@ static void __init smp_psurge_kick_cpu(int nr)
                 psurge_set_ipi(1);
 
         if (ppc_md.progress) ppc_md.progress("smp_psurge_kick_cpu - done", 0x354);
+
+        return 0;
 }
 
 static struct irqaction psurge_irqaction = {
-        .handler = psurge_primary_intr,
-        .flags = IRQF_DISABLED,
+        .handler = psurge_ipi_intr,
+        .flags = IRQF_DISABLED|IRQF_PERCPU,
         .name = "primary IPI",
 };
 
@@ -437,14 +447,15 @@ void __init smp_psurge_give_timebase(void)
 
 /* PowerSurge-style Macs */
 struct smp_ops_t psurge_smp_ops = {
-        .message_pass   = smp_psurge_message_pass,
+        .message_pass   = smp_muxed_ipi_message_pass,
+        .cause_ipi      = smp_psurge_cause_ipi,
         .probe          = smp_psurge_probe,
         .kick_cpu       = smp_psurge_kick_cpu,
         .setup_cpu      = smp_psurge_setup_cpu,
         .give_timebase  = smp_psurge_give_timebase,
         .take_timebase  = smp_psurge_take_timebase,
 };
-#endif /* CONFIG_PPC32 - actually powersurge support */
+#endif /* CONFIG_PPC_PMAC32_PSURGE */
 
 /*
  * Core 99 and later support
@@ -791,14 +802,14 @@ static int __init smp_core99_probe(void)
         return ncpus;
 }
 
-static void __devinit smp_core99_kick_cpu(int nr)
+static int __devinit smp_core99_kick_cpu(int nr)
 {
         unsigned int save_vector;
         unsigned long target, flags;
         unsigned int *vector = (unsigned int *)(PAGE_OFFSET+0x100);
 
         if (nr < 0 || nr > 3)
-                return;
+                return -ENOENT;
 
         if (ppc_md.progress)
                 ppc_md.progress("smp_core99_kick_cpu", 0x346);
@@ -830,6 +841,8 @@ static void __devinit smp_core99_kick_cpu(int nr)
 
         local_irq_restore(flags);
         if (ppc_md.progress) ppc_md.progress("smp_core99_kick_cpu done", 0x347);
+
+        return 0;
 }
 
 static void __devinit smp_core99_setup_cpu(int cpu_nr)
@@ -1002,7 +1015,7 @@ void __init pmac_setup_smp(void)
                 of_node_put(np);
                 smp_ops = &core99_smp_ops;
         }
-#ifdef CONFIG_PPC32
+#ifdef CONFIG_PPC_PMAC32_PSURGE
         else {
                 /* We have to set bits in cpu_possible_mask here since the
                  * secondary CPU(s) aren't in the device tree. Various
@@ -1015,7 +1028,7 @@ void __init pmac_setup_smp(void)
                         set_cpu_possible(cpu, true);
                 smp_ops = &psurge_smp_ops;
         }
-#endif /* CONFIG_PPC32 */
+#endif /* CONFIG_PPC_PMAC32_PSURGE */
 
 #ifdef CONFIG_HOTPLUG_CPU
         ppc_md.cpu_die = pmac_cpu_die;
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index f2f6413b81d3..600ed2c0ed59 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -197,7 +197,7 @@ static int ps3_virq_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
         result = irq_set_chip_data(*virq, pd);
 
         if (result) {
-                pr_debug("%s:%d: set_irq_chip_data failed\n",
+                pr_debug("%s:%d: irq_set_chip_data failed\n",
                         __func__, __LINE__);
                 goto fail_set;
         }
@@ -659,11 +659,6 @@ static void __maybe_unused _dump_mask(struct ps3_private *pd,
 static void dump_bmp(struct ps3_private* pd) {};
 #endif /* defined(DEBUG) */
 
-static void ps3_host_unmap(struct irq_host *h, unsigned int virq)
-{
-        irq_set_chip_data(virq, NULL);
-}
-
 static int ps3_host_map(struct irq_host *h, unsigned int virq,
         irq_hw_number_t hwirq)
 {
@@ -683,7 +678,6 @@ static int ps3_host_match(struct irq_host *h, struct device_node *np)
 
 static struct irq_host_ops ps3_host_ops = {
         .map = ps3_host_map,
-        .unmap = ps3_host_unmap,
         .match = ps3_host_match,
 };
 
diff --git a/arch/powerpc/platforms/ps3/smp.c b/arch/powerpc/platforms/ps3/smp.c
index 51ffde40af2b..4c44794faac0 100644
--- a/arch/powerpc/platforms/ps3/smp.c
+++ b/arch/powerpc/platforms/ps3/smp.c
@@ -39,7 +39,7 @@
 #define MSG_COUNT 4
 static DEFINE_PER_CPU(unsigned int [MSG_COUNT], ps3_ipi_virqs);
 
-static void do_message_pass(int target, int msg)
+static void ps3_smp_message_pass(int cpu, int msg)
 {
         int result;
         unsigned int virq;
@@ -49,28 +49,12 @@ static void do_message_pass(int target, int msg)
                 return;
         }
 
-        virq = per_cpu(ps3_ipi_virqs, target)[msg];
+        virq = per_cpu(ps3_ipi_virqs, cpu)[msg];
         result = ps3_send_event_locally(virq);
 
         if (result)
                 DBG("%s:%d: ps3_send_event_locally(%d, %d) failed"
-                        " (%d)\n", __func__, __LINE__, target, msg, result);
-}
-
-static void ps3_smp_message_pass(int target, int msg)
-{
-        int cpu;
-
-        if (target < NR_CPUS)
-                do_message_pass(target, msg);
-        else if (target == MSG_ALL_BUT_SELF) {
-                for_each_online_cpu(cpu)
-                        if (cpu != smp_processor_id())
-                                do_message_pass(cpu, msg);
-        } else {
-                for_each_online_cpu(cpu)
-                        do_message_pass(cpu, msg);
-        }
+                        " (%d)\n", __func__, __LINE__, cpu, msg, result);
 }
 
 static int ps3_smp_probe(void)
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index 39a472e9e80f..375a9f92158d 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -197,7 +197,7 @@ static void spu_unmap(struct spu *spu)
  * The current HV requires the spu shadow regs to be mapped with the
  * PTE page protection bits set as read-only (PP=3).  This implementation
  * uses the low level __ioremap() to bypass the page protection settings
- * inforced by ioremap_flags() to get the needed PTE bits set for the
+ * inforced by ioremap_prot() to get the needed PTE bits set for the
  * shadow regs.
  */
 
@@ -214,7 +214,7 @@ static int __init setup_areas(struct spu *spu)
                 goto fail_ioremap;
         }
 
-        spu->local_store = (__force void *)ioremap_flags(spu->local_store_phys,
+        spu->local_store = (__force void *)ioremap_prot(spu->local_store_phys,
                 LS_SIZE, _PAGE_NO_CACHE);
 
         if (!spu->local_store) {
diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
index 5b3da4b4ea79..71af4c5d6c05 100644
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
@@ -3,7 +3,10 @@ config PPC_PSERIES
         bool "IBM pSeries & new (POWER5-based) iSeries"
         select MPIC
         select PCI_MSI
-        select XICS
+        select PPC_XICS
+        select PPC_ICP_NATIVE
+        select PPC_ICP_HV
+        select PPC_ICS_RTAS
         select PPC_I8259
         select PPC_RTAS
         select PPC_RTAS_DAEMON
@@ -47,6 +50,24 @@ config SCANLOG
         tristate "Scanlog dump interface"
         depends on RTAS_PROC && PPC_PSERIES
 
+config IO_EVENT_IRQ
+        bool "IO Event Interrupt support"
+        depends on PPC_PSERIES
+        default y
+        help
+          Select this option, if you want to enable support for IO Event
+          interrupts. IO event interrupt is a mechanism provided by RTAS
+          to return information about hardware error and non-error events
+          which may need OS attention. RTAS returns events for multiple
+          event types and scopes. Device drivers can register their handlers
+          to receive events.
+
+          This option will only enable the IO event platform code. You
+          will still need to enable or compile the actual drivers
+          that use this infrastruture to handle IO event interrupts.
+
+          Say Y if you are unsure.
+
 config LPARCFG
         bool "LPAR Configuration Data"
         depends on PPC_PSERIES || PPC_ISERIES
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index fc5237810ece..3556e402cbf5 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -5,7 +5,6 @@ obj-y			:= lpar.o hvCall.o nvram.o reconfig.o \
                            setup.o iommu.o event_sources.o ras.o \
                            firmware.o power.o dlpar.o mobility.o
 obj-$(CONFIG_SMP)       += smp.o
-obj-$(CONFIG_XICS)      += xics.o
 obj-$(CONFIG_SCANLOG)   += scanlog.o
 obj-$(CONFIG_EEH)       += eeh.o eeh_cache.o eeh_driver.o eeh_event.o eeh_sysfs.o
 obj-$(CONFIG_KEXEC)     += kexec.o
@@ -22,6 +21,7 @@ obj-$(CONFIG_HCALL_STATS)	+= hvCall_inst.o
 obj-$(CONFIG_PHYP_DUMP)         += phyp_dump.o
 obj-$(CONFIG_CMM)               += cmm.o
 obj-$(CONFIG_DTL)               += dtl.o
+obj-$(CONFIG_IO_EVENT_IRQ)      += io_event_irq.o
 
 ifeq ($(CONFIG_PPC_PSERIES),y)
 obj-$(CONFIG_SUSPEND)           += suspend.o
diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c
index c371bc06434b..e9190073bb97 100644
--- a/arch/powerpc/platforms/pseries/dtl.c
+++ b/arch/powerpc/platforms/pseries/dtl.c
@@ -52,10 +52,10 @@ static u8 dtl_event_mask = 0x7;
 
 
 /*
- * Size of per-cpu log buffers. Default is just under 16 pages worth.
+ * Size of per-cpu log buffers. Firmware requires that the buffer does
+ * not cross a 4k boundary.
  */
-static int dtl_buf_entries = (16 * 85);
-
+static int dtl_buf_entries = N_DISPATCH_LOG;
 
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
 struct dtl_ring {
@@ -151,7 +151,7 @@ static int dtl_start(struct dtl *dtl)
 
         /* Register our dtl buffer with the hypervisor. The HV expects the
          * buffer size to be passed in the second word of the buffer */
-        ((u32 *)dtl->buf)[1] = dtl->buf_entries * sizeof(struct dtl_entry);
+        ((u32 *)dtl->buf)[1] = DISPATCH_LOG_BYTES;
 
         hwcpu = get_hard_smp_processor_id(dtl->cpu);
         addr = __pa(dtl->buf);
@@ -196,13 +196,15 @@ static int dtl_enable(struct dtl *dtl)
         long int rc;
         struct dtl_entry *buf = NULL;
 
+        if (!dtl_cache)
+                return -ENOMEM;
+
         /* only allow one reader */
         if (dtl->buf)
                 return -EBUSY;
 
         n_entries = dtl_buf_entries;
-        buf = kmalloc_node(n_entries * sizeof(struct dtl_entry),
-                        GFP_KERNEL, cpu_to_node(dtl->cpu));
+        buf = kmem_cache_alloc_node(dtl_cache, GFP_KERNEL, cpu_to_node(dtl->cpu));
         if (!buf) {
                 printk(KERN_WARNING "%s: buffer alloc failed for cpu %d\n",
                                 __func__, dtl->cpu);
@@ -223,7 +225,7 @@ static int dtl_enable(struct dtl *dtl)
         spin_unlock(&dtl->lock);
 
         if (rc)
-                kfree(buf);
+                kmem_cache_free(dtl_cache, buf);
         return rc;
 }
 
@@ -231,7 +233,7 @@ static void dtl_disable(struct dtl *dtl)
 {
         spin_lock(&dtl->lock);
         dtl_stop(dtl);
-        kfree(dtl->buf);
+        kmem_cache_free(dtl_cache, dtl->buf);
         dtl->buf = NULL;
         dtl->buf_entries = 0;
         spin_unlock(&dtl->lock);
@@ -365,7 +367,7 @@ static int dtl_init(void)
 
         event_mask_file = debugfs_create_x8("dtl_event_mask", 0600,
                                 dtl_dir, &dtl_event_mask);
-        buf_entries_file = debugfs_create_u32("dtl_buf_entries", 0600,
+        buf_entries_file = debugfs_create_u32("dtl_buf_entries", 0400,
                                 dtl_dir, &dtl_buf_entries);
 
         if (!event_mask_file || !buf_entries_file) {
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 89649173d3a3..46b55cf563e3 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -93,6 +93,7 @@ static int ibm_slot_error_detail;
 static int ibm_get_config_addr_info;
 static int ibm_get_config_addr_info2;
 static int ibm_configure_bridge;
+static int ibm_configure_pe;
 
 int eeh_subsystem_enabled;
 EXPORT_SYMBOL(eeh_subsystem_enabled);
@@ -261,6 +262,8 @@ void eeh_slot_error_detail(struct pci_dn *pdn, int severity)
         pci_regs_buf[0] = 0;
 
         rtas_pci_enable(pdn, EEH_THAW_MMIO);
+        rtas_configure_bridge(pdn);
+        eeh_restore_bars(pdn);
         loglen = gather_pci_data(pdn, pci_regs_buf, EEH_PCI_REGS_LOG_LEN);
 
         rtas_slot_error_detail(pdn, severity, pci_regs_buf, loglen);
@@ -448,6 +451,39 @@ void eeh_clear_slot (struct device_node *dn, int mode_flag)
         raw_spin_unlock_irqrestore(&confirm_error_lock, flags);
 }
 
+void __eeh_set_pe_freset(struct device_node *parent, unsigned int *freset)
+{
+        struct device_node *dn;
+
+        for_each_child_of_node(parent, dn) {
+                if (PCI_DN(dn)) {
+
+                        struct pci_dev *dev = PCI_DN(dn)->pcidev;
+
+                        if (dev && dev->driver)
+                                *freset |= dev->needs_freset;
+
+                        __eeh_set_pe_freset(dn, freset);
+                }
+        }
+}
+
+void eeh_set_pe_freset(struct device_node *dn, unsigned int *freset)
+{
+        struct pci_dev *dev;
+        dn = find_device_pe(dn);
+
+        /* Back up one, since config addrs might be shared */
+        if (!pcibios_find_pci_bus(dn) && PCI_DN(dn->parent))
+                dn = dn->parent;
+
+        dev = PCI_DN(dn)->pcidev;
+        if (dev)
+                *freset |= dev->needs_freset;
+
+        __eeh_set_pe_freset(dn, freset);
+}
+
 /**
  * eeh_dn_check_failure - check if all 1's data is due to EEH slot freeze
  * @dn device node
@@ -692,15 +728,24 @@ rtas_pci_slot_reset(struct pci_dn *pdn, int state)
         if (pdn->eeh_pe_config_addr)
                 config_addr = pdn->eeh_pe_config_addr;
 
-        rc = rtas_call(ibm_set_slot_reset,4,1, NULL,
+        rc = rtas_call(ibm_set_slot_reset, 4, 1, NULL,
                        config_addr,
                        BUID_HI(pdn->phb->buid),
                        BUID_LO(pdn->phb->buid),
                        state);
-        if (rc)
-                printk (KERN_WARNING "EEH: Unable to reset the failed slot,"
-                        " (%d) #RST=%d dn=%s\n",
-                        rc, state, pdn->node->full_name);
+
+        /* Fundamental-reset not supported on this PE, try hot-reset */
+        if (rc == -8 && state == 3) {
+                rc = rtas_call(ibm_set_slot_reset, 4, 1, NULL,
+                               config_addr,
+                               BUID_HI(pdn->phb->buid),
+                               BUID_LO(pdn->phb->buid), 1);
+                if (rc)
+                        printk(KERN_WARNING
+                                "EEH: Unable to reset the failed slot,"
+                                " #RST=%d dn=%s\n",
+                                rc, pdn->node->full_name);
+        }
 }
 
 /**
@@ -736,18 +781,21 @@ int pcibios_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state stat
 /**
  * rtas_set_slot_reset -- assert the pci #RST line for 1/4 second
  * @pdn: pci device node to be reset.
- *
- *  Return 0 if success, else a non-zero value.
  */
 
 static void __rtas_set_slot_reset(struct pci_dn *pdn)
 {
-        struct pci_dev *dev = pdn->pcidev;
+        unsigned int freset = 0;
 
-        /* Determine type of EEH reset required by device,
-         * default hot reset or fundamental reset
-         */
-        if (dev && dev->needs_freset)
+        /* Determine type of EEH reset required for
+         * Partitionable Endpoint, a hot-reset (1)
+         * or a fundamental reset (3).
+         * A fundamental reset required by any device under
+         * Partitionable Endpoint trumps hot-reset.
+         */
+        eeh_set_pe_freset(pdn->node, &freset);
+
+        if (freset)
                 rtas_pci_slot_reset(pdn, 3);
         else
                 rtas_pci_slot_reset(pdn, 1);
@@ -895,13 +943,20 @@ rtas_configure_bridge(struct pci_dn *pdn)
 {
         int config_addr;
         int rc;
+        int token;
 
         /* Use PE configuration address, if present */
         config_addr = pdn->eeh_config_addr;
         if (pdn->eeh_pe_config_addr)
                 config_addr = pdn->eeh_pe_config_addr;
 
-        rc = rtas_call(ibm_configure_bridge,3,1, NULL,
+        /* Use new configure-pe function, if supported */
+        if (ibm_configure_pe != RTAS_UNKNOWN_SERVICE)
+                token = ibm_configure_pe;
+        else
+                token = ibm_configure_bridge;
+
+        rc = rtas_call(token, 3, 1, NULL,
                        config_addr,
                        BUID_HI(pdn->phb->buid),
                        BUID_LO(pdn->phb->buid));
@@ -1077,6 +1132,7 @@ void __init eeh_init(void)
         ibm_get_config_addr_info = rtas_token("ibm,get-config-addr-info");
         ibm_get_config_addr_info2 = rtas_token("ibm,get-config-addr-info2");
         ibm_configure_bridge = rtas_token ("ibm,configure-bridge");
+        ibm_configure_pe = rtas_token("ibm,configure-pe");
 
         if (ibm_set_eeh_option == RTAS_UNKNOWN_SERVICE)
                 return;
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index b8d70f5d9aa9..1b6cb10589e0 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -328,7 +328,7 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
         struct pci_bus *frozen_bus;
         int rc = 0;
         enum pci_ers_result result = PCI_ERS_RESULT_NONE;
-        const char *location, *pci_str, *drv_str;
+        const char *location, *pci_str, *drv_str, *bus_pci_str, *bus_drv_str;
 
         frozen_dn = find_device_pe(event->dn);
         if (!frozen_dn) {
@@ -364,13 +364,8 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
         frozen_pdn = PCI_DN(frozen_dn);
         frozen_pdn->eeh_freeze_count++;
 
-        if (frozen_pdn->pcidev) {
-                pci_str = pci_name (frozen_pdn->pcidev);
-                drv_str = pcid_name (frozen_pdn->pcidev);
-        } else {
-                pci_str = eeh_pci_name(event->dev);
-                drv_str = pcid_name (event->dev);
-        }
+        pci_str = eeh_pci_name(event->dev);
+        drv_str = pcid_name(event->dev);
         
         if (frozen_pdn->eeh_freeze_count > EEH_MAX_ALLOWED_FREEZES)
                 goto excess_failures;
@@ -378,8 +373,17 @@ struct pci_dn * handle_eeh_events (struct eeh_event *event)
         printk(KERN_WARNING
            "EEH: This PCI device has failed %d times in the last hour:\n",
                 frozen_pdn->eeh_freeze_count);
+
+        if (frozen_pdn->pcidev) {
+                bus_pci_str = pci_name(frozen_pdn->pcidev);
+                bus_drv_str = pcid_name(frozen_pdn->pcidev);
+                printk(KERN_WARNING
+                        "EEH: Bus location=%s driver=%s pci addr=%s\n",
+                        location, bus_drv_str, bus_pci_str);
+        }
+
         printk(KERN_WARNING
-                "EEH: location=%s driver=%s pci addr=%s\n",
+                "EEH: Device location=%s driver=%s pci addr=%s\n",
                 location, drv_str, pci_str);
 
         /* Walk the various device drivers attached to this slot through
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index ef8c45489e20..46f13a3c5d09 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -19,6 +19,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/cpu.h>
 #include <asm/system.h>
@@ -28,7 +29,7 @@
 #include <asm/machdep.h>
 #include <asm/vdso_datapage.h>
 #include <asm/pSeries_reconfig.h>
-#include "xics.h"
+#include <asm/xics.h>
 #include "plpar_wrappers.h"
 #include "offline_states.h"
 
@@ -280,7 +281,7 @@ static int pseries_add_processor(struct device_node *np)
         }
 
         for_each_cpu(cpu, tmp) {
-                BUG_ON(cpumask_test_cpu(cpu, cpu_present_mask));
+                BUG_ON(cpu_present(cpu));
                 set_cpu_present(cpu, true);
                 set_hard_smp_processor_id(cpu, *intserv++);
         }
diff --git a/arch/powerpc/platforms/pseries/io_event_irq.c b/arch/powerpc/platforms/pseries/io_event_irq.c
new file mode 100644
index 000000000000..c829e6067d54
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/io_event_irq.c
@@ -0,0 +1,231 @@
+/*
+ * Copyright 2010 2011 Mark Nelson and Tseng-Hui (Frank) Lin, 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/errno.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/of.h>
+#include <linux/list.h>
+#include <linux/notifier.h>
+
+#include <asm/machdep.h>
+#include <asm/rtas.h>
+#include <asm/irq.h>
+#include <asm/io_event_irq.h>
+
+#include "pseries.h"
+
+/*
+ * IO event interrupt is a mechanism provided by RTAS to return
+ * information about hardware error and non-error events. Device
+ * drivers can register their event handlers to receive events.
+ * Device drivers are expected to use atomic_notifier_chain_register()
+ * and atomic_notifier_chain_unregister() to register and unregister
+ * their event handlers. Since multiple IO event types and scopes
+ * share an IO event interrupt, the event handlers are called one
+ * by one until the IO event is claimed by one of the handlers.
+ * The event handlers are expected to return NOTIFY_OK if the
+ * event is handled by the event handler or NOTIFY_DONE if the
+ * event does not belong to the handler.
+ *
+ * Usage:
+ *
+ * Notifier function:
+ * #include <asm/io_event_irq.h>
+ * int event_handler(struct notifier_block *nb, unsigned long val, void *data) {
+ *      p = (struct pseries_io_event_sect_data *) data;
+ *      if (! is_my_event(p->scope, p->event_type)) return NOTIFY_DONE;
+ *              :
+ *              :
+ *      return NOTIFY_OK;
+ * }
+ * struct notifier_block event_nb = {
+ *      .notifier_call = event_handler,
+ * }
+ *
+ * Registration:
+ * atomic_notifier_chain_register(&pseries_ioei_notifier_list, &event_nb);
+ *
+ * Unregistration:
+ * atomic_notifier_chain_unregister(&pseries_ioei_notifier_list, &event_nb);
+ */
+
+ATOMIC_NOTIFIER_HEAD(pseries_ioei_notifier_list);
+EXPORT_SYMBOL_GPL(pseries_ioei_notifier_list);
+
+static int ioei_check_exception_token;
+
+/* pSeries event log format */
+
+/* Two bytes ASCII section IDs */
+#define PSERIES_ELOG_SECT_ID_PRIV_HDR           (('P' << 8) | 'H')
+#define PSERIES_ELOG_SECT_ID_USER_HDR           (('U' << 8) | 'H')
+#define PSERIES_ELOG_SECT_ID_PRIMARY_SRC        (('P' << 8) | 'S')
+#define PSERIES_ELOG_SECT_ID_EXTENDED_UH        (('E' << 8) | 'H')
+#define PSERIES_ELOG_SECT_ID_FAILING_MTMS       (('M' << 8) | 'T')
+#define PSERIES_ELOG_SECT_ID_SECONDARY_SRC      (('S' << 8) | 'S')
+#define PSERIES_ELOG_SECT_ID_DUMP_LOCATOR       (('D' << 8) | 'H')
+#define PSERIES_ELOG_SECT_ID_FW_ERROR           (('S' << 8) | 'W')
+#define PSERIES_ELOG_SECT_ID_IMPACT_PART_ID     (('L' << 8) | 'P')
+#define PSERIES_ELOG_SECT_ID_LOGIC_RESOURCE_ID  (('L' << 8) | 'R')
+#define PSERIES_ELOG_SECT_ID_HMC_ID             (('H' << 8) | 'M')
+#define PSERIES_ELOG_SECT_ID_EPOW               (('E' << 8) | 'P')
+#define PSERIES_ELOG_SECT_ID_IO_EVENT           (('I' << 8) | 'E')
+#define PSERIES_ELOG_SECT_ID_MANUFACT_INFO      (('M' << 8) | 'I')
+#define PSERIES_ELOG_SECT_ID_CALL_HOME          (('C' << 8) | 'H')
+#define PSERIES_ELOG_SECT_ID_USER_DEF           (('U' << 8) | 'D')
+
+/* Vendor specific Platform Event Log Format, Version 6, section header */
+struct pseries_elog_section {
+        uint16_t id;                    /* 0x00 2-byte ASCII section ID */
+        uint16_t length;                /* 0x02 Section length in bytes */
+        uint8_t version;                /* 0x04 Section version         */
+        uint8_t subtype;                /* 0x05 Section subtype         */
+        uint16_t creator_component;     /* 0x06 Creator component ID    */
+        uint8_t data[];                 /* 0x08 Start of section data   */
+};
+
+static char ioei_rtas_buf[RTAS_DATA_BUF_SIZE] __cacheline_aligned;
+
+/**
+ * Find data portion of a specific section in RTAS extended event log.
+ * @elog: RTAS error/event log.
+ * @sect_id: secsion ID.
+ *
+ * Return:
+ *      pointer to the section data of the specified section
+ *      NULL if not found
+ */
+static struct pseries_elog_section *find_xelog_section(struct rtas_error_log *elog,
+                                                       uint16_t sect_id)
+{
+        struct rtas_ext_event_log_v6 *xelog =
+                (struct rtas_ext_event_log_v6 *) elog->buffer;
+        struct pseries_elog_section *sect;
+        unsigned char *p, *log_end;
+
+        /* Check that we understand the format */
+        if (elog->extended_log_length < sizeof(struct rtas_ext_event_log_v6) ||
+            xelog->log_format != RTAS_V6EXT_LOG_FORMAT_EVENT_LOG ||
+            xelog->company_id != RTAS_V6EXT_COMPANY_ID_IBM)
+                return NULL;
+
+        log_end = elog->buffer + elog->extended_log_length;
+        p = xelog->vendor_log;
+        while (p < log_end) {
+                sect = (struct pseries_elog_section *)p;
+                if (sect->id == sect_id)
+                        return sect;
+                p += sect->length;
+        }
+        return NULL;
+}
+
+/**
+ * Find the data portion of an IO Event section from event log.
+ * @elog: RTAS error/event log.
+ *
+ * Return:
+ *      pointer to a valid IO event section data. NULL if not found.
+ */
+static struct pseries_io_event * ioei_find_event(struct rtas_error_log *elog)
+{
+        struct pseries_elog_section *sect;
+
+        /* We should only ever get called for io-event interrupts, but if
+         * we do get called for another type then something went wrong so
+         * make some noise about it.
+         * RTAS_TYPE_IO only exists in extended event log version 6 or later.
+         * No need to check event log version.
+         */
+        if (unlikely(elog->type != RTAS_TYPE_IO)) {
+                printk_once(KERN_WARNING "io_event_irq: Unexpected event type %d",
+                            elog->type);
+                return NULL;
+        }
+
+        sect = find_xelog_section(elog, PSERIES_ELOG_SECT_ID_IO_EVENT);
+        if (unlikely(!sect)) {
+                printk_once(KERN_WARNING "io_event_irq: RTAS extended event "
+                            "log does not contain an IO Event section. "
+                            "Could be a bug in system firmware!\n");
+                return NULL;
+        }
+        return (struct pseries_io_event *) &sect->data;
+}
+
+/*
+ * PAPR:
+ * - check-exception returns the first found error or event and clear that
+ *   error or event so it is reported once.
+ * - Each interrupt returns one event. If a plateform chooses to report
+ *   multiple events through a single interrupt, it must ensure that the
+ *   interrupt remains asserted until check-exception has been used to
+ *   process all out-standing events for that interrupt.
+ *
+ * Implementation notes:
+ * - Events must be processed in the order they are returned. Hence,
+ *   sequential in nature.
+ * - The owner of an event is determined by combinations of scope,
+ *   event type, and sub-type. There is no easy way to pre-sort clients
+ *   by scope or event type alone. For example, Torrent ISR route change
+ *   event is reported with scope 0x00 (Not Applicatable) rather than
+ *   0x3B (Torrent-hub). It is better to let the clients to identify
+ *   who owns the the event.
+ */
+
+static irqreturn_t ioei_interrupt(int irq, void *dev_id)
+{
+        struct pseries_io_event *event;
+        int rtas_rc;
+
+        for (;;) {
+                rtas_rc = rtas_call(ioei_check_exception_token, 6, 1, NULL,
+                                    RTAS_VECTOR_EXTERNAL_INTERRUPT,
+                                    virq_to_hw(irq),
+                                    RTAS_IO_EVENTS, 1 /* Time Critical */,
+                                    __pa(ioei_rtas_buf),
+                                    RTAS_DATA_BUF_SIZE);
+                if (rtas_rc != 0)
+                        break;
+
+                event = ioei_find_event((struct rtas_error_log *)ioei_rtas_buf);
+                if (!event)
+                        continue;
+
+                atomic_notifier_call_chain(&pseries_ioei_notifier_list,
+                                           0, event);
+        }
+        return IRQ_HANDLED;
+}
+
+static int __init ioei_init(void)
+{
+        struct device_node *np;
+
+        ioei_check_exception_token = rtas_token("check-exception");
+        if (ioei_check_exception_token == RTAS_UNKNOWN_SERVICE) {
+                pr_warning("IO Event IRQ not supported on this system !\n");
+                return -ENODEV;
+        }
+        np = of_find_node_by_path("/event-sources/ibm,io-events");
+        if (np) {
+                request_event_sources_irqs(np, ioei_interrupt, "IO_EVENT");
+                of_node_put(np);
+        } else {
+                pr_err("io_event_irq: No ibm,io-events on system! "
+                       "IO Event interrupt disabled.\n");
+                return -ENODEV;
+        }
+        return 0;
+}
+machine_subsys_initcall(pseries, ioei_init);
+
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 6d5412a18b26..01faab9456ca 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -659,15 +659,18 @@ static void remove_ddw(struct device_node *np)
 {
         struct dynamic_dma_window_prop *dwp;
         struct property *win64;
-        const u32 *ddr_avail;
+        const u32 *ddw_avail;
         u64 liobn;
         int len, ret;
 
-        ddr_avail = of_get_property(np, "ibm,ddw-applicable", &len);
+        ddw_avail = of_get_property(np, "ibm,ddw-applicable", &len);
         win64 = of_find_property(np, DIRECT64_PROPNAME, NULL);
-        if (!win64 || !ddr_avail || len < 3 * sizeof(u32))
+        if (!win64)
                 return;
 
+        if (!ddw_avail || len < 3 * sizeof(u32) || win64->length < sizeof(*dwp))
+                goto delprop;
+
         dwp = win64->value;
         liobn = (u64)be32_to_cpu(dwp->liobn);
 
@@ -681,28 +684,29 @@ static void remove_ddw(struct device_node *np)
                 pr_debug("%s successfully cleared tces in window.\n",
                          np->full_name);
 
-        ret = rtas_call(ddr_avail[2], 1, 1, NULL, liobn);
+        ret = rtas_call(ddw_avail[2], 1, 1, NULL, liobn);
         if (ret)
                 pr_warning("%s: failed to remove direct window: rtas returned "
                         "%d to ibm,remove-pe-dma-window(%x) %llx\n",
-                        np->full_name, ret, ddr_avail[2], liobn);
+                        np->full_name, ret, ddw_avail[2], liobn);
         else
                 pr_debug("%s: successfully removed direct window: rtas returned "
                         "%d to ibm,remove-pe-dma-window(%x) %llx\n",
-                        np->full_name, ret, ddr_avail[2], liobn);
-}
+                        np->full_name, ret, ddw_avail[2], liobn);
 
+delprop:
+        ret = prom_remove_property(np, win64);
+        if (ret)
+                pr_warning("%s: failed to remove direct window property: %d\n",
+                        np->full_name, ret);
+}
 
-static int dupe_ddw_if_already_created(struct pci_dev *dev, struct device_node *pdn)
+static u64 find_existing_ddw(struct device_node *pdn)
 {
-        struct device_node *dn;
-        struct pci_dn *pcidn;
         struct direct_window *window;
         const struct dynamic_dma_window_prop *direct64;
         u64 dma_addr = 0;
 
-        dn = pci_device_to_OF_node(dev);
-        pcidn = PCI_DN(dn);
         spin_lock(&direct_window_list_lock);
         /* check if we already created a window and dupe that config if so */
         list_for_each_entry(window, &direct_window_list, list) {
@@ -717,36 +721,40 @@ static int dupe_ddw_if_already_created(struct pci_dev *dev, struct device_node *
         return dma_addr;
 }
 
-static u64 dupe_ddw_if_kexec(struct pci_dev *dev, struct device_node *pdn)
+static int find_existing_ddw_windows(void)
 {
-        struct device_node *dn;
-        struct pci_dn *pcidn;
         int len;
+        struct device_node *pdn;
         struct direct_window *window;
         const struct dynamic_dma_window_prop *direct64;
-        u64 dma_addr = 0;
 
-        dn = pci_device_to_OF_node(dev);
-        pcidn = PCI_DN(dn);
-        direct64 = of_get_property(pdn, DIRECT64_PROPNAME, &len);
-        if (direct64) {
+        if (!firmware_has_feature(FW_FEATURE_LPAR))
+                return 0;
+
+        for_each_node_with_property(pdn, DIRECT64_PROPNAME) {
+                direct64 = of_get_property(pdn, DIRECT64_PROPNAME, &len);
+                if (!direct64)
+                        continue;
+
                 window = kzalloc(sizeof(*window), GFP_KERNEL);
-                if (!window) {
+                if (!window || len < sizeof(struct dynamic_dma_window_prop)) {
+                        kfree(window);
                         remove_ddw(pdn);
-                } else {
-                        window->device = pdn;
-                        window->prop = direct64;
-                        spin_lock(&direct_window_list_lock);
-                        list_add(&window->list, &direct_window_list);
-                        spin_unlock(&direct_window_list_lock);
-                        dma_addr = direct64->dma_base;
+                        continue;
                 }
+
+                window->device = pdn;
+                window->prop = direct64;
+                spin_lock(&direct_window_list_lock);
+                list_add(&window->list, &direct_window_list);
+                spin_unlock(&direct_window_list_lock);
         }
 
-        return dma_addr;
+        return 0;
 }
+machine_arch_initcall(pseries, find_existing_ddw_windows);
 
-static int query_ddw(struct pci_dev *dev, const u32 *ddr_avail,
+static int query_ddw(struct pci_dev *dev, const u32 *ddw_avail,
                         struct ddw_query_response *query)
 {
         struct device_node *dn;
@@ -767,15 +775,15 @@ static int query_ddw(struct pci_dev *dev, const u32 *ddr_avail,
         if (pcidn->eeh_pe_config_addr)
                 cfg_addr = pcidn->eeh_pe_config_addr;
         buid = pcidn->phb->buid;
-        ret = rtas_call(ddr_avail[0], 3, 5, (u32 *)query,
+        ret = rtas_call(ddw_avail[0], 3, 5, (u32 *)query,
                   cfg_addr, BUID_HI(buid), BUID_LO(buid));
         dev_info(&dev->dev, "ibm,query-pe-dma-windows(%x) %x %x %x"
-                " returned %d\n", ddr_avail[0], cfg_addr, BUID_HI(buid),
+                " returned %d\n", ddw_avail[0], cfg_addr, BUID_HI(buid),
                 BUID_LO(buid), ret);
         return ret;
 }
 
-static int create_ddw(struct pci_dev *dev, const u32 *ddr_avail,
+static int create_ddw(struct pci_dev *dev, const u32 *ddw_avail,
                         struct ddw_create_response *create, int page_shift,
                         int window_shift)
 {
@@ -800,12 +808,12 @@ static int create_ddw(struct pci_dev *dev, const u32 *ddr_avail,
 
         do {
                 /* extra outputs are LIOBN and dma-addr (hi, lo) */
-                ret = rtas_call(ddr_avail[1], 5, 4, (u32 *)create, cfg_addr,
+                ret = rtas_call(ddw_avail[1], 5, 4, (u32 *)create, cfg_addr,
                                 BUID_HI(buid), BUID_LO(buid), page_shift, window_shift);
         } while (rtas_busy_delay(ret));
         dev_info(&dev->dev,
                 "ibm,create-pe-dma-window(%x) %x %x %x %x %x returned %d "
-                "(liobn = 0x%x starting addr = %x %x)\n", ddr_avail[1],
+                "(liobn = 0x%x starting addr = %x %x)\n", ddw_avail[1],
                  cfg_addr, BUID_HI(buid), BUID_LO(buid), page_shift,
                  window_shift, ret, create->liobn, create->addr_hi, create->addr_lo);
 
@@ -831,18 +839,14 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
         int page_shift;
         u64 dma_addr, max_addr;
         struct device_node *dn;
-        const u32 *uninitialized_var(ddr_avail);
+        const u32 *uninitialized_var(ddw_avail);
         struct direct_window *window;
-        struct property *uninitialized_var(win64);
+        struct property *win64;
         struct dynamic_dma_window_prop *ddwprop;
 
         mutex_lock(&direct_window_init_mutex);
 
-        dma_addr = dupe_ddw_if_already_created(dev, pdn);
-        if (dma_addr != 0)
-                goto out_unlock;
-
-        dma_addr = dupe_ddw_if_kexec(dev, pdn);
+        dma_addr = find_existing_ddw(pdn);
         if (dma_addr != 0)
                 goto out_unlock;
 
@@ -854,8 +858,8 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
          * for the given node in that order.
          * the property is actually in the parent, not the PE
          */
-        ddr_avail = of_get_property(pdn, "ibm,ddw-applicable", &len);
-        if (!ddr_avail || len < 3 * sizeof(u32))
+        ddw_avail = of_get_property(pdn, "ibm,ddw-applicable", &len);
+        if (!ddw_avail || len < 3 * sizeof(u32))
                 goto out_unlock;
 
        /*
@@ -865,7 +869,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
          * of page sizes: supported and supported for migrate-dma.
          */
         dn = pci_device_to_OF_node(dev);
-        ret = query_ddw(dev, ddr_avail, &query);
+        ret = query_ddw(dev, ddw_avail, &query);
         if (ret != 0)
                 goto out_unlock;
 
@@ -907,13 +911,14 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
         }
         win64->name = kstrdup(DIRECT64_PROPNAME, GFP_KERNEL);
         win64->value = ddwprop = kmalloc(sizeof(*ddwprop), GFP_KERNEL);
+        win64->length = sizeof(*ddwprop);
         if (!win64->name || !win64->value) {
                 dev_info(&dev->dev,
                         "couldn't allocate property name and value\n");
                 goto out_free_prop;
         }
 
-        ret = create_ddw(dev, ddr_avail, &create, page_shift, len);
+        ret = create_ddw(dev, ddw_avail, &create, page_shift, len);
         if (ret != 0)
                 goto out_free_prop;
 
@@ -1021,13 +1026,16 @@ static int dma_set_mask_pSeriesLP(struct device *dev, u64 dma_mask)
         const void *dma_window = NULL;
         u64 dma_offset;
 
-        if (!dev->dma_mask || !dma_supported(dev, dma_mask))
+        if (!dev->dma_mask)
                 return -EIO;
 
+        if (!dev_is_pci(dev))
+                goto check_mask;
+
+        pdev = to_pci_dev(dev);
+
         /* only attempt to use a new window if 64-bit DMA is requested */
         if (!disable_ddw && dma_mask == DMA_BIT_MASK(64)) {
-                pdev = to_pci_dev(dev);
-
                 dn = pci_device_to_OF_node(pdev);
                 dev_dbg(dev, "node is %s\n", dn->full_name);
 
@@ -1054,12 +1062,17 @@ static int dma_set_mask_pSeriesLP(struct device *dev, u64 dma_mask)
                 }
         }
 
-        /* fall-through to iommu ops */
-        if (!ddw_enabled) {
-                dev_info(dev, "Using 32-bit DMA via iommu\n");
+        /* fall back on iommu ops, restore table pointer with ops */
+        if (!ddw_enabled && get_dma_ops(dev) != &dma_iommu_ops) {
+                dev_info(dev, "Restoring 32-bit DMA via iommu\n");
                 set_dma_ops(dev, &dma_iommu_ops);
+                pci_dma_dev_setup_pSeriesLP(pdev);
         }
 
+check_mask:
+        if (!dma_supported(dev, dma_mask))
+                return -EIO;
+
         *dev->dma_mask = dma_mask;
         return 0;
 }
diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c
index 77d38a5e2ff9..54cf3a4aa16b 100644
--- a/arch/powerpc/platforms/pseries/kexec.c
+++ b/arch/powerpc/platforms/pseries/kexec.c
@@ -7,15 +7,18 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+
 #include <asm/machdep.h>
 #include <asm/page.h>
 #include <asm/firmware.h>
 #include <asm/kexec.h>
 #include <asm/mpic.h>
+#include <asm/xics.h>
 #include <asm/smp.h>
 
 #include "pseries.h"
-#include "xics.h"
 #include "plpar_wrappers.h"
 
 static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index ca5d5898d320..39e6e0a7b2fa 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -329,6 +329,8 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
         /* Make pHyp happy */
         if ((rflags & _PAGE_NO_CACHE) & !(rflags & _PAGE_WRITETHRU))
                 hpte_r &= ~_PAGE_COHERENT;
+        if (firmware_has_feature(FW_FEATURE_XCMO) && !(hpte_r & HPTE_R_N))
+                flags |= H_COALESCE_CAND;
 
         lpar_rc = plpar_pte_enter(flags, hpte_group, hpte_v, hpte_r, &slot);
         if (unlikely(lpar_rc == H_PTEG_FULL)) {
@@ -573,7 +575,7 @@ static void pSeries_lpar_flush_hash_range(unsigned long number, int local)
         unsigned long i, pix, rc;
         unsigned long flags = 0;
         struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
-        int lock_tlbie = !cpu_has_feature(CPU_FTR_LOCKLESS_TLBIE);
+        int lock_tlbie = !mmu_has_feature(MMU_FTR_LOCKLESS_TLBIE);
         unsigned long param[9];
         unsigned long va;
         unsigned long hash, index, shift, hidx, slot;
@@ -771,3 +773,47 @@ out:
         local_irq_restore(flags);
 }
 #endif
+
+/**
+ * h_get_mpp
+ * H_GET_MPP hcall returns info in 7 parms
+ */
+int h_get_mpp(struct hvcall_mpp_data *mpp_data)
+{
+        int rc;
+        unsigned long retbuf[PLPAR_HCALL9_BUFSIZE];
+
+        rc = plpar_hcall9(H_GET_MPP, retbuf);
+
+        mpp_data->entitled_mem = retbuf[0];
+        mpp_data->mapped_mem = retbuf[1];
+
+        mpp_data->group_num = (retbuf[2] >> 2 * 8) & 0xffff;
+        mpp_data->pool_num = retbuf[2] & 0xffff;
+
+        mpp_data->mem_weight = (retbuf[3] >> 7 * 8) & 0xff;
+        mpp_data->unallocated_mem_weight = (retbuf[3] >> 6 * 8) & 0xff;
+        mpp_data->unallocated_entitlement = retbuf[3] & 0xffffffffffff;
+
+        mpp_data->pool_size = retbuf[4];
+        mpp_data->loan_request = retbuf[5];
+        mpp_data->backing_mem = retbuf[6];
+
+        return rc;
+}
+EXPORT_SYMBOL(h_get_mpp);
+
+int h_get_mpp_x(struct hvcall_mpp_x_data *mpp_x_data)
+{
+        int rc;
+        unsigned long retbuf[PLPAR_HCALL9_BUFSIZE] = { 0 };
+
+        rc = plpar_hcall9(H_GET_MPP_X, retbuf);
+
+        mpp_x_data->coalesced_bytes = retbuf[0];
+        mpp_x_data->pool_coalesced_bytes = retbuf[1];
+        mpp_x_data->pool_purr_cycles = retbuf[2];
+        mpp_x_data->pool_spurr_cycles = retbuf[3];
+
+        return rc;
+}
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/platforms/pseries/plpar_wrappers.h
index d9801117124b..4bf21207d7d3 100644
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h
@@ -270,31 +270,4 @@ static inline long plpar_put_term_char(unsigned long termno, unsigned long len,
                         lbuf[1]);
 }
 
-static inline long plpar_eoi(unsigned long xirr)
-{
-        return plpar_hcall_norets(H_EOI, xirr);
-}
-
-static inline long plpar_cppr(unsigned long cppr)
-{
-        return plpar_hcall_norets(H_CPPR, cppr);
-}
-
-static inline long plpar_ipi(unsigned long servernum, unsigned long mfrr)
-{
-        return plpar_hcall_norets(H_IPI, servernum, mfrr);
-}
-
-static inline long plpar_xirr(unsigned long *xirr_ret, unsigned char cppr)
-{
-        long rc;
-        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
-
-        rc = plpar_hcall(H_XIRR, retbuf, cppr);
-
-        *xirr_ret = retbuf[0];
-
-        return rc;
-}
-
 #endif /* _PSERIES_PLPAR_WRAPPERS_H */
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index c55d7ad9c648..086d2ae4e06a 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -122,7 +122,7 @@ static irqreturn_t ras_epow_interrupt(int irq, void *dev_id)
 
         status = rtas_call(ras_check_exception_token, 6, 1, NULL,
                            RTAS_VECTOR_EXTERNAL_INTERRUPT,
-                           irq_map[irq].hwirq,
+                           virq_to_hw(irq),
                            RTAS_EPOW_WARNING | RTAS_POWERMGM_EVENTS,
                            critical, __pa(&ras_log_buf),
                                 rtas_get_error_log_max());
@@ -157,7 +157,7 @@ static irqreturn_t ras_error_interrupt(int irq, void *dev_id)
 
         status = rtas_call(ras_check_exception_token, 6, 1, NULL,
                            RTAS_VECTOR_EXTERNAL_INTERRUPT,
-                           irq_map[irq].hwirq,
+                           virq_to_hw(irq),
                            RTAS_INTERNAL_ERROR, 1 /*Time Critical */,
                            __pa(&ras_log_buf),
                                 rtas_get_error_log_max());
@@ -227,7 +227,7 @@ static struct rtas_error_log *fwnmi_get_errinfo(struct pt_regs *regs)
         struct rtas_error_log *h, *errhdr = NULL;
 
         if (!VALID_FWNMI_BUFFER(regs->gpr[3])) {
-                printk(KERN_ERR "FWNMI: corrupt r3\n");
+                printk(KERN_ERR "FWNMI: corrupt r3 0x%016lx\n", regs->gpr[3]);
                 return NULL;
         }
 
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 6c42cfde8415..593acceeff96 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -53,9 +53,9 @@
 #include <asm/irq.h>
 #include <asm/time.h>
 #include <asm/nvram.h>
-#include "xics.h"
 #include <asm/pmc.h>
 #include <asm/mpic.h>
+#include <asm/xics.h>
 #include <asm/ppc-pci.h>
 #include <asm/i8259.h>
 #include <asm/udbg.h>
@@ -205,6 +205,9 @@ static void __init pseries_mpic_init_IRQ(void)
                 mpic_assign_isu(mpic, n, isuaddr);
         }
 
+        /* Setup top-level get_irq */
+        ppc_md.get_irq = mpic_get_irq;
+
         /* All ISUs are setup, complete initialization */
         mpic_init(mpic);
 
@@ -214,7 +217,7 @@ static void __init pseries_mpic_init_IRQ(void)
 
 static void __init pseries_xics_init_IRQ(void)
 {
-        xics_init_IRQ();
+        xics_init();
         pseries_setup_i8259_cascade();
 }
 
@@ -238,7 +241,6 @@ static void __init pseries_discover_pic(void)
                 if (strstr(typep, "open-pic")) {
                         pSeries_mpic_node = of_node_get(np);
                         ppc_md.init_IRQ       = pseries_mpic_init_IRQ;
-                        ppc_md.get_irq        = mpic_get_irq;
                         setup_kexec_cpu_down_mpic();
                         smp_init_pseries_mpic();
                         return;
@@ -276,6 +278,8 @@ static struct notifier_block pci_dn_reconfig_nb = {
         .notifier_call = pci_dn_reconfig_notifier,
 };
 
+struct kmem_cache *dtl_cache;
+
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
 /*
  * Allocate space for the dispatch trace log for all possible cpus
@@ -287,18 +291,12 @@ static int alloc_dispatch_logs(void)
         int cpu, ret;
         struct paca_struct *pp;
         struct dtl_entry *dtl;
-        struct kmem_cache *dtl_cache;
 
         if (!firmware_has_feature(FW_FEATURE_SPLPAR))
                 return 0;
 
-        dtl_cache = kmem_cache_create("dtl", DISPATCH_LOG_BYTES,
-                                                DISPATCH_LOG_BYTES, 0, NULL);
-        if (!dtl_cache) {
-                pr_warn("Failed to create dispatch trace log buffer cache\n");
-                pr_warn("Stolen time statistics will be unreliable\n");
+        if (!dtl_cache)
                 return 0;
-        }
 
         for_each_possible_cpu(cpu) {
                 pp = &paca[cpu];
@@ -332,10 +330,27 @@ static int alloc_dispatch_logs(void)
 
         return 0;
 }
-
-early_initcall(alloc_dispatch_logs);
+#else /* !CONFIG_VIRT_CPU_ACCOUNTING */
+static inline int alloc_dispatch_logs(void)
+{
+        return 0;
+}
 #endif /* CONFIG_VIRT_CPU_ACCOUNTING */
 
+static int alloc_dispatch_log_kmem_cache(void)
+{
+        dtl_cache = kmem_cache_create("dtl", DISPATCH_LOG_BYTES,
+                                                DISPATCH_LOG_BYTES, 0, NULL);
+        if (!dtl_cache) {
+                pr_warn("Failed to create dispatch trace log buffer cache\n");
+                pr_warn("Stolen time statistics will be unreliable\n");
+                return 0;
+        }
+
+        return alloc_dispatch_logs();
+}
+early_initcall(alloc_dispatch_log_kmem_cache);
+
 static void __init pSeries_setup_arch(void)
 {
         /* Discover PIC type and setup ppc_md accordingly */
@@ -403,6 +418,16 @@ static int pseries_set_xdabr(unsigned long dabr)
 #define CMO_CHARACTERISTICS_TOKEN 44
 #define CMO_MAXLENGTH 1026
 
+void pSeries_coalesce_init(void)
+{
+        struct hvcall_mpp_x_data mpp_x_data;
+
+        if (firmware_has_feature(FW_FEATURE_CMO) && !h_get_mpp_x(&mpp_x_data))
+                powerpc_firmware_features |= FW_FEATURE_XCMO;
+        else
+                powerpc_firmware_features &= ~FW_FEATURE_XCMO;
+}
+
 /**
  * fw_cmo_feature_init - FW_FEATURE_CMO is not stored in ibm,hypertas-functions,
  * handle that here. (Stolen from parse_system_parameter_string)
@@ -472,6 +497,7 @@ void pSeries_cmo_feature_init(void)
                 pr_debug("CMO enabled, PrPSP=%d, SecPSP=%d\n", CMO_PrPSP,
                          CMO_SecPSP);
                 powerpc_firmware_features |= FW_FEATURE_CMO;
+                pSeries_coalesce_init();
         } else
                 pr_debug("CMO not enabled, PrPSP=%d, SecPSP=%d\n", CMO_PrPSP,
                          CMO_SecPSP);
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index a509c5292a67..fbffd7e47ab8 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -44,10 +44,11 @@
 #include <asm/mpic.h>
 #include <asm/vdso_datapage.h>
 #include <asm/cputhreads.h>
+#include <asm/mpic.h>
+#include <asm/xics.h>
 
 #include "plpar_wrappers.h"
 #include "pseries.h"
-#include "xics.h"
 #include "offline_states.h"
 
 
@@ -136,7 +137,6 @@ out:
         return 1;
 }
 
-#ifdef CONFIG_XICS
 static void __devinit smp_xics_setup_cpu(int cpu)
 {
         if (cpu != boot_cpuid)
@@ -151,14 +151,13 @@ static void __devinit smp_xics_setup_cpu(int cpu)
         set_default_offline_state(cpu);
 #endif
 }
-#endif /* CONFIG_XICS */
 
-static void __devinit smp_pSeries_kick_cpu(int nr)
+static int __devinit smp_pSeries_kick_cpu(int nr)
 {
         BUG_ON(nr < 0 || nr >= NR_CPUS);
 
         if (!smp_startup_cpu(nr))
-                return;
+                return -ENOENT;
 
         /*
          * The processor is currently spinning, waiting for the
@@ -180,6 +179,8 @@ static void __devinit smp_pSeries_kick_cpu(int nr)
                                                 "Ret= %ld\n", nr, rc);
         }
 #endif
+
+        return 0;
 }
 
 static int smp_pSeries_cpu_bootable(unsigned int nr)
@@ -197,23 +198,22 @@ static int smp_pSeries_cpu_bootable(unsigned int nr)
 
         return 1;
 }
-#ifdef CONFIG_MPIC
+
 static struct smp_ops_t pSeries_mpic_smp_ops = {
         .message_pass   = smp_mpic_message_pass,
         .probe          = smp_mpic_probe,
         .kick_cpu       = smp_pSeries_kick_cpu,
         .setup_cpu      = smp_mpic_setup_cpu,
 };
-#endif
-#ifdef CONFIG_XICS
+
 static struct smp_ops_t pSeries_xics_smp_ops = {
-        .message_pass   = smp_xics_message_pass,
-        .probe          = smp_xics_probe,
+        .message_pass   = smp_muxed_ipi_message_pass,
+        .cause_ipi      = NULL, /* Filled at runtime by xics_smp_probe() */
+        .probe          = xics_smp_probe,
         .kick_cpu       = smp_pSeries_kick_cpu,
         .setup_cpu      = smp_xics_setup_cpu,
         .cpu_bootable   = smp_pSeries_cpu_bootable,
 };
-#endif
 
 /* This is called very early */
 static void __init smp_init_pseries(void)
@@ -245,14 +245,12 @@ static void __init smp_init_pseries(void)
         pr_debug(" <- smp_init_pSeries()\n");
 }
 
-#ifdef CONFIG_MPIC
 void __init smp_init_pseries_mpic(void)
 {
         smp_ops = &pSeries_mpic_smp_ops;
 
         smp_init_pseries();
 }
-#endif
 
 void __init smp_init_pseries_xics(void)
 {
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
deleted file mode 100644
index d6901334d66e..000000000000
--- a/arch/powerpc/platforms/pseries/xics.c
+++ /dev/null
@@ -1,949 +0,0 @@
-/*
- * arch/powerpc/platforms/pseries/xics.c
- *
- * Copyright 2000 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/types.h>
-#include <linux/threads.h>
-#include <linux/kernel.h>
-#include <linux/irq.h>
-#include <linux/smp.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/radix-tree.h>
-#include <linux/cpu.h>
-#include <linux/msi.h>
-#include <linux/of.h>
-#include <linux/percpu.h>
-
-#include <asm/firmware.h>
-#include <asm/io.h>
-#include <asm/pgtable.h>
-#include <asm/smp.h>
-#include <asm/rtas.h>
-#include <asm/hvcall.h>
-#include <asm/machdep.h>
-
-#include "xics.h"
-#include "plpar_wrappers.h"
-
-static struct irq_host *xics_host;
-
-#define XICS_IPI                2
-#define XICS_IRQ_SPURIOUS       0
-
-/* Want a priority other than 0.  Various HW issues require this. */
-#define DEFAULT_PRIORITY        5
-
-/*
- * Mark IPIs as higher priority so we can take them inside interrupts that
- * arent marked IRQF_DISABLED
- */
-#define IPI_PRIORITY            4
-
-/* The least favored priority */
-#define LOWEST_PRIORITY         0xFF
-
-/* The number of priorities defined above */
-#define MAX_NUM_PRIORITIES      3
-
-static unsigned int default_server = 0xFF;
-static unsigned int default_distrib_server = 0;
-static unsigned int interrupt_server_size = 8;
-
-/* RTAS service tokens */
-static int ibm_get_xive;
-static int ibm_set_xive;
-static int ibm_int_on;
-static int ibm_int_off;
-
-struct xics_cppr {
-        unsigned char stack[MAX_NUM_PRIORITIES];
-        int index;
-};
-
-static DEFINE_PER_CPU(struct xics_cppr, xics_cppr);
-
-/* Direct hardware low level accessors */
-
-/* The part of the interrupt presentation layer that we care about */
-struct xics_ipl {
-        union {
-                u32 word;
-                u8 bytes[4];
-        } xirr_poll;
-        union {
-                u32 word;
-                u8 bytes[4];
-        } xirr;
-        u32 dummy;
-        union {
-                u32 word;
-                u8 bytes[4];
-        } qirr;
-};
-
-static struct xics_ipl __iomem *xics_per_cpu[NR_CPUS];
-
-static inline unsigned int direct_xirr_info_get(void)
-{
-        int cpu = smp_processor_id();
-
-        return in_be32(&xics_per_cpu[cpu]->xirr.word);
-}
-
-static inline void direct_xirr_info_set(unsigned int value)
-{
-        int cpu = smp_processor_id();
-
-        out_be32(&xics_per_cpu[cpu]->xirr.word, value);
-}
-
-static inline void direct_cppr_info(u8 value)
-{
-        int cpu = smp_processor_id();
-
-        out_8(&xics_per_cpu[cpu]->xirr.bytes[0], value);
-}
-
-static inline void direct_qirr_info(int n_cpu, u8 value)
-{
-        out_8(&xics_per_cpu[n_cpu]->qirr.bytes[0], value);
-}
-
-
-/* LPAR low level accessors */
-
-static inline unsigned int lpar_xirr_info_get(unsigned char cppr)
-{
-        unsigned long lpar_rc;
-        unsigned long return_value;
-
-        lpar_rc = plpar_xirr(&return_value, cppr);
-        if (lpar_rc != H_SUCCESS)
-                panic(" bad return code xirr - rc = %lx\n", lpar_rc);
-        return (unsigned int)return_value;
-}
-
-static inline void lpar_xirr_info_set(unsigned int value)
-{
-        unsigned long lpar_rc;
-
-        lpar_rc = plpar_eoi(value);
-        if (lpar_rc != H_SUCCESS)
-                panic("bad return code EOI - rc = %ld, value=%x\n", lpar_rc,
-                      value);
-}
-
-static inline void lpar_cppr_info(u8 value)
-{
-        unsigned long lpar_rc;
-
-        lpar_rc = plpar_cppr(value);
-        if (lpar_rc != H_SUCCESS)
-                panic("bad return code cppr - rc = %lx\n", lpar_rc);
-}
-
-static inline void lpar_qirr_info(int n_cpu , u8 value)
-{
-        unsigned long lpar_rc;
-
-        lpar_rc = plpar_ipi(get_hard_smp_processor_id(n_cpu), value);
-        if (lpar_rc != H_SUCCESS)
-                panic("bad return code qirr - rc = %lx\n", lpar_rc);
-}
-
-
-/* Interface to generic irq subsystem */
-
-#ifdef CONFIG_SMP
-/*
- * For the moment we only implement delivery to all cpus or one cpu.
- *
- * If the requested affinity is cpu_all_mask, we set global affinity.
- * If not we set it to the first cpu in the mask, even if multiple cpus
- * are set. This is so things like irqbalance (which set core and package
- * wide affinities) do the right thing.
- */
-static int get_irq_server(unsigned int virq, const struct cpumask *cpumask,
-                          unsigned int strict_check)
-{
-
-        if (!distribute_irqs)
-                return default_server;
-
-        if (!cpumask_subset(cpu_possible_mask, cpumask)) {
-                int server = cpumask_first_and(cpu_online_mask, cpumask);
-
-                if (server < nr_cpu_ids)
-                        return get_hard_smp_processor_id(server);
-
-                if (strict_check)
-                        return -1;
-        }
-
-        /*
-         * Workaround issue with some versions of JS20 firmware that
-         * deliver interrupts to cpus which haven't been started. This
-         * happens when using the maxcpus= boot option.
-         */
-        if (cpumask_equal(cpu_online_mask, cpu_present_mask))
-                return default_distrib_server;
-
-        return default_server;
-}
-#else
-#define get_irq_server(virq, cpumask, strict_check) (default_server)
-#endif
-
-static void xics_unmask_irq(struct irq_data *d)
-{
-        unsigned int hwirq;
-        int call_status;
-        int server;
-
-        pr_devel("xics: unmask virq %d\n", d->irq);
-
-        hwirq = (unsigned int)irq_map[d->irq].hwirq;
-        pr_devel(" -> map to hwirq 0x%x\n", hwirq);
-        if (hwirq == XICS_IPI || hwirq == XICS_IRQ_SPURIOUS)
-                return;
-
-        server = get_irq_server(d->irq, d->affinity, 0);
-
-        call_status = rtas_call(ibm_set_xive, 3, 1, NULL, hwirq, server,
-                                DEFAULT_PRIORITY);
-        if (call_status != 0) {
-                printk(KERN_ERR
-                        "%s: ibm_set_xive irq %u server %x returned %d\n",
-                        __func__, hwirq, server, call_status);
-                return;
-        }
-
-        /* Now unmask the interrupt (often a no-op) */
-        call_status = rtas_call(ibm_int_on, 1, 1, NULL, hwirq);
-        if (call_status != 0) {
-                printk(KERN_ERR "%s: ibm_int_on irq=%u returned %d\n",
-                        __func__, hwirq, call_status);
-                return;
-        }
-}
-
-static unsigned int xics_startup(struct irq_data *d)
-{
-        /*
-         * The generic MSI code returns with the interrupt disabled on the
-         * card, using the MSI mask bits. Firmware doesn't appear to unmask
-         * at that level, so we do it here by hand.
-         */
-        if (d->msi_desc)
-                unmask_msi_irq(d);
-
-        /* unmask it */
-        xics_unmask_irq(d);
-        return 0;
-}
-
-static void xics_mask_real_irq(unsigned int hwirq)
-{
-        int call_status;
-
-        if (hwirq == XICS_IPI)
-                return;
-
-        call_status = rtas_call(ibm_int_off, 1, 1, NULL, hwirq);
-        if (call_status != 0) {
-                printk(KERN_ERR "%s: ibm_int_off irq=%u returned %d\n",
-                        __func__, hwirq, call_status);
-                return;
-        }
-
-        /* Have to set XIVE to 0xff to be able to remove a slot */
-        call_status = rtas_call(ibm_set_xive, 3, 1, NULL, hwirq,
-                                default_server, 0xff);
-        if (call_status != 0) {
-                printk(KERN_ERR "%s: ibm_set_xive(0xff) irq=%u returned %d\n",
-                        __func__, hwirq, call_status);
-                return;
-        }
-}
-
-static void xics_mask_irq(struct irq_data *d)
-{
-        unsigned int hwirq;
-
-        pr_devel("xics: mask virq %d\n", d->irq);
-
-        hwirq = (unsigned int)irq_map[d->irq].hwirq;
-        if (hwirq == XICS_IPI || hwirq == XICS_IRQ_SPURIOUS)
-                return;
-        xics_mask_real_irq(hwirq);
-}
-
-static void xics_mask_unknown_vec(unsigned int vec)
-{
-        printk(KERN_ERR "Interrupt %u (real) is invalid, disabling it.\n", vec);
-        xics_mask_real_irq(vec);
-}
-
-static inline unsigned int xics_xirr_vector(unsigned int xirr)
-{
-        /*
-         * The top byte is the old cppr, to be restored on EOI.
-         * The remaining 24 bits are the vector.
-         */
-        return xirr & 0x00ffffff;
-}
-
-static void push_cppr(unsigned int vec)
-{
-        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
-
-        if (WARN_ON(os_cppr->index >= MAX_NUM_PRIORITIES - 1))
-                return;
-
-        if (vec == XICS_IPI)
-                os_cppr->stack[++os_cppr->index] = IPI_PRIORITY;
-        else
-                os_cppr->stack[++os_cppr->index] = DEFAULT_PRIORITY;
-}
-
-static unsigned int xics_get_irq_direct(void)
-{
-        unsigned int xirr = direct_xirr_info_get();
-        unsigned int vec = xics_xirr_vector(xirr);
-        unsigned int irq;
-
-        if (vec == XICS_IRQ_SPURIOUS)
-                return NO_IRQ;
-
-        irq = irq_radix_revmap_lookup(xics_host, vec);
-        if (likely(irq != NO_IRQ)) {
-                push_cppr(vec);
-                return irq;
-        }
-
-        /* We don't have a linux mapping, so have rtas mask it. */
-        xics_mask_unknown_vec(vec);
-
-        /* We might learn about it later, so EOI it */
-        direct_xirr_info_set(xirr);
-        return NO_IRQ;
-}
-
-static unsigned int xics_get_irq_lpar(void)
-{
-        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
-        unsigned int xirr = lpar_xirr_info_get(os_cppr->stack[os_cppr->index]);
-        unsigned int vec = xics_xirr_vector(xirr);
-        unsigned int irq;
-
-        if (vec == XICS_IRQ_SPURIOUS)
-                return NO_IRQ;
-
-        irq = irq_radix_revmap_lookup(xics_host, vec);
-        if (likely(irq != NO_IRQ)) {
-                push_cppr(vec);
-                return irq;
-        }
-
-        /* We don't have a linux mapping, so have RTAS mask it. */
-        xics_mask_unknown_vec(vec);
-
-        /* We might learn about it later, so EOI it */
-        lpar_xirr_info_set(xirr);
-        return NO_IRQ;
-}
-
-static unsigned char pop_cppr(void)
-{
-        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
-
-        if (WARN_ON(os_cppr->index < 1))
-                return LOWEST_PRIORITY;
-
-        return os_cppr->stack[--os_cppr->index];
-}
-
-static void xics_eoi_direct(struct irq_data *d)
-{
-        unsigned int hwirq = (unsigned int)irq_map[d->irq].hwirq;
-
-        iosync();
-        direct_xirr_info_set((pop_cppr() << 24) | hwirq);
-}
-
-static void xics_eoi_lpar(struct irq_data *d)
-{
-        unsigned int hwirq = (unsigned int)irq_map[d->irq].hwirq;
-
-        iosync();
-        lpar_xirr_info_set((pop_cppr() << 24) | hwirq);
-}
-
-static int
-xics_set_affinity(struct irq_data *d, const struct cpumask *cpumask, bool force)
-{
-        unsigned int hwirq;
-        int status;
-        int xics_status[2];
-        int irq_server;
-
-        hwirq = (unsigned int)irq_map[d->irq].hwirq;
-        if (hwirq == XICS_IPI || hwirq == XICS_IRQ_SPURIOUS)
-                return -1;
-
-        status = rtas_call(ibm_get_xive, 1, 3, xics_status, hwirq);
-
-        if (status) {
-                printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n",
-                        __func__, hwirq, status);
-                return -1;
-        }
-
-        irq_server = get_irq_server(d->irq, cpumask, 1);
-        if (irq_server == -1) {
-                char cpulist[128];
-                cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
-                printk(KERN_WARNING
-                        "%s: No online cpus in the mask %s for irq %d\n",
-                        __func__, cpulist, d->irq);
-                return -1;
-        }
-
-        status = rtas_call(ibm_set_xive, 3, 1, NULL,
-                                hwirq, irq_server, xics_status[1]);
-
-        if (status) {
-                printk(KERN_ERR "%s: ibm,set-xive irq=%u returns %d\n",
-                        __func__, hwirq, status);
-                return -1;
-        }
-
-        return 0;
-}
-
-static struct irq_chip xics_pic_direct = {
-        .name = "XICS",
-        .irq_startup = xics_startup,
-        .irq_mask = xics_mask_irq,
-        .irq_unmask = xics_unmask_irq,
-        .irq_eoi = xics_eoi_direct,
-        .irq_set_affinity = xics_set_affinity
-};
-
-static struct irq_chip xics_pic_lpar = {
-        .name = "XICS",
-        .irq_startup = xics_startup,
-        .irq_mask = xics_mask_irq,
-        .irq_unmask = xics_unmask_irq,
-        .irq_eoi = xics_eoi_lpar,
-        .irq_set_affinity = xics_set_affinity
-};
-
-
-/* Interface to arch irq controller subsystem layer */
-
-/* Points to the irq_chip we're actually using */
-static struct irq_chip *xics_irq_chip;
-
-static int xics_host_match(struct irq_host *h, struct device_node *node)
-{
-        /* IBM machines have interrupt parents of various funky types for things
-         * like vdevices, events, etc... The trick we use here is to match
-         * everything here except the legacy 8259 which is compatible "chrp,iic"
-         */
-        return !of_device_is_compatible(node, "chrp,iic");
-}
-
-static int xics_host_map(struct irq_host *h, unsigned int virq,
-                         irq_hw_number_t hw)
-{
-        pr_devel("xics: map virq %d, hwirq 0x%lx\n", virq, hw);
-
-        /* Insert the interrupt mapping into the radix tree for fast lookup */
-        irq_radix_revmap_insert(xics_host, virq, hw);
-
-        irq_set_status_flags(virq, IRQ_LEVEL);
-        irq_set_chip_and_handler(virq, xics_irq_chip, handle_fasteoi_irq);
-        return 0;
-}
-
-static int xics_host_xlate(struct irq_host *h, struct device_node *ct,
-                           const u32 *intspec, unsigned int intsize,
-                           irq_hw_number_t *out_hwirq, unsigned int *out_flags)
-
-{
-        /* Current xics implementation translates everything
-         * to level. It is not technically right for MSIs but this
-         * is irrelevant at this point. We might get smarter in the future
-         */
-        *out_hwirq = intspec[0];
-        *out_flags = IRQ_TYPE_LEVEL_LOW;
-
-        return 0;
-}
-
-static struct irq_host_ops xics_host_ops = {
-        .match = xics_host_match,
-        .map = xics_host_map,
-        .xlate = xics_host_xlate,
-};
-
-static void __init xics_init_host(void)
-{
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                xics_irq_chip = &xics_pic_lpar;
-        else
-                xics_irq_chip = &xics_pic_direct;
-
-        xics_host = irq_alloc_host(NULL, IRQ_HOST_MAP_TREE, 0, &xics_host_ops,
-                                   XICS_IRQ_SPURIOUS);
-        BUG_ON(xics_host == NULL);
-        irq_set_default_host(xics_host);
-}
-
-
-/* Inter-processor interrupt support */
-
-#ifdef CONFIG_SMP
-/*
- * XICS only has a single IPI, so encode the messages per CPU
- */
-static DEFINE_PER_CPU_SHARED_ALIGNED(unsigned long, xics_ipi_message);
-
-static inline void smp_xics_do_message(int cpu, int msg)
-{
-        unsigned long *tgt = &per_cpu(xics_ipi_message, cpu);
-
-        set_bit(msg, tgt);
-        mb();
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                lpar_qirr_info(cpu, IPI_PRIORITY);
-        else
-                direct_qirr_info(cpu, IPI_PRIORITY);
-}
-
-void smp_xics_message_pass(int target, int msg)
-{
-        unsigned int i;
-
-        if (target < NR_CPUS) {
-                smp_xics_do_message(target, msg);
-        } else {
-                for_each_online_cpu(i) {
-                        if (target == MSG_ALL_BUT_SELF
-                            && i == smp_processor_id())
-                                continue;
-                        smp_xics_do_message(i, msg);
-                }
-        }
-}
-
-static irqreturn_t xics_ipi_dispatch(int cpu)
-{
-        unsigned long *tgt = &per_cpu(xics_ipi_message, cpu);
-
-        mb();   /* order mmio clearing qirr */
-        while (*tgt) {
-                if (test_and_clear_bit(PPC_MSG_CALL_FUNCTION, tgt)) {
-                        smp_message_recv(PPC_MSG_CALL_FUNCTION);
-                }
-                if (test_and_clear_bit(PPC_MSG_RESCHEDULE, tgt)) {
-                        smp_message_recv(PPC_MSG_RESCHEDULE);
-                }
-                if (test_and_clear_bit(PPC_MSG_CALL_FUNC_SINGLE, tgt)) {
-                        smp_message_recv(PPC_MSG_CALL_FUNC_SINGLE);
-                }
-#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
-                if (test_and_clear_bit(PPC_MSG_DEBUGGER_BREAK, tgt)) {
-                        smp_message_recv(PPC_MSG_DEBUGGER_BREAK);
-                }
-#endif
-        }
-        return IRQ_HANDLED;
-}
-
-static irqreturn_t xics_ipi_action_direct(int irq, void *dev_id)
-{
-        int cpu = smp_processor_id();
-
-        direct_qirr_info(cpu, 0xff);
-
-        return xics_ipi_dispatch(cpu);
-}
-
-static irqreturn_t xics_ipi_action_lpar(int irq, void *dev_id)
-{
-        int cpu = smp_processor_id();
-
-        lpar_qirr_info(cpu, 0xff);
-
-        return xics_ipi_dispatch(cpu);
-}
-
-static void xics_request_ipi(void)
-{
-        unsigned int ipi;
-        int rc;
-
-        ipi = irq_create_mapping(xics_host, XICS_IPI);
-        BUG_ON(ipi == NO_IRQ);
-
-        /*
-         * IPIs are marked IRQF_DISABLED as they must run with irqs
-         * disabled
-         */
-        irq_set_handler(ipi, handle_percpu_irq);
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                rc = request_irq(ipi, xics_ipi_action_lpar,
-                                IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);
-        else
-                rc = request_irq(ipi, xics_ipi_action_direct,
-                                IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);
-        BUG_ON(rc);
-}
-
-int __init smp_xics_probe(void)
-{
-        xics_request_ipi();
-
-        return cpumask_weight(cpu_possible_mask);
-}
-
-#endif /* CONFIG_SMP */
-
-
-/* Initialization */
-
-static void xics_update_irq_servers(void)
-{
-        int i, j;
-        struct device_node *np;
-        u32 ilen;
-        const u32 *ireg;
-        u32 hcpuid;
-
-        /* Find the server numbers for the boot cpu. */
-        np = of_get_cpu_node(boot_cpuid, NULL);
-        BUG_ON(!np);
-
-        ireg = of_get_property(np, "ibm,ppc-interrupt-gserver#s", &ilen);
-        if (!ireg) {
-                of_node_put(np);
-                return;
-        }
-
-        i = ilen / sizeof(int);
-        hcpuid = get_hard_smp_processor_id(boot_cpuid);
-
-        /* Global interrupt distribution server is specified in the last
-         * entry of "ibm,ppc-interrupt-gserver#s" property. Get the last
-         * entry fom this property for current boot cpu id and use it as
-         * default distribution server
-         */
-        for (j = 0; j < i; j += 2) {
-                if (ireg[j] == hcpuid) {
-                        default_server = hcpuid;
-                        default_distrib_server = ireg[j+1];
-                }
-        }
-
-        of_node_put(np);
-}
-
-static void __init xics_map_one_cpu(int hw_id, unsigned long addr,
-                                     unsigned long size)
-{
-        int i;
-
-        /* This may look gross but it's good enough for now, we don't quite
-         * have a hard -> linux processor id matching.
-         */
-        for_each_possible_cpu(i) {
-                if (!cpu_present(i))
-                        continue;
-                if (hw_id == get_hard_smp_processor_id(i)) {
-                        xics_per_cpu[i] = ioremap(addr, size);
-                        return;
-                }
-        }
-}
-
-static void __init xics_init_one_node(struct device_node *np,
-                                      unsigned int *indx)
-{
-        unsigned int ilen;
-        const u32 *ireg;
-
-        /* This code does the theorically broken assumption that the interrupt
-         * server numbers are the same as the hard CPU numbers.
-         * This happens to be the case so far but we are playing with fire...
-         * should be fixed one of these days. -BenH.
-         */
-        ireg = of_get_property(np, "ibm,interrupt-server-ranges", NULL);
-
-        /* Do that ever happen ? we'll know soon enough... but even good'old
-         * f80 does have that property ..
-         */
-        WARN_ON(ireg == NULL);
-        if (ireg) {
-                /*
-                 * set node starting index for this node
-                 */
-                *indx = *ireg;
-        }
-        ireg = of_get_property(np, "reg", &ilen);
-        if (!ireg)
-                panic("xics_init_IRQ: can't find interrupt reg property");
-
-        while (ilen >= (4 * sizeof(u32))) {
-                unsigned long addr, size;
-
-                /* XXX Use proper OF parsing code here !!! */
-                addr = (unsigned long)*ireg++ << 32;
-                ilen -= sizeof(u32);
-                addr |= *ireg++;
-                ilen -= sizeof(u32);
-                size = (unsigned long)*ireg++ << 32;
-                ilen -= sizeof(u32);
-                size |= *ireg++;
-                ilen -= sizeof(u32);
-                xics_map_one_cpu(*indx, addr, size);
-                (*indx)++;
-        }
-}
-
-void __init xics_init_IRQ(void)
-{
-        struct device_node *np;
-        u32 indx = 0;
-        int found = 0;
-        const u32 *isize;
-
-        ppc64_boot_msg(0x20, "XICS Init");
-
-        ibm_get_xive = rtas_token("ibm,get-xive");
-        ibm_set_xive = rtas_token("ibm,set-xive");
-        ibm_int_on  = rtas_token("ibm,int-on");
-        ibm_int_off = rtas_token("ibm,int-off");
-
-        for_each_node_by_type(np, "PowerPC-External-Interrupt-Presentation") {
-                found = 1;
-                if (firmware_has_feature(FW_FEATURE_LPAR)) {
-                        of_node_put(np);
-                        break;
-                        }
-                xics_init_one_node(np, &indx);
-        }
-        if (found == 0)
-                return;
-
-        /* get the bit size of server numbers */
-        found = 0;
-
-        for_each_compatible_node(np, NULL, "ibm,ppc-xics") {
-                isize = of_get_property(np, "ibm,interrupt-server#-size", NULL);
-
-                if (!isize)
-                        continue;
-
-                if (!found) {
-                        interrupt_server_size = *isize;
-                        found = 1;
-                } else if (*isize != interrupt_server_size) {
-                        printk(KERN_WARNING "XICS: "
-                               "mismatched ibm,interrupt-server#-size\n");
-                        interrupt_server_size = max(*isize,
-                                                    interrupt_server_size);
-                }
-        }
-
-        xics_update_irq_servers();
-        xics_init_host();
-
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                ppc_md.get_irq = xics_get_irq_lpar;
-        else
-                ppc_md.get_irq = xics_get_irq_direct;
-
-        xics_setup_cpu();
-
-        ppc64_boot_msg(0x21, "XICS Done");
-}
-
-/* Cpu startup, shutdown, and hotplug */
-
-static void xics_set_cpu_priority(unsigned char cppr)
-{
-        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
-
-        /*
-         * we only really want to set the priority when there's
-         * just one cppr value on the stack
-         */
-        WARN_ON(os_cppr->index != 0);
-
-        os_cppr->stack[0] = cppr;
-
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                lpar_cppr_info(cppr);
-        else
-                direct_cppr_info(cppr);
-        iosync();
-}
-
-/* Have the calling processor join or leave the specified global queue */
-static void xics_set_cpu_giq(unsigned int gserver, unsigned int join)
-{
-        int index;
-        int status;
-
-        if (!rtas_indicator_present(GLOBAL_INTERRUPT_QUEUE, NULL))
-                return;
-
-        index = (1UL << interrupt_server_size) - 1 - gserver;
-
-        status = rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE, index, join);
-
-        WARN(status < 0, "set-indicator(%d, %d, %u) returned %d\n",
-             GLOBAL_INTERRUPT_QUEUE, index, join, status);
-}
-
-void xics_setup_cpu(void)
-{
-        xics_set_cpu_priority(LOWEST_PRIORITY);
-
-        xics_set_cpu_giq(default_distrib_server, 1);
-}
-
-void xics_teardown_cpu(void)
-{
-        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
-        int cpu = smp_processor_id();
-
-        /*
-         * we have to reset the cppr index to 0 because we're
-         * not going to return from the IPI
-         */
-        os_cppr->index = 0;
-        xics_set_cpu_priority(0);
-
-        /* Clear any pending IPI request */
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                lpar_qirr_info(cpu, 0xff);
-        else
-                direct_qirr_info(cpu, 0xff);
-}
-
-void xics_kexec_teardown_cpu(int secondary)
-{
-        xics_teardown_cpu();
-
-        /*
-         * we take the ipi irq but and never return so we
-         * need to EOI the IPI, but want to leave our priority 0
-         *
-         * should we check all the other interrupts too?
-         * should we be flagging idle loop instead?
-         * or creating some task to be scheduled?
-         */
-
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                lpar_xirr_info_set((0x00 << 24) | XICS_IPI);
-        else
-                direct_xirr_info_set((0x00 << 24) | XICS_IPI);
-
-        /*
-         * Some machines need to have at least one cpu in the GIQ,
-         * so leave the master cpu in the group.
-         */
-        if (secondary)
-                xics_set_cpu_giq(default_distrib_server, 0);
-}
-
-#ifdef CONFIG_HOTPLUG_CPU
-
-/* Interrupts are disabled. */
-void xics_migrate_irqs_away(void)
-{
-        int cpu = smp_processor_id(), hw_cpu = hard_smp_processor_id();
-        int virq;
-
-        /* If we used to be the default server, move to the new "boot_cpuid" */
-        if (hw_cpu == default_server)
-                xics_update_irq_servers();
-
-        /* Reject any interrupt that was queued to us... */
-        xics_set_cpu_priority(0);
-
-        /* Remove ourselves from the global interrupt queue */
-        xics_set_cpu_giq(default_distrib_server, 0);
-
-        /* Allow IPIs again... */
-        xics_set_cpu_priority(DEFAULT_PRIORITY);
-
-        for_each_irq(virq) {
-                struct irq_desc *desc;
-                struct irq_chip *chip;
-                unsigned int hwirq;
-                int xics_status[2];
-                int status;
-                unsigned long flags;
-
-                /* We can't set affinity on ISA interrupts */
-                if (virq < NUM_ISA_INTERRUPTS)
-                        continue;
-                if (irq_map[virq].host != xics_host)
-                        continue;
-                hwirq = (unsigned int)irq_map[virq].hwirq;
-                /* We need to get IPIs still. */
-                if (hwirq == XICS_IPI || hwirq == XICS_IRQ_SPURIOUS)
-                        continue;
-
-                desc = irq_to_desc(virq);
-
-                /* We only need to migrate enabled IRQS */
-                if (desc == NULL || desc->action == NULL)
-                        continue;
-
-                chip = irq_desc_get_chip(desc);
-                if (chip == NULL || chip->irq_set_affinity == NULL)
-                        continue;
-
-                raw_spin_lock_irqsave(&desc->lock, flags);
-
-                status = rtas_call(ibm_get_xive, 1, 3, xics_status, hwirq);
-                if (status) {
-                        printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n",
-                                        __func__, hwirq, status);
-                        goto unlock;
-                }
-
-                /*
-                 * We only support delivery to all cpus or to one cpu.
-                 * The irq has to be migrated only in the single cpu
-                 * case.
-                 */
-                if (xics_status[0] != hw_cpu)
-                        goto unlock;
-
-                /* This is expected during cpu offline. */
-                if (cpu_online(cpu))
-                        printk(KERN_WARNING "IRQ %u affinity broken off cpu %u\n",
-                               virq, cpu);
-
-                /* Reset affinity to all cpus */
-                cpumask_setall(desc->irq_data.affinity);
-                chip->irq_set_affinity(&desc->irq_data, cpu_all_mask, true);
-unlock:
-                raw_spin_unlock_irqrestore(&desc->lock, flags);
-        }
-}
-#endif
diff --git a/arch/powerpc/platforms/pseries/xics.h b/arch/powerpc/platforms/pseries/xics.h
deleted file mode 100644
index d1d5a83039ae..000000000000
--- a/arch/powerpc/platforms/pseries/xics.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * arch/powerpc/platforms/pseries/xics.h
- *
- * Copyright 2000 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.
- */
-
-#ifndef _POWERPC_KERNEL_XICS_H
-#define _POWERPC_KERNEL_XICS_H
-
-extern void xics_init_IRQ(void);
-extern void xics_setup_cpu(void);
-extern void xics_teardown_cpu(void);
-extern void xics_kexec_teardown_cpu(int secondary);
-extern void xics_migrate_irqs_away(void);
-extern int smp_xics_probe(void);
-extern void smp_xics_message_pass(int target, int msg);
-
-#endif /* _POWERPC_KERNEL_XICS_H */
diff --git a/arch/powerpc/platforms/wsp/Kconfig b/arch/powerpc/platforms/wsp/Kconfig
new file mode 100644
index 000000000000..c3c48eb62cc1
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/Kconfig
@@ -0,0 +1,28 @@
+config PPC_WSP
+        bool
+        default n
+
+menu "WSP platform selection"
+        depends on PPC_BOOK3E_64
+
+config PPC_PSR2
+        bool "PSR-2 platform"
+        select PPC_A2
+        select GENERIC_TBSYNC
+        select PPC_SCOM
+        select EPAPR_BOOT
+        select PPC_WSP
+        select PPC_XICS
+        select PPC_ICP_NATIVE
+        default y
+
+endmenu
+
+config PPC_A2_DD2
+        bool "Support for DD2 based A2/WSP systems"
+        depends on PPC_A2
+
+config WORKAROUND_ERRATUM_463
+        depends on PPC_A2_DD2
+        bool "Workaround erratum 463"
+        default y
diff --git a/arch/powerpc/platforms/wsp/Makefile b/arch/powerpc/platforms/wsp/Makefile
new file mode 100644
index 000000000000..095be73d6cd4
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/Makefile
@@ -0,0 +1,6 @@
+ccflags-y                       += -mno-minimal-toc
+
+obj-y                           += setup.o ics.o
+obj-$(CONFIG_PPC_PSR2)          += psr2.o opb_pic.o
+obj-$(CONFIG_PPC_WSP)           += scom_wsp.o
+obj-$(CONFIG_SMP)               += smp.o scom_smp.o
diff --git a/arch/powerpc/platforms/wsp/ics.c b/arch/powerpc/platforms/wsp/ics.c
new file mode 100644
index 000000000000..e53bd9e7b125
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/ics.c
@@ -0,0 +1,712 @@
+/*
+ * Copyright 2008-2011 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/cpu.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/msi.h>
+#include <linux/of.h>
+#include <linux/slab.h>
+#include <linux/smp.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/xics.h>
+
+#include "wsp.h"
+#include "ics.h"
+
+
+/* WSP ICS */
+
+struct wsp_ics {
+        struct ics ics;
+        struct device_node *dn;
+        void __iomem *regs;
+        spinlock_t lock;
+        unsigned long *bitmap;
+        u32 chip_id;
+        u32 lsi_base;
+        u32 lsi_count;
+        u64 hwirq_start;
+        u64 count;
+#ifdef CONFIG_SMP
+        int *hwirq_cpu_map;
+#endif
+};
+
+#define to_wsp_ics(ics) container_of(ics, struct wsp_ics, ics)
+
+#define INT_SRC_LAYER_BUID_REG(base)    ((base) + 0x00)
+#define IODA_TBL_ADDR_REG(base)         ((base) + 0x18)
+#define IODA_TBL_DATA_REG(base)         ((base) + 0x20)
+#define XIVE_UPDATE_REG(base)           ((base) + 0x28)
+#define ICS_INT_CAPS_REG(base)          ((base) + 0x30)
+
+#define TBL_AUTO_INCREMENT      ((1UL << 63) | (1UL << 15))
+#define TBL_SELECT_XIST         (1UL << 48)
+#define TBL_SELECT_XIVT         (1UL << 49)
+
+#define IODA_IRQ(irq)           ((irq) & (0x7FFULL))    /* HRM 5.1.3.4 */
+
+#define XIST_REQUIRED           0x8
+#define XIST_REJECTED           0x4
+#define XIST_PRESENTED          0x2
+#define XIST_PENDING            0x1
+
+#define XIVE_SERVER_SHIFT       42
+#define XIVE_SERVER_MASK        0xFFFFULL
+#define XIVE_PRIORITY_MASK      0xFFULL
+#define XIVE_PRIORITY_SHIFT     32
+#define XIVE_WRITE_ENABLE       (1ULL << 63)
+
+/*
+ * The docs refer to a 6 bit field called ChipID, which consists of a
+ * 3 bit NodeID and a 3 bit ChipID. On WSP the ChipID is always zero
+ * so we ignore it, and every where we use "chip id" in this code we
+ * mean the NodeID.
+ */
+#define WSP_ICS_CHIP_SHIFT              17
+
+
+static struct wsp_ics *ics_list;
+static int num_ics;
+
+/* ICS Source controller accessors */
+
+static u64 wsp_ics_get_xive(struct wsp_ics *ics, unsigned int irq)
+{
+        unsigned long flags;
+        u64 xive;
+
+        spin_lock_irqsave(&ics->lock, flags);
+        out_be64(IODA_TBL_ADDR_REG(ics->regs), TBL_SELECT_XIVT | IODA_IRQ(irq));
+        xive = in_be64(IODA_TBL_DATA_REG(ics->regs));
+        spin_unlock_irqrestore(&ics->lock, flags);
+
+        return xive;
+}
+
+static void wsp_ics_set_xive(struct wsp_ics *ics, unsigned int irq, u64 xive)
+{
+        xive &= ~XIVE_ADDR_MASK;
+        xive |= (irq & XIVE_ADDR_MASK);
+        xive |= XIVE_WRITE_ENABLE;
+
+        out_be64(XIVE_UPDATE_REG(ics->regs), xive);
+}
+
+static u64 xive_set_server(u64 xive, unsigned int server)
+{
+        u64 mask = ~(XIVE_SERVER_MASK << XIVE_SERVER_SHIFT);
+
+        xive &= mask;
+        xive |= (server & XIVE_SERVER_MASK) << XIVE_SERVER_SHIFT;
+
+        return xive;
+}
+
+static u64 xive_set_priority(u64 xive, unsigned int priority)
+{
+        u64 mask = ~(XIVE_PRIORITY_MASK << XIVE_PRIORITY_SHIFT);
+
+        xive &= mask;
+        xive |= (priority & XIVE_PRIORITY_MASK) << XIVE_PRIORITY_SHIFT;
+
+        return xive;
+}
+
+
+#ifdef CONFIG_SMP
+/* Find logical CPUs within mask on a given chip and store result in ret */
+void cpus_on_chip(int chip_id, cpumask_t *mask, cpumask_t *ret)
+{
+        int cpu, chip;
+        struct device_node *cpu_dn, *dn;
+        const u32 *prop;
+
+        cpumask_clear(ret);
+        for_each_cpu(cpu, mask) {
+                cpu_dn = of_get_cpu_node(cpu, NULL);
+                if (!cpu_dn)
+                        continue;
+
+                prop = of_get_property(cpu_dn, "at-node", NULL);
+                if (!prop) {
+                        of_node_put(cpu_dn);
+                        continue;
+                }
+
+                dn = of_find_node_by_phandle(*prop);
+                of_node_put(cpu_dn);
+
+                chip = wsp_get_chip_id(dn);
+                if (chip == chip_id)
+                        cpumask_set_cpu(cpu, ret);
+
+                of_node_put(dn);
+        }
+}
+
+/* Store a suitable CPU to handle a hwirq in the ics->hwirq_cpu_map cache */
+static int cache_hwirq_map(struct wsp_ics *ics, unsigned int hwirq,
+                           const cpumask_t *affinity)
+{
+        cpumask_var_t avail, newmask;
+        int ret = -ENOMEM, cpu, cpu_rover = 0, target;
+        int index = hwirq - ics->hwirq_start;
+        unsigned int nodeid;
+
+        BUG_ON(index < 0 || index >= ics->count);
+
+        if (!ics->hwirq_cpu_map)
+                return -ENOMEM;
+
+        if (!distribute_irqs) {
+                ics->hwirq_cpu_map[hwirq - ics->hwirq_start] = xics_default_server;
+                return 0;
+        }
+
+        /* Allocate needed CPU masks */
+        if (!alloc_cpumask_var(&avail, GFP_KERNEL))
+                goto ret;
+        if (!alloc_cpumask_var(&newmask, GFP_KERNEL))
+                goto freeavail;
+
+        /* Find PBus attached to the source of this IRQ */
+        nodeid = (hwirq >> WSP_ICS_CHIP_SHIFT) & 0x3; /* 12:14 */
+
+        /* Find CPUs that could handle this IRQ */
+        if (affinity)
+                cpumask_and(avail, cpu_online_mask, affinity);
+        else
+                cpumask_copy(avail, cpu_online_mask);
+
+        /* Narrow selection down to logical CPUs on the same chip */
+        cpus_on_chip(nodeid, avail, newmask);
+
+        /* Ensure we haven't narrowed it down to 0 */
+        if (unlikely(cpumask_empty(newmask))) {
+                if (unlikely(cpumask_empty(avail))) {
+                        ret = -1;
+                        goto out;
+                }
+                cpumask_copy(newmask, avail);
+        }
+
+        /* Choose a CPU out of those we narrowed it down to in round robin */
+        target = hwirq % cpumask_weight(newmask);
+        for_each_cpu(cpu, newmask) {
+                if (cpu_rover++ >= target) {
+                        ics->hwirq_cpu_map[index] = get_hard_smp_processor_id(cpu);
+                        ret = 0;
+                        goto out;
+                }
+        }
+
+        /* Shouldn't happen */
+        WARN_ON(1);
+
+out:
+        free_cpumask_var(newmask);
+freeavail:
+        free_cpumask_var(avail);
+ret:
+        if (ret < 0) {
+                ics->hwirq_cpu_map[index] = cpumask_first(cpu_online_mask);
+                pr_warning("Error, falling hwirq 0x%x routing back to CPU %i\n",
+                           hwirq, ics->hwirq_cpu_map[index]);
+        }
+        return ret;
+}
+
+static void alloc_irq_map(struct wsp_ics *ics)
+{
+        int i;
+
+        ics->hwirq_cpu_map = kmalloc(sizeof(int) * ics->count, GFP_KERNEL);
+        if (!ics->hwirq_cpu_map) {
+                pr_warning("Allocate hwirq_cpu_map failed, "
+                           "IRQ balancing disabled\n");
+                return;
+        }
+
+        for (i=0; i < ics->count; i++)
+                ics->hwirq_cpu_map[i] = xics_default_server;
+}
+
+static int get_irq_server(struct wsp_ics *ics, unsigned int hwirq)
+{
+        int index = hwirq - ics->hwirq_start;
+
+        BUG_ON(index < 0 || index >= ics->count);
+
+        if (!ics->hwirq_cpu_map)
+                return xics_default_server;
+
+        return ics->hwirq_cpu_map[index];
+}
+#else /* !CONFIG_SMP */
+static int cache_hwirq_map(struct wsp_ics *ics, unsigned int hwirq,
+                           const cpumask_t *affinity)
+{
+        return 0;
+}
+
+static int get_irq_server(struct wsp_ics *ics, unsigned int hwirq)
+{
+        return xics_default_server;
+}
+
+static void alloc_irq_map(struct wsp_ics *ics) { }
+#endif
+
+static void wsp_chip_unmask_irq(struct irq_data *d)
+{
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
+        struct wsp_ics *ics;
+        int server;
+        u64 xive;
+
+        if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
+                return;
+
+        ics = d->chip_data;
+        if (WARN_ON(!ics))
+                return;
+
+        server = get_irq_server(ics, hw_irq);
+
+        xive = wsp_ics_get_xive(ics, hw_irq);
+        xive = xive_set_server(xive, server);
+        xive = xive_set_priority(xive, DEFAULT_PRIORITY);
+        wsp_ics_set_xive(ics, hw_irq, xive);
+}
+
+static unsigned int wsp_chip_startup(struct irq_data *d)
+{
+        /* unmask it */
+        wsp_chip_unmask_irq(d);
+        return 0;
+}
+
+static void wsp_mask_real_irq(unsigned int hw_irq, struct wsp_ics *ics)
+{
+        u64 xive;
+
+        if (hw_irq == XICS_IPI)
+                return;
+
+        if (WARN_ON(!ics))
+                return;
+        xive = wsp_ics_get_xive(ics, hw_irq);
+        xive = xive_set_server(xive, xics_default_server);
+        xive = xive_set_priority(xive, LOWEST_PRIORITY);
+        wsp_ics_set_xive(ics, hw_irq, xive);
+}
+
+static void wsp_chip_mask_irq(struct irq_data *d)
+{
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
+        struct wsp_ics *ics = d->chip_data;
+
+        if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
+                return;
+
+        wsp_mask_real_irq(hw_irq, ics);
+}
+
+static int wsp_chip_set_affinity(struct irq_data *d,
+                                 const struct cpumask *cpumask, bool force)
+{
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
+        struct wsp_ics *ics;
+        int ret;
+        u64 xive;
+
+        if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
+                return -1;
+
+        ics = d->chip_data;
+        if (WARN_ON(!ics))
+                return -1;
+        xive = wsp_ics_get_xive(ics, hw_irq);
+
+        /*
+         * For the moment only implement delivery to all cpus or one cpu.
+         * Get current irq_server for the given irq
+         */
+        ret = cache_hwirq_map(ics, d->irq, cpumask);
+        if (ret == -1) {
+                char cpulist[128];
+                cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
+                pr_warning("%s: No online cpus in the mask %s for irq %d\n",
+                           __func__, cpulist, d->irq);
+                return -1;
+        } else if (ret == -ENOMEM) {
+                pr_warning("%s: Out of memory\n", __func__);
+                return -1;
+        }
+
+        xive = xive_set_server(xive, get_irq_server(ics, hw_irq));
+        wsp_ics_set_xive(ics, hw_irq, xive);
+
+        return 0;
+}
+
+static struct irq_chip wsp_irq_chip = {
+        .name = "WSP ICS",
+        .irq_startup            = wsp_chip_startup,
+        .irq_mask               = wsp_chip_mask_irq,
+        .irq_unmask             = wsp_chip_unmask_irq,
+        .irq_set_affinity       = wsp_chip_set_affinity
+};
+
+static int wsp_ics_host_match(struct ics *ics, struct device_node *dn)
+{
+        /* All ICSs in the system implement a global irq number space,
+         * so match against them all. */
+        return of_device_is_compatible(dn, "ibm,ppc-xics");
+}
+
+static int wsp_ics_match_hwirq(struct wsp_ics *wsp_ics, unsigned int hwirq)
+{
+        if (hwirq >= wsp_ics->hwirq_start &&
+            hwirq <  wsp_ics->hwirq_start + wsp_ics->count)
+                return 1;
+
+        return 0;
+}
+
+static int wsp_ics_map(struct ics *ics, unsigned int virq)
+{
+        struct wsp_ics *wsp_ics = to_wsp_ics(ics);
+        unsigned int hw_irq = virq_to_hw(virq);
+        unsigned long flags;
+
+        if (!wsp_ics_match_hwirq(wsp_ics, hw_irq))
+                return -ENOENT;
+
+        irq_set_chip_and_handler(virq, &wsp_irq_chip, handle_fasteoi_irq);
+
+        irq_set_chip_data(virq, wsp_ics);
+
+        spin_lock_irqsave(&wsp_ics->lock, flags);
+        bitmap_allocate_region(wsp_ics->bitmap, hw_irq - wsp_ics->hwirq_start, 0);
+        spin_unlock_irqrestore(&wsp_ics->lock, flags);
+
+        return 0;
+}
+
+static void wsp_ics_mask_unknown(struct ics *ics, unsigned long hw_irq)
+{
+        struct wsp_ics *wsp_ics = to_wsp_ics(ics);
+
+        if (!wsp_ics_match_hwirq(wsp_ics, hw_irq))
+                return;
+
+        pr_err("%s: IRQ %lu (real) is invalid, disabling it.\n", __func__, hw_irq);
+        wsp_mask_real_irq(hw_irq, wsp_ics);
+}
+
+static long wsp_ics_get_server(struct ics *ics, unsigned long hw_irq)
+{
+        struct wsp_ics *wsp_ics = to_wsp_ics(ics);
+
+        if (!wsp_ics_match_hwirq(wsp_ics, hw_irq))
+                return -ENOENT;
+
+        return get_irq_server(wsp_ics, hw_irq);
+}
+
+/* HW Number allocation API */
+
+static struct wsp_ics *wsp_ics_find_dn_ics(struct device_node *dn)
+{
+        struct device_node *iparent;
+        int i;
+
+        iparent = of_irq_find_parent(dn);
+        if (!iparent) {
+                pr_err("wsp_ics: Failed to find interrupt parent!\n");
+                return NULL;
+        }
+
+        for(i = 0; i < num_ics; i++) {
+                if(ics_list[i].dn == iparent)
+                        break;
+        }
+
+        if (i >= num_ics) {
+                pr_err("wsp_ics: Unable to find parent bitmap!\n");
+                return NULL;
+        }
+
+        return &ics_list[i];
+}
+
+int wsp_ics_alloc_irq(struct device_node *dn, int num)
+{
+        struct wsp_ics *ics;
+        int order, offset;
+
+        ics = wsp_ics_find_dn_ics(dn);
+        if (!ics)
+                return -ENODEV;
+
+        /* Fast, but overly strict if num isn't a power of two */
+        order = get_count_order(num);
+
+        spin_lock_irq(&ics->lock);
+        offset = bitmap_find_free_region(ics->bitmap, ics->count, order);
+        spin_unlock_irq(&ics->lock);
+
+        if (offset < 0)
+                return offset;
+
+        return offset + ics->hwirq_start;
+}
+
+void wsp_ics_free_irq(struct device_node *dn, unsigned int irq)
+{
+        struct wsp_ics *ics;
+
+        ics = wsp_ics_find_dn_ics(dn);
+        if (WARN_ON(!ics))
+                return;
+
+        spin_lock_irq(&ics->lock);
+        bitmap_release_region(ics->bitmap, irq, 0);
+        spin_unlock_irq(&ics->lock);
+}
+
+/* Initialisation */
+
+static int __init wsp_ics_bitmap_setup(struct wsp_ics *ics,
+                                      struct device_node *dn)
+{
+        int len, i, j, size;
+        u32 start, count;
+        const u32 *p;
+
+        size = BITS_TO_LONGS(ics->count) * sizeof(long);
+        ics->bitmap = kzalloc(size, GFP_KERNEL);
+        if (!ics->bitmap) {
+                pr_err("wsp_ics: ENOMEM allocating IRQ bitmap!\n");
+                return -ENOMEM;
+        }
+
+        spin_lock_init(&ics->lock);
+
+        p = of_get_property(dn, "available-ranges", &len);
+        if (!p || !len) {
+                /* FIXME this should be a WARN() once mambo is updated */
+                pr_err("wsp_ics: No available-ranges defined for %s\n",
+                        dn->full_name);
+                return 0;
+        }
+
+        if (len % (2 * sizeof(u32)) != 0) {
+                /* FIXME this should be a WARN() once mambo is updated */
+                pr_err("wsp_ics: Invalid available-ranges for %s\n",
+                        dn->full_name);
+                return 0;
+        }
+
+        bitmap_fill(ics->bitmap, ics->count);
+
+        for (i = 0; i < len / sizeof(u32); i += 2) {
+                start = of_read_number(p + i, 1);
+                count = of_read_number(p + i + 1, 1);
+
+                pr_devel("%s: start: %d count: %d\n", __func__, start, count);
+
+                if ((start + count) > (ics->hwirq_start + ics->count) ||
+                     start < ics->hwirq_start) {
+                        pr_err("wsp_ics: Invalid range! -> %d to %d\n",
+                                        start, start + count);
+                        break;
+                }
+
+                for (j = 0; j < count; j++)
+                        bitmap_release_region(ics->bitmap,
+                                (start + j) - ics->hwirq_start, 0);
+        }
+
+        /* Ensure LSIs are not available for allocation */
+        bitmap_allocate_region(ics->bitmap, ics->lsi_base,
+                               get_count_order(ics->lsi_count));
+
+        return 0;
+}
+
+static int __init wsp_ics_setup(struct wsp_ics *ics, struct device_node *dn)
+{
+        u32 lsi_buid, msi_buid, msi_base, msi_count;
+        void __iomem *regs;
+        const u32 *p;
+        int rc, len, i;
+        u64 caps, buid;
+
+        p = of_get_property(dn, "interrupt-ranges", &len);
+        if (!p || len < (2 * sizeof(u32))) {
+                pr_err("wsp_ics: No/bad interrupt-ranges found on %s\n",
+                        dn->full_name);
+                return -ENOENT;
+        }
+
+        if (len > (2 * sizeof(u32))) {
+                pr_err("wsp_ics: Multiple ics ranges not supported.\n");
+                return -EINVAL;
+        }
+
+        regs = of_iomap(dn, 0);
+        if (!regs) {
+                pr_err("wsp_ics: of_iomap(%s) failed\n", dn->full_name);
+                return -ENXIO;
+        }
+
+        ics->hwirq_start = of_read_number(p, 1);
+        ics->count = of_read_number(p + 1, 1);
+        ics->regs = regs;
+
+        ics->chip_id = wsp_get_chip_id(dn);
+        if (WARN_ON(ics->chip_id < 0))
+                ics->chip_id = 0;
+
+        /* Get some informations about the critter */
+        caps = in_be64(ICS_INT_CAPS_REG(ics->regs));
+        buid = in_be64(INT_SRC_LAYER_BUID_REG(ics->regs));
+        ics->lsi_count = caps >> 56;
+        msi_count = (caps >> 44) & 0x7ff;
+
+        /* Note: LSI BUID is 9 bits, but really only 3 are BUID and the
+         * rest is mixed in the interrupt number. We store the whole
+         * thing though
+         */
+        lsi_buid = (buid >> 48) & 0x1ff;
+        ics->lsi_base = (ics->chip_id << WSP_ICS_CHIP_SHIFT) | lsi_buid << 5;
+        msi_buid = (buid >> 37) & 0x7;
+        msi_base = (ics->chip_id << WSP_ICS_CHIP_SHIFT) | msi_buid << 11;
+
+        pr_info("wsp_ics: Found %s\n", dn->full_name);
+        pr_info("wsp_ics:    irq range : 0x%06llx..0x%06llx\n",
+                ics->hwirq_start, ics->hwirq_start + ics->count - 1);
+        pr_info("wsp_ics:    %4d LSIs : 0x%06x..0x%06x\n",
+                ics->lsi_count, ics->lsi_base,
+                ics->lsi_base + ics->lsi_count - 1);
+        pr_info("wsp_ics:    %4d MSIs : 0x%06x..0x%06x\n",
+                msi_count, msi_base,
+                msi_base + msi_count - 1);
+
+        /* Let's check the HW config is sane */
+        if (ics->lsi_base < ics->hwirq_start ||
+            (ics->lsi_base + ics->lsi_count) > (ics->hwirq_start + ics->count))
+                pr_warning("wsp_ics: WARNING ! LSIs out of interrupt-ranges !\n");
+        if (msi_base < ics->hwirq_start ||
+            (msi_base + msi_count) > (ics->hwirq_start + ics->count))
+                pr_warning("wsp_ics: WARNING ! MSIs out of interrupt-ranges !\n");
+
+        /* We don't check for overlap between LSI and MSI, which will happen
+         * if we use the same BUID, I'm not sure yet how legit that is.
+         */
+
+        rc = wsp_ics_bitmap_setup(ics, dn);
+        if (rc) {
+                iounmap(regs);
+                return rc;
+        }
+
+        ics->dn = of_node_get(dn);
+        alloc_irq_map(ics);
+
+        for(i = 0; i < ics->count; i++)
+                wsp_mask_real_irq(ics->hwirq_start + i, ics);
+
+        ics->ics.map = wsp_ics_map;
+        ics->ics.mask_unknown = wsp_ics_mask_unknown;
+        ics->ics.get_server = wsp_ics_get_server;
+        ics->ics.host_match = wsp_ics_host_match;
+
+        xics_register_ics(&ics->ics);
+
+        return 0;
+}
+
+static void __init wsp_ics_set_default_server(void)
+{
+        struct device_node *np;
+        u32 hwid;
+
+        /* Find the server number for the boot cpu. */
+        np = of_get_cpu_node(boot_cpuid, NULL);
+        BUG_ON(!np);
+
+        hwid = get_hard_smp_processor_id(boot_cpuid);
+
+        pr_info("wsp_ics: default server is %#x, CPU %s\n", hwid, np->full_name);
+        xics_default_server = hwid;
+
+        of_node_put(np);
+}
+
+static int __init wsp_ics_init(void)
+{
+        struct device_node *dn;
+        struct wsp_ics *ics;
+        int rc, found;
+
+        wsp_ics_set_default_server();
+
+        found = 0;
+        for_each_compatible_node(dn, NULL, "ibm,ppc-xics")
+                found++;
+
+        if (found == 0) {
+                pr_err("wsp_ics: No ICS's found!\n");
+                return -ENODEV;
+        }
+
+        ics_list = kmalloc(sizeof(*ics) * found, GFP_KERNEL);
+        if (!ics_list) {
+                pr_err("wsp_ics: No memory for structs.\n");
+                return -ENOMEM;
+        }
+
+        num_ics = 0;
+        ics = ics_list;
+        for_each_compatible_node(dn, NULL, "ibm,wsp-xics") {
+                rc = wsp_ics_setup(ics, dn);
+                if (rc == 0) {
+                        ics++;
+                        num_ics++;
+                }
+        }
+
+        if (found != num_ics) {
+                pr_err("wsp_ics: Failed setting up %d ICS's\n",
+                        found - num_ics);
+                return -1;
+        }
+
+        return 0;
+}
+
+void __init wsp_init_irq(void)
+{
+        wsp_ics_init();
+        xics_init();
+
+        /* We need to patch our irq chip's EOI to point to the right ICP */
+        wsp_irq_chip.irq_eoi = icp_ops->eoi;
+}
diff --git a/arch/powerpc/platforms/wsp/ics.h b/arch/powerpc/platforms/wsp/ics.h
new file mode 100644
index 000000000000..e34d53102640
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/ics.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2009 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.
+ */
+
+#ifndef __ICS_H
+#define __ICS_H
+
+#define XIVE_ADDR_MASK          0x7FFULL
+
+extern void wsp_init_irq(void);
+
+extern int wsp_ics_alloc_irq(struct device_node *dn, int num);
+extern void wsp_ics_free_irq(struct device_node *dn, unsigned int irq);
+
+#endif /* __ICS_H */
diff --git a/arch/powerpc/platforms/wsp/opb_pic.c b/arch/powerpc/platforms/wsp/opb_pic.c
new file mode 100644
index 000000000000..be05631a3c1c
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/opb_pic.c
@@ -0,0 +1,332 @@
+/*
+ * IBM Onboard Peripheral Bus Interrupt Controller
+ *
+ * Copyright 2010 Jack Miller, 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/interrupt.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/of.h>
+#include <linux/slab.h>
+#include <linux/time.h>
+
+#include <asm/reg_a2.h>
+#include <asm/irq.h>
+
+#define OPB_NR_IRQS 32
+
+#define OPB_MLSASIER    0x04    /* MLS Accumulated Status IER */
+#define OPB_MLSIR       0x50    /* MLS Interrupt Register */
+#define OPB_MLSIER      0x54    /* MLS Interrupt Enable Register */
+#define OPB_MLSIPR      0x58    /* MLS Interrupt Polarity Register */
+#define OPB_MLSIIR      0x5c    /* MLS Interrupt Inputs Register */
+
+static int opb_index = 0;
+
+struct opb_pic {
+        struct irq_host *host;
+        void *regs;
+        int index;
+        spinlock_t lock;
+};
+
+static u32 opb_in(struct opb_pic *opb, int offset)
+{
+        return in_be32(opb->regs + offset);
+}
+
+static void opb_out(struct opb_pic *opb, int offset, u32 val)
+{
+        out_be32(opb->regs + offset, val);
+}
+
+static void opb_unmask_irq(struct irq_data *d)
+{
+        struct opb_pic *opb;
+        unsigned long flags;
+        u32 ier, bitset;
+
+        opb = d->chip_data;
+        bitset = (1 << (31 - irqd_to_hwirq(d)));
+
+        spin_lock_irqsave(&opb->lock, flags);
+
+        ier = opb_in(opb, OPB_MLSIER);
+        opb_out(opb, OPB_MLSIER, ier | bitset);
+        ier = opb_in(opb, OPB_MLSIER);
+
+        spin_unlock_irqrestore(&opb->lock, flags);
+}
+
+static void opb_mask_irq(struct irq_data *d)
+{
+        struct opb_pic *opb;
+        unsigned long flags;
+        u32 ier, mask;
+
+        opb = d->chip_data;
+        mask = ~(1 << (31 - irqd_to_hwirq(d)));
+
+        spin_lock_irqsave(&opb->lock, flags);
+
+        ier = opb_in(opb, OPB_MLSIER);
+        opb_out(opb, OPB_MLSIER, ier & mask);
+        ier = opb_in(opb, OPB_MLSIER); // Flush posted writes
+
+        spin_unlock_irqrestore(&opb->lock, flags);
+}
+
+static void opb_ack_irq(struct irq_data *d)
+{
+        struct opb_pic *opb;
+        unsigned long flags;
+        u32 bitset;
+
+        opb = d->chip_data;
+        bitset = (1 << (31 - irqd_to_hwirq(d)));
+
+        spin_lock_irqsave(&opb->lock, flags);
+
+        opb_out(opb, OPB_MLSIR, bitset);
+        opb_in(opb, OPB_MLSIR); // Flush posted writes
+
+        spin_unlock_irqrestore(&opb->lock, flags);
+}
+
+static void opb_mask_ack_irq(struct irq_data *d)
+{
+        struct opb_pic *opb;
+        unsigned long flags;
+        u32 bitset;
+        u32 ier, ir;
+
+        opb = d->chip_data;
+        bitset = (1 << (31 - irqd_to_hwirq(d)));
+
+        spin_lock_irqsave(&opb->lock, flags);
+
+        ier = opb_in(opb, OPB_MLSIER);
+        opb_out(opb, OPB_MLSIER, ier & ~bitset);
+        ier = opb_in(opb, OPB_MLSIER); // Flush posted writes
+
+        opb_out(opb, OPB_MLSIR, bitset);
+        ir = opb_in(opb, OPB_MLSIR); // Flush posted writes
+
+        spin_unlock_irqrestore(&opb->lock, flags);
+}
+
+static int opb_set_irq_type(struct irq_data *d, unsigned int flow)
+{
+        struct opb_pic *opb;
+        unsigned long flags;
+        int invert, ipr, mask, bit;
+
+        opb = d->chip_data;
+
+        /* The only information we're interested in in the type is whether it's
+         * a high or low trigger. For high triggered interrupts, the polarity
+         * set for it in the MLS Interrupt Polarity Register is 0, for low
+         * interrupts it's 1 so that the proper input in the MLS Interrupt Input
+         * Register is interrupted as asserting the interrupt. */
+
+        switch (flow) {
+                case IRQ_TYPE_NONE:
+                        opb_mask_irq(d);
+                        return 0;
+
+                case IRQ_TYPE_LEVEL_HIGH:
+                        invert = 0;
+                        break;
+
+                case IRQ_TYPE_LEVEL_LOW:
+                        invert = 1;
+                        break;
+
+                default:
+                        return -EINVAL;
+        }
+
+        bit = (1 << (31 - irqd_to_hwirq(d)));
+        mask = ~bit;
+
+        spin_lock_irqsave(&opb->lock, flags);
+
+        ipr = opb_in(opb, OPB_MLSIPR);
+        ipr = (ipr & mask) | (invert ? bit : 0);
+        opb_out(opb, OPB_MLSIPR, ipr);
+        ipr = opb_in(opb, OPB_MLSIPR);  // Flush posted writes
+
+        spin_unlock_irqrestore(&opb->lock, flags);
+
+        /* Record the type in the interrupt descriptor */
+        irqd_set_trigger_type(d, flow);
+
+        return 0;
+}
+
+static struct irq_chip opb_irq_chip = {
+        .name           = "OPB",
+        .irq_mask       = opb_mask_irq,
+        .irq_unmask     = opb_unmask_irq,
+        .irq_mask_ack   = opb_mask_ack_irq,
+        .irq_ack        = opb_ack_irq,
+        .irq_set_type   = opb_set_irq_type
+};
+
+static int opb_host_map(struct irq_host *host, unsigned int virq,
+                irq_hw_number_t hwirq)
+{
+        struct opb_pic *opb;
+
+        opb = host->host_data;
+
+        /* Most of the important stuff is handled by the generic host code, like
+         * the lookup, so just attach some info to the virtual irq */
+
+        irq_set_chip_data(virq, opb);
+        irq_set_chip_and_handler(virq, &opb_irq_chip, handle_level_irq);
+        irq_set_irq_type(virq, IRQ_TYPE_NONE);
+
+        return 0;
+}
+
+static int opb_host_xlate(struct irq_host *host, struct device_node *dn,
+                const u32 *intspec, unsigned int intsize,
+                irq_hw_number_t *out_hwirq, unsigned int *out_type)
+{
+        /* Interrupt size must == 2 */
+        BUG_ON(intsize != 2);
+        *out_hwirq = intspec[0];
+        *out_type = intspec[1];
+        return 0;
+}
+
+static struct irq_host_ops opb_host_ops = {
+        .map = opb_host_map,
+        .xlate = opb_host_xlate,
+};
+
+irqreturn_t opb_irq_handler(int irq, void *private)
+{
+        struct opb_pic *opb;
+        u32 ir, src, subvirq;
+
+        opb = (struct opb_pic *) private;
+
+        /* Read the OPB MLS Interrupt Register for
+         * asserted interrupts */
+        ir = opb_in(opb, OPB_MLSIR);
+        if (!ir)
+                return IRQ_NONE;
+
+        do {
+                /* Get 1 - 32 source, *NOT* bit */
+                src = 32 - ffs(ir);
+
+                /* Translate from the OPB's conception of interrupt number to
+                 * Linux's virtual IRQ */
+
+                subvirq = irq_linear_revmap(opb->host, src);
+
+                generic_handle_irq(subvirq);
+        } while ((ir = opb_in(opb, OPB_MLSIR)));
+
+        return IRQ_HANDLED;
+}
+
+struct opb_pic *opb_pic_init_one(struct device_node *dn)
+{
+        struct opb_pic *opb;
+        struct resource res;
+
+        if (of_address_to_resource(dn, 0, &res)) {
+                printk(KERN_ERR "opb: Couldn't translate resource\n");
+                return  NULL;
+        }
+
+        opb = kzalloc(sizeof(struct opb_pic), GFP_KERNEL);
+        if (!opb) {
+                printk(KERN_ERR "opb: Failed to allocate opb struct!\n");
+                return NULL;
+        }
+
+        /* Get access to the OPB MMIO registers */
+        opb->regs = ioremap(res.start + 0x10000, 0x1000);
+        if (!opb->regs) {
+                printk(KERN_ERR "opb: Failed to allocate register space!\n");
+                goto free_opb;
+        }
+
+        /* Allocate an irq host so that Linux knows that despite only
+         * having one interrupt to issue, we're the controller for multiple
+         * hardware IRQs, so later we can lookup their virtual IRQs. */
+
+        opb->host = irq_alloc_host(dn, IRQ_HOST_MAP_LINEAR,
+                        OPB_NR_IRQS, &opb_host_ops, -1);
+
+        if (!opb->host) {
+                printk(KERN_ERR "opb: Failed to allocate IRQ host!\n");
+                goto free_regs;
+        }
+
+        opb->index = opb_index++;
+        spin_lock_init(&opb->lock);
+        opb->host->host_data = opb;
+
+        /* Disable all interrupts by default */
+        opb_out(opb, OPB_MLSASIER, 0);
+        opb_out(opb, OPB_MLSIER, 0);
+
+        /* ACK any interrupts left by FW */
+        opb_out(opb, OPB_MLSIR, 0xFFFFFFFF);
+
+        return opb;
+
+free_regs:
+        iounmap(opb->regs);
+free_opb:
+        kfree(opb);
+        return NULL;
+}
+
+void __init opb_pic_init(void)
+{
+        struct device_node *dn;
+        struct opb_pic *opb;
+        int virq;
+        int rc;
+
+        /* Call init_one for each OPB device */
+        for_each_compatible_node(dn, NULL, "ibm,opb") {
+
+                /* Fill in an OPB struct */
+                opb = opb_pic_init_one(dn);
+                if (!opb) {
+                        printk(KERN_WARNING "opb: Failed to init node, skipped!\n");
+                        continue;
+                }
+
+                /* Map / get opb's hardware virtual irq */
+                virq = irq_of_parse_and_map(dn, 0);
+                if (virq <= 0) {
+                        printk("opb: irq_op_parse_and_map failed!\n");
+                        continue;
+                }
+
+                /* Attach opb interrupt handler to new virtual IRQ */
+                rc = request_irq(virq, opb_irq_handler, 0, "OPB LS Cascade", opb);
+                if (rc) {
+                        printk("opb: request_irq failed: %d\n", rc);
+                        continue;
+                }
+
+                printk("OPB%d init with %d IRQs at %p\n", opb->index,
+                                OPB_NR_IRQS, opb->regs);
+        }
+}
diff --git a/arch/powerpc/platforms/wsp/psr2.c b/arch/powerpc/platforms/wsp/psr2.c
new file mode 100644
index 000000000000..40f28916ff6c
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/psr2.c
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2008-2011, 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/delay.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/of.h>
+#include <linux/smp.h>
+
+#include <asm/machdep.h>
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/udbg.h>
+
+#include "ics.h"
+#include "wsp.h"
+
+
+static void psr2_spin(void)
+{
+        hard_irq_disable();
+        for (;;) ;
+}
+
+static void psr2_restart(char *cmd)
+{
+        psr2_spin();
+}
+
+static int psr2_probe_devices(void)
+{
+        struct device_node *np;
+
+        /* Our RTC is a ds1500. It seems to be programatically compatible
+         * with the ds1511 for which we have a driver so let's use that
+         */
+        np = of_find_compatible_node(NULL, NULL, "dallas,ds1500");
+        if (np != NULL) {
+                struct resource res;
+                if (of_address_to_resource(np, 0, &res) == 0)
+                        platform_device_register_simple("ds1511", 0, &res, 1);
+        }
+        return 0;
+}
+machine_arch_initcall(psr2_md, psr2_probe_devices);
+
+static void __init psr2_setup_arch(void)
+{
+        /* init to some ~sane value until calibrate_delay() runs */
+        loops_per_jiffy = 50000000;
+
+        scom_init_wsp();
+
+        /* Setup SMP callback */
+#ifdef CONFIG_SMP
+        a2_setup_smp();
+#endif
+}
+
+static int __init psr2_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "ibm,psr2"))
+                return 0;
+
+        return 1;
+}
+
+static void __init psr2_init_irq(void)
+{
+        wsp_init_irq();
+        opb_pic_init();
+}
+
+define_machine(psr2_md) {
+        .name                   = "PSR2 A2",
+        .probe                  = psr2_probe,
+        .setup_arch             = psr2_setup_arch,
+        .restart                = psr2_restart,
+        .power_off              = psr2_spin,
+        .halt                   = psr2_spin,
+        .calibrate_decr         = generic_calibrate_decr,
+        .init_IRQ               = psr2_init_irq,
+        .progress               = udbg_progress,
+        .power_save             = book3e_idle,
+};
diff --git a/arch/powerpc/platforms/wsp/scom_smp.c b/arch/powerpc/platforms/wsp/scom_smp.c
new file mode 100644
index 000000000000..141e78032097
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/scom_smp.c
@@ -0,0 +1,427 @@
+/*
+ * SCOM support for A2 platforms
+ *
+ * Copyright 2007-2011 Benjamin Herrenschmidt, David Gibson,
+ *                     Michael Ellerman, IBM Corp.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/cpumask.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
+#include <asm/cputhreads.h>
+#include <asm/reg_a2.h>
+#include <asm/scom.h>
+#include <asm/udbg.h>
+
+#include "wsp.h"
+
+#define SCOM_RAMC               0x2a            /* Ram Command */
+#define SCOM_RAMC_TGT1_EXT      0x80000000
+#define SCOM_RAMC_SRC1_EXT      0x40000000
+#define SCOM_RAMC_SRC2_EXT      0x20000000
+#define SCOM_RAMC_SRC3_EXT      0x10000000
+#define SCOM_RAMC_ENABLE        0x00080000
+#define SCOM_RAMC_THREADSEL     0x00060000
+#define SCOM_RAMC_EXECUTE       0x00010000
+#define SCOM_RAMC_MSR_OVERRIDE  0x00008000
+#define SCOM_RAMC_MSR_PR        0x00004000
+#define SCOM_RAMC_MSR_GS        0x00002000
+#define SCOM_RAMC_FORCE         0x00001000
+#define SCOM_RAMC_FLUSH         0x00000800
+#define SCOM_RAMC_INTERRUPT     0x00000004
+#define SCOM_RAMC_ERROR         0x00000002
+#define SCOM_RAMC_DONE          0x00000001
+#define SCOM_RAMI               0x29            /* Ram Instruction */
+#define SCOM_RAMIC              0x28            /* Ram Instruction and Command */
+#define SCOM_RAMIC_INSN         0xffffffff00000000
+#define SCOM_RAMD               0x2d            /* Ram Data */
+#define SCOM_RAMDH              0x2e            /* Ram Data High */
+#define SCOM_RAMDL              0x2f            /* Ram Data Low */
+#define SCOM_PCCR0              0x33            /* PC Configuration Register 0 */
+#define SCOM_PCCR0_ENABLE_DEBUG 0x80000000
+#define SCOM_PCCR0_ENABLE_RAM   0x40000000
+#define SCOM_THRCTL             0x30            /* Thread Control and Status */
+#define SCOM_THRCTL_T0_STOP     0x80000000
+#define SCOM_THRCTL_T1_STOP     0x40000000
+#define SCOM_THRCTL_T2_STOP     0x20000000
+#define SCOM_THRCTL_T3_STOP     0x10000000
+#define SCOM_THRCTL_T0_STEP     0x08000000
+#define SCOM_THRCTL_T1_STEP     0x04000000
+#define SCOM_THRCTL_T2_STEP     0x02000000
+#define SCOM_THRCTL_T3_STEP     0x01000000
+#define SCOM_THRCTL_T0_RUN      0x00800000
+#define SCOM_THRCTL_T1_RUN      0x00400000
+#define SCOM_THRCTL_T2_RUN      0x00200000
+#define SCOM_THRCTL_T3_RUN      0x00100000
+#define SCOM_THRCTL_T0_PM       0x00080000
+#define SCOM_THRCTL_T1_PM       0x00040000
+#define SCOM_THRCTL_T2_PM       0x00020000
+#define SCOM_THRCTL_T3_PM       0x00010000
+#define SCOM_THRCTL_T0_UDE      0x00008000
+#define SCOM_THRCTL_T1_UDE      0x00004000
+#define SCOM_THRCTL_T2_UDE      0x00002000
+#define SCOM_THRCTL_T3_UDE      0x00001000
+#define SCOM_THRCTL_ASYNC_DIS   0x00000800
+#define SCOM_THRCTL_TB_DIS      0x00000400
+#define SCOM_THRCTL_DEC_DIS     0x00000200
+#define SCOM_THRCTL_AND         0x31            /* Thread Control and Status */
+#define SCOM_THRCTL_OR          0x32            /* Thread Control and Status */
+
+
+static DEFINE_PER_CPU(scom_map_t, scom_ptrs);
+
+static scom_map_t get_scom(int cpu, struct device_node *np, int *first_thread)
+{
+        scom_map_t scom = per_cpu(scom_ptrs, cpu);
+        int tcpu;
+
+        if (scom_map_ok(scom)) {
+                *first_thread = 0;
+                return scom;
+        }
+
+        *first_thread = 1;
+
+        scom = scom_map_device(np, 0);
+
+        for (tcpu = cpu_first_thread_sibling(cpu);
+             tcpu <= cpu_last_thread_sibling(cpu); tcpu++)
+                per_cpu(scom_ptrs, tcpu) = scom;
+
+        /* Hack: for the boot core, this will actually get called on
+         * the second thread up, not the first so our test above will
+         * set first_thread incorrectly. */
+        if (cpu_first_thread_sibling(cpu) == 0)
+                *first_thread = 0;
+
+        return scom;
+}
+
+static int a2_scom_ram(scom_map_t scom, int thread, u32 insn, int extmask)
+{
+        u64 cmd, mask, val;
+        int n = 0;
+
+        cmd = ((u64)insn << 32) | (((u64)extmask & 0xf) << 28)
+                | ((u64)thread << 17) | SCOM_RAMC_ENABLE | SCOM_RAMC_EXECUTE;
+        mask = SCOM_RAMC_DONE | SCOM_RAMC_INTERRUPT | SCOM_RAMC_ERROR;
+
+        scom_write(scom, SCOM_RAMIC, cmd);
+
+        while (!((val = scom_read(scom, SCOM_RAMC)) & mask)) {
+                pr_devel("Waiting on RAMC = 0x%llx\n", val);
+                if (++n == 3) {
+                        pr_err("RAMC timeout on instruction 0x%08x, thread %d\n",
+                               insn, thread);
+                        return -1;
+                }
+        }
+
+        if (val & SCOM_RAMC_INTERRUPT) {
+                pr_err("RAMC interrupt on instruction 0x%08x, thread %d\n",
+                       insn, thread);
+                return -SCOM_RAMC_INTERRUPT;
+        }
+
+        if (val & SCOM_RAMC_ERROR) {
+                pr_err("RAMC error on instruction 0x%08x, thread %d\n",
+                       insn, thread);
+                return -SCOM_RAMC_ERROR;
+        }
+
+        return 0;
+}
+
+static int a2_scom_getgpr(scom_map_t scom, int thread, int gpr, int alt,
+                          u64 *out_gpr)
+{
+        int rc;
+
+        /* or rN, rN, rN */
+        u32 insn = 0x7c000378 | (gpr << 21) | (gpr << 16) | (gpr << 11);
+        rc = a2_scom_ram(scom, thread, insn, alt ? 0xf : 0x0);
+        if (rc)
+                return rc;
+
+        *out_gpr = scom_read(scom, SCOM_RAMD);
+
+        return 0;
+}
+
+static int a2_scom_getspr(scom_map_t scom, int thread, int spr, u64 *out_spr)
+{
+        int rc, sprhi, sprlo;
+        u32 insn;
+
+        sprhi = spr >> 5;
+        sprlo = spr & 0x1f;
+        insn = 0x7c2002a6 | (sprlo << 16) | (sprhi << 11); /* mfspr r1,spr */
+
+        if (spr == 0x0ff0)
+                insn = 0x7c2000a6; /* mfmsr r1 */
+
+        rc = a2_scom_ram(scom, thread, insn, 0xf);
+        if (rc)
+                return rc;
+        return a2_scom_getgpr(scom, thread, 1, 1, out_spr);
+}
+
+static int a2_scom_setgpr(scom_map_t scom, int thread, int gpr,
+                          int alt, u64 val)
+{
+        u32 lis = 0x3c000000 | (gpr << 21);
+        u32 li = 0x38000000 | (gpr << 21);
+        u32 oris = 0x64000000 | (gpr << 21) | (gpr << 16);
+        u32 ori = 0x60000000 | (gpr << 21) | (gpr << 16);
+        u32 rldicr32 = 0x780007c6 | (gpr << 21) | (gpr << 16);
+        u32 highest = val >> 48;
+        u32 higher = (val >> 32) & 0xffff;
+        u32 high = (val >> 16) & 0xffff;
+        u32 low = val & 0xffff;
+        int lext = alt ? 0x8 : 0x0;
+        int oext = alt ? 0xf : 0x0;
+        int rc = 0;
+
+        if (highest)
+                rc |= a2_scom_ram(scom, thread, lis | highest, lext);
+
+        if (higher) {
+                if (highest)
+                        rc |= a2_scom_ram(scom, thread, oris | higher, oext);
+                else
+                        rc |= a2_scom_ram(scom, thread, li | higher, lext);
+        }
+
+        if (highest || higher)
+                rc |= a2_scom_ram(scom, thread, rldicr32, oext);
+
+        if (high) {
+                if (highest || higher)
+                        rc |= a2_scom_ram(scom, thread, oris | high, oext);
+                else
+                        rc |= a2_scom_ram(scom, thread, lis | high, lext);
+        }
+
+        if (highest || higher || high)
+                rc |= a2_scom_ram(scom, thread, ori | low, oext);
+        else
+                rc |= a2_scom_ram(scom, thread, li | low, lext);
+
+        return rc;
+}
+
+static int a2_scom_setspr(scom_map_t scom, int thread, int spr, u64 val)
+{
+        int sprhi = spr >> 5;
+        int sprlo = spr & 0x1f;
+        /* mtspr spr, r1 */
+        u32 insn = 0x7c2003a6 | (sprlo << 16) | (sprhi << 11);
+
+        if (spr == 0x0ff0)
+                insn = 0x7c200124; /* mtmsr r1 */
+
+        if (a2_scom_setgpr(scom, thread, 1, 1, val))
+                return -1;
+
+        return a2_scom_ram(scom, thread, insn, 0xf);
+}
+
+static int a2_scom_initial_tlb(scom_map_t scom, int thread)
+{
+        extern u32 a2_tlbinit_code_start[], a2_tlbinit_code_end[];
+        extern u32 a2_tlbinit_after_iprot_flush[];
+        extern u32 a2_tlbinit_after_linear_map[];
+        u32 assoc, entries, i;
+        u64 epn, tlbcfg;
+        u32 *p;
+        int rc;
+
+        /* Invalidate all entries (including iprot) */
+
+        rc = a2_scom_getspr(scom, thread, SPRN_TLB0CFG, &tlbcfg);
+        if (rc)
+                goto scom_fail;
+        entries = tlbcfg & TLBnCFG_N_ENTRY;
+        assoc = (tlbcfg & TLBnCFG_ASSOC) >> 24;
+        epn = 0;
+
+        /* Set MMUCR2 to enable 4K, 64K, 1M, 16M and 1G pages */
+        a2_scom_setspr(scom, thread, SPRN_MMUCR2, 0x000a7531);
+        /* Set MMUCR3 to write all thids bit to the TLB */
+        a2_scom_setspr(scom, thread, SPRN_MMUCR3, 0x0000000f);
+
+        /* Set MAS1 for 1G page size, and MAS2 to our initial EPN */
+        a2_scom_setspr(scom, thread, SPRN_MAS1, MAS1_TSIZE(BOOK3E_PAGESZ_1GB));
+        a2_scom_setspr(scom, thread, SPRN_MAS2, epn);
+        for (i = 0; i < entries; i++) {
+
+                a2_scom_setspr(scom, thread, SPRN_MAS0, MAS0_ESEL(i % assoc));
+
+                /* tlbwe */
+                rc = a2_scom_ram(scom, thread, 0x7c0007a4, 0);
+                if (rc)
+                        goto scom_fail;
+
+                /* Next entry is new address? */
+                if((i + 1) % assoc == 0) {
+                        epn += (1 << 30);
+                        a2_scom_setspr(scom, thread, SPRN_MAS2, epn);
+                }
+        }
+
+        /* Setup args for linear mapping */
+        rc = a2_scom_setgpr(scom, thread, 3, 0, MAS0_TLBSEL(0));
+        if (rc)
+                goto scom_fail;
+
+        /* Linear mapping */
+        for (p = a2_tlbinit_code_start; p < a2_tlbinit_after_linear_map; p++) {
+                rc = a2_scom_ram(scom, thread, *p, 0);
+                if (rc)
+                        goto scom_fail;
+        }
+
+        /*
+         * For the boot thread, between the linear mapping and the debug
+         * mappings there is a loop to flush iprot mappings. Ramming doesn't do
+         * branches, but the secondary threads don't need to be nearly as smart
+         * (i.e. we don't need to worry about invalidating the mapping we're
+         * standing on).
+         */
+
+        /* Debug mappings. Expects r11 = MAS0 from linear map (set above) */
+        for (p = a2_tlbinit_after_iprot_flush; p < a2_tlbinit_code_end; p++) {
+                rc = a2_scom_ram(scom, thread, *p, 0);
+                if (rc)
+                        goto scom_fail;
+        }
+
+scom_fail:
+        if (rc)
+                pr_err("Setting up initial TLB failed, err %d\n", rc);
+
+        if (rc == -SCOM_RAMC_INTERRUPT) {
+                /* Interrupt, dump some status */
+                int rc[10];
+                u64 iar, srr0, srr1, esr, mas0, mas1, mas2, mas7_3, mas8, ccr2;
+                rc[0] = a2_scom_getspr(scom, thread, SPRN_IAR, &iar);
+                rc[1] = a2_scom_getspr(scom, thread, SPRN_SRR0, &srr0);
+                rc[2] = a2_scom_getspr(scom, thread, SPRN_SRR1, &srr1);
+                rc[3] = a2_scom_getspr(scom, thread, SPRN_ESR, &esr);
+                rc[4] = a2_scom_getspr(scom, thread, SPRN_MAS0, &mas0);
+                rc[5] = a2_scom_getspr(scom, thread, SPRN_MAS1, &mas1);
+                rc[6] = a2_scom_getspr(scom, thread, SPRN_MAS2, &mas2);
+                rc[7] = a2_scom_getspr(scom, thread, SPRN_MAS7_MAS3, &mas7_3);
+                rc[8] = a2_scom_getspr(scom, thread, SPRN_MAS8, &mas8);
+                rc[9] = a2_scom_getspr(scom, thread, SPRN_A2_CCR2, &ccr2);
+                pr_err(" -> retreived IAR =0x%llx (err %d)\n", iar, rc[0]);
+                pr_err("    retreived SRR0=0x%llx (err %d)\n", srr0, rc[1]);
+                pr_err("    retreived SRR1=0x%llx (err %d)\n", srr1, rc[2]);
+                pr_err("    retreived ESR =0x%llx (err %d)\n", esr, rc[3]);
+                pr_err("    retreived MAS0=0x%llx (err %d)\n", mas0, rc[4]);
+                pr_err("    retreived MAS1=0x%llx (err %d)\n", mas1, rc[5]);
+                pr_err("    retreived MAS2=0x%llx (err %d)\n", mas2, rc[6]);
+                pr_err("    retreived MS73=0x%llx (err %d)\n", mas7_3, rc[7]);
+                pr_err("    retreived MAS8=0x%llx (err %d)\n", mas8, rc[8]);
+                pr_err("    retreived CCR2=0x%llx (err %d)\n", ccr2, rc[9]);
+        }
+
+        return rc;
+}
+
+int __devinit a2_scom_startup_cpu(unsigned int lcpu, int thr_idx,
+                                  struct device_node *np)
+{
+        u64 init_iar, init_msr, init_ccr2;
+        unsigned long start_here;
+        int rc, core_setup;
+        scom_map_t scom;
+        u64 pccr0;
+
+        scom = get_scom(lcpu, np, &core_setup);
+        if (!scom) {
+                printk(KERN_ERR "Couldn't map SCOM for CPU%d\n", lcpu);
+                return -1;
+        }
+
+        pr_devel("Bringing up CPU%d using SCOM...\n", lcpu);
+
+        pccr0 = scom_read(scom, SCOM_PCCR0);
+        scom_write(scom, SCOM_PCCR0, pccr0 | SCOM_PCCR0_ENABLE_DEBUG |
+                                     SCOM_PCCR0_ENABLE_RAM);
+
+        /* Stop the thead with THRCTL. If we are setting up the TLB we stop all
+         * threads. We also disable asynchronous interrupts while RAMing.
+         */
+        if (core_setup)
+                scom_write(scom, SCOM_THRCTL_OR,
+                              SCOM_THRCTL_T0_STOP |
+                              SCOM_THRCTL_T1_STOP |
+                              SCOM_THRCTL_T2_STOP |
+                              SCOM_THRCTL_T3_STOP |
+                              SCOM_THRCTL_ASYNC_DIS);
+        else
+                scom_write(scom, SCOM_THRCTL_OR, SCOM_THRCTL_T0_STOP >> thr_idx);
+
+        /* Flush its pipeline just in case */
+        scom_write(scom, SCOM_RAMC, ((u64)thr_idx << 17) |
+                      SCOM_RAMC_FLUSH | SCOM_RAMC_ENABLE);
+
+        a2_scom_getspr(scom, thr_idx, SPRN_IAR, &init_iar);
+        a2_scom_getspr(scom, thr_idx, 0x0ff0, &init_msr);
+        a2_scom_getspr(scom, thr_idx, SPRN_A2_CCR2, &init_ccr2);
+
+        /* Set MSR to MSR_CM (0x0ff0 is magic value for MSR_CM) */
+        rc = a2_scom_setspr(scom, thr_idx, 0x0ff0, MSR_CM);
+        if (rc) {
+                pr_err("Failed to set MSR ! err %d\n", rc);
+                return rc;
+        }
+
+        /* RAM in an sync/isync for the sake of it */
+        a2_scom_ram(scom, thr_idx, 0x7c0004ac, 0);
+        a2_scom_ram(scom, thr_idx, 0x4c00012c, 0);
+
+        if (core_setup) {
+                pr_devel("CPU%d is first thread in core, initializing TLB...\n",
+                         lcpu);
+                rc = a2_scom_initial_tlb(scom, thr_idx);
+                if (rc)
+                        goto fail;
+        }
+
+        start_here = *(unsigned long *)(core_setup ? generic_secondary_smp_init
+                                        : generic_secondary_thread_init);
+        pr_devel("CPU%d entry point at 0x%lx...\n", lcpu, start_here);
+
+        rc |= a2_scom_setspr(scom, thr_idx, SPRN_IAR, start_here);
+        rc |= a2_scom_setgpr(scom, thr_idx, 3, 0,
+                             get_hard_smp_processor_id(lcpu));
+        /*
+         * Tell book3e_secondary_core_init not to set up the TLB, we've
+         * already done that.
+         */
+        rc |= a2_scom_setgpr(scom, thr_idx, 4, 0, 1);
+
+        rc |= a2_scom_setspr(scom, thr_idx, SPRN_TENS, 0x1 << thr_idx);
+
+        scom_write(scom, SCOM_RAMC, 0);
+        scom_write(scom, SCOM_THRCTL_AND, ~(SCOM_THRCTL_T0_STOP >> thr_idx));
+        scom_write(scom, SCOM_PCCR0, pccr0);
+fail:
+        pr_devel("  SCOM initialization %s\n", rc ? "failed" : "succeeded");
+        if (rc) {
+                pr_err("Old IAR=0x%08llx MSR=0x%08llx CCR2=0x%08llx\n",
+                       init_iar, init_msr, init_ccr2);
+        }
+
+        return rc;
+}
diff --git a/arch/powerpc/platforms/wsp/scom_wsp.c b/arch/powerpc/platforms/wsp/scom_wsp.c
new file mode 100644
index 000000000000..4052e2259f30
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/scom_wsp.c
@@ -0,0 +1,77 @@
+/*
+ *  SCOM backend for WSP
+ *
+ *  Copyright 2010 Benjamin Herrenschmidt, IBM Corp.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/cpumask.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+
+#include <asm/cputhreads.h>
+#include <asm/reg_a2.h>
+#include <asm/scom.h>
+#include <asm/udbg.h>
+
+#include "wsp.h"
+
+
+static scom_map_t wsp_scom_map(struct device_node *dev, u64 reg, u64 count)
+{
+        struct resource r;
+        u64 xscom_addr;
+
+        if (!of_get_property(dev, "scom-controller", NULL)) {
+                pr_err("%s: device %s is not a SCOM controller\n",
+                        __func__, dev->full_name);
+                return SCOM_MAP_INVALID;
+        }
+
+        if (of_address_to_resource(dev, 0, &r)) {
+                pr_debug("Failed to find SCOM controller address\n");
+                return 0;
+        }
+
+        /* Transform the SCOM address into an XSCOM offset */
+        xscom_addr = ((reg & 0x7f000000) >> 1) | ((reg & 0xfffff) << 3);
+
+        return (scom_map_t)ioremap(r.start + xscom_addr, count << 3);
+}
+
+static void wsp_scom_unmap(scom_map_t map)
+{
+        iounmap((void *)map);
+}
+
+static u64 wsp_scom_read(scom_map_t map, u32 reg)
+{
+        u64 __iomem *addr = (u64 __iomem *)map;
+
+        return in_be64(addr + reg);
+}
+
+static void wsp_scom_write(scom_map_t map, u32 reg, u64 value)
+{
+        u64 __iomem *addr = (u64 __iomem *)map;
+
+        return out_be64(addr + reg, value);
+}
+
+static const struct scom_controller wsp_scom_controller = {
+        .map    = wsp_scom_map,
+        .unmap  = wsp_scom_unmap,
+        .read   = wsp_scom_read,
+        .write  = wsp_scom_write
+};
+
+void scom_init_wsp(void)
+{
+        scom_init(&wsp_scom_controller);
+}
diff --git a/arch/powerpc/platforms/wsp/setup.c b/arch/powerpc/platforms/wsp/setup.c
new file mode 100644
index 000000000000..11ac2f05e01c
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/setup.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2010 Michael Ellerman, IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/of_platform.h>
+
+#include "wsp.h"
+
+/*
+ * Find chip-id by walking up device tree looking for ibm,wsp-chip-id property.
+ * Won't work for nodes that are not a descendant of a wsp node.
+ */
+int wsp_get_chip_id(struct device_node *dn)
+{
+        const u32 *p;
+        int rc;
+
+        /* Start looking at the specified node, not its parent */
+        dn = of_node_get(dn);
+        while (dn && !(p = of_get_property(dn, "ibm,wsp-chip-id", NULL)))
+                dn = of_get_next_parent(dn);
+
+        if (!dn)
+                return -1;
+
+        rc = *p;
+        of_node_put(dn);
+
+        return rc;
+}
diff --git a/arch/powerpc/platforms/wsp/smp.c b/arch/powerpc/platforms/wsp/smp.c
new file mode 100644
index 000000000000..9d20fa9d3710
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/smp.c
@@ -0,0 +1,88 @@
+/*
+ *  SMP Support for A2 platforms
+ *
+ *  Copyright 2007 Benjamin Herrenschmidt, IBM Corp.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ *
+ */
+
+#include <linux/cpumask.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/smp.h>
+
+#include <asm/dbell.h>
+#include <asm/machdep.h>
+#include <asm/xics.h>
+
+#include "ics.h"
+#include "wsp.h"
+
+static void __devinit smp_a2_setup_cpu(int cpu)
+{
+        doorbell_setup_this_cpu();
+
+        if (cpu != boot_cpuid)
+                xics_setup_cpu();
+}
+
+int __devinit smp_a2_kick_cpu(int nr)
+{
+        const char *enable_method;
+        struct device_node *np;
+        int thr_idx;
+
+        if (nr < 0 || nr >= NR_CPUS)
+                return -ENOENT;
+
+        np = of_get_cpu_node(nr, &thr_idx);
+        if (!np)
+                return -ENODEV;
+
+        enable_method = of_get_property(np, "enable-method", NULL);
+        pr_devel("CPU%d has enable-method: \"%s\"\n", nr, enable_method);
+
+        if (!enable_method) {
+                printk(KERN_ERR "CPU%d has no enable-method\n", nr);
+                return -ENOENT;
+        } else if (strcmp(enable_method, "ibm,a2-scom") == 0) {
+                if (a2_scom_startup_cpu(nr, thr_idx, np))
+                        return -1;
+        } else {
+                printk(KERN_ERR "CPU%d: Don't understand enable-method \"%s\"\n",
+                       nr, enable_method);
+                return -EINVAL;
+        }
+
+        /*
+         * The processor is currently spinning, waiting for the
+         * cpu_start field to become non-zero After we set cpu_start,
+         * the processor will continue on to secondary_start
+         */
+        paca[nr].cpu_start = 1;
+
+        return 0;
+}
+
+static int __init smp_a2_probe(void)
+{
+        return cpus_weight(cpu_possible_map);
+}
+
+static struct smp_ops_t a2_smp_ops = {
+        .message_pass   = smp_muxed_ipi_message_pass,
+        .cause_ipi      = doorbell_cause_ipi,
+        .probe          = smp_a2_probe,
+        .kick_cpu       = smp_a2_kick_cpu,
+        .setup_cpu      = smp_a2_setup_cpu,
+};
+
+void __init a2_setup_smp(void)
+{
+        smp_ops = &a2_smp_ops;
+}
diff --git a/arch/powerpc/platforms/wsp/wsp.h b/arch/powerpc/platforms/wsp/wsp.h
new file mode 100644
index 000000000000..7c3e087fd2f2
--- /dev/null
+++ b/arch/powerpc/platforms/wsp/wsp.h
@@ -0,0 +1,17 @@
+#ifndef __WSP_H
+#define __WSP_H
+
+#include <asm/wsp.h>
+
+extern void wsp_setup_pci(void);
+extern void scom_init_wsp(void);
+
+extern void a2_setup_smp(void);
+extern int a2_scom_startup_cpu(unsigned int lcpu, int thr_idx,
+                               struct device_node *np);
+int smp_a2_cpu_bootable(unsigned int nr);
+int __devinit smp_a2_kick_cpu(int nr);
+
+void opb_pic_init(void);
+
+#endif /*  __WSP_H */
diff --git a/arch/powerpc/sysdev/Kconfig b/arch/powerpc/sysdev/Kconfig
index 396582835cb5..d775fd148d13 100644
--- a/arch/powerpc/sysdev/Kconfig
+++ b/arch/powerpc/sysdev/Kconfig
@@ -12,3 +12,13 @@ config PPC_MSI_BITMAP
         depends on PCI_MSI
         default y if MPIC
         default y if FSL_PCI
+
+source "arch/powerpc/sysdev/xics/Kconfig"
+
+config PPC_SCOM
+        bool
+
+config SCOM_DEBUGFS
+        bool "Expose SCOM controllers via debugfs"
+        depends on PPC_SCOM
+        default n
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 1e0c933ef772..6076e0074a87 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -57,3 +57,9 @@ obj-$(CONFIG_PPC_MPC52xx)	+= mpc5xxx_clocks.o
 ifeq ($(CONFIG_SUSPEND),y)
 obj-$(CONFIG_6xx)               += 6xx-suspend.o
 endif
+
+obj-$(CONFIG_PPC_SCOM)          += scom.o
+
+subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
+
+obj-$(CONFIG_PPC_XICS)          += xics/
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 1636dd896707..bd0d54060b94 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -216,7 +216,7 @@ static int axon_ram_probe(struct platform_device *device)
                         AXON_RAM_DEVICE_NAME, axon_ram_bank_id, bank->size >> 20);
 
         bank->ph_addr = resource.start;
-        bank->io_addr = (unsigned long) ioremap_flags(
+        bank->io_addr = (unsigned long) ioremap_prot(
                         bank->ph_addr, bank->size, _PAGE_NO_CACHE);
         if (bank->io_addr == 0) {
                 dev_err(&device->dev, "ioremap() failed\n");
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index e0bc944eb23f..350787c83e22 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -58,21 +58,21 @@ static struct irq_host *cpm_pic_host;
 
 static void cpm_mask_irq(struct irq_data *d)
 {
-        unsigned int cpm_vec = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int cpm_vec = (unsigned int)irqd_to_hwirq(d);
 
         clrbits32(&cpic_reg->cpic_cimr, (1 << cpm_vec));
 }
 
 static void cpm_unmask_irq(struct irq_data *d)
 {
-        unsigned int cpm_vec = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int cpm_vec = (unsigned int)irqd_to_hwirq(d);
 
         setbits32(&cpic_reg->cpic_cimr, (1 << cpm_vec));
 }
 
 static void cpm_end_irq(struct irq_data *d)
 {
-        unsigned int cpm_vec = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int cpm_vec = (unsigned int)irqd_to_hwirq(d);
 
         out_be32(&cpic_reg->cpic_cisr, (1 << cpm_vec));
 }
@@ -157,7 +157,7 @@ unsigned int cpm_pic_init(void)
                 goto end;
 
         /* Initialize the CPM interrupt controller. */
-        hwirq = (unsigned int)irq_map[sirq].hwirq;
+        hwirq = (unsigned int)virq_to_hw(sirq);
         out_be32(&cpic_reg->cpic_cicr,
             (CICR_SCD_SCC4 | CICR_SCC_SCC3 | CICR_SCB_SCC2 | CICR_SCA_SCC1) |
                 ((hwirq/2) << 13) | CICR_HP_MASK);
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
index 5495c1be472b..bcab50e2a9eb 100644
--- a/arch/powerpc/sysdev/cpm2_pic.c
+++ b/arch/powerpc/sysdev/cpm2_pic.c
@@ -81,7 +81,7 @@ static const u_char irq_to_siubit[] = {
 static void cpm2_mask_irq(struct irq_data *d)
 {
         int     bit, word;
-        unsigned int irq_nr = virq_to_hw(d->irq);
+        unsigned int irq_nr = irqd_to_hwirq(d);
 
         bit = irq_to_siubit[irq_nr];
         word = irq_to_siureg[irq_nr];
@@ -93,7 +93,7 @@ static void cpm2_mask_irq(struct irq_data *d)
 static void cpm2_unmask_irq(struct irq_data *d)
 {
         int     bit, word;
-        unsigned int irq_nr = virq_to_hw(d->irq);
+        unsigned int irq_nr = irqd_to_hwirq(d);
 
         bit = irq_to_siubit[irq_nr];
         word = irq_to_siureg[irq_nr];
@@ -105,7 +105,7 @@ static void cpm2_unmask_irq(struct irq_data *d)
 static void cpm2_ack(struct irq_data *d)
 {
         int     bit, word;
-        unsigned int irq_nr = virq_to_hw(d->irq);
+        unsigned int irq_nr = irqd_to_hwirq(d);
 
         bit = irq_to_siubit[irq_nr];
         word = irq_to_siureg[irq_nr];
@@ -116,7 +116,7 @@ static void cpm2_ack(struct irq_data *d)
 static void cpm2_end_irq(struct irq_data *d)
 {
         int     bit, word;
-        unsigned int irq_nr = virq_to_hw(d->irq);
+        unsigned int irq_nr = irqd_to_hwirq(d);
 
         bit = irq_to_siubit[irq_nr];
         word = irq_to_siureg[irq_nr];
@@ -133,7 +133,7 @@ static void cpm2_end_irq(struct irq_data *d)
 
 static int cpm2_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
-        unsigned int src = virq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned int vold, vnew, edibit;
 
         /* Port C interrupts are either IRQ_TYPE_EDGE_FALLING or
diff --git a/arch/powerpc/sysdev/fsl_85xx_cache_sram.c b/arch/powerpc/sysdev/fsl_85xx_cache_sram.c
index 54fb1922fe30..116415899176 100644
--- a/arch/powerpc/sysdev/fsl_85xx_cache_sram.c
+++ b/arch/powerpc/sysdev/fsl_85xx_cache_sram.c
@@ -106,10 +106,10 @@ int __init instantiate_cache_sram(struct platform_device *dev,
                 goto out_free;
         }
 
-        cache_sram->base_virt = ioremap_flags(cache_sram->base_phys,
+        cache_sram->base_virt = ioremap_prot(cache_sram->base_phys,
                                 cache_sram->size, _PAGE_COHERENT | PAGE_KERNEL);
         if (!cache_sram->base_virt) {
-                dev_err(&dev->dev, "%s: ioremap_flags failed\n",
+                dev_err(&dev->dev, "%s: ioremap_prot failed\n",
                                 dev->dev.of_node->full_name);
                 ret = -ENOMEM;
                 goto out_release;
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 01cd2f089512..92e78333c47c 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -110,7 +110,7 @@ static void fsl_teardown_msi_irqs(struct pci_dev *pdev)
         list_for_each_entry(entry, &pdev->msi_list, list) {
                 if (entry->irq == NO_IRQ)
                         continue;
-                msi_data = irq_get_handler_data(entry->irq);
+                msi_data = irq_get_chip_data(entry->irq);
                 irq_set_msi_desc(entry->irq, NULL);
                 msi_bitmap_free_hwirqs(&msi_data->bitmap,
                                        virq_to_hw(entry->irq), 1);
@@ -168,7 +168,7 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                         rc = -ENOSPC;
                         goto out_free;
                 }
-                irq_set_handler_data(virq, msi_data);
+                /* chip_data is msi_data via host->hostdata in host->map() */
                 irq_set_msi_desc(virq, entry);
 
                 fsl_compose_msi_msg(pdev, hwirq, &msg, msi_data);
@@ -193,7 +193,7 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
         u32 have_shift = 0;
         struct fsl_msi_cascade_data *cascade_data;
 
-        cascade_data = (struct fsl_msi_cascade_data *)irq_get_handler_data(irq);
+        cascade_data = irq_get_handler_data(irq);
         msi_data = cascade_data->msi_data;
 
         raw_spin_lock(&desc->lock);
@@ -253,7 +253,7 @@ unlock:
 
 static int fsl_of_msi_remove(struct platform_device *ofdev)
 {
-        struct fsl_msi *msi = ofdev->dev.platform_data;
+        struct fsl_msi *msi = platform_get_drvdata(ofdev);
         int virq, i;
         struct fsl_msi_cascade_data *cascade_data;
 
@@ -330,7 +330,7 @@ static int __devinit fsl_of_msi_probe(struct platform_device *dev)
                 dev_err(&dev->dev, "No memory for MSI structure\n");
                 return -ENOMEM;
         }
-        dev->dev.platform_data = msi;
+        platform_set_drvdata(dev, msi);
 
         msi->irqhost = irq_alloc_host(dev->dev.of_node, IRQ_HOST_MAP_LINEAR,
                                       NR_MSI_IRQS, &fsl_msi_host_ops, 0);
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index 142770cb84b6..d18bb27e4df9 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -185,18 +185,6 @@ static int i8259_host_map(struct irq_host *h, unsigned int virq,
         return 0;
 }
 
-static void i8259_host_unmap(struct irq_host *h, unsigned int virq)
-{
-        /* Make sure irq is masked in hardware */
-        i8259_mask_irq(irq_get_irq_data(virq));
-
-        /* remove chip and handler */
-        irq_set_chip_and_handler(virq, NULL, NULL);
-
-        /* Make sure it's completed */
-        synchronize_irq(virq);
-}
-
 static int i8259_host_xlate(struct irq_host *h, struct device_node *ct,
                             const u32 *intspec, unsigned int intsize,
                             irq_hw_number_t *out_hwirq, unsigned int *out_flags)
@@ -220,7 +208,6 @@ static int i8259_host_xlate(struct irq_host *h, struct device_node *ct,
 static struct irq_host_ops i8259_host_ops = {
         .match = i8259_host_match,
         .map = i8259_host_map,
-        .unmap = i8259_host_unmap,
         .xlate = i8259_host_xlate,
 };
 
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index fa438be962b7..7367d17364cb 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -18,7 +18,7 @@
 #include <linux/stddef.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/device.h>
 #include <linux/bootmem.h>
 #include <linux/spinlock.h>
@@ -521,12 +521,10 @@ static inline struct ipic * ipic_from_irq(unsigned int virq)
         return primary_ipic;
 }
 
-#define ipic_irq_to_hw(virq)    ((unsigned int)irq_map[virq].hwirq)
-
 static void ipic_unmask_irq(struct irq_data *d)
 {
         struct ipic *ipic = ipic_from_irq(d->irq);
-        unsigned int src = ipic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 temp;
 
@@ -542,7 +540,7 @@ static void ipic_unmask_irq(struct irq_data *d)
 static void ipic_mask_irq(struct irq_data *d)
 {
         struct ipic *ipic = ipic_from_irq(d->irq);
-        unsigned int src = ipic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 temp;
 
@@ -562,7 +560,7 @@ static void ipic_mask_irq(struct irq_data *d)
 static void ipic_ack_irq(struct irq_data *d)
 {
         struct ipic *ipic = ipic_from_irq(d->irq);
-        unsigned int src = ipic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 temp;
 
@@ -581,7 +579,7 @@ static void ipic_ack_irq(struct irq_data *d)
 static void ipic_mask_irq_and_ack(struct irq_data *d)
 {
         struct ipic *ipic = ipic_from_irq(d->irq);
-        unsigned int src = ipic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 temp;
 
@@ -604,7 +602,7 @@ static void ipic_mask_irq_and_ack(struct irq_data *d)
 static int ipic_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
         struct ipic *ipic = ipic_from_irq(d->irq);
-        unsigned int src = ipic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned int vold, vnew, edibit;
 
         if (flow_type == IRQ_TYPE_NONE)
@@ -793,7 +791,7 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
 int ipic_set_priority(unsigned int virq, unsigned int priority)
 {
         struct ipic *ipic = ipic_from_irq(virq);
-        unsigned int src = ipic_irq_to_hw(virq);
+        unsigned int src = virq_to_hw(virq);
         u32 temp;
 
         if (priority > 7)
@@ -821,7 +819,7 @@ int ipic_set_priority(unsigned int virq, unsigned int priority)
 void ipic_set_highest_priority(unsigned int virq)
 {
         struct ipic *ipic = ipic_from_irq(virq);
-        unsigned int src = ipic_irq_to_hw(virq);
+        unsigned int src = virq_to_hw(virq);
         u32 temp;
 
         temp = ipic_read(ipic->regs, IPIC_SICFR);
@@ -902,7 +900,7 @@ static struct {
         u32 sercr;
 } ipic_saved_state;
 
-static int ipic_suspend(struct sys_device *sdev, pm_message_t state)
+static int ipic_suspend(void)
 {
         struct ipic *ipic = primary_ipic;
 
@@ -933,7 +931,7 @@ static int ipic_suspend(struct sys_device *sdev, pm_message_t state)
         return 0;
 }
 
-static int ipic_resume(struct sys_device *sdev)
+static void ipic_resume(void)
 {
         struct ipic *ipic = primary_ipic;
 
@@ -949,44 +947,26 @@ static int ipic_resume(struct sys_device *sdev)
         ipic_write(ipic->regs, IPIC_SECNR, ipic_saved_state.secnr);
         ipic_write(ipic->regs, IPIC_SERMR, ipic_saved_state.sermr);
         ipic_write(ipic->regs, IPIC_SERCR, ipic_saved_state.sercr);
-
-        return 0;
 }
 #else
 #define ipic_suspend NULL
 #define ipic_resume NULL
 #endif
 
-static struct sysdev_class ipic_sysclass = {
-        .name = "ipic",
+static struct syscore_ops ipic_syscore_ops = {
         .suspend = ipic_suspend,
         .resume = ipic_resume,
 };
 
-static struct sys_device device_ipic = {
-        .id             = 0,
-        .cls            = &ipic_sysclass,
-};
-
-static int __init init_ipic_sysfs(void)
+static int __init init_ipic_syscore(void)
 {
-        int rc;
-
         if (!primary_ipic || !primary_ipic->regs)
                 return -ENODEV;
-        printk(KERN_DEBUG "Registering ipic with sysfs...\n");
 
-        rc = sysdev_class_register(&ipic_sysclass);
-        if (rc) {
-                printk(KERN_ERR "Failed registering ipic sys class\n");
-                return -ENODEV;
-        }
-        rc = sysdev_register(&device_ipic);
-        if (rc) {
-                printk(KERN_ERR "Failed registering ipic sys device\n");
-                return -ENODEV;
-        }
+        printk(KERN_DEBUG "Registering ipic system core operations\n");
+        register_syscore_ops(&ipic_syscore_ops);
+
         return 0;
 }
 
-subsys_initcall(init_ipic_sysfs);
+subsys_initcall(init_ipic_syscore);
diff --git a/arch/powerpc/sysdev/mmio_nvram.c b/arch/powerpc/sysdev/mmio_nvram.c
index 207324209065..ddc877a3a23a 100644
--- a/arch/powerpc/sysdev/mmio_nvram.c
+++ b/arch/powerpc/sysdev/mmio_nvram.c
@@ -115,6 +115,8 @@ int __init mmio_nvram_init(void)
         int ret;
 
         nvram_node = of_find_node_by_type(NULL, "nvram");
+        if (!nvram_node)
+                nvram_node = of_find_compatible_node(NULL, NULL, "nvram");
         if (!nvram_node) {
                 printk(KERN_WARNING "nvram: no node found in device-tree\n");
                 return -ENODEV;
diff --git a/arch/powerpc/sysdev/mpc8xx_pic.c b/arch/powerpc/sysdev/mpc8xx_pic.c
index a88800ff4d01..20924f2246f0 100644
--- a/arch/powerpc/sysdev/mpc8xx_pic.c
+++ b/arch/powerpc/sysdev/mpc8xx_pic.c
@@ -28,7 +28,7 @@ int cpm_get_irq(struct pt_regs *regs);
 static void mpc8xx_unmask_irq(struct irq_data *d)
 {
         int     bit, word;
-        unsigned int irq_nr = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
 
         bit = irq_nr & 0x1f;
         word = irq_nr >> 5;
@@ -40,7 +40,7 @@ static void mpc8xx_unmask_irq(struct irq_data *d)
 static void mpc8xx_mask_irq(struct irq_data *d)
 {
         int     bit, word;
-        unsigned int irq_nr = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
 
         bit = irq_nr & 0x1f;
         word = irq_nr >> 5;
@@ -52,7 +52,7 @@ static void mpc8xx_mask_irq(struct irq_data *d)
 static void mpc8xx_ack(struct irq_data *d)
 {
         int     bit;
-        unsigned int irq_nr = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
 
         bit = irq_nr & 0x1f;
         out_be32(&siu_reg->sc_sipend, 1 << (31-bit));
@@ -61,7 +61,7 @@ static void mpc8xx_ack(struct irq_data *d)
 static void mpc8xx_end_irq(struct irq_data *d)
 {
         int bit, word;
-        unsigned int irq_nr = (unsigned int)irq_map[d->irq].hwirq;
+        unsigned int irq_nr = (unsigned int)irqd_to_hwirq(d);
 
         bit = irq_nr & 0x1f;
         word = irq_nr >> 5;
@@ -73,7 +73,7 @@ static void mpc8xx_end_irq(struct irq_data *d)
 static int mpc8xx_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
         if (flow_type & IRQ_TYPE_EDGE_FALLING) {
-                irq_hw_number_t hw = (unsigned int)irq_map[d->irq].hwirq;
+                irq_hw_number_t hw = (unsigned int)irqd_to_hwirq(d);
                 unsigned int siel = in_be32(&siu_reg->sc_siel);
 
                 /* only external IRQ senses are programmable */
diff --git a/arch/powerpc/sysdev/mpc8xxx_gpio.c b/arch/powerpc/sysdev/mpc8xxx_gpio.c
index 0892a2841c2b..fb4963abdf55 100644
--- a/arch/powerpc/sysdev/mpc8xxx_gpio.c
+++ b/arch/powerpc/sysdev/mpc8xxx_gpio.c
@@ -163,7 +163,7 @@ static void mpc8xxx_irq_unmask(struct irq_data *d)
 
         spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
 
-        setbits32(mm->regs + GPIO_IMR, mpc8xxx_gpio2mask(virq_to_hw(d->irq)));
+        setbits32(mm->regs + GPIO_IMR, mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
 
         spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
 }
@@ -176,7 +176,7 @@ static void mpc8xxx_irq_mask(struct irq_data *d)
 
         spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
 
-        clrbits32(mm->regs + GPIO_IMR, mpc8xxx_gpio2mask(virq_to_hw(d->irq)));
+        clrbits32(mm->regs + GPIO_IMR, mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
 
         spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
 }
@@ -186,7 +186,7 @@ static void mpc8xxx_irq_ack(struct irq_data *d)
         struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_data_get_irq_chip_data(d);
         struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
 
-        out_be32(mm->regs + GPIO_IER, mpc8xxx_gpio2mask(virq_to_hw(d->irq)));
+        out_be32(mm->regs + GPIO_IER, mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
 }
 
 static int mpc8xxx_irq_set_type(struct irq_data *d, unsigned int flow_type)
@@ -199,14 +199,14 @@ static int mpc8xxx_irq_set_type(struct irq_data *d, unsigned int flow_type)
         case IRQ_TYPE_EDGE_FALLING:
                 spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
                 setbits32(mm->regs + GPIO_ICR,
-                          mpc8xxx_gpio2mask(virq_to_hw(d->irq)));
+                          mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
                 spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
                 break;
 
         case IRQ_TYPE_EDGE_BOTH:
                 spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
                 clrbits32(mm->regs + GPIO_ICR,
-                          mpc8xxx_gpio2mask(virq_to_hw(d->irq)));
+                          mpc8xxx_gpio2mask(irqd_to_hwirq(d)));
                 spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
                 break;
 
@@ -221,7 +221,7 @@ static int mpc512x_irq_set_type(struct irq_data *d, unsigned int flow_type)
 {
         struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_data_get_irq_chip_data(d);
         struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
-        unsigned long gpio = virq_to_hw(d->irq);
+        unsigned long gpio = irqd_to_hwirq(d);
         void __iomem *reg;
         unsigned int shift;
         unsigned long flags;
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index f91c065bed5a..3a8de5bb628a 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -6,6 +6,7 @@
  *  with various broken implementations of this HW.
  *
  *  Copyright (C) 2004 Benjamin Herrenschmidt, IBM Corp.
+ *  Copyright 2010-2011 Freescale Semiconductor, 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
@@ -27,6 +28,7 @@
 #include <linux/spinlock.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/syscore_ops.h>
 
 #include <asm/ptrace.h>
 #include <asm/signal.h>
@@ -218,6 +220,28 @@ static inline void _mpic_ipi_write(struct mpic *mpic, unsigned int ipi, u32 valu
         _mpic_write(mpic->reg_type, &mpic->gregs, offset, value);
 }
 
+static inline u32 _mpic_tm_read(struct mpic *mpic, unsigned int tm)
+{
+        unsigned int offset = MPIC_INFO(TIMER_VECTOR_PRI) +
+                              ((tm & 3) * MPIC_INFO(TIMER_STRIDE));
+
+        if (tm >= 4)
+                offset += 0x1000 / 4;
+
+        return _mpic_read(mpic->reg_type, &mpic->tmregs, offset);
+}
+
+static inline void _mpic_tm_write(struct mpic *mpic, unsigned int tm, u32 value)
+{
+        unsigned int offset = MPIC_INFO(TIMER_VECTOR_PRI) +
+                              ((tm & 3) * MPIC_INFO(TIMER_STRIDE));
+
+        if (tm >= 4)
+                offset += 0x1000 / 4;
+
+        _mpic_write(mpic->reg_type, &mpic->tmregs, offset, value);
+}
+
 static inline u32 _mpic_cpu_read(struct mpic *mpic, unsigned int reg)
 {
         unsigned int cpu = mpic_processor_id(mpic);
@@ -268,6 +292,8 @@ static inline void _mpic_irq_write(struct mpic *mpic, unsigned int src_no,
 #define mpic_write(b,r,v)       _mpic_write(mpic->reg_type,&(b),(r),(v))
 #define mpic_ipi_read(i)        _mpic_ipi_read(mpic,(i))
 #define mpic_ipi_write(i,v)     _mpic_ipi_write(mpic,(i),(v))
+#define mpic_tm_read(i)         _mpic_tm_read(mpic,(i))
+#define mpic_tm_write(i,v)      _mpic_tm_write(mpic,(i),(v))
 #define mpic_cpu_read(i)        _mpic_cpu_read(mpic,(i))
 #define mpic_cpu_write(i,v)     _mpic_cpu_write(mpic,(i),(v))
 #define mpic_irq_read(s,r)      _mpic_irq_read(mpic,(s),(r))
@@ -607,8 +633,6 @@ static int irq_choose_cpu(const struct cpumask *mask)
 }
 #endif
 
-#define mpic_irq_to_hw(virq)    ((unsigned int)irq_map[virq].hwirq)
-
 /* Find an mpic associated with a given linux interrupt */
 static struct mpic *mpic_find(unsigned int irq)
 {
@@ -621,11 +645,18 @@ static struct mpic *mpic_find(unsigned int irq)
 /* Determine if the linux irq is an IPI */
 static unsigned int mpic_is_ipi(struct mpic *mpic, unsigned int irq)
 {
-        unsigned int src = mpic_irq_to_hw(irq);
+        unsigned int src = virq_to_hw(irq);
 
         return (src >= mpic->ipi_vecs[0] && src <= mpic->ipi_vecs[3]);
 }
 
+/* Determine if the linux irq is a timer */
+static unsigned int mpic_is_tm(struct mpic *mpic, unsigned int irq)
+{
+        unsigned int src = virq_to_hw(irq);
+
+        return (src >= mpic->timer_vecs[0] && src <= mpic->timer_vecs[7]);
+}
 
 /* Convert a cpu mask from logical to physical cpu numbers. */
 static inline u32 mpic_physmask(u32 cpumask)
@@ -633,7 +664,7 @@ static inline u32 mpic_physmask(u32 cpumask)
         int i;
         u32 mask = 0;
 
-        for (i = 0; i < NR_CPUS; ++i, cpumask >>= 1)
+        for (i = 0; i < min(32, NR_CPUS); ++i, cpumask >>= 1)
                 mask |= (cpumask & 1) << get_hard_smp_processor_id(i);
         return mask;
 }
@@ -674,7 +705,7 @@ void mpic_unmask_irq(struct irq_data *d)
 {
         unsigned int loops = 100000;
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
         DBG("%p: %s: enable_irq: %d (src %d)\n", mpic, mpic->name, d->irq, src);
 
@@ -695,7 +726,7 @@ void mpic_mask_irq(struct irq_data *d)
 {
         unsigned int loops = 100000;
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
         DBG("%s: disable_irq: %d (src %d)\n", mpic->name, d->irq, src);
 
@@ -733,7 +764,7 @@ void mpic_end_irq(struct irq_data *d)
 static void mpic_unmask_ht_irq(struct irq_data *d)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
         mpic_unmask_irq(d);
 
@@ -744,7 +775,7 @@ static void mpic_unmask_ht_irq(struct irq_data *d)
 static unsigned int mpic_startup_ht_irq(struct irq_data *d)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
         mpic_unmask_irq(d);
         mpic_startup_ht_interrupt(mpic, src, irqd_is_level_type(d));
@@ -755,7 +786,7 @@ static unsigned int mpic_startup_ht_irq(struct irq_data *d)
 static void mpic_shutdown_ht_irq(struct irq_data *d)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
         mpic_shutdown_ht_interrupt(mpic, src);
         mpic_mask_irq(d);
@@ -764,7 +795,7 @@ static void mpic_shutdown_ht_irq(struct irq_data *d)
 static void mpic_end_ht_irq(struct irq_data *d)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
 #ifdef DEBUG_IRQ
         DBG("%s: end_irq: %d\n", mpic->name, d->irq);
@@ -785,7 +816,7 @@ static void mpic_end_ht_irq(struct irq_data *d)
 static void mpic_unmask_ipi(struct irq_data *d)
 {
         struct mpic *mpic = mpic_from_ipi(d);
-        unsigned int src = mpic_irq_to_hw(d->irq) - mpic->ipi_vecs[0];
+        unsigned int src = virq_to_hw(d->irq) - mpic->ipi_vecs[0];
 
         DBG("%s: enable_ipi: %d (ipi %d)\n", mpic->name, d->irq, src);
         mpic_ipi_write(src, mpic_ipi_read(src) & ~MPIC_VECPRI_MASK);
@@ -812,27 +843,42 @@ static void mpic_end_ipi(struct irq_data *d)
 
 #endif /* CONFIG_SMP */
 
+static void mpic_unmask_tm(struct irq_data *d)
+{
+        struct mpic *mpic = mpic_from_irq_data(d);
+        unsigned int src = virq_to_hw(d->irq) - mpic->timer_vecs[0];
+
+        DBG("%s: enable_tm: %d (tm %d)\n", mpic->name, irq, src);
+        mpic_tm_write(src, mpic_tm_read(src) & ~MPIC_VECPRI_MASK);
+        mpic_tm_read(src);
+}
+
+static void mpic_mask_tm(struct irq_data *d)
+{
+        struct mpic *mpic = mpic_from_irq_data(d);
+        unsigned int src = virq_to_hw(d->irq) - mpic->timer_vecs[0];
+
+        mpic_tm_write(src, mpic_tm_read(src) | MPIC_VECPRI_MASK);
+        mpic_tm_read(src);
+}
+
 int mpic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,
                       bool force)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
 
         if (mpic->flags & MPIC_SINGLE_DEST_CPU) {
                 int cpuid = irq_choose_cpu(cpumask);
 
                 mpic_irq_write(src, MPIC_INFO(IRQ_DESTINATION), 1 << cpuid);
         } else {
-                cpumask_var_t tmp;
-
-                alloc_cpumask_var(&tmp, GFP_KERNEL);
+                u32 mask = cpumask_bits(cpumask)[0];
 
-                cpumask_and(tmp, cpumask, cpu_online_mask);
+                mask &= cpumask_bits(cpu_online_mask)[0];
 
                 mpic_irq_write(src, MPIC_INFO(IRQ_DESTINATION),
-                               mpic_physmask(cpumask_bits(tmp)[0]));
-
-                free_cpumask_var(tmp);
+                               mpic_physmask(mask));
         }
 
         return 0;
@@ -862,7 +908,7 @@ static unsigned int mpic_type_to_vecpri(struct mpic *mpic, unsigned int type)
 int mpic_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
-        unsigned int src = mpic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned int vecpri, vold, vnew;
 
         DBG("mpic: set_irq_type(mpic:@%p,virq:%d,src:0x%x,type:0x%x)\n",
@@ -898,7 +944,7 @@ int mpic_set_irq_type(struct irq_data *d, unsigned int flow_type)
 void mpic_set_vector(unsigned int virq, unsigned int vector)
 {
         struct mpic *mpic = mpic_from_irq(virq);
-        unsigned int src = mpic_irq_to_hw(virq);
+        unsigned int src = virq_to_hw(virq);
         unsigned int vecpri;
 
         DBG("mpic: set_vector(mpic:@%p,virq:%d,src:%d,vector:0x%x)\n",
@@ -916,7 +962,7 @@ void mpic_set_vector(unsigned int virq, unsigned int vector)
 void mpic_set_destination(unsigned int virq, unsigned int cpuid)
 {
         struct mpic *mpic = mpic_from_irq(virq);
-        unsigned int src = mpic_irq_to_hw(virq);
+        unsigned int src = virq_to_hw(virq);
 
         DBG("mpic: set_destination(mpic:@%p,virq:%d,src:%d,cpuid:0x%x)\n",
             mpic, virq, src, cpuid);
@@ -942,6 +988,12 @@ static struct irq_chip mpic_ipi_chip = {
 };
 #endif /* CONFIG_SMP */
 
+static struct irq_chip mpic_tm_chip = {
+        .irq_mask       = mpic_mask_tm,
+        .irq_unmask     = mpic_unmask_tm,
+        .irq_eoi        = mpic_end_irq,
+};
+
 #ifdef CONFIG_MPIC_U3_HT_IRQS
 static struct irq_chip mpic_irq_ht_chip = {
         .irq_startup    = mpic_startup_ht_irq,
@@ -985,6 +1037,16 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq,
         }
 #endif /* CONFIG_SMP */
 
+        if (hw >= mpic->timer_vecs[0] && hw <= mpic->timer_vecs[7]) {
+                WARN_ON(!(mpic->flags & MPIC_PRIMARY));
+
+                DBG("mpic: mapping as timer\n");
+                irq_set_chip_data(virq, mpic);
+                irq_set_chip_and_handler(virq, &mpic->hc_tm,
+                                         handle_fasteoi_irq);
+                return 0;
+        }
+
         if (hw >= mpic->irq_count)
                 return -EINVAL;
 
@@ -1025,6 +1087,7 @@ static int mpic_host_xlate(struct irq_host *h, struct device_node *ct,
                            irq_hw_number_t *out_hwirq, unsigned int *out_flags)
 
 {
+        struct mpic *mpic = h->host_data;
         static unsigned char map_mpic_senses[4] = {
                 IRQ_TYPE_EDGE_RISING,
                 IRQ_TYPE_LEVEL_LOW,
@@ -1033,7 +1096,38 @@ static int mpic_host_xlate(struct irq_host *h, struct device_node *ct,
         };
 
         *out_hwirq = intspec[0];
-        if (intsize > 1) {
+        if (intsize >= 4 && (mpic->flags & MPIC_FSL)) {
+                /*
+                 * Freescale MPIC with extended intspec:
+                 * First two cells are as usual.  Third specifies
+                 * an "interrupt type".  Fourth is type-specific data.
+                 *
+                 * See Documentation/devicetree/bindings/powerpc/fsl/mpic.txt
+                 */
+                switch (intspec[2]) {
+                case 0:
+                case 1: /* no EISR/EIMR support for now, treat as shared IRQ */
+                        break;
+                case 2:
+                        if (intspec[0] >= ARRAY_SIZE(mpic->ipi_vecs))
+                                return -EINVAL;
+
+                        *out_hwirq = mpic->ipi_vecs[intspec[0]];
+                        break;
+                case 3:
+                        if (intspec[0] >= ARRAY_SIZE(mpic->timer_vecs))
+                                return -EINVAL;
+
+                        *out_hwirq = mpic->timer_vecs[intspec[0]];
+                        break;
+                default:
+                        pr_debug("%s: unknown irq type %u\n",
+                                 __func__, intspec[2]);
+                        return -EINVAL;
+                }
+
+                *out_flags = map_mpic_senses[intspec[1] & 3];
+        } else if (intsize > 1) {
                 u32 mask = 0x3;
 
                 /* Apple invented a new race of encoding on machines with
@@ -1109,6 +1203,9 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         mpic->hc_ipi.name = name;
 #endif /* CONFIG_SMP */
 
+        mpic->hc_tm = mpic_tm_chip;
+        mpic->hc_tm.name = name;
+
         mpic->flags = flags;
         mpic->isu_size = isu_size;
         mpic->irq_count = irq_count;
@@ -1119,10 +1216,14 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         else
                 intvec_top = 255;
 
-        mpic->timer_vecs[0] = intvec_top - 8;
-        mpic->timer_vecs[1] = intvec_top - 7;
-        mpic->timer_vecs[2] = intvec_top - 6;
-        mpic->timer_vecs[3] = intvec_top - 5;
+        mpic->timer_vecs[0] = intvec_top - 12;
+        mpic->timer_vecs[1] = intvec_top - 11;
+        mpic->timer_vecs[2] = intvec_top - 10;
+        mpic->timer_vecs[3] = intvec_top - 9;
+        mpic->timer_vecs[4] = intvec_top - 8;
+        mpic->timer_vecs[5] = intvec_top - 7;
+        mpic->timer_vecs[6] = intvec_top - 6;
+        mpic->timer_vecs[7] = intvec_top - 5;
         mpic->ipi_vecs[0]   = intvec_top - 4;
         mpic->ipi_vecs[1]   = intvec_top - 3;
         mpic->ipi_vecs[2]   = intvec_top - 2;
@@ -1132,6 +1233,8 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         /* Check for "big-endian" in device-tree */
         if (node && of_get_property(node, "big-endian", NULL) != NULL)
                 mpic->flags |= MPIC_BIG_ENDIAN;
+        if (node && of_device_is_compatible(node, "fsl,mpic"))
+                mpic->flags |= MPIC_FSL;
 
         /* Look for protected sources */
         if (node) {
@@ -1323,15 +1426,17 @@ void __init mpic_init(struct mpic *mpic)
         /* Set current processor priority to max */
         mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), 0xf);
 
-        /* Initialize timers: just disable them all */
+        /* Initialize timers to our reserved vectors and mask them for now */
         for (i = 0; i < 4; i++) {
                 mpic_write(mpic->tmregs,
                            i * MPIC_INFO(TIMER_STRIDE) +
-                           MPIC_INFO(TIMER_DESTINATION), 0);
+                           MPIC_INFO(TIMER_DESTINATION),
+                           1 << hard_smp_processor_id());
                 mpic_write(mpic->tmregs,
                            i * MPIC_INFO(TIMER_STRIDE) +
                            MPIC_INFO(TIMER_VECTOR_PRI),
                            MPIC_VECPRI_MASK |
+                           (9 << MPIC_VECPRI_PRIORITY_SHIFT) |
                            (mpic->timer_vecs[0] + i));
         }
 
@@ -1427,7 +1532,7 @@ void __init mpic_set_serial_int(struct mpic *mpic, int enable)
 void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
 {
         struct mpic *mpic = mpic_find(irq);
-        unsigned int src = mpic_irq_to_hw(irq);
+        unsigned int src = virq_to_hw(irq);
         unsigned long flags;
         u32 reg;
 
@@ -1440,6 +1545,11 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
                         ~MPIC_VECPRI_PRIORITY_MASK;
                 mpic_ipi_write(src - mpic->ipi_vecs[0],
                                reg | (pri << MPIC_VECPRI_PRIORITY_SHIFT));
+        } else if (mpic_is_tm(mpic, irq)) {
+                reg = mpic_tm_read(src - mpic->timer_vecs[0]) &
+                        ~MPIC_VECPRI_PRIORITY_MASK;
+                mpic_tm_write(src - mpic->timer_vecs[0],
+                              reg | (pri << MPIC_VECPRI_PRIORITY_SHIFT));
         } else {
                 reg = mpic_irq_read(src, MPIC_INFO(IRQ_VECTOR_PRI))
                         & ~MPIC_VECPRI_PRIORITY_MASK;
@@ -1619,46 +1729,28 @@ void mpic_request_ipis(void)
         }
 }
 
-static void mpic_send_ipi(unsigned int ipi_no, const struct cpumask *cpu_mask)
+void smp_mpic_message_pass(int cpu, int msg)
 {
         struct mpic *mpic = mpic_primary;
+        u32 physmask;
 
         BUG_ON(mpic == NULL);
 
-#ifdef DEBUG_IPI
-        DBG("%s: send_ipi(ipi_no: %d)\n", mpic->name, ipi_no);
-#endif
-
-        mpic_cpu_write(MPIC_INFO(CPU_IPI_DISPATCH_0) +
-                       ipi_no * MPIC_INFO(CPU_IPI_DISPATCH_STRIDE),
-                       mpic_physmask(cpumask_bits(cpu_mask)[0]));
-}
-
-void smp_mpic_message_pass(int target, int msg)
-{
-        cpumask_var_t tmp;
-
         /* make sure we're sending something that translates to an IPI */
         if ((unsigned int)msg > 3) {
                 printk("SMP %d: smp_message_pass: unknown msg %d\n",
                        smp_processor_id(), msg);
                 return;
         }
-        switch (target) {
-        case MSG_ALL:
-                mpic_send_ipi(msg, cpu_online_mask);
-                break;
-        case MSG_ALL_BUT_SELF:
-                alloc_cpumask_var(&tmp, GFP_NOWAIT);
-                cpumask_andnot(tmp, cpu_online_mask,
-                               cpumask_of(smp_processor_id()));
-                mpic_send_ipi(msg, tmp);
-                free_cpumask_var(tmp);
-                break;
-        default:
-                mpic_send_ipi(msg, cpumask_of(target));
-                break;
-        }
+
+#ifdef DEBUG_IPI
+        DBG("%s: send_ipi(ipi_no: %d)\n", mpic->name, msg);
+#endif
+
+        physmask = 1 << get_hard_smp_processor_id(cpu);
+
+        mpic_cpu_write(MPIC_INFO(CPU_IPI_DISPATCH_0) +
+                       msg * MPIC_INFO(CPU_IPI_DISPATCH_STRIDE), physmask);
 }
 
 int __init smp_mpic_probe(void)
@@ -1702,9 +1794,8 @@ void mpic_reset_core(int cpu)
 #endif /* CONFIG_SMP */
 
 #ifdef CONFIG_PM
-static int mpic_suspend(struct sys_device *dev, pm_message_t state)
+static void mpic_suspend_one(struct mpic *mpic)
 {
-        struct mpic *mpic = container_of(dev, struct mpic, sysdev);
         int i;
 
         for (i = 0; i < mpic->num_sources; i++) {
@@ -1713,13 +1804,22 @@ static int mpic_suspend(struct sys_device *dev, pm_message_t state)
                 mpic->save_data[i].dest =
                         mpic_irq_read(i, MPIC_INFO(IRQ_DESTINATION));
         }
+}
+
+static int mpic_suspend(void)
+{
+        struct mpic *mpic = mpics;
+
+        while (mpic) {
+                mpic_suspend_one(mpic);
+                mpic = mpic->next;
+        }
 
         return 0;
 }
 
-static int mpic_resume(struct sys_device *dev)
+static void mpic_resume_one(struct mpic *mpic)
 {
-        struct mpic *mpic = container_of(dev, struct mpic, sysdev);
         int i;
 
         for (i = 0; i < mpic->num_sources; i++) {
@@ -1746,33 +1846,28 @@ static int mpic_resume(struct sys_device *dev)
         }
 #endif
         } /* end for loop */
+}
 
-        return 0;
+static void mpic_resume(void)
+{
+        struct mpic *mpic = mpics;
+
+        while (mpic) {
+                mpic_resume_one(mpic);
+                mpic = mpic->next;
+        }
 }
-#endif
 
-static struct sysdev_class mpic_sysclass = {
-#ifdef CONFIG_PM
+static struct syscore_ops mpic_syscore_ops = {
         .resume = mpic_resume,
         .suspend = mpic_suspend,
-#endif
-        .name = "mpic",
 };
 
 static int mpic_init_sys(void)
 {
-        struct mpic *mpic = mpics;
-        int error, id = 0;
-
-        error = sysdev_class_register(&mpic_sysclass);
-
-        while (mpic && !error) {
-                mpic->sysdev.cls = &mpic_sysclass;
-                mpic->sysdev.id = id++;
-                error = sysdev_register(&mpic->sysdev);
-                mpic = mpic->next;
-        }
-        return error;
+        register_syscore_ops(&mpic_syscore_ops);
+        return 0;
 }
 
 device_initcall(mpic_init_sys);
+#endif
diff --git a/arch/powerpc/sysdev/mv64x60_pic.c b/arch/powerpc/sysdev/mv64x60_pic.c
index e9c633c7c083..14d130268e7a 100644
--- a/arch/powerpc/sysdev/mv64x60_pic.c
+++ b/arch/powerpc/sysdev/mv64x60_pic.c
@@ -78,7 +78,7 @@ static struct irq_host *mv64x60_irq_host;
 
 static void mv64x60_mask_low(struct irq_data *d)
 {
-        int level2 = irq_map[d->irq].hwirq & MV64x60_LEVEL2_MASK;
+        int level2 = irqd_to_hwirq(d) & MV64x60_LEVEL2_MASK;
         unsigned long flags;
 
         spin_lock_irqsave(&mv64x60_lock, flags);
@@ -91,7 +91,7 @@ static void mv64x60_mask_low(struct irq_data *d)
 
 static void mv64x60_unmask_low(struct irq_data *d)
 {
-        int level2 = irq_map[d->irq].hwirq & MV64x60_LEVEL2_MASK;
+        int level2 = irqd_to_hwirq(d) & MV64x60_LEVEL2_MASK;
         unsigned long flags;
 
         spin_lock_irqsave(&mv64x60_lock, flags);
@@ -115,7 +115,7 @@ static struct irq_chip mv64x60_chip_low = {
 
 static void mv64x60_mask_high(struct irq_data *d)
 {
-        int level2 = irq_map[d->irq].hwirq & MV64x60_LEVEL2_MASK;
+        int level2 = irqd_to_hwirq(d) & MV64x60_LEVEL2_MASK;
         unsigned long flags;
 
         spin_lock_irqsave(&mv64x60_lock, flags);
@@ -128,7 +128,7 @@ static void mv64x60_mask_high(struct irq_data *d)
 
 static void mv64x60_unmask_high(struct irq_data *d)
 {
-        int level2 = irq_map[d->irq].hwirq & MV64x60_LEVEL2_MASK;
+        int level2 = irqd_to_hwirq(d) & MV64x60_LEVEL2_MASK;
         unsigned long flags;
 
         spin_lock_irqsave(&mv64x60_lock, flags);
@@ -152,7 +152,7 @@ static struct irq_chip mv64x60_chip_high = {
 
 static void mv64x60_mask_gpp(struct irq_data *d)
 {
-        int level2 = irq_map[d->irq].hwirq & MV64x60_LEVEL2_MASK;
+        int level2 = irqd_to_hwirq(d) & MV64x60_LEVEL2_MASK;
         unsigned long flags;
 
         spin_lock_irqsave(&mv64x60_lock, flags);
@@ -165,7 +165,7 @@ static void mv64x60_mask_gpp(struct irq_data *d)
 
 static void mv64x60_mask_ack_gpp(struct irq_data *d)
 {
-        int level2 = irq_map[d->irq].hwirq & MV64x60_LEVEL2_MASK;
+        int level2 = irqd_to_hwirq(d) & MV64x60_LEVEL2_MASK;
         unsigned long flags;
 
         spin_lock_irqsave(&mv64x60_lock, flags);
@@ -180,7 +180,7 @@ static void mv64x60_mask_ack_gpp(struct irq_data *d)
 
 static void mv64x60_unmask_gpp(struct irq_data *d)
 {
-        int level2 = irq_map[d->irq].hwirq & MV64x60_LEVEL2_MASK;
+        int level2 = irqd_to_hwirq(d) & MV64x60_LEVEL2_MASK;
         unsigned long flags;
 
         spin_lock_irqsave(&mv64x60_lock, flags);
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c
index 832d6924ad1c..b2acda07220d 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -197,12 +197,10 @@ static inline struct qe_ic *qe_ic_from_irq_data(struct irq_data *d)
         return irq_data_get_irq_chip_data(d);
 }
 
-#define virq_to_hw(virq)        ((unsigned int)irq_map[virq].hwirq)
-
 static void qe_ic_unmask_irq(struct irq_data *d)
 {
         struct qe_ic *qe_ic = qe_ic_from_irq_data(d);
-        unsigned int src = virq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 temp;
 
@@ -218,7 +216,7 @@ static void qe_ic_unmask_irq(struct irq_data *d)
 static void qe_ic_mask_irq(struct irq_data *d)
 {
         struct qe_ic *qe_ic = qe_ic_from_irq_data(d);
-        unsigned int src = virq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 temp;
 
diff --git a/arch/powerpc/sysdev/scom.c b/arch/powerpc/sysdev/scom.c
new file mode 100644
index 000000000000..b2593ce30c9b
--- /dev/null
+++ b/arch/powerpc/sysdev/scom.c
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2010 Benjamin Herrenschmidt, IBM Corp
+ *                <benh@kernel.crashing.org>
+ *     and        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; 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/kernel.h>
+#include <linux/debugfs.h>
+#include <linux/slab.h>
+#include <asm/prom.h>
+#include <asm/scom.h>
+
+const struct scom_controller *scom_controller;
+EXPORT_SYMBOL_GPL(scom_controller);
+
+struct device_node *scom_find_parent(struct device_node *node)
+{
+        struct device_node *par, *tmp;
+        const u32 *p;
+
+        for (par = of_node_get(node); par;) {
+                if (of_get_property(par, "scom-controller", NULL))
+                        break;
+                p = of_get_property(par, "scom-parent", NULL);
+                tmp = par;
+                if (p == NULL)
+                        par = of_get_parent(par);
+                else
+                        par = of_find_node_by_phandle(*p);
+                of_node_put(tmp);
+        }
+        return par;
+}
+EXPORT_SYMBOL_GPL(scom_find_parent);
+
+scom_map_t scom_map_device(struct device_node *dev, int index)
+{
+        struct device_node *parent;
+        unsigned int cells, size;
+        const u32 *prop;
+        u64 reg, cnt;
+        scom_map_t ret;
+
+        parent = scom_find_parent(dev);
+
+        if (parent == NULL)
+                return 0;
+
+        prop = of_get_property(parent, "#scom-cells", NULL);
+        cells = prop ? *prop : 1;
+
+        prop = of_get_property(dev, "scom-reg", &size);
+        if (!prop)
+                return 0;
+        size >>= 2;
+
+        if (index >= (size / (2*cells)))
+                return 0;
+
+        reg = of_read_number(&prop[index * cells * 2], cells);
+        cnt = of_read_number(&prop[index * cells * 2 + cells], cells);
+
+        ret = scom_map(parent, reg, cnt);
+        of_node_put(parent);
+
+        return ret;
+}
+EXPORT_SYMBOL_GPL(scom_map_device);
+
+#ifdef CONFIG_SCOM_DEBUGFS
+struct scom_debug_entry {
+        struct device_node *dn;
+        unsigned long addr;
+        scom_map_t map;
+        spinlock_t lock;
+        char name[8];
+        struct debugfs_blob_wrapper blob;
+};
+
+static int scom_addr_set(void *data, u64 val)
+{
+        struct scom_debug_entry *ent = data;
+
+        ent->addr = 0;
+        scom_unmap(ent->map);
+
+        ent->map = scom_map(ent->dn, val, 1);
+        if (scom_map_ok(ent->map))
+                ent->addr = val;
+        else
+                return -EFAULT;
+
+        return 0;
+}
+
+static int scom_addr_get(void *data, u64 *val)
+{
+        struct scom_debug_entry *ent = data;
+        *val = ent->addr;
+        return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(scom_addr_fops, scom_addr_get, scom_addr_set,
+                        "0x%llx\n");
+
+static int scom_val_set(void *data, u64 val)
+{
+        struct scom_debug_entry *ent = data;
+
+        if (!scom_map_ok(ent->map))
+                return -EFAULT;
+
+        scom_write(ent->map, 0, val);
+
+        return 0;
+}
+
+static int scom_val_get(void *data, u64 *val)
+{
+        struct scom_debug_entry *ent = data;
+
+        if (!scom_map_ok(ent->map))
+                return -EFAULT;
+
+        *val = scom_read(ent->map, 0);
+        return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(scom_val_fops, scom_val_get, scom_val_set,
+                        "0x%llx\n");
+
+static int scom_debug_init_one(struct dentry *root, struct device_node *dn,
+                               int i)
+{
+        struct scom_debug_entry *ent;
+        struct dentry *dir;
+
+        ent = kzalloc(sizeof(*ent), GFP_KERNEL);
+        if (!ent)
+                return -ENOMEM;
+
+        ent->dn = of_node_get(dn);
+        ent->map = SCOM_MAP_INVALID;
+        spin_lock_init(&ent->lock);
+        snprintf(ent->name, 8, "scom%d", i);
+        ent->blob.data = dn->full_name;
+        ent->blob.size = strlen(dn->full_name);
+
+        dir = debugfs_create_dir(ent->name, root);
+        if (!dir) {
+                of_node_put(dn);
+                kfree(ent);
+                return -1;
+        }
+
+        debugfs_create_file("addr", 0600, dir, ent, &scom_addr_fops);
+        debugfs_create_file("value", 0600, dir, ent, &scom_val_fops);
+        debugfs_create_blob("path", 0400, dir, &ent->blob);
+
+        return 0;
+}
+
+static int scom_debug_init(void)
+{
+        struct device_node *dn;
+        struct dentry *root;
+        int i, rc;
+
+        root = debugfs_create_dir("scom", powerpc_debugfs_root);
+        if (!root)
+                return -1;
+
+        i = rc = 0;
+        for_each_node_with_property(dn, "scom-controller")
+                rc |= scom_debug_init_one(root, dn, i++);
+
+        return rc;
+}
+device_initcall(scom_debug_init);
+#endif /* CONFIG_SCOM_DEBUGFS */
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index 5d9138516628..984cd2029158 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -41,8 +41,6 @@
 #define UIC_VR          0x7
 #define UIC_VCR         0x8
 
-#define uic_irq_to_hw(virq)     (irq_map[virq].hwirq)
-
 struct uic *primary_uic;
 
 struct uic {
@@ -58,7 +56,7 @@ struct uic {
 static void uic_unmask_irq(struct irq_data *d)
 {
         struct uic *uic = irq_data_get_irq_chip_data(d);
-        unsigned int src = uic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 er, sr;
 
@@ -76,7 +74,7 @@ static void uic_unmask_irq(struct irq_data *d)
 static void uic_mask_irq(struct irq_data *d)
 {
         struct uic *uic = irq_data_get_irq_chip_data(d);
-        unsigned int src = uic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 er;
 
@@ -90,7 +88,7 @@ static void uic_mask_irq(struct irq_data *d)
 static void uic_ack_irq(struct irq_data *d)
 {
         struct uic *uic = irq_data_get_irq_chip_data(d);
-        unsigned int src = uic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
 
         spin_lock_irqsave(&uic->lock, flags);
@@ -101,7 +99,7 @@ static void uic_ack_irq(struct irq_data *d)
 static void uic_mask_ack_irq(struct irq_data *d)
 {
         struct uic *uic = irq_data_get_irq_chip_data(d);
-        unsigned int src = uic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         u32 er, sr;
 
@@ -126,7 +124,7 @@ static void uic_mask_ack_irq(struct irq_data *d)
 static int uic_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
         struct uic *uic = irq_data_get_irq_chip_data(d);
-        unsigned int src = uic_irq_to_hw(d->irq);
+        unsigned int src = irqd_to_hwirq(d);
         unsigned long flags;
         int trigger, polarity;
         u32 tr, pr, mask;
diff --git a/arch/powerpc/sysdev/xics/Kconfig b/arch/powerpc/sysdev/xics/Kconfig
new file mode 100644
index 000000000000..0031eda320c3
--- /dev/null
+++ b/arch/powerpc/sysdev/xics/Kconfig
@@ -0,0 +1,13 @@
+config PPC_XICS
+       def_bool n
+       select PPC_SMP_MUXED_IPI
+
+config PPC_ICP_NATIVE
+       def_bool n
+
+config PPC_ICP_HV
+       def_bool n
+
+config PPC_ICS_RTAS
+       def_bool n
+
diff --git a/arch/powerpc/sysdev/xics/Makefile b/arch/powerpc/sysdev/xics/Makefile
new file mode 100644
index 000000000000..b75a6059337f
--- /dev/null
+++ b/arch/powerpc/sysdev/xics/Makefile
@@ -0,0 +1,6 @@
+subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror
+
+obj-y                           += xics-common.o
+obj-$(CONFIG_PPC_ICP_NATIVE)    += icp-native.o
+obj-$(CONFIG_PPC_ICP_HV)        += icp-hv.o
+obj-$(CONFIG_PPC_ICS_RTAS)      += ics-rtas.o
diff --git a/arch/powerpc/sysdev/xics/icp-hv.c b/arch/powerpc/sysdev/xics/icp-hv.c
new file mode 100644
index 000000000000..9518d367a64f
--- /dev/null
+++ b/arch/powerpc/sysdev/xics/icp-hv.c
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2011 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/types.h>
+#include <linux/kernel.h>
+#include <linux/irq.h>
+#include <linux/smp.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/cpu.h>
+#include <linux/of.h>
+
+#include <asm/smp.h>
+#include <asm/irq.h>
+#include <asm/errno.h>
+#include <asm/xics.h>
+#include <asm/io.h>
+#include <asm/hvcall.h>
+
+static inline unsigned int icp_hv_get_xirr(unsigned char cppr)
+{
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
+        long rc;
+
+        rc = plpar_hcall(H_XIRR, retbuf, cppr);
+        if (rc != H_SUCCESS)
+                panic(" bad return code xirr - rc = %lx\n", rc);
+        return (unsigned int)retbuf[0];
+}
+
+static inline void icp_hv_set_xirr(unsigned int value)
+{
+        long rc = plpar_hcall_norets(H_EOI, value);
+        if (rc != H_SUCCESS)
+                panic("bad return code EOI - rc = %ld, value=%x\n", rc, value);
+}
+
+static inline void icp_hv_set_cppr(u8 value)
+{
+        long rc = plpar_hcall_norets(H_CPPR, value);
+        if (rc != H_SUCCESS)
+                panic("bad return code cppr - rc = %lx\n", rc);
+}
+
+static inline void icp_hv_set_qirr(int n_cpu , u8 value)
+{
+        long rc = plpar_hcall_norets(H_IPI, get_hard_smp_processor_id(n_cpu),
+                                     value);
+        if (rc != H_SUCCESS)
+                panic("bad return code qirr - rc = %lx\n", rc);
+}
+
+static void icp_hv_eoi(struct irq_data *d)
+{
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
+
+        iosync();
+        icp_hv_set_xirr((xics_pop_cppr() << 24) | hw_irq);
+}
+
+static void icp_hv_teardown_cpu(void)
+{
+        int cpu = smp_processor_id();
+
+        /* Clear any pending IPI */
+        icp_hv_set_qirr(cpu, 0xff);
+}
+
+static void icp_hv_flush_ipi(void)
+{
+        /* We take the ipi irq but and never return so we
+         * need to EOI the IPI, but want to leave our priority 0
+         *
+         * should we check all the other interrupts too?
+         * should we be flagging idle loop instead?
+         * or creating some task to be scheduled?
+         */
+
+        icp_hv_set_xirr((0x00 << 24) | XICS_IPI);
+}
+
+static unsigned int icp_hv_get_irq(void)
+{
+        unsigned int xirr = icp_hv_get_xirr(xics_cppr_top());
+        unsigned int vec = xirr & 0x00ffffff;
+        unsigned int irq;
+
+        if (vec == XICS_IRQ_SPURIOUS)
+                return NO_IRQ;
+
+        irq = irq_radix_revmap_lookup(xics_host, vec);
+        if (likely(irq != NO_IRQ)) {
+                xics_push_cppr(vec);
+                return irq;
+        }
+
+        /* We don't have a linux mapping, so have rtas mask it. */
+        xics_mask_unknown_vec(vec);
+
+        /* We might learn about it later, so EOI it */
+        icp_hv_set_xirr(xirr);
+
+        return NO_IRQ;
+}
+
+static void icp_hv_set_cpu_priority(unsigned char cppr)
+{
+        xics_set_base_cppr(cppr);
+        icp_hv_set_cppr(cppr);
+        iosync();
+}
+
+#ifdef CONFIG_SMP
+
+static void icp_hv_cause_ipi(int cpu, unsigned long data)
+{
+        icp_hv_set_qirr(cpu, IPI_PRIORITY);
+}
+
+static irqreturn_t icp_hv_ipi_action(int irq, void *dev_id)
+{
+        int cpu = smp_processor_id();
+
+        icp_hv_set_qirr(cpu, 0xff);
+
+        return smp_ipi_demux();
+}
+
+#endif /* CONFIG_SMP */
+
+static const struct icp_ops icp_hv_ops = {
+        .get_irq        = icp_hv_get_irq,
+        .eoi            = icp_hv_eoi,
+        .set_priority   = icp_hv_set_cpu_priority,
+        .teardown_cpu   = icp_hv_teardown_cpu,
+        .flush_ipi      = icp_hv_flush_ipi,
+#ifdef CONFIG_SMP
+        .ipi_action     = icp_hv_ipi_action,
+        .cause_ipi      = icp_hv_cause_ipi,
+#endif
+};
+
+int icp_hv_init(void)
+{
+        struct device_node *np;
+
+        np = of_find_compatible_node(NULL, NULL, "ibm,ppc-xicp");
+        if (!np)
+                np = of_find_node_by_type(NULL,
+                                    "PowerPC-External-Interrupt-Presentation");
+        if (!np)
+                return -ENODEV;
+
+        icp_ops = &icp_hv_ops;
+
+        return 0;
+}
+
diff --git a/arch/powerpc/sysdev/xics/icp-native.c b/arch/powerpc/sysdev/xics/icp-native.c
new file mode 100644
index 000000000000..1f15ad436140
--- /dev/null
+++ b/arch/powerpc/sysdev/xics/icp-native.c
@@ -0,0 +1,293 @@
+/*
+ * Copyright 2011 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/types.h>
+#include <linux/kernel.h>
+#include <linux/irq.h>
+#include <linux/smp.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/cpu.h>
+#include <linux/of.h>
+#include <linux/spinlock.h>
+
+#include <asm/prom.h>
+#include <asm/io.h>
+#include <asm/smp.h>
+#include <asm/irq.h>
+#include <asm/errno.h>
+#include <asm/xics.h>
+
+struct icp_ipl {
+        union {
+                u32 word;
+                u8 bytes[4];
+        } xirr_poll;
+        union {
+                u32 word;
+                u8 bytes[4];
+        } xirr;
+        u32 dummy;
+        union {
+                u32 word;
+                u8 bytes[4];
+        } qirr;
+        u32 link_a;
+        u32 link_b;
+        u32 link_c;
+};
+
+static struct icp_ipl __iomem *icp_native_regs[NR_CPUS];
+
+static inline unsigned int icp_native_get_xirr(void)
+{
+        int cpu = smp_processor_id();
+
+        return in_be32(&icp_native_regs[cpu]->xirr.word);
+}
+
+static inline void icp_native_set_xirr(unsigned int value)
+{
+        int cpu = smp_processor_id();
+
+        out_be32(&icp_native_regs[cpu]->xirr.word, value);
+}
+
+static inline void icp_native_set_cppr(u8 value)
+{
+        int cpu = smp_processor_id();
+
+        out_8(&icp_native_regs[cpu]->xirr.bytes[0], value);
+}
+
+static inline void icp_native_set_qirr(int n_cpu, u8 value)
+{
+        out_8(&icp_native_regs[n_cpu]->qirr.bytes[0], value);
+}
+
+static void icp_native_set_cpu_priority(unsigned char cppr)
+{
+        xics_set_base_cppr(cppr);
+        icp_native_set_cppr(cppr);
+        iosync();
+}
+
+static void icp_native_eoi(struct irq_data *d)
+{
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
+
+        iosync();
+        icp_native_set_xirr((xics_pop_cppr() << 24) | hw_irq);
+}
+
+static void icp_native_teardown_cpu(void)
+{
+        int cpu = smp_processor_id();
+
+        /* Clear any pending IPI */
+        icp_native_set_qirr(cpu, 0xff);
+}
+
+static void icp_native_flush_ipi(void)
+{
+        /* We take the ipi irq but and never return so we
+         * need to EOI the IPI, but want to leave our priority 0
+         *
+         * should we check all the other interrupts too?
+         * should we be flagging idle loop instead?
+         * or creating some task to be scheduled?
+         */
+
+        icp_native_set_xirr((0x00 << 24) | XICS_IPI);
+}
+
+static unsigned int icp_native_get_irq(void)
+{
+        unsigned int xirr = icp_native_get_xirr();
+        unsigned int vec = xirr & 0x00ffffff;
+        unsigned int irq;
+
+        if (vec == XICS_IRQ_SPURIOUS)
+                return NO_IRQ;
+
+        irq = irq_radix_revmap_lookup(xics_host, vec);
+        if (likely(irq != NO_IRQ)) {
+                xics_push_cppr(vec);
+                return irq;
+        }
+
+        /* We don't have a linux mapping, so have rtas mask it. */
+        xics_mask_unknown_vec(vec);
+
+        /* We might learn about it later, so EOI it */
+        icp_native_set_xirr(xirr);
+
+        return NO_IRQ;
+}
+
+#ifdef CONFIG_SMP
+
+static void icp_native_cause_ipi(int cpu, unsigned long data)
+{
+        icp_native_set_qirr(cpu, IPI_PRIORITY);
+}
+
+static irqreturn_t icp_native_ipi_action(int irq, void *dev_id)
+{
+        int cpu = smp_processor_id();
+
+        icp_native_set_qirr(cpu, 0xff);
+
+        return smp_ipi_demux();
+}
+
+#endif /* CONFIG_SMP */
+
+static int __init icp_native_map_one_cpu(int hw_id, unsigned long addr,
+                                         unsigned long size)
+{
+        char *rname;
+        int i, cpu = -1;
+
+        /* This may look gross but it's good enough for now, we don't quite
+         * have a hard -> linux processor id matching.
+         */
+        for_each_possible_cpu(i) {
+                if (!cpu_present(i))
+                        continue;
+                if (hw_id == get_hard_smp_processor_id(i)) {
+                        cpu = i;
+                        break;
+                }
+        }
+
+        /* Fail, skip that CPU. Don't print, it's normal, some XICS come up
+         * with way more entries in there than you have CPUs
+         */
+        if (cpu == -1)
+                return 0;
+
+        rname = kasprintf(GFP_KERNEL, "CPU %d [0x%x] Interrupt Presentation",
+                          cpu, hw_id);
+
+        if (!request_mem_region(addr, size, rname)) {
+                pr_warning("icp_native: Could not reserve ICP MMIO"
+                           " for CPU %d, interrupt server #0x%x\n",
+                           cpu, hw_id);
+                return -EBUSY;
+        }
+
+        icp_native_regs[cpu] = ioremap(addr, size);
+        if (!icp_native_regs[cpu]) {
+                pr_warning("icp_native: Failed ioremap for CPU %d, "
+                           "interrupt server #0x%x, addr %#lx\n",
+                           cpu, hw_id, addr);
+                release_mem_region(addr, size);
+                return -ENOMEM;
+        }
+        return 0;
+}
+
+static int __init icp_native_init_one_node(struct device_node *np,
+                                           unsigned int *indx)
+{
+        unsigned int ilen;
+        const u32 *ireg;
+        int i;
+        int reg_tuple_size;
+        int num_servers = 0;
+
+        /* This code does the theorically broken assumption that the interrupt
+         * server numbers are the same as the hard CPU numbers.
+         * This happens to be the case so far but we are playing with fire...
+         * should be fixed one of these days. -BenH.
+         */
+        ireg = of_get_property(np, "ibm,interrupt-server-ranges", &ilen);
+
+        /* Do that ever happen ? we'll know soon enough... but even good'old
+         * f80 does have that property ..
+         */
+        WARN_ON((ireg == NULL) || (ilen != 2*sizeof(u32)));
+
+        if (ireg) {
+                *indx = of_read_number(ireg, 1);
+                if (ilen >= 2*sizeof(u32))
+                        num_servers = of_read_number(ireg + 1, 1);
+        }
+
+        ireg = of_get_property(np, "reg", &ilen);
+        if (!ireg) {
+                pr_err("icp_native: Can't find interrupt reg property");
+                return -1;
+        }
+
+        reg_tuple_size = (of_n_addr_cells(np) + of_n_size_cells(np)) * 4;
+        if (((ilen % reg_tuple_size) != 0)
+            || (num_servers && (num_servers != (ilen / reg_tuple_size)))) {
+                pr_err("icp_native: ICP reg len (%d) != num servers (%d)",
+                       ilen / reg_tuple_size, num_servers);
+                return -1;
+        }
+
+        for (i = 0; i < (ilen / reg_tuple_size); i++) {
+                struct resource r;
+                int err;
+
+                err = of_address_to_resource(np, i, &r);
+                if (err) {
+                        pr_err("icp_native: Could not translate ICP MMIO"
+                               " for interrupt server 0x%x (%d)\n", *indx, err);
+                        return -1;
+                }
+
+                if (icp_native_map_one_cpu(*indx, r.start, r.end - r.start))
+                        return -1;
+
+                (*indx)++;
+        }
+        return 0;
+}
+
+static const struct icp_ops icp_native_ops = {
+        .get_irq        = icp_native_get_irq,
+        .eoi            = icp_native_eoi,
+        .set_priority   = icp_native_set_cpu_priority,
+        .teardown_cpu   = icp_native_teardown_cpu,
+        .flush_ipi      = icp_native_flush_ipi,
+#ifdef CONFIG_SMP
+        .ipi_action     = icp_native_ipi_action,
+        .cause_ipi      = icp_native_cause_ipi,
+#endif
+};
+
+int icp_native_init(void)
+{
+        struct device_node *np;
+        u32 indx = 0;
+        int found = 0;
+
+        for_each_compatible_node(np, NULL, "ibm,ppc-xicp")
+                if (icp_native_init_one_node(np, &indx) == 0)
+                        found = 1;
+        if (!found) {
+                for_each_node_by_type(np,
+                        "PowerPC-External-Interrupt-Presentation") {
+                                if (icp_native_init_one_node(np, &indx) == 0)
+                                        found = 1;
+                }
+        }
+
+        if (found == 0)
+                return -ENODEV;
+
+        icp_ops = &icp_native_ops;
+
+        return 0;
+}
diff --git a/arch/powerpc/sysdev/xics/ics-rtas.c b/arch/powerpc/sysdev/xics/ics-rtas.c
new file mode 100644
index 000000000000..c782f85cf7e4
--- /dev/null
+++ b/arch/powerpc/sysdev/xics/ics-rtas.c
@@ -0,0 +1,240 @@
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/irq.h>
+#include <linux/smp.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/cpu.h>
+#include <linux/of.h>
+#include <linux/spinlock.h>
+#include <linux/msi.h>
+
+#include <asm/prom.h>
+#include <asm/smp.h>
+#include <asm/machdep.h>
+#include <asm/irq.h>
+#include <asm/errno.h>
+#include <asm/xics.h>
+#include <asm/rtas.h>
+
+/* RTAS service tokens */
+static int ibm_get_xive;
+static int ibm_set_xive;
+static int ibm_int_on;
+static int ibm_int_off;
+
+static int ics_rtas_map(struct ics *ics, unsigned int virq);
+static void ics_rtas_mask_unknown(struct ics *ics, unsigned long vec);
+static long ics_rtas_get_server(struct ics *ics, unsigned long vec);
+static int ics_rtas_host_match(struct ics *ics, struct device_node *node);
+
+/* Only one global & state struct ics */
+static struct ics ics_rtas = {
+        .map            = ics_rtas_map,
+        .mask_unknown   = ics_rtas_mask_unknown,
+        .get_server     = ics_rtas_get_server,
+        .host_match     = ics_rtas_host_match,
+};
+
+static void ics_rtas_unmask_irq(struct irq_data *d)
+{
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
+        int call_status;
+        int server;
+
+        pr_devel("xics: unmask virq %d [hw 0x%x]\n", d->irq, hw_irq);
+
+        if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
+                return;
+
+        server = xics_get_irq_server(d->irq, d->affinity, 0);
+
+        call_status = rtas_call(ibm_set_xive, 3, 1, NULL, hw_irq, server,
+                                DEFAULT_PRIORITY);
+        if (call_status != 0) {
+                printk(KERN_ERR
+                        "%s: ibm_set_xive irq %u server %x returned %d\n",
+                        __func__, hw_irq, server, call_status);
+                return;
+        }
+
+        /* Now unmask the interrupt (often a no-op) */
+        call_status = rtas_call(ibm_int_on, 1, 1, NULL, hw_irq);
+        if (call_status != 0) {
+                printk(KERN_ERR "%s: ibm_int_on irq=%u returned %d\n",
+                        __func__, hw_irq, call_status);
+                return;
+        }
+}
+
+static unsigned int ics_rtas_startup(struct irq_data *d)
+{
+#ifdef CONFIG_PCI_MSI
+        /*
+         * The generic MSI code returns with the interrupt disabled on the
+         * card, using the MSI mask bits. Firmware doesn't appear to unmask
+         * at that level, so we do it here by hand.
+         */
+        if (d->msi_desc)
+                unmask_msi_irq(d);
+#endif
+        /* unmask it */
+        ics_rtas_unmask_irq(d);
+        return 0;
+}
+
+static void ics_rtas_mask_real_irq(unsigned int hw_irq)
+{
+        int call_status;
+
+        if (hw_irq == XICS_IPI)
+                return;
+
+        call_status = rtas_call(ibm_int_off, 1, 1, NULL, hw_irq);
+        if (call_status != 0) {
+                printk(KERN_ERR "%s: ibm_int_off irq=%u returned %d\n",
+                        __func__, hw_irq, call_status);
+                return;
+        }
+
+        /* Have to set XIVE to 0xff to be able to remove a slot */
+        call_status = rtas_call(ibm_set_xive, 3, 1, NULL, hw_irq,
+                                xics_default_server, 0xff);
+        if (call_status != 0) {
+                printk(KERN_ERR "%s: ibm_set_xive(0xff) irq=%u returned %d\n",
+                        __func__, hw_irq, call_status);
+                return;
+        }
+}
+
+static void ics_rtas_mask_irq(struct irq_data *d)
+{
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
+
+        pr_devel("xics: mask virq %d [hw 0x%x]\n", d->irq, hw_irq);
+
+        if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
+                return;
+        ics_rtas_mask_real_irq(hw_irq);
+}
+
+static int ics_rtas_set_affinity(struct irq_data *d,
+                                 const struct cpumask *cpumask,
+                                 bool force)
+{
+        unsigned int hw_irq = (unsigned int)irqd_to_hwirq(d);
+        int status;
+        int xics_status[2];
+        int irq_server;
+
+        if (hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS)
+                return -1;
+
+        status = rtas_call(ibm_get_xive, 1, 3, xics_status, hw_irq);
+
+        if (status) {
+                printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n",
+                        __func__, hw_irq, status);
+                return -1;
+        }
+
+        irq_server = xics_get_irq_server(d->irq, cpumask, 1);
+        if (irq_server == -1) {
+                char cpulist[128];
+                cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
+                printk(KERN_WARNING
+                        "%s: No online cpus in the mask %s for irq %d\n",
+                        __func__, cpulist, d->irq);
+                return -1;
+        }
+
+        status = rtas_call(ibm_set_xive, 3, 1, NULL,
+                           hw_irq, irq_server, xics_status[1]);
+
+        if (status) {
+                printk(KERN_ERR "%s: ibm,set-xive irq=%u returns %d\n",
+                        __func__, hw_irq, status);
+                return -1;
+        }
+
+        return IRQ_SET_MASK_OK;
+}
+
+static struct irq_chip ics_rtas_irq_chip = {
+        .name = "XICS",
+        .irq_startup = ics_rtas_startup,
+        .irq_mask = ics_rtas_mask_irq,
+        .irq_unmask = ics_rtas_unmask_irq,
+        .irq_eoi = NULL, /* Patched at init time */
+        .irq_set_affinity = ics_rtas_set_affinity
+};
+
+static int ics_rtas_map(struct ics *ics, unsigned int virq)
+{
+        unsigned int hw_irq = (unsigned int)virq_to_hw(virq);
+        int status[2];
+        int rc;
+
+        if (WARN_ON(hw_irq == XICS_IPI || hw_irq == XICS_IRQ_SPURIOUS))
+                return -EINVAL;
+
+        /* Check if RTAS knows about this interrupt */
+        rc = rtas_call(ibm_get_xive, 1, 3, status, hw_irq);
+        if (rc)
+                return -ENXIO;
+
+        irq_set_chip_and_handler(virq, &ics_rtas_irq_chip, handle_fasteoi_irq);
+        irq_set_chip_data(virq, &ics_rtas);
+
+        return 0;
+}
+
+static void ics_rtas_mask_unknown(struct ics *ics, unsigned long vec)
+{
+        ics_rtas_mask_real_irq(vec);
+}
+
+static long ics_rtas_get_server(struct ics *ics, unsigned long vec)
+{
+        int rc, status[2];
+
+        rc = rtas_call(ibm_get_xive, 1, 3, status, vec);
+        if (rc)
+                return -1;
+        return status[0];
+}
+
+static int ics_rtas_host_match(struct ics *ics, struct device_node *node)
+{
+        /* IBM machines have interrupt parents of various funky types for things
+         * like vdevices, events, etc... The trick we use here is to match
+         * everything here except the legacy 8259 which is compatible "chrp,iic"
+         */
+        return !of_device_is_compatible(node, "chrp,iic");
+}
+
+int ics_rtas_init(void)
+{
+        ibm_get_xive = rtas_token("ibm,get-xive");
+        ibm_set_xive = rtas_token("ibm,set-xive");
+        ibm_int_on  = rtas_token("ibm,int-on");
+        ibm_int_off = rtas_token("ibm,int-off");
+
+        /* We enable the RTAS "ICS" if RTAS is present with the
+         * appropriate tokens
+         */
+        if (ibm_get_xive == RTAS_UNKNOWN_SERVICE ||
+            ibm_set_xive == RTAS_UNKNOWN_SERVICE)
+                return -ENODEV;
+
+        /* We need to patch our irq chip's EOI to point to the
+         * right ICP
+         */
+        ics_rtas_irq_chip.irq_eoi = icp_ops->eoi;
+
+        /* Register ourselves */
+        xics_register_ics(&ics_rtas);
+
+        return 0;
+}
+
diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
new file mode 100644
index 000000000000..445c5a01b766
--- /dev/null
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -0,0 +1,443 @@
+/*
+ * Copyright 2011 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/types.h>
+#include <linux/threads.h>
+#include <linux/kernel.h>
+#include <linux/irq.h>
+#include <linux/debugfs.h>
+#include <linux/smp.h>
+#include <linux/interrupt.h>
+#include <linux/seq_file.h>
+#include <linux/init.h>
+#include <linux/cpu.h>
+#include <linux/of.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+
+#include <asm/prom.h>
+#include <asm/io.h>
+#include <asm/smp.h>
+#include <asm/machdep.h>
+#include <asm/irq.h>
+#include <asm/errno.h>
+#include <asm/rtas.h>
+#include <asm/xics.h>
+#include <asm/firmware.h>
+
+/* Globals common to all ICP/ICS implementations */
+const struct icp_ops    *icp_ops;
+
+unsigned int xics_default_server                = 0xff;
+unsigned int xics_default_distrib_server        = 0;
+unsigned int xics_interrupt_server_size         = 8;
+
+DEFINE_PER_CPU(struct xics_cppr, xics_cppr);
+
+struct irq_host *xics_host;
+
+static LIST_HEAD(ics_list);
+
+void xics_update_irq_servers(void)
+{
+        int i, j;
+        struct device_node *np;
+        u32 ilen;
+        const u32 *ireg;
+        u32 hcpuid;
+
+        /* Find the server numbers for the boot cpu. */
+        np = of_get_cpu_node(boot_cpuid, NULL);
+        BUG_ON(!np);
+
+        hcpuid = get_hard_smp_processor_id(boot_cpuid);
+        xics_default_server = xics_default_distrib_server = hcpuid;
+
+        pr_devel("xics: xics_default_server = 0x%x\n", xics_default_server);
+
+        ireg = of_get_property(np, "ibm,ppc-interrupt-gserver#s", &ilen);
+        if (!ireg) {
+                of_node_put(np);
+                return;
+        }
+
+        i = ilen / sizeof(int);
+
+        /* Global interrupt distribution server is specified in the last
+         * entry of "ibm,ppc-interrupt-gserver#s" property. Get the last
+         * entry fom this property for current boot cpu id and use it as
+         * default distribution server
+         */
+        for (j = 0; j < i; j += 2) {
+                if (ireg[j] == hcpuid) {
+                        xics_default_distrib_server = ireg[j+1];
+                        break;
+                }
+        }
+        pr_devel("xics: xics_default_distrib_server = 0x%x\n",
+                 xics_default_distrib_server);
+        of_node_put(np);
+}
+
+/* GIQ stuff, currently only supported on RTAS setups, will have
+ * to be sorted properly for bare metal
+ */
+void xics_set_cpu_giq(unsigned int gserver, unsigned int join)
+{
+#ifdef CONFIG_PPC_RTAS
+        int index;
+        int status;
+
+        if (!rtas_indicator_present(GLOBAL_INTERRUPT_QUEUE, NULL))
+                return;
+
+        index = (1UL << xics_interrupt_server_size) - 1 - gserver;
+
+        status = rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE, index, join);
+
+        WARN(status < 0, "set-indicator(%d, %d, %u) returned %d\n",
+             GLOBAL_INTERRUPT_QUEUE, index, join, status);
+#endif
+}
+
+void xics_setup_cpu(void)
+{
+        icp_ops->set_priority(LOWEST_PRIORITY);
+
+        xics_set_cpu_giq(xics_default_distrib_server, 1);
+}
+
+void xics_mask_unknown_vec(unsigned int vec)
+{
+        struct ics *ics;
+
+        pr_err("Interrupt 0x%x (real) is invalid, disabling it.\n", vec);
+
+        list_for_each_entry(ics, &ics_list, link)
+                ics->mask_unknown(ics, vec);
+}
+
+
+#ifdef CONFIG_SMP
+
+static void xics_request_ipi(void)
+{
+        unsigned int ipi;
+
+        ipi = irq_create_mapping(xics_host, XICS_IPI);
+        BUG_ON(ipi == NO_IRQ);
+
+        /*
+         * IPIs are marked IRQF_DISABLED as they must run with irqs
+         * disabled, and PERCPU.  The handler was set in map.
+         */
+        BUG_ON(request_irq(ipi, icp_ops->ipi_action,
+                           IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL));
+}
+
+int __init xics_smp_probe(void)
+{
+        /* Setup cause_ipi callback  based on which ICP is used */
+        smp_ops->cause_ipi = icp_ops->cause_ipi;
+
+        /* Register all the IPIs */
+        xics_request_ipi();
+
+        return cpumask_weight(cpu_possible_mask);
+}
+
+#endif /* CONFIG_SMP */
+
+void xics_teardown_cpu(void)
+{
+        struct xics_cppr *os_cppr = &__get_cpu_var(xics_cppr);
+
+        /*
+         * we have to reset the cppr index to 0 because we're
+         * not going to return from the IPI
+         */
+        os_cppr->index = 0;
+        icp_ops->set_priority(0);
+        icp_ops->teardown_cpu();
+}
+
+void xics_kexec_teardown_cpu(int secondary)
+{
+        xics_teardown_cpu();
+
+        icp_ops->flush_ipi();
+
+        /*
+         * Some machines need to have at least one cpu in the GIQ,
+         * so leave the master cpu in the group.
+         */
+        if (secondary)
+                xics_set_cpu_giq(xics_default_distrib_server, 0);
+}
+
+
+#ifdef CONFIG_HOTPLUG_CPU
+
+/* Interrupts are disabled. */
+void xics_migrate_irqs_away(void)
+{
+        int cpu = smp_processor_id(), hw_cpu = hard_smp_processor_id();
+        unsigned int irq, virq;
+
+        /* If we used to be the default server, move to the new "boot_cpuid" */
+        if (hw_cpu == xics_default_server)
+                xics_update_irq_servers();
+
+        /* Reject any interrupt that was queued to us... */
+        icp_ops->set_priority(0);
+
+        /* Remove ourselves from the global interrupt queue */
+        xics_set_cpu_giq(xics_default_distrib_server, 0);
+
+        /* Allow IPIs again... */
+        icp_ops->set_priority(DEFAULT_PRIORITY);
+
+        for_each_irq(virq) {
+                struct irq_desc *desc;
+                struct irq_chip *chip;
+                long server;
+                unsigned long flags;
+                struct ics *ics;
+
+                /* We can't set affinity on ISA interrupts */
+                if (virq < NUM_ISA_INTERRUPTS)
+                        continue;
+                if (!virq_is_host(virq, xics_host))
+                        continue;
+                irq = (unsigned int)virq_to_hw(virq);
+                /* We need to get IPIs still. */
+                if (irq == XICS_IPI || irq == XICS_IRQ_SPURIOUS)
+                        continue;
+                desc = irq_to_desc(virq);
+                /* We only need to migrate enabled IRQS */
+                if (!desc || !desc->action)
+                        continue;
+                chip = irq_desc_get_chip(desc);
+                if (!chip || !chip->irq_set_affinity)
+                        continue;
+
+                raw_spin_lock_irqsave(&desc->lock, flags);
+
+                /* Locate interrupt server */
+                server = -1;
+                ics = irq_get_chip_data(virq);
+                if (ics)
+                        server = ics->get_server(ics, irq);
+                if (server < 0) {
+                        printk(KERN_ERR "%s: Can't find server for irq %d\n",
+                               __func__, irq);
+                        goto unlock;
+                }
+
+                /* We only support delivery to all cpus or to one cpu.
+                 * The irq has to be migrated only in the single cpu
+                 * case.
+                 */
+                if (server != hw_cpu)
+                        goto unlock;
+
+                /* This is expected during cpu offline. */
+                if (cpu_online(cpu))
+                        pr_warning("IRQ %u affinity broken off cpu %u\n",
+                               virq, cpu);
+
+                /* Reset affinity to all cpus */
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
+                irq_set_affinity(virq, cpu_all_mask);
+                continue;
+unlock:
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
+        }
+}
+#endif /* CONFIG_HOTPLUG_CPU */
+
+#ifdef CONFIG_SMP
+/*
+ * For the moment we only implement delivery to all cpus or one cpu.
+ *
+ * If the requested affinity is cpu_all_mask, we set global affinity.
+ * If not we set it to the first cpu in the mask, even if multiple cpus
+ * are set. This is so things like irqbalance (which set core and package
+ * wide affinities) do the right thing.
+ *
+ * We need to fix this to implement support for the links
+ */
+int xics_get_irq_server(unsigned int virq, const struct cpumask *cpumask,
+                        unsigned int strict_check)
+{
+
+        if (!distribute_irqs)
+                return xics_default_server;
+
+        if (!cpumask_subset(cpu_possible_mask, cpumask)) {
+                int server = cpumask_first_and(cpu_online_mask, cpumask);
+
+                if (server < nr_cpu_ids)
+                        return get_hard_smp_processor_id(server);
+
+                if (strict_check)
+                        return -1;
+        }
+
+        /*
+         * Workaround issue with some versions of JS20 firmware that
+         * deliver interrupts to cpus which haven't been started. This
+         * happens when using the maxcpus= boot option.
+         */
+        if (cpumask_equal(cpu_online_mask, cpu_present_mask))
+                return xics_default_distrib_server;
+
+        return xics_default_server;
+}
+#endif /* CONFIG_SMP */
+
+static int xics_host_match(struct irq_host *h, struct device_node *node)
+{
+        struct ics *ics;
+
+        list_for_each_entry(ics, &ics_list, link)
+                if (ics->host_match(ics, node))
+                        return 1;
+
+        return 0;
+}
+
+/* Dummies */
+static void xics_ipi_unmask(struct irq_data *d) { }
+static void xics_ipi_mask(struct irq_data *d) { }
+
+static struct irq_chip xics_ipi_chip = {
+        .name = "XICS",
+        .irq_eoi = NULL, /* Patched at init time */
+        .irq_mask = xics_ipi_mask,
+        .irq_unmask = xics_ipi_unmask,
+};
+
+static int xics_host_map(struct irq_host *h, unsigned int virq,
+                         irq_hw_number_t hw)
+{
+        struct ics *ics;
+
+        pr_devel("xics: map virq %d, hwirq 0x%lx\n", virq, hw);
+
+        /* Insert the interrupt mapping into the radix tree for fast lookup */
+        irq_radix_revmap_insert(xics_host, virq, hw);
+
+        /* They aren't all level sensitive but we just don't really know */
+        irq_set_status_flags(virq, IRQ_LEVEL);
+
+        /* Don't call into ICS for IPIs */
+        if (hw == XICS_IPI) {
+                irq_set_chip_and_handler(virq, &xics_ipi_chip,
+                                         handle_percpu_irq);
+                return 0;
+        }
+
+        /* Let the ICS setup the chip data */
+        list_for_each_entry(ics, &ics_list, link)
+                if (ics->map(ics, virq) == 0)
+                        return 0;
+
+        return -EINVAL;
+}
+
+static int xics_host_xlate(struct irq_host *h, struct device_node *ct,
+                           const u32 *intspec, unsigned int intsize,
+                           irq_hw_number_t *out_hwirq, unsigned int *out_flags)
+
+{
+        /* Current xics implementation translates everything
+         * to level. It is not technically right for MSIs but this
+         * is irrelevant at this point. We might get smarter in the future
+         */
+        *out_hwirq = intspec[0];
+        *out_flags = IRQ_TYPE_LEVEL_LOW;
+
+        return 0;
+}
+
+static struct irq_host_ops xics_host_ops = {
+        .match = xics_host_match,
+        .map = xics_host_map,
+        .xlate = xics_host_xlate,
+};
+
+static void __init xics_init_host(void)
+{
+        xics_host = irq_alloc_host(NULL, IRQ_HOST_MAP_TREE, 0, &xics_host_ops,
+                                   XICS_IRQ_SPURIOUS);
+        BUG_ON(xics_host == NULL);
+        irq_set_default_host(xics_host);
+}
+
+void __init xics_register_ics(struct ics *ics)
+{
+        list_add(&ics->link, &ics_list);
+}
+
+static void __init xics_get_server_size(void)
+{
+        struct device_node *np;
+        const u32 *isize;
+
+        /* We fetch the interrupt server size from the first ICS node
+         * we find if any
+         */
+        np = of_find_compatible_node(NULL, NULL, "ibm,ppc-xics");
+        if (!np)
+                return;
+        isize = of_get_property(np, "ibm,interrupt-server#-size", NULL);
+        if (!isize)
+                return;
+        xics_interrupt_server_size = *isize;
+        of_node_put(np);
+}
+
+void __init xics_init(void)
+{
+        int rc = -1;
+
+        /* Fist locate ICP */
+#ifdef CONFIG_PPC_ICP_HV
+        if (firmware_has_feature(FW_FEATURE_LPAR))
+                rc = icp_hv_init();
+#endif
+#ifdef CONFIG_PPC_ICP_NATIVE
+        if (rc < 0)
+                rc = icp_native_init();
+#endif
+        if (rc < 0) {
+                pr_warning("XICS: Cannot find a Presentation Controller !\n");
+                return;
+        }
+
+        /* Copy get_irq callback over to ppc_md */
+        ppc_md.get_irq = icp_ops->get_irq;
+
+        /* Patch up IPI chip EOI */
+        xics_ipi_chip.irq_eoi = icp_ops->eoi;
+
+        /* Now locate ICS */
+#ifdef CONFIG_PPC_ICS_RTAS
+        rc = ics_rtas_init();
+#endif
+        if (rc < 0)
+                pr_warning("XICS: Cannot find a Source Controller !\n");
+
+        /* Initialize common bits */
+        xics_get_server_size();
+        xics_update_irq_servers();
+        xics_init_host();
+        xics_setup_cpu();
+}
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c
index 0a13fc19e287..6183799754af 100644
--- a/arch/powerpc/sysdev/xilinx_intc.c
+++ b/arch/powerpc/sysdev/xilinx_intc.c
@@ -71,7 +71,7 @@ static unsigned char xilinx_intc_map_senses[] = {
  */
 static void xilinx_intc_mask(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void * regs = irq_data_get_irq_chip_data(d);
         pr_debug("mask: %d\n", irq);
         out_be32(regs + XINTC_CIE, 1 << irq);
@@ -87,7 +87,7 @@ static int xilinx_intc_set_type(struct irq_data *d, unsigned int flow_type)
  */
 static void xilinx_intc_level_unmask(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void * regs = irq_data_get_irq_chip_data(d);
         pr_debug("unmask: %d\n", irq);
         out_be32(regs + XINTC_SIE, 1 << irq);
@@ -112,7 +112,7 @@ static struct irq_chip xilinx_intc_level_irqchip = {
  */
 static void xilinx_intc_edge_unmask(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void *regs = irq_data_get_irq_chip_data(d);
         pr_debug("unmask: %d\n", irq);
         out_be32(regs + XINTC_SIE, 1 << irq);
@@ -120,7 +120,7 @@ static void xilinx_intc_edge_unmask(struct irq_data *d)
 
 static void xilinx_intc_edge_ack(struct irq_data *d)
 {
-        int irq = virq_to_hw(d->irq);
+        int irq = irqd_to_hwirq(d);
         void * regs = irq_data_get_irq_chip_data(d);
         pr_debug("ack: %d\n", irq);
         out_be32(regs + XINTC_IAR, 1 << irq);
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 33794c1d92c3..42541bbcc7fa 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -334,7 +334,7 @@ static void release_output_lock(void)
 
 int cpus_are_in_xmon(void)
 {
-        return !cpus_empty(cpus_in_xmon);
+        return !cpumask_empty(&cpus_in_xmon);
 }
 #endif
 
@@ -373,7 +373,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
 
 #ifdef CONFIG_SMP
         cpu = smp_processor_id();
-        if (cpu_isset(cpu, cpus_in_xmon)) {
+        if (cpumask_test_cpu(cpu, &cpus_in_xmon)) {
                 get_output_lock();
                 excprint(regs);
                 printf("cpu 0x%x: Exception %lx %s in xmon, "
@@ -396,10 +396,10 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
         }
 
         xmon_fault_jmp[cpu] = recurse_jmp;
-        cpu_set(cpu, cpus_in_xmon);
+        cpumask_set_cpu(cpu, &cpus_in_xmon);
 
         bp = NULL;
-        if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) == (MSR_IR|MSR_SF))
+        if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) == (MSR_IR|MSR_64BIT))
                 bp = at_breakpoint(regs->nip);
         if (bp || unrecoverable_excp(regs))
                 fromipi = 0;
@@ -437,10 +437,10 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
                 xmon_owner = cpu;
                 mb();
                 if (ncpus > 1) {
-                        smp_send_debugger_break(MSG_ALL_BUT_SELF);
+                        smp_send_debugger_break();
                         /* wait for other cpus to come in */
                         for (timeout = 100000000; timeout != 0; --timeout) {
-                                if (cpus_weight(cpus_in_xmon) >= ncpus)
+                                if (cpumask_weight(&cpus_in_xmon) >= ncpus)
                                         break;
                                 barrier();
                         }
@@ -484,7 +484,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
                 }
         }
  leave:
-        cpu_clear(cpu, cpus_in_xmon);
+        cpumask_clear_cpu(cpu, &cpus_in_xmon);
         xmon_fault_jmp[cpu] = NULL;
 #else
         /* UP is simple... */
@@ -529,7 +529,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
                 }
         }
 #else
-        if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) == (MSR_IR|MSR_SF)) {
+        if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) == (MSR_IR|MSR_64BIT)) {
                 bp = at_breakpoint(regs->nip);
                 if (bp != NULL) {
                         int stepped = emulate_step(regs, bp->instr[0]);
@@ -578,7 +578,7 @@ static int xmon_bpt(struct pt_regs *regs)
         struct bpt *bp;
         unsigned long offset;
 
-        if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) != (MSR_IR|MSR_SF))
+        if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) != (MSR_IR|MSR_64BIT))
                 return 0;
 
         /* Are we at the trap at bp->instr[1] for some bp? */
@@ -609,7 +609,7 @@ static int xmon_sstep(struct pt_regs *regs)
 
 static int xmon_dabr_match(struct pt_regs *regs)
 {
-        if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) != (MSR_IR|MSR_SF))
+        if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) != (MSR_IR|MSR_64BIT))
                 return 0;
         if (dabr.enabled == 0)
                 return 0;
@@ -619,7 +619,7 @@ static int xmon_dabr_match(struct pt_regs *regs)
 
 static int xmon_iabr_match(struct pt_regs *regs)
 {
-        if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) != (MSR_IR|MSR_SF))
+        if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) != (MSR_IR|MSR_64BIT))
                 return 0;
         if (iabr == NULL)
                 return 0;
@@ -630,7 +630,7 @@ static int xmon_iabr_match(struct pt_regs *regs)
 static int xmon_ipi(struct pt_regs *regs)
 {
 #ifdef CONFIG_SMP
-        if (in_xmon && !cpu_isset(smp_processor_id(), cpus_in_xmon))
+        if (in_xmon && !cpumask_test_cpu(smp_processor_id(), &cpus_in_xmon))
                 xmon_core(regs, 1);
 #endif
         return 0;
@@ -644,7 +644,7 @@ static int xmon_fault_handler(struct pt_regs *regs)
         if (in_xmon && catch_memory_errors)
                 handle_fault(regs);     /* doesn't return */
 
-        if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) == (MSR_IR|MSR_SF)) {
+        if ((regs->msr & (MSR_IR|MSR_PR|MSR_64BIT)) == (MSR_IR|MSR_64BIT)) {
                 bp = in_breakpoint_table(regs->nip, &offset);
                 if (bp != NULL) {
                         regs->nip = bp->address + offset;
@@ -929,7 +929,7 @@ static int do_step(struct pt_regs *regs)
         int stepped;
 
         /* check we are in 64-bit kernel mode, translation enabled */
-        if ((regs->msr & (MSR_SF|MSR_PR|MSR_IR)) == (MSR_SF|MSR_IR)) {
+        if ((regs->msr & (MSR_64BIT|MSR_PR|MSR_IR)) == (MSR_64BIT|MSR_IR)) {
                 if (mread(regs->nip, &instr, 4) == 4) {
                         stepped = emulate_step(regs, instr);
                         if (stepped < 0) {
@@ -976,7 +976,7 @@ static int cpu_cmd(void)
                 printf("cpus stopped:");
                 count = 0;
                 for (cpu = 0; cpu < NR_CPUS; ++cpu) {
-                        if (cpu_isset(cpu, cpus_in_xmon)) {
+                        if (cpumask_test_cpu(cpu, &cpus_in_xmon)) {
                                 if (count == 0)
                                         printf(" %x", cpu);
                                 ++count;
@@ -992,7 +992,7 @@ static int cpu_cmd(void)
                 return 0;
         }
         /* try to switch to cpu specified */
-        if (!cpu_isset(cpu, cpus_in_xmon)) {
+        if (!cpumask_test_cpu(cpu, &cpus_in_xmon)) {
                 printf("cpu 0x%x isn't in xmon\n", cpu);
                 return 0;
         }
@@ -1497,6 +1497,10 @@ static void prregs(struct pt_regs *fp)
 #endif
         printf("pc  = ");
         xmon_print_symbol(fp->nip, " ", "\n");
+        if (TRAP(fp) != 0xc00 && cpu_has_feature(CPU_FTR_CFAR)) {
+                printf("cfar= ");
+                xmon_print_symbol(fp->orig_gpr3, " ", "\n");
+        }
         printf("lr  = ");
         xmon_print_symbol(fp->link, " ", "\n");
         printf("msr = "REG"   cr  = %.8lx\n", fp->msr, fp->ccr);
@@ -2663,7 +2667,7 @@ static void dump_stab(void)
 
 void dump_segments(void)
 {
-        if (cpu_has_feature(CPU_FTR_SLB))
+        if (mmu_has_feature(MMU_FTR_SLB))
                 dump_slb();
         else
                 dump_stab();
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 2508a6f31588..ff2d2371b2e9 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -88,6 +88,7 @@ config S390
         select HAVE_KERNEL_XZ
         select HAVE_GET_USER_PAGES_FAST
         select HAVE_ARCH_MUTEX_CPU_RELAX
+        select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
         select ARCH_INLINE_SPIN_TRYLOCK
         select ARCH_INLINE_SPIN_TRYLOCK_BH
         select ARCH_INLINE_SPIN_LOCK
@@ -229,17 +230,6 @@ config SYSVIPC_COMPAT
 config AUDIT_ARCH
         def_bool y
 
-config S390_EXEC_PROTECT
-        def_bool y
-        prompt "Data execute protection"
-        help
-          This option allows to enable a buffer overflow protection for user
-          space programs and it also selects the addressing mode option above.
-          The kernel parameter noexec=on will enable this feature and also
-          switch the addressing modes, default is disabled. Enabling this (via
-          kernel parameter) on machines earlier than IBM System z9 this will
-          reduce system performance.
-
 comment "Code generation options"
 
 choice
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index 5c91995b74e4..24bff4f1cc52 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -130,9 +130,7 @@ static void appldata_work_fn(struct work_struct *work)
 {
         struct list_head *lh;
         struct appldata_ops *ops;
-        int i;
 
-        i = 0;
         get_online_cpus();
         mutex_lock(&appldata_ops_mutex);
         list_for_each(lh, &appldata_ops_list) {
diff --git a/arch/s390/crypto/Makefile b/arch/s390/crypto/Makefile
index 1cf81d77c5a5..7f0b7cda6259 100644
--- a/arch/s390/crypto/Makefile
+++ b/arch/s390/crypto/Makefile
@@ -8,3 +8,4 @@ obj-$(CONFIG_CRYPTO_SHA512_S390) += sha512_s390.o sha_common.o
 obj-$(CONFIG_CRYPTO_DES_S390) += des_s390.o
 obj-$(CONFIG_CRYPTO_AES_S390) += aes_s390.o
 obj-$(CONFIG_S390_PRNG) += prng.o
+obj-$(CONFIG_CRYPTO_GHASH_S390) += ghash_s390.o
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index 58f46734465f..a9ce135893f8 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -31,7 +31,8 @@
 #define AES_KEYLEN_192          2
 #define AES_KEYLEN_256          4
 
-static char keylen_flag = 0;
+static u8 *ctrblk;
+static char keylen_flag;
 
 struct s390_aes_ctx {
         u8 iv[AES_BLOCK_SIZE];
@@ -45,6 +46,24 @@ struct s390_aes_ctx {
         } fallback;
 };
 
+struct pcc_param {
+        u8 key[32];
+        u8 tweak[16];
+        u8 block[16];
+        u8 bit[16];
+        u8 xts[16];
+};
+
+struct s390_xts_ctx {
+        u8 key[32];
+        u8 xts_param[16];
+        struct pcc_param pcc;
+        long enc;
+        long dec;
+        int key_len;
+        struct crypto_blkcipher *fallback;
+};
+
 /*
  * Check if the key_len is supported by the HW.
  * Returns 0 if it is, a positive number if it is not and software fallback is
@@ -504,15 +523,337 @@ static struct crypto_alg cbc_aes_alg = {
         }
 };
 
+static int xts_fallback_setkey(struct crypto_tfm *tfm, const u8 *key,
+                                   unsigned int len)
+{
+        struct s390_xts_ctx *xts_ctx = crypto_tfm_ctx(tfm);
+        unsigned int ret;
+
+        xts_ctx->fallback->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;
+        xts_ctx->fallback->base.crt_flags |= (tfm->crt_flags &
+                        CRYPTO_TFM_REQ_MASK);
+
+        ret = crypto_blkcipher_setkey(xts_ctx->fallback, key, len);
+        if (ret) {
+                tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;
+                tfm->crt_flags |= (xts_ctx->fallback->base.crt_flags &
+                                CRYPTO_TFM_RES_MASK);
+        }
+        return ret;
+}
+
+static int xts_fallback_decrypt(struct blkcipher_desc *desc,
+                struct scatterlist *dst, struct scatterlist *src,
+                unsigned int nbytes)
+{
+        struct s390_xts_ctx *xts_ctx = crypto_blkcipher_ctx(desc->tfm);
+        struct crypto_blkcipher *tfm;
+        unsigned int ret;
+
+        tfm = desc->tfm;
+        desc->tfm = xts_ctx->fallback;
+
+        ret = crypto_blkcipher_decrypt_iv(desc, dst, src, nbytes);
+
+        desc->tfm = tfm;
+        return ret;
+}
+
+static int xts_fallback_encrypt(struct blkcipher_desc *desc,
+                struct scatterlist *dst, struct scatterlist *src,
+                unsigned int nbytes)
+{
+        struct s390_xts_ctx *xts_ctx = crypto_blkcipher_ctx(desc->tfm);
+        struct crypto_blkcipher *tfm;
+        unsigned int ret;
+
+        tfm = desc->tfm;
+        desc->tfm = xts_ctx->fallback;
+
+        ret = crypto_blkcipher_encrypt_iv(desc, dst, src, nbytes);
+
+        desc->tfm = tfm;
+        return ret;
+}
+
+static int xts_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
+                           unsigned int key_len)
+{
+        struct s390_xts_ctx *xts_ctx = crypto_tfm_ctx(tfm);
+        u32 *flags = &tfm->crt_flags;
+
+        switch (key_len) {
+        case 32:
+                xts_ctx->enc = KM_XTS_128_ENCRYPT;
+                xts_ctx->dec = KM_XTS_128_DECRYPT;
+                memcpy(xts_ctx->key + 16, in_key, 16);
+                memcpy(xts_ctx->pcc.key + 16, in_key + 16, 16);
+                break;
+        case 48:
+                xts_ctx->enc = 0;
+                xts_ctx->dec = 0;
+                xts_fallback_setkey(tfm, in_key, key_len);
+                break;
+        case 64:
+                xts_ctx->enc = KM_XTS_256_ENCRYPT;
+                xts_ctx->dec = KM_XTS_256_DECRYPT;
+                memcpy(xts_ctx->key, in_key, 32);
+                memcpy(xts_ctx->pcc.key, in_key + 32, 32);
+                break;
+        default:
+                *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+                return -EINVAL;
+        }
+        xts_ctx->key_len = key_len;
+        return 0;
+}
+
+static int xts_aes_crypt(struct blkcipher_desc *desc, long func,
+                         struct s390_xts_ctx *xts_ctx,
+                         struct blkcipher_walk *walk)
+{
+        unsigned int offset = (xts_ctx->key_len >> 1) & 0x10;
+        int ret = blkcipher_walk_virt(desc, walk);
+        unsigned int nbytes = walk->nbytes;
+        unsigned int n;
+        u8 *in, *out;
+        void *param;
+
+        if (!nbytes)
+                goto out;
+
+        memset(xts_ctx->pcc.block, 0, sizeof(xts_ctx->pcc.block));
+        memset(xts_ctx->pcc.bit, 0, sizeof(xts_ctx->pcc.bit));
+        memset(xts_ctx->pcc.xts, 0, sizeof(xts_ctx->pcc.xts));
+        memcpy(xts_ctx->pcc.tweak, walk->iv, sizeof(xts_ctx->pcc.tweak));
+        param = xts_ctx->pcc.key + offset;
+        ret = crypt_s390_pcc(func, param);
+        BUG_ON(ret < 0);
+
+        memcpy(xts_ctx->xts_param, xts_ctx->pcc.xts, 16);
+        param = xts_ctx->key + offset;
+        do {
+                /* only use complete blocks */
+                n = nbytes & ~(AES_BLOCK_SIZE - 1);
+                out = walk->dst.virt.addr;
+                in = walk->src.virt.addr;
+
+                ret = crypt_s390_km(func, param, out, in, n);
+                BUG_ON(ret < 0 || ret != n);
+
+                nbytes &= AES_BLOCK_SIZE - 1;
+                ret = blkcipher_walk_done(desc, walk, nbytes);
+        } while ((nbytes = walk->nbytes));
+out:
+        return ret;
+}
+
+static int xts_aes_encrypt(struct blkcipher_desc *desc,
+                           struct scatterlist *dst, struct scatterlist *src,
+                           unsigned int nbytes)
+{
+        struct s390_xts_ctx *xts_ctx = crypto_blkcipher_ctx(desc->tfm);
+        struct blkcipher_walk walk;
+
+        if (unlikely(xts_ctx->key_len == 48))
+                return xts_fallback_encrypt(desc, dst, src, nbytes);
+
+        blkcipher_walk_init(&walk, dst, src, nbytes);
+        return xts_aes_crypt(desc, xts_ctx->enc, xts_ctx, &walk);
+}
+
+static int xts_aes_decrypt(struct blkcipher_desc *desc,
+                           struct scatterlist *dst, struct scatterlist *src,
+                           unsigned int nbytes)
+{
+        struct s390_xts_ctx *xts_ctx = crypto_blkcipher_ctx(desc->tfm);
+        struct blkcipher_walk walk;
+
+        if (unlikely(xts_ctx->key_len == 48))
+                return xts_fallback_decrypt(desc, dst, src, nbytes);
+
+        blkcipher_walk_init(&walk, dst, src, nbytes);
+        return xts_aes_crypt(desc, xts_ctx->dec, xts_ctx, &walk);
+}
+
+static int xts_fallback_init(struct crypto_tfm *tfm)
+{
+        const char *name = tfm->__crt_alg->cra_name;
+        struct s390_xts_ctx *xts_ctx = crypto_tfm_ctx(tfm);
+
+        xts_ctx->fallback = crypto_alloc_blkcipher(name, 0,
+                        CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK);
+
+        if (IS_ERR(xts_ctx->fallback)) {
+                pr_err("Allocating XTS fallback algorithm %s failed\n",
+                       name);
+                return PTR_ERR(xts_ctx->fallback);
+        }
+        return 0;
+}
+
+static void xts_fallback_exit(struct crypto_tfm *tfm)
+{
+        struct s390_xts_ctx *xts_ctx = crypto_tfm_ctx(tfm);
+
+        crypto_free_blkcipher(xts_ctx->fallback);
+        xts_ctx->fallback = NULL;
+}
+
+static struct crypto_alg xts_aes_alg = {
+        .cra_name               =       "xts(aes)",
+        .cra_driver_name        =       "xts-aes-s390",
+        .cra_priority           =       CRYPT_S390_COMPOSITE_PRIORITY,
+        .cra_flags              =       CRYPTO_ALG_TYPE_BLKCIPHER |
+                                        CRYPTO_ALG_NEED_FALLBACK,
+        .cra_blocksize          =       AES_BLOCK_SIZE,
+        .cra_ctxsize            =       sizeof(struct s390_xts_ctx),
+        .cra_type               =       &crypto_blkcipher_type,
+        .cra_module             =       THIS_MODULE,
+        .cra_list               =       LIST_HEAD_INIT(xts_aes_alg.cra_list),
+        .cra_init               =       xts_fallback_init,
+        .cra_exit               =       xts_fallback_exit,
+        .cra_u                  =       {
+                .blkcipher = {
+                        .min_keysize            =       2 * AES_MIN_KEY_SIZE,
+                        .max_keysize            =       2 * AES_MAX_KEY_SIZE,
+                        .ivsize                 =       AES_BLOCK_SIZE,
+                        .setkey                 =       xts_aes_set_key,
+                        .encrypt                =       xts_aes_encrypt,
+                        .decrypt                =       xts_aes_decrypt,
+                }
+        }
+};
+
+static int ctr_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
+                           unsigned int key_len)
+{
+        struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
+
+        switch (key_len) {
+        case 16:
+                sctx->enc = KMCTR_AES_128_ENCRYPT;
+                sctx->dec = KMCTR_AES_128_DECRYPT;
+                break;
+        case 24:
+                sctx->enc = KMCTR_AES_192_ENCRYPT;
+                sctx->dec = KMCTR_AES_192_DECRYPT;
+                break;
+        case 32:
+                sctx->enc = KMCTR_AES_256_ENCRYPT;
+                sctx->dec = KMCTR_AES_256_DECRYPT;
+                break;
+        }
+
+        return aes_set_key(tfm, in_key, key_len);
+}
+
+static int ctr_aes_crypt(struct blkcipher_desc *desc, long func,
+                         struct s390_aes_ctx *sctx, struct blkcipher_walk *walk)
+{
+        int ret = blkcipher_walk_virt_block(desc, walk, AES_BLOCK_SIZE);
+        unsigned int i, n, nbytes;
+        u8 buf[AES_BLOCK_SIZE];
+        u8 *out, *in;
+
+        if (!walk->nbytes)
+                return ret;
+
+        memcpy(ctrblk, walk->iv, AES_BLOCK_SIZE);
+        while ((nbytes = walk->nbytes) >= AES_BLOCK_SIZE) {
+                out = walk->dst.virt.addr;
+                in = walk->src.virt.addr;
+                while (nbytes >= AES_BLOCK_SIZE) {
+                        /* only use complete blocks, max. PAGE_SIZE */
+                        n = (nbytes > PAGE_SIZE) ? PAGE_SIZE :
+                                                 nbytes & ~(AES_BLOCK_SIZE - 1);
+                        for (i = AES_BLOCK_SIZE; i < n; i += AES_BLOCK_SIZE) {
+                                memcpy(ctrblk + i, ctrblk + i - AES_BLOCK_SIZE,
+                                       AES_BLOCK_SIZE);
+                                crypto_inc(ctrblk + i, AES_BLOCK_SIZE);
+                        }
+                        ret = crypt_s390_kmctr(func, sctx->key, out, in, n, ctrblk);
+                        BUG_ON(ret < 0 || ret != n);
+                        if (n > AES_BLOCK_SIZE)
+                                memcpy(ctrblk, ctrblk + n - AES_BLOCK_SIZE,
+                                       AES_BLOCK_SIZE);
+                        crypto_inc(ctrblk, AES_BLOCK_SIZE);
+                        out += n;
+                        in += n;
+                        nbytes -= n;
+                }
+                ret = blkcipher_walk_done(desc, walk, nbytes);
+        }
+        /*
+         * final block may be < AES_BLOCK_SIZE, copy only nbytes
+         */
+        if (nbytes) {
+                out = walk->dst.virt.addr;
+                in = walk->src.virt.addr;
+                ret = crypt_s390_kmctr(func, sctx->key, buf, in,
+                                       AES_BLOCK_SIZE, ctrblk);
+                BUG_ON(ret < 0 || ret != AES_BLOCK_SIZE);
+                memcpy(out, buf, nbytes);
+                crypto_inc(ctrblk, AES_BLOCK_SIZE);
+                ret = blkcipher_walk_done(desc, walk, 0);
+        }
+        memcpy(walk->iv, ctrblk, AES_BLOCK_SIZE);
+        return ret;
+}
+
+static int ctr_aes_encrypt(struct blkcipher_desc *desc,
+                           struct scatterlist *dst, struct scatterlist *src,
+                           unsigned int nbytes)
+{
+        struct s390_aes_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);
+        struct blkcipher_walk walk;
+
+        blkcipher_walk_init(&walk, dst, src, nbytes);
+        return ctr_aes_crypt(desc, sctx->enc, sctx, &walk);
+}
+
+static int ctr_aes_decrypt(struct blkcipher_desc *desc,
+                           struct scatterlist *dst, struct scatterlist *src,
+                           unsigned int nbytes)
+{
+        struct s390_aes_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);
+        struct blkcipher_walk walk;
+
+        blkcipher_walk_init(&walk, dst, src, nbytes);
+        return ctr_aes_crypt(desc, sctx->dec, sctx, &walk);
+}
+
+static struct crypto_alg ctr_aes_alg = {
+        .cra_name               =       "ctr(aes)",
+        .cra_driver_name        =       "ctr-aes-s390",
+        .cra_priority           =       CRYPT_S390_COMPOSITE_PRIORITY,
+        .cra_flags              =       CRYPTO_ALG_TYPE_BLKCIPHER,
+        .cra_blocksize          =       1,
+        .cra_ctxsize            =       sizeof(struct s390_aes_ctx),
+        .cra_type               =       &crypto_blkcipher_type,
+        .cra_module             =       THIS_MODULE,
+        .cra_list               =       LIST_HEAD_INIT(ctr_aes_alg.cra_list),
+        .cra_u                  =       {
+                .blkcipher = {
+                        .min_keysize            =       AES_MIN_KEY_SIZE,
+                        .max_keysize            =       AES_MAX_KEY_SIZE,
+                        .ivsize                 =       AES_BLOCK_SIZE,
+                        .setkey                 =       ctr_aes_set_key,
+                        .encrypt                =       ctr_aes_encrypt,
+                        .decrypt                =       ctr_aes_decrypt,
+                }
+        }
+};
+
 static int __init aes_s390_init(void)
 {
         int ret;
 
-        if (crypt_s390_func_available(KM_AES_128_ENCRYPT))
+        if (crypt_s390_func_available(KM_AES_128_ENCRYPT, CRYPT_S390_MSA))
                 keylen_flag |= AES_KEYLEN_128;
-        if (crypt_s390_func_available(KM_AES_192_ENCRYPT))
+        if (crypt_s390_func_available(KM_AES_192_ENCRYPT, CRYPT_S390_MSA))
                 keylen_flag |= AES_KEYLEN_192;
-        if (crypt_s390_func_available(KM_AES_256_ENCRYPT))
+        if (crypt_s390_func_available(KM_AES_256_ENCRYPT, CRYPT_S390_MSA))
                 keylen_flag |= AES_KEYLEN_256;
 
         if (!keylen_flag)
@@ -535,9 +876,40 @@ static int __init aes_s390_init(void)
         if (ret)
                 goto cbc_aes_err;
 
+        if (crypt_s390_func_available(KM_XTS_128_ENCRYPT,
+                        CRYPT_S390_MSA | CRYPT_S390_MSA4) &&
+            crypt_s390_func_available(KM_XTS_256_ENCRYPT,
+                        CRYPT_S390_MSA | CRYPT_S390_MSA4)) {
+                ret = crypto_register_alg(&xts_aes_alg);
+                if (ret)
+                        goto xts_aes_err;
+        }
+
+        if (crypt_s390_func_available(KMCTR_AES_128_ENCRYPT,
+                                CRYPT_S390_MSA | CRYPT_S390_MSA4) &&
+            crypt_s390_func_available(KMCTR_AES_192_ENCRYPT,
+                                CRYPT_S390_MSA | CRYPT_S390_MSA4) &&
+            crypt_s390_func_available(KMCTR_AES_256_ENCRYPT,
+                                CRYPT_S390_MSA | CRYPT_S390_MSA4)) {
+                ctrblk = (u8 *) __get_free_page(GFP_KERNEL);
+                if (!ctrblk) {
+                        ret = -ENOMEM;
+                        goto ctr_aes_err;
+                }
+                ret = crypto_register_alg(&ctr_aes_alg);
+                if (ret) {
+                        free_page((unsigned long) ctrblk);
+                        goto ctr_aes_err;
+                }
+        }
+
 out:
         return ret;
 
+ctr_aes_err:
+        crypto_unregister_alg(&xts_aes_alg);
+xts_aes_err:
+        crypto_unregister_alg(&cbc_aes_alg);
 cbc_aes_err:
         crypto_unregister_alg(&ecb_aes_alg);
 ecb_aes_err:
@@ -548,6 +920,9 @@ aes_err:
 
 static void __exit aes_s390_fini(void)
 {
+        crypto_unregister_alg(&ctr_aes_alg);
+        free_page((unsigned long) ctrblk);
+        crypto_unregister_alg(&xts_aes_alg);
         crypto_unregister_alg(&cbc_aes_alg);
         crypto_unregister_alg(&ecb_aes_alg);
         crypto_unregister_alg(&aes_alg);
diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h
index 7ee9a1b4ad9f..49676771bd66 100644
--- a/arch/s390/crypto/crypt_s390.h
+++ b/arch/s390/crypto/crypt_s390.h
@@ -24,13 +24,18 @@
 #define CRYPT_S390_PRIORITY 300
 #define CRYPT_S390_COMPOSITE_PRIORITY 400
 
+#define CRYPT_S390_MSA  0x1
+#define CRYPT_S390_MSA3 0x2
+#define CRYPT_S390_MSA4 0x4
+
 /* s390 cryptographic operations */
 enum crypt_s390_operations {
         CRYPT_S390_KM   = 0x0100,
         CRYPT_S390_KMC  = 0x0200,
         CRYPT_S390_KIMD = 0x0300,
         CRYPT_S390_KLMD = 0x0400,
-        CRYPT_S390_KMAC = 0x0500
+        CRYPT_S390_KMAC = 0x0500,
+        CRYPT_S390_KMCTR = 0x0600
 };
 
 /*
@@ -51,6 +56,10 @@ enum crypt_s390_km_func {
         KM_AES_192_DECRYPT  = CRYPT_S390_KM | 0x13 | 0x80,
         KM_AES_256_ENCRYPT  = CRYPT_S390_KM | 0x14,
         KM_AES_256_DECRYPT  = CRYPT_S390_KM | 0x14 | 0x80,
+        KM_XTS_128_ENCRYPT  = CRYPT_S390_KM | 0x32,
+        KM_XTS_128_DECRYPT  = CRYPT_S390_KM | 0x32 | 0x80,
+        KM_XTS_256_ENCRYPT  = CRYPT_S390_KM | 0x34,
+        KM_XTS_256_DECRYPT  = CRYPT_S390_KM | 0x34 | 0x80,
 };
 
 /*
@@ -75,6 +84,26 @@ enum crypt_s390_kmc_func {
 };
 
 /*
+ * function codes for KMCTR (CIPHER MESSAGE WITH COUNTER)
+ * instruction
+ */
+enum crypt_s390_kmctr_func {
+        KMCTR_QUERY            = CRYPT_S390_KMCTR | 0x0,
+        KMCTR_DEA_ENCRYPT      = CRYPT_S390_KMCTR | 0x1,
+        KMCTR_DEA_DECRYPT      = CRYPT_S390_KMCTR | 0x1 | 0x80,
+        KMCTR_TDEA_128_ENCRYPT = CRYPT_S390_KMCTR | 0x2,
+        KMCTR_TDEA_128_DECRYPT = CRYPT_S390_KMCTR | 0x2 | 0x80,
+        KMCTR_TDEA_192_ENCRYPT = CRYPT_S390_KMCTR | 0x3,
+        KMCTR_TDEA_192_DECRYPT = CRYPT_S390_KMCTR | 0x3 | 0x80,
+        KMCTR_AES_128_ENCRYPT  = CRYPT_S390_KMCTR | 0x12,
+        KMCTR_AES_128_DECRYPT  = CRYPT_S390_KMCTR | 0x12 | 0x80,
+        KMCTR_AES_192_ENCRYPT  = CRYPT_S390_KMCTR | 0x13,
+        KMCTR_AES_192_DECRYPT  = CRYPT_S390_KMCTR | 0x13 | 0x80,
+        KMCTR_AES_256_ENCRYPT  = CRYPT_S390_KMCTR | 0x14,
+        KMCTR_AES_256_DECRYPT  = CRYPT_S390_KMCTR | 0x14 | 0x80,
+};
+
+/*
  * function codes for KIMD (COMPUTE INTERMEDIATE MESSAGE DIGEST)
  * instruction
  */
@@ -83,6 +112,7 @@ enum crypt_s390_kimd_func {
         KIMD_SHA_1   = CRYPT_S390_KIMD | 1,
         KIMD_SHA_256 = CRYPT_S390_KIMD | 2,
         KIMD_SHA_512 = CRYPT_S390_KIMD | 3,
+        KIMD_GHASH   = CRYPT_S390_KIMD | 65,
 };
 
 /*
@@ -284,6 +314,45 @@ static inline int crypt_s390_kmac(long func, void *param,
 }
 
 /**
+ * crypt_s390_kmctr:
+ * @func: the function code passed to KMCTR; see crypt_s390_kmctr_func
+ * @param: address of parameter block; see POP for details on each func
+ * @dest: address of destination memory area
+ * @src: address of source memory area
+ * @src_len: length of src operand in bytes
+ * @counter: address of counter value
+ *
+ * Executes the KMCTR (CIPHER MESSAGE WITH COUNTER) operation of the CPU.
+ *
+ * Returns -1 for failure, 0 for the query func, number of processed
+ * bytes for encryption/decryption funcs
+ */
+static inline int crypt_s390_kmctr(long func, void *param, u8 *dest,
+                                 const u8 *src, long src_len, u8 *counter)
+{
+        register long __func asm("0") = func & CRYPT_S390_FUNC_MASK;
+        register void *__param asm("1") = param;
+        register const u8 *__src asm("2") = src;
+        register long __src_len asm("3") = src_len;
+        register u8 *__dest asm("4") = dest;
+        register u8 *__ctr asm("6") = counter;
+        int ret = -1;
+
+        asm volatile(
+                "0:     .insn   rrf,0xb92d0000,%3,%1,%4,0 \n" /* KMCTR opcode */
+                "1:     brc     1,0b \n" /* handle partial completion */
+                "       la      %0,0\n"
+                "2:\n"
+                EX_TABLE(0b,2b) EX_TABLE(1b,2b)
+                : "+d" (ret), "+a" (__src), "+d" (__src_len), "+a" (__dest),
+                  "+a" (__ctr)
+                : "d" (__func), "a" (__param) : "cc", "memory");
+        if (ret < 0)
+                return ret;
+        return (func & CRYPT_S390_FUNC_MASK) ? src_len - __src_len : __src_len;
+}
+
+/**
  * crypt_s390_func_available:
  * @func: the function code of the specific function; 0 if op in general
  *
@@ -291,13 +360,17 @@ static inline int crypt_s390_kmac(long func, void *param,
  *
  * Returns 1 if func available; 0 if func or op in general not available
  */
-static inline int crypt_s390_func_available(int func)
+static inline int crypt_s390_func_available(int func,
+                                            unsigned int facility_mask)
 {
         unsigned char status[16];
         int ret;
 
-        /* check if CPACF facility (bit 17) is available */
-        if (!test_facility(17))
+        if (facility_mask & CRYPT_S390_MSA && !test_facility(17))
+                return 0;
+        if (facility_mask & CRYPT_S390_MSA3 && !test_facility(76))
+                return 0;
+        if (facility_mask & CRYPT_S390_MSA4 && !test_facility(77))
                 return 0;
 
         switch (func & CRYPT_S390_OP_MASK) {
@@ -316,6 +389,10 @@ static inline int crypt_s390_func_available(int func)
         case CRYPT_S390_KMAC:
                 ret = crypt_s390_kmac(KMAC_QUERY, &status, NULL, 0);
                 break;
+        case CRYPT_S390_KMCTR:
+                ret = crypt_s390_kmctr(KMCTR_QUERY, &status, NULL, NULL, 0,
+                                       NULL);
+                break;
         default:
                 return 0;
         }
@@ -326,4 +403,31 @@ static inline int crypt_s390_func_available(int func)
         return (status[func >> 3] & (0x80 >> (func & 7))) != 0;
 }
 
+/**
+ * crypt_s390_pcc:
+ * @func: the function code passed to KM; see crypt_s390_km_func
+ * @param: address of parameter block; see POP for details on each func
+ *
+ * Executes the PCC (PERFORM CRYPTOGRAPHIC COMPUTATION) operation of the CPU.
+ *
+ * Returns -1 for failure, 0 for success.
+ */
+static inline int crypt_s390_pcc(long func, void *param)
+{
+        register long __func asm("0") = func & 0x7f; /* encrypt or decrypt */
+        register void *__param asm("1") = param;
+        int ret = -1;
+
+        asm volatile(
+                "0:     .insn   rre,0xb92c0000,0,0 \n" /* PCC opcode */
+                "1:     brc     1,0b \n" /* handle partial completion */
+                "       la      %0,0\n"
+                "2:\n"
+                EX_TABLE(0b,2b) EX_TABLE(1b,2b)
+                : "+d" (ret)
+                : "d" (__func), "a" (__param) : "cc", "memory");
+        return ret;
+}
+
+
 #endif  /* _CRYPTO_ARCH_S390_CRYPT_S390_H */
diff --git a/arch/s390/crypto/des_check_key.c b/arch/s390/crypto/des_check_key.c
deleted file mode 100644
index 5706af266442..000000000000
--- a/arch/s390/crypto/des_check_key.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Cryptographic API.
- *
- * Function for checking keys for the DES and Tripple DES Encryption
- * algorithms.
- *
- * Originally released as descore by Dana L. How <how@isl.stanford.edu>.
- * Modified by Raimar Falke <rf13@inf.tu-dresden.de> for the Linux-Kernel.
- * Derived from Cryptoapi and Nettle implementations, adapted for in-place
- * scatterlist interface.  Changed LGPL to GPL per section 3 of the LGPL.
- *
- * s390 Version:
- *   Copyright IBM Corp. 2003
- *   Author(s): Thomas Spatzier
- *              Jan Glauber (jan.glauber@de.ibm.com)
- *
- * Derived from "crypto/des.c"
- *   Copyright (c) 1992 Dana L. How.
- *   Copyright (c) Raimar Falke <rf13@inf.tu-dresden.de>
- *   Copyright (c) Gisle Sflensminde <gisle@ii.uib.no>
- *   Copyright (C) 2001 Niels Mvller.
- *   Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
- *
- * 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/module.h>
-#include <linux/errno.h>
-#include <linux/crypto.h>
-#include "crypto_des.h"
-
-#define ROR(d,c,o)      ((d) = (d) >> (c) | (d) << (o))
-
-static const u8 parity[] = {
-        8,1,0,8,0,8,8,0,0,8,8,0,8,0,2,8,0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,3,
-        0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,
-        0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,
-        8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,
-        0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,
-        8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,
-        8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,
-        4,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,8,5,0,8,0,8,8,0,0,8,8,0,8,0,6,8,
-};
-
-/*
- * RFC2451: Weak key checks SHOULD be performed.
- */
-int
-crypto_des_check_key(const u8 *key, unsigned int keylen, u32 *flags)
-{
-        u32 n, w;
-
-        n  = parity[key[0]]; n <<= 4;
-        n |= parity[key[1]]; n <<= 4;
-        n |= parity[key[2]]; n <<= 4;
-        n |= parity[key[3]]; n <<= 4;
-        n |= parity[key[4]]; n <<= 4;
-        n |= parity[key[5]]; n <<= 4;
-        n |= parity[key[6]]; n <<= 4;
-        n |= parity[key[7]];
-        w = 0x88888888L;
-
-        if ((*flags & CRYPTO_TFM_REQ_WEAK_KEY)
-            && !((n - (w >> 3)) & w)) {  /* 1 in 10^10 keys passes this test */
-                if (n < 0x41415151) {
-                        if (n < 0x31312121) {
-                                if (n < 0x14141515) {
-                                        /* 01 01 01 01 01 01 01 01 */
-                                        if (n == 0x11111111) goto weak;
-                                        /* 01 1F 01 1F 01 0E 01 0E */
-                                        if (n == 0x13131212) goto weak;
-                                } else {
-                                        /* 01 E0 01 E0 01 F1 01 F1 */
-                                        if (n == 0x14141515) goto weak;
-                                        /* 01 FE 01 FE 01 FE 01 FE */
-                                        if (n == 0x16161616) goto weak;
-                                }
-                        } else {
-                                if (n < 0x34342525) {
-                                        /* 1F 01 1F 01 0E 01 0E 01 */
-                                        if (n == 0x31312121) goto weak;
-                                        /* 1F 1F 1F 1F 0E 0E 0E 0E (?) */
-                                        if (n == 0x33332222) goto weak;
-                                } else {
-                                        /* 1F E0 1F E0 0E F1 0E F1 */
-                                        if (n == 0x34342525) goto weak;
-                                        /* 1F FE 1F FE 0E FE 0E FE */
-                                        if (n == 0x36362626) goto weak;
-                                }
-                        }
-                } else {
-                        if (n < 0x61616161) {
-                                if (n < 0x44445555) {
-                                        /* E0 01 E0 01 F1 01 F1 01 */
-                                        if (n == 0x41415151) goto weak;
-                                        /* E0 1F E0 1F F1 0E F1 0E */
-                                        if (n == 0x43435252) goto weak;
-                                } else {
-                                        /* E0 E0 E0 E0 F1 F1 F1 F1 (?) */
-                                        if (n == 0x44445555) goto weak;
-                                        /* E0 FE E0 FE F1 FE F1 FE */
-                                        if (n == 0x46465656) goto weak;
-                                }
-                        } else {
-                                if (n < 0x64646565) {
-                                        /* FE 01 FE 01 FE 01 FE 01 */
-                                        if (n == 0x61616161) goto weak;
-                                        /* FE 1F FE 1F FE 0E FE 0E */
-                                        if (n == 0x63636262) goto weak;
-                                } else {
-                                        /* FE E0 FE E0 FE F1 FE F1 */
-                                        if (n == 0x64646565) goto weak;
-                                        /* FE FE FE FE FE FE FE FE */
-                                        if (n == 0x66666666) goto weak;
-                                }
-                        }
-                }
-        }
-        return 0;
-weak:
-        *flags |= CRYPTO_TFM_RES_WEAK_KEY;
-        return -EINVAL;
-}
-
-EXPORT_SYMBOL(crypto_des_check_key);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Key Check function for DES &  DES3 Cipher Algorithms");
diff --git a/arch/s390/crypto/des_s390.c b/arch/s390/crypto/des_s390.c
index cc5420118393..a52bfd124d86 100644
--- a/arch/s390/crypto/des_s390.c
+++ b/arch/s390/crypto/des_s390.c
@@ -3,7 +3,7 @@
  *
  * s390 implementation of the DES Cipher Algorithm.
  *
- * Copyright IBM Corp. 2003,2007
+ * Copyright IBM Corp. 2003,2011
  * Author(s): Thomas Spatzier
  *            Jan Glauber (jan.glauber@de.ibm.com)
  *
@@ -22,22 +22,19 @@
 
 #include "crypt_s390.h"
 
-#define DES3_192_KEY_SIZE       (3 * DES_KEY_SIZE)
+#define DES3_KEY_SIZE   (3 * DES_KEY_SIZE)
 
-struct crypt_s390_des_ctx {
-        u8 iv[DES_BLOCK_SIZE];
-        u8 key[DES_KEY_SIZE];
-};
+static u8 *ctrblk;
 
-struct crypt_s390_des3_192_ctx {
+struct s390_des_ctx {
         u8 iv[DES_BLOCK_SIZE];
-        u8 key[DES3_192_KEY_SIZE];
+        u8 key[DES3_KEY_SIZE];
 };
 
 static int des_setkey(struct crypto_tfm *tfm, const u8 *key,
-                      unsigned int keylen)
+                      unsigned int key_len)
 {
-        struct crypt_s390_des_ctx *dctx = crypto_tfm_ctx(tfm);
+        struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm);
         u32 *flags = &tfm->crt_flags;
         u32 tmp[DES_EXPKEY_WORDS];
 
@@ -47,22 +44,22 @@ static int des_setkey(struct crypto_tfm *tfm, const u8 *key,
                 return -EINVAL;
         }
 
-        memcpy(dctx->key, key, keylen);
+        memcpy(ctx->key, key, key_len);
         return 0;
 }
 
 static void des_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
 {
-        struct crypt_s390_des_ctx *dctx = crypto_tfm_ctx(tfm);
+        struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm);
 
-        crypt_s390_km(KM_DEA_ENCRYPT, dctx->key, out, in, DES_BLOCK_SIZE);
+        crypt_s390_km(KM_DEA_ENCRYPT, ctx->key, out, in, DES_BLOCK_SIZE);
 }
 
 static void des_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
 {
-        struct crypt_s390_des_ctx *dctx = crypto_tfm_ctx(tfm);
+        struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm);
 
-        crypt_s390_km(KM_DEA_DECRYPT, dctx->key, out, in, DES_BLOCK_SIZE);
+        crypt_s390_km(KM_DEA_DECRYPT, ctx->key, out, in, DES_BLOCK_SIZE);
 }
 
 static struct crypto_alg des_alg = {
@@ -71,7 +68,7 @@ static struct crypto_alg des_alg = {
         .cra_priority           =       CRYPT_S390_PRIORITY,
         .cra_flags              =       CRYPTO_ALG_TYPE_CIPHER,
         .cra_blocksize          =       DES_BLOCK_SIZE,
-        .cra_ctxsize            =       sizeof(struct crypt_s390_des_ctx),
+        .cra_ctxsize            =       sizeof(struct s390_des_ctx),
         .cra_module             =       THIS_MODULE,
         .cra_list               =       LIST_HEAD_INIT(des_alg.cra_list),
         .cra_u                  =       {
@@ -86,7 +83,7 @@ static struct crypto_alg des_alg = {
 };
 
 static int ecb_desall_crypt(struct blkcipher_desc *desc, long func,
-                            void *param, struct blkcipher_walk *walk)
+                            u8 *key, struct blkcipher_walk *walk)
 {
         int ret = blkcipher_walk_virt(desc, walk);
         unsigned int nbytes;
@@ -97,7 +94,7 @@ static int ecb_desall_crypt(struct blkcipher_desc *desc, long func,
                 u8 *out = walk->dst.virt.addr;
                 u8 *in = walk->src.virt.addr;
 
-                ret = crypt_s390_km(func, param, out, in, n);
+                ret = crypt_s390_km(func, key, out, in, n);
                 BUG_ON((ret < 0) || (ret != n));
 
                 nbytes &= DES_BLOCK_SIZE - 1;
@@ -108,7 +105,7 @@ static int ecb_desall_crypt(struct blkcipher_desc *desc, long func,
 }
 
 static int cbc_desall_crypt(struct blkcipher_desc *desc, long func,
-                            void *param, struct blkcipher_walk *walk)
+                            u8 *iv, struct blkcipher_walk *walk)
 {
         int ret = blkcipher_walk_virt(desc, walk);
         unsigned int nbytes = walk->nbytes;
@@ -116,20 +113,20 @@ static int cbc_desall_crypt(struct blkcipher_desc *desc, long func,
         if (!nbytes)
                 goto out;
 
-        memcpy(param, walk->iv, DES_BLOCK_SIZE);
+        memcpy(iv, walk->iv, DES_BLOCK_SIZE);
         do {
                 /* only use complete blocks */
                 unsigned int n = nbytes & ~(DES_BLOCK_SIZE - 1);
                 u8 *out = walk->dst.virt.addr;
                 u8 *in = walk->src.virt.addr;
 
-                ret = crypt_s390_kmc(func, param, out, in, n);
+                ret = crypt_s390_kmc(func, iv, out, in, n);
                 BUG_ON((ret < 0) || (ret != n));
 
                 nbytes &= DES_BLOCK_SIZE - 1;
                 ret = blkcipher_walk_done(desc, walk, nbytes);
         } while ((nbytes = walk->nbytes));
-        memcpy(walk->iv, param, DES_BLOCK_SIZE);
+        memcpy(walk->iv, iv, DES_BLOCK_SIZE);
 
 out:
         return ret;
@@ -139,22 +136,22 @@ static int ecb_des_encrypt(struct blkcipher_desc *desc,
                            struct scatterlist *dst, struct scatterlist *src,
                            unsigned int nbytes)
 {
-        struct crypt_s390_des_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);
+        struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
         struct blkcipher_walk walk;
 
         blkcipher_walk_init(&walk, dst, src, nbytes);
-        return ecb_desall_crypt(desc, KM_DEA_ENCRYPT, sctx->key, &walk);
+        return ecb_desall_crypt(desc, KM_DEA_ENCRYPT, ctx->key, &walk);
 }
 
 static int ecb_des_decrypt(struct blkcipher_desc *desc,
                            struct scatterlist *dst, struct scatterlist *src,
                            unsigned int nbytes)
 {
-        struct crypt_s390_des_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);
+        struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
         struct blkcipher_walk walk;
 
         blkcipher_walk_init(&walk, dst, src, nbytes);
-        return ecb_desall_crypt(desc, KM_DEA_DECRYPT, sctx->key, &walk);
+        return ecb_desall_crypt(desc, KM_DEA_DECRYPT, ctx->key, &walk);
 }
 
 static struct crypto_alg ecb_des_alg = {
@@ -163,7 +160,7 @@ static struct crypto_alg ecb_des_alg = {
         .cra_priority           =       CRYPT_S390_COMPOSITE_PRIORITY,
         .cra_flags              =       CRYPTO_ALG_TYPE_BLKCIPHER,
         .cra_blocksize          =       DES_BLOCK_SIZE,
-        .cra_ctxsize            =       sizeof(struct crypt_s390_des_ctx),
+        .cra_ctxsize            =       sizeof(struct s390_des_ctx),
         .cra_type               =       &crypto_blkcipher_type,
         .cra_module             =       THIS_MODULE,
         .cra_list               =       LIST_HEAD_INIT(ecb_des_alg.cra_list),
@@ -182,22 +179,22 @@ static int cbc_des_encrypt(struct blkcipher_desc *desc,
                            struct scatterlist *dst, struct scatterlist *src,
                            unsigned int nbytes)
 {
-        struct crypt_s390_des_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);
+        struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
         struct blkcipher_walk walk;
 
         blkcipher_walk_init(&walk, dst, src, nbytes);
-        return cbc_desall_crypt(desc, KMC_DEA_ENCRYPT, sctx->iv, &walk);
+        return cbc_desall_crypt(desc, KMC_DEA_ENCRYPT, ctx->iv, &walk);
 }
 
 static int cbc_des_decrypt(struct blkcipher_desc *desc,
                            struct scatterlist *dst, struct scatterlist *src,
                            unsigned int nbytes)
 {
-        struct crypt_s390_des_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);
+        struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
         struct blkcipher_walk walk;
 
         blkcipher_walk_init(&walk, dst, src, nbytes);
-        return cbc_desall_crypt(desc, KMC_DEA_DECRYPT, sctx->iv, &walk);
+        return cbc_desall_crypt(desc, KMC_DEA_DECRYPT, ctx->iv, &walk);
 }
 
 static struct crypto_alg cbc_des_alg = {
@@ -206,7 +203,7 @@ static struct crypto_alg cbc_des_alg = {
         .cra_priority           =       CRYPT_S390_COMPOSITE_PRIORITY,
         .cra_flags              =       CRYPTO_ALG_TYPE_BLKCIPHER,
         .cra_blocksize          =       DES_BLOCK_SIZE,
-        .cra_ctxsize            =       sizeof(struct crypt_s390_des_ctx),
+        .cra_ctxsize            =       sizeof(struct s390_des_ctx),
         .cra_type               =       &crypto_blkcipher_type,
         .cra_module             =       THIS_MODULE,
         .cra_list               =       LIST_HEAD_INIT(cbc_des_alg.cra_list),
@@ -235,10 +232,10 @@ static struct crypto_alg cbc_des_alg = {
  *   property.
  *
  */
-static int des3_192_setkey(struct crypto_tfm *tfm, const u8 *key,
-                           unsigned int keylen)
+static int des3_setkey(struct crypto_tfm *tfm, const u8 *key,
+                       unsigned int key_len)
 {
-        struct crypt_s390_des3_192_ctx *dctx = crypto_tfm_ctx(tfm);
+        struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm);
         u32 *flags = &tfm->crt_flags;
 
         if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&
@@ -248,141 +245,276 @@ static int des3_192_setkey(struct crypto_tfm *tfm, const u8 *key,
                 *flags |= CRYPTO_TFM_RES_WEAK_KEY;
                 return -EINVAL;
         }
-        memcpy(dctx->key, key, keylen);
+        memcpy(ctx->key, key, key_len);
         return 0;
 }
 
-static void des3_192_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
+static void des3_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
-        struct crypt_s390_des3_192_ctx *dctx = crypto_tfm_ctx(tfm);
+        struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm);
 
-        crypt_s390_km(KM_TDEA_192_ENCRYPT, dctx->key, dst, (void*)src,
-                      DES_BLOCK_SIZE);
+        crypt_s390_km(KM_TDEA_192_ENCRYPT, ctx->key, dst, src, DES_BLOCK_SIZE);
 }
 
-static void des3_192_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
+static void des3_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
-        struct crypt_s390_des3_192_ctx *dctx = crypto_tfm_ctx(tfm);
+        struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm);
 
-        crypt_s390_km(KM_TDEA_192_DECRYPT, dctx->key, dst, (void*)src,
-                      DES_BLOCK_SIZE);
+        crypt_s390_km(KM_TDEA_192_DECRYPT, ctx->key, dst, src, DES_BLOCK_SIZE);
 }
 
-static struct crypto_alg des3_192_alg = {
+static struct crypto_alg des3_alg = {
         .cra_name               =       "des3_ede",
         .cra_driver_name        =       "des3_ede-s390",
         .cra_priority           =       CRYPT_S390_PRIORITY,
         .cra_flags              =       CRYPTO_ALG_TYPE_CIPHER,
         .cra_blocksize          =       DES_BLOCK_SIZE,
-        .cra_ctxsize            =       sizeof(struct crypt_s390_des3_192_ctx),
+        .cra_ctxsize            =       sizeof(struct s390_des_ctx),
         .cra_module             =       THIS_MODULE,
-        .cra_list               =       LIST_HEAD_INIT(des3_192_alg.cra_list),
+        .cra_list               =       LIST_HEAD_INIT(des3_alg.cra_list),
         .cra_u                  =       {
                 .cipher = {
-                        .cia_min_keysize        =       DES3_192_KEY_SIZE,
-                        .cia_max_keysize        =       DES3_192_KEY_SIZE,
-                        .cia_setkey             =       des3_192_setkey,
-                        .cia_encrypt            =       des3_192_encrypt,
-                        .cia_decrypt            =       des3_192_decrypt,
+                        .cia_min_keysize        =       DES3_KEY_SIZE,
+                        .cia_max_keysize        =       DES3_KEY_SIZE,
+                        .cia_setkey             =       des3_setkey,
+                        .cia_encrypt            =       des3_encrypt,
+                        .cia_decrypt            =       des3_decrypt,
                 }
         }
 };
 
-static int ecb_des3_192_encrypt(struct blkcipher_desc *desc,
-                                struct scatterlist *dst,
-                                struct scatterlist *src, unsigned int nbytes)
+static int ecb_des3_encrypt(struct blkcipher_desc *desc,
+                            struct scatterlist *dst, struct scatterlist *src,
+                            unsigned int nbytes)
 {
-        struct crypt_s390_des3_192_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);
+        struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
         struct blkcipher_walk walk;
 
         blkcipher_walk_init(&walk, dst, src, nbytes);
-        return ecb_desall_crypt(desc, KM_TDEA_192_ENCRYPT, sctx->key, &walk);
+        return ecb_desall_crypt(desc, KM_TDEA_192_ENCRYPT, ctx->key, &walk);
 }
 
-static int ecb_des3_192_decrypt(struct blkcipher_desc *desc,
-                                struct scatterlist *dst,
-                                struct scatterlist *src, unsigned int nbytes)
+static int ecb_des3_decrypt(struct blkcipher_desc *desc,
+                            struct scatterlist *dst, struct scatterlist *src,
+                            unsigned int nbytes)
 {
-        struct crypt_s390_des3_192_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);
+        struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
         struct blkcipher_walk walk;
 
         blkcipher_walk_init(&walk, dst, src, nbytes);
-        return ecb_desall_crypt(desc, KM_TDEA_192_DECRYPT, sctx->key, &walk);
+        return ecb_desall_crypt(desc, KM_TDEA_192_DECRYPT, ctx->key, &walk);
 }
 
-static struct crypto_alg ecb_des3_192_alg = {
+static struct crypto_alg ecb_des3_alg = {
         .cra_name               =       "ecb(des3_ede)",
         .cra_driver_name        =       "ecb-des3_ede-s390",
         .cra_priority           =       CRYPT_S390_COMPOSITE_PRIORITY,
         .cra_flags              =       CRYPTO_ALG_TYPE_BLKCIPHER,
         .cra_blocksize          =       DES_BLOCK_SIZE,
-        .cra_ctxsize            =       sizeof(struct crypt_s390_des3_192_ctx),
+        .cra_ctxsize            =       sizeof(struct s390_des_ctx),
         .cra_type               =       &crypto_blkcipher_type,
         .cra_module             =       THIS_MODULE,
         .cra_list               =       LIST_HEAD_INIT(
-                                                ecb_des3_192_alg.cra_list),
+                                                ecb_des3_alg.cra_list),
         .cra_u                  =       {
                 .blkcipher = {
-                        .min_keysize            =       DES3_192_KEY_SIZE,
-                        .max_keysize            =       DES3_192_KEY_SIZE,
-                        .setkey                 =       des3_192_setkey,
-                        .encrypt                =       ecb_des3_192_encrypt,
-                        .decrypt                =       ecb_des3_192_decrypt,
+                        .min_keysize            =       DES3_KEY_SIZE,
+                        .max_keysize            =       DES3_KEY_SIZE,
+                        .setkey                 =       des3_setkey,
+                        .encrypt                =       ecb_des3_encrypt,
+                        .decrypt                =       ecb_des3_decrypt,
                 }
         }
 };
 
-static int cbc_des3_192_encrypt(struct blkcipher_desc *desc,
-                                struct scatterlist *dst,
-                                struct scatterlist *src, unsigned int nbytes)
+static int cbc_des3_encrypt(struct blkcipher_desc *desc,
+                            struct scatterlist *dst, struct scatterlist *src,
+                            unsigned int nbytes)
 {
-        struct crypt_s390_des3_192_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);
+        struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
         struct blkcipher_walk walk;
 
         blkcipher_walk_init(&walk, dst, src, nbytes);
-        return cbc_desall_crypt(desc, KMC_TDEA_192_ENCRYPT, sctx->iv, &walk);
+        return cbc_desall_crypt(desc, KMC_TDEA_192_ENCRYPT, ctx->iv, &walk);
 }
 
-static int cbc_des3_192_decrypt(struct blkcipher_desc *desc,
-                                struct scatterlist *dst,
-                                struct scatterlist *src, unsigned int nbytes)
+static int cbc_des3_decrypt(struct blkcipher_desc *desc,
+                            struct scatterlist *dst, struct scatterlist *src,
+                            unsigned int nbytes)
 {
-        struct crypt_s390_des3_192_ctx *sctx = crypto_blkcipher_ctx(desc->tfm);
+        struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
         struct blkcipher_walk walk;
 
         blkcipher_walk_init(&walk, dst, src, nbytes);
-        return cbc_desall_crypt(desc, KMC_TDEA_192_DECRYPT, sctx->iv, &walk);
+        return cbc_desall_crypt(desc, KMC_TDEA_192_DECRYPT, ctx->iv, &walk);
 }
 
-static struct crypto_alg cbc_des3_192_alg = {
+static struct crypto_alg cbc_des3_alg = {
         .cra_name               =       "cbc(des3_ede)",
         .cra_driver_name        =       "cbc-des3_ede-s390",
         .cra_priority           =       CRYPT_S390_COMPOSITE_PRIORITY,
         .cra_flags              =       CRYPTO_ALG_TYPE_BLKCIPHER,
         .cra_blocksize          =       DES_BLOCK_SIZE,
-        .cra_ctxsize            =       sizeof(struct crypt_s390_des3_192_ctx),
+        .cra_ctxsize            =       sizeof(struct s390_des_ctx),
         .cra_type               =       &crypto_blkcipher_type,
         .cra_module             =       THIS_MODULE,
         .cra_list               =       LIST_HEAD_INIT(
-                                                cbc_des3_192_alg.cra_list),
+                                                cbc_des3_alg.cra_list),
         .cra_u                  =       {
                 .blkcipher = {
-                        .min_keysize            =       DES3_192_KEY_SIZE,
-                        .max_keysize            =       DES3_192_KEY_SIZE,
+                        .min_keysize            =       DES3_KEY_SIZE,
+                        .max_keysize            =       DES3_KEY_SIZE,
                         .ivsize                 =       DES_BLOCK_SIZE,
-                        .setkey                 =       des3_192_setkey,
-                        .encrypt                =       cbc_des3_192_encrypt,
-                        .decrypt                =       cbc_des3_192_decrypt,
+                        .setkey                 =       des3_setkey,
+                        .encrypt                =       cbc_des3_encrypt,
+                        .decrypt                =       cbc_des3_decrypt,
                 }
         }
 };
 
-static int des_s390_init(void)
+static int ctr_desall_crypt(struct blkcipher_desc *desc, long func,
+                            struct s390_des_ctx *ctx, struct blkcipher_walk *walk)
+{
+        int ret = blkcipher_walk_virt_block(desc, walk, DES_BLOCK_SIZE);
+        unsigned int i, n, nbytes;
+        u8 buf[DES_BLOCK_SIZE];
+        u8 *out, *in;
+
+        memcpy(ctrblk, walk->iv, DES_BLOCK_SIZE);
+        while ((nbytes = walk->nbytes) >= DES_BLOCK_SIZE) {
+                out = walk->dst.virt.addr;
+                in = walk->src.virt.addr;
+                while (nbytes >= DES_BLOCK_SIZE) {
+                        /* align to block size, max. PAGE_SIZE */
+                        n = (nbytes > PAGE_SIZE) ? PAGE_SIZE :
+                                nbytes & ~(DES_BLOCK_SIZE - 1);
+                        for (i = DES_BLOCK_SIZE; i < n; i += DES_BLOCK_SIZE) {
+                                memcpy(ctrblk + i, ctrblk + i - DES_BLOCK_SIZE,
+                                       DES_BLOCK_SIZE);
+                                crypto_inc(ctrblk + i, DES_BLOCK_SIZE);
+                        }
+                        ret = crypt_s390_kmctr(func, ctx->key, out, in, n, ctrblk);
+                        BUG_ON((ret < 0) || (ret != n));
+                        if (n > DES_BLOCK_SIZE)
+                                memcpy(ctrblk, ctrblk + n - DES_BLOCK_SIZE,
+                                       DES_BLOCK_SIZE);
+                        crypto_inc(ctrblk, DES_BLOCK_SIZE);
+                        out += n;
+                        in += n;
+                        nbytes -= n;
+                }
+                ret = blkcipher_walk_done(desc, walk, nbytes);
+        }
+
+        /* final block may be < DES_BLOCK_SIZE, copy only nbytes */
+        if (nbytes) {
+                out = walk->dst.virt.addr;
+                in = walk->src.virt.addr;
+                ret = crypt_s390_kmctr(func, ctx->key, buf, in,
+                                       DES_BLOCK_SIZE, ctrblk);
+                BUG_ON(ret < 0 || ret != DES_BLOCK_SIZE);
+                memcpy(out, buf, nbytes);
+                crypto_inc(ctrblk, DES_BLOCK_SIZE);
+                ret = blkcipher_walk_done(desc, walk, 0);
+        }
+        memcpy(walk->iv, ctrblk, DES_BLOCK_SIZE);
+        return ret;
+}
+
+static int ctr_des_encrypt(struct blkcipher_desc *desc,
+                           struct scatterlist *dst, struct scatterlist *src,
+                           unsigned int nbytes)
+{
+        struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+        struct blkcipher_walk walk;
+
+        blkcipher_walk_init(&walk, dst, src, nbytes);
+        return ctr_desall_crypt(desc, KMCTR_DEA_ENCRYPT, ctx, &walk);
+}
+
+static int ctr_des_decrypt(struct blkcipher_desc *desc,
+                           struct scatterlist *dst, struct scatterlist *src,
+                           unsigned int nbytes)
+{
+        struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+        struct blkcipher_walk walk;
+
+        blkcipher_walk_init(&walk, dst, src, nbytes);
+        return ctr_desall_crypt(desc, KMCTR_DEA_DECRYPT, ctx, &walk);
+}
+
+static struct crypto_alg ctr_des_alg = {
+        .cra_name               =       "ctr(des)",
+        .cra_driver_name        =       "ctr-des-s390",
+        .cra_priority           =       CRYPT_S390_COMPOSITE_PRIORITY,
+        .cra_flags              =       CRYPTO_ALG_TYPE_BLKCIPHER,
+        .cra_blocksize          =       1,
+        .cra_ctxsize            =       sizeof(struct s390_des_ctx),
+        .cra_type               =       &crypto_blkcipher_type,
+        .cra_module             =       THIS_MODULE,
+        .cra_list               =       LIST_HEAD_INIT(ctr_des_alg.cra_list),
+        .cra_u                  =       {
+                .blkcipher = {
+                        .min_keysize            =       DES_KEY_SIZE,
+                        .max_keysize            =       DES_KEY_SIZE,
+                        .ivsize                 =       DES_BLOCK_SIZE,
+                        .setkey                 =       des_setkey,
+                        .encrypt                =       ctr_des_encrypt,
+                        .decrypt                =       ctr_des_decrypt,
+                }
+        }
+};
+
+static int ctr_des3_encrypt(struct blkcipher_desc *desc,
+                            struct scatterlist *dst, struct scatterlist *src,
+                            unsigned int nbytes)
+{
+        struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+        struct blkcipher_walk walk;
+
+        blkcipher_walk_init(&walk, dst, src, nbytes);
+        return ctr_desall_crypt(desc, KMCTR_TDEA_192_ENCRYPT, ctx, &walk);
+}
+
+static int ctr_des3_decrypt(struct blkcipher_desc *desc,
+                            struct scatterlist *dst, struct scatterlist *src,
+                            unsigned int nbytes)
+{
+        struct s390_des_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+        struct blkcipher_walk walk;
+
+        blkcipher_walk_init(&walk, dst, src, nbytes);
+        return ctr_desall_crypt(desc, KMCTR_TDEA_192_DECRYPT, ctx, &walk);
+}
+
+static struct crypto_alg ctr_des3_alg = {
+        .cra_name               =       "ctr(des3_ede)",
+        .cra_driver_name        =       "ctr-des3_ede-s390",
+        .cra_priority           =       CRYPT_S390_COMPOSITE_PRIORITY,
+        .cra_flags              =       CRYPTO_ALG_TYPE_BLKCIPHER,
+        .cra_blocksize          =       1,
+        .cra_ctxsize            =       sizeof(struct s390_des_ctx),
+        .cra_type               =       &crypto_blkcipher_type,
+        .cra_module             =       THIS_MODULE,
+        .cra_list               =       LIST_HEAD_INIT(ctr_des3_alg.cra_list),
+        .cra_u                  =       {
+                .blkcipher = {
+                        .min_keysize            =       DES3_KEY_SIZE,
+                        .max_keysize            =       DES3_KEY_SIZE,
+                        .ivsize                 =       DES_BLOCK_SIZE,
+                        .setkey                 =       des3_setkey,
+                        .encrypt                =       ctr_des3_encrypt,
+                        .decrypt                =       ctr_des3_decrypt,
+                }
+        }
+};
+
+static int __init des_s390_init(void)
 {
         int ret;
 
-        if (!crypt_s390_func_available(KM_DEA_ENCRYPT) ||
-            !crypt_s390_func_available(KM_TDEA_192_ENCRYPT))
+        if (!crypt_s390_func_available(KM_DEA_ENCRYPT, CRYPT_S390_MSA) ||
+            !crypt_s390_func_available(KM_TDEA_192_ENCRYPT, CRYPT_S390_MSA))
                 return -EOPNOTSUPP;
 
         ret = crypto_register_alg(&des_alg);
@@ -394,23 +526,46 @@ static int des_s390_init(void)
         ret = crypto_register_alg(&cbc_des_alg);
         if (ret)
                 goto cbc_des_err;
-        ret = crypto_register_alg(&des3_192_alg);
+        ret = crypto_register_alg(&des3_alg);
         if (ret)
-                goto des3_192_err;
-        ret = crypto_register_alg(&ecb_des3_192_alg);
+                goto des3_err;
+        ret = crypto_register_alg(&ecb_des3_alg);
         if (ret)
-                goto ecb_des3_192_err;
-        ret = crypto_register_alg(&cbc_des3_192_alg);
+                goto ecb_des3_err;
+        ret = crypto_register_alg(&cbc_des3_alg);
         if (ret)
-                goto cbc_des3_192_err;
+                goto cbc_des3_err;
+
+        if (crypt_s390_func_available(KMCTR_DEA_ENCRYPT,
+                        CRYPT_S390_MSA | CRYPT_S390_MSA4) &&
+            crypt_s390_func_available(KMCTR_TDEA_192_ENCRYPT,
+                        CRYPT_S390_MSA | CRYPT_S390_MSA4)) {
+                ret = crypto_register_alg(&ctr_des_alg);
+                if (ret)
+                        goto ctr_des_err;
+                ret = crypto_register_alg(&ctr_des3_alg);
+                if (ret)
+                        goto ctr_des3_err;
+                ctrblk = (u8 *) __get_free_page(GFP_KERNEL);
+                if (!ctrblk) {
+                        ret = -ENOMEM;
+                        goto ctr_mem_err;
+                }
+        }
 out:
         return ret;
 
-cbc_des3_192_err:
-        crypto_unregister_alg(&ecb_des3_192_alg);
-ecb_des3_192_err:
-        crypto_unregister_alg(&des3_192_alg);
-des3_192_err:
+ctr_mem_err:
+        crypto_unregister_alg(&ctr_des3_alg);
+ctr_des3_err:
+        crypto_unregister_alg(&ctr_des_alg);
+ctr_des_err:
+        crypto_unregister_alg(&cbc_des3_alg);
+cbc_des3_err:
+        crypto_unregister_alg(&ecb_des3_alg);
+ecb_des3_err:
+        crypto_unregister_alg(&des3_alg);
+des3_err:
         crypto_unregister_alg(&cbc_des_alg);
 cbc_des_err:
         crypto_unregister_alg(&ecb_des_alg);
@@ -422,9 +577,14 @@ des_err:
 
 static void __exit des_s390_exit(void)
 {
-        crypto_unregister_alg(&cbc_des3_192_alg);
-        crypto_unregister_alg(&ecb_des3_192_alg);
-        crypto_unregister_alg(&des3_192_alg);
+        if (ctrblk) {
+                crypto_unregister_alg(&ctr_des_alg);
+                crypto_unregister_alg(&ctr_des3_alg);
+                free_page((unsigned long) ctrblk);
+        }
+        crypto_unregister_alg(&cbc_des3_alg);
+        crypto_unregister_alg(&ecb_des3_alg);
+        crypto_unregister_alg(&des3_alg);
         crypto_unregister_alg(&cbc_des_alg);
         crypto_unregister_alg(&ecb_des_alg);
         crypto_unregister_alg(&des_alg);
diff --git a/arch/s390/crypto/ghash_s390.c b/arch/s390/crypto/ghash_s390.c
new file mode 100644
index 000000000000..b1bd170f24b1
--- /dev/null
+++ b/arch/s390/crypto/ghash_s390.c
@@ -0,0 +1,162 @@
+/*
+ * Cryptographic API.
+ *
+ * s390 implementation of the GHASH algorithm for GCM (Galois/Counter Mode).
+ *
+ * Copyright IBM Corp. 2011
+ * Author(s): Gerald Schaefer <gerald.schaefer@de.ibm.com>
+ */
+
+#include <crypto/internal/hash.h>
+#include <linux/module.h>
+
+#include "crypt_s390.h"
+
+#define GHASH_BLOCK_SIZE        16
+#define GHASH_DIGEST_SIZE       16
+
+struct ghash_ctx {
+        u8 icv[16];
+        u8 key[16];
+};
+
+struct ghash_desc_ctx {
+        u8 buffer[GHASH_BLOCK_SIZE];
+        u32 bytes;
+};
+
+static int ghash_init(struct shash_desc *desc)
+{
+        struct ghash_desc_ctx *dctx = shash_desc_ctx(desc);
+
+        memset(dctx, 0, sizeof(*dctx));
+
+        return 0;
+}
+
+static int ghash_setkey(struct crypto_shash *tfm,
+                        const u8 *key, unsigned int keylen)
+{
+        struct ghash_ctx *ctx = crypto_shash_ctx(tfm);
+
+        if (keylen != GHASH_BLOCK_SIZE) {
+                crypto_shash_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
+                return -EINVAL;
+        }
+
+        memcpy(ctx->key, key, GHASH_BLOCK_SIZE);
+        memset(ctx->icv, 0, GHASH_BLOCK_SIZE);
+
+        return 0;
+}
+
+static int ghash_update(struct shash_desc *desc,
+                         const u8 *src, unsigned int srclen)
+{
+        struct ghash_desc_ctx *dctx = shash_desc_ctx(desc);
+        struct ghash_ctx *ctx = crypto_shash_ctx(desc->tfm);
+        unsigned int n;
+        u8 *buf = dctx->buffer;
+        int ret;
+
+        if (dctx->bytes) {
+                u8 *pos = buf + (GHASH_BLOCK_SIZE - dctx->bytes);
+
+                n = min(srclen, dctx->bytes);
+                dctx->bytes -= n;
+                srclen -= n;
+
+                memcpy(pos, src, n);
+                src += n;
+
+                if (!dctx->bytes) {
+                        ret = crypt_s390_kimd(KIMD_GHASH, ctx, buf,
+                                              GHASH_BLOCK_SIZE);
+                        BUG_ON(ret != GHASH_BLOCK_SIZE);
+                }
+        }
+
+        n = srclen & ~(GHASH_BLOCK_SIZE - 1);
+        if (n) {
+                ret = crypt_s390_kimd(KIMD_GHASH, ctx, src, n);
+                BUG_ON(ret != n);
+                src += n;
+                srclen -= n;
+        }
+
+        if (srclen) {
+                dctx->bytes = GHASH_BLOCK_SIZE - srclen;
+                memcpy(buf, src, srclen);
+        }
+
+        return 0;
+}
+
+static void ghash_flush(struct ghash_ctx *ctx, struct ghash_desc_ctx *dctx)
+{
+        u8 *buf = dctx->buffer;
+        int ret;
+
+        if (dctx->bytes) {
+                u8 *pos = buf + (GHASH_BLOCK_SIZE - dctx->bytes);
+
+                memset(pos, 0, dctx->bytes);
+
+                ret = crypt_s390_kimd(KIMD_GHASH, ctx, buf, GHASH_BLOCK_SIZE);
+                BUG_ON(ret != GHASH_BLOCK_SIZE);
+        }
+
+        dctx->bytes = 0;
+}
+
+static int ghash_final(struct shash_desc *desc, u8 *dst)
+{
+        struct ghash_desc_ctx *dctx = shash_desc_ctx(desc);
+        struct ghash_ctx *ctx = crypto_shash_ctx(desc->tfm);
+
+        ghash_flush(ctx, dctx);
+        memcpy(dst, ctx->icv, GHASH_BLOCK_SIZE);
+
+        return 0;
+}
+
+static struct shash_alg ghash_alg = {
+        .digestsize     = GHASH_DIGEST_SIZE,
+        .init           = ghash_init,
+        .update         = ghash_update,
+        .final          = ghash_final,
+        .setkey         = ghash_setkey,
+        .descsize       = sizeof(struct ghash_desc_ctx),
+        .base           = {
+                .cra_name               = "ghash",
+                .cra_driver_name        = "ghash-s390",
+                .cra_priority           = CRYPT_S390_PRIORITY,
+                .cra_flags              = CRYPTO_ALG_TYPE_SHASH,
+                .cra_blocksize          = GHASH_BLOCK_SIZE,
+                .cra_ctxsize            = sizeof(struct ghash_ctx),
+                .cra_module             = THIS_MODULE,
+                .cra_list               = LIST_HEAD_INIT(ghash_alg.base.cra_list),
+        },
+};
+
+static int __init ghash_mod_init(void)
+{
+        if (!crypt_s390_func_available(KIMD_GHASH,
+                                       CRYPT_S390_MSA | CRYPT_S390_MSA4))
+                return -EOPNOTSUPP;
+
+        return crypto_register_shash(&ghash_alg);
+}
+
+static void __exit ghash_mod_exit(void)
+{
+        crypto_unregister_shash(&ghash_alg);
+}
+
+module_init(ghash_mod_init);
+module_exit(ghash_mod_exit);
+
+MODULE_ALIAS("ghash");
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("GHASH Message Digest Algorithm, s390 implementation");
diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c
index 8b16c479585b..0808fbf0f7d3 100644
--- a/arch/s390/crypto/prng.c
+++ b/arch/s390/crypto/prng.c
@@ -166,7 +166,7 @@ static int __init prng_init(void)
         int ret;
 
         /* check if the CPU has a PRNG */
-        if (!crypt_s390_func_available(KMC_PRNG))
+        if (!crypt_s390_func_available(KMC_PRNG, CRYPT_S390_MSA))
                 return -EOPNOTSUPP;
 
         if (prng_chunk_size < 8)
diff --git a/arch/s390/crypto/sha1_s390.c b/arch/s390/crypto/sha1_s390.c
index f6de7826c979..e9868c6e0a08 100644
--- a/arch/s390/crypto/sha1_s390.c
+++ b/arch/s390/crypto/sha1_s390.c
@@ -90,7 +90,7 @@ static struct shash_alg alg = {
 
 static int __init sha1_s390_init(void)
 {
-        if (!crypt_s390_func_available(KIMD_SHA_1))
+        if (!crypt_s390_func_available(KIMD_SHA_1, CRYPT_S390_MSA))
                 return -EOPNOTSUPP;
         return crypto_register_shash(&alg);
 }
diff --git a/arch/s390/crypto/sha256_s390.c b/arch/s390/crypto/sha256_s390.c
index 61a7db372121..5ed8d64fc2ed 100644
--- a/arch/s390/crypto/sha256_s390.c
+++ b/arch/s390/crypto/sha256_s390.c
@@ -86,7 +86,7 @@ static struct shash_alg alg = {
 
 static int sha256_s390_init(void)
 {
-        if (!crypt_s390_func_available(KIMD_SHA_256))
+        if (!crypt_s390_func_available(KIMD_SHA_256, CRYPT_S390_MSA))
                 return -EOPNOTSUPP;
 
         return crypto_register_shash(&alg);
diff --git a/arch/s390/crypto/sha512_s390.c b/arch/s390/crypto/sha512_s390.c
index 4bf73d0dc525..32a81383b69c 100644
--- a/arch/s390/crypto/sha512_s390.c
+++ b/arch/s390/crypto/sha512_s390.c
@@ -132,7 +132,7 @@ static int __init init(void)
 {
         int ret;
 
-        if (!crypt_s390_func_available(KIMD_SHA_512))
+        if (!crypt_s390_func_available(KIMD_SHA_512, CRYPT_S390_MSA))
                 return -EOPNOTSUPP;
         if ((ret = crypto_register_shash(&sha512_alg)) < 0)
                 goto out;
diff --git a/arch/s390/hypfs/hypfs.h b/arch/s390/hypfs/hypfs.h
index 80c1526f2af3..d9df5a060a83 100644
--- a/arch/s390/hypfs/hypfs.h
+++ b/arch/s390/hypfs/hypfs.h
@@ -47,7 +47,7 @@ struct hypfs_dbfs_data {
         void                    *buf;
         void                    *buf_free_ptr;
         size_t                  size;
-        struct hypfs_dbfs_file  *dbfs_file;;
+        struct hypfs_dbfs_file  *dbfs_file;
         struct kref             kref;
 };
 
diff --git a/arch/s390/include/asm/cacheflush.h b/arch/s390/include/asm/cacheflush.h
index 43a5c78046db..3e20383d0921 100644
--- a/arch/s390/include/asm/cacheflush.h
+++ b/arch/s390/include/asm/cacheflush.h
@@ -11,5 +11,6 @@ void kernel_map_pages(struct page *page, int numpages, int enable);
 int set_memory_ro(unsigned long addr, int numpages);
 int set_memory_rw(unsigned long addr, int numpages);
 int set_memory_nx(unsigned long addr, int numpages);
+int set_memory_x(unsigned long addr, int numpages);
 
 #endif /* _S390_CACHEFLUSH_H */
diff --git a/arch/s390/include/asm/cmpxchg.h b/arch/s390/include/asm/cmpxchg.h
index 7488e52efa97..81d7908416cf 100644
--- a/arch/s390/include/asm/cmpxchg.h
+++ b/arch/s390/include/asm/cmpxchg.h
@@ -167,7 +167,6 @@ static inline unsigned long __cmpxchg(void *ptr, unsigned long old,
 #ifdef CONFIG_64BIT
 #define cmpxchg64(ptr, o, n)                                            \
 ({                                                                      \
-        BUILD_BUG_ON(sizeof(*(ptr)) != 8);                              \
         cmpxchg((ptr), (o), (n));                                       \
 })
 #else /* CONFIG_64BIT */
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index 10c029cfcc7d..64b61bf72e93 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -196,18 +196,6 @@ do {								\
 } while (0)
 #endif /* __s390x__ */
 
-/*
- * An executable for which elf_read_implies_exec() returns TRUE will
- * have the READ_IMPLIES_EXEC personality flag set automatically.
- */
-#define elf_read_implies_exec(ex, executable_stack)     \
-({                                                      \
-        if (current->mm->context.noexec &&              \
-            executable_stack != EXSTACK_DISABLE_X)      \
-                disable_noexec(current->mm, current);   \
-        current->mm->context.noexec == 0;               \
-})
-
 #define STACK_RND_MASK  0x7ffUL
 
 #define ARCH_DLINFO                                                         \
diff --git a/arch/s390/include/asm/ftrace.h b/arch/s390/include/asm/ftrace.h
index 3c29be4836ed..b7931faaef6d 100644
--- a/arch/s390/include/asm/ftrace.h
+++ b/arch/s390/include/asm/ftrace.h
@@ -11,15 +11,13 @@ struct dyn_arch_ftrace { };
 
 #ifdef CONFIG_64BIT
 #define MCOUNT_INSN_SIZE  12
-#define MCOUNT_OFFSET      8
 #else
 #define MCOUNT_INSN_SIZE  20
-#define MCOUNT_OFFSET      4
 #endif
 
 static inline unsigned long ftrace_call_adjust(unsigned long addr)
 {
-        return addr - MCOUNT_OFFSET;
+        return addr;
 }
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h
index b56403c2df28..799ed0f1643d 100644
--- a/arch/s390/include/asm/hugetlb.h
+++ b/arch/s390/include/asm/hugetlb.h
@@ -111,21 +111,10 @@ static inline void huge_ptep_invalidate(struct mm_struct *mm,
 {
         pmd_t *pmdp = (pmd_t *) ptep;
 
-        if (!MACHINE_HAS_IDTE) {
-                __pmd_csp(pmdp);
-                if (mm->context.noexec) {
-                        pmdp = get_shadow_table(pmdp);
-                        __pmd_csp(pmdp);
-                }
-                return;
-        }
-
-        __pmd_idte(address, pmdp);
-        if (mm->context.noexec) {
-                pmdp = get_shadow_table(pmdp);
+        if (MACHINE_HAS_IDTE)
                 __pmd_idte(address, pmdp);
-        }
-        return;
+        else
+                __pmd_csp(pmdp);
 }
 
 #define huge_ptep_set_access_flags(__vma, __addr, __ptep, __entry, __dirty) \
diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index db14a311f1d2..1544b90bd6d6 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -15,6 +15,7 @@ enum interruption_class {
         EXTINT_VRT,
         EXTINT_SCP,
         EXTINT_IUC,
+        EXTINT_CPM,
         IOINT_QAI,
         IOINT_QDI,
         IOINT_DAS,
diff --git a/arch/s390/include/asm/jump_label.h b/arch/s390/include/asm/jump_label.h
new file mode 100644
index 000000000000..95a6cf2b5b67
--- /dev/null
+++ b/arch/s390/include/asm/jump_label.h
@@ -0,0 +1,37 @@
+#ifndef _ASM_S390_JUMP_LABEL_H
+#define _ASM_S390_JUMP_LABEL_H
+
+#include <linux/types.h>
+
+#define JUMP_LABEL_NOP_SIZE 6
+
+#ifdef CONFIG_64BIT
+#define ASM_PTR ".quad"
+#define ASM_ALIGN ".balign 8"
+#else
+#define ASM_PTR ".long"
+#define ASM_ALIGN ".balign 4"
+#endif
+
+static __always_inline bool arch_static_branch(struct jump_label_key *key)
+{
+        asm goto("0:    brcl 0,0\n"
+                ".pushsection __jump_table, \"aw\"\n"
+                ASM_ALIGN "\n"
+                ASM_PTR " 0b, %l[label], %0\n"
+                ".popsection\n"
+                : : "X" (key) : : label);
+        return false;
+label:
+        return true;
+}
+
+typedef unsigned long jump_label_t;
+
+struct jump_entry {
+        jump_label_t code;
+        jump_label_t target;
+        jump_label_t key;
+};
+
+#endif
diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h
index 65e172f8209d..228cf0b295db 100644
--- a/arch/s390/include/asm/lowcore.h
+++ b/arch/s390/include/asm/lowcore.h
@@ -124,7 +124,7 @@ struct _lowcore {
         /* Address space pointer. */
         __u32   kernel_asce;                    /* 0x02ac */
         __u32   user_asce;                      /* 0x02b0 */
-        __u32   user_exec_asce;                 /* 0x02b4 */
+        __u32   current_pid;                    /* 0x02b4 */
 
         /* SMP info area */
         __u32   cpu_nr;                         /* 0x02b8 */
@@ -255,7 +255,7 @@ struct _lowcore {
         /* Address space pointer. */
         __u64   kernel_asce;                    /* 0x0310 */
         __u64   user_asce;                      /* 0x0318 */
-        __u64   user_exec_asce;                 /* 0x0320 */
+        __u64   current_pid;                    /* 0x0320 */
 
         /* SMP info area */
         __u32   cpu_nr;                         /* 0x0328 */
diff --git a/arch/s390/include/asm/mmu.h b/arch/s390/include/asm/mmu.h
index 78522cdefdd4..82d0847896a0 100644
--- a/arch/s390/include/asm/mmu.h
+++ b/arch/s390/include/asm/mmu.h
@@ -5,19 +5,18 @@ typedef struct {
         atomic_t attach_count;
         unsigned int flush_mm;
         spinlock_t list_lock;
-        struct list_head crst_list;
         struct list_head pgtable_list;
         unsigned long asce_bits;
         unsigned long asce_limit;
         unsigned long vdso_base;
-        int noexec;
-        int has_pgste;   /* The mmu context has extended page tables */
-        int alloc_pgste; /* cloned contexts will have extended page tables */
+        /* Cloned contexts will be created with extended page tables. */
+        unsigned int alloc_pgste:1;
+        /* The mmu context has extended page tables. */
+        unsigned int has_pgste:1;
 } mm_context_t;
 
 #define INIT_MM_CONTEXT(name)                                                 \
         .context.list_lock    = __SPIN_LOCK_UNLOCKED(name.context.list_lock), \
-        .context.crst_list    = LIST_HEAD_INIT(name.context.crst_list),       \
         .context.pgtable_list = LIST_HEAD_INIT(name.context.pgtable_list),
 
 #endif
diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h
index 8c277caa8d3a..5682f160ff82 100644
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@ -35,11 +35,9 @@ static inline int init_new_context(struct task_struct *tsk,
                  * and if has_pgste is set, it will create extended page
                  * tables.
                  */
-                mm->context.noexec = 0;
                 mm->context.has_pgste = 1;
                 mm->context.alloc_pgste = 1;
         } else {
-                mm->context.noexec = (user_mode == SECONDARY_SPACE_MODE);
                 mm->context.has_pgste = 0;
                 mm->context.alloc_pgste = 0;
         }
@@ -63,10 +61,8 @@ static inline void update_mm(struct mm_struct *mm, struct task_struct *tsk)
         S390_lowcore.user_asce = mm->context.asce_bits | __pa(pgd);
         if (user_mode != HOME_SPACE_MODE) {
                 /* Load primary space page table origin. */
-                pgd = mm->context.noexec ? get_shadow_table(pgd) : pgd;
-                S390_lowcore.user_exec_asce = mm->context.asce_bits | __pa(pgd);
                 asm volatile(LCTL_OPCODE" 1,1,%0\n"
-                             : : "m" (S390_lowcore.user_exec_asce) );
+                             : : "m" (S390_lowcore.user_asce) );
         } else
                 /* Load home space page table origin. */
                 asm volatile(LCTL_OPCODE" 13,13,%0"
diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index 3c987e9ec8d6..accb372ddc7e 100644
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
@@ -90,6 +90,7 @@ static inline void copy_page(void *to, void *from)
  */
 
 typedef struct { unsigned long pgprot; } pgprot_t;
+typedef struct { unsigned long pgste; } pgste_t;
 typedef struct { unsigned long pte; } pte_t;
 typedef struct { unsigned long pmd; } pmd_t;
 typedef struct { unsigned long pud; } pud_t;
@@ -97,18 +98,21 @@ typedef struct { unsigned long pgd; } pgd_t;
 typedef pte_t *pgtable_t;
 
 #define pgprot_val(x)   ((x).pgprot)
+#define pgste_val(x)    ((x).pgste)
 #define pte_val(x)      ((x).pte)
 #define pmd_val(x)      ((x).pmd)
 #define pud_val(x)      ((x).pud)
 #define pgd_val(x)      ((x).pgd)
 
+#define __pgste(x)      ((pgste_t) { (x) } )
 #define __pte(x)        ((pte_t) { (x) } )
 #define __pmd(x)        ((pmd_t) { (x) } )
+#define __pud(x)        ((pud_t) { (x) } )
 #define __pgd(x)        ((pgd_t) { (x) } )
 #define __pgprot(x)     ((pgprot_t) { (x) } )
 
-static inline void
-page_set_storage_key(unsigned long addr, unsigned int skey, int mapped)
+static inline void page_set_storage_key(unsigned long addr,
+                                        unsigned char skey, int mapped)
 {
         if (!mapped)
                 asm volatile(".insn rrf,0xb22b0000,%0,%1,8,0"
@@ -117,15 +121,59 @@ page_set_storage_key(unsigned long addr, unsigned int skey, int mapped)
                 asm volatile("sske %0,%1" : : "d" (skey), "a" (addr));
 }
 
-static inline unsigned int
-page_get_storage_key(unsigned long addr)
+static inline unsigned char page_get_storage_key(unsigned long addr)
 {
-        unsigned int skey;
+        unsigned char skey;
 
-        asm volatile("iske %0,%1" : "=d" (skey) : "a" (addr), "0" (0));
+        asm volatile("iske %0,%1" : "=d" (skey) : "a" (addr));
         return skey;
 }
 
+static inline int page_reset_referenced(unsigned long addr)
+{
+        unsigned int ipm;
+
+        asm volatile(
+                "       rrbe    0,%1\n"
+                "       ipm     %0\n"
+                : "=d" (ipm) : "a" (addr) : "cc");
+        return !!(ipm & 0x20000000);
+}
+
+/* Bits int the storage key */
+#define _PAGE_CHANGED           0x02    /* HW changed bit               */
+#define _PAGE_REFERENCED        0x04    /* HW referenced bit            */
+#define _PAGE_FP_BIT            0x08    /* HW fetch protection bit      */
+#define _PAGE_ACC_BITS          0xf0    /* HW access control bits       */
+
+/*
+ * Test and clear dirty bit in storage key.
+ * We can't clear the changed bit atomically. This is a potential
+ * race against modification of the referenced bit. This function
+ * should therefore only be called if it is not mapped in any
+ * address space.
+ */
+#define __HAVE_ARCH_PAGE_TEST_AND_CLEAR_DIRTY
+static inline int page_test_and_clear_dirty(unsigned long pfn, int mapped)
+{
+        unsigned char skey;
+
+        skey = page_get_storage_key(pfn << PAGE_SHIFT);
+        if (!(skey & _PAGE_CHANGED))
+                return 0;
+        page_set_storage_key(pfn << PAGE_SHIFT, skey & ~_PAGE_CHANGED, mapped);
+        return 1;
+}
+
+/*
+ * Test and clear referenced bit in storage key.
+ */
+#define __HAVE_ARCH_PAGE_TEST_AND_CLEAR_YOUNG
+static inline int page_test_and_clear_young(unsigned long pfn)
+{
+        return page_reset_referenced(pfn << PAGE_SHIFT);
+}
+
 struct page;
 void arch_free_page(struct page *page, int order);
 void arch_alloc_page(struct page *page, int order);
diff --git a/arch/s390/include/asm/percpu.h b/arch/s390/include/asm/percpu.h
index f7ad8719d02d..5325c89a5843 100644
--- a/arch/s390/include/asm/percpu.h
+++ b/arch/s390/include/asm/percpu.h
@@ -1,6 +1,9 @@
 #ifndef __ARCH_S390_PERCPU__
 #define __ARCH_S390_PERCPU__
 
+#include <linux/preempt.h>
+#include <asm/cmpxchg.h>
+
 /*
  * s390 uses its own implementation for per cpu data, the offset of
  * the cpu local data area is cached in the cpu's lowcore memory.
@@ -16,6 +19,71 @@
 #define ARCH_NEEDS_WEAK_PER_CPU
 #endif
 
+#define arch_irqsafe_cpu_to_op(pcp, val, op)                            \
+do {                                                                    \
+        typedef typeof(pcp) pcp_op_T__;                                 \
+        pcp_op_T__ old__, new__, prev__;                                \
+        pcp_op_T__ *ptr__;                                              \
+        preempt_disable();                                              \
+        ptr__ = __this_cpu_ptr(&(pcp));                                 \
+        prev__ = *ptr__;                                                \
+        do {                                                            \
+                old__ = prev__;                                         \
+                new__ = old__ op (val);                                 \
+                switch (sizeof(*ptr__)) {                               \
+                case 8:                                                 \
+                        prev__ = cmpxchg64(ptr__, old__, new__);        \
+                        break;                                          \
+                default:                                                \
+                        prev__ = cmpxchg(ptr__, old__, new__);          \
+                }                                                       \
+        } while (prev__ != old__);                                      \
+        preempt_enable();                                               \
+} while (0)
+
+#define irqsafe_cpu_add_1(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, +)
+#define irqsafe_cpu_add_2(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, +)
+#define irqsafe_cpu_add_4(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, +)
+#define irqsafe_cpu_add_8(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, +)
+
+#define irqsafe_cpu_and_1(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, &)
+#define irqsafe_cpu_and_2(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, &)
+#define irqsafe_cpu_and_4(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, &)
+#define irqsafe_cpu_and_8(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, &)
+
+#define irqsafe_cpu_or_1(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, |)
+#define irqsafe_cpu_or_2(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, |)
+#define irqsafe_cpu_or_4(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, |)
+#define irqsafe_cpu_or_8(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, |)
+
+#define irqsafe_cpu_xor_1(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, ^)
+#define irqsafe_cpu_xor_2(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, ^)
+#define irqsafe_cpu_xor_4(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, ^)
+#define irqsafe_cpu_xor_8(pcp, val) arch_irqsafe_cpu_to_op(pcp, val, ^)
+
+#define arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)                       \
+({                                                                      \
+        typedef typeof(pcp) pcp_op_T__;                                 \
+        pcp_op_T__ ret__;                                               \
+        pcp_op_T__ *ptr__;                                              \
+        preempt_disable();                                              \
+        ptr__ = __this_cpu_ptr(&(pcp));                                 \
+        switch (sizeof(*ptr__)) {                                       \
+        case 8:                                                         \
+                ret__ = cmpxchg64(ptr__, oval, nval);                   \
+                break;                                                  \
+        default:                                                        \
+                ret__ = cmpxchg(ptr__, oval, nval);                     \
+        }                                                               \
+        preempt_enable();                                               \
+        ret__;                                                          \
+})
+
+#define irqsafe_cpu_cmpxchg_1(pcp, oval, nval) arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)
+#define irqsafe_cpu_cmpxchg_2(pcp, oval, nval) arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)
+#define irqsafe_cpu_cmpxchg_4(pcp, oval, nval) arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)
+#define irqsafe_cpu_cmpxchg_8(pcp, oval, nval) arch_irqsafe_cpu_cmpxchg(pcp, oval, nval)
+
 #include <asm-generic/percpu.h>
 
 #endif /* __ARCH_S390_PERCPU__ */
diff --git a/arch/s390/include/asm/pgalloc.h b/arch/s390/include/asm/pgalloc.h
index 082eb4e50e8b..f6314af3b354 100644
--- a/arch/s390/include/asm/pgalloc.h
+++ b/arch/s390/include/asm/pgalloc.h
@@ -19,14 +19,13 @@
 
 #define check_pgt_cache()       do {} while (0)
 
-unsigned long *crst_table_alloc(struct mm_struct *, int);
+unsigned long *crst_table_alloc(struct mm_struct *);
 void crst_table_free(struct mm_struct *, unsigned long *);
 void crst_table_free_rcu(struct mm_struct *, unsigned long *);
 
 unsigned long *page_table_alloc(struct mm_struct *);
 void page_table_free(struct mm_struct *, unsigned long *);
 void page_table_free_rcu(struct mm_struct *, unsigned long *);
-void disable_noexec(struct mm_struct *, struct task_struct *);
 
 static inline void clear_table(unsigned long *s, unsigned long val, size_t n)
 {
@@ -50,9 +49,6 @@ static inline void clear_table(unsigned long *s, unsigned long val, size_t n)
 static inline void crst_table_init(unsigned long *crst, unsigned long entry)
 {
         clear_table(crst, entry, sizeof(unsigned long)*2048);
-        crst = get_shadow_table(crst);
-        if (crst)
-                clear_table(crst, entry, sizeof(unsigned long)*2048);
 }
 
 #ifndef __s390x__
@@ -69,10 +65,7 @@ static inline unsigned long pgd_entry_type(struct mm_struct *mm)
 #define pmd_free(mm, x)                         do { } while (0)
 
 #define pgd_populate(mm, pgd, pud)              BUG()
-#define pgd_populate_kernel(mm, pgd, pud)       BUG()
-
 #define pud_populate(mm, pud, pmd)              BUG()
-#define pud_populate_kernel(mm, pud, pmd)       BUG()
 
 #else /* __s390x__ */
 
@@ -90,7 +83,7 @@ void crst_table_downgrade(struct mm_struct *, unsigned long limit);
 
 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address)
 {
-        unsigned long *table = crst_table_alloc(mm, mm->context.noexec);
+        unsigned long *table = crst_table_alloc(mm);
         if (table)
                 crst_table_init(table, _REGION3_ENTRY_EMPTY);
         return (pud_t *) table;
@@ -99,43 +92,21 @@ static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long address)
 
 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long vmaddr)
 {
-        unsigned long *table = crst_table_alloc(mm, mm->context.noexec);
+        unsigned long *table = crst_table_alloc(mm);
         if (table)
                 crst_table_init(table, _SEGMENT_ENTRY_EMPTY);
         return (pmd_t *) table;
 }
 #define pmd_free(mm, pmd) crst_table_free(mm, (unsigned long *) pmd)
 
-static inline void pgd_populate_kernel(struct mm_struct *mm,
-                                       pgd_t *pgd, pud_t *pud)
-{
-        pgd_val(*pgd) = _REGION2_ENTRY | __pa(pud);
-}
-
 static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
 {
-        pgd_populate_kernel(mm, pgd, pud);
-        if (mm->context.noexec) {
-                pgd = get_shadow_table(pgd);
-                pud = get_shadow_table(pud);
-                pgd_populate_kernel(mm, pgd, pud);
-        }
-}
-
-static inline void pud_populate_kernel(struct mm_struct *mm,
-                                       pud_t *pud, pmd_t *pmd)
-{
-        pud_val(*pud) = _REGION3_ENTRY | __pa(pmd);
+        pgd_val(*pgd) = _REGION2_ENTRY | __pa(pud);
 }
 
 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
 {
-        pud_populate_kernel(mm, pud, pmd);
-        if (mm->context.noexec) {
-                pud = get_shadow_table(pud);
-                pmd = get_shadow_table(pmd);
-                pud_populate_kernel(mm, pud, pmd);
-        }
+        pud_val(*pud) = _REGION3_ENTRY | __pa(pmd);
 }
 
 #endif /* __s390x__ */
@@ -143,29 +114,19 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
 {
         spin_lock_init(&mm->context.list_lock);
-        INIT_LIST_HEAD(&mm->context.crst_list);
         INIT_LIST_HEAD(&mm->context.pgtable_list);
-        return (pgd_t *)
-                crst_table_alloc(mm, user_mode == SECONDARY_SPACE_MODE);
+        return (pgd_t *) crst_table_alloc(mm);
 }
 #define pgd_free(mm, pgd) crst_table_free(mm, (unsigned long *) pgd)
 
-static inline void pmd_populate_kernel(struct mm_struct *mm,
-                                       pmd_t *pmd, pte_t *pte)
-{
-        pmd_val(*pmd) = _SEGMENT_ENTRY + __pa(pte);
-}
-
 static inline void pmd_populate(struct mm_struct *mm,
                                 pmd_t *pmd, pgtable_t pte)
 {
-        pmd_populate_kernel(mm, pmd, pte);
-        if (mm->context.noexec) {
-                pmd = get_shadow_table(pmd);
-                pmd_populate_kernel(mm, pmd, pte + PTRS_PER_PTE);
-        }
+        pmd_val(*pmd) = _SEGMENT_ENTRY + __pa(pte);
 }
 
+#define pmd_populate_kernel(mm, pmd, pte) pmd_populate(mm, pmd, pte)
+
 #define pmd_pgtable(pmd) \
         (pgtable_t)(pmd_val(pmd) & -sizeof(pte_t)*PTRS_PER_PTE)
 
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 02ace3491c51..c4773a2ef3d3 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -31,9 +31,8 @@
 #ifndef __ASSEMBLY__
 #include <linux/sched.h>
 #include <linux/mm_types.h>
-#include <asm/bitops.h>
 #include <asm/bug.h>
-#include <asm/processor.h>
+#include <asm/page.h>
 
 extern pgd_t swapper_pg_dir[] __attribute__ ((aligned (4096)));
 extern void paging_init(void);
@@ -243,11 +242,13 @@ extern unsigned long VMALLOC_START;
 /* Software bits in the page table entry */
 #define _PAGE_SWT       0x001           /* SW pte type bit t */
 #define _PAGE_SWX       0x002           /* SW pte type bit x */
-#define _PAGE_SPECIAL   0x004           /* SW associated with special page */
+#define _PAGE_SWC       0x004           /* SW pte changed bit (for KVM) */
+#define _PAGE_SWR       0x008           /* SW pte referenced bit (for KVM) */
+#define _PAGE_SPECIAL   0x010           /* SW associated with special page */
 #define __HAVE_ARCH_PTE_SPECIAL
 
 /* Set of bits not changed in pte_modify */
-#define _PAGE_CHG_MASK  (PAGE_MASK | _PAGE_SPECIAL)
+#define _PAGE_CHG_MASK  (PAGE_MASK | _PAGE_SPECIAL | _PAGE_SWC | _PAGE_SWR)
 
 /* Six different types of pages. */
 #define _PAGE_TYPE_EMPTY        0x400
@@ -256,8 +257,6 @@ extern unsigned long VMALLOC_START;
 #define _PAGE_TYPE_FILE         0x601   /* bit 0x002 is used for offset !! */
 #define _PAGE_TYPE_RO           0x200
 #define _PAGE_TYPE_RW           0x000
-#define _PAGE_TYPE_EX_RO        0x202
-#define _PAGE_TYPE_EX_RW        0x002
 
 /*
  * Only four types for huge pages, using the invalid bit and protection bit
@@ -287,8 +286,6 @@ extern unsigned long VMALLOC_START;
  * _PAGE_TYPE_FILE      11?1   ->   11?1
  * _PAGE_TYPE_RO        0100   ->   1100
  * _PAGE_TYPE_RW        0000   ->   1000
- * _PAGE_TYPE_EX_RO     0110   ->   1110
- * _PAGE_TYPE_EX_RW     0010   ->   1010
  *
  * pte_none is true for bits combinations 1000, 1010, 1100, 1110
  * pte_present is true for bits combinations 0000, 0010, 0100, 0110, 1001
@@ -297,14 +294,17 @@ extern unsigned long VMALLOC_START;
  */
 
 /* Page status table bits for virtualization */
-#define RCP_PCL_BIT     55
-#define RCP_HR_BIT      54
-#define RCP_HC_BIT      53
-#define RCP_GR_BIT      50
-#define RCP_GC_BIT      49
-
-/* User dirty bit for KVM's migration feature */
-#define KVM_UD_BIT      47
+#define RCP_ACC_BITS    0xf000000000000000UL
+#define RCP_FP_BIT      0x0800000000000000UL
+#define RCP_PCL_BIT     0x0080000000000000UL
+#define RCP_HR_BIT      0x0040000000000000UL
+#define RCP_HC_BIT      0x0020000000000000UL
+#define RCP_GR_BIT      0x0004000000000000UL
+#define RCP_GC_BIT      0x0002000000000000UL
+
+/* User dirty / referenced bit for KVM's migration feature */
+#define KVM_UR_BIT      0x0000800000000000UL
+#define KVM_UC_BIT      0x0000400000000000UL
 
 #ifndef __s390x__
 
@@ -377,85 +377,54 @@ extern unsigned long VMALLOC_START;
 #define _ASCE_USER_BITS         (_ASCE_SPACE_SWITCH | _ASCE_PRIVATE_SPACE | \
                                  _ASCE_ALT_EVENT)
 
-/* Bits int the storage key */
-#define _PAGE_CHANGED    0x02          /* HW changed bit                   */
-#define _PAGE_REFERENCED 0x04          /* HW referenced bit                */
-
 /*
  * Page protection definitions.
  */
 #define PAGE_NONE       __pgprot(_PAGE_TYPE_NONE)
 #define PAGE_RO         __pgprot(_PAGE_TYPE_RO)
 #define PAGE_RW         __pgprot(_PAGE_TYPE_RW)
-#define PAGE_EX_RO      __pgprot(_PAGE_TYPE_EX_RO)
-#define PAGE_EX_RW      __pgprot(_PAGE_TYPE_EX_RW)
 
 #define PAGE_KERNEL     PAGE_RW
 #define PAGE_COPY       PAGE_RO
 
 /*
- * Dependent on the EXEC_PROTECT option s390 can do execute protection.
- * Write permission always implies read permission. In theory with a
- * primary/secondary page table execute only can be implemented but
- * it would cost an additional bit in the pte to distinguish all the
- * different pte types. To avoid that execute permission currently
- * implies read permission as well.
+ * On s390 the page table entry has an invalid bit and a read-only bit.
+ * Read permission implies execute permission and write permission
+ * implies read permission.
  */
          /*xwr*/
 #define __P000  PAGE_NONE
 #define __P001  PAGE_RO
 #define __P010  PAGE_RO
 #define __P011  PAGE_RO
-#define __P100  PAGE_EX_RO
-#define __P101  PAGE_EX_RO
-#define __P110  PAGE_EX_RO
-#define __P111  PAGE_EX_RO
+#define __P100  PAGE_RO
+#define __P101  PAGE_RO
+#define __P110  PAGE_RO
+#define __P111  PAGE_RO
 
 #define __S000  PAGE_NONE
 #define __S001  PAGE_RO
 #define __S010  PAGE_RW
 #define __S011  PAGE_RW
-#define __S100  PAGE_EX_RO
-#define __S101  PAGE_EX_RO
-#define __S110  PAGE_EX_RW
-#define __S111  PAGE_EX_RW
-
-#ifndef __s390x__
-# define PxD_SHADOW_SHIFT       1
-#else /* __s390x__ */
-# define PxD_SHADOW_SHIFT       2
-#endif /* __s390x__ */
+#define __S100  PAGE_RO
+#define __S101  PAGE_RO
+#define __S110  PAGE_RW
+#define __S111  PAGE_RW
 
-static inline void *get_shadow_table(void *table)
+static inline int mm_exclusive(struct mm_struct *mm)
 {
-        unsigned long addr, offset;
-        struct page *page;
-
-        addr = (unsigned long) table;
-        offset = addr & ((PAGE_SIZE << PxD_SHADOW_SHIFT) - 1);
-        page = virt_to_page((void *)(addr ^ offset));
-        return (void *)(addr_t)(page->index ? (page->index | offset) : 0UL);
+        return likely(mm == current->active_mm &&
+                      atomic_read(&mm->context.attach_count) <= 1);
 }
 
-/*
- * Certain architectures need to do special things when PTEs
- * within a page table are directly modified.  Thus, the following
- * hook is made available.
- */
-static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
-                              pte_t *ptep, pte_t entry)
+static inline int mm_has_pgste(struct mm_struct *mm)
 {
-        *ptep = entry;
-        if (mm->context.noexec) {
-                if (!(pte_val(entry) & _PAGE_INVALID) &&
-                    (pte_val(entry) & _PAGE_SWX))
-                        pte_val(entry) |= _PAGE_RO;
-                else
-                        pte_val(entry) = _PAGE_TYPE_EMPTY;
-                ptep[PTRS_PER_PTE] = entry;
-        }
+#ifdef CONFIG_PGSTE
+        if (unlikely(mm->context.has_pgste))
+                return 1;
+#endif
+        return 0;
 }
-
 /*
  * pgd/pmd/pte query functions
  */
@@ -568,52 +537,127 @@ static inline int pte_special(pte_t pte)
 }
 
 #define __HAVE_ARCH_PTE_SAME
-#define pte_same(a,b)  (pte_val(a) == pte_val(b))
+static inline int pte_same(pte_t a, pte_t b)
+{
+        return pte_val(a) == pte_val(b);
+}
 
-static inline void rcp_lock(pte_t *ptep)
+static inline pgste_t pgste_get_lock(pte_t *ptep)
 {
+        unsigned long new = 0;
 #ifdef CONFIG_PGSTE
-        unsigned long *pgste = (unsigned long *) (ptep + PTRS_PER_PTE);
+        unsigned long old;
+
         preempt_disable();
-        while (test_and_set_bit(RCP_PCL_BIT, pgste))
-                ;
+        asm(
+                "       lg      %0,%2\n"
+                "0:     lgr     %1,%0\n"
+                "       nihh    %0,0xff7f\n"    /* clear RCP_PCL_BIT in old */
+                "       oihh    %1,0x0080\n"    /* set RCP_PCL_BIT in new */
+                "       csg     %0,%1,%2\n"
+                "       jl      0b\n"
+                : "=&d" (old), "=&d" (new), "=Q" (ptep[PTRS_PER_PTE])
+                : "Q" (ptep[PTRS_PER_PTE]) : "cc");
 #endif
+        return __pgste(new);
 }
 
-static inline void rcp_unlock(pte_t *ptep)
+static inline void pgste_set_unlock(pte_t *ptep, pgste_t pgste)
 {
 #ifdef CONFIG_PGSTE
-        unsigned long *pgste = (unsigned long *) (ptep + PTRS_PER_PTE);
-        clear_bit(RCP_PCL_BIT, pgste);
+        asm(
+                "       nihh    %1,0xff7f\n"    /* clear RCP_PCL_BIT */
+                "       stg     %1,%0\n"
+                : "=Q" (ptep[PTRS_PER_PTE])
+                : "d" (pgste_val(pgste)), "Q" (ptep[PTRS_PER_PTE]) : "cc");
         preempt_enable();
 #endif
 }
 
-/* forward declaration for SetPageUptodate in page-flags.h*/
-static inline void page_clear_dirty(struct page *page, int mapped);
-#include <linux/page-flags.h>
-
-static inline void ptep_rcp_copy(pte_t *ptep)
+static inline pgste_t pgste_update_all(pte_t *ptep, pgste_t pgste)
 {
 #ifdef CONFIG_PGSTE
-        struct page *page = virt_to_page(pte_val(*ptep));
-        unsigned int skey;
-        unsigned long *pgste = (unsigned long *) (ptep + PTRS_PER_PTE);
-
-        skey = page_get_storage_key(page_to_phys(page));
-        if (skey & _PAGE_CHANGED) {
-                set_bit_simple(RCP_GC_BIT, pgste);
-                set_bit_simple(KVM_UD_BIT, pgste);
+        unsigned long pfn, bits;
+        unsigned char skey;
+
+        pfn = pte_val(*ptep) >> PAGE_SHIFT;
+        skey = page_get_storage_key(pfn);
+        bits = skey & (_PAGE_CHANGED | _PAGE_REFERENCED);
+        /* Clear page changed & referenced bit in the storage key */
+        if (bits) {
+                skey ^= bits;
+                page_set_storage_key(pfn, skey, 1);
         }
-        if (skey & _PAGE_REFERENCED)
-                set_bit_simple(RCP_GR_BIT, pgste);
-        if (test_and_clear_bit_simple(RCP_HC_BIT, pgste)) {
-                SetPageDirty(page);
-                set_bit_simple(KVM_UD_BIT, pgste);
-        }
-        if (test_and_clear_bit_simple(RCP_HR_BIT, pgste))
-                SetPageReferenced(page);
+        /* Transfer page changed & referenced bit to guest bits in pgste */
+        pgste_val(pgste) |= bits << 48;         /* RCP_GR_BIT & RCP_GC_BIT */
+        /* Get host changed & referenced bits from pgste */
+        bits |= (pgste_val(pgste) & (RCP_HR_BIT | RCP_HC_BIT)) >> 52;
+        /* Clear host bits in pgste. */
+        pgste_val(pgste) &= ~(RCP_HR_BIT | RCP_HC_BIT);
+        pgste_val(pgste) &= ~(RCP_ACC_BITS | RCP_FP_BIT);
+        /* Copy page access key and fetch protection bit to pgste */
+        pgste_val(pgste) |=
+                (unsigned long) (skey & (_PAGE_ACC_BITS | _PAGE_FP_BIT)) << 56;
+        /* Transfer changed and referenced to kvm user bits */
+        pgste_val(pgste) |= bits << 45;         /* KVM_UR_BIT & KVM_UC_BIT */
+        /* Transfer changed & referenced to pte sofware bits */
+        pte_val(*ptep) |= bits << 1;            /* _PAGE_SWR & _PAGE_SWC */
 #endif
+        return pgste;
+
+}
+
+static inline pgste_t pgste_update_young(pte_t *ptep, pgste_t pgste)
+{
+#ifdef CONFIG_PGSTE
+        int young;
+
+        young = page_reset_referenced(pte_val(*ptep) & PAGE_MASK);
+        /* Transfer page referenced bit to pte software bit (host view) */
+        if (young || (pgste_val(pgste) & RCP_HR_BIT))
+                pte_val(*ptep) |= _PAGE_SWR;
+        /* Clear host referenced bit in pgste. */
+        pgste_val(pgste) &= ~RCP_HR_BIT;
+        /* Transfer page referenced bit to guest bit in pgste */
+        pgste_val(pgste) |= (unsigned long) young << 50; /* set RCP_GR_BIT */
+#endif
+        return pgste;
+
+}
+
+static inline void pgste_set_pte(pte_t *ptep, pgste_t pgste)
+{
+#ifdef CONFIG_PGSTE
+        unsigned long pfn;
+        unsigned long okey, nkey;
+
+        pfn = pte_val(*ptep) >> PAGE_SHIFT;
+        okey = nkey = page_get_storage_key(pfn);
+        nkey &= ~(_PAGE_ACC_BITS | _PAGE_FP_BIT);
+        /* Set page access key and fetch protection bit from pgste */
+        nkey |= (pgste_val(pgste) & (RCP_ACC_BITS | RCP_FP_BIT)) >> 56;
+        if (okey != nkey)
+                page_set_storage_key(pfn, nkey, 1);
+#endif
+}
+
+/*
+ * Certain architectures need to do special things when PTEs
+ * within a page table are directly modified.  Thus, the following
+ * hook is made available.
+ */
+static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
+                              pte_t *ptep, pte_t entry)
+{
+        pgste_t pgste;
+
+        if (mm_has_pgste(mm)) {
+                pgste = pgste_get_lock(ptep);
+                pgste_set_pte(ptep, pgste);
+                *ptep = entry;
+                pgste_set_unlock(ptep, pgste);
+        } else
+                *ptep = entry;
 }
 
 /*
@@ -627,19 +671,19 @@ static inline int pte_write(pte_t pte)
 
 static inline int pte_dirty(pte_t pte)
 {
-        /* A pte is neither clean nor dirty on s/390. The dirty bit
-         * is in the storage key. See page_test_and_clear_dirty for
-         * details.
-         */
+#ifdef CONFIG_PGSTE
+        if (pte_val(pte) & _PAGE_SWC)
+                return 1;
+#endif
         return 0;
 }
 
 static inline int pte_young(pte_t pte)
 {
-        /* A pte is neither young nor old on s/390. The young bit
-         * is in the storage key. See page_test_and_clear_young for
-         * details.
-         */
+#ifdef CONFIG_PGSTE
+        if (pte_val(pte) & _PAGE_SWR)
+                return 1;
+#endif
         return 0;
 }
 
@@ -647,64 +691,30 @@ static inline int pte_young(pte_t pte)
  * pgd/pmd/pte modification functions
  */
 
-#ifndef __s390x__
-
-#define pgd_clear(pgd)          do { } while (0)
-#define pud_clear(pud)          do { } while (0)
-
-#else /* __s390x__ */
-
-static inline void pgd_clear_kernel(pgd_t * pgd)
+static inline void pgd_clear(pgd_t *pgd)
 {
+#ifdef __s390x__
         if ((pgd_val(*pgd) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R2)
                 pgd_val(*pgd) = _REGION2_ENTRY_EMPTY;
+#endif
 }
 
-static inline void pgd_clear(pgd_t * pgd)
-{
-        pgd_t *shadow = get_shadow_table(pgd);
-
-        pgd_clear_kernel(pgd);
-        if (shadow)
-                pgd_clear_kernel(shadow);
-}
-
-static inline void pud_clear_kernel(pud_t *pud)
+static inline void pud_clear(pud_t *pud)
 {
+#ifdef __s390x__
         if ((pud_val(*pud) & _REGION_ENTRY_TYPE_MASK) == _REGION_ENTRY_TYPE_R3)
                 pud_val(*pud) = _REGION3_ENTRY_EMPTY;
+#endif
 }
 
-static inline void pud_clear(pud_t *pud)
-{
-        pud_t *shadow = get_shadow_table(pud);
-
-        pud_clear_kernel(pud);
-        if (shadow)
-                pud_clear_kernel(shadow);
-}
-
-#endif /* __s390x__ */
-
-static inline void pmd_clear_kernel(pmd_t * pmdp)
+static inline void pmd_clear(pmd_t *pmdp)
 {
         pmd_val(*pmdp) = _SEGMENT_ENTRY_EMPTY;
 }
 
-static inline void pmd_clear(pmd_t *pmd)
-{
-        pmd_t *shadow = get_shadow_table(pmd);
-
-        pmd_clear_kernel(pmd);
-        if (shadow)
-                pmd_clear_kernel(shadow);
-}
-
 static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
         pte_val(*ptep) = _PAGE_TYPE_EMPTY;
-        if (mm->context.noexec)
-                pte_val(ptep[PTRS_PER_PTE]) = _PAGE_TYPE_EMPTY;
 }
 
 /*
@@ -734,35 +744,27 @@ static inline pte_t pte_mkwrite(pte_t pte)
 
 static inline pte_t pte_mkclean(pte_t pte)
 {
-        /* The only user of pte_mkclean is the fork() code.
-           We must *not* clear the *physical* page dirty bit
-           just because fork() wants to clear the dirty bit in
-           *one* of the page's mappings.  So we just do nothing. */
+#ifdef CONFIG_PGSTE
+        pte_val(pte) &= ~_PAGE_SWC;
+#endif
         return pte;
 }
 
 static inline pte_t pte_mkdirty(pte_t pte)
 {
-        /* We do not explicitly set the dirty bit because the
-         * sske instruction is slow. It is faster to let the
-         * next instruction set the dirty bit.
-         */
         return pte;
 }
 
 static inline pte_t pte_mkold(pte_t pte)
 {
-        /* S/390 doesn't keep its dirty/referenced bit in the pte.
-         * There is no point in clearing the real referenced bit.
-         */
+#ifdef CONFIG_PGSTE
+        pte_val(pte) &= ~_PAGE_SWR;
+#endif
         return pte;
 }
 
 static inline pte_t pte_mkyoung(pte_t pte)
 {
-        /* S/390 doesn't keep its dirty/referenced bit in the pte.
-         * There is no point in setting the real referenced bit.
-         */
         return pte;
 }
 
@@ -800,62 +802,60 @@ static inline pte_t pte_mkhuge(pte_t pte)
 }
 #endif
 
-#ifdef CONFIG_PGSTE
 /*
- * Get (and clear) the user dirty bit for a PTE.
+ * Get (and clear) the user dirty bit for a pte.
  */
-static inline int kvm_s390_test_and_clear_page_dirty(struct mm_struct *mm,
-                                                     pte_t *ptep)
+static inline int ptep_test_and_clear_user_dirty(struct mm_struct *mm,
+                                                 pte_t *ptep)
 {
-        int dirty;
-        unsigned long *pgste;
-        struct page *page;
-        unsigned int skey;
-
-        if (!mm->context.has_pgste)
-                return -EINVAL;
-        rcp_lock(ptep);
-        pgste = (unsigned long *) (ptep + PTRS_PER_PTE);
-        page = virt_to_page(pte_val(*ptep));
-        skey = page_get_storage_key(page_to_phys(page));
-        if (skey & _PAGE_CHANGED) {
-                set_bit_simple(RCP_GC_BIT, pgste);
-                set_bit_simple(KVM_UD_BIT, pgste);
+        pgste_t pgste;
+        int dirty = 0;
+
+        if (mm_has_pgste(mm)) {
+                pgste = pgste_get_lock(ptep);
+                pgste = pgste_update_all(ptep, pgste);
+                dirty = !!(pgste_val(pgste) & KVM_UC_BIT);
+                pgste_val(pgste) &= ~KVM_UC_BIT;
+                pgste_set_unlock(ptep, pgste);
+                return dirty;
         }
-        if (test_and_clear_bit_simple(RCP_HC_BIT, pgste)) {
-                SetPageDirty(page);
-                set_bit_simple(KVM_UD_BIT, pgste);
-        }
-        dirty = test_and_clear_bit_simple(KVM_UD_BIT, pgste);
-        if (skey & _PAGE_CHANGED)
-                page_clear_dirty(page, 1);
-        rcp_unlock(ptep);
         return dirty;
 }
-#endif
+
+/*
+ * Get (and clear) the user referenced bit for a pte.
+ */
+static inline int ptep_test_and_clear_user_young(struct mm_struct *mm,
+                                                 pte_t *ptep)
+{
+        pgste_t pgste;
+        int young = 0;
+
+        if (mm_has_pgste(mm)) {
+                pgste = pgste_get_lock(ptep);
+                pgste = pgste_update_young(ptep, pgste);
+                young = !!(pgste_val(pgste) & KVM_UR_BIT);
+                pgste_val(pgste) &= ~KVM_UR_BIT;
+                pgste_set_unlock(ptep, pgste);
+        }
+        return young;
+}
 
 #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
 static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,
                                             unsigned long addr, pte_t *ptep)
 {
-#ifdef CONFIG_PGSTE
-        unsigned long physpage;
-        int young;
-        unsigned long *pgste;
+        pgste_t pgste;
+        pte_t pte;
 
-        if (!vma->vm_mm->context.has_pgste)
-                return 0;
-        physpage = pte_val(*ptep) & PAGE_MASK;
-        pgste = (unsigned long *) (ptep + PTRS_PER_PTE);
-
-        young = ((page_get_storage_key(physpage) & _PAGE_REFERENCED) != 0);
-        rcp_lock(ptep);
-        if (young)
-                set_bit_simple(RCP_GR_BIT, pgste);
-        young |= test_and_clear_bit_simple(RCP_HR_BIT, pgste);
-        rcp_unlock(ptep);
-        return young;
-#endif
+        if (mm_has_pgste(vma->vm_mm)) {
+                pgste = pgste_get_lock(ptep);
+                pgste = pgste_update_young(ptep, pgste);
+                pte = *ptep;
+                *ptep = pte_mkold(pte);
+                pgste_set_unlock(ptep, pgste);
+                return pte_young(pte);
+        }
         return 0;
 }
 
@@ -867,10 +867,7 @@ static inline int ptep_clear_flush_young(struct vm_area_struct *vma,
          * On s390 reference bits are in storage key and never in TLB
          * With virtualization we handle the reference bit, without we
          * we can simply return */
-#ifdef CONFIG_PGSTE
         return ptep_test_and_clear_young(vma, address, ptep);
-#endif
-        return 0;
 }
 
 static inline void __ptep_ipte(unsigned long address, pte_t *ptep)
@@ -890,25 +887,6 @@ static inline void __ptep_ipte(unsigned long address, pte_t *ptep)
         }
 }
 
-static inline void ptep_invalidate(struct mm_struct *mm,
-                                   unsigned long address, pte_t *ptep)
-{
-        if (mm->context.has_pgste) {
-                rcp_lock(ptep);
-                __ptep_ipte(address, ptep);
-                ptep_rcp_copy(ptep);
-                pte_val(*ptep) = _PAGE_TYPE_EMPTY;
-                rcp_unlock(ptep);
-                return;
-        }
-        __ptep_ipte(address, ptep);
-        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
-        if (mm->context.noexec) {
-                __ptep_ipte(address, ptep + PTRS_PER_PTE);
-                pte_val(*(ptep + PTRS_PER_PTE)) = _PAGE_TYPE_EMPTY;
-        }
-}
-
 /*
  * This is hard to understand. ptep_get_and_clear and ptep_clear_flush
  * both clear the TLB for the unmapped pte. The reason is that
@@ -923,24 +901,72 @@ static inline void ptep_invalidate(struct mm_struct *mm,
  * is a nop.
  */
 #define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-#define ptep_get_and_clear(__mm, __address, __ptep)                     \
-({                                                                      \
-        pte_t __pte = *(__ptep);                                        \
-        (__mm)->context.flush_mm = 1;                                   \
-        if (atomic_read(&(__mm)->context.attach_count) > 1 ||           \
-            (__mm) != current->active_mm)                               \
-                ptep_invalidate(__mm, __address, __ptep);               \
-        else                                                            \
-                pte_clear((__mm), (__address), (__ptep));               \
-        __pte;                                                          \
-})
+static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
+                                       unsigned long address, pte_t *ptep)
+{
+        pgste_t pgste;
+        pte_t pte;
+
+        mm->context.flush_mm = 1;
+        if (mm_has_pgste(mm))
+                pgste = pgste_get_lock(ptep);
+
+        pte = *ptep;
+        if (!mm_exclusive(mm))
+                __ptep_ipte(address, ptep);
+        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
+
+        if (mm_has_pgste(mm)) {
+                pgste = pgste_update_all(&pte, pgste);
+                pgste_set_unlock(ptep, pgste);
+        }
+        return pte;
+}
+
+#define __HAVE_ARCH_PTEP_MODIFY_PROT_TRANSACTION
+static inline pte_t ptep_modify_prot_start(struct mm_struct *mm,
+                                           unsigned long address,
+                                           pte_t *ptep)
+{
+        pte_t pte;
+
+        mm->context.flush_mm = 1;
+        if (mm_has_pgste(mm))
+                pgste_get_lock(ptep);
+
+        pte = *ptep;
+        if (!mm_exclusive(mm))
+                __ptep_ipte(address, ptep);
+        return pte;
+}
+
+static inline void ptep_modify_prot_commit(struct mm_struct *mm,
+                                           unsigned long address,
+                                           pte_t *ptep, pte_t pte)
+{
+        *ptep = pte;
+        if (mm_has_pgste(mm))
+                pgste_set_unlock(ptep, *(pgste_t *)(ptep + PTRS_PER_PTE));
+}
 
 #define __HAVE_ARCH_PTEP_CLEAR_FLUSH
 static inline pte_t ptep_clear_flush(struct vm_area_struct *vma,
                                      unsigned long address, pte_t *ptep)
 {
-        pte_t pte = *ptep;
-        ptep_invalidate(vma->vm_mm, address, ptep);
+        pgste_t pgste;
+        pte_t pte;
+
+        if (mm_has_pgste(vma->vm_mm))
+                pgste = pgste_get_lock(ptep);
+
+        pte = *ptep;
+        __ptep_ipte(address, ptep);
+        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
+
+        if (mm_has_pgste(vma->vm_mm)) {
+                pgste = pgste_update_all(&pte, pgste);
+                pgste_set_unlock(ptep, pgste);
+        }
         return pte;
 }
 
@@ -953,76 +979,67 @@ static inline pte_t ptep_clear_flush(struct vm_area_struct *vma,
  */
 #define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL
 static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,
-                                            unsigned long addr,
+                                            unsigned long address,
                                             pte_t *ptep, int full)
 {
-        pte_t pte = *ptep;
+        pgste_t pgste;
+        pte_t pte;
+
+        if (mm_has_pgste(mm))
+                pgste = pgste_get_lock(ptep);
+
+        pte = *ptep;
+        if (!full)
+                __ptep_ipte(address, ptep);
+        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
 
-        if (full)
-                pte_clear(mm, addr, ptep);
-        else
-                ptep_invalidate(mm, addr, ptep);
+        if (mm_has_pgste(mm)) {
+                pgste = pgste_update_all(&pte, pgste);
+                pgste_set_unlock(ptep, pgste);
+        }
         return pte;
 }
 
 #define __HAVE_ARCH_PTEP_SET_WRPROTECT
-#define ptep_set_wrprotect(__mm, __addr, __ptep)                        \
-({                                                                      \
-        pte_t __pte = *(__ptep);                                        \
-        if (pte_write(__pte)) {                                         \
-                (__mm)->context.flush_mm = 1;                           \
-                if (atomic_read(&(__mm)->context.attach_count) > 1 ||   \
-                    (__mm) != current->active_mm)                       \
-                        ptep_invalidate(__mm, __addr, __ptep);          \
-                set_pte_at(__mm, __addr, __ptep, pte_wrprotect(__pte)); \
-        }                                                               \
-})
+static inline pte_t ptep_set_wrprotect(struct mm_struct *mm,
+                                       unsigned long address, pte_t *ptep)
+{
+        pgste_t pgste;
+        pte_t pte = *ptep;
 
-#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
-#define ptep_set_access_flags(__vma, __addr, __ptep, __entry, __dirty)  \
-({                                                                      \
-        int __changed = !pte_same(*(__ptep), __entry);                  \
-        if (__changed) {                                                \
-                ptep_invalidate((__vma)->vm_mm, __addr, __ptep);        \
-                set_pte_at((__vma)->vm_mm, __addr, __ptep, __entry);    \
-        }                                                               \
-        __changed;                                                      \
-})
+        if (pte_write(pte)) {
+                mm->context.flush_mm = 1;
+                if (mm_has_pgste(mm))
+                        pgste = pgste_get_lock(ptep);
 
-/*
- * Test and clear dirty bit in storage key.
- * We can't clear the changed bit atomically. This is a potential
- * race against modification of the referenced bit. This function
- * should therefore only be called if it is not mapped in any
- * address space.
- */
-#define __HAVE_ARCH_PAGE_TEST_DIRTY
-static inline int page_test_dirty(struct page *page)
-{
-        return (page_get_storage_key(page_to_phys(page)) & _PAGE_CHANGED) != 0;
-}
+                if (!mm_exclusive(mm))
+                        __ptep_ipte(address, ptep);
+                *ptep = pte_wrprotect(pte);
 
-#define __HAVE_ARCH_PAGE_CLEAR_DIRTY
-static inline void page_clear_dirty(struct page *page, int mapped)
-{
-        page_set_storage_key(page_to_phys(page), PAGE_DEFAULT_KEY, mapped);
+                if (mm_has_pgste(mm))
+                        pgste_set_unlock(ptep, pgste);
+        }
+        return pte;
 }
 
-/*
- * Test and clear referenced bit in storage key.
- */
-#define __HAVE_ARCH_PAGE_TEST_AND_CLEAR_YOUNG
-static inline int page_test_and_clear_young(struct page *page)
+#define __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
+static inline int ptep_set_access_flags(struct vm_area_struct *vma,
+                                        unsigned long address, pte_t *ptep,
+                                        pte_t entry, int dirty)
 {
-        unsigned long physpage = page_to_phys(page);
-        int ccode;
-
-        asm volatile(
-                "       rrbe    0,%1\n"
-                "       ipm     %0\n"
-                "       srl     %0,28\n"
-                : "=d" (ccode) : "a" (physpage) : "cc" );
-        return ccode & 2;
+        pgste_t pgste;
+
+        if (pte_same(*ptep, entry))
+                return 0;
+        if (mm_has_pgste(vma->vm_mm))
+                pgste = pgste_get_lock(ptep);
+
+        __ptep_ipte(address, ptep);
+        *ptep = entry;
+
+        if (mm_has_pgste(vma->vm_mm))
+                pgste_set_unlock(ptep, pgste);
+        return 1;
 }
 
 /*
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 2c79b6416271..1300c3025334 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -84,6 +84,7 @@ struct thread_struct {
         struct per_event per_event;     /* Cause of the last PER trap */
         /* pfault_wait is used to block the process on a pfault event */
         unsigned long pfault_wait;
+        struct list_head list;
 };
 
 typedef struct thread_struct thread_struct;
diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h
index 9074a54c4d10..77eee5477a52 100644
--- a/arch/s390/include/asm/tlb.h
+++ b/arch/s390/include/asm/tlb.h
@@ -29,65 +29,77 @@
 #include <asm/smp.h>
 #include <asm/tlbflush.h>
 
-#ifndef CONFIG_SMP
-#define TLB_NR_PTRS     1
-#else
-#define TLB_NR_PTRS     508
-#endif
-
 struct mmu_gather {
         struct mm_struct *mm;
         unsigned int fullmm;
         unsigned int nr_ptes;
         unsigned int nr_pxds;
-        void *array[TLB_NR_PTRS];
+        unsigned int max;
+        void **array;
+        void *local[8];
 };
 
-DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
-
-static inline struct mmu_gather *tlb_gather_mmu(struct mm_struct *mm,
-                                                unsigned int full_mm_flush)
+static inline void __tlb_alloc_page(struct mmu_gather *tlb)
 {
-        struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
+        unsigned long addr = __get_free_pages(GFP_NOWAIT | __GFP_NOWARN, 0);
 
+        if (addr) {
+                tlb->array = (void *) addr;
+                tlb->max = PAGE_SIZE / sizeof(void *);
+        }
+}
+
+static inline void tlb_gather_mmu(struct mmu_gather *tlb,
+                                  struct mm_struct *mm,
+                                  unsigned int full_mm_flush)
+{
         tlb->mm = mm;
+        tlb->max = ARRAY_SIZE(tlb->local);
+        tlb->array = tlb->local;
         tlb->fullmm = full_mm_flush;
-        tlb->nr_ptes = 0;
-        tlb->nr_pxds = TLB_NR_PTRS;
         if (tlb->fullmm)
                 __tlb_flush_mm(mm);
-        return tlb;
+        else
+                __tlb_alloc_page(tlb);
+        tlb->nr_ptes = 0;
+        tlb->nr_pxds = tlb->max;
 }
 
-static inline void tlb_flush_mmu(struct mmu_gather *tlb,
-                                 unsigned long start, unsigned long end)
+static inline void tlb_flush_mmu(struct mmu_gather *tlb)
 {
-        if (!tlb->fullmm && (tlb->nr_ptes > 0 || tlb->nr_pxds < TLB_NR_PTRS))
+        if (!tlb->fullmm && (tlb->nr_ptes > 0 || tlb->nr_pxds < tlb->max))
                 __tlb_flush_mm(tlb->mm);
         while (tlb->nr_ptes > 0)
                 page_table_free_rcu(tlb->mm, tlb->array[--tlb->nr_ptes]);
-        while (tlb->nr_pxds < TLB_NR_PTRS)
+        while (tlb->nr_pxds < tlb->max)
                 crst_table_free_rcu(tlb->mm, tlb->array[tlb->nr_pxds++]);
 }
 
 static inline void tlb_finish_mmu(struct mmu_gather *tlb,
                                   unsigned long start, unsigned long end)
 {
-        tlb_flush_mmu(tlb, start, end);
+        tlb_flush_mmu(tlb);
 
         rcu_table_freelist_finish();
 
         /* keep the page table cache within bounds */
         check_pgt_cache();
 
-        put_cpu_var(mmu_gathers);
+        if (tlb->array != tlb->local)
+                free_pages((unsigned long) tlb->array, 0);
 }
 
 /*
  * Release the page cache reference for a pte removed by
- * tlb_ptep_clear_flush. In both flush modes the tlb fo a page cache page
+ * tlb_ptep_clear_flush. In both flush modes the tlb for a page cache page
  * has already been freed, so just do free_page_and_swap_cache.
  */
+static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+{
+        free_page_and_swap_cache(page);
+        return 1; /* avoid calling tlb_flush_mmu */
+}
+
 static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
 {
         free_page_and_swap_cache(page);
@@ -103,7 +115,7 @@ static inline void pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte,
         if (!tlb->fullmm) {
                 tlb->array[tlb->nr_ptes++] = pte;
                 if (tlb->nr_ptes >= tlb->nr_pxds)
-                        tlb_flush_mmu(tlb, 0, 0);
+                        tlb_flush_mmu(tlb);
         } else
                 page_table_free(tlb->mm, (unsigned long *) pte);
 }
@@ -124,7 +136,7 @@ static inline void pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
         if (!tlb->fullmm) {
                 tlb->array[--tlb->nr_pxds] = pmd;
                 if (tlb->nr_ptes >= tlb->nr_pxds)
-                        tlb_flush_mmu(tlb, 0, 0);
+                        tlb_flush_mmu(tlb);
         } else
                 crst_table_free(tlb->mm, (unsigned long *) pmd);
 #endif
@@ -146,7 +158,7 @@ static inline void pud_free_tlb(struct mmu_gather *tlb, pud_t *pud,
         if (!tlb->fullmm) {
                 tlb->array[--tlb->nr_pxds] = pud;
                 if (tlb->nr_ptes >= tlb->nr_pxds)
-                        tlb_flush_mmu(tlb, 0, 0);
+                        tlb_flush_mmu(tlb);
         } else
                 crst_table_free(tlb->mm, (unsigned long *) pud);
 #endif
diff --git a/arch/s390/include/asm/tlbflush.h b/arch/s390/include/asm/tlbflush.h
index 29d5d6d4becc..b7a4f2eb0057 100644
--- a/arch/s390/include/asm/tlbflush.h
+++ b/arch/s390/include/asm/tlbflush.h
@@ -50,7 +50,7 @@ static inline void __tlb_flush_full(struct mm_struct *mm)
         /*
          * If the process only ran on the local cpu, do a local flush.
          */
-        local_cpumask = cpumask_of_cpu(smp_processor_id());
+        cpumask_copy(&local_cpumask, cpumask_of(smp_processor_id()));
         if (cpumask_equal(mm_cpumask(mm), &local_cpumask))
                 __tlb_flush_local();
         else
@@ -80,16 +80,11 @@ static inline void __tlb_flush_mm(struct mm_struct * mm)
          * on all cpus instead of doing a local flush if the mm
          * only ran on the local cpu.
          */
-        if (MACHINE_HAS_IDTE) {
-                if (mm->context.noexec)
-                        __tlb_flush_idte((unsigned long)
-                                         get_shadow_table(mm->pgd) |
-                                         mm->context.asce_bits);
+        if (MACHINE_HAS_IDTE)
                 __tlb_flush_idte((unsigned long) mm->pgd |
                                  mm->context.asce_bits);
-                return;
-        }
-        __tlb_flush_full(mm);
+        else
+                __tlb_flush_full(mm);
 }
 
 static inline void __tlb_flush_mm_cond(struct mm_struct * mm)
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
index e82152572377..9208e69245a0 100644
--- a/arch/s390/include/asm/unistd.h
+++ b/arch/s390/include/asm/unistd.h
@@ -385,6 +385,7 @@
 
 /* Ignore system calls that are also reachable via sys_socket */
 #define __IGNORE_recvmmsg
+#define __IGNORE_sendmmsg
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 64230bc392fa..5ff15dacb571 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -23,7 +23,7 @@ CFLAGS_sysinfo.o += -Iinclude/math-emu -Iarch/s390/math-emu -w
 obj-y   :=  bitmap.o traps.o time.o process.o base.o early.o setup.o \
             processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \
             s390_ext.o debug.o irq.o ipl.o dis.o diag.o mem_detect.o \
-            vdso.o vtime.o sysinfo.o nmi.o sclp.o
+            vdso.o vtime.o sysinfo.o nmi.o sclp.o jump_label.o
 
 obj-y   += $(if $(CONFIG_64BIT),entry64.o,entry.o)
 obj-y   += $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index fe03c140002a..edfbd17d7082 100644
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -124,13 +124,11 @@ int main(void)
         DEFINE(__LC_LAST_UPDATE_TIMER, offsetof(struct _lowcore, last_update_timer));
         DEFINE(__LC_LAST_UPDATE_CLOCK, offsetof(struct _lowcore, last_update_clock));
         DEFINE(__LC_CURRENT, offsetof(struct _lowcore, current_task));
+        DEFINE(__LC_CURRENT_PID, offsetof(struct _lowcore, current_pid));
         DEFINE(__LC_THREAD_INFO, offsetof(struct _lowcore, thread_info));
         DEFINE(__LC_KERNEL_STACK, offsetof(struct _lowcore, kernel_stack));
         DEFINE(__LC_ASYNC_STACK, offsetof(struct _lowcore, async_stack));
         DEFINE(__LC_PANIC_STACK, offsetof(struct _lowcore, panic_stack));
-        DEFINE(__LC_KERNEL_ASCE, offsetof(struct _lowcore, kernel_asce));
-        DEFINE(__LC_USER_ASCE, offsetof(struct _lowcore, user_asce));
-        DEFINE(__LC_USER_EXEC_ASCE, offsetof(struct _lowcore, user_exec_asce));
         DEFINE(__LC_INT_CLOCK, offsetof(struct _lowcore, int_clock));
         DEFINE(__LC_MCCK_CLOCK, offsetof(struct _lowcore, mcck_clock));
         DEFINE(__LC_MACHINE_FLAGS, offsetof(struct _lowcore, machine_flags));
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 1b67fc6ebdc2..0476174dfff5 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -212,6 +212,7 @@ __switch_to:
         lctl    %c4,%c4,__TASK_pid(%r3)         # load pid to control reg. 4
         lm      %r6,%r15,__SF_GPRS(%r15)        # load gprs of next task
         st      %r3,__LC_CURRENT                # store task struct of next
+        mvc     __LC_CURRENT_PID(4,%r0),__TASK_pid(%r3) # store pid of next
         st      %r5,__LC_THREAD_INFO            # store thread info of next
         ahi     %r5,STACK_SIZE                  # end of kernel stack of next
         st      %r5,__LC_KERNEL_STACK           # store end of kernel stack
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 9fd864563499..d61967e2eab0 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -220,6 +220,7 @@ __switch_to:
         lctl    %c4,%c4,__TASK_pid(%r3)         # load pid to control reg. 4
         lmg     %r6,%r15,__SF_GPRS(%r15)        # load gprs of next task
         stg     %r3,__LC_CURRENT                # store task struct of next
+        mvc     __LC_CURRENT_PID+4(4,%r0),__TASK_pid(%r3) # store pid of next
         stg     %r5,__LC_THREAD_INFO            # store thread info of next
         aghi    %r5,STACK_SIZE                  # end of kernel stack of next
         stg     %r5,__LC_KERNEL_STACK           # store end of kernel stack
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index ea5099c9709c..e204f9597aaf 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -32,6 +32,7 @@ static const struct irq_class intrclass_names[] = {
         {.name = "VRT", .desc = "[EXT] Virtio" },
         {.name = "SCP", .desc = "[EXT] Service Call" },
         {.name = "IUC", .desc = "[EXT] IUCV" },
+        {.name = "CPM", .desc = "[EXT] CPU Measurement" },
         {.name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt" },
         {.name = "QDI", .desc = "[I/O] QDIO Interrupt" },
         {.name = "DAS", .desc = "[I/O] DASD" },
diff --git a/arch/s390/kernel/jump_label.c b/arch/s390/kernel/jump_label.c
new file mode 100644
index 000000000000..44cc06bedf77
--- /dev/null
+++ b/arch/s390/kernel/jump_label.c
@@ -0,0 +1,59 @@
+/*
+ * Jump label s390 support
+ *
+ * Copyright IBM Corp. 2011
+ * Author(s): Jan Glauber <jang@linux.vnet.ibm.com>
+ */
+#include <linux/module.h>
+#include <linux/uaccess.h>
+#include <linux/stop_machine.h>
+#include <linux/jump_label.h>
+#include <asm/ipl.h>
+
+#ifdef HAVE_JUMP_LABEL
+
+struct insn {
+        u16 opcode;
+        s32 offset;
+} __packed;
+
+struct insn_args {
+        unsigned long *target;
+        struct insn *insn;
+        ssize_t size;
+};
+
+static int __arch_jump_label_transform(void *data)
+{
+        struct insn_args *args = data;
+        int rc;
+
+        rc = probe_kernel_write(args->target, args->insn, args->size);
+        WARN_ON_ONCE(rc < 0);
+        return 0;
+}
+
+void arch_jump_label_transform(struct jump_entry *entry,
+                               enum jump_label_type type)
+{
+        struct insn_args args;
+        struct insn insn;
+
+        if (type == JUMP_LABEL_ENABLE) {
+                /* brcl 15,offset */
+                insn.opcode = 0xc0f4;
+                insn.offset = (entry->target - entry->code) >> 1;
+        } else {
+                /* brcl 0,0 */
+                insn.opcode = 0xc004;
+                insn.offset = 0;
+        }
+
+        args.target = (void *) entry->code;
+        args.insn = &insn;
+        args.size = JUMP_LABEL_NOP_SIZE;
+
+        stop_machine(__arch_jump_label_transform, &args, NULL);
+}
+
+#endif
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index a895e69379f7..541a7509faeb 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -9,41 +9,26 @@
 
 #include <linux/compiler.h>
 #include <linux/cpu.h>
-#include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/fs.h>
 #include <linux/smp.h>
-#include <linux/stddef.h>
 #include <linux/slab.h>
-#include <linux/unistd.h>
-#include <linux/ptrace.h>
-#include <linux/vmalloc.h>
-#include <linux/user.h>
 #include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/reboot.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/notifier.h>
 #include <linux/tick.h>
-#include <linux/elfcore.h>
-#include <linux/kernel_stat.h>
 #include <linux/personality.h>
 #include <linux/syscalls.h>
 #include <linux/compat.h>
 #include <linux/kprobes.h>
 #include <linux/random.h>
-#include <asm/compat.h>
-#include <asm/uaccess.h>
-#include <asm/pgtable.h>
+#include <linux/module.h>
 #include <asm/system.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/irq.h>
 #include <asm/timer.h>
 #include <asm/nmi.h>
+#include <asm/compat.h>
 #include <asm/smp.h>
 #include "entry.h"
 
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index f5434d1ecb31..0c35dee10b00 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -305,8 +305,7 @@ static int set_amode_and_uaccess(unsigned long user_amode,
  */
 static int __init early_parse_switch_amode(char *p)
 {
-        if (user_mode != SECONDARY_SPACE_MODE)
-                user_mode = PRIMARY_SPACE_MODE;
+        user_mode = PRIMARY_SPACE_MODE;
         return 0;
 }
 early_param("switch_amode", early_parse_switch_amode);
@@ -315,10 +314,6 @@ static int __init early_parse_user_mode(char *p)
 {
         if (p && strcmp(p, "primary") == 0)
                 user_mode = PRIMARY_SPACE_MODE;
-#ifdef CONFIG_S390_EXEC_PROTECT
-        else if (p && strcmp(p, "secondary") == 0)
-                user_mode = SECONDARY_SPACE_MODE;
-#endif
         else if (!p || strcmp(p, "home") == 0)
                 user_mode = HOME_SPACE_MODE;
         else
@@ -327,31 +322,9 @@ static int __init early_parse_user_mode(char *p)
 }
 early_param("user_mode", early_parse_user_mode);
 
-#ifdef CONFIG_S390_EXEC_PROTECT
-/*
- * Enable execute protection?
- */
-static int __init early_parse_noexec(char *p)
-{
-        if (!strncmp(p, "off", 3))
-                return 0;
-        user_mode = SECONDARY_SPACE_MODE;
-        return 0;
-}
-early_param("noexec", early_parse_noexec);
-#endif /* CONFIG_S390_EXEC_PROTECT */
-
 static void setup_addressing_mode(void)
 {
-        if (user_mode == SECONDARY_SPACE_MODE) {
-                if (set_amode_and_uaccess(PSW_ASC_SECONDARY,
-                                          PSW32_ASC_SECONDARY))
-                        pr_info("Execute protection active, "
-                                "mvcos available\n");
-                else
-                        pr_info("Execute protection active, "
-                                "mvcos not available\n");
-        } else if (user_mode == PRIMARY_SPACE_MODE) {
+        if (user_mode == PRIMARY_SPACE_MODE) {
                 if (set_amode_and_uaccess(PSW_ASC_PRIMARY, PSW32_ASC_PRIMARY))
                         pr_info("Address spaces switched, "
                                 "mvcos available\n");
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 63a97db83f96..f8e85ecbc459 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -165,12 +165,12 @@ static void do_ext_call_interrupt(unsigned int ext_int_code,
         kstat_cpu(smp_processor_id()).irqs[EXTINT_IPI]++;
         /*
          * handle bit signal external calls
-         *
-         * For the ec_schedule signal we have to do nothing. All the work
-         * is done automatically when we return from the interrupt.
          */
         bits = xchg(&S390_lowcore.ext_call_fast, 0);
 
+        if (test_bit(ec_schedule, &bits))
+                scheduler_ipi();
+
         if (test_bit(ec_call_function, &bits))
                 generic_smp_call_function_interrupt();
 
@@ -335,7 +335,7 @@ static int smp_rescan_cpus_sigp(cpumask_t avail)
                 smp_cpu_polarization[logical_cpu] = POLARIZATION_UNKNWN;
                 if (!cpu_stopped(logical_cpu))
                         continue;
-                cpu_set(logical_cpu, cpu_present_map);
+                set_cpu_present(logical_cpu, true);
                 smp_cpu_state[logical_cpu] = CPU_STATE_CONFIGURED;
                 logical_cpu = cpumask_next(logical_cpu, &avail);
                 if (logical_cpu >= nr_cpu_ids)
@@ -367,7 +367,7 @@ static int smp_rescan_cpus_sclp(cpumask_t avail)
                         continue;
                 __cpu_logical_map[logical_cpu] = cpu_id;
                 smp_cpu_polarization[logical_cpu] = POLARIZATION_UNKNWN;
-                cpu_set(logical_cpu, cpu_present_map);
+                set_cpu_present(logical_cpu, true);
                 if (cpu >= info->configured)
                         smp_cpu_state[logical_cpu] = CPU_STATE_STANDBY;
                 else
@@ -385,7 +385,7 @@ static int __smp_rescan_cpus(void)
 {
         cpumask_t avail;
 
-        cpus_xor(avail, cpu_possible_map, cpu_present_map);
+        cpumask_xor(&avail, cpu_possible_mask, cpu_present_mask);
         if (smp_use_sigp_detection)
                 return smp_rescan_cpus_sigp(avail);
         else
@@ -467,7 +467,7 @@ int __cpuinit start_secondary(void *cpuvoid)
         notify_cpu_starting(smp_processor_id());
         /* Mark this cpu as online */
         ipi_call_lock();
-        cpu_set(smp_processor_id(), cpu_online_map);
+        set_cpu_online(smp_processor_id(), true);
         ipi_call_unlock();
         /* Switch on interrupts */
         local_irq_enable();
@@ -644,7 +644,7 @@ int __cpu_disable(void)
         struct ec_creg_mask_parms cr_parms;
         int cpu = smp_processor_id();
 
-        cpu_clear(cpu, cpu_online_map);
+        set_cpu_online(cpu, false);
 
         /* Disable pfault pseudo page faults on this cpu. */
         pfault_fini();
@@ -654,8 +654,8 @@ int __cpu_disable(void)
 
         /* disable all external interrupts */
         cr_parms.orvals[0] = 0;
-        cr_parms.andvals[0] = ~(1 << 15 | 1 << 14 | 1 << 13 | 1 << 12 |
-                                1 << 11 | 1 << 10 | 1 <<  6 | 1 <<  4);
+        cr_parms.andvals[0] = ~(1 << 15 | 1 << 14 | 1 << 13 | 1 << 11 |
+                                1 << 10 | 1 <<  9 | 1 <<  6 | 1 <<  4);
         /* disable all I/O interrupts */
         cr_parms.orvals[6] = 0;
         cr_parms.andvals[6] = ~(1 << 31 | 1 << 30 | 1 << 29 | 1 << 28 |
@@ -681,7 +681,7 @@ void __cpu_die(unsigned int cpu)
         atomic_dec(&init_mm.context.attach_count);
 }
 
-void cpu_die(void)
+void __noreturn cpu_die(void)
 {
         idle_task_exit();
         while (sigp(smp_processor_id(), sigp_stop) == sigp_busy)
@@ -738,8 +738,8 @@ void __init smp_prepare_boot_cpu(void)
         BUG_ON(smp_processor_id() != 0);
 
         current_thread_info()->cpu = 0;
-        cpu_set(0, cpu_present_map);
-        cpu_set(0, cpu_online_map);
+        set_cpu_present(0, true);
+        set_cpu_online(0, true);
         S390_lowcore.percpu_offset = __per_cpu_offset[0];
         current_set[0] = current;
         smp_cpu_state[0] = CPU_STATE_CONFIGURED;
@@ -1016,21 +1016,21 @@ int __ref smp_rescan_cpus(void)
 
         get_online_cpus();
         mutex_lock(&smp_cpu_state_mutex);
-        newcpus = cpu_present_map;
+        cpumask_copy(&newcpus, cpu_present_mask);
         rc = __smp_rescan_cpus();
         if (rc)
                 goto out;
-        cpus_andnot(newcpus, cpu_present_map, newcpus);
-        for_each_cpu_mask(cpu, newcpus) {
+        cpumask_andnot(&newcpus, cpu_present_mask, &newcpus);
+        for_each_cpu(cpu, &newcpus) {
                 rc = smp_add_present_cpu(cpu);
                 if (rc)
-                        cpu_clear(cpu, cpu_present_map);
+                        set_cpu_present(cpu, false);
         }
         rc = 0;
 out:
         mutex_unlock(&smp_cpu_state_mutex);
         put_online_cpus();
-        if (!cpus_empty(newcpus))
+        if (!cpumask_empty(&newcpus))
                 topology_schedule_update();
         return rc;
 }
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 87be655557aa..a59557f1fb5f 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -810,7 +810,7 @@ static int etr_sync_clock_stop(struct etr_aib *aib, int port)
         etr_sync.etr_port = port;
         get_online_cpus();
         atomic_set(&etr_sync.cpus, num_online_cpus() - 1);
-        rc = stop_machine(etr_sync_clock, &etr_sync, &cpu_online_map);
+        rc = stop_machine(etr_sync_clock, &etr_sync, cpu_online_mask);
         put_online_cpus();
         return rc;
 }
@@ -1579,7 +1579,7 @@ static void stp_work_fn(struct work_struct *work)
         memset(&stp_sync, 0, sizeof(stp_sync));
         get_online_cpus();
         atomic_set(&stp_sync.cpus, num_online_cpus() - 1);
-        stop_machine(stp_sync_clock, &stp_sync, &cpu_online_map);
+        stop_machine(stp_sync_clock, &stp_sync, cpu_online_mask);
         put_online_cpus();
 
         if (!check_sync_clock())
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 94b06c31fc8a..2eafb8c7a746 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -52,20 +52,20 @@ static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu)
 {
         cpumask_t mask;
 
-        cpus_clear(mask);
+        cpumask_clear(&mask);
         if (!topology_enabled || !MACHINE_HAS_TOPOLOGY) {
                 cpumask_copy(&mask, cpumask_of(cpu));
                 return mask;
         }
         while (info) {
-                if (cpu_isset(cpu, info->mask)) {
+                if (cpumask_test_cpu(cpu, &info->mask)) {
                         mask = info->mask;
                         break;
                 }
                 info = info->next;
         }
-        if (cpus_empty(mask))
-                mask = cpumask_of_cpu(cpu);
+        if (cpumask_empty(&mask))
+                cpumask_copy(&mask, cpumask_of(cpu));
         return mask;
 }
 
@@ -85,10 +85,10 @@ static void add_cpus_to_mask(struct topology_cpu *tl_cpu,
                         if (cpu_logical_map(lcpu) != rcpu)
                                 continue;
 #ifdef CONFIG_SCHED_BOOK
-                        cpu_set(lcpu, book->mask);
+                        cpumask_set_cpu(lcpu, &book->mask);
                         cpu_book_id[lcpu] = book->id;
 #endif
-                        cpu_set(lcpu, core->mask);
+                        cpumask_set_cpu(lcpu, &core->mask);
                         cpu_core_id[lcpu] = core->id;
                         smp_cpu_polarization[lcpu] = tl_cpu->pp;
                 }
@@ -101,13 +101,13 @@ static void clear_masks(void)
 
         info = &core_info;
         while (info) {
-                cpus_clear(info->mask);
+                cpumask_clear(&info->mask);
                 info = info->next;
         }
 #ifdef CONFIG_SCHED_BOOK
         info = &book_info;
         while (info) {
-                cpus_clear(info->mask);
+                cpumask_clear(&info->mask);
                 info = info->next;
         }
 #endif
diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile
index d13e8755a8cc..8ad2b34ad151 100644
--- a/arch/s390/kernel/vdso32/Makefile
+++ b/arch/s390/kernel/vdso32/Makefile
@@ -22,6 +22,9 @@ obj-y += vdso32_wrapper.o
 extra-y += vdso32.lds
 CPPFLAGS_vdso32.lds += -P -C -U$(ARCH)
 
+# Disable gcov profiling for VDSO code
+GCOV_PROFILE := n
+
 # Force dependency (incbin is bad)
 $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so
 
diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile
index 449352dda9cd..2a8ddfd12a5b 100644
--- a/arch/s390/kernel/vdso64/Makefile
+++ b/arch/s390/kernel/vdso64/Makefile
@@ -22,6 +22,9 @@ obj-y += vdso64_wrapper.o
 extra-y += vdso64.lds
 CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
 
+# Disable gcov profiling for VDSO code
+GCOV_PROFILE := n
+
 # Force dependency (incbin is bad)
 $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so
 
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 1bc18cdb525b..56fe6bc81fee 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -77,7 +77,7 @@ SECTIONS
         . = ALIGN(PAGE_SIZE);
         INIT_DATA_SECTION(0x100)
 
-        PERCPU(0x100, PAGE_SIZE)
+        PERCPU_SECTION(0x100)
         . = ALIGN(PAGE_SIZE);
         __init_end = .;         /* freed after init ends here */
 
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index 3cc95dd0a3a6..075ddada4911 100644
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -412,6 +412,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
         struct dcss_segment *seg;
         int rc, diag_cc;
 
+        start_addr = end_addr = 0;
         seg = kmalloc(sizeof(*seg), GFP_KERNEL | GFP_DMA);
         if (seg == NULL) {
                 rc = -ENOMEM;
@@ -573,6 +574,7 @@ segment_modify_shared (char *name, int do_nonshared)
         unsigned long start_addr, end_addr, dummy;
         int rc, diag_cc;
 
+        start_addr = end_addr = 0;
         mutex_lock(&dcss_lock);
         seg = segment_by_name (name);
         if (seg == NULL) {
@@ -681,8 +683,6 @@ void
 segment_save(char *name)
 {
         struct dcss_segment *seg;
-        int startpfn = 0;
-        int endpfn = 0;
         char cmd1[160];
         char cmd2[80];
         int i, response;
@@ -698,8 +698,6 @@ segment_save(char *name)
                 goto out;
         }
 
-        startpfn = seg->start_addr >> PAGE_SHIFT;
-        endpfn = (seg->end) >> PAGE_SHIFT;
         sprintf(cmd1, "DEFSEG %s", name);
         for (i=0; i<seg->segcnt; i++) {
                 sprintf(cmd1+strlen(cmd1), " %lX-%lX %s",
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index ab988135e5c6..a0f9e730f26a 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -225,33 +225,6 @@ static noinline void do_sigbus(struct pt_regs *regs, long int_code,
         force_sig_info(SIGBUS, &si, tsk);
 }
 
-#ifdef CONFIG_S390_EXEC_PROTECT
-static noinline int signal_return(struct pt_regs *regs, long int_code,
-                                  unsigned long trans_exc_code)
-{
-        u16 instruction;
-        int rc;
-
-        rc = __get_user(instruction, (u16 __user *) regs->psw.addr);
-
-        if (!rc && instruction == 0x0a77) {
-                clear_tsk_thread_flag(current, TIF_PER_TRAP);
-                if (is_compat_task())
-                        sys32_sigreturn();
-                else
-                        sys_sigreturn();
-        } else if (!rc && instruction == 0x0aad) {
-                clear_tsk_thread_flag(current, TIF_PER_TRAP);
-                if (is_compat_task())
-                        sys32_rt_sigreturn();
-                else
-                        sys_rt_sigreturn();
-        } else
-                do_sigsegv(regs, int_code, SEGV_MAPERR, trans_exc_code);
-        return 0;
-}
-#endif /* CONFIG_S390_EXEC_PROTECT */
-
 static noinline void do_fault_error(struct pt_regs *regs, long int_code,
                                     unsigned long trans_exc_code, int fault)
 {
@@ -259,13 +232,6 @@ static noinline void do_fault_error(struct pt_regs *regs, long int_code,
 
         switch (fault) {
         case VM_FAULT_BADACCESS:
-#ifdef CONFIG_S390_EXEC_PROTECT
-                if ((regs->psw.mask & PSW_MASK_ASC) == PSW_ASC_SECONDARY &&
-                    (trans_exc_code & 3) == 0) {
-                        signal_return(regs, int_code, trans_exc_code);
-                        break;
-                }
-#endif /* CONFIG_S390_EXEC_PROTECT */
         case VM_FAULT_BADMAP:
                 /* Bad memory access. Check if it is kernel or user space. */
                 if (regs->psw.mask & PSW_MASK_PSTATE) {
@@ -414,11 +380,6 @@ void __kprobes do_dat_exception(struct pt_regs *regs, long pgm_int_code,
         int access, fault;
 
         access = VM_READ | VM_EXEC | VM_WRITE;
-#ifdef CONFIG_S390_EXEC_PROTECT
-        if ((regs->psw.mask & PSW_MASK_ASC) == PSW_ASC_SECONDARY &&
-            (trans_exc_code & 3) == 0)
-                access = VM_EXEC;
-#endif
         fault = do_exception(regs, access, trans_exc_code);
         if (unlikely(fault))
                 do_fault_error(regs, pgm_int_code & 255, trans_exc_code, fault);
@@ -491,22 +452,28 @@ static int __init nopfault(char *str)
 
 __setup("nopfault", nopfault);
 
-typedef struct {
-        __u16 refdiagc;
-        __u16 reffcode;
-        __u16 refdwlen;
-        __u16 refversn;
-        __u64 refgaddr;
-        __u64 refselmk;
-        __u64 refcmpmk;
-        __u64 reserved;
-} __attribute__ ((packed, aligned(8))) pfault_refbk_t;
+struct pfault_refbk {
+        u16 refdiagc;
+        u16 reffcode;
+        u16 refdwlen;
+        u16 refversn;
+        u64 refgaddr;
+        u64 refselmk;
+        u64 refcmpmk;
+        u64 reserved;
+} __attribute__ ((packed, aligned(8)));
 
 int pfault_init(void)
 {
-        pfault_refbk_t refbk =
-                { 0x258, 0, 5, 2, __LC_CURRENT, 1ULL << 48, 1ULL << 48,
-                  __PF_RES_FIELD };
+        struct pfault_refbk refbk = {
+                .refdiagc = 0x258,
+                .reffcode = 0,
+                .refdwlen = 5,
+                .refversn = 2,
+                .refgaddr = __LC_CURRENT_PID,
+                .refselmk = 1ULL << 48,
+                .refcmpmk = 1ULL << 48,
+                .reserved = __PF_RES_FIELD };
         int rc;
 
         if (!MACHINE_IS_VM || pfault_disable)
@@ -524,8 +491,12 @@ int pfault_init(void)
 
 void pfault_fini(void)
 {
-        pfault_refbk_t refbk =
-        { 0x258, 1, 5, 2, 0ULL, 0ULL, 0ULL, 0ULL };
+        struct pfault_refbk refbk = {
+                .refdiagc = 0x258,
+                .reffcode = 1,
+                .refdwlen = 5,
+                .refversn = 2,
+        };
 
         if (!MACHINE_IS_VM || pfault_disable)
                 return;
@@ -537,11 +508,15 @@ void pfault_fini(void)
                 : : "a" (&refbk), "m" (refbk) : "cc");
 }
 
+static DEFINE_SPINLOCK(pfault_lock);
+static LIST_HEAD(pfault_list);
+
 static void pfault_interrupt(unsigned int ext_int_code,
                              unsigned int param32, unsigned long param64)
 {
         struct task_struct *tsk;
         __u16 subcode;
+        pid_t pid;
 
         /*
          * Get the external interruption subcode & pfault
@@ -553,44 +528,79 @@ static void pfault_interrupt(unsigned int ext_int_code,
         if ((subcode & 0xff00) != __SUBCODE_MASK)
                 return;
         kstat_cpu(smp_processor_id()).irqs[EXTINT_PFL]++;
-
-        /*
-         * Get the token (= address of the task structure of the affected task).
-         */
-#ifdef CONFIG_64BIT
-        tsk = (struct task_struct *) param64;
-#else
-        tsk = (struct task_struct *) param32;
-#endif
-
+        if (subcode & 0x0080) {
+                /* Get the token (= pid of the affected task). */
+                pid = sizeof(void *) == 4 ? param32 : param64;
+                rcu_read_lock();
+                tsk = find_task_by_pid_ns(pid, &init_pid_ns);
+                if (tsk)
+                        get_task_struct(tsk);
+                rcu_read_unlock();
+                if (!tsk)
+                        return;
+        } else {
+                tsk = current;
+        }
+        spin_lock(&pfault_lock);
         if (subcode & 0x0080) {
                 /* signal bit is set -> a page has been swapped in by VM */
-                if (xchg(&tsk->thread.pfault_wait, -1) != 0) {
+                if (tsk->thread.pfault_wait == 1) {
                         /* Initial interrupt was faster than the completion
                          * interrupt. pfault_wait is valid. Set pfault_wait
                          * back to zero and wake up the process. This can
                          * safely be done because the task is still sleeping
                          * and can't produce new pfaults. */
                         tsk->thread.pfault_wait = 0;
+                        list_del(&tsk->thread.list);
                         wake_up_process(tsk);
-                        put_task_struct(tsk);
+                } else {
+                        /* Completion interrupt was faster than initial
+                         * interrupt. Set pfault_wait to -1 so the initial
+                         * interrupt doesn't put the task to sleep. */
+                        tsk->thread.pfault_wait = -1;
                 }
+                put_task_struct(tsk);
         } else {
                 /* signal bit not set -> a real page is missing. */
-                get_task_struct(tsk);
-                set_task_state(tsk, TASK_UNINTERRUPTIBLE);
-                if (xchg(&tsk->thread.pfault_wait, 1) != 0) {
+                if (tsk->thread.pfault_wait == -1) {
                         /* Completion interrupt was faster than the initial
-                         * interrupt (swapped in a -1 for pfault_wait). Set
-                         * pfault_wait back to zero and exit. This can be
-                         * done safely because tsk is running in kernel 
-                         * mode and can't produce new pfaults. */
+                         * interrupt (pfault_wait == -1). Set pfault_wait
+                         * back to zero and exit. */
                         tsk->thread.pfault_wait = 0;
-                        set_task_state(tsk, TASK_RUNNING);
-                        put_task_struct(tsk);
-                } else
+                } else {
+                        /* Initial interrupt arrived before completion
+                         * interrupt. Let the task sleep. */
+                        tsk->thread.pfault_wait = 1;
+                        list_add(&tsk->thread.list, &pfault_list);
+                        set_task_state(tsk, TASK_UNINTERRUPTIBLE);
                         set_tsk_need_resched(tsk);
+                }
+        }
+        spin_unlock(&pfault_lock);
+}
+
+static int __cpuinit pfault_cpu_notify(struct notifier_block *self,
+                                       unsigned long action, void *hcpu)
+{
+        struct thread_struct *thread, *next;
+        struct task_struct *tsk;
+
+        switch (action) {
+        case CPU_DEAD:
+        case CPU_DEAD_FROZEN:
+                spin_lock_irq(&pfault_lock);
+                list_for_each_entry_safe(thread, next, &pfault_list, list) {
+                        thread->pfault_wait = 0;
+                        list_del(&thread->list);
+                        tsk = container_of(thread, struct task_struct, thread);
+                        wake_up_process(tsk);
+                }
+                spin_unlock_irq(&pfault_lock);
+                break;
+        default:
+                break;
         }
+        return NOTIFY_OK;
 }
 
 static int __init pfault_irq_init(void)
@@ -599,22 +609,21 @@ static int __init pfault_irq_init(void)
 
         if (!MACHINE_IS_VM)
                 return 0;
-        /*
-         * Try to get pfault pseudo page faults going.
-         */
         rc = register_external_interrupt(0x2603, pfault_interrupt);
-        if (rc) {
-                pfault_disable = 1;
-                return rc;
-        }
-        if (pfault_init() == 0)
-                return 0;
+        if (rc)
+                goto out_extint;
+        rc = pfault_init() == 0 ? 0 : -EOPNOTSUPP;
+        if (rc)
+                goto out_pfault;
+        hotcpu_notifier(pfault_cpu_notify, 0);
+        return 0;
 
-        /* Tough luck, no pfault. */
-        pfault_disable = 1;
+out_pfault:
         unregister_external_interrupt(0x2603, pfault_interrupt);
-        return 0;
+out_extint:
+        pfault_disable = 1;
+        return rc;
 }
 early_initcall(pfault_irq_init);
 
-#endif
+#endif /* CONFIG_PFAULT */
diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index 639cd21f2218..a4d856db9154 100644
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -13,7 +13,6 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
                                    pte_t *pteptr, pte_t pteval)
 {
         pmd_t *pmdp = (pmd_t *) pteptr;
-        pte_t shadow_pteval = pteval;
         unsigned long mask;
 
         if (!MACHINE_HAS_HPAGE) {
@@ -21,18 +20,9 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
                 mask = pte_val(pteval) &
                                 (_SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO);
                 pte_val(pteval) = (_SEGMENT_ENTRY + __pa(pteptr)) | mask;
-                if (mm->context.noexec) {
-                        pteptr += PTRS_PER_PTE;
-                        pte_val(shadow_pteval) =
-                                        (_SEGMENT_ENTRY + __pa(pteptr)) | mask;
-                }
         }
 
         pmd_val(*pmdp) = pte_val(pteval);
-        if (mm->context.noexec) {
-                pmdp = get_shadow_table(pmdp);
-                pmd_val(*pmdp) = pte_val(shadow_pteval);
-        }
 }
 
 int arch_prepare_hugepage(struct page *page)
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index bb409332a484..dfefc2171691 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -175,7 +175,8 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
                 pmd = pmd_offset(pud, address);
                 pte = pte_offset_kernel(pmd, address);
                 if (!enable) {
-                        ptep_invalidate(&init_mm, address, pte);
+                        __ptep_ipte(address, pte);
+                        pte_val(*pte) = _PAGE_TYPE_EMPTY;
                         continue;
                 }
                 *pte = mk_pte_phys(address, __pgprot(_PAGE_TYPE_RW));
diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
index 0607e4b14b27..d013ed39743b 100644
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@ -28,7 +28,7 @@ static void change_page_attr(unsigned long addr, int numpages,
 
                 pte = *ptep;
                 pte = set(pte);
-                ptep_invalidate(&init_mm, addr, ptep);
+                __ptep_ipte(addr, ptep);
                 *ptep = pte;
                 addr += PAGE_SIZE;
         }
@@ -54,3 +54,8 @@ int set_memory_nx(unsigned long addr, int numpages)
         return 0;
 }
 EXPORT_SYMBOL_GPL(set_memory_nx);
+
+int set_memory_x(unsigned long addr, int numpages)
+{
+        return 0;
+}
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index e1850c28cd68..14c6fae6fe6b 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -36,11 +36,9 @@ struct rcu_table_freelist {
         ((PAGE_SIZE - sizeof(struct rcu_table_freelist)) \
           / sizeof(unsigned long))
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 static DEFINE_PER_CPU(struct rcu_table_freelist *, rcu_table_freelist);
 
 static void __page_table_free(struct mm_struct *mm, unsigned long *table);
-static void __crst_table_free(struct mm_struct *mm, unsigned long *table);
 
 static struct rcu_table_freelist *rcu_table_freelist_get(struct mm_struct *mm)
 {
@@ -67,7 +65,7 @@ static void rcu_table_freelist_callback(struct rcu_head *head)
         while (batch->pgt_index > 0)
                 __page_table_free(batch->mm, batch->table[--batch->pgt_index]);
         while (batch->crst_index < RCU_FREELIST_SIZE)
-                __crst_table_free(batch->mm, batch->table[batch->crst_index++]);
+                crst_table_free(batch->mm, batch->table[batch->crst_index++]);
         free_page((unsigned long) batch);
 }
 
@@ -125,63 +123,33 @@ static int __init parse_vmalloc(char *arg)
 }
 early_param("vmalloc", parse_vmalloc);
 
-unsigned long *crst_table_alloc(struct mm_struct *mm, int noexec)
+unsigned long *crst_table_alloc(struct mm_struct *mm)
 {
         struct page *page = alloc_pages(GFP_KERNEL, ALLOC_ORDER);
 
         if (!page)
                 return NULL;
-        page->index = 0;
-        if (noexec) {
-                struct page *shadow = alloc_pages(GFP_KERNEL, ALLOC_ORDER);
-                if (!shadow) {
-                        __free_pages(page, ALLOC_ORDER);
-                        return NULL;
-                }
-                page->index = page_to_phys(shadow);
-        }
-        spin_lock_bh(&mm->context.list_lock);
-        list_add(&page->lru, &mm->context.crst_list);
-        spin_unlock_bh(&mm->context.list_lock);
         return (unsigned long *) page_to_phys(page);
 }
 
-static void __crst_table_free(struct mm_struct *mm, unsigned long *table)
-{
-        unsigned long *shadow = get_shadow_table(table);
-
-        if (shadow)
-                free_pages((unsigned long) shadow, ALLOC_ORDER);
-        free_pages((unsigned long) table, ALLOC_ORDER);
-}
-
 void crst_table_free(struct mm_struct *mm, unsigned long *table)
 {
-        struct page *page = virt_to_page(table);
-
-        spin_lock_bh(&mm->context.list_lock);
-        list_del(&page->lru);
-        spin_unlock_bh(&mm->context.list_lock);
-        __crst_table_free(mm, table);
+        free_pages((unsigned long) table, ALLOC_ORDER);
 }
 
 void crst_table_free_rcu(struct mm_struct *mm, unsigned long *table)
 {
         struct rcu_table_freelist *batch;
-        struct page *page = virt_to_page(table);
 
-        spin_lock_bh(&mm->context.list_lock);
-        list_del(&page->lru);
-        spin_unlock_bh(&mm->context.list_lock);
         if (atomic_read(&mm->mm_users) < 2 &&
             cpumask_equal(mm_cpumask(mm), cpumask_of(smp_processor_id()))) {
-                __crst_table_free(mm, table);
+                crst_table_free(mm, table);
                 return;
         }
         batch = rcu_table_freelist_get(mm);
         if (!batch) {
                 smp_call_function(smp_sync, NULL, 1);
-                __crst_table_free(mm, table);
+                crst_table_free(mm, table);
                 return;
         }
         batch->table[--batch->crst_index] = table;
@@ -197,7 +165,7 @@ int crst_table_upgrade(struct mm_struct *mm, unsigned long limit)
 
         BUG_ON(limit > (1UL << 53));
 repeat:
-        table = crst_table_alloc(mm, mm->context.noexec);
+        table = crst_table_alloc(mm);
         if (!table)
                 return -ENOMEM;
         spin_lock_bh(&mm->page_table_lock);
@@ -273,7 +241,7 @@ unsigned long *page_table_alloc(struct mm_struct *mm)
         unsigned long *table;
         unsigned long bits;
 
-        bits = (mm->context.noexec || mm->context.has_pgste) ? 3UL : 1UL;
+        bits = (mm->context.has_pgste) ? 3UL : 1UL;
         spin_lock_bh(&mm->context.list_lock);
         page = NULL;
         if (!list_empty(&mm->context.pgtable_list)) {
@@ -329,7 +297,7 @@ void page_table_free(struct mm_struct *mm, unsigned long *table)
         struct page *page;
         unsigned long bits;
 
-        bits = (mm->context.noexec || mm->context.has_pgste) ? 3UL : 1UL;
+        bits = (mm->context.has_pgste) ? 3UL : 1UL;
         bits <<= (__pa(table) & (PAGE_SIZE - 1)) / 256 / sizeof(unsigned long);
         page = pfn_to_page(__pa(table) >> PAGE_SHIFT);
         spin_lock_bh(&mm->context.list_lock);
@@ -366,7 +334,7 @@ void page_table_free_rcu(struct mm_struct *mm, unsigned long *table)
                 page_table_free(mm, table);
                 return;
         }
-        bits = (mm->context.noexec || mm->context.has_pgste) ? 3UL : 1UL;
+        bits = (mm->context.has_pgste) ? 3UL : 1UL;
         bits <<= (__pa(table) & (PAGE_SIZE - 1)) / 256 / sizeof(unsigned long);
         page = pfn_to_page(__pa(table) >> PAGE_SHIFT);
         spin_lock_bh(&mm->context.list_lock);
@@ -379,25 +347,6 @@ void page_table_free_rcu(struct mm_struct *mm, unsigned long *table)
                 rcu_table_freelist_finish();
 }
 
-void disable_noexec(struct mm_struct *mm, struct task_struct *tsk)
-{
-        struct page *page;
-
-        spin_lock_bh(&mm->context.list_lock);
-        /* Free shadow region and segment tables. */
-        list_for_each_entry(page, &mm->context.crst_list, lru)
-                if (page->index) {
-                        free_pages((unsigned long) page->index, ALLOC_ORDER);
-                        page->index = 0;
-                }
-        /* "Free" second halves of page tables. */
-        list_for_each_entry(page, &mm->context.pgtable_list, lru)
-                page->flags &= ~SECOND_HALVES;
-        spin_unlock_bh(&mm->context.list_lock);
-        mm->context.noexec = 0;
-        update_mm(mm, tsk);
-}
-
 /*
  * switch on pgstes for its userspace process (for kvm)
  */
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index 34c43f23b28c..8c1970d1dd91 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -95,7 +95,7 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
                         pu_dir = vmem_pud_alloc();
                         if (!pu_dir)
                                 goto out;
-                        pgd_populate_kernel(&init_mm, pg_dir, pu_dir);
+                        pgd_populate(&init_mm, pg_dir, pu_dir);
                 }
 
                 pu_dir = pud_offset(pg_dir, address);
@@ -103,7 +103,7 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
                         pm_dir = vmem_pmd_alloc();
                         if (!pm_dir)
                                 goto out;
-                        pud_populate_kernel(&init_mm, pu_dir, pm_dir);
+                        pud_populate(&init_mm, pu_dir, pm_dir);
                 }
 
                 pte = mk_pte_phys(address, __pgprot(ro ? _PAGE_RO : 0));
@@ -123,7 +123,7 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
                         pt_dir = vmem_pte_alloc();
                         if (!pt_dir)
                                 goto out;
-                        pmd_populate_kernel(&init_mm, pm_dir, pt_dir);
+                        pmd_populate(&init_mm, pm_dir, pt_dir);
                 }
 
                 pt_dir = pte_offset_kernel(pm_dir, address);
@@ -159,7 +159,7 @@ static void vmem_remove_range(unsigned long start, unsigned long size)
                         continue;
 
                 if (pmd_huge(*pm_dir)) {
-                        pmd_clear_kernel(pm_dir);
+                        pmd_clear(pm_dir);
                         address += HPAGE_SIZE - PAGE_SIZE;
                         continue;
                 }
@@ -192,7 +192,7 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
                         pu_dir = vmem_pud_alloc();
                         if (!pu_dir)
                                 goto out;
-                        pgd_populate_kernel(&init_mm, pg_dir, pu_dir);
+                        pgd_populate(&init_mm, pg_dir, pu_dir);
                 }
 
                 pu_dir = pud_offset(pg_dir, address);
@@ -200,7 +200,7 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
                         pm_dir = vmem_pmd_alloc();
                         if (!pm_dir)
                                 goto out;
-                        pud_populate_kernel(&init_mm, pu_dir, pm_dir);
+                        pud_populate(&init_mm, pu_dir, pm_dir);
                 }
 
                 pm_dir = pmd_offset(pu_dir, address);
@@ -208,7 +208,7 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
                         pt_dir = vmem_pte_alloc();
                         if (!pt_dir)
                                 goto out;
-                        pmd_populate_kernel(&init_mm, pm_dir, pt_dir);
+                        pmd_populate(&init_mm, pm_dir, pt_dir);
                 }
 
                 pt_dir = pte_offset_kernel(pm_dir, address);
diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c
index 33cbd373cce4..053caa0fd276 100644
--- a/arch/s390/oprofile/hwsampler.c
+++ b/arch/s390/oprofile/hwsampler.c
@@ -5,6 +5,7 @@
  * Author: Heinz Graalfs <graalfs@de.ibm.com>
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/smp.h>
@@ -674,17 +675,11 @@ int hwsampler_activate(unsigned int cpu)
 static void hws_ext_handler(unsigned int ext_int_code,
                             unsigned int param32, unsigned long param64)
 {
-        int cpu;
         struct hws_cpu_buffer *cb;
 
-        cpu = smp_processor_id();
-        cb = &per_cpu(sampler_cpu_buffer, cpu);
-
-        atomic_xchg(
-                        &cb->ext_params,
-                        atomic_read(&cb->ext_params)
-                                | S390_lowcore.ext_params);
-
+        kstat_cpu(smp_processor_id()).irqs[EXTINT_CPM]++;
+        cb = &__get_cpu_var(sampler_cpu_buffer);
+        atomic_xchg(&cb->ext_params, atomic_read(&cb->ext_params) | param32);
         if (hws_wq)
                 queue_work(hws_wq, &cb->worker);
 }
@@ -764,7 +759,7 @@ static int worker_check_error(unsigned int cpu, int ext_params)
         if (!sdbt || !*sdbt)
                 return -EINVAL;
 
-        if (ext_params & EI_IEA)
+        if (ext_params & EI_PRA)
                 cb->req_alert++;
 
         if (ext_params & EI_LSDA)
@@ -1009,7 +1004,7 @@ int hwsampler_deallocate()
         if (hws_state != HWS_STOPPED)
                 goto deallocate_exit;
 
-        smp_ctl_clear_bit(0, 5); /* set bit 58 CR0 off */
+        ctl_clear_bit(0, 5); /* set bit 58 CR0 off */
         deallocate_sdbt();
 
         hws_state = HWS_DEALLOCATED;
@@ -1123,7 +1118,7 @@ int hwsampler_shutdown()
                 mutex_lock(&hws_sem);
 
                 if (hws_state == HWS_STOPPED) {
-                        smp_ctl_clear_bit(0, 5); /* set bit 58 CR0 off */
+                        ctl_clear_bit(0, 5); /* set bit 58 CR0 off */
                         deallocate_sdbt();
                 }
                 if (hws_wq) {
@@ -1198,7 +1193,7 @@ start_all_exit:
         hws_oom = 1;
         hws_flush_all = 0;
         /* now let them in, 1407 CPUMF external interrupts */
-        smp_ctl_set_bit(0, 5); /* set CR0 bit 58 */
+        ctl_set_bit(0, 5); /* set CR0 bit 58 */
 
         return 0;
 }
diff --git a/arch/score/Kconfig.debug b/arch/score/Kconfig.debug
index 451ed54ce646..a1f346df0a71 100644
--- a/arch/score/Kconfig.debug
+++ b/arch/score/Kconfig.debug
@@ -16,15 +16,6 @@ config CMDLINE
           other cases you can specify kernel args so that you don't have
           to set them up in board prom initialization routines.
 
-config DEBUG_STACK_USAGE
-        bool "Enable stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        help
-          Enables the display of the minimum amount of free stack which each
-          task has ever had available in the sysrq-T and sysrq-P debug output.
-
-          This option will slow down process creation somewhat.
-
 config RUNTIME_DEBUG
         bool "Enable run-time debugging"
         depends on DEBUG_KERNEL
diff --git a/arch/score/mm/init.c b/arch/score/mm/init.c
index 50fdec54c70a..cee6bce1e30c 100644
--- a/arch/score/mm/init.c
+++ b/arch/score/mm/init.c
@@ -38,8 +38,6 @@
 #include <asm/sections.h>
 #include <asm/tlb.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 unsigned long empty_zero_page;
 EXPORT_SYMBOL_GPL(empty_zero_page);
 
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 4b89da248d17..b44e37753b9a 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -21,10 +21,10 @@ config SUPERH
         select HAVE_REGS_AND_STACK_ACCESS_API
         select HAVE_GENERIC_HARDIRQS
         select HAVE_SPARSE_IRQ
+        select IRQ_FORCED_THREADING
         select RTC_LIB
         select GENERIC_ATOMIC64
         select GENERIC_IRQ_SHOW
-        select ARCH_NO_SYSDEV_OPS
         help
           The SuperH is a RISC processor targeted for use in embedded systems
           and consumer electronics; it was also used in the Sega Dreamcast
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 1553d56cf4e0..c1d5a820b1aa 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -28,15 +28,6 @@ config STACK_DEBUG
           every function call and will therefore incur a major
           performance hit. Most users should say N.
 
-config DEBUG_STACK_USAGE
-        bool "Stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        help
-          Enables the display of the minimum amount of free stack which each
-          task has ever had available in the sysrq-T and sysrq-P debug output.
-
-          This option will slow down process creation somewhat.
-
 config 4KSTACKS
         bool "Use 4Kb for kernel stacks instead of 8Kb"
         depends on DEBUG_KERNEL && (MMU || BROKEN) && !PAGE_SIZE_64KB
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 86a0d565aded..bb13d0e1b964 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -482,7 +482,7 @@ static struct i2c_board_info ts_i2c_clients = {
         .irq            = IRQ0,
 };
 
-#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)
+#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
 /* SDHI0 */
 static void sdhi0_set_pwr(struct platform_device *pdev, int state)
 {
@@ -522,7 +522,7 @@ static struct platform_device sdhi0_device = {
         },
 };
 
-#if !defined(CONFIG_MMC_SH_MMCIF)
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
 /* SDHI1 */
 static void sdhi1_set_pwr(struct platform_device *pdev, int state)
 {
@@ -836,7 +836,7 @@ static struct platform_device vou_device = {
         },
 };
 
-#if defined(CONFIG_MMC_SH_MMCIF)
+#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
 /* SH_MMCIF */
 static void mmcif_set_pwr(struct platform_device *pdev, int state)
 {
@@ -898,9 +898,9 @@ static struct platform_device *ecovec_devices[] __initdata = {
         &ceu0_device,
         &ceu1_device,
         &keysc_device,
-#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)
+#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
         &sdhi0_device,
-#if !defined(CONFIG_MMC_SH_MMCIF)
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
         &sdhi1_device,
 #endif
 #else
@@ -912,7 +912,7 @@ static struct platform_device *ecovec_devices[] __initdata = {
         &fsi_device,
         &irda_device,
         &vou_device,
-#if defined(CONFIG_MMC_SH_MMCIF)
+#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
         &sh_mmcif_device,
 #endif
 };
@@ -1180,7 +1180,7 @@ static int __init arch_setup(void)
         gpio_direction_input(GPIO_PTR5);
         gpio_direction_input(GPIO_PTR6);
 
-#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)
+#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
         /* enable SDHI0 on CN11 (needs DS2.4 set to ON) */
         gpio_request(GPIO_FN_SDHI0CD,  NULL);
         gpio_request(GPIO_FN_SDHI0WP,  NULL);
@@ -1193,7 +1193,7 @@ static int __init arch_setup(void)
         gpio_request(GPIO_PTB6, NULL);
         gpio_direction_output(GPIO_PTB6, 0);
 
-#if !defined(CONFIG_MMC_SH_MMCIF)
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
         /* enable SDHI1 on CN12 (needs DS2.6,7 set to ON,OFF) */
         gpio_request(GPIO_FN_SDHI1CD,  NULL);
         gpio_request(GPIO_FN_SDHI1WP,  NULL);
@@ -1284,7 +1284,7 @@ static int __init arch_setup(void)
         gpio_request(GPIO_PTU5, NULL);
         gpio_direction_output(GPIO_PTU5, 0);
 
-#if defined(CONFIG_MMC_SH_MMCIF)
+#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
         /* enable MMCIF (needs DS2.6,7 set to OFF,ON) */
         gpio_request(GPIO_FN_MMC_D7, NULL);
         gpio_request(GPIO_FN_MMC_D6, NULL);
diff --git a/arch/sh/configs/apsh4ad0a_defconfig b/arch/sh/configs/apsh4ad0a_defconfig
index e71a531f1e31..77ec0e7b8ddf 100644
--- a/arch/sh/configs/apsh4ad0a_defconfig
+++ b/arch/sh/configs/apsh4ad0a_defconfig
@@ -48,7 +48,6 @@ CONFIG_PREEMPT=y
 CONFIG_BINFMT_MISC=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
-CONFIG_PM_VERBOSE=y
 CONFIG_PM_RUNTIME=y
 CONFIG_CPU_IDLE=y
 CONFIG_NET=y
diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig
index 8d13e8a5a750..911e30c9abfd 100644
--- a/arch/sh/configs/ecovec24_defconfig
+++ b/arch/sh/configs/ecovec24_defconfig
@@ -115,7 +115,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_FILE_STORAGE=m
 CONFIG_MMC=y
 CONFIG_MMC_SPI=y
-CONFIG_MMC_TMIO=y
+CONFIG_MMC_SDHI=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_RS5C372=y
 CONFIG_UIO=y
diff --git a/arch/sh/configs/sdk7786_defconfig b/arch/sh/configs/sdk7786_defconfig
index dc4a2eb6a616..c41650572d79 100644
--- a/arch/sh/configs/sdk7786_defconfig
+++ b/arch/sh/configs/sdk7786_defconfig
@@ -83,7 +83,6 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_MISC=y
 CONFIG_PM=y
 CONFIG_PM_DEBUG=y
-CONFIG_PM_VERBOSE=y
 CONFIG_PM_RUNTIME=y
 CONFIG_CPU_IDLE=y
 CONFIG_NET=y
diff --git a/arch/sh/configs/sh7757lcr_defconfig b/arch/sh/configs/sh7757lcr_defconfig
index fa0ecf87034c..33ddb130a7c8 100644
--- a/arch/sh/configs/sh7757lcr_defconfig
+++ b/arch/sh/configs/sh7757lcr_defconfig
@@ -70,7 +70,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
-CONFIG_MMC_TMIO=y
+CONFIG_MMC_SDHI=y
 CONFIG_MMC_SH_MMCIF=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
diff --git a/arch/sh/drivers/pci/fixups-se7751.c b/arch/sh/drivers/pci/fixups-se7751.c
index a4c7d3a4efca..fd3e6b02f289 100644
--- a/arch/sh/drivers/pci/fixups-se7751.c
+++ b/arch/sh/drivers/pci/fixups-se7751.c
@@ -6,7 +6,7 @@
 #include <linux/io.h>
 #include "pci-sh4.h"
 
-int __init pcibios_map_platform_irq(u8 slot, u8 pin)
+int __init pcibios_map_platform_irq(struct pci_dev *, u8 slot, u8 pin)
 {
         switch (slot) {
         case 0: return 13;
diff --git a/arch/sh/include/asm/stacktrace.h b/arch/sh/include/asm/stacktrace.h
index 797018213718..a7e2d4dfd087 100644
--- a/arch/sh/include/asm/stacktrace.h
+++ b/arch/sh/include/asm/stacktrace.h
@@ -10,9 +10,6 @@
 /* Generic stack tracer with callbacks */
 
 struct stacktrace_ops {
-        void (*warning)(void *data, char *msg);
-        /* msg must contain %s for the symbol */
-        void (*warning_symbol)(void *data, char *msg, unsigned long symbol);
         void (*address)(void *data, unsigned long address, int reliable);
         /* On negative return stop dumping */
         int (*stack)(void *data, char *name);
diff --git a/arch/sh/include/asm/tlb.h b/arch/sh/include/asm/tlb.h
index 75abb38dffd5..6c308d8b9a50 100644
--- a/arch/sh/include/asm/tlb.h
+++ b/arch/sh/include/asm/tlb.h
@@ -23,8 +23,6 @@ struct mmu_gather {
         unsigned long           start, end;
 };
 
-DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 static inline void init_tlb_gather(struct mmu_gather *tlb)
 {
         tlb->start = TASK_SIZE;
@@ -36,17 +34,13 @@ static inline void init_tlb_gather(struct mmu_gather *tlb)
         }
 }
 
-static inline struct mmu_gather *
-tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
+static inline void
+tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned int full_mm_flush)
 {
-        struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
-
         tlb->mm = mm;
         tlb->fullmm = full_mm_flush;
 
         init_tlb_gather(tlb);
-
-        return tlb;
 }
 
 static inline void
@@ -57,8 +51,6 @@ tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
 
         /* keep the page table cache within bounds */
         check_pgt_cache();
-
-        put_cpu_var(mmu_gathers);
 }
 
 static inline void
@@ -91,7 +83,21 @@ tlb_end_vma(struct mmu_gather *tlb, struct vm_area_struct *vma)
         }
 }
 
-#define tlb_remove_page(tlb,page)       free_page_and_swap_cache(page)
+static inline void tlb_flush_mmu(struct mmu_gather *tlb)
+{
+}
+
+static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+{
+        free_page_and_swap_cache(page);
+        return 1; /* avoid calling tlb_flush_mmu */
+}
+
+static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+{
+        __tlb_remove_page(tlb, page);
+}
+
 #define pte_free_tlb(tlb, ptep, addr)   pte_free((tlb)->mm, ptep)
 #define pmd_free_tlb(tlb, pmdp, addr)   pmd_free((tlb)->mm, pmdp)
 #define pud_free_tlb(tlb, pudp, addr)   pud_free((tlb)->mm, pudp)
diff --git a/arch/sh/include/asm/unistd_32.h b/arch/sh/include/asm/unistd_32.h
index ca7765e5f967..bb7d2702c2c9 100644
--- a/arch/sh/include/asm/unistd_32.h
+++ b/arch/sh/include/asm/unistd_32.h
@@ -373,8 +373,9 @@
 #define __NR_open_by_handle_at  360
 #define __NR_clock_adjtime      361
 #define __NR_syncfs             362
+#define __NR_sendmmsg           363
 
-#define NR_syscalls 363
+#define NR_syscalls 364
 
 #ifdef __KERNEL__
 
diff --git a/arch/sh/include/asm/unistd_64.h b/arch/sh/include/asm/unistd_64.h
index a694009bb816..46327cea1e5c 100644
--- a/arch/sh/include/asm/unistd_64.h
+++ b/arch/sh/include/asm/unistd_64.h
@@ -394,10 +394,11 @@
 #define __NR_open_by_handle_at  371
 #define __NR_clock_adjtime      372
 #define __NR_syncfs             373
+#define __NR_sendmmsg           374
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 374
+#define NR_syscalls 375
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/arch/sh/kernel/cpu/Makefile b/arch/sh/kernel/cpu/Makefile
index d49c2135fd48..ae95935d93cd 100644
--- a/arch/sh/kernel/cpu/Makefile
+++ b/arch/sh/kernel/cpu/Makefile
@@ -17,7 +17,5 @@ obj-$(CONFIG_ARCH_SHMOBILE)	+= shmobile/
 
 obj-$(CONFIG_SH_ADC)            += adc.o
 obj-$(CONFIG_SH_CLK_CPG_LEGACY) += clock-cpg.o
-obj-$(CONFIG_SH_FPU)            += fpu.o
-obj-$(CONFIG_SH_FPU_EMU)        += fpu.o
 
-obj-y   += irq/ init.o clock.o hwblk.o proc.o
+obj-y   += irq/ init.o clock.o fpu.o hwblk.o proc.o
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index 14726eef1ce0..f0907995b4c9 100644
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -20,6 +20,7 @@
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
 #include <linux/io.h>
+#include <linux/prefetch.h>
 #include <asm/page.h>
 #include <asm/cacheflush.h>
 #include <cpu/sq.h>
diff --git a/arch/sh/kernel/cpu/shmobile/pm_runtime.c b/arch/sh/kernel/cpu/shmobile/pm_runtime.c
index 6dcb8166a64d..64c807c39208 100644
--- a/arch/sh/kernel/cpu/shmobile/pm_runtime.c
+++ b/arch/sh/kernel/cpu/shmobile/pm_runtime.c
@@ -139,7 +139,7 @@ void platform_pm_runtime_suspend_idle(void)
         queue_work(pm_wq, &hwblk_work);
 }
 
-int platform_pm_runtime_suspend(struct device *dev)
+static int default_platform_runtime_suspend(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct pdev_archdata *ad = &pdev->archdata;
@@ -147,7 +147,7 @@ int platform_pm_runtime_suspend(struct device *dev)
         int hwblk = ad->hwblk_id;
         int ret = 0;
 
-        dev_dbg(dev, "platform_pm_runtime_suspend() [%d]\n", hwblk);
+        dev_dbg(dev, "%s() [%d]\n", __func__, hwblk);
 
         /* ignore off-chip platform devices */
         if (!hwblk)
@@ -157,7 +157,7 @@ int platform_pm_runtime_suspend(struct device *dev)
         might_sleep();
 
         /* catch misconfigured drivers not starting with resume */
-        if (test_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags)) {
+        if (test_bit(PDEV_ARCHDATA_FLAG_INIT, &ad->flags)) {
                 ret = -EINVAL;
                 goto out;
         }
@@ -170,8 +170,8 @@ int platform_pm_runtime_suspend(struct device *dev)
 
         /* put device on idle list */
         spin_lock_irqsave(&hwblk_lock, flags);
-        list_add_tail(&pdev->archdata.entry, &hwblk_idle_list);
-        __set_bit(PDEV_ARCHDATA_FLAG_IDLE, &pdev->archdata.flags);
+        list_add_tail(&ad->entry, &hwblk_idle_list);
+        __set_bit(PDEV_ARCHDATA_FLAG_IDLE, &ad->flags);
         spin_unlock_irqrestore(&hwblk_lock, flags);
 
         /* increase idle count */
@@ -183,20 +183,20 @@ int platform_pm_runtime_suspend(struct device *dev)
         mutex_unlock(&ad->mutex);
 
 out:
-        dev_dbg(dev, "platform_pm_runtime_suspend() [%d] returns %d\n",
-                hwblk, ret);
+        dev_dbg(dev, "%s() [%d] returns %d\n",
+                 __func__, hwblk, ret);
 
         return ret;
 }
 
-int platform_pm_runtime_resume(struct device *dev)
+static int default_platform_runtime_resume(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct pdev_archdata *ad = &pdev->archdata;
         int hwblk = ad->hwblk_id;
         int ret = 0;
 
-        dev_dbg(dev, "platform_pm_runtime_resume() [%d]\n", hwblk);
+        dev_dbg(dev, "%s() [%d]\n", __func__, hwblk);
 
         /* ignore off-chip platform devices */
         if (!hwblk)
@@ -228,19 +228,19 @@ int platform_pm_runtime_resume(struct device *dev)
          */
         mutex_unlock(&ad->mutex);
 out:
-        dev_dbg(dev, "platform_pm_runtime_resume() [%d] returns %d\n",
-                hwblk, ret);
+        dev_dbg(dev, "%s() [%d] returns %d\n",
+                __func__, hwblk, ret);
 
         return ret;
 }
 
-int platform_pm_runtime_idle(struct device *dev)
+static int default_platform_runtime_idle(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         int hwblk = pdev->archdata.hwblk_id;
         int ret = 0;
 
-        dev_dbg(dev, "platform_pm_runtime_idle() [%d]\n", hwblk);
+        dev_dbg(dev, "%s() [%d]\n", __func__, hwblk);
 
         /* ignore off-chip platform devices */
         if (!hwblk)
@@ -252,10 +252,19 @@ int platform_pm_runtime_idle(struct device *dev)
         /* suspend synchronously to disable clocks immediately */
         ret = pm_runtime_suspend(dev);
 out:
-        dev_dbg(dev, "platform_pm_runtime_idle() [%d] done!\n", hwblk);
+        dev_dbg(dev, "%s() [%d] done!\n", __func__, hwblk);
         return ret;
 }
 
+static struct dev_power_domain default_power_domain = {
+        .ops = {
+                .runtime_suspend = default_platform_runtime_suspend,
+                .runtime_resume = default_platform_runtime_resume,
+                .runtime_idle = default_platform_runtime_idle,
+                USE_PLATFORM_PM_SLEEP_OPS
+        },
+};
+
 static int platform_bus_notify(struct notifier_block *nb,
                                unsigned long action, void *data)
 {
@@ -276,6 +285,7 @@ static int platform_bus_notify(struct notifier_block *nb,
                 hwblk_disable(hwblk_info, hwblk);
                 /* make sure driver re-inits itself once */
                 __set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags);
+                dev->pwr_domain = &default_power_domain;
                 break;
         /* TODO: add BUS_NOTIFY_BIND_DRIVER and increase idle count */
         case BUS_NOTIFY_BOUND_DRIVER:
@@ -289,6 +299,7 @@ static int platform_bus_notify(struct notifier_block *nb,
                 __set_bit(PDEV_ARCHDATA_FLAG_INIT, &pdev->archdata.flags);
                 break;
         case BUS_NOTIFY_DEL_DEVICE:
+                dev->pwr_domain = NULL;
                 break;
         }
         return 0;
diff --git a/arch/sh/kernel/dumpstack.c b/arch/sh/kernel/dumpstack.c
index 6f5ad1513409..694158b9a50f 100644
--- a/arch/sh/kernel/dumpstack.c
+++ b/arch/sh/kernel/dumpstack.c
@@ -69,19 +69,6 @@ stack_reader_dump(struct task_struct *task, struct pt_regs *regs,
         }
 }
 
-static void
-print_trace_warning_symbol(void *data, char *msg, unsigned long symbol)
-{
-        printk(data);
-        print_symbol(msg, symbol);
-        printk("\n");
-}
-
-static void print_trace_warning(void *data, char *msg)
-{
-        printk("%s%s\n", (char *)data, msg);
-}
-
 static int print_trace_stack(void *data, char *name)
 {
         printk("%s <%s> ", (char *)data, name);
@@ -98,8 +85,6 @@ static void print_trace_address(void *data, unsigned long addr, int reliable)
 }
 
 static const struct stacktrace_ops print_trace_ops = {
-        .warning = print_trace_warning,
-        .warning_symbol = print_trace_warning_symbol,
         .stack = print_trace_stack,
         .address = print_trace_address,
 };
diff --git a/arch/sh/kernel/module.c b/arch/sh/kernel/module.c
index ae0be697a89e..19b1f8826aef 100644
--- a/arch/sh/kernel/module.c
+++ b/arch/sh/kernel/module.c
@@ -93,6 +93,8 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
 #endif
 
                 switch (ELF32_R_TYPE(rel[i].r_info)) {
+                case R_SH_NONE:
+                        break;
                 case R_SH_DIR32:
                         value = get_unaligned(location);
                         value += relocation;
diff --git a/arch/sh/kernel/perf_callchain.c b/arch/sh/kernel/perf_callchain.c
index d5ca1ef50fa9..cc80b614b5fa 100644
--- a/arch/sh/kernel/perf_callchain.c
+++ b/arch/sh/kernel/perf_callchain.c
@@ -14,16 +14,6 @@
 #include <asm/unwinder.h>
 #include <asm/ptrace.h>
 
-
-static void callchain_warning(void *data, char *msg)
-{
-}
-
-static void
-callchain_warning_symbol(void *data, char *msg, unsigned long symbol)
-{
-}
-
 static int callchain_stack(void *data, char *name)
 {
         return 0;
@@ -38,8 +28,6 @@ static void callchain_address(void *data, unsigned long addr, int reliable)
 }
 
 static const struct stacktrace_ops callchain_ops = {
-        .warning        = callchain_warning,
-        .warning_symbol = callchain_warning_symbol,
         .stack          = callchain_stack,
         .address        = callchain_address,
 };
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 509b36b45115..6207561ea34a 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -20,6 +20,7 @@
 #include <linux/module.h>
 #include <linux/cpu.h>
 #include <linux/interrupt.h>
+#include <linux/sched.h>
 #include <asm/atomic.h>
 #include <asm/processor.h>
 #include <asm/system.h>
@@ -323,6 +324,7 @@ void smp_message_recv(unsigned int msg)
                 generic_smp_call_function_interrupt();
                 break;
         case SMP_MSG_RESCHEDULE:
+                scheduler_ipi();
                 break;
         case SMP_MSG_FUNCTION_SINGLE:
                 generic_smp_call_function_single_interrupt();
diff --git a/arch/sh/kernel/stacktrace.c b/arch/sh/kernel/stacktrace.c
index c2e45c48409c..bf989e063a0c 100644
--- a/arch/sh/kernel/stacktrace.c
+++ b/arch/sh/kernel/stacktrace.c
@@ -17,15 +17,6 @@
 #include <asm/ptrace.h>
 #include <asm/stacktrace.h>
 
-static void save_stack_warning(void *data, char *msg)
-{
-}
-
-static void
-save_stack_warning_symbol(void *data, char *msg, unsigned long symbol)
-{
-}
-
 static int save_stack_stack(void *data, char *name)
 {
         return 0;
@@ -51,8 +42,6 @@ static void save_stack_address(void *data, unsigned long addr, int reliable)
 }
 
 static const struct stacktrace_ops save_stack_ops = {
-        .warning = save_stack_warning,
-        .warning_symbol = save_stack_warning_symbol,
         .stack = save_stack_stack,
         .address = save_stack_address,
 };
@@ -88,8 +77,6 @@ save_stack_address_nosched(void *data, unsigned long addr, int reliable)
 }
 
 static const struct stacktrace_ops save_stack_ops_nosched = {
-        .warning = save_stack_warning,
-        .warning_symbol = save_stack_warning_symbol,
         .stack = save_stack_stack,
         .address = save_stack_address_nosched,
 };
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S
index 030966a9305c..7c486f3e3a3c 100644
--- a/arch/sh/kernel/syscalls_32.S
+++ b/arch/sh/kernel/syscalls_32.S
@@ -380,3 +380,4 @@ ENTRY(sys_call_table)
         .long sys_open_by_handle_at     /* 360 */
         .long sys_clock_adjtime
         .long sys_syncfs
+        .long sys_sendmmsg
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S
index ca0a6142ab63..ba1a737afe80 100644
--- a/arch/sh/kernel/syscalls_64.S
+++ b/arch/sh/kernel/syscalls_64.S
@@ -400,3 +400,4 @@ sys_call_table:
         .long sys_open_by_handle_at
         .long sys_clock_adjtime
         .long sys_syncfs
+        .long sys_sendmmsg
diff --git a/arch/sh/kernel/traps_32.c b/arch/sh/kernel/traps_32.c
index 3484c2f65aba..b51a17104b5f 100644
--- a/arch/sh/kernel/traps_32.c
+++ b/arch/sh/kernel/traps_32.c
@@ -87,7 +87,6 @@ void die(const char * str, struct pt_regs * regs, long err)
         bust_spinlocks(1);
 
         printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
-        sysfs_printk_last_file();
         print_modules();
         show_regs(regs);
 
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index af4d46187a79..731c10ce67b5 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -66,7 +66,7 @@ SECTIONS
                 __machvec_end = .;
         }
 
-        PERCPU(L1_CACHE_BYTES, PAGE_SIZE)
+        PERCPU_SECTION(L1_CACHE_BYTES)
 
         /*
          * .exit.text is discarded at runtime, not link time, to deal with
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 0d3f912e3334..58a93fb3d965 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -28,7 +28,6 @@
 #include <asm/cache.h>
 #include <asm/sizes.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 pgd_t swapper_pg_dir[PTRS_PER_PGD];
 
 void __init generic_mem_init(void)
diff --git a/arch/sh/oprofile/backtrace.c b/arch/sh/oprofile/backtrace.c
index 37f3a75ea6cb..9c88dcd56e86 100644
--- a/arch/sh/oprofile/backtrace.c
+++ b/arch/sh/oprofile/backtrace.c
@@ -23,17 +23,6 @@
 #include <asm/sections.h>
 #include <asm/stacktrace.h>
 
-static void backtrace_warning_symbol(void *data, char *msg,
-                                     unsigned long symbol)
-{
-        /* Ignore warnings */
-}
-
-static void backtrace_warning(void *data, char *msg)
-{
-        /* Ignore warnings */
-}
-
 static int backtrace_stack(void *data, char *name)
 {
         /* Yes, we want all stacks */
@@ -49,8 +38,6 @@ static void backtrace_address(void *data, unsigned long addr, int reliable)
 }
 
 static struct stacktrace_ops backtrace_ops = {
-        .warning = backtrace_warning,
-        .warning_symbol = backtrace_warning_symbol,
         .stack = backtrace_stack,
         .address = backtrace_address,
 };
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index e560d102215a..63a027c9ada5 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -25,6 +25,10 @@ config SPARC
         select HAVE_DMA_ATTRS
         select HAVE_DMA_API_DEBUG
         select HAVE_ARCH_JUMP_LABEL
+        select HAVE_GENERIC_HARDIRQS
+        select GENERIC_HARDIRQS_NO_DEPRECATED
+        select GENERIC_IRQ_SHOW
+        select USE_GENERIC_SMP_HELPERS if SMP
 
 config SPARC32
         def_bool !64BIT
@@ -43,15 +47,12 @@ config SPARC64
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FTRACE_MCOUNT_RECORD
         select HAVE_SYSCALL_TRACEPOINTS
-        select USE_GENERIC_SMP_HELPERS if SMP
         select RTC_DRV_CMOS
         select RTC_DRV_BQ4802
         select RTC_DRV_SUN4V
         select RTC_DRV_STARFIRE
         select HAVE_PERF_EVENTS
         select PERF_USE_VMALLOC
-        select HAVE_GENERIC_HARDIRQS
-        select GENERIC_IRQ_SHOW
         select IRQ_PREFLOW_FASTEOI
 
 config ARCH_DEFCONFIG
diff --git a/arch/sparc/Kconfig.debug b/arch/sparc/Kconfig.debug
index d9a795efbc04..6db35fba79fd 100644
--- a/arch/sparc/Kconfig.debug
+++ b/arch/sparc/Kconfig.debug
@@ -6,15 +6,6 @@ config TRACE_IRQFLAGS_SUPPORT
 
 source "lib/Kconfig.debug"
 
-config DEBUG_STACK_USAGE
-        bool "Enable stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        help
-          Enables the display of the minimum amount of free stack which each
-          task has ever had available in the sysrq-T and sysrq-P debug output.
-
-          This option will slow down process creation somewhat.
-
 config DEBUG_DCFLUSH
         bool "D-cache flush debugging"
         depends on SPARC64 && DEBUG_KERNEL
diff --git a/arch/sparc/include/asm/cpudata_32.h b/arch/sparc/include/asm/cpudata_32.h
index 31d48a0e32c7..a4c5a938b936 100644
--- a/arch/sparc/include/asm/cpudata_32.h
+++ b/arch/sparc/include/asm/cpudata_32.h
@@ -16,6 +16,10 @@ typedef struct {
         unsigned long clock_tick;
         unsigned int multiplier;
         unsigned int counter;
+#ifdef CONFIG_SMP
+        unsigned int irq_resched_count;
+        unsigned int irq_call_count;
+#endif
         int prom_node;
         int mid;
         int next;
@@ -23,5 +27,6 @@ typedef struct {
 
 DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);
 #define cpu_data(__cpu) per_cpu(__cpu_data, (__cpu))
+#define local_cpu_data() __get_cpu_var(__cpu_data)
 
 #endif /* _SPARC_CPUDATA_H */
diff --git a/arch/sparc/include/asm/floppy_32.h b/arch/sparc/include/asm/floppy_32.h
index 86666f70322e..482c79e2a416 100644
--- a/arch/sparc/include/asm/floppy_32.h
+++ b/arch/sparc/include/asm/floppy_32.h
@@ -281,28 +281,27 @@ static inline void sun_fd_enable_dma(void)
         pdma_areasize = pdma_size;
 }
 
-/* Our low-level entry point in arch/sparc/kernel/entry.S */
-extern int sparc_floppy_request_irq(int irq, unsigned long flags,
-                                    irq_handler_t irq_handler);
+extern int sparc_floppy_request_irq(unsigned int irq,
+                                    irq_handler_t irq_handler);
 
 static int sun_fd_request_irq(void)
 {
         static int once = 0;
-        int error;
 
-        if(!once) {
+        if (!once) {
                 once = 1;
-                error = sparc_floppy_request_irq(FLOPPY_IRQ,
-                                                 IRQF_DISABLED,
-                                                 floppy_interrupt);
-                return ((error == 0) ? 0 : -1);
-        } else return 0;
+                return sparc_floppy_request_irq(FLOPPY_IRQ, floppy_interrupt);
+        } else {
+                return 0;
+        }
 }
 
 static struct linux_prom_registers fd_regs[2];
 
 static int sun_floppy_init(void)
 {
+        struct platform_device *op;
+        struct device_node *dp;
         char state[128];
         phandle tnode, fd_node;
         int num_regs;
@@ -310,7 +309,6 @@ static int sun_floppy_init(void)
 
         use_virtual_dma = 1;
 
-        FLOPPY_IRQ = 11;
         /* Forget it if we aren't on a machine that could possibly
          * ever have a floppy drive.
          */
@@ -349,6 +347,26 @@ static int sun_floppy_init(void)
         sun_fdc = (struct sun_flpy_controller *)
             of_ioremap(&r, 0, fd_regs[0].reg_size, "floppy");
 
+        /* Look up irq in platform_device.
+         * We try "SUNW,fdtwo" and "fd"
+         */
+        for_each_node_by_name(dp, "SUNW,fdtwo") {
+                op = of_find_device_by_node(dp);
+                if (op)
+                        break;
+        }
+        if (!op) {
+                for_each_node_by_name(dp, "fd") {
+                        op = of_find_device_by_node(dp);
+                        if (op)
+                                break;
+                }
+        }
+        if (!op)
+                goto no_sun_fdc;
+
+        FLOPPY_IRQ = op->archdata.irqs[0];
+
         /* Last minute sanity check... */
         if(sun_fdc->status_82072 == 0xff) {
                 sun_fdc = NULL;
diff --git a/arch/sparc/include/asm/io.h b/arch/sparc/include/asm/io.h
index a34b2994937a..f6902cf3cbe9 100644
--- a/arch/sparc/include/asm/io.h
+++ b/arch/sparc/include/asm/io.h
@@ -5,4 +5,17 @@
 #else
 #include <asm/io_32.h>
 #endif
+
+/*
+ * Defines used for both SPARC32 and SPARC64
+ */
+
+/* Big endian versions of memory read/write routines */
+#define readb_be(__addr)        __raw_readb(__addr)
+#define readw_be(__addr)        __raw_readw(__addr)
+#define readl_be(__addr)        __raw_readl(__addr)
+#define writeb_be(__b, __addr)  __raw_writeb(__b, __addr)
+#define writel_be(__w, __addr)  __raw_writel(__w, __addr)
+#define writew_be(__l, __addr)  __raw_writew(__l, __addr)
+
 #endif
diff --git a/arch/sparc/include/asm/irq_32.h b/arch/sparc/include/asm/irq_32.h
index eced3e3ebd30..2ae3acaeb1b3 100644
--- a/arch/sparc/include/asm/irq_32.h
+++ b/arch/sparc/include/asm/irq_32.h
@@ -6,7 +6,11 @@
 #ifndef _SPARC_IRQ_H
 #define _SPARC_IRQ_H
 
-#define NR_IRQS    16
+/* Allocated number of logical irq numbers.
+ * sun4d boxes (ss2000e) should be OK with ~32.
+ * Be on the safe side and make room for 64
+ */
+#define NR_IRQS    64
 
 #include <linux/interrupt.h>
 
diff --git a/arch/sparc/include/asm/jump_label.h b/arch/sparc/include/asm/jump_label.h
index 427d4684e0d2..fc73a82366f8 100644
--- a/arch/sparc/include/asm/jump_label.h
+++ b/arch/sparc/include/asm/jump_label.h
@@ -7,17 +7,20 @@
 
 #define JUMP_LABEL_NOP_SIZE 4
 
-#define JUMP_LABEL(key, label)                                  \
-        do {                                                    \
-                asm goto("1:\n\t"                               \
-                         "nop\n\t"                              \
-                         "nop\n\t"                              \
-                         ".pushsection __jump_table,  \"a\"\n\t"\
-                         ".align 4\n\t"                         \
-                         ".word 1b, %l[" #label "], %c0\n\t"    \
-                         ".popsection \n\t"                     \
-                         : :  "i" (key) :  : label);\
-        } while (0)
+static __always_inline bool arch_static_branch(struct jump_label_key *key)
+{
+                asm goto("1:\n\t"
+                         "nop\n\t"
+                         "nop\n\t"
+                         ".pushsection __jump_table,  \"aw\"\n\t"
+                         ".align 4\n\t"
+                         ".word 1b, %l[l_yes], %c0\n\t"
+                         ".popsection \n\t"
+                         : :  "i" (key) : : l_yes);
+        return false;
+l_yes:
+        return true;
+}
 
 #endif /* __KERNEL__ */
 
diff --git a/arch/sparc/include/asm/leon.h b/arch/sparc/include/asm/leon.h
index c04f96fb753c..6bdaf1e43d2a 100644
--- a/arch/sparc/include/asm/leon.h
+++ b/arch/sparc/include/asm/leon.h
@@ -52,29 +52,6 @@
 #define LEON_DIAGF_VALID        0x2000
 #define LEON_DIAGF_VALID_SHIFT  13
 
-/*
- *  Interrupt Sources
- *
- *  The interrupt source numbers directly map to the trap type and to
- *  the bits used in the Interrupt Clear, Interrupt Force, Interrupt Mask,
- *  and the Interrupt Pending Registers.
- */
-#define LEON_INTERRUPT_CORRECTABLE_MEMORY_ERROR 1
-#define LEON_INTERRUPT_UART_1_RX_TX             2
-#define LEON_INTERRUPT_UART_0_RX_TX             3
-#define LEON_INTERRUPT_EXTERNAL_0               4
-#define LEON_INTERRUPT_EXTERNAL_1               5
-#define LEON_INTERRUPT_EXTERNAL_2               6
-#define LEON_INTERRUPT_EXTERNAL_3               7
-#define LEON_INTERRUPT_TIMER1                   8
-#define LEON_INTERRUPT_TIMER2                   9
-#define LEON_INTERRUPT_EMPTY1                   10
-#define LEON_INTERRUPT_EMPTY2                   11
-#define LEON_INTERRUPT_OPEN_ETH                 12
-#define LEON_INTERRUPT_EMPTY4                   13
-#define LEON_INTERRUPT_EMPTY5                   14
-#define LEON_INTERRUPT_EMPTY6                   15
-
 /* irq masks */
 #define LEON_HARD_INT(x)        (1 << (x))      /* irq 0-15 */
 #define LEON_IRQMASK_R          0x0000fffe      /* bit 15- 1 of lregs.irqmask */
@@ -183,7 +160,6 @@ static inline void leon_srmmu_enabletlb(void)
 /* macro access for leon_readnobuffer_reg() */
 #define LEON_BYPASSCACHE_LOAD_VA(x) leon_readnobuffer_reg((unsigned long)(x))
 
-extern void sparc_leon_eirq_register(int eirq);
 extern void leon_init(void);
 extern void leon_switch_mm(void);
 extern void leon_init_IRQ(void);
@@ -239,8 +215,8 @@ static inline int sparc_leon3_cpuid(void)
 #endif /*!__ASSEMBLY__*/
 
 #ifdef CONFIG_SMP
-# define LEON3_IRQ_RESCHEDULE           13
-# define LEON3_IRQ_TICKER               (leon_percpu_timer_dev[0].irq)
+# define LEON3_IRQ_IPI_DEFAULT          13
+# define LEON3_IRQ_TICKER               (leon3_ticker_irq)
 # define LEON3_IRQ_CROSS_CALL           15
 #endif
 
@@ -339,9 +315,9 @@ struct leon2_cacheregs {
 #include <linux/interrupt.h>
 
 struct device_node;
-extern int sparc_leon_eirq_get(int eirq, int cpu);
-extern irqreturn_t sparc_leon_eirq_isr(int dummy, void *dev_id);
-extern void sparc_leon_eirq_register(int eirq);
+extern unsigned int leon_build_device_irq(unsigned int real_irq,
+                                           irq_flow_handler_t flow_handler,
+                                           const char *name, int do_ack);
 extern void leon_clear_clock_irq(void);
 extern void leon_load_profile_irq(int cpu, unsigned int limit);
 extern void leon_init_timers(irq_handler_t counter_fn);
@@ -358,6 +334,7 @@ extern void leon3_getCacheRegs(struct leon3_cacheregs *regs);
 extern int leon_flush_needed(void);
 extern void leon_switch_mm(void);
 extern int srmmu_swprobe_trace;
+extern int leon3_ticker_irq;
 
 #ifdef CONFIG_SMP
 extern int leon_smp_nrcpus(void);
@@ -366,17 +343,19 @@ extern void leon_smp_done(void);
 extern void leon_boot_cpus(void);
 extern int leon_boot_one_cpu(int i);
 void leon_init_smp(void);
-extern void cpu_probe(void);
 extern void cpu_idle(void);
 extern void init_IRQ(void);
 extern void cpu_panic(void);
 extern int __leon_processor_id(void);
 void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu);
+extern irqreturn_t leon_percpu_timer_interrupt(int irq, void *unused);
 
-extern unsigned int real_irq_entry[], smpleon_ticker[];
+extern unsigned int real_irq_entry[];
+extern unsigned int smpleon_ipi[];
 extern unsigned int patchme_maybe_smp_msg[];
 extern unsigned int t_nmi[], linux_trap_ipi15_leon[];
 extern unsigned int linux_trap_ipi15_sun4m[];
+extern int leon_ipi_irq;
 
 #endif /* CONFIG_SMP */
 
diff --git a/arch/sparc/include/asm/pcic.h b/arch/sparc/include/asm/pcic.h
index f20ef562b265..7eb5d78f5211 100644
--- a/arch/sparc/include/asm/pcic.h
+++ b/arch/sparc/include/asm/pcic.h
@@ -29,11 +29,17 @@ struct linux_pcic {
         int                     pcic_imdim;
 };
 
-extern int pcic_probe(void);
-/* Erm... MJ redefined pcibios_present() so that it does not work early. */
+#ifdef CONFIG_PCI
 extern int pcic_present(void);
+extern int pcic_probe(void);
+extern void pci_time_init(void);
 extern void sun4m_pci_init_IRQ(void);
-
+#else
+static inline int pcic_present(void) { return 0; }
+static inline int pcic_probe(void) { return 0; }
+static inline void pci_time_init(void) {}
+static inline void sun4m_pci_init_IRQ(void) {}
+#endif
 #endif
 
 /* Size of PCI I/O space which we relocate. */
diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
index 5bdfa2c6e400..4e5e0878144f 100644
--- a/arch/sparc/include/asm/pgalloc_64.h
+++ b/arch/sparc/include/asm/pgalloc_64.h
@@ -78,4 +78,7 @@ static inline void check_pgt_cache(void)
         quicklist_trim(0, NULL, 25, 16);
 }
 
+#define __pte_free_tlb(tlb, pte, addr)  pte_free((tlb)->mm, pte)
+#define __pmd_free_tlb(tlb, pmd, addr)  pmd_free((tlb)->mm, pmd)
+
 #endif /* _SPARC64_PGALLOC_H */
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
index 303bd4dc8292..5b31a8e89823 100644
--- a/arch/sparc/include/asm/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
@@ -8,6 +8,8 @@
  *  Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
  */
 
+#include <linux/const.h>
+
 #ifndef __ASSEMBLY__
 #include <asm-generic/4level-fixup.h>
 
@@ -456,9 +458,9 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma,
 
 #endif /* !(__ASSEMBLY__) */
 
-#define VMALLOC_START           0xfe600000
+#define VMALLOC_START           _AC(0xfe600000,UL)
 /* XXX Alter this when I get around to fixing sun4c - Anton */
-#define VMALLOC_END             0xffc00000
+#define VMALLOC_END             _AC(0xffc00000,UL)
 
 
 /* We provide our own get_unmapped_area to cope with VA holes for userland */
diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h
index f8dddb7045bb..1e03c5a6b4f7 100644
--- a/arch/sparc/include/asm/pgtable_64.h
+++ b/arch/sparc/include/asm/pgtable_64.h
@@ -655,9 +655,11 @@ static inline int pte_special(pte_t pte)
 #define pte_unmap(pte)                  do { } while (0)
 
 /* Actual page table PTE updates.  */
-extern void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t orig);
+extern void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,
+                          pte_t *ptep, pte_t orig, int fullmm);
 
-static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte)
+static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr,
+                             pte_t *ptep, pte_t pte, int fullmm)
 {
         pte_t orig = *ptep;
 
@@ -670,12 +672,19 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *p
          *             and SUN4V pte layout, so this inline test is fine.
          */
         if (likely(mm != &init_mm) && (pte_val(orig) & _PAGE_VALID))
-                tlb_batch_add(mm, addr, ptep, orig);
+                tlb_batch_add(mm, addr, ptep, orig, fullmm);
 }
 
+#define set_pte_at(mm,addr,ptep,pte)    \
+        __set_pte_at((mm), (addr), (ptep), (pte), 0)
+
 #define pte_clear(mm,addr,ptep)         \
         set_pte_at((mm), (addr), (ptep), __pte(0UL))
 
+#define __HAVE_ARCH_PTE_CLEAR_NOT_PRESENT_FULL
+#define pte_clear_not_present_full(mm,addr,ptep,fullmm) \
+        __set_pte_at((mm), (addr), (ptep), __pte(0UL), (fullmm))
+
 #ifdef DCACHE_ALIASING_POSSIBLE
 #define __HAVE_ARCH_MOVE_PTE
 #define move_pte(pte, prot, old_addr, new_addr)                         \
@@ -699,6 +708,9 @@ extern pmd_t swapper_low_pmd_dir[2048];
 extern void paging_init(void);
 extern unsigned long find_ecache_flush_span(unsigned long size);
 
+struct seq_file;
+extern void mmu_info(struct seq_file *);
+
 /* These do nothing with the way I have things setup. */
 #define mmu_lockarea(vaddr, len)                (vaddr)
 #define mmu_unlockarea(vaddr, len)              do { } while(0)
diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
index 2643c62f4ac0..64718ba26434 100644
--- a/arch/sparc/include/asm/setup.h
+++ b/arch/sparc/include/asm/setup.h
@@ -11,4 +11,16 @@
 # define COMMAND_LINE_SIZE 256
 #endif
 
+#ifdef __KERNEL__
+
+#ifdef CONFIG_SPARC32
+/* The CPU that was used for booting
+ * Only sun4d + leon may have boot_cpu_id != 0
+ */
+extern unsigned char boot_cpu_id;
+extern unsigned char boot_cpu_id4;
+#endif
+
+#endif /* __KERNEL__ */
+
 #endif /* _SPARC_SETUP_H */
diff --git a/arch/sparc/include/asm/smp_32.h b/arch/sparc/include/asm/smp_32.h
index d82d7f4c0a79..093f10843ff2 100644
--- a/arch/sparc/include/asm/smp_32.h
+++ b/arch/sparc/include/asm/smp_32.h
@@ -50,42 +50,38 @@ void smp_callin(void);
 void smp_boot_cpus(void);
 void smp_store_cpu_info(int);
 
+void smp_resched_interrupt(void);
+void smp_call_function_single_interrupt(void);
+void smp_call_function_interrupt(void);
+
 struct seq_file;
 void smp_bogo(struct seq_file *);
 void smp_info(struct seq_file *);
 
 BTFIXUPDEF_CALL(void, smp_cross_call, smpfunc_t, cpumask_t, unsigned long, unsigned long, unsigned long, unsigned long)
 BTFIXUPDEF_CALL(int, __hard_smp_processor_id, void)
+BTFIXUPDEF_CALL(void, smp_ipi_resched, int);
+BTFIXUPDEF_CALL(void, smp_ipi_single, int);
+BTFIXUPDEF_CALL(void, smp_ipi_mask_one, int);
 BTFIXUPDEF_BLACKBOX(hard_smp_processor_id)
 BTFIXUPDEF_BLACKBOX(load_current)
 
 #define smp_cross_call(func,mask,arg1,arg2,arg3,arg4) BTFIXUP_CALL(smp_cross_call)(func,mask,arg1,arg2,arg3,arg4)
 
-static inline void xc0(smpfunc_t func) { smp_cross_call(func, cpu_online_map, 0, 0, 0, 0); }
+static inline void xc0(smpfunc_t func) { smp_cross_call(func, *cpu_online_mask, 0, 0, 0, 0); }
 static inline void xc1(smpfunc_t func, unsigned long arg1)
-{ smp_cross_call(func, cpu_online_map, arg1, 0, 0, 0); }
+{ smp_cross_call(func, *cpu_online_mask, arg1, 0, 0, 0); }
 static inline void xc2(smpfunc_t func, unsigned long arg1, unsigned long arg2)
-{ smp_cross_call(func, cpu_online_map, arg1, arg2, 0, 0); }
+{ smp_cross_call(func, *cpu_online_mask, arg1, arg2, 0, 0); }
 static inline void xc3(smpfunc_t func, unsigned long arg1, unsigned long arg2,
                            unsigned long arg3)
-{ smp_cross_call(func, cpu_online_map, arg1, arg2, arg3, 0); }
+{ smp_cross_call(func, *cpu_online_mask, arg1, arg2, arg3, 0); }
 static inline void xc4(smpfunc_t func, unsigned long arg1, unsigned long arg2,
                            unsigned long arg3, unsigned long arg4)
-{ smp_cross_call(func, cpu_online_map, arg1, arg2, arg3, arg4); }
-
-static inline int smp_call_function(void (*func)(void *info), void *info, int wait)
-{
-        xc1((smpfunc_t)func, (unsigned long)info);
-        return 0;
-}
+{ smp_cross_call(func, *cpu_online_mask, arg1, arg2, arg3, arg4); }
 
-static inline int smp_call_function_single(int cpuid, void (*func) (void *info),
-                                           void *info, int wait)
-{
-        smp_cross_call((smpfunc_t)func, cpumask_of_cpu(cpuid),
-                       (unsigned long) info, 0, 0, 0);
-        return 0;
-}
+extern void arch_send_call_function_single_ipi(int cpu);
+extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
 
 static inline int cpu_logical_map(int cpu)
 {
@@ -135,6 +131,11 @@ static inline int hard_smp_processor_id(void)
                 __asm__ __volatile__("lda [%g0] ASI_M_VIKING_TMP1, %0\n\t"
                                      "nop; nop" :
                                      "=&r" (cpuid));
+                     - leon
+                __asm__ __volatile__(   "rd %asr17, %0\n\t"
+                                        "srl %0, 0x1c, %0\n\t"
+                                        "nop\n\t" :
+                                        "=&r" (cpuid));
            See btfixup.h and btfixupprep.c to understand how a blackbox works.
          */
         __asm__ __volatile__("sethi %%hi(___b_hard_smp_processor_id), %0\n\t"
diff --git a/arch/sparc/include/asm/smp_64.h b/arch/sparc/include/asm/smp_64.h
index f49e11cd4ded..20bca8950710 100644
--- a/arch/sparc/include/asm/smp_64.h
+++ b/arch/sparc/include/asm/smp_64.h
@@ -49,6 +49,10 @@ extern void cpu_play_dead(void);
 
 extern void smp_fetch_global_regs(void);
 
+struct seq_file;
+void smp_bogo(struct seq_file *);
+void smp_info(struct seq_file *);
+
 #ifdef CONFIG_HOTPLUG_CPU
 extern int __cpu_disable(void);
 extern void __cpu_die(unsigned int cpu);
diff --git a/arch/sparc/include/asm/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h
index 7f9b9dba38a6..5f5b8bf3f50d 100644
--- a/arch/sparc/include/asm/spinlock_32.h
+++ b/arch/sparc/include/asm/spinlock_32.h
@@ -9,6 +9,7 @@
 #ifndef __ASSEMBLY__
 
 #include <asm/psr.h>
+#include <asm/processor.h> /* for cpu_relax */
 
 #define arch_spin_is_locked(lock) (*((volatile unsigned char *)(lock)) != 0)
 
diff --git a/arch/sparc/include/asm/system_32.h b/arch/sparc/include/asm/system_32.h
index 890036b3689a..47a7e862474e 100644
--- a/arch/sparc/include/asm/system_32.h
+++ b/arch/sparc/include/asm/system_32.h
@@ -15,11 +15,6 @@
 
 #include <linux/irqflags.h>
 
-static inline unsigned int probe_irq_mask(unsigned long val)
-{
-        return 0;
-}
-
 /*
  * Sparc (general) CPU types
  */
diff --git a/arch/sparc/include/asm/system_64.h b/arch/sparc/include/asm/system_64.h
index e3b65d8cf41b..3c96d3bb9f15 100644
--- a/arch/sparc/include/asm/system_64.h
+++ b/arch/sparc/include/asm/system_64.h
@@ -29,10 +29,6 @@ enum sparc_cpu {
 /* This cannot ever be a sun4c :) That's just history. */
 #define ARCH_SUN4C 0
 
-extern const char *sparc_cpu_type;
-extern const char *sparc_fpu_type;
-extern const char *sparc_pmu_type;
-
 extern char reboot_command[];
 
 /* These are here in an effort to more fully work around Spitfire Errata
diff --git a/arch/sparc/include/asm/tlb_64.h b/arch/sparc/include/asm/tlb_64.h
index dca406b9b6fc..190e18913cc6 100644
--- a/arch/sparc/include/asm/tlb_64.h
+++ b/arch/sparc/include/asm/tlb_64.h
@@ -7,66 +7,11 @@
 #include <asm/tlbflush.h>
 #include <asm/mmu_context.h>
 
-#define TLB_BATCH_NR    192
-
-/*
- * For UP we don't need to worry about TLB flush
- * and page free order so much..
- */
-#ifdef CONFIG_SMP
-  #define FREE_PTE_NR   506
-  #define tlb_fast_mode(bp) ((bp)->pages_nr == ~0U)
-#else
-  #define FREE_PTE_NR   1
-  #define tlb_fast_mode(bp) 1
-#endif
-
-struct mmu_gather {
-        struct mm_struct *mm;
-        unsigned int pages_nr;
-        unsigned int need_flush;
-        unsigned int fullmm;
-        unsigned int tlb_nr;
-        unsigned long vaddrs[TLB_BATCH_NR];
-        struct page *pages[FREE_PTE_NR];
-};
-
-DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 #ifdef CONFIG_SMP
 extern void smp_flush_tlb_pending(struct mm_struct *,
                                   unsigned long, unsigned long *);
 #endif
 
-extern void __flush_tlb_pending(unsigned long, unsigned long, unsigned long *);
-extern void flush_tlb_pending(void);
-
-static inline struct mmu_gather *tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
-{
-        struct mmu_gather *mp = &get_cpu_var(mmu_gathers);
-
-        BUG_ON(mp->tlb_nr);
-
-        mp->mm = mm;
-        mp->pages_nr = num_online_cpus() > 1 ? 0U : ~0U;
-        mp->fullmm = full_mm_flush;
-
-        return mp;
-}
-
-
-static inline void tlb_flush_mmu(struct mmu_gather *mp)
-{
-        if (!mp->fullmm)
-                flush_tlb_pending();
-        if (mp->need_flush) {
-                free_pages_and_swap_cache(mp->pages, mp->pages_nr);
-                mp->pages_nr = 0;
-                mp->need_flush = 0;
-        }
-
-}
-
 #ifdef CONFIG_SMP
 extern void smp_flush_tlb_mm(struct mm_struct *mm);
 #define do_flush_tlb_mm(mm) smp_flush_tlb_mm(mm)
@@ -74,38 +19,14 @@ extern void smp_flush_tlb_mm(struct mm_struct *mm);
 #define do_flush_tlb_mm(mm) __flush_tlb_mm(CTX_HWBITS(mm->context), SECONDARY_CONTEXT)
 #endif
 
-static inline void tlb_finish_mmu(struct mmu_gather *mp, unsigned long start, unsigned long end)
-{
-        tlb_flush_mmu(mp);
-
-        if (mp->fullmm)
-                mp->fullmm = 0;
-
-        /* keep the page table cache within bounds */
-        check_pgt_cache();
-
-        put_cpu_var(mmu_gathers);
-}
-
-static inline void tlb_remove_page(struct mmu_gather *mp, struct page *page)
-{
-        if (tlb_fast_mode(mp)) {
-                free_page_and_swap_cache(page);
-                return;
-        }
-        mp->need_flush = 1;
-        mp->pages[mp->pages_nr++] = page;
-        if (mp->pages_nr >= FREE_PTE_NR)
-                tlb_flush_mmu(mp);
-}
-
-#define tlb_remove_tlb_entry(mp,ptep,addr) do { } while (0)
-#define pte_free_tlb(mp, ptepage, addr) pte_free((mp)->mm, ptepage)
-#define pmd_free_tlb(mp, pmdp, addr) pmd_free((mp)->mm, pmdp)
-#define pud_free_tlb(tlb,pudp, addr) __pud_free_tlb(tlb,pudp,addr)
+extern void __flush_tlb_pending(unsigned long, unsigned long, unsigned long *);
+extern void flush_tlb_pending(void);
 
-#define tlb_migrate_finish(mm)  do { } while (0)
 #define tlb_start_vma(tlb, vma) do { } while (0)
 #define tlb_end_vma(tlb, vma)   do { } while (0)
+#define __tlb_remove_tlb_entry(tlb, ptep, address) do { } while (0)
+#define tlb_flush(tlb)  flush_tlb_pending()
+
+#include <asm-generic/tlb.h>
 
 #endif /* _SPARC64_TLB_H */
diff --git a/arch/sparc/include/asm/tlbflush_64.h b/arch/sparc/include/asm/tlbflush_64.h
index fbb675dbe0c9..2ef463494153 100644
--- a/arch/sparc/include/asm/tlbflush_64.h
+++ b/arch/sparc/include/asm/tlbflush_64.h
@@ -5,9 +5,17 @@
 #include <asm/mmu_context.h>
 
 /* TSB flush operations. */
-struct mmu_gather;
+
+#define TLB_BATCH_NR    192
+
+struct tlb_batch {
+        struct mm_struct *mm;
+        unsigned long tlb_nr;
+        unsigned long vaddrs[TLB_BATCH_NR];
+};
+
 extern void flush_tsb_kernel_range(unsigned long start, unsigned long end);
-extern void flush_tsb_user(struct mmu_gather *mp);
+extern void flush_tsb_user(struct tlb_batch *tb);
 
 /* TLB flush operations. */
 
diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h
index 1c79f32734a0..8b9c556d630b 100644
--- a/arch/sparc/include/asm/topology_64.h
+++ b/arch/sparc/include/asm/topology_64.h
@@ -65,6 +65,10 @@ static inline int pcibus_to_node(struct pci_bus *pbus)
 #define smt_capable()                           (sparc64_multi_core)
 #endif /* CONFIG_SMP */
 
-#define cpu_coregroup_mask(cpu)                 (&cpu_core_map[cpu])
+extern cpumask_t cpu_core_map[NR_CPUS];
+static inline const struct cpumask *cpu_coregroup_mask(int cpu)
+{
+        return &cpu_core_map[cpu];
+}
 
 #endif /* _ASM_SPARC64_TOPOLOGY_H */
diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h
index 9d897b6db983..c5387ed0add8 100644
--- a/arch/sparc/include/asm/unistd.h
+++ b/arch/sparc/include/asm/unistd.h
@@ -404,8 +404,9 @@
 #define __NR_open_by_handle_at  333
 #define __NR_clock_adjtime      334
 #define __NR_syncfs             335
+#define __NR_sendmmsg           336
 
-#define NR_syscalls             336
+#define NR_syscalls             337
 
 #ifdef __32bit_syscall_numbers__
 /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants,
diff --git a/arch/sparc/include/asm/winmacro.h b/arch/sparc/include/asm/winmacro.h
index 5b0a06dc3bcb..a9be04b0d049 100644
--- a/arch/sparc/include/asm/winmacro.h
+++ b/arch/sparc/include/asm/winmacro.h
@@ -103,6 +103,7 @@
         st       %scratch, [%cur_reg + TI_W_SAVED];
 
 #ifdef CONFIG_SMP
+/* Results of LOAD_CURRENT() after BTFIXUP for SUN4M, SUN4D & LEON (comments) */
 #define LOAD_CURRENT4M(dest_reg, idreg) \
         rd       %tbr, %idreg; \
         sethi    %hi(current_set), %dest_reg; \
@@ -118,6 +119,14 @@
         or      %dest_reg, %lo(C_LABEL(current_set)), %dest_reg; \
         ld      [%idreg + %dest_reg], %dest_reg;
 
+#define LOAD_CURRENT_LEON(dest_reg, idreg)                      \
+        rd      %asr17, %idreg;                                 \
+        sethi   %hi(current_set), %dest_reg;                    \
+        srl     %idreg, 0x1c, %idreg;                           \
+        or      %dest_reg, %lo(current_set), %dest_reg;         \
+        sll     %idreg, 0x2, %idreg;                            \
+        ld      [%idreg + %dest_reg], %dest_reg;
+
 /* Blackbox - take care with this... - check smp4m and smp4d before changing this. */
 #define LOAD_CURRENT(dest_reg, idreg)                                   \
         sethi    %hi(___b_load_current), %idreg;                        \
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index 99aa4db6e9c2..9cff2709a96d 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -71,10 +71,6 @@ obj-$(CONFIG_SPARC64)	+= pcr.o
 obj-$(CONFIG_SPARC64)   += nmi.o
 obj-$(CONFIG_SPARC64_SMP) += cpumap.o
 
-# sparc32 do not use GENERIC_HARDIRQS but uses the generic devres implementation
-obj-$(CONFIG_SPARC32)     += devres.o
-devres-y                  := ../../../kernel/irq/devres.o
-
 obj-y                     += dma.o
 
 obj-$(CONFIG_SPARC32_PCI) += pcic.o
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
index 7925c54f4133..138dbbc8dc84 100644
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
@@ -4,6 +4,7 @@
  * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
  */
 
+#include <linux/seq_file.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -11,7 +12,9 @@
 #include <linux/threads.h>
 
 #include <asm/spitfire.h>
+#include <asm/pgtable.h>
 #include <asm/oplib.h>
+#include <asm/setup.h>
 #include <asm/page.h>
 #include <asm/head.h>
 #include <asm/psr.h>
@@ -23,6 +26,9 @@
 DEFINE_PER_CPU(cpuinfo_sparc, __cpu_data) = { 0 };
 EXPORT_PER_CPU_SYMBOL(__cpu_data);
 
+int ncpus_probed;
+unsigned int fsr_storage;
+
 struct cpu_info {
         int psr_vers;
         const char *name;
@@ -247,13 +253,12 @@ static const struct manufacturer_info __initconst manufacturer_info[] = {
  * machine type value into consideration too.  I will fix this.
  */
 
-const char *sparc_cpu_type;
-const char *sparc_fpu_type;
+static const char *sparc_cpu_type;
+static const char *sparc_fpu_type;
 const char *sparc_pmu_type;
 
-unsigned int fsr_storage;
 
-static void set_cpu_and_fpu(int psr_impl, int psr_vers, int fpu_vers)
+static void __init set_cpu_and_fpu(int psr_impl, int psr_vers, int fpu_vers)
 {
         const struct manufacturer_info *manuf;
         int i;
@@ -313,7 +318,123 @@ static void set_cpu_and_fpu(int psr_impl, int psr_vers, int fpu_vers)
 }
 
 #ifdef CONFIG_SPARC32
-void __cpuinit cpu_probe(void)
+static int show_cpuinfo(struct seq_file *m, void *__unused)
+{
+        seq_printf(m,
+                   "cpu\t\t: %s\n"
+                   "fpu\t\t: %s\n"
+                   "promlib\t\t: Version %d Revision %d\n"
+                   "prom\t\t: %d.%d\n"
+                   "type\t\t: %s\n"
+                   "ncpus probed\t: %d\n"
+                   "ncpus active\t: %d\n"
+#ifndef CONFIG_SMP
+                   "CPU0Bogo\t: %lu.%02lu\n"
+                   "CPU0ClkTck\t: %ld\n"
+#endif
+                   ,
+                   sparc_cpu_type,
+                   sparc_fpu_type ,
+                   romvec->pv_romvers,
+                   prom_rev,
+                   romvec->pv_printrev >> 16,
+                   romvec->pv_printrev & 0xffff,
+                   &cputypval[0],
+                   ncpus_probed,
+                   num_online_cpus()
+#ifndef CONFIG_SMP
+                   , cpu_data(0).udelay_val/(500000/HZ),
+                   (cpu_data(0).udelay_val/(5000/HZ)) % 100,
+                   cpu_data(0).clock_tick
+#endif
+                );
+
+#ifdef CONFIG_SMP
+        smp_bogo(m);
+#endif
+        mmu_info(m);
+#ifdef CONFIG_SMP
+        smp_info(m);
+#endif
+        return 0;
+}
+#endif /* CONFIG_SPARC32 */
+
+#ifdef CONFIG_SPARC64
+unsigned int dcache_parity_tl1_occurred;
+unsigned int icache_parity_tl1_occurred;
+
+
+static int show_cpuinfo(struct seq_file *m, void *__unused)
+{
+        seq_printf(m,
+                   "cpu\t\t: %s\n"
+                   "fpu\t\t: %s\n"
+                   "pmu\t\t: %s\n"
+                   "prom\t\t: %s\n"
+                   "type\t\t: %s\n"
+                   "ncpus probed\t: %d\n"
+                   "ncpus active\t: %d\n"
+                   "D$ parity tl1\t: %u\n"
+                   "I$ parity tl1\t: %u\n"
+#ifndef CONFIG_SMP
+                   "Cpu0ClkTck\t: %016lx\n"
+#endif
+                   ,
+                   sparc_cpu_type,
+                   sparc_fpu_type,
+                   sparc_pmu_type,
+                   prom_version,
+                   ((tlb_type == hypervisor) ?
+                    "sun4v" :
+                    "sun4u"),
+                   ncpus_probed,
+                   num_online_cpus(),
+                   dcache_parity_tl1_occurred,
+                   icache_parity_tl1_occurred
+#ifndef CONFIG_SMP
+                   , cpu_data(0).clock_tick
+#endif
+                );
+#ifdef CONFIG_SMP
+        smp_bogo(m);
+#endif
+        mmu_info(m);
+#ifdef CONFIG_SMP
+        smp_info(m);
+#endif
+        return 0;
+}
+#endif /* CONFIG_SPARC64 */
+
+static void *c_start(struct seq_file *m, loff_t *pos)
+{
+        /* The pointer we are returning is arbitrary,
+         * it just has to be non-NULL and not IS_ERR
+         * in the success case.
+         */
+        return *pos == 0 ? &c_start : NULL;
+}
+
+static void *c_next(struct seq_file *m, void *v, loff_t *pos)
+{
+        ++*pos;
+        return c_start(m, pos);
+}
+
+static void c_stop(struct seq_file *m, void *v)
+{
+}
+
+const struct seq_operations cpuinfo_op = {
+        .start =c_start,
+        .next = c_next,
+        .stop = c_stop,
+        .show = show_cpuinfo,
+};
+
+#ifdef CONFIG_SPARC32
+static int __init cpu_type_probe(void)
 {
         int psr_impl, psr_vers, fpu_vers;
         int psr;
@@ -332,8 +453,12 @@ void __cpuinit cpu_probe(void)
         put_psr(psr);
 
         set_cpu_and_fpu(psr_impl, psr_vers, fpu_vers);
+
+        return 0;
 }
-#else
+#endif /* CONFIG_SPARC32 */
+
+#ifdef CONFIG_SPARC64
 static void __init sun4v_cpu_probe(void)
 {
         switch (sun4v_chip_type) {
@@ -374,6 +499,6 @@ static int __init cpu_type_probe(void)
         }
         return 0;
 }
+#endif /* CONFIG_SPARC64 */
 
 early_initcall(cpu_type_probe);
-#endif
diff --git a/arch/sparc/kernel/cpumap.c b/arch/sparc/kernel/cpumap.c
index 8de64c8126bc..d91fd782743a 100644
--- a/arch/sparc/kernel/cpumap.c
+++ b/arch/sparc/kernel/cpumap.c
@@ -202,7 +202,7 @@ static struct cpuinfo_tree *build_cpuinfo_tree(void)
         new_tree->total_nodes = n;
         memcpy(&new_tree->level, tmp_level, sizeof(tmp_level));
 
-        prev_cpu = cpu = first_cpu(cpu_online_map);
+        prev_cpu = cpu = cpumask_first(cpu_online_mask);
 
         /* Initialize all levels in the tree with the first CPU */
         for (level = CPUINFO_LVL_PROC; level >= CPUINFO_LVL_ROOT; level--) {
@@ -381,7 +381,7 @@ static int simple_map_to_cpu(unsigned int index)
         }
 
         /* Impossible, since num_online_cpus() <= num_possible_cpus() */
-        return first_cpu(cpu_online_map);
+        return cpumask_first(cpu_online_mask);
 }
 
 static int _map_to_cpu(unsigned int index)
diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c
index d2eddd6647cd..113c052c3043 100644
--- a/arch/sparc/kernel/devices.c
+++ b/arch/sparc/kernel/devices.c
@@ -20,7 +20,6 @@
 #include <asm/system.h>
 #include <asm/cpudata.h>
 
-extern void cpu_probe(void);
 extern void clock_stop_probe(void); /* tadpole.c */
 extern void sun4c_probe_memerr_reg(void);
 
@@ -115,7 +114,7 @@ int cpu_get_hwmid(phandle prom_node)
 
 void __init device_scan(void)
 {
-        prom_printf("Booting Linux...\n");
+        printk(KERN_NOTICE "Booting Linux...\n");
 
 #ifndef CONFIG_SMP
         {
@@ -133,7 +132,6 @@ void __init device_scan(void)
         }
 #endif /* !CONFIG_SMP */
 
-        cpu_probe();
         {
                 extern void auxio_probe(void);
                 extern void auxio_power_probe(void);
diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
index 3add4de8a1a9..dd1342c0a3be 100644
--- a/arch/sparc/kernel/ds.c
+++ b/arch/sparc/kernel/ds.c
@@ -497,7 +497,7 @@ static void dr_cpu_init_response(struct ds_data *resp, u64 req_num,
         tag->num_records = ncpus;
 
         i = 0;
-        for_each_cpu_mask(cpu, *mask) {
+        for_each_cpu(cpu, mask) {
                 ent[i].cpu = cpu;
                 ent[i].result = DR_CPU_RES_OK;
                 ent[i].stat = default_stat;
@@ -534,7 +534,7 @@ static int __cpuinit dr_cpu_configure(struct ds_info *dp,
         int resp_len, ncpus, cpu;
         unsigned long flags;
 
-        ncpus = cpus_weight(*mask);
+        ncpus = cpumask_weight(mask);
         resp_len = dr_cpu_size_response(ncpus);
         resp = kzalloc(resp_len, GFP_KERNEL);
         if (!resp)
@@ -547,7 +547,7 @@ static int __cpuinit dr_cpu_configure(struct ds_info *dp,
         mdesc_populate_present_mask(mask);
         mdesc_fill_in_cpu_data(mask);
 
-        for_each_cpu_mask(cpu, *mask) {
+        for_each_cpu(cpu, mask) {
                 int err;
 
                 printk(KERN_INFO "ds-%llu: Starting cpu %d...\n",
@@ -593,7 +593,7 @@ static int dr_cpu_unconfigure(struct ds_info *dp,
         int resp_len, ncpus, cpu;
         unsigned long flags;
 
-        ncpus = cpus_weight(*mask);
+        ncpus = cpumask_weight(mask);
         resp_len = dr_cpu_size_response(ncpus);
         resp = kzalloc(resp_len, GFP_KERNEL);
         if (!resp)
@@ -603,7 +603,7 @@ static int dr_cpu_unconfigure(struct ds_info *dp,
                              resp_len, ncpus, mask,
                              DR_CPU_STAT_UNCONFIGURED);
 
-        for_each_cpu_mask(cpu, *mask) {
+        for_each_cpu(cpu, mask) {
                 int err;
 
                 printk(KERN_INFO "ds-%llu: Shutting down cpu %d...\n",
@@ -649,13 +649,13 @@ static void __cpuinit dr_cpu_data(struct ds_info *dp,
 
         purge_dups(cpu_list, tag->num_records);
 
-        cpus_clear(mask);
+        cpumask_clear(&mask);
         for (i = 0; i < tag->num_records; i++) {
                 if (cpu_list[i] == CPU_SENTINEL)
                         continue;
 
                 if (cpu_list[i] < nr_cpu_ids)
-                        cpu_set(cpu_list[i], mask);
+                        cpumask_set_cpu(cpu_list[i], &mask);
         }
 
         if (tag->type == DR_CPU_CONFIGURE)
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 6da784a5612b..8341963f4c84 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -269,19 +269,22 @@ smp4m_ticker:
         /* Here is where we check for possible SMP IPI passed to us
          * on some level other than 15 which is the NMI and only used
          * for cross calls.  That has a separate entry point below.
+         *
+         * IPIs are sent on Level 12, 13 and 14. See IRQ_IPI_*.
          */
 maybe_smp4m_msg:
         GET_PROCESSOR4M_ID(o3)
         sethi   %hi(sun4m_irq_percpu), %l5
         sll     %o3, 2, %o3
         or      %l5, %lo(sun4m_irq_percpu), %o5
-        sethi   %hi(0x40000000), %o2
+        sethi   %hi(0x70000000), %o2    ! Check all soft-IRQs
         ld      [%o5 + %o3], %o1
         ld      [%o1 + 0x00], %o3       ! sun4m_irq_percpu[cpu]->pending
         andcc   %o3, %o2, %g0
         be,a    smp4m_ticker
          cmp    %l7, 14
-        st      %o2, [%o1 + 0x04]       ! sun4m_irq_percpu[cpu]->clear=0x40000000
+        /* Soft-IRQ IPI */
+        st      %o2, [%o1 + 0x04]       ! sun4m_irq_percpu[cpu]->clear=0x70000000
         WRITE_PAUSE
         ld      [%o1 + 0x00], %g0       ! sun4m_irq_percpu[cpu]->pending
         WRITE_PAUSE
@@ -290,9 +293,27 @@ maybe_smp4m_msg:
         WRITE_PAUSE
         wr      %l4, PSR_ET, %psr
         WRITE_PAUSE
-        call    smp_reschedule_irq
+        sll     %o2, 28, %o2            ! shift for simpler checks below
+maybe_smp4m_msg_check_single:
+        andcc   %o2, 0x1, %g0
+        beq,a   maybe_smp4m_msg_check_mask
+         andcc  %o2, 0x2, %g0
+        call    smp_call_function_single_interrupt
          nop
-
+        andcc   %o2, 0x2, %g0
+maybe_smp4m_msg_check_mask:
+        beq,a   maybe_smp4m_msg_check_resched
+         andcc  %o2, 0x4, %g0
+        call    smp_call_function_interrupt
+         nop
+        andcc   %o2, 0x4, %g0
+maybe_smp4m_msg_check_resched:
+        /* rescheduling is done in RESTORE_ALL regardless, but incr stats */
+        beq,a   maybe_smp4m_msg_out
+         nop
+        call    smp_resched_interrupt
+         nop
+maybe_smp4m_msg_out:
         RESTORE_ALL
 
         .align  4
@@ -401,18 +422,18 @@ linux_trap_ipi15_sun4d:
 1:      b,a     1b
 
 #ifdef CONFIG_SPARC_LEON
-
-        .globl  smpleon_ticker
-        /* SMP per-cpu ticker interrupts are handled specially. */
-smpleon_ticker:
+        .globl  smpleon_ipi
+        .extern leon_ipi_interrupt
+        /* SMP per-cpu IPI interrupts are handled specially. */
+smpleon_ipi:
         SAVE_ALL
         or      %l0, PSR_PIL, %g2
         wr      %g2, 0x0, %psr
         WRITE_PAUSE
         wr      %g2, PSR_ET, %psr
         WRITE_PAUSE
-        call    leon_percpu_timer_interrupt
-         add    %sp, STACKFRAME_SZ, %o0
+        call    leonsmp_ipi_interrupt
+         add    %sp, STACKFRAME_SZ, %o1 ! pt_regs
         wr      %l0, PSR_ET, %psr
         WRITE_PAUSE
         RESTORE_ALL
diff --git a/arch/sparc/kernel/head_32.S b/arch/sparc/kernel/head_32.S
index 59423491cef8..587785759838 100644
--- a/arch/sparc/kernel/head_32.S
+++ b/arch/sparc/kernel/head_32.S
@@ -810,31 +810,25 @@ found_version:
 got_prop:
 #ifdef CONFIG_SPARC_LEON
                 /* no cpu-type check is needed, it is a SPARC-LEON */
-#ifdef CONFIG_SMP
-                ba leon_smp_init
-                 nop
 
-                .global leon_smp_init
-leon_smp_init:
-                sethi   %hi(boot_cpu_id), %g1    ! master always 0
-                stb     %g0, [%g1 + %lo(boot_cpu_id)]
-                sethi   %hi(boot_cpu_id4), %g1   ! master always 0
-                stb     %g0, [%g1 + %lo(boot_cpu_id4)]
+                sethi   %hi(boot_cpu_id), %g2   ! boot-cpu index
 
-                rd     %asr17,%g1
-                srl    %g1,28,%g1
+#ifdef CONFIG_SMP
+                ldub    [%g2 + %lo(boot_cpu_id)], %g1
+                cmp     %g1, 0xff               ! unset means first CPU
+                bne     leon_smp_cpu_startup    ! continue only with master
+                 nop
+#endif
+                /* Get CPU-ID from most significant 4-bit of ASR17 */
+                rd     %asr17, %g1
+                srl    %g1, 28, %g1
 
-                cmp %g0,%g1
-                 beq sun4c_continue_boot         !continue with master
-                nop
+                /* Update boot_cpu_id only on boot cpu */
+                stub    %g1, [%g2 + %lo(boot_cpu_id)]
 
-                ba leon_smp_cpu_startup
-                 nop
-#else
                 ba sun4c_continue_boot
                  nop
 #endif
-#endif
                 set     cputypval, %o2
                 ldub    [%o2 + 0x4], %l1
 
@@ -893,9 +887,6 @@ sun4d_init:
         sta     %g4, [%g0] ASI_M_VIKING_TMP1
         sethi   %hi(boot_cpu_id), %g5
         stb     %g4, [%g5 + %lo(boot_cpu_id)]
-        sll     %g4, 2, %g4
-        sethi   %hi(boot_cpu_id4), %g5
-        stb     %g4, [%g5 + %lo(boot_cpu_id4)]
 #endif
 
         /* Fall through to sun4m_init */
@@ -1024,14 +1015,28 @@ sun4c_continue_boot:
                 bl      1b
                  add    %o0, 0x1, %o0
 
+                /* If boot_cpu_id has not been setup by machine specific
+                 * init-code above we default it to zero.
+                 */
+                sethi   %hi(boot_cpu_id), %g2
+                ldub    [%g2 + %lo(boot_cpu_id)], %g3
+                cmp     %g3, 0xff
+                bne     1f
+                 nop
+                mov     %g0, %g3
+                stub    %g3, [%g2 + %lo(boot_cpu_id)]
+
+1:              /* boot_cpu_id set. calculate boot_cpu_id4 = boot_cpu_id*4 */
+                sll     %g3, 2, %g3
+                sethi   %hi(boot_cpu_id4), %g2
+                stub    %g3, [%g2 + %lo(boot_cpu_id4)]
+
                 /* Initialize the uwinmask value for init task just in case.
                  * But first make current_set[boot_cpu_id] point to something useful.
                  */
                 set     init_thread_union, %g6
                 set     current_set, %g2
 #ifdef CONFIG_SMP
-                sethi   %hi(boot_cpu_id4), %g3
-                ldub    [%g3 + %lo(boot_cpu_id4)], %g3
                 st      %g6, [%g2]
                 add     %g2, %g3, %g2
 #endif
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index c6ce9a6a4790..1c9c80a1a86a 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -50,10 +50,15 @@
 #include <asm/io-unit.h>
 #include <asm/leon.h>
 
+/* This function must make sure that caches and memory are coherent after DMA
+ * On LEON systems without cache snooping it flushes the entire D-CACHE.
+ */
 #ifndef CONFIG_SPARC_LEON
-#define mmu_inval_dma_area(p, l)        /* Anton pulled it out for 2.4.0-xx */
+static inline void dma_make_coherent(unsigned long pa, unsigned long len)
+{
+}
 #else
-static inline void mmu_inval_dma_area(void *va, unsigned long len)
+static inline void dma_make_coherent(unsigned long pa, unsigned long len)
 {
         if (!sparc_leon3_snooping_enabled())
                 leon_flush_dcache_all();
@@ -284,7 +289,6 @@ static void *sbus_alloc_coherent(struct device *dev, size_t len,
                 printk("sbus_alloc_consistent: cannot occupy 0x%lx", len_total);
                 goto err_nova;
         }
-        mmu_inval_dma_area((void *)va, len_total);
 
         // XXX The mmu_map_dma_area does this for us below, see comments.
         // sparc_mapiorange(0, virt_to_phys(va), res->start, len_total);
@@ -336,7 +340,6 @@ static void sbus_free_coherent(struct device *dev, size_t n, void *p,
         release_resource(res);
         kfree(res);
 
-        /* mmu_inval_dma_area(va, n); */ /* it's consistent, isn't it */
         pgv = virt_to_page(p);
         mmu_unmap_dma_area(dev, ba, n);
 
@@ -463,7 +466,6 @@ static void *pci32_alloc_coherent(struct device *dev, size_t len,
                 printk("pci_alloc_consistent: cannot occupy 0x%lx", len_total);
                 goto err_nova;
         }
-        mmu_inval_dma_area(va, len_total);
         sparc_mapiorange(0, virt_to_phys(va), res->start, len_total);
 
         *pba = virt_to_phys(va); /* equals virt_to_bus (R.I.P.) for us. */
@@ -489,7 +491,6 @@ static void pci32_free_coherent(struct device *dev, size_t n, void *p,
                                 dma_addr_t ba)
 {
         struct resource *res;
-        void *pgp;
 
         if ((res = _sparc_find_resource(&_sparc_dvma,
             (unsigned long)p)) == NULL) {
@@ -509,14 +510,12 @@ static void pci32_free_coherent(struct device *dev, size_t n, void *p,
                 return;
         }
 
-        pgp = phys_to_virt(ba); /* bus_to_virt actually */
-        mmu_inval_dma_area(pgp, n);
+        dma_make_coherent(ba, n);
         sparc_unmapiorange((unsigned long)p, n);
 
         release_resource(res);
         kfree(res);
-
-        free_pages((unsigned long)pgp, get_order(n));
+        free_pages((unsigned long)phys_to_virt(ba), get_order(n));
 }
 
 /*
@@ -535,7 +534,7 @@ static void pci32_unmap_page(struct device *dev, dma_addr_t ba, size_t size,
                              enum dma_data_direction dir, struct dma_attrs *attrs)
 {
         if (dir != PCI_DMA_TODEVICE)
-                mmu_inval_dma_area(phys_to_virt(ba), PAGE_ALIGN(size));
+                dma_make_coherent(ba, PAGE_ALIGN(size));
 }
 
 /* Map a set of buffers described by scatterlist in streaming
@@ -562,8 +561,7 @@ static int pci32_map_sg(struct device *device, struct scatterlist *sgl,
 
         /* IIep is write-through, not flushing. */
         for_each_sg(sgl, sg, nents, n) {
-                BUG_ON(page_address(sg_page(sg)) == NULL);
-                sg->dma_address = virt_to_phys(sg_virt(sg));
+                sg->dma_address = sg_phys(sg);
                 sg->dma_length = sg->length;
         }
         return nents;
@@ -582,9 +580,7 @@ static void pci32_unmap_sg(struct device *dev, struct scatterlist *sgl,
 
         if (dir != PCI_DMA_TODEVICE) {
                 for_each_sg(sgl, sg, nents, n) {
-                        BUG_ON(page_address(sg_page(sg)) == NULL);
-                        mmu_inval_dma_area(page_address(sg_page(sg)),
-                                           PAGE_ALIGN(sg->length));
+                        dma_make_coherent(sg_phys(sg), PAGE_ALIGN(sg->length));
                 }
         }
 }
@@ -603,8 +599,7 @@ static void pci32_sync_single_for_cpu(struct device *dev, dma_addr_t ba,
                                       size_t size, enum dma_data_direction dir)
 {
         if (dir != PCI_DMA_TODEVICE) {
-                mmu_inval_dma_area(phys_to_virt(ba),
-                                   PAGE_ALIGN(size));
+                dma_make_coherent(ba, PAGE_ALIGN(size));
         }
 }
 
@@ -612,8 +607,7 @@ static void pci32_sync_single_for_device(struct device *dev, dma_addr_t ba,
                                          size_t size, enum dma_data_direction dir)
 {
         if (dir != PCI_DMA_TODEVICE) {
-                mmu_inval_dma_area(phys_to_virt(ba),
-                                   PAGE_ALIGN(size));
+                dma_make_coherent(ba, PAGE_ALIGN(size));
         }
 }
 
@@ -631,9 +625,7 @@ static void pci32_sync_sg_for_cpu(struct device *dev, struct scatterlist *sgl,
 
         if (dir != PCI_DMA_TODEVICE) {
                 for_each_sg(sgl, sg, nents, n) {
-                        BUG_ON(page_address(sg_page(sg)) == NULL);
-                        mmu_inval_dma_area(page_address(sg_page(sg)),
-                                           PAGE_ALIGN(sg->length));
+                        dma_make_coherent(sg_phys(sg), PAGE_ALIGN(sg->length));
                 }
         }
 }
@@ -646,9 +638,7 @@ static void pci32_sync_sg_for_device(struct device *device, struct scatterlist *
 
         if (dir != PCI_DMA_TODEVICE) {
                 for_each_sg(sgl, sg, nents, n) {
-                        BUG_ON(page_address(sg_page(sg)) == NULL);
-                        mmu_inval_dma_area(page_address(sg_page(sg)),
-                                           PAGE_ALIGN(sg->length));
+                        dma_make_coherent(sg_phys(sg), PAGE_ALIGN(sg->length));
                 }
         }
 }
diff --git a/arch/sparc/kernel/irq.h b/arch/sparc/kernel/irq.h
index 008453b798ec..100b9c204e78 100644
--- a/arch/sparc/kernel/irq.h
+++ b/arch/sparc/kernel/irq.h
@@ -2,6 +2,23 @@
 
 #include <asm/btfixup.h>
 
+struct irq_bucket {
+        struct irq_bucket *next;
+        unsigned int real_irq;
+        unsigned int irq;
+        unsigned int pil;
+};
+
+#define SUN4D_MAX_BOARD 10
+#define SUN4D_MAX_IRQ ((SUN4D_MAX_BOARD + 2) << 5)
+
+/* Map between the irq identifier used in hw to the
+ * irq_bucket. The map is sufficient large to hold
+ * the sun4d hw identifiers.
+ */
+extern struct irq_bucket *irq_map[SUN4D_MAX_IRQ];
+
+
 /* sun4m specific type definitions */
 
 /* This maps direct to CPU specific interrupt registers */
@@ -35,6 +52,10 @@ struct sparc_irq_config {
 };
 extern struct sparc_irq_config sparc_irq_config;
 
+unsigned int irq_alloc(unsigned int real_irq, unsigned int pil);
+void irq_link(unsigned int irq);
+void irq_unlink(unsigned int irq);
+void handler_irq(unsigned int pil, struct pt_regs *regs);
 
 /* Dave Redman (djhr@tadpole.co.uk)
  * changed these to function pointers.. it saves cycles and will allow
@@ -44,33 +65,9 @@ extern struct sparc_irq_config sparc_irq_config;
  * Changed these to btfixup entities... It saves cycles :)
  */
 
-BTFIXUPDEF_CALL(void, disable_irq, unsigned int)
-BTFIXUPDEF_CALL(void, enable_irq, unsigned int)
-BTFIXUPDEF_CALL(void, disable_pil_irq, unsigned int)
-BTFIXUPDEF_CALL(void, enable_pil_irq, unsigned int)
 BTFIXUPDEF_CALL(void, clear_clock_irq, void)
 BTFIXUPDEF_CALL(void, load_profile_irq, int, unsigned int)
 
-static inline void __disable_irq(unsigned int irq)
-{
-        BTFIXUP_CALL(disable_irq)(irq);
-}
-
-static inline void __enable_irq(unsigned int irq)
-{
-        BTFIXUP_CALL(enable_irq)(irq);
-}
-
-static inline void disable_pil_irq(unsigned int irq)
-{
-        BTFIXUP_CALL(disable_pil_irq)(irq);
-}
-
-static inline void enable_pil_irq(unsigned int irq)
-{
-        BTFIXUP_CALL(enable_pil_irq)(irq);
-}
-
 static inline void clear_clock_irq(void)
 {
         BTFIXUP_CALL(clear_clock_irq)();
@@ -89,4 +86,10 @@ BTFIXUPDEF_CALL(void, set_irq_udt, int)
 #define set_cpu_int(cpu,level) BTFIXUP_CALL(set_cpu_int)(cpu,level)
 #define clear_cpu_int(cpu,level) BTFIXUP_CALL(clear_cpu_int)(cpu,level)
 #define set_irq_udt(cpu) BTFIXUP_CALL(set_irq_udt)(cpu)
+
+/* All SUN4D IPIs are sent on this IRQ, may be shared with hard IRQs */
+#define SUN4D_IPI_IRQ 14
+
+extern void sun4d_ipi_interrupt(void);
+
 #endif
diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c
index 7c93df4099cb..9b89d842913c 100644
--- a/arch/sparc/kernel/irq_32.c
+++ b/arch/sparc/kernel/irq_32.c
@@ -15,6 +15,7 @@
 #include <linux/seq_file.h>
 
 #include <asm/cacheflush.h>
+#include <asm/cpudata.h>
 #include <asm/pcic.h>
 #include <asm/leon.h>
 
@@ -101,284 +102,173 @@ EXPORT_SYMBOL(arch_local_irq_restore);
  * directed CPU interrupts using the existing enable/disable irq code
  * with tweaks.
  *
+ * Sun4d complicates things even further.  IRQ numbers are arbitrary
+ * 32-bit values in that case.  Since this is similar to sparc64,
+ * we adopt a virtual IRQ numbering scheme as is done there.
+ * Virutal interrupt numbers are allocated by build_irq().  So NR_IRQS
+ * just becomes a limit of how many interrupt sources we can handle in
+ * a single system.  Even fully loaded SS2000 machines top off at
+ * about 32 interrupt sources or so, therefore a NR_IRQS value of 64
+ * is more than enough.
+  *
+ * We keep a map of per-PIL enable interrupts.  These get wired
+ * up via the irq_chip->startup() method which gets invoked by
+ * the generic IRQ layer during request_irq().
  */
 
 
+/* Table of allocated irqs. Unused entries has irq == 0 */
+static struct irq_bucket irq_table[NR_IRQS];
+/* Protect access to irq_table */
+static DEFINE_SPINLOCK(irq_table_lock);
 
-/*
- * Dave Redman (djhr@tadpole.co.uk)
- *
- * There used to be extern calls and hard coded values here.. very sucky!
- * instead, because some of the devices attach very early, I do something
- * equally sucky but at least we'll never try to free statically allocated
- * space or call kmalloc before kmalloc_init :(.
- *
- * In fact it's the timer10 that attaches first.. then timer14
- * then kmalloc_init is called.. then the tty interrupts attach.
- * hmmm....
- *
- */
-#define MAX_STATIC_ALLOC        4
-struct irqaction static_irqaction[MAX_STATIC_ALLOC];
-int static_irq_count;
-
-static struct {
-        struct irqaction *action;
-        int flags;
-} sparc_irq[NR_IRQS];
-#define SPARC_IRQ_INPROGRESS 1
-
-/* Used to protect the IRQ action lists */
-DEFINE_SPINLOCK(irq_action_lock);
+/* Map between the irq identifier used in hw to the irq_bucket. */
+struct irq_bucket *irq_map[SUN4D_MAX_IRQ];
+/* Protect access to irq_map */
+static DEFINE_SPINLOCK(irq_map_lock);
 
-int show_interrupts(struct seq_file *p, void *v)
+/* Allocate a new irq from the irq_table */
+unsigned int irq_alloc(unsigned int real_irq, unsigned int pil)
 {
-        int i = *(loff_t *)v;
-        struct irqaction *action;
         unsigned long flags;
-#ifdef CONFIG_SMP
-        int j;
-#endif
+        unsigned int i;
+
+        spin_lock_irqsave(&irq_table_lock, flags);
+        for (i = 1; i < NR_IRQS; i++) {
+                if (irq_table[i].real_irq == real_irq && irq_table[i].pil == pil)
+                        goto found;
+        }
 
-        if (sparc_cpu_model == sun4d)
-                return show_sun4d_interrupts(p, v);
+        for (i = 1; i < NR_IRQS; i++) {
+                if (!irq_table[i].irq)
+                        break;
+        }
 
-        spin_lock_irqsave(&irq_action_lock, flags);
         if (i < NR_IRQS) {
-                action = sparc_irq[i].action;
-                if (!action)
-                        goto out_unlock;
-                seq_printf(p, "%3d: ", i);
-#ifndef CONFIG_SMP
-                seq_printf(p, "%10u ", kstat_irqs(i));
-#else
-                for_each_online_cpu(j) {
-                        seq_printf(p, "%10u ",
-                                    kstat_cpu(j).irqs[i]);
-                }
-#endif
-                seq_printf(p, " %c %s",
-                        (action->flags & IRQF_DISABLED) ? '+' : ' ',
-                        action->name);
-                for (action = action->next; action; action = action->next) {
-                        seq_printf(p, ",%s %s",
-                                (action->flags & IRQF_DISABLED) ? " +" : "",
-                                action->name);
-                }
-                seq_putc(p, '\n');
+                irq_table[i].real_irq = real_irq;
+                irq_table[i].irq = i;
+                irq_table[i].pil = pil;
+        } else {
+                printk(KERN_ERR "IRQ: Out of virtual IRQs.\n");
+                i = 0;
         }
-out_unlock:
-        spin_unlock_irqrestore(&irq_action_lock, flags);
-        return 0;
+found:
+        spin_unlock_irqrestore(&irq_table_lock, flags);
+
+        return i;
 }
 
-void free_irq(unsigned int irq, void *dev_id)
+/* Based on a single pil handler_irq may need to call several
+ * interrupt handlers. Use irq_map as entry to irq_table,
+ * and let each entry in irq_table point to the next entry.
+ */
+void irq_link(unsigned int irq)
 {
-        struct irqaction *action;
-        struct irqaction **actionp;
+        struct irq_bucket *p;
         unsigned long flags;
-        unsigned int cpu_irq;
-
-        if (sparc_cpu_model == sun4d) {
-                sun4d_free_irq(irq, dev_id);
-                return;
-        }
-        cpu_irq = irq & (NR_IRQS - 1);
-        if (cpu_irq > 14) {  /* 14 irq levels on the sparc */
-                printk(KERN_ERR "Trying to free bogus IRQ %d\n", irq);
-                return;
-        }
+        unsigned int pil;
 
-        spin_lock_irqsave(&irq_action_lock, flags);
+        BUG_ON(irq >= NR_IRQS);
 
-        actionp = &sparc_irq[cpu_irq].action;
-        action = *actionp;
+        spin_lock_irqsave(&irq_map_lock, flags);
 
-        if (!action->handler) {
-                printk(KERN_ERR "Trying to free free IRQ%d\n", irq);
-                goto out_unlock;
-        }
-        if (dev_id) {
-                for (; action; action = action->next) {
-                        if (action->dev_id == dev_id)
-                                break;
-                        actionp = &action->next;
-                }
-                if (!action) {
-                        printk(KERN_ERR "Trying to free free shared IRQ%d\n",
-                               irq);
-                        goto out_unlock;
-                }
-        } else if (action->flags & IRQF_SHARED) {
-                printk(KERN_ERR "Trying to free shared IRQ%d with NULL device ID\n",
-                       irq);
-                goto out_unlock;
-        }
-        if (action->flags & SA_STATIC_ALLOC) {
-                /*
-                 * This interrupt is marked as specially allocated
-                 * so it is a bad idea to free it.
-                 */
-                printk(KERN_ERR "Attempt to free statically allocated IRQ%d (%s)\n",
-                       irq, action->name);
-                goto out_unlock;
-        }
-
-        *actionp = action->next;
+        p = &irq_table[irq];
+        pil = p->pil;
+        BUG_ON(pil > SUN4D_MAX_IRQ);
+        p->next = irq_map[pil];
+        irq_map[pil] = p;
 
-        spin_unlock_irqrestore(&irq_action_lock, flags);
+        spin_unlock_irqrestore(&irq_map_lock, flags);
+}
 
-        synchronize_irq(irq);
+void irq_unlink(unsigned int irq)
+{
+        struct irq_bucket *p, **pnext;
+        unsigned long flags;
 
-        spin_lock_irqsave(&irq_action_lock, flags);
+        BUG_ON(irq >= NR_IRQS);
 
-        kfree(action);
+        spin_lock_irqsave(&irq_map_lock, flags);
 
-        if (!sparc_irq[cpu_irq].action)
-                __disable_irq(irq);
+        p = &irq_table[irq];
+        BUG_ON(p->pil > SUN4D_MAX_IRQ);
+        pnext = &irq_map[p->pil];
+        while (*pnext != p)
+                pnext = &(*pnext)->next;
+        *pnext = p->next;
 
-out_unlock:
-        spin_unlock_irqrestore(&irq_action_lock, flags);
+        spin_unlock_irqrestore(&irq_map_lock, flags);
 }
-EXPORT_SYMBOL(free_irq);
-
-/*
- * This is called when we want to synchronize with
- * interrupts. We may for example tell a device to
- * stop sending interrupts: but to make sure there
- * are no interrupts that are executing on another
- * CPU we need to call this function.
- */
-#ifdef CONFIG_SMP
-void synchronize_irq(unsigned int irq)
-{
-        unsigned int cpu_irq;
 
-        cpu_irq = irq & (NR_IRQS - 1);
-        while (sparc_irq[cpu_irq].flags & SPARC_IRQ_INPROGRESS)
-                cpu_relax();
-}
-EXPORT_SYMBOL(synchronize_irq);
-#endif /* SMP */
 
-void unexpected_irq(int irq, void *dev_id, struct pt_regs *regs)
+/* /proc/interrupts printing */
+int arch_show_interrupts(struct seq_file *p, int prec)
 {
-        int i;
-        struct irqaction *action;
-        unsigned int cpu_irq;
+        int j;
 
-        cpu_irq = irq & (NR_IRQS - 1);
-        action = sparc_irq[cpu_irq].action;
-
-        printk(KERN_ERR "IO device interrupt, irq = %d\n", irq);
-        printk(KERN_ERR "PC = %08lx NPC = %08lx FP=%08lx\n", regs->pc,
-                    regs->npc, regs->u_regs[14]);
-        if (action) {
-                printk(KERN_ERR "Expecting: ");
-                for (i = 0; i < 16; i++)
-                        if (action->handler)
-                                printk(KERN_CONT "[%s:%d:0x%x] ", action->name,
-                                       i, (unsigned int)action->handler);
-        }
-        printk(KERN_ERR "AIEEE\n");
-        panic("bogus interrupt received");
+#ifdef CONFIG_SMP
+        seq_printf(p, "RES: ");
+        for_each_online_cpu(j)
+                seq_printf(p, "%10u ", cpu_data(j).irq_resched_count);
+        seq_printf(p, "     IPI rescheduling interrupts\n");
+        seq_printf(p, "CAL: ");
+        for_each_online_cpu(j)
+                seq_printf(p, "%10u ", cpu_data(j).irq_call_count);
+        seq_printf(p, "     IPI function call interrupts\n");
+#endif
+        seq_printf(p, "NMI: ");
+        for_each_online_cpu(j)
+                seq_printf(p, "%10u ", cpu_data(j).counter);
+        seq_printf(p, "     Non-maskable interrupts\n");
+        return 0;
 }
 
-void handler_irq(int pil, struct pt_regs *regs)
+void handler_irq(unsigned int pil, struct pt_regs *regs)
 {
         struct pt_regs *old_regs;
-        struct irqaction *action;
-        int cpu = smp_processor_id();
+        struct irq_bucket *p;
 
+        BUG_ON(pil > 15);
         old_regs = set_irq_regs(regs);
         irq_enter();
-        disable_pil_irq(pil);
-#ifdef CONFIG_SMP
-        /* Only rotate on lower priority IRQs (scsi, ethernet, etc.). */
-        if ((sparc_cpu_model==sun4m) && (pil < 10))
-                smp4m_irq_rotate(cpu);
-#endif
-        action = sparc_irq[pil].action;
-        sparc_irq[pil].flags |= SPARC_IRQ_INPROGRESS;
-        kstat_cpu(cpu).irqs[pil]++;
-        do {
-                if (!action || !action->handler)
-                        unexpected_irq(pil, NULL, regs);
-                action->handler(pil, action->dev_id);
-                action = action->next;
-        } while (action);
-        sparc_irq[pil].flags &= ~SPARC_IRQ_INPROGRESS;
-        enable_pil_irq(pil);
+
+        p = irq_map[pil];
+        while (p) {
+                struct irq_bucket *next = p->next;
+
+                generic_handle_irq(p->irq);
+                p = next;
+        }
         irq_exit();
         set_irq_regs(old_regs);
 }
 
 #if defined(CONFIG_BLK_DEV_FD) || defined(CONFIG_BLK_DEV_FD_MODULE)
+static unsigned int floppy_irq;
 
-/*
- * Fast IRQs on the Sparc can only have one routine attached to them,
- * thus no sharing possible.
- */
-static int request_fast_irq(unsigned int irq,
-                            void (*handler)(void),
-                            unsigned long irqflags, const char *devname)
+int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler)
 {
-        struct irqaction *action;
-        unsigned long flags;
         unsigned int cpu_irq;
-        int ret;
+        int err;
+
 #if defined CONFIG_SMP && !defined CONFIG_SPARC_LEON
         struct tt_entry *trap_table;
 #endif
-        cpu_irq = irq & (NR_IRQS - 1);
-        if (cpu_irq > 14) {
-                ret = -EINVAL;
-                goto out;
-        }
-        if (!handler) {
-                ret = -EINVAL;
-                goto out;
-        }
 
-        spin_lock_irqsave(&irq_action_lock, flags);
+        err = request_irq(irq, irq_handler, 0, "floppy", NULL);
+        if (err)
+                return -1;
 
-        action = sparc_irq[cpu_irq].action;
-        if (action) {
-                if (action->flags & IRQF_SHARED)
-                        panic("Trying to register fast irq when already shared.\n");
-                if (irqflags & IRQF_SHARED)
-                        panic("Trying to register fast irq as shared.\n");
+        /* Save for later use in floppy interrupt handler */
+        floppy_irq = irq;
 
-                /* Anyway, someone already owns it so cannot be made fast. */
-                printk(KERN_ERR "request_fast_irq: Trying to register yet already owned.\n");
-                ret = -EBUSY;
-                goto out_unlock;
-        }
-
-        /*
-         * If this is flagged as statically allocated then we use our
-         * private struct which is never freed.
-         */
-        if (irqflags & SA_STATIC_ALLOC) {
-                if (static_irq_count < MAX_STATIC_ALLOC)
-                        action = &static_irqaction[static_irq_count++];
-                else
-                        printk(KERN_ERR "Fast IRQ%d (%s) SA_STATIC_ALLOC failed using kmalloc\n",
-                               irq, devname);
-        }
-
-        if (action == NULL)
-                action = kmalloc(sizeof(struct irqaction), GFP_ATOMIC);
-        if (!action) {
-                ret = -ENOMEM;
-                goto out_unlock;
-        }
+        cpu_irq = (irq & (NR_IRQS - 1));
 
         /* Dork with trap table if we get this far. */
 #define INSTANTIATE(table) \
         table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_one = SPARC_RD_PSR_L0; \
         table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two = \
-                SPARC_BRANCH((unsigned long) handler, \
+                SPARC_BRANCH((unsigned long) floppy_hardint, \
                              (unsigned long) &table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two);\
         table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_three = SPARC_RD_WIM_L3; \
         table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP;
@@ -399,22 +289,9 @@ static int request_fast_irq(unsigned int irq,
          * writing we have no CPU-neutral interface to fine-grained flushes.
          */
         flush_cache_all();
-
-        action->flags = irqflags;
-        action->name = devname;
-        action->dev_id = NULL;
-        action->next = NULL;
-
-        sparc_irq[cpu_irq].action = action;
-
-        __enable_irq(irq);
-
-        ret = 0;
-out_unlock:
-        spin_unlock_irqrestore(&irq_action_lock, flags);
-out:
-        return ret;
+        return 0;
 }
+EXPORT_SYMBOL(sparc_floppy_request_irq);
 
 /*
  * These variables are used to access state from the assembler
@@ -440,154 +317,23 @@ EXPORT_SYMBOL(pdma_base);
 unsigned long pdma_areasize;
 EXPORT_SYMBOL(pdma_areasize);
 
-static irq_handler_t floppy_irq_handler;
-
+/* Use the generic irq support to call floppy_interrupt
+ * which was setup using request_irq() in sparc_floppy_request_irq().
+ * We only have one floppy interrupt so we do not need to check
+ * for additional handlers being wired up by irq_link()
+ */
 void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
         struct pt_regs *old_regs;
-        int cpu = smp_processor_id();
 
         old_regs = set_irq_regs(regs);
-        disable_pil_irq(irq);
         irq_enter();
-        kstat_cpu(cpu).irqs[irq]++;
-        floppy_irq_handler(irq, dev_id);
+        generic_handle_irq(floppy_irq);
         irq_exit();
-        enable_pil_irq(irq);
         set_irq_regs(old_regs);
-        /*
-         * XXX Eek, it's totally changed with preempt_count() and such
-         * if (softirq_pending(cpu))
-         *      do_softirq();
-         */
-}
-
-int sparc_floppy_request_irq(int irq, unsigned long flags,
-                             irq_handler_t irq_handler)
-{
-        floppy_irq_handler = irq_handler;
-        return request_fast_irq(irq, floppy_hardint, flags, "floppy");
 }
-EXPORT_SYMBOL(sparc_floppy_request_irq);
-
 #endif
 
-int request_irq(unsigned int irq,
-                irq_handler_t handler,
-                unsigned long irqflags, const char *devname, void *dev_id)
-{
-        struct irqaction *action, **actionp;
-        unsigned long flags;
-        unsigned int cpu_irq;
-        int ret;
-
-        if (sparc_cpu_model == sun4d)
-                return sun4d_request_irq(irq, handler, irqflags, devname, dev_id);
-
-        cpu_irq = irq & (NR_IRQS - 1);
-        if (cpu_irq > 14) {
-                ret = -EINVAL;
-                goto out;
-        }
-        if (!handler) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        spin_lock_irqsave(&irq_action_lock, flags);
-
-        actionp = &sparc_irq[cpu_irq].action;
-        action = *actionp;
-        if (action) {
-                if (!(action->flags & IRQF_SHARED) || !(irqflags & IRQF_SHARED)) {
-                        ret = -EBUSY;
-                        goto out_unlock;
-                }
-                if ((action->flags & IRQF_DISABLED) != (irqflags & IRQF_DISABLED)) {
-                        printk(KERN_ERR "Attempt to mix fast and slow interrupts on IRQ%d denied\n",
-                               irq);
-                        ret = -EBUSY;
-                        goto out_unlock;
-                }
-                for ( ; action; action = *actionp)
-                        actionp = &action->next;
-        }
-
-        /* If this is flagged as statically allocated then we use our
-         * private struct which is never freed.
-         */
-        if (irqflags & SA_STATIC_ALLOC) {
-                if (static_irq_count < MAX_STATIC_ALLOC)
-                        action = &static_irqaction[static_irq_count++];
-                else
-                        printk(KERN_ERR "Request for IRQ%d (%s) SA_STATIC_ALLOC failed using kmalloc\n",
-                               irq, devname);
-        }
-        if (action == NULL)
-                action = kmalloc(sizeof(struct irqaction), GFP_ATOMIC);
-        if (!action) {
-                ret = -ENOMEM;
-                goto out_unlock;
-        }
-
-        action->handler = handler;
-        action->flags = irqflags;
-        action->name = devname;
-        action->next = NULL;
-        action->dev_id = dev_id;
-
-        *actionp = action;
-
-        __enable_irq(irq);
-
-        ret = 0;
-out_unlock:
-        spin_unlock_irqrestore(&irq_action_lock, flags);
-out:
-        return ret;
-}
-EXPORT_SYMBOL(request_irq);
-
-void disable_irq_nosync(unsigned int irq)
-{
-        __disable_irq(irq);
-}
-EXPORT_SYMBOL(disable_irq_nosync);
-
-void disable_irq(unsigned int irq)
-{
-        __disable_irq(irq);
-}
-EXPORT_SYMBOL(disable_irq);
-
-void enable_irq(unsigned int irq)
-{
-        __enable_irq(irq);
-}
-EXPORT_SYMBOL(enable_irq);
-
-/*
- * We really don't need these at all on the Sparc.  We only have
- * stubs here because they are exported to modules.
- */
-unsigned long probe_irq_on(void)
-{
-        return 0;
-}
-EXPORT_SYMBOL(probe_irq_on);
-
-int probe_irq_off(unsigned long mask)
-{
-        return 0;
-}
-EXPORT_SYMBOL(probe_irq_off);
-
-static unsigned int build_device_irq(struct platform_device *op,
-                                     unsigned int real_irq)
-{
-        return real_irq;
-}
-
 /* djhr
  * This could probably be made indirect too and assigned in the CPU
  * bits of the code. That would be much nicer I think and would also
@@ -598,8 +344,6 @@ static unsigned int build_device_irq(struct platform_device *op,
 
 void __init init_IRQ(void)
 {
-        sparc_irq_config.build_device_irq = build_device_irq;
-
         switch (sparc_cpu_model) {
         case sun4c:
         case sun4:
@@ -607,14 +351,11 @@ void __init init_IRQ(void)
                 break;
 
         case sun4m:
-#ifdef CONFIG_PCI
                 pcic_probe();
-                if (pcic_present()) {
+                if (pcic_present())
                         sun4m_pci_init_IRQ();
-                        break;
-                }
-#endif
-                sun4m_init_IRQ();
+                else
+                        sun4m_init_IRQ();
                 break;
 
         case sun4d:
@@ -632,9 +373,3 @@ void __init init_IRQ(void)
         btfixup();
 }
 
-#ifdef CONFIG_PROC_FS
-void init_irq_proc(void)
-{
-        /* For now, nothing... */
-}
-#endif /* CONFIG_PROC_FS */
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
index b1d275ce3435..4e78862d12fd 100644
--- a/arch/sparc/kernel/irq_64.c
+++ b/arch/sparc/kernel/irq_64.c
@@ -224,13 +224,13 @@ static int irq_choose_cpu(unsigned int irq, const struct cpumask *affinity)
         int cpuid;
 
         cpumask_copy(&mask, affinity);
-        if (cpus_equal(mask, cpu_online_map)) {
+        if (cpumask_equal(&mask, cpu_online_mask)) {
                 cpuid = map_to_cpu(irq);
         } else {
                 cpumask_t tmp;
 
-                cpus_and(tmp, cpu_online_map, mask);
-                cpuid = cpus_empty(tmp) ? map_to_cpu(irq) : first_cpu(tmp);
+                cpumask_and(&tmp, cpu_online_mask, &mask);
+                cpuid = cpumask_empty(&tmp) ? map_to_cpu(irq) : cpumask_first(&tmp);
         }
 
         return cpuid;
diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h
index 24ad449886be..6f6544cfa0ef 100644
--- a/arch/sparc/kernel/kernel.h
+++ b/arch/sparc/kernel/kernel.h
@@ -6,11 +6,9 @@
 #include <asm/traps.h>
 
 /* cpu.c */
-extern const char *sparc_cpu_type;
 extern const char *sparc_pmu_type;
-extern const char *sparc_fpu_type;
-
 extern unsigned int fsr_storage;
+extern int ncpus_probed;
 
 #ifdef CONFIG_SPARC32
 /* cpu.c */
@@ -37,6 +35,7 @@ extern void sun4c_init_IRQ(void);
 extern unsigned int lvl14_resolution;
 
 extern void sun4m_init_IRQ(void);
+extern void sun4m_unmask_profile_irq(void);
 extern void sun4m_clear_profile_irq(int cpu);
 
 /* sun4d_irq.c */
diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
index 2969f777fa11..2f538ac2e139 100644
--- a/arch/sparc/kernel/leon_kernel.c
+++ b/arch/sparc/kernel/leon_kernel.c
@@ -19,53 +19,70 @@
 #include <asm/leon_amba.h>
 #include <asm/traps.h>
 #include <asm/cacheflush.h>
+#include <asm/smp.h>
+#include <asm/setup.h>
 
 #include "prom.h"
 #include "irq.h"
 
 struct leon3_irqctrl_regs_map *leon3_irqctrl_regs; /* interrupt controller base address */
 struct leon3_gptimer_regs_map *leon3_gptimer_regs; /* timer controller base address */
-struct amba_apb_device leon_percpu_timer_dev[16];
 
 int leondebug_irq_disable;
 int leon_debug_irqout;
 static int dummy_master_l10_counter;
 unsigned long amba_system_id;
+static DEFINE_SPINLOCK(leon_irq_lock);
 
 unsigned long leon3_gptimer_irq; /* interrupt controller irq number */
 unsigned long leon3_gptimer_idx; /* Timer Index (0..6) within Timer Core */
+int leon3_ticker_irq; /* Timer ticker IRQ */
 unsigned int sparc_leon_eirq;
-#define LEON_IMASK ((&leon3_irqctrl_regs->mask[0]))
+#define LEON_IMASK(cpu) (&leon3_irqctrl_regs->mask[cpu])
+#define LEON_IACK (&leon3_irqctrl_regs->iclear)
+#define LEON_DO_ACK_HW 1
 
-/* Return the IRQ of the pending IRQ on the extended IRQ controller */
-int sparc_leon_eirq_get(int eirq, int cpu)
+/* Return the last ACKed IRQ by the Extended IRQ controller. It has already
+ * been (automatically) ACKed when the CPU takes the trap.
+ */
+static inline unsigned int leon_eirq_get(int cpu)
 {
         return LEON3_BYPASS_LOAD_PA(&leon3_irqctrl_regs->intid[cpu]) & 0x1f;
 }
 
-irqreturn_t sparc_leon_eirq_isr(int dummy, void *dev_id)
+/* Handle one or multiple IRQs from the extended interrupt controller */
+static void leon_handle_ext_irq(unsigned int irq, struct irq_desc *desc)
 {
-        printk(KERN_ERR "sparc_leon_eirq_isr: ERROR EXTENDED IRQ\n");
-        return IRQ_HANDLED;
+        unsigned int eirq;
+        int cpu = sparc_leon3_cpuid();
+
+        eirq = leon_eirq_get(cpu);
+        if ((eirq & 0x10) && irq_map[eirq]->irq) /* bit4 tells if IRQ happened */
+                generic_handle_irq(irq_map[eirq]->irq);
 }
 
 /* The extended IRQ controller has been found, this function registers it */
-void sparc_leon_eirq_register(int eirq)
+void leon_eirq_setup(unsigned int eirq)
 {
-        int irq;
+        unsigned long mask, oldmask;
+        unsigned int veirq;
 
-        /* Register a "BAD" handler for this interrupt, it should never happen */
-        irq = request_irq(eirq, sparc_leon_eirq_isr,
-                          (IRQF_DISABLED | SA_STATIC_ALLOC), "extirq", NULL);
-
-        if (irq) {
-                printk(KERN_ERR
-                       "sparc_leon_eirq_register: unable to attach IRQ%d\n",
-                       eirq);
-        } else {
-                sparc_leon_eirq = eirq;
+        if (eirq < 1 || eirq > 0xf) {
+                printk(KERN_ERR "LEON EXT IRQ NUMBER BAD: %d\n", eirq);
+                return;
         }
 
+        veirq = leon_build_device_irq(eirq, leon_handle_ext_irq, "extirq", 0);
+
+        /*
+         * Unmask the Extended IRQ, the IRQs routed through the Ext-IRQ
+         * controller have a mask-bit of their own, so this is safe.
+         */
+        irq_link(veirq);
+        mask = 1 << eirq;
+        oldmask = LEON3_BYPASS_LOAD_PA(LEON_IMASK(boot_cpu_id));
+        LEON3_BYPASS_STORE_PA(LEON_IMASK(boot_cpu_id), (oldmask | mask));
+        sparc_leon_eirq = eirq;
 }
 
 static inline unsigned long get_irqmask(unsigned int irq)
@@ -83,35 +100,151 @@ static inline unsigned long get_irqmask(unsigned int irq)
         return mask;
 }
 
-static void leon_enable_irq(unsigned int irq_nr)
+#ifdef CONFIG_SMP
+static int irq_choose_cpu(const struct cpumask *affinity)
 {
-        unsigned long mask, flags;
-        mask = get_irqmask(irq_nr);
-        local_irq_save(flags);
-        LEON3_BYPASS_STORE_PA(LEON_IMASK,
-                              (LEON3_BYPASS_LOAD_PA(LEON_IMASK) | (mask)));
-        local_irq_restore(flags);
+        cpumask_t mask;
+
+        cpus_and(mask, cpu_online_map, *affinity);
+        if (cpus_equal(mask, cpu_online_map) || cpus_empty(mask))
+                return boot_cpu_id;
+        else
+                return first_cpu(mask);
 }
+#else
+#define irq_choose_cpu(affinity) boot_cpu_id
+#endif
 
-static void leon_disable_irq(unsigned int irq_nr)
+static int leon_set_affinity(struct irq_data *data, const struct cpumask *dest,
+                             bool force)
 {
-        unsigned long mask, flags;
-        mask = get_irqmask(irq_nr);
-        local_irq_save(flags);
-        LEON3_BYPASS_STORE_PA(LEON_IMASK,
-                              (LEON3_BYPASS_LOAD_PA(LEON_IMASK) & ~(mask)));
-        local_irq_restore(flags);
+        unsigned long mask, oldmask, flags;
+        int oldcpu, newcpu;
+
+        mask = (unsigned long)data->chip_data;
+        oldcpu = irq_choose_cpu(data->affinity);
+        newcpu = irq_choose_cpu(dest);
+
+        if (oldcpu == newcpu)
+                goto out;
+
+        /* unmask on old CPU first before enabling on the selected CPU */
+        spin_lock_irqsave(&leon_irq_lock, flags);
+        oldmask = LEON3_BYPASS_LOAD_PA(LEON_IMASK(oldcpu));
+        LEON3_BYPASS_STORE_PA(LEON_IMASK(oldcpu), (oldmask & ~mask));
+        oldmask = LEON3_BYPASS_LOAD_PA(LEON_IMASK(newcpu));
+        LEON3_BYPASS_STORE_PA(LEON_IMASK(newcpu), (oldmask | mask));
+        spin_unlock_irqrestore(&leon_irq_lock, flags);
+out:
+        return IRQ_SET_MASK_OK;
+}
+
+static void leon_unmask_irq(struct irq_data *data)
+{
+        unsigned long mask, oldmask, flags;
+        int cpu;
+
+        mask = (unsigned long)data->chip_data;
+        cpu = irq_choose_cpu(data->affinity);
+        spin_lock_irqsave(&leon_irq_lock, flags);
+        oldmask = LEON3_BYPASS_LOAD_PA(LEON_IMASK(cpu));
+        LEON3_BYPASS_STORE_PA(LEON_IMASK(cpu), (oldmask | mask));
+        spin_unlock_irqrestore(&leon_irq_lock, flags);
+}
+
+static void leon_mask_irq(struct irq_data *data)
+{
+        unsigned long mask, oldmask, flags;
+        int cpu;
+
+        mask = (unsigned long)data->chip_data;
+        cpu = irq_choose_cpu(data->affinity);
+        spin_lock_irqsave(&leon_irq_lock, flags);
+        oldmask = LEON3_BYPASS_LOAD_PA(LEON_IMASK(cpu));
+        LEON3_BYPASS_STORE_PA(LEON_IMASK(cpu), (oldmask & ~mask));
+        spin_unlock_irqrestore(&leon_irq_lock, flags);
+}
+
+static unsigned int leon_startup_irq(struct irq_data *data)
+{
+        irq_link(data->irq);
+        leon_unmask_irq(data);
+        return 0;
+}
 
+static void leon_shutdown_irq(struct irq_data *data)
+{
+        leon_mask_irq(data);
+        irq_unlink(data->irq);
+}
+
+/* Used by external level sensitive IRQ handlers on the LEON: ACK IRQ ctrl */
+static void leon_eoi_irq(struct irq_data *data)
+{
+        unsigned long mask = (unsigned long)data->chip_data;
+
+        if (mask & LEON_DO_ACK_HW)
+                LEON3_BYPASS_STORE_PA(LEON_IACK, mask & ~LEON_DO_ACK_HW);
+}
+
+static struct irq_chip leon_irq = {
+        .name                   = "leon",
+        .irq_startup            = leon_startup_irq,
+        .irq_shutdown           = leon_shutdown_irq,
+        .irq_mask               = leon_mask_irq,
+        .irq_unmask             = leon_unmask_irq,
+        .irq_eoi                = leon_eoi_irq,
+        .irq_set_affinity       = leon_set_affinity,
+};
+
+/*
+ * Build a LEON IRQ for the edge triggered LEON IRQ controller:
+ *  Edge (normal) IRQ           - handle_simple_irq, ack=DONT-CARE, never ack
+ *  Level IRQ (PCI|Level-GPIO)  - handle_fasteoi_irq, ack=1, ack after ISR
+ *  Per-CPU Edge                - handle_percpu_irq, ack=0
+ */
+unsigned int leon_build_device_irq(unsigned int real_irq,
+                                    irq_flow_handler_t flow_handler,
+                                    const char *name, int do_ack)
+{
+        unsigned int irq;
+        unsigned long mask;
+
+        irq = 0;
+        mask = get_irqmask(real_irq);
+        if (mask == 0)
+                goto out;
+
+        irq = irq_alloc(real_irq, real_irq);
+        if (irq == 0)
+                goto out;
+
+        if (do_ack)
+                mask |= LEON_DO_ACK_HW;
+
+        irq_set_chip_and_handler_name(irq, &leon_irq,
+                                      flow_handler, name);
+        irq_set_chip_data(irq, (void *)mask);
+
+out:
+        return irq;
+}
+
+static unsigned int _leon_build_device_irq(struct platform_device *op,
+                                           unsigned int real_irq)
+{
+        return leon_build_device_irq(real_irq, handle_simple_irq, "edge", 0);
 }
 
 void __init leon_init_timers(irq_handler_t counter_fn)
 {
-        int irq;
+        int irq, eirq;
         struct device_node *rootnp, *np, *nnp;
         struct property *pp;
         int len;
-        int cpu, icsel;
+        int icsel;
         int ampopts;
+        int err;
 
         leondebug_irq_disable = 0;
         leon_debug_irqout = 0;
@@ -173,98 +306,85 @@ void __init leon_init_timers(irq_handler_t counter_fn)
                         leon3_gptimer_irq = *(unsigned int *)pp->value;
         } while (0);
 
-        if (leon3_gptimer_regs && leon3_irqctrl_regs && leon3_gptimer_irq) {
-                LEON3_BYPASS_STORE_PA(
-                        &leon3_gptimer_regs->e[leon3_gptimer_idx].val, 0);
-                LEON3_BYPASS_STORE_PA(
-                        &leon3_gptimer_regs->e[leon3_gptimer_idx].rld,
-                        (((1000000 / HZ) - 1)));
-                LEON3_BYPASS_STORE_PA(
+        if (!(leon3_gptimer_regs && leon3_irqctrl_regs && leon3_gptimer_irq))
+                goto bad;
+
+        LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].val, 0);
+        LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].rld,
+                                (((1000000 / HZ) - 1)));
+        LEON3_BYPASS_STORE_PA(
                         &leon3_gptimer_regs->e[leon3_gptimer_idx].ctrl, 0);
 
 #ifdef CONFIG_SMP
-                leon_percpu_timer_dev[0].start = (int)leon3_gptimer_regs;
-                leon_percpu_timer_dev[0].irq = leon3_gptimer_irq + 1 +
-                                               leon3_gptimer_idx;
-
-                if (!(LEON3_BYPASS_LOAD_PA(&leon3_gptimer_regs->config) &
-                      (1<<LEON3_GPTIMER_SEPIRQ))) {
-                        prom_printf("irq timer not configured with separate irqs\n");
-                        BUG();
-                }
+        leon3_ticker_irq = leon3_gptimer_irq + 1 + leon3_gptimer_idx;
 
-                LEON3_BYPASS_STORE_PA(
-                        &leon3_gptimer_regs->e[leon3_gptimer_idx+1].val, 0);
-                LEON3_BYPASS_STORE_PA(
-                        &leon3_gptimer_regs->e[leon3_gptimer_idx+1].rld,
-                        (((1000000/HZ) - 1)));
-                LEON3_BYPASS_STORE_PA(
-                        &leon3_gptimer_regs->e[leon3_gptimer_idx+1].ctrl, 0);
-# endif
-
-                /*
-                 * The IRQ controller may (if implemented) consist of multiple
-                 * IRQ controllers, each mapped on a 4Kb boundary.
-                 * Each CPU may be routed to different IRQCTRLs, however
-                 * we assume that all CPUs (in SMP system) is routed to the
-                 * same IRQ Controller, and for non-SMP only one IRQCTRL is
-                 * accessed anyway.
-                 * In AMP systems, Linux must run on CPU0 for the time being.
-                 */
-                cpu = sparc_leon3_cpuid();
-                icsel = LEON3_BYPASS_LOAD_PA(&leon3_irqctrl_regs->icsel[cpu/8]);
-                icsel = (icsel >> ((7 - (cpu&0x7)) * 4)) & 0xf;
-                leon3_irqctrl_regs += icsel;
-        } else {
-                goto bad;
+        if (!(LEON3_BYPASS_LOAD_PA(&leon3_gptimer_regs->config) &
+              (1<<LEON3_GPTIMER_SEPIRQ))) {
+                printk(KERN_ERR "timer not configured with separate irqs\n");
+                BUG();
         }
 
-        irq = request_irq(leon3_gptimer_irq+leon3_gptimer_idx,
-                          counter_fn,
-                          (IRQF_DISABLED | SA_STATIC_ALLOC), "timer", NULL);
+        LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].val,
+                                0);
+        LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].rld,
+                                (((1000000/HZ) - 1)));
+        LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].ctrl,
+                                0);
+#endif
 
-        if (irq) {
-                printk(KERN_ERR "leon_time_init: unable to attach IRQ%d\n",
-                       LEON_INTERRUPT_TIMER1);
+        /*
+         * The IRQ controller may (if implemented) consist of multiple
+         * IRQ controllers, each mapped on a 4Kb boundary.
+         * Each CPU may be routed to different IRQCTRLs, however
+         * we assume that all CPUs (in SMP system) is routed to the
+         * same IRQ Controller, and for non-SMP only one IRQCTRL is
+         * accessed anyway.
+         * In AMP systems, Linux must run on CPU0 for the time being.
+         */
+        icsel = LEON3_BYPASS_LOAD_PA(&leon3_irqctrl_regs->icsel[boot_cpu_id/8]);
+        icsel = (icsel >> ((7 - (boot_cpu_id&0x7)) * 4)) & 0xf;
+        leon3_irqctrl_regs += icsel;
+
+        /* Mask all IRQs on boot-cpu IRQ controller */
+        LEON3_BYPASS_STORE_PA(&leon3_irqctrl_regs->mask[boot_cpu_id], 0);
+
+        /* Probe extended IRQ controller */
+        eirq = (LEON3_BYPASS_LOAD_PA(&leon3_irqctrl_regs->mpstatus)
+                >> 16) & 0xf;
+        if (eirq != 0)
+                leon_eirq_setup(eirq);
+
+        irq = _leon_build_device_irq(NULL, leon3_gptimer_irq+leon3_gptimer_idx);
+        err = request_irq(irq, counter_fn, IRQF_TIMER, "timer", NULL);
+        if (err) {
+                printk(KERN_ERR "unable to attach timer IRQ%d\n", irq);
                 prom_halt();
         }
 
-# ifdef CONFIG_SMP
-        {
-                unsigned long flags;
-                struct tt_entry *trap_table = &sparc_ttable[SP_TRAP_IRQ1 + (leon_percpu_timer_dev[0].irq - 1)];
-
-                /* For SMP we use the level 14 ticker, however the bootup code
-                 * has copied the firmwares level 14 vector into boot cpu's
-                 * trap table, we must fix this now or we get squashed.
-                 */
-                local_irq_save(flags);
-
-                patchme_maybe_smp_msg[0] = 0x01000000; /* NOP out the branch */
-
-                /* Adjust so that we jump directly to smpleon_ticker */
-                trap_table->inst_three += smpleon_ticker - real_irq_entry;
+        LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].ctrl,
+                              LEON3_GPTIMER_EN |
+                              LEON3_GPTIMER_RL |
+                              LEON3_GPTIMER_LD |
+                              LEON3_GPTIMER_IRQEN);
 
-                local_flush_cache_all();
-                local_irq_restore(flags);
+#ifdef CONFIG_SMP
+        /* Install per-cpu IRQ handler for broadcasted ticker */
+        irq = leon_build_device_irq(leon3_ticker_irq, handle_percpu_irq,
+                                    "per-cpu", 0);
+        err = request_irq(irq, leon_percpu_timer_interrupt,
+                          IRQF_PERCPU | IRQF_TIMER, "ticker",
+                          NULL);
+        if (err) {
+                printk(KERN_ERR "unable to attach ticker IRQ%d\n", irq);
+                prom_halt();
         }
-# endif
-
-        if (leon3_gptimer_regs) {
-                LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx].ctrl,
-                                      LEON3_GPTIMER_EN |
-                                      LEON3_GPTIMER_RL |
-                                      LEON3_GPTIMER_LD | LEON3_GPTIMER_IRQEN);
 
-#ifdef CONFIG_SMP
-                LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].ctrl,
-                                      LEON3_GPTIMER_EN |
-                                      LEON3_GPTIMER_RL |
-                                      LEON3_GPTIMER_LD |
-                                      LEON3_GPTIMER_IRQEN);
+        LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[leon3_gptimer_idx+1].ctrl,
+                              LEON3_GPTIMER_EN |
+                              LEON3_GPTIMER_RL |
+                              LEON3_GPTIMER_LD |
+                              LEON3_GPTIMER_IRQEN);
 #endif
-
-        }
         return;
 bad:
         printk(KERN_ERR "No Timer/irqctrl found\n");
@@ -281,9 +401,6 @@ void leon_load_profile_irq(int cpu, unsigned int limit)
         BUG();
 }
 
-
-
-
 void __init leon_trans_init(struct device_node *dp)
 {
         if (strcmp(dp->type, "cpu") == 0 && strcmp(dp->name, "<NULL>") == 0) {
@@ -337,22 +454,18 @@ void leon_enable_irq_cpu(unsigned int irq_nr, unsigned int cpu)
 {
         unsigned long mask, flags, *addr;
         mask = get_irqmask(irq_nr);
-        local_irq_save(flags);
-        addr = (unsigned long *)&(leon3_irqctrl_regs->mask[cpu]);
-        LEON3_BYPASS_STORE_PA(addr, (LEON3_BYPASS_LOAD_PA(addr) | (mask)));
-        local_irq_restore(flags);
+        spin_lock_irqsave(&leon_irq_lock, flags);
+        addr = (unsigned long *)LEON_IMASK(cpu);
+        LEON3_BYPASS_STORE_PA(addr, (LEON3_BYPASS_LOAD_PA(addr) | mask));
+        spin_unlock_irqrestore(&leon_irq_lock, flags);
 }
 
 #endif
 
 void __init leon_init_IRQ(void)
 {
-        sparc_irq_config.init_timers = leon_init_timers;
-
-        BTFIXUPSET_CALL(enable_irq, leon_enable_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(disable_irq, leon_disable_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(enable_pil_irq, leon_enable_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(disable_pil_irq, leon_disable_irq, BTFIXUPCALL_NORM);
+        sparc_irq_config.init_timers      = leon_init_timers;
+        sparc_irq_config.build_device_irq = _leon_build_device_irq;
 
         BTFIXUPSET_CALL(clear_clock_irq, leon_clear_clock_irq,
                         BTFIXUPCALL_NORM);
diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c
index 8f5de4aa3c0a..fe8fb44c609c 100644
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@ -14,6 +14,7 @@
 #include <linux/smp.h>
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
+#include <linux/of.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/mm.h>
@@ -29,6 +30,7 @@
 #include <asm/ptrace.h>
 #include <asm/atomic.h>
 #include <asm/irq_regs.h>
+#include <asm/traps.h>
 
 #include <asm/delay.h>
 #include <asm/irq.h>
@@ -50,9 +52,12 @@
 extern ctxd_t *srmmu_ctx_table_phys;
 static int smp_processors_ready;
 extern volatile unsigned long cpu_callin_map[NR_CPUS];
-extern unsigned char boot_cpu_id;
 extern cpumask_t smp_commenced_mask;
 void __init leon_configure_cache_smp(void);
+static void leon_ipi_init(void);
+
+/* IRQ number of LEON IPIs */
+int leon_ipi_irq = LEON3_IRQ_IPI_DEFAULT;
 
 static inline unsigned long do_swap(volatile unsigned long *ptr,
                                     unsigned long val)
@@ -94,8 +99,6 @@ void __cpuinit leon_callin(void)
         local_flush_cache_all();
         local_flush_tlb_all();
 
-        cpu_probe();
-
         /* Fix idle thread fields. */
         __asm__ __volatile__("ld [%0], %%g6\n\t" : : "r"(&current_set[cpuid])
                              : "memory" /* paranoid */);
@@ -104,11 +107,11 @@ void __cpuinit leon_callin(void)
         atomic_inc(&init_mm.mm_count);
         current->active_mm = &init_mm;
 
-        while (!cpu_isset(cpuid, smp_commenced_mask))
+        while (!cpumask_test_cpu(cpuid, &smp_commenced_mask))
                 mb();
 
         local_irq_enable();
-        cpu_set(cpuid, cpu_online_map);
+        set_cpu_online(cpuid, true);
 }
 
 /*
@@ -179,13 +182,16 @@ void __init leon_boot_cpus(void)
         int nrcpu = leon_smp_nrcpus();
         int me = smp_processor_id();
 
+        /* Setup IPI */
+        leon_ipi_init();
+
         printk(KERN_INFO "%d:(%d:%d) cpus mpirq at 0x%x\n", (unsigned int)me,
                (unsigned int)nrcpu, (unsigned int)NR_CPUS,
                (unsigned int)&(leon3_irqctrl_regs->mpstatus));
 
         leon_enable_irq_cpu(LEON3_IRQ_CROSS_CALL, me);
         leon_enable_irq_cpu(LEON3_IRQ_TICKER, me);
-        leon_enable_irq_cpu(LEON3_IRQ_RESCHEDULE, me);
+        leon_enable_irq_cpu(leon_ipi_irq, me);
 
         leon_smp_setbroadcast(1 << LEON3_IRQ_TICKER);
 
@@ -220,6 +226,10 @@ int __cpuinit leon_boot_one_cpu(int i)
                (unsigned int)&leon3_irqctrl_regs->mpstatus);
         local_flush_cache_all();
 
+        /* Make sure all IRQs are of from the start for this new CPU */
+        LEON_BYPASS_STORE_PA(&leon3_irqctrl_regs->mask[i], 0);
+
+        /* Wake one CPU */
         LEON_BYPASS_STORE_PA(&(leon3_irqctrl_regs->mpstatus), 1 << i);
 
         /* wheee... it's going... */
@@ -236,7 +246,7 @@ int __cpuinit leon_boot_one_cpu(int i)
         } else {
                 leon_enable_irq_cpu(LEON3_IRQ_CROSS_CALL, i);
                 leon_enable_irq_cpu(LEON3_IRQ_TICKER, i);
-                leon_enable_irq_cpu(LEON3_IRQ_RESCHEDULE, i);
+                leon_enable_irq_cpu(leon_ipi_irq, i);
         }
 
         local_flush_cache_all();
@@ -262,21 +272,21 @@ void __init leon_smp_done(void)
         local_flush_cache_all();
 
         /* Free unneeded trap tables */
-        if (!cpu_isset(1, cpu_present_map)) {
+        if (!cpu_present(1)) {
                 ClearPageReserved(virt_to_page(&trapbase_cpu1));
                 init_page_count(virt_to_page(&trapbase_cpu1));
                 free_page((unsigned long)&trapbase_cpu1);
                 totalram_pages++;
                 num_physpages++;
         }
-        if (!cpu_isset(2, cpu_present_map)) {
+        if (!cpu_present(2)) {
                 ClearPageReserved(virt_to_page(&trapbase_cpu2));
                 init_page_count(virt_to_page(&trapbase_cpu2));
                 free_page((unsigned long)&trapbase_cpu2);
                 totalram_pages++;
                 num_physpages++;
         }
-        if (!cpu_isset(3, cpu_present_map)) {
+        if (!cpu_present(3)) {
                 ClearPageReserved(virt_to_page(&trapbase_cpu3));
                 init_page_count(virt_to_page(&trapbase_cpu3));
                 free_page((unsigned long)&trapbase_cpu3);
@@ -292,6 +302,99 @@ void leon_irq_rotate(int cpu)
 {
 }
 
+struct leon_ipi_work {
+        int single;
+        int msk;
+        int resched;
+};
+
+static DEFINE_PER_CPU_SHARED_ALIGNED(struct leon_ipi_work, leon_ipi_work);
+
+/* Initialize IPIs on the LEON, in order to save IRQ resources only one IRQ
+ * is used for all three types of IPIs.
+ */
+static void __init leon_ipi_init(void)
+{
+        int cpu, len;
+        struct leon_ipi_work *work;
+        struct property *pp;
+        struct device_node *rootnp;
+        struct tt_entry *trap_table;
+        unsigned long flags;
+
+        /* Find IPI IRQ or stick with default value */
+        rootnp = of_find_node_by_path("/ambapp0");
+        if (rootnp) {
+                pp = of_find_property(rootnp, "ipi_num", &len);
+                if (pp && (*(int *)pp->value))
+                        leon_ipi_irq = *(int *)pp->value;
+        }
+        printk(KERN_INFO "leon: SMP IPIs at IRQ %d\n", leon_ipi_irq);
+
+        /* Adjust so that we jump directly to smpleon_ipi */
+        local_irq_save(flags);
+        trap_table = &sparc_ttable[SP_TRAP_IRQ1 + (leon_ipi_irq - 1)];
+        trap_table->inst_three += smpleon_ipi - real_irq_entry;
+        local_flush_cache_all();
+        local_irq_restore(flags);
+
+        for_each_possible_cpu(cpu) {
+                work = &per_cpu(leon_ipi_work, cpu);
+                work->single = work->msk = work->resched = 0;
+        }
+}
+
+static void leon_ipi_single(int cpu)
+{
+        struct leon_ipi_work *work = &per_cpu(leon_ipi_work, cpu);
+
+        /* Mark work */
+        work->single = 1;
+
+        /* Generate IRQ on the CPU */
+        set_cpu_int(cpu, leon_ipi_irq);
+}
+
+static void leon_ipi_mask_one(int cpu)
+{
+        struct leon_ipi_work *work = &per_cpu(leon_ipi_work, cpu);
+
+        /* Mark work */
+        work->msk = 1;
+
+        /* Generate IRQ on the CPU */
+        set_cpu_int(cpu, leon_ipi_irq);
+}
+
+static void leon_ipi_resched(int cpu)
+{
+        struct leon_ipi_work *work = &per_cpu(leon_ipi_work, cpu);
+
+        /* Mark work */
+        work->resched = 1;
+
+        /* Generate IRQ on the CPU (any IRQ will cause resched) */
+        set_cpu_int(cpu, leon_ipi_irq);
+}
+
+void leonsmp_ipi_interrupt(void)
+{
+        struct leon_ipi_work *work = &__get_cpu_var(leon_ipi_work);
+
+        if (work->single) {
+                work->single = 0;
+                smp_call_function_single_interrupt();
+        }
+        if (work->msk) {
+                work->msk = 0;
+                smp_call_function_interrupt();
+        }
+        if (work->resched) {
+                work->resched = 0;
+                smp_resched_interrupt();
+        }
+}
+
 static struct smp_funcall {
         smpfunc_t func;
         unsigned long arg1;
@@ -337,10 +440,10 @@ static void leon_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
                 {
                         register int i;
 
-                        cpu_clear(smp_processor_id(), mask);
-                        cpus_and(mask, cpu_online_map, mask);
+                        cpumask_clear_cpu(smp_processor_id(), &mask);
+                        cpumask_and(&mask, cpu_online_mask, &mask);
                         for (i = 0; i <= high; i++) {
-                                if (cpu_isset(i, mask)) {
+                                if (cpumask_test_cpu(i, &mask)) {
                                         ccall_info.processors_in[i] = 0;
                                         ccall_info.processors_out[i] = 0;
                                         set_cpu_int(i, LEON3_IRQ_CROSS_CALL);
@@ -354,7 +457,7 @@ static void leon_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
 
                         i = 0;
                         do {
-                                if (!cpu_isset(i, mask))
+                                if (!cpumask_test_cpu(i, &mask))
                                         continue;
 
                                 while (!ccall_info.processors_in[i])
@@ -363,7 +466,7 @@ static void leon_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
 
                         i = 0;
                         do {
-                                if (!cpu_isset(i, mask))
+                                if (!cpumask_test_cpu(i, &mask))
                                         continue;
 
                                 while (!ccall_info.processors_out[i])
@@ -386,27 +489,23 @@ void leon_cross_call_irq(void)
         ccall_info.processors_out[i] = 1;
 }
 
-void leon_percpu_timer_interrupt(struct pt_regs *regs)
+irqreturn_t leon_percpu_timer_interrupt(int irq, void *unused)
 {
-        struct pt_regs *old_regs;
         int cpu = smp_processor_id();
 
-        old_regs = set_irq_regs(regs);
-
         leon_clear_profile_irq(cpu);
 
         profile_tick(CPU_PROFILING);
 
         if (!--prof_counter(cpu)) {
-                int user = user_mode(regs);
+                int user = user_mode(get_irq_regs());
 
-                irq_enter();
                 update_process_times(user);
-                irq_exit();
 
                 prof_counter(cpu) = prof_multiplier(cpu);
         }
-        set_irq_regs(old_regs);
+
+        return IRQ_HANDLED;
 }
 
 static void __init smp_setup_percpu_timer(void)
@@ -449,6 +548,9 @@ void __init leon_init_smp(void)
         BTFIXUPSET_CALL(smp_cross_call, leon_cross_call, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(__hard_smp_processor_id, __leon_processor_id,
                         BTFIXUPCALL_NORM);
+        BTFIXUPSET_CALL(smp_ipi_resched, leon_ipi_resched, BTFIXUPCALL_NORM);
+        BTFIXUPSET_CALL(smp_ipi_single, leon_ipi_single, BTFIXUPCALL_NORM);
+        BTFIXUPSET_CALL(smp_ipi_mask_one, leon_ipi_mask_one, BTFIXUPCALL_NORM);
 }
 
 #endif /* CONFIG_SPARC_LEON */
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 56db06432ce9..42f28c7420e1 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -768,7 +768,7 @@ static void * __cpuinit mdesc_iterate_over_cpus(void *(*func)(struct mdesc_handl
                                cpuid, NR_CPUS);
                         continue;
                 }
-                if (!cpu_isset(cpuid, *mask))
+                if (!cpumask_test_cpu(cpuid, mask))
                         continue;
 #endif
 
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 5c149689bb20..3bb2eace58cf 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -622,8 +622,9 @@ static unsigned int __init build_one_device_irq(struct platform_device *op,
 out:
         nid = of_node_to_nid(dp);
         if (nid != -1) {
-                cpumask_t numa_mask = *cpumask_of_node(nid);
+                cpumask_t numa_mask;
 
+                cpumask_copy(&numa_mask, cpumask_of_node(nid));
                 irq_set_affinity(irq, &numa_mask);
         }
 
diff --git a/arch/sparc/kernel/pci_msi.c b/arch/sparc/kernel/pci_msi.c
index 30982e9ab626..580651af73f2 100644
--- a/arch/sparc/kernel/pci_msi.c
+++ b/arch/sparc/kernel/pci_msi.c
@@ -284,8 +284,9 @@ static int bringup_one_msi_queue(struct pci_pbm_info *pbm,
 
         nid = pbm->numa_node;
         if (nid != -1) {
-                cpumask_t numa_mask = *cpumask_of_node(nid);
+                cpumask_t numa_mask;
 
+                cpumask_copy(&numa_mask, cpumask_of_node(nid));
                 irq_set_affinity(irq, &numa_mask);
         }
         err = request_irq(irq, sparc64_msiq_interrupt, 0,
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 2cdc131b50ac..948601a066ff 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -164,6 +164,9 @@ void __iomem *pcic_regs;
 volatile int pcic_speculative;
 volatile int pcic_trapped;
 
+/* forward */
+unsigned int pcic_build_device_irq(struct platform_device *op,
+                                   unsigned int real_irq);
 
 #define CONFIG_CMD(bus, device_fn, where) (0x80000000 | (((unsigned int)bus) << 16) | (((unsigned int)device_fn) << 8) | (where & ~3))
 
@@ -523,6 +526,7 @@ static void
 pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node)
 {
         struct pcic_ca2irq *p;
+        unsigned int real_irq;
         int i, ivec;
         char namebuf[64];
 
@@ -551,26 +555,25 @@ pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node)
         i = p->pin;
         if (i >= 0 && i < 4) {
                 ivec = readw(pcic->pcic_regs+PCI_INT_SELECT_LO);
-                dev->irq = ivec >> (i << 2) & 0xF;
+                real_irq = ivec >> (i << 2) & 0xF;
         } else if (i >= 4 && i < 8) {
                 ivec = readw(pcic->pcic_regs+PCI_INT_SELECT_HI);
-                dev->irq = ivec >> ((i-4) << 2) & 0xF;
+                real_irq = ivec >> ((i-4) << 2) & 0xF;
         } else {                                        /* Corrupted map */
                 printk("PCIC: BAD PIN %d\n", i); for (;;) {}
         }
 /* P3 */ /* printk("PCIC: device %s pin %d ivec 0x%x irq %x\n", namebuf, i, ivec, dev->irq); */
 
-        /*
-         * dev->irq=0 means PROM did not bother to program the upper
+        /* real_irq means PROM did not bother to program the upper
          * half of PCIC. This happens on JS-E with PROM 3.11, for instance.
          */
-        if (dev->irq == 0 || p->force) {
+        if (real_irq == 0 || p->force) {
                 if (p->irq == 0 || p->irq >= 15) {      /* Corrupted map */
                         printk("PCIC: BAD IRQ %d\n", p->irq); for (;;) {}
                 }
                 printk("PCIC: setting irq %d at pin %d for device %02x:%02x\n",
                     p->irq, p->pin, dev->bus->number, dev->devfn);
-                dev->irq = p->irq;
+                real_irq = p->irq;
 
                 i = p->pin;
                 if (i >= 4) {
@@ -584,7 +587,8 @@ pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node)
                         ivec |= p->irq << (i << 2);
                         writew(ivec, pcic->pcic_regs+PCI_INT_SELECT_LO);
                 }
-        }
+        }
+        dev->irq = pcic_build_device_irq(NULL, real_irq);
 }
 
 /*
@@ -729,6 +733,7 @@ void __init pci_time_init(void)
         struct linux_pcic *pcic = &pcic0;
         unsigned long v;
         int timer_irq, irq;
+        int err;
 
         do_arch_gettimeoffset = pci_gettimeoffset;
 
@@ -740,9 +745,10 @@ void __init pci_time_init(void)
         timer_irq = PCI_COUNTER_IRQ_SYS(v);
         writel (PCI_COUNTER_IRQ_SET(timer_irq, 0),
                 pcic->pcic_regs+PCI_COUNTER_IRQ);
-        irq = request_irq(timer_irq, pcic_timer_handler,
-                          (IRQF_DISABLED | SA_STATIC_ALLOC), "timer", NULL);
-        if (irq) {
+        irq = pcic_build_device_irq(NULL, timer_irq);
+        err = request_irq(irq, pcic_timer_handler,
+                          IRQF_TIMER, "timer", NULL);
+        if (err) {
                 prom_printf("time_init: unable to attach IRQ%d\n", timer_irq);
                 prom_halt();
         }
@@ -803,50 +809,73 @@ static inline unsigned long get_irqmask(int irq_nr)
         return 1 << irq_nr;
 }
 
-static void pcic_disable_irq(unsigned int irq_nr)
+static void pcic_mask_irq(struct irq_data *data)
 {
         unsigned long mask, flags;
 
-        mask = get_irqmask(irq_nr);
+        mask = (unsigned long)data->chip_data;
         local_irq_save(flags);
         writel(mask, pcic0.pcic_regs+PCI_SYS_INT_TARGET_MASK_SET);
         local_irq_restore(flags);
 }
 
-static void pcic_enable_irq(unsigned int irq_nr)
+static void pcic_unmask_irq(struct irq_data *data)
 {
         unsigned long mask, flags;
 
-        mask = get_irqmask(irq_nr);
+        mask = (unsigned long)data->chip_data;
         local_irq_save(flags);
         writel(mask, pcic0.pcic_regs+PCI_SYS_INT_TARGET_MASK_CLEAR);
         local_irq_restore(flags);
 }
 
-static void pcic_load_profile_irq(int cpu, unsigned int limit)
+static unsigned int pcic_startup_irq(struct irq_data *data)
 {
-        printk("PCIC: unimplemented code: FILE=%s LINE=%d", __FILE__, __LINE__);
+        irq_link(data->irq);
+        pcic_unmask_irq(data);
+        return 0;
 }
 
-/* We assume the caller has disabled local interrupts when these are called,
- * or else very bizarre behavior will result.
- */
-static void pcic_disable_pil_irq(unsigned int pil)
+static struct irq_chip pcic_irq = {
+        .name           = "pcic",
+        .irq_startup    = pcic_startup_irq,
+        .irq_mask       = pcic_mask_irq,
+        .irq_unmask     = pcic_unmask_irq,
+};
+
+unsigned int pcic_build_device_irq(struct platform_device *op,
+                                   unsigned int real_irq)
 {
-        writel(get_irqmask(pil), pcic0.pcic_regs+PCI_SYS_INT_TARGET_MASK_SET);
+        unsigned int irq;
+        unsigned long mask;
+
+        irq = 0;
+        mask = get_irqmask(real_irq);
+        if (mask == 0)
+                goto out;
+
+        irq = irq_alloc(real_irq, real_irq);
+        if (irq == 0)
+                goto out;
+
+        irq_set_chip_and_handler_name(irq, &pcic_irq,
+                                      handle_level_irq, "PCIC");
+        irq_set_chip_data(irq, (void *)mask);
+
+out:
+        return irq;
 }
 
-static void pcic_enable_pil_irq(unsigned int pil)
+
+static void pcic_load_profile_irq(int cpu, unsigned int limit)
 {
-        writel(get_irqmask(pil), pcic0.pcic_regs+PCI_SYS_INT_TARGET_MASK_CLEAR);
+        printk("PCIC: unimplemented code: FILE=%s LINE=%d", __FILE__, __LINE__);
 }
 
 void __init sun4m_pci_init_IRQ(void)
 {
-        BTFIXUPSET_CALL(enable_irq, pcic_enable_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(disable_irq, pcic_disable_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(enable_pil_irq, pcic_enable_pil_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(disable_pil_irq, pcic_disable_pil_irq, BTFIXUPCALL_NORM);
+        sparc_irq_config.build_device_irq = pcic_build_device_irq;
+
         BTFIXUPSET_CALL(clear_clock_irq, pcic_clear_clock_irq, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(load_profile_irq, pcic_load_profile_irq, BTFIXUPCALL_NORM);
 }
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
index ee8426ede7c7..2cb0e1c001e2 100644
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@ -26,6 +26,7 @@
 #include <asm/nmi.h>
 #include <asm/pcr.h>
 
+#include "kernel.h"
 #include "kstack.h"
 
 /* Sparc64 chips have two performance counters, 32-bits each, with
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index 17529298c50a..c8cc461ff75f 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -128,8 +128,16 @@ void cpu_idle(void)
         set_thread_flag(TIF_POLLING_NRFLAG);
         /* endless idle loop with no priority at all */
         while(1) {
-                while (!need_resched())
-                        cpu_relax();
+#ifdef CONFIG_SPARC_LEON
+                if (pm_idle) {
+                        while (!need_resched())
+                                (*pm_idle)();
+                } else
+#endif
+                {
+                        while (!need_resched())
+                                cpu_relax();
+                }
                 preempt_enable_no_resched();
                 schedule();
                 preempt_disable();
diff --git a/arch/sparc/kernel/prom_32.c b/arch/sparc/kernel/prom_32.c
index 05fb25330583..5ce3d15a99b0 100644
--- a/arch/sparc/kernel/prom_32.c
+++ b/arch/sparc/kernel/prom_32.c
@@ -326,7 +326,6 @@ void __init of_console_init(void)
                         of_console_options = NULL;
         }
 
-        prom_printf(msg, of_console_path);
         printk(msg, of_console_path);
 }
 
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c
index 7b8b76c9557f..3249d3f3234d 100644
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -82,7 +82,7 @@ static void prom_sync_me(void)
                              "nop\n\t" : : "r" (&trapbase));
 
         prom_printf("PROM SYNC COMMAND...\n");
-        show_free_areas();
+        show_free_areas(0);
         if(current->pid != 0) {
                 local_irq_enable();
                 sys_sync();
@@ -103,16 +103,20 @@ static unsigned int boot_flags __initdata = 0;
 /* Exported for mm/init.c:paging_init. */
 unsigned long cmdline_memory_size __initdata = 0;
 
+/* which CPU booted us (0xff = not set) */
+unsigned char boot_cpu_id = 0xff; /* 0xff will make it into DATA section... */
+unsigned char boot_cpu_id4; /* boot_cpu_id << 2 */
+
 static void
 prom_console_write(struct console *con, const char *s, unsigned n)
 {
         prom_write(s, n);
 }
 
-static struct console prom_debug_console = {
-        .name =         "debug",
+static struct console prom_early_console = {
+        .name =         "earlyprom",
         .write =        prom_console_write,
-        .flags =        CON_PRINTBUFFER,
+        .flags =        CON_PRINTBUFFER | CON_BOOT,
         .index =        -1,
 };
 
@@ -133,8 +137,7 @@ static void __init process_switch(char c)
                 prom_halt();
                 break;
         case 'p':
-                /* Use PROM debug console. */
-                register_console(&prom_debug_console);
+                /* Just ignore, this behavior is now the default.  */
                 break;
         default:
                 printk("Unknown boot switch (-%c)\n", c);
@@ -215,6 +218,10 @@ void __init setup_arch(char **cmdline_p)
         strcpy(boot_command_line, *cmdline_p);
         parse_early_param();
 
+        boot_flags_init(*cmdline_p);
+
+        register_console(&prom_early_console);
+
         /* Set sparc_cpu_model */
         sparc_cpu_model = sun_unknown;
         if (!strcmp(&cputypval[0], "sun4 "))
@@ -265,7 +272,6 @@ void __init setup_arch(char **cmdline_p)
 #ifdef CONFIG_DUMMY_CONSOLE
         conswitchp = &dummy_con;
 #endif
-        boot_flags_init(*cmdline_p);
 
         idprom_init();
         if (ARCH_SUN4C)
@@ -311,75 +317,6 @@ void __init setup_arch(char **cmdline_p)
         smp_setup_cpu_possible_map();
 }
 
-static int ncpus_probed;
-
-static int show_cpuinfo(struct seq_file *m, void *__unused)
-{
-        seq_printf(m,
-                   "cpu\t\t: %s\n"
-                   "fpu\t\t: %s\n"
-                   "promlib\t\t: Version %d Revision %d\n"
-                   "prom\t\t: %d.%d\n"
-                   "type\t\t: %s\n"
-                   "ncpus probed\t: %d\n"
-                   "ncpus active\t: %d\n"
-#ifndef CONFIG_SMP
-                   "CPU0Bogo\t: %lu.%02lu\n"
-                   "CPU0ClkTck\t: %ld\n"
-#endif
-                   ,
-                   sparc_cpu_type,
-                   sparc_fpu_type ,
-                   romvec->pv_romvers,
-                   prom_rev,
-                   romvec->pv_printrev >> 16,
-                   romvec->pv_printrev & 0xffff,
-                   &cputypval[0],
-                   ncpus_probed,
-                   num_online_cpus()
-#ifndef CONFIG_SMP
-                   , cpu_data(0).udelay_val/(500000/HZ),
-                   (cpu_data(0).udelay_val/(5000/HZ)) % 100,
-                   cpu_data(0).clock_tick
-#endif
-                );
-
-#ifdef CONFIG_SMP
-        smp_bogo(m);
-#endif
-        mmu_info(m);
-#ifdef CONFIG_SMP
-        smp_info(m);
-#endif
-        return 0;
-}
-
-static void *c_start(struct seq_file *m, loff_t *pos)
-{
-        /* The pointer we are returning is arbitrary,
-         * it just has to be non-NULL and not IS_ERR
-         * in the success case.
-         */
-        return *pos == 0 ? &c_start : NULL;
-}
-
-static void *c_next(struct seq_file *m, void *v, loff_t *pos)
-{
-        ++*pos;
-        return c_start(m, pos);
-}
-
-static void c_stop(struct seq_file *m, void *v)
-{
-}
-
-const struct seq_operations cpuinfo_op = {
-        .start =c_start,
-        .next = c_next,
-        .stop = c_stop,
-        .show = show_cpuinfo,
-};
-
 extern int stop_a_enabled;
 
 void sun_do_break(void)
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 29bafe051bb1..f3b6850cc8db 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -339,84 +339,6 @@ void __init setup_arch(char **cmdline_p)
         paging_init();
 }
 
-/* BUFFER is PAGE_SIZE bytes long. */
-
-extern void smp_info(struct seq_file *);
-extern void smp_bogo(struct seq_file *);
-extern void mmu_info(struct seq_file *);
-
-unsigned int dcache_parity_tl1_occurred;
-unsigned int icache_parity_tl1_occurred;
-
-int ncpus_probed;
-
-static int show_cpuinfo(struct seq_file *m, void *__unused)
-{
-        seq_printf(m, 
-                   "cpu\t\t: %s\n"
-                   "fpu\t\t: %s\n"
-                   "pmu\t\t: %s\n"
-                   "prom\t\t: %s\n"
-                   "type\t\t: %s\n"
-                   "ncpus probed\t: %d\n"
-                   "ncpus active\t: %d\n"
-                   "D$ parity tl1\t: %u\n"
-                   "I$ parity tl1\t: %u\n"
-#ifndef CONFIG_SMP
-                   "Cpu0ClkTck\t: %016lx\n"
-#endif
-                   ,
-                   sparc_cpu_type,
-                   sparc_fpu_type,
-                   sparc_pmu_type,
-                   prom_version,
-                   ((tlb_type == hypervisor) ?
-                    "sun4v" :
-                    "sun4u"),
-                   ncpus_probed,
-                   num_online_cpus(),
-                   dcache_parity_tl1_occurred,
-                   icache_parity_tl1_occurred
-#ifndef CONFIG_SMP
-                   , cpu_data(0).clock_tick
-#endif
-                );
-#ifdef CONFIG_SMP
-        smp_bogo(m);
-#endif
-        mmu_info(m);
-#ifdef CONFIG_SMP
-        smp_info(m);
-#endif
-        return 0;
-}
-
-static void *c_start(struct seq_file *m, loff_t *pos)
-{
-        /* The pointer we are returning is arbitrary,
-         * it just has to be non-NULL and not IS_ERR
-         * in the success case.
-         */
-        return *pos == 0 ? &c_start : NULL;
-}
-
-static void *c_next(struct seq_file *m, void *v, loff_t *pos)
-{
-        ++*pos;
-        return c_start(m, pos);
-}
-
-static void c_stop(struct seq_file *m, void *v)
-{
-}
-
-const struct seq_operations cpuinfo_op = {
-        .start =c_start,
-        .next = c_next,
-        .stop = c_stop,
-        .show = show_cpuinfo,
-};
-
 extern int stop_a_enabled;
 
 void sun_do_break(void)
diff --git a/arch/sparc/kernel/smp_32.c b/arch/sparc/kernel/smp_32.c
index 850a1360c0d6..d5b3958be0b4 100644
--- a/arch/sparc/kernel/smp_32.c
+++ b/arch/sparc/kernel/smp_32.c
@@ -37,8 +37,6 @@
 #include "irq.h"
 
 volatile unsigned long cpu_callin_map[NR_CPUS] __cpuinitdata = {0,};
-unsigned char boot_cpu_id = 0;
-unsigned char boot_cpu_id4 = 0; /* boot_cpu_id << 2 */
 
 cpumask_t smp_commenced_mask = CPU_MASK_NONE;
 
@@ -129,13 +127,58 @@ struct linux_prom_registers smp_penguin_ctable __cpuinitdata = { 0 };
 
 void smp_send_reschedule(int cpu)
 {
-        /* See sparc64 */
+        /*
+         * CPU model dependent way of implementing IPI generation targeting
+         * a single CPU. The trap handler needs only to do trap entry/return
+         * to call schedule.
+         */
+        BTFIXUP_CALL(smp_ipi_resched)(cpu);
 }
 
 void smp_send_stop(void)
 {
 }
 
+void arch_send_call_function_single_ipi(int cpu)
+{
+        /* trigger one IPI single call on one CPU */
+        BTFIXUP_CALL(smp_ipi_single)(cpu);
+}
+
+void arch_send_call_function_ipi_mask(const struct cpumask *mask)
+{
+        int cpu;
+
+        /* trigger IPI mask call on each CPU */
+        for_each_cpu(cpu, mask)
+                BTFIXUP_CALL(smp_ipi_mask_one)(cpu);
+}
+
+void smp_resched_interrupt(void)
+{
+        irq_enter();
+        scheduler_ipi();
+        local_cpu_data().irq_resched_count++;
+        irq_exit();
+        /* re-schedule routine called by interrupt return code. */
+}
+
+void smp_call_function_single_interrupt(void)
+{
+        irq_enter();
+        generic_smp_call_function_single_interrupt();
+        local_cpu_data().irq_call_count++;
+        irq_exit();
+}
+
+void smp_call_function_interrupt(void)
+{
+        irq_enter();
+        generic_smp_call_function_interrupt();
+        local_cpu_data().irq_call_count++;
+        irq_exit();
+}
+
 void smp_flush_cache_all(void)
 {
         xc0((smpfunc_t) BTFIXUP_CALL(local_flush_cache_all));
@@ -151,9 +194,10 @@ void smp_flush_tlb_all(void)
 void smp_flush_cache_mm(struct mm_struct *mm)
 {
         if(mm->context != NO_CONTEXT) {
-                cpumask_t cpu_mask = *mm_cpumask(mm);
-                cpu_clear(smp_processor_id(), cpu_mask);
-                if (!cpus_empty(cpu_mask))
+                cpumask_t cpu_mask;
+                cpumask_copy(&cpu_mask, mm_cpumask(mm));
+                cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
+                if (!cpumask_empty(&cpu_mask))
                         xc1((smpfunc_t) BTFIXUP_CALL(local_flush_cache_mm), (unsigned long) mm);
                 local_flush_cache_mm(mm);
         }
@@ -162,9 +206,10 @@ void smp_flush_cache_mm(struct mm_struct *mm)
 void smp_flush_tlb_mm(struct mm_struct *mm)
 {
         if(mm->context != NO_CONTEXT) {
-                cpumask_t cpu_mask = *mm_cpumask(mm);
-                cpu_clear(smp_processor_id(), cpu_mask);
-                if (!cpus_empty(cpu_mask)) {
+                cpumask_t cpu_mask;
+                cpumask_copy(&cpu_mask, mm_cpumask(mm));
+                cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
+                if (!cpumask_empty(&cpu_mask)) {
                         xc1((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_mm), (unsigned long) mm);
                         if(atomic_read(&mm->mm_users) == 1 && current->active_mm == mm)
                                 cpumask_copy(mm_cpumask(mm),
@@ -180,9 +225,10 @@ void smp_flush_cache_range(struct vm_area_struct *vma, unsigned long start,
         struct mm_struct *mm = vma->vm_mm;
 
         if (mm->context != NO_CONTEXT) {
-                cpumask_t cpu_mask = *mm_cpumask(mm);
-                cpu_clear(smp_processor_id(), cpu_mask);
-                if (!cpus_empty(cpu_mask))
+                cpumask_t cpu_mask;
+                cpumask_copy(&cpu_mask, mm_cpumask(mm));
+                cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
+                if (!cpumask_empty(&cpu_mask))
                         xc3((smpfunc_t) BTFIXUP_CALL(local_flush_cache_range), (unsigned long) vma, start, end);
                 local_flush_cache_range(vma, start, end);
         }
@@ -194,9 +240,10 @@ void smp_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
         struct mm_struct *mm = vma->vm_mm;
 
         if (mm->context != NO_CONTEXT) {
-                cpumask_t cpu_mask = *mm_cpumask(mm);
-                cpu_clear(smp_processor_id(), cpu_mask);
-                if (!cpus_empty(cpu_mask))
+                cpumask_t cpu_mask;
+                cpumask_copy(&cpu_mask, mm_cpumask(mm));
+                cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
+                if (!cpumask_empty(&cpu_mask))
                         xc3((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_range), (unsigned long) vma, start, end);
                 local_flush_tlb_range(vma, start, end);
         }
@@ -207,9 +254,10 @@ void smp_flush_cache_page(struct vm_area_struct *vma, unsigned long page)
         struct mm_struct *mm = vma->vm_mm;
 
         if(mm->context != NO_CONTEXT) {
-                cpumask_t cpu_mask = *mm_cpumask(mm);
-                cpu_clear(smp_processor_id(), cpu_mask);
-                if (!cpus_empty(cpu_mask))
+                cpumask_t cpu_mask;
+                cpumask_copy(&cpu_mask, mm_cpumask(mm));
+                cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
+                if (!cpumask_empty(&cpu_mask))
                         xc2((smpfunc_t) BTFIXUP_CALL(local_flush_cache_page), (unsigned long) vma, page);
                 local_flush_cache_page(vma, page);
         }
@@ -220,19 +268,15 @@ void smp_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
         struct mm_struct *mm = vma->vm_mm;
 
         if(mm->context != NO_CONTEXT) {
-                cpumask_t cpu_mask = *mm_cpumask(mm);
-                cpu_clear(smp_processor_id(), cpu_mask);
-                if (!cpus_empty(cpu_mask))
+                cpumask_t cpu_mask;
+                cpumask_copy(&cpu_mask, mm_cpumask(mm));
+                cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
+                if (!cpumask_empty(&cpu_mask))
                         xc2((smpfunc_t) BTFIXUP_CALL(local_flush_tlb_page), (unsigned long) vma, page);
                 local_flush_tlb_page(vma, page);
         }
 }
 
-void smp_reschedule_irq(void)
-{
-        set_need_resched();
-}
-
 void smp_flush_page_to_ram(unsigned long page)
 {
         /* Current theory is that those who call this are the one's
@@ -249,9 +293,10 @@ void smp_flush_page_to_ram(unsigned long page)
 
 void smp_flush_sig_insns(struct mm_struct *mm, unsigned long insn_addr)
 {
-        cpumask_t cpu_mask = *mm_cpumask(mm);
-        cpu_clear(smp_processor_id(), cpu_mask);
-        if (!cpus_empty(cpu_mask))
+        cpumask_t cpu_mask;
+        cpumask_copy(&cpu_mask, mm_cpumask(mm));
+        cpumask_clear_cpu(smp_processor_id(), &cpu_mask);
+        if (!cpumask_empty(&cpu_mask))
                 xc2((smpfunc_t) BTFIXUP_CALL(local_flush_sig_insns), (unsigned long) mm, insn_addr);
         local_flush_sig_insns(mm, insn_addr);
 }
@@ -405,7 +450,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
         };
 
         if (!ret) {
-                cpu_set(cpu, smp_commenced_mask);
+                cpumask_set_cpu(cpu, &smp_commenced_mask);
                 while (!cpu_online(cpu))
                         mb();
         }
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 3e94a8c23238..99cb17251bb5 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -121,11 +121,11 @@ void __cpuinit smp_callin(void)
         /* inform the notifiers about the new cpu */
         notify_cpu_starting(cpuid);
 
-        while (!cpu_isset(cpuid, smp_commenced_mask))
+        while (!cpumask_test_cpu(cpuid, &smp_commenced_mask))
                 rmb();
 
         ipi_call_lock_irq();
-        cpu_set(cpuid, cpu_online_map);
+        set_cpu_online(cpuid, true);
         ipi_call_unlock_irq();
 
         /* idle thread is expected to have preempt disabled */
@@ -785,7 +785,7 @@ static void xcall_deliver(u64 data0, u64 data1, u64 data2, const cpumask_t *mask
 
 /* Send cross call to all processors mentioned in MASK_P
  * except self.  Really, there are only two cases currently,
- * "&cpu_online_map" and "&mm->cpu_vm_mask".
+ * "cpu_online_mask" and "mm_cpumask(mm)".
  */
 static void smp_cross_call_masked(unsigned long *func, u32 ctx, u64 data1, u64 data2, const cpumask_t *mask)
 {
@@ -797,7 +797,7 @@ static void smp_cross_call_masked(unsigned long *func, u32 ctx, u64 data1, u64 d
 /* Send cross call to all processors except self. */
 static void smp_cross_call(unsigned long *func, u32 ctx, u64 data1, u64 data2)
 {
-        smp_cross_call_masked(func, ctx, data1, data2, &cpu_online_map);
+        smp_cross_call_masked(func, ctx, data1, data2, cpu_online_mask);
 }
 
 extern unsigned long xcall_sync_tick;
@@ -805,7 +805,7 @@ extern unsigned long xcall_sync_tick;
 static void smp_start_sync_tick_client(int cpu)
 {
         xcall_deliver((u64) &xcall_sync_tick, 0, 0,
-                      &cpumask_of_cpu(cpu));
+                      cpumask_of(cpu));
 }
 
 extern unsigned long xcall_call_function;
@@ -820,7 +820,7 @@ extern unsigned long xcall_call_function_single;
 void arch_send_call_function_single_ipi(int cpu)
 {
         xcall_deliver((u64) &xcall_call_function_single, 0, 0,
-                      &cpumask_of_cpu(cpu));
+                      cpumask_of(cpu));
 }
 
 void __irq_entry smp_call_function_client(int irq, struct pt_regs *regs)
@@ -918,7 +918,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
                 }
                 if (data0) {
                         xcall_deliver(data0, __pa(pg_addr),
-                                      (u64) pg_addr, &cpumask_of_cpu(cpu));
+                                      (u64) pg_addr, cpumask_of(cpu));
 #ifdef CONFIG_DEBUG_DCFLUSH
                         atomic_inc(&dcpage_flushes_xcall);
 #endif
@@ -954,7 +954,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
         }
         if (data0) {
                 xcall_deliver(data0, __pa(pg_addr),
-                              (u64) pg_addr, &cpu_online_map);
+                              (u64) pg_addr, cpu_online_mask);
 #ifdef CONFIG_DEBUG_DCFLUSH
                 atomic_inc(&dcpage_flushes_xcall);
 #endif
@@ -1197,32 +1197,32 @@ void __devinit smp_fill_in_sib_core_maps(void)
         for_each_present_cpu(i) {
                 unsigned int j;
 
-                cpus_clear(cpu_core_map[i]);
+                cpumask_clear(&cpu_core_map[i]);
                 if (cpu_data(i).core_id == 0) {
-                        cpu_set(i, cpu_core_map[i]);
+                        cpumask_set_cpu(i, &cpu_core_map[i]);
                         continue;
                 }
 
                 for_each_present_cpu(j) {
                         if (cpu_data(i).core_id ==
                             cpu_data(j).core_id)
-                                cpu_set(j, cpu_core_map[i]);
+                                cpumask_set_cpu(j, &cpu_core_map[i]);
                 }
         }
 
         for_each_present_cpu(i) {
                 unsigned int j;
 
-                cpus_clear(per_cpu(cpu_sibling_map, i));
+                cpumask_clear(&per_cpu(cpu_sibling_map, i));
                 if (cpu_data(i).proc_id == -1) {
-                        cpu_set(i, per_cpu(cpu_sibling_map, i));
+                        cpumask_set_cpu(i, &per_cpu(cpu_sibling_map, i));
                         continue;
                 }
 
                 for_each_present_cpu(j) {
                         if (cpu_data(i).proc_id ==
                             cpu_data(j).proc_id)
-                                cpu_set(j, per_cpu(cpu_sibling_map, i));
+                                cpumask_set_cpu(j, &per_cpu(cpu_sibling_map, i));
                 }
         }
 }
@@ -1232,10 +1232,10 @@ int __cpuinit __cpu_up(unsigned int cpu)
         int ret = smp_boot_one_cpu(cpu);
 
         if (!ret) {
-                cpu_set(cpu, smp_commenced_mask);
-                while (!cpu_isset(cpu, cpu_online_map))
+                cpumask_set_cpu(cpu, &smp_commenced_mask);
+                while (!cpu_online(cpu))
                         mb();
-                if (!cpu_isset(cpu, cpu_online_map)) {
+                if (!cpu_online(cpu)) {
                         ret = -ENODEV;
                 } else {
                         /* On SUN4V, writes to %tick and %stick are
@@ -1269,7 +1269,7 @@ void cpu_play_dead(void)
                                 tb->nonresum_mondo_pa, 0);
         }
 
-        cpu_clear(cpu, smp_commenced_mask);
+        cpumask_clear_cpu(cpu, &smp_commenced_mask);
         membar_safe("#Sync");
 
         local_irq_disable();
@@ -1290,13 +1290,13 @@ int __cpu_disable(void)
         cpuinfo_sparc *c;
         int i;
 
-        for_each_cpu_mask(i, cpu_core_map[cpu])
-                cpu_clear(cpu, cpu_core_map[i]);
-        cpus_clear(cpu_core_map[cpu]);
+        for_each_cpu(i, &cpu_core_map[cpu])
+                cpumask_clear_cpu(cpu, &cpu_core_map[i]);
+        cpumask_clear(&cpu_core_map[cpu]);
 
-        for_each_cpu_mask(i, per_cpu(cpu_sibling_map, cpu))
-                cpu_clear(cpu, per_cpu(cpu_sibling_map, i));
-        cpus_clear(per_cpu(cpu_sibling_map, cpu));
+        for_each_cpu(i, &per_cpu(cpu_sibling_map, cpu))
+                cpumask_clear_cpu(cpu, &per_cpu(cpu_sibling_map, i));
+        cpumask_clear(&per_cpu(cpu_sibling_map, cpu));
 
         c = &cpu_data(cpu);
 
@@ -1313,7 +1313,7 @@ int __cpu_disable(void)
         local_irq_disable();
 
         ipi_call_lock();
-        cpu_clear(cpu, cpu_online_map);
+        set_cpu_online(cpu, false);
         ipi_call_unlock();
 
         cpu_map_rebuild();
@@ -1327,11 +1327,11 @@ void __cpu_die(unsigned int cpu)
 
         for (i = 0; i < 100; i++) {
                 smp_rmb();
-                if (!cpu_isset(cpu, smp_commenced_mask))
+                if (!cpumask_test_cpu(cpu, &smp_commenced_mask))
                         break;
                 msleep(100);
         }
-        if (cpu_isset(cpu, smp_commenced_mask)) {
+        if (cpumask_test_cpu(cpu, &smp_commenced_mask)) {
                 printk(KERN_ERR "CPU %u didn't die...\n", cpu);
         } else {
 #if defined(CONFIG_SUN_LDOMS)
@@ -1341,7 +1341,7 @@ void __cpu_die(unsigned int cpu)
                 do {
                         hv_err = sun4v_cpu_stop(cpu);
                         if (hv_err == HV_EOK) {
-                                cpu_clear(cpu, cpu_present_map);
+                                set_cpu_present(cpu, false);
                                 break;
                         }
                 } while (--limit > 0);
@@ -1362,12 +1362,13 @@ void __init smp_cpus_done(unsigned int max_cpus)
 void smp_send_reschedule(int cpu)
 {
         xcall_deliver((u64) &xcall_receive_signal, 0, 0,
-                      &cpumask_of_cpu(cpu));
+                      cpumask_of(cpu));
 }
 
 void __irq_entry smp_receive_signal_client(int irq, struct pt_regs *regs)
 {
         clear_softint(1 << irq);
+        scheduler_ipi();
 }
 
 /* This is a nop because we capture all other cpus
diff --git a/arch/sparc/kernel/sun4c_irq.c b/arch/sparc/kernel/sun4c_irq.c
index 90eea38ad66f..f6bf25a2ff80 100644
--- a/arch/sparc/kernel/sun4c_irq.c
+++ b/arch/sparc/kernel/sun4c_irq.c
@@ -65,62 +65,94 @@
  */
 unsigned char __iomem *interrupt_enable;
 
-static void sun4c_disable_irq(unsigned int irq_nr)
+static void sun4c_mask_irq(struct irq_data *data)
 {
-        unsigned long flags;
-        unsigned char current_mask, new_mask;
-
-        local_irq_save(flags);
-        irq_nr &= (NR_IRQS - 1);
-        current_mask = sbus_readb(interrupt_enable);
-        switch (irq_nr) {
-        case 1:
-                new_mask = ((current_mask) & (~(SUN4C_INT_E1)));
-                break;
-        case 8:
-                new_mask = ((current_mask) & (~(SUN4C_INT_E8)));
-                break;
-        case 10:
-                new_mask = ((current_mask) & (~(SUN4C_INT_E10)));
-                break;
-        case 14:
-                new_mask = ((current_mask) & (~(SUN4C_INT_E14)));
-                break;
-        default:
+        unsigned long mask = (unsigned long)data->chip_data;
+
+        if (mask) {
+                unsigned long flags;
+
+                local_irq_save(flags);
+                mask = sbus_readb(interrupt_enable) & ~mask;
+                sbus_writeb(mask, interrupt_enable);
                 local_irq_restore(flags);
-                return;
         }
-        sbus_writeb(new_mask, interrupt_enable);
-        local_irq_restore(flags);
 }
 
-static void sun4c_enable_irq(unsigned int irq_nr)
+static void sun4c_unmask_irq(struct irq_data *data)
 {
-        unsigned long flags;
-        unsigned char current_mask, new_mask;
-
-        local_irq_save(flags);
-        irq_nr &= (NR_IRQS - 1);
-        current_mask = sbus_readb(interrupt_enable);
-        switch (irq_nr) {
-        case 1:
-                new_mask = ((current_mask) | SUN4C_INT_E1);
-                break;
-        case 8:
-                new_mask = ((current_mask) | SUN4C_INT_E8);
-                break;
-        case 10:
-                new_mask = ((current_mask) | SUN4C_INT_E10);
-                break;
-        case 14:
-                new_mask = ((current_mask) | SUN4C_INT_E14);
-                break;
-        default:
+        unsigned long mask = (unsigned long)data->chip_data;
+
+        if (mask) {
+                unsigned long flags;
+
+                local_irq_save(flags);
+                mask = sbus_readb(interrupt_enable) | mask;
+                sbus_writeb(mask, interrupt_enable);
                 local_irq_restore(flags);
-                return;
         }
-        sbus_writeb(new_mask, interrupt_enable);
-        local_irq_restore(flags);
+}
+
+static unsigned int sun4c_startup_irq(struct irq_data *data)
+{
+        irq_link(data->irq);
+        sun4c_unmask_irq(data);
+
+        return 0;
+}
+
+static void sun4c_shutdown_irq(struct irq_data *data)
+{
+        sun4c_mask_irq(data);
+        irq_unlink(data->irq);
+}
+
+static struct irq_chip sun4c_irq = {
+        .name           = "sun4c",
+        .irq_startup    = sun4c_startup_irq,
+        .irq_shutdown   = sun4c_shutdown_irq,
+        .irq_mask       = sun4c_mask_irq,
+        .irq_unmask     = sun4c_unmask_irq,
+};
+
+static unsigned int sun4c_build_device_irq(struct platform_device *op,
+                                           unsigned int real_irq)
+{
+         unsigned int irq;
+
+        if (real_irq >= 16) {
+                prom_printf("Bogus sun4c IRQ %u\n", real_irq);
+                prom_halt();
+        }
+
+        irq = irq_alloc(real_irq, real_irq);
+        if (irq) {
+                unsigned long mask = 0UL;
+
+                switch (real_irq) {
+                case 1:
+                        mask = SUN4C_INT_E1;
+                        break;
+                case 8:
+                        mask = SUN4C_INT_E8;
+                        break;
+                case 10:
+                        mask = SUN4C_INT_E10;
+                        break;
+                case 14:
+                        mask = SUN4C_INT_E14;
+                        break;
+                default:
+                        /* All the rest are either always enabled,
+                         * or are for signalling software interrupts.
+                         */
+                        break;
+                }
+                irq_set_chip_and_handler_name(irq, &sun4c_irq,
+                                              handle_level_irq, "level");
+                irq_set_chip_data(irq, (void *)mask);
+        }
+        return irq;
 }
 
 struct sun4c_timer_info {
@@ -144,8 +176,9 @@ static void sun4c_load_profile_irq(int cpu, unsigned int limit)
 
 static void __init sun4c_init_timers(irq_handler_t counter_fn)
 {
-        const struct linux_prom_irqs *irq;
+        const struct linux_prom_irqs *prom_irqs;
         struct device_node *dp;
+        unsigned int irq;
         const u32 *addr;
         int err;
 
@@ -163,9 +196,9 @@ static void __init sun4c_init_timers(irq_handler_t counter_fn)
 
         sun4c_timers = (void __iomem *) (unsigned long) addr[0];
 
-        irq = of_get_property(dp, "intr", NULL);
+        prom_irqs = of_get_property(dp, "intr", NULL);
         of_node_put(dp);
-        if (!irq) {
+        if (!prom_irqs) {
                 prom_printf("sun4c_init_timers: No intr property\n");
                 prom_halt();
         }
@@ -178,15 +211,15 @@ static void __init sun4c_init_timers(irq_handler_t counter_fn)
 
         master_l10_counter = &sun4c_timers->l10_count;
 
-        err = request_irq(irq[0].pri, counter_fn,
-                          (IRQF_DISABLED | SA_STATIC_ALLOC),
-                          "timer", NULL);
+        irq = sun4c_build_device_irq(NULL, prom_irqs[0].pri);
+        err = request_irq(irq, counter_fn, IRQF_TIMER, "timer", NULL);
         if (err) {
                 prom_printf("sun4c_init_timers: request_irq() fails with %d\n", err);
                 prom_halt();
         }
 
-        sun4c_disable_irq(irq[1].pri);
+        /* disable timer interrupt */
+        sun4c_mask_irq(irq_get_irq_data(irq));
 }
 
 #ifdef CONFIG_SMP
@@ -215,14 +248,11 @@ void __init sun4c_init_IRQ(void)
 
         interrupt_enable = (void __iomem *) (unsigned long) addr[0];
 
-        BTFIXUPSET_CALL(enable_irq, sun4c_enable_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(disable_irq, sun4c_disable_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(enable_pil_irq, sun4c_enable_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(disable_pil_irq, sun4c_disable_irq, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(clear_clock_irq, sun4c_clear_clock_irq, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(load_profile_irq, sun4c_load_profile_irq, BTFIXUPCALL_NOP);
 
-        sparc_irq_config.init_timers = sun4c_init_timers;
+        sparc_irq_config.init_timers      = sun4c_init_timers;
+        sparc_irq_config.build_device_irq = sun4c_build_device_irq;
 
 #ifdef CONFIG_SMP
         BTFIXUPSET_CALL(set_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c
index 77b4a8992710..a9ea60eb2c10 100644
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@@ -14,6 +14,7 @@
 #include <asm/io.h>
 #include <asm/sbi.h>
 #include <asm/cacheflush.h>
+#include <asm/setup.h>
 
 #include "kernel.h"
 #include "irq.h"
@@ -22,22 +23,20 @@
  * cpu local.  CPU local interrupts cover the timer interrupts
  * and whatnot, and we encode those as normal PILs between
  * 0 and 15.
- *
- * SBUS interrupts are encoded integers including the board number
- * (plus one), the SBUS level, and the SBUS slot number.  Sun4D
- * IRQ dispatch is done by:
- *
- * 1) Reading the BW local interrupt table in order to get the bus
- *    interrupt mask.
- *
- *    This table is indexed by SBUS interrupt level which can be
- *    derived from the PIL we got interrupted on.
- *
- * 2) For each bus showing interrupt pending from #1, read the
- *    SBI interrupt state register.  This will indicate which slots
- *    have interrupts pending for that SBUS interrupt level.
+ * SBUS interrupts are encodes as a combination of board, level and slot.
  */
 
+struct sun4d_handler_data {
+        unsigned int cpuid;    /* target cpu */
+        unsigned int real_irq; /* interrupt level */
+};
+
+
+static unsigned int sun4d_encode_irq(int board, int lvl, int slot)
+{
+        return (board + 1) << 5 | (lvl << 2) | slot;
+}
+
 struct sun4d_timer_regs {
         u32     l10_timer_limit;
         u32     l10_cur_countx;
@@ -48,17 +47,12 @@ struct sun4d_timer_regs {
 
 static struct sun4d_timer_regs __iomem *sun4d_timers;
 
-#define TIMER_IRQ       10
-
-#define MAX_STATIC_ALLOC        4
-static unsigned char sbus_tid[32];
-
-static struct irqaction *irq_action[NR_IRQS];
+#define SUN4D_TIMER_IRQ        10
 
-static struct sbus_action {
-        struct irqaction *action;
-        /* For SMP this needs to be extended */
-} *sbus_actions;
+/* Specify which cpu handle interrupts from which board.
+ * Index is board - value is cpu.
+ */
+static unsigned char board_to_cpu[32];
 
 static int pil_to_sbus[] = {
         0,
@@ -79,152 +73,81 @@ static int pil_to_sbus[] = {
         0,
 };
 
-static int sbus_to_pil[] = {
-        0,
-        2,
-        3,
-        5,
-        7,
-        9,
-        11,
-        13,
-};
-
-static int nsbi;
-
 /* Exported for sun4d_smp.c */
 DEFINE_SPINLOCK(sun4d_imsk_lock);
 
-int show_sun4d_interrupts(struct seq_file *p, void *v)
+/* SBUS interrupts are encoded integers including the board number
+ * (plus one), the SBUS level, and the SBUS slot number.  Sun4D
+ * IRQ dispatch is done by:
+ *
+ * 1) Reading the BW local interrupt table in order to get the bus
+ *    interrupt mask.
+ *
+ *    This table is indexed by SBUS interrupt level which can be
+ *    derived from the PIL we got interrupted on.
+ *
+ * 2) For each bus showing interrupt pending from #1, read the
+ *    SBI interrupt state register.  This will indicate which slots
+ *    have interrupts pending for that SBUS interrupt level.
+ *
+ * 3) Call the genreric IRQ support.
+ */
+static void sun4d_sbus_handler_irq(int sbusl)
 {
-        int i = *(loff_t *) v, j = 0, k = 0, sbusl;
-        struct irqaction *action;
-        unsigned long flags;
-#ifdef CONFIG_SMP
-        int x;
-#endif
-
-        spin_lock_irqsave(&irq_action_lock, flags);
-        if (i < NR_IRQS) {
-                sbusl = pil_to_sbus[i];
-                if (!sbusl) {
-                        action = *(i + irq_action);
-                        if (!action)
-                                goto out_unlock;
-                } else {
-                        for (j = 0; j < nsbi; j++) {
-                                for (k = 0; k < 4; k++)
-                                        action = sbus_actions[(j << 5) + (sbusl << 2) + k].action;
-                                        if (action)
-                                                goto found_it;
-                        }
-                        goto out_unlock;
-                }
-found_it:       seq_printf(p, "%3d: ", i);
-#ifndef CONFIG_SMP
-                seq_printf(p, "%10u ", kstat_irqs(i));
-#else
-                for_each_online_cpu(x)
-                        seq_printf(p, "%10u ",
-                               kstat_cpu(cpu_logical_map(x)).irqs[i]);
-#endif
-                seq_printf(p, "%c %s",
-                        (action->flags & IRQF_DISABLED) ? '+' : ' ',
-                        action->name);
-                action = action->next;
-                for (;;) {
-                        for (; action; action = action->next) {
-                                seq_printf(p, ",%s %s",
-                                        (action->flags & IRQF_DISABLED) ? " +" : "",
-                                        action->name);
-                        }
-                        if (!sbusl)
-                                break;
-                        k++;
-                        if (k < 4) {
-                                action = sbus_actions[(j << 5) + (sbusl << 2) + k].action;
-                        } else {
-                                j++;
-                                if (j == nsbi)
-                                        break;
-                                k = 0;
-                                action = sbus_actions[(j << 5) + (sbusl << 2)].action;
+        unsigned int bus_mask;
+        unsigned int sbino, slot;
+        unsigned int sbil;
+
+        bus_mask = bw_get_intr_mask(sbusl) & 0x3ffff;
+        bw_clear_intr_mask(sbusl, bus_mask);
+
+        sbil = (sbusl << 2);
+        /* Loop for each pending SBI */
+        for (sbino = 0; bus_mask; sbino++) {
+                unsigned int idx, mask;
+
+                bus_mask >>= 1;
+                if (!(bus_mask & 1))
+                        continue;
+                /* XXX This seems to ACK the irq twice.  acquire_sbi()
+                 * XXX uses swap, therefore this writes 0xf << sbil,
+                 * XXX then later release_sbi() will write the individual
+                 * XXX bits which were set again.
+                 */
+                mask = acquire_sbi(SBI2DEVID(sbino), 0xf << sbil);
+                mask &= (0xf << sbil);
+
+                /* Loop for each pending SBI slot */
+                idx = 0;
+                slot = (1 << sbil);
+                while (mask != 0) {
+                        unsigned int pil;
+                        struct irq_bucket *p;
+
+                        idx++;
+                        slot <<= 1;
+                        if (!(mask & slot))
+                                continue;
+
+                        mask &= ~slot;
+                        pil = sun4d_encode_irq(sbino, sbil, idx);
+
+                        p = irq_map[pil];
+                        while (p) {
+                                struct irq_bucket *next;
+
+                                next = p->next;
+                                generic_handle_irq(p->irq);
+                                p = next;
                         }
+                        release_sbi(SBI2DEVID(sbino), slot);
                 }
-                seq_putc(p, '\n');
         }
-out_unlock:
-        spin_unlock_irqrestore(&irq_action_lock, flags);
-        return 0;
-}
-
-void sun4d_free_irq(unsigned int irq, void *dev_id)
-{
-        struct irqaction *action, **actionp;
-        struct irqaction *tmp = NULL;
-        unsigned long flags;
-
-        spin_lock_irqsave(&irq_action_lock, flags);
-        if (irq < 15)
-                actionp = irq + irq_action;
-        else
-                actionp = &(sbus_actions[irq - (1 << 5)].action);
-        action = *actionp;
-        if (!action) {
-                printk(KERN_ERR "Trying to free free IRQ%d\n", irq);
-                goto out_unlock;
-        }
-        if (dev_id) {
-                for (; action; action = action->next) {
-                        if (action->dev_id == dev_id)
-                                break;
-                        tmp = action;
-                }
-                if (!action) {
-                        printk(KERN_ERR "Trying to free free shared IRQ%d\n",
-                               irq);
-                        goto out_unlock;
-                }
-        } else if (action->flags & IRQF_SHARED) {
-                printk(KERN_ERR "Trying to free shared IRQ%d with NULL device ID\n",
-                       irq);
-                goto out_unlock;
-        }
-        if (action->flags & SA_STATIC_ALLOC) {
-                /*
-                 * This interrupt is marked as specially allocated
-                 * so it is a bad idea to free it.
-                 */
-                printk(KERN_ERR "Attempt to free statically allocated IRQ%d (%s)\n",
-                       irq, action->name);
-                goto out_unlock;
-        }
-
-        if (tmp)
-                tmp->next = action->next;
-        else
-                *actionp = action->next;
-
-        spin_unlock_irqrestore(&irq_action_lock, flags);
-
-        synchronize_irq(irq);
-
-        spin_lock_irqsave(&irq_action_lock, flags);
-
-        kfree(action);
-
-        if (!(*actionp))
-                __disable_irq(irq);
-
-out_unlock:
-        spin_unlock_irqrestore(&irq_action_lock, flags);
 }
 
 void sun4d_handler_irq(int pil, struct pt_regs *regs)
 {
         struct pt_regs *old_regs;
-        struct irqaction *action;
-        int cpu = smp_processor_id();
         /* SBUS IRQ level (1 - 7) */
         int sbusl = pil_to_sbus[pil];
 
@@ -233,160 +156,96 @@ void sun4d_handler_irq(int pil, struct pt_regs *regs)
 
         cc_set_iclr(1 << pil);
 
+#ifdef CONFIG_SMP
+        /*
+         * Check IPI data structures after IRQ has been cleared. Hard and Soft
+         * IRQ can happen at the same time, so both cases are always handled.
+         */
+        if (pil == SUN4D_IPI_IRQ)
+                sun4d_ipi_interrupt();
+#endif
+
         old_regs = set_irq_regs(regs);
         irq_enter();
-        kstat_cpu(cpu).irqs[pil]++;
-        if (!sbusl) {
-                action = *(pil + irq_action);
-                if (!action)
-                        unexpected_irq(pil, NULL, regs);
-                do {
-                        action->handler(pil, action->dev_id);
-                        action = action->next;
-                } while (action);
+        if (sbusl == 0) {
+                /* cpu interrupt */
+                struct irq_bucket *p;
+
+                p = irq_map[pil];
+                while (p) {
+                        struct irq_bucket *next;
+
+                        next = p->next;
+                        generic_handle_irq(p->irq);
+                        p = next;
+                }
         } else {
-                int bus_mask = bw_get_intr_mask(sbusl) & 0x3ffff;
-                int sbino;
-                struct sbus_action *actionp;
-                unsigned mask, slot;
-                int sbil = (sbusl << 2);
-
-                bw_clear_intr_mask(sbusl, bus_mask);
-
-                /* Loop for each pending SBI */
-                for (sbino = 0; bus_mask; sbino++, bus_mask >>= 1)
-                        if (bus_mask & 1) {
-                                mask = acquire_sbi(SBI2DEVID(sbino), 0xf << sbil);
-                                mask &= (0xf << sbil);
-                                actionp = sbus_actions + (sbino << 5) + (sbil);
-                                /* Loop for each pending SBI slot */
-                                for (slot = (1 << sbil); mask; slot <<= 1, actionp++)
-                                        if (mask & slot) {
-                                                mask &= ~slot;
-                                                action = actionp->action;
-
-                                                if (!action)
-                                                        unexpected_irq(pil, NULL, regs);
-                                                do {
-                                                        action->handler(pil, action->dev_id);
-                                                        action = action->next;
-                                                } while (action);
-                                                release_sbi(SBI2DEVID(sbino), slot);
-                                        }
-                        }
+                /* SBUS interrupt */
+                sun4d_sbus_handler_irq(sbusl);
         }
         irq_exit();
         set_irq_regs(old_regs);
 }
 
-int sun4d_request_irq(unsigned int irq,
-                irq_handler_t handler,
-                unsigned long irqflags, const char *devname, void *dev_id)
+
+static void sun4d_mask_irq(struct irq_data *data)
 {
-        struct irqaction *action, *tmp = NULL, **actionp;
+        struct sun4d_handler_data *handler_data = data->handler_data;
+        unsigned int real_irq;
+#ifdef CONFIG_SMP
+        int cpuid = handler_data->cpuid;
         unsigned long flags;
-        int ret;
-
-        if (irq > 14 && irq < (1 << 5)) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        if (!handler) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        spin_lock_irqsave(&irq_action_lock, flags);
-
-        if (irq >= (1 << 5))
-                actionp = &(sbus_actions[irq - (1 << 5)].action);
-        else
-                actionp = irq + irq_action;
-        action = *actionp;
-
-        if (action) {
-                if ((action->flags & IRQF_SHARED) && (irqflags & IRQF_SHARED)) {
-                        for (tmp = action; tmp->next; tmp = tmp->next)
-                                /* find last entry - tmp used below */;
-                } else {
-                        ret = -EBUSY;
-                        goto out_unlock;
-                }
-                if ((action->flags & IRQF_DISABLED) ^ (irqflags & IRQF_DISABLED)) {
-                        printk(KERN_ERR "Attempt to mix fast and slow interrupts on IRQ%d denied\n",
-                               irq);
-                        ret = -EBUSY;
-                        goto out_unlock;
-                }
-                action = NULL;          /* Or else! */
-        }
-
-        /* If this is flagged as statically allocated then we use our
-         * private struct which is never freed.
-         */
-        if (irqflags & SA_STATIC_ALLOC) {
-                if (static_irq_count < MAX_STATIC_ALLOC)
-                        action = &static_irqaction[static_irq_count++];
-                else
-                        printk(KERN_ERR "Request for IRQ%d (%s) SA_STATIC_ALLOC failed using kmalloc\n",
-                               irq, devname);
-        }
-
-        if (action == NULL)
-                action = kmalloc(sizeof(struct irqaction), GFP_ATOMIC);
-
-        if (!action) {
-                ret = -ENOMEM;
-                goto out_unlock;
-        }
-
-        action->handler = handler;
-        action->flags = irqflags;
-        action->name = devname;
-        action->next = NULL;
-        action->dev_id = dev_id;
-
-        if (tmp)
-                tmp->next = action;
-        else
-                *actionp = action;
-
-        __enable_irq(irq);
-
-        ret = 0;
-out_unlock:
-        spin_unlock_irqrestore(&irq_action_lock, flags);
-out:
-        return ret;
+#endif
+        real_irq = handler_data->real_irq;
+#ifdef CONFIG_SMP
+        spin_lock_irqsave(&sun4d_imsk_lock, flags);
+        cc_set_imsk_other(cpuid, cc_get_imsk_other(cpuid) | (1 << real_irq));
+        spin_unlock_irqrestore(&sun4d_imsk_lock, flags);
+#else
+        cc_set_imsk(cc_get_imsk() | (1 << real_irq));
+#endif
 }
 
-static void sun4d_disable_irq(unsigned int irq)
+static void sun4d_unmask_irq(struct irq_data *data)
 {
-        int tid = sbus_tid[(irq >> 5) - 1];
+        struct sun4d_handler_data *handler_data = data->handler_data;
+        unsigned int real_irq;
+#ifdef CONFIG_SMP
+        int cpuid = handler_data->cpuid;
         unsigned long flags;
+#endif
+        real_irq = handler_data->real_irq;
 
-        if (irq < NR_IRQS)
-                return;
-
+#ifdef CONFIG_SMP
         spin_lock_irqsave(&sun4d_imsk_lock, flags);
-        cc_set_imsk_other(tid, cc_get_imsk_other(tid) | (1 << sbus_to_pil[(irq >> 2) & 7]));
+        cc_set_imsk_other(cpuid, cc_get_imsk_other(cpuid) | ~(1 << real_irq));
         spin_unlock_irqrestore(&sun4d_imsk_lock, flags);
+#else
+        cc_set_imsk(cc_get_imsk() | ~(1 << real_irq));
+#endif
 }
 
-static void sun4d_enable_irq(unsigned int irq)
+static unsigned int sun4d_startup_irq(struct irq_data *data)
 {
-        int tid = sbus_tid[(irq >> 5) - 1];
-        unsigned long flags;
-
-        if (irq < NR_IRQS)
-                return;
+        irq_link(data->irq);
+        sun4d_unmask_irq(data);
+        return 0;
+}
 
-        spin_lock_irqsave(&sun4d_imsk_lock, flags);
-        cc_set_imsk_other(tid, cc_get_imsk_other(tid) & ~(1 << sbus_to_pil[(irq >> 2) & 7]));
-        spin_unlock_irqrestore(&sun4d_imsk_lock, flags);
+static void sun4d_shutdown_irq(struct irq_data *data)
+{
+        sun4d_mask_irq(data);
+        irq_unlink(data->irq);
 }
 
+struct irq_chip sun4d_irq = {
+        .name           = "sun4d",
+        .irq_startup    = sun4d_startup_irq,
+        .irq_shutdown   = sun4d_shutdown_irq,
+        .irq_unmask     = sun4d_unmask_irq,
+        .irq_mask       = sun4d_mask_irq,
+};
+
 #ifdef CONFIG_SMP
 static void sun4d_set_cpu_int(int cpu, int level)
 {
@@ -413,7 +272,7 @@ void __init sun4d_distribute_irqs(void)
         for_each_node_by_name(dp, "sbi") {
                 int devid = of_getintprop_default(dp, "device-id", 0);
                 int board = of_getintprop_default(dp, "board#", 0);
-                sbus_tid[board] = cpuid;
+                board_to_cpu[board] = cpuid;
                 set_sbi_tid(devid, cpuid << 3);
         }
         printk(KERN_ERR "All sbus IRQs directed to CPU%d\n", cpuid);
@@ -443,15 +302,16 @@ static void __init sun4d_load_profile_irqs(void)
 unsigned int sun4d_build_device_irq(struct platform_device *op,
                                     unsigned int real_irq)
 {
-        static int pil_to_sbus[] = {
-                0, 0, 1, 2, 0, 3, 0, 4, 0, 5, 0, 6, 0, 7, 0, 0,
-        };
         struct device_node *dp = op->dev.of_node;
         struct device_node *io_unit, *sbi = dp->parent;
         const struct linux_prom_registers *regs;
+        struct sun4d_handler_data *handler_data;
+        unsigned int pil;
+        unsigned int irq;
         int board, slot;
         int sbusl;
 
+        irq = 0;
         while (sbi) {
                 if (!strcmp(sbi->name, "sbi"))
                         break;
@@ -484,7 +344,28 @@ unsigned int sun4d_build_device_irq(struct platform_device *op,
 
         sbusl = pil_to_sbus[real_irq];
         if (sbusl)
-                return (((board + 1) << 5) + (sbusl << 2) + slot);
+                pil = sun4d_encode_irq(board, sbusl, slot);
+        else
+                pil = real_irq;
+
+        irq = irq_alloc(real_irq, pil);
+        if (irq == 0)
+                goto err_out;
+
+        handler_data = irq_get_handler_data(irq);
+        if (unlikely(handler_data))
+                goto err_out;
+
+        handler_data = kzalloc(sizeof(struct sun4d_handler_data), GFP_ATOMIC);
+        if (unlikely(!handler_data)) {
+                prom_printf("IRQ: kzalloc(sun4d_handler_data) failed.\n");
+                prom_halt();
+        }
+        handler_data->cpuid    = board_to_cpu[board];
+        handler_data->real_irq = real_irq;
+        irq_set_chip_and_handler_name(irq, &sun4d_irq,
+                                      handle_level_irq, "level");
+        irq_set_handler_data(irq, handler_data);
 
 err_out:
         return real_irq;
@@ -518,6 +399,7 @@ static void __init sun4d_init_timers(irq_handler_t counter_fn)
 {
         struct device_node *dp;
         struct resource res;
+        unsigned int irq;
         const u32 *reg;
         int err;
 
@@ -552,9 +434,8 @@ static void __init sun4d_init_timers(irq_handler_t counter_fn)
 
         master_l10_counter = &sun4d_timers->l10_cur_count;
 
-        err = request_irq(TIMER_IRQ, counter_fn,
-                          (IRQF_DISABLED | SA_STATIC_ALLOC),
-                          "timer", NULL);
+        irq = sun4d_build_device_irq(NULL, SUN4D_TIMER_IRQ);
+        err = request_irq(irq, counter_fn, IRQF_TIMER, "timer", NULL);
         if (err) {
                 prom_printf("sun4d_init_timers: request_irq() failed with %d\n",
                              err);
@@ -567,27 +448,16 @@ static void __init sun4d_init_timers(irq_handler_t counter_fn)
 void __init sun4d_init_sbi_irq(void)
 {
         struct device_node *dp;
-        int target_cpu = 0;
+        int target_cpu;
 
-#ifdef CONFIG_SMP
         target_cpu = boot_cpu_id;
-#endif
-
-        nsbi = 0;
-        for_each_node_by_name(dp, "sbi")
-                nsbi++;
-        sbus_actions = kzalloc(nsbi * 8 * 4 * sizeof(struct sbus_action), GFP_ATOMIC);
-        if (!sbus_actions) {
-                prom_printf("SUN4D: Cannot allocate sbus_actions, halting.\n");
-                prom_halt();
-        }
         for_each_node_by_name(dp, "sbi") {
                 int devid = of_getintprop_default(dp, "device-id", 0);
                 int board = of_getintprop_default(dp, "board#", 0);
                 unsigned int mask;
 
                 set_sbi_tid(devid, target_cpu << 3);
-                sbus_tid[board] = target_cpu;
+                board_to_cpu[board] = target_cpu;
 
                 /* Get rid of pending irqs from PROM */
                 mask = acquire_sbi(devid, 0xffffffff);
@@ -603,12 +473,10 @@ void __init sun4d_init_IRQ(void)
 {
         local_irq_disable();
 
-        BTFIXUPSET_CALL(enable_irq, sun4d_enable_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(disable_irq, sun4d_disable_irq, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(clear_clock_irq, sun4d_clear_clock_irq, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(load_profile_irq, sun4d_load_profile_irq, BTFIXUPCALL_NORM);
 
-        sparc_irq_config.init_timers = sun4d_init_timers;
+        sparc_irq_config.init_timers      = sun4d_init_timers;
         sparc_irq_config.build_device_irq = sun4d_build_device_irq;
 
 #ifdef CONFIG_SMP
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 475d50b96cd0..133387980b56 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -32,6 +32,7 @@ static inline unsigned long sun4d_swap(volatile unsigned long *ptr, unsigned lon
         return val;
 }
 
+static void smp4d_ipi_init(void);
 static void smp_setup_percpu_timer(void);
 
 static unsigned char cpu_leds[32];
@@ -80,8 +81,6 @@ void __cpuinit smp4d_callin(void)
         local_flush_cache_all();
         local_flush_tlb_all();
 
-        cpu_probe();
-
         while ((unsigned long)current_set[cpuid] < PAGE_OFFSET)
                 barrier();
 
@@ -105,7 +104,7 @@ void __cpuinit smp4d_callin(void)
 
         local_irq_enable();     /* We don't allow PIL 14 yet */
 
-        while (!cpu_isset(cpuid, smp_commenced_mask))
+        while (!cpumask_test_cpu(cpuid, &smp_commenced_mask))
                 barrier();
 
         spin_lock_irqsave(&sun4d_imsk_lock, flags);
@@ -120,6 +119,7 @@ void __cpuinit smp4d_callin(void)
  */
 void __init smp4d_boot_cpus(void)
 {
+        smp4d_ipi_init();
         if (boot_cpu_id)
                 current_set[0] = NULL;
         smp_setup_percpu_timer();
@@ -191,6 +191,80 @@ void __init smp4d_smp_done(void)
         sun4d_distribute_irqs();
 }
 
+/* Memory structure giving interrupt handler information about IPI generated */
+struct sun4d_ipi_work {
+        int single;
+        int msk;
+        int resched;
+};
+
+static DEFINE_PER_CPU_SHARED_ALIGNED(struct sun4d_ipi_work, sun4d_ipi_work);
+
+/* Initialize IPIs on the SUN4D SMP machine */
+static void __init smp4d_ipi_init(void)
+{
+        int cpu;
+        struct sun4d_ipi_work *work;
+
+        printk(KERN_INFO "smp4d: setup IPI at IRQ %d\n", SUN4D_IPI_IRQ);
+
+        for_each_possible_cpu(cpu) {
+                work = &per_cpu(sun4d_ipi_work, cpu);
+                work->single = work->msk = work->resched = 0;
+        }
+}
+
+void sun4d_ipi_interrupt(void)
+{
+        struct sun4d_ipi_work *work = &__get_cpu_var(sun4d_ipi_work);
+
+        if (work->single) {
+                work->single = 0;
+                smp_call_function_single_interrupt();
+        }
+        if (work->msk) {
+                work->msk = 0;
+                smp_call_function_interrupt();
+        }
+        if (work->resched) {
+                work->resched = 0;
+                smp_resched_interrupt();
+        }
+}
+
+static void smp4d_ipi_single(int cpu)
+{
+        struct sun4d_ipi_work *work = &per_cpu(sun4d_ipi_work, cpu);
+
+        /* Mark work */
+        work->single = 1;
+
+        /* Generate IRQ on the CPU */
+        sun4d_send_ipi(cpu, SUN4D_IPI_IRQ);
+}
+
+static void smp4d_ipi_mask_one(int cpu)
+{
+        struct sun4d_ipi_work *work = &per_cpu(sun4d_ipi_work, cpu);
+
+        /* Mark work */
+        work->msk = 1;
+
+        /* Generate IRQ on the CPU */
+        sun4d_send_ipi(cpu, SUN4D_IPI_IRQ);
+}
+
+static void smp4d_ipi_resched(int cpu)
+{
+        struct sun4d_ipi_work *work = &per_cpu(sun4d_ipi_work, cpu);
+
+        /* Mark work */
+        work->resched = 1;
+
+        /* Generate IRQ on the CPU (any IRQ will cause resched) */
+        sun4d_send_ipi(cpu, SUN4D_IPI_IRQ);
+}
+
 static struct smp_funcall {
         smpfunc_t func;
         unsigned long arg1;
@@ -239,10 +313,10 @@ static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
                 {
                         register int i;
 
-                        cpu_clear(smp_processor_id(), mask);
-                        cpus_and(mask, cpu_online_map, mask);
+                        cpumask_clear_cpu(smp_processor_id(), &mask);
+                        cpumask_and(&mask, cpu_online_mask, &mask);
                         for (i = 0; i <= high; i++) {
-                                if (cpu_isset(i, mask)) {
+                                if (cpumask_test_cpu(i, &mask)) {
                                         ccall_info.processors_in[i] = 0;
                                         ccall_info.processors_out[i] = 0;
                                         sun4d_send_ipi(i, IRQ_CROSS_CALL);
@@ -255,7 +329,7 @@ static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
 
                         i = 0;
                         do {
-                                if (!cpu_isset(i, mask))
+                                if (!cpumask_test_cpu(i, &mask))
                                         continue;
                                 while (!ccall_info.processors_in[i])
                                         barrier();
@@ -263,7 +337,7 @@ static void smp4d_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
 
                         i = 0;
                         do {
-                                if (!cpu_isset(i, mask))
+                                if (!cpumask_test_cpu(i, &mask))
                                         continue;
                                 while (!ccall_info.processors_out[i])
                                         barrier();
@@ -356,6 +430,9 @@ void __init sun4d_init_smp(void)
         BTFIXUPSET_BLACKBOX(load_current, smp4d_blackbox_current);
         BTFIXUPSET_CALL(smp_cross_call, smp4d_cross_call, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(__hard_smp_processor_id, __smp4d_processor_id, BTFIXUPCALL_NORM);
+        BTFIXUPSET_CALL(smp_ipi_resched, smp4d_ipi_resched, BTFIXUPCALL_NORM);
+        BTFIXUPSET_CALL(smp_ipi_single, smp4d_ipi_single, BTFIXUPCALL_NORM);
+        BTFIXUPSET_CALL(smp_ipi_mask_one, smp4d_ipi_mask_one, BTFIXUPCALL_NORM);
 
         for (i = 0; i < NR_CPUS; i++) {
                 ccall_info.processors_in[i] = 1;
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c
index 69df6257a32e..422c16dad1f6 100644
--- a/arch/sparc/kernel/sun4m_irq.c
+++ b/arch/sparc/kernel/sun4m_irq.c
@@ -100,6 +100,11 @@
 struct sun4m_irq_percpu __iomem *sun4m_irq_percpu[SUN4M_NCPUS];
 struct sun4m_irq_global __iomem *sun4m_irq_global;
 
+struct sun4m_handler_data {
+        bool    percpu;
+        long    mask;
+};
+
 /* Dave Redman (djhr@tadpole.co.uk)
  * The sun4m interrupt registers.
  */
@@ -142,9 +147,9 @@ struct sun4m_irq_global __iomem *sun4m_irq_global;
 #define OBP_INT_LEVEL_VME       0x40
 
 #define SUN4M_TIMER_IRQ         (OBP_INT_LEVEL_ONBOARD | 10)
-#define SUM4M_PROFILE_IRQ       (OBP_INT_LEVEL_ONBOARD | 14)
+#define SUN4M_PROFILE_IRQ       (OBP_INT_LEVEL_ONBOARD | 14)
 
-static unsigned long irq_mask[0x50] = {
+static unsigned long sun4m_imask[0x50] = {
         /* 0x00 - SMP */
         0,  SUN4M_SOFT_INT(1),
         SUN4M_SOFT_INT(2),  SUN4M_SOFT_INT(3),
@@ -169,7 +174,7 @@ static unsigned long irq_mask[0x50] = {
         SUN4M_INT_VIDEO, SUN4M_INT_MODULE,
         SUN4M_INT_REALTIME, SUN4M_INT_FLOPPY,
         (SUN4M_INT_SERIAL | SUN4M_INT_KBDMS),
-        SUN4M_INT_AUDIO, 0, SUN4M_INT_MODULE_ERR,
+        SUN4M_INT_AUDIO, SUN4M_INT_E14, SUN4M_INT_MODULE_ERR,
         /* 0x30 - sbus */
         0, 0, SUN4M_INT_SBUS(0), SUN4M_INT_SBUS(1),
         0, SUN4M_INT_SBUS(2), 0, SUN4M_INT_SBUS(3),
@@ -182,105 +187,110 @@ static unsigned long irq_mask[0x50] = {
         0, SUN4M_INT_VME(6), 0, 0
 };
 
-static unsigned long sun4m_get_irqmask(unsigned int irq)
+static void sun4m_mask_irq(struct irq_data *data)
 {
-        unsigned long mask;
-
-        if (irq < 0x50)
-                mask = irq_mask[irq];
-        else
-                mask = 0;
+        struct sun4m_handler_data *handler_data = data->handler_data;
+        int cpu = smp_processor_id();
 
-        if (!mask)
-                printk(KERN_ERR "sun4m_get_irqmask: IRQ%d has no valid mask!\n",
-                       irq);
+        if (handler_data->mask) {
+                unsigned long flags;
 
-        return mask;
+                local_irq_save(flags);
+                if (handler_data->percpu) {
+                        sbus_writel(handler_data->mask, &sun4m_irq_percpu[cpu]->set);
+                } else {
+                        sbus_writel(handler_data->mask, &sun4m_irq_global->mask_set);
+                }
+                local_irq_restore(flags);
+        }
 }
 
-static void sun4m_disable_irq(unsigned int irq_nr)
+static void sun4m_unmask_irq(struct irq_data *data)
 {
-        unsigned long mask, flags;
+        struct sun4m_handler_data *handler_data = data->handler_data;
         int cpu = smp_processor_id();
 
-        mask = sun4m_get_irqmask(irq_nr);
-        local_irq_save(flags);
-        if (irq_nr > 15)
-                sbus_writel(mask, &sun4m_irq_global->mask_set);
-        else
-                sbus_writel(mask, &sun4m_irq_percpu[cpu]->set);
-        local_irq_restore(flags);
-}
-
-static void sun4m_enable_irq(unsigned int irq_nr)
-{
-        unsigned long mask, flags;
-        int cpu = smp_processor_id();
+        if (handler_data->mask) {
+                unsigned long flags;
 
-        /* Dreadful floppy hack. When we use 0x2b instead of
-         * 0x0b the system blows (it starts to whistle!).
-         * So we continue to use 0x0b. Fixme ASAP. --P3
-         */
-        if (irq_nr != 0x0b) {
-                mask = sun4m_get_irqmask(irq_nr);
-                local_irq_save(flags);
-                if (irq_nr > 15)
-                        sbus_writel(mask, &sun4m_irq_global->mask_clear);
-                else
-                        sbus_writel(mask, &sun4m_irq_percpu[cpu]->clear);
-                local_irq_restore(flags);
-        } else {
                 local_irq_save(flags);
-                sbus_writel(SUN4M_INT_FLOPPY, &sun4m_irq_global->mask_clear);
+                if (handler_data->percpu) {
+                        sbus_writel(handler_data->mask, &sun4m_irq_percpu[cpu]->clear);
+                } else {
+                        sbus_writel(handler_data->mask, &sun4m_irq_global->mask_clear);
+                }
                 local_irq_restore(flags);
         }
 }
 
-static unsigned long cpu_pil_to_imask[16] = {
-/*0*/   0x00000000,
-/*1*/   0x00000000,
-/*2*/   SUN4M_INT_SBUS(0) | SUN4M_INT_VME(0),
-/*3*/   SUN4M_INT_SBUS(1) | SUN4M_INT_VME(1),
-/*4*/   SUN4M_INT_SCSI,
-/*5*/   SUN4M_INT_SBUS(2) | SUN4M_INT_VME(2),
-/*6*/   SUN4M_INT_ETHERNET,
-/*7*/   SUN4M_INT_SBUS(3) | SUN4M_INT_VME(3),
-/*8*/   SUN4M_INT_VIDEO,
-/*9*/   SUN4M_INT_SBUS(4) | SUN4M_INT_VME(4) | SUN4M_INT_MODULE_ERR,
-/*10*/  SUN4M_INT_REALTIME,
-/*11*/  SUN4M_INT_SBUS(5) | SUN4M_INT_VME(5) | SUN4M_INT_FLOPPY,
-/*12*/  SUN4M_INT_SERIAL  | SUN4M_INT_KBDMS,
-/*13*/  SUN4M_INT_SBUS(6) | SUN4M_INT_VME(6) | SUN4M_INT_AUDIO,
-/*14*/  SUN4M_INT_E14,
-/*15*/  SUN4M_INT_ERROR,
-};
+static unsigned int sun4m_startup_irq(struct irq_data *data)
+{
+        irq_link(data->irq);
+        sun4m_unmask_irq(data);
+        return 0;
+}
 
-/* We assume the caller has disabled local interrupts when these are called,
- * or else very bizarre behavior will result.
- */
-static void sun4m_disable_pil_irq(unsigned int pil)
+static void sun4m_shutdown_irq(struct irq_data *data)
 {
-        sbus_writel(cpu_pil_to_imask[pil], &sun4m_irq_global->mask_set);
+        sun4m_mask_irq(data);
+        irq_unlink(data->irq);
 }
 
-static void sun4m_enable_pil_irq(unsigned int pil)
+static struct irq_chip sun4m_irq = {
+        .name           = "sun4m",
+        .irq_startup    = sun4m_startup_irq,
+        .irq_shutdown   = sun4m_shutdown_irq,
+        .irq_mask       = sun4m_mask_irq,
+        .irq_unmask     = sun4m_unmask_irq,
+};
+
+
+static unsigned int sun4m_build_device_irq(struct platform_device *op,
+                                           unsigned int real_irq)
 {
-        sbus_writel(cpu_pil_to_imask[pil], &sun4m_irq_global->mask_clear);
+        struct sun4m_handler_data *handler_data;
+        unsigned int irq;
+        unsigned int pil;
+
+        if (real_irq >= OBP_INT_LEVEL_VME) {
+                prom_printf("Bogus sun4m IRQ %u\n", real_irq);
+                prom_halt();
+        }
+        pil = (real_irq & 0xf);
+        irq = irq_alloc(real_irq, pil);
+
+        if (irq == 0)
+                goto out;
+
+        handler_data = irq_get_handler_data(irq);
+        if (unlikely(handler_data))
+                goto out;
+
+        handler_data = kzalloc(sizeof(struct sun4m_handler_data), GFP_ATOMIC);
+        if (unlikely(!handler_data)) {
+                prom_printf("IRQ: kzalloc(sun4m_handler_data) failed.\n");
+                prom_halt();
+        }
+
+        handler_data->mask = sun4m_imask[real_irq];
+        handler_data->percpu = real_irq < OBP_INT_LEVEL_ONBOARD;
+        irq_set_chip_and_handler_name(irq, &sun4m_irq,
+                                      handle_level_irq, "level");
+        irq_set_handler_data(irq, handler_data);
+
+out:
+        return irq;
 }
 
 #ifdef CONFIG_SMP
 static void sun4m_send_ipi(int cpu, int level)
 {
-        unsigned long mask = sun4m_get_irqmask(level);
-
-        sbus_writel(mask, &sun4m_irq_percpu[cpu]->set);
+        sbus_writel(SUN4M_SOFT_INT(level), &sun4m_irq_percpu[cpu]->set);
 }
 
 static void sun4m_clear_ipi(int cpu, int level)
 {
-        unsigned long mask = sun4m_get_irqmask(level);
-
-        sbus_writel(mask, &sun4m_irq_percpu[cpu]->clear);
+        sbus_writel(SUN4M_SOFT_INT(level), &sun4m_irq_percpu[cpu]->clear);
 }
 
 static void sun4m_set_udt(int cpu)
@@ -343,7 +353,15 @@ void sun4m_nmi(struct pt_regs *regs)
         prom_halt();
 }
 
-/* Exported for sun4m_smp.c */
+void sun4m_unmask_profile_irq(void)
+{
+        unsigned long flags;
+
+        local_irq_save(flags);
+        sbus_writel(sun4m_imask[SUN4M_PROFILE_IRQ], &sun4m_irq_global->mask_clear);
+        local_irq_restore(flags);
+}
+
 void sun4m_clear_profile_irq(int cpu)
 {
         sbus_readl(&timers_percpu[cpu]->l14_limit);
@@ -358,6 +376,7 @@ static void __init sun4m_init_timers(irq_handler_t counter_fn)
 {
         struct device_node *dp = of_find_node_by_name(NULL, "counter");
         int i, err, len, num_cpu_timers;
+        unsigned int irq;
         const u32 *addr;
 
         if (!dp) {
@@ -384,8 +403,9 @@ static void __init sun4m_init_timers(irq_handler_t counter_fn)
 
         master_l10_counter = &timers_global->l10_count;
 
-        err = request_irq(SUN4M_TIMER_IRQ, counter_fn,
-                          (IRQF_DISABLED | SA_STATIC_ALLOC), "timer", NULL);
+        irq = sun4m_build_device_irq(NULL, SUN4M_TIMER_IRQ);
+
+        err = request_irq(irq, counter_fn, IRQF_TIMER, "timer", NULL);
         if (err) {
                 printk(KERN_ERR "sun4m_init_timers: Register IRQ error %d.\n",
                         err);
@@ -452,14 +472,11 @@ void __init sun4m_init_IRQ(void)
         if (num_cpu_iregs == 4)
                 sbus_writel(0, &sun4m_irq_global->interrupt_target);
 
-        BTFIXUPSET_CALL(enable_irq, sun4m_enable_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(disable_irq, sun4m_disable_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(enable_pil_irq, sun4m_enable_pil_irq, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(disable_pil_irq, sun4m_disable_pil_irq, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(clear_clock_irq, sun4m_clear_clock_irq, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(load_profile_irq, sun4m_load_profile_irq, BTFIXUPCALL_NORM);
 
         sparc_irq_config.init_timers = sun4m_init_timers;
+        sparc_irq_config.build_device_irq = sun4m_build_device_irq;
 
 #ifdef CONFIG_SMP
         BTFIXUPSET_CALL(set_cpu_int, sun4m_send_ipi, BTFIXUPCALL_NORM);
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index 5cc7dc51de3d..594768686525 100644
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -15,6 +15,9 @@
 #include "irq.h"
 #include "kernel.h"
 
+#define IRQ_IPI_SINGLE          12
+#define IRQ_IPI_MASK            13
+#define IRQ_IPI_RESCHED         14
 #define IRQ_CROSS_CALL          15
 
 static inline unsigned long
@@ -26,6 +29,7 @@ swap_ulong(volatile unsigned long *ptr, unsigned long val)
         return val;
 }
 
+static void smp4m_ipi_init(void);
 static void smp_setup_percpu_timer(void);
 
 void __cpuinit smp4m_callin(void)
@@ -59,8 +63,6 @@ void __cpuinit smp4m_callin(void)
         local_flush_cache_all();
         local_flush_tlb_all();
 
-        cpu_probe();
-
         /* Fix idle thread fields. */
         __asm__ __volatile__("ld [%0], %%g6\n\t"
                              : : "r" (&current_set[cpuid])
@@ -70,7 +72,7 @@ void __cpuinit smp4m_callin(void)
         atomic_inc(&init_mm.mm_count);
         current->active_mm = &init_mm;
 
-        while (!cpu_isset(cpuid, smp_commenced_mask))
+        while (!cpumask_test_cpu(cpuid, &smp_commenced_mask))
                 mb();
 
         local_irq_enable();
@@ -83,6 +85,7 @@ void __cpuinit smp4m_callin(void)
  */
 void __init smp4m_boot_cpus(void)
 {
+        smp4m_ipi_init();
         smp_setup_percpu_timer();
         local_flush_cache_all();
 }
@@ -150,18 +153,25 @@ void __init smp4m_smp_done(void)
         /* Ok, they are spinning and ready to go. */
 }
 
-/* At each hardware IRQ, we get this called to forward IRQ reception
- * to the next processor.  The caller must disable the IRQ level being
- * serviced globally so that there are no double interrupts received.
- *
- * XXX See sparc64 irq.c.
- */
-void smp4m_irq_rotate(int cpu)
+
+/* Initialize IPIs on the SUN4M SMP machine */
+static void __init smp4m_ipi_init(void)
+{
+}
+
+static void smp4m_ipi_resched(int cpu)
+{
+        set_cpu_int(cpu, IRQ_IPI_RESCHED);
+}
+
+static void smp4m_ipi_single(int cpu)
 {
-        int next = cpu_data(cpu).next;
+        set_cpu_int(cpu, IRQ_IPI_SINGLE);
+}
 
-        if (next != cpu)
-                set_irq_udt(next);
+static void smp4m_ipi_mask_one(int cpu)
+{
+        set_cpu_int(cpu, IRQ_IPI_MASK);
 }
 
 static struct smp_funcall {
@@ -199,10 +209,10 @@ static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
                 {
                         register int i;
 
-                        cpu_clear(smp_processor_id(), mask);
-                        cpus_and(mask, cpu_online_map, mask);
+                        cpumask_clear_cpu(smp_processor_id(), &mask);
+                        cpumask_and(&mask, cpu_online_mask, &mask);
                         for (i = 0; i < ncpus; i++) {
-                                if (cpu_isset(i, mask)) {
+                                if (cpumask_test_cpu(i, &mask)) {
                                         ccall_info.processors_in[i] = 0;
                                         ccall_info.processors_out[i] = 0;
                                         set_cpu_int(i, IRQ_CROSS_CALL);
@@ -218,7 +228,7 @@ static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
 
                         i = 0;
                         do {
-                                if (!cpu_isset(i, mask))
+                                if (!cpumask_test_cpu(i, &mask))
                                         continue;
                                 while (!ccall_info.processors_in[i])
                                         barrier();
@@ -226,7 +236,7 @@ static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
 
                         i = 0;
                         do {
-                                if (!cpu_isset(i, mask))
+                                if (!cpumask_test_cpu(i, &mask))
                                         continue;
                                 while (!ccall_info.processors_out[i])
                                         barrier();
@@ -277,7 +287,7 @@ static void __cpuinit smp_setup_percpu_timer(void)
         load_profile_irq(cpu, lvl14_resolution);
 
         if (cpu == boot_cpu_id)
-                enable_pil_irq(14);
+                sun4m_unmask_profile_irq();
 }
 
 static void __init smp4m_blackbox_id(unsigned *addr)
@@ -306,4 +316,7 @@ void __init sun4m_init_smp(void)
         BTFIXUPSET_BLACKBOX(load_current, smp4m_blackbox_current);
         BTFIXUPSET_CALL(smp_cross_call, smp4m_cross_call, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(__hard_smp_processor_id, __smp4m_processor_id, BTFIXUPCALL_NORM);
+        BTFIXUPSET_CALL(smp_ipi_resched, smp4m_ipi_resched, BTFIXUPCALL_NORM);
+        BTFIXUPSET_CALL(smp_ipi_single, smp4m_ipi_single, BTFIXUPCALL_NORM);
+        BTFIXUPSET_CALL(smp_ipi_mask_one, smp4m_ipi_mask_one, BTFIXUPCALL_NORM);
 }
diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c
index 1eb8b00aed75..7408201d7efb 100644
--- a/arch/sparc/kernel/sysfs.c
+++ b/arch/sparc/kernel/sysfs.c
@@ -103,9 +103,10 @@ static unsigned long run_on_cpu(unsigned long cpu,
                                 unsigned long (*func)(unsigned long),
                                 unsigned long arg)
 {
-        cpumask_t old_affinity = current->cpus_allowed;
+        cpumask_t old_affinity;
         unsigned long ret;
 
+        cpumask_copy(&old_affinity, tsk_cpus_allowed(current));
         /* should return -EINVAL to userspace */
         if (set_cpus_allowed_ptr(current, cpumask_of(cpu)))
                 return 0;
diff --git a/arch/sparc/kernel/systbls_32.S b/arch/sparc/kernel/systbls_32.S
index 47ac73c32e88..332c83ff7701 100644
--- a/arch/sparc/kernel/systbls_32.S
+++ b/arch/sparc/kernel/systbls_32.S
@@ -84,4 +84,4 @@ sys_call_table:
 /*320*/ .long sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv
 /*325*/ .long sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init
 /*330*/ .long sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime
-/*335*/ .long sys_syncfs
+/*335*/ .long sys_syncfs, sys_sendmmsg
diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S
index 4f3170c1ef47..43887ca0be0e 100644
--- a/arch/sparc/kernel/systbls_64.S
+++ b/arch/sparc/kernel/systbls_64.S
@@ -85,7 +85,7 @@ sys_call_table32:
 /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, compat_sys_preadv
         .word compat_sys_pwritev, compat_sys_rt_tgsigqueueinfo, sys_perf_event_open, compat_sys_recvmmsg, sys_fanotify_init
 /*330*/ .word sys32_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, compat_sys_open_by_handle_at, compat_sys_clock_adjtime
-        .word sys_syncfs
+        .word sys_syncfs, compat_sys_sendmmsg
 
 #endif /* CONFIG_COMPAT */
 
@@ -162,4 +162,4 @@ sys_call_table:
 /*320*/ .word sys_dup3, sys_pipe2, sys_inotify_init1, sys_accept4, sys_preadv
         .word sys_pwritev, sys_rt_tgsigqueueinfo, sys_perf_event_open, sys_recvmmsg, sys_fanotify_init
 /*330*/ .word sys_fanotify_mark, sys_prlimit64, sys_name_to_handle_at, sys_open_by_handle_at, sys_clock_adjtime
-        .word sys_syncfs
+        .word sys_syncfs, sys_sendmmsg
diff --git a/arch/sparc/kernel/time_32.c b/arch/sparc/kernel/time_32.c
index 96046a4024c2..1060e0672a4b 100644
--- a/arch/sparc/kernel/time_32.c
+++ b/arch/sparc/kernel/time_32.c
@@ -228,14 +228,10 @@ static void __init sbus_time_init(void)
 
 void __init time_init(void)
 {
-#ifdef CONFIG_PCI
-        extern void pci_time_init(void);
-        if (pcic_present()) {
+        if (pcic_present())
                 pci_time_init();
-                return;
-        }
-#endif
-        sbus_time_init();
+        else
+                sbus_time_init();
 }
 
 
diff --git a/arch/sparc/kernel/us2e_cpufreq.c b/arch/sparc/kernel/us2e_cpufreq.c
index 8f982b76c712..531d54fc9829 100644
--- a/arch/sparc/kernel/us2e_cpufreq.c
+++ b/arch/sparc/kernel/us2e_cpufreq.c
@@ -237,7 +237,7 @@ static unsigned int us2e_freq_get(unsigned int cpu)
         if (!cpu_online(cpu))
                 return 0;
 
-        cpus_allowed = current->cpus_allowed;
+        cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
 
         clock_tick = sparc64_get_clock_tick(cpu) / 1000;
@@ -258,7 +258,7 @@ static void us2e_set_cpu_divider_index(unsigned int cpu, unsigned int index)
         if (!cpu_online(cpu))
                 return;
 
-        cpus_allowed = current->cpus_allowed;
+        cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
 
         new_freq = clock_tick = sparc64_get_clock_tick(cpu) / 1000;
diff --git a/arch/sparc/kernel/us3_cpufreq.c b/arch/sparc/kernel/us3_cpufreq.c
index f35d1e794548..9a8ceb700833 100644
--- a/arch/sparc/kernel/us3_cpufreq.c
+++ b/arch/sparc/kernel/us3_cpufreq.c
@@ -85,7 +85,7 @@ static unsigned int us3_freq_get(unsigned int cpu)
         if (!cpu_online(cpu))
                 return 0;
 
-        cpus_allowed = current->cpus_allowed;
+        cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
 
         reg = read_safari_cfg();
@@ -105,7 +105,7 @@ static void us3_set_cpu_divider_index(unsigned int cpu, unsigned int index)
         if (!cpu_online(cpu))
                 return;
 
-        cpus_allowed = current->cpus_allowed;
+        cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
 
         new_freq = sparc64_get_clock_tick(cpu) / 1000;
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index 92b557afe535..c0220759003e 100644
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -108,7 +108,7 @@ SECTIONS
                 __sun4v_2insn_patch_end = .;
         }
 
-        PERCPU(SMP_CACHE_BYTES, PAGE_SIZE)
+        PERCPU_SECTION(SMP_CACHE_BYTES)
 
         . = ALIGN(PAGE_SIZE);
         __init_end = .;
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index 846d1c4374ea..7f01b8fce8bc 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -15,7 +15,6 @@ lib-$(CONFIG_SPARC32) += divdi3.o udivdi3.o
 lib-$(CONFIG_SPARC32) += copy_user.o locks.o
 lib-y                 += atomic_$(BITS).o
 lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o
-lib-$(CONFIG_SPARC32) += rwsem_32.o
 lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o
 
 lib-$(CONFIG_SPARC64) += copy_page.o clear_page.o bzero.o
diff --git a/arch/sparc/lib/rwsem_32.S b/arch/sparc/lib/rwsem_32.S
deleted file mode 100644
index 9675268e7fde..000000000000
--- a/arch/sparc/lib/rwsem_32.S
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Assembly part of rw semaphores.
- *
- * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
- */
-
-#include <asm/ptrace.h>
-#include <asm/psr.h>
-
-        .section .sched.text, "ax"
-        .align  4
-
-        .globl          ___down_read
-___down_read:
-        rd              %psr, %g3
-        nop
-        nop
-        nop
-        or              %g3, PSR_PIL, %g7
-        wr              %g7, 0, %psr
-        nop
-        nop
-        nop
-#ifdef CONFIG_SMP
-1:      ldstub          [%g1 + 4], %g7
-        tst             %g7
-        bne             1b
-         ld             [%g1], %g7
-        sub             %g7, 1, %g7
-        st              %g7, [%g1]
-        stb             %g0, [%g1 + 4]
-#else
-        ld              [%g1], %g7
-        sub             %g7, 1, %g7
-        st              %g7, [%g1]
-#endif
-        wr              %g3, 0, %psr
-        add             %g7, 1, %g7
-        nop
-        nop
-        subcc           %g7, 1, %g7
-        bneg            3f
-         nop
-2:      jmpl            %o7, %g0
-         mov            %g4, %o7
-3:      save            %sp, -64, %sp
-        mov             %g1, %l1
-        mov             %g4, %l4
-        bcs             4f
-         mov            %g5, %l5
-        call            down_read_failed
-         mov            %l1, %o0
-        mov             %l1, %g1
-        mov             %l4, %g4
-        ba              ___down_read
-         restore        %l5, %g0, %g5
-4:      call            down_read_failed_biased
-         mov            %l1, %o0
-        mov             %l1, %g1
-        mov             %l4, %g4
-        ba              2b
-         restore        %l5, %g0, %g5
-
-        .globl          ___down_write
-___down_write:
-        rd              %psr, %g3
-        nop
-        nop
-        nop
-        or              %g3, PSR_PIL, %g7
-        wr              %g7, 0, %psr
-        sethi           %hi(0x01000000), %g2
-        nop
-        nop
-#ifdef CONFIG_SMP
-1:      ldstub          [%g1 + 4], %g7
-        tst             %g7
-        bne             1b
-         ld             [%g1], %g7
-        sub             %g7, %g2, %g7
-        st              %g7, [%g1]
-        stb             %g0, [%g1 + 4]
-#else
-        ld              [%g1], %g7
-        sub             %g7, %g2, %g7
-        st              %g7, [%g1]
-#endif
-        wr              %g3, 0, %psr
-        add             %g7, %g2, %g7
-        nop
-        nop
-        subcc           %g7, %g2, %g7
-        bne             3f
-         nop
-2:      jmpl            %o7, %g0
-         mov            %g4, %o7
-3:      save            %sp, -64, %sp
-        mov             %g1, %l1
-        mov             %g4, %l4
-        bcs             4f
-         mov            %g5, %l5
-        call            down_write_failed
-         mov            %l1, %o0
-        mov             %l1, %g1
-        mov             %l4, %g4
-        ba              ___down_write
-         restore        %l5, %g0, %g5
-4:      call            down_write_failed_biased
-         mov            %l1, %o0
-        mov             %l1, %g1
-        mov             %l4, %g4
-        ba              2b
-         restore        %l5, %g0, %g5
-
-        .text
-        .globl          ___up_read
-___up_read:
-        rd              %psr, %g3
-        nop
-        nop
-        nop
-        or              %g3, PSR_PIL, %g7
-        wr              %g7, 0, %psr
-        nop
-        nop
-        nop
-#ifdef CONFIG_SMP
-1:      ldstub          [%g1 + 4], %g7
-        tst             %g7
-        bne             1b
-         ld             [%g1], %g7
-        add             %g7, 1, %g7
-        st              %g7, [%g1]
-        stb             %g0, [%g1 + 4]
-#else
-        ld              [%g1], %g7
-        add             %g7, 1, %g7
-        st              %g7, [%g1]
-#endif
-        wr              %g3, 0, %psr
-        nop
-        nop
-        nop
-        cmp             %g7, 0
-        be              3f
-         nop
-2:      jmpl            %o7, %g0
-         mov            %g4, %o7
-3:      save            %sp, -64, %sp
-        mov             %g1, %l1
-        mov             %g4, %l4
-        mov             %g5, %l5
-        clr             %o1
-        call            __rwsem_wake
-         mov            %l1, %o0
-        mov             %l1, %g1
-        mov             %l4, %g4
-        ba              2b
-         restore        %l5, %g0, %g5
-
-        .globl          ___up_write
-___up_write:
-        rd              %psr, %g3
-        nop
-        nop
-        nop
-        or              %g3, PSR_PIL, %g7
-        wr              %g7, 0, %psr
-        sethi           %hi(0x01000000), %g2
-        nop
-        nop
-#ifdef CONFIG_SMP
-1:      ldstub          [%g1 + 4], %g7
-        tst             %g7
-        bne             1b
-         ld             [%g1], %g7
-        add             %g7, %g2, %g7
-        st              %g7, [%g1]
-        stb             %g0, [%g1 + 4]
-#else
-        ld              [%g1], %g7
-        add             %g7, %g2, %g7
-        st              %g7, [%g1]
-#endif
-        wr              %g3, 0, %psr
-        sub             %g7, %g2, %g7
-        nop
-        nop
-        addcc           %g7, %g2, %g7
-        bcs             3f
-         nop
-2:      jmpl            %o7, %g0
-         mov            %g4, %o7
-3:      save            %sp, -64, %sp
-        mov             %g1, %l1
-        mov             %g4, %l4
-        mov             %g5, %l5
-        mov             %g7, %o1
-        call            __rwsem_wake
-         mov            %l1, %o0
-        mov             %l1, %g1
-        mov             %l4, %g4
-        ba              2b
-         restore        %l5, %g0, %g5
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index 4c31e2b6e71b..ca217327e8d2 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -37,8 +37,6 @@
 #include <asm/prom.h>
 #include <asm/leon.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 unsigned long *sparc_valid_addr_bitmap;
 EXPORT_SYMBOL(sparc_valid_addr_bitmap);
 
@@ -78,7 +76,7 @@ void __init kmap_init(void)
 void show_mem(unsigned int filter)
 {
         printk("Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
         printk("Free swap:       %6ldkB\n",
                nr_swap_pages << (PAGE_SHIFT-10));
         printk("%ld pages of RAM\n", totalram_pages);
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 2f6ae1d1fb6b..e10cd03fab80 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -862,7 +862,7 @@ static void init_node_masks_nonnuma(void)
         for (i = 0; i < NR_CPUS; i++)
                 numa_cpu_lookup_table[i] = 0;
 
-        numa_cpumask_lookup_table[0] = CPU_MASK_ALL;
+        cpumask_setall(&numa_cpumask_lookup_table[0]);
 }
 
 #ifdef CONFIG_NEED_MULTIPLE_NODES
@@ -1080,7 +1080,7 @@ static void __init numa_parse_mdesc_group_cpus(struct mdesc_handle *md,
 {
         u64 arc;
 
-        cpus_clear(*mask);
+        cpumask_clear(mask);
 
         mdesc_for_each_arc(arc, md, grp, MDESC_ARC_TYPE_BACK) {
                 u64 target = mdesc_arc_target(md, arc);
@@ -1091,7 +1091,7 @@ static void __init numa_parse_mdesc_group_cpus(struct mdesc_handle *md,
                         continue;
                 id = mdesc_get_property(md, target, "id", NULL);
                 if (*id < nr_cpu_ids)
-                        cpu_set(*id, *mask);
+                        cpumask_set_cpu(*id, mask);
         }
 }
 
@@ -1153,13 +1153,13 @@ static int __init numa_parse_mdesc_group(struct mdesc_handle *md, u64 grp,
 
         numa_parse_mdesc_group_cpus(md, grp, &mask);
 
-        for_each_cpu_mask(cpu, mask)
+        for_each_cpu(cpu, &mask)
                 numa_cpu_lookup_table[cpu] = index;
-        numa_cpumask_lookup_table[index] = mask;
+        cpumask_copy(&numa_cpumask_lookup_table[index], &mask);
 
         if (numa_debug) {
                 printk(KERN_INFO "NUMA GROUP[%d]: cpus [ ", index);
-                for_each_cpu_mask(cpu, mask)
+                for_each_cpu(cpu, &mask)
                         printk("%d ", cpu);
                 printk("]\n");
         }
@@ -1218,7 +1218,7 @@ static int __init numa_parse_jbus(void)
         index = 0;
         for_each_present_cpu(cpu) {
                 numa_cpu_lookup_table[cpu] = index;
-                numa_cpumask_lookup_table[index] = cpumask_of_cpu(cpu);
+                cpumask_copy(&numa_cpumask_lookup_table[index], cpumask_of(cpu));
                 node_masks[index].mask = ~((1UL << 36UL) - 1UL);
                 node_masks[index].val = cpu << 36UL;
 
diff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c
index d8f21e24a82f..b1f279cd00bf 100644
--- a/arch/sparc/mm/tlb.c
+++ b/arch/sparc/mm/tlb.c
@@ -19,33 +19,34 @@
 
 /* Heavily inspired by the ppc64 code.  */
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+static DEFINE_PER_CPU(struct tlb_batch, tlb_batch);
 
 void flush_tlb_pending(void)
 {
-        struct mmu_gather *mp = &get_cpu_var(mmu_gathers);
+        struct tlb_batch *tb = &get_cpu_var(tlb_batch);
 
-        if (mp->tlb_nr) {
-                flush_tsb_user(mp);
+        if (tb->tlb_nr) {
+                flush_tsb_user(tb);
 
-                if (CTX_VALID(mp->mm->context)) {
+                if (CTX_VALID(tb->mm->context)) {
 #ifdef CONFIG_SMP
-                        smp_flush_tlb_pending(mp->mm, mp->tlb_nr,
-                                              &mp->vaddrs[0]);
+                        smp_flush_tlb_pending(tb->mm, tb->tlb_nr,
+                                              &tb->vaddrs[0]);
 #else
-                        __flush_tlb_pending(CTX_HWBITS(mp->mm->context),
-                                            mp->tlb_nr, &mp->vaddrs[0]);
+                        __flush_tlb_pending(CTX_HWBITS(tb->mm->context),
+                                            tb->tlb_nr, &tb->vaddrs[0]);
 #endif
                 }
-                mp->tlb_nr = 0;
+                tb->tlb_nr = 0;
         }
 
-        put_cpu_var(mmu_gathers);
+        put_cpu_var(tlb_batch);
 }
 
-void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t orig)
+void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr,
+                   pte_t *ptep, pte_t orig, int fullmm)
 {
-        struct mmu_gather *mp = &__get_cpu_var(mmu_gathers);
+        struct tlb_batch *tb = &get_cpu_var(tlb_batch);
         unsigned long nr;
 
         vaddr &= PAGE_MASK;
@@ -77,21 +78,25 @@ void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t
 
 no_cache_flush:
 
-        if (mp->fullmm)
+        if (fullmm) {
+                put_cpu_var(tlb_batch);
                 return;
+        }
 
-        nr = mp->tlb_nr;
+        nr = tb->tlb_nr;
 
-        if (unlikely(nr != 0 && mm != mp->mm)) {
+        if (unlikely(nr != 0 && mm != tb->mm)) {
                 flush_tlb_pending();
                 nr = 0;
         }
 
         if (nr == 0)
-                mp->mm = mm;
+                tb->mm = mm;
 
-        mp->vaddrs[nr] = vaddr;
-        mp->tlb_nr = ++nr;
+        tb->vaddrs[nr] = vaddr;
+        tb->tlb_nr = ++nr;
         if (nr >= TLB_BATCH_NR)
                 flush_tlb_pending();
+
+        put_cpu_var(tlb_batch);
 }
diff --git a/arch/sparc/mm/tsb.c b/arch/sparc/mm/tsb.c
index 101d7c82870b..948461513499 100644
--- a/arch/sparc/mm/tsb.c
+++ b/arch/sparc/mm/tsb.c
@@ -47,12 +47,13 @@ void flush_tsb_kernel_range(unsigned long start, unsigned long end)
         }
 }
 
-static void __flush_tsb_one(struct mmu_gather *mp, unsigned long hash_shift, unsigned long tsb, unsigned long nentries)
+static void __flush_tsb_one(struct tlb_batch *tb, unsigned long hash_shift,
+                            unsigned long tsb, unsigned long nentries)
 {
         unsigned long i;
 
-        for (i = 0; i < mp->tlb_nr; i++) {
-                unsigned long v = mp->vaddrs[i];
+        for (i = 0; i < tb->tlb_nr; i++) {
+                unsigned long v = tb->vaddrs[i];
                 unsigned long tag, ent, hash;
 
                 v &= ~0x1UL;
@@ -65,9 +66,9 @@ static void __flush_tsb_one(struct mmu_gather *mp, unsigned long hash_shift, uns
         }
 }
 
-void flush_tsb_user(struct mmu_gather *mp)
+void flush_tsb_user(struct tlb_batch *tb)
 {
-        struct mm_struct *mm = mp->mm;
+        struct mm_struct *mm = tb->mm;
         unsigned long nentries, base, flags;
 
         spin_lock_irqsave(&mm->context.lock, flags);
@@ -76,7 +77,7 @@ void flush_tsb_user(struct mmu_gather *mp)
         nentries = mm->context.tsb_block[MM_TSB_BASE].tsb_nentries;
         if (tlb_type == cheetah_plus || tlb_type == hypervisor)
                 base = __pa(base);
-        __flush_tsb_one(mp, PAGE_SHIFT, base, nentries);
+        __flush_tsb_one(tb, PAGE_SHIFT, base, nentries);
 
 #ifdef CONFIG_HUGETLB_PAGE
         if (mm->context.tsb_block[MM_TSB_HUGE].tsb) {
@@ -84,7 +85,7 @@ void flush_tsb_user(struct mmu_gather *mp)
                 nentries = mm->context.tsb_block[MM_TSB_HUGE].tsb_nentries;
                 if (tlb_type == cheetah_plus || tlb_type == hypervisor)
                         base = __pa(base);
-                __flush_tsb_one(mp, HPAGE_SHIFT, base, nentries);
+                __flush_tsb_one(tb, HPAGE_SHIFT, base, nentries);
         }
 #endif
         spin_unlock_irqrestore(&mm->context.lock, flags);
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index e32b0c23c4c8..635e1bfb1c5d 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -339,6 +339,14 @@ config NO_IOPORT
 
 source "drivers/pci/Kconfig"
 
+config HOTPLUG
+        bool "Support for hot-pluggable devices"
+        ---help---
+          Say Y here if you want to plug devices into your computer while
+          the system is running, and be able to use them quickly.  In many
+          cases, the devices can likewise be unplugged at any time too.
+          One well-known example of this is USB.
+
 source "drivers/pci/hotplug/Kconfig"
 
 endmenu
diff --git a/arch/tile/Kconfig.debug b/arch/tile/Kconfig.debug
index 9bc161a02c71..ddbfc3322d7f 100644
--- a/arch/tile/Kconfig.debug
+++ b/arch/tile/Kconfig.debug
@@ -21,15 +21,6 @@ config DEBUG_STACKOVERFLOW
           This option will cause messages to be printed if free stack space
           drops below a certain limit.
 
-config DEBUG_STACK_USAGE
-        bool "Stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        help
-          Enables the display of the minimum amount of free stack which each
-          task has ever had available in the sysrq-T and sysrq-P debug output.
-
-          This option will slow down process creation somewhat.
-
 config DEBUG_EXTRA_FLAGS
         string "Additional compiler arguments when building with '-g'"
         depends on DEBUG_INFO
diff --git a/arch/tile/configs/tile_defconfig b/arch/tile/configs/tile_defconfig
deleted file mode 100644
index 0fe54445fda5..000000000000
--- a/arch/tile/configs/tile_defconfig
+++ /dev/null
@@ -1,71 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="usr/contents.txt"
-CONFIG_EXPERT=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_PROFILING=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_HZ_100=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_NETDEVICES=y
-CONFIG_TUN=y
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-# CONFIG_HID_SUPPORT is not set
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_INTF_SYSFS is not set
-# CONFIG_RTC_INTF_PROC is not set
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-CONFIG_FUSE_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=m
-CONFIG_TMPFS=y
-CONFIG_HUGETLBFS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEBUG_SPINLOCK_SLEEP=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_VM=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_DEBUG_EXTRA_FLAGS="-femit-struct-debug-baseonly"
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
new file mode 100644
index 000000000000..09f1c7fad8bf
--- /dev/null
+++ b/arch/tile/configs/tilegx_defconfig
@@ -0,0 +1,1833 @@
+#
+# Automatically generated make config: don't edit
+# Linux/tilegx 2.6.39-rc5 Kernel Configuration
+# Wed May  4 11:08:04 2011
+#
+CONFIG_TILE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CSUM=y
+CONFIG_SEMAPHORE_SLEEPERS=y
+CONFIG_HAVE_ARCH_ALLOC_REMAP=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_DEFAULT_MIGRATION_COST=10000000
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_SMP=y
+# CONFIG_DEBUG_COPY_FROM_USER is not set
+CONFIG_HVC_TILE=y
+CONFIG_TILEGX=y
+CONFIG_64BIT=y
+CONFIG_ARCH_DEFCONFIG="arch/tile/configs/tilegx_defconfig"
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_FHANDLE is not set
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_AUDIT=y
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=64
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_CGROUPS=y
+CONFIG_CGROUP_DEBUG=y
+CONFIG_CGROUP_NS=y
+# CONFIG_CGROUP_FREEZER is not set
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
+CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="usr/contents.txt"
+CONFIG_INITRAMFS_ROOT_UID=0
+CONFIG_INITRAMFS_ROOT_GID=0
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_RD_LZO is not set
+CONFIG_INITRAMFS_COMPRESSION_NONE=y
+# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EXPERT=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_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_EMBEDDED=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=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_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_INTEGRITY=y
+# CONFIG_BLK_DEV_THROTTLING is not set
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PADATA=y
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+
+#
+# Tilera-specific configuration
+#
+CONFIG_NR_CPUS=100
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+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_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+# CONFIG_HIGHMEM is not set
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=2
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_DISCONTIGMEM_MANUAL=y
+CONFIG_DISCONTIGMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_COMPACTION is not set
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_VMALLOC_RESERVE=0x1000000
+CONFIG_HARDWALL=y
+CONFIG_KERNEL_PL=1
+
+#
+# Bus options
+#
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_NO_IOMEM is not set
+# CONFIG_NO_IOPORT is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+CONFIG_PCI_DEBUG=y
+# CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_KCORE_ELF=y
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+# CONFIG_NET_IPGRE_DEMUX is not set
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+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_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+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_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+# CONFIG_IPV6_SUBTREES is not set
+CONFIG_IPV6_MROUTE=y
+# CONFIG_IPV6_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_NETLABEL=y
+CONFIG_NETWORK_SECMARK=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+# CONFIG_NF_CONNTRACK_SNMP is not set
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+# CONFIG_NF_CT_NETLINK is not set
+CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+
+#
+# Xtables targets
+#
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=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_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# CONFIG_IP_SET is not set
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# 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_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=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 is not set
+# CONFIG_IP_VS_SH is not set
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+# CONFIG_IP_VS_NFCT is not set
+# CONFIG_IP_VS_PE_SIP is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=y
+CONFIG_NF_CONNTRACK_IPV4=y
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+# CONFIG_NF_NAT is not set
+CONFIG_IP_NF_MANGLE=m
+# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+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_IP6=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_BRIDGE_EBT_NFLOG=m
+# 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_RDS=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_L2TP is not set
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_NET_DSA_MV88E6XXX=y
+CONFIG_NET_DSA_MV88E6060=y
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=y
+CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+CONFIG_PHONET=m
+# CONFIG_IEEE802154 is not set
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+# CONFIG_NET_SCH_SFB is not set
+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_DRR=m
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_CHOKE is not set
+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_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+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=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+# CONFIG_NET_ACT_CSUM is not set
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+# CONFIG_WIRELESS is not set
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+# CONFIG_MTD is not set
+# CONFIG_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=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_DRBD is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+CONFIG_ATA_OVER_ETH=y
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_APDS9802ALS is not set
+# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
+# CONFIG_DS1682 is not set
+# CONFIG_BMP085 is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_AT24 is not set
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_MAX6875 is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_CB710_CORE is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_SENSORS_LIS3_I2C is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=m
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+# 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 is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+CONFIG_SCSI_SAS_ATTRS=m
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_SCSI_BNX2X_FCOE is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS 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_MVSAS is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_FCOE is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN 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_DEBUG is not set
+# CONFIG_SCSI_PMCRAID is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_AHCI_PLATFORM is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_SATA_ACARD_AHCI is not set
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_SVW is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+
+#
+# PATA SFF controllers with BMDMA
+#
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARASAN_CF is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_ATP867X is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5536 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR 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_IT8213 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RDC is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_TOSHIBA is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+
+#
+# PIO-only SFF controllers
+#
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_RZ1000 is not set
+
+#
+# Generic fallback / legacy drivers
+#
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_LEGACY is not set
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MULTICORE_RAID456=y
+# CONFIG_MD_MULTIPATH is not set
+CONFIG_MD_FAULTY=m
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_DEBUG=y
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_MIRROR=m
+# CONFIG_DM_RAID is not set
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+# CONFIG_DM_FLAKEY is not set
+# CONFIG_TARGET_CORE is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_I2O is not set
+CONFIG_NETDEVICES=y
+CONFIG_IFB=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=y
+CONFIG_VETH=m
+# CONFIG_ARCNET is not set
+# CONFIG_MII 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_BCM63XX_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_NET_ETHERNET is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+CONFIG_E1000E=m
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF 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_CNIC is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
+# CONFIG_JME is not set
+# CONFIG_STMMAC_ETH is not set
+# CONFIG_PCH_GBE is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+# CONFIG_WLAN is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+
+#
+# CAIF transport drivers
+#
+# CONFIG_TILE_NET is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VMXNET3 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
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_N_GSM is not set
+CONFIG_DEVKMEM=y
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MFD_HSU is not set
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_TTY_PRINTK is not set
+CONFIG_HVC_DRIVER=y
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_RAMOOPS is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=y
+# CONFIG_I2C_MUX is not set
+CONFIG_I2C_HELPER_AUTO=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_INTEL_MID is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_PXA_PCI is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_XILINX is not set
+# CONFIG_I2C_EG20T is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_STUB 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_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+CONFIG_MFD_SUPPORT=y
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_TPS6105X is not set
+# CONFIG_TPS6507X is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_PCF50633 is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_MFD_WL1273_CORE is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGA_ARB is not set
+# CONFIG_DRM is not set
+# CONFIG_STUB_POULSBO is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_UWB is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_NFC_DEVICES is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_DS3232 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_ISL12022 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_BQ32K is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+# CONFIG_RTC_DRV_RX8025 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_TILE=y
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT2_FS_XIP=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_FS_XIP=y
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_JBD2=y
+CONFIG_JBD2_DEBUG=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+# CONFIG_OCFS2_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_NILFS2_FS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_FANOTIFY is not set
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=y
+# CONFIG_QFMT_V1 is not set
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+# CONFIG_AUTOFS4_FS is not set
+CONFIG_FUSE_FS=y
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM 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=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_CONFIGFS_FS=m
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_ECRYPT_FS=m
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_LOGFS is not set
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+# CONFIG_SQUASHFS_XATTR is not set
+# CONFIG_SQUASHFS_LZO is not set
+# CONFIG_SQUASHFS_XZ is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_V4_1=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_DEPRECATED=y
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_CEPH_FS is not set
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_ACL is not set
+CONFIG_CIFS_EXPERIMENTAL=y
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+CONFIG_DLM_DEBUG=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=2048
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+CONFIG_HEADERS_CHECK=y
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_KMEMLEAK 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_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_REDUCED=y
+CONFIG_DEBUG_VM=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DEBUG_LIST=y
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+CONFIG_DEBUG_CREDENTIALS=y
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
+# CONFIG_LKDTM is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BUILD_DOCSRC is not set
+CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_SAMPLES is not set
+# CONFIG_TEST_KSTRTOX is not set
+CONFIG_EARLY_PRINTK=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_EXTRA_FLAGS=""
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+# CONFIG_SECURITY_PATH is not set
+CONFIG_LSM_MMAP_MIN_ADDR=65536
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_IMA is not set
+CONFIG_DEFAULT_SECURITY_SELINUX=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_DEFAULT_SECURITY="selinux"
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_SALSA20 is not set
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+# CONFIG_CRC_CCITT is not set
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=m
+CONFIG_AUDIT_GENERIC=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_LZO_COMPRESS=m
+CONFIG_LZO_DECOMPRESS=m
+# CONFIG_XZ_DEC is not set
+# CONFIG_XZ_DEC_BCJ is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
+CONFIG_NLATTR=y
+# CONFIG_AVERAGE is not set
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
new file mode 100644
index 000000000000..f58dc362b944
--- /dev/null
+++ b/arch/tile/configs/tilepro_defconfig
@@ -0,0 +1,1163 @@
+#
+# Automatically generated make config: don't edit
+# Linux/tile 2.6.39-rc5 Kernel Configuration
+# Tue May  3 09:15:02 2011
+#
+CONFIG_TILE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CSUM=y
+CONFIG_SEMAPHORE_SLEEPERS=y
+CONFIG_HAVE_ARCH_ALLOC_REMAP=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_DEFAULT_MIGRATION_COST=10000000
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_STRICT_DEVMEM=y
+CONFIG_SMP=y
+# CONFIG_DEBUG_COPY_FROM_USER is not set
+CONFIG_HVC_TILE=y
+# CONFIG_TILEGX is not set
+CONFIG_ARCH_DEFCONFIG="arch/tile/configs/tile_defconfig"
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_CONSTRUCTORS=y
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+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_FHANDLE=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_RCU_FANOUT=32
+# CONFIG_RCU_FANOUT_EXACT is not set
+# CONFIG_RCU_FAST_NO_HZ is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_CGROUPS is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="usr/contents.txt"
+CONFIG_INITRAMFS_ROOT_UID=0
+CONFIG_INITRAMFS_ROOT_GID=0
+CONFIG_RD_GZIP=y
+# CONFIG_RD_BZIP2 is not set
+# CONFIG_RD_LZMA is not set
+# CONFIG_RD_XZ is not set
+# CONFIG_RD_LZO is not set
+CONFIG_INITRAMFS_COMPRESSION_NONE=y
+# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_EXPERT=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_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_EMBEDDED=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_PCI_QUIRKS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_NOOP=y
+CONFIG_DEFAULT_IOSCHED="noop"
+# CONFIG_INLINE_SPIN_TRYLOCK is not set
+# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK is not set
+# CONFIG_INLINE_SPIN_LOCK_BH is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQ is not set
+# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
+# CONFIG_INLINE_SPIN_UNLOCK_BH is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_READ_TRYLOCK is not set
+# CONFIG_INLINE_READ_LOCK is not set
+# CONFIG_INLINE_READ_LOCK_BH is not set
+# CONFIG_INLINE_READ_LOCK_IRQ is not set
+# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
+CONFIG_INLINE_READ_UNLOCK=y
+# CONFIG_INLINE_READ_UNLOCK_BH is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
+# CONFIG_INLINE_WRITE_TRYLOCK is not set
+# CONFIG_INLINE_WRITE_LOCK is not set
+# CONFIG_INLINE_WRITE_LOCK_BH is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQ is not set
+# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
+# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+
+#
+# Tilera-specific configuration
+#
+CONFIG_NR_CPUS=64
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+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_SCHED_HRTICK=y
+# CONFIG_KEXEC is not set
+CONFIG_HIGHMEM=y
+CONFIG_NUMA=y
+CONFIG_NODES_SHIFT=2
+# CONFIG_VMSPLIT_3_75G is not set
+# CONFIG_VMSPLIT_3_5G is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2_75G is not set
+# CONFIG_VMSPLIT_2_5G is not set
+# CONFIG_VMSPLIT_2_25G is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_DISCONTIGMEM_MANUAL=y
+CONFIG_DISCONTIGMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_COMPACTION is not set
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_KSM is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_VMALLOC_RESERVE=0x1000000
+CONFIG_HARDWALL=y
+CONFIG_KERNEL_PL=1
+
+#
+# Bus options
+#
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_NO_IOMEM is not set
+# CONFIG_NO_IOPORT is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_STUB is not set
+# CONFIG_PCI_IOV is not set
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_KCORE_ELF=y
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE_DEMUX is not set
+# CONFIG_IP_MROUTE 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 is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO 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=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_SIT_6RD is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_L2TP is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_PHONET is not set
+# CONFIG_IEEE802154 is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+# CONFIG_BATMAN_ADV is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_WIRELESS is not set
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_DEVTMPFS is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+# CONFIG_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
+
+#
+# DRBD disabled because PROC_FS, INET or CONNECTOR not selected
+#
+# 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_BLK_DEV_RBD is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_CB710_CORE is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS 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
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
+# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_SCSI_BNX2X_FCOE is not set
+# CONFIG_BE2ISCSI is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_HPSA is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_3W_SAS 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_MVSAS is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_LIBFC is not set
+# CONFIG_LIBFCOE is not set
+# CONFIG_FCOE is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN 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_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_PMCRAID is not set
+# CONFIG_SCSI_PM8001 is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_BFA_FC is not set
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_SCSI_OSD_INITIATOR is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_TARGET_CORE is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_FIREWIRE_NOSY is not set
+# CONFIG_I2O is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=y
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+# CONFIG_MII is not set
+# CONFIG_PHYLIB is not set
+# CONFIG_NET_ETHERNET is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_IGBVF 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_CNIC is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+# CONFIG_ATL1C is not set
+# CONFIG_JME is not set
+# CONFIG_STMMAC_ETH is not set
+# CONFIG_PCH_GBE is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+# CONFIG_WLAN is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+# CONFIG_WAN is not set
+
+#
+# CAIF transport drivers
+#
+CONFIG_TILE_NET=y
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_VMXNET3 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
+# CONFIG_INPUT_SPARSEKMAP is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+# CONFIG_N_GSM is not set
+CONFIG_DEVKMEM=y
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MFD_HSU is not set
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_TIMBERDALE is not set
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_TTY_PRINTK is not set
+CONFIG_HVC_DRIVER=y
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_RAMOOPS is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+
+#
+# PPS support
+#
+# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SCH5627 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_THERMAL is not set
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_NOWAYOUT=y
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_ALIM7101_WDT is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+CONFIG_MFD_SUPPORT=y
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_ABX500_CORE is not set
+# CONFIG_LPC_SCH is not set
+# CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_VX855 is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_MEDIA_SUPPORT is not set
+
+#
+# Graphics support
+#
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+# CONFIG_DRM is not set
+# CONFIG_STUB_POULSBO is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# 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
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+
+#
+# Enable Host or Gadget support to see Inventra options
+#
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_UWB is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_NFC_DEVICES is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+CONFIG_EDAC=y
+
+#
+# Reporting subsystems
+#
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_MM_EDAC=y
+CONFIG_EDAC_TILE=y
+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 is not set
+# CONFIG_RTC_INTF_PROC is not set
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_MSM6242 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_RP5C01 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_TILE=y
+# CONFIG_DMADEVICES is not set
+# CONFIG_AUXDISPLAY is not set
+# CONFIG_UIO is not set
+# CONFIG_STAGING 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_DEFAULTS_TO_ORDERED is not set
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_NILFS2_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_FANOTIFY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_QUOTACTL is not set
+# CONFIG_AUTOFS4_FS is not set
+CONFIG_FUSE_FS=y
+# CONFIG_CUSE is not set
+
+#
+# Caches
+#
+# CONFIG_FSCACHE is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# 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_LOGFS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_PSTORE is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFSD is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_CEPH_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=2048
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_HARDLOCKUP_DETECTOR is not set
+CONFIG_DETECT_HUNG_TASK=y
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_KMEMLEAK 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_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_LOCK_STAT is not set
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+CONFIG_DEBUG_VM=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_ENABLE_DEFAULT_TRACERS is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_TEST_KSTRTOX is not set
+CONFIG_EARLY_PRINTK=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DEBUG_EXTRA_FLAGS="-femit-struct-debug-baseonly"
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
+CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI2=m
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=m
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_PCRYPT is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_VMAC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_GHASH is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_ZLIB is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_BINARY_PRINTF is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+# CONFIG_XZ_DEC is not set
+# CONFIG_XZ_DEC_BCJ is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CPU_RMAP=y
+CONFIG_NLATTR=y
+# CONFIG_AVERAGE is not set
+CONFIG_HAVE_KVM=y
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/tile/include/arch/chip_tilegx.h b/arch/tile/include/arch/chip_tilegx.h
new file mode 100644
index 000000000000..ea8e4f2c9483
--- /dev/null
+++ b/arch/tile/include/arch/chip_tilegx.h
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+/*
+ * @file
+ * Global header file.
+ * This header file specifies defines for TILE-Gx.
+ */
+
+#ifndef __ARCH_CHIP_H__
+#define __ARCH_CHIP_H__
+
+/** Specify chip version.
+ * When possible, prefer the CHIP_xxx symbols below for future-proofing.
+ * This is intended for cross-compiling; native compilation should
+ * use the predefined __tile_chip__ symbol.
+ */
+#define TILE_CHIP 10
+
+/** Specify chip revision.
+ * This provides for the case of a respin of a particular chip type;
+ * the normal value for this symbol is "0".
+ * This is intended for cross-compiling; native compilation should
+ * use the predefined __tile_chip_rev__ symbol.
+ */
+#define TILE_CHIP_REV 0
+
+/** The name of this architecture. */
+#define CHIP_ARCH_NAME "tilegx"
+
+/** The ELF e_machine type for binaries for this chip. */
+#define CHIP_ELF_TYPE() EM_TILEGX
+
+/** The alternate ELF e_machine type for binaries for this chip. */
+#define CHIP_COMPAT_ELF_TYPE() 0x2597
+
+/** What is the native word size of the machine? */
+#define CHIP_WORD_SIZE() 64
+
+/** How many bits of a virtual address are used. Extra bits must be
+ * the sign extension of the low bits.
+ */
+#define CHIP_VA_WIDTH() 42
+
+/** How many bits are in a physical address? */
+#define CHIP_PA_WIDTH() 40
+
+/** Size of the L2 cache, in bytes. */
+#define CHIP_L2_CACHE_SIZE() 262144
+
+/** Log size of an L2 cache line in bytes. */
+#define CHIP_L2_LOG_LINE_SIZE() 6
+
+/** Size of an L2 cache line, in bytes. */
+#define CHIP_L2_LINE_SIZE() (1 << CHIP_L2_LOG_LINE_SIZE())
+
+/** Associativity of the L2 cache. */
+#define CHIP_L2_ASSOC() 8
+
+/** Size of the L1 data cache, in bytes. */
+#define CHIP_L1D_CACHE_SIZE() 32768
+
+/** Log size of an L1 data cache line in bytes. */
+#define CHIP_L1D_LOG_LINE_SIZE() 6
+
+/** Size of an L1 data cache line, in bytes. */
+#define CHIP_L1D_LINE_SIZE() (1 << CHIP_L1D_LOG_LINE_SIZE())
+
+/** Associativity of the L1 data cache. */
+#define CHIP_L1D_ASSOC() 2
+
+/** Size of the L1 instruction cache, in bytes. */
+#define CHIP_L1I_CACHE_SIZE() 32768
+
+/** Log size of an L1 instruction cache line in bytes. */
+#define CHIP_L1I_LOG_LINE_SIZE() 6
+
+/** Size of an L1 instruction cache line, in bytes. */
+#define CHIP_L1I_LINE_SIZE() (1 << CHIP_L1I_LOG_LINE_SIZE())
+
+/** Associativity of the L1 instruction cache. */
+#define CHIP_L1I_ASSOC() 2
+
+/** Stride with which flush instructions must be issued. */
+#define CHIP_FLUSH_STRIDE() CHIP_L2_LINE_SIZE()
+
+/** Stride with which inv instructions must be issued. */
+#define CHIP_INV_STRIDE() CHIP_L2_LINE_SIZE()
+
+/** Stride with which finv instructions must be issued. */
+#define CHIP_FINV_STRIDE() CHIP_L2_LINE_SIZE()
+
+/** Can the local cache coherently cache data that is homed elsewhere? */
+#define CHIP_HAS_COHERENT_LOCAL_CACHE() 1
+
+/** How many simultaneous outstanding victims can the L2 cache have? */
+#define CHIP_MAX_OUTSTANDING_VICTIMS() 128
+
+/** Does the TLB support the NC and NOALLOC bits? */
+#define CHIP_HAS_NC_AND_NOALLOC_BITS() 1
+
+/** Does the chip support hash-for-home caching? */
+#define CHIP_HAS_CBOX_HOME_MAP() 1
+
+/** Number of entries in the chip's home map tables. */
+#define CHIP_CBOX_HOME_MAP_SIZE() 128
+
+/** Do uncacheable requests miss in the cache regardless of whether
+ * there is matching data? */
+#define CHIP_HAS_ENFORCED_UNCACHEABLE_REQUESTS() 1
+
+/** Does the mf instruction wait for victims? */
+#define CHIP_HAS_MF_WAITS_FOR_VICTIMS() 0
+
+/** Does the chip have an "inv" instruction that doesn't also flush? */
+#define CHIP_HAS_INV() 1
+
+/** Does the chip have a "wh64" instruction? */
+#define CHIP_HAS_WH64() 1
+
+/** Does this chip have a 'dword_align' instruction? */
+#define CHIP_HAS_DWORD_ALIGN() 0
+
+/** Number of performance counters. */
+#define CHIP_PERFORMANCE_COUNTERS() 4
+
+/** Does this chip have auxiliary performance counters? */
+#define CHIP_HAS_AUX_PERF_COUNTERS() 1
+
+/** Is the CBOX_MSR1 SPR supported? */
+#define CHIP_HAS_CBOX_MSR1() 0
+
+/** Is the TILE_RTF_HWM SPR supported? */
+#define CHIP_HAS_TILE_RTF_HWM() 1
+
+/** Is the TILE_WRITE_PENDING SPR supported? */
+#define CHIP_HAS_TILE_WRITE_PENDING() 0
+
+/** Is the PROC_STATUS SPR supported? */
+#define CHIP_HAS_PROC_STATUS_SPR() 1
+
+/** Is the DSTREAM_PF SPR supported? */
+#define CHIP_HAS_DSTREAM_PF() 1
+
+/** Log of the number of mshims we have. */
+#define CHIP_LOG_NUM_MSHIMS() 2
+
+/** Are the bases of the interrupt vector areas fixed? */
+#define CHIP_HAS_FIXED_INTVEC_BASE() 0
+
+/** Are the interrupt masks split up into 2 SPRs? */
+#define CHIP_HAS_SPLIT_INTR_MASK() 0
+
+/** Is the cycle count split up into 2 SPRs? */
+#define CHIP_HAS_SPLIT_CYCLE() 0
+
+/** Does the chip have a static network? */
+#define CHIP_HAS_SN() 0
+
+/** Does the chip have a static network processor? */
+#define CHIP_HAS_SN_PROC() 0
+
+/** Size of the L1 static network processor instruction cache, in bytes. */
+/* #define CHIP_L1SNI_CACHE_SIZE() -- does not apply to chip 10 */
+
+/** Does the chip have DMA support in each tile? */
+#define CHIP_HAS_TILE_DMA() 0
+
+/** Does the chip have the second revision of the directly accessible
+ *  dynamic networks?  This encapsulates a number of characteristics,
+ *  including the absence of the catch-all, the absence of inline message
+ *  tags, the absence of support for network context-switching, and so on.
+ */
+#define CHIP_HAS_REV1_XDN() 1
+
+/** Does the chip have cmpexch and similar (fetchadd, exch, etc.)? */
+#define CHIP_HAS_CMPEXCH() 1
+
+/** Does the chip have memory-mapped I/O support? */
+#define CHIP_HAS_MMIO() 1
+
+/** Does the chip have post-completion interrupts? */
+#define CHIP_HAS_POST_COMPLETION_INTERRUPTS() 1
+
+/** Does the chip have native single step support? */
+#define CHIP_HAS_SINGLE_STEP() 1
+
+#ifndef __OPEN_SOURCE__  /* features only relevant to hypervisor-level code */
+
+/** How many entries are present in the instruction TLB? */
+#define CHIP_ITLB_ENTRIES() 16
+
+/** How many entries are present in the data TLB? */
+#define CHIP_DTLB_ENTRIES() 32
+
+/** How many MAF entries does the XAUI shim have? */
+#define CHIP_XAUI_MAF_ENTRIES() 32
+
+/** Does the memory shim have a source-id table? */
+#define CHIP_HAS_MSHIM_SRCID_TABLE() 0
+
+/** Does the L1 instruction cache clear on reset? */
+#define CHIP_HAS_L1I_CLEAR_ON_RESET() 1
+
+/** Does the chip come out of reset with valid coordinates on all tiles?
+ * Note that if defined, this also implies that the upper left is 1,1.
+ */
+#define CHIP_HAS_VALID_TILE_COORD_RESET() 1
+
+/** Does the chip have unified packet formats? */
+#define CHIP_HAS_UNIFIED_PACKET_FORMATS() 1
+
+/** Does the chip support write reordering? */
+#define CHIP_HAS_WRITE_REORDERING() 1
+
+/** Does the chip support Y-X routing as well as X-Y? */
+#define CHIP_HAS_Y_X_ROUTING() 1
+
+/** Is INTCTRL_3 managed with the correct MPL? */
+#define CHIP_HAS_INTCTRL_3_STATUS_FIX() 1
+
+/** Is it possible to configure the chip to be big-endian? */
+#define CHIP_HAS_BIG_ENDIAN_CONFIG() 1
+
+/** Is the CACHE_RED_WAY_OVERRIDDEN SPR supported? */
+#define CHIP_HAS_CACHE_RED_WAY_OVERRIDDEN() 0
+
+/** Is the DIAG_TRACE_WAY SPR supported? */
+#define CHIP_HAS_DIAG_TRACE_WAY() 0
+
+/** Is the MEM_STRIPE_CONFIG SPR supported? */
+#define CHIP_HAS_MEM_STRIPE_CONFIG() 1
+
+/** Are the TLB_PERF SPRs supported? */
+#define CHIP_HAS_TLB_PERF() 1
+
+/** Is the VDN_SNOOP_SHIM_CTL SPR supported? */
+#define CHIP_HAS_VDN_SNOOP_SHIM_CTL() 0
+
+/** Does the chip support rev1 DMA packets? */
+#define CHIP_HAS_REV1_DMA_PACKETS() 1
+
+/** Does the chip have an IPI shim? */
+#define CHIP_HAS_IPI() 1
+
+#endif /* !__OPEN_SOURCE__ */
+#endif /* __ARCH_CHIP_H__ */
diff --git a/arch/tile/include/arch/icache.h b/arch/tile/include/arch/icache.h
index 5c87c9016338..762eafa8a11e 100644
--- a/arch/tile/include/arch/icache.h
+++ b/arch/tile/include/arch/icache.h
@@ -16,7 +16,7 @@
 /**
  * @file
  *
- * Support for invalidating bytes in the instruction
+ * Support for invalidating bytes in the instruction cache.
  */
 
 #ifndef __ARCH_ICACHE_H__
@@ -30,11 +30,10 @@
  *
  * @param addr The start of memory to be invalidated.
  * @param size The number of bytes to be invalidated.
- * @param page_size The system's page size, typically the PAGE_SIZE constant
- * in sys/page.h.  This value must be a power of two no larger
- * than the page containing the code to be invalidated. If the value
- * is smaller than the actual page size, this function will still
- * work, but may run slower than necessary.
+ * @param page_size The system's page size, e.g. getpagesize() in userspace.
+ * This value must be a power of two no larger than the page containing
+ * the code to be invalidated. If the value is smaller than the actual page
+ * size, this function will still work, but may run slower than necessary.
  */
 static __inline void
 invalidate_icache(const void* addr, unsigned long size,
diff --git a/arch/tile/include/arch/interrupts_64.h b/arch/tile/include/arch/interrupts_64.h
new file mode 100644
index 000000000000..5bb58b2e4e6f
--- /dev/null
+++ b/arch/tile/include/arch/interrupts_64.h
@@ -0,0 +1,276 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#ifndef __ARCH_INTERRUPTS_H__
+#define __ARCH_INTERRUPTS_H__
+
+/** Mask for an interrupt. */
+#ifdef __ASSEMBLER__
+/* Note: must handle breaking interrupts into high and low words manually. */
+#define INT_MASK(intno) (1 << (intno))
+#else
+#define INT_MASK(intno) (1ULL << (intno))
+#endif
+
+
+/** Where a given interrupt executes */
+#define INTERRUPT_VECTOR(i, pl) (0xFC000000 + ((pl) << 24) + ((i) << 8))
+
+/** Where to store a vector for a given interrupt. */
+#define USER_INTERRUPT_VECTOR(i) INTERRUPT_VECTOR(i, 0)
+
+/** The base address of user-level interrupts. */
+#define USER_INTERRUPT_VECTOR_BASE INTERRUPT_VECTOR(0, 0)
+
+
+/** Additional synthetic interrupt. */
+#define INT_BREAKPOINT (63)
+
+#define INT_MEM_ERROR    0
+#define INT_SINGLE_STEP_3    1
+#define INT_SINGLE_STEP_2    2
+#define INT_SINGLE_STEP_1    3
+#define INT_SINGLE_STEP_0    4
+#define INT_IDN_COMPLETE    5
+#define INT_UDN_COMPLETE    6
+#define INT_ITLB_MISS    7
+#define INT_ILL    8
+#define INT_GPV    9
+#define INT_IDN_ACCESS   10
+#define INT_UDN_ACCESS   11
+#define INT_SWINT_3   12
+#define INT_SWINT_2   13
+#define INT_SWINT_1   14
+#define INT_SWINT_0   15
+#define INT_ILL_TRANS   16
+#define INT_UNALIGN_DATA   17
+#define INT_DTLB_MISS   18
+#define INT_DTLB_ACCESS   19
+#define INT_IDN_FIREWALL   20
+#define INT_UDN_FIREWALL   21
+#define INT_TILE_TIMER   22
+#define INT_AUX_TILE_TIMER   23
+#define INT_IDN_TIMER   24
+#define INT_UDN_TIMER   25
+#define INT_IDN_AVAIL   26
+#define INT_UDN_AVAIL   27
+#define INT_IPI_3   28
+#define INT_IPI_2   29
+#define INT_IPI_1   30
+#define INT_IPI_0   31
+#define INT_PERF_COUNT   32
+#define INT_AUX_PERF_COUNT   33
+#define INT_INTCTRL_3   34
+#define INT_INTCTRL_2   35
+#define INT_INTCTRL_1   36
+#define INT_INTCTRL_0   37
+#define INT_BOOT_ACCESS   38
+#define INT_WORLD_ACCESS   39
+#define INT_I_ASID   40
+#define INT_D_ASID   41
+#define INT_DOUBLE_FAULT   42
+
+#define NUM_INTERRUPTS 43
+
+#ifndef __ASSEMBLER__
+#define QUEUED_INTERRUPTS ( \
+    INT_MASK(INT_MEM_ERROR) | \
+    INT_MASK(INT_IDN_COMPLETE) | \
+    INT_MASK(INT_UDN_COMPLETE) | \
+    INT_MASK(INT_IDN_FIREWALL) | \
+    INT_MASK(INT_UDN_FIREWALL) | \
+    INT_MASK(INT_TILE_TIMER) | \
+    INT_MASK(INT_AUX_TILE_TIMER) | \
+    INT_MASK(INT_IDN_TIMER) | \
+    INT_MASK(INT_UDN_TIMER) | \
+    INT_MASK(INT_IDN_AVAIL) | \
+    INT_MASK(INT_UDN_AVAIL) | \
+    INT_MASK(INT_IPI_3) | \
+    INT_MASK(INT_IPI_2) | \
+    INT_MASK(INT_IPI_1) | \
+    INT_MASK(INT_IPI_0) | \
+    INT_MASK(INT_PERF_COUNT) | \
+    INT_MASK(INT_AUX_PERF_COUNT) | \
+    INT_MASK(INT_INTCTRL_3) | \
+    INT_MASK(INT_INTCTRL_2) | \
+    INT_MASK(INT_INTCTRL_1) | \
+    INT_MASK(INT_INTCTRL_0) | \
+    INT_MASK(INT_BOOT_ACCESS) | \
+    INT_MASK(INT_WORLD_ACCESS) | \
+    INT_MASK(INT_I_ASID) | \
+    INT_MASK(INT_D_ASID) | \
+    INT_MASK(INT_DOUBLE_FAULT) | \
+    0)
+#define NONQUEUED_INTERRUPTS ( \
+    INT_MASK(INT_SINGLE_STEP_3) | \
+    INT_MASK(INT_SINGLE_STEP_2) | \
+    INT_MASK(INT_SINGLE_STEP_1) | \
+    INT_MASK(INT_SINGLE_STEP_0) | \
+    INT_MASK(INT_ITLB_MISS) | \
+    INT_MASK(INT_ILL) | \
+    INT_MASK(INT_GPV) | \
+    INT_MASK(INT_IDN_ACCESS) | \
+    INT_MASK(INT_UDN_ACCESS) | \
+    INT_MASK(INT_SWINT_3) | \
+    INT_MASK(INT_SWINT_2) | \
+    INT_MASK(INT_SWINT_1) | \
+    INT_MASK(INT_SWINT_0) | \
+    INT_MASK(INT_ILL_TRANS) | \
+    INT_MASK(INT_UNALIGN_DATA) | \
+    INT_MASK(INT_DTLB_MISS) | \
+    INT_MASK(INT_DTLB_ACCESS) | \
+    0)
+#define CRITICAL_MASKED_INTERRUPTS ( \
+    INT_MASK(INT_MEM_ERROR) | \
+    INT_MASK(INT_SINGLE_STEP_3) | \
+    INT_MASK(INT_SINGLE_STEP_2) | \
+    INT_MASK(INT_SINGLE_STEP_1) | \
+    INT_MASK(INT_SINGLE_STEP_0) | \
+    INT_MASK(INT_IDN_COMPLETE) | \
+    INT_MASK(INT_UDN_COMPLETE) | \
+    INT_MASK(INT_IDN_FIREWALL) | \
+    INT_MASK(INT_UDN_FIREWALL) | \
+    INT_MASK(INT_TILE_TIMER) | \
+    INT_MASK(INT_AUX_TILE_TIMER) | \
+    INT_MASK(INT_IDN_TIMER) | \
+    INT_MASK(INT_UDN_TIMER) | \
+    INT_MASK(INT_IDN_AVAIL) | \
+    INT_MASK(INT_UDN_AVAIL) | \
+    INT_MASK(INT_IPI_3) | \
+    INT_MASK(INT_IPI_2) | \
+    INT_MASK(INT_IPI_1) | \
+    INT_MASK(INT_IPI_0) | \
+    INT_MASK(INT_PERF_COUNT) | \
+    INT_MASK(INT_AUX_PERF_COUNT) | \
+    INT_MASK(INT_INTCTRL_3) | \
+    INT_MASK(INT_INTCTRL_2) | \
+    INT_MASK(INT_INTCTRL_1) | \
+    INT_MASK(INT_INTCTRL_0) | \
+    0)
+#define CRITICAL_UNMASKED_INTERRUPTS ( \
+    INT_MASK(INT_ITLB_MISS) | \
+    INT_MASK(INT_ILL) | \
+    INT_MASK(INT_GPV) | \
+    INT_MASK(INT_IDN_ACCESS) | \
+    INT_MASK(INT_UDN_ACCESS) | \
+    INT_MASK(INT_SWINT_3) | \
+    INT_MASK(INT_SWINT_2) | \
+    INT_MASK(INT_SWINT_1) | \
+    INT_MASK(INT_SWINT_0) | \
+    INT_MASK(INT_ILL_TRANS) | \
+    INT_MASK(INT_UNALIGN_DATA) | \
+    INT_MASK(INT_DTLB_MISS) | \
+    INT_MASK(INT_DTLB_ACCESS) | \
+    INT_MASK(INT_BOOT_ACCESS) | \
+    INT_MASK(INT_WORLD_ACCESS) | \
+    INT_MASK(INT_I_ASID) | \
+    INT_MASK(INT_D_ASID) | \
+    INT_MASK(INT_DOUBLE_FAULT) | \
+    0)
+#define MASKABLE_INTERRUPTS ( \
+    INT_MASK(INT_MEM_ERROR) | \
+    INT_MASK(INT_SINGLE_STEP_3) | \
+    INT_MASK(INT_SINGLE_STEP_2) | \
+    INT_MASK(INT_SINGLE_STEP_1) | \
+    INT_MASK(INT_SINGLE_STEP_0) | \
+    INT_MASK(INT_IDN_COMPLETE) | \
+    INT_MASK(INT_UDN_COMPLETE) | \
+    INT_MASK(INT_IDN_FIREWALL) | \
+    INT_MASK(INT_UDN_FIREWALL) | \
+    INT_MASK(INT_TILE_TIMER) | \
+    INT_MASK(INT_AUX_TILE_TIMER) | \
+    INT_MASK(INT_IDN_TIMER) | \
+    INT_MASK(INT_UDN_TIMER) | \
+    INT_MASK(INT_IDN_AVAIL) | \
+    INT_MASK(INT_UDN_AVAIL) | \
+    INT_MASK(INT_IPI_3) | \
+    INT_MASK(INT_IPI_2) | \
+    INT_MASK(INT_IPI_1) | \
+    INT_MASK(INT_IPI_0) | \
+    INT_MASK(INT_PERF_COUNT) | \
+    INT_MASK(INT_AUX_PERF_COUNT) | \
+    INT_MASK(INT_INTCTRL_3) | \
+    INT_MASK(INT_INTCTRL_2) | \
+    INT_MASK(INT_INTCTRL_1) | \
+    INT_MASK(INT_INTCTRL_0) | \
+    0)
+#define UNMASKABLE_INTERRUPTS ( \
+    INT_MASK(INT_ITLB_MISS) | \
+    INT_MASK(INT_ILL) | \
+    INT_MASK(INT_GPV) | \
+    INT_MASK(INT_IDN_ACCESS) | \
+    INT_MASK(INT_UDN_ACCESS) | \
+    INT_MASK(INT_SWINT_3) | \
+    INT_MASK(INT_SWINT_2) | \
+    INT_MASK(INT_SWINT_1) | \
+    INT_MASK(INT_SWINT_0) | \
+    INT_MASK(INT_ILL_TRANS) | \
+    INT_MASK(INT_UNALIGN_DATA) | \
+    INT_MASK(INT_DTLB_MISS) | \
+    INT_MASK(INT_DTLB_ACCESS) | \
+    INT_MASK(INT_BOOT_ACCESS) | \
+    INT_MASK(INT_WORLD_ACCESS) | \
+    INT_MASK(INT_I_ASID) | \
+    INT_MASK(INT_D_ASID) | \
+    INT_MASK(INT_DOUBLE_FAULT) | \
+    0)
+#define SYNC_INTERRUPTS ( \
+    INT_MASK(INT_SINGLE_STEP_3) | \
+    INT_MASK(INT_SINGLE_STEP_2) | \
+    INT_MASK(INT_SINGLE_STEP_1) | \
+    INT_MASK(INT_SINGLE_STEP_0) | \
+    INT_MASK(INT_IDN_COMPLETE) | \
+    INT_MASK(INT_UDN_COMPLETE) | \
+    INT_MASK(INT_ITLB_MISS) | \
+    INT_MASK(INT_ILL) | \
+    INT_MASK(INT_GPV) | \
+    INT_MASK(INT_IDN_ACCESS) | \
+    INT_MASK(INT_UDN_ACCESS) | \
+    INT_MASK(INT_SWINT_3) | \
+    INT_MASK(INT_SWINT_2) | \
+    INT_MASK(INT_SWINT_1) | \
+    INT_MASK(INT_SWINT_0) | \
+    INT_MASK(INT_ILL_TRANS) | \
+    INT_MASK(INT_UNALIGN_DATA) | \
+    INT_MASK(INT_DTLB_MISS) | \
+    INT_MASK(INT_DTLB_ACCESS) | \
+    0)
+#define NON_SYNC_INTERRUPTS ( \
+    INT_MASK(INT_MEM_ERROR) | \
+    INT_MASK(INT_IDN_FIREWALL) | \
+    INT_MASK(INT_UDN_FIREWALL) | \
+    INT_MASK(INT_TILE_TIMER) | \
+    INT_MASK(INT_AUX_TILE_TIMER) | \
+    INT_MASK(INT_IDN_TIMER) | \
+    INT_MASK(INT_UDN_TIMER) | \
+    INT_MASK(INT_IDN_AVAIL) | \
+    INT_MASK(INT_UDN_AVAIL) | \
+    INT_MASK(INT_IPI_3) | \
+    INT_MASK(INT_IPI_2) | \
+    INT_MASK(INT_IPI_1) | \
+    INT_MASK(INT_IPI_0) | \
+    INT_MASK(INT_PERF_COUNT) | \
+    INT_MASK(INT_AUX_PERF_COUNT) | \
+    INT_MASK(INT_INTCTRL_3) | \
+    INT_MASK(INT_INTCTRL_2) | \
+    INT_MASK(INT_INTCTRL_1) | \
+    INT_MASK(INT_INTCTRL_0) | \
+    INT_MASK(INT_BOOT_ACCESS) | \
+    INT_MASK(INT_WORLD_ACCESS) | \
+    INT_MASK(INT_I_ASID) | \
+    INT_MASK(INT_D_ASID) | \
+    INT_MASK(INT_DOUBLE_FAULT) | \
+    0)
+#endif /* !__ASSEMBLER__ */
+#endif /* !__ARCH_INTERRUPTS_H__ */
diff --git a/arch/tile/include/arch/spr_def.h b/arch/tile/include/arch/spr_def.h
index 442fcba0d122..f548efeb2de3 100644
--- a/arch/tile/include/arch/spr_def.h
+++ b/arch/tile/include/arch/spr_def.h
@@ -12,6 +12,15 @@
  *   more details.
  */
 
+/* Include the proper base SPR definition file. */
+#ifdef __tilegx__
+#include <arch/spr_def_64.h>
+#else
+#include <arch/spr_def_32.h>
+#endif
+
+#ifdef __KERNEL__
+
 /*
  * In addition to including the proper base SPR definition file, depending
  * on machine architecture, this file defines several macros which allow
@@ -29,7 +38,6 @@
 #define _concat4(a, b, c, d)  __concat4(a, b, c, d)
 
 #ifdef __tilegx__
-#include <arch/spr_def_64.h>
 
 /* TILE-Gx dependent, protection-level dependent SPRs. */
 
@@ -65,7 +73,6 @@
         _concat4(INT_SINGLE_STEP_, CONFIG_KERNEL_PL,,)
 
 #else
-#include <arch/spr_def_32.h>
 
 /* TILEPro dependent, protection-level dependent SPRs. */
 
@@ -102,3 +109,5 @@
         _concat4(SPR_INTCTRL_, CONFIG_KERNEL_PL, _STATUS,)
 #define INT_INTCTRL_K \
         _concat4(INT_INTCTRL_, CONFIG_KERNEL_PL,,)
+
+#endif /* __KERNEL__ */
diff --git a/arch/tile/include/arch/spr_def_64.h b/arch/tile/include/arch/spr_def_64.h
new file mode 100644
index 000000000000..cd3e5f95d5fd
--- /dev/null
+++ b/arch/tile/include/arch/spr_def_64.h
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#ifndef __DOXYGEN__
+
+#ifndef __ARCH_SPR_DEF_H__
+#define __ARCH_SPR_DEF_H__
+
+#define SPR_AUX_PERF_COUNT_0 0x2105
+#define SPR_AUX_PERF_COUNT_1 0x2106
+#define SPR_AUX_PERF_COUNT_CTL 0x2107
+#define SPR_AUX_PERF_COUNT_STS 0x2108
+#define SPR_CMPEXCH_VALUE 0x2780
+#define SPR_CYCLE 0x2781
+#define SPR_DONE 0x2705
+#define SPR_DSTREAM_PF 0x2706
+#define SPR_EVENT_BEGIN 0x2782
+#define SPR_EVENT_END 0x2783
+#define SPR_EX_CONTEXT_0_0 0x2580
+#define SPR_EX_CONTEXT_0_1 0x2581
+#define SPR_EX_CONTEXT_0_1__PL_SHIFT 0
+#define SPR_EX_CONTEXT_0_1__PL_RMASK 0x3
+#define SPR_EX_CONTEXT_0_1__PL_MASK  0x3
+#define SPR_EX_CONTEXT_0_1__ICS_SHIFT 2
+#define SPR_EX_CONTEXT_0_1__ICS_RMASK 0x1
+#define SPR_EX_CONTEXT_0_1__ICS_MASK  0x4
+#define SPR_EX_CONTEXT_1_0 0x2480
+#define SPR_EX_CONTEXT_1_1 0x2481
+#define SPR_EX_CONTEXT_1_1__PL_SHIFT 0
+#define SPR_EX_CONTEXT_1_1__PL_RMASK 0x3
+#define SPR_EX_CONTEXT_1_1__PL_MASK  0x3
+#define SPR_EX_CONTEXT_1_1__ICS_SHIFT 2
+#define SPR_EX_CONTEXT_1_1__ICS_RMASK 0x1
+#define SPR_EX_CONTEXT_1_1__ICS_MASK  0x4
+#define SPR_EX_CONTEXT_2_0 0x2380
+#define SPR_EX_CONTEXT_2_1 0x2381
+#define SPR_EX_CONTEXT_2_1__PL_SHIFT 0
+#define SPR_EX_CONTEXT_2_1__PL_RMASK 0x3
+#define SPR_EX_CONTEXT_2_1__PL_MASK  0x3
+#define SPR_EX_CONTEXT_2_1__ICS_SHIFT 2
+#define SPR_EX_CONTEXT_2_1__ICS_RMASK 0x1
+#define SPR_EX_CONTEXT_2_1__ICS_MASK  0x4
+#define SPR_FAIL 0x2707
+#define SPR_ILL_TRANS_REASON__I_STREAM_VA_RMASK 0x1
+#define SPR_INTCTRL_0_STATUS 0x2505
+#define SPR_INTCTRL_1_STATUS 0x2405
+#define SPR_INTCTRL_2_STATUS 0x2305
+#define SPR_INTERRUPT_CRITICAL_SECTION 0x2708
+#define SPR_INTERRUPT_MASK_0 0x2506
+#define SPR_INTERRUPT_MASK_1 0x2406
+#define SPR_INTERRUPT_MASK_2 0x2306
+#define SPR_INTERRUPT_MASK_RESET_0 0x2507
+#define SPR_INTERRUPT_MASK_RESET_1 0x2407
+#define SPR_INTERRUPT_MASK_RESET_2 0x2307
+#define SPR_INTERRUPT_MASK_SET_0 0x2508
+#define SPR_INTERRUPT_MASK_SET_1 0x2408
+#define SPR_INTERRUPT_MASK_SET_2 0x2308
+#define SPR_INTERRUPT_VECTOR_BASE_0 0x2509
+#define SPR_INTERRUPT_VECTOR_BASE_1 0x2409
+#define SPR_INTERRUPT_VECTOR_BASE_2 0x2309
+#define SPR_INTERRUPT_VECTOR_BASE_3 0x2209
+#define SPR_IPI_EVENT_0 0x1f05
+#define SPR_IPI_EVENT_1 0x1e05
+#define SPR_IPI_EVENT_2 0x1d05
+#define SPR_IPI_EVENT_RESET_0 0x1f06
+#define SPR_IPI_EVENT_RESET_1 0x1e06
+#define SPR_IPI_EVENT_RESET_2 0x1d06
+#define SPR_IPI_EVENT_SET_0 0x1f07
+#define SPR_IPI_EVENT_SET_1 0x1e07
+#define SPR_IPI_EVENT_SET_2 0x1d07
+#define SPR_IPI_MASK_0 0x1f08
+#define SPR_IPI_MASK_1 0x1e08
+#define SPR_IPI_MASK_2 0x1d08
+#define SPR_IPI_MASK_RESET_0 0x1f09
+#define SPR_IPI_MASK_RESET_1 0x1e09
+#define SPR_IPI_MASK_RESET_2 0x1d09
+#define SPR_IPI_MASK_SET_0 0x1f0a
+#define SPR_IPI_MASK_SET_1 0x1e0a
+#define SPR_IPI_MASK_SET_2 0x1d0a
+#define SPR_MPL_AUX_TILE_TIMER_SET_0 0x1700
+#define SPR_MPL_AUX_TILE_TIMER_SET_1 0x1701
+#define SPR_MPL_AUX_TILE_TIMER_SET_2 0x1702
+#define SPR_MPL_INTCTRL_0_SET_0 0x2500
+#define SPR_MPL_INTCTRL_0_SET_1 0x2501
+#define SPR_MPL_INTCTRL_0_SET_2 0x2502
+#define SPR_MPL_INTCTRL_1_SET_0 0x2400
+#define SPR_MPL_INTCTRL_1_SET_1 0x2401
+#define SPR_MPL_INTCTRL_1_SET_2 0x2402
+#define SPR_MPL_INTCTRL_2_SET_0 0x2300
+#define SPR_MPL_INTCTRL_2_SET_1 0x2301
+#define SPR_MPL_INTCTRL_2_SET_2 0x2302
+#define SPR_MPL_UDN_ACCESS_SET_0 0x0b00
+#define SPR_MPL_UDN_ACCESS_SET_1 0x0b01
+#define SPR_MPL_UDN_ACCESS_SET_2 0x0b02
+#define SPR_MPL_UDN_AVAIL_SET_0 0x1b00
+#define SPR_MPL_UDN_AVAIL_SET_1 0x1b01
+#define SPR_MPL_UDN_AVAIL_SET_2 0x1b02
+#define SPR_MPL_UDN_COMPLETE_SET_0 0x0600
+#define SPR_MPL_UDN_COMPLETE_SET_1 0x0601
+#define SPR_MPL_UDN_COMPLETE_SET_2 0x0602
+#define SPR_MPL_UDN_FIREWALL_SET_0 0x1500
+#define SPR_MPL_UDN_FIREWALL_SET_1 0x1501
+#define SPR_MPL_UDN_FIREWALL_SET_2 0x1502
+#define SPR_MPL_UDN_TIMER_SET_0 0x1900
+#define SPR_MPL_UDN_TIMER_SET_1 0x1901
+#define SPR_MPL_UDN_TIMER_SET_2 0x1902
+#define SPR_MPL_WORLD_ACCESS_SET_0 0x2700
+#define SPR_MPL_WORLD_ACCESS_SET_1 0x2701
+#define SPR_MPL_WORLD_ACCESS_SET_2 0x2702
+#define SPR_PASS 0x2709
+#define SPR_PERF_COUNT_0 0x2005
+#define SPR_PERF_COUNT_1 0x2006
+#define SPR_PERF_COUNT_CTL 0x2007
+#define SPR_PERF_COUNT_DN_CTL 0x2008
+#define SPR_PERF_COUNT_STS 0x2009
+#define SPR_PROC_STATUS 0x2784
+#define SPR_SIM_CONTROL 0x2785
+#define SPR_SINGLE_STEP_CONTROL_0 0x0405
+#define SPR_SINGLE_STEP_CONTROL_0__CANCELED_MASK  0x1
+#define SPR_SINGLE_STEP_CONTROL_0__INHIBIT_MASK  0x2
+#define SPR_SINGLE_STEP_CONTROL_1 0x0305
+#define SPR_SINGLE_STEP_CONTROL_1__CANCELED_MASK  0x1
+#define SPR_SINGLE_STEP_CONTROL_1__INHIBIT_MASK  0x2
+#define SPR_SINGLE_STEP_CONTROL_2 0x0205
+#define SPR_SINGLE_STEP_CONTROL_2__CANCELED_MASK  0x1
+#define SPR_SINGLE_STEP_CONTROL_2__INHIBIT_MASK  0x2
+#define SPR_SINGLE_STEP_EN_0_0 0x250a
+#define SPR_SINGLE_STEP_EN_0_1 0x240a
+#define SPR_SINGLE_STEP_EN_0_2 0x230a
+#define SPR_SINGLE_STEP_EN_1_0 0x250b
+#define SPR_SINGLE_STEP_EN_1_1 0x240b
+#define SPR_SINGLE_STEP_EN_1_2 0x230b
+#define SPR_SINGLE_STEP_EN_2_0 0x250c
+#define SPR_SINGLE_STEP_EN_2_1 0x240c
+#define SPR_SINGLE_STEP_EN_2_2 0x230c
+#define SPR_SYSTEM_SAVE_0_0 0x2582
+#define SPR_SYSTEM_SAVE_0_1 0x2583
+#define SPR_SYSTEM_SAVE_0_2 0x2584
+#define SPR_SYSTEM_SAVE_0_3 0x2585
+#define SPR_SYSTEM_SAVE_1_0 0x2482
+#define SPR_SYSTEM_SAVE_1_1 0x2483
+#define SPR_SYSTEM_SAVE_1_2 0x2484
+#define SPR_SYSTEM_SAVE_1_3 0x2485
+#define SPR_SYSTEM_SAVE_2_0 0x2382
+#define SPR_SYSTEM_SAVE_2_1 0x2383
+#define SPR_SYSTEM_SAVE_2_2 0x2384
+#define SPR_SYSTEM_SAVE_2_3 0x2385
+#define SPR_TILE_COORD 0x270b
+#define SPR_TILE_RTF_HWM 0x270c
+#define SPR_TILE_TIMER_CONTROL 0x1605
+#define SPR_UDN_AVAIL_EN 0x1b05
+#define SPR_UDN_DATA_AVAIL 0x0b80
+#define SPR_UDN_DEADLOCK_TIMEOUT 0x1906
+#define SPR_UDN_DEMUX_COUNT_0 0x0b05
+#define SPR_UDN_DEMUX_COUNT_1 0x0b06
+#define SPR_UDN_DEMUX_COUNT_2 0x0b07
+#define SPR_UDN_DEMUX_COUNT_3 0x0b08
+#define SPR_UDN_DIRECTION_PROTECT 0x1505
+
+#endif /* !defined(__ARCH_SPR_DEF_H__) */
+
+#endif /* !defined(__DOXYGEN__) */
diff --git a/arch/tile/include/asm/atomic.h b/arch/tile/include/asm/atomic.h
index 75a16028a952..739cfe0499d1 100644
--- a/arch/tile/include/asm/atomic.h
+++ b/arch/tile/include/asm/atomic.h
@@ -130,17 +130,52 @@ static inline int atomic_read(const atomic_t *v)
  */
 #define atomic_inc_not_zero(v)          atomic_add_unless((v), 1, 0)
 
-
-/*
- * We define xchg() and cmpxchg() in the included headers.
- * Note that we do not define __HAVE_ARCH_CMPXCHG, since that would imply
- * that cmpxchg() is an efficient operation, which is not particularly true.
- */
-
 /* Nonexistent functions intended to cause link errors. */
 extern unsigned long __xchg_called_with_bad_pointer(void);
 extern unsigned long __cmpxchg_called_with_bad_pointer(void);
 
+#define xchg(ptr, x)                                                    \
+        ({                                                              \
+                typeof(*(ptr)) __x;                                     \
+                switch (sizeof(*(ptr))) {                               \
+                case 4:                                                 \
+                        __x = (typeof(__x))(typeof(__x-__x))atomic_xchg( \
+                                (atomic_t *)(ptr),                      \
+                                (u32)(typeof((x)-(x)))(x));             \
+                        break;                                          \
+                case 8:                                                 \
+                        __x = (typeof(__x))(typeof(__x-__x))atomic64_xchg( \
+                                (atomic64_t *)(ptr),                    \
+                                (u64)(typeof((x)-(x)))(x));             \
+                        break;                                          \
+                default:                                                \
+                        __xchg_called_with_bad_pointer();               \
+                }                                                       \
+                __x;                                                    \
+        })
+
+#define cmpxchg(ptr, o, n)                                              \
+        ({                                                              \
+                typeof(*(ptr)) __x;                                     \
+                switch (sizeof(*(ptr))) {                               \
+                case 4:                                                 \
+                        __x = (typeof(__x))(typeof(__x-__x))atomic_cmpxchg( \
+                                (atomic_t *)(ptr),                      \
+                                (u32)(typeof((o)-(o)))(o),              \
+                                (u32)(typeof((n)-(n)))(n));             \
+                        break;                                          \
+                case 8:                                                 \
+                        __x = (typeof(__x))(typeof(__x-__x))atomic64_cmpxchg( \
+                                (atomic64_t *)(ptr),                    \
+                                (u64)(typeof((o)-(o)))(o),              \
+                                (u64)(typeof((n)-(n)))(n));             \
+                        break;                                          \
+                default:                                                \
+                        __cmpxchg_called_with_bad_pointer();            \
+                }                                                       \
+                __x;                                                    \
+        })
+
 #define tas(ptr) (xchg((ptr), 1))
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/tile/include/asm/atomic_32.h b/arch/tile/include/asm/atomic_32.h
index ed359aee8837..92a8bee32311 100644
--- a/arch/tile/include/asm/atomic_32.h
+++ b/arch/tile/include/asm/atomic_32.h
@@ -110,16 +110,6 @@ static inline void atomic_set(atomic_t *v, int n)
         _atomic_xchg(v, n);
 }
 
-#define xchg(ptr, x) ((typeof(*(ptr))) \
-  ((sizeof(*(ptr)) == sizeof(atomic_t)) ? \
-   atomic_xchg((atomic_t *)(ptr), (long)(x)) : \
-   __xchg_called_with_bad_pointer()))
-
-#define cmpxchg(ptr, o, n) ((typeof(*(ptr))) \
-  ((sizeof(*(ptr)) == sizeof(atomic_t)) ? \
-   atomic_cmpxchg((atomic_t *)(ptr), (long)(o), (long)(n)) : \
-   __cmpxchg_called_with_bad_pointer()))
-
 /* A 64bit atomic type */
 
 typedef struct {
diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
new file mode 100644
index 000000000000..1c1e60d8ccb6
--- /dev/null
+++ b/arch/tile/include/asm/atomic_64.h
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * Do not include directly; use <asm/atomic.h>.
+ */
+
+#ifndef _ASM_TILE_ATOMIC_64_H
+#define _ASM_TILE_ATOMIC_64_H
+
+#ifndef __ASSEMBLY__
+
+#include <arch/spr_def.h>
+
+/* First, the 32-bit atomic ops that are "real" on our 64-bit platform. */
+
+#define atomic_set(v, i) ((v)->counter = (i))
+
+/*
+ * The smp_mb() operations throughout are to support the fact that
+ * Linux requires memory barriers before and after the operation,
+ * on any routine which updates memory and returns a value.
+ */
+
+static inline int atomic_cmpxchg(atomic_t *v, int o, int n)
+{
+        int val;
+        __insn_mtspr(SPR_CMPEXCH_VALUE, o);
+        smp_mb();  /* barrier for proper semantics */
+        val = __insn_cmpexch4((void *)&v->counter, n);
+        smp_mb();  /* barrier for proper semantics */
+        return val;
+}
+
+static inline int atomic_xchg(atomic_t *v, int n)
+{
+        int val;
+        smp_mb();  /* barrier for proper semantics */
+        val = __insn_exch4((void *)&v->counter, n);
+        smp_mb();  /* barrier for proper semantics */
+        return val;
+}
+
+static inline void atomic_add(int i, atomic_t *v)
+{
+        __insn_fetchadd4((void *)&v->counter, i);
+}
+
+static inline int atomic_add_return(int i, atomic_t *v)
+{
+        int val;
+        smp_mb();  /* barrier for proper semantics */
+        val = __insn_fetchadd4((void *)&v->counter, i) + i;
+        barrier();  /* the "+ i" above will wait on memory */
+        return val;
+}
+
+static inline int atomic_add_unless(atomic_t *v, int a, int u)
+{
+        int guess, oldval = v->counter;
+        do {
+                if (oldval == u)
+                        break;
+                guess = oldval;
+                oldval = atomic_cmpxchg(v, guess, guess + a);
+        } while (guess != oldval);
+        return oldval != u;
+}
+
+/* Now the true 64-bit operations. */
+
+#define ATOMIC64_INIT(i)        { (i) }
+
+#define atomic64_read(v)                ((v)->counter)
+#define atomic64_set(v, i) ((v)->counter = (i))
+
+static inline long atomic64_cmpxchg(atomic64_t *v, long o, long n)
+{
+        long val;
+        smp_mb();  /* barrier for proper semantics */
+        __insn_mtspr(SPR_CMPEXCH_VALUE, o);
+        val = __insn_cmpexch((void *)&v->counter, n);
+        smp_mb();  /* barrier for proper semantics */
+        return val;
+}
+
+static inline long atomic64_xchg(atomic64_t *v, long n)
+{
+        long val;
+        smp_mb();  /* barrier for proper semantics */
+        val = __insn_exch((void *)&v->counter, n);
+        smp_mb();  /* barrier for proper semantics */
+        return val;
+}
+
+static inline void atomic64_add(long i, atomic64_t *v)
+{
+        __insn_fetchadd((void *)&v->counter, i);
+}
+
+static inline long atomic64_add_return(long i, atomic64_t *v)
+{
+        int val;
+        smp_mb();  /* barrier for proper semantics */
+        val = __insn_fetchadd((void *)&v->counter, i) + i;
+        barrier();  /* the "+ i" above will wait on memory */
+        return val;
+}
+
+static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
+{
+        long guess, oldval = v->counter;
+        do {
+                if (oldval == u)
+                        break;
+                guess = oldval;
+                oldval = atomic64_cmpxchg(v, guess, guess + a);
+        } while (guess != oldval);
+        return oldval != u;
+}
+
+#define atomic64_sub_return(i, v)       atomic64_add_return(-(i), (v))
+#define atomic64_sub(i, v)              atomic64_add(-(i), (v))
+#define atomic64_inc_return(v)          atomic64_add_return(1, (v))
+#define atomic64_dec_return(v)          atomic64_sub_return(1, (v))
+#define atomic64_inc(v)                 atomic64_add(1, (v))
+#define atomic64_dec(v)                 atomic64_sub(1, (v))
+
+#define atomic64_inc_and_test(v)        (atomic64_inc_return(v) == 0)
+#define atomic64_dec_and_test(v)        (atomic64_dec_return(v) == 0)
+#define atomic64_sub_and_test(i, v)     (atomic64_sub_return((i), (v)) == 0)
+#define atomic64_add_negative(i, v)     (atomic64_add_return((i), (v)) < 0)
+
+#define atomic64_inc_not_zero(v)        atomic64_add_unless((v), 1, 0)
+
+/* Atomic dec and inc don't implement barrier, so provide them if needed. */
+#define smp_mb__before_atomic_dec()     smp_mb()
+#define smp_mb__after_atomic_dec()      smp_mb()
+#define smp_mb__before_atomic_inc()     smp_mb()
+#define smp_mb__after_atomic_inc()      smp_mb()
+
+/* Define this to indicate that cmpxchg is an efficient operation. */
+#define __HAVE_ARCH_CMPXCHG
+
+#endif /* !__ASSEMBLY__ */
+
+#endif /* _ASM_TILE_ATOMIC_64_H */
diff --git a/arch/tile/include/asm/backtrace.h b/arch/tile/include/asm/backtrace.h
index f18887d82399..bd5399a69edf 100644
--- a/arch/tile/include/asm/backtrace.h
+++ b/arch/tile/include/asm/backtrace.h
@@ -12,80 +12,41 @@
  *   more details.
  */
 
-#ifndef _TILE_BACKTRACE_H
-#define _TILE_BACKTRACE_H
-
-
+#ifndef _ASM_TILE_BACKTRACE_H
+#define _ASM_TILE_BACKTRACE_H
 
 #include <linux/types.h>
 
-#include <arch/chip.h>
-
-#if defined(__tile__)
-typedef unsigned long VirtualAddress;
-#elif CHIP_VA_WIDTH() > 32
-typedef unsigned long long VirtualAddress;
-#else
-typedef unsigned int VirtualAddress;
-#endif
-
-
-/** Reads 'size' bytes from 'address' and writes the data to 'result'.
+/* Reads 'size' bytes from 'address' and writes the data to 'result'.
  * Returns true if successful, else false (e.g. memory not readable).
  */
 typedef bool (*BacktraceMemoryReader)(void *result,
-                                      VirtualAddress address,
+                                      unsigned long address,
                                       unsigned int size,
                                       void *extra);
 
 typedef struct {
-        /** Current PC. */
-        VirtualAddress pc;
+        /* Current PC. */
+        unsigned long pc;
 
-        /** Current stack pointer value. */
-        VirtualAddress sp;
+        /* Current stack pointer value. */
+        unsigned long sp;
 
-        /** Current frame pointer value (i.e. caller's stack pointer) */
-        VirtualAddress fp;
+        /* Current frame pointer value (i.e. caller's stack pointer) */
+        unsigned long fp;
 
-        /** Internal use only: caller's PC for first frame. */
-        VirtualAddress initial_frame_caller_pc;
+        /* Internal use only: caller's PC for first frame. */
+        unsigned long initial_frame_caller_pc;
 
-        /** Internal use only: callback to read memory. */
+        /* Internal use only: callback to read memory. */
         BacktraceMemoryReader read_memory_func;
 
-        /** Internal use only: arbitrary argument to read_memory_func. */
+        /* Internal use only: arbitrary argument to read_memory_func. */
         void *read_memory_func_extra;
 
 } BacktraceIterator;
 
 
-/** Initializes a backtracer to start from the given location.
- *
- * If the frame pointer cannot be determined it is set to -1.
- *
- * @param state The state to be filled in.
- * @param read_memory_func A callback that reads memory. If NULL, a default
- *        value is provided.
- * @param read_memory_func_extra An arbitrary argument to read_memory_func.
- * @param pc The current PC.
- * @param lr The current value of the 'lr' register.
- * @param sp The current value of the 'sp' register.
- * @param r52 The current value of the 'r52' register.
- */
-extern void backtrace_init(BacktraceIterator *state,
-                           BacktraceMemoryReader read_memory_func,
-                           void *read_memory_func_extra,
-                           VirtualAddress pc, VirtualAddress lr,
-                           VirtualAddress sp, VirtualAddress r52);
-
-
-/** Advances the backtracing state to the calling frame, returning
- * true iff successful.
- */
-extern bool backtrace_next(BacktraceIterator *state);
-
-
 typedef enum {
 
         /* We have no idea what the caller's pc is. */
@@ -138,7 +99,7 @@ enum {
 };
 
 
-/** Internal constants used to define 'info' operands. */
+/* Internal constants used to define 'info' operands. */
 enum {
         /* 0 and 1 are reserved, as are all negative numbers. */
 
@@ -147,13 +108,10 @@ enum {
         CALLER_SP_IN_R52_BASE = 4,
 
         CALLER_SP_OFFSET_BASE = 8,
-
-        /* Marks the entry point of certain functions. */
-        ENTRY_POINT_INFO_OP = 16
 };
 
 
-/** Current backtracer state describing where it thinks the caller is. */
+/* Current backtracer state describing where it thinks the caller is. */
 typedef struct {
         /*
          * Public fields
@@ -192,7 +150,13 @@ typedef struct {
 
 } CallerLocation;
 
+extern void backtrace_init(BacktraceIterator *state,
+                          BacktraceMemoryReader read_memory_func,
+                          void *read_memory_func_extra,
+                          unsigned long pc, unsigned long lr,
+                          unsigned long sp, unsigned long r52);
 
 
+extern bool backtrace_next(BacktraceIterator *state);
 
-#endif /* _TILE_BACKTRACE_H */
+#endif /* _ASM_TILE_BACKTRACE_H */
diff --git a/arch/tile/include/asm/bitops.h b/arch/tile/include/asm/bitops.h
index 132e6bbd07e9..16f1fa51fea1 100644
--- a/arch/tile/include/asm/bitops.h
+++ b/arch/tile/include/asm/bitops.h
@@ -122,6 +122,7 @@ static inline unsigned long __arch_hweight64(__u64 w)
 #include <asm-generic/bitops/lock.h>
 #include <asm-generic/bitops/find.h>
 #include <asm-generic/bitops/sched.h>
+#include <asm-generic/bitops/non-atomic.h>
 #include <asm-generic/bitops/le.h>
 
 #endif /* _ASM_TILE_BITOPS_H */
diff --git a/arch/tile/include/asm/bitops_32.h b/arch/tile/include/asm/bitops_32.h
index 2638be51a164..d31ab905cfa7 100644
--- a/arch/tile/include/asm/bitops_32.h
+++ b/arch/tile/include/asm/bitops_32.h
@@ -126,7 +126,6 @@ static inline int test_and_change_bit(unsigned nr,
 #define smp_mb__before_clear_bit()      smp_mb()
 #define smp_mb__after_clear_bit()       do {} while (0)
 
-#include <asm-generic/bitops/non-atomic.h>
 #include <asm-generic/bitops/ext2-atomic.h>
 
 #endif /* _ASM_TILE_BITOPS_32_H */
diff --git a/arch/tile/include/asm/bitops_64.h b/arch/tile/include/asm/bitops_64.h
new file mode 100644
index 000000000000..99615e8d2d8b
--- /dev/null
+++ b/arch/tile/include/asm/bitops_64.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#ifndef _ASM_TILE_BITOPS_64_H
+#define _ASM_TILE_BITOPS_64_H
+
+#include <linux/compiler.h>
+#include <asm/atomic.h>
+#include <asm/system.h>
+
+/* See <asm/bitops.h> for API comments. */
+
+static inline void set_bit(unsigned nr, volatile unsigned long *addr)
+{
+        unsigned long mask = (1UL << (nr % BITS_PER_LONG));
+        __insn_fetchor((void *)(addr + nr / BITS_PER_LONG), mask);
+}
+
+static inline void clear_bit(unsigned nr, volatile unsigned long *addr)
+{
+        unsigned long mask = (1UL << (nr % BITS_PER_LONG));
+        __insn_fetchand((void *)(addr + nr / BITS_PER_LONG), ~mask);
+}
+
+#define smp_mb__before_clear_bit()      smp_mb()
+#define smp_mb__after_clear_bit()       smp_mb()
+
+
+static inline void change_bit(unsigned nr, volatile unsigned long *addr)
+{
+        unsigned long old, mask = (1UL << (nr % BITS_PER_LONG));
+        long guess, oldval;
+        addr += nr / BITS_PER_LONG;
+        old = *addr;
+        do {
+                guess = oldval;
+                oldval = atomic64_cmpxchg((atomic64_t *)addr,
+                                          guess, guess ^ mask);
+        } while (guess != oldval);
+}
+
+
+/*
+ * The test_and_xxx_bit() routines require a memory fence before we
+ * start the operation, and after the operation completes.  We use
+ * smp_mb() before, and rely on the "!= 0" comparison, plus a compiler
+ * barrier(), to block until the atomic op is complete.
+ */
+
+static inline int test_and_set_bit(unsigned nr, volatile unsigned long *addr)
+{
+        int val;
+        unsigned long mask = (1UL << (nr % BITS_PER_LONG));
+        smp_mb();  /* barrier for proper semantics */
+        val = (__insn_fetchor((void *)(addr + nr / BITS_PER_LONG), mask)
+               & mask) != 0;
+        barrier();
+        return val;
+}
+
+
+static inline int test_and_clear_bit(unsigned nr, volatile unsigned long *addr)
+{
+        int val;
+        unsigned long mask = (1UL << (nr % BITS_PER_LONG));
+        smp_mb();  /* barrier for proper semantics */
+        val = (__insn_fetchand((void *)(addr + nr / BITS_PER_LONG), ~mask)
+               & mask) != 0;
+        barrier();
+        return val;
+}
+
+
+static inline int test_and_change_bit(unsigned nr,
+                                      volatile unsigned long *addr)
+{
+        unsigned long mask = (1UL << (nr % BITS_PER_LONG));
+        long guess, oldval = *addr;
+        addr += nr / BITS_PER_LONG;
+        oldval = *addr;
+        do {
+                guess = oldval;
+                oldval = atomic64_cmpxchg((atomic64_t *)addr,
+                                          guess, guess ^ mask);
+        } while (guess != oldval);
+        return (oldval & mask) != 0;
+}
+
+#define ext2_set_bit_atomic(lock, nr, addr)                     \
+        test_and_set_bit((nr), (unsigned long *)(addr))
+#define ext2_clear_bit_atomic(lock, nr, addr)                   \
+        test_and_clear_bit((nr), (unsigned long *)(addr))
+
+#endif /* _ASM_TILE_BITOPS_64_H */
diff --git a/arch/tile/include/asm/cacheflush.h b/arch/tile/include/asm/cacheflush.h
index 12fb0fb330ee..e925f4bb498f 100644
--- a/arch/tile/include/asm/cacheflush.h
+++ b/arch/tile/include/asm/cacheflush.h
@@ -116,22 +116,28 @@ static inline void __finv_buffer(void *buffer, size_t size)
 }
 
 
-/* Invalidate a VA range, then memory fence. */
+/* Invalidate a VA range and wait for it to be complete. */
 static inline void inv_buffer(void *buffer, size_t size)
 {
         __inv_buffer(buffer, size);
-        mb_incoherent();
+        mb();
 }
 
-/* Flush a VA range, then memory fence. */
-static inline void flush_buffer(void *buffer, size_t size)
+/*
+ * Flush a locally-homecached VA range and wait for the evicted
+ * cachelines to hit memory.
+ */
+static inline void flush_buffer_local(void *buffer, size_t size)
 {
         __flush_buffer(buffer, size);
         mb_incoherent();
 }
 
-/* Flush & invalidate a VA range, then memory fence. */
-static inline void finv_buffer(void *buffer, size_t size)
+/*
+ * Flush and invalidate a locally-homecached VA range and wait for the
+ * evicted cachelines to hit memory.
+ */
+static inline void finv_buffer_local(void *buffer, size_t size)
 {
         __finv_buffer(buffer, size);
         mb_incoherent();
diff --git a/arch/tile/include/asm/compat.h b/arch/tile/include/asm/compat.h
index c3ae570c0a5d..bf95f55b82b0 100644
--- a/arch/tile/include/asm/compat.h
+++ b/arch/tile/include/asm/compat.h
@@ -215,8 +215,8 @@ struct compat_sigaction;
 struct compat_siginfo;
 struct compat_sigaltstack;
 long compat_sys_execve(const char __user *path,
-                       const compat_uptr_t __user *argv,
-                       const compat_uptr_t __user *envp, struct pt_regs *);
+                       compat_uptr_t __user *argv,
+                       compat_uptr_t __user *envp, struct pt_regs *);
 long compat_sys_rt_sigaction(int sig, struct compat_sigaction __user *act,
                              struct compat_sigaction __user *oact,
                              size_t sigsetsize);
diff --git a/arch/tile/include/asm/dma-mapping.h b/arch/tile/include/asm/dma-mapping.h
index 15e1dceecc64..eaa06d175b39 100644
--- a/arch/tile/include/asm/dma-mapping.h
+++ b/arch/tile/include/asm/dma-mapping.h
@@ -65,7 +65,8 @@ extern void dma_sync_single_range_for_cpu(struct device *, dma_addr_t,
 extern void dma_sync_single_range_for_device(struct device *, dma_addr_t,
                                              unsigned long offset, size_t,
                                              enum dma_data_direction);
-extern void dma_cache_sync(void *vaddr, size_t, enum dma_data_direction);
+extern void dma_cache_sync(struct device *dev, void *vaddr, size_t,
+                           enum dma_data_direction);
 
 static inline int
 dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
diff --git a/arch/tile/include/asm/fb.h b/arch/tile/include/asm/fb.h
new file mode 100644
index 000000000000..3a4988e8df45
--- /dev/null
+++ b/arch/tile/include/asm/fb.h
@@ -0,0 +1 @@
+#include <asm-generic/fb.h>
diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h
index d3cbb9b14cbe..c9ea1652af03 100644
--- a/arch/tile/include/asm/io.h
+++ b/arch/tile/include/asm/io.h
@@ -52,6 +52,7 @@ extern void iounmap(volatile void __iomem *addr);
 #endif
 
 #define ioremap_nocache(physaddr, size)         ioremap(physaddr, size)
+#define ioremap_wc(physaddr, size)              ioremap(physaddr, size)
 #define ioremap_writethrough(physaddr, size)    ioremap(physaddr, size)
 #define ioremap_fullcache(physaddr, size)       ioremap(physaddr, size)
 
@@ -161,6 +162,15 @@ static inline void _tile_writeq(u64 val, unsigned long addr)
 #define iowrite32 writel
 #define iowrite64 writeq
 
+static inline void memset_io(void *dst, int val, size_t len)
+{
+        int x;
+        BUG_ON((unsigned long)dst & 0x3);
+        val = (val & 0xff) * 0x01010101;
+        for (x = 0; x < len; x += 4)
+                writel(val, dst + x);
+}
+
 static inline void memcpy_fromio(void *dst, const volatile void __iomem *src,
                                  size_t len)
 {
@@ -269,6 +279,11 @@ static inline void outsl(unsigned long addr, const void *buffer, int count)
         ioport_panic();
 }
 
+#define ioread16be(addr)        be16_to_cpu(ioread16(addr))
+#define ioread32be(addr)        be32_to_cpu(ioread32(addr))
+#define iowrite16be(v, addr)    iowrite16(be16_to_cpu(v), (addr))
+#define iowrite32be(v, addr)    iowrite32(be32_to_cpu(v), (addr))
+
 #define ioread8_rep(p, dst, count) \
         insb((unsigned long) (p), (dst), (count))
 #define ioread16_rep(p, dst, count) \
@@ -283,4 +298,7 @@ static inline void outsl(unsigned long addr, const void *buffer, int count)
 #define iowrite32_rep(p, src, count) \
         outsl((unsigned long) (p), (src), (count))
 
+#define virt_to_bus     virt_to_phys
+#define bus_to_virt     phys_to_virt
+
 #endif /* _ASM_TILE_IO_H */
diff --git a/arch/tile/include/asm/irq.h b/arch/tile/include/asm/irq.h
index 572fd3ef1d73..94e9a511de84 100644
--- a/arch/tile/include/asm/irq.h
+++ b/arch/tile/include/asm/irq.h
@@ -23,6 +23,8 @@
 /* IRQ numbers used for linux IPIs. */
 #define IRQ_RESCHEDULE 1
 
+#define irq_canonicalize(irq)   (irq)
+
 void ack_bad_irq(unsigned int irq);
 
 /*
diff --git a/arch/tile/include/asm/mmu_context.h b/arch/tile/include/asm/mmu_context.h
index 9bc0d0725c28..15fb24641120 100644
--- a/arch/tile/include/asm/mmu_context.h
+++ b/arch/tile/include/asm/mmu_context.h
@@ -100,8 +100,8 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
                 __get_cpu_var(current_asid) = asid;
 
                 /* Clear cpu from the old mm, and set it in the new one. */
-                cpumask_clear_cpu(cpu, &prev->cpu_vm_mask);
-                cpumask_set_cpu(cpu, &next->cpu_vm_mask);
+                cpumask_clear_cpu(cpu, mm_cpumask(prev));
+                cpumask_set_cpu(cpu, mm_cpumask(next));
 
                 /* Re-load page tables */
                 install_page_table(next->pgd, asid);
diff --git a/arch/tile/include/asm/opcode-tile_32.h b/arch/tile/include/asm/opcode-tile_32.h
index eda60ecbae3d..03df7b1e77bf 100644
--- a/arch/tile/include/asm/opcode-tile_32.h
+++ b/arch/tile/include/asm/opcode-tile_32.h
@@ -1502,5 +1502,12 @@ extern int parse_insn_tile(tile_bundle_bits bits,
                            decoded[TILE_MAX_INSTRUCTIONS_PER_BUNDLE]);
 
 
+/* Given a set of bundle bits and a specific pipe, returns which
+ * instruction the bundle contains in that pipe.
+ */
+extern const struct tile_opcode *
+find_opcode(tile_bundle_bits bits, tile_pipeline pipe);
+
+
 
 #endif /* opcode_tile_h */
diff --git a/arch/tile/include/asm/opcode-tile_64.h b/arch/tile/include/asm/opcode-tile_64.h
index eda60ecbae3d..c0633466cd5c 100644
--- a/arch/tile/include/asm/opcode-tile_64.h
+++ b/arch/tile/include/asm/opcode-tile_64.h
@@ -5,863 +5,711 @@
 #ifndef opcode_tile_h
 #define opcode_tile_h
 
-typedef unsigned long long tile_bundle_bits;
+typedef unsigned long long tilegx_bundle_bits;
 
 
 enum
 {
-  TILE_MAX_OPERANDS = 5 /* mm */
+  TILEGX_MAX_OPERANDS = 4 /* bfexts */
 };
 
 typedef enum
 {
-  TILE_OPC_BPT,
-  TILE_OPC_INFO,
-  TILE_OPC_INFOL,
-  TILE_OPC_J,
-  TILE_OPC_JAL,
-  TILE_OPC_MOVE,
-  TILE_OPC_MOVE_SN,
-  TILE_OPC_MOVEI,
-  TILE_OPC_MOVEI_SN,
-  TILE_OPC_MOVELI,
-  TILE_OPC_MOVELI_SN,
-  TILE_OPC_MOVELIS,
-  TILE_OPC_PREFETCH,
-  TILE_OPC_RAISE,
-  TILE_OPC_ADD,
-  TILE_OPC_ADD_SN,
-  TILE_OPC_ADDB,
-  TILE_OPC_ADDB_SN,
-  TILE_OPC_ADDBS_U,
-  TILE_OPC_ADDBS_U_SN,
-  TILE_OPC_ADDH,
-  TILE_OPC_ADDH_SN,
-  TILE_OPC_ADDHS,
-  TILE_OPC_ADDHS_SN,
-  TILE_OPC_ADDI,
-  TILE_OPC_ADDI_SN,
-  TILE_OPC_ADDIB,
-  TILE_OPC_ADDIB_SN,
-  TILE_OPC_ADDIH,
-  TILE_OPC_ADDIH_SN,
-  TILE_OPC_ADDLI,
-  TILE_OPC_ADDLI_SN,
-  TILE_OPC_ADDLIS,
-  TILE_OPC_ADDS,
-  TILE_OPC_ADDS_SN,
-  TILE_OPC_ADIFFB_U,
-  TILE_OPC_ADIFFB_U_SN,
-  TILE_OPC_ADIFFH,
-  TILE_OPC_ADIFFH_SN,
-  TILE_OPC_AND,
-  TILE_OPC_AND_SN,
-  TILE_OPC_ANDI,
-  TILE_OPC_ANDI_SN,
-  TILE_OPC_AULI,
-  TILE_OPC_AVGB_U,
-  TILE_OPC_AVGB_U_SN,
-  TILE_OPC_AVGH,
-  TILE_OPC_AVGH_SN,
-  TILE_OPC_BBNS,
-  TILE_OPC_BBNS_SN,
-  TILE_OPC_BBNST,
-  TILE_OPC_BBNST_SN,
-  TILE_OPC_BBS,
-  TILE_OPC_BBS_SN,
-  TILE_OPC_BBST,
-  TILE_OPC_BBST_SN,
-  TILE_OPC_BGEZ,
-  TILE_OPC_BGEZ_SN,
-  TILE_OPC_BGEZT,
-  TILE_OPC_BGEZT_SN,
-  TILE_OPC_BGZ,
-  TILE_OPC_BGZ_SN,
-  TILE_OPC_BGZT,
-  TILE_OPC_BGZT_SN,
-  TILE_OPC_BITX,
-  TILE_OPC_BITX_SN,
-  TILE_OPC_BLEZ,
-  TILE_OPC_BLEZ_SN,
-  TILE_OPC_BLEZT,
-  TILE_OPC_BLEZT_SN,
-  TILE_OPC_BLZ,
-  TILE_OPC_BLZ_SN,
-  TILE_OPC_BLZT,
-  TILE_OPC_BLZT_SN,
-  TILE_OPC_BNZ,
-  TILE_OPC_BNZ_SN,
-  TILE_OPC_BNZT,
-  TILE_OPC_BNZT_SN,
-  TILE_OPC_BYTEX,
-  TILE_OPC_BYTEX_SN,
-  TILE_OPC_BZ,
-  TILE_OPC_BZ_SN,
-  TILE_OPC_BZT,
-  TILE_OPC_BZT_SN,
-  TILE_OPC_CLZ,
-  TILE_OPC_CLZ_SN,
-  TILE_OPC_CRC32_32,
-  TILE_OPC_CRC32_32_SN,
-  TILE_OPC_CRC32_8,
-  TILE_OPC_CRC32_8_SN,
-  TILE_OPC_CTZ,
-  TILE_OPC_CTZ_SN,
-  TILE_OPC_DRAIN,
-  TILE_OPC_DTLBPR,
-  TILE_OPC_DWORD_ALIGN,
-  TILE_OPC_DWORD_ALIGN_SN,
-  TILE_OPC_FINV,
-  TILE_OPC_FLUSH,
-  TILE_OPC_FNOP,
-  TILE_OPC_ICOH,
-  TILE_OPC_ILL,
-  TILE_OPC_INTHB,
-  TILE_OPC_INTHB_SN,
-  TILE_OPC_INTHH,
-  TILE_OPC_INTHH_SN,
-  TILE_OPC_INTLB,
-  TILE_OPC_INTLB_SN,
-  TILE_OPC_INTLH,
-  TILE_OPC_INTLH_SN,
-  TILE_OPC_INV,
-  TILE_OPC_IRET,
-  TILE_OPC_JALB,
-  TILE_OPC_JALF,
-  TILE_OPC_JALR,
-  TILE_OPC_JALRP,
-  TILE_OPC_JB,
-  TILE_OPC_JF,
-  TILE_OPC_JR,
-  TILE_OPC_JRP,
-  TILE_OPC_LB,
-  TILE_OPC_LB_SN,
-  TILE_OPC_LB_U,
-  TILE_OPC_LB_U_SN,
-  TILE_OPC_LBADD,
-  TILE_OPC_LBADD_SN,
-  TILE_OPC_LBADD_U,
-  TILE_OPC_LBADD_U_SN,
-  TILE_OPC_LH,
-  TILE_OPC_LH_SN,
-  TILE_OPC_LH_U,
-  TILE_OPC_LH_U_SN,
-  TILE_OPC_LHADD,
-  TILE_OPC_LHADD_SN,
-  TILE_OPC_LHADD_U,
-  TILE_OPC_LHADD_U_SN,
-  TILE_OPC_LNK,
-  TILE_OPC_LNK_SN,
-  TILE_OPC_LW,
-  TILE_OPC_LW_SN,
-  TILE_OPC_LW_NA,
-  TILE_OPC_LW_NA_SN,
-  TILE_OPC_LWADD,
-  TILE_OPC_LWADD_SN,
-  TILE_OPC_LWADD_NA,
-  TILE_OPC_LWADD_NA_SN,
-  TILE_OPC_MAXB_U,
-  TILE_OPC_MAXB_U_SN,
-  TILE_OPC_MAXH,
-  TILE_OPC_MAXH_SN,
-  TILE_OPC_MAXIB_U,
-  TILE_OPC_MAXIB_U_SN,
-  TILE_OPC_MAXIH,
-  TILE_OPC_MAXIH_SN,
-  TILE_OPC_MF,
-  TILE_OPC_MFSPR,
-  TILE_OPC_MINB_U,
-  TILE_OPC_MINB_U_SN,
-  TILE_OPC_MINH,
-  TILE_OPC_MINH_SN,
-  TILE_OPC_MINIB_U,
-  TILE_OPC_MINIB_U_SN,
-  TILE_OPC_MINIH,
-  TILE_OPC_MINIH_SN,
-  TILE_OPC_MM,
-  TILE_OPC_MNZ,
-  TILE_OPC_MNZ_SN,
-  TILE_OPC_MNZB,
-  TILE_OPC_MNZB_SN,
-  TILE_OPC_MNZH,
-  TILE_OPC_MNZH_SN,
-  TILE_OPC_MTSPR,
-  TILE_OPC_MULHH_SS,
-  TILE_OPC_MULHH_SS_SN,
-  TILE_OPC_MULHH_SU,
-  TILE_OPC_MULHH_SU_SN,
-  TILE_OPC_MULHH_UU,
-  TILE_OPC_MULHH_UU_SN,
-  TILE_OPC_MULHHA_SS,
-  TILE_OPC_MULHHA_SS_SN,
-  TILE_OPC_MULHHA_SU,
-  TILE_OPC_MULHHA_SU_SN,
-  TILE_OPC_MULHHA_UU,
-  TILE_OPC_MULHHA_UU_SN,
-  TILE_OPC_MULHHSA_UU,
-  TILE_OPC_MULHHSA_UU_SN,
-  TILE_OPC_MULHL_SS,
-  TILE_OPC_MULHL_SS_SN,
-  TILE_OPC_MULHL_SU,
-  TILE_OPC_MULHL_SU_SN,
-  TILE_OPC_MULHL_US,
-  TILE_OPC_MULHL_US_SN,
-  TILE_OPC_MULHL_UU,
-  TILE_OPC_MULHL_UU_SN,
-  TILE_OPC_MULHLA_SS,
-  TILE_OPC_MULHLA_SS_SN,
-  TILE_OPC_MULHLA_SU,
-  TILE_OPC_MULHLA_SU_SN,
-  TILE_OPC_MULHLA_US,
-  TILE_OPC_MULHLA_US_SN,
-  TILE_OPC_MULHLA_UU,
-  TILE_OPC_MULHLA_UU_SN,
-  TILE_OPC_MULHLSA_UU,
-  TILE_OPC_MULHLSA_UU_SN,
-  TILE_OPC_MULLL_SS,
-  TILE_OPC_MULLL_SS_SN,
-  TILE_OPC_MULLL_SU,
-  TILE_OPC_MULLL_SU_SN,
-  TILE_OPC_MULLL_UU,
-  TILE_OPC_MULLL_UU_SN,
-  TILE_OPC_MULLLA_SS,
-  TILE_OPC_MULLLA_SS_SN,
-  TILE_OPC_MULLLA_SU,
-  TILE_OPC_MULLLA_SU_SN,
-  TILE_OPC_MULLLA_UU,
-  TILE_OPC_MULLLA_UU_SN,
-  TILE_OPC_MULLLSA_UU,
-  TILE_OPC_MULLLSA_UU_SN,
-  TILE_OPC_MVNZ,
-  TILE_OPC_MVNZ_SN,
-  TILE_OPC_MVZ,
-  TILE_OPC_MVZ_SN,
-  TILE_OPC_MZ,
-  TILE_OPC_MZ_SN,
-  TILE_OPC_MZB,
-  TILE_OPC_MZB_SN,
-  TILE_OPC_MZH,
-  TILE_OPC_MZH_SN,
-  TILE_OPC_NAP,
-  TILE_OPC_NOP,
-  TILE_OPC_NOR,
-  TILE_OPC_NOR_SN,
-  TILE_OPC_OR,
-  TILE_OPC_OR_SN,
-  TILE_OPC_ORI,
-  TILE_OPC_ORI_SN,
-  TILE_OPC_PACKBS_U,
-  TILE_OPC_PACKBS_U_SN,
-  TILE_OPC_PACKHB,
-  TILE_OPC_PACKHB_SN,
-  TILE_OPC_PACKHS,
-  TILE_OPC_PACKHS_SN,
-  TILE_OPC_PACKLB,
-  TILE_OPC_PACKLB_SN,
-  TILE_OPC_PCNT,
-  TILE_OPC_PCNT_SN,
-  TILE_OPC_RL,
-  TILE_OPC_RL_SN,
-  TILE_OPC_RLI,
-  TILE_OPC_RLI_SN,
-  TILE_OPC_S1A,
-  TILE_OPC_S1A_SN,
-  TILE_OPC_S2A,
-  TILE_OPC_S2A_SN,
-  TILE_OPC_S3A,
-  TILE_OPC_S3A_SN,
-  TILE_OPC_SADAB_U,
-  TILE_OPC_SADAB_U_SN,
-  TILE_OPC_SADAH,
-  TILE_OPC_SADAH_SN,
-  TILE_OPC_SADAH_U,
-  TILE_OPC_SADAH_U_SN,
-  TILE_OPC_SADB_U,
-  TILE_OPC_SADB_U_SN,
-  TILE_OPC_SADH,
-  TILE_OPC_SADH_SN,
-  TILE_OPC_SADH_U,
-  TILE_OPC_SADH_U_SN,
-  TILE_OPC_SB,
-  TILE_OPC_SBADD,
-  TILE_OPC_SEQ,
-  TILE_OPC_SEQ_SN,
-  TILE_OPC_SEQB,
-  TILE_OPC_SEQB_SN,
-  TILE_OPC_SEQH,
-  TILE_OPC_SEQH_SN,
-  TILE_OPC_SEQI,
-  TILE_OPC_SEQI_SN,
-  TILE_OPC_SEQIB,
-  TILE_OPC_SEQIB_SN,
-  TILE_OPC_SEQIH,
-  TILE_OPC_SEQIH_SN,
-  TILE_OPC_SH,
-  TILE_OPC_SHADD,
-  TILE_OPC_SHL,
-  TILE_OPC_SHL_SN,
-  TILE_OPC_SHLB,
-  TILE_OPC_SHLB_SN,
-  TILE_OPC_SHLH,
-  TILE_OPC_SHLH_SN,
-  TILE_OPC_SHLI,
-  TILE_OPC_SHLI_SN,
-  TILE_OPC_SHLIB,
-  TILE_OPC_SHLIB_SN,
-  TILE_OPC_SHLIH,
-  TILE_OPC_SHLIH_SN,
-  TILE_OPC_SHR,
-  TILE_OPC_SHR_SN,
-  TILE_OPC_SHRB,
-  TILE_OPC_SHRB_SN,
-  TILE_OPC_SHRH,
-  TILE_OPC_SHRH_SN,
-  TILE_OPC_SHRI,
-  TILE_OPC_SHRI_SN,
-  TILE_OPC_SHRIB,
-  TILE_OPC_SHRIB_SN,
-  TILE_OPC_SHRIH,
-  TILE_OPC_SHRIH_SN,
-  TILE_OPC_SLT,
-  TILE_OPC_SLT_SN,
-  TILE_OPC_SLT_U,
-  TILE_OPC_SLT_U_SN,
-  TILE_OPC_SLTB,
-  TILE_OPC_SLTB_SN,
-  TILE_OPC_SLTB_U,
-  TILE_OPC_SLTB_U_SN,
-  TILE_OPC_SLTE,
-  TILE_OPC_SLTE_SN,
-  TILE_OPC_SLTE_U,
-  TILE_OPC_SLTE_U_SN,
-  TILE_OPC_SLTEB,
-  TILE_OPC_SLTEB_SN,
-  TILE_OPC_SLTEB_U,
-  TILE_OPC_SLTEB_U_SN,
-  TILE_OPC_SLTEH,
-  TILE_OPC_SLTEH_SN,
-  TILE_OPC_SLTEH_U,
-  TILE_OPC_SLTEH_U_SN,
-  TILE_OPC_SLTH,
-  TILE_OPC_SLTH_SN,
-  TILE_OPC_SLTH_U,
-  TILE_OPC_SLTH_U_SN,
-  TILE_OPC_SLTI,
-  TILE_OPC_SLTI_SN,
-  TILE_OPC_SLTI_U,
-  TILE_OPC_SLTI_U_SN,
-  TILE_OPC_SLTIB,
-  TILE_OPC_SLTIB_SN,
-  TILE_OPC_SLTIB_U,
-  TILE_OPC_SLTIB_U_SN,
-  TILE_OPC_SLTIH,
-  TILE_OPC_SLTIH_SN,
-  TILE_OPC_SLTIH_U,
-  TILE_OPC_SLTIH_U_SN,
-  TILE_OPC_SNE,
-  TILE_OPC_SNE_SN,
-  TILE_OPC_SNEB,
-  TILE_OPC_SNEB_SN,
-  TILE_OPC_SNEH,
-  TILE_OPC_SNEH_SN,
-  TILE_OPC_SRA,
-  TILE_OPC_SRA_SN,
-  TILE_OPC_SRAB,
-  TILE_OPC_SRAB_SN,
-  TILE_OPC_SRAH,
-  TILE_OPC_SRAH_SN,
-  TILE_OPC_SRAI,
-  TILE_OPC_SRAI_SN,
-  TILE_OPC_SRAIB,
-  TILE_OPC_SRAIB_SN,
-  TILE_OPC_SRAIH,
-  TILE_OPC_SRAIH_SN,
-  TILE_OPC_SUB,
-  TILE_OPC_SUB_SN,
-  TILE_OPC_SUBB,
-  TILE_OPC_SUBB_SN,
-  TILE_OPC_SUBBS_U,
-  TILE_OPC_SUBBS_U_SN,
-  TILE_OPC_SUBH,
-  TILE_OPC_SUBH_SN,
-  TILE_OPC_SUBHS,
-  TILE_OPC_SUBHS_SN,
-  TILE_OPC_SUBS,
-  TILE_OPC_SUBS_SN,
-  TILE_OPC_SW,
-  TILE_OPC_SWADD,
-  TILE_OPC_SWINT0,
-  TILE_OPC_SWINT1,
-  TILE_OPC_SWINT2,
-  TILE_OPC_SWINT3,
-  TILE_OPC_TBLIDXB0,
-  TILE_OPC_TBLIDXB0_SN,
-  TILE_OPC_TBLIDXB1,
-  TILE_OPC_TBLIDXB1_SN,
-  TILE_OPC_TBLIDXB2,
-  TILE_OPC_TBLIDXB2_SN,
-  TILE_OPC_TBLIDXB3,
-  TILE_OPC_TBLIDXB3_SN,
-  TILE_OPC_TNS,
-  TILE_OPC_TNS_SN,
-  TILE_OPC_WH64,
-  TILE_OPC_XOR,
-  TILE_OPC_XOR_SN,
-  TILE_OPC_XORI,
-  TILE_OPC_XORI_SN,
-  TILE_OPC_NONE
-} tile_mnemonic;
+  TILEGX_OPC_BPT,
+  TILEGX_OPC_INFO,
+  TILEGX_OPC_INFOL,
+  TILEGX_OPC_MOVE,
+  TILEGX_OPC_MOVEI,
+  TILEGX_OPC_MOVELI,
+  TILEGX_OPC_PREFETCH,
+  TILEGX_OPC_PREFETCH_ADD_L1,
+  TILEGX_OPC_PREFETCH_ADD_L1_FAULT,
+  TILEGX_OPC_PREFETCH_ADD_L2,
+  TILEGX_OPC_PREFETCH_ADD_L2_FAULT,
+  TILEGX_OPC_PREFETCH_ADD_L3,
+  TILEGX_OPC_PREFETCH_ADD_L3_FAULT,
+  TILEGX_OPC_PREFETCH_L1,
+  TILEGX_OPC_PREFETCH_L1_FAULT,
+  TILEGX_OPC_PREFETCH_L2,
+  TILEGX_OPC_PREFETCH_L2_FAULT,
+  TILEGX_OPC_PREFETCH_L3,
+  TILEGX_OPC_PREFETCH_L3_FAULT,
+  TILEGX_OPC_RAISE,
+  TILEGX_OPC_ADD,
+  TILEGX_OPC_ADDI,
+  TILEGX_OPC_ADDLI,
+  TILEGX_OPC_ADDX,
+  TILEGX_OPC_ADDXI,
+  TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXSC,
+  TILEGX_OPC_AND,
+  TILEGX_OPC_ANDI,
+  TILEGX_OPC_BEQZ,
+  TILEGX_OPC_BEQZT,
+  TILEGX_OPC_BFEXTS,
+  TILEGX_OPC_BFEXTU,
+  TILEGX_OPC_BFINS,
+  TILEGX_OPC_BGEZ,
+  TILEGX_OPC_BGEZT,
+  TILEGX_OPC_BGTZ,
+  TILEGX_OPC_BGTZT,
+  TILEGX_OPC_BLBC,
+  TILEGX_OPC_BLBCT,
+  TILEGX_OPC_BLBS,
+  TILEGX_OPC_BLBST,
+  TILEGX_OPC_BLEZ,
+  TILEGX_OPC_BLEZT,
+  TILEGX_OPC_BLTZ,
+  TILEGX_OPC_BLTZT,
+  TILEGX_OPC_BNEZ,
+  TILEGX_OPC_BNEZT,
+  TILEGX_OPC_CLZ,
+  TILEGX_OPC_CMOVEQZ,
+  TILEGX_OPC_CMOVNEZ,
+  TILEGX_OPC_CMPEQ,
+  TILEGX_OPC_CMPEQI,
+  TILEGX_OPC_CMPEXCH,
+  TILEGX_OPC_CMPEXCH4,
+  TILEGX_OPC_CMPLES,
+  TILEGX_OPC_CMPLEU,
+  TILEGX_OPC_CMPLTS,
+  TILEGX_OPC_CMPLTSI,
+  TILEGX_OPC_CMPLTU,
+  TILEGX_OPC_CMPLTUI,
+  TILEGX_OPC_CMPNE,
+  TILEGX_OPC_CMUL,
+  TILEGX_OPC_CMULA,
+  TILEGX_OPC_CMULAF,
+  TILEGX_OPC_CMULF,
+  TILEGX_OPC_CMULFR,
+  TILEGX_OPC_CMULH,
+  TILEGX_OPC_CMULHR,
+  TILEGX_OPC_CRC32_32,
+  TILEGX_OPC_CRC32_8,
+  TILEGX_OPC_CTZ,
+  TILEGX_OPC_DBLALIGN,
+  TILEGX_OPC_DBLALIGN2,
+  TILEGX_OPC_DBLALIGN4,
+  TILEGX_OPC_DBLALIGN6,
+  TILEGX_OPC_DRAIN,
+  TILEGX_OPC_DTLBPR,
+  TILEGX_OPC_EXCH,
+  TILEGX_OPC_EXCH4,
+  TILEGX_OPC_FDOUBLE_ADD_FLAGS,
+  TILEGX_OPC_FDOUBLE_ADDSUB,
+  TILEGX_OPC_FDOUBLE_MUL_FLAGS,
+  TILEGX_OPC_FDOUBLE_PACK1,
+  TILEGX_OPC_FDOUBLE_PACK2,
+  TILEGX_OPC_FDOUBLE_SUB_FLAGS,
+  TILEGX_OPC_FDOUBLE_UNPACK_MAX,
+  TILEGX_OPC_FDOUBLE_UNPACK_MIN,
+  TILEGX_OPC_FETCHADD,
+  TILEGX_OPC_FETCHADD4,
+  TILEGX_OPC_FETCHADDGEZ,
+  TILEGX_OPC_FETCHADDGEZ4,
+  TILEGX_OPC_FETCHAND,
+  TILEGX_OPC_FETCHAND4,
+  TILEGX_OPC_FETCHOR,
+  TILEGX_OPC_FETCHOR4,
+  TILEGX_OPC_FINV,
+  TILEGX_OPC_FLUSH,
+  TILEGX_OPC_FLUSHWB,
+  TILEGX_OPC_FNOP,
+  TILEGX_OPC_FSINGLE_ADD1,
+  TILEGX_OPC_FSINGLE_ADDSUB2,
+  TILEGX_OPC_FSINGLE_MUL1,
+  TILEGX_OPC_FSINGLE_MUL2,
+  TILEGX_OPC_FSINGLE_PACK1,
+  TILEGX_OPC_FSINGLE_PACK2,
+  TILEGX_OPC_FSINGLE_SUB1,
+  TILEGX_OPC_ICOH,
+  TILEGX_OPC_ILL,
+  TILEGX_OPC_INV,
+  TILEGX_OPC_IRET,
+  TILEGX_OPC_J,
+  TILEGX_OPC_JAL,
+  TILEGX_OPC_JALR,
+  TILEGX_OPC_JALRP,
+  TILEGX_OPC_JR,
+  TILEGX_OPC_JRP,
+  TILEGX_OPC_LD,
+  TILEGX_OPC_LD1S,
+  TILEGX_OPC_LD1S_ADD,
+  TILEGX_OPC_LD1U,
+  TILEGX_OPC_LD1U_ADD,
+  TILEGX_OPC_LD2S,
+  TILEGX_OPC_LD2S_ADD,
+  TILEGX_OPC_LD2U,
+  TILEGX_OPC_LD2U_ADD,
+  TILEGX_OPC_LD4S,
+  TILEGX_OPC_LD4S_ADD,
+  TILEGX_OPC_LD4U,
+  TILEGX_OPC_LD4U_ADD,
+  TILEGX_OPC_LD_ADD,
+  TILEGX_OPC_LDNA,
+  TILEGX_OPC_LDNA_ADD,
+  TILEGX_OPC_LDNT,
+  TILEGX_OPC_LDNT1S,
+  TILEGX_OPC_LDNT1S_ADD,
+  TILEGX_OPC_LDNT1U,
+  TILEGX_OPC_LDNT1U_ADD,
+  TILEGX_OPC_LDNT2S,
+  TILEGX_OPC_LDNT2S_ADD,
+  TILEGX_OPC_LDNT2U,
+  TILEGX_OPC_LDNT2U_ADD,
+  TILEGX_OPC_LDNT4S,
+  TILEGX_OPC_LDNT4S_ADD,
+  TILEGX_OPC_LDNT4U,
+  TILEGX_OPC_LDNT4U_ADD,
+  TILEGX_OPC_LDNT_ADD,
+  TILEGX_OPC_LNK,
+  TILEGX_OPC_MF,
+  TILEGX_OPC_MFSPR,
+  TILEGX_OPC_MM,
+  TILEGX_OPC_MNZ,
+  TILEGX_OPC_MTSPR,
+  TILEGX_OPC_MUL_HS_HS,
+  TILEGX_OPC_MUL_HS_HU,
+  TILEGX_OPC_MUL_HS_LS,
+  TILEGX_OPC_MUL_HS_LU,
+  TILEGX_OPC_MUL_HU_HU,
+  TILEGX_OPC_MUL_HU_LS,
+  TILEGX_OPC_MUL_HU_LU,
+  TILEGX_OPC_MUL_LS_LS,
+  TILEGX_OPC_MUL_LS_LU,
+  TILEGX_OPC_MUL_LU_LU,
+  TILEGX_OPC_MULA_HS_HS,
+  TILEGX_OPC_MULA_HS_HU,
+  TILEGX_OPC_MULA_HS_LS,
+  TILEGX_OPC_MULA_HS_LU,
+  TILEGX_OPC_MULA_HU_HU,
+  TILEGX_OPC_MULA_HU_LS,
+  TILEGX_OPC_MULA_HU_LU,
+  TILEGX_OPC_MULA_LS_LS,
+  TILEGX_OPC_MULA_LS_LU,
+  TILEGX_OPC_MULA_LU_LU,
+  TILEGX_OPC_MULAX,
+  TILEGX_OPC_MULX,
+  TILEGX_OPC_MZ,
+  TILEGX_OPC_NAP,
+  TILEGX_OPC_NOP,
+  TILEGX_OPC_NOR,
+  TILEGX_OPC_OR,
+  TILEGX_OPC_ORI,
+  TILEGX_OPC_PCNT,
+  TILEGX_OPC_REVBITS,
+  TILEGX_OPC_REVBYTES,
+  TILEGX_OPC_ROTL,
+  TILEGX_OPC_ROTLI,
+  TILEGX_OPC_SHL,
+  TILEGX_OPC_SHL16INSLI,
+  TILEGX_OPC_SHL1ADD,
+  TILEGX_OPC_SHL1ADDX,
+  TILEGX_OPC_SHL2ADD,
+  TILEGX_OPC_SHL2ADDX,
+  TILEGX_OPC_SHL3ADD,
+  TILEGX_OPC_SHL3ADDX,
+  TILEGX_OPC_SHLI,
+  TILEGX_OPC_SHLX,
+  TILEGX_OPC_SHLXI,
+  TILEGX_OPC_SHRS,
+  TILEGX_OPC_SHRSI,
+  TILEGX_OPC_SHRU,
+  TILEGX_OPC_SHRUI,
+  TILEGX_OPC_SHRUX,
+  TILEGX_OPC_SHRUXI,
+  TILEGX_OPC_SHUFFLEBYTES,
+  TILEGX_OPC_ST,
+  TILEGX_OPC_ST1,
+  TILEGX_OPC_ST1_ADD,
+  TILEGX_OPC_ST2,
+  TILEGX_OPC_ST2_ADD,
+  TILEGX_OPC_ST4,
+  TILEGX_OPC_ST4_ADD,
+  TILEGX_OPC_ST_ADD,
+  TILEGX_OPC_STNT,
+  TILEGX_OPC_STNT1,
+  TILEGX_OPC_STNT1_ADD,
+  TILEGX_OPC_STNT2,
+  TILEGX_OPC_STNT2_ADD,
+  TILEGX_OPC_STNT4,
+  TILEGX_OPC_STNT4_ADD,
+  TILEGX_OPC_STNT_ADD,
+  TILEGX_OPC_SUB,
+  TILEGX_OPC_SUBX,
+  TILEGX_OPC_SUBXSC,
+  TILEGX_OPC_SWINT0,
+  TILEGX_OPC_SWINT1,
+  TILEGX_OPC_SWINT2,
+  TILEGX_OPC_SWINT3,
+  TILEGX_OPC_TBLIDXB0,
+  TILEGX_OPC_TBLIDXB1,
+  TILEGX_OPC_TBLIDXB2,
+  TILEGX_OPC_TBLIDXB3,
+  TILEGX_OPC_V1ADD,
+  TILEGX_OPC_V1ADDI,
+  TILEGX_OPC_V1ADDUC,
+  TILEGX_OPC_V1ADIFFU,
+  TILEGX_OPC_V1AVGU,
+  TILEGX_OPC_V1CMPEQ,
+  TILEGX_OPC_V1CMPEQI,
+  TILEGX_OPC_V1CMPLES,
+  TILEGX_OPC_V1CMPLEU,
+  TILEGX_OPC_V1CMPLTS,
+  TILEGX_OPC_V1CMPLTSI,
+  TILEGX_OPC_V1CMPLTU,
+  TILEGX_OPC_V1CMPLTUI,
+  TILEGX_OPC_V1CMPNE,
+  TILEGX_OPC_V1DDOTPU,
+  TILEGX_OPC_V1DDOTPUA,
+  TILEGX_OPC_V1DDOTPUS,
+  TILEGX_OPC_V1DDOTPUSA,
+  TILEGX_OPC_V1DOTP,
+  TILEGX_OPC_V1DOTPA,
+  TILEGX_OPC_V1DOTPU,
+  TILEGX_OPC_V1DOTPUA,
+  TILEGX_OPC_V1DOTPUS,
+  TILEGX_OPC_V1DOTPUSA,
+  TILEGX_OPC_V1INT_H,
+  TILEGX_OPC_V1INT_L,
+  TILEGX_OPC_V1MAXU,
+  TILEGX_OPC_V1MAXUI,
+  TILEGX_OPC_V1MINU,
+  TILEGX_OPC_V1MINUI,
+  TILEGX_OPC_V1MNZ,
+  TILEGX_OPC_V1MULTU,
+  TILEGX_OPC_V1MULU,
+  TILEGX_OPC_V1MULUS,
+  TILEGX_OPC_V1MZ,
+  TILEGX_OPC_V1SADAU,
+  TILEGX_OPC_V1SADU,
+  TILEGX_OPC_V1SHL,
+  TILEGX_OPC_V1SHLI,
+  TILEGX_OPC_V1SHRS,
+  TILEGX_OPC_V1SHRSI,
+  TILEGX_OPC_V1SHRU,
+  TILEGX_OPC_V1SHRUI,
+  TILEGX_OPC_V1SUB,
+  TILEGX_OPC_V1SUBUC,
+  TILEGX_OPC_V2ADD,
+  TILEGX_OPC_V2ADDI,
+  TILEGX_OPC_V2ADDSC,
+  TILEGX_OPC_V2ADIFFS,
+  TILEGX_OPC_V2AVGS,
+  TILEGX_OPC_V2CMPEQ,
+  TILEGX_OPC_V2CMPEQI,
+  TILEGX_OPC_V2CMPLES,
+  TILEGX_OPC_V2CMPLEU,
+  TILEGX_OPC_V2CMPLTS,
+  TILEGX_OPC_V2CMPLTSI,
+  TILEGX_OPC_V2CMPLTU,
+  TILEGX_OPC_V2CMPLTUI,
+  TILEGX_OPC_V2CMPNE,
+  TILEGX_OPC_V2DOTP,
+  TILEGX_OPC_V2DOTPA,
+  TILEGX_OPC_V2INT_H,
+  TILEGX_OPC_V2INT_L,
+  TILEGX_OPC_V2MAXS,
+  TILEGX_OPC_V2MAXSI,
+  TILEGX_OPC_V2MINS,
+  TILEGX_OPC_V2MINSI,
+  TILEGX_OPC_V2MNZ,
+  TILEGX_OPC_V2MULFSC,
+  TILEGX_OPC_V2MULS,
+  TILEGX_OPC_V2MULTS,
+  TILEGX_OPC_V2MZ,
+  TILEGX_OPC_V2PACKH,
+  TILEGX_OPC_V2PACKL,
+  TILEGX_OPC_V2PACKUC,
+  TILEGX_OPC_V2SADAS,
+  TILEGX_OPC_V2SADAU,
+  TILEGX_OPC_V2SADS,
+  TILEGX_OPC_V2SADU,
+  TILEGX_OPC_V2SHL,
+  TILEGX_OPC_V2SHLI,
+  TILEGX_OPC_V2SHLSC,
+  TILEGX_OPC_V2SHRS,
+  TILEGX_OPC_V2SHRSI,
+  TILEGX_OPC_V2SHRU,
+  TILEGX_OPC_V2SHRUI,
+  TILEGX_OPC_V2SUB,
+  TILEGX_OPC_V2SUBSC,
+  TILEGX_OPC_V4ADD,
+  TILEGX_OPC_V4ADDSC,
+  TILEGX_OPC_V4INT_H,
+  TILEGX_OPC_V4INT_L,
+  TILEGX_OPC_V4PACKSC,
+  TILEGX_OPC_V4SHL,
+  TILEGX_OPC_V4SHLSC,
+  TILEGX_OPC_V4SHRS,
+  TILEGX_OPC_V4SHRU,
+  TILEGX_OPC_V4SUB,
+  TILEGX_OPC_V4SUBSC,
+  TILEGX_OPC_WH64,
+  TILEGX_OPC_XOR,
+  TILEGX_OPC_XORI,
+  TILEGX_OPC_NONE
+} tilegx_mnemonic;
 
 /* 64-bit pattern for a { bpt ; nop } bundle. */
-#define TILE_BPT_BUNDLE 0x400b3cae70166000ULL
+#define TILEGX_BPT_BUNDLE 0x286a44ae51485000ULL
 
 
-#define TILE_ELF_MACHINE_CODE EM_TILEPRO
+#define TILE_ELF_MACHINE_CODE EM_TILE64
 
-#define TILE_ELF_NAME "elf32-tilepro"
+#define TILE_ELF_NAME "elf32-tile64"
 
 
 static __inline unsigned int
-get_BrOff_SN(tile_bundle_bits num)
+get_BFEnd_X0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((n >> 0)) & 0x3ff);
+  return (((n >> 12)) & 0x3f);
 }
 
 static __inline unsigned int
-get_BrOff_X1(tile_bundle_bits n)
+get_BFOpcodeExtension_X0(tilegx_bundle_bits num)
 {
-  return (((unsigned int)(n >> 43)) & 0x00007fff) |
-         (((unsigned int)(n >> 20)) & 0x00018000);
+  const unsigned int n = (unsigned int)num;
+  return (((n >> 24)) & 0xf);
 }
 
 static __inline unsigned int
-get_BrType_X1(tile_bundle_bits n)
+get_BFStart_X0(tilegx_bundle_bits num)
 {
-  return (((unsigned int)(n >> 31)) & 0xf);
+  const unsigned int n = (unsigned int)num;
+  return (((n >> 18)) & 0x3f);
 }
 
 static __inline unsigned int
-get_Dest_Imm8_X1(tile_bundle_bits n)
+get_BrOff_X1(tilegx_bundle_bits n)
 {
   return (((unsigned int)(n >> 31)) & 0x0000003f) |
-         (((unsigned int)(n >> 43)) & 0x000000c0);
+         (((unsigned int)(n >> 37)) & 0x0001ffc0);
 }
 
 static __inline unsigned int
-get_Dest_SN(tile_bundle_bits num)
+get_BrType_X1(tilegx_bundle_bits n)
 {
-  const unsigned int n = (unsigned int)num;
-  return (((n >> 2)) & 0x3);
+  return (((unsigned int)(n >> 54)) & 0x1f);
 }
 
 static __inline unsigned int
-get_Dest_X0(tile_bundle_bits num)
+get_Dest_Imm8_X1(tilegx_bundle_bits n)
+{
+  return (((unsigned int)(n >> 31)) & 0x0000003f) |
+         (((unsigned int)(n >> 43)) & 0x000000c0);
+}
+
+static __inline unsigned int
+get_Dest_X0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
   return (((n >> 0)) & 0x3f);
 }
 
 static __inline unsigned int
-get_Dest_X1(tile_bundle_bits n)
+get_Dest_X1(tilegx_bundle_bits n)
 {
   return (((unsigned int)(n >> 31)) & 0x3f);
 }
 
 static __inline unsigned int
-get_Dest_Y0(tile_bundle_bits num)
+get_Dest_Y0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
   return (((n >> 0)) & 0x3f);
 }
 
 static __inline unsigned int
-get_Dest_Y1(tile_bundle_bits n)
+get_Dest_Y1(tilegx_bundle_bits n)
 {
   return (((unsigned int)(n >> 31)) & 0x3f);
 }
 
 static __inline unsigned int
-get_Imm16_X0(tile_bundle_bits num)
+get_Imm16_X0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
   return (((n >> 12)) & 0xffff);
 }
 
 static __inline unsigned int
-get_Imm16_X1(tile_bundle_bits n)
+get_Imm16_X1(tilegx_bundle_bits n)
 {
   return (((unsigned int)(n >> 43)) & 0xffff);
 }
 
 static __inline unsigned int
-get_Imm8_SN(tile_bundle_bits num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((n >> 0)) & 0xff);
-}
-
-static __inline unsigned int
-get_Imm8_X0(tile_bundle_bits num)
+get_Imm8OpcodeExtension_X0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((n >> 12)) & 0xff);
+  return (((n >> 20)) & 0xff);
 }
 
 static __inline unsigned int
-get_Imm8_X1(tile_bundle_bits n)
+get_Imm8OpcodeExtension_X1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 43)) & 0xff);
+  return (((unsigned int)(n >> 51)) & 0xff);
 }
 
 static __inline unsigned int
-get_Imm8_Y0(tile_bundle_bits num)
+get_Imm8_X0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
   return (((n >> 12)) & 0xff);
 }
 
 static __inline unsigned int
-get_Imm8_Y1(tile_bundle_bits n)
+get_Imm8_X1(tilegx_bundle_bits n)
 {
   return (((unsigned int)(n >> 43)) & 0xff);
 }
 
 static __inline unsigned int
-get_ImmOpcodeExtension_X0(tile_bundle_bits num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((n >> 20)) & 0x7f);
-}
-
-static __inline unsigned int
-get_ImmOpcodeExtension_X1(tile_bundle_bits n)
-{
-  return (((unsigned int)(n >> 51)) & 0x7f);
-}
-
-static __inline unsigned int
-get_ImmRROpcodeExtension_SN(tile_bundle_bits num)
+get_Imm8_Y0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((n >> 8)) & 0x3);
-}
-
-static __inline unsigned int
-get_JOffLong_X1(tile_bundle_bits n)
-{
-  return (((unsigned int)(n >> 43)) & 0x00007fff) |
-         (((unsigned int)(n >> 20)) & 0x00018000) |
-         (((unsigned int)(n >> 14)) & 0x001e0000) |
-         (((unsigned int)(n >> 16)) & 0x07e00000) |
-         (((unsigned int)(n >> 31)) & 0x18000000);
-}
-
-static __inline unsigned int
-get_JOff_X1(tile_bundle_bits n)
-{
-  return (((unsigned int)(n >> 43)) & 0x00007fff) |
-         (((unsigned int)(n >> 20)) & 0x00018000) |
-         (((unsigned int)(n >> 14)) & 0x001e0000) |
-         (((unsigned int)(n >> 16)) & 0x07e00000) |
-         (((unsigned int)(n >> 31)) & 0x08000000);
-}
-
-static __inline unsigned int
-get_MF_Imm15_X1(tile_bundle_bits n)
-{
-  return (((unsigned int)(n >> 37)) & 0x00003fff) |
-         (((unsigned int)(n >> 44)) & 0x00004000);
+  return (((n >> 12)) & 0xff);
 }
 
 static __inline unsigned int
-get_MMEnd_X0(tile_bundle_bits num)
+get_Imm8_Y1(tilegx_bundle_bits n)
 {
-  const unsigned int n = (unsigned int)num;
-  return (((n >> 18)) & 0x1f);
+  return (((unsigned int)(n >> 43)) & 0xff);
 }
 
 static __inline unsigned int
-get_MMEnd_X1(tile_bundle_bits n)
+get_JumpOff_X1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 49)) & 0x1f);
+  return (((unsigned int)(n >> 31)) & 0x7ffffff);
 }
 
 static __inline unsigned int
-get_MMStart_X0(tile_bundle_bits num)
+get_JumpOpcodeExtension_X1(tilegx_bundle_bits n)
 {
-  const unsigned int n = (unsigned int)num;
-  return (((n >> 23)) & 0x1f);
+  return (((unsigned int)(n >> 58)) & 0x1);
 }
 
 static __inline unsigned int
-get_MMStart_X1(tile_bundle_bits n)
+get_MF_Imm14_X1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 54)) & 0x1f);
+  return (((unsigned int)(n >> 37)) & 0x3fff);
 }
 
 static __inline unsigned int
-get_MT_Imm15_X1(tile_bundle_bits n)
+get_MT_Imm14_X1(tilegx_bundle_bits n)
 {
   return (((unsigned int)(n >> 31)) & 0x0000003f) |
-         (((unsigned int)(n >> 37)) & 0x00003fc0) |
-         (((unsigned int)(n >> 44)) & 0x00004000);
+         (((unsigned int)(n >> 37)) & 0x00003fc0);
 }
 
 static __inline unsigned int
-get_Mode(tile_bundle_bits n)
+get_Mode(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 63)) & 0x1);
+  return (((unsigned int)(n >> 62)) & 0x3);
 }
 
 static __inline unsigned int
-get_NoRegOpcodeExtension_SN(tile_bundle_bits num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((n >> 0)) & 0xf);
-}
-
-static __inline unsigned int
-get_Opcode_SN(tile_bundle_bits num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((n >> 10)) & 0x3f);
-}
-
-static __inline unsigned int
-get_Opcode_X0(tile_bundle_bits num)
+get_Opcode_X0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
   return (((n >> 28)) & 0x7);
 }
 
 static __inline unsigned int
-get_Opcode_X1(tile_bundle_bits n)
+get_Opcode_X1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 59)) & 0xf);
+  return (((unsigned int)(n >> 59)) & 0x7);
 }
 
 static __inline unsigned int
-get_Opcode_Y0(tile_bundle_bits num)
+get_Opcode_Y0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
   return (((n >> 27)) & 0xf);
 }
 
 static __inline unsigned int
-get_Opcode_Y1(tile_bundle_bits n)
+get_Opcode_Y1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 59)) & 0xf);
+  return (((unsigned int)(n >> 58)) & 0xf);
 }
 
 static __inline unsigned int
-get_Opcode_Y2(tile_bundle_bits n)
+get_Opcode_Y2(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 56)) & 0x7);
-}
-
-static __inline unsigned int
-get_RROpcodeExtension_SN(tile_bundle_bits num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((n >> 4)) & 0xf);
+  return (((n >> 26)) & 0x00000001) |
+         (((unsigned int)(n >> 56)) & 0x00000002);
 }
 
 static __inline unsigned int
-get_RRROpcodeExtension_X0(tile_bundle_bits num)
+get_RRROpcodeExtension_X0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((n >> 18)) & 0x1ff);
+  return (((n >> 18)) & 0x3ff);
 }
 
 static __inline unsigned int
-get_RRROpcodeExtension_X1(tile_bundle_bits n)
+get_RRROpcodeExtension_X1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 49)) & 0x1ff);
+  return (((unsigned int)(n >> 49)) & 0x3ff);
 }
 
 static __inline unsigned int
-get_RRROpcodeExtension_Y0(tile_bundle_bits num)
+get_RRROpcodeExtension_Y0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
   return (((n >> 18)) & 0x3);
 }
 
 static __inline unsigned int
-get_RRROpcodeExtension_Y1(tile_bundle_bits n)
+get_RRROpcodeExtension_Y1(tilegx_bundle_bits n)
 {
   return (((unsigned int)(n >> 49)) & 0x3);
 }
 
 static __inline unsigned int
-get_RouteOpcodeExtension_SN(tile_bundle_bits num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((n >> 0)) & 0x3ff);
-}
-
-static __inline unsigned int
-get_S_X0(tile_bundle_bits num)
+get_ShAmt_X0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((n >> 27)) & 0x1);
+  return (((n >> 12)) & 0x3f);
 }
 
 static __inline unsigned int
-get_S_X1(tile_bundle_bits n)
+get_ShAmt_X1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 58)) & 0x1);
+  return (((unsigned int)(n >> 43)) & 0x3f);
 }
 
 static __inline unsigned int
-get_ShAmt_X0(tile_bundle_bits num)
+get_ShAmt_Y0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((n >> 12)) & 0x1f);
+  return (((n >> 12)) & 0x3f);
 }
 
 static __inline unsigned int
-get_ShAmt_X1(tile_bundle_bits n)
+get_ShAmt_Y1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 43)) & 0x1f);
+  return (((unsigned int)(n >> 43)) & 0x3f);
 }
 
 static __inline unsigned int
-get_ShAmt_Y0(tile_bundle_bits num)
+get_ShiftOpcodeExtension_X0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((n >> 12)) & 0x1f);
+  return (((n >> 18)) & 0x3ff);
 }
 
 static __inline unsigned int
-get_ShAmt_Y1(tile_bundle_bits n)
+get_ShiftOpcodeExtension_X1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 43)) & 0x1f);
+  return (((unsigned int)(n >> 49)) & 0x3ff);
 }
 
 static __inline unsigned int
-get_SrcA_X0(tile_bundle_bits num)
+get_ShiftOpcodeExtension_Y0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((n >> 6)) & 0x3f);
+  return (((n >> 18)) & 0x3);
 }
 
 static __inline unsigned int
-get_SrcA_X1(tile_bundle_bits n)
+get_ShiftOpcodeExtension_Y1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 37)) & 0x3f);
+  return (((unsigned int)(n >> 49)) & 0x3);
 }
 
 static __inline unsigned int
-get_SrcA_Y0(tile_bundle_bits num)
+get_SrcA_X0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
   return (((n >> 6)) & 0x3f);
 }
 
 static __inline unsigned int
-get_SrcA_Y1(tile_bundle_bits n)
+get_SrcA_X1(tilegx_bundle_bits n)
 {
   return (((unsigned int)(n >> 37)) & 0x3f);
 }
 
 static __inline unsigned int
-get_SrcA_Y2(tile_bundle_bits n)
+get_SrcA_Y0(tilegx_bundle_bits num)
 {
-  return (((n >> 26)) & 0x00000001) |
-         (((unsigned int)(n >> 50)) & 0x0000003e);
+  const unsigned int n = (unsigned int)num;
+  return (((n >> 6)) & 0x3f);
 }
 
 static __inline unsigned int
-get_SrcBDest_Y2(tile_bundle_bits num)
+get_SrcA_Y1(tilegx_bundle_bits n)
 {
-  const unsigned int n = (unsigned int)num;
-  return (((n >> 20)) & 0x3f);
+  return (((unsigned int)(n >> 37)) & 0x3f);
 }
 
 static __inline unsigned int
-get_SrcB_X0(tile_bundle_bits num)
+get_SrcA_Y2(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((n >> 12)) & 0x3f);
+  return (((n >> 20)) & 0x3f);
 }
 
 static __inline unsigned int
-get_SrcB_X1(tile_bundle_bits n)
+get_SrcBDest_Y2(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 43)) & 0x3f);
+  return (((unsigned int)(n >> 51)) & 0x3f);
 }
 
 static __inline unsigned int
-get_SrcB_Y0(tile_bundle_bits num)
+get_SrcB_X0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
   return (((n >> 12)) & 0x3f);
 }
 
 static __inline unsigned int
-get_SrcB_Y1(tile_bundle_bits n)
+get_SrcB_X1(tilegx_bundle_bits n)
 {
   return (((unsigned int)(n >> 43)) & 0x3f);
 }
 
 static __inline unsigned int
-get_Src_SN(tile_bundle_bits num)
+get_SrcB_Y0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((n >> 0)) & 0x3);
-}
-
-static __inline unsigned int
-get_UnOpcodeExtension_X0(tile_bundle_bits num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((n >> 12)) & 0x1f);
-}
-
-static __inline unsigned int
-get_UnOpcodeExtension_X1(tile_bundle_bits n)
-{
-  return (((unsigned int)(n >> 43)) & 0x1f);
-}
-
-static __inline unsigned int
-get_UnOpcodeExtension_Y0(tile_bundle_bits num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((n >> 12)) & 0x1f);
+  return (((n >> 12)) & 0x3f);
 }
 
 static __inline unsigned int
-get_UnOpcodeExtension_Y1(tile_bundle_bits n)
+get_SrcB_Y1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 43)) & 0x1f);
+  return (((unsigned int)(n >> 43)) & 0x3f);
 }
 
 static __inline unsigned int
-get_UnShOpcodeExtension_X0(tile_bundle_bits num)
+get_UnaryOpcodeExtension_X0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((n >> 17)) & 0x3ff);
+  return (((n >> 12)) & 0x3f);
 }
 
 static __inline unsigned int
-get_UnShOpcodeExtension_X1(tile_bundle_bits n)
+get_UnaryOpcodeExtension_X1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 48)) & 0x3ff);
+  return (((unsigned int)(n >> 43)) & 0x3f);
 }
 
 static __inline unsigned int
-get_UnShOpcodeExtension_Y0(tile_bundle_bits num)
+get_UnaryOpcodeExtension_Y0(tilegx_bundle_bits num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((n >> 17)) & 0x7);
+  return (((n >> 12)) & 0x3f);
 }
 
 static __inline unsigned int
-get_UnShOpcodeExtension_Y1(tile_bundle_bits n)
+get_UnaryOpcodeExtension_Y1(tilegx_bundle_bits n)
 {
-  return (((unsigned int)(n >> 48)) & 0x7);
+  return (((unsigned int)(n >> 43)) & 0x3f);
 }
 
 
@@ -874,546 +722,441 @@ sign_extend(int n, int num_bits)
 
 
 
-static __inline tile_bundle_bits
-create_BrOff_SN(int num)
+static __inline tilegx_bundle_bits
+create_BFEnd_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x3ff) << 0);
+  return ((n & 0x3f) << 12);
 }
 
-static __inline tile_bundle_bits
-create_BrOff_X1(int num)
+static __inline tilegx_bundle_bits
+create_BFOpcodeExtension_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x00007fff)) << 43) |
-         (((tile_bundle_bits)(n & 0x00018000)) << 20);
+  return ((n & 0xf) << 24);
 }
 
-static __inline tile_bundle_bits
-create_BrType_X1(int num)
+static __inline tilegx_bundle_bits
+create_BFStart_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0xf)) << 31);
+  return ((n & 0x3f) << 18);
 }
 
-static __inline tile_bundle_bits
-create_Dest_Imm8_X1(int num)
+static __inline tilegx_bundle_bits
+create_BrOff_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x0000003f)) << 31) |
-         (((tile_bundle_bits)(n & 0x000000c0)) << 43);
+  return (((tilegx_bundle_bits)(n & 0x0000003f)) << 31) |
+         (((tilegx_bundle_bits)(n & 0x0001ffc0)) << 37);
 }
 
-static __inline tile_bundle_bits
-create_Dest_SN(int num)
+static __inline tilegx_bundle_bits
+create_BrType_X1(int num)
+{
+  const unsigned int n = (unsigned int)num;
+  return (((tilegx_bundle_bits)(n & 0x1f)) << 54);
+}
+
+static __inline tilegx_bundle_bits
+create_Dest_Imm8_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x3) << 2);
+  return (((tilegx_bundle_bits)(n & 0x0000003f)) << 31) |
+         (((tilegx_bundle_bits)(n & 0x000000c0)) << 43);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Dest_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
   return ((n & 0x3f) << 0);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Dest_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x3f)) << 31);
+  return (((tilegx_bundle_bits)(n & 0x3f)) << 31);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Dest_Y0(int num)
 {
   const unsigned int n = (unsigned int)num;
   return ((n & 0x3f) << 0);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Dest_Y1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x3f)) << 31);
+  return (((tilegx_bundle_bits)(n & 0x3f)) << 31);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Imm16_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
   return ((n & 0xffff) << 12);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Imm16_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0xffff)) << 43);
+  return (((tilegx_bundle_bits)(n & 0xffff)) << 43);
 }
 
-static __inline tile_bundle_bits
-create_Imm8_SN(int num)
+static __inline tilegx_bundle_bits
+create_Imm8OpcodeExtension_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0xff) << 0);
+  return ((n & 0xff) << 20);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
+create_Imm8OpcodeExtension_X1(int num)
+{
+  const unsigned int n = (unsigned int)num;
+  return (((tilegx_bundle_bits)(n & 0xff)) << 51);
+}
+
+static __inline tilegx_bundle_bits
 create_Imm8_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
   return ((n & 0xff) << 12);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Imm8_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0xff)) << 43);
+  return (((tilegx_bundle_bits)(n & 0xff)) << 43);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Imm8_Y0(int num)
 {
   const unsigned int n = (unsigned int)num;
   return ((n & 0xff) << 12);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Imm8_Y1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0xff)) << 43);
-}
-
-static __inline tile_bundle_bits
-create_ImmOpcodeExtension_X0(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return ((n & 0x7f) << 20);
-}
-
-static __inline tile_bundle_bits
-create_ImmOpcodeExtension_X1(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x7f)) << 51);
-}
-
-static __inline tile_bundle_bits
-create_ImmRROpcodeExtension_SN(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return ((n & 0x3) << 8);
-}
-
-static __inline tile_bundle_bits
-create_JOffLong_X1(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x00007fff)) << 43) |
-         (((tile_bundle_bits)(n & 0x00018000)) << 20) |
-         (((tile_bundle_bits)(n & 0x001e0000)) << 14) |
-         (((tile_bundle_bits)(n & 0x07e00000)) << 16) |
-         (((tile_bundle_bits)(n & 0x18000000)) << 31);
-}
-
-static __inline tile_bundle_bits
-create_JOff_X1(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x00007fff)) << 43) |
-         (((tile_bundle_bits)(n & 0x00018000)) << 20) |
-         (((tile_bundle_bits)(n & 0x001e0000)) << 14) |
-         (((tile_bundle_bits)(n & 0x07e00000)) << 16) |
-         (((tile_bundle_bits)(n & 0x08000000)) << 31);
-}
-
-static __inline tile_bundle_bits
-create_MF_Imm15_X1(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x00003fff)) << 37) |
-         (((tile_bundle_bits)(n & 0x00004000)) << 44);
+  return (((tilegx_bundle_bits)(n & 0xff)) << 43);
 }
 
-static __inline tile_bundle_bits
-create_MMEnd_X0(int num)
+static __inline tilegx_bundle_bits
+create_JumpOff_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x1f) << 18);
+  return (((tilegx_bundle_bits)(n & 0x7ffffff)) << 31);
 }
 
-static __inline tile_bundle_bits
-create_MMEnd_X1(int num)
+static __inline tilegx_bundle_bits
+create_JumpOpcodeExtension_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x1f)) << 49);
+  return (((tilegx_bundle_bits)(n & 0x1)) << 58);
 }
 
-static __inline tile_bundle_bits
-create_MMStart_X0(int num)
+static __inline tilegx_bundle_bits
+create_MF_Imm14_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x1f) << 23);
+  return (((tilegx_bundle_bits)(n & 0x3fff)) << 37);
 }
 
-static __inline tile_bundle_bits
-create_MMStart_X1(int num)
+static __inline tilegx_bundle_bits
+create_MT_Imm14_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x1f)) << 54);
+  return (((tilegx_bundle_bits)(n & 0x0000003f)) << 31) |
+         (((tilegx_bundle_bits)(n & 0x00003fc0)) << 37);
 }
 
-static __inline tile_bundle_bits
-create_MT_Imm15_X1(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x0000003f)) << 31) |
-         (((tile_bundle_bits)(n & 0x00003fc0)) << 37) |
-         (((tile_bundle_bits)(n & 0x00004000)) << 44);
-}
-
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Mode(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x1)) << 63);
+  return (((tilegx_bundle_bits)(n & 0x3)) << 62);
 }
 
-static __inline tile_bundle_bits
-create_NoRegOpcodeExtension_SN(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return ((n & 0xf) << 0);
-}
-
-static __inline tile_bundle_bits
-create_Opcode_SN(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return ((n & 0x3f) << 10);
-}
-
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Opcode_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
   return ((n & 0x7) << 28);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Opcode_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0xf)) << 59);
+  return (((tilegx_bundle_bits)(n & 0x7)) << 59);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Opcode_Y0(int num)
 {
   const unsigned int n = (unsigned int)num;
   return ((n & 0xf) << 27);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Opcode_Y1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0xf)) << 59);
+  return (((tilegx_bundle_bits)(n & 0xf)) << 58);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_Opcode_Y2(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x7)) << 56);
-}
-
-static __inline tile_bundle_bits
-create_RROpcodeExtension_SN(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return ((n & 0xf) << 4);
+  return ((n & 0x00000001) << 26) |
+         (((tilegx_bundle_bits)(n & 0x00000002)) << 56);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_RRROpcodeExtension_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x1ff) << 18);
+  return ((n & 0x3ff) << 18);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_RRROpcodeExtension_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x1ff)) << 49);
+  return (((tilegx_bundle_bits)(n & 0x3ff)) << 49);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_RRROpcodeExtension_Y0(int num)
 {
   const unsigned int n = (unsigned int)num;
   return ((n & 0x3) << 18);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_RRROpcodeExtension_Y1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x3)) << 49);
+  return (((tilegx_bundle_bits)(n & 0x3)) << 49);
 }
 
-static __inline tile_bundle_bits
-create_RouteOpcodeExtension_SN(int num)
+static __inline tilegx_bundle_bits
+create_ShAmt_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x3ff) << 0);
+  return ((n & 0x3f) << 12);
 }
 
-static __inline tile_bundle_bits
-create_S_X0(int num)
+static __inline tilegx_bundle_bits
+create_ShAmt_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x1) << 27);
+  return (((tilegx_bundle_bits)(n & 0x3f)) << 43);
 }
 
-static __inline tile_bundle_bits
-create_S_X1(int num)
+static __inline tilegx_bundle_bits
+create_ShAmt_Y0(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x1)) << 58);
+  return ((n & 0x3f) << 12);
 }
 
-static __inline tile_bundle_bits
-create_ShAmt_X0(int num)
+static __inline tilegx_bundle_bits
+create_ShAmt_Y1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x1f) << 12);
+  return (((tilegx_bundle_bits)(n & 0x3f)) << 43);
 }
 
-static __inline tile_bundle_bits
-create_ShAmt_X1(int num)
+static __inline tilegx_bundle_bits
+create_ShiftOpcodeExtension_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x1f)) << 43);
+  return ((n & 0x3ff) << 18);
 }
 
-static __inline tile_bundle_bits
-create_ShAmt_Y0(int num)
+static __inline tilegx_bundle_bits
+create_ShiftOpcodeExtension_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x1f) << 12);
+  return (((tilegx_bundle_bits)(n & 0x3ff)) << 49);
 }
 
-static __inline tile_bundle_bits
-create_ShAmt_Y1(int num)
+static __inline tilegx_bundle_bits
+create_ShiftOpcodeExtension_Y0(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x1f)) << 43);
+  return ((n & 0x3) << 18);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
+create_ShiftOpcodeExtension_Y1(int num)
+{
+  const unsigned int n = (unsigned int)num;
+  return (((tilegx_bundle_bits)(n & 0x3)) << 49);
+}
+
+static __inline tilegx_bundle_bits
 create_SrcA_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
   return ((n & 0x3f) << 6);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_SrcA_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x3f)) << 37);
+  return (((tilegx_bundle_bits)(n & 0x3f)) << 37);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_SrcA_Y0(int num)
 {
   const unsigned int n = (unsigned int)num;
   return ((n & 0x3f) << 6);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_SrcA_Y1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x3f)) << 37);
+  return (((tilegx_bundle_bits)(n & 0x3f)) << 37);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_SrcA_Y2(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x00000001) << 26) |
-         (((tile_bundle_bits)(n & 0x0000003e)) << 50);
+  return ((n & 0x3f) << 20);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_SrcBDest_Y2(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x3f) << 20);
+  return (((tilegx_bundle_bits)(n & 0x3f)) << 51);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_SrcB_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
   return ((n & 0x3f) << 12);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_SrcB_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x3f)) << 43);
+  return (((tilegx_bundle_bits)(n & 0x3f)) << 43);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_SrcB_Y0(int num)
 {
   const unsigned int n = (unsigned int)num;
   return ((n & 0x3f) << 12);
 }
 
-static __inline tile_bundle_bits
+static __inline tilegx_bundle_bits
 create_SrcB_Y1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x3f)) << 43);
+  return (((tilegx_bundle_bits)(n & 0x3f)) << 43);
 }
 
-static __inline tile_bundle_bits
-create_Src_SN(int num)
+static __inline tilegx_bundle_bits
+create_UnaryOpcodeExtension_X0(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x3) << 0);
-}
-
-static __inline tile_bundle_bits
-create_UnOpcodeExtension_X0(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return ((n & 0x1f) << 12);
-}
-
-static __inline tile_bundle_bits
-create_UnOpcodeExtension_X1(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x1f)) << 43);
-}
-
-static __inline tile_bundle_bits
-create_UnOpcodeExtension_Y0(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return ((n & 0x1f) << 12);
-}
-
-static __inline tile_bundle_bits
-create_UnOpcodeExtension_Y1(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x1f)) << 43);
-}
-
-static __inline tile_bundle_bits
-create_UnShOpcodeExtension_X0(int num)
-{
-  const unsigned int n = (unsigned int)num;
-  return ((n & 0x3ff) << 17);
+  return ((n & 0x3f) << 12);
 }
 
-static __inline tile_bundle_bits
-create_UnShOpcodeExtension_X1(int num)
+static __inline tilegx_bundle_bits
+create_UnaryOpcodeExtension_X1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x3ff)) << 48);
+  return (((tilegx_bundle_bits)(n & 0x3f)) << 43);
 }
 
-static __inline tile_bundle_bits
-create_UnShOpcodeExtension_Y0(int num)
+static __inline tilegx_bundle_bits
+create_UnaryOpcodeExtension_Y0(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return ((n & 0x7) << 17);
+  return ((n & 0x3f) << 12);
 }
 
-static __inline tile_bundle_bits
-create_UnShOpcodeExtension_Y1(int num)
+static __inline tilegx_bundle_bits
+create_UnaryOpcodeExtension_Y1(int num)
 {
   const unsigned int n = (unsigned int)num;
-  return (((tile_bundle_bits)(n & 0x7)) << 48);
+  return (((tilegx_bundle_bits)(n & 0x3f)) << 43);
 }
 
 
-
 typedef enum
 {
-  TILE_PIPELINE_X0,
-  TILE_PIPELINE_X1,
-  TILE_PIPELINE_Y0,
-  TILE_PIPELINE_Y1,
-  TILE_PIPELINE_Y2,
-} tile_pipeline;
+  TILEGX_PIPELINE_X0,
+  TILEGX_PIPELINE_X1,
+  TILEGX_PIPELINE_Y0,
+  TILEGX_PIPELINE_Y1,
+  TILEGX_PIPELINE_Y2,
+} tilegx_pipeline;
 
-#define tile_is_x_pipeline(p) ((int)(p) <= (int)TILE_PIPELINE_X1)
+#define tilegx_is_x_pipeline(p) ((int)(p) <= (int)TILEGX_PIPELINE_X1)
 
 typedef enum
 {
-  TILE_OP_TYPE_REGISTER,
-  TILE_OP_TYPE_IMMEDIATE,
-  TILE_OP_TYPE_ADDRESS,
-  TILE_OP_TYPE_SPR
-} tile_operand_type;
+  TILEGX_OP_TYPE_REGISTER,
+  TILEGX_OP_TYPE_IMMEDIATE,
+  TILEGX_OP_TYPE_ADDRESS,
+  TILEGX_OP_TYPE_SPR
+} tilegx_operand_type;
 
-/* This is the bit that determines if a bundle is in the Y encoding. */
-#define TILE_BUNDLE_Y_ENCODING_MASK ((tile_bundle_bits)1 << 63)
+/* These are the bits that determine if a bundle is in the X encoding. */
+#define TILEGX_BUNDLE_MODE_MASK ((tilegx_bundle_bits)3 << 62)
 
 enum
 {
   /* Maximum number of instructions in a bundle (2 for X, 3 for Y). */
-  TILE_MAX_INSTRUCTIONS_PER_BUNDLE = 3,
+  TILEGX_MAX_INSTRUCTIONS_PER_BUNDLE = 3,
 
   /* How many different pipeline encodings are there? X0, X1, Y0, Y1, Y2. */
-  TILE_NUM_PIPELINE_ENCODINGS = 5,
+  TILEGX_NUM_PIPELINE_ENCODINGS = 5,
 
-  /* Log base 2 of TILE_BUNDLE_SIZE_IN_BYTES. */
-  TILE_LOG2_BUNDLE_SIZE_IN_BYTES = 3,
+  /* Log base 2 of TILEGX_BUNDLE_SIZE_IN_BYTES. */
+  TILEGX_LOG2_BUNDLE_SIZE_IN_BYTES = 3,
 
   /* Instructions take this many bytes. */
-  TILE_BUNDLE_SIZE_IN_BYTES = 1 << TILE_LOG2_BUNDLE_SIZE_IN_BYTES,
+  TILEGX_BUNDLE_SIZE_IN_BYTES = 1 << TILEGX_LOG2_BUNDLE_SIZE_IN_BYTES,
 
-  /* Log base 2 of TILE_BUNDLE_ALIGNMENT_IN_BYTES. */
-  TILE_LOG2_BUNDLE_ALIGNMENT_IN_BYTES = 3,
+  /* Log base 2 of TILEGX_BUNDLE_ALIGNMENT_IN_BYTES. */
+  TILEGX_LOG2_BUNDLE_ALIGNMENT_IN_BYTES = 3,
 
   /* Bundles should be aligned modulo this number of bytes. */
-  TILE_BUNDLE_ALIGNMENT_IN_BYTES =
-    (1 << TILE_LOG2_BUNDLE_ALIGNMENT_IN_BYTES),
-
-  /* Log base 2 of TILE_SN_INSTRUCTION_SIZE_IN_BYTES. */
-  TILE_LOG2_SN_INSTRUCTION_SIZE_IN_BYTES = 1,
-
-  /* Static network instructions take this many bytes. */
-  TILE_SN_INSTRUCTION_SIZE_IN_BYTES =
-    (1 << TILE_LOG2_SN_INSTRUCTION_SIZE_IN_BYTES),
+  TILEGX_BUNDLE_ALIGNMENT_IN_BYTES =
+    (1 << TILEGX_LOG2_BUNDLE_ALIGNMENT_IN_BYTES),
 
   /* Number of registers (some are magic, such as network I/O). */
-  TILE_NUM_REGISTERS = 64,
-
-  /* Number of static network registers. */
-  TILE_NUM_SN_REGISTERS = 4
+  TILEGX_NUM_REGISTERS = 64,
 };
 
 
-struct tile_operand
+struct tilegx_operand
 {
   /* Is this operand a register, immediate or address? */
-  tile_operand_type type;
+  tilegx_operand_type type;
 
   /* The default relocation type for this operand.  */
   signed int default_reloc : 16;
@@ -1437,27 +1180,27 @@ struct tile_operand
   unsigned int rightshift : 2;
 
   /* Return the bits for this operand to be ORed into an existing bundle. */
-  tile_bundle_bits (*insert) (int op);
+  tilegx_bundle_bits (*insert) (int op);
 
   /* Extract this operand and return it. */
-  unsigned int (*extract) (tile_bundle_bits bundle);
+  unsigned int (*extract) (tilegx_bundle_bits bundle);
 };
 
 
-extern const struct tile_operand tile_operands[];
+extern const struct tilegx_operand tilegx_operands[];
 
 /* One finite-state machine per pipe for rapid instruction decoding. */
 extern const unsigned short * const
-tile_bundle_decoder_fsms[TILE_NUM_PIPELINE_ENCODINGS];
+tilegx_bundle_decoder_fsms[TILEGX_NUM_PIPELINE_ENCODINGS];
 
 
-struct tile_opcode
+struct tilegx_opcode
 {
   /* The opcode mnemonic, e.g. "add" */
   const char *name;
 
   /* The enum value for this mnemonic. */
-  tile_mnemonic mnemonic;
+  tilegx_mnemonic mnemonic;
 
   /* A bit mask of which of the five pipes this instruction
      is compatible with:
@@ -1478,29 +1221,28 @@ struct tile_opcode
   unsigned char can_bundle;
 
   /* The description of the operands. Each of these is an
-   * index into the tile_operands[] table. */
-  unsigned char operands[TILE_NUM_PIPELINE_ENCODINGS][TILE_MAX_OPERANDS];
+   * index into the tilegx_operands[] table. */
+  unsigned char operands[TILEGX_NUM_PIPELINE_ENCODINGS][TILEGX_MAX_OPERANDS];
 
 };
 
-extern const struct tile_opcode tile_opcodes[];
-
+extern const struct tilegx_opcode tilegx_opcodes[];
 
 /* Used for non-textual disassembly into structs. */
-struct tile_decoded_instruction
+struct tilegx_decoded_instruction
 {
-  const struct tile_opcode *opcode;
-  const struct tile_operand *operands[TILE_MAX_OPERANDS];
-  int operand_values[TILE_MAX_OPERANDS];
+  const struct tilegx_opcode *opcode;
+  const struct tilegx_operand *operands[TILEGX_MAX_OPERANDS];
+  long long operand_values[TILEGX_MAX_OPERANDS];
 };
 
 
 /* Disassemble a bundle into a struct for machine processing. */
-extern int parse_insn_tile(tile_bundle_bits bits,
-                           unsigned int pc,
-                           struct tile_decoded_instruction
-                           decoded[TILE_MAX_INSTRUCTIONS_PER_BUNDLE]);
+extern int parse_insn_tilegx(tilegx_bundle_bits bits,
+                             unsigned long long pc,
+                             struct tilegx_decoded_instruction
+                             decoded[TILEGX_MAX_INSTRUCTIONS_PER_BUNDLE]);
 
 
 
-#endif /* opcode_tile_h */
+#endif /* opcode_tilegx_h */
diff --git a/arch/tile/include/asm/opcode_constants_64.h b/arch/tile/include/asm/opcode_constants_64.h
index 227d033b180c..710192869476 100644
--- a/arch/tile/include/asm/opcode_constants_64.h
+++ b/arch/tile/include/asm/opcode_constants_64.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Tilera Corporation. All Rights Reserved.
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public License
@@ -19,462 +19,591 @@
 #define _TILE_OPCODE_CONSTANTS_H
 enum
 {
-  ADDBS_U_SPECIAL_0_OPCODE_X0 = 98,
-  ADDBS_U_SPECIAL_0_OPCODE_X1 = 68,
-  ADDB_SPECIAL_0_OPCODE_X0 = 1,
-  ADDB_SPECIAL_0_OPCODE_X1 = 1,
-  ADDHS_SPECIAL_0_OPCODE_X0 = 99,
-  ADDHS_SPECIAL_0_OPCODE_X1 = 69,
-  ADDH_SPECIAL_0_OPCODE_X0 = 2,
-  ADDH_SPECIAL_0_OPCODE_X1 = 2,
-  ADDIB_IMM_0_OPCODE_X0 = 1,
-  ADDIB_IMM_0_OPCODE_X1 = 1,
-  ADDIH_IMM_0_OPCODE_X0 = 2,
-  ADDIH_IMM_0_OPCODE_X1 = 2,
-  ADDI_IMM_0_OPCODE_X0 = 3,
-  ADDI_IMM_0_OPCODE_X1 = 3,
-  ADDI_IMM_1_OPCODE_SN = 1,
-  ADDI_OPCODE_Y0 = 9,
-  ADDI_OPCODE_Y1 = 7,
-  ADDLIS_OPCODE_X0 = 1,
-  ADDLIS_OPCODE_X1 = 2,
-  ADDLI_OPCODE_X0 = 2,
-  ADDLI_OPCODE_X1 = 3,
-  ADDS_SPECIAL_0_OPCODE_X0 = 96,
-  ADDS_SPECIAL_0_OPCODE_X1 = 66,
-  ADD_SPECIAL_0_OPCODE_X0 = 3,
-  ADD_SPECIAL_0_OPCODE_X1 = 3,
-  ADD_SPECIAL_0_OPCODE_Y0 = 0,
-  ADD_SPECIAL_0_OPCODE_Y1 = 0,
-  ADIFFB_U_SPECIAL_0_OPCODE_X0 = 4,
-  ADIFFH_SPECIAL_0_OPCODE_X0 = 5,
-  ANDI_IMM_0_OPCODE_X0 = 1,
-  ANDI_IMM_0_OPCODE_X1 = 4,
-  ANDI_OPCODE_Y0 = 10,
-  ANDI_OPCODE_Y1 = 8,
-  AND_SPECIAL_0_OPCODE_X0 = 6,
-  AND_SPECIAL_0_OPCODE_X1 = 4,
-  AND_SPECIAL_2_OPCODE_Y0 = 0,
-  AND_SPECIAL_2_OPCODE_Y1 = 0,
-  AULI_OPCODE_X0 = 3,
-  AULI_OPCODE_X1 = 4,
-  AVGB_U_SPECIAL_0_OPCODE_X0 = 7,
-  AVGH_SPECIAL_0_OPCODE_X0 = 8,
-  BBNST_BRANCH_OPCODE_X1 = 15,
-  BBNS_BRANCH_OPCODE_X1 = 14,
-  BBNS_OPCODE_SN = 63,
-  BBST_BRANCH_OPCODE_X1 = 13,
-  BBS_BRANCH_OPCODE_X1 = 12,
-  BBS_OPCODE_SN = 62,
-  BGEZT_BRANCH_OPCODE_X1 = 7,
-  BGEZ_BRANCH_OPCODE_X1 = 6,
-  BGEZ_OPCODE_SN = 61,
-  BGZT_BRANCH_OPCODE_X1 = 5,
-  BGZ_BRANCH_OPCODE_X1 = 4,
-  BGZ_OPCODE_SN = 58,
-  BITX_UN_0_SHUN_0_OPCODE_X0 = 1,
-  BITX_UN_0_SHUN_0_OPCODE_Y0 = 1,
-  BLEZT_BRANCH_OPCODE_X1 = 11,
-  BLEZ_BRANCH_OPCODE_X1 = 10,
-  BLEZ_OPCODE_SN = 59,
-  BLZT_BRANCH_OPCODE_X1 = 9,
-  BLZ_BRANCH_OPCODE_X1 = 8,
-  BLZ_OPCODE_SN = 60,
-  BNZT_BRANCH_OPCODE_X1 = 3,
-  BNZ_BRANCH_OPCODE_X1 = 2,
-  BNZ_OPCODE_SN = 57,
-  BPT_NOREG_RR_IMM_0_OPCODE_SN = 1,
-  BRANCH_OPCODE_X1 = 5,
-  BYTEX_UN_0_SHUN_0_OPCODE_X0 = 2,
-  BYTEX_UN_0_SHUN_0_OPCODE_Y0 = 2,
-  BZT_BRANCH_OPCODE_X1 = 1,
-  BZ_BRANCH_OPCODE_X1 = 0,
-  BZ_OPCODE_SN = 56,
-  CLZ_UN_0_SHUN_0_OPCODE_X0 = 3,
-  CLZ_UN_0_SHUN_0_OPCODE_Y0 = 3,
-  CRC32_32_SPECIAL_0_OPCODE_X0 = 9,
-  CRC32_8_SPECIAL_0_OPCODE_X0 = 10,
-  CTZ_UN_0_SHUN_0_OPCODE_X0 = 4,
-  CTZ_UN_0_SHUN_0_OPCODE_Y0 = 4,
-  DRAIN_UN_0_SHUN_0_OPCODE_X1 = 1,
-  DTLBPR_UN_0_SHUN_0_OPCODE_X1 = 2,
-  DWORD_ALIGN_SPECIAL_0_OPCODE_X0 = 95,
-  FINV_UN_0_SHUN_0_OPCODE_X1 = 3,
-  FLUSH_UN_0_SHUN_0_OPCODE_X1 = 4,
-  FNOP_NOREG_RR_IMM_0_OPCODE_SN = 3,
-  FNOP_UN_0_SHUN_0_OPCODE_X0 = 5,
-  FNOP_UN_0_SHUN_0_OPCODE_X1 = 5,
-  FNOP_UN_0_SHUN_0_OPCODE_Y0 = 5,
-  FNOP_UN_0_SHUN_0_OPCODE_Y1 = 1,
-  HALT_NOREG_RR_IMM_0_OPCODE_SN = 0,
-  ICOH_UN_0_SHUN_0_OPCODE_X1 = 6,
-  ILL_UN_0_SHUN_0_OPCODE_X1 = 7,
-  ILL_UN_0_SHUN_0_OPCODE_Y1 = 2,
-  IMM_0_OPCODE_SN = 0,
-  IMM_0_OPCODE_X0 = 4,
-  IMM_0_OPCODE_X1 = 6,
-  IMM_1_OPCODE_SN = 1,
-  IMM_OPCODE_0_X0 = 5,
-  INTHB_SPECIAL_0_OPCODE_X0 = 11,
-  INTHB_SPECIAL_0_OPCODE_X1 = 5,
-  INTHH_SPECIAL_0_OPCODE_X0 = 12,
-  INTHH_SPECIAL_0_OPCODE_X1 = 6,
-  INTLB_SPECIAL_0_OPCODE_X0 = 13,
-  INTLB_SPECIAL_0_OPCODE_X1 = 7,
-  INTLH_SPECIAL_0_OPCODE_X0 = 14,
-  INTLH_SPECIAL_0_OPCODE_X1 = 8,
-  INV_UN_0_SHUN_0_OPCODE_X1 = 8,
-  IRET_UN_0_SHUN_0_OPCODE_X1 = 9,
-  JALB_OPCODE_X1 = 13,
-  JALF_OPCODE_X1 = 12,
-  JALRP_SPECIAL_0_OPCODE_X1 = 9,
-  JALRR_IMM_1_OPCODE_SN = 3,
-  JALR_RR_IMM_0_OPCODE_SN = 5,
-  JALR_SPECIAL_0_OPCODE_X1 = 10,
-  JB_OPCODE_X1 = 11,
-  JF_OPCODE_X1 = 10,
-  JRP_SPECIAL_0_OPCODE_X1 = 11,
-  JRR_IMM_1_OPCODE_SN = 2,
-  JR_RR_IMM_0_OPCODE_SN = 4,
-  JR_SPECIAL_0_OPCODE_X1 = 12,
-  LBADD_IMM_0_OPCODE_X1 = 22,
-  LBADD_U_IMM_0_OPCODE_X1 = 23,
-  LB_OPCODE_Y2 = 0,
-  LB_UN_0_SHUN_0_OPCODE_X1 = 10,
-  LB_U_OPCODE_Y2 = 1,
-  LB_U_UN_0_SHUN_0_OPCODE_X1 = 11,
-  LHADD_IMM_0_OPCODE_X1 = 24,
-  LHADD_U_IMM_0_OPCODE_X1 = 25,
-  LH_OPCODE_Y2 = 2,
-  LH_UN_0_SHUN_0_OPCODE_X1 = 12,
-  LH_U_OPCODE_Y2 = 3,
-  LH_U_UN_0_SHUN_0_OPCODE_X1 = 13,
-  LNK_SPECIAL_0_OPCODE_X1 = 13,
-  LWADD_IMM_0_OPCODE_X1 = 26,
-  LWADD_NA_IMM_0_OPCODE_X1 = 27,
-  LW_NA_UN_0_SHUN_0_OPCODE_X1 = 24,
-  LW_OPCODE_Y2 = 4,
-  LW_UN_0_SHUN_0_OPCODE_X1 = 14,
-  MAXB_U_SPECIAL_0_OPCODE_X0 = 15,
-  MAXB_U_SPECIAL_0_OPCODE_X1 = 14,
-  MAXH_SPECIAL_0_OPCODE_X0 = 16,
-  MAXH_SPECIAL_0_OPCODE_X1 = 15,
-  MAXIB_U_IMM_0_OPCODE_X0 = 4,
-  MAXIB_U_IMM_0_OPCODE_X1 = 5,
-  MAXIH_IMM_0_OPCODE_X0 = 5,
-  MAXIH_IMM_0_OPCODE_X1 = 6,
-  MFSPR_IMM_0_OPCODE_X1 = 7,
-  MF_UN_0_SHUN_0_OPCODE_X1 = 15,
-  MINB_U_SPECIAL_0_OPCODE_X0 = 17,
-  MINB_U_SPECIAL_0_OPCODE_X1 = 16,
-  MINH_SPECIAL_0_OPCODE_X0 = 18,
-  MINH_SPECIAL_0_OPCODE_X1 = 17,
-  MINIB_U_IMM_0_OPCODE_X0 = 6,
-  MINIB_U_IMM_0_OPCODE_X1 = 8,
-  MINIH_IMM_0_OPCODE_X0 = 7,
-  MINIH_IMM_0_OPCODE_X1 = 9,
-  MM_OPCODE_X0 = 6,
-  MM_OPCODE_X1 = 7,
-  MNZB_SPECIAL_0_OPCODE_X0 = 19,
-  MNZB_SPECIAL_0_OPCODE_X1 = 18,
-  MNZH_SPECIAL_0_OPCODE_X0 = 20,
-  MNZH_SPECIAL_0_OPCODE_X1 = 19,
-  MNZ_SPECIAL_0_OPCODE_X0 = 21,
-  MNZ_SPECIAL_0_OPCODE_X1 = 20,
-  MNZ_SPECIAL_1_OPCODE_Y0 = 0,
-  MNZ_SPECIAL_1_OPCODE_Y1 = 1,
-  MOVEI_IMM_1_OPCODE_SN = 0,
-  MOVE_RR_IMM_0_OPCODE_SN = 8,
-  MTSPR_IMM_0_OPCODE_X1 = 10,
-  MULHHA_SS_SPECIAL_0_OPCODE_X0 = 22,
-  MULHHA_SS_SPECIAL_7_OPCODE_Y0 = 0,
-  MULHHA_SU_SPECIAL_0_OPCODE_X0 = 23,
-  MULHHA_UU_SPECIAL_0_OPCODE_X0 = 24,
-  MULHHA_UU_SPECIAL_7_OPCODE_Y0 = 1,
-  MULHHSA_UU_SPECIAL_0_OPCODE_X0 = 25,
-  MULHH_SS_SPECIAL_0_OPCODE_X0 = 26,
-  MULHH_SS_SPECIAL_6_OPCODE_Y0 = 0,
-  MULHH_SU_SPECIAL_0_OPCODE_X0 = 27,
-  MULHH_UU_SPECIAL_0_OPCODE_X0 = 28,
-  MULHH_UU_SPECIAL_6_OPCODE_Y0 = 1,
-  MULHLA_SS_SPECIAL_0_OPCODE_X0 = 29,
-  MULHLA_SU_SPECIAL_0_OPCODE_X0 = 30,
-  MULHLA_US_SPECIAL_0_OPCODE_X0 = 31,
-  MULHLA_UU_SPECIAL_0_OPCODE_X0 = 32,
-  MULHLSA_UU_SPECIAL_0_OPCODE_X0 = 33,
-  MULHLSA_UU_SPECIAL_5_OPCODE_Y0 = 0,
-  MULHL_SS_SPECIAL_0_OPCODE_X0 = 34,
-  MULHL_SU_SPECIAL_0_OPCODE_X0 = 35,
-  MULHL_US_SPECIAL_0_OPCODE_X0 = 36,
-  MULHL_UU_SPECIAL_0_OPCODE_X0 = 37,
-  MULLLA_SS_SPECIAL_0_OPCODE_X0 = 38,
-  MULLLA_SS_SPECIAL_7_OPCODE_Y0 = 2,
-  MULLLA_SU_SPECIAL_0_OPCODE_X0 = 39,
-  MULLLA_UU_SPECIAL_0_OPCODE_X0 = 40,
-  MULLLA_UU_SPECIAL_7_OPCODE_Y0 = 3,
-  MULLLSA_UU_SPECIAL_0_OPCODE_X0 = 41,
-  MULLL_SS_SPECIAL_0_OPCODE_X0 = 42,
-  MULLL_SS_SPECIAL_6_OPCODE_Y0 = 2,
-  MULLL_SU_SPECIAL_0_OPCODE_X0 = 43,
-  MULLL_UU_SPECIAL_0_OPCODE_X0 = 44,
-  MULLL_UU_SPECIAL_6_OPCODE_Y0 = 3,
-  MVNZ_SPECIAL_0_OPCODE_X0 = 45,
-  MVNZ_SPECIAL_1_OPCODE_Y0 = 1,
-  MVZ_SPECIAL_0_OPCODE_X0 = 46,
-  MVZ_SPECIAL_1_OPCODE_Y0 = 2,
-  MZB_SPECIAL_0_OPCODE_X0 = 47,
-  MZB_SPECIAL_0_OPCODE_X1 = 21,
-  MZH_SPECIAL_0_OPCODE_X0 = 48,
-  MZH_SPECIAL_0_OPCODE_X1 = 22,
-  MZ_SPECIAL_0_OPCODE_X0 = 49,
-  MZ_SPECIAL_0_OPCODE_X1 = 23,
-  MZ_SPECIAL_1_OPCODE_Y0 = 3,
-  MZ_SPECIAL_1_OPCODE_Y1 = 2,
-  NAP_UN_0_SHUN_0_OPCODE_X1 = 16,
-  NOP_NOREG_RR_IMM_0_OPCODE_SN = 2,
-  NOP_UN_0_SHUN_0_OPCODE_X0 = 6,
-  NOP_UN_0_SHUN_0_OPCODE_X1 = 17,
-  NOP_UN_0_SHUN_0_OPCODE_Y0 = 6,
-  NOP_UN_0_SHUN_0_OPCODE_Y1 = 3,
-  NOREG_RR_IMM_0_OPCODE_SN = 0,
-  NOR_SPECIAL_0_OPCODE_X0 = 50,
-  NOR_SPECIAL_0_OPCODE_X1 = 24,
-  NOR_SPECIAL_2_OPCODE_Y0 = 1,
-  NOR_SPECIAL_2_OPCODE_Y1 = 1,
-  ORI_IMM_0_OPCODE_X0 = 8,
-  ORI_IMM_0_OPCODE_X1 = 11,
-  ORI_OPCODE_Y0 = 11,
-  ORI_OPCODE_Y1 = 9,
-  OR_SPECIAL_0_OPCODE_X0 = 51,
-  OR_SPECIAL_0_OPCODE_X1 = 25,
-  OR_SPECIAL_2_OPCODE_Y0 = 2,
-  OR_SPECIAL_2_OPCODE_Y1 = 2,
-  PACKBS_U_SPECIAL_0_OPCODE_X0 = 103,
-  PACKBS_U_SPECIAL_0_OPCODE_X1 = 73,
-  PACKHB_SPECIAL_0_OPCODE_X0 = 52,
-  PACKHB_SPECIAL_0_OPCODE_X1 = 26,
-  PACKHS_SPECIAL_0_OPCODE_X0 = 102,
-  PACKHS_SPECIAL_0_OPCODE_X1 = 72,
-  PACKLB_SPECIAL_0_OPCODE_X0 = 53,
-  PACKLB_SPECIAL_0_OPCODE_X1 = 27,
-  PCNT_UN_0_SHUN_0_OPCODE_X0 = 7,
-  PCNT_UN_0_SHUN_0_OPCODE_Y0 = 7,
-  RLI_SHUN_0_OPCODE_X0 = 1,
-  RLI_SHUN_0_OPCODE_X1 = 1,
-  RLI_SHUN_0_OPCODE_Y0 = 1,
-  RLI_SHUN_0_OPCODE_Y1 = 1,
-  RL_SPECIAL_0_OPCODE_X0 = 54,
-  RL_SPECIAL_0_OPCODE_X1 = 28,
-  RL_SPECIAL_3_OPCODE_Y0 = 0,
-  RL_SPECIAL_3_OPCODE_Y1 = 0,
-  RR_IMM_0_OPCODE_SN = 0,
-  S1A_SPECIAL_0_OPCODE_X0 = 55,
-  S1A_SPECIAL_0_OPCODE_X1 = 29,
-  S1A_SPECIAL_0_OPCODE_Y0 = 1,
-  S1A_SPECIAL_0_OPCODE_Y1 = 1,
-  S2A_SPECIAL_0_OPCODE_X0 = 56,
-  S2A_SPECIAL_0_OPCODE_X1 = 30,
-  S2A_SPECIAL_0_OPCODE_Y0 = 2,
-  S2A_SPECIAL_0_OPCODE_Y1 = 2,
-  S3A_SPECIAL_0_OPCODE_X0 = 57,
-  S3A_SPECIAL_0_OPCODE_X1 = 31,
-  S3A_SPECIAL_5_OPCODE_Y0 = 1,
-  S3A_SPECIAL_5_OPCODE_Y1 = 1,
-  SADAB_U_SPECIAL_0_OPCODE_X0 = 58,
-  SADAH_SPECIAL_0_OPCODE_X0 = 59,
-  SADAH_U_SPECIAL_0_OPCODE_X0 = 60,
-  SADB_U_SPECIAL_0_OPCODE_X0 = 61,
-  SADH_SPECIAL_0_OPCODE_X0 = 62,
-  SADH_U_SPECIAL_0_OPCODE_X0 = 63,
-  SBADD_IMM_0_OPCODE_X1 = 28,
-  SB_OPCODE_Y2 = 5,
-  SB_SPECIAL_0_OPCODE_X1 = 32,
-  SEQB_SPECIAL_0_OPCODE_X0 = 64,
-  SEQB_SPECIAL_0_OPCODE_X1 = 33,
-  SEQH_SPECIAL_0_OPCODE_X0 = 65,
-  SEQH_SPECIAL_0_OPCODE_X1 = 34,
-  SEQIB_IMM_0_OPCODE_X0 = 9,
-  SEQIB_IMM_0_OPCODE_X1 = 12,
-  SEQIH_IMM_0_OPCODE_X0 = 10,
-  SEQIH_IMM_0_OPCODE_X1 = 13,
-  SEQI_IMM_0_OPCODE_X0 = 11,
-  SEQI_IMM_0_OPCODE_X1 = 14,
-  SEQI_OPCODE_Y0 = 12,
-  SEQI_OPCODE_Y1 = 10,
-  SEQ_SPECIAL_0_OPCODE_X0 = 66,
-  SEQ_SPECIAL_0_OPCODE_X1 = 35,
-  SEQ_SPECIAL_5_OPCODE_Y0 = 2,
-  SEQ_SPECIAL_5_OPCODE_Y1 = 2,
-  SHADD_IMM_0_OPCODE_X1 = 29,
-  SHL8II_IMM_0_OPCODE_SN = 3,
-  SHLB_SPECIAL_0_OPCODE_X0 = 67,
-  SHLB_SPECIAL_0_OPCODE_X1 = 36,
-  SHLH_SPECIAL_0_OPCODE_X0 = 68,
-  SHLH_SPECIAL_0_OPCODE_X1 = 37,
-  SHLIB_SHUN_0_OPCODE_X0 = 2,
-  SHLIB_SHUN_0_OPCODE_X1 = 2,
-  SHLIH_SHUN_0_OPCODE_X0 = 3,
-  SHLIH_SHUN_0_OPCODE_X1 = 3,
-  SHLI_SHUN_0_OPCODE_X0 = 4,
-  SHLI_SHUN_0_OPCODE_X1 = 4,
-  SHLI_SHUN_0_OPCODE_Y0 = 2,
-  SHLI_SHUN_0_OPCODE_Y1 = 2,
-  SHL_SPECIAL_0_OPCODE_X0 = 69,
-  SHL_SPECIAL_0_OPCODE_X1 = 38,
-  SHL_SPECIAL_3_OPCODE_Y0 = 1,
-  SHL_SPECIAL_3_OPCODE_Y1 = 1,
-  SHR1_RR_IMM_0_OPCODE_SN = 9,
-  SHRB_SPECIAL_0_OPCODE_X0 = 70,
-  SHRB_SPECIAL_0_OPCODE_X1 = 39,
-  SHRH_SPECIAL_0_OPCODE_X0 = 71,
-  SHRH_SPECIAL_0_OPCODE_X1 = 40,
-  SHRIB_SHUN_0_OPCODE_X0 = 5,
-  SHRIB_SHUN_0_OPCODE_X1 = 5,
-  SHRIH_SHUN_0_OPCODE_X0 = 6,
-  SHRIH_SHUN_0_OPCODE_X1 = 6,
-  SHRI_SHUN_0_OPCODE_X0 = 7,
-  SHRI_SHUN_0_OPCODE_X1 = 7,
-  SHRI_SHUN_0_OPCODE_Y0 = 3,
-  SHRI_SHUN_0_OPCODE_Y1 = 3,
-  SHR_SPECIAL_0_OPCODE_X0 = 72,
-  SHR_SPECIAL_0_OPCODE_X1 = 41,
-  SHR_SPECIAL_3_OPCODE_Y0 = 2,
-  SHR_SPECIAL_3_OPCODE_Y1 = 2,
-  SHUN_0_OPCODE_X0 = 7,
-  SHUN_0_OPCODE_X1 = 8,
-  SHUN_0_OPCODE_Y0 = 13,
-  SHUN_0_OPCODE_Y1 = 11,
-  SH_OPCODE_Y2 = 6,
-  SH_SPECIAL_0_OPCODE_X1 = 42,
-  SLTB_SPECIAL_0_OPCODE_X0 = 73,
-  SLTB_SPECIAL_0_OPCODE_X1 = 43,
-  SLTB_U_SPECIAL_0_OPCODE_X0 = 74,
-  SLTB_U_SPECIAL_0_OPCODE_X1 = 44,
-  SLTEB_SPECIAL_0_OPCODE_X0 = 75,
-  SLTEB_SPECIAL_0_OPCODE_X1 = 45,
-  SLTEB_U_SPECIAL_0_OPCODE_X0 = 76,
-  SLTEB_U_SPECIAL_0_OPCODE_X1 = 46,
-  SLTEH_SPECIAL_0_OPCODE_X0 = 77,
-  SLTEH_SPECIAL_0_OPCODE_X1 = 47,
-  SLTEH_U_SPECIAL_0_OPCODE_X0 = 78,
-  SLTEH_U_SPECIAL_0_OPCODE_X1 = 48,
-  SLTE_SPECIAL_0_OPCODE_X0 = 79,
-  SLTE_SPECIAL_0_OPCODE_X1 = 49,
-  SLTE_SPECIAL_4_OPCODE_Y0 = 0,
-  SLTE_SPECIAL_4_OPCODE_Y1 = 0,
-  SLTE_U_SPECIAL_0_OPCODE_X0 = 80,
-  SLTE_U_SPECIAL_0_OPCODE_X1 = 50,
-  SLTE_U_SPECIAL_4_OPCODE_Y0 = 1,
-  SLTE_U_SPECIAL_4_OPCODE_Y1 = 1,
-  SLTH_SPECIAL_0_OPCODE_X0 = 81,
-  SLTH_SPECIAL_0_OPCODE_X1 = 51,
-  SLTH_U_SPECIAL_0_OPCODE_X0 = 82,
-  SLTH_U_SPECIAL_0_OPCODE_X1 = 52,
-  SLTIB_IMM_0_OPCODE_X0 = 12,
-  SLTIB_IMM_0_OPCODE_X1 = 15,
-  SLTIB_U_IMM_0_OPCODE_X0 = 13,
-  SLTIB_U_IMM_0_OPCODE_X1 = 16,
-  SLTIH_IMM_0_OPCODE_X0 = 14,
-  SLTIH_IMM_0_OPCODE_X1 = 17,
-  SLTIH_U_IMM_0_OPCODE_X0 = 15,
-  SLTIH_U_IMM_0_OPCODE_X1 = 18,
-  SLTI_IMM_0_OPCODE_X0 = 16,
-  SLTI_IMM_0_OPCODE_X1 = 19,
-  SLTI_OPCODE_Y0 = 14,
-  SLTI_OPCODE_Y1 = 12,
-  SLTI_U_IMM_0_OPCODE_X0 = 17,
-  SLTI_U_IMM_0_OPCODE_X1 = 20,
-  SLTI_U_OPCODE_Y0 = 15,
-  SLTI_U_OPCODE_Y1 = 13,
-  SLT_SPECIAL_0_OPCODE_X0 = 83,
-  SLT_SPECIAL_0_OPCODE_X1 = 53,
-  SLT_SPECIAL_4_OPCODE_Y0 = 2,
-  SLT_SPECIAL_4_OPCODE_Y1 = 2,
-  SLT_U_SPECIAL_0_OPCODE_X0 = 84,
-  SLT_U_SPECIAL_0_OPCODE_X1 = 54,
-  SLT_U_SPECIAL_4_OPCODE_Y0 = 3,
-  SLT_U_SPECIAL_4_OPCODE_Y1 = 3,
-  SNEB_SPECIAL_0_OPCODE_X0 = 85,
-  SNEB_SPECIAL_0_OPCODE_X1 = 55,
-  SNEH_SPECIAL_0_OPCODE_X0 = 86,
-  SNEH_SPECIAL_0_OPCODE_X1 = 56,
-  SNE_SPECIAL_0_OPCODE_X0 = 87,
-  SNE_SPECIAL_0_OPCODE_X1 = 57,
-  SNE_SPECIAL_5_OPCODE_Y0 = 3,
-  SNE_SPECIAL_5_OPCODE_Y1 = 3,
-  SPECIAL_0_OPCODE_X0 = 0,
-  SPECIAL_0_OPCODE_X1 = 1,
-  SPECIAL_0_OPCODE_Y0 = 1,
-  SPECIAL_0_OPCODE_Y1 = 1,
-  SPECIAL_1_OPCODE_Y0 = 2,
-  SPECIAL_1_OPCODE_Y1 = 2,
-  SPECIAL_2_OPCODE_Y0 = 3,
-  SPECIAL_2_OPCODE_Y1 = 3,
-  SPECIAL_3_OPCODE_Y0 = 4,
-  SPECIAL_3_OPCODE_Y1 = 4,
-  SPECIAL_4_OPCODE_Y0 = 5,
-  SPECIAL_4_OPCODE_Y1 = 5,
-  SPECIAL_5_OPCODE_Y0 = 6,
-  SPECIAL_5_OPCODE_Y1 = 6,
-  SPECIAL_6_OPCODE_Y0 = 7,
-  SPECIAL_7_OPCODE_Y0 = 8,
-  SRAB_SPECIAL_0_OPCODE_X0 = 88,
-  SRAB_SPECIAL_0_OPCODE_X1 = 58,
-  SRAH_SPECIAL_0_OPCODE_X0 = 89,
-  SRAH_SPECIAL_0_OPCODE_X1 = 59,
-  SRAIB_SHUN_0_OPCODE_X0 = 8,
-  SRAIB_SHUN_0_OPCODE_X1 = 8,
-  SRAIH_SHUN_0_OPCODE_X0 = 9,
-  SRAIH_SHUN_0_OPCODE_X1 = 9,
-  SRAI_SHUN_0_OPCODE_X0 = 10,
-  SRAI_SHUN_0_OPCODE_X1 = 10,
-  SRAI_SHUN_0_OPCODE_Y0 = 4,
-  SRAI_SHUN_0_OPCODE_Y1 = 4,
-  SRA_SPECIAL_0_OPCODE_X0 = 90,
-  SRA_SPECIAL_0_OPCODE_X1 = 60,
-  SRA_SPECIAL_3_OPCODE_Y0 = 3,
-  SRA_SPECIAL_3_OPCODE_Y1 = 3,
-  SUBBS_U_SPECIAL_0_OPCODE_X0 = 100,
-  SUBBS_U_SPECIAL_0_OPCODE_X1 = 70,
-  SUBB_SPECIAL_0_OPCODE_X0 = 91,
-  SUBB_SPECIAL_0_OPCODE_X1 = 61,
-  SUBHS_SPECIAL_0_OPCODE_X0 = 101,
-  SUBHS_SPECIAL_0_OPCODE_X1 = 71,
-  SUBH_SPECIAL_0_OPCODE_X0 = 92,
-  SUBH_SPECIAL_0_OPCODE_X1 = 62,
-  SUBS_SPECIAL_0_OPCODE_X0 = 97,
-  SUBS_SPECIAL_0_OPCODE_X1 = 67,
-  SUB_SPECIAL_0_OPCODE_X0 = 93,
-  SUB_SPECIAL_0_OPCODE_X1 = 63,
-  SUB_SPECIAL_0_OPCODE_Y0 = 3,
-  SUB_SPECIAL_0_OPCODE_Y1 = 3,
-  SWADD_IMM_0_OPCODE_X1 = 30,
-  SWINT0_UN_0_SHUN_0_OPCODE_X1 = 18,
-  SWINT1_UN_0_SHUN_0_OPCODE_X1 = 19,
-  SWINT2_UN_0_SHUN_0_OPCODE_X1 = 20,
-  SWINT3_UN_0_SHUN_0_OPCODE_X1 = 21,
-  SW_OPCODE_Y2 = 7,
-  SW_SPECIAL_0_OPCODE_X1 = 64,
-  TBLIDXB0_UN_0_SHUN_0_OPCODE_X0 = 8,
-  TBLIDXB0_UN_0_SHUN_0_OPCODE_Y0 = 8,
-  TBLIDXB1_UN_0_SHUN_0_OPCODE_X0 = 9,
-  TBLIDXB1_UN_0_SHUN_0_OPCODE_Y0 = 9,
-  TBLIDXB2_UN_0_SHUN_0_OPCODE_X0 = 10,
-  TBLIDXB2_UN_0_SHUN_0_OPCODE_Y0 = 10,
-  TBLIDXB3_UN_0_SHUN_0_OPCODE_X0 = 11,
-  TBLIDXB3_UN_0_SHUN_0_OPCODE_Y0 = 11,
-  TNS_UN_0_SHUN_0_OPCODE_X1 = 22,
-  UN_0_SHUN_0_OPCODE_X0 = 11,
-  UN_0_SHUN_0_OPCODE_X1 = 11,
-  UN_0_SHUN_0_OPCODE_Y0 = 5,
-  UN_0_SHUN_0_OPCODE_Y1 = 5,
-  WH64_UN_0_SHUN_0_OPCODE_X1 = 23,
-  XORI_IMM_0_OPCODE_X0 = 2,
-  XORI_IMM_0_OPCODE_X1 = 21,
-  XOR_SPECIAL_0_OPCODE_X0 = 94,
-  XOR_SPECIAL_0_OPCODE_X1 = 65,
-  XOR_SPECIAL_2_OPCODE_Y0 = 3,
-  XOR_SPECIAL_2_OPCODE_Y1 = 3
+  ADDI_IMM8_OPCODE_X0 = 1,
+  ADDI_IMM8_OPCODE_X1 = 1,
+  ADDI_OPCODE_Y0 = 0,
+  ADDI_OPCODE_Y1 = 1,
+  ADDLI_OPCODE_X0 = 1,
+  ADDLI_OPCODE_X1 = 0,
+  ADDXI_IMM8_OPCODE_X0 = 2,
+  ADDXI_IMM8_OPCODE_X1 = 2,
+  ADDXI_OPCODE_Y0 = 1,
+  ADDXI_OPCODE_Y1 = 2,
+  ADDXLI_OPCODE_X0 = 2,
+  ADDXLI_OPCODE_X1 = 1,
+  ADDXSC_RRR_0_OPCODE_X0 = 1,
+  ADDXSC_RRR_0_OPCODE_X1 = 1,
+  ADDX_RRR_0_OPCODE_X0 = 2,
+  ADDX_RRR_0_OPCODE_X1 = 2,
+  ADDX_RRR_0_OPCODE_Y0 = 0,
+  ADDX_SPECIAL_0_OPCODE_Y1 = 0,
+  ADD_RRR_0_OPCODE_X0 = 3,
+  ADD_RRR_0_OPCODE_X1 = 3,
+  ADD_RRR_0_OPCODE_Y0 = 1,
+  ADD_SPECIAL_0_OPCODE_Y1 = 1,
+  ANDI_IMM8_OPCODE_X0 = 3,
+  ANDI_IMM8_OPCODE_X1 = 3,
+  ANDI_OPCODE_Y0 = 2,
+  ANDI_OPCODE_Y1 = 3,
+  AND_RRR_0_OPCODE_X0 = 4,
+  AND_RRR_0_OPCODE_X1 = 4,
+  AND_RRR_5_OPCODE_Y0 = 0,
+  AND_RRR_5_OPCODE_Y1 = 0,
+  BEQZT_BRANCH_OPCODE_X1 = 16,
+  BEQZ_BRANCH_OPCODE_X1 = 17,
+  BFEXTS_BF_OPCODE_X0 = 4,
+  BFEXTU_BF_OPCODE_X0 = 5,
+  BFINS_BF_OPCODE_X0 = 6,
+  BF_OPCODE_X0 = 3,
+  BGEZT_BRANCH_OPCODE_X1 = 18,
+  BGEZ_BRANCH_OPCODE_X1 = 19,
+  BGTZT_BRANCH_OPCODE_X1 = 20,
+  BGTZ_BRANCH_OPCODE_X1 = 21,
+  BLBCT_BRANCH_OPCODE_X1 = 22,
+  BLBC_BRANCH_OPCODE_X1 = 23,
+  BLBST_BRANCH_OPCODE_X1 = 24,
+  BLBS_BRANCH_OPCODE_X1 = 25,
+  BLEZT_BRANCH_OPCODE_X1 = 26,
+  BLEZ_BRANCH_OPCODE_X1 = 27,
+  BLTZT_BRANCH_OPCODE_X1 = 28,
+  BLTZ_BRANCH_OPCODE_X1 = 29,
+  BNEZT_BRANCH_OPCODE_X1 = 30,
+  BNEZ_BRANCH_OPCODE_X1 = 31,
+  BRANCH_OPCODE_X1 = 2,
+  CMOVEQZ_RRR_0_OPCODE_X0 = 5,
+  CMOVEQZ_RRR_4_OPCODE_Y0 = 0,
+  CMOVNEZ_RRR_0_OPCODE_X0 = 6,
+  CMOVNEZ_RRR_4_OPCODE_Y0 = 1,
+  CMPEQI_IMM8_OPCODE_X0 = 4,
+  CMPEQI_IMM8_OPCODE_X1 = 4,
+  CMPEQI_OPCODE_Y0 = 3,
+  CMPEQI_OPCODE_Y1 = 4,
+  CMPEQ_RRR_0_OPCODE_X0 = 7,
+  CMPEQ_RRR_0_OPCODE_X1 = 5,
+  CMPEQ_RRR_3_OPCODE_Y0 = 0,
+  CMPEQ_RRR_3_OPCODE_Y1 = 2,
+  CMPEXCH4_RRR_0_OPCODE_X1 = 6,
+  CMPEXCH_RRR_0_OPCODE_X1 = 7,
+  CMPLES_RRR_0_OPCODE_X0 = 8,
+  CMPLES_RRR_0_OPCODE_X1 = 8,
+  CMPLES_RRR_2_OPCODE_Y0 = 0,
+  CMPLES_RRR_2_OPCODE_Y1 = 0,
+  CMPLEU_RRR_0_OPCODE_X0 = 9,
+  CMPLEU_RRR_0_OPCODE_X1 = 9,
+  CMPLEU_RRR_2_OPCODE_Y0 = 1,
+  CMPLEU_RRR_2_OPCODE_Y1 = 1,
+  CMPLTSI_IMM8_OPCODE_X0 = 5,
+  CMPLTSI_IMM8_OPCODE_X1 = 5,
+  CMPLTSI_OPCODE_Y0 = 4,
+  CMPLTSI_OPCODE_Y1 = 5,
+  CMPLTS_RRR_0_OPCODE_X0 = 10,
+  CMPLTS_RRR_0_OPCODE_X1 = 10,
+  CMPLTS_RRR_2_OPCODE_Y0 = 2,
+  CMPLTS_RRR_2_OPCODE_Y1 = 2,
+  CMPLTUI_IMM8_OPCODE_X0 = 6,
+  CMPLTUI_IMM8_OPCODE_X1 = 6,
+  CMPLTU_RRR_0_OPCODE_X0 = 11,
+  CMPLTU_RRR_0_OPCODE_X1 = 11,
+  CMPLTU_RRR_2_OPCODE_Y0 = 3,
+  CMPLTU_RRR_2_OPCODE_Y1 = 3,
+  CMPNE_RRR_0_OPCODE_X0 = 12,
+  CMPNE_RRR_0_OPCODE_X1 = 12,
+  CMPNE_RRR_3_OPCODE_Y0 = 1,
+  CMPNE_RRR_3_OPCODE_Y1 = 3,
+  CMULAF_RRR_0_OPCODE_X0 = 13,
+  CMULA_RRR_0_OPCODE_X0 = 14,
+  CMULFR_RRR_0_OPCODE_X0 = 15,
+  CMULF_RRR_0_OPCODE_X0 = 16,
+  CMULHR_RRR_0_OPCODE_X0 = 17,
+  CMULH_RRR_0_OPCODE_X0 = 18,
+  CMUL_RRR_0_OPCODE_X0 = 19,
+  CNTLZ_UNARY_OPCODE_X0 = 1,
+  CNTLZ_UNARY_OPCODE_Y0 = 1,
+  CNTTZ_UNARY_OPCODE_X0 = 2,
+  CNTTZ_UNARY_OPCODE_Y0 = 2,
+  CRC32_32_RRR_0_OPCODE_X0 = 20,
+  CRC32_8_RRR_0_OPCODE_X0 = 21,
+  DBLALIGN2_RRR_0_OPCODE_X0 = 22,
+  DBLALIGN2_RRR_0_OPCODE_X1 = 13,
+  DBLALIGN4_RRR_0_OPCODE_X0 = 23,
+  DBLALIGN4_RRR_0_OPCODE_X1 = 14,
+  DBLALIGN6_RRR_0_OPCODE_X0 = 24,
+  DBLALIGN6_RRR_0_OPCODE_X1 = 15,
+  DBLALIGN_RRR_0_OPCODE_X0 = 25,
+  DRAIN_UNARY_OPCODE_X1 = 1,
+  DTLBPR_UNARY_OPCODE_X1 = 2,
+  EXCH4_RRR_0_OPCODE_X1 = 16,
+  EXCH_RRR_0_OPCODE_X1 = 17,
+  FDOUBLE_ADDSUB_RRR_0_OPCODE_X0 = 26,
+  FDOUBLE_ADD_FLAGS_RRR_0_OPCODE_X0 = 27,
+  FDOUBLE_MUL_FLAGS_RRR_0_OPCODE_X0 = 28,
+  FDOUBLE_PACK1_RRR_0_OPCODE_X0 = 29,
+  FDOUBLE_PACK2_RRR_0_OPCODE_X0 = 30,
+  FDOUBLE_SUB_FLAGS_RRR_0_OPCODE_X0 = 31,
+  FDOUBLE_UNPACK_MAX_RRR_0_OPCODE_X0 = 32,
+  FDOUBLE_UNPACK_MIN_RRR_0_OPCODE_X0 = 33,
+  FETCHADD4_RRR_0_OPCODE_X1 = 18,
+  FETCHADDGEZ4_RRR_0_OPCODE_X1 = 19,
+  FETCHADDGEZ_RRR_0_OPCODE_X1 = 20,
+  FETCHADD_RRR_0_OPCODE_X1 = 21,
+  FETCHAND4_RRR_0_OPCODE_X1 = 22,
+  FETCHAND_RRR_0_OPCODE_X1 = 23,
+  FETCHOR4_RRR_0_OPCODE_X1 = 24,
+  FETCHOR_RRR_0_OPCODE_X1 = 25,
+  FINV_UNARY_OPCODE_X1 = 3,
+  FLUSHWB_UNARY_OPCODE_X1 = 4,
+  FLUSH_UNARY_OPCODE_X1 = 5,
+  FNOP_UNARY_OPCODE_X0 = 3,
+  FNOP_UNARY_OPCODE_X1 = 6,
+  FNOP_UNARY_OPCODE_Y0 = 3,
+  FNOP_UNARY_OPCODE_Y1 = 8,
+  FSINGLE_ADD1_RRR_0_OPCODE_X0 = 34,
+  FSINGLE_ADDSUB2_RRR_0_OPCODE_X0 = 35,
+  FSINGLE_MUL1_RRR_0_OPCODE_X0 = 36,
+  FSINGLE_MUL2_RRR_0_OPCODE_X0 = 37,
+  FSINGLE_PACK1_UNARY_OPCODE_X0 = 4,
+  FSINGLE_PACK1_UNARY_OPCODE_Y0 = 4,
+  FSINGLE_PACK2_RRR_0_OPCODE_X0 = 38,
+  FSINGLE_SUB1_RRR_0_OPCODE_X0 = 39,
+  ICOH_UNARY_OPCODE_X1 = 7,
+  ILL_UNARY_OPCODE_X1 = 8,
+  ILL_UNARY_OPCODE_Y1 = 9,
+  IMM8_OPCODE_X0 = 4,
+  IMM8_OPCODE_X1 = 3,
+  INV_UNARY_OPCODE_X1 = 9,
+  IRET_UNARY_OPCODE_X1 = 10,
+  JALRP_UNARY_OPCODE_X1 = 11,
+  JALRP_UNARY_OPCODE_Y1 = 10,
+  JALR_UNARY_OPCODE_X1 = 12,
+  JALR_UNARY_OPCODE_Y1 = 11,
+  JAL_JUMP_OPCODE_X1 = 0,
+  JRP_UNARY_OPCODE_X1 = 13,
+  JRP_UNARY_OPCODE_Y1 = 12,
+  JR_UNARY_OPCODE_X1 = 14,
+  JR_UNARY_OPCODE_Y1 = 13,
+  JUMP_OPCODE_X1 = 4,
+  J_JUMP_OPCODE_X1 = 1,
+  LD1S_ADD_IMM8_OPCODE_X1 = 7,
+  LD1S_OPCODE_Y2 = 0,
+  LD1S_UNARY_OPCODE_X1 = 15,
+  LD1U_ADD_IMM8_OPCODE_X1 = 8,
+  LD1U_OPCODE_Y2 = 1,
+  LD1U_UNARY_OPCODE_X1 = 16,
+  LD2S_ADD_IMM8_OPCODE_X1 = 9,
+  LD2S_OPCODE_Y2 = 2,
+  LD2S_UNARY_OPCODE_X1 = 17,
+  LD2U_ADD_IMM8_OPCODE_X1 = 10,
+  LD2U_OPCODE_Y2 = 3,
+  LD2U_UNARY_OPCODE_X1 = 18,
+  LD4S_ADD_IMM8_OPCODE_X1 = 11,
+  LD4S_OPCODE_Y2 = 1,
+  LD4S_UNARY_OPCODE_X1 = 19,
+  LD4U_ADD_IMM8_OPCODE_X1 = 12,
+  LD4U_OPCODE_Y2 = 2,
+  LD4U_UNARY_OPCODE_X1 = 20,
+  LDNA_UNARY_OPCODE_X1 = 21,
+  LDNT1S_ADD_IMM8_OPCODE_X1 = 13,
+  LDNT1S_UNARY_OPCODE_X1 = 22,
+  LDNT1U_ADD_IMM8_OPCODE_X1 = 14,
+  LDNT1U_UNARY_OPCODE_X1 = 23,
+  LDNT2S_ADD_IMM8_OPCODE_X1 = 15,
+  LDNT2S_UNARY_OPCODE_X1 = 24,
+  LDNT2U_ADD_IMM8_OPCODE_X1 = 16,
+  LDNT2U_UNARY_OPCODE_X1 = 25,
+  LDNT4S_ADD_IMM8_OPCODE_X1 = 17,
+  LDNT4S_UNARY_OPCODE_X1 = 26,
+  LDNT4U_ADD_IMM8_OPCODE_X1 = 18,
+  LDNT4U_UNARY_OPCODE_X1 = 27,
+  LDNT_ADD_IMM8_OPCODE_X1 = 19,
+  LDNT_UNARY_OPCODE_X1 = 28,
+  LD_ADD_IMM8_OPCODE_X1 = 20,
+  LD_OPCODE_Y2 = 3,
+  LD_UNARY_OPCODE_X1 = 29,
+  LNK_UNARY_OPCODE_X1 = 30,
+  LNK_UNARY_OPCODE_Y1 = 14,
+  LWNA_ADD_IMM8_OPCODE_X1 = 21,
+  MFSPR_IMM8_OPCODE_X1 = 22,
+  MF_UNARY_OPCODE_X1 = 31,
+  MM_BF_OPCODE_X0 = 7,
+  MNZ_RRR_0_OPCODE_X0 = 40,
+  MNZ_RRR_0_OPCODE_X1 = 26,
+  MNZ_RRR_4_OPCODE_Y0 = 2,
+  MNZ_RRR_4_OPCODE_Y1 = 2,
+  MODE_OPCODE_YA2 = 1,
+  MODE_OPCODE_YB2 = 2,
+  MODE_OPCODE_YC2 = 3,
+  MTSPR_IMM8_OPCODE_X1 = 23,
+  MULAX_RRR_0_OPCODE_X0 = 41,
+  MULAX_RRR_3_OPCODE_Y0 = 2,
+  MULA_HS_HS_RRR_0_OPCODE_X0 = 42,
+  MULA_HS_HS_RRR_9_OPCODE_Y0 = 0,
+  MULA_HS_HU_RRR_0_OPCODE_X0 = 43,
+  MULA_HS_LS_RRR_0_OPCODE_X0 = 44,
+  MULA_HS_LU_RRR_0_OPCODE_X0 = 45,
+  MULA_HU_HU_RRR_0_OPCODE_X0 = 46,
+  MULA_HU_HU_RRR_9_OPCODE_Y0 = 1,
+  MULA_HU_LS_RRR_0_OPCODE_X0 = 47,
+  MULA_HU_LU_RRR_0_OPCODE_X0 = 48,
+  MULA_LS_LS_RRR_0_OPCODE_X0 = 49,
+  MULA_LS_LS_RRR_9_OPCODE_Y0 = 2,
+  MULA_LS_LU_RRR_0_OPCODE_X0 = 50,
+  MULA_LU_LU_RRR_0_OPCODE_X0 = 51,
+  MULA_LU_LU_RRR_9_OPCODE_Y0 = 3,
+  MULX_RRR_0_OPCODE_X0 = 52,
+  MULX_RRR_3_OPCODE_Y0 = 3,
+  MUL_HS_HS_RRR_0_OPCODE_X0 = 53,
+  MUL_HS_HS_RRR_8_OPCODE_Y0 = 0,
+  MUL_HS_HU_RRR_0_OPCODE_X0 = 54,
+  MUL_HS_LS_RRR_0_OPCODE_X0 = 55,
+  MUL_HS_LU_RRR_0_OPCODE_X0 = 56,
+  MUL_HU_HU_RRR_0_OPCODE_X0 = 57,
+  MUL_HU_HU_RRR_8_OPCODE_Y0 = 1,
+  MUL_HU_LS_RRR_0_OPCODE_X0 = 58,
+  MUL_HU_LU_RRR_0_OPCODE_X0 = 59,
+  MUL_LS_LS_RRR_0_OPCODE_X0 = 60,
+  MUL_LS_LS_RRR_8_OPCODE_Y0 = 2,
+  MUL_LS_LU_RRR_0_OPCODE_X0 = 61,
+  MUL_LU_LU_RRR_0_OPCODE_X0 = 62,
+  MUL_LU_LU_RRR_8_OPCODE_Y0 = 3,
+  MZ_RRR_0_OPCODE_X0 = 63,
+  MZ_RRR_0_OPCODE_X1 = 27,
+  MZ_RRR_4_OPCODE_Y0 = 3,
+  MZ_RRR_4_OPCODE_Y1 = 3,
+  NAP_UNARY_OPCODE_X1 = 32,
+  NOP_UNARY_OPCODE_X0 = 5,
+  NOP_UNARY_OPCODE_X1 = 33,
+  NOP_UNARY_OPCODE_Y0 = 5,
+  NOP_UNARY_OPCODE_Y1 = 15,
+  NOR_RRR_0_OPCODE_X0 = 64,
+  NOR_RRR_0_OPCODE_X1 = 28,
+  NOR_RRR_5_OPCODE_Y0 = 1,
+  NOR_RRR_5_OPCODE_Y1 = 1,
+  ORI_IMM8_OPCODE_X0 = 7,
+  ORI_IMM8_OPCODE_X1 = 24,
+  OR_RRR_0_OPCODE_X0 = 65,
+  OR_RRR_0_OPCODE_X1 = 29,
+  OR_RRR_5_OPCODE_Y0 = 2,
+  OR_RRR_5_OPCODE_Y1 = 2,
+  PCNT_UNARY_OPCODE_X0 = 6,
+  PCNT_UNARY_OPCODE_Y0 = 6,
+  REVBITS_UNARY_OPCODE_X0 = 7,
+  REVBITS_UNARY_OPCODE_Y0 = 7,
+  REVBYTES_UNARY_OPCODE_X0 = 8,
+  REVBYTES_UNARY_OPCODE_Y0 = 8,
+  ROTLI_SHIFT_OPCODE_X0 = 1,
+  ROTLI_SHIFT_OPCODE_X1 = 1,
+  ROTLI_SHIFT_OPCODE_Y0 = 0,
+  ROTLI_SHIFT_OPCODE_Y1 = 0,
+  ROTL_RRR_0_OPCODE_X0 = 66,
+  ROTL_RRR_0_OPCODE_X1 = 30,
+  ROTL_RRR_6_OPCODE_Y0 = 0,
+  ROTL_RRR_6_OPCODE_Y1 = 0,
+  RRR_0_OPCODE_X0 = 5,
+  RRR_0_OPCODE_X1 = 5,
+  RRR_0_OPCODE_Y0 = 5,
+  RRR_0_OPCODE_Y1 = 6,
+  RRR_1_OPCODE_Y0 = 6,
+  RRR_1_OPCODE_Y1 = 7,
+  RRR_2_OPCODE_Y0 = 7,
+  RRR_2_OPCODE_Y1 = 8,
+  RRR_3_OPCODE_Y0 = 8,
+  RRR_3_OPCODE_Y1 = 9,
+  RRR_4_OPCODE_Y0 = 9,
+  RRR_4_OPCODE_Y1 = 10,
+  RRR_5_OPCODE_Y0 = 10,
+  RRR_5_OPCODE_Y1 = 11,
+  RRR_6_OPCODE_Y0 = 11,
+  RRR_6_OPCODE_Y1 = 12,
+  RRR_7_OPCODE_Y0 = 12,
+  RRR_7_OPCODE_Y1 = 13,
+  RRR_8_OPCODE_Y0 = 13,
+  RRR_9_OPCODE_Y0 = 14,
+  SHIFT_OPCODE_X0 = 6,
+  SHIFT_OPCODE_X1 = 6,
+  SHIFT_OPCODE_Y0 = 15,
+  SHIFT_OPCODE_Y1 = 14,
+  SHL16INSLI_OPCODE_X0 = 7,
+  SHL16INSLI_OPCODE_X1 = 7,
+  SHL1ADDX_RRR_0_OPCODE_X0 = 67,
+  SHL1ADDX_RRR_0_OPCODE_X1 = 31,
+  SHL1ADDX_RRR_7_OPCODE_Y0 = 1,
+  SHL1ADDX_RRR_7_OPCODE_Y1 = 1,
+  SHL1ADD_RRR_0_OPCODE_X0 = 68,
+  SHL1ADD_RRR_0_OPCODE_X1 = 32,
+  SHL1ADD_RRR_1_OPCODE_Y0 = 0,
+  SHL1ADD_RRR_1_OPCODE_Y1 = 0,
+  SHL2ADDX_RRR_0_OPCODE_X0 = 69,
+  SHL2ADDX_RRR_0_OPCODE_X1 = 33,
+  SHL2ADDX_RRR_7_OPCODE_Y0 = 2,
+  SHL2ADDX_RRR_7_OPCODE_Y1 = 2,
+  SHL2ADD_RRR_0_OPCODE_X0 = 70,
+  SHL2ADD_RRR_0_OPCODE_X1 = 34,
+  SHL2ADD_RRR_1_OPCODE_Y0 = 1,
+  SHL2ADD_RRR_1_OPCODE_Y1 = 1,
+  SHL3ADDX_RRR_0_OPCODE_X0 = 71,
+  SHL3ADDX_RRR_0_OPCODE_X1 = 35,
+  SHL3ADDX_RRR_7_OPCODE_Y0 = 3,
+  SHL3ADDX_RRR_7_OPCODE_Y1 = 3,
+  SHL3ADD_RRR_0_OPCODE_X0 = 72,
+  SHL3ADD_RRR_0_OPCODE_X1 = 36,
+  SHL3ADD_RRR_1_OPCODE_Y0 = 2,
+  SHL3ADD_RRR_1_OPCODE_Y1 = 2,
+  SHLI_SHIFT_OPCODE_X0 = 2,
+  SHLI_SHIFT_OPCODE_X1 = 2,
+  SHLI_SHIFT_OPCODE_Y0 = 1,
+  SHLI_SHIFT_OPCODE_Y1 = 1,
+  SHLXI_SHIFT_OPCODE_X0 = 3,
+  SHLXI_SHIFT_OPCODE_X1 = 3,
+  SHLX_RRR_0_OPCODE_X0 = 73,
+  SHLX_RRR_0_OPCODE_X1 = 37,
+  SHL_RRR_0_OPCODE_X0 = 74,
+  SHL_RRR_0_OPCODE_X1 = 38,
+  SHL_RRR_6_OPCODE_Y0 = 1,
+  SHL_RRR_6_OPCODE_Y1 = 1,
+  SHRSI_SHIFT_OPCODE_X0 = 4,
+  SHRSI_SHIFT_OPCODE_X1 = 4,
+  SHRSI_SHIFT_OPCODE_Y0 = 2,
+  SHRSI_SHIFT_OPCODE_Y1 = 2,
+  SHRS_RRR_0_OPCODE_X0 = 75,
+  SHRS_RRR_0_OPCODE_X1 = 39,
+  SHRS_RRR_6_OPCODE_Y0 = 2,
+  SHRS_RRR_6_OPCODE_Y1 = 2,
+  SHRUI_SHIFT_OPCODE_X0 = 5,
+  SHRUI_SHIFT_OPCODE_X1 = 5,
+  SHRUI_SHIFT_OPCODE_Y0 = 3,
+  SHRUI_SHIFT_OPCODE_Y1 = 3,
+  SHRUXI_SHIFT_OPCODE_X0 = 6,
+  SHRUXI_SHIFT_OPCODE_X1 = 6,
+  SHRUX_RRR_0_OPCODE_X0 = 76,
+  SHRUX_RRR_0_OPCODE_X1 = 40,
+  SHRU_RRR_0_OPCODE_X0 = 77,
+  SHRU_RRR_0_OPCODE_X1 = 41,
+  SHRU_RRR_6_OPCODE_Y0 = 3,
+  SHRU_RRR_6_OPCODE_Y1 = 3,
+  SHUFFLEBYTES_RRR_0_OPCODE_X0 = 78,
+  ST1_ADD_IMM8_OPCODE_X1 = 25,
+  ST1_OPCODE_Y2 = 0,
+  ST1_RRR_0_OPCODE_X1 = 42,
+  ST2_ADD_IMM8_OPCODE_X1 = 26,
+  ST2_OPCODE_Y2 = 1,
+  ST2_RRR_0_OPCODE_X1 = 43,
+  ST4_ADD_IMM8_OPCODE_X1 = 27,
+  ST4_OPCODE_Y2 = 2,
+  ST4_RRR_0_OPCODE_X1 = 44,
+  STNT1_ADD_IMM8_OPCODE_X1 = 28,
+  STNT1_RRR_0_OPCODE_X1 = 45,
+  STNT2_ADD_IMM8_OPCODE_X1 = 29,
+  STNT2_RRR_0_OPCODE_X1 = 46,
+  STNT4_ADD_IMM8_OPCODE_X1 = 30,
+  STNT4_RRR_0_OPCODE_X1 = 47,
+  STNT_ADD_IMM8_OPCODE_X1 = 31,
+  STNT_RRR_0_OPCODE_X1 = 48,
+  ST_ADD_IMM8_OPCODE_X1 = 32,
+  ST_OPCODE_Y2 = 3,
+  ST_RRR_0_OPCODE_X1 = 49,
+  SUBXSC_RRR_0_OPCODE_X0 = 79,
+  SUBXSC_RRR_0_OPCODE_X1 = 50,
+  SUBX_RRR_0_OPCODE_X0 = 80,
+  SUBX_RRR_0_OPCODE_X1 = 51,
+  SUBX_RRR_0_OPCODE_Y0 = 2,
+  SUBX_RRR_0_OPCODE_Y1 = 2,
+  SUB_RRR_0_OPCODE_X0 = 81,
+  SUB_RRR_0_OPCODE_X1 = 52,
+  SUB_RRR_0_OPCODE_Y0 = 3,
+  SUB_RRR_0_OPCODE_Y1 = 3,
+  SWINT0_UNARY_OPCODE_X1 = 34,
+  SWINT1_UNARY_OPCODE_X1 = 35,
+  SWINT2_UNARY_OPCODE_X1 = 36,
+  SWINT3_UNARY_OPCODE_X1 = 37,
+  TBLIDXB0_UNARY_OPCODE_X0 = 9,
+  TBLIDXB0_UNARY_OPCODE_Y0 = 9,
+  TBLIDXB1_UNARY_OPCODE_X0 = 10,
+  TBLIDXB1_UNARY_OPCODE_Y0 = 10,
+  TBLIDXB2_UNARY_OPCODE_X0 = 11,
+  TBLIDXB2_UNARY_OPCODE_Y0 = 11,
+  TBLIDXB3_UNARY_OPCODE_X0 = 12,
+  TBLIDXB3_UNARY_OPCODE_Y0 = 12,
+  UNARY_RRR_0_OPCODE_X0 = 82,
+  UNARY_RRR_0_OPCODE_X1 = 53,
+  UNARY_RRR_1_OPCODE_Y0 = 3,
+  UNARY_RRR_1_OPCODE_Y1 = 3,
+  V1ADDI_IMM8_OPCODE_X0 = 8,
+  V1ADDI_IMM8_OPCODE_X1 = 33,
+  V1ADDUC_RRR_0_OPCODE_X0 = 83,
+  V1ADDUC_RRR_0_OPCODE_X1 = 54,
+  V1ADD_RRR_0_OPCODE_X0 = 84,
+  V1ADD_RRR_0_OPCODE_X1 = 55,
+  V1ADIFFU_RRR_0_OPCODE_X0 = 85,
+  V1AVGU_RRR_0_OPCODE_X0 = 86,
+  V1CMPEQI_IMM8_OPCODE_X0 = 9,
+  V1CMPEQI_IMM8_OPCODE_X1 = 34,
+  V1CMPEQ_RRR_0_OPCODE_X0 = 87,
+  V1CMPEQ_RRR_0_OPCODE_X1 = 56,
+  V1CMPLES_RRR_0_OPCODE_X0 = 88,
+  V1CMPLES_RRR_0_OPCODE_X1 = 57,
+  V1CMPLEU_RRR_0_OPCODE_X0 = 89,
+  V1CMPLEU_RRR_0_OPCODE_X1 = 58,
+  V1CMPLTSI_IMM8_OPCODE_X0 = 10,
+  V1CMPLTSI_IMM8_OPCODE_X1 = 35,
+  V1CMPLTS_RRR_0_OPCODE_X0 = 90,
+  V1CMPLTS_RRR_0_OPCODE_X1 = 59,
+  V1CMPLTUI_IMM8_OPCODE_X0 = 11,
+  V1CMPLTUI_IMM8_OPCODE_X1 = 36,
+  V1CMPLTU_RRR_0_OPCODE_X0 = 91,
+  V1CMPLTU_RRR_0_OPCODE_X1 = 60,
+  V1CMPNE_RRR_0_OPCODE_X0 = 92,
+  V1CMPNE_RRR_0_OPCODE_X1 = 61,
+  V1DDOTPUA_RRR_0_OPCODE_X0 = 161,
+  V1DDOTPUSA_RRR_0_OPCODE_X0 = 93,
+  V1DDOTPUS_RRR_0_OPCODE_X0 = 94,
+  V1DDOTPU_RRR_0_OPCODE_X0 = 162,
+  V1DOTPA_RRR_0_OPCODE_X0 = 95,
+  V1DOTPUA_RRR_0_OPCODE_X0 = 163,
+  V1DOTPUSA_RRR_0_OPCODE_X0 = 96,
+  V1DOTPUS_RRR_0_OPCODE_X0 = 97,
+  V1DOTPU_RRR_0_OPCODE_X0 = 164,
+  V1DOTP_RRR_0_OPCODE_X0 = 98,
+  V1INT_H_RRR_0_OPCODE_X0 = 99,
+  V1INT_H_RRR_0_OPCODE_X1 = 62,
+  V1INT_L_RRR_0_OPCODE_X0 = 100,
+  V1INT_L_RRR_0_OPCODE_X1 = 63,
+  V1MAXUI_IMM8_OPCODE_X0 = 12,
+  V1MAXUI_IMM8_OPCODE_X1 = 37,
+  V1MAXU_RRR_0_OPCODE_X0 = 101,
+  V1MAXU_RRR_0_OPCODE_X1 = 64,
+  V1MINUI_IMM8_OPCODE_X0 = 13,
+  V1MINUI_IMM8_OPCODE_X1 = 38,
+  V1MINU_RRR_0_OPCODE_X0 = 102,
+  V1MINU_RRR_0_OPCODE_X1 = 65,
+  V1MNZ_RRR_0_OPCODE_X0 = 103,
+  V1MNZ_RRR_0_OPCODE_X1 = 66,
+  V1MULTU_RRR_0_OPCODE_X0 = 104,
+  V1MULUS_RRR_0_OPCODE_X0 = 105,
+  V1MULU_RRR_0_OPCODE_X0 = 106,
+  V1MZ_RRR_0_OPCODE_X0 = 107,
+  V1MZ_RRR_0_OPCODE_X1 = 67,
+  V1SADAU_RRR_0_OPCODE_X0 = 108,
+  V1SADU_RRR_0_OPCODE_X0 = 109,
+  V1SHLI_SHIFT_OPCODE_X0 = 7,
+  V1SHLI_SHIFT_OPCODE_X1 = 7,
+  V1SHL_RRR_0_OPCODE_X0 = 110,
+  V1SHL_RRR_0_OPCODE_X1 = 68,
+  V1SHRSI_SHIFT_OPCODE_X0 = 8,
+  V1SHRSI_SHIFT_OPCODE_X1 = 8,
+  V1SHRS_RRR_0_OPCODE_X0 = 111,
+  V1SHRS_RRR_0_OPCODE_X1 = 69,
+  V1SHRUI_SHIFT_OPCODE_X0 = 9,
+  V1SHRUI_SHIFT_OPCODE_X1 = 9,
+  V1SHRU_RRR_0_OPCODE_X0 = 112,
+  V1SHRU_RRR_0_OPCODE_X1 = 70,
+  V1SUBUC_RRR_0_OPCODE_X0 = 113,
+  V1SUBUC_RRR_0_OPCODE_X1 = 71,
+  V1SUB_RRR_0_OPCODE_X0 = 114,
+  V1SUB_RRR_0_OPCODE_X1 = 72,
+  V2ADDI_IMM8_OPCODE_X0 = 14,
+  V2ADDI_IMM8_OPCODE_X1 = 39,
+  V2ADDSC_RRR_0_OPCODE_X0 = 115,
+  V2ADDSC_RRR_0_OPCODE_X1 = 73,
+  V2ADD_RRR_0_OPCODE_X0 = 116,
+  V2ADD_RRR_0_OPCODE_X1 = 74,
+  V2ADIFFS_RRR_0_OPCODE_X0 = 117,
+  V2AVGS_RRR_0_OPCODE_X0 = 118,
+  V2CMPEQI_IMM8_OPCODE_X0 = 15,
+  V2CMPEQI_IMM8_OPCODE_X1 = 40,
+  V2CMPEQ_RRR_0_OPCODE_X0 = 119,
+  V2CMPEQ_RRR_0_OPCODE_X1 = 75,
+  V2CMPLES_RRR_0_OPCODE_X0 = 120,
+  V2CMPLES_RRR_0_OPCODE_X1 = 76,
+  V2CMPLEU_RRR_0_OPCODE_X0 = 121,
+  V2CMPLEU_RRR_0_OPCODE_X1 = 77,
+  V2CMPLTSI_IMM8_OPCODE_X0 = 16,
+  V2CMPLTSI_IMM8_OPCODE_X1 = 41,
+  V2CMPLTS_RRR_0_OPCODE_X0 = 122,
+  V2CMPLTS_RRR_0_OPCODE_X1 = 78,
+  V2CMPLTUI_IMM8_OPCODE_X0 = 17,
+  V2CMPLTUI_IMM8_OPCODE_X1 = 42,
+  V2CMPLTU_RRR_0_OPCODE_X0 = 123,
+  V2CMPLTU_RRR_0_OPCODE_X1 = 79,
+  V2CMPNE_RRR_0_OPCODE_X0 = 124,
+  V2CMPNE_RRR_0_OPCODE_X1 = 80,
+  V2DOTPA_RRR_0_OPCODE_X0 = 125,
+  V2DOTP_RRR_0_OPCODE_X0 = 126,
+  V2INT_H_RRR_0_OPCODE_X0 = 127,
+  V2INT_H_RRR_0_OPCODE_X1 = 81,
+  V2INT_L_RRR_0_OPCODE_X0 = 128,
+  V2INT_L_RRR_0_OPCODE_X1 = 82,
+  V2MAXSI_IMM8_OPCODE_X0 = 18,
+  V2MAXSI_IMM8_OPCODE_X1 = 43,
+  V2MAXS_RRR_0_OPCODE_X0 = 129,
+  V2MAXS_RRR_0_OPCODE_X1 = 83,
+  V2MINSI_IMM8_OPCODE_X0 = 19,
+  V2MINSI_IMM8_OPCODE_X1 = 44,
+  V2MINS_RRR_0_OPCODE_X0 = 130,
+  V2MINS_RRR_0_OPCODE_X1 = 84,
+  V2MNZ_RRR_0_OPCODE_X0 = 131,
+  V2MNZ_RRR_0_OPCODE_X1 = 85,
+  V2MULFSC_RRR_0_OPCODE_X0 = 132,
+  V2MULS_RRR_0_OPCODE_X0 = 133,
+  V2MULTS_RRR_0_OPCODE_X0 = 134,
+  V2MZ_RRR_0_OPCODE_X0 = 135,
+  V2MZ_RRR_0_OPCODE_X1 = 86,
+  V2PACKH_RRR_0_OPCODE_X0 = 136,
+  V2PACKH_RRR_0_OPCODE_X1 = 87,
+  V2PACKL_RRR_0_OPCODE_X0 = 137,
+  V2PACKL_RRR_0_OPCODE_X1 = 88,
+  V2PACKUC_RRR_0_OPCODE_X0 = 138,
+  V2PACKUC_RRR_0_OPCODE_X1 = 89,
+  V2SADAS_RRR_0_OPCODE_X0 = 139,
+  V2SADAU_RRR_0_OPCODE_X0 = 140,
+  V2SADS_RRR_0_OPCODE_X0 = 141,
+  V2SADU_RRR_0_OPCODE_X0 = 142,
+  V2SHLI_SHIFT_OPCODE_X0 = 10,
+  V2SHLI_SHIFT_OPCODE_X1 = 10,
+  V2SHLSC_RRR_0_OPCODE_X0 = 143,
+  V2SHLSC_RRR_0_OPCODE_X1 = 90,
+  V2SHL_RRR_0_OPCODE_X0 = 144,
+  V2SHL_RRR_0_OPCODE_X1 = 91,
+  V2SHRSI_SHIFT_OPCODE_X0 = 11,
+  V2SHRSI_SHIFT_OPCODE_X1 = 11,
+  V2SHRS_RRR_0_OPCODE_X0 = 145,
+  V2SHRS_RRR_0_OPCODE_X1 = 92,
+  V2SHRUI_SHIFT_OPCODE_X0 = 12,
+  V2SHRUI_SHIFT_OPCODE_X1 = 12,
+  V2SHRU_RRR_0_OPCODE_X0 = 146,
+  V2SHRU_RRR_0_OPCODE_X1 = 93,
+  V2SUBSC_RRR_0_OPCODE_X0 = 147,
+  V2SUBSC_RRR_0_OPCODE_X1 = 94,
+  V2SUB_RRR_0_OPCODE_X0 = 148,
+  V2SUB_RRR_0_OPCODE_X1 = 95,
+  V4ADDSC_RRR_0_OPCODE_X0 = 149,
+  V4ADDSC_RRR_0_OPCODE_X1 = 96,
+  V4ADD_RRR_0_OPCODE_X0 = 150,
+  V4ADD_RRR_0_OPCODE_X1 = 97,
+  V4INT_H_RRR_0_OPCODE_X0 = 151,
+  V4INT_H_RRR_0_OPCODE_X1 = 98,
+  V4INT_L_RRR_0_OPCODE_X0 = 152,
+  V4INT_L_RRR_0_OPCODE_X1 = 99,
+  V4PACKSC_RRR_0_OPCODE_X0 = 153,
+  V4PACKSC_RRR_0_OPCODE_X1 = 100,
+  V4SHLSC_RRR_0_OPCODE_X0 = 154,
+  V4SHLSC_RRR_0_OPCODE_X1 = 101,
+  V4SHL_RRR_0_OPCODE_X0 = 155,
+  V4SHL_RRR_0_OPCODE_X1 = 102,
+  V4SHRS_RRR_0_OPCODE_X0 = 156,
+  V4SHRS_RRR_0_OPCODE_X1 = 103,
+  V4SHRU_RRR_0_OPCODE_X0 = 157,
+  V4SHRU_RRR_0_OPCODE_X1 = 104,
+  V4SUBSC_RRR_0_OPCODE_X0 = 158,
+  V4SUBSC_RRR_0_OPCODE_X1 = 105,
+  V4SUB_RRR_0_OPCODE_X0 = 159,
+  V4SUB_RRR_0_OPCODE_X1 = 106,
+  WH64_UNARY_OPCODE_X1 = 38,
+  XORI_IMM8_OPCODE_X0 = 20,
+  XORI_IMM8_OPCODE_X1 = 45,
+  XOR_RRR_0_OPCODE_X0 = 160,
+  XOR_RRR_0_OPCODE_X1 = 107,
+  XOR_RRR_5_OPCODE_Y0 = 3,
+  XOR_RRR_5_OPCODE_Y1 = 3
 };
 
 #endif /* !_TILE_OPCODE_CONSTANTS_H */
diff --git a/arch/tile/include/asm/page.h b/arch/tile/include/asm/page.h
index 3eb53525bf9d..db93518fac03 100644
--- a/arch/tile/include/asm/page.h
+++ b/arch/tile/include/asm/page.h
@@ -16,7 +16,8 @@
 #define _ASM_TILE_PAGE_H
 
 #include <linux/const.h>
-#include <hv/pagesize.h>
+#include <hv/hypervisor.h>
+#include <arch/chip.h>
 
 /* PAGE_SHIFT and HPAGE_SHIFT determine the page sizes. */
 #define PAGE_SHIFT      HV_LOG2_PAGE_SIZE_SMALL
@@ -28,8 +29,6 @@
 #define PAGE_MASK       (~(PAGE_SIZE - 1))
 #define HPAGE_MASK      (~(HPAGE_SIZE - 1))
 
-#ifdef __KERNEL__
-
 /*
  * If the Kconfig doesn't specify, set a maximum zone order that
  * is enough so that we can create huge pages from small pages given
@@ -39,9 +38,6 @@
 #define CONFIG_FORCE_MAX_ZONEORDER (HPAGE_SHIFT - PAGE_SHIFT + 1)
 #endif
 
-#include <hv/hypervisor.h>
-#include <arch/chip.h>
-
 #ifndef __ASSEMBLY__
 
 #include <linux/types.h>
@@ -91,6 +87,10 @@ typedef struct page *pgtable_t;
 /* Must be a macro since it is used to create constants. */
 #define __pgprot(val) hv_pte(val)
 
+/* Rarely-used initializers, typically with a "zero" value. */
+#define __pte(x) hv_pte(x)
+#define __pgd(x) hv_pte(x)
+
 static inline u64 pgprot_val(pgprot_t pgprot)
 {
         return hv_pte_val(pgprot);
@@ -110,6 +110,8 @@ static inline u64 pgd_val(pgd_t pgd)
 
 typedef HV_PTE pmd_t;
 
+#define __pmd(x) hv_pte(x)
+
 static inline u64 pmd_val(pmd_t pmd)
 {
         return hv_pte_val(pmd);
@@ -318,7 +320,7 @@ static inline int pfn_valid(unsigned long pfn)
 
 /* Provide as macros since these require some other headers included. */
 #define page_to_pa(page) ((phys_addr_t)(page_to_pfn(page)) << PAGE_SHIFT)
-#define virt_to_page(kaddr) pfn_to_page(kaddr_to_pfn(kaddr))
+#define virt_to_page(kaddr) pfn_to_page(kaddr_to_pfn((void *)(kaddr)))
 #define page_to_virt(page) pfn_to_kaddr(page_to_pfn(page))
 
 struct mm_struct;
@@ -331,6 +333,4 @@ extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr);
 
 #include <asm-generic/memory_model.h>
 
-#endif /* __KERNEL__ */
-
 #endif /* _ASM_TILE_PAGE_H */
diff --git a/arch/tile/include/asm/parport.h b/arch/tile/include/asm/parport.h
new file mode 100644
index 000000000000..cf252af64590
--- /dev/null
+++ b/arch/tile/include/asm/parport.h
@@ -0,0 +1 @@
+#include <asm-generic/parport.h>
diff --git a/arch/tile/include/asm/pci.h b/arch/tile/include/asm/pci.h
index c3fc458a0d32..7f03cefed1b9 100644
--- a/arch/tile/include/asm/pci.h
+++ b/arch/tile/include/asm/pci.h
@@ -46,7 +46,8 @@ struct pci_controller {
  */
 #define PCI_DMA_BUS_IS_PHYS     1
 
-int __init tile_pci_init(void);
+int __devinit tile_pci_init(void);
+int __devinit pcibios_init(void);
 
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
 static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {}
diff --git a/arch/tile/include/asm/pgtable_64.h b/arch/tile/include/asm/pgtable_64.h
new file mode 100644
index 000000000000..fd80328523b4
--- /dev/null
+++ b/arch/tile/include/asm/pgtable_64.h
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ */
+
+#ifndef _ASM_TILE_PGTABLE_64_H
+#define _ASM_TILE_PGTABLE_64_H
+
+/* The level-0 page table breaks the address space into 32-bit chunks. */
+#define PGDIR_SHIFT     HV_LOG2_L1_SPAN
+#define PGDIR_SIZE      HV_L1_SPAN
+#define PGDIR_MASK      (~(PGDIR_SIZE-1))
+#define PTRS_PER_PGD    HV_L0_ENTRIES
+#define SIZEOF_PGD      (PTRS_PER_PGD * sizeof(pgd_t))
+
+/*
+ * The level-1 index is defined by the huge page size.  A PMD is composed
+ * of PTRS_PER_PMD pgd_t's and is the middle level of the page table.
+ */
+#define PMD_SHIFT       HV_LOG2_PAGE_SIZE_LARGE
+#define PMD_SIZE        HV_PAGE_SIZE_LARGE
+#define PMD_MASK        (~(PMD_SIZE-1))
+#define PTRS_PER_PMD    (1 << (PGDIR_SHIFT - PMD_SHIFT))
+#define SIZEOF_PMD      (PTRS_PER_PMD * sizeof(pmd_t))
+
+/*
+ * The level-2 index is defined by the difference between the huge
+ * page size and the normal page size.  A PTE is composed of
+ * PTRS_PER_PTE pte_t's and is the bottom level of the page table.
+ * Note that the hypervisor docs use PTE for what we call pte_t, so
+ * this nomenclature is somewhat confusing.
+ */
+#define PTRS_PER_PTE (1 << (HV_LOG2_PAGE_SIZE_LARGE - HV_LOG2_PAGE_SIZE_SMALL))
+#define SIZEOF_PTE      (PTRS_PER_PTE * sizeof(pte_t))
+
+/*
+ * Align the vmalloc area to an L2 page table, and leave a guard page
+ * at the beginning and end.  The vmalloc code also puts in an internal
+ * guard page between each allocation.
+ */
+#define _VMALLOC_END    HUGE_VMAP_BASE
+#define VMALLOC_END     (_VMALLOC_END - PAGE_SIZE)
+#define VMALLOC_START   (_VMALLOC_START + PAGE_SIZE)
+
+#define HUGE_VMAP_END   (HUGE_VMAP_BASE + PGDIR_SIZE)
+
+#ifndef __ASSEMBLY__
+
+/* We have no pud since we are a three-level page table. */
+#include <asm-generic/pgtable-nopud.h>
+
+static inline int pud_none(pud_t pud)
+{
+        return pud_val(pud) == 0;
+}
+
+static inline int pud_present(pud_t pud)
+{
+        return pud_val(pud) & _PAGE_PRESENT;
+}
+
+#define pmd_ERROR(e) \
+        pr_err("%s:%d: bad pmd 0x%016llx.\n", __FILE__, __LINE__, pmd_val(e))
+
+static inline void pud_clear(pud_t *pudp)
+{
+        __pte_clear(&pudp->pgd);
+}
+
+static inline int pud_bad(pud_t pud)
+{
+        return ((pud_val(pud) & _PAGE_ALL) != _PAGE_TABLE);
+}
+
+/* Return the page-table frame number (ptfn) that a pud_t points at. */
+#define pud_ptfn(pud) hv_pte_get_ptfn((pud).pgd)
+
+/*
+ * A given kernel pud_t maps to a kernel pmd_t table at a specific
+ * virtual address.  Since kernel pmd_t tables can be aligned at
+ * sub-page granularity, this macro can return non-page-aligned
+ * pointers, despite its name.
+ */
+#define pud_page_vaddr(pud) \
+        (__va((phys_addr_t)pud_ptfn(pud) << HV_LOG2_PAGE_TABLE_ALIGN))
+
+/*
+ * A pud_t points to a pmd_t array.  Since we can have multiple per
+ * page, we don't have a one-to-one mapping of pud_t's to pages.
+ */
+#define pud_page(pud) pfn_to_page(HV_PTFN_TO_PFN(pud_ptfn(pud)))
+
+static inline unsigned long pud_index(unsigned long address)
+{
+        return (address >> PUD_SHIFT) & (PTRS_PER_PUD - 1);
+}
+
+#define pmd_offset(pud, address) \
+        ((pmd_t *)pud_page_vaddr(*(pud)) + pmd_index(address))
+
+static inline void __set_pmd(pmd_t *pmdp, pmd_t pmdval)
+{
+        set_pte(pmdp, pmdval);
+}
+
+/* Create a pmd from a PTFN and pgprot. */
+static inline pmd_t ptfn_pmd(unsigned long ptfn, pgprot_t prot)
+{
+        return hv_pte_set_ptfn(prot, ptfn);
+}
+
+/* Return the page-table frame number (ptfn) that a pmd_t points at. */
+static inline unsigned long pmd_ptfn(pmd_t pmd)
+{
+        return hv_pte_get_ptfn(pmd);
+}
+
+static inline void pmd_clear(pmd_t *pmdp)
+{
+        __pte_clear(pmdp);
+}
+
+/* Normalize an address to having the correct high bits set. */
+#define pgd_addr_normalize pgd_addr_normalize
+static inline unsigned long pgd_addr_normalize(unsigned long addr)
+{
+        return ((long)addr << (CHIP_WORD_SIZE() - CHIP_VA_WIDTH())) >>
+                (CHIP_WORD_SIZE() - CHIP_VA_WIDTH());
+}
+
+/* We don't define any pgds for these addresses. */
+static inline int pgd_addr_invalid(unsigned long addr)
+{
+        return addr >= MEM_HV_START ||
+                (addr > MEM_LOW_END && addr < MEM_HIGH_START);
+}
+
+/*
+ * Use atomic instructions to provide atomicity against the hypervisor.
+ */
+#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
+static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,
+                                            unsigned long addr, pte_t *ptep)
+{
+        return (__insn_fetchand(&ptep->val, ~HV_PTE_ACCESSED) >>
+                HV_PTE_INDEX_ACCESSED) & 0x1;
+}
+
+#define __HAVE_ARCH_PTEP_SET_WRPROTECT
+static inline void ptep_set_wrprotect(struct mm_struct *mm,
+                                      unsigned long addr, pte_t *ptep)
+{
+        __insn_fetchand(&ptep->val, ~HV_PTE_WRITABLE);
+}
+
+#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
+static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
+                                       unsigned long addr, pte_t *ptep)
+{
+        return hv_pte(__insn_exch(&ptep->val, 0UL));
+}
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* _ASM_TILE_PGTABLE_64_H */
diff --git a/arch/tile/include/asm/processor.h b/arch/tile/include/asm/processor.h
index e6889474038a..34c1e01ffb5e 100644
--- a/arch/tile/include/asm/processor.h
+++ b/arch/tile/include/asm/processor.h
@@ -215,6 +215,8 @@ static inline void release_thread(struct task_struct *dead_task)
 
 extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
 
+extern int do_work_pending(struct pt_regs *regs, u32 flags);
+
 
 /*
  * Return saved (kernel) PC of a blocked thread.
@@ -255,10 +257,6 @@ static inline void cpu_relax(void)
         barrier();
 }
 
-struct siginfo;
-extern void arch_coredump_signal(struct siginfo *, struct pt_regs *);
-#define arch_coredump_signal arch_coredump_signal
-
 /* Info on this processor (see fs/proc/cpuinfo.c) */
 struct seq_operations;
 extern const struct seq_operations cpuinfo_op;
@@ -269,9 +267,6 @@ extern char chip_model[64];
 /* Data on which physical memory controller corresponds to which NUMA node. */
 extern int node_controller[];
 
-/* Do we dump information to the console when a user application crashes? */
-extern int show_crashinfo;
-
 #if CHIP_HAS_CBOX_HOME_MAP()
 /* Does the heap allocator return hash-for-home pages by default? */
 extern int hash_default;
diff --git a/arch/tile/include/asm/serial.h b/arch/tile/include/asm/serial.h
new file mode 100644
index 000000000000..a0cb0caff152
--- /dev/null
+++ b/arch/tile/include/asm/serial.h
@@ -0,0 +1 @@
+#include <asm-generic/serial.h>
diff --git a/arch/tile/include/asm/signal.h b/arch/tile/include/asm/signal.h
index 81d92a45cd4b..1e1e616783eb 100644
--- a/arch/tile/include/asm/signal.h
+++ b/arch/tile/include/asm/signal.h
@@ -28,6 +28,10 @@ struct pt_regs;
 int restore_sigcontext(struct pt_regs *, struct sigcontext __user *);
 int setup_sigcontext(struct sigcontext __user *, struct pt_regs *);
 void do_signal(struct pt_regs *regs);
+void signal_fault(const char *type, struct pt_regs *,
+                  void __user *frame, int sig);
+void trace_unhandled_signal(const char *type, struct pt_regs *regs,
+                            unsigned long address, int signo);
 #endif
 
 #endif /* _ASM_TILE_SIGNAL_H */
diff --git a/arch/tile/include/asm/spinlock_64.h b/arch/tile/include/asm/spinlock_64.h
new file mode 100644
index 000000000000..72be5904e020
--- /dev/null
+++ b/arch/tile/include/asm/spinlock_64.h
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * 64-bit SMP ticket spinlocks, allowing only a single CPU anywhere
+ * (the type definitions are in asm/spinlock_types.h)
+ */
+
+#ifndef _ASM_TILE_SPINLOCK_64_H
+#define _ASM_TILE_SPINLOCK_64_H
+
+/* Shifts and masks for the various fields in "lock". */
+#define __ARCH_SPIN_CURRENT_SHIFT       17
+#define __ARCH_SPIN_NEXT_MASK           0x7fff
+#define __ARCH_SPIN_NEXT_OVERFLOW       0x8000
+
+/*
+ * Return the "current" portion of a ticket lock value,
+ * i.e. the number that currently owns the lock.
+ */
+static inline int arch_spin_current(u32 val)
+{
+        return val >> __ARCH_SPIN_CURRENT_SHIFT;
+}
+
+/*
+ * Return the "next" portion of a ticket lock value,
+ * i.e. the number that the next task to try to acquire the lock will get.
+ */
+static inline int arch_spin_next(u32 val)
+{
+        return val & __ARCH_SPIN_NEXT_MASK;
+}
+
+/* The lock is locked if a task would have to wait to get it. */
+static inline int arch_spin_is_locked(arch_spinlock_t *lock)
+{
+        u32 val = lock->lock;
+        return arch_spin_current(val) != arch_spin_next(val);
+}
+
+/* Bump the current ticket so the next task owns the lock. */
+static inline void arch_spin_unlock(arch_spinlock_t *lock)
+{
+        wmb();  /* guarantee anything modified under the lock is visible */
+        __insn_fetchadd4(&lock->lock, 1U << __ARCH_SPIN_CURRENT_SHIFT);
+}
+
+void arch_spin_unlock_wait(arch_spinlock_t *lock);
+
+void arch_spin_lock_slow(arch_spinlock_t *lock, u32 val);
+
+/* Grab the "next" ticket number and bump it atomically.
+ * If the current ticket is not ours, go to the slow path.
+ * We also take the slow path if the "next" value overflows.
+ */
+static inline void arch_spin_lock(arch_spinlock_t *lock)
+{
+        u32 val = __insn_fetchadd4(&lock->lock, 1);
+        u32 ticket = val & (__ARCH_SPIN_NEXT_MASK | __ARCH_SPIN_NEXT_OVERFLOW);
+        if (unlikely(arch_spin_current(val) != ticket))
+                arch_spin_lock_slow(lock, ticket);
+}
+
+/* Try to get the lock, and return whether we succeeded. */
+int arch_spin_trylock(arch_spinlock_t *lock);
+
+/* We cannot take an interrupt after getting a ticket, so don't enable them. */
+#define arch_spin_lock_flags(lock, flags) arch_spin_lock(lock)
+
+/*
+ * Read-write spinlocks, allowing multiple readers
+ * but only one writer.
+ *
+ * We use fetchadd() for readers, and fetchor() with the sign bit
+ * for writers.
+ */
+
+#define __WRITE_LOCK_BIT (1 << 31)
+
+static inline int arch_write_val_locked(int val)
+{
+        return val < 0;  /* Optimize "val & __WRITE_LOCK_BIT". */
+}
+
+/**
+ * read_can_lock - would read_trylock() succeed?
+ * @lock: the rwlock in question.
+ */
+static inline int arch_read_can_lock(arch_rwlock_t *rw)
+{
+        return !arch_write_val_locked(rw->lock);
+}
+
+/**
+ * write_can_lock - would write_trylock() succeed?
+ * @lock: the rwlock in question.
+ */
+static inline int arch_write_can_lock(arch_rwlock_t *rw)
+{
+        return rw->lock == 0;
+}
+
+extern void __read_lock_failed(arch_rwlock_t *rw);
+
+static inline void arch_read_lock(arch_rwlock_t *rw)
+{
+        u32 val = __insn_fetchaddgez4(&rw->lock, 1);
+        if (unlikely(arch_write_val_locked(val)))
+                __read_lock_failed(rw);
+}
+
+extern void __write_lock_failed(arch_rwlock_t *rw, u32 val);
+
+static inline void arch_write_lock(arch_rwlock_t *rw)
+{
+        u32 val = __insn_fetchor4(&rw->lock, __WRITE_LOCK_BIT);
+        if (unlikely(val != 0))
+                __write_lock_failed(rw, val);
+}
+
+static inline void arch_read_unlock(arch_rwlock_t *rw)
+{
+        __insn_mf();
+        __insn_fetchadd4(&rw->lock, -1);
+}
+
+static inline void arch_write_unlock(arch_rwlock_t *rw)
+{
+        __insn_mf();
+        rw->lock = 0;
+}
+
+static inline int arch_read_trylock(arch_rwlock_t *rw)
+{
+        return !arch_write_val_locked(__insn_fetchaddgez4(&rw->lock, 1));
+}
+
+static inline int arch_write_trylock(arch_rwlock_t *rw)
+{
+        u32 val = __insn_fetchor4(&rw->lock, __WRITE_LOCK_BIT);
+        if (likely(val == 0))
+                return 1;
+        if (!arch_write_val_locked(val))
+                __insn_fetchand4(&rw->lock, ~__WRITE_LOCK_BIT);
+        return 0;
+}
+
+#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
+#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
+
+#endif /* _ASM_TILE_SPINLOCK_64_H */
diff --git a/arch/tile/include/asm/stat.h b/arch/tile/include/asm/stat.h
index b16e5db8f0e7..c0db34d56be3 100644
--- a/arch/tile/include/asm/stat.h
+++ b/arch/tile/include/asm/stat.h
@@ -1,4 +1,4 @@
-#ifdef CONFIG_COMPAT
+#if defined(__KERNEL__) && defined(CONFIG_COMPAT)
 #define __ARCH_WANT_STAT64      /* Used for compat_sys_stat64() etc. */
 #endif
 #include <asm-generic/stat.h>
diff --git a/arch/tile/include/asm/swab.h b/arch/tile/include/asm/swab.h
index 25c686a00f1d..7c37b38f6c8d 100644
--- a/arch/tile/include/asm/swab.h
+++ b/arch/tile/include/asm/swab.h
@@ -18,12 +18,6 @@
 /* Tile gcc is always >= 4.3.0, so we use __builtin_bswap. */
 #define __arch_swab32(x) __builtin_bswap32(x)
 #define __arch_swab64(x) __builtin_bswap64(x)
-
-/* Use the variant that is natural for the wordsize. */
-#ifdef CONFIG_64BIT
-#define __arch_swab16(x) (__builtin_bswap64(x) >> 48)
-#else
 #define __arch_swab16(x) (__builtin_bswap32(x) >> 16)
-#endif
 
 #endif /* _ASM_TILE_SWAB_H */
diff --git a/arch/tile/include/asm/thread_info.h b/arch/tile/include/asm/thread_info.h
index 3405b52853b8..bc4f562bd459 100644
--- a/arch/tile/include/asm/thread_info.h
+++ b/arch/tile/include/asm/thread_info.h
@@ -125,6 +125,7 @@ extern void cpu_idle_on_new_stack(struct thread_info *old_ti,
 #define TIF_SYSCALL_AUDIT       5       /* syscall auditing active */
 #define TIF_SECCOMP             6       /* secure computing */
 #define TIF_MEMDIE              7       /* OOM killer at work */
+#define TIF_NOTIFY_RESUME       8       /* callback before returning to user */
 
 #define _TIF_SIGPENDING         (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED       (1<<TIF_NEED_RESCHED)
@@ -134,10 +135,12 @@ extern void cpu_idle_on_new_stack(struct thread_info *old_ti,
 #define _TIF_SYSCALL_AUDIT      (1<<TIF_SYSCALL_AUDIT)
 #define _TIF_SECCOMP            (1<<TIF_SECCOMP)
 #define _TIF_MEMDIE             (1<<TIF_MEMDIE)
+#define _TIF_NOTIFY_RESUME      (1<<TIF_NOTIFY_RESUME)
 
 /* Work to do on any return to user space. */
 #define _TIF_ALLWORK_MASK \
-  (_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_SINGLESTEP|_TIF_ASYNC_TLB)
+  (_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_SINGLESTEP|\
+   _TIF_ASYNC_TLB|_TIF_NOTIFY_RESUME)
 
 /*
  * Thread-synchronous status.
diff --git a/arch/tile/include/asm/topology.h b/arch/tile/include/asm/topology.h
index 343172d422a9..6fdd0c860193 100644
--- a/arch/tile/include/asm/topology.h
+++ b/arch/tile/include/asm/topology.h
@@ -44,25 +44,64 @@ static inline const struct cpumask *cpumask_of_node(int node)
 /* For now, use numa node -1 for global allocation. */
 #define pcibus_to_node(bus)             ((void)(bus), -1)
 
+/*
+ * TILE architecture has many cores integrated in one processor, so we need
+ * setup bigger balance_interval for both CPU/NODE scheduling domains to
+ * reduce process scheduling costs.
+ */
+
+/* sched_domains SD_CPU_INIT for TILE architecture */
+#define SD_CPU_INIT (struct sched_domain) {                             \
+        .min_interval           = 4,                                    \
+        .max_interval           = 128,                                  \
+        .busy_factor            = 64,                                   \
+        .imbalance_pct          = 125,                                  \
+        .cache_nice_tries       = 1,                                    \
+        .busy_idx               = 2,                                    \
+        .idle_idx               = 1,                                    \
+        .newidle_idx            = 0,                                    \
+        .wake_idx               = 0,                                    \
+        .forkexec_idx           = 0,                                    \
+                                                                        \
+        .flags                  = 1*SD_LOAD_BALANCE                     \
+                                | 1*SD_BALANCE_NEWIDLE                  \
+                                | 1*SD_BALANCE_EXEC                     \
+                                | 1*SD_BALANCE_FORK                     \
+                                | 0*SD_BALANCE_WAKE                     \
+                                | 0*SD_WAKE_AFFINE                      \
+                                | 0*SD_PREFER_LOCAL                     \
+                                | 0*SD_SHARE_CPUPOWER                   \
+                                | 0*SD_SHARE_PKG_RESOURCES              \
+                                | 0*SD_SERIALIZE                        \
+                                ,                                       \
+        .last_balance           = jiffies,                              \
+        .balance_interval       = 32,                                   \
+}
+
 /* sched_domains SD_NODE_INIT for TILE architecture */
-#define SD_NODE_INIT (struct sched_domain) {            \
-        .min_interval           = 8,                    \
-        .max_interval           = 32,                   \
-        .busy_factor            = 32,                   \
-        .imbalance_pct          = 125,                  \
-        .cache_nice_tries       = 1,                    \
-        .busy_idx               = 3,                    \
-        .idle_idx               = 1,                    \
-        .newidle_idx            = 2,                    \
-        .wake_idx               = 1,                    \
-        .flags                  = SD_LOAD_BALANCE       \
-                                | SD_BALANCE_NEWIDLE    \
-                                | SD_BALANCE_EXEC       \
-                                | SD_BALANCE_FORK       \
-                                | SD_WAKE_AFFINE        \
-                                | SD_SERIALIZE,         \
-        .last_balance           = jiffies,              \
-        .balance_interval       = 1,                    \
+#define SD_NODE_INIT (struct sched_domain) {                            \
+        .min_interval           = 16,                                   \
+        .max_interval           = 512,                                  \
+        .busy_factor            = 32,                                   \
+        .imbalance_pct          = 125,                                  \
+        .cache_nice_tries       = 1,                                    \
+        .busy_idx               = 3,                                    \
+        .idle_idx               = 1,                                    \
+        .newidle_idx            = 2,                                    \
+        .wake_idx               = 1,                                    \
+        .flags                  = 1*SD_LOAD_BALANCE                     \
+                                | 1*SD_BALANCE_NEWIDLE                  \
+                                | 1*SD_BALANCE_EXEC                     \
+                                | 1*SD_BALANCE_FORK                     \
+                                | 0*SD_BALANCE_WAKE                     \
+                                | 0*SD_WAKE_AFFINE                      \
+                                | 0*SD_PREFER_LOCAL                     \
+                                | 0*SD_SHARE_CPUPOWER                   \
+                                | 0*SD_SHARE_PKG_RESOURCES              \
+                                | 1*SD_SERIALIZE                        \
+                                ,                                       \
+        .last_balance           = jiffies,                              \
+        .balance_interval       = 128,                                  \
 }
 
 /* By definition, we create nodes based on online memory. */
diff --git a/arch/tile/include/asm/traps.h b/arch/tile/include/asm/traps.h
index d06e35f57201..5f20f920f932 100644
--- a/arch/tile/include/asm/traps.h
+++ b/arch/tile/include/asm/traps.h
@@ -15,10 +15,14 @@
 #ifndef _ASM_TILE_TRAPS_H
 #define _ASM_TILE_TRAPS_H
 
+#include <arch/chip.h>
+
 /* mm/fault.c */
 void do_page_fault(struct pt_regs *, int fault_num,
                    unsigned long address, unsigned long write);
+#if CHIP_HAS_TILE_DMA() || CHIP_HAS_SN_PROC()
 void do_async_page_fault(struct pt_regs *);
+#endif
 
 #ifndef __tilegx__
 /*
diff --git a/arch/tile/include/asm/unistd.h b/arch/tile/include/asm/unistd.h
index b35c2db71199..f70bf1c541f1 100644
--- a/arch/tile/include/asm/unistd.h
+++ b/arch/tile/include/asm/unistd.h
@@ -15,7 +15,7 @@
 #if !defined(_ASM_TILE_UNISTD_H) || defined(__SYSCALL)
 #define _ASM_TILE_UNISTD_H
 
-#ifndef __LP64__
+#if !defined(__LP64__) || defined(__SYSCALL_COMPAT)
 /* Use the flavor of this syscall that matches the 32-bit API better. */
 #define __ARCH_WANT_SYNC_FILE_RANGE2
 #endif
diff --git a/arch/tile/include/hv/pagesize.h b/arch/tile/include/asm/vga.h
index 58bed114fedd..7b46e754d611 100644
--- a/arch/tile/include/hv/pagesize.h
+++ b/arch/tile/include/asm/vga.h
@@ -10,23 +10,30 @@
  *   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
  *   NON INFRINGEMENT.  See the GNU General Public License for
  *   more details.
+ *
+ * Access to VGA videoram.
  */
 
-/**
- * @file pagesize.h
- */
+#ifndef _ASM_TILE_VGA_H
+#define _ASM_TILE_VGA_H
 
-#ifndef _HV_PAGESIZE_H
-#define _HV_PAGESIZE_H
+#include <asm/io.h>
 
-/** The log2 of the size of small pages, in bytes. This value should
- * be verified at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_SMALL).
- */
-#define HV_LOG2_PAGE_SIZE_SMALL 16
+#define VT_BUF_HAVE_RW
 
-/** The log2 of the size of large pages, in bytes. This value should be
- * verified at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_LARGE).
- */
-#define HV_LOG2_PAGE_SIZE_LARGE 24
+static inline void scr_writew(u16 val, volatile u16 *addr)
+{
+        __raw_writew(val, (volatile u16 __iomem *) addr);
+}
+
+static inline u16 scr_readw(volatile const u16 *addr)
+{
+        return __raw_readw((volatile const u16 __iomem *) addr);
+}
+
+#define vga_readb(a)    readb((u8 __iomem *)(a))
+#define vga_writeb(v,a) writeb(v, (u8 __iomem *)(a))
+
+#define VGA_MAP_MEM(x,s)        ((unsigned long) ioremap(x, s))
 
-#endif /* _HV_PAGESIZE_H */
+#endif
diff --git a/arch/tile/include/hv/hypervisor.h b/arch/tile/include/hv/hypervisor.h
index ee41bca4c8c4..72ec1e972f15 100644
--- a/arch/tile/include/hv/hypervisor.h
+++ b/arch/tile/include/hv/hypervisor.h
@@ -22,8 +22,6 @@
 
 #include <arch/chip.h>
 
-#include <hv/pagesize.h>
-
 /* Linux builds want unsigned long constants, but assembler wants numbers */
 #ifdef __ASSEMBLER__
 /** One, for assembler */
@@ -44,11 +42,21 @@
  */
 #define HV_L1_SPAN (__HV_SIZE_ONE << HV_LOG2_L1_SPAN)
 
+/** The log2 of the size of small pages, in bytes. This value should
+ * be verified at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_SMALL).
+ */
+#define HV_LOG2_PAGE_SIZE_SMALL 16
+
 /** The size of small pages, in bytes. This value should be verified
  * at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_SMALL).
  */
 #define HV_PAGE_SIZE_SMALL (__HV_SIZE_ONE << HV_LOG2_PAGE_SIZE_SMALL)
 
+/** The log2 of the size of large pages, in bytes. This value should be
+ * verified at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_LARGE).
+ */
+#define HV_LOG2_PAGE_SIZE_LARGE 24
+
 /** The size of large pages, in bytes. This value should be verified
  * at runtime by calling hv_sysconf(HV_SYSCONF_PAGE_SIZE_LARGE).
  */
diff --git a/arch/tile/kernel/backtrace.c b/arch/tile/kernel/backtrace.c
index 55a6a74974b4..1dc71eabfc5a 100644
--- a/arch/tile/kernel/backtrace.c
+++ b/arch/tile/kernel/backtrace.c
@@ -14,19 +14,11 @@
 
 #include <linux/kernel.h>
 #include <linux/string.h>
-
 #include <asm/backtrace.h>
-
-#include <arch/chip.h>
-
 #include <asm/opcode-tile.h>
+#include <arch/abi.h>
 
-
-#define TREG_SP 54
-#define TREG_LR 55
-
-
-#if TILE_CHIP >= 10
+#ifdef __tilegx__
 #define tile_bundle_bits tilegx_bundle_bits
 #define TILE_MAX_INSTRUCTIONS_PER_BUNDLE TILEGX_MAX_INSTRUCTIONS_PER_BUNDLE
 #define TILE_BUNDLE_ALIGNMENT_IN_BYTES TILEGX_BUNDLE_ALIGNMENT_IN_BYTES
@@ -47,7 +39,7 @@ typedef long long bt_int_reg_t;
 typedef int bt_int_reg_t;
 #endif
 
-/** A decoded bundle used for backtracer analysis. */
+/* A decoded bundle used for backtracer analysis. */
 struct BacktraceBundle {
         tile_bundle_bits bits;
         int num_insns;
@@ -56,23 +48,7 @@ struct BacktraceBundle {
 };
 
 
-/* This implementation only makes sense for native tools. */
-/** Default function to read memory. */
-static bool bt_read_memory(void *result, VirtualAddress addr,
-                           unsigned int size, void *extra)
-{
-        /* FIXME: this should do some horrible signal stuff to catch
-         * SEGV cleanly and fail.
-         *
-         * Or else the caller should do the setjmp for efficiency.
-         */
-
-        memcpy(result, (const void *)addr, size);
-        return true;
-}
-
-
-/** Locates an instruction inside the given bundle that
+/* Locates an instruction inside the given bundle that
  * has the specified mnemonic, and whose first 'num_operands_to_match'
  * operands exactly match those in 'operand_values'.
  */
@@ -107,13 +83,13 @@ static const struct tile_decoded_instruction *find_matching_insn(
         return NULL;
 }
 
-/** Does this bundle contain an 'iret' instruction? */
+/* Does this bundle contain an 'iret' instruction? */
 static inline bool bt_has_iret(const struct BacktraceBundle *bundle)
 {
         return find_matching_insn(bundle, TILE_OPC_IRET, NULL, 0) != NULL;
 }
 
-/** Does this bundle contain an 'addi sp, sp, OFFSET' or
+/* Does this bundle contain an 'addi sp, sp, OFFSET' or
  * 'addli sp, sp, OFFSET' instruction, and if so, what is OFFSET?
  */
 static bool bt_has_addi_sp(const struct BacktraceBundle *bundle, int *adjust)
@@ -124,7 +100,7 @@ static bool bt_has_addi_sp(const struct BacktraceBundle *bundle, int *adjust)
                 find_matching_insn(bundle, TILE_OPC_ADDI, vals, 2);
         if (insn == NULL)
                 insn = find_matching_insn(bundle, TILE_OPC_ADDLI, vals, 2);
-#if TILE_CHIP >= 10
+#ifdef __tilegx__
         if (insn == NULL)
                 insn = find_matching_insn(bundle, TILEGX_OPC_ADDXLI, vals, 2);
         if (insn == NULL)
@@ -137,7 +113,7 @@ static bool bt_has_addi_sp(const struct BacktraceBundle *bundle, int *adjust)
         return true;
 }
 
-/** Does this bundle contain any 'info OP' or 'infol OP'
+/* Does this bundle contain any 'info OP' or 'infol OP'
  * instruction, and if so, what are their OP?  Note that OP is interpreted
  * as an unsigned value by this code since that's what the caller wants.
  * Returns the number of info ops found.
@@ -161,7 +137,7 @@ static int bt_get_info_ops(const struct BacktraceBundle *bundle,
         return num_ops;
 }
 
-/** Does this bundle contain a jrp instruction, and if so, to which
+/* Does this bundle contain a jrp instruction, and if so, to which
  * register is it jumping?
  */
 static bool bt_has_jrp(const struct BacktraceBundle *bundle, int *target_reg)
@@ -175,7 +151,7 @@ static bool bt_has_jrp(const struct BacktraceBundle *bundle, int *target_reg)
         return true;
 }
 
-/** Does this bundle modify the specified register in any way? */
+/* Does this bundle modify the specified register in any way? */
 static bool bt_modifies_reg(const struct BacktraceBundle *bundle, int reg)
 {
         int i, j;
@@ -195,34 +171,34 @@ static bool bt_modifies_reg(const struct BacktraceBundle *bundle, int reg)
         return false;
 }
 
-/** Does this bundle modify sp? */
+/* Does this bundle modify sp? */
 static inline bool bt_modifies_sp(const struct BacktraceBundle *bundle)
 {
         return bt_modifies_reg(bundle, TREG_SP);
 }
 
-/** Does this bundle modify lr? */
+/* Does this bundle modify lr? */
 static inline bool bt_modifies_lr(const struct BacktraceBundle *bundle)
 {
         return bt_modifies_reg(bundle, TREG_LR);
 }
 
-/** Does this bundle contain the instruction 'move fp, sp'? */
+/* Does this bundle contain the instruction 'move fp, sp'? */
 static inline bool bt_has_move_r52_sp(const struct BacktraceBundle *bundle)
 {
         static const int vals[2] = { 52, TREG_SP };
         return find_matching_insn(bundle, TILE_OPC_MOVE, vals, 2) != NULL;
 }
 
-/** Does this bundle contain a store of lr to sp? */
+/* Does this bundle contain a store of lr to sp? */
 static inline bool bt_has_sw_sp_lr(const struct BacktraceBundle *bundle)
 {
         static const int vals[2] = { TREG_SP, TREG_LR };
         return find_matching_insn(bundle, OPCODE_STORE, vals, 2) != NULL;
 }
 
-#if TILE_CHIP >= 10
-/** Track moveli values placed into registers. */
+#ifdef __tilegx__
+/* Track moveli values placed into registers. */
 static inline void bt_update_moveli(const struct BacktraceBundle *bundle,
                                     int moveli_args[])
 {
@@ -238,7 +214,7 @@ static inline void bt_update_moveli(const struct BacktraceBundle *bundle,
         }
 }
 
-/** Does this bundle contain an 'add sp, sp, reg' instruction
+/* Does this bundle contain an 'add sp, sp, reg' instruction
  * from a register that we saw a moveli into, and if so, what
  * is the value in the register?
  */
@@ -260,11 +236,11 @@ static bool bt_has_add_sp(const struct BacktraceBundle *bundle, int *adjust,
 }
 #endif
 
-/** Locates the caller's PC and SP for a program starting at the
+/* Locates the caller's PC and SP for a program starting at the
  * given address.
  */
 static void find_caller_pc_and_caller_sp(CallerLocation *location,
-                                         const VirtualAddress start_pc,
+                                         const unsigned long start_pc,
                                          BacktraceMemoryReader read_memory_func,
                                          void *read_memory_func_extra)
 {
@@ -288,9 +264,9 @@ static void find_caller_pc_and_caller_sp(CallerLocation *location,
         tile_bundle_bits prefetched_bundles[32];
         int num_bundles_prefetched = 0;
         int next_bundle = 0;
-        VirtualAddress pc;
+        unsigned long pc;
 
-#if TILE_CHIP >= 10
+#ifdef __tilegx__
         /* Naively try to track moveli values to support addx for -m32. */
         int moveli_args[TILEGX_NUM_REGISTERS] = { 0 };
 #endif
@@ -369,10 +345,6 @@ static void find_caller_pc_and_caller_sp(CallerLocation *location,
                                         /* Weird; reserved value, ignore it. */
                                         continue;
                                 }
-                                if (info_operand & ENTRY_POINT_INFO_OP) {
-                                        /* This info op is ignored by the backtracer. */
-                                        continue;
-                                }
 
                                 /* Skip info ops which are not in the
                                  * "one_ago" mode we want right now.
@@ -453,7 +425,7 @@ static void find_caller_pc_and_caller_sp(CallerLocation *location,
                 if (!sp_determined) {
                         int adjust;
                         if (bt_has_addi_sp(&bundle, &adjust)
-#if TILE_CHIP >= 10
+#ifdef __tilegx__
                             || bt_has_add_sp(&bundle, &adjust, moveli_args)
 #endif
                                 ) {
@@ -504,7 +476,7 @@ static void find_caller_pc_and_caller_sp(CallerLocation *location,
                                 }
                         }
 
-#if TILE_CHIP >= 10
+#ifdef __tilegx__
                         /* Track moveli arguments for -m32 mode. */
                         bt_update_moveli(&bundle, moveli_args);
 #endif
@@ -546,18 +518,26 @@ static void find_caller_pc_and_caller_sp(CallerLocation *location,
         }
 }
 
+/* Initializes a backtracer to start from the given location.
+ *
+ * If the frame pointer cannot be determined it is set to -1.
+ *
+ * state: The state to be filled in.
+ * read_memory_func: A callback that reads memory.
+ * read_memory_func_extra: An arbitrary argument to read_memory_func.
+ * pc: The current PC.
+ * lr: The current value of the 'lr' register.
+ * sp: The current value of the 'sp' register.
+ * r52: The current value of the 'r52' register.
+ */
 void backtrace_init(BacktraceIterator *state,
                     BacktraceMemoryReader read_memory_func,
                     void *read_memory_func_extra,
-                    VirtualAddress pc, VirtualAddress lr,
-                    VirtualAddress sp, VirtualAddress r52)
+                    unsigned long pc, unsigned long lr,
+                    unsigned long sp, unsigned long r52)
 {
         CallerLocation location;
-        VirtualAddress fp, initial_frame_caller_pc;
-
-        if (read_memory_func == NULL) {
-                read_memory_func = bt_read_memory;
-        }
+        unsigned long fp, initial_frame_caller_pc;
 
         /* Find out where we are in the initial frame. */
         find_caller_pc_and_caller_sp(&location, pc,
@@ -630,12 +610,15 @@ void backtrace_init(BacktraceIterator *state,
 /* Handle the case where the register holds more bits than the VA. */
 static bool valid_addr_reg(bt_int_reg_t reg)
 {
-        return ((VirtualAddress)reg == reg);
+        return ((unsigned long)reg == reg);
 }
 
+/* Advances the backtracing state to the calling frame, returning
+ * true iff successful.
+ */
 bool backtrace_next(BacktraceIterator *state)
 {
-        VirtualAddress next_fp, next_pc;
+        unsigned long next_fp, next_pc;
         bt_int_reg_t next_frame[2];
 
         if (state->fp == -1) {
diff --git a/arch/tile/kernel/compat.c b/arch/tile/kernel/compat.c
index dbc213adf5e1..bf5e9d70266c 100644
--- a/arch/tile/kernel/compat.c
+++ b/arch/tile/kernel/compat.c
@@ -135,26 +135,15 @@ long tile_compat_sys_msgrcv(int msqid,
 
 /* Provide the compat syscall number to call mapping. */
 #undef __SYSCALL
-#define __SYSCALL(nr, call) [nr] = (compat_##call),
+#define __SYSCALL(nr, call) [nr] = (call),
 
 /* The generic versions of these don't work for Tile. */
 #define compat_sys_msgrcv tile_compat_sys_msgrcv
 #define compat_sys_msgsnd tile_compat_sys_msgsnd
 
 /* See comments in sys.c */
-#define compat_sys_fadvise64 sys32_fadvise64
 #define compat_sys_fadvise64_64 sys32_fadvise64_64
 #define compat_sys_readahead sys32_readahead
-#define compat_sys_sync_file_range compat_sys_sync_file_range2
-
-/* We leverage the "struct stat64" type for 32-bit time_t/nsec. */
-#define compat_sys_stat64 sys_stat64
-#define compat_sys_lstat64 sys_lstat64
-#define compat_sys_fstat64 sys_fstat64
-#define compat_sys_fstatat64 sys_fstatat64
-
-/* The native sys_ptrace dynamically handles compat binaries. */
-#define compat_sys_ptrace sys_ptrace
 
 /* Call the trampolines to manage pt_regs where necessary. */
 #define compat_sys_execve _compat_sys_execve
diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c
index dbb0dfc7bece..a7869ad62776 100644
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
@@ -317,7 +317,7 @@ long compat_sys_rt_sigreturn(struct pt_regs *regs)
         return 0;
 
 badframe:
-        force_sig(SIGSEGV, current);
+        signal_fault("bad sigreturn frame", regs, frame, 0);
         return 0;
 }
 
@@ -431,6 +431,6 @@ int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         return 0;
 
 give_sigsegv:
-        force_sigsegv(sig, current);
+        signal_fault("bad setup frame", regs, frame, sig);
         return -EFAULT;
 }
diff --git a/arch/tile/kernel/futex_64.S b/arch/tile/kernel/futex_64.S
new file mode 100644
index 000000000000..f465d1eda20f
--- /dev/null
+++ b/arch/tile/kernel/futex_64.S
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * Atomically access user memory, but use MMU to avoid propagating
+ * kernel exceptions.
+ */
+
+#include <linux/linkage.h>
+#include <asm/errno.h>
+#include <asm/futex.h>
+#include <asm/page.h>
+#include <asm/processor.h>
+
+/*
+ * Provide a set of atomic memory operations supporting <asm/futex.h>.
+ *
+ * r0: user address to manipulate
+ * r1: new value to write, or for cmpxchg, old value to compare against
+ * r2: (cmpxchg only) new value to write
+ *
+ * Return __get_user struct, r0 with value, r1 with error.
+ */
+#define FUTEX_OP(name, ...) \
+STD_ENTRY(futex_##name)                 \
+        __VA_ARGS__;                    \
+        {                               \
+         move   r1, zero;               \
+         jrp    lr                      \
+        };                              \
+        STD_ENDPROC(futex_##name);      \
+        .pushsection __ex_table,"a";    \
+        .quad 1b, get_user_fault;       \
+        .popsection
+
+        .pushsection .fixup,"ax"
+get_user_fault:
+        { movei r1, -EFAULT; jrp lr }
+        ENDPROC(get_user_fault)
+        .popsection
+
+FUTEX_OP(cmpxchg, mtspr CMPEXCH_VALUE, r1; 1: cmpexch4 r0, r0, r2)
+FUTEX_OP(set, 1: exch4 r0, r0, r1)
+FUTEX_OP(add, 1: fetchadd4 r0, r0, r1)
+FUTEX_OP(or, 1: fetchor4 r0, r0, r1)
+FUTEX_OP(andn, nor r1, r1, zero; 1: fetchand4 r0, r0, r1)
diff --git a/arch/tile/kernel/hardwall.c b/arch/tile/kernel/hardwall.c
index e910530436e6..3bddef710de4 100644
--- a/arch/tile/kernel/hardwall.c
+++ b/arch/tile/kernel/hardwall.c
@@ -268,12 +268,10 @@ void __kprobes do_hardwall_trap(struct pt_regs* regs, int fault_num)
         found_processes = 0;
         list_for_each_entry(p, &rect->task_head, thread.hardwall_list) {
                 BUG_ON(p->thread.hardwall != rect);
-                if (p->sighand) {
+                if (!(p->flags & PF_EXITING)) {
                         found_processes = 1;
                         pr_notice("hardwall: killing %d\n", p->pid);
-                        spin_lock(&p->sighand->siglock);
-                        __group_send_sig_info(info.si_signo, &info, p);
-                        spin_unlock(&p->sighand->siglock);
+                        do_send_sig_info(info.si_signo, &info, p, false);
                 }
         }
         if (!found_processes)
diff --git a/arch/tile/kernel/head_64.S b/arch/tile/kernel/head_64.S
new file mode 100644
index 000000000000..6bc3a932fe45
--- /dev/null
+++ b/arch/tile/kernel/head_64.S
@@ -0,0 +1,269 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * TILE startup code.
+ */
+
+#include <linux/linkage.h>
+#include <linux/init.h>
+#include <asm/page.h>
+#include <asm/pgtable.h>
+#include <asm/thread_info.h>
+#include <asm/processor.h>
+#include <asm/asm-offsets.h>
+#include <hv/hypervisor.h>
+#include <arch/chip.h>
+#include <arch/spr_def.h>
+
+/*
+ * This module contains the entry code for kernel images. It performs the
+ * minimal setup needed to call the generic C routines.
+ */
+
+        __HEAD
+ENTRY(_start)
+        /* Notify the hypervisor of what version of the API we want */
+        {
+          movei r1, TILE_CHIP
+          movei r2, TILE_CHIP_REV
+        }
+        {
+          moveli r0, _HV_VERSION
+          jal hv_init
+        }
+        /* Get a reasonable default ASID in r0 */
+        {
+          move r0, zero
+          jal hv_inquire_asid
+        }
+
+        /*
+         * Install the default page table.  The relocation required to
+         * statically define the table is a bit too complex, so we have
+         * to plug in the pointer from the L0 to the L1 table by hand.
+         * We only do this on the first cpu to boot, though, since the
+         * other CPUs should see a properly-constructed page table.
+         */
+        {
+          v4int_l r2, zero, r0    /* ASID for hv_install_context */
+          moveli r4, hw1_last(swapper_pgprot - PAGE_OFFSET)
+        }
+        {
+          shl16insli r4, r4, hw0(swapper_pgprot - PAGE_OFFSET)
+        }
+        {
+          ld r1, r4               /* access_pte for hv_install_context */
+        }
+        {
+          moveli r0, hw1_last(.Lsv_data_pmd - PAGE_OFFSET)
+          moveli r6, hw1_last(temp_data_pmd - PAGE_OFFSET)
+        }
+        {
+          /* After initializing swapper_pgprot, HV_PTE_GLOBAL is set. */
+          bfextu r7, r1, HV_PTE_INDEX_GLOBAL, HV_PTE_INDEX_GLOBAL
+          inv r4
+        }
+        bnez r7, .Lno_write
+        {
+          shl16insli r0, r0, hw0(.Lsv_data_pmd - PAGE_OFFSET)
+          shl16insli r6, r6, hw0(temp_data_pmd - PAGE_OFFSET)
+        }
+        {
+          /* Cut off the low bits of the PT address. */
+          shrui r6, r6, HV_LOG2_PAGE_TABLE_ALIGN
+          /* Start with our access pte. */
+          move r5, r1
+        }
+        {
+          /* Stuff the address into the page table pointer slot of the PTE. */
+          bfins r5, r6, HV_PTE_INDEX_PTFN, \
+                        HV_PTE_INDEX_PTFN + HV_PTE_PTFN_BITS - 1
+        }
+        {
+          /* Store the L0 data PTE. */
+          st r0, r5
+          addli r6, r6, (temp_code_pmd - temp_data_pmd) >> \
+                        HV_LOG2_PAGE_TABLE_ALIGN
+        }
+        {
+          addli r0, r0, .Lsv_code_pmd - .Lsv_data_pmd
+          bfins r5, r6, HV_PTE_INDEX_PTFN, \
+                        HV_PTE_INDEX_PTFN + HV_PTE_PTFN_BITS - 1
+        }
+        /* Store the L0 code PTE. */
+        st r0, r5
+
+.Lno_write:
+        moveli lr, hw2_last(1f)
+        {
+          shl16insli lr, lr, hw1(1f)
+          moveli r0, hw1_last(swapper_pg_dir - PAGE_OFFSET)
+        }
+        {
+          shl16insli lr, lr, hw0(1f)
+          shl16insli r0, r0, hw0(swapper_pg_dir - PAGE_OFFSET)
+        }
+        {
+          move r3, zero
+          j hv_install_context
+        }
+1:
+
+        /* Install the interrupt base. */
+        moveli r0, hw2_last(MEM_SV_START)
+        shl16insli r0, r0, hw1(MEM_SV_START)
+        shl16insli r0, r0, hw0(MEM_SV_START)
+        mtspr SPR_INTERRUPT_VECTOR_BASE_K, r0
+
+        /*
+         * Get our processor number and save it away in SAVE_K_0.
+         * Extract stuff from the topology structure: r4 = y, r6 = x,
+         * r5 = width.  FIXME: consider whether we want to just make these
+         * 64-bit values (and if so fix smp_topology write below, too).
+         */
+        jal hv_inquire_topology
+        {
+          v4int_l r5, zero, r1    /* r5 = width */
+          shrui r4, r0, 32        /* r4 = y */
+        }
+        {
+          v4int_l r6, zero, r0    /* r6 = x */
+          mul_lu_lu r4, r4, r5
+        }
+        {
+          add r4, r4, r6          /* r4 == cpu == y*width + x */
+        }
+
+#ifdef CONFIG_SMP
+        /*
+         * Load up our per-cpu offset.  When the first (master) tile
+         * boots, this value is still zero, so we will load boot_pc
+         * with start_kernel, and boot_sp with init_stack + THREAD_SIZE.
+         * The master tile initializes the per-cpu offset array, so that
+         * when subsequent (secondary) tiles boot, they will instead load
+         * from their per-cpu versions of boot_sp and boot_pc.
+         */
+        moveli r5, hw2_last(__per_cpu_offset)
+        shl16insli r5, r5, hw1(__per_cpu_offset)
+        shl16insli r5, r5, hw0(__per_cpu_offset)
+        shl3add r5, r4, r5
+        ld r5, r5
+        bnez r5, 1f
+
+        /*
+         * Save the width and height to the smp_topology variable
+         * for later use.
+         */
+        moveli r0, hw2_last(smp_topology + HV_TOPOLOGY_WIDTH_OFFSET)
+        shl16insli r0, r0, hw1(smp_topology + HV_TOPOLOGY_WIDTH_OFFSET)
+        shl16insli r0, r0, hw0(smp_topology + HV_TOPOLOGY_WIDTH_OFFSET)
+        st r0, r1
+1:
+#else
+        move r5, zero
+#endif
+
+        /* Load and go with the correct pc and sp. */
+        {
+          moveli r1, hw2_last(boot_sp)
+          moveli r0, hw2_last(boot_pc)
+        }
+        {
+          shl16insli r1, r1, hw1(boot_sp)
+          shl16insli r0, r0, hw1(boot_pc)
+        }
+        {
+          shl16insli r1, r1, hw0(boot_sp)
+          shl16insli r0, r0, hw0(boot_pc)
+        }
+        {
+          add r1, r1, r5
+          add r0, r0, r5
+        }
+        ld r0, r0
+        ld sp, r1
+        or r4, sp, r4
+        mtspr SPR_SYSTEM_SAVE_K_0, r4  /* save ksp0 + cpu */
+        addi sp, sp, -STACK_TOP_DELTA
+        {
+          move lr, zero   /* stop backtraces in the called function */
+          jr r0
+        }
+        ENDPROC(_start)
+
+__PAGE_ALIGNED_BSS
+        .align PAGE_SIZE
+ENTRY(empty_zero_page)
+        .fill PAGE_SIZE,1,0
+        END(empty_zero_page)
+
+        .macro PTE cpa, bits1
+        .quad HV_PTE_PAGE | HV_PTE_DIRTY | HV_PTE_PRESENT | HV_PTE_ACCESSED |\
+              HV_PTE_GLOBAL | (HV_PTE_MODE_CACHE_NO_L3 << HV_PTE_INDEX_MODE) |\
+              (\bits1) | (HV_CPA_TO_PFN(\cpa) << HV_PTE_INDEX_PFN)
+        .endm
+
+__PAGE_ALIGNED_DATA
+        .align PAGE_SIZE
+ENTRY(swapper_pg_dir)
+        .org swapper_pg_dir + HV_L0_INDEX(PAGE_OFFSET) * HV_PTE_SIZE
+.Lsv_data_pmd:
+        .quad 0  /* PTE temp_data_pmd - PAGE_OFFSET, 0 */
+        .org swapper_pg_dir + HV_L0_INDEX(MEM_SV_START) * HV_PTE_SIZE
+.Lsv_code_pmd:
+        .quad 0  /* PTE temp_code_pmd - PAGE_OFFSET, 0 */
+        .org swapper_pg_dir + HV_L0_SIZE
+        END(swapper_pg_dir)
+
+        .align HV_PAGE_TABLE_ALIGN
+ENTRY(temp_data_pmd)
+        /*
+         * We fill the PAGE_OFFSET pmd with huge pages with
+         * VA = PA + PAGE_OFFSET.  We remap things with more precise access
+         * permissions later.
+         */
+        .set addr, 0
+        .rept HV_L1_ENTRIES
+        PTE addr, HV_PTE_READABLE | HV_PTE_WRITABLE
+        .set addr, addr + HV_PAGE_SIZE_LARGE
+        .endr
+        .org temp_data_pmd + HV_L1_SIZE
+        END(temp_data_pmd)
+
+        .align HV_PAGE_TABLE_ALIGN
+ENTRY(temp_code_pmd)
+        /*
+         * We fill the MEM_SV_START pmd with huge pages with
+         * VA = PA + PAGE_OFFSET.  We remap things with more precise access
+         * permissions later.
+         */
+        .set addr, 0
+        .rept HV_L1_ENTRIES
+        PTE addr, HV_PTE_READABLE | HV_PTE_EXECUTABLE
+        .set addr, addr + HV_PAGE_SIZE_LARGE
+        .endr
+        .org temp_code_pmd + HV_L1_SIZE
+        END(temp_code_pmd)
+
+        /*
+         * Isolate swapper_pgprot to its own cache line, since each cpu
+         * starting up will read it using VA-is-PA and local homing.
+         * This would otherwise likely conflict with other data on the cache
+         * line, once we have set its permanent home in the page tables.
+         */
+        __INITDATA
+        .align CHIP_L2_LINE_SIZE()
+ENTRY(swapper_pgprot)
+        .quad HV_PTE_PRESENT | (HV_PTE_MODE_CACHE_NO_L3 << HV_PTE_INDEX_MODE)
+        .align CHIP_L2_LINE_SIZE()
+        END(swapper_pgprot)
diff --git a/arch/tile/kernel/intvec_32.S b/arch/tile/kernel/intvec_32.S
index fffcfa6b3a62..72ade79b621b 100644
--- a/arch/tile/kernel/intvec_32.S
+++ b/arch/tile/kernel/intvec_32.S
@@ -851,14 +851,27 @@ STD_ENTRY(interrupt_return)
         /* Check to see if there is any work to do before returning to user. */
         {
          addi   r29, r32, THREAD_INFO_FLAGS_OFFSET
-         moveli r28, lo16(_TIF_ALLWORK_MASK)
+         moveli r1, lo16(_TIF_ALLWORK_MASK)
         }
         {
          lw     r29, r29
-         auli   r28, r28, ha16(_TIF_ALLWORK_MASK)
+         auli   r1, r1, ha16(_TIF_ALLWORK_MASK)
         }
-        and     r28, r29, r28
-        bnz     r28, .Lwork_pending
+        and     r1, r29, r1
+        bzt     r1, .Lrestore_all
+
+        /*
+         * Make sure we have all the registers saved for signal
+         * handling or single-step.  Call out to C code to figure out
+         * exactly what we need to do for each flag bit, then if
+         * necessary, reload the flags and recheck.
+         */
+        push_extra_callee_saves r0
+        {
+         PTREGS_PTR(r0, PTREGS_OFFSET_BASE)
+         jal    do_work_pending
+        }
+        bnz     r0, .Lresume_userspace
 
         /*
          * In the NMI case we
@@ -1099,99 +1112,6 @@ STD_ENTRY(interrupt_return)
         pop_reg r50
         pop_reg r51, sp, PTREGS_OFFSET_REG(29) - PTREGS_OFFSET_REG(51)
         j .Lcontinue_restore_regs
-
-.Lwork_pending:
-        /* Mask the reschedule flag */
-        andi    r28, r29, _TIF_NEED_RESCHED
-
-        {
-         /*
-          * If the NEED_RESCHED flag is called, we call schedule(), which
-          * may drop this context right here and go do something else.
-          * On return, jump back to .Lresume_userspace and recheck.
-          */
-         bz     r28, .Lasync_tlb
-
-         /* Mask the async-tlb flag */
-         andi   r28, r29, _TIF_ASYNC_TLB
-        }
-
-        jal     schedule
-        FEEDBACK_REENTER(interrupt_return)
-
-        /* Reload the flags and check again */
-        j       .Lresume_userspace
-
-.Lasync_tlb:
-        {
-         bz     r28, .Lneed_sigpending
-
-         /* Mask the sigpending flag */
-         andi   r28, r29, _TIF_SIGPENDING
-        }
-
-        PTREGS_PTR(r0, PTREGS_OFFSET_BASE)
-        jal     do_async_page_fault
-        FEEDBACK_REENTER(interrupt_return)
-
-        /*
-         * Go restart the "resume userspace" process.  We may have
-         * fired a signal, and we need to disable interrupts again.
-         */
-        j       .Lresume_userspace
-
-.Lneed_sigpending:
-        /*
-         * At this point we are either doing signal handling or single-step,
-         * so either way make sure we have all the registers saved.
-         */
-        push_extra_callee_saves r0
-
-        {
-         /* If no signal pending, skip to singlestep check */
-         bz     r28, .Lneed_singlestep
-
-         /* Mask the singlestep flag */
-         andi   r28, r29, _TIF_SINGLESTEP
-        }
-
-        jal     do_signal
-        FEEDBACK_REENTER(interrupt_return)
-
-        /* Reload the flags and check again */
-        j       .Lresume_userspace
-
-.Lneed_singlestep:
-        {
-         /* Get a pointer to the EX1 field */
-         PTREGS_PTR(r29, PTREGS_OFFSET_EX1)
-
-         /* If we get here, our bit must be set. */
-         bz     r28, .Lwork_confusion
-        }
-        /* If we are in priv mode, don't single step */
-        lw      r28, r29
-        andi    r28, r28, SPR_EX_CONTEXT_1_1__PL_MASK  /* mask off ICS */
-        bnz     r28, .Lrestore_all
-
-        /* Allow interrupts within the single step code */
-        TRACE_IRQS_ON  /* Note: clobbers registers r0-r29 */
-        IRQ_ENABLE(r20, r21)
-
-        /* try to single-step the current instruction */
-        PTREGS_PTR(r0, PTREGS_OFFSET_BASE)
-        jal     single_step_once
-        FEEDBACK_REENTER(interrupt_return)
-
-        /* Re-disable interrupts.  TRACE_IRQS_OFF in .Lrestore_all. */
-        IRQ_DISABLE(r20,r21)
-
-        j       .Lrestore_all
-
-.Lwork_confusion:
-        move    r0, r28
-        panic   "thread_info allwork flags unhandled on userspace resume: %#x"
-
         STD_ENDPROC(interrupt_return)
 
         /*
@@ -1550,7 +1470,10 @@ STD_ENTRY(_sys_clone)
  * We place it in the __HEAD section to ensure it is relatively
  * near to the intvec_SWINT_1 code (reachable by a conditional branch).
  *
- * Must match register usage in do_page_fault().
+ * Our use of ATOMIC_LOCK_REG here must match do_page_fault_ics().
+ *
+ * As we do in lib/atomic_asm_32.S, we bypass a store if the value we
+ * would store is the same as the value we just loaded.
  */
         __HEAD
         .align 64
@@ -1611,17 +1534,7 @@ ENTRY(sys_cmpxchg)
         {
          shri   r20, r25, 32 - ATOMIC_HASH_L1_SHIFT
          slt_u  r23, r0, r23
-
-         /*
-          * Ensure that the TLB is loaded before we take out the lock.
-          * On TILEPro, this will start fetching the value all the way
-          * into our L1 as well (and if it gets modified before we
-          * grab the lock, it will be invalidated from our cache
-          * before we reload it).  On tile64, we'll start fetching it
-          * into our L1 if we're the home, and if we're not, we'll
-          * still at least start fetching it into the home's L2.
-          */
-         lw     r26, r0
+         lw     r26, r0  /* see comment in the "#else" for the "lw r26". */
         }
         {
          s2a    r21, r20, r21
@@ -1637,18 +1550,9 @@ ENTRY(sys_cmpxchg)
          bbs    r23, .Lcmpxchg64
          andi   r23, r0, 7       /* Precompute alignment for cmpxchg64. */
         }
-
         {
-         /*
-          * We very carefully align the code that actually runs with
-          * the lock held (nine bundles) so that we know it is all in
-          * the icache when we start.  This instruction (the jump) is
-          * at the start of the first cache line, address zero mod 64;
-          * we jump to somewhere in the second cache line to issue the
-          * tns, then jump back to finish up.
-          */
          s2a    ATOMIC_LOCK_REG_NAME, r25, r21
-         j      .Lcmpxchg32_tns
+         j      .Lcmpxchg32_tns   /* see comment in the #else for the jump. */
         }
 
 #else /* ATOMIC_LOCKS_FOUND_VIA_TABLE() */
@@ -1713,24 +1617,25 @@ ENTRY(sys_cmpxchg)
         {
          /*
           * We very carefully align the code that actually runs with
-          * the lock held (nine bundles) so that we know it is all in
+          * the lock held (twelve bundles) so that we know it is all in
           * the icache when we start.  This instruction (the jump) is
           * at the start of the first cache line, address zero mod 64;
-          * we jump to somewhere in the second cache line to issue the
-          * tns, then jump back to finish up.
+          * we jump to the very end of the second cache line to get that
+          * line loaded in the icache, then fall through to issue the tns
+          * in the third cache line, at which point it's all cached.
+          * Note that is for performance, not correctness.
           */
          j      .Lcmpxchg32_tns
         }
 
 #endif /* ATOMIC_LOCKS_FOUND_VIA_TABLE() */
 
-        ENTRY(__sys_cmpxchg_grab_lock)
+/* Symbol for do_page_fault_ics() to use to compare against the PC. */
+.global __sys_cmpxchg_grab_lock
+__sys_cmpxchg_grab_lock:
 
         /*
          * Perform the actual cmpxchg or atomic_update.
-         * Note that the system <arch/atomic.h> header relies on
-         * atomic_update() to always perform an "mf", so don't make
-         * it optional or conditional without modifying that code.
          */
 .Ldo_cmpxchg32:
         {
@@ -1748,10 +1653,13 @@ ENTRY(sys_cmpxchg)
         }
         {
          mvnz   r24, r23, r25    /* Use atomic_update value if appropriate. */
-         bbns   r22, .Lcmpxchg32_mismatch
+         bbns   r22, .Lcmpxchg32_nostore
         }
+        seq     r22, r24, r21    /* Are we storing the value we loaded? */
+        bbs     r22, .Lcmpxchg32_nostore
         sw      r0, r24
 
+        /* The following instruction is the start of the second cache line. */
         /* Do slow mtspr here so the following "mf" waits less. */
         {
          move   sp, r27
@@ -1759,7 +1667,6 @@ ENTRY(sys_cmpxchg)
         }
         mf
 
-        /* The following instruction is the start of the second cache line. */
         {
          move   r0, r21
          sw     ATOMIC_LOCK_REG_NAME, zero
@@ -1767,7 +1674,7 @@ ENTRY(sys_cmpxchg)
         iret
 
         /* Duplicated code here in the case where we don't overlap "mf" */
-.Lcmpxchg32_mismatch:
+.Lcmpxchg32_nostore:
         {
          move   r0, r21
          sw     ATOMIC_LOCK_REG_NAME, zero
@@ -1783,8 +1690,6 @@ ENTRY(sys_cmpxchg)
          * and for 64-bit cmpxchg.  We provide it as a macro and put
          * it into both versions.  We can't share the code literally
          * since it depends on having the right branch-back address.
-         * Note that the first few instructions should share the cache
-         * line with the second half of the actual locked code.
          */
         .macro  cmpxchg_lock, bitwidth
 
@@ -1810,7 +1715,7 @@ ENTRY(sys_cmpxchg)
         }
         /*
          * The preceding instruction is the last thing that must be
-         * on the second cache line.
+         * hot in the icache before we do the "tns" above.
          */
 
 #ifdef CONFIG_SMP
@@ -1841,6 +1746,12 @@ ENTRY(sys_cmpxchg)
         .endm
 
 .Lcmpxchg32_tns:
+        /*
+         * This is the last instruction on the second cache line.
+         * The nop here loads the second line, then we fall through
+         * to the tns to load the third line before we take the lock.
+         */
+        nop
         cmpxchg_lock 32
 
         /*
diff --git a/arch/tile/kernel/intvec_64.S b/arch/tile/kernel/intvec_64.S
new file mode 100644
index 000000000000..79c93e10ba27
--- /dev/null
+++ b/arch/tile/kernel/intvec_64.S
@@ -0,0 +1,1231 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * Linux interrupt vectors.
+ */
+
+#include <linux/linkage.h>
+#include <linux/errno.h>
+#include <linux/unistd.h>
+#include <asm/ptrace.h>
+#include <asm/thread_info.h>
+#include <asm/irqflags.h>
+#include <asm/asm-offsets.h>
+#include <asm/types.h>
+#include <hv/hypervisor.h>
+#include <arch/abi.h>
+#include <arch/interrupts.h>
+#include <arch/spr_def.h>
+
+#ifdef CONFIG_PREEMPT
+# error "No support for kernel preemption currently"
+#endif
+
+#define PTREGS_PTR(reg, ptreg) addli reg, sp, C_ABI_SAVE_AREA_SIZE + (ptreg)
+
+#define PTREGS_OFFSET_SYSCALL PTREGS_OFFSET_REG(TREG_SYSCALL_NR)
+
+
+        .macro  push_reg reg, ptr=sp, delta=-8
+        {
+         st     \ptr, \reg
+         addli  \ptr, \ptr, \delta
+        }
+        .endm
+
+        .macro  pop_reg reg, ptr=sp, delta=8
+        {
+         ld     \reg, \ptr
+         addli  \ptr, \ptr, \delta
+        }
+        .endm
+
+        .macro  pop_reg_zero reg, zreg, ptr=sp, delta=8
+        {
+         move   \zreg, zero
+         ld     \reg, \ptr
+         addi   \ptr, \ptr, \delta
+        }
+        .endm
+
+        .macro  push_extra_callee_saves reg
+        PTREGS_PTR(\reg, PTREGS_OFFSET_REG(51))
+        push_reg r51, \reg
+        push_reg r50, \reg
+        push_reg r49, \reg
+        push_reg r48, \reg
+        push_reg r47, \reg
+        push_reg r46, \reg
+        push_reg r45, \reg
+        push_reg r44, \reg
+        push_reg r43, \reg
+        push_reg r42, \reg
+        push_reg r41, \reg
+        push_reg r40, \reg
+        push_reg r39, \reg
+        push_reg r38, \reg
+        push_reg r37, \reg
+        push_reg r36, \reg
+        push_reg r35, \reg
+        push_reg r34, \reg, PTREGS_OFFSET_BASE - PTREGS_OFFSET_REG(34)
+        .endm
+
+        .macro  panic str
+        .pushsection .rodata, "a"
+1:
+        .asciz  "\str"
+        .popsection
+        {
+         moveli r0, hw2_last(1b)
+        }
+        {
+         shl16insli r0, r0, hw1(1b)
+        }
+        {
+         shl16insli r0, r0, hw0(1b)
+         jal    panic
+        }
+        .endm
+
+
+#ifdef __COLLECT_LINKER_FEEDBACK__
+        .pushsection .text.intvec_feedback,"ax"
+intvec_feedback:
+        .popsection
+#endif
+
+        /*
+         * Default interrupt handler.
+         *
+         * vecnum is where we'll put this code.
+         * c_routine is the C routine we'll call.
+         *
+         * The C routine is passed two arguments:
+         * - A pointer to the pt_regs state.
+         * - The interrupt vector number.
+         *
+         * The "processing" argument specifies the code for processing
+         * the interrupt. Defaults to "handle_interrupt".
+         */
+        .macro  int_hand vecnum, vecname, c_routine, processing=handle_interrupt
+        .org    (\vecnum << 8)
+intvec_\vecname:
+        /* Temporarily save a register so we have somewhere to work. */
+
+        mtspr   SPR_SYSTEM_SAVE_K_1, r0
+        mfspr   r0, SPR_EX_CONTEXT_K_1
+
+        andi    r0, r0, SPR_EX_CONTEXT_1_1__PL_MASK  /* mask off ICS */
+
+        .ifc    \vecnum, INT_DOUBLE_FAULT
+        /*
+         * For double-faults from user-space, fall through to the normal
+         * register save and stack setup path.  Otherwise, it's the
+         * hypervisor giving us one last chance to dump diagnostics, and we
+         * branch to the kernel_double_fault routine to do so.
+         */
+        beqz    r0, 1f
+        j       _kernel_double_fault
+1:
+        .else
+        /*
+         * If we're coming from user-space, then set sp to the top of
+         * the kernel stack.  Otherwise, assume sp is already valid.
+         */
+        {
+         bnez   r0, 0f
+         move   r0, sp
+        }
+        .endif
+
+        .ifc    \c_routine, do_page_fault
+        /*
+         * The page_fault handler may be downcalled directly by the
+         * hypervisor even when Linux is running and has ICS set.
+         *
+         * In this case the contents of EX_CONTEXT_K_1 reflect the
+         * previous fault and can't be relied on to choose whether or
+         * not to reinitialize the stack pointer.  So we add a test
+         * to see whether SYSTEM_SAVE_K_2 has the high bit set,
+         * and if so we don't reinitialize sp, since we must be coming
+         * from Linux.  (In fact the precise case is !(val & ~1),
+         * but any Linux PC has to have the high bit set.)
+         *
+         * Note that the hypervisor *always* sets SYSTEM_SAVE_K_2 for
+         * any path that turns into a downcall to one of our TLB handlers.
+         *
+         * FIXME: if we end up never using this path, perhaps we should
+         * prevent the hypervisor from generating downcalls in this case.
+         * The advantage of getting a downcall is we can panic in Linux.
+         */
+        mfspr   r0, SPR_SYSTEM_SAVE_K_2
+        {
+         bltz   r0, 0f    /* high bit in S_S_1_2 is for a PC to use */
+         move   r0, sp
+        }
+        .endif
+
+
+        /*
+         * SYSTEM_SAVE_K_0 holds the cpu number in the low bits, and
+         * the current stack top in the higher bits.  So we recover
+         * our stack top by just masking off the low bits, then
+         * point sp at the top aligned address on the actual stack page.
+         */
+        mfspr   r0, SPR_SYSTEM_SAVE_K_0
+        mm      r0, zero, LOG2_THREAD_SIZE, 63
+
+0:
+        /*
+         * Align the stack mod 64 so we can properly predict what
+         * cache lines we need to write-hint to reduce memory fetch
+         * latency as we enter the kernel.  The layout of memory is
+         * as follows, with cache line 0 at the lowest VA, and cache
+         * line 8 just below the r0 value this "andi" computes.
+         * Note that we never write to cache line 8, and we skip
+         * cache lines 1-3 for syscalls.
+         *
+         *    cache line 8: ptregs padding (two words)
+         *    cache line 7: sp, lr, pc, ex1, faultnum, orig_r0, flags, cmpexch
+         *    cache line 6: r46...r53 (tp)
+         *    cache line 5: r38...r45
+         *    cache line 4: r30...r37
+         *    cache line 3: r22...r29
+         *    cache line 2: r14...r21
+         *    cache line 1: r6...r13
+         *    cache line 0: 2 x frame, r0..r5
+         */
+        andi    r0, r0, -64
+
+        /*
+         * Push the first four registers on the stack, so that we can set
+         * them to vector-unique values before we jump to the common code.
+         *
+         * Registers are pushed on the stack as a struct pt_regs,
+         * with the sp initially just above the struct, and when we're
+         * done, sp points to the base of the struct, minus
+         * C_ABI_SAVE_AREA_SIZE, so we can directly jal to C code.
+         *
+         * This routine saves just the first four registers, plus the
+         * stack context so we can do proper backtracing right away,
+         * and defers to handle_interrupt to save the rest.
+         * The backtracer needs pc, ex1, lr, sp, r52, and faultnum.
+         */
+        addli   r0, r0, PTREGS_OFFSET_LR - (PTREGS_SIZE + KSTK_PTREGS_GAP)
+        wh64    r0   /* cache line 7 */
+        {
+         st     r0, lr
+         addli  r0, r0, PTREGS_OFFSET_SP - PTREGS_OFFSET_LR
+        }
+        {
+         st     r0, sp
+         addli  sp, r0, PTREGS_OFFSET_REG(52) - PTREGS_OFFSET_SP
+        }
+        wh64    sp   /* cache line 6 */
+        {
+         st     sp, r52
+         addli  sp, sp, PTREGS_OFFSET_REG(1) - PTREGS_OFFSET_REG(52)
+        }
+        wh64    sp   /* cache line 0 */
+        {
+         st     sp, r1
+         addli  sp, sp, PTREGS_OFFSET_REG(2) - PTREGS_OFFSET_REG(1)
+        }
+        {
+         st     sp, r2
+         addli  sp, sp, PTREGS_OFFSET_REG(3) - PTREGS_OFFSET_REG(2)
+        }
+        {
+         st     sp, r3
+         addli  sp, sp, PTREGS_OFFSET_PC - PTREGS_OFFSET_REG(3)
+        }
+        mfspr   r0, SPR_EX_CONTEXT_K_0
+        .ifc \processing,handle_syscall
+        /*
+         * Bump the saved PC by one bundle so that when we return, we won't
+         * execute the same swint instruction again.  We need to do this while
+         * we're in the critical section.
+         */
+        addi    r0, r0, 8
+        .endif
+        {
+         st     sp, r0
+         addli  sp, sp, PTREGS_OFFSET_EX1 - PTREGS_OFFSET_PC
+        }
+        mfspr   r0, SPR_EX_CONTEXT_K_1
+        {
+         st     sp, r0
+         addi   sp, sp, PTREGS_OFFSET_FAULTNUM - PTREGS_OFFSET_EX1
+        /*
+         * Use r0 for syscalls so it's a temporary; use r1 for interrupts
+         * so that it gets passed through unchanged to the handler routine.
+         * Note that the .if conditional confusingly spans bundles.
+         */
+         .ifc \processing,handle_syscall
+         movei  r0, \vecnum
+        }
+        {
+         st     sp, r0
+         .else
+         movei  r1, \vecnum
+        }
+        {
+         st     sp, r1
+         .endif
+         addli  sp, sp, PTREGS_OFFSET_REG(0) - PTREGS_OFFSET_FAULTNUM
+        }
+        mfspr   r0, SPR_SYSTEM_SAVE_K_1    /* Original r0 */
+        {
+         st     sp, r0
+         addi   sp, sp, -PTREGS_OFFSET_REG(0) - 8
+        }
+        {
+         st     sp, zero        /* write zero into "Next SP" frame pointer */
+         addi   sp, sp, -8      /* leave SP pointing at bottom of frame */
+        }
+        .ifc \processing,handle_syscall
+        j       handle_syscall
+        .else
+        /* Capture per-interrupt SPR context to registers. */
+        .ifc \c_routine, do_page_fault
+        mfspr   r2, SPR_SYSTEM_SAVE_K_3   /* address of page fault */
+        mfspr   r3, SPR_SYSTEM_SAVE_K_2   /* info about page fault */
+        .else
+        .ifc \vecnum, INT_ILL_TRANS
+        mfspr   r2, ILL_TRANS_REASON
+        .else
+        .ifc \vecnum, INT_DOUBLE_FAULT
+        mfspr   r2, SPR_SYSTEM_SAVE_K_2   /* double fault info from HV */
+        .else
+        .ifc \c_routine, do_trap
+        mfspr   r2, GPV_REASON
+        .else
+        .ifc \c_routine, op_handle_perf_interrupt
+        mfspr   r2, PERF_COUNT_STS
+#if CHIP_HAS_AUX_PERF_COUNTERS()
+        .else
+        .ifc \c_routine, op_handle_aux_perf_interrupt
+        mfspr   r2, AUX_PERF_COUNT_STS
+        .endif
+#endif
+        .endif
+        .endif
+        .endif
+        .endif
+        .endif
+        /* Put function pointer in r0 */
+        moveli  r0, hw2_last(\c_routine)
+        shl16insli r0, r0, hw1(\c_routine)
+        {
+         shl16insli r0, r0, hw0(\c_routine)
+         j       \processing
+        }
+        .endif
+        ENDPROC(intvec_\vecname)
+
+#ifdef __COLLECT_LINKER_FEEDBACK__
+        .pushsection .text.intvec_feedback,"ax"
+        .org    (\vecnum << 5)
+        FEEDBACK_ENTER_EXPLICIT(intvec_\vecname, .intrpt1, 1 << 8)
+        jrp     lr
+        .popsection
+#endif
+
+        .endm
+
+
+        /*
+         * Save the rest of the registers that we didn't save in the actual
+         * vector itself.  We can't use r0-r10 inclusive here.
+         */
+        .macro  finish_interrupt_save, function
+
+        /* If it's a syscall, save a proper orig_r0, otherwise just zero. */
+        PTREGS_PTR(r52, PTREGS_OFFSET_ORIG_R0)
+        {
+         .ifc \function,handle_syscall
+         st     r52, r0
+         .else
+         st     r52, zero
+         .endif
+         PTREGS_PTR(r52, PTREGS_OFFSET_TP)
+        }
+        st      r52, tp
+        {
+         mfspr  tp, CMPEXCH_VALUE
+         PTREGS_PTR(r52, PTREGS_OFFSET_CMPEXCH)
+        }
+
+        /*
+         * For ordinary syscalls, we save neither caller- nor callee-
+         * save registers, since the syscall invoker doesn't expect the
+         * caller-saves to be saved, and the called kernel functions will
+         * take care of saving the callee-saves for us.
+         *
+         * For interrupts we save just the caller-save registers.  Saving
+         * them is required (since the "caller" can't save them).  Again,
+         * the called kernel functions will restore the callee-save
+         * registers for us appropriately.
+         *
+         * On return, we normally restore nothing special for syscalls,
+         * and just the caller-save registers for interrupts.
+         *
+         * However, there are some important caveats to all this:
+         *
+         * - We always save a few callee-save registers to give us
+         *   some scratchpad registers to carry across function calls.
+         *
+         * - fork/vfork/etc require us to save all the callee-save
+         *   registers, which we do in PTREGS_SYSCALL_ALL_REGS, below.
+         *
+         * - We always save r0..r5 and r10 for syscalls, since we need
+         *   to reload them a bit later for the actual kernel call, and
+         *   since we might need them for -ERESTARTNOINTR, etc.
+         *
+         * - Before invoking a signal handler, we save the unsaved
+         *   callee-save registers so they are visible to the
+         *   signal handler or any ptracer.
+         *
+         * - If the unsaved callee-save registers are modified, we set
+         *   a bit in pt_regs so we know to reload them from pt_regs
+         *   and not just rely on the kernel function unwinding.
+         *   (Done for ptrace register writes and SA_SIGINFO handler.)
+         */
+        {
+         st     r52, tp
+         PTREGS_PTR(r52, PTREGS_OFFSET_REG(33))
+        }
+        wh64    r52    /* cache line 4 */
+        push_reg r33, r52
+        push_reg r32, r52
+        push_reg r31, r52
+        .ifc \function,handle_syscall
+        push_reg r30, r52, PTREGS_OFFSET_SYSCALL - PTREGS_OFFSET_REG(30)
+        push_reg TREG_SYSCALL_NR_NAME, r52, \
+          PTREGS_OFFSET_REG(5) - PTREGS_OFFSET_SYSCALL
+        .else
+
+        push_reg r30, r52, PTREGS_OFFSET_REG(29) - PTREGS_OFFSET_REG(30)
+        wh64    r52   /* cache line 3 */
+        push_reg r29, r52
+        push_reg r28, r52
+        push_reg r27, r52
+        push_reg r26, r52
+        push_reg r25, r52
+        push_reg r24, r52
+        push_reg r23, r52
+        push_reg r22, r52
+        wh64    r52   /* cache line 2 */
+        push_reg r21, r52
+        push_reg r20, r52
+        push_reg r19, r52
+        push_reg r18, r52
+        push_reg r17, r52
+        push_reg r16, r52
+        push_reg r15, r52
+        push_reg r14, r52
+        wh64    r52   /* cache line 1 */
+        push_reg r13, r52
+        push_reg r12, r52
+        push_reg r11, r52
+        push_reg r10, r52
+        push_reg r9, r52
+        push_reg r8, r52
+        push_reg r7, r52
+        push_reg r6, r52
+
+        .endif
+
+        push_reg r5, r52
+        st      r52, r4
+
+        /* Load tp with our per-cpu offset. */
+#ifdef CONFIG_SMP
+        {
+         mfspr  r20, SPR_SYSTEM_SAVE_K_0
+         moveli r21, hw2_last(__per_cpu_offset)
+        }
+        {
+         shl16insli r21, r21, hw1(__per_cpu_offset)
+         bfextu r20, r20, 0, LOG2_THREAD_SIZE-1
+        }
+        shl16insli r21, r21, hw0(__per_cpu_offset)
+        shl3add r20, r20, r21
+        ld      tp, r20
+#else
+        move    tp, zero
+#endif
+
+        /*
+         * If we will be returning to the kernel, we will need to
+         * reset the interrupt masks to the state they had before.
+         * Set DISABLE_IRQ in flags iff we came from PL1 with irqs disabled.
+         */
+        mfspr   r32, SPR_EX_CONTEXT_K_1
+        {
+         andi   r32, r32, SPR_EX_CONTEXT_1_1__PL_MASK  /* mask off ICS */
+         PTREGS_PTR(r21, PTREGS_OFFSET_FLAGS)
+        }
+        beqzt   r32, 1f       /* zero if from user space */
+        IRQS_DISABLED(r32)    /* zero if irqs enabled */
+#if PT_FLAGS_DISABLE_IRQ != 1
+# error Value of IRQS_DISABLED used to set PT_FLAGS_DISABLE_IRQ; fix
+#endif
+1:
+        .ifnc \function,handle_syscall
+        /* Record the fact that we saved the caller-save registers above. */
+        ori     r32, r32, PT_FLAGS_CALLER_SAVES
+        .endif
+        st      r21, r32
+
+#ifdef __COLLECT_LINKER_FEEDBACK__
+        /*
+         * Notify the feedback routines that we were in the
+         * appropriate fixed interrupt vector area.  Note that we
+         * still have ICS set at this point, so we can't invoke any
+         * atomic operations or we will panic.  The feedback
+         * routines internally preserve r0..r10 and r30 up.
+         */
+        .ifnc \function,handle_syscall
+        shli    r20, r1, 5
+        .else
+        moveli  r20, INT_SWINT_1 << 5
+        .endif
+        moveli  r21, hw2_last(intvec_feedback)
+        shl16insli r21, r21, hw1(intvec_feedback)
+        shl16insli r21, r21, hw0(intvec_feedback)
+        add     r20, r20, r21
+        jalr    r20
+
+        /* And now notify the feedback routines that we are here. */
+        FEEDBACK_ENTER(\function)
+#endif
+
+        /*
+         * we've captured enough state to the stack (including in
+         * particular our EX_CONTEXT state) that we can now release
+         * the interrupt critical section and replace it with our
+         * standard "interrupts disabled" mask value.  This allows
+         * synchronous interrupts (and profile interrupts) to punch
+         * through from this point onwards.
+         */
+        .ifc \function,handle_nmi
+        IRQ_DISABLE_ALL(r20)
+        .else
+        IRQ_DISABLE(r20, r21)
+        .endif
+        mtspr   INTERRUPT_CRITICAL_SECTION, zero
+
+        /*
+         * Prepare the first 256 stack bytes to be rapidly accessible
+         * without having to fetch the background data.
+         */
+        addi    r52, sp, -64
+        {
+         wh64   r52
+         addi   r52, r52, -64
+        }
+        {
+         wh64   r52
+         addi   r52, r52, -64
+        }
+        {
+         wh64   r52
+         addi   r52, r52, -64
+        }
+        wh64    r52
+
+#ifdef CONFIG_TRACE_IRQFLAGS
+        .ifnc \function,handle_nmi
+        /*
+         * We finally have enough state set up to notify the irq
+         * tracing code that irqs were disabled on entry to the handler.
+         * The TRACE_IRQS_OFF call clobbers registers r0-r29.
+         * For syscalls, we already have the register state saved away
+         * on the stack, so we don't bother to do any register saves here,
+         * and later we pop the registers back off the kernel stack.
+         * For interrupt handlers, save r0-r3 in callee-saved registers.
+         */
+        .ifnc \function,handle_syscall
+        { move r30, r0; move r31, r1 }
+        { move r32, r2; move r33, r3 }
+        .endif
+        TRACE_IRQS_OFF
+        .ifnc \function,handle_syscall
+        { move r0, r30; move r1, r31 }
+        { move r2, r32; move r3, r33 }
+        .endif
+        .endif
+#endif
+
+        .endm
+
+        /*
+         * Redispatch a downcall.
+         */
+        .macro  dc_dispatch vecnum, vecname
+        .org    (\vecnum << 8)
+intvec_\vecname:
+        j       hv_downcall_dispatch
+        ENDPROC(intvec_\vecname)
+        .endm
+
+        /*
+         * Common code for most interrupts.  The C function we're eventually
+         * going to is in r0, and the faultnum is in r1; the original
+         * values for those registers are on the stack.
+         */
+        .pushsection .text.handle_interrupt,"ax"
+handle_interrupt:
+        finish_interrupt_save handle_interrupt
+
+        /* Jump to the C routine; it should enable irqs as soon as possible. */
+        {
+         jalr   r0
+         PTREGS_PTR(r0, PTREGS_OFFSET_BASE)
+        }
+        FEEDBACK_REENTER(handle_interrupt)
+        {
+         movei  r30, 0   /* not an NMI */
+         j      interrupt_return
+        }
+        STD_ENDPROC(handle_interrupt)
+
+/*
+ * This routine takes a boolean in r30 indicating if this is an NMI.
+ * If so, we also expect a boolean in r31 indicating whether to
+ * re-enable the oprofile interrupts.
+ */
+STD_ENTRY(interrupt_return)
+        /* If we're resuming to kernel space, don't check thread flags. */
+        {
+         bnez   r30, .Lrestore_all  /* NMIs don't special-case user-space */
+         PTREGS_PTR(r29, PTREGS_OFFSET_EX1)
+        }
+        ld      r29, r29
+        andi    r29, r29, SPR_EX_CONTEXT_1_1__PL_MASK  /* mask off ICS */
+        {
+         beqzt  r29, .Lresume_userspace
+         PTREGS_PTR(r29, PTREGS_OFFSET_PC)
+        }
+
+        /* If we're resuming to _cpu_idle_nap, bump PC forward by 8. */
+        moveli  r27, hw2_last(_cpu_idle_nap)
+        {
+         ld     r28, r29
+         shl16insli r27, r27, hw1(_cpu_idle_nap)
+        }
+        {
+         shl16insli r27, r27, hw0(_cpu_idle_nap)
+        }
+        {
+         cmpeq  r27, r27, r28
+        }
+        {
+         blbc   r27, .Lrestore_all
+         addi   r28, r28, 8
+        }
+        st      r29, r28
+        j       .Lrestore_all
+
+.Lresume_userspace:
+        FEEDBACK_REENTER(interrupt_return)
+
+        /*
+         * Disable interrupts so as to make sure we don't
+         * miss an interrupt that sets any of the thread flags (like
+         * need_resched or sigpending) between sampling and the iret.
+         * Routines like schedule() or do_signal() may re-enable
+         * interrupts before returning.
+         */
+        IRQ_DISABLE(r20, r21)
+        TRACE_IRQS_OFF  /* Note: clobbers registers r0-r29 */
+
+        /* Get base of stack in r32; note r30/31 are used as arguments here. */
+        GET_THREAD_INFO(r32)
+
+
+        /* Check to see if there is any work to do before returning to user. */
+        {
+         addi   r29, r32, THREAD_INFO_FLAGS_OFFSET
+         moveli r1, hw1_last(_TIF_ALLWORK_MASK)
+        }
+        {
+         ld     r29, r29
+         shl16insli r1, r1, hw0(_TIF_ALLWORK_MASK)
+        }
+        and     r1, r29, r1
+        beqzt   r1, .Lrestore_all
+
+        /*
+         * Make sure we have all the registers saved for signal
+         * handling or single-step.  Call out to C code to figure out
+         * exactly what we need to do for each flag bit, then if
+         * necessary, reload the flags and recheck.
+         */
+        push_extra_callee_saves r0
+        {
+         PTREGS_PTR(r0, PTREGS_OFFSET_BASE)
+         jal    do_work_pending
+        }
+        bnez    r0, .Lresume_userspace
+
+        /*
+         * In the NMI case we
+         * omit the call to single_process_check_nohz, which normally checks
+         * to see if we should start or stop the scheduler tick, because
+         * we can't call arbitrary Linux code from an NMI context.
+         * We always call the homecache TLB deferral code to re-trigger
+         * the deferral mechanism.
+         *
+         * The other chunk of responsibility this code has is to reset the
+         * interrupt masks appropriately to reset irqs and NMIs.  We have
+         * to call TRACE_IRQS_OFF and TRACE_IRQS_ON to support all the
+         * lockdep-type stuff, but we can't set ICS until afterwards, since
+         * ICS can only be used in very tight chunks of code to avoid
+         * tripping over various assertions that it is off.
+         */
+.Lrestore_all:
+        PTREGS_PTR(r0, PTREGS_OFFSET_EX1)
+        {
+         ld      r0, r0
+         PTREGS_PTR(r32, PTREGS_OFFSET_FLAGS)
+        }
+        {
+         andi   r0, r0, SPR_EX_CONTEXT_1_1__PL_MASK
+         ld     r32, r32
+        }
+        bnez    r0, 1f
+        j       2f
+#if PT_FLAGS_DISABLE_IRQ != 1
+# error Assuming PT_FLAGS_DISABLE_IRQ == 1 so we can use blbct below
+#endif
+1:      blbct   r32, 2f
+        IRQ_DISABLE(r20,r21)
+        TRACE_IRQS_OFF
+        movei   r0, 1
+        mtspr   INTERRUPT_CRITICAL_SECTION, r0
+        beqzt   r30, .Lrestore_regs
+        j       3f
+2:      TRACE_IRQS_ON
+        movei   r0, 1
+        mtspr   INTERRUPT_CRITICAL_SECTION, r0
+        IRQ_ENABLE(r20, r21)
+        beqzt   r30, .Lrestore_regs
+3:
+
+
+        /*
+         * We now commit to returning from this interrupt, since we will be
+         * doing things like setting EX_CONTEXT SPRs and unwinding the stack
+         * frame.  No calls should be made to any other code after this point.
+         * This code should only be entered with ICS set.
+         * r32 must still be set to ptregs.flags.
+         * We launch loads to each cache line separately first, so we can
+         * get some parallelism out of the memory subsystem.
+         * We start zeroing caller-saved registers throughout, since
+         * that will save some cycles if this turns out to be a syscall.
+         */
+.Lrestore_regs:
+        FEEDBACK_REENTER(interrupt_return)   /* called from elsewhere */
+
+        /*
+         * Rotate so we have one high bit and one low bit to test.
+         * - low bit says whether to restore all the callee-saved registers,
+         *   or just r30-r33, and r52 up.
+         * - high bit (i.e. sign bit) says whether to restore all the
+         *   caller-saved registers, or just r0.
+         */
+#if PT_FLAGS_CALLER_SAVES != 2 || PT_FLAGS_RESTORE_REGS != 4
+# error Rotate trick does not work :-)
+#endif
+        {
+         rotli  r20, r32, 62
+         PTREGS_PTR(sp, PTREGS_OFFSET_REG(0))
+        }
+
+        /*
+         * Load cache lines 0, 4, 6 and 7, in that order, then use
+         * the last loaded value, which makes it likely that the other
+         * cache lines have also loaded, at which point we should be
+         * able to safely read all the remaining words on those cache
+         * lines without waiting for the memory subsystem.
+         */
+        pop_reg r0, sp, PTREGS_OFFSET_REG(30) - PTREGS_OFFSET_REG(0)
+        pop_reg r30, sp, PTREGS_OFFSET_REG(52) - PTREGS_OFFSET_REG(30)
+        pop_reg_zero r52, r3, sp, PTREGS_OFFSET_CMPEXCH - PTREGS_OFFSET_REG(52)
+        pop_reg_zero r21, r27, sp, PTREGS_OFFSET_EX1 - PTREGS_OFFSET_CMPEXCH
+        pop_reg_zero lr, r2, sp, PTREGS_OFFSET_PC - PTREGS_OFFSET_EX1
+        {
+         mtspr  CMPEXCH_VALUE, r21
+         move   r4, zero
+        }
+        pop_reg r21, sp, PTREGS_OFFSET_REG(31) - PTREGS_OFFSET_PC
+        {
+         mtspr  SPR_EX_CONTEXT_K_1, lr
+         andi   lr, lr, SPR_EX_CONTEXT_1_1__PL_MASK  /* mask off ICS */
+        }
+        {
+         mtspr  SPR_EX_CONTEXT_K_0, r21
+         move   r5, zero
+        }
+
+        /* Restore callee-saveds that we actually use. */
+        pop_reg_zero r31, r6
+        pop_reg_zero r32, r7
+        pop_reg_zero r33, r8, sp, PTREGS_OFFSET_REG(29) - PTREGS_OFFSET_REG(33)
+
+        /*
+         * If we modified other callee-saveds, restore them now.
+         * This is rare, but could be via ptrace or signal handler.
+         */
+        {
+         move   r9, zero
+         blbs   r20, .Lrestore_callees
+        }
+.Lcontinue_restore_regs:
+
+        /* Check if we're returning from a syscall. */
+        {
+         move   r10, zero
+         bltzt  r20, 1f  /* no, so go restore callee-save registers */
+        }
+
+        /*
+         * Check if we're returning to userspace.
+         * Note that if we're not, we don't worry about zeroing everything.
+         */
+        {
+         addli  sp, sp, PTREGS_OFFSET_LR - PTREGS_OFFSET_REG(29)
+         bnez   lr, .Lkernel_return
+        }
+
+        /*
+         * On return from syscall, we've restored r0 from pt_regs, but we
+         * clear the remainder of the caller-saved registers.  We could
+         * restore the syscall arguments, but there's not much point,
+         * and it ensures user programs aren't trying to use the
+         * caller-saves if we clear them, as well as avoiding leaking
+         * kernel pointers into userspace.
+         */
+        pop_reg_zero lr, r11, sp, PTREGS_OFFSET_TP - PTREGS_OFFSET_LR
+        pop_reg_zero tp, r12, sp, PTREGS_OFFSET_SP - PTREGS_OFFSET_TP
+        {
+         ld     sp, sp
+         move   r13, zero
+         move   r14, zero
+        }
+        { move r15, zero; move r16, zero }
+        { move r17, zero; move r18, zero }
+        { move r19, zero; move r20, zero }
+        { move r21, zero; move r22, zero }
+        { move r23, zero; move r24, zero }
+        { move r25, zero; move r26, zero }
+
+        /* Set r1 to errno if we are returning an error, otherwise zero. */
+        {
+         moveli r29, 4096
+         sub    r1, zero, r0
+        }
+        {
+         move   r28, zero
+         cmpltu r29, r1, r29
+        }
+        {
+         mnz    r1, r29, r1
+         move   r29, zero
+        }
+        iret
+
+        /*
+         * Not a syscall, so restore caller-saved registers.
+         * First kick off loads for cache lines 1-3, which we're touching
+         * for the first time here.
+         */
+        .align 64
+1:      pop_reg r29, sp, PTREGS_OFFSET_REG(21) - PTREGS_OFFSET_REG(29)
+        pop_reg r21, sp, PTREGS_OFFSET_REG(13) - PTREGS_OFFSET_REG(21)
+        pop_reg r13, sp, PTREGS_OFFSET_REG(1) - PTREGS_OFFSET_REG(13)
+        pop_reg r1
+        pop_reg r2
+        pop_reg r3
+        pop_reg r4
+        pop_reg r5
+        pop_reg r6
+        pop_reg r7
+        pop_reg r8
+        pop_reg r9
+        pop_reg r10
+        pop_reg r11
+        pop_reg r12, sp, 16
+        /* r13 already restored above */
+        pop_reg r14
+        pop_reg r15
+        pop_reg r16
+        pop_reg r17
+        pop_reg r18
+        pop_reg r19
+        pop_reg r20, sp, 16
+        /* r21 already restored above */
+        pop_reg r22
+        pop_reg r23
+        pop_reg r24
+        pop_reg r25
+        pop_reg r26
+        pop_reg r27
+        pop_reg r28, sp, PTREGS_OFFSET_LR - PTREGS_OFFSET_REG(28)
+        /* r29 already restored above */
+        bnez    lr, .Lkernel_return
+        pop_reg lr, sp, PTREGS_OFFSET_TP - PTREGS_OFFSET_LR
+        pop_reg tp, sp, PTREGS_OFFSET_SP - PTREGS_OFFSET_TP
+        ld      sp, sp
+        iret
+
+        /*
+         * We can't restore tp when in kernel mode, since a thread might
+         * have migrated from another cpu and brought a stale tp value.
+         */
+.Lkernel_return:
+        pop_reg lr, sp, PTREGS_OFFSET_SP - PTREGS_OFFSET_LR
+        ld      sp, sp
+        iret
+
+        /* Restore callee-saved registers from r34 to r51. */
+.Lrestore_callees:
+        addli  sp, sp, PTREGS_OFFSET_REG(34) - PTREGS_OFFSET_REG(29)
+        pop_reg r34
+        pop_reg r35
+        pop_reg r36
+        pop_reg r37
+        pop_reg r38
+        pop_reg r39
+        pop_reg r40
+        pop_reg r41
+        pop_reg r42
+        pop_reg r43
+        pop_reg r44
+        pop_reg r45
+        pop_reg r46
+        pop_reg r47
+        pop_reg r48
+        pop_reg r49
+        pop_reg r50
+        pop_reg r51, sp, PTREGS_OFFSET_REG(29) - PTREGS_OFFSET_REG(51)
+        j .Lcontinue_restore_regs
+        STD_ENDPROC(interrupt_return)
+
+        /*
+         * "NMI" interrupts mask ALL interrupts before calling the
+         * handler, and don't check thread flags, etc., on the way
+         * back out.  In general, the only things we do here for NMIs
+         * are register save/restore and dataplane kernel-TLB management.
+         * We don't (for example) deal with start/stop of the sched tick.
+         */
+        .pushsection .text.handle_nmi,"ax"
+handle_nmi:
+        finish_interrupt_save handle_nmi
+        {
+         jalr   r0
+         PTREGS_PTR(r0, PTREGS_OFFSET_BASE)
+        }
+        FEEDBACK_REENTER(handle_nmi)
+        {
+         movei  r30, 1
+         move   r31, r0
+        }
+        j       interrupt_return
+        STD_ENDPROC(handle_nmi)
+
+        /*
+         * Parallel code for syscalls to handle_interrupt.
+         */
+        .pushsection .text.handle_syscall,"ax"
+handle_syscall:
+        finish_interrupt_save handle_syscall
+
+        /* Enable irqs. */
+        TRACE_IRQS_ON
+        IRQ_ENABLE(r20, r21)
+
+        /* Bump the counter for syscalls made on this tile. */
+        moveli r20, hw2_last(irq_stat + IRQ_CPUSTAT_SYSCALL_COUNT_OFFSET)
+        shl16insli r20, r20, hw1(irq_stat + IRQ_CPUSTAT_SYSCALL_COUNT_OFFSET)
+        shl16insli r20, r20, hw0(irq_stat + IRQ_CPUSTAT_SYSCALL_COUNT_OFFSET)
+        add     r20, r20, tp
+        ld4s    r21, r20
+        addi    r21, r21, 1
+        st4     r20, r21
+
+        /* Trace syscalls, if requested. */
+        GET_THREAD_INFO(r31)
+        addi    r31, r31, THREAD_INFO_FLAGS_OFFSET
+        ld      r30, r31
+        andi    r30, r30, _TIF_SYSCALL_TRACE
+        {
+         addi   r30, r31, THREAD_INFO_STATUS_OFFSET - THREAD_INFO_FLAGS_OFFSET
+         beqzt  r30, .Lrestore_syscall_regs
+        }
+        jal     do_syscall_trace
+        FEEDBACK_REENTER(handle_syscall)
+
+        /*
+         * We always reload our registers from the stack at this
+         * point.  They might be valid, if we didn't build with
+         * TRACE_IRQFLAGS, and this isn't a dataplane tile, and we're not
+         * doing syscall tracing, but there are enough cases now that it
+         * seems simplest just to do the reload unconditionally.
+         */
+.Lrestore_syscall_regs:
+        {
+         ld     r30, r30
+         PTREGS_PTR(r11, PTREGS_OFFSET_REG(0))
+        }
+        pop_reg r0,  r11
+        pop_reg r1,  r11
+        pop_reg r2,  r11
+        pop_reg r3,  r11
+        pop_reg r4,  r11
+        pop_reg r5,  r11, PTREGS_OFFSET_SYSCALL - PTREGS_OFFSET_REG(5)
+        {
+         ld     TREG_SYSCALL_NR_NAME, r11
+         moveli r21, __NR_syscalls
+        }
+
+        /* Ensure that the syscall number is within the legal range. */
+        {
+         moveli r20, hw2(sys_call_table)
+         blbs   r30, .Lcompat_syscall
+        }
+        {
+         cmpltu r21, TREG_SYSCALL_NR_NAME, r21
+         shl16insli r20, r20, hw1(sys_call_table)
+        }
+        {
+         blbc   r21, .Linvalid_syscall
+         shl16insli r20, r20, hw0(sys_call_table)
+        }
+.Lload_syscall_pointer:
+        shl3add r20, TREG_SYSCALL_NR_NAME, r20
+        ld      r20, r20
+
+        /* Jump to syscall handler. */
+        jalr    r20
+.Lhandle_syscall_link: /* value of "lr" after "jalr r20" above */
+
+        /*
+         * Write our r0 onto the stack so it gets restored instead
+         * of whatever the user had there before.
+         * In compat mode, sign-extend r0 before storing it.
+         */
+        {
+         PTREGS_PTR(r29, PTREGS_OFFSET_REG(0))
+         blbct  r30, 1f
+        }
+        addxi   r0, r0, 0
+1:      st      r29, r0
+
+.Lsyscall_sigreturn_skip:
+        FEEDBACK_REENTER(handle_syscall)
+
+        /* Do syscall trace again, if requested. */
+        ld      r30, r31
+        andi    r30, r30, _TIF_SYSCALL_TRACE
+        beqzt   r30, 1f
+        jal     do_syscall_trace
+        FEEDBACK_REENTER(handle_syscall)
+1:      j       .Lresume_userspace   /* jump into middle of interrupt_return */
+
+.Lcompat_syscall:
+        /*
+         * Load the base of the compat syscall table in r20, and
+         * range-check the syscall number (duplicated from 64-bit path).
+         * Sign-extend all the user's passed arguments to make them consistent.
+         * Also save the original "r(n)" values away in "r(11+n)" in
+         * case the syscall table entry wants to validate them.
+         */
+        moveli  r20, hw2(compat_sys_call_table)
+        {
+         cmpltu r21, TREG_SYSCALL_NR_NAME, r21
+         shl16insli r20, r20, hw1(compat_sys_call_table)
+        }
+        {
+         blbc   r21, .Linvalid_syscall
+         shl16insli r20, r20, hw0(compat_sys_call_table)
+        }
+        { move r11, r0; addxi r0, r0, 0 }
+        { move r12, r1; addxi r1, r1, 0 }
+        { move r13, r2; addxi r2, r2, 0 }
+        { move r14, r3; addxi r3, r3, 0 }
+        { move r15, r4; addxi r4, r4, 0 }
+        { move r16, r5; addxi r5, r5, 0 }
+        j .Lload_syscall_pointer
+
+.Linvalid_syscall:
+        /* Report an invalid syscall back to the user program */
+        {
+         PTREGS_PTR(r29, PTREGS_OFFSET_REG(0))
+         movei  r28, -ENOSYS
+        }
+        st      r29, r28
+        j       .Lresume_userspace   /* jump into middle of interrupt_return */
+        STD_ENDPROC(handle_syscall)
+
+        /* Return the address for oprofile to suppress in backtraces. */
+STD_ENTRY_SECTION(handle_syscall_link_address, .text.handle_syscall)
+        lnk     r0
+        {
+         addli  r0, r0, .Lhandle_syscall_link - .
+         jrp    lr
+        }
+        STD_ENDPROC(handle_syscall_link_address)
+
+STD_ENTRY(ret_from_fork)
+        jal     sim_notify_fork
+        jal     schedule_tail
+        FEEDBACK_REENTER(ret_from_fork)
+        j       .Lresume_userspace
+        STD_ENDPROC(ret_from_fork)
+
+/* Various stub interrupt handlers and syscall handlers */
+
+STD_ENTRY_LOCAL(_kernel_double_fault)
+        mfspr   r1, SPR_EX_CONTEXT_K_0
+        move    r2, lr
+        move    r3, sp
+        move    r4, r52
+        addi    sp, sp, -C_ABI_SAVE_AREA_SIZE
+        j       kernel_double_fault
+        STD_ENDPROC(_kernel_double_fault)
+
+STD_ENTRY_LOCAL(bad_intr)
+        mfspr   r2, SPR_EX_CONTEXT_K_0
+        panic   "Unhandled interrupt %#x: PC %#lx"
+        STD_ENDPROC(bad_intr)
+
+/* Put address of pt_regs in reg and jump. */
+#define PTREGS_SYSCALL(x, reg)                          \
+        STD_ENTRY(_##x);                                \
+        {                                               \
+         PTREGS_PTR(reg, PTREGS_OFFSET_BASE);           \
+         j      x                                       \
+        };                                              \
+        STD_ENDPROC(_##x)
+
+/*
+ * Special-case sigreturn to not write r0 to the stack on return.
+ * This is technically more efficient, but it also avoids difficulties
+ * in the 64-bit OS when handling 32-bit compat code, since we must not
+ * sign-extend r0 for the sigreturn return-value case.
+ */
+#define PTREGS_SYSCALL_SIGRETURN(x, reg)                \
+        STD_ENTRY(_##x);                                \
+        addli   lr, lr, .Lsyscall_sigreturn_skip - .Lhandle_syscall_link; \
+        {                                               \
+         PTREGS_PTR(reg, PTREGS_OFFSET_BASE);           \
+         j      x                                       \
+        };                                              \
+        STD_ENDPROC(_##x)
+
+PTREGS_SYSCALL(sys_execve, r3)
+PTREGS_SYSCALL(sys_sigaltstack, r2)
+PTREGS_SYSCALL_SIGRETURN(sys_rt_sigreturn, r0)
+#ifdef CONFIG_COMPAT
+PTREGS_SYSCALL(compat_sys_execve, r3)
+PTREGS_SYSCALL(compat_sys_sigaltstack, r2)
+PTREGS_SYSCALL_SIGRETURN(compat_sys_rt_sigreturn, r0)
+#endif
+
+/* Save additional callee-saves to pt_regs, put address in r4 and jump. */
+STD_ENTRY(_sys_clone)
+        push_extra_callee_saves r4
+        j       sys_clone
+        STD_ENDPROC(_sys_clone)
+
+/* The single-step support may need to read all the registers. */
+int_unalign:
+        push_extra_callee_saves r0
+        j       do_trap
+
+/* Include .intrpt1 array of interrupt vectors */
+        .section ".intrpt1", "ax"
+
+#define op_handle_perf_interrupt bad_intr
+#define op_handle_aux_perf_interrupt bad_intr
+
+#ifndef CONFIG_HARDWALL
+#define do_hardwall_trap bad_intr
+#endif
+
+        int_hand     INT_MEM_ERROR, MEM_ERROR, bad_intr
+        int_hand     INT_SINGLE_STEP_3, SINGLE_STEP_3, bad_intr
+#if CONFIG_KERNEL_PL == 2
+        int_hand     INT_SINGLE_STEP_2, SINGLE_STEP_2, gx_singlestep_handle
+        int_hand     INT_SINGLE_STEP_1, SINGLE_STEP_1, bad_intr
+#else
+        int_hand     INT_SINGLE_STEP_2, SINGLE_STEP_2, bad_intr
+        int_hand     INT_SINGLE_STEP_1, SINGLE_STEP_1, gx_singlestep_handle
+#endif
+        int_hand     INT_SINGLE_STEP_0, SINGLE_STEP_0, bad_intr
+        int_hand     INT_IDN_COMPLETE, IDN_COMPLETE, bad_intr
+        int_hand     INT_UDN_COMPLETE, UDN_COMPLETE, bad_intr
+        int_hand     INT_ITLB_MISS, ITLB_MISS, do_page_fault
+        int_hand     INT_ILL, ILL, do_trap
+        int_hand     INT_GPV, GPV, do_trap
+        int_hand     INT_IDN_ACCESS, IDN_ACCESS, do_trap
+        int_hand     INT_UDN_ACCESS, UDN_ACCESS, do_trap
+        int_hand     INT_SWINT_3, SWINT_3, do_trap
+        int_hand     INT_SWINT_2, SWINT_2, do_trap
+        int_hand     INT_SWINT_1, SWINT_1, SYSCALL, handle_syscall
+        int_hand     INT_SWINT_0, SWINT_0, do_trap
+        int_hand     INT_ILL_TRANS, ILL_TRANS, do_trap
+        int_hand     INT_UNALIGN_DATA, UNALIGN_DATA, int_unalign
+        int_hand     INT_DTLB_MISS, DTLB_MISS, do_page_fault
+        int_hand     INT_DTLB_ACCESS, DTLB_ACCESS, do_page_fault
+        int_hand     INT_IDN_FIREWALL, IDN_FIREWALL, bad_intr
+        int_hand     INT_UDN_FIREWALL, UDN_FIREWALL, do_hardwall_trap
+        int_hand     INT_TILE_TIMER, TILE_TIMER, do_timer_interrupt
+        int_hand     INT_IDN_TIMER, IDN_TIMER, bad_intr
+        int_hand     INT_UDN_TIMER, UDN_TIMER, bad_intr
+        int_hand     INT_IDN_AVAIL, IDN_AVAIL, bad_intr
+        int_hand     INT_UDN_AVAIL, UDN_AVAIL, bad_intr
+        int_hand     INT_IPI_3, IPI_3, bad_intr
+#if CONFIG_KERNEL_PL == 2
+        int_hand     INT_IPI_2, IPI_2, tile_dev_intr
+        int_hand     INT_IPI_1, IPI_1, bad_intr
+#else
+        int_hand     INT_IPI_2, IPI_2, bad_intr
+        int_hand     INT_IPI_1, IPI_1, tile_dev_intr
+#endif
+        int_hand     INT_IPI_0, IPI_0, bad_intr
+        int_hand     INT_PERF_COUNT, PERF_COUNT, \
+                     op_handle_perf_interrupt, handle_nmi
+        int_hand     INT_AUX_PERF_COUNT, AUX_PERF_COUNT, \
+                     op_handle_perf_interrupt, handle_nmi
+        int_hand     INT_INTCTRL_3, INTCTRL_3, bad_intr
+#if CONFIG_KERNEL_PL == 2
+        dc_dispatch  INT_INTCTRL_2, INTCTRL_2
+        int_hand     INT_INTCTRL_1, INTCTRL_1, bad_intr
+#else
+        int_hand     INT_INTCTRL_2, INTCTRL_2, bad_intr
+        dc_dispatch  INT_INTCTRL_1, INTCTRL_1
+#endif
+        int_hand     INT_INTCTRL_0, INTCTRL_0, bad_intr
+        int_hand     INT_MESSAGE_RCV_DWNCL, MESSAGE_RCV_DWNCL, \
+                     hv_message_intr
+        int_hand     INT_DEV_INTR_DWNCL, DEV_INTR_DWNCL, bad_intr
+        int_hand     INT_I_ASID, I_ASID, bad_intr
+        int_hand     INT_D_ASID, D_ASID, bad_intr
+        int_hand     INT_DOUBLE_FAULT, DOUBLE_FAULT, do_trap
+
+        /* Synthetic interrupt delivered only by the simulator */
+        int_hand     INT_BREAKPOINT, BREAKPOINT, do_breakpoint
diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c
index e2ab82b7c7e7..f68df69f1f67 100644
--- a/arch/tile/kernel/module.c
+++ b/arch/tile/kernel/module.c
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <asm/opcode-tile.h>
 #include <asm/pgtable.h>
+#include <asm/homecache.h>
 
 #ifdef __tilegx__
 # define Elf_Rela Elf64_Rela
@@ -86,8 +87,13 @@ error:
 void module_free(struct module *mod, void *module_region)
 {
         vfree(module_region);
+
+        /* Globally flush the L1 icache. */
+        flush_remote(0, HV_FLUSH_EVICT_L1I, cpu_online_mask,
+                     0, 0, 0, NULL, NULL, 0);
+
         /*
-         * FIXME: If module_region == mod->init_region, trim exception
+         * FIXME: If module_region == mod->module_init, trim exception
          * table entries.
          */
 }
diff --git a/arch/tile/kernel/pci-dma.c b/arch/tile/kernel/pci-dma.c
index 658752b2835e..658f2ce426a4 100644
--- a/arch/tile/kernel/pci-dma.c
+++ b/arch/tile/kernel/pci-dma.c
@@ -244,7 +244,7 @@ EXPORT_SYMBOL(dma_sync_single_range_for_device);
  * dma_alloc_noncoherent() returns non-cacheable memory, so there's no
  * need to do any flushing here.
  */
-void dma_cache_sync(void *vaddr, size_t size,
+void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                     enum dma_data_direction direction)
 {
 }
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index ea38f0c9ec7c..6d4cb5d7a9fd 100644
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Tilera Corporation. All Rights Reserved.
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public License
@@ -59,6 +59,7 @@ int __write_once tile_plx_gen1;
 
 static struct pci_controller controllers[TILE_NUM_PCIE];
 static int num_controllers;
+static int pci_scan_flags[TILE_NUM_PCIE];
 
 static struct pci_ops tile_cfg_ops;
 
@@ -79,7 +80,7 @@ EXPORT_SYMBOL(pcibios_align_resource);
  * controller_id is the controller number, config type is 0 or 1 for
  * config0 or config1 operations.
  */
-static int __init tile_pcie_open(int controller_id, int config_type)
+static int __devinit tile_pcie_open(int controller_id, int config_type)
 {
         char filename[32];
         int fd;
@@ -95,7 +96,7 @@ static int __init tile_pcie_open(int controller_id, int config_type)
 /*
  * Get the IRQ numbers from the HV and set up the handlers for them.
  */
-static int __init tile_init_irqs(int controller_id,
+static int __devinit tile_init_irqs(int controller_id,
                                  struct pci_controller *controller)
 {
         char filename[32];
@@ -139,71 +140,74 @@ static int __init tile_init_irqs(int controller_id,
  *
  * Returns the number of controllers discovered.
  */
-int __init tile_pci_init(void)
+int __devinit tile_pci_init(void)
 {
         int i;
 
         pr_info("PCI: Searching for controllers...\n");
 
+        /* Re-init number of PCIe controllers to support hot-plug feature. */
+        num_controllers = 0;
+
         /* Do any configuration we need before using the PCIe */
 
         for (i = 0; i < TILE_NUM_PCIE; i++) {
-                int hv_cfg_fd0 = -1;
-                int hv_cfg_fd1 = -1;
-                int hv_mem_fd = -1;
-                char name[32];
-                struct pci_controller *controller;
-
                 /*
-                 * Open the fd to the HV.  If it fails then this
-                 * device doesn't exist.
+                 * To see whether we need a real config op based on
+                 * the results of pcibios_init(), to support PCIe hot-plug.
                  */
-                hv_cfg_fd0 = tile_pcie_open(i, 0);
-                if (hv_cfg_fd0 < 0)
-                        continue;
-                hv_cfg_fd1 = tile_pcie_open(i, 1);
-                if (hv_cfg_fd1 < 0) {
-                        pr_err("PCI: Couldn't open config fd to HV "
-                            "for controller %d\n", i);
-                        goto err_cont;
-                }
-
-                sprintf(name, "pcie/%d/mem", i);
-                hv_mem_fd = hv_dev_open((HV_VirtAddr)name, 0);
-                if (hv_mem_fd < 0) {
-                        pr_err("PCI: Could not open mem fd to HV!\n");
-                        goto err_cont;
-                }
+                if (pci_scan_flags[i] == 0) {
+                        int hv_cfg_fd0 = -1;
+                        int hv_cfg_fd1 = -1;
+                        int hv_mem_fd = -1;
+                        char name[32];
+                        struct pci_controller *controller;
+
+                        /*
+                         * Open the fd to the HV.  If it fails then this
+                         * device doesn't exist.
+                         */
+                        hv_cfg_fd0 = tile_pcie_open(i, 0);
+                        if (hv_cfg_fd0 < 0)
+                                continue;
+                        hv_cfg_fd1 = tile_pcie_open(i, 1);
+                        if (hv_cfg_fd1 < 0) {
+                                pr_err("PCI: Couldn't open config fd to HV "
+                                    "for controller %d\n", i);
+                                goto err_cont;
+                        }
 
-                pr_info("PCI: Found PCI controller #%d\n", i);
+                        sprintf(name, "pcie/%d/mem", i);
+                        hv_mem_fd = hv_dev_open((HV_VirtAddr)name, 0);
+                        if (hv_mem_fd < 0) {
+                                pr_err("PCI: Could not open mem fd to HV!\n");
+                                goto err_cont;
+                        }
 
-                controller = &controllers[num_controllers];
+                        pr_info("PCI: Found PCI controller #%d\n", i);
 
-                if (tile_init_irqs(i, controller)) {
-                        pr_err("PCI: Could not initialize "
-                               "IRQs, aborting.\n");
-                        goto err_cont;
-                }
+                        controller = &controllers[i];
 
-                controller->index = num_controllers;
-                controller->hv_cfg_fd[0] = hv_cfg_fd0;
-                controller->hv_cfg_fd[1] = hv_cfg_fd1;
-                controller->hv_mem_fd = hv_mem_fd;
-                controller->first_busno = 0;
-                controller->last_busno = 0xff;
-                controller->ops = &tile_cfg_ops;
+                        controller->index = i;
+                        controller->hv_cfg_fd[0] = hv_cfg_fd0;
+                        controller->hv_cfg_fd[1] = hv_cfg_fd1;
+                        controller->hv_mem_fd = hv_mem_fd;
+                        controller->first_busno = 0;
+                        controller->last_busno = 0xff;
+                        controller->ops = &tile_cfg_ops;
 
-                num_controllers++;
-                continue;
+                        num_controllers++;
+                        continue;
 
 err_cont:
-                if (hv_cfg_fd0 >= 0)
-                        hv_dev_close(hv_cfg_fd0);
-                if (hv_cfg_fd1 >= 0)
-                        hv_dev_close(hv_cfg_fd1);
-                if (hv_mem_fd >= 0)
-                        hv_dev_close(hv_mem_fd);
-                continue;
+                        if (hv_cfg_fd0 >= 0)
+                                hv_dev_close(hv_cfg_fd0);
+                        if (hv_cfg_fd1 >= 0)
+                                hv_dev_close(hv_cfg_fd1);
+                        if (hv_mem_fd >= 0)
+                                hv_dev_close(hv_mem_fd);
+                        continue;
+                }
         }
 
         /*
@@ -232,7 +236,7 @@ static int tile_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 }
 
 
-static void __init fixup_read_and_payload_sizes(void)
+static void __devinit fixup_read_and_payload_sizes(void)
 {
         struct pci_dev *dev = NULL;
         int smallest_max_payload = 0x1; /* Tile maxes out at 256 bytes. */
@@ -282,7 +286,7 @@ static void __init fixup_read_and_payload_sizes(void)
  * The controllers have been set up by the time we get here, by a call to
  * tile_pci_init.
  */
-static int __init pcibios_init(void)
+int __devinit pcibios_init(void)
 {
         int i;
 
@@ -296,25 +300,36 @@ static int __init pcibios_init(void)
         mdelay(250);
 
         /* Scan all of the recorded PCI controllers.  */
-        for (i = 0; i < num_controllers; i++) {
-                struct pci_controller *controller = &controllers[i];
-                struct pci_bus *bus;
-
-                pr_info("PCI: initializing controller #%d\n", i);
-
+        for (i = 0; i < TILE_NUM_PCIE; i++) {
                 /*
-                 * This comes from the generic Linux PCI driver.
-                 *
-                 * It reads the PCI tree for this bus into the Linux
-                 * data structures.
-                 *
-                 * This is inlined in linux/pci.h and calls into
-                 * pci_scan_bus_parented() in probe.c.
+                 * Do real pcibios init ops if the controller is initialized
+                 * by tile_pci_init() successfully and not initialized by
+                 * pcibios_init() yet to support PCIe hot-plug.
                  */
-                bus = pci_scan_bus(0, controller->ops, controller);
-                controller->root_bus = bus;
-                controller->last_busno = bus->subordinate;
+                if (pci_scan_flags[i] == 0 && controllers[i].ops != NULL) {
+                        struct pci_controller *controller = &controllers[i];
+                        struct pci_bus *bus;
 
+                        if (tile_init_irqs(i, controller)) {
+                                pr_err("PCI: Could not initialize IRQs\n");
+                                continue;
+                        }
+
+                        pr_info("PCI: initializing controller #%d\n", i);
+
+                        /*
+                         * This comes from the generic Linux PCI driver.
+                         *
+                         * It reads the PCI tree for this bus into the Linux
+                         * data structures.
+                         *
+                         * This is inlined in linux/pci.h and calls into
+                         * pci_scan_bus_parented() in probe.c.
+                         */
+                        bus = pci_scan_bus(0, controller->ops, controller);
+                        controller->root_bus = bus;
+                        controller->last_busno = bus->subordinate;
+                }
         }
 
         /* Do machine dependent PCI interrupt routing */
@@ -326,34 +341,45 @@ static int __init pcibios_init(void)
          * It allocates all of the resources (I/O memory, etc)
          * associated with the devices read in above.
          */
-
         pci_assign_unassigned_resources();
 
         /* Configure the max_read_size and max_payload_size values. */
         fixup_read_and_payload_sizes();
 
         /* Record the I/O resources in the PCI controller structure. */
-        for (i = 0; i < num_controllers; i++) {
-                struct pci_bus *root_bus = controllers[i].root_bus;
-                struct pci_bus *next_bus;
-                struct pci_dev *dev;
-
-                list_for_each_entry(dev, &root_bus->devices, bus_list) {
-                        /* Find the PCI host controller, ie. the 1st bridge. */
-                        if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI &&
-                                (PCI_SLOT(dev->devfn) == 0)) {
-                                next_bus = dev->subordinate;
-                                controllers[i].mem_resources[0] =
-                                        *next_bus->resource[0];
-                                controllers[i].mem_resources[1] =
-                                         *next_bus->resource[1];
-                                controllers[i].mem_resources[2] =
-                                         *next_bus->resource[2];
-
-                                break;
+        for (i = 0; i < TILE_NUM_PCIE; i++) {
+                /*
+                 * Do real pcibios init ops if the controller is initialized
+                 * by tile_pci_init() successfully and not initialized by
+                 * pcibios_init() yet to support PCIe hot-plug.
+                 */
+                if (pci_scan_flags[i] == 0 && controllers[i].ops != NULL) {
+                        struct pci_bus *root_bus = controllers[i].root_bus;
+                        struct pci_bus *next_bus;
+                        struct pci_dev *dev;
+
+                        list_for_each_entry(dev, &root_bus->devices, bus_list) {
+                                /*
+                                 * Find the PCI host controller, ie. the 1st
+                                 * bridge.
+                                 */
+                                if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI &&
+                                        (PCI_SLOT(dev->devfn) == 0)) {
+                                        next_bus = dev->subordinate;
+                                        controllers[i].mem_resources[0] =
+                                                *next_bus->resource[0];
+                                        controllers[i].mem_resources[1] =
+                                                 *next_bus->resource[1];
+                                        controllers[i].mem_resources[2] =
+                                                 *next_bus->resource[2];
+
+                                        /* Setup flags. */
+                                        pci_scan_flags[i] = 1;
+
+                                        break;
+                                }
                         }
                 }
-
         }
 
         return 0;
@@ -381,7 +407,7 @@ char __devinit *pcibios_setup(char *str)
 /*
  * This is called from the generic Linux layer.
  */
-void __init pcibios_update_irq(struct pci_dev *dev, int irq)
+void __devinit pcibios_update_irq(struct pci_dev *dev, int irq)
 {
         pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
 }
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c
index d0065103eb7b..9c45d8bbdf57 100644
--- a/arch/tile/kernel/process.c
+++ b/arch/tile/kernel/process.c
@@ -25,10 +25,13 @@
 #include <linux/hardirq.h>
 #include <linux/syscalls.h>
 #include <linux/kernel.h>
+#include <linux/tracehook.h>
+#include <linux/signal.h>
 #include <asm/system.h>
 #include <asm/stack.h>
 #include <asm/homecache.h>
 #include <asm/syscalls.h>
+#include <asm/traps.h>
 #ifdef CONFIG_HARDWALL
 #include <asm/hardwall.h>
 #endif
@@ -546,6 +549,51 @@ struct task_struct *__sched _switch_to(struct task_struct *prev,
         return __switch_to(prev, next, next_current_ksp0(next));
 }
 
+/*
+ * This routine is called on return from interrupt if any of the
+ * TIF_WORK_MASK flags are set in thread_info->flags.  It is
+ * entered with interrupts disabled so we don't miss an event
+ * that modified the thread_info flags.  If any flag is set, we
+ * handle it and return, and the calling assembly code will
+ * re-disable interrupts, reload the thread flags, and call back
+ * if more flags need to be handled.
+ *
+ * We return whether we need to check the thread_info flags again
+ * or not.  Note that we don't clear TIF_SINGLESTEP here, so it's
+ * important that it be tested last, and then claim that we don't
+ * need to recheck the flags.
+ */
+int do_work_pending(struct pt_regs *regs, u32 thread_info_flags)
+{
+        if (thread_info_flags & _TIF_NEED_RESCHED) {
+                schedule();
+                return 1;
+        }
+#if CHIP_HAS_TILE_DMA() || CHIP_HAS_SN_PROC()
+        if (thread_info_flags & _TIF_ASYNC_TLB) {
+                do_async_page_fault(regs);
+                return 1;
+        }
+#endif
+        if (thread_info_flags & _TIF_SIGPENDING) {
+                do_signal(regs);
+                return 1;
+        }
+        if (thread_info_flags & _TIF_NOTIFY_RESUME) {
+                clear_thread_flag(TIF_NOTIFY_RESUME);
+                tracehook_notify_resume(regs);
+                if (current->replacement_session_keyring)
+                        key_replace_session_keyring();
+                return 1;
+        }
+        if (thread_info_flags & _TIF_SINGLESTEP) {
+                if ((regs->ex1 & SPR_EX_CONTEXT_1_1__PL_MASK) == 0)
+                        single_step_once(regs);
+                return 0;
+        }
+        panic("work_pending: bad flags %#x\n", thread_info_flags);
+}
+
 /* Note there is an implicit fifth argument if (clone_flags & CLONE_SETTLS). */
 SYSCALL_DEFINE5(clone, unsigned long, clone_flags, unsigned long, newsp,
                 void __user *, parent_tidptr, void __user *, child_tidptr,
@@ -582,8 +630,8 @@ out:
 
 #ifdef CONFIG_COMPAT
 long compat_sys_execve(const char __user *path,
-                       const compat_uptr_t __user *argv,
-                       const compat_uptr_t __user *envp,
+                       compat_uptr_t __user *argv,
+                       compat_uptr_t __user *envp,
                        struct pt_regs *regs)
 {
         long error;
diff --git a/arch/tile/kernel/regs_64.S b/arch/tile/kernel/regs_64.S
new file mode 100644
index 000000000000..f748c1e85285
--- /dev/null
+++ b/arch/tile/kernel/regs_64.S
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/linkage.h>
+#include <asm/system.h>
+#include <asm/ptrace.h>
+#include <asm/asm-offsets.h>
+#include <arch/spr_def.h>
+#include <asm/processor.h>
+
+/*
+ * See <asm/system.h>; called with prev and next task_struct pointers.
+ * "prev" is returned in r0 for _switch_to and also for ret_from_fork.
+ *
+ * We want to save pc/sp in "prev", and get the new pc/sp from "next".
+ * We also need to save all the callee-saved registers on the stack.
+ *
+ * Intel enables/disables access to the hardware cycle counter in
+ * seccomp (secure computing) environments if necessary, based on
+ * has_secure_computing().  We might want to do this at some point,
+ * though it would require virtualizing the other SPRs under WORLD_ACCESS.
+ *
+ * Since we're saving to the stack, we omit sp from this list.
+ * And for parallels with other architectures, we save lr separately,
+ * in the thread_struct itself (as the "pc" field).
+ *
+ * This code also needs to be aligned with process.c copy_thread()
+ */
+
+#if CALLEE_SAVED_REGS_COUNT != 24
+# error Mismatch between <asm/system.h> and kernel/entry.S
+#endif
+#define FRAME_SIZE ((2 + CALLEE_SAVED_REGS_COUNT) * 8)
+
+#define SAVE_REG(r) { st r12, r; addi r12, r12, 8 }
+#define LOAD_REG(r) { ld r, r12; addi r12, r12, 8 }
+#define FOR_EACH_CALLEE_SAVED_REG(f)                                    \
+                                                        f(r30); f(r31); \
+        f(r32); f(r33); f(r34); f(r35); f(r36); f(r37); f(r38); f(r39); \
+        f(r40); f(r41); f(r42); f(r43); f(r44); f(r45); f(r46); f(r47); \
+        f(r48); f(r49); f(r50); f(r51); f(r52);
+
+STD_ENTRY_SECTION(__switch_to, .sched.text)
+        {
+          move r10, sp
+          st sp, lr
+        }
+        {
+          addli r11, sp, -FRAME_SIZE + 8
+          addli sp, sp, -FRAME_SIZE
+        }
+        {
+          st r11, r10
+          addli r4, r1, TASK_STRUCT_THREAD_KSP_OFFSET
+        }
+        {
+          ld r13, r4   /* Load new sp to a temp register early. */
+          addi r12, sp, 16
+        }
+        FOR_EACH_CALLEE_SAVED_REG(SAVE_REG)
+        addli r3, r0, TASK_STRUCT_THREAD_KSP_OFFSET
+        {
+          st r3, sp
+          addli r3, r0, TASK_STRUCT_THREAD_PC_OFFSET
+        }
+        {
+          st r3, lr
+          addli r4, r1, TASK_STRUCT_THREAD_PC_OFFSET
+        }
+        {
+          ld lr, r4
+          addi r12, r13, 16
+        }
+        {
+          /* Update sp and ksp0 simultaneously to avoid backtracer warnings. */
+          move sp, r13
+          mtspr SPR_SYSTEM_SAVE_K_0, r2
+        }
+        FOR_EACH_CALLEE_SAVED_REG(LOAD_REG)
+.L__switch_to_pc:
+        {
+          addli sp, sp, FRAME_SIZE
+          jrp lr   /* r0 is still valid here, so return it */
+        }
+        STD_ENDPROC(__switch_to)
+
+/* Return a suitable address for the backtracer for suspended threads */
+STD_ENTRY_SECTION(get_switch_to_pc, .sched.text)
+        lnk r0
+        {
+          addli r0, r0, .L__switch_to_pc - .
+          jrp lr
+        }
+        STD_ENDPROC(get_switch_to_pc)
+
+STD_ENTRY(get_pt_regs)
+        .irp reg, r0, r1, r2, r3, r4, r5, r6, r7, \
+                 r8, r9, r10, r11, r12, r13, r14, r15, \
+                 r16, r17, r18, r19, r20, r21, r22, r23, \
+                 r24, r25, r26, r27, r28, r29, r30, r31, \
+                 r32, r33, r34, r35, r36, r37, r38, r39, \
+                 r40, r41, r42, r43, r44, r45, r46, r47, \
+                 r48, r49, r50, r51, r52, tp, sp
+        {
+         st r0, \reg
+         addi r0, r0, 8
+        }
+        .endr
+        {
+         st r0, lr
+         addi r0, r0, PTREGS_OFFSET_PC - PTREGS_OFFSET_LR
+        }
+        lnk r1
+        {
+         st r0, r1
+         addi r0, r0, PTREGS_OFFSET_EX1 - PTREGS_OFFSET_PC
+        }
+        mfspr r1, INTERRUPT_CRITICAL_SECTION
+        shli r1, r1, SPR_EX_CONTEXT_1_1__ICS_SHIFT
+        ori r1, r1, KERNEL_PL
+        {
+         st r0, r1
+         addi r0, r0, PTREGS_OFFSET_FAULTNUM - PTREGS_OFFSET_EX1
+        }
+        {
+         st r0, zero       /* clear faultnum */
+         addi r0, r0, PTREGS_OFFSET_ORIG_R0 - PTREGS_OFFSET_FAULTNUM
+        }
+        {
+         st r0, zero       /* clear orig_r0 */
+         addli r0, r0, -PTREGS_OFFSET_ORIG_R0    /* restore r0 to base */
+        }
+        jrp lr
+        STD_ENDPROC(get_pt_regs)
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index 3696b1832566..6cdc9ba55fe0 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -912,6 +912,8 @@ void __cpuinit setup_cpu(int boot)
 #endif
 }
 
+#ifdef CONFIG_BLK_DEV_INITRD
+
 static int __initdata set_initramfs_file;
 static char __initdata initramfs_file[128] = "initramfs.cpio.gz";
 
@@ -969,6 +971,10 @@ void __init free_initrd_mem(unsigned long begin, unsigned long end)
         free_bootmem(__pa(begin), end - begin);
 }
 
+#else
+static inline void load_hv_initrd(void) {}
+#endif /* CONFIG_BLK_DEV_INITRD */
+
 static void __init validate_hv(void)
 {
         /*
diff --git a/arch/tile/kernel/signal.c b/arch/tile/kernel/signal.c
index 1260321155f1..bedaf4e9f3a7 100644
--- a/arch/tile/kernel/signal.c
+++ b/arch/tile/kernel/signal.c
@@ -39,7 +39,6 @@
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
-
 SYSCALL_DEFINE3(sigaltstack, const stack_t __user *, uss,
                 stack_t __user *, uoss, struct pt_regs *, regs)
 {
@@ -78,6 +77,13 @@ int restore_sigcontext(struct pt_regs *regs,
         return err;
 }
 
+void signal_fault(const char *type, struct pt_regs *regs,
+                  void __user *frame, int sig)
+{
+        trace_unhandled_signal(type, regs, (unsigned long)frame, SIGSEGV);
+        force_sigsegv(sig, current);
+}
+
 /* The assembly shim for this function arranges to ignore the return value. */
 SYSCALL_DEFINE1(rt_sigreturn, struct pt_regs *, regs)
 {
@@ -105,7 +111,7 @@ SYSCALL_DEFINE1(rt_sigreturn, struct pt_regs *, regs)
         return 0;
 
 badframe:
-        force_sig(SIGSEGV, current);
+        signal_fault("bad sigreturn frame", regs, frame, 0);
         return 0;
 }
 
@@ -231,7 +237,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         return 0;
 
 give_sigsegv:
-        force_sigsegv(sig, current);
+        signal_fault("bad setup frame", regs, frame, sig);
         return -EFAULT;
 }
 
@@ -245,7 +251,6 @@ static int handle_signal(unsigned long sig, siginfo_t *info,
 {
         int ret;
 
-
         /* Are we from a system call? */
         if (regs->faultnum == INT_SWINT_1) {
                 /* If so, check system call restarting.. */
@@ -363,3 +368,118 @@ done:
         /* Avoid double syscall restart if there are nested signals. */
         regs->faultnum = INT_SWINT_1_SIGRETURN;
 }
+
+int show_unhandled_signals = 1;
+
+static int __init crashinfo(char *str)
+{
+        unsigned long val;
+        const char *word;
+
+        if (*str == '\0')
+                val = 2;
+        else if (*str != '=' || strict_strtoul(++str, 0, &val) != 0)
+                return 0;
+        show_unhandled_signals = val;
+        switch (show_unhandled_signals) {
+        case 0:
+                word = "No";
+                break;
+        case 1:
+                word = "One-line";
+                break;
+        default:
+                word = "Detailed";
+                break;
+        }
+        pr_info("%s crash reports will be generated on the console\n", word);
+        return 1;
+}
+__setup("crashinfo", crashinfo);
+
+static void dump_mem(void __user *address)
+{
+        void __user *addr;
+        enum { region_size = 256, bytes_per_line = 16 };
+        int i, j, k;
+        int found_readable_mem = 0;
+
+        pr_err("\n");
+        if (!access_ok(VERIFY_READ, address, 1)) {
+                pr_err("Not dumping at address 0x%lx (kernel address)\n",
+                       (unsigned long)address);
+                return;
+        }
+
+        addr = (void __user *)
+                (((unsigned long)address & -bytes_per_line) - region_size/2);
+        if (addr > address)
+                addr = NULL;
+        for (i = 0; i < region_size;
+             addr += bytes_per_line, i += bytes_per_line) {
+                unsigned char buf[bytes_per_line];
+                char line[100];
+                if (copy_from_user(buf, addr, bytes_per_line))
+                        continue;
+                if (!found_readable_mem) {
+                        pr_err("Dumping memory around address 0x%lx:\n",
+                               (unsigned long)address);
+                        found_readable_mem = 1;
+                }
+                j = sprintf(line, REGFMT":", (unsigned long)addr);
+                for (k = 0; k < bytes_per_line; ++k)
+                        j += sprintf(&line[j], " %02x", buf[k]);
+                pr_err("%s\n", line);
+        }
+        if (!found_readable_mem)
+                pr_err("No readable memory around address 0x%lx\n",
+                       (unsigned long)address);
+}
+
+void trace_unhandled_signal(const char *type, struct pt_regs *regs,
+                            unsigned long address, int sig)
+{
+        struct task_struct *tsk = current;
+
+        if (show_unhandled_signals == 0)
+                return;
+
+        /* If the signal is handled, don't show it here. */
+        if (!is_global_init(tsk)) {
+                void __user *handler =
+                        tsk->sighand->action[sig-1].sa.sa_handler;
+                if (handler != SIG_IGN && handler != SIG_DFL)
+                        return;
+        }
+
+        /* Rate-limit the one-line output, not the detailed output. */
+        if (show_unhandled_signals <= 1 && !printk_ratelimit())
+                return;
+
+        printk("%s%s[%d]: %s at %lx pc "REGFMT" signal %d",
+               task_pid_nr(tsk) > 1 ? KERN_INFO : KERN_EMERG,
+               tsk->comm, task_pid_nr(tsk), type, address, regs->pc, sig);
+
+        print_vma_addr(KERN_CONT " in ", regs->pc);
+
+        printk(KERN_CONT "\n");
+
+        if (show_unhandled_signals > 1) {
+                switch (sig) {
+                case SIGILL:
+                case SIGFPE:
+                case SIGSEGV:
+                case SIGBUS:
+                        pr_err("User crash: signal %d,"
+                               " trap %ld, address 0x%lx\n",
+                               sig, regs->faultnum, address);
+                        show_regs(regs);
+                        dump_mem((void __user *)address);
+                        break;
+                default:
+                        pr_err("User crash: signal %d, trap %ld\n",
+                               sig, regs->faultnum);
+                        break;
+                }
+        }
+}
diff --git a/arch/tile/kernel/single_step.c b/arch/tile/kernel/single_step.c
index 84a729e06ec4..4032ca8e51b6 100644
--- a/arch/tile/kernel/single_step.c
+++ b/arch/tile/kernel/single_step.c
@@ -186,6 +186,8 @@ static tile_bundle_bits rewrite_load_store_unaligned(
                         .si_code = SEGV_MAPERR,
                         .si_addr = addr
                 };
+                trace_unhandled_signal("segfault", regs,
+                                       (unsigned long)addr, SIGSEGV);
                 force_sig_info(info.si_signo, &info, current);
                 return (tile_bundle_bits) 0;
         }
@@ -196,6 +198,8 @@ static tile_bundle_bits rewrite_load_store_unaligned(
                         .si_code = BUS_ADRALN,
                         .si_addr = addr
                 };
+                trace_unhandled_signal("unaligned trap", regs,
+                                       (unsigned long)addr, SIGBUS);
                 force_sig_info(info.si_signo, &info, current);
                 return (tile_bundle_bits) 0;
         }
@@ -318,6 +322,14 @@ void single_step_once(struct pt_regs *regs)
 "    .popsection\n"
         );
 
+        /*
+         * Enable interrupts here to allow touching userspace and the like.
+         * The callers expect this: do_trap() already has interrupts
+         * enabled, and do_work_pending() handles functions that enable
+         * interrupts internally.
+         */
+        local_irq_enable();
+
         if (state == NULL) {
                 /* allocate a page of writable, executable memory */
                 state = kmalloc(sizeof(struct single_step_state), GFP_KERNEL);
diff --git a/arch/tile/kernel/smp.c b/arch/tile/kernel/smp.c
index a4293102ef81..c52224d5ed45 100644
--- a/arch/tile/kernel/smp.c
+++ b/arch/tile/kernel/smp.c
@@ -189,12 +189,8 @@ void flush_icache_range(unsigned long start, unsigned long end)
 /* Called when smp_send_reschedule() triggers IRQ_RESCHEDULE. */
 static irqreturn_t handle_reschedule_ipi(int irq, void *token)
 {
-        /*
-         * Nothing to do here; when we return from interrupt, the
-         * rescheduling will occur there. But do bump the interrupt
-         * profiler count in the meantime.
-         */
         __get_cpu_var(irq_stat).irq_resched_count++;
+        scheduler_ipi();
 
         return IRQ_HANDLED;
 }
diff --git a/arch/tile/kernel/stack.c b/arch/tile/kernel/stack.c
index dd81713a90dc..37ee4d037e0b 100644
--- a/arch/tile/kernel/stack.c
+++ b/arch/tile/kernel/stack.c
@@ -36,7 +36,7 @@
 #define KBT_LOOP        3  /* Backtrace entered a loop */
 
 /* Is address on the specified kernel stack? */
-static int in_kernel_stack(struct KBacktraceIterator *kbt, VirtualAddress sp)
+static int in_kernel_stack(struct KBacktraceIterator *kbt, unsigned long sp)
 {
         ulong kstack_base = (ulong) kbt->task->stack;
         if (kstack_base == 0)  /* corrupt task pointer; just follow stack... */
@@ -45,7 +45,7 @@ static int in_kernel_stack(struct KBacktraceIterator *kbt, VirtualAddress sp)
 }
 
 /* Is address valid for reading? */
-static int valid_address(struct KBacktraceIterator *kbt, VirtualAddress address)
+static int valid_address(struct KBacktraceIterator *kbt, unsigned long address)
 {
         HV_PTE *l1_pgtable = kbt->pgtable;
         HV_PTE *l2_pgtable;
@@ -97,7 +97,7 @@ static int valid_address(struct KBacktraceIterator *kbt, VirtualAddress address)
 }
 
 /* Callback for backtracer; basically a glorified memcpy */
-static bool read_memory_func(void *result, VirtualAddress address,
+static bool read_memory_func(void *result, unsigned long address,
                              unsigned int size, void *vkbt)
 {
         int retval;
@@ -124,7 +124,7 @@ static struct pt_regs *valid_fault_handler(struct KBacktraceIterator* kbt)
 {
         const char *fault = NULL;  /* happy compiler */
         char fault_buf[64];
-        VirtualAddress sp = kbt->it.sp;
+        unsigned long sp = kbt->it.sp;
         struct pt_regs *p;
 
         if (!in_kernel_stack(kbt, sp))
@@ -163,7 +163,7 @@ static struct pt_regs *valid_fault_handler(struct KBacktraceIterator* kbt)
 }
 
 /* Is the pc pointing to a sigreturn trampoline? */
-static int is_sigreturn(VirtualAddress pc)
+static int is_sigreturn(unsigned long pc)
 {
         return (pc == VDSO_BASE);
 }
@@ -260,7 +260,7 @@ static void validate_stack(struct pt_regs *regs)
 void KBacktraceIterator_init(struct KBacktraceIterator *kbt,
                              struct task_struct *t, struct pt_regs *regs)
 {
-        VirtualAddress pc, lr, sp, r52;
+        unsigned long pc, lr, sp, r52;
         int is_current;
 
         /*
@@ -331,7 +331,7 @@ EXPORT_SYMBOL(KBacktraceIterator_end);
 
 void KBacktraceIterator_next(struct KBacktraceIterator *kbt)
 {
-        VirtualAddress old_pc = kbt->it.pc, old_sp = kbt->it.sp;
+        unsigned long old_pc = kbt->it.pc, old_sp = kbt->it.sp;
         kbt->new_context = 0;
         if (!backtrace_next(&kbt->it) && !KBacktraceIterator_restart(kbt)) {
                 kbt->end = KBT_DONE;
diff --git a/arch/tile/kernel/sys.c b/arch/tile/kernel/sys.c
index e2187d24a9b4..cb44ba7ccd2d 100644
--- a/arch/tile/kernel/sys.c
+++ b/arch/tile/kernel/sys.c
@@ -56,13 +56,6 @@ ssize_t sys32_readahead(int fd, u32 offset_lo, u32 offset_hi, u32 count)
         return sys_readahead(fd, ((loff_t)offset_hi << 32) | offset_lo, count);
 }
 
-long sys32_fadvise64(int fd, u32 offset_lo, u32 offset_hi,
-                     u32 len, int advice)
-{
-        return sys_fadvise64_64(fd, ((loff_t)offset_hi << 32) | offset_lo,
-                                len, advice);
-}
-
 int sys32_fadvise64_64(int fd, u32 offset_lo, u32 offset_hi,
                        u32 len_lo, u32 len_hi, int advice)
 {
@@ -103,10 +96,8 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,
 
 #ifndef __tilegx__
 /* See comments at the top of the file. */
-#define sys_fadvise64 sys32_fadvise64
 #define sys_fadvise64_64 sys32_fadvise64_64
 #define sys_readahead sys32_readahead
-#define sys_sync_file_range sys_sync_file_range2
 #endif
 
 /* Call the trampolines to manage pt_regs where necessary. */
diff --git a/arch/tile/kernel/tile-desc_32.c b/arch/tile/kernel/tile-desc_32.c
index 69af0e150f78..7e31a1285788 100644
--- a/arch/tile/kernel/tile-desc_32.c
+++ b/arch/tile/kernel/tile-desc_32.c
@@ -2413,12 +2413,13 @@ const struct tile_operand tile_operands[43] =
 
 
 
-/* Given a set of bundle bits and the lookup FSM for a specific pipe,
- * returns which instruction the bundle contains in that pipe.
+/* Given a set of bundle bits and a specific pipe, returns which
+ * instruction the bundle contains in that pipe.
  */
-static const struct tile_opcode *
-find_opcode(tile_bundle_bits bits, const unsigned short *table)
+const struct tile_opcode *
+find_opcode(tile_bundle_bits bits, tile_pipeline pipe)
 {
+  const unsigned short *table = tile_bundle_decoder_fsms[pipe];
   int index = 0;
 
   while (1)
@@ -2465,7 +2466,7 @@ parse_insn_tile(tile_bundle_bits bits,
     int i;
 
     d = &decoded[num_instructions++];
-    opc = find_opcode (bits, tile_bundle_decoder_fsms[pipe]);
+    opc = find_opcode (bits, (tile_pipeline)pipe);
     d->opcode = opc;
 
     /* Decode each operand, sign extending, etc. as appropriate. */
diff --git a/arch/tile/kernel/tile-desc_64.c b/arch/tile/kernel/tile-desc_64.c
new file mode 100644
index 000000000000..d57007bed77f
--- /dev/null
+++ b/arch/tile/kernel/tile-desc_64.c
@@ -0,0 +1,2200 @@
+/* This define is BFD_RELOC_##x for real bfd, or -1 for everyone else. */
+#define BFD_RELOC(x) -1
+
+/* Special registers. */
+#define TREG_LR 55
+#define TREG_SN 56
+#define TREG_ZERO 63
+
+/* FIXME: Rename this. */
+#include <asm/opcode-tile_64.h>
+
+#include <linux/stddef.h>
+
+const struct tilegx_opcode tilegx_opcodes[334] =
+{
+ { "bpt", TILEGX_OPC_BPT, 0x2, 0, TREG_ZERO, 0,
+    { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
+  },
+  { "info", TILEGX_OPC_INFO, 0xf, 1, TREG_ZERO, 1,
+    { { 0 }, { 1 }, { 2 }, { 3 }, { 0, } },
+  },
+  { "infol", TILEGX_OPC_INFOL, 0x3, 1, TREG_ZERO, 1,
+    { { 4 }, { 5 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "move", TILEGX_OPC_MOVE, 0xf, 2, TREG_ZERO, 1,
+    { { 6, 7 }, { 8, 9 }, { 10, 11 }, { 12, 13 }, { 0, } },
+  },
+  { "movei", TILEGX_OPC_MOVEI, 0xf, 2, TREG_ZERO, 1,
+    { { 6, 0 }, { 8, 1 }, { 10, 2 }, { 12, 3 }, { 0, } },
+  },
+  { "moveli", TILEGX_OPC_MOVELI, 0x3, 2, TREG_ZERO, 1,
+    { { 6, 4 }, { 8, 5 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "prefetch", TILEGX_OPC_PREFETCH, 0x12, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
+  },
+  { "prefetch_add_l1", TILEGX_OPC_PREFETCH_ADD_L1, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "prefetch_add_l1_fault", TILEGX_OPC_PREFETCH_ADD_L1_FAULT, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "prefetch_add_l2", TILEGX_OPC_PREFETCH_ADD_L2, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "prefetch_add_l2_fault", TILEGX_OPC_PREFETCH_ADD_L2_FAULT, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "prefetch_add_l3", TILEGX_OPC_PREFETCH_ADD_L3, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "prefetch_add_l3_fault", TILEGX_OPC_PREFETCH_ADD_L3_FAULT, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "prefetch_l1", TILEGX_OPC_PREFETCH_L1, 0x12, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
+  },
+  { "prefetch_l1_fault", TILEGX_OPC_PREFETCH_L1_FAULT, 0x12, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
+  },
+  { "prefetch_l2", TILEGX_OPC_PREFETCH_L2, 0x12, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
+  },
+  { "prefetch_l2_fault", TILEGX_OPC_PREFETCH_L2_FAULT, 0x12, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
+  },
+  { "prefetch_l3", TILEGX_OPC_PREFETCH_L3, 0x12, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
+  },
+  { "prefetch_l3_fault", TILEGX_OPC_PREFETCH_L3_FAULT, 0x12, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 14 } },
+  },
+  { "raise", TILEGX_OPC_RAISE, 0x2, 0, TREG_ZERO, 1,
+    { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
+  },
+  { "add", TILEGX_OPC_ADD, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "addi", TILEGX_OPC_ADDI, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
+  },
+  { "addli", TILEGX_OPC_ADDLI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 4 }, { 8, 9, 5 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "addx", TILEGX_OPC_ADDX, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "addxi", TILEGX_OPC_ADDXI, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
+  },
+  { "addxli", TILEGX_OPC_ADDXLI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 4 }, { 8, 9, 5 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "addxsc", TILEGX_OPC_ADDXSC, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "and", TILEGX_OPC_AND, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "andi", TILEGX_OPC_ANDI, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
+  },
+  { "beqz", TILEGX_OPC_BEQZ, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "beqzt", TILEGX_OPC_BEQZT, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "bfexts", TILEGX_OPC_BFEXTS, 0x1, 4, TREG_ZERO, 1,
+    { { 6, 7, 21, 22 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "bfextu", TILEGX_OPC_BFEXTU, 0x1, 4, TREG_ZERO, 1,
+    { { 6, 7, 21, 22 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "bfins", TILEGX_OPC_BFINS, 0x1, 4, TREG_ZERO, 1,
+    { { 23, 7, 21, 22 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "bgez", TILEGX_OPC_BGEZ, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "bgezt", TILEGX_OPC_BGEZT, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "bgtz", TILEGX_OPC_BGTZ, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "bgtzt", TILEGX_OPC_BGTZT, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "blbc", TILEGX_OPC_BLBC, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "blbct", TILEGX_OPC_BLBCT, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "blbs", TILEGX_OPC_BLBS, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "blbst", TILEGX_OPC_BLBST, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "blez", TILEGX_OPC_BLEZ, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "blezt", TILEGX_OPC_BLEZT, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "bltz", TILEGX_OPC_BLTZ, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "bltzt", TILEGX_OPC_BLTZT, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "bnez", TILEGX_OPC_BNEZ, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "bnezt", TILEGX_OPC_BNEZT, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 20 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "clz", TILEGX_OPC_CLZ, 0x5, 2, TREG_ZERO, 1,
+    { { 6, 7 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
+  },
+  { "cmoveqz", TILEGX_OPC_CMOVEQZ, 0x5, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+  },
+  { "cmovnez", TILEGX_OPC_CMOVNEZ, 0x5, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+  },
+  { "cmpeq", TILEGX_OPC_CMPEQ, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "cmpeqi", TILEGX_OPC_CMPEQI, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
+  },
+  { "cmpexch", TILEGX_OPC_CMPEXCH, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "cmpexch4", TILEGX_OPC_CMPEXCH4, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "cmples", TILEGX_OPC_CMPLES, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "cmpleu", TILEGX_OPC_CMPLEU, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "cmplts", TILEGX_OPC_CMPLTS, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "cmpltsi", TILEGX_OPC_CMPLTSI, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 10, 11, 2 }, { 12, 13, 3 }, { 0, } },
+  },
+  { "cmpltu", TILEGX_OPC_CMPLTU, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "cmpltui", TILEGX_OPC_CMPLTUI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "cmpne", TILEGX_OPC_CMPNE, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "cmul", TILEGX_OPC_CMUL, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "cmula", TILEGX_OPC_CMULA, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "cmulaf", TILEGX_OPC_CMULAF, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "cmulf", TILEGX_OPC_CMULF, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "cmulfr", TILEGX_OPC_CMULFR, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "cmulh", TILEGX_OPC_CMULH, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "cmulhr", TILEGX_OPC_CMULHR, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "crc32_32", TILEGX_OPC_CRC32_32, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "crc32_8", TILEGX_OPC_CRC32_8, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ctz", TILEGX_OPC_CTZ, 0x5, 2, TREG_ZERO, 1,
+    { { 6, 7 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
+  },
+  { "dblalign", TILEGX_OPC_DBLALIGN, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "dblalign2", TILEGX_OPC_DBLALIGN2, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "dblalign4", TILEGX_OPC_DBLALIGN4, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "dblalign6", TILEGX_OPC_DBLALIGN6, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "drain", TILEGX_OPC_DRAIN, 0x2, 0, TREG_ZERO, 0,
+    { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
+  },
+  { "dtlbpr", TILEGX_OPC_DTLBPR, 0x2, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "exch", TILEGX_OPC_EXCH, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "exch4", TILEGX_OPC_EXCH4, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fdouble_add_flags", TILEGX_OPC_FDOUBLE_ADD_FLAGS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fdouble_addsub", TILEGX_OPC_FDOUBLE_ADDSUB, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fdouble_mul_flags", TILEGX_OPC_FDOUBLE_MUL_FLAGS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fdouble_pack1", TILEGX_OPC_FDOUBLE_PACK1, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fdouble_pack2", TILEGX_OPC_FDOUBLE_PACK2, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fdouble_sub_flags", TILEGX_OPC_FDOUBLE_SUB_FLAGS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fdouble_unpack_max", TILEGX_OPC_FDOUBLE_UNPACK_MAX, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fdouble_unpack_min", TILEGX_OPC_FDOUBLE_UNPACK_MIN, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fetchadd", TILEGX_OPC_FETCHADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fetchadd4", TILEGX_OPC_FETCHADD4, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fetchaddgez", TILEGX_OPC_FETCHADDGEZ, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fetchaddgez4", TILEGX_OPC_FETCHADDGEZ4, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fetchand", TILEGX_OPC_FETCHAND, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fetchand4", TILEGX_OPC_FETCHAND4, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fetchor", TILEGX_OPC_FETCHOR, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fetchor4", TILEGX_OPC_FETCHOR4, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "finv", TILEGX_OPC_FINV, 0x2, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "flush", TILEGX_OPC_FLUSH, 0x2, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "flushwb", TILEGX_OPC_FLUSHWB, 0x2, 0, TREG_ZERO, 1,
+    { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fnop", TILEGX_OPC_FNOP, 0xf, 0, TREG_ZERO, 1,
+    { {  }, {  }, {  }, {  }, { 0, } },
+  },
+  { "fsingle_add1", TILEGX_OPC_FSINGLE_ADD1, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fsingle_addsub2", TILEGX_OPC_FSINGLE_ADDSUB2, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fsingle_mul1", TILEGX_OPC_FSINGLE_MUL1, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fsingle_mul2", TILEGX_OPC_FSINGLE_MUL2, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fsingle_pack1", TILEGX_OPC_FSINGLE_PACK1, 0x5, 2, TREG_ZERO, 1,
+    { { 6, 7 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
+  },
+  { "fsingle_pack2", TILEGX_OPC_FSINGLE_PACK2, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "fsingle_sub1", TILEGX_OPC_FSINGLE_SUB1, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "icoh", TILEGX_OPC_ICOH, 0x2, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ill", TILEGX_OPC_ILL, 0xa, 0, TREG_ZERO, 1,
+    { { 0, }, {  }, { 0, }, {  }, { 0, } },
+  },
+  { "inv", TILEGX_OPC_INV, 0x2, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "iret", TILEGX_OPC_IRET, 0x2, 0, TREG_ZERO, 1,
+    { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
+  },
+  { "j", TILEGX_OPC_J, 0x2, 1, TREG_ZERO, 1,
+    { { 0, }, { 25 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "jal", TILEGX_OPC_JAL, 0x2, 1, TREG_LR, 1,
+    { { 0, }, { 25 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "jalr", TILEGX_OPC_JALR, 0xa, 1, TREG_LR, 1,
+    { { 0, }, { 9 }, { 0, }, { 13 }, { 0, } },
+  },
+  { "jalrp", TILEGX_OPC_JALRP, 0xa, 1, TREG_LR, 1,
+    { { 0, }, { 9 }, { 0, }, { 13 }, { 0, } },
+  },
+  { "jr", TILEGX_OPC_JR, 0xa, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 13 }, { 0, } },
+  },
+  { "jrp", TILEGX_OPC_JRP, 0xa, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 13 }, { 0, } },
+  },
+  { "ld", TILEGX_OPC_LD, 0x12, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
+  },
+  { "ld1s", TILEGX_OPC_LD1S, 0x12, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
+  },
+  { "ld1s_add", TILEGX_OPC_LD1S_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ld1u", TILEGX_OPC_LD1U, 0x12, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
+  },
+  { "ld1u_add", TILEGX_OPC_LD1U_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ld2s", TILEGX_OPC_LD2S, 0x12, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
+  },
+  { "ld2s_add", TILEGX_OPC_LD2S_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ld2u", TILEGX_OPC_LD2U, 0x12, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
+  },
+  { "ld2u_add", TILEGX_OPC_LD2U_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ld4s", TILEGX_OPC_LD4S, 0x12, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
+  },
+  { "ld4s_add", TILEGX_OPC_LD4S_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ld4u", TILEGX_OPC_LD4U, 0x12, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 26, 14 } },
+  },
+  { "ld4u_add", TILEGX_OPC_LD4U_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ld_add", TILEGX_OPC_LD_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldna", TILEGX_OPC_LDNA, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldna_add", TILEGX_OPC_LDNA_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt", TILEGX_OPC_LDNT, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt1s", TILEGX_OPC_LDNT1S, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt1s_add", TILEGX_OPC_LDNT1S_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt1u", TILEGX_OPC_LDNT1U, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt1u_add", TILEGX_OPC_LDNT1U_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt2s", TILEGX_OPC_LDNT2S, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt2s_add", TILEGX_OPC_LDNT2S_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt2u", TILEGX_OPC_LDNT2U, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt2u_add", TILEGX_OPC_LDNT2U_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt4s", TILEGX_OPC_LDNT4S, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt4s_add", TILEGX_OPC_LDNT4S_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt4u", TILEGX_OPC_LDNT4U, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt4u_add", TILEGX_OPC_LDNT4U_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "ldnt_add", TILEGX_OPC_LDNT_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 8, 15, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "lnk", TILEGX_OPC_LNK, 0xa, 1, TREG_ZERO, 1,
+    { { 0, }, { 8 }, { 0, }, { 12 }, { 0, } },
+  },
+  { "mf", TILEGX_OPC_MF, 0x2, 0, TREG_ZERO, 1,
+    { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mfspr", TILEGX_OPC_MFSPR, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 8, 27 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mm", TILEGX_OPC_MM, 0x1, 4, TREG_ZERO, 1,
+    { { 23, 7, 21, 22 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mnz", TILEGX_OPC_MNZ, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "mtspr", TILEGX_OPC_MTSPR, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 28, 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mul_hs_hs", TILEGX_OPC_MUL_HS_HS, 0x5, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
+  },
+  { "mul_hs_hu", TILEGX_OPC_MUL_HS_HU, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mul_hs_ls", TILEGX_OPC_MUL_HS_LS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mul_hs_lu", TILEGX_OPC_MUL_HS_LU, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mul_hu_hu", TILEGX_OPC_MUL_HU_HU, 0x5, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
+  },
+  { "mul_hu_ls", TILEGX_OPC_MUL_HU_LS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mul_hu_lu", TILEGX_OPC_MUL_HU_LU, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mul_ls_ls", TILEGX_OPC_MUL_LS_LS, 0x5, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
+  },
+  { "mul_ls_lu", TILEGX_OPC_MUL_LS_LU, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mul_lu_lu", TILEGX_OPC_MUL_LU_LU, 0x5, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
+  },
+  { "mula_hs_hs", TILEGX_OPC_MULA_HS_HS, 0x5, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+  },
+  { "mula_hs_hu", TILEGX_OPC_MULA_HS_HU, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mula_hs_ls", TILEGX_OPC_MULA_HS_LS, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mula_hs_lu", TILEGX_OPC_MULA_HS_LU, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mula_hu_hu", TILEGX_OPC_MULA_HU_HU, 0x5, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+  },
+  { "mula_hu_ls", TILEGX_OPC_MULA_HU_LS, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mula_hu_lu", TILEGX_OPC_MULA_HU_LU, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mula_ls_ls", TILEGX_OPC_MULA_LS_LS, 0x5, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+  },
+  { "mula_ls_lu", TILEGX_OPC_MULA_LS_LU, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "mula_lu_lu", TILEGX_OPC_MULA_LU_LU, 0x5, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+  },
+  { "mulax", TILEGX_OPC_MULAX, 0x5, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 24, 11, 18 }, { 0, }, { 0, } },
+  },
+  { "mulx", TILEGX_OPC_MULX, 0x5, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 10, 11, 18 }, { 0, }, { 0, } },
+  },
+  { "mz", TILEGX_OPC_MZ, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "nap", TILEGX_OPC_NAP, 0x2, 0, TREG_ZERO, 0,
+    { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
+  },
+  { "nop", TILEGX_OPC_NOP, 0xf, 0, TREG_ZERO, 1,
+    { {  }, {  }, {  }, {  }, { 0, } },
+  },
+  { "nor", TILEGX_OPC_NOR, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "or", TILEGX_OPC_OR, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "ori", TILEGX_OPC_ORI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "pcnt", TILEGX_OPC_PCNT, 0x5, 2, TREG_ZERO, 1,
+    { { 6, 7 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
+  },
+  { "revbits", TILEGX_OPC_REVBITS, 0x5, 2, TREG_ZERO, 1,
+    { { 6, 7 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
+  },
+  { "revbytes", TILEGX_OPC_REVBYTES, 0x5, 2, TREG_ZERO, 1,
+    { { 6, 7 }, { 0, }, { 10, 11 }, { 0, }, { 0, } },
+  },
+  { "rotl", TILEGX_OPC_ROTL, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "rotli", TILEGX_OPC_ROTLI, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 10, 11, 31 }, { 12, 13, 32 }, { 0, } },
+  },
+  { "shl", TILEGX_OPC_SHL, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "shl16insli", TILEGX_OPC_SHL16INSLI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 4 }, { 8, 9, 5 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "shl1add", TILEGX_OPC_SHL1ADD, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "shl1addx", TILEGX_OPC_SHL1ADDX, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "shl2add", TILEGX_OPC_SHL2ADD, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "shl2addx", TILEGX_OPC_SHL2ADDX, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "shl3add", TILEGX_OPC_SHL3ADD, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "shl3addx", TILEGX_OPC_SHL3ADDX, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "shli", TILEGX_OPC_SHLI, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 10, 11, 31 }, { 12, 13, 32 }, { 0, } },
+  },
+  { "shlx", TILEGX_OPC_SHLX, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "shlxi", TILEGX_OPC_SHLXI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "shrs", TILEGX_OPC_SHRS, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "shrsi", TILEGX_OPC_SHRSI, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 10, 11, 31 }, { 12, 13, 32 }, { 0, } },
+  },
+  { "shru", TILEGX_OPC_SHRU, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "shrui", TILEGX_OPC_SHRUI, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 10, 11, 31 }, { 12, 13, 32 }, { 0, } },
+  },
+  { "shrux", TILEGX_OPC_SHRUX, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "shruxi", TILEGX_OPC_SHRUXI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "shufflebytes", TILEGX_OPC_SHUFFLEBYTES, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "st", TILEGX_OPC_ST, 0x12, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 14, 33 } },
+  },
+  { "st1", TILEGX_OPC_ST1, 0x12, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 14, 33 } },
+  },
+  { "st1_add", TILEGX_OPC_ST1_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 15, 17, 34 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "st2", TILEGX_OPC_ST2, 0x12, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 14, 33 } },
+  },
+  { "st2_add", TILEGX_OPC_ST2_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 15, 17, 34 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "st4", TILEGX_OPC_ST4, 0x12, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 14, 33 } },
+  },
+  { "st4_add", TILEGX_OPC_ST4_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 15, 17, 34 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "st_add", TILEGX_OPC_ST_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 15, 17, 34 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "stnt", TILEGX_OPC_STNT, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "stnt1", TILEGX_OPC_STNT1, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "stnt1_add", TILEGX_OPC_STNT1_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 15, 17, 34 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "stnt2", TILEGX_OPC_STNT2, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "stnt2_add", TILEGX_OPC_STNT2_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 15, 17, 34 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "stnt4", TILEGX_OPC_STNT4, 0x2, 2, TREG_ZERO, 1,
+    { { 0, }, { 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "stnt4_add", TILEGX_OPC_STNT4_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 15, 17, 34 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "stnt_add", TILEGX_OPC_STNT_ADD, 0x2, 3, TREG_ZERO, 1,
+    { { 0, }, { 15, 17, 34 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "sub", TILEGX_OPC_SUB, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "subx", TILEGX_OPC_SUBX, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "subxsc", TILEGX_OPC_SUBXSC, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "swint0", TILEGX_OPC_SWINT0, 0x2, 0, TREG_ZERO, 0,
+    { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
+  },
+  { "swint1", TILEGX_OPC_SWINT1, 0x2, 0, TREG_ZERO, 0,
+    { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
+  },
+  { "swint2", TILEGX_OPC_SWINT2, 0x2, 0, TREG_ZERO, 0,
+    { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
+  },
+  { "swint3", TILEGX_OPC_SWINT3, 0x2, 0, TREG_ZERO, 0,
+    { { 0, }, {  }, { 0, }, { 0, }, { 0, } },
+  },
+  { "tblidxb0", TILEGX_OPC_TBLIDXB0, 0x5, 2, TREG_ZERO, 1,
+    { { 23, 7 }, { 0, }, { 24, 11 }, { 0, }, { 0, } },
+  },
+  { "tblidxb1", TILEGX_OPC_TBLIDXB1, 0x5, 2, TREG_ZERO, 1,
+    { { 23, 7 }, { 0, }, { 24, 11 }, { 0, }, { 0, } },
+  },
+  { "tblidxb2", TILEGX_OPC_TBLIDXB2, 0x5, 2, TREG_ZERO, 1,
+    { { 23, 7 }, { 0, }, { 24, 11 }, { 0, }, { 0, } },
+  },
+  { "tblidxb3", TILEGX_OPC_TBLIDXB3, 0x5, 2, TREG_ZERO, 1,
+    { { 23, 7 }, { 0, }, { 24, 11 }, { 0, }, { 0, } },
+  },
+  { "v1add", TILEGX_OPC_V1ADD, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1addi", TILEGX_OPC_V1ADDI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1adduc", TILEGX_OPC_V1ADDUC, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1adiffu", TILEGX_OPC_V1ADIFFU, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1avgu", TILEGX_OPC_V1AVGU, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1cmpeq", TILEGX_OPC_V1CMPEQ, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1cmpeqi", TILEGX_OPC_V1CMPEQI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1cmples", TILEGX_OPC_V1CMPLES, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1cmpleu", TILEGX_OPC_V1CMPLEU, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1cmplts", TILEGX_OPC_V1CMPLTS, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1cmpltsi", TILEGX_OPC_V1CMPLTSI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1cmpltu", TILEGX_OPC_V1CMPLTU, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1cmpltui", TILEGX_OPC_V1CMPLTUI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1cmpne", TILEGX_OPC_V1CMPNE, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1ddotpu", TILEGX_OPC_V1DDOTPU, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1ddotpua", TILEGX_OPC_V1DDOTPUA, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1ddotpus", TILEGX_OPC_V1DDOTPUS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1ddotpusa", TILEGX_OPC_V1DDOTPUSA, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1dotp", TILEGX_OPC_V1DOTP, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1dotpa", TILEGX_OPC_V1DOTPA, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1dotpu", TILEGX_OPC_V1DOTPU, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1dotpua", TILEGX_OPC_V1DOTPUA, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1dotpus", TILEGX_OPC_V1DOTPUS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1dotpusa", TILEGX_OPC_V1DOTPUSA, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1int_h", TILEGX_OPC_V1INT_H, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1int_l", TILEGX_OPC_V1INT_L, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1maxu", TILEGX_OPC_V1MAXU, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1maxui", TILEGX_OPC_V1MAXUI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1minu", TILEGX_OPC_V1MINU, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1minui", TILEGX_OPC_V1MINUI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1mnz", TILEGX_OPC_V1MNZ, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1multu", TILEGX_OPC_V1MULTU, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1mulu", TILEGX_OPC_V1MULU, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1mulus", TILEGX_OPC_V1MULUS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1mz", TILEGX_OPC_V1MZ, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1sadau", TILEGX_OPC_V1SADAU, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1sadu", TILEGX_OPC_V1SADU, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1shl", TILEGX_OPC_V1SHL, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1shli", TILEGX_OPC_V1SHLI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1shrs", TILEGX_OPC_V1SHRS, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1shrsi", TILEGX_OPC_V1SHRSI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1shru", TILEGX_OPC_V1SHRU, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1shrui", TILEGX_OPC_V1SHRUI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1sub", TILEGX_OPC_V1SUB, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v1subuc", TILEGX_OPC_V1SUBUC, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2add", TILEGX_OPC_V2ADD, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2addi", TILEGX_OPC_V2ADDI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2addsc", TILEGX_OPC_V2ADDSC, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2adiffs", TILEGX_OPC_V2ADIFFS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2avgs", TILEGX_OPC_V2AVGS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2cmpeq", TILEGX_OPC_V2CMPEQ, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2cmpeqi", TILEGX_OPC_V2CMPEQI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2cmples", TILEGX_OPC_V2CMPLES, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2cmpleu", TILEGX_OPC_V2CMPLEU, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2cmplts", TILEGX_OPC_V2CMPLTS, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2cmpltsi", TILEGX_OPC_V2CMPLTSI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2cmpltu", TILEGX_OPC_V2CMPLTU, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2cmpltui", TILEGX_OPC_V2CMPLTUI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2cmpne", TILEGX_OPC_V2CMPNE, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2dotp", TILEGX_OPC_V2DOTP, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2dotpa", TILEGX_OPC_V2DOTPA, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2int_h", TILEGX_OPC_V2INT_H, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2int_l", TILEGX_OPC_V2INT_L, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2maxs", TILEGX_OPC_V2MAXS, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2maxsi", TILEGX_OPC_V2MAXSI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2mins", TILEGX_OPC_V2MINS, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2minsi", TILEGX_OPC_V2MINSI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2mnz", TILEGX_OPC_V2MNZ, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2mulfsc", TILEGX_OPC_V2MULFSC, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2muls", TILEGX_OPC_V2MULS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2mults", TILEGX_OPC_V2MULTS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2mz", TILEGX_OPC_V2MZ, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2packh", TILEGX_OPC_V2PACKH, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2packl", TILEGX_OPC_V2PACKL, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2packuc", TILEGX_OPC_V2PACKUC, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2sadas", TILEGX_OPC_V2SADAS, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2sadau", TILEGX_OPC_V2SADAU, 0x1, 3, TREG_ZERO, 1,
+    { { 23, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2sads", TILEGX_OPC_V2SADS, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2sadu", TILEGX_OPC_V2SADU, 0x1, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 0, }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2shl", TILEGX_OPC_V2SHL, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2shli", TILEGX_OPC_V2SHLI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2shlsc", TILEGX_OPC_V2SHLSC, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2shrs", TILEGX_OPC_V2SHRS, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2shrsi", TILEGX_OPC_V2SHRSI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2shru", TILEGX_OPC_V2SHRU, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2shrui", TILEGX_OPC_V2SHRUI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 29 }, { 8, 9, 30 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2sub", TILEGX_OPC_V2SUB, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v2subsc", TILEGX_OPC_V2SUBSC, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v4add", TILEGX_OPC_V4ADD, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v4addsc", TILEGX_OPC_V4ADDSC, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v4int_h", TILEGX_OPC_V4INT_H, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v4int_l", TILEGX_OPC_V4INT_L, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v4packsc", TILEGX_OPC_V4PACKSC, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v4shl", TILEGX_OPC_V4SHL, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v4shlsc", TILEGX_OPC_V4SHLSC, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v4shrs", TILEGX_OPC_V4SHRS, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v4shru", TILEGX_OPC_V4SHRU, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v4sub", TILEGX_OPC_V4SUB, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "v4subsc", TILEGX_OPC_V4SUBSC, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "wh64", TILEGX_OPC_WH64, 0x2, 1, TREG_ZERO, 1,
+    { { 0, }, { 9 }, { 0, }, { 0, }, { 0, } },
+  },
+  { "xor", TILEGX_OPC_XOR, 0xf, 3, TREG_ZERO, 1,
+    { { 6, 7, 16 }, { 8, 9, 17 }, { 10, 11, 18 }, { 12, 13, 19 }, { 0, } },
+  },
+  { "xori", TILEGX_OPC_XORI, 0x3, 3, TREG_ZERO, 1,
+    { { 6, 7, 0 }, { 8, 9, 1 }, { 0, }, { 0, }, { 0, } },
+  },
+  { NULL, TILEGX_OPC_NONE, 0, 0, TREG_ZERO, 0, { { 0, } },
+  }
+};
+#define BITFIELD(start, size) ((start) | (((1 << (size)) - 1) << 6))
+#define CHILD(array_index) (TILEGX_OPC_NONE + (array_index))
+
+static const unsigned short decode_X0_fsm[936] =
+{
+  BITFIELD(22, 9) /* index 0 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_BFEXTS,
+  TILEGX_OPC_BFEXTS, TILEGX_OPC_BFEXTS, TILEGX_OPC_BFEXTS, TILEGX_OPC_BFEXTU,
+  TILEGX_OPC_BFEXTU, TILEGX_OPC_BFEXTU, TILEGX_OPC_BFEXTU, TILEGX_OPC_BFINS,
+  TILEGX_OPC_BFINS, TILEGX_OPC_BFINS, TILEGX_OPC_BFINS, TILEGX_OPC_MM,
+  TILEGX_OPC_MM, TILEGX_OPC_MM, TILEGX_OPC_MM, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, CHILD(528), CHILD(578),
+  CHILD(583), CHILD(588), CHILD(593), CHILD(598), TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, CHILD(603), CHILD(620), CHILD(637), CHILD(654), CHILD(671),
+  CHILD(703), CHILD(797), CHILD(814), CHILD(831), CHILD(848), CHILD(865),
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, CHILD(889), TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906),
+  CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906),
+  CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906),
+  CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906),
+  CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906),
+  CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906),
+  CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906),
+  CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906),
+  CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906),
+  CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906),
+  CHILD(906), CHILD(906), CHILD(906), CHILD(906), CHILD(906),
+  BITFIELD(6, 2) /* index 513 */,
+  TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, CHILD(518),
+  BITFIELD(8, 2) /* index 518 */,
+  TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, CHILD(523),
+  BITFIELD(10, 2) /* index 523 */,
+  TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, TILEGX_OPC_MOVELI,
+  BITFIELD(20, 2) /* index 528 */,
+  TILEGX_OPC_NONE, CHILD(533), TILEGX_OPC_ADDXI, CHILD(548),
+  BITFIELD(6, 2) /* index 533 */,
+  TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, CHILD(538),
+  BITFIELD(8, 2) /* index 538 */,
+  TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, CHILD(543),
+  BITFIELD(10, 2) /* index 543 */,
+  TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_MOVEI,
+  BITFIELD(0, 2) /* index 548 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(553),
+  BITFIELD(2, 2) /* index 553 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(558),
+  BITFIELD(4, 2) /* index 558 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(563),
+  BITFIELD(6, 2) /* index 563 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(568),
+  BITFIELD(8, 2) /* index 568 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(573),
+  BITFIELD(10, 2) /* index 573 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_INFO,
+  BITFIELD(20, 2) /* index 578 */,
+  TILEGX_OPC_CMPEQI, TILEGX_OPC_CMPLTSI, TILEGX_OPC_CMPLTUI, TILEGX_OPC_ORI,
+  BITFIELD(20, 2) /* index 583 */,
+  TILEGX_OPC_V1ADDI, TILEGX_OPC_V1CMPEQI, TILEGX_OPC_V1CMPLTSI,
+  TILEGX_OPC_V1CMPLTUI,
+  BITFIELD(20, 2) /* index 588 */,
+  TILEGX_OPC_V1MAXUI, TILEGX_OPC_V1MINUI, TILEGX_OPC_V2ADDI,
+  TILEGX_OPC_V2CMPEQI,
+  BITFIELD(20, 2) /* index 593 */,
+  TILEGX_OPC_V2CMPLTSI, TILEGX_OPC_V2CMPLTUI, TILEGX_OPC_V2MAXSI,
+  TILEGX_OPC_V2MINSI,
+  BITFIELD(20, 2) /* index 598 */,
+  TILEGX_OPC_XORI, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(18, 4) /* index 603 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_ADDXSC, TILEGX_OPC_ADDX, TILEGX_OPC_ADD,
+  TILEGX_OPC_AND, TILEGX_OPC_CMOVEQZ, TILEGX_OPC_CMOVNEZ, TILEGX_OPC_CMPEQ,
+  TILEGX_OPC_CMPLES, TILEGX_OPC_CMPLEU, TILEGX_OPC_CMPLTS, TILEGX_OPC_CMPLTU,
+  TILEGX_OPC_CMPNE, TILEGX_OPC_CMULAF, TILEGX_OPC_CMULA, TILEGX_OPC_CMULFR,
+  BITFIELD(18, 4) /* index 620 */,
+  TILEGX_OPC_CMULF, TILEGX_OPC_CMULHR, TILEGX_OPC_CMULH, TILEGX_OPC_CMUL,
+  TILEGX_OPC_CRC32_32, TILEGX_OPC_CRC32_8, TILEGX_OPC_DBLALIGN2,
+  TILEGX_OPC_DBLALIGN4, TILEGX_OPC_DBLALIGN6, TILEGX_OPC_DBLALIGN,
+  TILEGX_OPC_FDOUBLE_ADDSUB, TILEGX_OPC_FDOUBLE_ADD_FLAGS,
+  TILEGX_OPC_FDOUBLE_MUL_FLAGS, TILEGX_OPC_FDOUBLE_PACK1,
+  TILEGX_OPC_FDOUBLE_PACK2, TILEGX_OPC_FDOUBLE_SUB_FLAGS,
+  BITFIELD(18, 4) /* index 637 */,
+  TILEGX_OPC_FDOUBLE_UNPACK_MAX, TILEGX_OPC_FDOUBLE_UNPACK_MIN,
+  TILEGX_OPC_FSINGLE_ADD1, TILEGX_OPC_FSINGLE_ADDSUB2,
+  TILEGX_OPC_FSINGLE_MUL1, TILEGX_OPC_FSINGLE_MUL2, TILEGX_OPC_FSINGLE_PACK2,
+  TILEGX_OPC_FSINGLE_SUB1, TILEGX_OPC_MNZ, TILEGX_OPC_MULAX,
+  TILEGX_OPC_MULA_HS_HS, TILEGX_OPC_MULA_HS_HU, TILEGX_OPC_MULA_HS_LS,
+  TILEGX_OPC_MULA_HS_LU, TILEGX_OPC_MULA_HU_HU, TILEGX_OPC_MULA_HU_LS,
+  BITFIELD(18, 4) /* index 654 */,
+  TILEGX_OPC_MULA_HU_LU, TILEGX_OPC_MULA_LS_LS, TILEGX_OPC_MULA_LS_LU,
+  TILEGX_OPC_MULA_LU_LU, TILEGX_OPC_MULX, TILEGX_OPC_MUL_HS_HS,
+  TILEGX_OPC_MUL_HS_HU, TILEGX_OPC_MUL_HS_LS, TILEGX_OPC_MUL_HS_LU,
+  TILEGX_OPC_MUL_HU_HU, TILEGX_OPC_MUL_HU_LS, TILEGX_OPC_MUL_HU_LU,
+  TILEGX_OPC_MUL_LS_LS, TILEGX_OPC_MUL_LS_LU, TILEGX_OPC_MUL_LU_LU,
+  TILEGX_OPC_MZ,
+  BITFIELD(18, 4) /* index 671 */,
+  TILEGX_OPC_NOR, CHILD(688), TILEGX_OPC_ROTL, TILEGX_OPC_SHL1ADDX,
+  TILEGX_OPC_SHL1ADD, TILEGX_OPC_SHL2ADDX, TILEGX_OPC_SHL2ADD,
+  TILEGX_OPC_SHL3ADDX, TILEGX_OPC_SHL3ADD, TILEGX_OPC_SHLX, TILEGX_OPC_SHL,
+  TILEGX_OPC_SHRS, TILEGX_OPC_SHRUX, TILEGX_OPC_SHRU, TILEGX_OPC_SHUFFLEBYTES,
+  TILEGX_OPC_SUBXSC,
+  BITFIELD(12, 2) /* index 688 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, CHILD(693),
+  BITFIELD(14, 2) /* index 693 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, CHILD(698),
+  BITFIELD(16, 2) /* index 698 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_MOVE,
+  BITFIELD(18, 4) /* index 703 */,
+  TILEGX_OPC_SUBX, TILEGX_OPC_SUB, CHILD(720), TILEGX_OPC_V1ADDUC,
+  TILEGX_OPC_V1ADD, TILEGX_OPC_V1ADIFFU, TILEGX_OPC_V1AVGU,
+  TILEGX_OPC_V1CMPEQ, TILEGX_OPC_V1CMPLES, TILEGX_OPC_V1CMPLEU,
+  TILEGX_OPC_V1CMPLTS, TILEGX_OPC_V1CMPLTU, TILEGX_OPC_V1CMPNE,
+  TILEGX_OPC_V1DDOTPUSA, TILEGX_OPC_V1DDOTPUS, TILEGX_OPC_V1DOTPA,
+  BITFIELD(12, 4) /* index 720 */,
+  TILEGX_OPC_NONE, CHILD(737), CHILD(742), CHILD(747), CHILD(752), CHILD(757),
+  CHILD(762), CHILD(767), CHILD(772), CHILD(777), CHILD(782), CHILD(787),
+  CHILD(792), TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(16, 2) /* index 737 */,
+  TILEGX_OPC_CLZ, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(16, 2) /* index 742 */,
+  TILEGX_OPC_CTZ, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(16, 2) /* index 747 */,
+  TILEGX_OPC_FNOP, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(16, 2) /* index 752 */,
+  TILEGX_OPC_FSINGLE_PACK1, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(16, 2) /* index 757 */,
+  TILEGX_OPC_NOP, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(16, 2) /* index 762 */,
+  TILEGX_OPC_PCNT, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(16, 2) /* index 767 */,
+  TILEGX_OPC_REVBITS, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(16, 2) /* index 772 */,
+  TILEGX_OPC_REVBYTES, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(16, 2) /* index 777 */,
+  TILEGX_OPC_TBLIDXB0, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(16, 2) /* index 782 */,
+  TILEGX_OPC_TBLIDXB1, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(16, 2) /* index 787 */,
+  TILEGX_OPC_TBLIDXB2, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(16, 2) /* index 792 */,
+  TILEGX_OPC_TBLIDXB3, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(18, 4) /* index 797 */,
+  TILEGX_OPC_V1DOTPUSA, TILEGX_OPC_V1DOTPUS, TILEGX_OPC_V1DOTP,
+  TILEGX_OPC_V1INT_H, TILEGX_OPC_V1INT_L, TILEGX_OPC_V1MAXU,
+  TILEGX_OPC_V1MINU, TILEGX_OPC_V1MNZ, TILEGX_OPC_V1MULTU, TILEGX_OPC_V1MULUS,
+  TILEGX_OPC_V1MULU, TILEGX_OPC_V1MZ, TILEGX_OPC_V1SADAU, TILEGX_OPC_V1SADU,
+  TILEGX_OPC_V1SHL, TILEGX_OPC_V1SHRS,
+  BITFIELD(18, 4) /* index 814 */,
+  TILEGX_OPC_V1SHRU, TILEGX_OPC_V1SUBUC, TILEGX_OPC_V1SUB, TILEGX_OPC_V2ADDSC,
+  TILEGX_OPC_V2ADD, TILEGX_OPC_V2ADIFFS, TILEGX_OPC_V2AVGS,
+  TILEGX_OPC_V2CMPEQ, TILEGX_OPC_V2CMPLES, TILEGX_OPC_V2CMPLEU,
+  TILEGX_OPC_V2CMPLTS, TILEGX_OPC_V2CMPLTU, TILEGX_OPC_V2CMPNE,
+  TILEGX_OPC_V2DOTPA, TILEGX_OPC_V2DOTP, TILEGX_OPC_V2INT_H,
+  BITFIELD(18, 4) /* index 831 */,
+  TILEGX_OPC_V2INT_L, TILEGX_OPC_V2MAXS, TILEGX_OPC_V2MINS, TILEGX_OPC_V2MNZ,
+  TILEGX_OPC_V2MULFSC, TILEGX_OPC_V2MULS, TILEGX_OPC_V2MULTS, TILEGX_OPC_V2MZ,
+  TILEGX_OPC_V2PACKH, TILEGX_OPC_V2PACKL, TILEGX_OPC_V2PACKUC,
+  TILEGX_OPC_V2SADAS, TILEGX_OPC_V2SADAU, TILEGX_OPC_V2SADS,
+  TILEGX_OPC_V2SADU, TILEGX_OPC_V2SHLSC,
+  BITFIELD(18, 4) /* index 848 */,
+  TILEGX_OPC_V2SHL, TILEGX_OPC_V2SHRS, TILEGX_OPC_V2SHRU, TILEGX_OPC_V2SUBSC,
+  TILEGX_OPC_V2SUB, TILEGX_OPC_V4ADDSC, TILEGX_OPC_V4ADD, TILEGX_OPC_V4INT_H,
+  TILEGX_OPC_V4INT_L, TILEGX_OPC_V4PACKSC, TILEGX_OPC_V4SHLSC,
+  TILEGX_OPC_V4SHL, TILEGX_OPC_V4SHRS, TILEGX_OPC_V4SHRU, TILEGX_OPC_V4SUBSC,
+  TILEGX_OPC_V4SUB,
+  BITFIELD(18, 3) /* index 865 */,
+  CHILD(874), CHILD(877), CHILD(880), CHILD(883), CHILD(886), TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(21, 1) /* index 874 */,
+  TILEGX_OPC_XOR, TILEGX_OPC_NONE,
+  BITFIELD(21, 1) /* index 877 */,
+  TILEGX_OPC_V1DDOTPUA, TILEGX_OPC_NONE,
+  BITFIELD(21, 1) /* index 880 */,
+  TILEGX_OPC_V1DDOTPU, TILEGX_OPC_NONE,
+  BITFIELD(21, 1) /* index 883 */,
+  TILEGX_OPC_V1DOTPUA, TILEGX_OPC_NONE,
+  BITFIELD(21, 1) /* index 886 */,
+  TILEGX_OPC_V1DOTPU, TILEGX_OPC_NONE,
+  BITFIELD(18, 4) /* index 889 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_ROTLI, TILEGX_OPC_SHLI, TILEGX_OPC_SHLXI,
+  TILEGX_OPC_SHRSI, TILEGX_OPC_SHRUI, TILEGX_OPC_SHRUXI, TILEGX_OPC_V1SHLI,
+  TILEGX_OPC_V1SHRSI, TILEGX_OPC_V1SHRUI, TILEGX_OPC_V2SHLI,
+  TILEGX_OPC_V2SHRSI, TILEGX_OPC_V2SHRUI, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE,
+  BITFIELD(0, 2) /* index 906 */,
+  TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
+  CHILD(911),
+  BITFIELD(2, 2) /* index 911 */,
+  TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
+  CHILD(916),
+  BITFIELD(4, 2) /* index 916 */,
+  TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
+  CHILD(921),
+  BITFIELD(6, 2) /* index 921 */,
+  TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
+  CHILD(926),
+  BITFIELD(8, 2) /* index 926 */,
+  TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
+  CHILD(931),
+  BITFIELD(10, 2) /* index 931 */,
+  TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
+  TILEGX_OPC_INFOL,
+};
+
+static const unsigned short decode_X1_fsm[1206] =
+{
+  BITFIELD(53, 9) /* index 0 */,
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513), CHILD(513),
+  CHILD(513), CHILD(513), CHILD(513), CHILD(513), TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI,
+  TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_ADDXLI, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_BEQZT,
+  TILEGX_OPC_BEQZT, TILEGX_OPC_BEQZ, TILEGX_OPC_BEQZ, TILEGX_OPC_BGEZT,
+  TILEGX_OPC_BGEZT, TILEGX_OPC_BGEZ, TILEGX_OPC_BGEZ, TILEGX_OPC_BGTZT,
+  TILEGX_OPC_BGTZT, TILEGX_OPC_BGTZ, TILEGX_OPC_BGTZ, TILEGX_OPC_BLBCT,
+  TILEGX_OPC_BLBCT, TILEGX_OPC_BLBC, TILEGX_OPC_BLBC, TILEGX_OPC_BLBST,
+  TILEGX_OPC_BLBST, TILEGX_OPC_BLBS, TILEGX_OPC_BLBS, TILEGX_OPC_BLEZT,
+  TILEGX_OPC_BLEZT, TILEGX_OPC_BLEZ, TILEGX_OPC_BLEZ, TILEGX_OPC_BLTZT,
+  TILEGX_OPC_BLTZT, TILEGX_OPC_BLTZ, TILEGX_OPC_BLTZ, TILEGX_OPC_BNEZT,
+  TILEGX_OPC_BNEZT, TILEGX_OPC_BNEZ, TILEGX_OPC_BNEZ, CHILD(528), CHILD(578),
+  CHILD(598), CHILD(663), CHILD(683), CHILD(688), CHILD(693), CHILD(698),
+  CHILD(703), CHILD(708), CHILD(713), CHILD(718), TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_JAL,
+  TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL,
+  TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL,
+  TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL,
+  TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL,
+  TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL,
+  TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL,
+  TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL,
+  TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_JAL, TILEGX_OPC_J, TILEGX_OPC_J,
+  TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J,
+  TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J,
+  TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J,
+  TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J,
+  TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J,
+  TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J, TILEGX_OPC_J,
+  CHILD(723), CHILD(740), CHILD(772), CHILD(789), CHILD(1108), CHILD(1125),
+  CHILD(1142), TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, CHILD(1159), TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176), CHILD(1176),
+  CHILD(1176),
+  BITFIELD(37, 2) /* index 513 */,
+  TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, CHILD(518),
+  BITFIELD(39, 2) /* index 518 */,
+  TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, CHILD(523),
+  BITFIELD(41, 2) /* index 523 */,
+  TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, TILEGX_OPC_ADDLI, TILEGX_OPC_MOVELI,
+  BITFIELD(51, 2) /* index 528 */,
+  TILEGX_OPC_NONE, CHILD(533), TILEGX_OPC_ADDXI, CHILD(548),
+  BITFIELD(37, 2) /* index 533 */,
+  TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, CHILD(538),
+  BITFIELD(39, 2) /* index 538 */,
+  TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, CHILD(543),
+  BITFIELD(41, 2) /* index 543 */,
+  TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_MOVEI,
+  BITFIELD(31, 2) /* index 548 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(553),
+  BITFIELD(33, 2) /* index 553 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(558),
+  BITFIELD(35, 2) /* index 558 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(563),
+  BITFIELD(37, 2) /* index 563 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(568),
+  BITFIELD(39, 2) /* index 568 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(573),
+  BITFIELD(41, 2) /* index 573 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_INFO,
+  BITFIELD(51, 2) /* index 578 */,
+  TILEGX_OPC_CMPEQI, TILEGX_OPC_CMPLTSI, TILEGX_OPC_CMPLTUI, CHILD(583),
+  BITFIELD(31, 2) /* index 583 */,
+  TILEGX_OPC_LD1S_ADD, TILEGX_OPC_LD1S_ADD, TILEGX_OPC_LD1S_ADD, CHILD(588),
+  BITFIELD(33, 2) /* index 588 */,
+  TILEGX_OPC_LD1S_ADD, TILEGX_OPC_LD1S_ADD, TILEGX_OPC_LD1S_ADD, CHILD(593),
+  BITFIELD(35, 2) /* index 593 */,
+  TILEGX_OPC_LD1S_ADD, TILEGX_OPC_LD1S_ADD, TILEGX_OPC_LD1S_ADD,
+  TILEGX_OPC_PREFETCH_ADD_L1_FAULT,
+  BITFIELD(51, 2) /* index 598 */,
+  CHILD(603), CHILD(618), CHILD(633), CHILD(648),
+  BITFIELD(31, 2) /* index 603 */,
+  TILEGX_OPC_LD1U_ADD, TILEGX_OPC_LD1U_ADD, TILEGX_OPC_LD1U_ADD, CHILD(608),
+  BITFIELD(33, 2) /* index 608 */,
+  TILEGX_OPC_LD1U_ADD, TILEGX_OPC_LD1U_ADD, TILEGX_OPC_LD1U_ADD, CHILD(613),
+  BITFIELD(35, 2) /* index 613 */,
+  TILEGX_OPC_LD1U_ADD, TILEGX_OPC_LD1U_ADD, TILEGX_OPC_LD1U_ADD,
+  TILEGX_OPC_PREFETCH_ADD_L1,
+  BITFIELD(31, 2) /* index 618 */,
+  TILEGX_OPC_LD2S_ADD, TILEGX_OPC_LD2S_ADD, TILEGX_OPC_LD2S_ADD, CHILD(623),
+  BITFIELD(33, 2) /* index 623 */,
+  TILEGX_OPC_LD2S_ADD, TILEGX_OPC_LD2S_ADD, TILEGX_OPC_LD2S_ADD, CHILD(628),
+  BITFIELD(35, 2) /* index 628 */,
+  TILEGX_OPC_LD2S_ADD, TILEGX_OPC_LD2S_ADD, TILEGX_OPC_LD2S_ADD,
+  TILEGX_OPC_PREFETCH_ADD_L2_FAULT,
+  BITFIELD(31, 2) /* index 633 */,
+  TILEGX_OPC_LD2U_ADD, TILEGX_OPC_LD2U_ADD, TILEGX_OPC_LD2U_ADD, CHILD(638),
+  BITFIELD(33, 2) /* index 638 */,
+  TILEGX_OPC_LD2U_ADD, TILEGX_OPC_LD2U_ADD, TILEGX_OPC_LD2U_ADD, CHILD(643),
+  BITFIELD(35, 2) /* index 643 */,
+  TILEGX_OPC_LD2U_ADD, TILEGX_OPC_LD2U_ADD, TILEGX_OPC_LD2U_ADD,
+  TILEGX_OPC_PREFETCH_ADD_L2,
+  BITFIELD(31, 2) /* index 648 */,
+  TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, CHILD(653),
+  BITFIELD(33, 2) /* index 653 */,
+  TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, CHILD(658),
+  BITFIELD(35, 2) /* index 658 */,
+  TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD, TILEGX_OPC_LD4S_ADD,
+  TILEGX_OPC_PREFETCH_ADD_L3_FAULT,
+  BITFIELD(51, 2) /* index 663 */,
+  CHILD(668), TILEGX_OPC_LDNT1S_ADD, TILEGX_OPC_LDNT1U_ADD,
+  TILEGX_OPC_LDNT2S_ADD,
+  BITFIELD(31, 2) /* index 668 */,
+  TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, CHILD(673),
+  BITFIELD(33, 2) /* index 673 */,
+  TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, CHILD(678),
+  BITFIELD(35, 2) /* index 678 */,
+  TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD, TILEGX_OPC_LD4U_ADD,
+  TILEGX_OPC_PREFETCH_ADD_L3,
+  BITFIELD(51, 2) /* index 683 */,
+  TILEGX_OPC_LDNT2U_ADD, TILEGX_OPC_LDNT4S_ADD, TILEGX_OPC_LDNT4U_ADD,
+  TILEGX_OPC_LDNT_ADD,
+  BITFIELD(51, 2) /* index 688 */,
+  TILEGX_OPC_LD_ADD, TILEGX_OPC_LDNA_ADD, TILEGX_OPC_MFSPR, TILEGX_OPC_MTSPR,
+  BITFIELD(51, 2) /* index 693 */,
+  TILEGX_OPC_ORI, TILEGX_OPC_ST1_ADD, TILEGX_OPC_ST2_ADD, TILEGX_OPC_ST4_ADD,
+  BITFIELD(51, 2) /* index 698 */,
+  TILEGX_OPC_STNT1_ADD, TILEGX_OPC_STNT2_ADD, TILEGX_OPC_STNT4_ADD,
+  TILEGX_OPC_STNT_ADD,
+  BITFIELD(51, 2) /* index 703 */,
+  TILEGX_OPC_ST_ADD, TILEGX_OPC_V1ADDI, TILEGX_OPC_V1CMPEQI,
+  TILEGX_OPC_V1CMPLTSI,
+  BITFIELD(51, 2) /* index 708 */,
+  TILEGX_OPC_V1CMPLTUI, TILEGX_OPC_V1MAXUI, TILEGX_OPC_V1MINUI,
+  TILEGX_OPC_V2ADDI,
+  BITFIELD(51, 2) /* index 713 */,
+  TILEGX_OPC_V2CMPEQI, TILEGX_OPC_V2CMPLTSI, TILEGX_OPC_V2CMPLTUI,
+  TILEGX_OPC_V2MAXSI,
+  BITFIELD(51, 2) /* index 718 */,
+  TILEGX_OPC_V2MINSI, TILEGX_OPC_XORI, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(49, 4) /* index 723 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_ADDXSC, TILEGX_OPC_ADDX, TILEGX_OPC_ADD,
+  TILEGX_OPC_AND, TILEGX_OPC_CMPEQ, TILEGX_OPC_CMPEXCH4, TILEGX_OPC_CMPEXCH,
+  TILEGX_OPC_CMPLES, TILEGX_OPC_CMPLEU, TILEGX_OPC_CMPLTS, TILEGX_OPC_CMPLTU,
+  TILEGX_OPC_CMPNE, TILEGX_OPC_DBLALIGN2, TILEGX_OPC_DBLALIGN4,
+  TILEGX_OPC_DBLALIGN6,
+  BITFIELD(49, 4) /* index 740 */,
+  TILEGX_OPC_EXCH4, TILEGX_OPC_EXCH, TILEGX_OPC_FETCHADD4,
+  TILEGX_OPC_FETCHADDGEZ4, TILEGX_OPC_FETCHADDGEZ, TILEGX_OPC_FETCHADD,
+  TILEGX_OPC_FETCHAND4, TILEGX_OPC_FETCHAND, TILEGX_OPC_FETCHOR4,
+  TILEGX_OPC_FETCHOR, TILEGX_OPC_MNZ, TILEGX_OPC_MZ, TILEGX_OPC_NOR,
+  CHILD(757), TILEGX_OPC_ROTL, TILEGX_OPC_SHL1ADDX,
+  BITFIELD(43, 2) /* index 757 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, CHILD(762),
+  BITFIELD(45, 2) /* index 762 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, CHILD(767),
+  BITFIELD(47, 2) /* index 767 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_MOVE,
+  BITFIELD(49, 4) /* index 772 */,
+  TILEGX_OPC_SHL1ADD, TILEGX_OPC_SHL2ADDX, TILEGX_OPC_SHL2ADD,
+  TILEGX_OPC_SHL3ADDX, TILEGX_OPC_SHL3ADD, TILEGX_OPC_SHLX, TILEGX_OPC_SHL,
+  TILEGX_OPC_SHRS, TILEGX_OPC_SHRUX, TILEGX_OPC_SHRU, TILEGX_OPC_ST1,
+  TILEGX_OPC_ST2, TILEGX_OPC_ST4, TILEGX_OPC_STNT1, TILEGX_OPC_STNT2,
+  TILEGX_OPC_STNT4,
+  BITFIELD(46, 7) /* index 789 */,
+  TILEGX_OPC_STNT, TILEGX_OPC_STNT, TILEGX_OPC_STNT, TILEGX_OPC_STNT,
+  TILEGX_OPC_STNT, TILEGX_OPC_STNT, TILEGX_OPC_STNT, TILEGX_OPC_STNT,
+  TILEGX_OPC_ST, TILEGX_OPC_ST, TILEGX_OPC_ST, TILEGX_OPC_ST, TILEGX_OPC_ST,
+  TILEGX_OPC_ST, TILEGX_OPC_ST, TILEGX_OPC_ST, TILEGX_OPC_SUBXSC,
+  TILEGX_OPC_SUBXSC, TILEGX_OPC_SUBXSC, TILEGX_OPC_SUBXSC, TILEGX_OPC_SUBXSC,
+  TILEGX_OPC_SUBXSC, TILEGX_OPC_SUBXSC, TILEGX_OPC_SUBXSC, TILEGX_OPC_SUBX,
+  TILEGX_OPC_SUBX, TILEGX_OPC_SUBX, TILEGX_OPC_SUBX, TILEGX_OPC_SUBX,
+  TILEGX_OPC_SUBX, TILEGX_OPC_SUBX, TILEGX_OPC_SUBX, TILEGX_OPC_SUB,
+  TILEGX_OPC_SUB, TILEGX_OPC_SUB, TILEGX_OPC_SUB, TILEGX_OPC_SUB,
+  TILEGX_OPC_SUB, TILEGX_OPC_SUB, TILEGX_OPC_SUB, CHILD(918), CHILD(927),
+  CHILD(1006), CHILD(1090), CHILD(1099), TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_V1ADDUC, TILEGX_OPC_V1ADDUC, TILEGX_OPC_V1ADDUC,
+  TILEGX_OPC_V1ADDUC, TILEGX_OPC_V1ADDUC, TILEGX_OPC_V1ADDUC,
+  TILEGX_OPC_V1ADDUC, TILEGX_OPC_V1ADDUC, TILEGX_OPC_V1ADD, TILEGX_OPC_V1ADD,
+  TILEGX_OPC_V1ADD, TILEGX_OPC_V1ADD, TILEGX_OPC_V1ADD, TILEGX_OPC_V1ADD,
+  TILEGX_OPC_V1ADD, TILEGX_OPC_V1ADD, TILEGX_OPC_V1CMPEQ, TILEGX_OPC_V1CMPEQ,
+  TILEGX_OPC_V1CMPEQ, TILEGX_OPC_V1CMPEQ, TILEGX_OPC_V1CMPEQ,
+  TILEGX_OPC_V1CMPEQ, TILEGX_OPC_V1CMPEQ, TILEGX_OPC_V1CMPEQ,
+  TILEGX_OPC_V1CMPLES, TILEGX_OPC_V1CMPLES, TILEGX_OPC_V1CMPLES,
+  TILEGX_OPC_V1CMPLES, TILEGX_OPC_V1CMPLES, TILEGX_OPC_V1CMPLES,
+  TILEGX_OPC_V1CMPLES, TILEGX_OPC_V1CMPLES, TILEGX_OPC_V1CMPLEU,
+  TILEGX_OPC_V1CMPLEU, TILEGX_OPC_V1CMPLEU, TILEGX_OPC_V1CMPLEU,
+  TILEGX_OPC_V1CMPLEU, TILEGX_OPC_V1CMPLEU, TILEGX_OPC_V1CMPLEU,
+  TILEGX_OPC_V1CMPLEU, TILEGX_OPC_V1CMPLTS, TILEGX_OPC_V1CMPLTS,
+  TILEGX_OPC_V1CMPLTS, TILEGX_OPC_V1CMPLTS, TILEGX_OPC_V1CMPLTS,
+  TILEGX_OPC_V1CMPLTS, TILEGX_OPC_V1CMPLTS, TILEGX_OPC_V1CMPLTS,
+  TILEGX_OPC_V1CMPLTU, TILEGX_OPC_V1CMPLTU, TILEGX_OPC_V1CMPLTU,
+  TILEGX_OPC_V1CMPLTU, TILEGX_OPC_V1CMPLTU, TILEGX_OPC_V1CMPLTU,
+  TILEGX_OPC_V1CMPLTU, TILEGX_OPC_V1CMPLTU, TILEGX_OPC_V1CMPNE,
+  TILEGX_OPC_V1CMPNE, TILEGX_OPC_V1CMPNE, TILEGX_OPC_V1CMPNE,
+  TILEGX_OPC_V1CMPNE, TILEGX_OPC_V1CMPNE, TILEGX_OPC_V1CMPNE,
+  TILEGX_OPC_V1CMPNE, TILEGX_OPC_V1INT_H, TILEGX_OPC_V1INT_H,
+  TILEGX_OPC_V1INT_H, TILEGX_OPC_V1INT_H, TILEGX_OPC_V1INT_H,
+  TILEGX_OPC_V1INT_H, TILEGX_OPC_V1INT_H, TILEGX_OPC_V1INT_H,
+  TILEGX_OPC_V1INT_L, TILEGX_OPC_V1INT_L, TILEGX_OPC_V1INT_L,
+  TILEGX_OPC_V1INT_L, TILEGX_OPC_V1INT_L, TILEGX_OPC_V1INT_L,
+  TILEGX_OPC_V1INT_L, TILEGX_OPC_V1INT_L,
+  BITFIELD(43, 3) /* index 918 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_DRAIN, TILEGX_OPC_DTLBPR, TILEGX_OPC_FINV,
+  TILEGX_OPC_FLUSHWB, TILEGX_OPC_FLUSH, TILEGX_OPC_FNOP, TILEGX_OPC_ICOH,
+  BITFIELD(43, 3) /* index 927 */,
+  CHILD(936), TILEGX_OPC_INV, TILEGX_OPC_IRET, TILEGX_OPC_JALRP,
+  TILEGX_OPC_JALR, TILEGX_OPC_JRP, TILEGX_OPC_JR, CHILD(991),
+  BITFIELD(31, 2) /* index 936 */,
+  CHILD(941), CHILD(966), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(33, 2) /* index 941 */,
+  TILEGX_OPC_ILL, TILEGX_OPC_ILL, TILEGX_OPC_ILL, CHILD(946),
+  BITFIELD(35, 2) /* index 946 */,
+  TILEGX_OPC_ILL, CHILD(951), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(37, 2) /* index 951 */,
+  TILEGX_OPC_ILL, CHILD(956), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(39, 2) /* index 956 */,
+  TILEGX_OPC_ILL, CHILD(961), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(41, 2) /* index 961 */,
+  TILEGX_OPC_ILL, TILEGX_OPC_ILL, TILEGX_OPC_BPT, TILEGX_OPC_ILL,
+  BITFIELD(33, 2) /* index 966 */,
+  TILEGX_OPC_ILL, TILEGX_OPC_ILL, TILEGX_OPC_ILL, CHILD(971),
+  BITFIELD(35, 2) /* index 971 */,
+  TILEGX_OPC_ILL, CHILD(976), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(37, 2) /* index 976 */,
+  TILEGX_OPC_ILL, CHILD(981), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(39, 2) /* index 981 */,
+  TILEGX_OPC_ILL, CHILD(986), TILEGX_OPC_ILL, TILEGX_OPC_ILL,
+  BITFIELD(41, 2) /* index 986 */,
+  TILEGX_OPC_ILL, TILEGX_OPC_ILL, TILEGX_OPC_RAISE, TILEGX_OPC_ILL,
+  BITFIELD(31, 2) /* index 991 */,
+  TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, CHILD(996),
+  BITFIELD(33, 2) /* index 996 */,
+  TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, CHILD(1001),
+  BITFIELD(35, 2) /* index 1001 */,
+  TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, TILEGX_OPC_LD1S,
+  TILEGX_OPC_PREFETCH_L1_FAULT,
+  BITFIELD(43, 3) /* index 1006 */,
+  CHILD(1015), CHILD(1030), CHILD(1045), CHILD(1060), CHILD(1075),
+  TILEGX_OPC_LDNA, TILEGX_OPC_LDNT1S, TILEGX_OPC_LDNT1U,
+  BITFIELD(31, 2) /* index 1015 */,
+  TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, CHILD(1020),
+  BITFIELD(33, 2) /* index 1020 */,
+  TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, CHILD(1025),
+  BITFIELD(35, 2) /* index 1025 */,
+  TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_PREFETCH,
+  BITFIELD(31, 2) /* index 1030 */,
+  TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, CHILD(1035),
+  BITFIELD(33, 2) /* index 1035 */,
+  TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, CHILD(1040),
+  BITFIELD(35, 2) /* index 1040 */,
+  TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, TILEGX_OPC_LD2S,
+  TILEGX_OPC_PREFETCH_L2_FAULT,
+  BITFIELD(31, 2) /* index 1045 */,
+  TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, CHILD(1050),
+  BITFIELD(33, 2) /* index 1050 */,
+  TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, CHILD(1055),
+  BITFIELD(35, 2) /* index 1055 */,
+  TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_PREFETCH_L2,
+  BITFIELD(31, 2) /* index 1060 */,
+  TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, CHILD(1065),
+  BITFIELD(33, 2) /* index 1065 */,
+  TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, CHILD(1070),
+  BITFIELD(35, 2) /* index 1070 */,
+  TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, TILEGX_OPC_LD4S,
+  TILEGX_OPC_PREFETCH_L3_FAULT,
+  BITFIELD(31, 2) /* index 1075 */,
+  TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, CHILD(1080),
+  BITFIELD(33, 2) /* index 1080 */,
+  TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, CHILD(1085),
+  BITFIELD(35, 2) /* index 1085 */,
+  TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, TILEGX_OPC_PREFETCH_L3,
+  BITFIELD(43, 3) /* index 1090 */,
+  TILEGX_OPC_LDNT2S, TILEGX_OPC_LDNT2U, TILEGX_OPC_LDNT4S, TILEGX_OPC_LDNT4U,
+  TILEGX_OPC_LDNT, TILEGX_OPC_LD, TILEGX_OPC_LNK, TILEGX_OPC_MF,
+  BITFIELD(43, 3) /* index 1099 */,
+  TILEGX_OPC_NAP, TILEGX_OPC_NOP, TILEGX_OPC_SWINT0, TILEGX_OPC_SWINT1,
+  TILEGX_OPC_SWINT2, TILEGX_OPC_SWINT3, TILEGX_OPC_WH64, TILEGX_OPC_NONE,
+  BITFIELD(49, 4) /* index 1108 */,
+  TILEGX_OPC_V1MAXU, TILEGX_OPC_V1MINU, TILEGX_OPC_V1MNZ, TILEGX_OPC_V1MZ,
+  TILEGX_OPC_V1SHL, TILEGX_OPC_V1SHRS, TILEGX_OPC_V1SHRU, TILEGX_OPC_V1SUBUC,
+  TILEGX_OPC_V1SUB, TILEGX_OPC_V2ADDSC, TILEGX_OPC_V2ADD, TILEGX_OPC_V2CMPEQ,
+  TILEGX_OPC_V2CMPLES, TILEGX_OPC_V2CMPLEU, TILEGX_OPC_V2CMPLTS,
+  TILEGX_OPC_V2CMPLTU,
+  BITFIELD(49, 4) /* index 1125 */,
+  TILEGX_OPC_V2CMPNE, TILEGX_OPC_V2INT_H, TILEGX_OPC_V2INT_L,
+  TILEGX_OPC_V2MAXS, TILEGX_OPC_V2MINS, TILEGX_OPC_V2MNZ, TILEGX_OPC_V2MZ,
+  TILEGX_OPC_V2PACKH, TILEGX_OPC_V2PACKL, TILEGX_OPC_V2PACKUC,
+  TILEGX_OPC_V2SHLSC, TILEGX_OPC_V2SHL, TILEGX_OPC_V2SHRS, TILEGX_OPC_V2SHRU,
+  TILEGX_OPC_V2SUBSC, TILEGX_OPC_V2SUB,
+  BITFIELD(49, 4) /* index 1142 */,
+  TILEGX_OPC_V4ADDSC, TILEGX_OPC_V4ADD, TILEGX_OPC_V4INT_H,
+  TILEGX_OPC_V4INT_L, TILEGX_OPC_V4PACKSC, TILEGX_OPC_V4SHLSC,
+  TILEGX_OPC_V4SHL, TILEGX_OPC_V4SHRS, TILEGX_OPC_V4SHRU, TILEGX_OPC_V4SUBSC,
+  TILEGX_OPC_V4SUB, TILEGX_OPC_XOR, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(49, 4) /* index 1159 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_ROTLI, TILEGX_OPC_SHLI, TILEGX_OPC_SHLXI,
+  TILEGX_OPC_SHRSI, TILEGX_OPC_SHRUI, TILEGX_OPC_SHRUXI, TILEGX_OPC_V1SHLI,
+  TILEGX_OPC_V1SHRSI, TILEGX_OPC_V1SHRUI, TILEGX_OPC_V2SHLI,
+  TILEGX_OPC_V2SHRSI, TILEGX_OPC_V2SHRUI, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE,
+  BITFIELD(31, 2) /* index 1176 */,
+  TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
+  CHILD(1181),
+  BITFIELD(33, 2) /* index 1181 */,
+  TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
+  CHILD(1186),
+  BITFIELD(35, 2) /* index 1186 */,
+  TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
+  CHILD(1191),
+  BITFIELD(37, 2) /* index 1191 */,
+  TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
+  CHILD(1196),
+  BITFIELD(39, 2) /* index 1196 */,
+  TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
+  CHILD(1201),
+  BITFIELD(41, 2) /* index 1201 */,
+  TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI, TILEGX_OPC_SHL16INSLI,
+  TILEGX_OPC_INFOL,
+};
+
+static const unsigned short decode_Y0_fsm[178] =
+{
+  BITFIELD(27, 4) /* index 0 */,
+  CHILD(17), TILEGX_OPC_ADDXI, CHILD(32), TILEGX_OPC_CMPEQI,
+  TILEGX_OPC_CMPLTSI, CHILD(62), CHILD(67), CHILD(118), CHILD(123),
+  CHILD(128), CHILD(133), CHILD(153), CHILD(158), CHILD(163), CHILD(168),
+  CHILD(173),
+  BITFIELD(6, 2) /* index 17 */,
+  TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, CHILD(22),
+  BITFIELD(8, 2) /* index 22 */,
+  TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, CHILD(27),
+  BITFIELD(10, 2) /* index 27 */,
+  TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_MOVEI,
+  BITFIELD(0, 2) /* index 32 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(37),
+  BITFIELD(2, 2) /* index 37 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(42),
+  BITFIELD(4, 2) /* index 42 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(47),
+  BITFIELD(6, 2) /* index 47 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(52),
+  BITFIELD(8, 2) /* index 52 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(57),
+  BITFIELD(10, 2) /* index 57 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_INFO,
+  BITFIELD(18, 2) /* index 62 */,
+  TILEGX_OPC_ADDX, TILEGX_OPC_ADD, TILEGX_OPC_SUBX, TILEGX_OPC_SUB,
+  BITFIELD(15, 5) /* index 67 */,
+  TILEGX_OPC_SHL1ADD, TILEGX_OPC_SHL1ADD, TILEGX_OPC_SHL1ADD,
+  TILEGX_OPC_SHL1ADD, TILEGX_OPC_SHL1ADD, TILEGX_OPC_SHL1ADD,
+  TILEGX_OPC_SHL1ADD, TILEGX_OPC_SHL1ADD, TILEGX_OPC_SHL2ADD,
+  TILEGX_OPC_SHL2ADD, TILEGX_OPC_SHL2ADD, TILEGX_OPC_SHL2ADD,
+  TILEGX_OPC_SHL2ADD, TILEGX_OPC_SHL2ADD, TILEGX_OPC_SHL2ADD,
+  TILEGX_OPC_SHL2ADD, TILEGX_OPC_SHL3ADD, TILEGX_OPC_SHL3ADD,
+  TILEGX_OPC_SHL3ADD, TILEGX_OPC_SHL3ADD, TILEGX_OPC_SHL3ADD,
+  TILEGX_OPC_SHL3ADD, TILEGX_OPC_SHL3ADD, TILEGX_OPC_SHL3ADD, CHILD(100),
+  CHILD(109), TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(12, 3) /* index 100 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_CLZ, TILEGX_OPC_CTZ, TILEGX_OPC_FNOP,
+  TILEGX_OPC_FSINGLE_PACK1, TILEGX_OPC_NOP, TILEGX_OPC_PCNT,
+  TILEGX_OPC_REVBITS,
+  BITFIELD(12, 3) /* index 109 */,
+  TILEGX_OPC_REVBYTES, TILEGX_OPC_TBLIDXB0, TILEGX_OPC_TBLIDXB1,
+  TILEGX_OPC_TBLIDXB2, TILEGX_OPC_TBLIDXB3, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  TILEGX_OPC_NONE,
+  BITFIELD(18, 2) /* index 118 */,
+  TILEGX_OPC_CMPLES, TILEGX_OPC_CMPLEU, TILEGX_OPC_CMPLTS, TILEGX_OPC_CMPLTU,
+  BITFIELD(18, 2) /* index 123 */,
+  TILEGX_OPC_CMPEQ, TILEGX_OPC_CMPNE, TILEGX_OPC_MULAX, TILEGX_OPC_MULX,
+  BITFIELD(18, 2) /* index 128 */,
+  TILEGX_OPC_CMOVEQZ, TILEGX_OPC_CMOVNEZ, TILEGX_OPC_MNZ, TILEGX_OPC_MZ,
+  BITFIELD(18, 2) /* index 133 */,
+  TILEGX_OPC_AND, TILEGX_OPC_NOR, CHILD(138), TILEGX_OPC_XOR,
+  BITFIELD(12, 2) /* index 138 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, CHILD(143),
+  BITFIELD(14, 2) /* index 143 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, CHILD(148),
+  BITFIELD(16, 2) /* index 148 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_MOVE,
+  BITFIELD(18, 2) /* index 153 */,
+  TILEGX_OPC_ROTL, TILEGX_OPC_SHL, TILEGX_OPC_SHRS, TILEGX_OPC_SHRU,
+  BITFIELD(18, 2) /* index 158 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_SHL1ADDX, TILEGX_OPC_SHL2ADDX,
+  TILEGX_OPC_SHL3ADDX,
+  BITFIELD(18, 2) /* index 163 */,
+  TILEGX_OPC_MUL_HS_HS, TILEGX_OPC_MUL_HU_HU, TILEGX_OPC_MUL_LS_LS,
+  TILEGX_OPC_MUL_LU_LU,
+  BITFIELD(18, 2) /* index 168 */,
+  TILEGX_OPC_MULA_HS_HS, TILEGX_OPC_MULA_HU_HU, TILEGX_OPC_MULA_LS_LS,
+  TILEGX_OPC_MULA_LU_LU,
+  BITFIELD(18, 2) /* index 173 */,
+  TILEGX_OPC_ROTLI, TILEGX_OPC_SHLI, TILEGX_OPC_SHRSI, TILEGX_OPC_SHRUI,
+};
+
+static const unsigned short decode_Y1_fsm[167] =
+{
+  BITFIELD(58, 4) /* index 0 */,
+  TILEGX_OPC_NONE, CHILD(17), TILEGX_OPC_ADDXI, CHILD(32), TILEGX_OPC_CMPEQI,
+  TILEGX_OPC_CMPLTSI, CHILD(62), CHILD(67), CHILD(117), CHILD(122),
+  CHILD(127), CHILD(132), CHILD(152), CHILD(157), CHILD(162), TILEGX_OPC_NONE,
+  BITFIELD(37, 2) /* index 17 */,
+  TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, CHILD(22),
+  BITFIELD(39, 2) /* index 22 */,
+  TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, CHILD(27),
+  BITFIELD(41, 2) /* index 27 */,
+  TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_ADDI, TILEGX_OPC_MOVEI,
+  BITFIELD(31, 2) /* index 32 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(37),
+  BITFIELD(33, 2) /* index 37 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(42),
+  BITFIELD(35, 2) /* index 42 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(47),
+  BITFIELD(37, 2) /* index 47 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(52),
+  BITFIELD(39, 2) /* index 52 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, CHILD(57),
+  BITFIELD(41, 2) /* index 57 */,
+  TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_ANDI, TILEGX_OPC_INFO,
+  BITFIELD(49, 2) /* index 62 */,
+  TILEGX_OPC_ADDX, TILEGX_OPC_ADD, TILEGX_OPC_SUBX, TILEGX_OPC_SUB,
+  BITFIELD(47, 4) /* index 67 */,
+  TILEGX_OPC_SHL1ADD, TILEGX_OPC_SHL1ADD, TILEGX_OPC_SHL1ADD,
+  TILEGX_OPC_SHL1ADD, TILEGX_OPC_SHL2ADD, TILEGX_OPC_SHL2ADD,
+  TILEGX_OPC_SHL2ADD, TILEGX_OPC_SHL2ADD, TILEGX_OPC_SHL3ADD,
+  TILEGX_OPC_SHL3ADD, TILEGX_OPC_SHL3ADD, TILEGX_OPC_SHL3ADD, CHILD(84),
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_NONE,
+  BITFIELD(43, 3) /* index 84 */,
+  CHILD(93), CHILD(96), CHILD(99), CHILD(102), CHILD(105), CHILD(108),
+  CHILD(111), CHILD(114),
+  BITFIELD(46, 1) /* index 93 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_FNOP,
+  BITFIELD(46, 1) /* index 96 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_ILL,
+  BITFIELD(46, 1) /* index 99 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_JALRP,
+  BITFIELD(46, 1) /* index 102 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_JALR,
+  BITFIELD(46, 1) /* index 105 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_JRP,
+  BITFIELD(46, 1) /* index 108 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_JR,
+  BITFIELD(46, 1) /* index 111 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_LNK,
+  BITFIELD(46, 1) /* index 114 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_NOP,
+  BITFIELD(49, 2) /* index 117 */,
+  TILEGX_OPC_CMPLES, TILEGX_OPC_CMPLEU, TILEGX_OPC_CMPLTS, TILEGX_OPC_CMPLTU,
+  BITFIELD(49, 2) /* index 122 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_CMPEQ, TILEGX_OPC_CMPNE,
+  BITFIELD(49, 2) /* index 127 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_NONE, TILEGX_OPC_MNZ, TILEGX_OPC_MZ,
+  BITFIELD(49, 2) /* index 132 */,
+  TILEGX_OPC_AND, TILEGX_OPC_NOR, CHILD(137), TILEGX_OPC_XOR,
+  BITFIELD(43, 2) /* index 137 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, CHILD(142),
+  BITFIELD(45, 2) /* index 142 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, CHILD(147),
+  BITFIELD(47, 2) /* index 147 */,
+  TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_OR, TILEGX_OPC_MOVE,
+  BITFIELD(49, 2) /* index 152 */,
+  TILEGX_OPC_ROTL, TILEGX_OPC_SHL, TILEGX_OPC_SHRS, TILEGX_OPC_SHRU,
+  BITFIELD(49, 2) /* index 157 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_SHL1ADDX, TILEGX_OPC_SHL2ADDX,
+  TILEGX_OPC_SHL3ADDX,
+  BITFIELD(49, 2) /* index 162 */,
+  TILEGX_OPC_ROTLI, TILEGX_OPC_SHLI, TILEGX_OPC_SHRSI, TILEGX_OPC_SHRUI,
+};
+
+static const unsigned short decode_Y2_fsm[118] =
+{
+  BITFIELD(62, 2) /* index 0 */,
+  TILEGX_OPC_NONE, CHILD(5), CHILD(66), CHILD(109),
+  BITFIELD(55, 3) /* index 5 */,
+  CHILD(14), CHILD(14), CHILD(14), CHILD(17), CHILD(40), CHILD(40), CHILD(40),
+  CHILD(43),
+  BITFIELD(26, 1) /* index 14 */,
+  TILEGX_OPC_LD1S, TILEGX_OPC_LD1U,
+  BITFIELD(26, 1) /* index 17 */,
+  CHILD(20), CHILD(30),
+  BITFIELD(51, 2) /* index 20 */,
+  TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, CHILD(25),
+  BITFIELD(53, 2) /* index 25 */,
+  TILEGX_OPC_LD1S, TILEGX_OPC_LD1S, TILEGX_OPC_LD1S,
+  TILEGX_OPC_PREFETCH_L1_FAULT,
+  BITFIELD(51, 2) /* index 30 */,
+  TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, CHILD(35),
+  BITFIELD(53, 2) /* index 35 */,
+  TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_LD1U, TILEGX_OPC_PREFETCH,
+  BITFIELD(26, 1) /* index 40 */,
+  TILEGX_OPC_LD2S, TILEGX_OPC_LD2U,
+  BITFIELD(26, 1) /* index 43 */,
+  CHILD(46), CHILD(56),
+  BITFIELD(51, 2) /* index 46 */,
+  TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, CHILD(51),
+  BITFIELD(53, 2) /* index 51 */,
+  TILEGX_OPC_LD2S, TILEGX_OPC_LD2S, TILEGX_OPC_LD2S,
+  TILEGX_OPC_PREFETCH_L2_FAULT,
+  BITFIELD(51, 2) /* index 56 */,
+  TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, CHILD(61),
+  BITFIELD(53, 2) /* index 61 */,
+  TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_LD2U, TILEGX_OPC_PREFETCH_L2,
+  BITFIELD(56, 2) /* index 66 */,
+  CHILD(71), CHILD(74), CHILD(90), CHILD(93),
+  BITFIELD(26, 1) /* index 71 */,
+  TILEGX_OPC_NONE, TILEGX_OPC_LD4S,
+  BITFIELD(26, 1) /* index 74 */,
+  TILEGX_OPC_NONE, CHILD(77),
+  BITFIELD(51, 2) /* index 77 */,
+  TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, CHILD(82),
+  BITFIELD(53, 2) /* index 82 */,
+  TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, TILEGX_OPC_LD4S, CHILD(87),
+  BITFIELD(55, 1) /* index 87 */,
+  TILEGX_OPC_LD4S, TILEGX_OPC_PREFETCH_L3_FAULT,
+  BITFIELD(26, 1) /* index 90 */,
+  TILEGX_OPC_LD4U, TILEGX_OPC_LD,
+  BITFIELD(26, 1) /* index 93 */,
+  CHILD(96), TILEGX_OPC_LD,
+  BITFIELD(51, 2) /* index 96 */,
+  TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, CHILD(101),
+  BITFIELD(53, 2) /* index 101 */,
+  TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, TILEGX_OPC_LD4U, CHILD(106),
+  BITFIELD(55, 1) /* index 106 */,
+  TILEGX_OPC_LD4U, TILEGX_OPC_PREFETCH_L3,
+  BITFIELD(26, 1) /* index 109 */,
+  CHILD(112), CHILD(115),
+  BITFIELD(57, 1) /* index 112 */,
+  TILEGX_OPC_ST1, TILEGX_OPC_ST4,
+  BITFIELD(57, 1) /* index 115 */,
+  TILEGX_OPC_ST2, TILEGX_OPC_ST,
+};
+
+#undef BITFIELD
+#undef CHILD
+const unsigned short * const
+tilegx_bundle_decoder_fsms[TILEGX_NUM_PIPELINE_ENCODINGS] =
+{
+  decode_X0_fsm,
+  decode_X1_fsm,
+  decode_Y0_fsm,
+  decode_Y1_fsm,
+  decode_Y2_fsm
+};
+const struct tilegx_operand tilegx_operands[35] =
+{
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(TILEGX_IMM8_X0),
+    8, 1, 0, 0, 0, 0,
+    create_Imm8_X0, get_Imm8_X0
+  },
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(TILEGX_IMM8_X1),
+    8, 1, 0, 0, 0, 0,
+    create_Imm8_X1, get_Imm8_X1
+  },
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(TILEGX_IMM8_Y0),
+    8, 1, 0, 0, 0, 0,
+    create_Imm8_Y0, get_Imm8_Y0
+  },
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(TILEGX_IMM8_Y1),
+    8, 1, 0, 0, 0, 0,
+    create_Imm8_Y1, get_Imm8_Y1
+  },
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(TILEGX_IMM16_X0_HW0_LAST),
+    16, 1, 0, 0, 0, 0,
+    create_Imm16_X0, get_Imm16_X0
+  },
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(TILEGX_IMM16_X1_HW0_LAST),
+    16, 1, 0, 0, 0, 0,
+    create_Imm16_X1, get_Imm16_X1
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 0, 1, 0, 0,
+    create_Dest_X0, get_Dest_X0
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 0, 0, 0,
+    create_SrcA_X0, get_SrcA_X0
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 0, 1, 0, 0,
+    create_Dest_X1, get_Dest_X1
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 0, 0, 0,
+    create_SrcA_X1, get_SrcA_X1
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 0, 1, 0, 0,
+    create_Dest_Y0, get_Dest_Y0
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 0, 0, 0,
+    create_SrcA_Y0, get_SrcA_Y0
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 0, 1, 0, 0,
+    create_Dest_Y1, get_Dest_Y1
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 0, 0, 0,
+    create_SrcA_Y1, get_SrcA_Y1
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 0, 0, 0,
+    create_SrcA_Y2, get_SrcA_Y2
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 1, 0, 0,
+    create_SrcA_X1, get_SrcA_X1
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 0, 0, 0,
+    create_SrcB_X0, get_SrcB_X0
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 0, 0, 0,
+    create_SrcB_X1, get_SrcB_X1
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 0, 0, 0,
+    create_SrcB_Y0, get_SrcB_Y0
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 0, 0, 0,
+    create_SrcB_Y1, get_SrcB_Y1
+  },
+  {
+    TILEGX_OP_TYPE_ADDRESS, BFD_RELOC(TILEGX_BROFF_X1),
+    17, 1, 0, 0, 1, TILEGX_LOG2_BUNDLE_ALIGNMENT_IN_BYTES,
+    create_BrOff_X1, get_BrOff_X1
+  },
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(NONE),
+    6, 0, 0, 0, 0, 0,
+    create_BFStart_X0, get_BFStart_X0
+  },
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(NONE),
+    6, 0, 0, 0, 0, 0,
+    create_BFEnd_X0, get_BFEnd_X0
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 1, 0, 0,
+    create_Dest_X0, get_Dest_X0
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 1, 0, 0,
+    create_Dest_Y0, get_Dest_Y0
+  },
+  {
+    TILEGX_OP_TYPE_ADDRESS, BFD_RELOC(TILEGX_JUMPOFF_X1),
+    27, 1, 0, 0, 1, TILEGX_LOG2_BUNDLE_ALIGNMENT_IN_BYTES,
+    create_JumpOff_X1, get_JumpOff_X1
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 0, 1, 0, 0,
+    create_SrcBDest_Y2, get_SrcBDest_Y2
+  },
+  {
+    TILEGX_OP_TYPE_SPR, BFD_RELOC(TILEGX_MF_IMM14_X1),
+    14, 0, 0, 0, 0, 0,
+    create_MF_Imm14_X1, get_MF_Imm14_X1
+  },
+  {
+    TILEGX_OP_TYPE_SPR, BFD_RELOC(TILEGX_MT_IMM14_X1),
+    14, 0, 0, 0, 0, 0,
+    create_MT_Imm14_X1, get_MT_Imm14_X1
+  },
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(TILEGX_SHAMT_X0),
+    6, 0, 0, 0, 0, 0,
+    create_ShAmt_X0, get_ShAmt_X0
+  },
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(TILEGX_SHAMT_X1),
+    6, 0, 0, 0, 0, 0,
+    create_ShAmt_X1, get_ShAmt_X1
+  },
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(TILEGX_SHAMT_Y0),
+    6, 0, 0, 0, 0, 0,
+    create_ShAmt_Y0, get_ShAmt_Y0
+  },
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(TILEGX_SHAMT_Y1),
+    6, 0, 0, 0, 0, 0,
+    create_ShAmt_Y1, get_ShAmt_Y1
+  },
+  {
+    TILEGX_OP_TYPE_REGISTER, BFD_RELOC(NONE),
+    6, 0, 1, 0, 0, 0,
+    create_SrcBDest_Y2, get_SrcBDest_Y2
+  },
+  {
+    TILEGX_OP_TYPE_IMMEDIATE, BFD_RELOC(TILEGX_DEST_IMM8_X1),
+    8, 1, 0, 0, 0, 0,
+    create_Dest_Imm8_X1, get_Dest_Imm8_X1
+  }
+};
+
+
+
+
+/* Given a set of bundle bits and the lookup FSM for a specific pipe,
+ * returns which instruction the bundle contains in that pipe.
+ */
+static const struct tilegx_opcode *
+find_opcode(tilegx_bundle_bits bits, const unsigned short *table)
+{
+  int index = 0;
+
+  while (1)
+  {
+    unsigned short bitspec = table[index];
+    unsigned int bitfield =
+      ((unsigned int)(bits >> (bitspec & 63))) & (bitspec >> 6);
+
+    unsigned short next = table[index + 1 + bitfield];
+    if (next <= TILEGX_OPC_NONE)
+      return &tilegx_opcodes[next];
+
+    index = next - TILEGX_OPC_NONE;
+  }
+}
+
+
+int
+parse_insn_tilegx(tilegx_bundle_bits bits,
+                  unsigned long long pc,
+                  struct tilegx_decoded_instruction
+                  decoded[TILEGX_MAX_INSTRUCTIONS_PER_BUNDLE])
+{
+  int num_instructions = 0;
+  int pipe;
+
+  int min_pipe, max_pipe;
+  if ((bits & TILEGX_BUNDLE_MODE_MASK) == 0)
+  {
+    min_pipe = TILEGX_PIPELINE_X0;
+    max_pipe = TILEGX_PIPELINE_X1;
+  }
+  else
+  {
+    min_pipe = TILEGX_PIPELINE_Y0;
+    max_pipe = TILEGX_PIPELINE_Y2;
+  }
+
+  /* For each pipe, find an instruction that fits. */
+  for (pipe = min_pipe; pipe <= max_pipe; pipe++)
+  {
+    const struct tilegx_opcode *opc;
+    struct tilegx_decoded_instruction *d;
+    int i;
+
+    d = &decoded[num_instructions++];
+    opc = find_opcode (bits, tilegx_bundle_decoder_fsms[pipe]);
+    d->opcode = opc;
+
+    /* Decode each operand, sign extending, etc. as appropriate. */
+    for (i = 0; i < opc->num_operands; i++)
+    {
+      const struct tilegx_operand *op =
+        &tilegx_operands[opc->operands[pipe][i]];
+      int raw_opval = op->extract (bits);
+      long long opval;
+
+      if (op->is_signed)
+      {
+        /* Sign-extend the operand. */
+        int shift = (int)((sizeof(int) * 8) - op->num_bits);
+        raw_opval = (raw_opval << shift) >> shift;
+      }
+
+      /* Adjust PC-relative scaled branch offsets. */
+      if (op->type == TILEGX_OP_TYPE_ADDRESS)
+        opval = (raw_opval * TILEGX_BUNDLE_SIZE_IN_BYTES) + pc;
+      else
+        opval = raw_opval;
+
+      /* Record the final value. */
+      d->operands[i] = op;
+      d->operand_values[i] = opval;
+    }
+  }
+
+  return num_instructions;
+}
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index 49a605be94c5..c4be58cc5d50 100644
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
@@ -22,6 +22,7 @@
 #include <linux/sched.h>
 #include <linux/smp.h>
 #include <linux/delay.h>
+#include <linux/module.h>
 #include <asm/irq_regs.h>
 #include <asm/traps.h>
 #include <hv/hypervisor.h>
@@ -56,6 +57,7 @@ cycles_t get_cycles(void)
 
         return (((cycles_t)high) << 32) | low;
 }
+EXPORT_SYMBOL(get_cycles);
 #endif
 
 /*
diff --git a/arch/tile/kernel/tlb.c b/arch/tile/kernel/tlb.c
index 2dffc1044d83..a5f241c24cac 100644
--- a/arch/tile/kernel/tlb.c
+++ b/arch/tile/kernel/tlb.c
@@ -34,13 +34,13 @@ void flush_tlb_mm(struct mm_struct *mm)
 {
         HV_Remote_ASID asids[NR_CPUS];
         int i = 0, cpu;
-        for_each_cpu(cpu, &mm->cpu_vm_mask) {
+        for_each_cpu(cpu, mm_cpumask(mm)) {
                 HV_Remote_ASID *asid = &asids[i++];
                 asid->y = cpu / smp_topology.width;
                 asid->x = cpu % smp_topology.width;
                 asid->asid = per_cpu(current_asid, cpu);
         }
-        flush_remote(0, HV_FLUSH_EVICT_L1I, &mm->cpu_vm_mask,
+        flush_remote(0, HV_FLUSH_EVICT_L1I, mm_cpumask(mm),
                      0, 0, 0, NULL, asids, i);
 }
 
@@ -54,8 +54,8 @@ void flush_tlb_page_mm(const struct vm_area_struct *vma, struct mm_struct *mm,
 {
         unsigned long size = hv_page_size(vma);
         int cache = (vma->vm_flags & VM_EXEC) ? HV_FLUSH_EVICT_L1I : 0;
-        flush_remote(0, cache, &mm->cpu_vm_mask,
-                     va, size, size, &mm->cpu_vm_mask, NULL, 0);
+        flush_remote(0, cache, mm_cpumask(mm),
+                     va, size, size, mm_cpumask(mm), NULL, 0);
 }
 
 void flush_tlb_page(const struct vm_area_struct *vma, unsigned long va)
@@ -70,8 +70,8 @@ void flush_tlb_range(const struct vm_area_struct *vma,
         unsigned long size = hv_page_size(vma);
         struct mm_struct *mm = vma->vm_mm;
         int cache = (vma->vm_flags & VM_EXEC) ? HV_FLUSH_EVICT_L1I : 0;
-        flush_remote(0, cache, &mm->cpu_vm_mask, start, end - start, size,
-                     &mm->cpu_vm_mask, NULL, 0);
+        flush_remote(0, cache, mm_cpumask(mm), start, end - start, size,
+                     mm_cpumask(mm), NULL, 0);
 }
 
 void flush_tlb_all(void)
diff --git a/arch/tile/kernel/traps.c b/arch/tile/kernel/traps.c
index 5474fc2e77e8..f9803dfa7357 100644
--- a/arch/tile/kernel/traps.c
+++ b/arch/tile/kernel/traps.c
@@ -308,6 +308,7 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
         info.si_addr = (void __user *)address;
         if (signo == SIGILL)
                 info.si_trapno = fault_num;
+        trace_unhandled_signal("trap", regs, address, signo);
         force_sig_info(signo, &info, current);
 }
 
diff --git a/arch/tile/kernel/vmlinux.lds.S b/arch/tile/kernel/vmlinux.lds.S
index 38f64fafdc10..631f10de12fe 100644
--- a/arch/tile/kernel/vmlinux.lds.S
+++ b/arch/tile/kernel/vmlinux.lds.S
@@ -60,7 +60,7 @@ SECTIONS
   . = ALIGN(PAGE_SIZE);
   VMLINUX_SYMBOL(_sinitdata) = .;
   INIT_DATA_SECTION(16) :data =0
-  PERCPU(L2_CACHE_BYTES, PAGE_SIZE)
+  PERCPU_SECTION(L2_CACHE_BYTES)
   . = ALIGN(PAGE_SIZE);
   VMLINUX_SYMBOL(_einitdata) = .;
 
diff --git a/arch/tile/lib/atomic_asm_32.S b/arch/tile/lib/atomic_asm_32.S
index 82f64cc63658..24448734f6f1 100644
--- a/arch/tile/lib/atomic_asm_32.S
+++ b/arch/tile/lib/atomic_asm_32.S
@@ -59,7 +59,7 @@
  * bad kernel addresses).
  *
  * Note that if the value we would store is the same as what we
- * loaded, we bypass the load.  Other platforms with true atomics can
+ * loaded, we bypass the store.  Other platforms with true atomics can
  * make the guarantee that a non-atomic __clear_bit(), for example,
  * can safely race with an atomic test_and_set_bit(); this example is
  * from bit_spinlock.h in slub_lock() / slub_unlock().  We can't do
diff --git a/arch/tile/lib/cacheflush.c b/arch/tile/lib/cacheflush.c
index 35c1d8ca5f38..8928aace7a64 100644
--- a/arch/tile/lib/cacheflush.c
+++ b/arch/tile/lib/cacheflush.c
@@ -15,6 +15,7 @@
 #include <asm/page.h>
 #include <asm/cacheflush.h>
 #include <arch/icache.h>
+#include <arch/spr_def.h>
 
 
 void __flush_icache_range(unsigned long start, unsigned long end)
@@ -39,6 +40,18 @@ void finv_buffer_remote(void *buffer, size_t size, int hfh)
         char *p, *base;
         size_t step_size, load_count;
         const unsigned long STRIPE_WIDTH = 8192;
+#ifdef __tilegx__
+        /*
+         * On TILE-Gx, we must disable the dstream prefetcher before doing
+         * a cache flush; otherwise, we could end up with data in the cache
+         * that we don't want there.  Note that normally we'd do an mf
+         * after the SPR write to disabling the prefetcher, but we do one
+         * below, before any further loads, so there's no need to do it
+         * here.
+         */
+        uint_reg_t old_dstream_pf = __insn_mfspr(SPR_DSTREAM_PF);
+        __insn_mtspr(SPR_DSTREAM_PF, 0);
+#endif
 
         /*
          * Flush and invalidate the buffer out of the local L1/L2
@@ -122,4 +135,9 @@ void finv_buffer_remote(void *buffer, size_t size, int hfh)
 
         /* Wait for the load+inv's (and thus finvs) to have completed. */
         __insn_mf();
+
+#ifdef __tilegx__
+        /* Reenable the prefetcher. */
+        __insn_mtspr(SPR_DSTREAM_PF, old_dstream_pf);
+#endif
 }
diff --git a/arch/tile/lib/memchr_64.c b/arch/tile/lib/memchr_64.c
new file mode 100644
index 000000000000..84fdc8d8e735
--- /dev/null
+++ b/arch/tile/lib/memchr_64.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/module.h>
+
+void *memchr(const void *s, int c, size_t n)
+{
+        const uint64_t *last_word_ptr;
+        const uint64_t *p;
+        const char *last_byte_ptr;
+        uintptr_t s_int;
+        uint64_t goal, before_mask, v, bits;
+        char *ret;
+
+        if (__builtin_expect(n == 0, 0)) {
+                /* Don't dereference any memory if the array is empty. */
+                return NULL;
+        }
+
+        /* Get an aligned pointer. */
+        s_int = (uintptr_t) s;
+        p = (const uint64_t *)(s_int & -8);
+
+        /* Create eight copies of the byte for which we are looking. */
+        goal = 0x0101010101010101ULL * (uint8_t) c;
+
+        /* Read the first word, but munge it so that bytes before the array
+         * will not match goal.
+         *
+         * Note that this shift count expression works because we know
+         * shift counts are taken mod 64.
+         */
+        before_mask = (1ULL << (s_int << 3)) - 1;
+        v = (*p | before_mask) ^ (goal & before_mask);
+
+        /* Compute the address of the last byte. */
+        last_byte_ptr = (const char *)s + n - 1;
+
+        /* Compute the address of the word containing the last byte. */
+        last_word_ptr = (const uint64_t *)((uintptr_t) last_byte_ptr & -8);
+
+        while ((bits = __insn_v1cmpeq(v, goal)) == 0) {
+                if (__builtin_expect(p == last_word_ptr, 0)) {
+                        /* We already read the last word in the array,
+                         * so give up.
+                         */
+                        return NULL;
+                }
+                v = *++p;
+        }
+
+        /* We found a match, but it might be in a byte past the end
+         * of the array.
+         */
+        ret = ((char *)p) + (__insn_ctz(bits) >> 3);
+        return (ret <= last_byte_ptr) ? ret : NULL;
+}
+EXPORT_SYMBOL(memchr);
diff --git a/arch/tile/lib/memcpy_64.c b/arch/tile/lib/memcpy_64.c
new file mode 100644
index 000000000000..3fab9a6a2bbe
--- /dev/null
+++ b/arch/tile/lib/memcpy_64.c
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/module.h>
+#define __memcpy memcpy
+/* EXPORT_SYMBOL() is in arch/tile/lib/exports.c since this should be asm. */
+
+/* Must be 8 bytes in size. */
+#define word_t uint64_t
+
+#if CHIP_L2_LINE_SIZE() != 64 && CHIP_L2_LINE_SIZE() != 128
+#error "Assumes 64 or 128 byte line size"
+#endif
+
+/* How many cache lines ahead should we prefetch? */
+#define PREFETCH_LINES_AHEAD 3
+
+/*
+ * Provide "base versions" of load and store for the normal code path.
+ * The kernel provides other versions for userspace copies.
+ */
+#define ST(p, v) (*(p) = (v))
+#define LD(p) (*(p))
+
+#ifndef USERCOPY_FUNC
+#define ST1 ST
+#define ST2 ST
+#define ST4 ST
+#define ST8 ST
+#define LD1 LD
+#define LD2 LD
+#define LD4 LD
+#define LD8 LD
+#define RETVAL dstv
+void *memcpy(void *__restrict dstv, const void *__restrict srcv, size_t n)
+#else
+/*
+ * Special kernel version will provide implementation of the LDn/STn
+ * macros to return a count of uncopied bytes due to mm fault.
+ */
+#define RETVAL 0
+int USERCOPY_FUNC(void *__restrict dstv, const void *__restrict srcv, size_t n)
+#endif
+{
+        char *__restrict dst1 = (char *)dstv;
+        const char *__restrict src1 = (const char *)srcv;
+        const char *__restrict src1_end;
+        const char *__restrict prefetch;
+        word_t *__restrict dst8;    /* 8-byte pointer to destination memory. */
+        word_t final; /* Final bytes to write to trailing word, if any */
+        long i;
+
+        if (n < 16) {
+                for (; n; n--)
+                        ST1(dst1++, LD1(src1++));
+                return RETVAL;
+        }
+
+        /*
+         * Locate the end of source memory we will copy.  Don't
+         * prefetch past this.
+         */
+        src1_end = src1 + n - 1;
+
+        /* Prefetch ahead a few cache lines, but not past the end. */
+        prefetch = src1;
+        for (i = 0; i < PREFETCH_LINES_AHEAD; i++) {
+                __insn_prefetch(prefetch);
+                prefetch += CHIP_L2_LINE_SIZE();
+                prefetch = (prefetch > src1_end) ? prefetch : src1;
+        }
+
+        /* Copy bytes until dst is word-aligned. */
+        for (; (uintptr_t)dst1 & (sizeof(word_t) - 1); n--)
+                ST1(dst1++, LD1(src1++));
+
+        /* 8-byte pointer to destination memory. */
+        dst8 = (word_t *)dst1;
+
+        if (__builtin_expect((uintptr_t)src1 & (sizeof(word_t) - 1), 0)) {
+                /*
+                 * Misaligned copy.  Copy 8 bytes at a time, but don't
+                 * bother with other fanciness.
+                 *
+                 * TODO: Consider prefetching and using wh64 as well.
+                 */
+
+                /* Create an aligned src8. */
+                const word_t *__restrict src8 =
+                        (const word_t *)((uintptr_t)src1 & -sizeof(word_t));
+                word_t b;
+
+                word_t a = LD8(src8++);
+                for (; n >= sizeof(word_t); n -= sizeof(word_t)) {
+                        b = LD8(src8++);
+                        a = __insn_dblalign(a, b, src1);
+                        ST8(dst8++, a);
+                        a = b;
+                }
+
+                if (n == 0)
+                        return RETVAL;
+
+                b = ((const char *)src8 <= src1_end) ? *src8 : 0;
+
+                /*
+                 * Final source bytes to write to trailing partial
+                 * word, if any.
+                 */
+                final = __insn_dblalign(a, b, src1);
+        } else {
+                /* Aligned copy. */
+
+                const word_t* __restrict src8 = (const word_t *)src1;
+
+                /* src8 and dst8 are both word-aligned. */
+                if (n >= CHIP_L2_LINE_SIZE()) {
+                        /* Copy until 'dst' is cache-line-aligned. */
+                        for (; (uintptr_t)dst8 & (CHIP_L2_LINE_SIZE() - 1);
+                             n -= sizeof(word_t))
+                                ST8(dst8++, LD8(src8++));
+
+                        for (; n >= CHIP_L2_LINE_SIZE(); ) {
+                                __insn_wh64(dst8);
+
+                                /*
+                                 * Prefetch and advance to next line
+                                 * to prefetch, but don't go past the end
+                                 */
+                                __insn_prefetch(prefetch);
+                                prefetch += CHIP_L2_LINE_SIZE();
+                                prefetch = (prefetch > src1_end) ? prefetch :
+                                        (const char *)src8;
+
+                                /*
+                                 * Copy an entire cache line.  Manually
+                                 * unrolled to avoid idiosyncracies of
+                                 * compiler unrolling.
+                                 */
+#define COPY_WORD(offset) ({ ST8(dst8+offset, LD8(src8+offset)); n -= 8; })
+                                COPY_WORD(0);
+                                COPY_WORD(1);
+                                COPY_WORD(2);
+                                COPY_WORD(3);
+                                COPY_WORD(4);
+                                COPY_WORD(5);
+                                COPY_WORD(6);
+                                COPY_WORD(7);
+#if CHIP_L2_LINE_SIZE() == 128
+                                COPY_WORD(8);
+                                COPY_WORD(9);
+                                COPY_WORD(10);
+                                COPY_WORD(11);
+                                COPY_WORD(12);
+                                COPY_WORD(13);
+                                COPY_WORD(14);
+                                COPY_WORD(15);
+#elif CHIP_L2_LINE_SIZE() != 64
+# error Fix code that assumes particular L2 cache line sizes
+#endif
+
+                                dst8 += CHIP_L2_LINE_SIZE() / sizeof(word_t);
+                                src8 += CHIP_L2_LINE_SIZE() / sizeof(word_t);
+                        }
+                }
+
+                for (; n >= sizeof(word_t); n -= sizeof(word_t))
+                        ST8(dst8++, LD8(src8++));
+
+                if (__builtin_expect(n == 0, 1))
+                        return RETVAL;
+
+                final = LD8(src8);
+        }
+
+        /* n != 0 if we get here.  Write out any trailing bytes. */
+        dst1 = (char *)dst8;
+        if (n & 4) {
+                ST4((uint32_t *)dst1, final);
+                dst1 += 4;
+                final >>= 32;
+                n &= 3;
+        }
+        if (n & 2) {
+                ST2((uint16_t *)dst1, final);
+                dst1 += 2;
+                final >>= 16;
+                n &= 1;
+        }
+        if (n)
+                ST1((uint8_t *)dst1, final);
+
+        return RETVAL;
+}
+
+
+#ifdef USERCOPY_FUNC
+#undef ST1
+#undef ST2
+#undef ST4
+#undef ST8
+#undef LD1
+#undef LD2
+#undef LD4
+#undef LD8
+#undef USERCOPY_FUNC
+#endif
diff --git a/arch/tile/lib/memcpy_user_64.c b/arch/tile/lib/memcpy_user_64.c
new file mode 100644
index 000000000000..4763b3aff1cc
--- /dev/null
+++ b/arch/tile/lib/memcpy_user_64.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * Do memcpy(), but trap and return "n" when a load or store faults.
+ *
+ * Note: this idiom only works when memcpy() compiles to a leaf function.
+ * If "sp" is updated during memcpy, the "jrp lr" will be incorrect.
+ *
+ * Also note that we are capturing "n" from the containing scope here.
+ */
+
+#define _ST(p, inst, v)                                         \
+        ({                                                      \
+                asm("1: " #inst " %0, %1;"                      \
+                    ".pushsection .coldtext.memcpy,\"ax\";"     \
+                    "2: { move r0, %2; jrp lr };"               \
+                    ".section __ex_table,\"a\";"                \
+                    ".quad 1b, 2b;"                             \
+                    ".popsection"                               \
+                    : "=m" (*(p)) : "r" (v), "r" (n));          \
+        })
+
+#define _LD(p, inst)                                            \
+        ({                                                      \
+                unsigned long __v;                              \
+                asm("1: " #inst " %0, %1;"                      \
+                    ".pushsection .coldtext.memcpy,\"ax\";"     \
+                    "2: { move r0, %2; jrp lr };"               \
+                    ".section __ex_table,\"a\";"                \
+                    ".quad 1b, 2b;"                             \
+                    ".popsection"                               \
+                    : "=r" (__v) : "m" (*(p)), "r" (n));        \
+                __v;                                            \
+        })
+
+#define USERCOPY_FUNC __copy_to_user_inatomic
+#define ST1(p, v) _ST((p), st1, (v))
+#define ST2(p, v) _ST((p), st2, (v))
+#define ST4(p, v) _ST((p), st4, (v))
+#define ST8(p, v) _ST((p), st, (v))
+#define LD1 LD
+#define LD2 LD
+#define LD4 LD
+#define LD8 LD
+#include "memcpy_64.c"
+
+#define USERCOPY_FUNC __copy_from_user_inatomic
+#define ST1 ST
+#define ST2 ST
+#define ST4 ST
+#define ST8 ST
+#define LD1(p) _LD((p), ld1u)
+#define LD2(p) _LD((p), ld2u)
+#define LD4(p) _LD((p), ld4u)
+#define LD8(p) _LD((p), ld)
+#include "memcpy_64.c"
+
+#define USERCOPY_FUNC __copy_in_user_inatomic
+#define ST1(p, v) _ST((p), st1, (v))
+#define ST2(p, v) _ST((p), st2, (v))
+#define ST4(p, v) _ST((p), st4, (v))
+#define ST8(p, v) _ST((p), st, (v))
+#define LD1(p) _LD((p), ld1u)
+#define LD2(p) _LD((p), ld2u)
+#define LD4(p) _LD((p), ld4u)
+#define LD8(p) _LD((p), ld)
+#include "memcpy_64.c"
+
+unsigned long __copy_from_user_zeroing(void *to, const void __user *from,
+                                       unsigned long n)
+{
+        unsigned long rc = __copy_from_user_inatomic(to, from, n);
+        if (unlikely(rc))
+                memset(to + n - rc, 0, rc);
+        return rc;
+}
diff --git a/arch/tile/lib/memset_64.c b/arch/tile/lib/memset_64.c
new file mode 100644
index 000000000000..3873085711d5
--- /dev/null
+++ b/arch/tile/lib/memset_64.c
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <arch/chip.h>
+
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/module.h>
+
+#undef memset
+
+void *memset(void *s, int c, size_t n)
+{
+        uint64_t *out64;
+        int n64, to_align64;
+        uint64_t v64;
+        uint8_t *out8 = s;
+
+        /* Experimentation shows that a trivial tight loop is a win up until
+         * around a size of 20, where writing a word at a time starts to win.
+         */
+#define BYTE_CUTOFF 20
+
+#if BYTE_CUTOFF < 7
+        /* This must be at least at least this big, or some code later
+         * on doesn't work.
+         */
+#error "BYTE_CUTOFF is too small"
+#endif
+
+        if (n < BYTE_CUTOFF) {
+                /* Strangely, this turns out to be the tightest way to
+                 * write this loop.
+                 */
+                if (n != 0) {
+                        do {
+                                /* Strangely, combining these into one line
+                                 * performs worse.
+                                 */
+                                *out8 = c;
+                                out8++;
+                        } while (--n != 0);
+                }
+
+                return s;
+        }
+
+        /* Align 'out8'. We know n >= 7 so this won't write past the end. */
+        while (((uintptr_t) out8 & 7) != 0) {
+                *out8++ = c;
+                --n;
+        }
+
+        /* Align 'n'. */
+        while (n & 7)
+                out8[--n] = c;
+
+        out64 = (uint64_t *) out8;
+        n64 = n >> 3;
+
+        /* Tile input byte out to 64 bits. */
+        /* KLUDGE */
+        v64 = 0x0101010101010101ULL * (uint8_t)c;
+
+        /* This must be at least 8 or the following loop doesn't work. */
+#define CACHE_LINE_SIZE_IN_DOUBLEWORDS (CHIP_L2_LINE_SIZE() / 8)
+
+        /* Determine how many words we need to emit before the 'out32'
+         * pointer becomes aligned modulo the cache line size.
+         */
+        to_align64 = (-((uintptr_t)out64 >> 3)) &
+                (CACHE_LINE_SIZE_IN_DOUBLEWORDS - 1);
+
+        /* Only bother aligning and using wh64 if there is at least
+         * one full cache line to process.  This check also prevents
+         * overrunning the end of the buffer with alignment words.
+         */
+        if (to_align64 <= n64 - CACHE_LINE_SIZE_IN_DOUBLEWORDS) {
+                int lines_left;
+
+                /* Align out64 mod the cache line size so we can use wh64. */
+                n64 -= to_align64;
+                for (; to_align64 != 0; to_align64--) {
+                        *out64 = v64;
+                        out64++;
+                }
+
+                /* Use unsigned divide to turn this into a right shift. */
+                lines_left = (unsigned)n64 / CACHE_LINE_SIZE_IN_DOUBLEWORDS;
+
+                do {
+                        /* Only wh64 a few lines at a time, so we don't
+                         * exceed the maximum number of victim lines.
+                         */
+                        int x = ((lines_left < CHIP_MAX_OUTSTANDING_VICTIMS())
+                                  ? lines_left
+                                  : CHIP_MAX_OUTSTANDING_VICTIMS());
+                        uint64_t *wh = out64;
+                        int i = x;
+                        int j;
+
+                        lines_left -= x;
+
+                        do {
+                                __insn_wh64(wh);
+                                wh += CACHE_LINE_SIZE_IN_DOUBLEWORDS;
+                        } while (--i);
+
+                        for (j = x * (CACHE_LINE_SIZE_IN_DOUBLEWORDS / 4);
+                             j != 0; j--) {
+                                *out64++ = v64;
+                                *out64++ = v64;
+                                *out64++ = v64;
+                                *out64++ = v64;
+                        }
+                } while (lines_left != 0);
+
+                /* We processed all full lines above, so only this many
+                 * words remain to be processed.
+                 */
+                n64 &= CACHE_LINE_SIZE_IN_DOUBLEWORDS - 1;
+        }
+
+        /* Now handle any leftover values. */
+        if (n64 != 0) {
+                do {
+                        *out64 = v64;
+                        out64++;
+                } while (--n64 != 0);
+        }
+
+        return s;
+}
+EXPORT_SYMBOL(memset);
diff --git a/arch/tile/lib/spinlock_64.c b/arch/tile/lib/spinlock_64.c
new file mode 100644
index 000000000000..d6fb9581e980
--- /dev/null
+++ b/arch/tile/lib/spinlock_64.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/spinlock.h>
+#include <linux/module.h>
+#include <asm/processor.h>
+
+#include "spinlock_common.h"
+
+/*
+ * Read the spinlock value without allocating in our cache and without
+ * causing an invalidation to another cpu with a copy of the cacheline.
+ * This is important when we are spinning waiting for the lock.
+ */
+static inline u32 arch_spin_read_noalloc(void *lock)
+{
+        return atomic_cmpxchg((atomic_t *)lock, -1, -1);
+}
+
+/*
+ * Wait until the high bits (current) match my ticket.
+ * If we notice the overflow bit set on entry, we clear it.
+ */
+void arch_spin_lock_slow(arch_spinlock_t *lock, u32 my_ticket)
+{
+        if (unlikely(my_ticket & __ARCH_SPIN_NEXT_OVERFLOW)) {
+                __insn_fetchand4(&lock->lock, ~__ARCH_SPIN_NEXT_OVERFLOW);
+                my_ticket &= ~__ARCH_SPIN_NEXT_OVERFLOW;
+        }
+
+        for (;;) {
+                u32 val = arch_spin_read_noalloc(lock);
+                u32 delta = my_ticket - arch_spin_current(val);
+                if (delta == 0)
+                        return;
+                relax((128 / CYCLES_PER_RELAX_LOOP) * delta);
+        }
+}
+EXPORT_SYMBOL(arch_spin_lock_slow);
+
+/*
+ * Check the lock to see if it is plausible, and try to get it with cmpxchg().
+ */
+int arch_spin_trylock(arch_spinlock_t *lock)
+{
+        u32 val = arch_spin_read_noalloc(lock);
+        if (unlikely(arch_spin_current(val) != arch_spin_next(val)))
+                return 0;
+        return cmpxchg(&lock->lock, val, (val + 1) & ~__ARCH_SPIN_NEXT_OVERFLOW)
+                == val;
+}
+EXPORT_SYMBOL(arch_spin_trylock);
+
+void arch_spin_unlock_wait(arch_spinlock_t *lock)
+{
+        u32 iterations = 0;
+        while (arch_spin_is_locked(lock))
+                delay_backoff(iterations++);
+}
+EXPORT_SYMBOL(arch_spin_unlock_wait);
+
+/*
+ * If the read lock fails due to a writer, we retry periodically
+ * until the value is positive and we write our incremented reader count.
+ */
+void __read_lock_failed(arch_rwlock_t *rw)
+{
+        u32 val;
+        int iterations = 0;
+        do {
+                delay_backoff(iterations++);
+                val = __insn_fetchaddgez4(&rw->lock, 1);
+        } while (unlikely(arch_write_val_locked(val)));
+}
+EXPORT_SYMBOL(__read_lock_failed);
+
+/*
+ * If we failed because there were readers, clear the "writer" bit
+ * so we don't block additional readers.  Otherwise, there was another
+ * writer anyway, so our "fetchor" made no difference.  Then wait,
+ * issuing periodic fetchor instructions, till we get the lock.
+ */
+void __write_lock_failed(arch_rwlock_t *rw, u32 val)
+{
+        int iterations = 0;
+        do {
+                if (!arch_write_val_locked(val))
+                        val = __insn_fetchand4(&rw->lock, ~__WRITE_LOCK_BIT);
+                delay_backoff(iterations++);
+                val = __insn_fetchor4(&rw->lock, __WRITE_LOCK_BIT);
+        } while (val != 0);
+}
+EXPORT_SYMBOL(__write_lock_failed);
diff --git a/arch/tile/lib/strchr_64.c b/arch/tile/lib/strchr_64.c
new file mode 100644
index 000000000000..617a9273aaa8
--- /dev/null
+++ b/arch/tile/lib/strchr_64.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/module.h>
+
+#undef strchr
+
+char *strchr(const char *s, int c)
+{
+        int z, g;
+
+        /* Get an aligned pointer. */
+        const uintptr_t s_int = (uintptr_t) s;
+        const uint64_t *p = (const uint64_t *)(s_int & -8);
+
+        /* Create eight copies of the byte for which we are looking. */
+        const uint64_t goal = 0x0101010101010101ULL * (uint8_t) c;
+
+        /* Read the first aligned word, but force bytes before the string to
+         * match neither zero nor goal (we make sure the high bit of each
+         * byte is 1, and the low 7 bits are all the opposite of the goal
+         * byte).
+         *
+         * Note that this shift count expression works because we know shift
+         * counts are taken mod 64.
+         */
+        const uint64_t before_mask = (1ULL << (s_int << 3)) - 1;
+        uint64_t v = (*p | before_mask) ^
+                (goal & __insn_v1shrsi(before_mask, 1));
+
+        uint64_t zero_matches, goal_matches;
+        while (1) {
+                /* Look for a terminating '\0'. */
+                zero_matches = __insn_v1cmpeqi(v, 0);
+
+                /* Look for the goal byte. */
+                goal_matches = __insn_v1cmpeq(v, goal);
+
+                if (__builtin_expect((zero_matches | goal_matches) != 0, 0))
+                        break;
+
+                v = *++p;
+        }
+
+        z = __insn_ctz(zero_matches);
+        g = __insn_ctz(goal_matches);
+
+        /* If we found c before '\0' we got a match. Note that if c == '\0'
+         * then g == z, and we correctly return the address of the '\0'
+         * rather than NULL.
+         */
+        return (g <= z) ? ((char *)p) + (g >> 3) : NULL;
+}
+EXPORT_SYMBOL(strchr);
diff --git a/arch/tile/lib/strlen_64.c b/arch/tile/lib/strlen_64.c
new file mode 100644
index 000000000000..1c92d46202a8
--- /dev/null
+++ b/arch/tile/lib/strlen_64.c
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/module.h>
+
+#undef strlen
+
+size_t strlen(const char *s)
+{
+        /* Get an aligned pointer. */
+        const uintptr_t s_int = (uintptr_t) s;
+        const uint64_t *p = (const uint64_t *)(s_int & -8);
+
+        /* Read the first word, but force bytes before the string to be nonzero.
+         * This expression works because we know shift counts are taken mod 64.
+         */
+        uint64_t v = *p | ((1ULL << (s_int << 3)) - 1);
+
+        uint64_t bits;
+        while ((bits = __insn_v1cmpeqi(v, 0)) == 0)
+                v = *++p;
+
+        return ((const char *)p) + (__insn_ctz(bits) >> 3) - s;
+}
+EXPORT_SYMBOL(strlen);
diff --git a/arch/tile/lib/usercopy_64.S b/arch/tile/lib/usercopy_64.S
new file mode 100644
index 000000000000..2ff44f87b78e
--- /dev/null
+++ b/arch/tile/lib/usercopy_64.S
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/linkage.h>
+#include <asm/errno.h>
+#include <asm/cache.h>
+#include <arch/chip.h>
+
+/* Access user memory, but use MMU to avoid propagating kernel exceptions. */
+
+        .pushsection .fixup,"ax"
+
+get_user_fault:
+        { movei r1, -EFAULT; move r0, zero }
+        jrp lr
+        ENDPROC(get_user_fault)
+
+put_user_fault:
+        { movei r0, -EFAULT; jrp lr }
+        ENDPROC(put_user_fault)
+
+        .popsection
+
+/*
+ * __get_user_N functions take a pointer in r0, and return 0 in r1
+ * on success, with the value in r0; or else -EFAULT in r1.
+ */
+#define __get_user_N(bytes, LOAD) \
+        STD_ENTRY(__get_user_##bytes); \
+1:      { LOAD r0, r0; move r1, zero }; \
+        jrp lr; \
+        STD_ENDPROC(__get_user_##bytes); \
+        .pushsection __ex_table,"a"; \
+        .quad 1b, get_user_fault; \
+        .popsection
+
+__get_user_N(1, ld1u)
+__get_user_N(2, ld2u)
+__get_user_N(4, ld4u)
+__get_user_N(8, ld)
+
+/*
+ * __put_user_N functions take a value in r0 and a pointer in r1,
+ * and return 0 in r0 on success or -EFAULT on failure.
+ */
+#define __put_user_N(bytes, STORE) \
+        STD_ENTRY(__put_user_##bytes); \
+1:      { STORE r1, r0; move r0, zero }; \
+        jrp lr; \
+        STD_ENDPROC(__put_user_##bytes); \
+        .pushsection __ex_table,"a"; \
+        .quad 1b, put_user_fault; \
+        .popsection
+
+__put_user_N(1, st1)
+__put_user_N(2, st2)
+__put_user_N(4, st4)
+__put_user_N(8, st)
+
+/*
+ * strnlen_user_asm takes the pointer in r0, and the length bound in r1.
+ * It returns the length, including the terminating NUL, or zero on exception.
+ * If length is greater than the bound, returns one plus the bound.
+ */
+STD_ENTRY(strnlen_user_asm)
+        { beqz r1, 2f; addi r3, r0, -1 }  /* bias down to include NUL */
+1:      { ld1u r4, r0; addi r1, r1, -1 }
+        beqz r4, 2f
+        { bnezt r1, 1b; addi r0, r0, 1 }
+2:      { sub r0, r0, r3; jrp lr }
+        STD_ENDPROC(strnlen_user_asm)
+        .pushsection .fixup,"ax"
+strnlen_user_fault:
+        { move r0, zero; jrp lr }
+        ENDPROC(strnlen_user_fault)
+        .section __ex_table,"a"
+        .quad 1b, strnlen_user_fault
+        .popsection
+
+/*
+ * strncpy_from_user_asm takes the kernel target pointer in r0,
+ * the userspace source pointer in r1, and the length bound (including
+ * the trailing NUL) in r2.  On success, it returns the string length
+ * (not including the trailing NUL), or -EFAULT on failure.
+ */
+STD_ENTRY(strncpy_from_user_asm)
+        { beqz r2, 2f; move r3, r0 }
+1:      { ld1u r4, r1; addi r1, r1, 1; addi r2, r2, -1 }
+        { st1 r0, r4; addi r0, r0, 1 }
+        beqz r2, 2f
+        bnezt r4, 1b
+        addi r0, r0, -1   /* don't count the trailing NUL */
+2:      { sub r0, r0, r3; jrp lr }
+        STD_ENDPROC(strncpy_from_user_asm)
+        .pushsection .fixup,"ax"
+strncpy_from_user_fault:
+        { movei r0, -EFAULT; jrp lr }
+        ENDPROC(strncpy_from_user_fault)
+        .section __ex_table,"a"
+        .quad 1b, strncpy_from_user_fault
+        .popsection
+
+/*
+ * clear_user_asm takes the user target address in r0 and the
+ * number of bytes to zero in r1.
+ * It returns the number of uncopiable bytes (hopefully zero) in r0.
+ * Note that we don't use a separate .fixup section here since we fall
+ * through into the "fixup" code as the last straight-line bundle anyway.
+ */
+STD_ENTRY(clear_user_asm)
+        { beqz r1, 2f; or r2, r0, r1 }
+        andi r2, r2, 7
+        beqzt r2, .Lclear_aligned_user_asm
+1:      { st1 r0, zero; addi r0, r0, 1; addi r1, r1, -1 }
+        bnezt r1, 1b
+2:      { move r0, r1; jrp lr }
+        .pushsection __ex_table,"a"
+        .quad 1b, 2b
+        .popsection
+
+.Lclear_aligned_user_asm:
+1:      { st r0, zero; addi r0, r0, 8; addi r1, r1, -8 }
+        bnezt r1, 1b
+2:      { move r0, r1; jrp lr }
+        STD_ENDPROC(clear_user_asm)
+        .pushsection __ex_table,"a"
+        .quad 1b, 2b
+        .popsection
+
+/*
+ * flush_user_asm takes the user target address in r0 and the
+ * number of bytes to flush in r1.
+ * It returns the number of unflushable bytes (hopefully zero) in r0.
+ */
+STD_ENTRY(flush_user_asm)
+        beqz r1, 2f
+        { movei r2, L2_CACHE_BYTES; add r1, r0, r1 }
+        { sub r2, zero, r2; addi r1, r1, L2_CACHE_BYTES-1 }
+        { and r0, r0, r2; and r1, r1, r2 }
+        { sub r1, r1, r0 }
+1:      { flush r0; addi r1, r1, -CHIP_FLUSH_STRIDE() }
+        { addi r0, r0, CHIP_FLUSH_STRIDE(); bnezt r1, 1b }
+2:      { move r0, r1; jrp lr }
+        STD_ENDPROC(flush_user_asm)
+        .pushsection __ex_table,"a"
+        .quad 1b, 2b
+        .popsection
+
+/*
+ * inv_user_asm takes the user target address in r0 and the
+ * number of bytes to invalidate in r1.
+ * It returns the number of not inv'able bytes (hopefully zero) in r0.
+ */
+STD_ENTRY(inv_user_asm)
+        beqz r1, 2f
+        { movei r2, L2_CACHE_BYTES; add r1, r0, r1 }
+        { sub r2, zero, r2; addi r1, r1, L2_CACHE_BYTES-1 }
+        { and r0, r0, r2; and r1, r1, r2 }
+        { sub r1, r1, r0 }
+1:      { inv r0; addi r1, r1, -CHIP_INV_STRIDE() }
+        { addi r0, r0, CHIP_INV_STRIDE(); bnezt r1, 1b }
+2:      { move r0, r1; jrp lr }
+        STD_ENDPROC(inv_user_asm)
+        .pushsection __ex_table,"a"
+        .quad 1b, 2b
+        .popsection
+
+/*
+ * finv_user_asm takes the user target address in r0 and the
+ * number of bytes to flush-invalidate in r1.
+ * It returns the number of not finv'able bytes (hopefully zero) in r0.
+ */
+STD_ENTRY(finv_user_asm)
+        beqz r1, 2f
+        { movei r2, L2_CACHE_BYTES; add r1, r0, r1 }
+        { sub r2, zero, r2; addi r1, r1, L2_CACHE_BYTES-1 }
+        { and r0, r0, r2; and r1, r1, r2 }
+        { sub r1, r1, r0 }
+1:      { finv r0; addi r1, r1, -CHIP_FINV_STRIDE() }
+        { addi r0, r0, CHIP_FINV_STRIDE(); bnezt r1, 1b }
+2:      { move r0, r1; jrp lr }
+        STD_ENDPROC(finv_user_asm)
+        .pushsection __ex_table,"a"
+        .quad 1b, 2b
+        .popsection
diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c
index 51f8663bf074..25b7b90fd620 100644
--- a/arch/tile/mm/fault.c
+++ b/arch/tile/mm/fault.c
@@ -43,8 +43,11 @@
 
 #include <arch/interrupts.h>
 
-static noinline void force_sig_info_fault(int si_signo, int si_code,
-        unsigned long address, int fault_num, struct task_struct *tsk)
+static noinline void force_sig_info_fault(const char *type, int si_signo,
+                                          int si_code, unsigned long address,
+                                          int fault_num,
+                                          struct task_struct *tsk,
+                                          struct pt_regs *regs)
 {
         siginfo_t info;
 
@@ -59,6 +62,7 @@ static noinline void force_sig_info_fault(int si_signo, int si_code,
         info.si_code = si_code;
         info.si_addr = (void __user *)address;
         info.si_trapno = fault_num;
+        trace_unhandled_signal(type, regs, address, si_signo);
         force_sig_info(si_signo, &info, tsk);
 }
 
@@ -71,11 +75,12 @@ SYSCALL_DEFINE2(cmpxchg_badaddr, unsigned long, address,
                 struct pt_regs *, regs)
 {
         if (address >= PAGE_OFFSET)
-                force_sig_info_fault(SIGSEGV, SEGV_MAPERR, address,
-                                     INT_DTLB_MISS, current);
+                force_sig_info_fault("atomic segfault", SIGSEGV, SEGV_MAPERR,
+                                     address, INT_DTLB_MISS, current, regs);
         else
-                force_sig_info_fault(SIGBUS, BUS_ADRALN, address,
-                                     INT_UNALIGN_DATA, current);
+                force_sig_info_fault("atomic alignment fault", SIGBUS,
+                                     BUS_ADRALN, address,
+                                     INT_UNALIGN_DATA, current, regs);
 
         /*
          * Adjust pc to point at the actual instruction, which is unusual
@@ -471,8 +476,8 @@ bad_area_nosemaphore:
                  */
                 local_irq_enable();
 
-                force_sig_info_fault(SIGSEGV, si_code, address,
-                                     fault_num, tsk);
+                force_sig_info_fault("segfault", SIGSEGV, si_code, address,
+                                     fault_num, tsk, regs);
                 return 0;
         }
 
@@ -547,7 +552,8 @@ do_sigbus:
         if (is_kernel_mode)
                 goto no_context;
 
-        force_sig_info_fault(SIGBUS, BUS_ADRERR, address, fault_num, tsk);
+        force_sig_info_fault("bus error", SIGBUS, BUS_ADRERR, address,
+                             fault_num, tsk, regs);
         return 0;
 }
 
@@ -732,6 +738,7 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
                 panic("Bad fault number %d in do_page_fault", fault_num);
         }
 
+#if CHIP_HAS_TILE_DMA() || CHIP_HAS_SN_PROC()
         if (EX1_PL(regs->ex1) != USER_PL) {
                 struct async_tlb *async;
                 switch (fault_num) {
@@ -775,6 +782,7 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
                         return;
                 }
         }
+#endif
 
         handle_page_fault(regs, fault_num, is_page_fault, address, write);
 }
@@ -801,8 +809,6 @@ static void handle_async_page_fault(struct pt_regs *regs,
                                   async->address, async->is_write);
         }
 }
-#endif /* CHIP_HAS_TILE_DMA() || CHIP_HAS_SN_PROC() */
-
 
 /*
  * This routine effectively re-issues asynchronous page faults
@@ -824,6 +830,8 @@ void do_async_page_fault(struct pt_regs *regs)
         handle_async_page_fault(regs, &current->thread.sn_async_tlb);
 #endif
 }
+#endif /* CHIP_HAS_TILE_DMA() || CHIP_HAS_SN_PROC() */
+
 
 void vmalloc_sync_all(void)
 {
diff --git a/arch/tile/mm/init.c b/arch/tile/mm/init.c
index d6e87fda2fb2..4e10c4023028 100644
--- a/arch/tile/mm/init.c
+++ b/arch/tile/mm/init.c
@@ -60,8 +60,6 @@ unsigned long VMALLOC_RESERVE = CONFIG_VMALLOC_RESERVE;
 EXPORT_SYMBOL(VMALLOC_RESERVE);
 #endif
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 /* Create an L2 page table */
 static pte_t * __init alloc_pte(void)
 {
diff --git a/arch/tile/mm/migrate_64.S b/arch/tile/mm/migrate_64.S
new file mode 100644
index 000000000000..e76fea688beb
--- /dev/null
+++ b/arch/tile/mm/migrate_64.S
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ *
+ *   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.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * This routine is a helper for migrating the home of a set of pages to
+ * a new cpu.  See the documentation in homecache.c for more information.
+ */
+
+#include <linux/linkage.h>
+#include <linux/threads.h>
+#include <asm/page.h>
+#include <asm/thread_info.h>
+#include <asm/types.h>
+#include <asm/asm-offsets.h>
+#include <hv/hypervisor.h>
+
+        .text
+
+/*
+ * First, some definitions that apply to all the code in the file.
+ */
+
+/* Locals (caller-save) */
+#define r_tmp           r10
+#define r_save_sp       r11
+
+/* What we save where in the stack frame; must include all callee-saves. */
+#define FRAME_SP        8
+#define FRAME_R30       16
+#define FRAME_R31       24
+#define FRAME_R32       32
+#define FRAME_R33       40
+#define FRAME_SIZE      48
+
+
+
+
+/*
+ * On entry:
+ *
+ *   r0 the new context PA to install (moved to r_context)
+ *   r1 PTE to use for context access (moved to r_access)
+ *   r2 ASID to use for new context (moved to r_asid)
+ *   r3 pointer to cpumask with just this cpu set in it (r_my_cpumask)
+ */
+
+/* Arguments (caller-save) */
+#define r_context_in    r0
+#define r_access_in     r1
+#define r_asid_in       r2
+#define r_my_cpumask    r3
+
+/* Locals (callee-save); must not be more than FRAME_xxx above. */
+#define r_save_ics      r30
+#define r_context       r31
+#define r_access        r32
+#define r_asid          r33
+
+/*
+ * Caller-save locals and frame constants are the same as
+ * for homecache_migrate_stack_and_flush.
+ */
+
+STD_ENTRY(flush_and_install_context)
+        /*
+         * Create a stack frame; we can't touch it once we flush the
+         * cache until we install the new page table and flush the TLB.
+         */
+        {
+         move r_save_sp, sp
+         st sp, lr
+         addi sp, sp, -FRAME_SIZE
+        }
+        addi r_tmp, sp, FRAME_SP
+        {
+         st r_tmp, r_save_sp
+         addi r_tmp, sp, FRAME_R30
+        }
+        {
+         st r_tmp, r30
+         addi r_tmp, sp, FRAME_R31
+        }
+        {
+         st r_tmp, r31
+         addi r_tmp, sp, FRAME_R32
+        }
+        {
+         st r_tmp, r32
+         addi r_tmp, sp, FRAME_R33
+        }
+        st r_tmp, r33
+
+        /* Move some arguments to callee-save registers. */
+        {
+         move r_context, r_context_in
+         move r_access, r_access_in
+        }
+        move r_asid, r_asid_in
+
+        /* Disable interrupts, since we can't use our stack. */
+        {
+         mfspr r_save_ics, INTERRUPT_CRITICAL_SECTION
+         movei r_tmp, 1
+        }
+        mtspr INTERRUPT_CRITICAL_SECTION, r_tmp
+
+        /* First, flush our L2 cache. */
+        {
+         move r0, zero  /* cache_pa */
+         moveli r1, hw2_last(HV_FLUSH_EVICT_L2)  /* cache_control */
+        }
+        {
+         shl16insli r1, r1, hw1(HV_FLUSH_EVICT_L2)
+         move r2, r_my_cpumask  /* cache_cpumask */
+        }
+        {
+         shl16insli r1, r1, hw0(HV_FLUSH_EVICT_L2)
+         move r3, zero  /* tlb_va */
+        }
+        {
+         move r4, zero  /* tlb_length */
+         move r5, zero  /* tlb_pgsize */
+        }
+        {
+         move r6, zero  /* tlb_cpumask */
+         move r7, zero  /* asids */
+        }
+        {
+         move r8, zero  /* asidcount */
+         jal hv_flush_remote
+        }
+        bnez r0, 1f
+
+        /* Now install the new page table. */
+        {
+         move r0, r_context
+         move r1, r_access
+        }
+        {
+         move r2, r_asid
+         movei r3, HV_CTX_DIRECTIO
+        }
+        jal hv_install_context
+        bnez r0, 1f
+
+        /* Finally, flush the TLB. */
+        {
+         movei r0, 0   /* preserve_global */
+         jal hv_flush_all
+        }
+
+1:      /* Reset interrupts back how they were before. */
+        mtspr INTERRUPT_CRITICAL_SECTION, r_save_ics
+
+        /* Restore the callee-saved registers and return. */
+        addli lr, sp, FRAME_SIZE
+        {
+         ld lr, lr
+         addli r_tmp, sp, FRAME_R30
+        }
+        {
+         ld r30, r_tmp
+         addli r_tmp, sp, FRAME_R31
+        }
+        {
+         ld r31, r_tmp
+         addli r_tmp, sp, FRAME_R32
+        }
+        {
+         ld r32, r_tmp
+         addli r_tmp, sp, FRAME_R33
+        }
+        {
+         ld r33, r_tmp
+         addi sp, sp, FRAME_SIZE
+        }
+        jrp lr
+        STD_ENDPROC(flush_and_install_context)
diff --git a/arch/um/Kconfig.debug b/arch/um/Kconfig.debug
index 8fce5e536b0f..68205fd3b08c 100644
--- a/arch/um/Kconfig.debug
+++ b/arch/um/Kconfig.debug
@@ -28,13 +28,13 @@ config GCOV
           If you're involved in UML kernel development and want to use gcov,
           say Y.  If you're unsure, say N.
 
-config DEBUG_STACK_USAGE
-        bool "Stack utilization instrumentation"
-        default N
-        help
-          Track the maximum kernel stack usage - this will look at each
-          kernel stack at process exit and log it if it's the deepest
-          stack seen so far.
+config EARLY_PRINTK
+        bool "Early printk"
+        default y
+        ---help---
+          Write kernel log output directly to stdout.
+
+          This is useful for kernel debugging when your machine crashes very
+          early before the console code is initialized.
 
-          This option will slow down process creation and destruction somewhat.
 endmenu
diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86
index a9da516a5274..795ea8e869f4 100644
--- a/arch/um/Kconfig.x86
+++ b/arch/um/Kconfig.x86
@@ -29,10 +29,10 @@ config X86_64
         def_bool 64BIT
 
 config RWSEM_XCHGADD_ALGORITHM
-        def_bool X86_XADD
+        def_bool X86_XADD && 64BIT
 
 config RWSEM_GENERIC_SPINLOCK
-        def_bool !X86_XADD
+        def_bool !RWSEM_XCHGADD_ALGORITHM
 
 config 3_LEVEL_PGTABLES
         bool "Three-level pagetables (EXPERIMENTAL)" if !64BIT
diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile
index 1d9b6ae967b0..e7582e1d248c 100644
--- a/arch/um/drivers/Makefile
+++ b/arch/um/drivers/Makefile
@@ -9,7 +9,7 @@
 slip-objs := slip_kern.o slip_user.o
 slirp-objs := slirp_kern.o slirp_user.o
 daemon-objs := daemon_kern.o daemon_user.o
-mcast-objs := mcast_kern.o mcast_user.o
+umcast-objs := umcast_kern.o umcast_user.o
 net-objs := net_kern.o net_user.o
 mconsole-objs := mconsole_kern.o mconsole_user.o
 hostaudio-objs := hostaudio_kern.o
@@ -44,7 +44,7 @@ obj-$(CONFIG_UML_NET_SLIP) += slip.o slip_common.o
 obj-$(CONFIG_UML_NET_SLIRP) += slirp.o slip_common.o
 obj-$(CONFIG_UML_NET_DAEMON) += daemon.o 
 obj-$(CONFIG_UML_NET_VDE) += vde.o
-obj-$(CONFIG_UML_NET_MCAST) += mcast.o 
+obj-$(CONFIG_UML_NET_MCAST) += umcast.o
 obj-$(CONFIG_UML_NET_PCAP) += pcap.o
 obj-$(CONFIG_UML_NET) += net.o 
 obj-$(CONFIG_MCONSOLE) += mconsole.o
diff --git a/arch/um/drivers/mcast.h b/arch/um/drivers/mcast.h
deleted file mode 100644
index 6fa282e896be..000000000000
--- a/arch/um/drivers/mcast.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* 
- * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
- * Licensed under the GPL
- */
-
-#ifndef __DRIVERS_MCAST_H
-#define __DRIVERS_MCAST_H
-
-#include "net_user.h"
-
-struct mcast_data {
-        char *addr;
-        unsigned short port;
-        void *mcast_addr;
-        int ttl;
-        void *dev;
-};
-
-extern const struct net_user_info mcast_user_info;
-
-extern int mcast_user_write(int fd, void *buf, int len, 
-                            struct mcast_data *pri);
-
-#endif
diff --git a/arch/um/drivers/mcast_kern.c b/arch/um/drivers/mcast_kern.c
deleted file mode 100644
index ffc6416d5ed7..000000000000
--- a/arch/um/drivers/mcast_kern.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * user-mode-linux networking multicast transport
- * Copyright (C) 2001 by Harald Welte <laforge@gnumonks.org>
- * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
- *
- * based on the existing uml-networking code, which is
- * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and
- * James Leu (jleu@mindspring.net).
- * Copyright (C) 2001 by various other people who didn't put their name here.
- *
- * Licensed under the GPL.
- */
-
-#include "linux/init.h"
-#include <linux/netdevice.h>
-#include "mcast.h"
-#include "net_kern.h"
-
-struct mcast_init {
-        char *addr;
-        int port;
-        int ttl;
-};
-
-static void mcast_init(struct net_device *dev, void *data)
-{
-        struct uml_net_private *pri;
-        struct mcast_data *dpri;
-        struct mcast_init *init = data;
-
-        pri = netdev_priv(dev);
-        dpri = (struct mcast_data *) pri->user;
-        dpri->addr = init->addr;
-        dpri->port = init->port;
-        dpri->ttl = init->ttl;
-        dpri->dev = dev;
-
-        printk("mcast backend multicast address: %s:%u, TTL:%u\n",
-               dpri->addr, dpri->port, dpri->ttl);
-}
-
-static int mcast_read(int fd, struct sk_buff *skb, struct uml_net_private *lp)
-{
-        return net_recvfrom(fd, skb_mac_header(skb),
-                            skb->dev->mtu + ETH_HEADER_OTHER);
-}
-
-static int mcast_write(int fd, struct sk_buff *skb, struct uml_net_private *lp)
-{
-        return mcast_user_write(fd, skb->data, skb->len,
-                                (struct mcast_data *) &lp->user);
-}
-
-static const struct net_kern_info mcast_kern_info = {
-        .init                   = mcast_init,
-        .protocol               = eth_protocol,
-        .read                   = mcast_read,
-        .write                  = mcast_write,
-};
-
-static int mcast_setup(char *str, char **mac_out, void *data)
-{
-        struct mcast_init *init = data;
-        char *port_str = NULL, *ttl_str = NULL, *remain;
-        char *last;
-
-        *init = ((struct mcast_init)
-                { .addr         = "239.192.168.1",
-                  .port         = 1102,
-                  .ttl          = 1 });
-
-        remain = split_if_spec(str, mac_out, &init->addr, &port_str, &ttl_str,
-                               NULL);
-        if (remain != NULL) {
-                printk(KERN_ERR "mcast_setup - Extra garbage on "
-                       "specification : '%s'\n", remain);
-                return 0;
-        }
-
-        if (port_str != NULL) {
-                init->port = simple_strtoul(port_str, &last, 10);
-                if ((*last != '\0') || (last == port_str)) {
-                        printk(KERN_ERR "mcast_setup - Bad port : '%s'\n",
-                               port_str);
-                        return 0;
-                }
-        }
-
-        if (ttl_str != NULL) {
-                init->ttl = simple_strtoul(ttl_str, &last, 10);
-                if ((*last != '\0') || (last == ttl_str)) {
-                        printk(KERN_ERR "mcast_setup - Bad ttl : '%s'\n",
-                               ttl_str);
-                        return 0;
-                }
-        }
-
-        printk(KERN_INFO "Configured mcast device: %s:%u-%u\n", init->addr,
-               init->port, init->ttl);
-
-        return 1;
-}
-
-static struct transport mcast_transport = {
-        .list           = LIST_HEAD_INIT(mcast_transport.list),
-        .name           = "mcast",
-        .setup          = mcast_setup,
-        .user           = &mcast_user_info,
-        .kern           = &mcast_kern_info,
-        .private_size   = sizeof(struct mcast_data),
-        .setup_size     = sizeof(struct mcast_init),
-};
-
-static int register_mcast(void)
-{
-        register_transport(&mcast_transport);
-        return 0;
-}
-
-late_initcall(register_mcast);
diff --git a/arch/um/drivers/mcast_user.c b/arch/um/drivers/mcast_user.c
deleted file mode 100644
index ee19e91568a2..000000000000
--- a/arch/um/drivers/mcast_user.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * user-mode-linux networking multicast transport
- * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
- * Copyright (C) 2001 by Harald Welte <laforge@gnumonks.org>
- *
- * based on the existing uml-networking code, which is
- * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and
- * James Leu (jleu@mindspring.net).
- * Copyright (C) 2001 by various other people who didn't put their name here.
- *
- * Licensed under the GPL.
- *
- */
-
-#include <unistd.h>
-#include <errno.h>
-#include <netinet/in.h>
-#include "kern_constants.h"
-#include "mcast.h"
-#include "net_user.h"
-#include "um_malloc.h"
-#include "user.h"
-
-static struct sockaddr_in *new_addr(char *addr, unsigned short port)
-{
-        struct sockaddr_in *sin;
-
-        sin = uml_kmalloc(sizeof(struct sockaddr_in), UM_GFP_KERNEL);
-        if (sin == NULL) {
-                printk(UM_KERN_ERR "new_addr: allocation of sockaddr_in "
-                       "failed\n");
-                return NULL;
-        }
-        sin->sin_family = AF_INET;
-        sin->sin_addr.s_addr = in_aton(addr);
-        sin->sin_port = htons(port);
-        return sin;
-}
-
-static int mcast_user_init(void *data, void *dev)
-{
-        struct mcast_data *pri = data;
-
-        pri->mcast_addr = new_addr(pri->addr, pri->port);
-        pri->dev = dev;
-        return 0;
-}
-
-static void mcast_remove(void *data)
-{
-        struct mcast_data *pri = data;
-
-        kfree(pri->mcast_addr);
-        pri->mcast_addr = NULL;
-}
-
-static int mcast_open(void *data)
-{
-        struct mcast_data *pri = data;
-        struct sockaddr_in *sin = pri->mcast_addr;
-        struct ip_mreq mreq;
-        int fd, yes = 1, err = -EINVAL;
-
-
-        if ((sin->sin_addr.s_addr == 0) || (sin->sin_port == 0))
-                goto out;
-
-        fd = socket(AF_INET, SOCK_DGRAM, 0);
-
-        if (fd < 0) {
-                err = -errno;
-                printk(UM_KERN_ERR "mcast_open : data socket failed, "
-                       "errno = %d\n", errno);
-                goto out;
-        }
-
-        if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
-                err = -errno;
-                printk(UM_KERN_ERR "mcast_open: SO_REUSEADDR failed, "
-                       "errno = %d\n", errno);
-                goto out_close;
-        }
-
-        /* set ttl according to config */
-        if (setsockopt(fd, SOL_IP, IP_MULTICAST_TTL, &pri->ttl,
-                       sizeof(pri->ttl)) < 0) {
-                err = -errno;
-                printk(UM_KERN_ERR "mcast_open: IP_MULTICAST_TTL failed, "
-                       "error = %d\n", errno);
-                goto out_close;
-        }
-
-        /* set LOOP, so data does get fed back to local sockets */
-        if (setsockopt(fd, SOL_IP, IP_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {
-                err = -errno;
-                printk(UM_KERN_ERR "mcast_open: IP_MULTICAST_LOOP failed, "
-                       "error = %d\n", errno);
-                goto out_close;
-        }
-
-        /* bind socket to mcast address */
-        if (bind(fd, (struct sockaddr *) sin, sizeof(*sin)) < 0) {
-                err = -errno;
-                printk(UM_KERN_ERR "mcast_open : data bind failed, "
-                       "errno = %d\n", errno);
-                goto out_close;
-        }
-
-        /* subscribe to the multicast group */
-        mreq.imr_multiaddr.s_addr = sin->sin_addr.s_addr;
-        mreq.imr_interface.s_addr = 0;
-        if (setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP,
-                       &mreq, sizeof(mreq)) < 0) {
-                err = -errno;
-                printk(UM_KERN_ERR "mcast_open: IP_ADD_MEMBERSHIP failed, "
-                       "error = %d\n", errno);
-                printk(UM_KERN_ERR "There appears not to be a multicast-"
-                       "capable network interface on the host.\n");
-                printk(UM_KERN_ERR "eth0 should be configured in order to use "
-                       "the multicast transport.\n");
-                goto out_close;
-        }
-
-        return fd;
-
- out_close:
-        close(fd);
- out:
-        return err;
-}
-
-static void mcast_close(int fd, void *data)
-{
-        struct ip_mreq mreq;
-        struct mcast_data *pri = data;
-        struct sockaddr_in *sin = pri->mcast_addr;
-
-        mreq.imr_multiaddr.s_addr = sin->sin_addr.s_addr;
-        mreq.imr_interface.s_addr = 0;
-        if (setsockopt(fd, SOL_IP, IP_DROP_MEMBERSHIP,
-                       &mreq, sizeof(mreq)) < 0) {
-                printk(UM_KERN_ERR "mcast_open: IP_DROP_MEMBERSHIP failed, "
-                       "error = %d\n", errno);
-        }
-
-        close(fd);
-}
-
-int mcast_user_write(int fd, void *buf, int len, struct mcast_data *pri)
-{
-        struct sockaddr_in *data_addr = pri->mcast_addr;
-
-        return net_sendto(fd, buf, len, data_addr, sizeof(*data_addr));
-}
-
-const struct net_user_info mcast_user_info = {
-        .init           = mcast_user_init,
-        .open           = mcast_open,
-        .close          = mcast_close,
-        .remove         = mcast_remove,
-        .add_address    = NULL,
-        .delete_address = NULL,
-        .mtu            = ETH_MAX_PACKET,
-        .max_packet     = ETH_MAX_PACKET + ETH_HEADER_OTHER,
-};
diff --git a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c
index 7e0619c2c2c6..c0ef803c7c70 100644
--- a/arch/um/drivers/mmapper_kern.c
+++ b/arch/um/drivers/mmapper_kern.c
@@ -116,7 +116,7 @@ static int __init mmapper_init(void)
         if (err) {
                 printk(KERN_ERR "mmapper - misc_register failed, err = %d\n",
                        err);
-                return err;;
+                return err;
         }
         return 0;
 }
diff --git a/arch/um/drivers/umcast.h b/arch/um/drivers/umcast.h
new file mode 100644
index 000000000000..6f8c0fe890fb
--- /dev/null
+++ b/arch/um/drivers/umcast.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Licensed under the GPL
+ */
+
+#ifndef __DRIVERS_UMCAST_H
+#define __DRIVERS_UMCAST_H
+
+#include "net_user.h"
+
+struct umcast_data {
+        char *addr;
+        unsigned short lport;
+        unsigned short rport;
+        void *listen_addr;
+        void *remote_addr;
+        int ttl;
+        int unicast;
+        void *dev;
+};
+
+extern const struct net_user_info umcast_user_info;
+
+extern int umcast_user_write(int fd, void *buf, int len,
+                             struct umcast_data *pri);
+
+#endif
diff --git a/arch/um/drivers/umcast_kern.c b/arch/um/drivers/umcast_kern.c
new file mode 100644
index 000000000000..42dab11d2ecf
--- /dev/null
+++ b/arch/um/drivers/umcast_kern.c
@@ -0,0 +1,188 @@
+/*
+ * user-mode-linux networking multicast transport
+ * Copyright (C) 2001 by Harald Welte <laforge@gnumonks.org>
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ *
+ * based on the existing uml-networking code, which is
+ * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and
+ * James Leu (jleu@mindspring.net).
+ * Copyright (C) 2001 by various other people who didn't put their name here.
+ *
+ * Licensed under the GPL.
+ */
+
+#include "linux/init.h"
+#include <linux/netdevice.h>
+#include "umcast.h"
+#include "net_kern.h"
+
+struct umcast_init {
+        char *addr;
+        int lport;
+        int rport;
+        int ttl;
+        bool unicast;
+};
+
+static void umcast_init(struct net_device *dev, void *data)
+{
+        struct uml_net_private *pri;
+        struct umcast_data *dpri;
+        struct umcast_init *init = data;
+
+        pri = netdev_priv(dev);
+        dpri = (struct umcast_data *) pri->user;
+        dpri->addr = init->addr;
+        dpri->lport = init->lport;
+        dpri->rport = init->rport;
+        dpri->unicast = init->unicast;
+        dpri->ttl = init->ttl;
+        dpri->dev = dev;
+
+        if (dpri->unicast) {
+                printk(KERN_INFO "ucast backend address: %s:%u listen port: "
+                       "%u\n", dpri->addr, dpri->rport, dpri->lport);
+        } else {
+                printk(KERN_INFO "mcast backend multicast address: %s:%u, "
+                       "TTL:%u\n", dpri->addr, dpri->lport, dpri->ttl);
+        }
+}
+
+static int umcast_read(int fd, struct sk_buff *skb, struct uml_net_private *lp)
+{
+        return net_recvfrom(fd, skb_mac_header(skb),
+                            skb->dev->mtu + ETH_HEADER_OTHER);
+}
+
+static int umcast_write(int fd, struct sk_buff *skb, struct uml_net_private *lp)
+{
+        return umcast_user_write(fd, skb->data, skb->len,
+                                (struct umcast_data *) &lp->user);
+}
+
+static const struct net_kern_info umcast_kern_info = {
+        .init                   = umcast_init,
+        .protocol               = eth_protocol,
+        .read                   = umcast_read,
+        .write                  = umcast_write,
+};
+
+static int mcast_setup(char *str, char **mac_out, void *data)
+{
+        struct umcast_init *init = data;
+        char *port_str = NULL, *ttl_str = NULL, *remain;
+        char *last;
+
+        *init = ((struct umcast_init)
+                { .addr = "239.192.168.1",
+                  .lport        = 1102,
+                  .ttl  = 1 });
+
+        remain = split_if_spec(str, mac_out, &init->addr, &port_str, &ttl_str,
+                               NULL);
+        if (remain != NULL) {
+                printk(KERN_ERR "mcast_setup - Extra garbage on "
+                       "specification : '%s'\n", remain);
+                return 0;
+        }
+
+        if (port_str != NULL) {
+                init->lport = simple_strtoul(port_str, &last, 10);
+                if ((*last != '\0') || (last == port_str)) {
+                        printk(KERN_ERR "mcast_setup - Bad port : '%s'\n",
+                               port_str);
+                        return 0;
+                }
+        }
+
+        if (ttl_str != NULL) {
+                init->ttl = simple_strtoul(ttl_str, &last, 10);
+                if ((*last != '\0') || (last == ttl_str)) {
+                        printk(KERN_ERR "mcast_setup - Bad ttl : '%s'\n",
+                               ttl_str);
+                        return 0;
+                }
+        }
+
+        init->unicast = false;
+        init->rport = init->lport;
+
+        printk(KERN_INFO "Configured mcast device: %s:%u-%u\n", init->addr,
+               init->lport, init->ttl);
+
+        return 1;
+}
+
+static int ucast_setup(char *str, char **mac_out, void *data)
+{
+        struct umcast_init *init = data;
+        char *lport_str = NULL, *rport_str = NULL, *remain;
+        char *last;
+
+        *init = ((struct umcast_init)
+                { .addr         = "",
+                  .lport        = 1102,
+                  .rport        = 1102 });
+
+        remain = split_if_spec(str, mac_out, &init->addr,
+                               &lport_str, &rport_str, NULL);
+        if (remain != NULL) {
+                printk(KERN_ERR "ucast_setup - Extra garbage on "
+                       "specification : '%s'\n", remain);
+                return 0;
+        }
+
+        if (lport_str != NULL) {
+                init->lport = simple_strtoul(lport_str, &last, 10);
+                if ((*last != '\0') || (last == lport_str)) {
+                        printk(KERN_ERR "ucast_setup - Bad listen port : "
+                               "'%s'\n", lport_str);
+                        return 0;
+                }
+        }
+
+        if (rport_str != NULL) {
+                init->rport = simple_strtoul(rport_str, &last, 10);
+                if ((*last != '\0') || (last == rport_str)) {
+                        printk(KERN_ERR "ucast_setup - Bad remote port : "
+                               "'%s'\n", rport_str);
+                        return 0;
+                }
+        }
+
+        init->unicast = true;
+
+        printk(KERN_INFO "Configured ucast device: :%u -> %s:%u\n",
+               init->lport, init->addr, init->rport);
+
+        return 1;
+}
+
+static struct transport mcast_transport = {
+        .list   = LIST_HEAD_INIT(mcast_transport.list),
+        .name   = "mcast",
+        .setup  = mcast_setup,
+        .user   = &umcast_user_info,
+        .kern   = &umcast_kern_info,
+        .private_size   = sizeof(struct umcast_data),
+        .setup_size     = sizeof(struct umcast_init),
+};
+
+static struct transport ucast_transport = {
+        .list   = LIST_HEAD_INIT(ucast_transport.list),
+        .name   = "ucast",
+        .setup  = ucast_setup,
+        .user   = &umcast_user_info,
+        .kern   = &umcast_kern_info,
+        .private_size   = sizeof(struct umcast_data),
+        .setup_size     = sizeof(struct umcast_init),
+};
+
+static int register_umcast(void)
+{
+        register_transport(&mcast_transport);
+        register_transport(&ucast_transport);
+        return 0;
+}
+
+late_initcall(register_umcast);
diff --git a/arch/um/drivers/umcast_user.c b/arch/um/drivers/umcast_user.c
new file mode 100644
index 000000000000..59c56fd6f52a
--- /dev/null
+++ b/arch/um/drivers/umcast_user.c
@@ -0,0 +1,186 @@
+/*
+ * user-mode-linux networking multicast transport
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Copyright (C) 2001 by Harald Welte <laforge@gnumonks.org>
+ *
+ * based on the existing uml-networking code, which is
+ * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and
+ * James Leu (jleu@mindspring.net).
+ * Copyright (C) 2001 by various other people who didn't put their name here.
+ *
+ * Licensed under the GPL.
+ *
+ */
+
+#include <unistd.h>
+#include <errno.h>
+#include <netinet/in.h>
+#include "kern_constants.h"
+#include "umcast.h"
+#include "net_user.h"
+#include "um_malloc.h"
+#include "user.h"
+
+static struct sockaddr_in *new_addr(char *addr, unsigned short port)
+{
+        struct sockaddr_in *sin;
+
+        sin = uml_kmalloc(sizeof(struct sockaddr_in), UM_GFP_KERNEL);
+        if (sin == NULL) {
+                printk(UM_KERN_ERR "new_addr: allocation of sockaddr_in "
+                       "failed\n");
+                return NULL;
+        }
+        sin->sin_family = AF_INET;
+        if (addr)
+                sin->sin_addr.s_addr = in_aton(addr);
+        else
+                sin->sin_addr.s_addr = INADDR_ANY;
+        sin->sin_port = htons(port);
+        return sin;
+}
+
+static int umcast_user_init(void *data, void *dev)
+{
+        struct umcast_data *pri = data;
+
+        pri->remote_addr = new_addr(pri->addr, pri->rport);
+        if (pri->unicast)
+                pri->listen_addr = new_addr(NULL, pri->lport);
+        else
+                pri->listen_addr = pri->remote_addr;
+        pri->dev = dev;
+        return 0;
+}
+
+static void umcast_remove(void *data)
+{
+        struct umcast_data *pri = data;
+
+        kfree(pri->listen_addr);
+        if (pri->unicast)
+                kfree(pri->remote_addr);
+        pri->listen_addr = pri->remote_addr = NULL;
+}
+
+static int umcast_open(void *data)
+{
+        struct umcast_data *pri = data;
+        struct sockaddr_in *lsin = pri->listen_addr;
+        struct sockaddr_in *rsin = pri->remote_addr;
+        struct ip_mreq mreq;
+        int fd, yes = 1, err = -EINVAL;
+
+
+        if ((!pri->unicast && lsin->sin_addr.s_addr == 0) ||
+            (rsin->sin_addr.s_addr == 0) ||
+            (lsin->sin_port == 0) || (rsin->sin_port == 0))
+                goto out;
+
+        fd = socket(AF_INET, SOCK_DGRAM, 0);
+
+        if (fd < 0) {
+                err = -errno;
+                printk(UM_KERN_ERR "umcast_open : data socket failed, "
+                       "errno = %d\n", errno);
+                goto out;
+        }
+
+        if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
+                err = -errno;
+                printk(UM_KERN_ERR "umcast_open: SO_REUSEADDR failed, "
+                       "errno = %d\n", errno);
+                goto out_close;
+        }
+
+        if (!pri->unicast) {
+                /* set ttl according to config */
+                if (setsockopt(fd, SOL_IP, IP_MULTICAST_TTL, &pri->ttl,
+                               sizeof(pri->ttl)) < 0) {
+                        err = -errno;
+                        printk(UM_KERN_ERR "umcast_open: IP_MULTICAST_TTL "
+                               "failed, error = %d\n", errno);
+                        goto out_close;
+                }
+
+                /* set LOOP, so data does get fed back to local sockets */
+                if (setsockopt(fd, SOL_IP, IP_MULTICAST_LOOP,
+                               &yes, sizeof(yes)) < 0) {
+                        err = -errno;
+                        printk(UM_KERN_ERR "umcast_open: IP_MULTICAST_LOOP "
+                               "failed, error = %d\n", errno);
+                        goto out_close;
+                }
+        }
+
+        /* bind socket to the address */
+        if (bind(fd, (struct sockaddr *) lsin, sizeof(*lsin)) < 0) {
+                err = -errno;
+                printk(UM_KERN_ERR "umcast_open : data bind failed, "
+                       "errno = %d\n", errno);
+                goto out_close;
+        }
+
+        if (!pri->unicast) {
+                /* subscribe to the multicast group */
+                mreq.imr_multiaddr.s_addr = lsin->sin_addr.s_addr;
+                mreq.imr_interface.s_addr = 0;
+                if (setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP,
+                               &mreq, sizeof(mreq)) < 0) {
+                        err = -errno;
+                        printk(UM_KERN_ERR "umcast_open: IP_ADD_MEMBERSHIP "
+                               "failed, error = %d\n", errno);
+                        printk(UM_KERN_ERR "There appears not to be a "
+                               "multicast-capable network interface on the "
+                               "host.\n");
+                        printk(UM_KERN_ERR "eth0 should be configured in order "
+                               "to use the multicast transport.\n");
+                        goto out_close;
+                }
+        }
+
+        return fd;
+
+ out_close:
+        close(fd);
+ out:
+        return err;
+}
+
+static void umcast_close(int fd, void *data)
+{
+        struct umcast_data *pri = data;
+
+        if (!pri->unicast) {
+                struct ip_mreq mreq;
+                struct sockaddr_in *lsin = pri->listen_addr;
+
+                mreq.imr_multiaddr.s_addr = lsin->sin_addr.s_addr;
+                mreq.imr_interface.s_addr = 0;
+                if (setsockopt(fd, SOL_IP, IP_DROP_MEMBERSHIP,
+                               &mreq, sizeof(mreq)) < 0) {
+                        printk(UM_KERN_ERR "umcast_close: IP_DROP_MEMBERSHIP "
+                               "failed, error = %d\n", errno);
+                }
+        }
+
+        close(fd);
+}
+
+int umcast_user_write(int fd, void *buf, int len, struct umcast_data *pri)
+{
+        struct sockaddr_in *data_addr = pri->remote_addr;
+
+        return net_sendto(fd, buf, len, data_addr, sizeof(*data_addr));
+}
+
+const struct net_user_info umcast_user_info = {
+        .init   = umcast_user_init,
+        .open   = umcast_open,
+        .close  = umcast_close,
+        .remove = umcast_remove,
+        .add_address    = NULL,
+        .delete_address = NULL,
+        .mtu    = ETH_MAX_PACKET,
+        .max_packet     = ETH_MAX_PACKET + ETH_HEADER_OTHER,
+};
diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index da2caa5a21ef..8ac7146c237f 100644
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -90,7 +90,7 @@ static int xterm_open(int input, int output, int primary, void *d,
         int pid, fd, new, err;
         char title[256], file[] = "/tmp/xterm-pipeXXXXXX";
         char *argv[] = { terminal_emulator, title_switch, title, exec_switch,
-                         "/usr/lib/uml/port-helper", "-uml-socket",
+                         OS_LIB_PATH "/uml/port-helper", "-uml-socket",
                          file, NULL };
 
         if (access(argv[4], X_OK) < 0)
diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/asm/common.lds.S
index 34bede8aad4a..4938de5512d2 100644
--- a/arch/um/include/asm/common.lds.S
+++ b/arch/um/include/asm/common.lds.S
@@ -42,7 +42,7 @@
         INIT_SETUP(0)
   }
 
-  PERCPU(32, 32)
+  PERCPU_SECTION(32)
         
   .initcall.init : {
         INIT_CALLS
diff --git a/arch/um/include/asm/processor-generic.h b/arch/um/include/asm/processor-generic.h
index d1d1b0d8a0cd..98d01bc4fa92 100644
--- a/arch/um/include/asm/processor-generic.h
+++ b/arch/um/include/asm/processor-generic.h
@@ -14,6 +14,8 @@ struct task_struct;
 #include "registers.h"
 #include "sysdep/archsetjmp.h"
 
+#include <linux/prefetch.h>
+
 struct mm_struct;
 
 struct thread_struct {
diff --git a/arch/um/include/asm/smp.h b/arch/um/include/asm/smp.h
index f27a96313174..4a4b09d4f366 100644
--- a/arch/um/include/asm/smp.h
+++ b/arch/um/include/asm/smp.h
@@ -11,7 +11,6 @@
 
 #define cpu_logical_map(n) (n)
 #define cpu_number_map(n) (n)
-#define PROC_CHANGE_PENALTY     15 /* Pick a number, any number */
 extern int hard_smp_processor_id(void);
 #define NO_PROC_ID -1
 
diff --git a/arch/um/include/asm/tlb.h b/arch/um/include/asm/tlb.h
index 660caedac9eb..4febacd1a8a1 100644
--- a/arch/um/include/asm/tlb.h
+++ b/arch/um/include/asm/tlb.h
@@ -22,9 +22,6 @@ struct mmu_gather {
         unsigned int            fullmm; /* non-zero means full mm flush */
 };
 
-/* Users of the generic TLB shootdown code must declare this storage space. */
-DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep,
                                           unsigned long address)
 {
@@ -47,27 +44,20 @@ static inline void init_tlb_gather(struct mmu_gather *tlb)
         }
 }
 
-/* tlb_gather_mmu
- *      Return a pointer to an initialized struct mmu_gather.
- */
-static inline struct mmu_gather *
-tlb_gather_mmu(struct mm_struct *mm, unsigned int full_mm_flush)
+static inline void
+tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned int full_mm_flush)
 {
-        struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
-
         tlb->mm = mm;
         tlb->fullmm = full_mm_flush;
 
         init_tlb_gather(tlb);
-
-        return tlb;
 }
 
 extern void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
                                unsigned long end);
 
 static inline void
-tlb_flush_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
+tlb_flush_mmu(struct mmu_gather *tlb)
 {
         if (!tlb->need_flush)
                 return;
@@ -83,12 +73,10 @@ tlb_flush_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
 static inline void
 tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
 {
-        tlb_flush_mmu(tlb, start, end);
+        tlb_flush_mmu(tlb);
 
         /* keep the page table cache within bounds */
         check_pgt_cache();
-
-        put_cpu_var(mmu_gathers);
 }
 
 /* tlb_remove_page
@@ -96,11 +84,16 @@ tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
  *      while handling the additional races in SMP caused by other CPUs
  *      caching valid mappings in their TLBs.
  */
-static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)
 {
         tlb->need_flush = 1;
         free_page_and_swap_cache(page);
-        return;
+        return 1; /* avoid calling tlb_flush_mmu */
+}
+
+static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+{
+        __tlb_remove_page(tlb, page);
 }
 
 /**
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
index c4617baaa4f2..83c7c2ecd614 100644
--- a/arch/um/include/shared/os.h
+++ b/arch/um/include/shared/os.h
@@ -29,6 +29,12 @@
 #define OS_ACC_R_OK    4       /* Test for read permission.  */
 #define OS_ACC_RW_OK   (OS_ACC_W_OK | OS_ACC_R_OK) /* Test for RW permission */
 
+#ifdef CONFIG_64BIT
+#define OS_LIB_PATH     "/usr/lib64/"
+#else
+#define OS_LIB_PATH     "/usr/lib/"
+#endif
+
 /*
  * types taken from stat_file() in hostfs_user.c
  * (if they are wrong here, they are wrong there...).
@@ -238,6 +244,7 @@ extern int raw(int fd);
 extern void setup_machinename(char *machine_out);
 extern void setup_hostinfo(char *buf, int len);
 extern void os_dump_core(void) __attribute__ ((noreturn));
+extern void um_early_printk(const char *s, unsigned int n);
 
 /* time.c */
 extern void idle_sleep(unsigned long long nsecs);
diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
index 1119233597a1..c4491c15afb2 100644
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
@@ -17,6 +17,7 @@ obj-y = config.o exec.o exitcode.o init_task.o irq.o ksyms.o mem.o \
 obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
 obj-$(CONFIG_GPROF)     += gprof_syms.o
 obj-$(CONFIG_GCOV)      += gmon_syms.o
+obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
 
 USER_OBJS := config.o
 
diff --git a/arch/um/kernel/early_printk.c b/arch/um/kernel/early_printk.c
new file mode 100644
index 000000000000..ec649bf72f68
--- /dev/null
+++ b/arch/um/kernel/early_printk.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2011 Richard Weinberger <richrd@nod.at>
+ *
+ * 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/kernel.h>
+#include <linux/console.h>
+#include <linux/init.h>
+#include "os.h"
+
+static void early_console_write(struct console *con, const char *s, unsigned int n)
+{
+        um_early_printk(s, n);
+}
+
+static struct console early_console = {
+        .name = "earlycon",
+        .write = early_console_write,
+        .flags = CON_BOOT,
+        .index = -1,
+};
+
+static int __init setup_early_printk(char *buf)
+{
+        register_console(&early_console);
+
+        return 0;
+}
+
+early_param("earlyprintk", setup_early_printk);
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
index 106bf27e2a9a..155206a66908 100644
--- a/arch/um/kernel/smp.c
+++ b/arch/um/kernel/smp.c
@@ -7,9 +7,6 @@
 #include "asm/pgalloc.h"
 #include "asm/tlb.h"
 
-/* For some reason, mmu_gathers are referenced when CONFIG_SMP is off. */
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 #ifdef CONFIG_SMP
 
 #include "linux/sched.h"
@@ -173,7 +170,7 @@ void IPI_handler(int cpu)
                         break;
 
                 case 'R':
-                        set_tsk_need_resched(current);
+                        scheduler_ipi();
                         break;
 
                 case 'S':
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index 637c6505dc00..8c7b8823d1f0 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -113,6 +113,27 @@ out_of_memory:
         return 0;
 }
 
+static void show_segv_info(struct uml_pt_regs *regs)
+{
+        struct task_struct *tsk = current;
+        struct faultinfo *fi = UPT_FAULTINFO(regs);
+
+        if (!unhandled_signal(tsk, SIGSEGV))
+                return;
+
+        if (!printk_ratelimit())
+                return;
+
+        printk("%s%s[%d]: segfault at %lx ip %p sp %p error %x",
+                task_pid_nr(tsk) > 1 ? KERN_INFO : KERN_EMERG,
+                tsk->comm, task_pid_nr(tsk), FAULT_ADDRESS(*fi),
+                (void *)UPT_IP(regs), (void *)UPT_SP(regs),
+                fi->error_code);
+
+        print_vma_addr(KERN_CONT " in ", UPT_IP(regs));
+        printk(KERN_CONT "\n");
+}
+
 static void bad_segv(struct faultinfo fi, unsigned long ip)
 {
         struct siginfo si;
@@ -141,6 +162,7 @@ void segv_handler(int sig, struct uml_pt_regs *regs)
         struct faultinfo * fi = UPT_FAULTINFO(regs);
 
         if (UPT_IS_USER(regs) && !SEGV_IS_FIXABLE(fi)) {
+                show_segv_info(regs);
                 bad_segv(*fi, UPT_IP(regs));
                 return;
         }
@@ -202,6 +224,8 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,
                       address, ip);
         }
 
+        show_segv_info(regs);
+
         if (err == -EACCES) {
                 si.si_signo = SIGBUS;
                 si.si_errno = 0;
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index eee69b9f52c9..fb2a97a75fb1 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -78,7 +78,7 @@ static void install_fatal_handler(int sig)
         }
 }
 
-#define UML_LIB_PATH    ":/usr/lib/uml"
+#define UML_LIB_PATH    ":" OS_LIB_PATH "/uml"
 
 static void setup_env_path(void)
 {
@@ -142,7 +142,6 @@ int __init main(int argc, char **argv, char **envp)
          */
         install_fatal_handler(SIGINT);
         install_fatal_handler(SIGTERM);
-        install_fatal_handler(SIGHUP);
 
         scan_elf_aux(envp);
 
diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c
index e0477c3ee894..0c45dc8efb05 100644
--- a/arch/um/os-Linux/process.c
+++ b/arch/um/os-Linux/process.c
@@ -253,6 +253,7 @@ void init_new_thread_signals(void)
                     SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGALRM,
                     SIGVTALRM, -1);
         signal(SIGWINCH, SIG_IGN);
+        signal(SIGTERM, SIG_DFL);
 }
 
 int run_kernel_thread(int (*fn)(void *), void *arg, jmp_buf **jmp_ptr)
diff --git a/arch/um/os-Linux/util.c b/arch/um/os-Linux/util.c
index 42827cafa6af..5803b1887672 100644
--- a/arch/um/os-Linux/util.c
+++ b/arch/um/os-Linux/util.c
@@ -139,3 +139,8 @@ void os_dump_core(void)
 
         uml_abort();
 }
+
+void um_early_printk(const char *s, unsigned int n)
+{
+        printf("%.*s", n, s);
+}
diff --git a/arch/unicore32/Kconfig.debug b/arch/unicore32/Kconfig.debug
index 3140151ede45..ae2ec334c3c6 100644
--- a/arch/unicore32/Kconfig.debug
+++ b/arch/unicore32/Kconfig.debug
@@ -27,13 +27,6 @@ config EARLY_PRINTK
           with klogd/syslogd or the X server. You should normally N here,
           unless you want to debug such a crash.
 
-config DEBUG_STACK_USAGE
-        bool "Enable stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        help
-          Enables the display of the minimum amount of free stack which each
-          task has ever had available in the sysrq-T output.
-
 # These options are only for real kernel hackers who want to get their hands dirty.
 config DEBUG_LL
         bool "Kernel low-level debugging functions"
diff --git a/arch/unicore32/kernel/irq.c b/arch/unicore32/kernel/irq.c
index 2aa30a364bbe..d4efa7d679ff 100644
--- a/arch/unicore32/kernel/irq.c
+++ b/arch/unicore32/kernel/irq.c
@@ -23,7 +23,7 @@
 #include <linux/list.h>
 #include <linux/kallsyms.h>
 #include <linux/proc_fs.h>
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/gpio.h>
 
 #include <asm/system.h>
@@ -237,7 +237,7 @@ static struct puv3_irq_state {
         unsigned int    iccr;
 } puv3_irq_state;
 
-static int puv3_irq_suspend(struct sys_device *dev, pm_message_t state)
+static int puv3_irq_suspend(void)
 {
         struct puv3_irq_state *st = &puv3_irq_state;
 
@@ -265,7 +265,7 @@ static int puv3_irq_suspend(struct sys_device *dev, pm_message_t state)
         return 0;
 }
 
-static int puv3_irq_resume(struct sys_device *dev)
+static void puv3_irq_resume(void)
 {
         struct puv3_irq_state *st = &puv3_irq_state;
 
@@ -278,27 +278,20 @@ static int puv3_irq_resume(struct sys_device *dev)
 
                 writel(st->icmr, INTC_ICMR);
         }
-        return 0;
 }
 
-static struct sysdev_class puv3_irq_sysclass = {
-        .name           = "pkunity-irq",
+static struct syscore_ops puv3_irq_syscore_ops = {
         .suspend        = puv3_irq_suspend,
         .resume         = puv3_irq_resume,
 };
 
-static struct sys_device puv3_irq_device = {
-        .id             = 0,
-        .cls            = &puv3_irq_sysclass,
-};
-
-static int __init puv3_irq_init_devicefs(void)
+static int __init puv3_irq_init_syscore(void)
 {
-        sysdev_class_register(&puv3_irq_sysclass);
-        return sysdev_register(&puv3_irq_device);
+        register_syscore_ops(&puv3_irq_syscore_ops);
+        return 0;
 }
 
-device_initcall(puv3_irq_init_devicefs);
+device_initcall(puv3_irq_init_syscore);
 
 void __init init_IRQ(void)
 {
diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c
index 254e36fa9513..b9a26465e728 100644
--- a/arch/unicore32/kernel/traps.c
+++ b/arch/unicore32/kernel/traps.c
@@ -192,7 +192,6 @@ static int __die(const char *str, int err, struct thread_info *thread,
 
         printk(KERN_EMERG "Internal error: %s: %x [#%d]\n",
                str, err, ++die_counter);
-        sysfs_printk_last_file();
 
         /* trap and error numbers are mostly meaningless on UniCore */
         ret = notify_die(DIE_OOPS, str, regs, err, tsk->thread.trap_no, \
diff --git a/arch/unicore32/mm/init.c b/arch/unicore32/mm/init.c
index 1fc02633f700..2d3e7112d2a3 100644
--- a/arch/unicore32/mm/init.c
+++ b/arch/unicore32/mm/init.c
@@ -62,7 +62,7 @@ void show_mem(unsigned int filter)
         struct meminfo *mi = &meminfo;
 
         printk(KERN_DEFAULT "Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
 
         for_each_bank(i, mi) {
                 struct membank *bank = &mi->bank[i];
diff --git a/arch/unicore32/mm/mmu.c b/arch/unicore32/mm/mmu.c
index db2d334941b4..3e5c3e5a0b45 100644
--- a/arch/unicore32/mm/mmu.c
+++ b/arch/unicore32/mm/mmu.c
@@ -30,8 +30,6 @@
 
 #include "mm.h"
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 /*
  * empty_zero_page is a special page that is used for
  * zero-initialized data and COW.
diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild
index 0e103236b754..0e9dec6cadd1 100644
--- a/arch/x86/Kbuild
+++ b/arch/x86/Kbuild
@@ -15,3 +15,4 @@ obj-y += vdso/
 obj-$(CONFIG_IA32_EMULATION) += ia32/
 
 obj-y += platform/
+obj-y += net/
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cc6c53a95bfd..483775f42d2a 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -8,6 +8,7 @@ config 64BIT
 
 config X86_32
         def_bool !64BIT
+        select CLKSRC_I8253
 
 config X86_64
         def_bool 64BIT
@@ -16,8 +17,6 @@ config X86_64
 config X86
         def_bool y
         select HAVE_AOUT if X86_32
-        select HAVE_READQ
-        select HAVE_WRITEQ
         select HAVE_UNSTABLE_SCHED_CLOCK
         select HAVE_IDE
         select HAVE_OPROFILE
@@ -71,7 +70,7 @@ config X86
         select GENERIC_IRQ_SHOW
         select IRQ_FORCED_THREADING
         select USE_GENERIC_SMP_HELPERS if SMP
-        select ARCH_NO_SYSDEV_OPS
+        select HAVE_BPF_JIT if (X86_64 && NET)
 
 config INSTRUCTION_DECODER
         def_bool (KPROBES || PERF_EVENTS)
@@ -112,7 +111,14 @@ config MMU
         def_bool y
 
 config ZONE_DMA
-        def_bool y
+        bool "DMA memory allocation support" if EXPERT
+        default y
+        help
+          DMA memory allocation support allows devices with less than 32-bit
+          addressing to allocate within the first 16MB of address space.
+          Disable if no such devices will be used.
+
+          If unsure, say Y.
 
 config SBUS
         bool
@@ -365,17 +371,6 @@ config X86_UV
 # Following is an alphabetically sorted list of 32 bit extended platforms
 # Please maintain the alphabetic order if and when there are additions
 
-config X86_ELAN
-        bool "AMD Elan"
-        depends on X86_32
-        depends on X86_EXTENDED_PLATFORM
-        ---help---
-          Select this for an AMD Elan processor.
-
-          Do not use this option for K6/Athlon/Opteron processors!
-
-          If unsure, choose "PC-compatible" instead.
-
 config X86_INTEL_CE
         bool "CE4100 TV platform"
         depends on PCI
@@ -690,6 +685,7 @@ config AMD_IOMMU
         bool "AMD IOMMU support"
         select SWIOTLB
         select PCI_MSI
+        select PCI_IOV
         depends on X86_64 && PCI && ACPI
         ---help---
           With this option you can enable support for AMD IOMMU hardware in
@@ -919,6 +915,7 @@ config TOSHIBA
 
 config I8K
         tristate "Dell laptop support"
+        select HWMON
         ---help---
           This adds a driver to safely access the System Management Mode
           of the CPU on the Dell Inspiron 8000. The System Management Mode
@@ -1174,7 +1171,7 @@ comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
 config AMD_NUMA
         def_bool y
         prompt "Old style AMD Opteron NUMA detection"
-        depends on X86_64 && NUMA && PCI
+        depends on NUMA && PCI
         ---help---
           Enable AMD NUMA node topology detection.  You should say Y here if
           you have a multi processor AMD system. This uses an old method to
@@ -1201,7 +1198,7 @@ config NODES_SPAN_OTHER_NODES
 
 config NUMA_EMU
         bool "NUMA emulation"
-        depends on X86_64 && NUMA
+        depends on NUMA
         ---help---
           Enable NUMA emulation. A flat machine will be split
           into virtual nodes when booted with "numa=fake=N", where N is the
@@ -1223,6 +1220,10 @@ config HAVE_ARCH_BOOTMEM
         def_bool y
         depends on X86_32 && NUMA
 
+config HAVE_ARCH_ALLOC_REMAP
+        def_bool y
+        depends on X86_32 && NUMA
+
 config ARCH_HAVE_MEMORY_PRESENT
         def_bool y
         depends on X86_32 && DISCONTIGMEM
@@ -1231,13 +1232,9 @@ config NEED_NODE_MEMMAP_SIZE
         def_bool y
         depends on X86_32 && (DISCONTIGMEM || SPARSEMEM)
 
-config HAVE_ARCH_ALLOC_REMAP
-        def_bool y
-        depends on X86_32 && NUMA
-
 config ARCH_FLATMEM_ENABLE
         def_bool y
-        depends on X86_32 && ARCH_SELECT_MEMORY_MODEL && !NUMA
+        depends on X86_32 && !NUMA
 
 config ARCH_DISCONTIGMEM_ENABLE
         def_bool y
@@ -1247,20 +1244,16 @@ config ARCH_DISCONTIGMEM_DEFAULT
         def_bool y
         depends on NUMA && X86_32
 
-config ARCH_PROC_KCORE_TEXT
-        def_bool y
-        depends on X86_64 && PROC_KCORE
-
-config ARCH_SPARSEMEM_DEFAULT
-        def_bool y
-        depends on X86_64
-
 config ARCH_SPARSEMEM_ENABLE
         def_bool y
         depends on X86_64 || NUMA || (EXPERIMENTAL && X86_32) || X86_32_NON_STANDARD
         select SPARSEMEM_STATIC if X86_32
         select SPARSEMEM_VMEMMAP_ENABLE if X86_64
 
+config ARCH_SPARSEMEM_DEFAULT
+        def_bool y
+        depends on X86_64
+
 config ARCH_SELECT_MEMORY_MODEL
         def_bool y
         depends on ARCH_SPARSEMEM_ENABLE
@@ -1269,6 +1262,10 @@ config ARCH_MEMORY_PROBE
         def_bool X86_64
         depends on MEMORY_HOTPLUG
 
+config ARCH_PROC_KCORE_TEXT
+        def_bool y
+        depends on X86_64 && PROC_KCORE
+
 config ILLEGAL_POINTER_VALUE
        hex
        default 0 if X86_32
@@ -1703,10 +1700,6 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
         def_bool y
         depends on MEMORY_HOTPLUG
 
-config HAVE_ARCH_EARLY_PFN_TO_NID
-        def_bool X86_64
-        depends on NUMA
-
 config USE_PERCPU_NUMA_NODE_ID
         def_bool y
         depends on NUMA
@@ -1848,7 +1841,7 @@ config APM_ALLOW_INTS
 
 endif # APM
 
-source "arch/x86/kernel/cpu/cpufreq/Kconfig"
+source "drivers/cpufreq/Kconfig"
 
 source "drivers/cpuidle/Kconfig"
 
@@ -2076,7 +2069,7 @@ config OLPC
         depends on !X86_PAE
         select GPIOLIB
         select OF
-        select OF_PROMTREE if PROC_DEVICETREE
+        select OF_PROMTREE
         ---help---
           Add support for detecting the unique features of the OLPC
           XO hardware.
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index d161e939df62..6a7cfdf8ff69 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -1,6 +1,4 @@
 # Put here option for CPU selection and depending optimization
-if !X86_ELAN
-
 choice
         prompt "Processor family"
         default M686 if X86_32
@@ -203,6 +201,14 @@ config MWINCHIP3D
           stores for this CPU, which can increase performance of some
           operations.
 
+config MELAN
+        bool "AMD Elan"
+        depends on X86_32
+        ---help---
+          Select this for an AMD Elan processor.
+
+          Do not use this option for K6/Athlon/Opteron processors!
+
 config MGEODEGX1
         bool "GeodeGX1"
         depends on X86_32
@@ -292,8 +298,6 @@ config X86_GENERIC
           This is really intended for distributors who need more
           generic optimizations.
 
-endif
-
 #
 # Define implied options from the CPU selection here
 config X86_INTERNODE_CACHE_SHIFT
@@ -312,7 +316,7 @@ config X86_L1_CACHE_SHIFT
         int
         default "7" if MPENTIUM4 || MPSC
         default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
-        default "4" if X86_ELAN || M486 || M386 || MGEODEGX1
+        default "4" if MELAN || M486 || M386 || MGEODEGX1
         default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
 
 config X86_XADD
@@ -358,7 +362,7 @@ config X86_POPAD_OK
 
 config X86_ALIGNMENT_16
         def_bool y
-        depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
+        depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
 
 config X86_INTEL_USERCOPY
         def_bool y
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 615e18810f48..c0f8a5c88910 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -66,26 +66,6 @@ config DEBUG_STACKOVERFLOW
           This option will cause messages to be printed if free stack space
           drops below a certain limit.
 
-config DEBUG_STACK_USAGE
-        bool "Stack utilization instrumentation"
-        depends on DEBUG_KERNEL
-        ---help---
-          Enables the display of the minimum amount of free stack which each
-          task has ever had available in the sysrq-T and sysrq-P debug output.
-
-          This option will slow down process creation somewhat.
-
-config DEBUG_PER_CPU_MAPS
-        bool "Debug access to per_cpu maps"
-        depends on DEBUG_KERNEL
-        depends on SMP
-        ---help---
-          Say Y to verify that the per_cpu map being accessed has
-          been setup.  Adds a fair amount of code to kernel memory
-          and decreases performance.
-
-          Say N if unsure.
-
 config X86_PTDUMP
         bool "Export kernel pagetable layout to userspace via debugfs"
         depends on DEBUG_KERNEL
diff --git a/arch/x86/Makefile_32.cpu b/arch/x86/Makefile_32.cpu
index f2ee1abb1df9..86cee7b749e1 100644
--- a/arch/x86/Makefile_32.cpu
+++ b/arch/x86/Makefile_32.cpu
@@ -37,7 +37,7 @@ cflags-$(CONFIG_MATOM)		+= $(call cc-option,-march=atom,$(call cc-option,-march=
         $(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
 
 # AMD Elan support
-cflags-$(CONFIG_X86_ELAN)       += -march=i486
+cflags-$(CONFIG_MELAN)          += -march=i486
 
 # Geode GX1 support
 cflags-$(CONFIG_MGEODEGX1)      += -march=pentium-mmx
diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile
index 1a58ad89fdf7..c04f1b7a9139 100644
--- a/arch/x86/crypto/Makefile
+++ b/arch/x86/crypto/Makefile
@@ -2,8 +2,6 @@
 # Arch-specific CryptoAPI modules.
 #
 
-obj-$(CONFIG_CRYPTO_FPU) += fpu.o
-
 obj-$(CONFIG_CRYPTO_AES_586) += aes-i586.o
 obj-$(CONFIG_CRYPTO_TWOFISH_586) += twofish-i586.o
 obj-$(CONFIG_CRYPTO_SALSA20_586) += salsa20-i586.o
@@ -24,6 +22,6 @@ aes-x86_64-y := aes-x86_64-asm_64.o aes_glue.o
 twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_glue.o
 salsa20-x86_64-y := salsa20-x86_64-asm_64.o salsa20_glue.o
 
-aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o
+aesni-intel-y := aesni-intel_asm.o aesni-intel_glue.o fpu.o
 
 ghash-clmulni-intel-y := ghash-clmulni-intel_asm.o ghash-clmulni-intel_glue.o
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index 2577613fb32b..feee8ff1d05e 100644
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -94,6 +94,10 @@ asmlinkage void aesni_cbc_enc(struct crypto_aes_ctx *ctx, u8 *out,
                               const u8 *in, unsigned int len, u8 *iv);
 asmlinkage void aesni_cbc_dec(struct crypto_aes_ctx *ctx, u8 *out,
                               const u8 *in, unsigned int len, u8 *iv);
+
+int crypto_fpu_init(void);
+void crypto_fpu_exit(void);
+
 #ifdef CONFIG_X86_64
 asmlinkage void aesni_ctr_enc(struct crypto_aes_ctx *ctx, u8 *out,
                               const u8 *in, unsigned int len, u8 *iv);
@@ -1257,6 +1261,8 @@ static int __init aesni_init(void)
                 return -ENODEV;
         }
 
+        if ((err = crypto_fpu_init()))
+                goto fpu_err;
         if ((err = crypto_register_alg(&aesni_alg)))
                 goto aes_err;
         if ((err = crypto_register_alg(&__aesni_alg)))
@@ -1334,6 +1340,7 @@ blk_ecb_err:
 __aes_err:
         crypto_unregister_alg(&aesni_alg);
 aes_err:
+fpu_err:
         return err;
 }
 
@@ -1363,6 +1370,8 @@ static void __exit aesni_exit(void)
         crypto_unregister_alg(&blk_ecb_alg);
         crypto_unregister_alg(&__aesni_alg);
         crypto_unregister_alg(&aesni_alg);
+
+        crypto_fpu_exit();
 }
 
 module_init(aesni_init);
diff --git a/arch/x86/crypto/fpu.c b/arch/x86/crypto/fpu.c
index 1a8f8649c035..98d7a188f46b 100644
--- a/arch/x86/crypto/fpu.c
+++ b/arch/x86/crypto/fpu.c
@@ -150,18 +150,12 @@ static struct crypto_template crypto_fpu_tmpl = {
         .module = THIS_MODULE,
 };
 
-static int __init crypto_fpu_module_init(void)
+int __init crypto_fpu_init(void)
 {
         return crypto_register_template(&crypto_fpu_tmpl);
 }
 
-static void __exit crypto_fpu_module_exit(void)
+void __exit crypto_fpu_exit(void)
 {
         crypto_unregister_template(&crypto_fpu_tmpl);
 }
-
-module_init(crypto_fpu_module_init);
-module_exit(crypto_fpu_module_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("FPU block cipher wrapper");
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 849a9d23c71d..95f5826be458 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -848,4 +848,5 @@ ia32_sys_call_table:
         .quad compat_sys_open_by_handle_at
         .quad compat_sys_clock_adjtime
         .quad sys_syncfs
+        .quad compat_sys_sendmmsg       /* 345 */
 ia32_syscall_end:
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 12e0e7dd869c..416d865eae39 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -183,8 +183,6 @@ static inline void disable_acpi(void) { }
 
 #define ARCH_HAS_POWER_INIT     1
 
-struct bootnode;
-
 #ifdef CONFIG_ACPI_NUMA
 extern int acpi_numa;
 extern int x86_acpi_numa_init(void);
diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
index a63a68be1cce..94d420b360d1 100644
--- a/arch/x86/include/asm/alternative-asm.h
+++ b/arch/x86/include/asm/alternative-asm.h
@@ -15,4 +15,13 @@
         .endm
 #endif
 
+.macro altinstruction_entry orig alt feature orig_len alt_len
+        .align 8
+        .quad \orig
+        .quad \alt
+        .word \feature
+        .byte \orig_len
+        .byte \alt_len
+.endm
+
 #endif  /*  __ASSEMBLY__  */
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 13009d1af99a..bf535f947e8c 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -4,7 +4,6 @@
 #include <linux/types.h>
 #include <linux/stddef.h>
 #include <linux/stringify.h>
-#include <linux/jump_label.h>
 #include <asm/asm.h>
 
 /*
@@ -191,12 +190,4 @@ extern void *text_poke(void *addr, const void *opcode, size_t len);
 extern void *text_poke_smp(void *addr, const void *opcode, size_t len);
 extern void text_poke_smp_batch(struct text_poke_param *params, int n);
 
-#if defined(CONFIG_DYNAMIC_FTRACE) || defined(HAVE_JUMP_LABEL)
-#define IDEAL_NOP_SIZE_5 5
-extern unsigned char ideal_nop5[IDEAL_NOP_SIZE_5];
-extern void arch_init_ideal_nop5(void);
-#else
-static inline void arch_init_ideal_nop5(void) {}
-#endif
-
 #endif /* _ASM_X86_ALTERNATIVE_H */
diff --git a/arch/x86/include/asm/amd_iommu_proto.h b/arch/x86/include/asm/amd_iommu_proto.h
index 916bc8111a01..55d95eb789b3 100644
--- a/arch/x86/include/asm/amd_iommu_proto.h
+++ b/arch/x86/include/asm/amd_iommu_proto.h
@@ -19,13 +19,12 @@
 #ifndef _ASM_X86_AMD_IOMMU_PROTO_H
 #define _ASM_X86_AMD_IOMMU_PROTO_H
 
-struct amd_iommu;
+#include <asm/amd_iommu_types.h>
 
 extern int amd_iommu_init_dma_ops(void);
 extern int amd_iommu_init_passthrough(void);
+extern irqreturn_t amd_iommu_int_thread(int irq, void *data);
 extern irqreturn_t amd_iommu_int_handler(int irq, void *data);
-extern void amd_iommu_flush_all_domains(void);
-extern void amd_iommu_flush_all_devices(void);
 extern void amd_iommu_apply_erratum_63(u16 devid);
 extern void amd_iommu_reset_cmd_buffer(struct amd_iommu *iommu);
 extern int amd_iommu_init_devices(void);
@@ -44,4 +43,12 @@ static inline bool is_rd890_iommu(struct pci_dev *pdev)
                (pdev->device == PCI_DEVICE_ID_RD890_IOMMU);
 }
 
+static inline bool iommu_feature(struct amd_iommu *iommu, u64 f)
+{
+        if (!(iommu->cap & (1 << IOMMU_CAP_EFR)))
+                return false;
+
+        return !!(iommu->features & f);
+}
+
 #endif /* _ASM_X86_AMD_IOMMU_PROTO_H  */
diff --git a/arch/x86/include/asm/amd_iommu_types.h b/arch/x86/include/asm/amd_iommu_types.h
index e3509fc303bf..4c9982995414 100644
--- a/arch/x86/include/asm/amd_iommu_types.h
+++ b/arch/x86/include/asm/amd_iommu_types.h
@@ -68,12 +68,25 @@
 #define MMIO_CONTROL_OFFSET     0x0018
 #define MMIO_EXCL_BASE_OFFSET   0x0020
 #define MMIO_EXCL_LIMIT_OFFSET  0x0028
+#define MMIO_EXT_FEATURES       0x0030
 #define MMIO_CMD_HEAD_OFFSET    0x2000
 #define MMIO_CMD_TAIL_OFFSET    0x2008
 #define MMIO_EVT_HEAD_OFFSET    0x2010
 #define MMIO_EVT_TAIL_OFFSET    0x2018
 #define MMIO_STATUS_OFFSET      0x2020
 
+
+/* Extended Feature Bits */
+#define FEATURE_PREFETCH        (1ULL<<0)
+#define FEATURE_PPR             (1ULL<<1)
+#define FEATURE_X2APIC          (1ULL<<2)
+#define FEATURE_NX              (1ULL<<3)
+#define FEATURE_GT              (1ULL<<4)
+#define FEATURE_IA              (1ULL<<6)
+#define FEATURE_GA              (1ULL<<7)
+#define FEATURE_HE              (1ULL<<8)
+#define FEATURE_PC              (1ULL<<9)
+
 /* MMIO status bits */
 #define MMIO_STATUS_COM_WAIT_INT_MASK   0x04
 
@@ -113,7 +126,9 @@
 /* command specific defines */
 #define CMD_COMPL_WAIT          0x01
 #define CMD_INV_DEV_ENTRY       0x02
-#define CMD_INV_IOMMU_PAGES     0x03
+#define CMD_INV_IOMMU_PAGES     0x03
+#define CMD_INV_IOTLB_PAGES     0x04
+#define CMD_INV_ALL             0x08
 
 #define CMD_COMPL_WAIT_STORE_MASK       0x01
 #define CMD_COMPL_WAIT_INT_MASK         0x02
@@ -215,6 +230,8 @@
 #define IOMMU_PTE_IR (1ULL << 61)
 #define IOMMU_PTE_IW (1ULL << 62)
 
+#define DTE_FLAG_IOTLB  0x01
+
 #define IOMMU_PAGE_MASK (((1ULL << 52) - 1) & ~0xfffULL)
 #define IOMMU_PTE_PRESENT(pte) ((pte) & IOMMU_PTE_P)
 #define IOMMU_PTE_PAGE(pte) (phys_to_virt((pte) & IOMMU_PAGE_MASK))
@@ -227,6 +244,7 @@
 /* IOMMU capabilities */
 #define IOMMU_CAP_IOTLB   24
 #define IOMMU_CAP_NPCACHE 26
+#define IOMMU_CAP_EFR     27
 
 #define MAX_DOMAIN_ID 65536
 
@@ -249,6 +267,8 @@ extern bool amd_iommu_dump;
 
 /* global flag if IOMMUs cache non-present entries */
 extern bool amd_iommu_np_cache;
+/* Only true if all IOMMUs support device IOTLBs */
+extern bool amd_iommu_iotlb_sup;
 
 /*
  * Make iterating over all IOMMUs easier
@@ -371,6 +391,9 @@ struct amd_iommu {
         /* flags read from acpi table */
         u8 acpi_flags;
 
+        /* Extended features */
+        u64 features;
+
         /*
          * Capability pointer. There could be more than one IOMMU per PCI
          * device function if there are more than one AMD IOMMU capability
@@ -409,9 +432,6 @@ struct amd_iommu {
         /* if one, we need to send a completion wait command */
         bool need_sync;
 
-        /* becomes true if a command buffer reset is running */
-        bool reset_in_progress;
-
         /* default dma_ops domain for that IOMMU */
         struct dma_ops_domain *default_dom;
 
diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h
index 331682231bb4..67f87f257611 100644
--- a/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@ -11,7 +11,6 @@ struct amd_nb_bus_dev_range {
 
 extern const struct pci_device_id amd_nb_misc_ids[];
 extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];
-struct bootnode;
 
 extern bool early_is_amd_nb(u32 value);
 extern int amd_cache_northbridges(void);
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 2b7d573be549..4a0b7c7e2cce 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -363,7 +363,12 @@ struct apic {
          */
         int (*x86_32_early_logical_apicid)(int cpu);
 
-        /* determine CPU -> NUMA node mapping */
+        /*
+         * Optional method called from setup_local_APIC() after logical
+         * apicid is guaranteed to be known to initialize apicid -> node
+         * mapping if NUMA initialization hasn't done so already.  Don't
+         * add new users.
+         */
         int (*x86_32_numa_cpu_node)(int cpu);
 #endif
 };
@@ -376,6 +381,26 @@ struct apic {
 extern struct apic *apic;
 
 /*
+ * APIC drivers are probed based on how they are listed in the .apicdrivers
+ * section. So the order is important and enforced by the ordering
+ * of different apic driver files in the Makefile.
+ *
+ * For the files having two apic drivers, we use apic_drivers()
+ * to enforce the order with in them.
+ */
+#define apic_driver(sym)                                        \
+        static struct apic *__apicdrivers_##sym __used          \
+        __aligned(sizeof(struct apic *))                        \
+        __section(.apicdrivers) = { &sym }
+
+#define apic_drivers(sym1, sym2)                                        \
+        static struct apic *__apicdrivers_##sym1##sym2[2] __used        \
+        __aligned(sizeof(struct apic *))                                \
+        __section(.apicdrivers) = { &sym1, &sym2 }
+
+extern struct apic *__apicdrivers[], *__apicdrivers_end[];
+
+/*
  * APIC functionality to boot other CPUs - only used on SMP:
  */
 #ifdef CONFIG_SMP
@@ -453,15 +478,10 @@ static inline unsigned default_get_apic_id(unsigned long x)
 #define DEFAULT_TRAMPOLINE_PHYS_HIGH            0x469
 
 #ifdef CONFIG_X86_64
-extern struct apic apic_flat;
-extern struct apic apic_physflat;
-extern struct apic apic_x2apic_cluster;
-extern struct apic apic_x2apic_phys;
 extern int default_acpi_madt_oem_check(char *, char *);
 
 extern void apic_send_IPI_self(int vector);
 
-extern struct apic apic_x2apic_uv_x;
 DECLARE_PER_CPU(int, x2apic_extra_bits);
 
 extern int default_cpu_present_to_apicid(int mps_cpu);
@@ -475,7 +495,7 @@ static inline void default_wait_for_init_deassert(atomic_t *deassert)
         return;
 }
 
-extern void generic_bigsmp_probe(void);
+extern struct apic *generic_bigsmp_probe(void);
 
 
 #ifdef CONFIG_X86_LOCAL_APIC
@@ -511,8 +531,6 @@ extern struct apic apic_noop;
 
 #ifdef CONFIG_X86_32
 
-extern struct apic apic_default;
-
 static inline int noop_x86_32_early_logical_apicid(int cpu)
 {
         return BAD_APICID;
@@ -537,8 +555,6 @@ static inline int default_phys_pkg_id(int cpuid_apic, int index_msb)
         return cpuid_apic >> index_msb;
 }
 
-extern int default_x86_32_numa_cpu_node(int cpu);
-
 #endif
 
 static inline unsigned int
diff --git a/arch/x86/include/asm/bios_ebda.h b/arch/x86/include/asm/bios_ebda.h
index 3c7521063d3f..aa6a3170ab5a 100644
--- a/arch/x86/include/asm/bios_ebda.h
+++ b/arch/x86/include/asm/bios_ebda.h
@@ -4,16 +4,40 @@
 #include <asm/io.h>
 
 /*
- * there is a real-mode segmented pointer pointing to the
- * 4K EBDA area at 0x40E.
+ * Returns physical address of EBDA.  Returns 0 if there is no EBDA.
  */
 static inline unsigned int get_bios_ebda(void)
 {
+        /*
+         * There is a real-mode segmented pointer pointing to the
+         * 4K EBDA area at 0x40E.
+         */
         unsigned int address = *(unsigned short *)phys_to_virt(0x40E);
         address <<= 4;
         return address; /* 0 means none */
 }
 
+/*
+ * Return the sanitized length of the EBDA in bytes, if it exists.
+ */
+static inline unsigned int get_bios_ebda_length(void)
+{
+        unsigned int address;
+        unsigned int length;
+
+        address = get_bios_ebda();
+        if (!address)
+                return 0;
+
+        /* EBDA length is byte 0 of the EBDA (stored in KiB) */
+        length = *(unsigned char *)phys_to_virt(address);
+        length <<= 10;
+
+        /* Trim the length if it extends beyond 640KiB */
+        length = min_t(unsigned int, (640 * 1024) - address, length);
+        return length;
+}
+
 void reserve_ebda_region(void);
 
 #ifdef CONFIG_X86_CHECK_BIOS_CORRUPTION
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 91f3e087cf21..5dc6acc98dbd 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -195,6 +195,8 @@
 
 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
 #define X86_FEATURE_FSGSBASE    (9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
+#define X86_FEATURE_SMEP        (9*32+ 7) /* Supervisor Mode Execution Protection */
+#define X86_FEATURE_ERMS        (9*32+ 9) /* Enhanced REP MOVSB/STOSB */
 
 #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
 
@@ -207,8 +209,7 @@ extern const char * const x86_power_flags[32];
 #define test_cpu_cap(c, bit)                                            \
          test_bit(bit, (unsigned long *)((c)->x86_capability))
 
-#define cpu_has(c, bit)                                                 \
-        (__builtin_constant_p(bit) &&                                   \
+#define REQUIRED_MASK_BIT_SET(bit)                                      \
          ( (((bit)>>5)==0 && (1UL<<((bit)&31) & REQUIRED_MASK0)) ||     \
            (((bit)>>5)==1 && (1UL<<((bit)&31) & REQUIRED_MASK1)) ||     \
            (((bit)>>5)==2 && (1UL<<((bit)&31) & REQUIRED_MASK2)) ||     \
@@ -218,10 +219,16 @@ extern const char * const x86_power_flags[32];
            (((bit)>>5)==6 && (1UL<<((bit)&31) & REQUIRED_MASK6)) ||     \
            (((bit)>>5)==7 && (1UL<<((bit)&31) & REQUIRED_MASK7)) ||     \
            (((bit)>>5)==8 && (1UL<<((bit)&31) & REQUIRED_MASK8)) ||     \
-           (((bit)>>5)==9 && (1UL<<((bit)&31) & REQUIRED_MASK9)) )      \
-          ? 1 :                                                         \
+           (((bit)>>5)==9 && (1UL<<((bit)&31) & REQUIRED_MASK9)) )
+
+#define cpu_has(c, bit)                                                 \
+        (__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 :  \
          test_cpu_cap(c, bit))
 
+#define this_cpu_has(bit)                                               \
+        (__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 :  \
+         x86_this_cpu_test_bit(bit, (unsigned long *)&cpu_info.x86_capability))
+
 #define boot_cpu_has(bit)       cpu_has(&boot_cpu_data, bit)
 
 #define set_cpu_cap(c, bit)     set_bit(bit, (unsigned long *)((c)->x86_capability))
diff --git a/arch/x86/include/asm/dma.h b/arch/x86/include/asm/dma.h
index 057099e5faba..0bdb0c54d9a1 100644
--- a/arch/x86/include/asm/dma.h
+++ b/arch/x86/include/asm/dma.h
@@ -69,22 +69,18 @@
 
 #define MAX_DMA_CHANNELS        8
 
-#ifdef CONFIG_X86_32
-
-/* The maximum address that we can perform a DMA transfer to on this platform */
-#define MAX_DMA_ADDRESS      (PAGE_OFFSET + 0x1000000)
-
-#else
-
 /* 16MB ISA DMA zone */
 #define MAX_DMA_PFN   ((16 * 1024 * 1024) >> PAGE_SHIFT)
 
 /* 4GB broken PCI/AGP hardware bus master zone */
 #define MAX_DMA32_PFN ((4UL * 1024 * 1024 * 1024) >> PAGE_SHIFT)
 
+#ifdef CONFIG_X86_32
+/* The maximum address that we can perform a DMA transfer to on this platform */
+#define MAX_DMA_ADDRESS      (PAGE_OFFSET + 0x1000000)
+#else
 /* Compat define for old dma zone */
 #define MAX_DMA_ADDRESS ((unsigned long)__va(MAX_DMA_PFN << PAGE_SHIFT))
-
 #endif
 
 /* 8237 DMA controllers */
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 8e4a16508d4e..7093e4a6a0bc 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -90,6 +90,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,
 #endif /* CONFIG_X86_32 */
 
 extern int add_efi_memmap;
+extern void efi_set_executable(efi_memory_desc_t *md, bool executable);
 extern void efi_memblock_x86_reserve_range(void);
 extern void efi_call_phys_prelog(void);
 extern void efi_call_phys_epilog(void);
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
index db24c2278be0..268c783ab1c0 100644
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@ -38,11 +38,10 @@ extern void mcount(void);
 static inline unsigned long ftrace_call_adjust(unsigned long addr)
 {
         /*
-         * call mcount is "e8 <4 byte offset>"
-         * The addr points to the 4 byte offset and the caller of this
-         * function wants the pointer to e8. Simply subtract one.
+         * addr is the address of the mcount call instruction.
+         * recordmcount does the necessary offset calculation.
          */
-        return addr - 1;
+        return addr;
 }
 
 #ifdef CONFIG_DYNAMIC_FTRACE
diff --git a/arch/x86/include/asm/i8253.h b/arch/x86/include/asm/i8253.h
index fc1f579fb965..65aaa91d5850 100644
--- a/arch/x86/include/asm/i8253.h
+++ b/arch/x86/include/asm/i8253.h
@@ -6,6 +6,8 @@
 #define PIT_CH0                 0x40
 #define PIT_CH2                 0x42
 
+#define PIT_LATCH       LATCH
+
 extern raw_spinlock_t i8253_lock;
 
 extern struct clock_event_device *global_clock_event;
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 072273082528..d02804d650c4 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -38,7 +38,6 @@
 
 #include <linux/string.h>
 #include <linux/compiler.h>
-#include <asm-generic/int-ll64.h>
 #include <asm/page.h>
 
 #include <xen/xen.h>
@@ -87,27 +86,6 @@ build_mmio_write(__writel, "l", unsigned int, "r", )
 build_mmio_read(readq, "q", unsigned long, "=r", :"memory")
 build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
 
-#else
-
-static inline __u64 readq(const volatile void __iomem *addr)
-{
-        const volatile u32 __iomem *p = addr;
-        u32 low, high;
-
-        low = readl(p);
-        high = readl(p + 1);
-
-        return low + ((u64)high << 32);
-}
-
-static inline void writeq(__u64 val, volatile void __iomem *addr)
-{
-        writel(val, addr);
-        writel(val >> 32, addr+4);
-}
-
-#endif
-
 #define readq_relaxed(a)        readq(a)
 
 #define __raw_readq(a)          readq(a)
@@ -117,6 +95,8 @@ static inline void writeq(__u64 val, volatile void __iomem *addr)
 #define readq                   readq
 #define writeq                  writeq
 
+#endif
+
 /**
  *      virt_to_phys    -       map virtual addresses to physical
  *      @address: address to remap
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index a97a240f67f3..690d1cc9a877 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -105,12 +105,12 @@ struct IR_IO_APIC_route_entry {
  * # of IO-APICs and # of IRQ routing registers
  */
 extern int nr_ioapics;
-extern int nr_ioapic_registers[MAX_IO_APICS];
 
-#define MP_MAX_IOAPIC_PIN 127
+extern int mpc_ioapic_id(int ioapic);
+extern unsigned int mpc_ioapic_addr(int ioapic);
+extern struct mp_ioapic_gsi *mp_ioapic_gsi_routing(int ioapic);
 
-/* I/O APIC entries */
-extern struct mpc_ioapic mp_ioapics[MAX_IO_APICS];
+#define MP_MAX_IOAPIC_PIN 127
 
 /* # of MP IRQ source entries */
 extern int mp_irq_entries;
@@ -152,11 +152,9 @@ extern void ioapic_insert_resources(void);
 
 int io_apic_setup_irq_pin_once(unsigned int irq, int node, struct io_apic_irq_attr *attr);
 
-extern struct IO_APIC_route_entry **alloc_ioapic_entries(void);
-extern void free_ioapic_entries(struct IO_APIC_route_entry **ioapic_entries);
-extern int save_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
-extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
-extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
+extern int save_ioapic_entries(void);
+extern void mask_ioapic_entries(void);
+extern int restore_ioapic_entries(void);
 
 extern int get_nr_irqs_gsi(void);
 
@@ -192,19 +190,13 @@ struct io_apic_irq_attr;
 static inline int io_apic_set_pci_routing(struct device *dev, int irq,
                  struct io_apic_irq_attr *irq_attr) { return 0; }
 
-static inline struct IO_APIC_route_entry **alloc_ioapic_entries(void)
-{
-        return NULL;
-}
-
-static inline void free_ioapic_entries(struct IO_APIC_route_entry **ent) { }
-static inline int save_IO_APIC_setup(struct IO_APIC_route_entry **ent)
+static inline int save_ioapic_entries(void)
 {
         return -ENOMEM;
 }
 
-static inline void mask_IO_APIC_setup(struct IO_APIC_route_entry **ent) { }
-static inline int restore_IO_APIC_setup(struct IO_APIC_route_entry **ent)
+static inline void mask_ioapic_entries(void) { }
+static inline int restore_ioapic_entries(void)
 {
         return -ENOMEM;
 }
diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h
index 574dbc22893a..a32b18ce6ead 100644
--- a/arch/x86/include/asm/jump_label.h
+++ b/arch/x86/include/asm/jump_label.h
@@ -5,20 +5,25 @@
 
 #include <linux/types.h>
 #include <asm/nops.h>
+#include <asm/asm.h>
 
 #define JUMP_LABEL_NOP_SIZE 5
 
-# define JUMP_LABEL_INITIAL_NOP ".byte 0xe9 \n\t .long 0\n\t"
-
-# define JUMP_LABEL(key, label)                                 \
-        do {                                                    \
-                asm goto("1:"                                   \
-                        JUMP_LABEL_INITIAL_NOP                  \
-                        ".pushsection __jump_table,  \"aw\" \n\t"\
-                        _ASM_PTR "1b, %l[" #label "], %c0 \n\t" \
-                        ".popsection \n\t"                      \
-                        : :  "i" (key) :  : label);             \
-        } while (0)
+#define JUMP_LABEL_INITIAL_NOP ".byte 0xe9 \n\t .long 0\n\t"
+
+static __always_inline bool arch_static_branch(struct jump_label_key *key)
+{
+        asm goto("1:"
+                JUMP_LABEL_INITIAL_NOP
+                ".pushsection __jump_table,  \"aw\" \n\t"
+                _ASM_ALIGN "\n\t"
+                _ASM_PTR "1b, %l[l_yes], %c0 \n\t"
+                ".popsection \n\t"
+                : :  "i" (key) : : l_yes);
+        return false;
+l_yes:
+        return true;
+}
 
 #endif /* __KERNEL__ */
 
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h
index 0f5213564326..0049211959c0 100644
--- a/arch/x86/include/asm/kvm_emulate.h
+++ b/arch/x86/include/asm/kvm_emulate.h
@@ -14,6 +14,8 @@
 #include <asm/desc_defs.h>
 
 struct x86_emulate_ctxt;
+enum x86_intercept;
+enum x86_intercept_stage;
 
 struct x86_exception {
         u8 vector;
@@ -24,6 +26,24 @@ struct x86_exception {
 };
 
 /*
+ * This struct is used to carry enough information from the instruction
+ * decoder to main KVM so that a decision can be made whether the
+ * instruction needs to be intercepted or not.
+ */
+struct x86_instruction_info {
+        u8  intercept;          /* which intercept                      */
+        u8  rep_prefix;         /* rep prefix?                          */
+        u8  modrm_mod;          /* mod part of modrm                    */
+        u8  modrm_reg;          /* index of register used               */
+        u8  modrm_rm;           /* rm part of modrm                     */
+        u64 src_val;            /* value of source operand              */
+        u8  src_bytes;          /* size of source operand               */
+        u8  dst_bytes;          /* size of destination operand          */
+        u8  ad_bytes;           /* size of src/dst address              */
+        u64 next_rip;           /* rip following the instruction        */
+};
+
+/*
  * x86_emulate_ops:
  *
  * These operations represent the instruction emulator's interface to memory.
@@ -62,6 +82,7 @@ struct x86_exception {
 #define X86EMUL_RETRY_INSTR     3 /* retry the instruction for some reason */
 #define X86EMUL_CMPXCHG_FAILED  4 /* cmpxchg did not see expected value */
 #define X86EMUL_IO_NEEDED       5 /* IO is needed to complete emulation */
+#define X86EMUL_INTERCEPTED     6 /* Intercepted by nested VMCB/VMCS */
 
 struct x86_emulate_ops {
         /*
@@ -71,8 +92,9 @@ struct x86_emulate_ops {
          *  @val:   [OUT] Value read from memory, zero-extended to 'u_long'.
          *  @bytes: [IN ] Number of bytes to read from memory.
          */
-        int (*read_std)(unsigned long addr, void *val,
-                        unsigned int bytes, struct kvm_vcpu *vcpu,
+        int (*read_std)(struct x86_emulate_ctxt *ctxt,
+                        unsigned long addr, void *val,
+                        unsigned int bytes,
                         struct x86_exception *fault);
 
         /*
@@ -82,8 +104,8 @@ struct x86_emulate_ops {
          *  @val:   [OUT] Value write to memory, zero-extended to 'u_long'.
          *  @bytes: [IN ] Number of bytes to write to memory.
          */
-        int (*write_std)(unsigned long addr, void *val,
-                         unsigned int bytes, struct kvm_vcpu *vcpu,
+        int (*write_std)(struct x86_emulate_ctxt *ctxt,
+                         unsigned long addr, void *val, unsigned int bytes,
                          struct x86_exception *fault);
         /*
          * fetch: Read bytes of standard (non-emulated/special) memory.
@@ -92,8 +114,8 @@ struct x86_emulate_ops {
          *  @val:   [OUT] Value read from memory, zero-extended to 'u_long'.
          *  @bytes: [IN ] Number of bytes to read from memory.
          */
-        int (*fetch)(unsigned long addr, void *val,
-                     unsigned int bytes, struct kvm_vcpu *vcpu,
+        int (*fetch)(struct x86_emulate_ctxt *ctxt,
+                     unsigned long addr, void *val, unsigned int bytes,
                      struct x86_exception *fault);
 
         /*
@@ -102,11 +124,9 @@ struct x86_emulate_ops {
          *  @val:   [OUT] Value read from memory, zero-extended to 'u_long'.
          *  @bytes: [IN ] Number of bytes to read from memory.
          */
-        int (*read_emulated)(unsigned long addr,
-                             void *val,
-                             unsigned int bytes,
-                             struct x86_exception *fault,
-                             struct kvm_vcpu *vcpu);
+        int (*read_emulated)(struct x86_emulate_ctxt *ctxt,
+                             unsigned long addr, void *val, unsigned int bytes,
+                             struct x86_exception *fault);
 
         /*
          * write_emulated: Write bytes to emulated/special memory area.
@@ -115,11 +135,10 @@ struct x86_emulate_ops {
          *                required).
          *  @bytes: [IN ] Number of bytes to write to memory.
          */
-        int (*write_emulated)(unsigned long addr,
-                              const void *val,
+        int (*write_emulated)(struct x86_emulate_ctxt *ctxt,
+                              unsigned long addr, const void *val,
                               unsigned int bytes,
-                              struct x86_exception *fault,
-                              struct kvm_vcpu *vcpu);
+                              struct x86_exception *fault);
 
         /*
          * cmpxchg_emulated: Emulate an atomic (LOCKed) CMPXCHG operation on an
@@ -129,40 +148,54 @@ struct x86_emulate_ops {
          *  @new:   [IN ] Value to write to @addr.
          *  @bytes: [IN ] Number of bytes to access using CMPXCHG.
          */
-        int (*cmpxchg_emulated)(unsigned long addr,
+        int (*cmpxchg_emulated)(struct x86_emulate_ctxt *ctxt,
+                                unsigned long addr,
                                 const void *old,
                                 const void *new,
                                 unsigned int bytes,
-                                struct x86_exception *fault,
-                                struct kvm_vcpu *vcpu);
-
-        int (*pio_in_emulated)(int size, unsigned short port, void *val,
-                               unsigned int count, struct kvm_vcpu *vcpu);
-
-        int (*pio_out_emulated)(int size, unsigned short port, const void *val,
-                                unsigned int count, struct kvm_vcpu *vcpu);
-
-        bool (*get_cached_descriptor)(struct desc_struct *desc, u32 *base3,
-                                      int seg, struct kvm_vcpu *vcpu);
-        void (*set_cached_descriptor)(struct desc_struct *desc, u32 base3,
-                                      int seg, struct kvm_vcpu *vcpu);
-        u16 (*get_segment_selector)(int seg, struct kvm_vcpu *vcpu);
-        void (*set_segment_selector)(u16 sel, int seg, struct kvm_vcpu *vcpu);
-        unsigned long (*get_cached_segment_base)(int seg, struct kvm_vcpu *vcpu);
-        void (*get_gdt)(struct desc_ptr *dt, struct kvm_vcpu *vcpu);
-        void (*get_idt)(struct desc_ptr *dt, struct kvm_vcpu *vcpu);
-        ulong (*get_cr)(int cr, struct kvm_vcpu *vcpu);
-        int (*set_cr)(int cr, ulong val, struct kvm_vcpu *vcpu);
-        int (*cpl)(struct kvm_vcpu *vcpu);
-        int (*get_dr)(int dr, unsigned long *dest, struct kvm_vcpu *vcpu);
-        int (*set_dr)(int dr, unsigned long value, struct kvm_vcpu *vcpu);
-        int (*set_msr)(struct kvm_vcpu *vcpu, u32 msr_index, u64 data);
-        int (*get_msr)(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata);
+                                struct x86_exception *fault);
+        void (*invlpg)(struct x86_emulate_ctxt *ctxt, ulong addr);
+
+        int (*pio_in_emulated)(struct x86_emulate_ctxt *ctxt,
+                               int size, unsigned short port, void *val,
+                               unsigned int count);
+
+        int (*pio_out_emulated)(struct x86_emulate_ctxt *ctxt,
+                                int size, unsigned short port, const void *val,
+                                unsigned int count);
+
+        bool (*get_segment)(struct x86_emulate_ctxt *ctxt, u16 *selector,
+                            struct desc_struct *desc, u32 *base3, int seg);
+        void (*set_segment)(struct x86_emulate_ctxt *ctxt, u16 selector,
+                            struct desc_struct *desc, u32 base3, int seg);
+        unsigned long (*get_cached_segment_base)(struct x86_emulate_ctxt *ctxt,
+                                                 int seg);
+        void (*get_gdt)(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt);
+        void (*get_idt)(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt);
+        void (*set_gdt)(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt);
+        void (*set_idt)(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt);
+        ulong (*get_cr)(struct x86_emulate_ctxt *ctxt, int cr);
+        int (*set_cr)(struct x86_emulate_ctxt *ctxt, int cr, ulong val);
+        int (*cpl)(struct x86_emulate_ctxt *ctxt);
+        int (*get_dr)(struct x86_emulate_ctxt *ctxt, int dr, ulong *dest);
+        int (*set_dr)(struct x86_emulate_ctxt *ctxt, int dr, ulong value);
+        int (*set_msr)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 data);
+        int (*get_msr)(struct x86_emulate_ctxt *ctxt, u32 msr_index, u64 *pdata);
+        void (*halt)(struct x86_emulate_ctxt *ctxt);
+        void (*wbinvd)(struct x86_emulate_ctxt *ctxt);
+        int (*fix_hypercall)(struct x86_emulate_ctxt *ctxt);
+        void (*get_fpu)(struct x86_emulate_ctxt *ctxt); /* disables preempt */
+        void (*put_fpu)(struct x86_emulate_ctxt *ctxt); /* reenables preempt */
+        int (*intercept)(struct x86_emulate_ctxt *ctxt,
+                         struct x86_instruction_info *info,
+                         enum x86_intercept_stage stage);
 };
 
+typedef u32 __attribute__((vector_size(16))) sse128_t;
+
 /* Type, address-of, and value of an instruction's operand. */
 struct operand {
-        enum { OP_REG, OP_MEM, OP_IMM, OP_NONE } type;
+        enum { OP_REG, OP_MEM, OP_IMM, OP_XMM, OP_NONE } type;
         unsigned int bytes;
         union {
                 unsigned long orig_val;
@@ -174,11 +207,13 @@ struct operand {
                         ulong ea;
                         unsigned seg;
                 } mem;
+                unsigned xmm;
         } addr;
         union {
                 unsigned long val;
                 u64 val64;
                 char valptr[sizeof(unsigned long) + 2];
+                sse128_t vec_val;
         };
 };
 
@@ -197,6 +232,7 @@ struct read_cache {
 struct decode_cache {
         u8 twobyte;
         u8 b;
+        u8 intercept;
         u8 lock_prefix;
         u8 rep_prefix;
         u8 op_bytes;
@@ -209,6 +245,7 @@ struct decode_cache {
         u8 seg_override;
         unsigned int d;
         int (*execute)(struct x86_emulate_ctxt *ctxt);
+        int (*check_perm)(struct x86_emulate_ctxt *ctxt);
         unsigned long regs[NR_VCPU_REGS];
         unsigned long eip;
         /* modrm */
@@ -227,17 +264,15 @@ struct x86_emulate_ctxt {
         struct x86_emulate_ops *ops;
 
         /* Register state before/after emulation. */
-        struct kvm_vcpu *vcpu;
-
         unsigned long eflags;
         unsigned long eip; /* eip before instruction emulation */
         /* Emulated execution mode, represented by an X86EMUL_MODE value. */
         int mode;
-        u32 cs_base;
 
         /* interruptibility state, as a result of execution of STI or MOV SS */
         int interruptibility;
 
+        bool guest_mode; /* guest running a nested guest */
         bool perm_ok; /* do not check permissions if true */
         bool only_vendor_specific_insn;
 
@@ -249,8 +284,8 @@ struct x86_emulate_ctxt {
 };
 
 /* Repeat String Operation Prefix */
-#define REPE_PREFIX     1
-#define REPNE_PREFIX    2
+#define REPE_PREFIX     0xf3
+#define REPNE_PREFIX    0xf2
 
 /* Execution mode, passed to the emulator. */
 #define X86EMUL_MODE_REAL     0 /* Real mode.             */
@@ -259,6 +294,69 @@ struct x86_emulate_ctxt {
 #define X86EMUL_MODE_PROT32   4 /* 32-bit protected mode. */
 #define X86EMUL_MODE_PROT64   8 /* 64-bit (long) mode.    */
 
+/* any protected mode   */
+#define X86EMUL_MODE_PROT     (X86EMUL_MODE_PROT16|X86EMUL_MODE_PROT32| \
+                               X86EMUL_MODE_PROT64)
+
+enum x86_intercept_stage {
+        X86_ICTP_NONE = 0,   /* Allow zero-init to not match anything */
+        X86_ICPT_PRE_EXCEPT,
+        X86_ICPT_POST_EXCEPT,
+        X86_ICPT_POST_MEMACCESS,
+};
+
+enum x86_intercept {
+        x86_intercept_none,
+        x86_intercept_cr_read,
+        x86_intercept_cr_write,
+        x86_intercept_clts,
+        x86_intercept_lmsw,
+        x86_intercept_smsw,
+        x86_intercept_dr_read,
+        x86_intercept_dr_write,
+        x86_intercept_lidt,
+        x86_intercept_sidt,
+        x86_intercept_lgdt,
+        x86_intercept_sgdt,
+        x86_intercept_lldt,
+        x86_intercept_sldt,
+        x86_intercept_ltr,
+        x86_intercept_str,
+        x86_intercept_rdtsc,
+        x86_intercept_rdpmc,
+        x86_intercept_pushf,
+        x86_intercept_popf,
+        x86_intercept_cpuid,
+        x86_intercept_rsm,
+        x86_intercept_iret,
+        x86_intercept_intn,
+        x86_intercept_invd,
+        x86_intercept_pause,
+        x86_intercept_hlt,
+        x86_intercept_invlpg,
+        x86_intercept_invlpga,
+        x86_intercept_vmrun,
+        x86_intercept_vmload,
+        x86_intercept_vmsave,
+        x86_intercept_vmmcall,
+        x86_intercept_stgi,
+        x86_intercept_clgi,
+        x86_intercept_skinit,
+        x86_intercept_rdtscp,
+        x86_intercept_icebp,
+        x86_intercept_wbinvd,
+        x86_intercept_monitor,
+        x86_intercept_mwait,
+        x86_intercept_rdmsr,
+        x86_intercept_wrmsr,
+        x86_intercept_in,
+        x86_intercept_ins,
+        x86_intercept_out,
+        x86_intercept_outs,
+
+        nr_x86_intercepts
+};
+
 /* Host execution mode. */
 #if defined(CONFIG_X86_32)
 #define X86EMUL_MODE_HOST X86EMUL_MODE_PROT32
@@ -270,6 +368,7 @@ int x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len);
 #define EMULATION_FAILED -1
 #define EMULATION_OK 0
 #define EMULATION_RESTART 1
+#define EMULATION_INTERCEPTED 2
 int x86_emulate_insn(struct x86_emulate_ctxt *ctxt);
 int emulator_task_switch(struct x86_emulate_ctxt *ctxt,
                          u16 tss_selector, int reason,
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index c8af0991fdf0..d2ac8e2ee897 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -30,14 +30,30 @@
 #define KVM_MEMORY_SLOTS 32
 /* memory slots that does not exposed to userspace */
 #define KVM_PRIVATE_MEM_SLOTS 4
+#define KVM_MMIO_SIZE 16
 
 #define KVM_PIO_PAGE_OFFSET 1
 #define KVM_COALESCED_MMIO_PAGE_OFFSET 2
 
+#define CR0_RESERVED_BITS                                               \
+        (~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \
+                          | X86_CR0_ET | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM \
+                          | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))
+
 #define CR3_PAE_RESERVED_BITS ((X86_CR3_PWT | X86_CR3_PCD) - 1)
 #define CR3_NONPAE_RESERVED_BITS ((PAGE_SIZE-1) & ~(X86_CR3_PWT | X86_CR3_PCD))
 #define CR3_L_MODE_RESERVED_BITS (CR3_NONPAE_RESERVED_BITS |    \
                                   0xFFFFFF0000000000ULL)
+#define CR4_RESERVED_BITS                                               \
+        (~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\
+                          | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE     \
+                          | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR  \
+                          | X86_CR4_OSXSAVE \
+                          | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE))
+
+#define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)
+
+
 
 #define INVALID_PAGE (~(hpa_t)0)
 #define VALID_PAGE(x) ((x) != INVALID_PAGE)
@@ -118,6 +134,9 @@ enum kvm_reg {
 enum kvm_reg_ex {
         VCPU_EXREG_PDPTR = NR_VCPU_REGS,
         VCPU_EXREG_CR3,
+        VCPU_EXREG_RFLAGS,
+        VCPU_EXREG_CPL,
+        VCPU_EXREG_SEGMENTS,
 };
 
 enum {
@@ -256,7 +275,7 @@ struct kvm_mmu {
                          struct kvm_mmu_page *sp);
         void (*invlpg)(struct kvm_vcpu *vcpu, gva_t gva);
         void (*update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
-                        u64 *spte, const void *pte, unsigned long mmu_seq);
+                           u64 *spte, const void *pte);
         hpa_t root_hpa;
         int root_level;
         int shadow_root_level;
@@ -340,7 +359,6 @@ struct kvm_vcpu_arch {
         struct fpu guest_fpu;
         u64 xcr0;
 
-        gva_t mmio_fault_cr2;
         struct kvm_pio_request pio;
         void *pio_data;
 
@@ -367,18 +385,22 @@ struct kvm_vcpu_arch {
         /* emulate context */
 
         struct x86_emulate_ctxt emulate_ctxt;
+        bool emulate_regs_need_sync_to_vcpu;
+        bool emulate_regs_need_sync_from_vcpu;
 
         gpa_t time;
         struct pvclock_vcpu_time_info hv_clock;
         unsigned int hw_tsc_khz;
         unsigned int time_offset;
         struct page *time_page;
-        u64 last_host_tsc;
         u64 last_guest_tsc;
         u64 last_kernel_ns;
         u64 last_tsc_nsec;
         u64 last_tsc_write;
+        u32 virtual_tsc_khz;
         bool tsc_catchup;
+        u32  tsc_catchup_mult;
+        s8   tsc_catchup_shift;
 
         bool nmi_pending;
         bool nmi_injected;
@@ -448,9 +470,6 @@ struct kvm_arch {
         u64 last_tsc_nsec;
         u64 last_tsc_offset;
         u64 last_tsc_write;
-        u32 virtual_tsc_khz;
-        u32 virtual_tsc_mult;
-        s8 virtual_tsc_shift;
 
         struct kvm_xen_hvm_config xen_hvm_config;
 
@@ -502,6 +521,8 @@ struct kvm_vcpu_stat {
         u32 nmi_injections;
 };
 
+struct x86_instruction_info;
+
 struct kvm_x86_ops {
         int (*cpu_has_kvm_support)(void);          /* __init */
         int (*disabled_by_bios)(void);             /* __init */
@@ -586,9 +607,17 @@ struct kvm_x86_ops {
 
         bool (*has_wbinvd_exit)(void);
 
+        void (*set_tsc_khz)(struct kvm_vcpu *vcpu, u32 user_tsc_khz);
         void (*write_tsc_offset)(struct kvm_vcpu *vcpu, u64 offset);
 
+        u64 (*compute_tsc_offset)(struct kvm_vcpu *vcpu, u64 target_tsc);
+
         void (*get_exit_info)(struct kvm_vcpu *vcpu, u64 *info1, u64 *info2);
+
+        int (*check_intercept)(struct kvm_vcpu *vcpu,
+                               struct x86_instruction_info *info,
+                               enum x86_intercept_stage stage);
+
         const struct trace_print_flags *exit_reasons_str;
 };
 
@@ -627,6 +656,13 @@ u8 kvm_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);
 
 extern bool tdp_enabled;
 
+/* control of guest tsc rate supported? */
+extern bool kvm_has_tsc_control;
+/* minimum supported tsc_khz for guests */
+extern u32  kvm_min_guest_tsc_khz;
+/* maximum supported tsc_khz for guests */
+extern u32  kvm_max_guest_tsc_khz;
+
 enum emulation_result {
         EMULATE_DONE,       /* no further processing */
         EMULATE_DO_MMIO,      /* kvm_run filled with mmio request */
@@ -645,9 +681,6 @@ static inline int emulate_instruction(struct kvm_vcpu *vcpu,
         return x86_emulate_instruction(vcpu, 0, emulation_type, NULL, 0);
 }
 
-void realmode_lgdt(struct kvm_vcpu *vcpu, u16 size, unsigned long address);
-void realmode_lidt(struct kvm_vcpu *vcpu, u16 size, unsigned long address);
-
 void kvm_enable_efer_bits(u64);
 int kvm_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *data);
 int kvm_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data);
@@ -657,8 +690,6 @@ struct x86_emulate_ctxt;
 int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size, unsigned short port);
 void kvm_emulate_cpuid(struct kvm_vcpu *vcpu);
 int kvm_emulate_halt(struct kvm_vcpu *vcpu);
-int emulate_invlpg(struct kvm_vcpu *vcpu, gva_t address);
-int emulate_clts(struct kvm_vcpu *vcpu);
 int kvm_emulate_wbinvd(struct kvm_vcpu *vcpu);
 
 void kvm_get_segment(struct kvm_vcpu *vcpu, struct kvm_segment *var, int seg);
@@ -721,8 +752,6 @@ gpa_t kvm_mmu_gva_to_gpa_system(struct kvm_vcpu *vcpu, gva_t gva,
 
 int kvm_emulate_hypercall(struct kvm_vcpu *vcpu);
 
-int kvm_fix_hypercall(struct kvm_vcpu *vcpu);
-
 int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t gva, u32 error_code,
                        void *insn, int insn_len);
 void kvm_mmu_invlpg(struct kvm_vcpu *vcpu, gva_t gva);
diff --git a/arch/x86/include/asm/linkage.h b/arch/x86/include/asm/linkage.h
index 12d55e773eb6..48142971b25d 100644
--- a/arch/x86/include/asm/linkage.h
+++ b/arch/x86/include/asm/linkage.h
@@ -8,11 +8,6 @@
 
 #ifdef CONFIG_X86_32
 #define asmlinkage CPP_ASMLINKAGE __attribute__((regparm(0)))
-/*
- * For 32-bit UML - mark functions implemented in assembly that use
- * regparm input parameters:
- */
-#define asmregparm __attribute__((regparm(3)))
 
 /*
  * Make sure the compiler doesn't do anything stupid with the
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index eb16e94ae04f..021979a6e23f 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -142,8 +142,6 @@ static inline void winchip_mcheck_init(struct cpuinfo_x86 *c) {}
 static inline void enable_p5_mce(void) {}
 #endif
 
-extern void (*x86_mce_decode_callback)(struct mce *m);
-
 void mce_setup(struct mce *m);
 void mce_log(struct mce *m);
 DECLARE_PER_CPU(struct sys_device, mce_dev);
diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h
index 91df7c51806c..5e83a416eca8 100644
--- a/arch/x86/include/asm/mmzone_32.h
+++ b/arch/x86/include/asm/mmzone_32.h
@@ -13,31 +13,11 @@ extern struct pglist_data *node_data[];
 #define NODE_DATA(nid)  (node_data[nid])
 
 #include <asm/numaq.h>
-/* summit or generic arch */
-#include <asm/srat.h>
-
-extern int get_memcfg_numa_flat(void);
-/*
- * This allows any one NUMA architecture to be compiled
- * for, and still fall back to the flat function if it
- * fails.
- */
-static inline void get_memcfg_numa(void)
-{
-
-        if (get_memcfg_numaq())
-                return;
-        if (get_memcfg_from_srat())
-                return;
-        get_memcfg_numa_flat();
-}
 
 extern void resume_map_numa_kva(pgd_t *pgd);
 
 #else /* !CONFIG_NUMA */
 
-#define get_memcfg_numa get_memcfg_numa_flat
-
 static inline void resume_map_numa_kva(pgd_t *pgd) {}
 
 #endif /* CONFIG_NUMA */
diff --git a/arch/x86/include/asm/mmzone_64.h b/arch/x86/include/asm/mmzone_64.h
index 288b96f815a6..b3f88d7867c7 100644
--- a/arch/x86/include/asm/mmzone_64.h
+++ b/arch/x86/include/asm/mmzone_64.h
@@ -4,36 +4,13 @@
 #ifndef _ASM_X86_MMZONE_64_H
 #define _ASM_X86_MMZONE_64_H
 
-
 #ifdef CONFIG_NUMA
 
 #include <linux/mmdebug.h>
-
 #include <asm/smp.h>
 
-/* Simple perfect hash to map physical addresses to node numbers */
-struct memnode {
-        int shift;
-        unsigned int mapsize;
-        s16 *map;
-        s16 embedded_map[64 - 8];
-} ____cacheline_aligned; /* total size = 128 bytes */
-extern struct memnode memnode;
-#define memnode_shift memnode.shift
-#define memnodemap memnode.map
-#define memnodemapsize memnode.mapsize
-
 extern struct pglist_data *node_data[];
 
-static inline __attribute__((pure)) int phys_to_nid(unsigned long addr)
-{
-        unsigned nid;
-        VIRTUAL_BUG_ON(!memnodemap);
-        nid = memnodemap[addr >> memnode_shift];
-        VIRTUAL_BUG_ON(nid >= MAX_NUMNODES || !node_data[nid]);
-        return nid;
-}
-
 #define NODE_DATA(nid)          (node_data[nid])
 
 #define node_start_pfn(nid)     (NODE_DATA(nid)->node_start_pfn)
diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
index 67763c5d8b4e..9eae7752ae9b 100644
--- a/arch/x86/include/asm/module.h
+++ b/arch/x86/include/asm/module.h
@@ -35,7 +35,7 @@
 #define MODULE_PROC_FAMILY "K7 "
 #elif defined CONFIG_MK8
 #define MODULE_PROC_FAMILY "K8 "
-#elif defined CONFIG_X86_ELAN
+#elif defined CONFIG_MELAN
 #define MODULE_PROC_FAMILY "ELAN "
 #elif defined CONFIG_MCRUSOE
 #define MODULE_PROC_FAMILY "CRUSOE "
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 3cce71413d0b..485b4f1f079b 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -118,6 +118,7 @@
    complete list. */
 
 #define MSR_AMD64_PATCH_LEVEL           0x0000008b
+#define MSR_AMD64_TSC_RATIO             0xc0000104
 #define MSR_AMD64_NB_CFG                0xc001001f
 #define MSR_AMD64_PATCH_LOADER          0xc0010020
 #define MSR_AMD64_OSVW_ID_LENGTH        0xc0010140
diff --git a/arch/x86/include/asm/nops.h b/arch/x86/include/asm/nops.h
index af788496020b..405b4032a60b 100644
--- a/arch/x86/include/asm/nops.h
+++ b/arch/x86/include/asm/nops.h
@@ -1,7 +1,13 @@
 #ifndef _ASM_X86_NOPS_H
 #define _ASM_X86_NOPS_H
 
-/* Define nops for use with alternative() */
+/*
+ * Define nops for use with alternative() and for tracing.
+ *
+ * *_NOP5_ATOMIC must be a single instruction.
+ */
+
+#define NOP_DS_PREFIX 0x3e
 
 /* generic versions from gas
    1: nop
@@ -13,14 +19,15 @@
    6: leal 0x00000000(%esi),%esi
    7: leal 0x00000000(,%esi,1),%esi
 */
-#define GENERIC_NOP1 ".byte 0x90\n"
-#define GENERIC_NOP2 ".byte 0x89,0xf6\n"
-#define GENERIC_NOP3 ".byte 0x8d,0x76,0x00\n"
-#define GENERIC_NOP4 ".byte 0x8d,0x74,0x26,0x00\n"
-#define GENERIC_NOP5 GENERIC_NOP1 GENERIC_NOP4
-#define GENERIC_NOP6 ".byte 0x8d,0xb6,0x00,0x00,0x00,0x00\n"
-#define GENERIC_NOP7 ".byte 0x8d,0xb4,0x26,0x00,0x00,0x00,0x00\n"
-#define GENERIC_NOP8 GENERIC_NOP1 GENERIC_NOP7
+#define GENERIC_NOP1 0x90
+#define GENERIC_NOP2 0x89,0xf6
+#define GENERIC_NOP3 0x8d,0x76,0x00
+#define GENERIC_NOP4 0x8d,0x74,0x26,0x00
+#define GENERIC_NOP5 GENERIC_NOP1,GENERIC_NOP4
+#define GENERIC_NOP6 0x8d,0xb6,0x00,0x00,0x00,0x00
+#define GENERIC_NOP7 0x8d,0xb4,0x26,0x00,0x00,0x00,0x00
+#define GENERIC_NOP8 GENERIC_NOP1,GENERIC_NOP7
+#define GENERIC_NOP5_ATOMIC NOP_DS_PREFIX,GENERIC_NOP4
 
 /* Opteron 64bit nops
    1: nop
@@ -29,13 +36,14 @@
    4: osp osp osp nop
 */
 #define K8_NOP1 GENERIC_NOP1
-#define K8_NOP2 ".byte 0x66,0x90\n"
-#define K8_NOP3 ".byte 0x66,0x66,0x90\n"
-#define K8_NOP4 ".byte 0x66,0x66,0x66,0x90\n"
-#define K8_NOP5 K8_NOP3 K8_NOP2
-#define K8_NOP6 K8_NOP3 K8_NOP3
-#define K8_NOP7 K8_NOP4 K8_NOP3
-#define K8_NOP8 K8_NOP4 K8_NOP4
+#define K8_NOP2 0x66,K8_NOP1
+#define K8_NOP3 0x66,K8_NOP2
+#define K8_NOP4 0x66,K8_NOP3
+#define K8_NOP5 K8_NOP3,K8_NOP2
+#define K8_NOP6 K8_NOP3,K8_NOP3
+#define K8_NOP7 K8_NOP4,K8_NOP3
+#define K8_NOP8 K8_NOP4,K8_NOP4
+#define K8_NOP5_ATOMIC 0x66,K8_NOP4
 
 /* K7 nops
    uses eax dependencies (arbitrary choice)
@@ -47,13 +55,14 @@
    7: leal 0x00000000(,%eax,1),%eax
 */
 #define K7_NOP1 GENERIC_NOP1
-#define K7_NOP2 ".byte 0x8b,0xc0\n"
-#define K7_NOP3 ".byte 0x8d,0x04,0x20\n"
-#define K7_NOP4 ".byte 0x8d,0x44,0x20,0x00\n"
-#define K7_NOP5 K7_NOP4 ASM_NOP1
-#define K7_NOP6 ".byte 0x8d,0x80,0,0,0,0\n"
-#define K7_NOP7 ".byte 0x8D,0x04,0x05,0,0,0,0\n"
-#define K7_NOP8 K7_NOP7 ASM_NOP1
+#define K7_NOP2 0x8b,0xc0
+#define K7_NOP3 0x8d,0x04,0x20
+#define K7_NOP4 0x8d,0x44,0x20,0x00
+#define K7_NOP5 K7_NOP4,K7_NOP1
+#define K7_NOP6 0x8d,0x80,0,0,0,0
+#define K7_NOP7 0x8D,0x04,0x05,0,0,0,0
+#define K7_NOP8 K7_NOP7,K7_NOP1
+#define K7_NOP5_ATOMIC NOP_DS_PREFIX,K7_NOP4
 
 /* P6 nops
    uses eax dependencies (Intel-recommended choice)
@@ -69,52 +78,65 @@
         There is kernel code that depends on this.
 */
 #define P6_NOP1 GENERIC_NOP1
-#define P6_NOP2 ".byte 0x66,0x90\n"
-#define P6_NOP3 ".byte 0x0f,0x1f,0x00\n"
-#define P6_NOP4 ".byte 0x0f,0x1f,0x40,0\n"
-#define P6_NOP5 ".byte 0x0f,0x1f,0x44,0x00,0\n"
-#define P6_NOP6 ".byte 0x66,0x0f,0x1f,0x44,0x00,0\n"
-#define P6_NOP7 ".byte 0x0f,0x1f,0x80,0,0,0,0\n"
-#define P6_NOP8 ".byte 0x0f,0x1f,0x84,0x00,0,0,0,0\n"
+#define P6_NOP2 0x66,0x90
+#define P6_NOP3 0x0f,0x1f,0x00
+#define P6_NOP4 0x0f,0x1f,0x40,0
+#define P6_NOP5 0x0f,0x1f,0x44,0x00,0
+#define P6_NOP6 0x66,0x0f,0x1f,0x44,0x00,0
+#define P6_NOP7 0x0f,0x1f,0x80,0,0,0,0
+#define P6_NOP8 0x0f,0x1f,0x84,0x00,0,0,0,0
+#define P6_NOP5_ATOMIC P6_NOP5
+
+#define _ASM_MK_NOP(x) ".byte " __stringify(x) "\n"
 
 #if defined(CONFIG_MK7)
-#define ASM_NOP1 K7_NOP1
-#define ASM_NOP2 K7_NOP2
-#define ASM_NOP3 K7_NOP3
-#define ASM_NOP4 K7_NOP4
-#define ASM_NOP5 K7_NOP5
-#define ASM_NOP6 K7_NOP6
-#define ASM_NOP7 K7_NOP7
-#define ASM_NOP8 K7_NOP8
+#define ASM_NOP1 _ASM_MK_NOP(K7_NOP1)
+#define ASM_NOP2 _ASM_MK_NOP(K7_NOP2)
+#define ASM_NOP3 _ASM_MK_NOP(K7_NOP3)
+#define ASM_NOP4 _ASM_MK_NOP(K7_NOP4)
+#define ASM_NOP5 _ASM_MK_NOP(K7_NOP5)
+#define ASM_NOP6 _ASM_MK_NOP(K7_NOP6)
+#define ASM_NOP7 _ASM_MK_NOP(K7_NOP7)
+#define ASM_NOP8 _ASM_MK_NOP(K7_NOP8)
+#define ASM_NOP5_ATOMIC _ASM_MK_NOP(K7_NOP5_ATOMIC)
 #elif defined(CONFIG_X86_P6_NOP)
-#define ASM_NOP1 P6_NOP1
-#define ASM_NOP2 P6_NOP2
-#define ASM_NOP3 P6_NOP3
-#define ASM_NOP4 P6_NOP4
-#define ASM_NOP5 P6_NOP5
-#define ASM_NOP6 P6_NOP6
-#define ASM_NOP7 P6_NOP7
-#define ASM_NOP8 P6_NOP8
+#define ASM_NOP1 _ASM_MK_NOP(P6_NOP1)
+#define ASM_NOP2 _ASM_MK_NOP(P6_NOP2)
+#define ASM_NOP3 _ASM_MK_NOP(P6_NOP3)
+#define ASM_NOP4 _ASM_MK_NOP(P6_NOP4)
+#define ASM_NOP5 _ASM_MK_NOP(P6_NOP5)
+#define ASM_NOP6 _ASM_MK_NOP(P6_NOP6)
+#define ASM_NOP7 _ASM_MK_NOP(P6_NOP7)
+#define ASM_NOP8 _ASM_MK_NOP(P6_NOP8)
+#define ASM_NOP5_ATOMIC _ASM_MK_NOP(P6_NOP5_ATOMIC)
 #elif defined(CONFIG_X86_64)
-#define ASM_NOP1 K8_NOP1
-#define ASM_NOP2 K8_NOP2
-#define ASM_NOP3 K8_NOP3
-#define ASM_NOP4 K8_NOP4
-#define ASM_NOP5 K8_NOP5
-#define ASM_NOP6 K8_NOP6
-#define ASM_NOP7 K8_NOP7
-#define ASM_NOP8 K8_NOP8
+#define ASM_NOP1 _ASM_MK_NOP(K8_NOP1)
+#define ASM_NOP2 _ASM_MK_NOP(K8_NOP2)
+#define ASM_NOP3 _ASM_MK_NOP(K8_NOP3)
+#define ASM_NOP4 _ASM_MK_NOP(K8_NOP4)
+#define ASM_NOP5 _ASM_MK_NOP(K8_NOP5)
+#define ASM_NOP6 _ASM_MK_NOP(K8_NOP6)
+#define ASM_NOP7 _ASM_MK_NOP(K8_NOP7)
+#define ASM_NOP8 _ASM_MK_NOP(K8_NOP8)
+#define ASM_NOP5_ATOMIC _ASM_MK_NOP(K8_NOP5_ATOMIC)
 #else
-#define ASM_NOP1 GENERIC_NOP1
-#define ASM_NOP2 GENERIC_NOP2
-#define ASM_NOP3 GENERIC_NOP3
-#define ASM_NOP4 GENERIC_NOP4
-#define ASM_NOP5 GENERIC_NOP5
-#define ASM_NOP6 GENERIC_NOP6
-#define ASM_NOP7 GENERIC_NOP7
-#define ASM_NOP8 GENERIC_NOP8
+#define ASM_NOP1 _ASM_MK_NOP(GENERIC_NOP1)
+#define ASM_NOP2 _ASM_MK_NOP(GENERIC_NOP2)
+#define ASM_NOP3 _ASM_MK_NOP(GENERIC_NOP3)
+#define ASM_NOP4 _ASM_MK_NOP(GENERIC_NOP4)
+#define ASM_NOP5 _ASM_MK_NOP(GENERIC_NOP5)
+#define ASM_NOP6 _ASM_MK_NOP(GENERIC_NOP6)
+#define ASM_NOP7 _ASM_MK_NOP(GENERIC_NOP7)
+#define ASM_NOP8 _ASM_MK_NOP(GENERIC_NOP8)
+#define ASM_NOP5_ATOMIC _ASM_MK_NOP(GENERIC_NOP5_ATOMIC)
 #endif
 
 #define ASM_NOP_MAX 8
+#define NOP_ATOMIC5 (ASM_NOP_MAX+1)     /* Entry for the 5-byte atomic NOP */
+
+#ifndef __ASSEMBLY__
+extern const unsigned char * const *ideal_nops;
+extern void arch_init_ideal_nops(void);
+#endif
 
 #endif /* _ASM_X86_NOPS_H */
diff --git a/arch/x86/include/asm/numa.h b/arch/x86/include/asm/numa.h
index a50fc9f493b3..bfacd2ccf651 100644
--- a/arch/x86/include/asm/numa.h
+++ b/arch/x86/include/asm/numa.h
@@ -1,12 +1,24 @@
 #ifndef _ASM_X86_NUMA_H
 #define _ASM_X86_NUMA_H
 
+#include <linux/nodemask.h>
+
 #include <asm/topology.h>
 #include <asm/apicdef.h>
 
 #ifdef CONFIG_NUMA
 
 #define NR_NODE_MEMBLKS         (MAX_NUMNODES*2)
+#define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))
+
+/*
+ * Too small node sizes may confuse the VM badly. Usually they
+ * result from BIOS bugs. So dont recognize nodes as standalone
+ * NUMA entities that have less than this amount of RAM listed:
+ */
+#define NODE_MIN_SIZE (4*1024*1024)
+
+extern int numa_off;
 
 /*
  * __apicid_to_node[] stores the raw mapping between physical apicid and
@@ -17,15 +29,27 @@
  * numa_cpu_node().
  */
 extern s16 __apicid_to_node[MAX_LOCAL_APIC];
+extern nodemask_t numa_nodes_parsed __initdata;
+
+extern int __init numa_add_memblk(int nodeid, u64 start, u64 end);
+extern void __init numa_set_distance(int from, int to, int distance);
 
 static inline void set_apicid_to_node(int apicid, s16 node)
 {
         __apicid_to_node[apicid] = node;
 }
+
+extern int __cpuinit numa_cpu_node(int cpu);
+
 #else   /* CONFIG_NUMA */
 static inline void set_apicid_to_node(int apicid, s16 node)
 {
 }
+
+static inline int numa_cpu_node(int cpu)
+{
+        return NUMA_NO_NODE;
+}
 #endif  /* CONFIG_NUMA */
 
 #ifdef CONFIG_X86_32
@@ -37,14 +61,12 @@ static inline void set_apicid_to_node(int apicid, s16 node)
 #ifdef CONFIG_NUMA
 extern void __cpuinit numa_set_node(int cpu, int node);
 extern void __cpuinit numa_clear_node(int cpu);
-extern void __init numa_init_array(void);
 extern void __init init_cpu_to_node(void);
 extern void __cpuinit numa_add_cpu(int cpu);
 extern void __cpuinit numa_remove_cpu(int cpu);
 #else   /* CONFIG_NUMA */
 static inline void numa_set_node(int cpu, int node)     { }
 static inline void numa_clear_node(int cpu)             { }
-static inline void numa_init_array(void)                { }
 static inline void init_cpu_to_node(void)               { }
 static inline void numa_add_cpu(int cpu)                { }
 static inline void numa_remove_cpu(int cpu)             { }
@@ -54,4 +76,10 @@ static inline void numa_remove_cpu(int cpu)		{ }
 void debug_cpumask_set_cpu(int cpu, int node, bool enable);
 #endif
 
+#ifdef CONFIG_NUMA_EMU
+#define FAKE_NODE_MIN_SIZE      ((u64)32 << 20)
+#define FAKE_NODE_MIN_HASH_MASK (~(FAKE_NODE_MIN_SIZE - 1UL))
+void numa_emu_cmdline(char *);
+#endif /* CONFIG_NUMA_EMU */
+
 #endif  /* _ASM_X86_NUMA_H */
diff --git a/arch/x86/include/asm/numa_32.h b/arch/x86/include/asm/numa_32.h
index c6beed1ef103..e7d6b8254742 100644
--- a/arch/x86/include/asm/numa_32.h
+++ b/arch/x86/include/asm/numa_32.h
@@ -1,16 +1,6 @@
 #ifndef _ASM_X86_NUMA_32_H
 #define _ASM_X86_NUMA_32_H
 
-extern int numa_off;
-
-extern int pxm_to_nid(int pxm);
-
-#ifdef CONFIG_NUMA
-extern int __cpuinit numa_cpu_node(int cpu);
-#else   /* CONFIG_NUMA */
-static inline int numa_cpu_node(int cpu)                { return NUMA_NO_NODE; }
-#endif  /* CONFIG_NUMA */
-
 #ifdef CONFIG_HIGHMEM
 extern void set_highmem_pages_init(void);
 #else
diff --git a/arch/x86/include/asm/numa_64.h b/arch/x86/include/asm/numa_64.h
index 344eb1790b46..0c05f7ae46e8 100644
--- a/arch/x86/include/asm/numa_64.h
+++ b/arch/x86/include/asm/numa_64.h
@@ -1,42 +1,6 @@
 #ifndef _ASM_X86_NUMA_64_H
 #define _ASM_X86_NUMA_64_H
 
-#include <linux/nodemask.h>
-
-struct bootnode {
-        u64 start;
-        u64 end;
-};
-
-#define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))
-
-extern int numa_off;
-
 extern unsigned long numa_free_all_bootmem(void);
-extern void setup_node_bootmem(int nodeid, unsigned long start,
-                               unsigned long end);
-
-#ifdef CONFIG_NUMA
-/*
- * Too small node sizes may confuse the VM badly. Usually they
- * result from BIOS bugs. So dont recognize nodes as standalone
- * NUMA entities that have less than this amount of RAM listed:
- */
-#define NODE_MIN_SIZE (4*1024*1024)
-
-extern nodemask_t numa_nodes_parsed __initdata;
-
-extern int __cpuinit numa_cpu_node(int cpu);
-extern int __init numa_add_memblk(int nodeid, u64 start, u64 end);
-extern void __init numa_set_distance(int from, int to, int distance);
-
-#ifdef CONFIG_NUMA_EMU
-#define FAKE_NODE_MIN_SIZE      ((u64)32 << 20)
-#define FAKE_NODE_MIN_HASH_MASK (~(FAKE_NODE_MIN_SIZE - 1UL))
-void numa_emu_cmdline(char *);
-#endif /* CONFIG_NUMA_EMU */
-#else
-static inline int numa_cpu_node(int cpu)                { return NUMA_NO_NODE; }
-#endif
 
 #endif /* _ASM_X86_NUMA_64_H */
diff --git a/arch/x86/include/asm/numaq.h b/arch/x86/include/asm/numaq.h
index 37c516545ec8..c3b3c322fd87 100644
--- a/arch/x86/include/asm/numaq.h
+++ b/arch/x86/include/asm/numaq.h
@@ -29,7 +29,7 @@
 #ifdef CONFIG_X86_NUMAQ
 
 extern int found_numaq;
-extern int get_memcfg_numaq(void);
+extern int numaq_numa_init(void);
 extern int pci_numaq_init(void);
 
 extern void *xquad_portio;
@@ -166,11 +166,6 @@ struct sys_cfg_data {
 
 void numaq_tsc_disable(void);
 
-#else
-static inline int get_memcfg_numaq(void)
-{
-        return 0;
-}
 #endif /* CONFIG_X86_NUMAQ */
 #endif /* _ASM_X86_NUMAQ_H */
 
diff --git a/arch/x86/include/asm/olpc_ofw.h b/arch/x86/include/asm/olpc_ofw.h
index c5d3a5abbb9f..24487712e0b1 100644
--- a/arch/x86/include/asm/olpc_ofw.h
+++ b/arch/x86/include/asm/olpc_ofw.h
@@ -26,15 +26,12 @@ extern void setup_olpc_ofw_pgd(void);
 /* check if OFW was detected during boot */
 extern bool olpc_ofw_present(void);
 
+extern void olpc_dt_build_devicetree(void);
+
 #else /* !CONFIG_OLPC */
 static inline void olpc_ofw_detect(void) { }
 static inline void setup_olpc_ofw_pgd(void) { }
-#endif /* !CONFIG_OLPC */
-
-#ifdef CONFIG_OF_PROMTREE
-extern void olpc_dt_build_devicetree(void);
-#else
 static inline void olpc_dt_build_devicetree(void) { }
-#endif
+#endif /* !CONFIG_OLPC */
 
 #endif /* _ASM_X86_OLPC_OFW_H */
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 676129229630..d498943b906c 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -135,8 +135,6 @@ void default_teardown_msi_irqs(struct pci_dev *dev);
 #include "pci_64.h"
 #endif
 
-void dma32_reserve_bootmem(void);
-
 /* implement the pci_ DMA API in terms of the generic device dma_ one */
 #include <asm-generic/pci-dma-compat.h>
 
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index d475b4398d8b..a0a9779084d1 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -509,6 +509,11 @@ do {									\
  * it in software.  The address used in the cmpxchg16 instruction must be
  * aligned to a 16 byte boundary.
  */
+#ifdef CONFIG_SMP
+#define CMPXCHG16B_EMU_CALL "call this_cpu_cmpxchg16b_emu\n\t" ASM_NOP3
+#else
+#define CMPXCHG16B_EMU_CALL "call this_cpu_cmpxchg16b_emu\n\t" ASM_NOP2
+#endif
 #define percpu_cmpxchg16b_double(pcp1, o1, o2, n1, n2)                  \
 ({                                                                      \
         char __ret;                                                     \
@@ -517,7 +522,7 @@ do {									\
         typeof(o2) __o2 = o2;                                           \
         typeof(o2) __n2 = n2;                                           \
         typeof(o2) __dummy;                                             \
-        alternative_io("call this_cpu_cmpxchg16b_emu\n\t" P6_NOP4,      \
+        alternative_io(CMPXCHG16B_EMU_CALL,                             \
                        "cmpxchg16b " __percpu_prefix "(%%rsi)\n\tsetz %0\n\t",  \
                        X86_FEATURE_CX16,                                \
                        ASM_OUTPUT2("=a"(__ret), "=d"(__dummy)),         \
@@ -542,6 +547,33 @@ do {									\
         old__;                                                          \
 })
 
+static __always_inline int x86_this_cpu_constant_test_bit(unsigned int nr,
+                        const unsigned long __percpu *addr)
+{
+        unsigned long __percpu *a = (unsigned long *)addr + nr / BITS_PER_LONG;
+
+        return ((1UL << (nr % BITS_PER_LONG)) & percpu_read(*a)) != 0;
+}
+
+static inline int x86_this_cpu_variable_test_bit(int nr,
+                        const unsigned long __percpu *addr)
+{
+        int oldbit;
+
+        asm volatile("bt "__percpu_arg(2)",%1\n\t"
+                        "sbb %0,%0"
+                        : "=r" (oldbit)
+                        : "m" (*(unsigned long *)addr), "Ir" (nr));
+
+        return oldbit;
+}
+
+#define x86_this_cpu_test_bit(nr, addr)                 \
+        (__builtin_constant_p((nr))                     \
+         ? x86_this_cpu_constant_test_bit((nr), (addr)) \
+         : x86_this_cpu_variable_test_bit((nr), (addr)))
+
+
 #include <asm-generic/percpu.h>
 
 /* We can use this directly for local CPU (faster). */
diff --git a/arch/x86/include/asm/probe_roms.h b/arch/x86/include/asm/probe_roms.h
new file mode 100644
index 000000000000..4950a0b1d09c
--- /dev/null
+++ b/arch/x86/include/asm/probe_roms.h
@@ -0,0 +1,8 @@
+#ifndef _PROBE_ROMS_H_
+#define _PROBE_ROMS_H_
+struct pci_dev;
+
+extern void __iomem *pci_map_biosrom(struct pci_dev *pdev);
+extern void pci_unmap_biosrom(void __iomem *rom);
+extern size_t pci_biosrom_size(struct pci_dev *pdev);
+#endif
diff --git a/arch/x86/include/asm/processor-flags.h b/arch/x86/include/asm/processor-flags.h
index a898a2b6e10c..59ab4dffa377 100644
--- a/arch/x86/include/asm/processor-flags.h
+++ b/arch/x86/include/asm/processor-flags.h
@@ -60,6 +60,7 @@
 #define X86_CR4_OSXMMEXCPT 0x00000400 /* enable unmasked SSE exceptions */
 #define X86_CR4_VMXE    0x00002000 /* enable VMX virtualization */
 #define X86_CR4_OSXSAVE 0x00040000 /* enable xsave and xrestore */
+#define X86_CR4_SMEP    0x00100000 /* enable SMEP support */
 
 /*
  * x86-64 Task Priority Register, CR8
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index db8aa19a08a2..9756551ec760 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -88,7 +88,7 @@ void *extend_brk(size_t size, size_t align);
  * executable.)
  */
 #define RESERVE_BRK(name,sz)                                            \
-        static void __section(.discard.text) __used                     \
+        static void __section(.discard.text) __used notrace             \
         __brk_reservation_fn_##name##__(void) {                         \
                 asm volatile (                                          \
                         ".pushsection .brk_reservation,\"aw\",@nobits;" \
@@ -104,10 +104,10 @@ void *extend_brk(size_t size, size_t align);
         type *name;                                     \
         RESERVE_BRK(name, sizeof(type) * entries)
 
+extern void probe_roms(void);
 #ifdef __i386__
 
 void __init i386_start_kernel(void);
-extern void probe_roms(void);
 
 #else
 void __init x86_64_start_kernel(char *real_mode);
diff --git a/arch/x86/include/asm/srat.h b/arch/x86/include/asm/srat.h
deleted file mode 100644
index b508d639d1a7..000000000000
--- a/arch/x86/include/asm/srat.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Some of the code in this file has been gleaned from the 64 bit
- * discontigmem support code base.
- *
- * Copyright (C) 2002, IBM Corp.
- *
- * All rights reserved.
- *
- * 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, GOOD TITLE or
- * NON INFRINGEMENT.  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.
- *
- * Send feedback to Pat Gaughen <gone@us.ibm.com>
- */
-
-#ifndef _ASM_X86_SRAT_H
-#define _ASM_X86_SRAT_H
-
-#ifdef CONFIG_ACPI_NUMA
-extern int get_memcfg_from_srat(void);
-#else
-static inline int get_memcfg_from_srat(void)
-{
-        return 0;
-}
-#endif
-
-#endif /* _ASM_X86_SRAT_H */
diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
index d7e89c83645d..70bbe39043a9 100644
--- a/arch/x86/include/asm/stacktrace.h
+++ b/arch/x86/include/asm/stacktrace.h
@@ -37,9 +37,6 @@ print_context_stack_bp(struct thread_info *tinfo,
 /* Generic stack tracer with callbacks */
 
 struct stacktrace_ops {
-        void (*warning)(void *data, char *msg);
-        /* msg must contain %s for the symbol */
-        void (*warning_symbol)(void *data, char *msg, unsigned long symbol);
         void (*address)(void *data, unsigned long address, int reliable);
         /* On negative return stop dumping */
         int (*stack)(void *data, char *name);
diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
index 12569e691ce3..c2ff2a1d845e 100644
--- a/arch/x86/include/asm/system.h
+++ b/arch/x86/include/asm/system.h
@@ -303,24 +303,81 @@ static inline void native_wbinvd(void)
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
 #else
-#define read_cr0()      (native_read_cr0())
-#define write_cr0(x)    (native_write_cr0(x))
-#define read_cr2()      (native_read_cr2())
-#define write_cr2(x)    (native_write_cr2(x))
-#define read_cr3()      (native_read_cr3())
-#define write_cr3(x)    (native_write_cr3(x))
-#define read_cr4()      (native_read_cr4())
-#define read_cr4_safe() (native_read_cr4_safe())
-#define write_cr4(x)    (native_write_cr4(x))
-#define wbinvd()        (native_wbinvd())
+
+static inline unsigned long read_cr0(void)
+{
+        return native_read_cr0();
+}
+
+static inline void write_cr0(unsigned long x)
+{
+        native_write_cr0(x);
+}
+
+static inline unsigned long read_cr2(void)
+{
+        return native_read_cr2();
+}
+
+static inline void write_cr2(unsigned long x)
+{
+        native_write_cr2(x);
+}
+
+static inline unsigned long read_cr3(void)
+{
+        return native_read_cr3();
+}
+
+static inline void write_cr3(unsigned long x)
+{
+        native_write_cr3(x);
+}
+
+static inline unsigned long read_cr4(void)
+{
+        return native_read_cr4();
+}
+
+static inline unsigned long read_cr4_safe(void)
+{
+        return native_read_cr4_safe();
+}
+
+static inline void write_cr4(unsigned long x)
+{
+        native_write_cr4(x);
+}
+
+static inline void wbinvd(void)
+{
+        native_wbinvd();
+}
+
 #ifdef CONFIG_X86_64
-#define read_cr8()      (native_read_cr8())
-#define write_cr8(x)    (native_write_cr8(x))
-#define load_gs_index   native_load_gs_index
+
+static inline unsigned long read_cr8(void)
+{
+        return native_read_cr8();
+}
+
+static inline void write_cr8(unsigned long x)
+{
+        native_write_cr8(x);
+}
+
+static inline void load_gs_index(unsigned selector)
+{
+        native_load_gs_index(selector);
+}
+
 #endif
 
 /* Clear the 'TS' bit */
-#define clts()          (native_clts())
+static inline void clts(void)
+{
+        native_clts();
+}
 
 #endif/* CONFIG_PARAVIRT */
 
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 910a7084f7f2..c00692476e9f 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -93,19 +93,11 @@ extern void setup_node_to_cpumask_map(void);
 #define pcibus_to_node(bus) __pcibus_to_node(bus)
 
 #ifdef CONFIG_X86_32
-extern unsigned long node_start_pfn[];
-extern unsigned long node_end_pfn[];
-extern unsigned long node_remap_size[];
-#define node_has_online_mem(nid) (node_start_pfn[nid] != node_end_pfn[nid])
-
 # define SD_CACHE_NICE_TRIES    1
 # define SD_IDLE_IDX            1
-
 #else
-
 # define SD_CACHE_NICE_TRIES    2
 # define SD_IDLE_IDX            2
-
 #endif
 
 /* sched_domains SD_NODE_INIT for NUMA machines */
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index abd3e0ea762a..99ddd148a760 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -6,7 +6,6 @@
 #include <linux/errno.h>
 #include <linux/compiler.h>
 #include <linux/thread_info.h>
-#include <linux/prefetch.h>
 #include <linux/string.h>
 #include <asm/asm.h>
 #include <asm/page.h>
@@ -42,7 +41,7 @@
  * Returns 0 if the range is valid, nonzero otherwise.
  *
  * This is equivalent to the following test:
- * (u33)addr + (u33)size >= (u33)current->addr_limit.seg (u65 for x86_64)
+ * (u33)addr + (u33)size > (u33)current->addr_limit.seg (u65 for x86_64)
  *
  * This needs 33-bit (65-bit for x86_64) arithmetic. We have a carry...
  */
diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
index 088d09fb1615..566e803cc602 100644
--- a/arch/x86/include/asm/uaccess_32.h
+++ b/arch/x86/include/asm/uaccess_32.h
@@ -6,7 +6,6 @@
  */
 #include <linux/errno.h>
 #include <linux/thread_info.h>
-#include <linux/prefetch.h>
 #include <linux/string.h>
 #include <asm/asm.h>
 #include <asm/page.h>
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
index 316708d5af92..1c66d30971ad 100644
--- a/arch/x86/include/asm/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
@@ -6,7 +6,6 @@
  */
 #include <linux/compiler.h>
 #include <linux/errno.h>
-#include <linux/prefetch.h>
 #include <linux/lockdep.h>
 #include <asm/alternative.h>
 #include <asm/cpufeature.h>
diff --git a/arch/x86/include/asm/unistd_32.h b/arch/x86/include/asm/unistd_32.h
index a755ef5e5977..fb6a625c99bf 100644
--- a/arch/x86/include/asm/unistd_32.h
+++ b/arch/x86/include/asm/unistd_32.h
@@ -350,10 +350,11 @@
 #define __NR_open_by_handle_at  342
 #define __NR_clock_adjtime      343
 #define __NR_syncfs             344
+#define __NR_sendmmsg           345
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 345
+#define NR_syscalls 346
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h
index 160fa76bd578..79f90eb15aad 100644
--- a/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
@@ -677,6 +677,8 @@ __SYSCALL(__NR_open_by_handle_at, sys_open_by_handle_at)
 __SYSCALL(__NR_clock_adjtime, sys_clock_adjtime)
 #define __NR_syncfs                             306
 __SYSCALL(__NR_syncfs, sys_syncfs)
+#define __NR_sendmmsg                           307
+__SYSCALL(__NR_sendmmsg, sys_sendmmsg)
 
 #ifndef __NO_STUBS
 #define __ARCH_WANT_OLD_READDIR
diff --git a/arch/x86/include/asm/x2apic.h b/arch/x86/include/asm/x2apic.h
new file mode 100644
index 000000000000..6bf5b8e478c0
--- /dev/null
+++ b/arch/x86/include/asm/x2apic.h
@@ -0,0 +1,62 @@
+/*
+ * Common bits for X2APIC cluster/physical modes.
+ */
+
+#ifndef _ASM_X86_X2APIC_H
+#define _ASM_X86_X2APIC_H
+
+#include <asm/apic.h>
+#include <asm/ipi.h>
+#include <linux/cpumask.h>
+
+/*
+ * Need to use more than cpu 0, because we need more vectors
+ * when MSI-X are used.
+ */
+static const struct cpumask *x2apic_target_cpus(void)
+{
+        return cpu_online_mask;
+}
+
+static int x2apic_apic_id_registered(void)
+{
+        return 1;
+}
+
+/*
+ * For now each logical cpu is in its own vector allocation domain.
+ */
+static void x2apic_vector_allocation_domain(int cpu, struct cpumask *retmask)
+{
+        cpumask_clear(retmask);
+        cpumask_set_cpu(cpu, retmask);
+}
+
+static void
+__x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest)
+{
+        unsigned long cfg = __prepare_ICR(0, vector, dest);
+        native_x2apic_icr_write(cfg, apicid);
+}
+
+static unsigned int x2apic_get_apic_id(unsigned long id)
+{
+        return id;
+}
+
+static unsigned long x2apic_set_apic_id(unsigned int id)
+{
+        return id;
+}
+
+static int x2apic_phys_pkg_id(int initial_apicid, int index_msb)
+{
+        return initial_apicid >> index_msb;
+}
+
+static void x2apic_send_IPI_self(int vector)
+{
+        apic_write(APIC_SELF_IPI, vector);
+}
+
+#endif /* _ASM_X86_X2APIC_H */
diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
index c61934fbf22a..64a619d47d34 100644
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
@@ -47,8 +47,9 @@ extern bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn);
 extern unsigned long set_phys_range_identity(unsigned long pfn_s,
                                              unsigned long pfn_e);
 
-extern int m2p_add_override(unsigned long mfn, struct page *page);
-extern int m2p_remove_override(struct page *page);
+extern int m2p_add_override(unsigned long mfn, struct page *page,
+                            bool clear_pte);
+extern int m2p_remove_override(struct page *page, bool clear_pte);
 extern struct page *m2p_find_override(unsigned long mfn);
 extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
 
diff --git a/arch/x86/include/asm/xen/pci.h b/arch/x86/include/asm/xen/pci.h
index aa8620989162..4fbda9a3f339 100644
--- a/arch/x86/include/asm/xen/pci.h
+++ b/arch/x86/include/asm/xen/pci.h
@@ -15,10 +15,26 @@ static inline int pci_xen_hvm_init(void)
 #endif
 #if defined(CONFIG_XEN_DOM0)
 void __init xen_setup_pirqs(void);
+int xen_find_device_domain_owner(struct pci_dev *dev);
+int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain);
+int xen_unregister_device_domain_owner(struct pci_dev *dev);
 #else
 static inline void __init xen_setup_pirqs(void)
 {
 }
+static inline int xen_find_device_domain_owner(struct pci_dev *dev)
+{
+        return -1;
+}
+static inline int xen_register_device_domain_owner(struct pci_dev *dev,
+                                                   uint16_t domain)
+{
+        return -1;
+}
+static inline int xen_unregister_device_domain_owner(struct pci_dev *dev)
+{
+        return -1;
+}
 #endif
 
 #if defined(CONFIG_PCI_MSI)
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 7338ef2218bc..250806472a7e 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -36,7 +36,7 @@ obj-y			+= traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
 obj-y                   += time.o ioport.o ldt.o dumpstack.o
 obj-y                   += setup.o x86_init.o i8259.o irqinit.o jump_label.o
 obj-$(CONFIG_IRQ_WORK)  += irq_work.o
-obj-$(CONFIG_X86_32)    += probe_roms_32.o
+obj-y                   += probe_roms.o
 obj-$(CONFIG_X86_32)    += sys_i386_32.o i386_ksyms_32.o
 obj-$(CONFIG_X86_64)    += sys_x86_64.o x8664_ksyms_64.o
 obj-$(CONFIG_X86_64)    += syscall_64.o vsyscall_64.o
@@ -117,7 +117,7 @@ obj-$(CONFIG_OF)			+= devicetree.o
 ifeq ($(CONFIG_X86_64),y)
         obj-$(CONFIG_AUDIT)             += audit_64.o
 
-        obj-$(CONFIG_GART_IOMMU)        += pci-gart_64.o aperture_64.o
+        obj-$(CONFIG_GART_IOMMU)        += amd_gart_64.o aperture_64.o
         obj-$(CONFIG_CALGARY_IOMMU)     += pci-calgary_64.o tce_64.o
         obj-$(CONFIG_AMD_IOMMU)         += amd_iommu_init.o amd_iommu.o
 
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 9a966c579af5..4558f0d0822d 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -970,7 +970,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
         mp_irq.irqflag = (trigger << 2) | polarity;
         mp_irq.srcbus = MP_ISA_BUS;
         mp_irq.srcbusirq = bus_irq;     /* IRQ */
-        mp_irq.dstapic = mp_ioapics[ioapic].apicid; /* APIC ID */
+        mp_irq.dstapic = mpc_ioapic_id(ioapic); /* APIC ID */
         mp_irq.dstirq = pin;    /* INTIN# */
 
         mp_save_irq(&mp_irq);
@@ -1021,7 +1021,7 @@ void __init mp_config_acpi_legacy_irqs(void)
                 if (ioapic < 0)
                         continue;
                 pin = mp_find_ioapic_pin(ioapic, gsi);
-                dstapic = mp_ioapics[ioapic].apicid;
+                dstapic = mpc_ioapic_id(ioapic);
 
                 for (idx = 0; idx < mp_irq_entries; idx++) {
                         struct mpc_intsrc *irq = mp_irqs + idx;
@@ -1082,7 +1082,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger,
         mp_irq.srcbus = number;
         mp_irq.srcbusirq = (((devfn >> 3) & 0x1f) << 2) | ((pin - 1) & 3);
         ioapic = mp_find_ioapic(gsi);
-        mp_irq.dstapic = mp_ioapics[ioapic].apicid;
+        mp_irq.dstapic = mpc_ioapic_id(ioapic);
         mp_irq.dstirq = mp_find_ioapic_pin(ioapic, gsi);
 
         mp_save_irq(&mp_irq);
@@ -1113,7 +1113,7 @@ int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity)
 
         if (ioapic_pin > MP_MAX_IOAPIC_PIN) {
                 printk(KERN_ERR "Invalid reference to IOAPIC pin "
-                       "%d-%d\n", mp_ioapics[ioapic].apicid,
+                       "%d-%d\n", mpc_ioapic_id(ioapic),
                        ioapic_pin);
                 return gsi;
         }
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index ff93bc1b09c3..18a857ba7a25 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -112,11 +112,6 @@ static int __init acpi_sleep_setup(char *str)
 #ifdef CONFIG_HIBERNATION
                 if (strncmp(str, "s4_nohwsig", 10) == 0)
                         acpi_no_s4_hw_signature();
-                if (strncmp(str, "s4_nonvs", 8) == 0) {
-                        pr_warning("ACPI: acpi_sleep=s4_nonvs is deprecated, "
-                                        "please use acpi_sleep=nonvs instead");
-                        acpi_nvs_nosave();
-                }
 #endif
                 if (strncmp(str, "nonvs", 5) == 0)
                         acpi_nvs_nosave();
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 4a234677e213..a81f2d52f869 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -67,17 +67,30 @@ __setup("noreplace-paravirt", setup_noreplace_paravirt);
 #define DPRINTK(fmt, args...) if (debug_alternative) \
         printk(KERN_DEBUG fmt, args)
 
+/*
+ * Each GENERIC_NOPX is of X bytes, and defined as an array of bytes
+ * that correspond to that nop. Getting from one nop to the next, we
+ * add to the array the offset that is equal to the sum of all sizes of
+ * nops preceding the one we are after.
+ *
+ * Note: The GENERIC_NOP5_ATOMIC is at the end, as it breaks the
+ * nice symmetry of sizes of the previous nops.
+ */
 #if defined(GENERIC_NOP1) && !defined(CONFIG_X86_64)
-/* Use inline assembly to define this because the nops are defined
-   as inline assembly strings in the include files and we cannot
-   get them easily into strings. */
-asm("\t" __stringify(__INITRODATA_OR_MODULE) "\nintelnops: "
-        GENERIC_NOP1 GENERIC_NOP2 GENERIC_NOP3 GENERIC_NOP4 GENERIC_NOP5 GENERIC_NOP6
-        GENERIC_NOP7 GENERIC_NOP8
-    "\t.previous");
-extern const unsigned char intelnops[];
-static const unsigned char *const __initconst_or_module
-intel_nops[ASM_NOP_MAX+1] = {
+static const unsigned char intelnops[] =
+{
+        GENERIC_NOP1,
+        GENERIC_NOP2,
+        GENERIC_NOP3,
+        GENERIC_NOP4,
+        GENERIC_NOP5,
+        GENERIC_NOP6,
+        GENERIC_NOP7,
+        GENERIC_NOP8,
+        GENERIC_NOP5_ATOMIC
+};
+static const unsigned char * const intel_nops[ASM_NOP_MAX+2] =
+{
         NULL,
         intelnops,
         intelnops + 1,
@@ -87,17 +100,25 @@ intel_nops[ASM_NOP_MAX+1] = {
         intelnops + 1 + 2 + 3 + 4 + 5,
         intelnops + 1 + 2 + 3 + 4 + 5 + 6,
         intelnops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
+        intelnops + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8,
 };
 #endif
 
 #ifdef K8_NOP1
-asm("\t" __stringify(__INITRODATA_OR_MODULE) "\nk8nops: "
-        K8_NOP1 K8_NOP2 K8_NOP3 K8_NOP4 K8_NOP5 K8_NOP6
-        K8_NOP7 K8_NOP8
-    "\t.previous");
-extern const unsigned char k8nops[];
-static const unsigned char *const __initconst_or_module
-k8_nops[ASM_NOP_MAX+1] = {
+static const unsigned char k8nops[] =
+{
+        K8_NOP1,
+        K8_NOP2,
+        K8_NOP3,
+        K8_NOP4,
+        K8_NOP5,
+        K8_NOP6,
+        K8_NOP7,
+        K8_NOP8,
+        K8_NOP5_ATOMIC
+};
+static const unsigned char * const k8_nops[ASM_NOP_MAX+2] =
+{
         NULL,
         k8nops,
         k8nops + 1,
@@ -107,17 +128,25 @@ k8_nops[ASM_NOP_MAX+1] = {
         k8nops + 1 + 2 + 3 + 4 + 5,
         k8nops + 1 + 2 + 3 + 4 + 5 + 6,
         k8nops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
+        k8nops + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8,
 };
 #endif
 
 #if defined(K7_NOP1) && !defined(CONFIG_X86_64)
-asm("\t" __stringify(__INITRODATA_OR_MODULE) "\nk7nops: "
-        K7_NOP1 K7_NOP2 K7_NOP3 K7_NOP4 K7_NOP5 K7_NOP6
-        K7_NOP7 K7_NOP8
-    "\t.previous");
-extern const unsigned char k7nops[];
-static const unsigned char *const __initconst_or_module
-k7_nops[ASM_NOP_MAX+1] = {
+static const unsigned char k7nops[] =
+{
+        K7_NOP1,
+        K7_NOP2,
+        K7_NOP3,
+        K7_NOP4,
+        K7_NOP5,
+        K7_NOP6,
+        K7_NOP7,
+        K7_NOP8,
+        K7_NOP5_ATOMIC
+};
+static const unsigned char * const k7_nops[ASM_NOP_MAX+2] =
+{
         NULL,
         k7nops,
         k7nops + 1,
@@ -127,17 +156,25 @@ k7_nops[ASM_NOP_MAX+1] = {
         k7nops + 1 + 2 + 3 + 4 + 5,
         k7nops + 1 + 2 + 3 + 4 + 5 + 6,
         k7nops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
+        k7nops + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8,
 };
 #endif
 
 #ifdef P6_NOP1
-asm("\t" __stringify(__INITRODATA_OR_MODULE) "\np6nops: "
-        P6_NOP1 P6_NOP2 P6_NOP3 P6_NOP4 P6_NOP5 P6_NOP6
-        P6_NOP7 P6_NOP8
-    "\t.previous");
-extern const unsigned char p6nops[];
-static const unsigned char *const __initconst_or_module
-p6_nops[ASM_NOP_MAX+1] = {
+static const unsigned char  __initconst_or_module p6nops[] =
+{
+        P6_NOP1,
+        P6_NOP2,
+        P6_NOP3,
+        P6_NOP4,
+        P6_NOP5,
+        P6_NOP6,
+        P6_NOP7,
+        P6_NOP8,
+        P6_NOP5_ATOMIC
+};
+static const unsigned char * const p6_nops[ASM_NOP_MAX+2] =
+{
         NULL,
         p6nops,
         p6nops + 1,
@@ -147,47 +184,65 @@ p6_nops[ASM_NOP_MAX+1] = {
         p6nops + 1 + 2 + 3 + 4 + 5,
         p6nops + 1 + 2 + 3 + 4 + 5 + 6,
         p6nops + 1 + 2 + 3 + 4 + 5 + 6 + 7,
+        p6nops + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8,
 };
 #endif
 
+/* Initialize these to a safe default */
 #ifdef CONFIG_X86_64
+const unsigned char * const *ideal_nops = p6_nops;
+#else
+const unsigned char * const *ideal_nops = intel_nops;
+#endif
 
-extern char __vsyscall_0;
-static const unsigned char *const *__init_or_module find_nop_table(void)
+void __init arch_init_ideal_nops(void)
 {
-        if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL &&
-            boot_cpu_has(X86_FEATURE_NOPL))
-                return p6_nops;
-        else
-                return k8_nops;
-}
-
-#else /* CONFIG_X86_64 */
+        switch (boot_cpu_data.x86_vendor) {
+        case X86_VENDOR_INTEL:
+                /*
+                 * Due to a decoder implementation quirk, some
+                 * specific Intel CPUs actually perform better with
+                 * the "k8_nops" than with the SDM-recommended NOPs.
+                 */
+                if (boot_cpu_data.x86 == 6 &&
+                    boot_cpu_data.x86_model >= 0x0f &&
+                    boot_cpu_data.x86_model != 0x1c &&
+                    boot_cpu_data.x86_model != 0x26 &&
+                    boot_cpu_data.x86_model != 0x27 &&
+                    boot_cpu_data.x86_model < 0x30) {
+                        ideal_nops = k8_nops;
+                } else if (boot_cpu_has(X86_FEATURE_NOPL)) {
+                           ideal_nops = p6_nops;
+                } else {
+#ifdef CONFIG_X86_64
+                        ideal_nops = k8_nops;
+#else
+                        ideal_nops = intel_nops;
+#endif
+                }
 
-static const unsigned char *const *__init_or_module find_nop_table(void)
-{
-        if (boot_cpu_has(X86_FEATURE_K8))
-                return k8_nops;
-        else if (boot_cpu_has(X86_FEATURE_K7))
-                return k7_nops;
-        else if (boot_cpu_has(X86_FEATURE_NOPL))
-                return p6_nops;
-        else
-                return intel_nops;
+        default:
+#ifdef CONFIG_X86_64
+                ideal_nops = k8_nops;
+#else
+                if (boot_cpu_has(X86_FEATURE_K8))
+                        ideal_nops = k8_nops;
+                else if (boot_cpu_has(X86_FEATURE_K7))
+                        ideal_nops = k7_nops;
+                else
+                        ideal_nops = intel_nops;
+#endif
+        }
 }
 
-#endif /* CONFIG_X86_64 */
-
 /* Use this to add nops to a buffer, then text_poke the whole buffer. */
 static void __init_or_module add_nops(void *insns, unsigned int len)
 {
-        const unsigned char *const *noptable = find_nop_table();
-
         while (len > 0) {
                 unsigned int noplen = len;
                 if (noplen > ASM_NOP_MAX)
                         noplen = ASM_NOP_MAX;
-                memcpy(insns, noptable[noplen], noplen);
+                memcpy(insns, ideal_nops[noplen], noplen);
                 insns += noplen;
                 len -= noplen;
         }
@@ -195,6 +250,7 @@ static void __init_or_module add_nops(void *insns, unsigned int len)
 
 extern struct alt_instr __alt_instructions[], __alt_instructions_end[];
 extern s32 __smp_locks[], __smp_locks_end[];
+extern char __vsyscall_0;
 void *text_poke_early(void *addr, const void *opcode, size_t len);
 
 /* Replace instructions with better alternatives for this CPU type.
@@ -210,6 +266,15 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
         u8 insnbuf[MAX_PATCH_LEN];
 
         DPRINTK("%s: alt table %p -> %p\n", __func__, start, end);
+        /*
+         * The scan order should be from start to end. A later scanned
+         * alternative code can overwrite a previous scanned alternative code.
+         * Some kernel functions (e.g. memcpy, memset, etc) use this order to
+         * patch code.
+         *
+         * So be careful if you want to change the scan order to any other
+         * order.
+         */
         for (a = start; a < end; a++) {
                 u8 *instr = a->instr;
                 BUG_ON(a->replacementlen > a->instrlen);
@@ -678,29 +743,3 @@ void __kprobes text_poke_smp_batch(struct text_poke_param *params, int n)
         wrote_text = 0;
         __stop_machine(stop_machine_text_poke, (void *)&tpp, NULL);
 }
-
-#if defined(CONFIG_DYNAMIC_FTRACE) || defined(HAVE_JUMP_LABEL)
-
-#ifdef CONFIG_X86_64
-unsigned char ideal_nop5[5] = { 0x66, 0x66, 0x66, 0x66, 0x90 };
-#else
-unsigned char ideal_nop5[5] = { 0x3e, 0x8d, 0x74, 0x26, 0x00 };
-#endif
-
-void __init arch_init_ideal_nop5(void)
-{
-        /*
-         * There is no good nop for all x86 archs.  This selection
-         * algorithm should be unified with the one in find_nop_table(),
-         * but this should be good enough for now.
-         *
-         * For cases other than the ones below, use the safe (as in
-         * always functional) defaults above.
-         */
-#ifdef CONFIG_X86_64
-        /* Don't use these on 32 bits due to broken virtualizers */
-        if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
-                memcpy(ideal_nop5, p6_nops[5], 5);
-#endif
-}
-#endif
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/amd_gart_64.c
index b117efd24f71..b117efd24f71 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/amd_gart_64.c
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 57ca77787220..cd8cbeb5fa34 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/pci.h>
+#include <linux/pci-ats.h>
 #include <linux/bitmap.h>
 #include <linux/slab.h>
 #include <linux/debugfs.h>
@@ -25,6 +26,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/iommu-helper.h>
 #include <linux/iommu.h>
+#include <linux/delay.h>
 #include <asm/proto.h>
 #include <asm/iommu.h>
 #include <asm/gart.h>
@@ -34,7 +36,7 @@
 
 #define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28))
 
-#define EXIT_LOOP_COUNT 10000000
+#define LOOP_TIMEOUT    100000
 
 static DEFINE_RWLOCK(amd_iommu_devtable_lock);
 
@@ -57,7 +59,6 @@ struct iommu_cmd {
         u32 data[4];
 };
 
-static void reset_iommu_command_buffer(struct amd_iommu *iommu);
 static void update_domain(struct protection_domain *domain);
 
 /****************************************************************************
@@ -322,8 +323,6 @@ static void iommu_print_event(struct amd_iommu *iommu, void *__evt)
                 break;
         case EVENT_TYPE_ILL_CMD:
                 printk("ILLEGAL_COMMAND_ERROR address=0x%016llx]\n", address);
-                iommu->reset_in_progress = true;
-                reset_iommu_command_buffer(iommu);
                 dump_command(address);
                 break;
         case EVENT_TYPE_CMD_HARD_ERR:
@@ -367,7 +366,7 @@ static void iommu_poll_events(struct amd_iommu *iommu)
         spin_unlock_irqrestore(&iommu->lock, flags);
 }
 
-irqreturn_t amd_iommu_int_handler(int irq, void *data)
+irqreturn_t amd_iommu_int_thread(int irq, void *data)
 {
         struct amd_iommu *iommu;
 
@@ -377,192 +376,300 @@ irqreturn_t amd_iommu_int_handler(int irq, void *data)
         return IRQ_HANDLED;
 }
 
+irqreturn_t amd_iommu_int_handler(int irq, void *data)
+{
+        return IRQ_WAKE_THREAD;
+}
+
 /****************************************************************************
  *
  * IOMMU command queuing functions
  *
  ****************************************************************************/
 
-/*
- * Writes the command to the IOMMUs command buffer and informs the
- * hardware about the new command. Must be called with iommu->lock held.
- */
-static int __iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd)
+static int wait_on_sem(volatile u64 *sem)
+{
+        int i = 0;
+
+        while (*sem == 0 && i < LOOP_TIMEOUT) {
+                udelay(1);
+                i += 1;
+        }
+
+        if (i == LOOP_TIMEOUT) {
+                pr_alert("AMD-Vi: Completion-Wait loop timed out\n");
+                return -EIO;
+        }
+
+        return 0;
+}
+
+static void copy_cmd_to_buffer(struct amd_iommu *iommu,
+                               struct iommu_cmd *cmd,
+                               u32 tail)
 {
-        u32 tail, head;
         u8 *target;
 
-        WARN_ON(iommu->cmd_buf_size & CMD_BUFFER_UNINITIALIZED);
-        tail = readl(iommu->mmio_base + MMIO_CMD_TAIL_OFFSET);
         target = iommu->cmd_buf + tail;
-        memcpy_toio(target, cmd, sizeof(*cmd));
-        tail = (tail + sizeof(*cmd)) % iommu->cmd_buf_size;
-        head = readl(iommu->mmio_base + MMIO_CMD_HEAD_OFFSET);
-        if (tail == head)
-                return -ENOMEM;
+        tail   = (tail + sizeof(*cmd)) % iommu->cmd_buf_size;
+
+        /* Copy command to buffer */
+        memcpy(target, cmd, sizeof(*cmd));
+
+        /* Tell the IOMMU about it */
         writel(tail, iommu->mmio_base + MMIO_CMD_TAIL_OFFSET);
+}
 
-        return 0;
+static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
+{
+        WARN_ON(address & 0x7ULL);
+
+        memset(cmd, 0, sizeof(*cmd));
+        cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
+        cmd->data[1] = upper_32_bits(__pa(address));
+        cmd->data[2] = 1;
+        CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
+}
+
+static void build_inv_dte(struct iommu_cmd *cmd, u16 devid)
+{
+        memset(cmd, 0, sizeof(*cmd));
+        cmd->data[0] = devid;
+        CMD_SET_TYPE(cmd, CMD_INV_DEV_ENTRY);
+}
+
+static void build_inv_iommu_pages(struct iommu_cmd *cmd, u64 address,
+                                  size_t size, u16 domid, int pde)
+{
+        u64 pages;
+        int s;
+
+        pages = iommu_num_pages(address, size, PAGE_SIZE);
+        s     = 0;
+
+        if (pages > 1) {
+                /*
+                 * If we have to flush more than one page, flush all
+                 * TLB entries for this domain
+                 */
+                address = CMD_INV_IOMMU_ALL_PAGES_ADDRESS;
+                s = 1;
+        }
+
+        address &= PAGE_MASK;
+
+        memset(cmd, 0, sizeof(*cmd));
+        cmd->data[1] |= domid;
+        cmd->data[2]  = lower_32_bits(address);
+        cmd->data[3]  = upper_32_bits(address);
+        CMD_SET_TYPE(cmd, CMD_INV_IOMMU_PAGES);
+        if (s) /* size bit - we flush more than one 4kb page */
+                cmd->data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK;
+        if (pde) /* PDE bit - we wan't flush everything not only the PTEs */
+                cmd->data[2] |= CMD_INV_IOMMU_PAGES_PDE_MASK;
+}
+
+static void build_inv_iotlb_pages(struct iommu_cmd *cmd, u16 devid, int qdep,
+                                  u64 address, size_t size)
+{
+        u64 pages;
+        int s;
+
+        pages = iommu_num_pages(address, size, PAGE_SIZE);
+        s     = 0;
+
+        if (pages > 1) {
+                /*
+                 * If we have to flush more than one page, flush all
+                 * TLB entries for this domain
+                 */
+                address = CMD_INV_IOMMU_ALL_PAGES_ADDRESS;
+                s = 1;
+        }
+
+        address &= PAGE_MASK;
+
+        memset(cmd, 0, sizeof(*cmd));
+        cmd->data[0]  = devid;
+        cmd->data[0] |= (qdep & 0xff) << 24;
+        cmd->data[1]  = devid;
+        cmd->data[2]  = lower_32_bits(address);
+        cmd->data[3]  = upper_32_bits(address);
+        CMD_SET_TYPE(cmd, CMD_INV_IOTLB_PAGES);
+        if (s)
+                cmd->data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK;
+}
+
+static void build_inv_all(struct iommu_cmd *cmd)
+{
+        memset(cmd, 0, sizeof(*cmd));
+        CMD_SET_TYPE(cmd, CMD_INV_ALL);
 }
 
 /*
- * General queuing function for commands. Takes iommu->lock and calls
- * __iommu_queue_command().
+ * Writes the command to the IOMMUs command buffer and informs the
+ * hardware about the new command.
  */
 static int iommu_queue_command(struct amd_iommu *iommu, struct iommu_cmd *cmd)
 {
+        u32 left, tail, head, next_tail;
         unsigned long flags;
-        int ret;
 
+        WARN_ON(iommu->cmd_buf_size & CMD_BUFFER_UNINITIALIZED);
+
+again:
         spin_lock_irqsave(&iommu->lock, flags);
-        ret = __iommu_queue_command(iommu, cmd);
-        if (!ret)
-                iommu->need_sync = true;
-        spin_unlock_irqrestore(&iommu->lock, flags);
 
-        return ret;
-}
+        head      = readl(iommu->mmio_base + MMIO_CMD_HEAD_OFFSET);
+        tail      = readl(iommu->mmio_base + MMIO_CMD_TAIL_OFFSET);
+        next_tail = (tail + sizeof(*cmd)) % iommu->cmd_buf_size;
+        left      = (head - next_tail) % iommu->cmd_buf_size;
 
-/*
- * This function waits until an IOMMU has completed a completion
- * wait command
- */
-static void __iommu_wait_for_completion(struct amd_iommu *iommu)
-{
-        int ready = 0;
-        unsigned status = 0;
-        unsigned long i = 0;
+        if (left <= 2) {
+                struct iommu_cmd sync_cmd;
+                volatile u64 sem = 0;
+                int ret;
+
+                build_completion_wait(&sync_cmd, (u64)&sem);
+                copy_cmd_to_buffer(iommu, &sync_cmd, tail);
 
-        INC_STATS_COUNTER(compl_wait);
+                spin_unlock_irqrestore(&iommu->lock, flags);
+
+                if ((ret = wait_on_sem(&sem)) != 0)
+                        return ret;
 
-        while (!ready && (i < EXIT_LOOP_COUNT)) {
-                ++i;
-                /* wait for the bit to become one */
-                status = readl(iommu->mmio_base + MMIO_STATUS_OFFSET);
-                ready = status & MMIO_STATUS_COM_WAIT_INT_MASK;
+                goto again;
         }
 
-        /* set bit back to zero */
-        status &= ~MMIO_STATUS_COM_WAIT_INT_MASK;
-        writel(status, iommu->mmio_base + MMIO_STATUS_OFFSET);
+        copy_cmd_to_buffer(iommu, cmd, tail);
+
+        /* We need to sync now to make sure all commands are processed */
+        iommu->need_sync = true;
+
+        spin_unlock_irqrestore(&iommu->lock, flags);
 
-        if (unlikely(i == EXIT_LOOP_COUNT))
-                iommu->reset_in_progress = true;
+        return 0;
 }
 
 /*
  * This function queues a completion wait command into the command
  * buffer of an IOMMU
  */
-static int __iommu_completion_wait(struct amd_iommu *iommu)
+static int iommu_completion_wait(struct amd_iommu *iommu)
 {
         struct iommu_cmd cmd;
+        volatile u64 sem = 0;
+        int ret;
+
+        if (!iommu->need_sync)
+                return 0;
 
-         memset(&cmd, 0, sizeof(cmd));
-         cmd.data[0] = CMD_COMPL_WAIT_INT_MASK;
-         CMD_SET_TYPE(&cmd, CMD_COMPL_WAIT);
+        build_completion_wait(&cmd, (u64)&sem);
 
-         return __iommu_queue_command(iommu, &cmd);
+        ret = iommu_queue_command(iommu, &cmd);
+        if (ret)
+                return ret;
+
+        return wait_on_sem(&sem);
 }
 
-/*
- * This function is called whenever we need to ensure that the IOMMU has
- * completed execution of all commands we sent. It sends a
- * COMPLETION_WAIT command and waits for it to finish. The IOMMU informs
- * us about that by writing a value to a physical address we pass with
- * the command.
- */
-static int iommu_completion_wait(struct amd_iommu *iommu)
+static int iommu_flush_dte(struct amd_iommu *iommu, u16 devid)
 {
-        int ret = 0;
-        unsigned long flags;
-
-        spin_lock_irqsave(&iommu->lock, flags);
+        struct iommu_cmd cmd;
 
-        if (!iommu->need_sync)
-                goto out;
+        build_inv_dte(&cmd, devid);
 
-        ret = __iommu_completion_wait(iommu);
+        return iommu_queue_command(iommu, &cmd);
+}
 
-        iommu->need_sync = false;
+static void iommu_flush_dte_all(struct amd_iommu *iommu)
+{
+        u32 devid;
 
-        if (ret)
-                goto out;
+        for (devid = 0; devid <= 0xffff; ++devid)
+                iommu_flush_dte(iommu, devid);
 
-        __iommu_wait_for_completion(iommu);
+        iommu_completion_wait(iommu);
+}
 
-out:
-        spin_unlock_irqrestore(&iommu->lock, flags);
+/*
+ * This function uses heavy locking and may disable irqs for some time. But
+ * this is no issue because it is only called during resume.
+ */
+static void iommu_flush_tlb_all(struct amd_iommu *iommu)
+{
+        u32 dom_id;
 
-        if (iommu->reset_in_progress)
-                reset_iommu_command_buffer(iommu);
+        for (dom_id = 0; dom_id <= 0xffff; ++dom_id) {
+                struct iommu_cmd cmd;
+                build_inv_iommu_pages(&cmd, 0, CMD_INV_IOMMU_ALL_PAGES_ADDRESS,
+                                      dom_id, 1);
+                iommu_queue_command(iommu, &cmd);
+        }
 
-        return 0;
+        iommu_completion_wait(iommu);
 }
 
-static void iommu_flush_complete(struct protection_domain *domain)
+static void iommu_flush_all(struct amd_iommu *iommu)
 {
-        int i;
+        struct iommu_cmd cmd;
 
-        for (i = 0; i < amd_iommus_present; ++i) {
-                if (!domain->dev_iommu[i])
-                        continue;
+        build_inv_all(&cmd);
 
-                /*
-                 * Devices of this domain are behind this IOMMU
-                 * We need to wait for completion of all commands.
-                 */
-                iommu_completion_wait(amd_iommus[i]);
+        iommu_queue_command(iommu, &cmd);
+        iommu_completion_wait(iommu);
+}
+
+void iommu_flush_all_caches(struct amd_iommu *iommu)
+{
+        if (iommu_feature(iommu, FEATURE_IA)) {
+                iommu_flush_all(iommu);
+        } else {
+                iommu_flush_dte_all(iommu);
+                iommu_flush_tlb_all(iommu);
         }
 }
 
 /*
- * Command send function for invalidating a device table entry
+ * Command send function for flushing on-device TLB
  */
-static int iommu_flush_device(struct device *dev)
+static int device_flush_iotlb(struct device *dev, u64 address, size_t size)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         struct amd_iommu *iommu;
         struct iommu_cmd cmd;
         u16 devid;
+        int qdep;
 
+        qdep  = pci_ats_queue_depth(pdev);
         devid = get_device_id(dev);
         iommu = amd_iommu_rlookup_table[devid];
 
-        /* Build command */
-        memset(&cmd, 0, sizeof(cmd));
-        CMD_SET_TYPE(&cmd, CMD_INV_DEV_ENTRY);
-        cmd.data[0] = devid;
+        build_inv_iotlb_pages(&cmd, devid, qdep, address, size);
 
         return iommu_queue_command(iommu, &cmd);
 }
 
-static void __iommu_build_inv_iommu_pages(struct iommu_cmd *cmd, u64 address,
-                                          u16 domid, int pde, int s)
-{
-        memset(cmd, 0, sizeof(*cmd));
-        address &= PAGE_MASK;
-        CMD_SET_TYPE(cmd, CMD_INV_IOMMU_PAGES);
-        cmd->data[1] |= domid;
-        cmd->data[2] = lower_32_bits(address);
-        cmd->data[3] = upper_32_bits(address);
-        if (s) /* size bit - we flush more than one 4kb page */
-                cmd->data[2] |= CMD_INV_IOMMU_PAGES_SIZE_MASK;
-        if (pde) /* PDE bit - we wan't flush everything not only the PTEs */
-                cmd->data[2] |= CMD_INV_IOMMU_PAGES_PDE_MASK;
-}
-
 /*
- * Generic command send function for invalidaing TLB entries
+ * Command send function for invalidating a device table entry
  */
-static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu,
-                u64 address, u16 domid, int pde, int s)
+static int device_flush_dte(struct device *dev)
 {
-        struct iommu_cmd cmd;
+        struct amd_iommu *iommu;
+        struct pci_dev *pdev;
+        u16 devid;
         int ret;
 
-        __iommu_build_inv_iommu_pages(&cmd, address, domid, pde, s);
+        pdev  = to_pci_dev(dev);
+        devid = get_device_id(dev);
+        iommu = amd_iommu_rlookup_table[devid];
 
-        ret = iommu_queue_command(iommu, &cmd);
+        ret = iommu_flush_dte(iommu, devid);
+        if (ret)
+                return ret;
+
+        if (pci_ats_enabled(pdev))
+                ret = device_flush_iotlb(dev, 0, ~0UL);
 
         return ret;
 }
@@ -572,23 +679,14 @@ static int iommu_queue_inv_iommu_pages(struct amd_iommu *iommu,
  * It invalidates a single PTE if the range to flush is within a single
  * page. Otherwise it flushes the whole TLB of the IOMMU.
  */
-static void __iommu_flush_pages(struct protection_domain *domain,
-                                u64 address, size_t size, int pde)
+static void __domain_flush_pages(struct protection_domain *domain,
+                                 u64 address, size_t size, int pde)
 {
-        int s = 0, i;
-        unsigned long pages = iommu_num_pages(address, size, PAGE_SIZE);
-
-        address &= PAGE_MASK;
-
-        if (pages > 1) {
-                /*
-                 * If we have to flush more than one page, flush all
-                 * TLB entries for this domain
-                 */
-                address = CMD_INV_IOMMU_ALL_PAGES_ADDRESS;
-                s = 1;
-        }
+        struct iommu_dev_data *dev_data;
+        struct iommu_cmd cmd;
+        int ret = 0, i;
 
+        build_inv_iommu_pages(&cmd, address, size, domain->id, pde);
 
         for (i = 0; i < amd_iommus_present; ++i) {
                 if (!domain->dev_iommu[i])
@@ -598,101 +696,70 @@ static void __iommu_flush_pages(struct protection_domain *domain,
                  * Devices of this domain are behind this IOMMU
                  * We need a TLB flush
                  */
-                iommu_queue_inv_iommu_pages(amd_iommus[i], address,
-                                            domain->id, pde, s);
+                ret |= iommu_queue_command(amd_iommus[i], &cmd);
+        }
+
+        list_for_each_entry(dev_data, &domain->dev_list, list) {
+                struct pci_dev *pdev = to_pci_dev(dev_data->dev);
+
+                if (!pci_ats_enabled(pdev))
+                        continue;
+
+                ret |= device_flush_iotlb(dev_data->dev, address, size);
         }
 
-        return;
+        WARN_ON(ret);
 }
 
-static void iommu_flush_pages(struct protection_domain *domain,
-                             u64 address, size_t size)
+static void domain_flush_pages(struct protection_domain *domain,
+                               u64 address, size_t size)
 {
-        __iommu_flush_pages(domain, address, size, 0);
+        __domain_flush_pages(domain, address, size, 0);
 }
 
 /* Flush the whole IO/TLB for a given protection domain */
-static void iommu_flush_tlb(struct protection_domain *domain)
+static void domain_flush_tlb(struct protection_domain *domain)
 {
-        __iommu_flush_pages(domain, 0, CMD_INV_IOMMU_ALL_PAGES_ADDRESS, 0);
+        __domain_flush_pages(domain, 0, CMD_INV_IOMMU_ALL_PAGES_ADDRESS, 0);
 }
 
 /* Flush the whole IO/TLB for a given protection domain - including PDE */
-static void iommu_flush_tlb_pde(struct protection_domain *domain)
+static void domain_flush_tlb_pde(struct protection_domain *domain)
 {
-        __iommu_flush_pages(domain, 0, CMD_INV_IOMMU_ALL_PAGES_ADDRESS, 1);
-}
-
-
-/*
- * This function flushes the DTEs for all devices in domain
- */
-static void iommu_flush_domain_devices(struct protection_domain *domain)
-{
-        struct iommu_dev_data *dev_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(&domain->lock, flags);
-
-        list_for_each_entry(dev_data, &domain->dev_list, list)
-                iommu_flush_device(dev_data->dev);
-
-        spin_unlock_irqrestore(&domain->lock, flags);
+        __domain_flush_pages(domain, 0, CMD_INV_IOMMU_ALL_PAGES_ADDRESS, 1);
 }
 
-static void iommu_flush_all_domain_devices(void)
+static void domain_flush_complete(struct protection_domain *domain)
 {
-        struct protection_domain *domain;
-        unsigned long flags;
+        int i;
 
-        spin_lock_irqsave(&amd_iommu_pd_lock, flags);
+        for (i = 0; i < amd_iommus_present; ++i) {
+                if (!domain->dev_iommu[i])
+                        continue;
 
-        list_for_each_entry(domain, &amd_iommu_pd_list, list) {
-                iommu_flush_domain_devices(domain);
-                iommu_flush_complete(domain);
+                /*
+                 * Devices of this domain are behind this IOMMU
+                 * We need to wait for completion of all commands.
+                 */
+                iommu_completion_wait(amd_iommus[i]);
         }
-
-        spin_unlock_irqrestore(&amd_iommu_pd_lock, flags);
 }
 
-void amd_iommu_flush_all_devices(void)
-{
-        iommu_flush_all_domain_devices();
-}
 
 /*
- * This function uses heavy locking and may disable irqs for some time. But
- * this is no issue because it is only called during resume.
+ * This function flushes the DTEs for all devices in domain
  */
-void amd_iommu_flush_all_domains(void)
+static void domain_flush_devices(struct protection_domain *domain)
 {
-        struct protection_domain *domain;
+        struct iommu_dev_data *dev_data;
         unsigned long flags;
 
-        spin_lock_irqsave(&amd_iommu_pd_lock, flags);
-
-        list_for_each_entry(domain, &amd_iommu_pd_list, list) {
-                spin_lock(&domain->lock);
-                iommu_flush_tlb_pde(domain);
-                iommu_flush_complete(domain);
-                spin_unlock(&domain->lock);
-        }
-
-        spin_unlock_irqrestore(&amd_iommu_pd_lock, flags);
-}
-
-static void reset_iommu_command_buffer(struct amd_iommu *iommu)
-{
-        pr_err("AMD-Vi: Resetting IOMMU command buffer\n");
-
-        if (iommu->reset_in_progress)
-                panic("AMD-Vi: ILLEGAL_COMMAND_ERROR while resetting command buffer\n");
+        spin_lock_irqsave(&domain->lock, flags);
 
-        amd_iommu_reset_cmd_buffer(iommu);
-        amd_iommu_flush_all_devices();
-        amd_iommu_flush_all_domains();
+        list_for_each_entry(dev_data, &domain->dev_list, list)
+                device_flush_dte(dev_data->dev);
 
-        iommu->reset_in_progress = false;
+        spin_unlock_irqrestore(&domain->lock, flags);
 }
 
 /****************************************************************************
@@ -1410,17 +1477,22 @@ static bool dma_ops_domain(struct protection_domain *domain)
         return domain->flags & PD_DMA_OPS_MASK;
 }
 
-static void set_dte_entry(u16 devid, struct protection_domain *domain)
+static void set_dte_entry(u16 devid, struct protection_domain *domain, bool ats)
 {
         u64 pte_root = virt_to_phys(domain->pt_root);
+        u32 flags = 0;
 
         pte_root |= (domain->mode & DEV_ENTRY_MODE_MASK)
                     << DEV_ENTRY_MODE_SHIFT;
         pte_root |= IOMMU_PTE_IR | IOMMU_PTE_IW | IOMMU_PTE_P | IOMMU_PTE_TV;
 
-        amd_iommu_dev_table[devid].data[2] = domain->id;
-        amd_iommu_dev_table[devid].data[1] = upper_32_bits(pte_root);
-        amd_iommu_dev_table[devid].data[0] = lower_32_bits(pte_root);
+        if (ats)
+                flags |= DTE_FLAG_IOTLB;
+
+        amd_iommu_dev_table[devid].data[3] |= flags;
+        amd_iommu_dev_table[devid].data[2]  = domain->id;
+        amd_iommu_dev_table[devid].data[1]  = upper_32_bits(pte_root);
+        amd_iommu_dev_table[devid].data[0]  = lower_32_bits(pte_root);
 }
 
 static void clear_dte_entry(u16 devid)
@@ -1437,23 +1509,29 @@ static void do_attach(struct device *dev, struct protection_domain *domain)
 {
         struct iommu_dev_data *dev_data;
         struct amd_iommu *iommu;
+        struct pci_dev *pdev;
+        bool ats = false;
         u16 devid;
 
         devid    = get_device_id(dev);
         iommu    = amd_iommu_rlookup_table[devid];
         dev_data = get_dev_data(dev);
+        pdev     = to_pci_dev(dev);
+
+        if (amd_iommu_iotlb_sup)
+                ats = pci_ats_enabled(pdev);
 
         /* Update data structures */
         dev_data->domain = domain;
         list_add(&dev_data->list, &domain->dev_list);
-        set_dte_entry(devid, domain);
+        set_dte_entry(devid, domain, ats);
 
         /* Do reference counting */
         domain->dev_iommu[iommu->index] += 1;
         domain->dev_cnt                 += 1;
 
         /* Flush the DTE entry */
-        iommu_flush_device(dev);
+        device_flush_dte(dev);
 }
 
 static void do_detach(struct device *dev)
@@ -1476,7 +1554,7 @@ static void do_detach(struct device *dev)
         clear_dte_entry(devid);
 
         /* Flush the DTE entry */
-        iommu_flush_device(dev);
+        device_flush_dte(dev);
 }
 
 /*
@@ -1539,9 +1617,13 @@ out_unlock:
 static int attach_device(struct device *dev,
                          struct protection_domain *domain)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         unsigned long flags;
         int ret;
 
+        if (amd_iommu_iotlb_sup)
+                pci_enable_ats(pdev, PAGE_SHIFT);
+
         write_lock_irqsave(&amd_iommu_devtable_lock, flags);
         ret = __attach_device(dev, domain);
         write_unlock_irqrestore(&amd_iommu_devtable_lock, flags);
@@ -1551,7 +1633,7 @@ static int attach_device(struct device *dev,
          * left the caches in the IOMMU dirty. So we have to flush
          * here to evict all dirty stuff.
          */
-        iommu_flush_tlb_pde(domain);
+        domain_flush_tlb_pde(domain);
 
         return ret;
 }
@@ -1598,12 +1680,16 @@ static void __detach_device(struct device *dev)
  */
 static void detach_device(struct device *dev)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
         unsigned long flags;
 
         /* lock device table */
         write_lock_irqsave(&amd_iommu_devtable_lock, flags);
         __detach_device(dev);
         write_unlock_irqrestore(&amd_iommu_devtable_lock, flags);
+
+        if (amd_iommu_iotlb_sup && pci_ats_enabled(pdev))
+                pci_disable_ats(pdev);
 }
 
 /*
@@ -1615,10 +1701,9 @@ static struct protection_domain *domain_for_device(struct device *dev)
         struct protection_domain *dom;
         struct iommu_dev_data *dev_data, *alias_data;
         unsigned long flags;
-        u16 devid, alias;
+        u16 devid;
 
         devid      = get_device_id(dev);
-        alias      = amd_iommu_alias_table[devid];
         dev_data   = get_dev_data(dev);
         alias_data = get_dev_data(dev_data->alias);
         if (!alias_data)
@@ -1692,7 +1777,7 @@ static int device_change_notifier(struct notifier_block *nb,
                 goto out;
         }
 
-        iommu_flush_device(dev);
+        device_flush_dte(dev);
         iommu_completion_wait(iommu);
 
 out:
@@ -1753,8 +1838,9 @@ static void update_device_table(struct protection_domain *domain)
         struct iommu_dev_data *dev_data;
 
         list_for_each_entry(dev_data, &domain->dev_list, list) {
+                struct pci_dev *pdev = to_pci_dev(dev_data->dev);
                 u16 devid = get_device_id(dev_data->dev);
-                set_dte_entry(devid, domain);
+                set_dte_entry(devid, domain, pci_ats_enabled(pdev));
         }
 }
 
@@ -1764,8 +1850,9 @@ static void update_domain(struct protection_domain *domain)
                 return;
 
         update_device_table(domain);
-        iommu_flush_domain_devices(domain);
-        iommu_flush_tlb_pde(domain);
+
+        domain_flush_devices(domain);
+        domain_flush_tlb_pde(domain);
 
         domain->updated = false;
 }
@@ -1924,10 +2011,10 @@ retry:
         ADD_STATS_COUNTER(alloced_io_mem, size);
 
         if (unlikely(dma_dom->need_flush && !amd_iommu_unmap_flush)) {
-                iommu_flush_tlb(&dma_dom->domain);
+                domain_flush_tlb(&dma_dom->domain);
                 dma_dom->need_flush = false;
         } else if (unlikely(amd_iommu_np_cache))
-                iommu_flush_pages(&dma_dom->domain, address, size);
+                domain_flush_pages(&dma_dom->domain, address, size);
 
 out:
         return address;
@@ -1976,7 +2063,7 @@ static void __unmap_single(struct dma_ops_domain *dma_dom,
         dma_ops_free_addresses(dma_dom, dma_addr, pages);
 
         if (amd_iommu_unmap_flush || dma_dom->need_flush) {
-                iommu_flush_pages(&dma_dom->domain, flush_addr, size);
+                domain_flush_pages(&dma_dom->domain, flush_addr, size);
                 dma_dom->need_flush = false;
         }
 }
@@ -2012,7 +2099,7 @@ static dma_addr_t map_page(struct device *dev, struct page *page,
         if (addr == DMA_ERROR_CODE)
                 goto out;
 
-        iommu_flush_complete(domain);
+        domain_flush_complete(domain);
 
 out:
         spin_unlock_irqrestore(&domain->lock, flags);
@@ -2039,7 +2126,7 @@ static void unmap_page(struct device *dev, dma_addr_t dma_addr, size_t size,
 
         __unmap_single(domain->priv, dma_addr, size, dir);
 
-        iommu_flush_complete(domain);
+        domain_flush_complete(domain);
 
         spin_unlock_irqrestore(&domain->lock, flags);
 }
@@ -2104,7 +2191,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
                         goto unmap;
         }
 
-        iommu_flush_complete(domain);
+        domain_flush_complete(domain);
 
 out:
         spin_unlock_irqrestore(&domain->lock, flags);
@@ -2150,7 +2237,7 @@ static void unmap_sg(struct device *dev, struct scatterlist *sglist,
                 s->dma_address = s->dma_length = 0;
         }
 
-        iommu_flush_complete(domain);
+        domain_flush_complete(domain);
 
         spin_unlock_irqrestore(&domain->lock, flags);
 }
@@ -2200,7 +2287,7 @@ static void *alloc_coherent(struct device *dev, size_t size,
                 goto out_free;
         }
 
-        iommu_flush_complete(domain);
+        domain_flush_complete(domain);
 
         spin_unlock_irqrestore(&domain->lock, flags);
 
@@ -2232,7 +2319,7 @@ static void free_coherent(struct device *dev, size_t size,
 
         __unmap_single(domain->priv, dma_addr, size, DMA_BIDIRECTIONAL);
 
-        iommu_flush_complete(domain);
+        domain_flush_complete(domain);
 
         spin_unlock_irqrestore(&domain->lock, flags);
 
@@ -2476,7 +2563,7 @@ static void amd_iommu_detach_device(struct iommu_domain *dom,
         if (!iommu)
                 return;
 
-        iommu_flush_device(dev);
+        device_flush_dte(dev);
         iommu_completion_wait(iommu);
 }
 
@@ -2542,7 +2629,7 @@ static int amd_iommu_unmap(struct iommu_domain *dom, unsigned long iova,
         unmap_size = iommu_unmap_page(domain, iova, page_size);
         mutex_unlock(&domain->api_lock);
 
-        iommu_flush_tlb_pde(domain);
+        domain_flush_tlb_pde(domain);
 
         return get_order(unmap_size);
 }
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index 246d727b65b7..9179c21120a8 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -137,6 +137,7 @@ int amd_iommus_present;
 
 /* IOMMUs have a non-present cache? */
 bool amd_iommu_np_cache __read_mostly;
+bool amd_iommu_iotlb_sup __read_mostly = true;
 
 /*
  * The ACPI table parsing functions set this variable on an error
@@ -180,6 +181,12 @@ static u32 dev_table_size;	/* size of the device table */
 static u32 alias_table_size;    /* size of the alias table */
 static u32 rlookup_table_size;  /* size if the rlookup table */
 
+/*
+ * This function flushes all internal caches of
+ * the IOMMU used by this driver.
+ */
+extern void iommu_flush_all_caches(struct amd_iommu *iommu);
+
 static inline void update_last_devid(u16 devid)
 {
         if (devid > amd_iommu_last_bdf)
@@ -293,9 +300,23 @@ static void iommu_feature_disable(struct amd_iommu *iommu, u8 bit)
 /* Function to enable the hardware */
 static void iommu_enable(struct amd_iommu *iommu)
 {
-        printk(KERN_INFO "AMD-Vi: Enabling IOMMU at %s cap 0x%hx\n",
+        static const char * const feat_str[] = {
+                "PreF", "PPR", "X2APIC", "NX", "GT", "[5]",
+                "IA", "GA", "HE", "PC", NULL
+        };
+        int i;
+
+        printk(KERN_INFO "AMD-Vi: Enabling IOMMU at %s cap 0x%hx",
                dev_name(&iommu->dev->dev), iommu->cap_ptr);
 
+        if (iommu->cap & (1 << IOMMU_CAP_EFR)) {
+                printk(KERN_CONT " extended features: ");
+                for (i = 0; feat_str[i]; ++i)
+                        if (iommu_feature(iommu, (1ULL << i)))
+                                printk(KERN_CONT " %s", feat_str[i]);
+        }
+        printk(KERN_CONT "\n");
+
         iommu_feature_enable(iommu, CONTROL_IOMMU_EN);
 }
 
@@ -651,7 +672,7 @@ static void __init set_device_exclusion_range(u16 devid, struct ivmd_header *m)
 static void __init init_iommu_from_pci(struct amd_iommu *iommu)
 {
         int cap_ptr = iommu->cap_ptr;
-        u32 range, misc;
+        u32 range, misc, low, high;
         int i, j;
 
         pci_read_config_dword(iommu->dev, cap_ptr + MMIO_CAP_HDR_OFFSET,
@@ -667,6 +688,15 @@ static void __init init_iommu_from_pci(struct amd_iommu *iommu)
                                         MMIO_GET_LD(range));
         iommu->evt_msi_num = MMIO_MSI_NUM(misc);
 
+        if (!(iommu->cap & (1 << IOMMU_CAP_IOTLB)))
+                amd_iommu_iotlb_sup = false;
+
+        /* read extended feature bits */
+        low  = readl(iommu->mmio_base + MMIO_EXT_FEATURES);
+        high = readl(iommu->mmio_base + MMIO_EXT_FEATURES + 4);
+
+        iommu->features = ((u64)high << 32) | low;
+
         if (!is_rd890_iommu(iommu->dev))
                 return;
 
@@ -1004,10 +1034,11 @@ static int iommu_setup_msi(struct amd_iommu *iommu)
         if (pci_enable_msi(iommu->dev))
                 return 1;
 
-        r = request_irq(iommu->dev->irq, amd_iommu_int_handler,
-                        IRQF_SAMPLE_RANDOM,
-                        "AMD-Vi",
-                        NULL);
+        r = request_threaded_irq(iommu->dev->irq,
+                                 amd_iommu_int_handler,
+                                 amd_iommu_int_thread,
+                                 0, "AMD-Vi",
+                                 iommu->dev);
 
         if (r) {
                 pci_disable_msi(iommu->dev);
@@ -1244,6 +1275,7 @@ static void enable_iommus(void)
                 iommu_set_exclusion_range(iommu);
                 iommu_init_msi(iommu);
                 iommu_enable(iommu);
+                iommu_flush_all_caches(iommu);
         }
 }
 
@@ -1274,8 +1306,8 @@ static void amd_iommu_resume(void)
          * we have to flush after the IOMMUs are enabled because a
          * disabled IOMMU will never execute the commands we send
          */
-        amd_iommu_flush_all_devices();
-        amd_iommu_flush_all_domains();
+        for_each_iommu(iommu)
+                iommu_flush_all_caches(iommu);
 }
 
 static int amd_iommu_suspend(void)
diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index cd1ffed4ee22..289e92862fd9 100644
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -177,7 +177,6 @@ static struct clocksource clocksource_apbt = {
         .rating         = APBT_CLOCKSOURCE_RATING,
         .read           = apbt_read_clocksource,
         .mask           = APBT_MASK,
-        .shift          = APBT_SHIFT,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
         .resume         = apbt_restart_clocksource,
 };
@@ -543,14 +542,7 @@ static int apbt_clocksource_register(void)
         if (t1 == apbt_read_clocksource(&clocksource_apbt))
                 panic("APBT counter not counting. APBT disabled\n");
 
-        /*
-         * initialize and register APBT clocksource
-         * convert that to ns/clock cycle
-         * mult = (ns/c) * 2^APBT_SHIFT
-         */
-        clocksource_apbt.mult = div_sc(MSEC_PER_SEC,
-                                       (unsigned long) apbt_freq, APBT_SHIFT);
-        clocksource_register(&clocksource_apbt);
+        clocksource_register_khz(&clocksource_apbt, (u32)apbt_freq*1000);
 
         return 0;
 }
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index 73fb469908c6..3d2661ca6542 100644
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -30,6 +30,22 @@
 #include <asm/amd_nb.h>
 #include <asm/x86_init.h>
 
+/*
+ * Using 512M as goal, in case kexec will load kernel_big
+ * that will do the on-position decompress, and could overlap with
+ * with the gart aperture that is used.
+ * Sequence:
+ * kernel_small
+ * ==> kexec (with kdump trigger path or gart still enabled)
+ * ==> kernel_small (gart area become e820_reserved)
+ * ==> kexec (with kdump trigger path or gart still enabled)
+ * ==> kerne_big (uncompressed size will be big than 64M or 128M)
+ * So don't use 512M below as gart iommu, leave the space for kernel
+ * code for safe.
+ */
+#define GART_MIN_ADDR   (512ULL << 20)
+#define GART_MAX_ADDR   (1ULL   << 32)
+
 int gart_iommu_aperture;
 int gart_iommu_aperture_disabled __initdata;
 int gart_iommu_aperture_allowed __initdata;
@@ -70,21 +86,9 @@ static u32 __init allocate_aperture(void)
          * memory. Unfortunately we cannot move it up because that would
          * make the IOMMU useless.
          */
-        /*
-         * using 512M as goal, in case kexec will load kernel_big
-         * that will do the on position decompress, and  could overlap with
-         * that position with gart that is used.
-         * sequende:
-         * kernel_small
-         * ==> kexec (with kdump trigger path or previous doesn't shutdown gart)
-         * ==> kernel_small(gart area become e820_reserved)
-         * ==> kexec (with kdump trigger path or previous doesn't shutdown gart)
-         * ==> kerne_big (uncompressed size will be big than 64M or 128M)
-         * so don't use 512M below as gart iommu, leave the space for kernel
-         * code for safe
-         */
-        addr = memblock_find_in_range(0, 1ULL<<32, aper_size, 512ULL<<20);
-        if (addr == MEMBLOCK_ERROR || addr + aper_size > 0xffffffff) {
+        addr = memblock_find_in_range(GART_MIN_ADDR, GART_MAX_ADDR,
+                                      aper_size, aper_size);
+        if (addr == MEMBLOCK_ERROR || addr + aper_size > GART_MAX_ADDR) {
                 printk(KERN_ERR
                         "Cannot allocate aperture memory hole (%lx,%uK)\n",
                                 addr, aper_size>>10);
diff --git a/arch/x86/kernel/apic/Makefile b/arch/x86/kernel/apic/Makefile
index 3966b564ea47..767fd04f2843 100644
--- a/arch/x86/kernel/apic/Makefile
+++ b/arch/x86/kernel/apic/Makefile
@@ -2,20 +2,25 @@
 # Makefile for local APIC drivers and for the IO-APIC code
 #
 
-obj-$(CONFIG_X86_LOCAL_APIC)    += apic.o apic_noop.o probe_$(BITS).o ipi.o
+obj-$(CONFIG_X86_LOCAL_APIC)    += apic.o apic_noop.o ipi.o
 obj-y                           += hw_nmi.o
 
 obj-$(CONFIG_X86_IO_APIC)       += io_apic.o
 obj-$(CONFIG_SMP)               += ipi.o
 
 ifeq ($(CONFIG_X86_64),y)
-obj-y                           += apic_flat_64.o
-obj-$(CONFIG_X86_X2APIC)        += x2apic_cluster.o
-obj-$(CONFIG_X86_X2APIC)        += x2apic_phys.o
+# APIC probe will depend on the listing order here
 obj-$(CONFIG_X86_UV)            += x2apic_uv_x.o
+obj-$(CONFIG_X86_X2APIC)        += x2apic_phys.o
+obj-$(CONFIG_X86_X2APIC)        += x2apic_cluster.o
+obj-y                           += apic_flat_64.o
 endif
 
-obj-$(CONFIG_X86_BIGSMP)        += bigsmp_32.o
+# APIC probe will depend on the listing order here
 obj-$(CONFIG_X86_NUMAQ)         += numaq_32.o
-obj-$(CONFIG_X86_ES7000)        += es7000_32.o
 obj-$(CONFIG_X86_SUMMIT)        += summit_32.o
+obj-$(CONFIG_X86_BIGSMP)        += bigsmp_32.o
+obj-$(CONFIG_X86_ES7000)        += es7000_32.o
+
+# For 32bit, probe_32 need to be listed last
+obj-$(CONFIG_X86_LOCAL_APIC)    += probe_$(BITS).o
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index fabf01eff771..b961af86bfea 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -505,7 +505,7 @@ static void __cpuinit setup_APIC_timer(void)
 {
         struct clock_event_device *levt = &__get_cpu_var(lapic_events);
 
-        if (cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_ARAT)) {
+        if (this_cpu_has(X86_FEATURE_ARAT)) {
                 lapic_clockevent.features &= ~CLOCK_EVT_FEAT_C3STOP;
                 /* Make LAPIC timer preferrable over percpu HPET */
                 lapic_clockevent.rating = 150;
@@ -1237,6 +1237,17 @@ void __cpuinit setup_local_APIC(void)
         /* always use the value from LDR */
         early_per_cpu(x86_cpu_to_logical_apicid, cpu) =
                 logical_smp_processor_id();
+
+        /*
+         * Some NUMA implementations (NUMAQ) don't initialize apicid to
+         * node mapping during NUMA init.  Now that logical apicid is
+         * guaranteed to be known, give it another chance.  This is already
+         * a bit too late - percpu allocation has already happened without
+         * proper NUMA affinity.
+         */
+        if (apic->x86_32_numa_cpu_node)
+                set_apicid_to_node(early_per_cpu(x86_cpu_to_apicid, cpu),
+                                   apic->x86_32_numa_cpu_node(cpu));
 #endif
 
         /*
@@ -1450,7 +1461,6 @@ int __init enable_IR(void)
 void __init enable_IR_x2apic(void)
 {
         unsigned long flags;
-        struct IO_APIC_route_entry **ioapic_entries;
         int ret, x2apic_enabled = 0;
         int dmar_table_init_ret;
 
@@ -1458,13 +1468,7 @@ void __init enable_IR_x2apic(void)
         if (dmar_table_init_ret && !x2apic_supported())
                 return;
 
-        ioapic_entries = alloc_ioapic_entries();
-        if (!ioapic_entries) {
-                pr_err("Allocate ioapic_entries failed\n");
-                goto out;
-        }
-
-        ret = save_IO_APIC_setup(ioapic_entries);
+        ret = save_ioapic_entries();
         if (ret) {
                 pr_info("Saving IO-APIC state failed: %d\n", ret);
                 goto out;
@@ -1472,7 +1476,7 @@ void __init enable_IR_x2apic(void)
 
         local_irq_save(flags);
         legacy_pic->mask_all();
-        mask_IO_APIC_setup(ioapic_entries);
+        mask_ioapic_entries();
 
         if (dmar_table_init_ret)
                 ret = 0;
@@ -1503,14 +1507,11 @@ void __init enable_IR_x2apic(void)
 
 nox2apic:
         if (!ret) /* IR enabling failed */
-                restore_IO_APIC_setup(ioapic_entries);
+                restore_ioapic_entries();
         legacy_pic->restore_mask();
         local_irq_restore(flags);
 
 out:
-        if (ioapic_entries)
-                free_ioapic_entries(ioapic_entries);
-
         if (x2apic_enabled)
                 return;
 
@@ -1812,30 +1813,41 @@ void smp_spurious_interrupt(struct pt_regs *regs)
  */
 void smp_error_interrupt(struct pt_regs *regs)
 {
-        u32 v, v1;
+        u32 v0, v1;
+        u32 i = 0;
+        static const char * const error_interrupt_reason[] = {
+                "Send CS error",                /* APIC Error Bit 0 */
+                "Receive CS error",             /* APIC Error Bit 1 */
+                "Send accept error",            /* APIC Error Bit 2 */
+                "Receive accept error",         /* APIC Error Bit 3 */
+                "Redirectable IPI",             /* APIC Error Bit 4 */
+                "Send illegal vector",          /* APIC Error Bit 5 */
+                "Received illegal vector",      /* APIC Error Bit 6 */
+                "Illegal register address",     /* APIC Error Bit 7 */
+        };
 
         exit_idle();
         irq_enter();
         /* First tickle the hardware, only then report what went on. -- REW */
-        v = apic_read(APIC_ESR);
+        v0 = apic_read(APIC_ESR);
         apic_write(APIC_ESR, 0);
         v1 = apic_read(APIC_ESR);
         ack_APIC_irq();
         atomic_inc(&irq_err_count);
 
-        /*
-         * Here is what the APIC error bits mean:
-         * 0: Send CS error
-         * 1: Receive CS error
-         * 2: Send accept error
-         * 3: Receive accept error
-         * 4: Reserved
-         * 5: Send illegal vector
-         * 6: Received illegal vector
-         * 7: Illegal register address
-         */
-        pr_debug("APIC error on CPU%d: %02x(%02x)\n",
-                smp_processor_id(), v , v1);
+        apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
+                    smp_processor_id(), v0 , v1);
+
+        v1 = v1 & 0xff;
+        while (v1) {
+                if (v1 & 0x1)
+                        apic_printk(APIC_DEBUG, KERN_CONT " : %s", error_interrupt_reason[i]);
+                i++;
+                v1 >>= 1;
+        };
+
+        apic_printk(APIC_DEBUG, KERN_CONT "\n");
+
         irq_exit();
 }
 
@@ -2003,21 +2015,6 @@ void default_init_apic_ldr(void)
         apic_write(APIC_LDR, val);
 }
 
-#ifdef CONFIG_X86_32
-int default_x86_32_numa_cpu_node(int cpu)
-{
-#ifdef CONFIG_NUMA
-        int apicid = early_per_cpu(x86_cpu_to_apicid, cpu);
-
-        if (apicid != BAD_APICID)
-                return __apicid_to_node[apicid];
-        return NUMA_NO_NODE;
-#else
-        return 0;
-#endif
-}
-#endif
-
 /*
  * Power management
  */
@@ -2088,28 +2085,20 @@ static void lapic_resume(void)
 {
         unsigned int l, h;
         unsigned long flags;
-        int maxlvt, ret;
-        struct IO_APIC_route_entry **ioapic_entries = NULL;
+        int maxlvt;
 
         if (!apic_pm_state.active)
                 return;
 
         local_irq_save(flags);
         if (intr_remapping_enabled) {
-                ioapic_entries = alloc_ioapic_entries();
-                if (!ioapic_entries) {
-                        WARN(1, "Alloc ioapic_entries in lapic resume failed.");
-                        goto restore;
-                }
-
-                ret = save_IO_APIC_setup(ioapic_entries);
-                if (ret) {
-                        WARN(1, "Saving IO-APIC state failed: %d\n", ret);
-                        free_ioapic_entries(ioapic_entries);
-                        goto restore;
-                }
-
-                mask_IO_APIC_setup(ioapic_entries);
+                /*
+                 * IO-APIC and PIC have their own resume routines.
+                 * We just mask them here to make sure the interrupt
+                 * subsystem is completely quiet while we enable x2apic
+                 * and interrupt-remapping.
+                 */
+                mask_ioapic_entries();
                 legacy_pic->mask_all();
         }
 
@@ -2152,13 +2141,9 @@ static void lapic_resume(void)
         apic_write(APIC_ESR, 0);
         apic_read(APIC_ESR);
 
-        if (intr_remapping_enabled) {
+        if (intr_remapping_enabled)
                 reenable_intr_remapping(x2apic_mode);
-                legacy_pic->restore_mask();
-                restore_IO_APIC_setup(ioapic_entries);
-                free_ioapic_entries(ioapic_entries);
-        }
-restore:
+
         local_irq_restore(flags);
 }
 
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 5652d31fe108..f7a41e4cae47 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -16,6 +16,7 @@
 #include <linux/ctype.h>
 #include <linux/init.h>
 #include <linux/hardirq.h>
+#include <linux/module.h>
 #include <asm/smp.h>
 #include <asm/apic.h>
 #include <asm/ipi.h>
@@ -24,6 +25,12 @@
 #include <acpi/acpi_bus.h>
 #endif
 
+static struct apic apic_physflat;
+static struct apic apic_flat;
+
+struct apic __read_mostly *apic = &apic_flat;
+EXPORT_SYMBOL_GPL(apic);
+
 static int flat_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
         return 1;
@@ -164,7 +171,7 @@ static int flat_phys_pkg_id(int initial_apic_id, int index_msb)
         return initial_apic_id >> index_msb;
 }
 
-struct apic apic_flat =  {
+static struct apic apic_flat =  {
         .name                           = "flat",
         .probe                          = NULL,
         .acpi_madt_oem_check            = flat_acpi_madt_oem_check,
@@ -312,10 +319,18 @@ physflat_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
         return per_cpu(x86_cpu_to_apicid, cpu);
 }
 
-struct apic apic_physflat =  {
+static int physflat_probe(void)
+{
+        if (apic == &apic_physflat || num_possible_cpus() > 8)
+                return 1;
+
+        return 0;
+}
+
+static struct apic apic_physflat =  {
 
         .name                           = "physical flat",
-        .probe                          = NULL,
+        .probe                          = physflat_probe,
         .acpi_madt_oem_check            = physflat_acpi_madt_oem_check,
         .apic_id_registered             = flat_apic_id_registered,
 
@@ -369,3 +384,8 @@ struct apic apic_physflat =  {
         .wait_icr_idle                  = native_apic_wait_icr_idle,
         .safe_wait_icr_idle             = native_safe_apic_wait_icr_idle,
 };
+
+/*
+ * We need to check for physflat first, so this order is important.
+ */
+apic_drivers(apic_physflat, apic_flat);
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index f1baa2dc087a..775b82bc655c 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -119,14 +119,6 @@ static void noop_apic_write(u32 reg, u32 v)
         WARN_ON_ONCE(cpu_has_apic && !disable_apic);
 }
 
-#ifdef CONFIG_X86_32
-static int noop_x86_32_numa_cpu_node(int cpu)
-{
-        /* we're always on node 0 */
-        return 0;
-}
-#endif
-
 struct apic apic_noop = {
         .name                           = "noop",
         .probe                          = noop_probe,
@@ -195,6 +187,5 @@ struct apic apic_noop = {
 
 #ifdef CONFIG_X86_32
         .x86_32_early_logical_apicid    = noop_x86_32_early_logical_apicid,
-        .x86_32_numa_cpu_node           = noop_x86_32_numa_cpu_node,
 #endif
 };
diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index 541a2e431659..efd737e827f4 100644
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -193,7 +193,7 @@ static int probe_bigsmp(void)
         return dmi_bigsmp;
 }
 
-struct apic apic_bigsmp = {
+static struct apic apic_bigsmp = {
 
         .name                           = "bigsmp",
         .probe                          = probe_bigsmp,
@@ -253,5 +253,14 @@ struct apic apic_bigsmp = {
         .safe_wait_icr_idle             = native_safe_apic_wait_icr_idle,
 
         .x86_32_early_logical_apicid    = bigsmp_early_logical_apicid,
-        .x86_32_numa_cpu_node           = default_x86_32_numa_cpu_node,
 };
+
+struct apic * __init generic_bigsmp_probe(void)
+{
+        if (probe_bigsmp())
+                return &apic_bigsmp;
+
+        return NULL;
+}
+
+apic_driver(apic_bigsmp);
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 3e9de4854c5b..9536b3fe43f8 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -510,11 +510,6 @@ static void es7000_setup_apic_routing(void)
                 nr_ioapics, cpumask_bits(es7000_target_cpus())[0]);
 }
 
-static int es7000_numa_cpu_node(int cpu)
-{
-        return 0;
-}
-
 static int es7000_cpu_present_to_apicid(int mps_cpu)
 {
         if (!mps_cpu)
@@ -625,7 +620,7 @@ static int es7000_mps_oem_check_cluster(struct mpc_table *mpc, char *oem,
 }
 
 /* We've been warned by a false positive warning.Use __refdata to keep calm. */
-struct apic __refdata apic_es7000_cluster = {
+static struct apic __refdata apic_es7000_cluster = {
 
         .name                           = "es7000",
         .probe                          = probe_es7000,
@@ -688,10 +683,9 @@ struct apic __refdata apic_es7000_cluster = {
         .safe_wait_icr_idle             = native_safe_apic_wait_icr_idle,
 
         .x86_32_early_logical_apicid    = es7000_early_logical_apicid,
-        .x86_32_numa_cpu_node           = es7000_numa_cpu_node,
 };
 
-struct apic __refdata apic_es7000 = {
+static struct apic __refdata apic_es7000 = {
 
         .name                           = "es7000",
         .probe                          = probe_es7000,
@@ -752,5 +746,10 @@ struct apic __refdata apic_es7000 = {
         .safe_wait_icr_idle             = native_safe_apic_wait_icr_idle,
 
         .x86_32_early_logical_apicid    = es7000_early_logical_apicid,
-        .x86_32_numa_cpu_node           = es7000_numa_cpu_node,
 };
+
+/*
+ * Need to check for es7000 followed by es7000_cluster, so this order
+ * in apic_drivers is important.
+ */
+apic_drivers(apic_es7000, apic_es7000_cluster);
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index 5260fe91bcb6..d5e57db0f7be 100644
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -19,9 +19,9 @@
 #include <linux/delay.h>
 
 #ifdef CONFIG_HARDLOCKUP_DETECTOR
-u64 hw_nmi_get_sample_period(void)
+u64 hw_nmi_get_sample_period(int watchdog_thresh)
 {
-        return (u64)(cpu_khz) * 1000 * 60;
+        return (u64)(cpu_khz) * 1000 * watchdog_thresh;
 }
 #endif
 
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 45fd33d1fd3a..e5293394b548 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -76,17 +76,40 @@ int sis_apic_bug = -1;
 static DEFINE_RAW_SPINLOCK(ioapic_lock);
 static DEFINE_RAW_SPINLOCK(vector_lock);
 
-/*
- * # of IRQ routing registers
- */
-int nr_ioapic_registers[MAX_IO_APICS];
+static struct ioapic {
+        /*
+         * # of IRQ routing registers
+         */
+        int nr_registers;
+        /*
+         * Saved state during suspend/resume, or while enabling intr-remap.
+         */
+        struct IO_APIC_route_entry *saved_registers;
+        /* I/O APIC config */
+        struct mpc_ioapic mp_config;
+        /* IO APIC gsi routing info */
+        struct mp_ioapic_gsi  gsi_config;
+        DECLARE_BITMAP(pin_programmed, MP_MAX_IOAPIC_PIN + 1);
+} ioapics[MAX_IO_APICS];
 
-/* I/O APIC entries */
-struct mpc_ioapic mp_ioapics[MAX_IO_APICS];
-int nr_ioapics;
+#define mpc_ioapic_ver(id)              ioapics[id].mp_config.apicver
+
+int mpc_ioapic_id(int id)
+{
+        return ioapics[id].mp_config.apicid;
+}
 
-/* IO APIC gsi routing info */
-struct mp_ioapic_gsi  mp_gsi_routing[MAX_IO_APICS];
+unsigned int mpc_ioapic_addr(int id)
+{
+        return ioapics[id].mp_config.apicaddr;
+}
+
+struct mp_ioapic_gsi *mp_ioapic_gsi_routing(int id)
+{
+        return &ioapics[id].gsi_config;
+}
+
+int nr_ioapics;
 
 /* The one past the highest gsi number used */
 u32 gsi_top;
@@ -179,6 +202,14 @@ int __init arch_early_irq_init(void)
                 io_apic_irqs = ~0UL;
         }
 
+        for (i = 0; i < nr_ioapics; i++) {
+                ioapics[i].saved_registers =
+                        kzalloc(sizeof(struct IO_APIC_route_entry) *
+                                ioapics[i].nr_registers, GFP_KERNEL);
+                if (!ioapics[i].saved_registers)
+                        pr_err("IOAPIC %d: suspend/resume impossible!\n", i);
+        }
+
         cfg = irq_cfgx;
         count = ARRAY_SIZE(irq_cfgx);
         node = cpu_to_node(0);
@@ -297,7 +328,7 @@ struct io_apic {
 static __attribute_const__ struct io_apic __iomem *io_apic_base(int idx)
 {
         return (void __iomem *) __fix_to_virt(FIX_IO_APIC_BASE_0 + idx)
-                + (mp_ioapics[idx].apicaddr & ~PAGE_MASK);
+                + (mpc_ioapic_addr(idx) & ~PAGE_MASK);
 }
 
 static inline void io_apic_eoi(unsigned int apic, unsigned int vector)
@@ -573,7 +604,7 @@ static void clear_IO_APIC (void)
         int apic, pin;
 
         for (apic = 0; apic < nr_ioapics; apic++)
-                for (pin = 0; pin < nr_ioapic_registers[apic]; pin++)
+                for (pin = 0; pin < ioapics[apic].nr_registers; pin++)
                         clear_IO_APIC_pin(apic, pin);
 }
 
@@ -615,74 +646,43 @@ static int __init ioapic_pirq_setup(char *str)
 __setup("pirq=", ioapic_pirq_setup);
 #endif /* CONFIG_X86_32 */
 
-struct IO_APIC_route_entry **alloc_ioapic_entries(void)
-{
-        int apic;
-        struct IO_APIC_route_entry **ioapic_entries;
-
-        ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
-                                GFP_KERNEL);
-        if (!ioapic_entries)
-                return 0;
-
-        for (apic = 0; apic < nr_ioapics; apic++) {
-                ioapic_entries[apic] =
-                        kzalloc(sizeof(struct IO_APIC_route_entry) *
-                                nr_ioapic_registers[apic], GFP_KERNEL);
-                if (!ioapic_entries[apic])
-                        goto nomem;
-        }
-
-        return ioapic_entries;
-
-nomem:
-        while (--apic >= 0)
-                kfree(ioapic_entries[apic]);
-        kfree(ioapic_entries);
-
-        return 0;
-}
-
 /*
  * Saves all the IO-APIC RTE's
  */
-int save_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries)
+int save_ioapic_entries(void)
 {
         int apic, pin;
-
-        if (!ioapic_entries)
-                return -ENOMEM;
+        int err = 0;
 
         for (apic = 0; apic < nr_ioapics; apic++) {
-                if (!ioapic_entries[apic])
-                        return -ENOMEM;
+                if (!ioapics[apic].saved_registers) {
+                        err = -ENOMEM;
+                        continue;
+                }
 
-                for (pin = 0; pin < nr_ioapic_registers[apic]; pin++)
-                        ioapic_entries[apic][pin] =
+                for (pin = 0; pin < ioapics[apic].nr_registers; pin++)
+                        ioapics[apic].saved_registers[pin] =
                                 ioapic_read_entry(apic, pin);
         }
 
-        return 0;
+        return err;
 }
 
 /*
  * Mask all IO APIC entries.
  */
-void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries)
+void mask_ioapic_entries(void)
 {
         int apic, pin;
 
-        if (!ioapic_entries)
-                return;
-
         for (apic = 0; apic < nr_ioapics; apic++) {
-                if (!ioapic_entries[apic])
-                        break;
+                if (!ioapics[apic].saved_registers)
+                        continue;
 
-                for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) {
+                for (pin = 0; pin < ioapics[apic].nr_registers; pin++) {
                         struct IO_APIC_route_entry entry;
 
-                        entry = ioapic_entries[apic][pin];
+                        entry = ioapics[apic].saved_registers[pin];
                         if (!entry.mask) {
                                 entry.mask = 1;
                                 ioapic_write_entry(apic, pin, entry);
@@ -692,36 +692,23 @@ void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries)
 }
 
 /*
- * Restore IO APIC entries which was saved in ioapic_entries.
+ * Restore IO APIC entries which was saved in the ioapic structure.
  */
-int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries)
+int restore_ioapic_entries(void)
 {
         int apic, pin;
 
-        if (!ioapic_entries)
-                return -ENOMEM;
-
         for (apic = 0; apic < nr_ioapics; apic++) {
-                if (!ioapic_entries[apic])
-                        return -ENOMEM;
+                if (!ioapics[apic].saved_registers)
+                        continue;
 
-                for (pin = 0; pin < nr_ioapic_registers[apic]; pin++)
+                for (pin = 0; pin < ioapics[apic].nr_registers; pin++)
                         ioapic_write_entry(apic, pin,
-                                        ioapic_entries[apic][pin]);
+                                           ioapics[apic].saved_registers[pin]);
         }
         return 0;
 }
 
-void free_ioapic_entries(struct IO_APIC_route_entry **ioapic_entries)
-{
-        int apic;
-
-        for (apic = 0; apic < nr_ioapics; apic++)
-                kfree(ioapic_entries[apic]);
-
-        kfree(ioapic_entries);
-}
-
 /*
  * Find the IRQ entry number of a certain pin.
  */
@@ -731,7 +718,7 @@ static int find_irq_entry(int apic, int pin, int type)
 
         for (i = 0; i < mp_irq_entries; i++)
                 if (mp_irqs[i].irqtype == type &&
-                    (mp_irqs[i].dstapic == mp_ioapics[apic].apicid ||
+                    (mp_irqs[i].dstapic == mpc_ioapic_id(apic) ||
                      mp_irqs[i].dstapic == MP_APIC_ALL) &&
                     mp_irqs[i].dstirq == pin)
                         return i;
@@ -773,7 +760,7 @@ static int __init find_isa_irq_apic(int irq, int type)
         if (i < mp_irq_entries) {
                 int apic;
                 for(apic = 0; apic < nr_ioapics; apic++) {
-                        if (mp_ioapics[apic].apicid == mp_irqs[i].dstapic)
+                        if (mpc_ioapic_id(apic) == mp_irqs[i].dstapic)
                                 return apic;
                 }
         }
@@ -942,6 +929,7 @@ static int pin_2_irq(int idx, int apic, int pin)
 {
         int irq;
         int bus = mp_irqs[idx].srcbus;
+        struct mp_ioapic_gsi *gsi_cfg = mp_ioapic_gsi_routing(apic);
 
         /*
          * Debugging check, we are in big trouble if this message pops up!
@@ -952,7 +940,7 @@ static int pin_2_irq(int idx, int apic, int pin)
         if (test_bit(bus, mp_bus_not_pci)) {
                 irq = mp_irqs[idx].srcbusirq;
         } else {
-                u32 gsi = mp_gsi_routing[apic].gsi_base + pin;
+                u32 gsi = gsi_cfg->gsi_base + pin;
 
                 if (gsi >= NR_IRQS_LEGACY)
                         irq = gsi;
@@ -1003,7 +991,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
                 int lbus = mp_irqs[i].srcbus;
 
                 for (apic = 0; apic < nr_ioapics; apic++)
-                        if (mp_ioapics[apic].apicid == mp_irqs[i].dstapic ||
+                        if (mpc_ioapic_id(apic) == mp_irqs[i].dstapic ||
                             mp_irqs[i].dstapic == MP_APIC_ALL)
                                 break;
 
@@ -1222,7 +1210,7 @@ static inline int IO_APIC_irq_trigger(int irq)
         int apic, idx, pin;
 
         for (apic = 0; apic < nr_ioapics; apic++) {
-                for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) {
+                for (pin = 0; pin < ioapics[apic].nr_registers; pin++) {
                         idx = find_irq_entry(apic, pin, mp_INT);
                         if ((idx != -1) && (irq == pin_2_irq(idx, apic, pin)))
                                 return irq_trigger(idx);
@@ -1350,14 +1338,14 @@ static void setup_ioapic_irq(int apic_id, int pin, unsigned int irq,
         apic_printk(APIC_VERBOSE,KERN_DEBUG
                     "IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> "
                     "IRQ %d Mode:%i Active:%i)\n",
-                    apic_id, mp_ioapics[apic_id].apicid, pin, cfg->vector,
+                    apic_id, mpc_ioapic_id(apic_id), pin, cfg->vector,
                     irq, trigger, polarity);
 
 
-        if (setup_ioapic_entry(mp_ioapics[apic_id].apicid, irq, &entry,
+        if (setup_ioapic_entry(mpc_ioapic_id(apic_id), irq, &entry,
                                dest, trigger, polarity, cfg->vector, pin)) {
                 printk("Failed to setup ioapic entry for ioapic  %d, pin %d\n",
-                       mp_ioapics[apic_id].apicid, pin);
+                       mpc_ioapic_id(apic_id), pin);
                 __clear_irq_vector(irq, cfg);
                 return;
         }
@@ -1369,17 +1357,13 @@ static void setup_ioapic_irq(int apic_id, int pin, unsigned int irq,
         ioapic_write_entry(apic_id, pin, entry);
 }
 
-static struct {
-        DECLARE_BITMAP(pin_programmed, MP_MAX_IOAPIC_PIN + 1);
-} mp_ioapic_routing[MAX_IO_APICS];
-
 static bool __init io_apic_pin_not_connected(int idx, int apic_id, int pin)
 {
         if (idx != -1)
                 return false;
 
         apic_printk(APIC_VERBOSE, KERN_DEBUG " apic %d pin %d not connected\n",
-                    mp_ioapics[apic_id].apicid, pin);
+                    mpc_ioapic_id(apic_id), pin);
         return true;
 }
 
@@ -1389,7 +1373,7 @@ static void __init __io_apic_setup_irqs(unsigned int apic_id)
         struct io_apic_irq_attr attr;
         unsigned int pin, irq;
 
-        for (pin = 0; pin < nr_ioapic_registers[apic_id]; pin++) {
+        for (pin = 0; pin < ioapics[apic_id].nr_registers; pin++) {
                 idx = find_irq_entry(apic_id, pin, mp_INT);
                 if (io_apic_pin_not_connected(idx, apic_id, pin))
                         continue;
@@ -1511,7 +1495,7 @@ __apicdebuginit(void) print_IO_APIC(void)
         printk(KERN_DEBUG "number of MP IRQ sources: %d.\n", mp_irq_entries);
         for (i = 0; i < nr_ioapics; i++)
                 printk(KERN_DEBUG "number of IO-APIC #%d registers: %d.\n",
-                       mp_ioapics[i].apicid, nr_ioapic_registers[i]);
+                       mpc_ioapic_id(i), ioapics[i].nr_registers);
 
         /*
          * We are a bit conservative about what we expect.  We have to
@@ -1531,7 +1515,7 @@ __apicdebuginit(void) print_IO_APIC(void)
         raw_spin_unlock_irqrestore(&ioapic_lock, flags);
 
         printk("\n");
-        printk(KERN_DEBUG "IO APIC #%d......\n", mp_ioapics[apic].apicid);
+        printk(KERN_DEBUG "IO APIC #%d......\n", mpc_ioapic_id(apic));
         printk(KERN_DEBUG ".... register #00: %08X\n", reg_00.raw);
         printk(KERN_DEBUG ".......    : physical APIC id: %02X\n", reg_00.bits.ID);
         printk(KERN_DEBUG ".......    : Delivery Type: %X\n", reg_00.bits.delivery_type);
@@ -1825,7 +1809,7 @@ void __init enable_IO_APIC(void)
         for(apic = 0; apic < nr_ioapics; apic++) {
                 int pin;
                 /* See if any of the pins is in ExtINT mode */
-                for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) {
+                for (pin = 0; pin < ioapics[apic].nr_registers; pin++) {
                         struct IO_APIC_route_entry entry;
                         entry = ioapic_read_entry(apic, pin);
 
@@ -1949,14 +1933,14 @@ void __init setup_ioapic_ids_from_mpc_nocheck(void)
                 reg_00.raw = io_apic_read(apic_id, 0);
                 raw_spin_unlock_irqrestore(&ioapic_lock, flags);
 
-                old_id = mp_ioapics[apic_id].apicid;
+                old_id = mpc_ioapic_id(apic_id);
 
-                if (mp_ioapics[apic_id].apicid >= get_physical_broadcast()) {
+                if (mpc_ioapic_id(apic_id) >= get_physical_broadcast()) {
                         printk(KERN_ERR "BIOS bug, IO-APIC#%d ID is %d in the MPC table!...\n",
-                                apic_id, mp_ioapics[apic_id].apicid);
+                                apic_id, mpc_ioapic_id(apic_id));
                         printk(KERN_ERR "... fixing up to %d. (tell your hw vendor)\n",
                                 reg_00.bits.ID);
-                        mp_ioapics[apic_id].apicid = reg_00.bits.ID;
+                        ioapics[apic_id].mp_config.apicid = reg_00.bits.ID;
                 }
 
                 /*
@@ -1965,9 +1949,9 @@ void __init setup_ioapic_ids_from_mpc_nocheck(void)
                  * 'stuck on smp_invalidate_needed IPI wait' messages.
                  */
                 if (apic->check_apicid_used(&phys_id_present_map,
-                                        mp_ioapics[apic_id].apicid)) {
+                                            mpc_ioapic_id(apic_id))) {
                         printk(KERN_ERR "BIOS bug, IO-APIC#%d ID %d is already used!...\n",
-                                apic_id, mp_ioapics[apic_id].apicid);
+                                apic_id, mpc_ioapic_id(apic_id));
                         for (i = 0; i < get_physical_broadcast(); i++)
                                 if (!physid_isset(i, phys_id_present_map))
                                         break;
@@ -1976,13 +1960,14 @@ void __init setup_ioapic_ids_from_mpc_nocheck(void)
                         printk(KERN_ERR "... fixing up to %d. (tell your hw vendor)\n",
                                 i);
                         physid_set(i, phys_id_present_map);
-                        mp_ioapics[apic_id].apicid = i;
+                        ioapics[apic_id].mp_config.apicid = i;
                 } else {
                         physid_mask_t tmp;
-                        apic->apicid_to_cpu_present(mp_ioapics[apic_id].apicid, &tmp);
+                        apic->apicid_to_cpu_present(mpc_ioapic_id(apic_id),
+                                                    &tmp);
                         apic_printk(APIC_VERBOSE, "Setting %d in the "
                                         "phys_id_present_map\n",
-                                        mp_ioapics[apic_id].apicid);
+                                        mpc_ioapic_id(apic_id));
                         physids_or(phys_id_present_map, phys_id_present_map, tmp);
                 }
 
@@ -1990,24 +1975,24 @@ void __init setup_ioapic_ids_from_mpc_nocheck(void)
                  * We need to adjust the IRQ routing table
                  * if the ID changed.
                  */
-                if (old_id != mp_ioapics[apic_id].apicid)
+                if (old_id != mpc_ioapic_id(apic_id))
                         for (i = 0; i < mp_irq_entries; i++)
                                 if (mp_irqs[i].dstapic == old_id)
                                         mp_irqs[i].dstapic
-                                                = mp_ioapics[apic_id].apicid;
+                                                = mpc_ioapic_id(apic_id);
 
                 /*
                  * Update the ID register according to the right value
                  * from the MPC table if they are different.
                  */
-                if (mp_ioapics[apic_id].apicid == reg_00.bits.ID)
+                if (mpc_ioapic_id(apic_id) == reg_00.bits.ID)
                         continue;
 
                 apic_printk(APIC_VERBOSE, KERN_INFO
                         "...changing IO-APIC physical APIC ID to %d ...",
-                        mp_ioapics[apic_id].apicid);
+                        mpc_ioapic_id(apic_id));
 
-                reg_00.bits.ID = mp_ioapics[apic_id].apicid;
+                reg_00.bits.ID = mpc_ioapic_id(apic_id);
                 raw_spin_lock_irqsave(&ioapic_lock, flags);
                 io_apic_write(apic_id, 0, reg_00.raw);
                 raw_spin_unlock_irqrestore(&ioapic_lock, flags);
@@ -2018,7 +2003,7 @@ void __init setup_ioapic_ids_from_mpc_nocheck(void)
                 raw_spin_lock_irqsave(&ioapic_lock, flags);
                 reg_00.raw = io_apic_read(apic_id, 0);
                 raw_spin_unlock_irqrestore(&ioapic_lock, flags);
-                if (reg_00.bits.ID != mp_ioapics[apic_id].apicid)
+                if (reg_00.bits.ID != mpc_ioapic_id(apic_id))
                         printk("could not set ID!\n");
                 else
                         apic_printk(APIC_VERBOSE, " ok.\n");
@@ -2404,7 +2389,7 @@ static void eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg)
 
         raw_spin_lock_irqsave(&ioapic_lock, flags);
         for_each_irq_pin(entry, cfg->irq_2_pin) {
-                if (mp_ioapics[entry->apic].apicver >= 0x20) {
+                if (mpc_ioapic_ver(entry->apic) >= 0x20) {
                         /*
                          * Intr-remapping uses pin number as the virtual vector
                          * in the RTE. Actual vector is programmed in
@@ -2918,49 +2903,19 @@ static int __init io_apic_bug_finalize(void)
 
 late_initcall(io_apic_bug_finalize);
 
-static struct IO_APIC_route_entry *ioapic_saved_data[MAX_IO_APICS];
-
-static void suspend_ioapic(int ioapic_id)
+static void resume_ioapic_id(int ioapic_id)
 {
-        struct IO_APIC_route_entry *saved_data = ioapic_saved_data[ioapic_id];
-        int i;
-
-        if (!saved_data)
-                return;
-
-        for (i = 0; i < nr_ioapic_registers[ioapic_id]; i++)
-                saved_data[i] = ioapic_read_entry(ioapic_id, i);
-}
-
-static int ioapic_suspend(void)
-{
-        int ioapic_id;
-
-        for (ioapic_id = 0; ioapic_id < nr_ioapics; ioapic_id++)
-                suspend_ioapic(ioapic_id);
-
-        return 0;
-}
-
-static void resume_ioapic(int ioapic_id)
-{
-        struct IO_APIC_route_entry *saved_data = ioapic_saved_data[ioapic_id];
         unsigned long flags;
         union IO_APIC_reg_00 reg_00;
-        int i;
 
-        if (!saved_data)
-                return;
 
         raw_spin_lock_irqsave(&ioapic_lock, flags);
         reg_00.raw = io_apic_read(ioapic_id, 0);
-        if (reg_00.bits.ID != mp_ioapics[ioapic_id].apicid) {
-                reg_00.bits.ID = mp_ioapics[ioapic_id].apicid;
+        if (reg_00.bits.ID != mpc_ioapic_id(ioapic_id)) {
+                reg_00.bits.ID = mpc_ioapic_id(ioapic_id);
                 io_apic_write(ioapic_id, 0, reg_00.raw);
         }
         raw_spin_unlock_irqrestore(&ioapic_lock, flags);
-        for (i = 0; i < nr_ioapic_registers[ioapic_id]; i++)
-                ioapic_write_entry(ioapic_id, i, saved_data[i]);
 }
 
 static void ioapic_resume(void)
@@ -2968,28 +2923,18 @@ static void ioapic_resume(void)
         int ioapic_id;
 
         for (ioapic_id = nr_ioapics - 1; ioapic_id >= 0; ioapic_id--)
-                resume_ioapic(ioapic_id);
+                resume_ioapic_id(ioapic_id);
+
+        restore_ioapic_entries();
 }
 
 static struct syscore_ops ioapic_syscore_ops = {
-        .suspend = ioapic_suspend,
+        .suspend = save_ioapic_entries,
         .resume = ioapic_resume,
 };
 
 static int __init ioapic_init_ops(void)
 {
-        int i;
-
-        for (i = 0; i < nr_ioapics; i++) {
-                unsigned int size;
-
-                size = nr_ioapic_registers[i]
-                        * sizeof(struct IO_APIC_route_entry);
-                ioapic_saved_data[i] = kzalloc(size, GFP_KERNEL);
-                if (!ioapic_saved_data[i])
-                        pr_err("IOAPIC %d: suspend/resume impossible!\n", i);
-        }
-
         register_syscore_ops(&ioapic_syscore_ops);
 
         return 0;
@@ -3592,14 +3537,14 @@ int io_apic_setup_irq_pin_once(unsigned int irq, int node,
         int ret;
 
         /* Avoid redundant programming */
-        if (test_bit(pin, mp_ioapic_routing[id].pin_programmed)) {
+        if (test_bit(pin, ioapics[id].pin_programmed)) {
                 pr_debug("Pin %d-%d already programmed\n",
-                         mp_ioapics[id].apicid, pin);
+                         mpc_ioapic_id(id), pin);
                 return 0;
         }
         ret = io_apic_setup_irq_pin(irq, node, attr);
         if (!ret)
-                set_bit(pin, mp_ioapic_routing[id].pin_programmed);
+                set_bit(pin, ioapics[id].pin_programmed);
         return ret;
 }
 
@@ -3764,8 +3709,7 @@ static u8 __init io_apic_unique_id(u8 id)
 
         bitmap_zero(used, 256);
         for (i = 0; i < nr_ioapics; i++) {
-                struct mpc_ioapic *ia = &mp_ioapics[i];
-                __set_bit(ia->apicid, used);
+                __set_bit(mpc_ioapic_id(i), used);
         }
         if (!test_bit(id, used))
                 return id;
@@ -3825,7 +3769,7 @@ void __init setup_ioapic_dest(void)
                 return;
 
         for (ioapic = 0; ioapic < nr_ioapics; ioapic++)
-        for (pin = 0; pin < nr_ioapic_registers[ioapic]; pin++) {
+        for (pin = 0; pin < ioapics[ioapic].nr_registers; pin++) {
                 irq_entry = find_irq_entry(ioapic, pin, mp_INT);
                 if (irq_entry == -1)
                         continue;
@@ -3896,7 +3840,7 @@ void __init ioapic_and_gsi_init(void)
         ioapic_res = ioapic_setup_resources(nr_ioapics);
         for (i = 0; i < nr_ioapics; i++) {
                 if (smp_found_config) {
-                        ioapic_phys = mp_ioapics[i].apicaddr;
+                        ioapic_phys = mpc_ioapic_addr(i);
 #ifdef CONFIG_X86_32
                         if (!ioapic_phys) {
                                 printk(KERN_ERR
@@ -3956,8 +3900,9 @@ int mp_find_ioapic(u32 gsi)
 
         /* Find the IOAPIC that manages this GSI. */
         for (i = 0; i < nr_ioapics; i++) {
-                if ((gsi >= mp_gsi_routing[i].gsi_base)
-                    && (gsi <= mp_gsi_routing[i].gsi_end))
+                struct mp_ioapic_gsi *gsi_cfg = mp_ioapic_gsi_routing(i);
+                if ((gsi >= gsi_cfg->gsi_base)
+                    && (gsi <= gsi_cfg->gsi_end))
                         return i;
         }
 
@@ -3967,12 +3912,16 @@ int mp_find_ioapic(u32 gsi)
 
 int mp_find_ioapic_pin(int ioapic, u32 gsi)
 {
+        struct mp_ioapic_gsi *gsi_cfg;
+
         if (WARN_ON(ioapic == -1))
                 return -1;
-        if (WARN_ON(gsi > mp_gsi_routing[ioapic].gsi_end))
+
+        gsi_cfg = mp_ioapic_gsi_routing(ioapic);
+        if (WARN_ON(gsi > gsi_cfg->gsi_end))
                 return -1;
 
-        return gsi - mp_gsi_routing[ioapic].gsi_base;
+        return gsi - gsi_cfg->gsi_base;
 }
 
 static __init int bad_ioapic(unsigned long address)
@@ -3994,40 +3943,42 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)
 {
         int idx = 0;
         int entries;
+        struct mp_ioapic_gsi *gsi_cfg;
 
         if (bad_ioapic(address))
                 return;
 
         idx = nr_ioapics;
 
-        mp_ioapics[idx].type = MP_IOAPIC;
-        mp_ioapics[idx].flags = MPC_APIC_USABLE;
-        mp_ioapics[idx].apicaddr = address;
+        ioapics[idx].mp_config.type = MP_IOAPIC;
+        ioapics[idx].mp_config.flags = MPC_APIC_USABLE;
+        ioapics[idx].mp_config.apicaddr = address;
 
         set_fixmap_nocache(FIX_IO_APIC_BASE_0 + idx, address);
-        mp_ioapics[idx].apicid = io_apic_unique_id(id);
-        mp_ioapics[idx].apicver = io_apic_get_version(idx);
+        ioapics[idx].mp_config.apicid = io_apic_unique_id(id);
+        ioapics[idx].mp_config.apicver = io_apic_get_version(idx);
 
         /*
          * Build basic GSI lookup table to facilitate gsi->io_apic lookups
          * and to prevent reprogramming of IOAPIC pins (PCI GSIs).
          */
         entries = io_apic_get_redir_entries(idx);
-        mp_gsi_routing[idx].gsi_base = gsi_base;
-        mp_gsi_routing[idx].gsi_end = gsi_base + entries - 1;
+        gsi_cfg = mp_ioapic_gsi_routing(idx);
+        gsi_cfg->gsi_base = gsi_base;
+        gsi_cfg->gsi_end = gsi_base + entries - 1;
 
         /*
          * The number of IO-APIC IRQ registers (== #pins):
          */
-        nr_ioapic_registers[idx] = entries;
+        ioapics[idx].nr_registers = entries;
 
-        if (mp_gsi_routing[idx].gsi_end >= gsi_top)
-                gsi_top = mp_gsi_routing[idx].gsi_end + 1;
+        if (gsi_cfg->gsi_end >= gsi_top)
+                gsi_top = gsi_cfg->gsi_end + 1;
 
         printk(KERN_INFO "IOAPIC[%d]: apic_id %d, version %d, address 0x%x, "
-               "GSI %d-%d\n", idx, mp_ioapics[idx].apicid,
-               mp_ioapics[idx].apicver, mp_ioapics[idx].apicaddr,
-               mp_gsi_routing[idx].gsi_base, mp_gsi_routing[idx].gsi_end);
+               "GSI %d-%d\n", idx, mpc_ioapic_id(idx),
+               mpc_ioapic_ver(idx), mpc_ioapic_addr(idx),
+               gsi_cfg->gsi_base, gsi_cfg->gsi_end);
 
         nr_ioapics++;
 }
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index 6273eee5134b..c4a61ca1349a 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -48,8 +48,6 @@
 #include <asm/e820.h>
 #include <asm/ipi.h>
 
-#define MB_TO_PAGES(addr)               ((addr) << (20 - PAGE_SHIFT))
-
 int found_numaq;
 
 /*
@@ -79,31 +77,20 @@ int					quad_local_to_mp_bus_id[NR_CPUS/4][4];
 static inline void numaq_register_node(int node, struct sys_cfg_data *scd)
 {
         struct eachquadmem *eq = scd->eq + node;
+        u64 start = (u64)(eq->hi_shrd_mem_start - eq->priv_mem_size) << 20;
+        u64 end = (u64)(eq->hi_shrd_mem_start + eq->hi_shrd_mem_size) << 20;
+        int ret;
 
-        node_set_online(node);
-
-        /* Convert to pages */
-        node_start_pfn[node] =
-                 MB_TO_PAGES(eq->hi_shrd_mem_start - eq->priv_mem_size);
-
-        node_end_pfn[node] =
-                 MB_TO_PAGES(eq->hi_shrd_mem_start + eq->hi_shrd_mem_size);
-
-        memblock_x86_register_active_regions(node, node_start_pfn[node],
-                                                node_end_pfn[node]);
-
-        memory_present(node, node_start_pfn[node], node_end_pfn[node]);
-
-        node_remap_size[node] = node_memmap_size_bytes(node,
-                                        node_start_pfn[node],
-                                        node_end_pfn[node]);
+        node_set(node, numa_nodes_parsed);
+        ret = numa_add_memblk(node, start, end);
+        BUG_ON(ret < 0);
 }
 
 /*
  * Function: smp_dump_qct()
  *
  * Description: gets memory layout from the quad config table.  This
- * function also updates node_online_map with the nodes (quads) present.
+ * function also updates numa_nodes_parsed with the nodes (quads) present.
  */
 static void __init smp_dump_qct(void)
 {
@@ -112,7 +99,6 @@ static void __init smp_dump_qct(void)
 
         scd = (void *)__va(SYS_CFG_DATA_PRIV_ADDR);
 
-        nodes_clear(node_online_map);
         for_each_node(node) {
                 if (scd->quads_present31_0 & (1 << node))
                         numaq_register_node(node, scd);
@@ -282,14 +268,14 @@ static __init void early_check_numaq(void)
         }
 }
 
-int __init get_memcfg_numaq(void)
+int __init numaq_numa_init(void)
 {
         early_check_numaq();
         if (!found_numaq)
-                return 0;
+                return -ENOENT;
         smp_dump_qct();
 
-        return 1;
+        return 0;
 }
 
 #define NUMAQ_APIC_DFR_VALUE    (APIC_DFR_CLUSTER)
@@ -486,8 +472,8 @@ static void numaq_setup_portio_remap(void)
                 (u_long) xquad_portio, (u_long) num_quads*XQUAD_PORTIO_QUAD);
 }
 
-/* Use __refdata to keep false positive warning calm.   */
-struct apic __refdata apic_numaq = {
+/* Use __refdata to keep false positive warning calm.  */
+static struct apic __refdata apic_numaq = {
 
         .name                           = "NUMAQ",
         .probe                          = probe_numaq,
@@ -551,3 +537,5 @@ struct apic __refdata apic_numaq = {
         .x86_32_early_logical_apicid    = noop_x86_32_early_logical_apicid,
         .x86_32_numa_cpu_node           = numaq_numa_cpu_node,
 };
+
+apic_driver(apic_numaq);
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index fc84c7b61108..b5254ad044ab 100644
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -52,31 +52,6 @@ static int __init print_ipi_mode(void)
 }
 late_initcall(print_ipi_mode);
 
-void __init default_setup_apic_routing(void)
-{
-        int version = apic_version[boot_cpu_physical_apicid];
-
-        if (num_possible_cpus() > 8) {
-                switch (boot_cpu_data.x86_vendor) {
-                case X86_VENDOR_INTEL:
-                        if (!APIC_XAPIC(version)) {
-                                def_to_bigsmp = 0;
-                                break;
-                        }
-                        /* If P4 and above fall through */
-                case X86_VENDOR_AMD:
-                        def_to_bigsmp = 1;
-                }
-        }
-
-#ifdef CONFIG_X86_BIGSMP
-        generic_bigsmp_probe();
-#endif
-
-        if (apic->setup_apic_routing)
-                apic->setup_apic_routing();
-}
-
 static int default_x86_32_early_logical_apicid(int cpu)
 {
         return 1 << cpu;
@@ -112,7 +87,7 @@ static int probe_default(void)
         return 1;
 }
 
-struct apic apic_default = {
+static struct apic apic_default = {
 
         .name                           = "default",
         .probe                          = probe_default,
@@ -172,47 +147,24 @@ struct apic apic_default = {
         .safe_wait_icr_idle             = native_safe_apic_wait_icr_idle,
 
         .x86_32_early_logical_apicid    = default_x86_32_early_logical_apicid,
-        .x86_32_numa_cpu_node           = default_x86_32_numa_cpu_node,
 };
 
-extern struct apic apic_numaq;
-extern struct apic apic_summit;
-extern struct apic apic_bigsmp;
-extern struct apic apic_es7000;
-extern struct apic apic_es7000_cluster;
+apic_driver(apic_default);
 
 struct apic *apic = &apic_default;
 EXPORT_SYMBOL_GPL(apic);
 
-static struct apic *apic_probe[] __initdata = {
-#ifdef CONFIG_X86_NUMAQ
-        &apic_numaq,
-#endif
-#ifdef CONFIG_X86_SUMMIT
-        &apic_summit,
-#endif
-#ifdef CONFIG_X86_BIGSMP
-        &apic_bigsmp,
-#endif
-#ifdef CONFIG_X86_ES7000
-        &apic_es7000,
-        &apic_es7000_cluster,
-#endif
-        &apic_default,  /* must be last */
-        NULL,
-};
-
 static int cmdline_apic __initdata;
 static int __init parse_apic(char *arg)
 {
-        int i;
+        struct apic **drv;
 
         if (!arg)
                 return -EINVAL;
 
-        for (i = 0; apic_probe[i]; i++) {
-                if (!strcmp(apic_probe[i]->name, arg)) {
-                        apic = apic_probe[i];
+        for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) {
+                if (!strcmp((*drv)->name, arg)) {
+                        apic = *drv;
                         cmdline_apic = 1;
                         return 0;
                 }
@@ -223,38 +175,58 @@ static int __init parse_apic(char *arg)
 }
 early_param("apic", parse_apic);
 
-void __init generic_bigsmp_probe(void)
+void __init default_setup_apic_routing(void)
 {
+        int version = apic_version[boot_cpu_physical_apicid];
+
+        if (num_possible_cpus() > 8) {
+                switch (boot_cpu_data.x86_vendor) {
+                case X86_VENDOR_INTEL:
+                        if (!APIC_XAPIC(version)) {
+                                def_to_bigsmp = 0;
+                                break;
+                        }
+                        /* If P4 and above fall through */
+                case X86_VENDOR_AMD:
+                        def_to_bigsmp = 1;
+                }
+        }
+
 #ifdef CONFIG_X86_BIGSMP
         /*
-         * This routine is used to switch to bigsmp mode when
+         * This is used to switch to bigsmp mode when
          * - There is no apic= option specified by the user
          * - generic_apic_probe() has chosen apic_default as the sub_arch
          * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support
          */
 
         if (!cmdline_apic && apic == &apic_default) {
-                if (apic_bigsmp.probe()) {
-                        apic = &apic_bigsmp;
+                struct apic *bigsmp = generic_bigsmp_probe();
+                if (bigsmp) {
+                        apic = bigsmp;
                         printk(KERN_INFO "Overriding APIC driver with %s\n",
                                apic->name);
                 }
         }
 #endif
+
+        if (apic->setup_apic_routing)
+                apic->setup_apic_routing();
 }
 
 void __init generic_apic_probe(void)
 {
         if (!cmdline_apic) {
-                int i;
-                for (i = 0; apic_probe[i]; i++) {
-                        if (apic_probe[i]->probe()) {
-                                apic = apic_probe[i];
+                struct apic **drv;
+
+                for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) {
+                        if ((*drv)->probe()) {
+                                apic = *drv;
                                 break;
                         }
                 }
                 /* Not visible without early console */
-                if (!apic_probe[i])
+                if (drv == __apicdrivers_end)
                         panic("Didn't find an APIC driver");
         }
         printk(KERN_INFO "Using APIC driver %s\n", apic->name);
@@ -265,16 +237,16 @@ void __init generic_apic_probe(void)
 int __init
 generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
 {
-        int i;
+        struct apic **drv;
 
-        for (i = 0; apic_probe[i]; ++i) {
-                if (!apic_probe[i]->mps_oem_check)
+        for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) {
+                if (!((*drv)->mps_oem_check))
                         continue;
-                if (!apic_probe[i]->mps_oem_check(mpc, oem, productid))
+                if (!(*drv)->mps_oem_check(mpc, oem, productid))
                         continue;
 
                 if (!cmdline_apic) {
-                        apic = apic_probe[i];
+                        apic = *drv;
                         printk(KERN_INFO "Switched to APIC driver `%s'.\n",
                                apic->name);
                 }
@@ -285,16 +257,16 @@ generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
 
 int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
-        int i;
+        struct apic **drv;
 
-        for (i = 0; apic_probe[i]; ++i) {
-                if (!apic_probe[i]->acpi_madt_oem_check)
+        for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) {
+                if (!(*drv)->acpi_madt_oem_check)
                         continue;
-                if (!apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id))
+                if (!(*drv)->acpi_madt_oem_check(oem_id, oem_table_id))
                         continue;
 
                 if (!cmdline_apic) {
-                        apic = apic_probe[i];
+                        apic = *drv;
                         printk(KERN_INFO "Switched to APIC driver `%s'.\n",
                                apic->name);
                 }
diff --git a/arch/x86/kernel/apic/probe_64.c b/arch/x86/kernel/apic/probe_64.c
index d8c4a6feb286..3fe986698929 100644
--- a/arch/x86/kernel/apic/probe_64.c
+++ b/arch/x86/kernel/apic/probe_64.c
@@ -23,27 +23,6 @@
 #include <asm/ipi.h>
 #include <asm/setup.h>
 
-extern struct apic apic_flat;
-extern struct apic apic_physflat;
-extern struct apic apic_x2xpic_uv_x;
-extern struct apic apic_x2apic_phys;
-extern struct apic apic_x2apic_cluster;
-
-struct apic __read_mostly *apic = &apic_flat;
-EXPORT_SYMBOL_GPL(apic);
-
-static struct apic *apic_probe[] __initdata = {
-#ifdef CONFIG_X86_UV
-        &apic_x2apic_uv_x,
-#endif
-#ifdef CONFIG_X86_X2APIC
-        &apic_x2apic_phys,
-        &apic_x2apic_cluster,
-#endif
-        &apic_physflat,
-        NULL,
-};
-
 static int apicid_phys_pkg_id(int initial_apic_id, int index_msb)
 {
         return hard_smp_processor_id() >> index_msb;
@@ -54,26 +33,20 @@ static int apicid_phys_pkg_id(int initial_apic_id, int index_msb)
  */
 void __init default_setup_apic_routing(void)
 {
+        struct apic **drv;
 
         enable_IR_x2apic();
 
-#ifdef CONFIG_X86_X2APIC
-        if (x2apic_mode
-#ifdef CONFIG_X86_UV
-                       && apic != &apic_x2apic_uv_x
-#endif
-                       ) {
-                if (x2apic_phys)
-                        apic = &apic_x2apic_phys;
-                else
-                        apic = &apic_x2apic_cluster;
+        for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) {
+                if ((*drv)->probe && (*drv)->probe()) {
+                        if (apic != *drv) {
+                                apic = *drv;
+                                pr_info("Switched APIC routing to %s.\n",
+                                        apic->name);
+                        }
+                        break;
+                }
         }
-#endif
-
-        if (apic == &apic_flat && num_possible_cpus() > 8)
-                        apic = &apic_physflat;
-
-        printk(KERN_INFO "Setting APIC routing to %s\n", apic->name);
 
         if (is_vsmp_box()) {
                 /* need to update phys_pkg_id */
@@ -90,13 +63,15 @@ void apic_send_IPI_self(int vector)
 
 int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
-        int i;
+        struct apic **drv;
 
-        for (i = 0; apic_probe[i]; ++i) {
-                if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) {
-                        apic = apic_probe[i];
-                        printk(KERN_INFO "Setting APIC routing to %s.\n",
-                                apic->name);
+        for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) {
+                if ((*drv)->acpi_madt_oem_check(oem_id, oem_table_id)) {
+                        if (apic != *drv) {
+                                apic = *drv;
+                                pr_info("Setting APIC routing to %s.\n",
+                                        apic->name);
+                        }
                         return 1;
                 }
         }
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index e4b8059b414a..19114423c58c 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -491,7 +491,7 @@ void setup_summit(void)
 }
 #endif
 
-struct apic apic_summit = {
+static struct apic apic_summit = {
 
         .name                           = "summit",
         .probe                          = probe_summit,
@@ -551,5 +551,6 @@ struct apic apic_summit = {
         .safe_wait_icr_idle             = native_safe_apic_wait_icr_idle,
 
         .x86_32_early_logical_apicid    = summit_early_logical_apicid,
-        .x86_32_numa_cpu_node           = default_x86_32_numa_cpu_node,
 };
+
+apic_driver(apic_summit);
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index 90949bbd566d..500795875827 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -5,118 +5,95 @@
 #include <linux/ctype.h>
 #include <linux/init.h>
 #include <linux/dmar.h>
+#include <linux/cpu.h>
 
 #include <asm/smp.h>
-#include <asm/apic.h>
-#include <asm/ipi.h>
+#include <asm/x2apic.h>
 
 static DEFINE_PER_CPU(u32, x86_cpu_to_logical_apicid);
+static DEFINE_PER_CPU(cpumask_var_t, cpus_in_cluster);
+static DEFINE_PER_CPU(cpumask_var_t, ipi_mask);
 
 static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
         return x2apic_enabled();
 }
 
-/*
- * need to use more than cpu 0, because we need more vectors when
- * MSI-X are used.
- */
-static const struct cpumask *x2apic_target_cpus(void)
+static inline u32 x2apic_cluster(int cpu)
 {
-        return cpu_online_mask;
-}
-
-/*
- * for now each logical cpu is in its own vector allocation domain.
- */
-static void x2apic_vector_allocation_domain(int cpu, struct cpumask *retmask)
-{
-        cpumask_clear(retmask);
-        cpumask_set_cpu(cpu, retmask);
+        return per_cpu(x86_cpu_to_logical_apicid, cpu) >> 16;
 }
 
 static void
- __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest)
+__x2apic_send_IPI_mask(const struct cpumask *mask, int vector, int apic_dest)
 {
-        unsigned long cfg;
+        struct cpumask *cpus_in_cluster_ptr;
+        struct cpumask *ipi_mask_ptr;
+        unsigned int cpu, this_cpu;
+        unsigned long flags;
+        u32 dest;
+
+        x2apic_wrmsr_fence();
+
+        local_irq_save(flags);
 
-        cfg = __prepare_ICR(0, vector, dest);
+        this_cpu = smp_processor_id();
 
         /*
-         * send the IPI.
+         * We are to modify mask, so we need an own copy
+         * and be sure it's manipulated with irq off.
          */
-        native_x2apic_icr_write(cfg, apicid);
-}
+        ipi_mask_ptr = __raw_get_cpu_var(ipi_mask);
+        cpumask_copy(ipi_mask_ptr, mask);
 
-/*
- * for now, we send the IPI's one by one in the cpumask.
- * TBD: Based on the cpu mask, we can send the IPI's to the cluster group
- * at once. We have 16 cpu's in a cluster. This will minimize IPI register
- * writes.
- */
-static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector)
-{
-        unsigned long query_cpu;
-        unsigned long flags;
+        /*
+         * The idea is to send one IPI per cluster.
+         */
+        for_each_cpu(cpu, ipi_mask_ptr) {
+                unsigned long i;
 
-        x2apic_wrmsr_fence();
+                cpus_in_cluster_ptr = per_cpu(cpus_in_cluster, cpu);
+                dest = 0;
 
-        local_irq_save(flags);
-        for_each_cpu(query_cpu, mask) {
-                __x2apic_send_IPI_dest(
-                        per_cpu(x86_cpu_to_logical_apicid, query_cpu),
-                        vector, apic->dest_logical);
+                /* Collect cpus in cluster. */
+                for_each_cpu_and(i, ipi_mask_ptr, cpus_in_cluster_ptr) {
+                        if (apic_dest == APIC_DEST_ALLINC || i != this_cpu)
+                                dest |= per_cpu(x86_cpu_to_logical_apicid, i);
+                }
+
+                if (!dest)
+                        continue;
+
+                __x2apic_send_IPI_dest(dest, vector, apic->dest_logical);
+                /*
+                 * Cluster sibling cpus should be discared now so
+                 * we would not send IPI them second time.
+                 */
+                cpumask_andnot(ipi_mask_ptr, ipi_mask_ptr, cpus_in_cluster_ptr);
         }
+
         local_irq_restore(flags);
 }
 
+static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector)
+{
+        __x2apic_send_IPI_mask(mask, vector, APIC_DEST_ALLINC);
+}
+
 static void
  x2apic_send_IPI_mask_allbutself(const struct cpumask *mask, int vector)
 {
-        unsigned long this_cpu = smp_processor_id();
-        unsigned long query_cpu;
-        unsigned long flags;
-
-        x2apic_wrmsr_fence();
-
-        local_irq_save(flags);
-        for_each_cpu(query_cpu, mask) {
-                if (query_cpu == this_cpu)
-                        continue;
-                __x2apic_send_IPI_dest(
-                                per_cpu(x86_cpu_to_logical_apicid, query_cpu),
-                                vector, apic->dest_logical);
-        }
-        local_irq_restore(flags);
+        __x2apic_send_IPI_mask(mask, vector, APIC_DEST_ALLBUT);
 }
 
 static void x2apic_send_IPI_allbutself(int vector)
 {
-        unsigned long this_cpu = smp_processor_id();
-        unsigned long query_cpu;
-        unsigned long flags;
-
-        x2apic_wrmsr_fence();
-
-        local_irq_save(flags);
-        for_each_online_cpu(query_cpu) {
-                if (query_cpu == this_cpu)
-                        continue;
-                __x2apic_send_IPI_dest(
-                                per_cpu(x86_cpu_to_logical_apicid, query_cpu),
-                                vector, apic->dest_logical);
-        }
-        local_irq_restore(flags);
+        __x2apic_send_IPI_mask(cpu_online_mask, vector, APIC_DEST_ALLBUT);
 }
 
 static void x2apic_send_IPI_all(int vector)
 {
-        x2apic_send_IPI_mask(cpu_online_mask, vector);
-}
-
-static int x2apic_apic_id_registered(void)
-{
-        return 1;
+        __x2apic_send_IPI_mask(cpu_online_mask, vector, APIC_DEST_ALLINC);
 }
 
 static unsigned int x2apic_cpu_mask_to_apicid(const struct cpumask *cpumask)
@@ -151,43 +128,90 @@ x2apic_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
         return per_cpu(x86_cpu_to_logical_apicid, cpu);
 }
 
-static unsigned int x2apic_cluster_phys_get_apic_id(unsigned long x)
+static void init_x2apic_ldr(void)
 {
-        unsigned int id;
+        unsigned int this_cpu = smp_processor_id();
+        unsigned int cpu;
 
-        id = x;
-        return id;
+        per_cpu(x86_cpu_to_logical_apicid, this_cpu) = apic_read(APIC_LDR);
+
+        __cpu_set(this_cpu, per_cpu(cpus_in_cluster, this_cpu));
+        for_each_online_cpu(cpu) {
+                if (x2apic_cluster(this_cpu) != x2apic_cluster(cpu))
+                        continue;
+                __cpu_set(this_cpu, per_cpu(cpus_in_cluster, cpu));
+                __cpu_set(cpu, per_cpu(cpus_in_cluster, this_cpu));
+        }
 }
 
-static unsigned long set_apic_id(unsigned int id)
+ /*
+  * At CPU state changes, update the x2apic cluster sibling info.
+  */
+static int __cpuinit
+update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
 {
-        unsigned long x;
+        unsigned int this_cpu = (unsigned long)hcpu;
+        unsigned int cpu;
+        int err = 0;
+
+        switch (action) {
+        case CPU_UP_PREPARE:
+                if (!zalloc_cpumask_var(&per_cpu(cpus_in_cluster, this_cpu),
+                                        GFP_KERNEL)) {
+                        err = -ENOMEM;
+                } else if (!zalloc_cpumask_var(&per_cpu(ipi_mask, this_cpu),
+                                               GFP_KERNEL)) {
+                        free_cpumask_var(per_cpu(cpus_in_cluster, this_cpu));
+                        err = -ENOMEM;
+                }
+                break;
+        case CPU_UP_CANCELED:
+        case CPU_UP_CANCELED_FROZEN:
+        case CPU_DEAD:
+                for_each_online_cpu(cpu) {
+                        if (x2apic_cluster(this_cpu) != x2apic_cluster(cpu))
+                                continue;
+                        __cpu_clear(this_cpu, per_cpu(cpus_in_cluster, cpu));
+                        __cpu_clear(cpu, per_cpu(cpus_in_cluster, this_cpu));
+                }
+                free_cpumask_var(per_cpu(cpus_in_cluster, this_cpu));
+                free_cpumask_var(per_cpu(ipi_mask, this_cpu));
+                break;
+        }
 
-        x = id;
-        return x;
+        return notifier_from_errno(err);
 }
 
-static int x2apic_cluster_phys_pkg_id(int initial_apicid, int index_msb)
-{
-        return initial_apicid >> index_msb;
-}
+static struct notifier_block __refdata x2apic_cpu_notifier = {
+        .notifier_call = update_clusterinfo,
+};
 
-static void x2apic_send_IPI_self(int vector)
+static int x2apic_init_cpu_notifier(void)
 {
-        apic_write(APIC_SELF_IPI, vector);
+        int cpu = smp_processor_id();
+
+        zalloc_cpumask_var(&per_cpu(cpus_in_cluster, cpu), GFP_KERNEL);
+        zalloc_cpumask_var(&per_cpu(ipi_mask, cpu), GFP_KERNEL);
+
+        BUG_ON(!per_cpu(cpus_in_cluster, cpu) || !per_cpu(ipi_mask, cpu));
+
+        __cpu_set(cpu, per_cpu(cpus_in_cluster, cpu));
+        register_hotcpu_notifier(&x2apic_cpu_notifier);
+        return 1;
 }
 
-static void init_x2apic_ldr(void)
+static int x2apic_cluster_probe(void)
 {
-        int cpu = smp_processor_id();
-
-        per_cpu(x86_cpu_to_logical_apicid, cpu) = apic_read(APIC_LDR);
+        if (x2apic_mode)
+                return x2apic_init_cpu_notifier();
+        else
+                return 0;
 }
 
-struct apic apic_x2apic_cluster = {
+static struct apic apic_x2apic_cluster = {
 
         .name                           = "cluster x2apic",
-        .probe                          = NULL,
+        .probe                          = x2apic_cluster_probe,
         .acpi_madt_oem_check            = x2apic_acpi_madt_oem_check,
         .apic_id_registered             = x2apic_apic_id_registered,
 
@@ -211,11 +235,11 @@ struct apic apic_x2apic_cluster = {
         .setup_portio_remap             = NULL,
         .check_phys_apicid_present      = default_check_phys_apicid_present,
         .enable_apic_mode               = NULL,
-        .phys_pkg_id                    = x2apic_cluster_phys_pkg_id,
+        .phys_pkg_id                    = x2apic_phys_pkg_id,
         .mps_oem_check                  = NULL,
 
-        .get_apic_id                    = x2apic_cluster_phys_get_apic_id,
-        .set_apic_id                    = set_apic_id,
+        .get_apic_id                    = x2apic_get_apic_id,
+        .set_apic_id                    = x2apic_set_apic_id,
         .apic_id_mask                   = 0xFFFFFFFFu,
 
         .cpu_mask_to_apicid             = x2apic_cpu_mask_to_apicid,
@@ -240,3 +264,5 @@ struct apic apic_x2apic_cluster = {
         .wait_icr_idle                  = native_x2apic_wait_icr_idle,
         .safe_wait_icr_idle             = native_safe_x2apic_wait_icr_idle,
 };
+
+apic_driver(apic_x2apic_cluster);
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index c7e6d6645bf4..f5373dfde21e 100644
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -7,11 +7,12 @@
 #include <linux/dmar.h>
 
 #include <asm/smp.h>
-#include <asm/apic.h>
-#include <asm/ipi.h>
+#include <asm/x2apic.h>
 
 int x2apic_phys;
 
+static struct apic apic_x2apic_phys;
+
 static int set_x2apic_phys_mode(char *arg)
 {
         x2apic_phys = 1;
@@ -27,94 +28,46 @@ static int x2apic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
                 return 0;
 }
 
-/*
- * need to use more than cpu 0, because we need more vectors when
- * MSI-X are used.
- */
-static const struct cpumask *x2apic_target_cpus(void)
-{
-        return cpu_online_mask;
-}
-
-static void x2apic_vector_allocation_domain(int cpu, struct cpumask *retmask)
-{
-        cpumask_clear(retmask);
-        cpumask_set_cpu(cpu, retmask);
-}
-
-static void __x2apic_send_IPI_dest(unsigned int apicid, int vector,
-                                   unsigned int dest)
-{
-        unsigned long cfg;
-
-        cfg = __prepare_ICR(0, vector, dest);
-
-        /*
-         * send the IPI.
-         */
-        native_x2apic_icr_write(cfg, apicid);
-}
-
-static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector)
+static void
+__x2apic_send_IPI_mask(const struct cpumask *mask, int vector, int apic_dest)
 {
         unsigned long query_cpu;
+        unsigned long this_cpu;
         unsigned long flags;
 
         x2apic_wrmsr_fence();
 
         local_irq_save(flags);
+
+        this_cpu = smp_processor_id();
         for_each_cpu(query_cpu, mask) {
+                if (apic_dest == APIC_DEST_ALLBUT && this_cpu == query_cpu)
+                        continue;
                 __x2apic_send_IPI_dest(per_cpu(x86_cpu_to_apicid, query_cpu),
                                        vector, APIC_DEST_PHYSICAL);
         }
         local_irq_restore(flags);
 }
 
+static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector)
+{
+        __x2apic_send_IPI_mask(mask, vector, APIC_DEST_ALLINC);
+}
+
 static void
  x2apic_send_IPI_mask_allbutself(const struct cpumask *mask, int vector)
 {
-        unsigned long this_cpu = smp_processor_id();
-        unsigned long query_cpu;
-        unsigned long flags;
-
-        x2apic_wrmsr_fence();
-
-        local_irq_save(flags);
-        for_each_cpu(query_cpu, mask) {
-                if (query_cpu != this_cpu)
-                        __x2apic_send_IPI_dest(
-                                per_cpu(x86_cpu_to_apicid, query_cpu),
-                                vector, APIC_DEST_PHYSICAL);
-        }
-        local_irq_restore(flags);
+        __x2apic_send_IPI_mask(mask, vector, APIC_DEST_ALLBUT);
 }
 
 static void x2apic_send_IPI_allbutself(int vector)
 {
-        unsigned long this_cpu = smp_processor_id();
-        unsigned long query_cpu;
-        unsigned long flags;
-
-        x2apic_wrmsr_fence();
-
-        local_irq_save(flags);
-        for_each_online_cpu(query_cpu) {
-                if (query_cpu == this_cpu)
-                        continue;
-                __x2apic_send_IPI_dest(per_cpu(x86_cpu_to_apicid, query_cpu),
-                                       vector, APIC_DEST_PHYSICAL);
-        }
-        local_irq_restore(flags);
+        __x2apic_send_IPI_mask(cpu_online_mask, vector, APIC_DEST_ALLBUT);
 }
 
 static void x2apic_send_IPI_all(int vector)
 {
-        x2apic_send_IPI_mask(cpu_online_mask, vector);
-}
-
-static int x2apic_apic_id_registered(void)
-{
-        return 1;
+        __x2apic_send_IPI_mask(cpu_online_mask, vector, APIC_DEST_ALLINC);
 }
 
 static unsigned int x2apic_cpu_mask_to_apicid(const struct cpumask *cpumask)
@@ -149,34 +102,22 @@ x2apic_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
         return per_cpu(x86_cpu_to_apicid, cpu);
 }
 
-static unsigned int x2apic_phys_get_apic_id(unsigned long x)
-{
-        return x;
-}
-
-static unsigned long set_apic_id(unsigned int id)
-{
-        return id;
-}
-
-static int x2apic_phys_pkg_id(int initial_apicid, int index_msb)
+static void init_x2apic_ldr(void)
 {
-        return initial_apicid >> index_msb;
 }
 
-static void x2apic_send_IPI_self(int vector)
+static int x2apic_phys_probe(void)
 {
-        apic_write(APIC_SELF_IPI, vector);
-}
+        if (x2apic_mode && x2apic_phys)
+                return 1;
 
-static void init_x2apic_ldr(void)
-{
+        return apic == &apic_x2apic_phys;
 }
 
-struct apic apic_x2apic_phys = {
+static struct apic apic_x2apic_phys = {
 
         .name                           = "physical x2apic",
-        .probe                          = NULL,
+        .probe                          = x2apic_phys_probe,
         .acpi_madt_oem_check            = x2apic_acpi_madt_oem_check,
         .apic_id_registered             = x2apic_apic_id_registered,
 
@@ -203,8 +144,8 @@ struct apic apic_x2apic_phys = {
         .phys_pkg_id                    = x2apic_phys_pkg_id,
         .mps_oem_check                  = NULL,
 
-        .get_apic_id                    = x2apic_phys_get_apic_id,
-        .set_apic_id                    = set_apic_id,
+        .get_apic_id                    = x2apic_get_apic_id,
+        .set_apic_id                    = x2apic_set_apic_id,
         .apic_id_mask                   = 0xFFFFFFFFu,
 
         .cpu_mask_to_apicid             = x2apic_cpu_mask_to_apicid,
@@ -229,3 +170,5 @@ struct apic apic_x2apic_phys = {
         .wait_icr_idle                  = native_x2apic_wait_icr_idle,
         .safe_wait_icr_idle             = native_safe_x2apic_wait_icr_idle,
 };
+
+apic_driver(apic_x2apic_phys);
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 7acd2d2ac965..f450b683dfcf 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -58,6 +58,8 @@ unsigned int uv_apicid_hibits;
 EXPORT_SYMBOL_GPL(uv_apicid_hibits);
 static DEFINE_SPINLOCK(uv_nmi_lock);
 
+static struct apic apic_x2apic_uv_x;
+
 static unsigned long __init uv_early_read_mmr(unsigned long addr)
 {
         unsigned long val, *mmr;
@@ -326,10 +328,15 @@ static void uv_send_IPI_self(int vector)
         apic_write(APIC_SELF_IPI, vector);
 }
 
-struct apic __refdata apic_x2apic_uv_x = {
+static int uv_probe(void)
+{
+        return apic == &apic_x2apic_uv_x;
+}
+
+static struct apic __refdata apic_x2apic_uv_x = {
 
         .name                           = "UV large system",
-        .probe                          = NULL,
+        .probe                          = uv_probe,
         .acpi_madt_oem_check            = uv_acpi_madt_oem_check,
         .apic_id_registered             = uv_apic_id_registered,
 
@@ -859,3 +866,5 @@ void __init uv_system_init(void)
         if (is_kdump_kernel())
                 reboot_type = BOOT_ACPI;
 }
+
+apic_driver(apic_x2apic_uv_x);
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index adee12e0da1f..3bfa02235965 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1238,7 +1238,6 @@ static int suspend(int vetoable)
         dpm_suspend_noirq(PMSG_SUSPEND);
 
         local_irq_disable();
-        sysdev_suspend(PMSG_SUSPEND);
         syscore_suspend();
 
         local_irq_enable();
@@ -1258,7 +1257,6 @@ static int suspend(int vetoable)
         err = (err == APM_SUCCESS) ? 0 : -EIO;
 
         syscore_resume();
-        sysdev_resume();
         local_irq_enable();
 
         dpm_resume_noirq(PMSG_RESUME);
@@ -1282,7 +1280,6 @@ static void standby(void)
         dpm_suspend_noirq(PMSG_SUSPEND);
 
         local_irq_disable();
-        sysdev_suspend(PMSG_SUSPEND);
         syscore_suspend();
         local_irq_enable();
 
@@ -1292,7 +1289,6 @@ static void standby(void)
 
         local_irq_disable();
         syscore_resume();
-        sysdev_resume();
         local_irq_enable();
 
         dpm_resume_noirq(PMSG_RESUME);
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 3f0ebe429a01..6042981d0309 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -30,7 +30,6 @@ obj-$(CONFIG_PERF_EVENTS)		+= perf_event.o
 
 obj-$(CONFIG_X86_MCE)                   += mcheck/
 obj-$(CONFIG_MTRR)                      += mtrr/
-obj-$(CONFIG_CPU_FREQ)                  += cpufreq/
 
 obj-$(CONFIG_X86_LOCAL_APIC)            += perfctr-watchdog.o
 
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 6f9d1f6063e9..8f5cabb3c5b0 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -629,10 +629,13 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
                  * Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=33012
                  */
                 u64 mask;
+                int err;
 
-                rdmsrl(MSR_AMD64_MCx_MASK(4), mask);
-                mask |= (1 << 10);
-                wrmsrl(MSR_AMD64_MCx_MASK(4), mask);
+                err = rdmsrl_safe(MSR_AMD64_MCx_MASK(4), &mask);
+                if (err == 0) {
+                        mask |= (1 << 10);
+                        checking_wrmsrl(MSR_AMD64_MCx_MASK(4), mask);
+                }
         }
 }
 
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index e2ced0074a45..c8b41623377f 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -254,6 +254,25 @@ static inline void squash_the_stupid_serial_number(struct cpuinfo_x86 *c)
 }
 #endif
 
+static int disable_smep __cpuinitdata;
+static __init int setup_disable_smep(char *arg)
+{
+        disable_smep = 1;
+        return 1;
+}
+__setup("nosmep", setup_disable_smep);
+
+static __cpuinit void setup_smep(struct cpuinfo_x86 *c)
+{
+        if (cpu_has(c, X86_FEATURE_SMEP)) {
+                if (unlikely(disable_smep)) {
+                        setup_clear_cpu_cap(X86_FEATURE_SMEP);
+                        clear_in_cr4(X86_CR4_SMEP);
+                } else
+                        set_in_cr4(X86_CR4_SMEP);
+        }
+}
+
 /*
  * Some CPU features depend on higher CPUID levels, which may not always
  * be available due to CPUID level capping or broken virtualization
@@ -565,8 +584,7 @@ void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)
 
                 cpuid_count(0x00000007, 0, &eax, &ebx, &ecx, &edx);
 
-                if (eax > 0)
-                        c->x86_capability[9] = ebx;
+                c->x86_capability[9] = ebx;
         }
 
         /* AMD-defined flags: level 0x80000001 */
@@ -668,6 +686,8 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
         c->cpu_index = 0;
 #endif
         filter_cpuid_features(c, false);
+
+        setup_smep(c);
 }
 
 void __init early_cpu_init(void)
@@ -753,6 +773,8 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c)
 #endif
         }
 
+        setup_smep(c);
+
         get_model_name(c); /* Default name */
 
         detect_nopl(c);
diff --git a/arch/x86/kernel/cpu/cpufreq/Kconfig b/arch/x86/kernel/cpu/cpufreq/Kconfig
deleted file mode 100644
index 870e6cc6ad28..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/Kconfig
+++ /dev/null
@@ -1,266 +0,0 @@
-#
-# CPU Frequency scaling
-#
-
-menu "CPU Frequency scaling"
-
-source "drivers/cpufreq/Kconfig"
-
-if CPU_FREQ
-
-comment "CPUFreq processor drivers"
-
-config X86_PCC_CPUFREQ
-        tristate "Processor Clocking Control interface driver"
-        depends on ACPI && ACPI_PROCESSOR
-        help
-          This driver adds support for the PCC interface.
-
-          For details, take a look at:
-          <file:Documentation/cpu-freq/pcc-cpufreq.txt>.
-
-          To compile this driver as a module, choose M here: the
-          module will be called pcc-cpufreq.
-
-          If in doubt, say N.
-
-config X86_ACPI_CPUFREQ
-        tristate "ACPI Processor P-States driver"
-        select CPU_FREQ_TABLE
-        depends on ACPI_PROCESSOR
-        help
-          This driver adds a CPUFreq driver which utilizes the ACPI
-          Processor Performance States.
-          This driver also supports Intel Enhanced Speedstep.
-
-          To compile this driver as a module, choose M here: the
-          module will be called acpi-cpufreq.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-config ELAN_CPUFREQ
-        tristate "AMD Elan SC400 and SC410"
-        select CPU_FREQ_TABLE
-        depends on X86_ELAN
-        ---help---
-          This adds the CPUFreq driver for AMD Elan SC400 and SC410
-          processors.
-
-          You need to specify the processor maximum speed as boot
-          parameter: elanfreq=maxspeed (in kHz) or as module
-          parameter "max_freq".
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-config SC520_CPUFREQ
-        tristate "AMD Elan SC520"
-        select CPU_FREQ_TABLE
-        depends on X86_ELAN
-        ---help---
-          This adds the CPUFreq driver for AMD Elan SC520 processor.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-
-config X86_POWERNOW_K6
-        tristate "AMD Mobile K6-2/K6-3 PowerNow!"
-        select CPU_FREQ_TABLE
-        depends on X86_32
-        help
-          This adds the CPUFreq driver for mobile AMD K6-2+ and mobile
-          AMD K6-3+ processors.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-config X86_POWERNOW_K7
-        tristate "AMD Mobile Athlon/Duron PowerNow!"
-        select CPU_FREQ_TABLE
-        depends on X86_32
-        help
-          This adds the CPUFreq driver for mobile AMD K7 mobile processors.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-config X86_POWERNOW_K7_ACPI
-        bool
-        depends on X86_POWERNOW_K7 && ACPI_PROCESSOR
-        depends on !(X86_POWERNOW_K7 = y && ACPI_PROCESSOR = m)
-        depends on X86_32
-        default y
-
-config X86_POWERNOW_K8
-        tristate "AMD Opteron/Athlon64 PowerNow!"
-        select CPU_FREQ_TABLE
-        depends on ACPI && ACPI_PROCESSOR
-        help
-          This adds the CPUFreq driver for K8/K10 Opteron/Athlon64 processors.
-
-          To compile this driver as a module, choose M here: the
-          module will be called powernow-k8.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-config X86_GX_SUSPMOD
-        tristate "Cyrix MediaGX/NatSemi Geode Suspend Modulation"
-        depends on X86_32 && PCI
-        help
-         This add the CPUFreq driver for NatSemi Geode processors which
-         support suspend modulation.
-
-         For details, take a look at <file:Documentation/cpu-freq/>.
-
-         If in doubt, say N.
-
-config X86_SPEEDSTEP_CENTRINO
-        tristate "Intel Enhanced SpeedStep (deprecated)"
-        select CPU_FREQ_TABLE
-        select X86_SPEEDSTEP_CENTRINO_TABLE if X86_32
-        depends on X86_32 || (X86_64 && ACPI_PROCESSOR)
-        help
-          This is deprecated and this functionality is now merged into
-          acpi_cpufreq (X86_ACPI_CPUFREQ). Use that driver instead of
-          speedstep_centrino.
-          This adds the CPUFreq driver for Enhanced SpeedStep enabled
-          mobile CPUs.  This means Intel Pentium M (Centrino) CPUs
-          or 64bit enabled Intel Xeons.
-
-          To compile this driver as a module, choose M here: the
-          module will be called speedstep-centrino.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-config X86_SPEEDSTEP_CENTRINO_TABLE
-        bool "Built-in tables for Banias CPUs"
-        depends on X86_32 && X86_SPEEDSTEP_CENTRINO
-        default y
-        help
-          Use built-in tables for Banias CPUs if ACPI encoding
-          is not available.
-
-          If in doubt, say N.
-
-config X86_SPEEDSTEP_ICH
-        tristate "Intel Speedstep on ICH-M chipsets (ioport interface)"
-        select CPU_FREQ_TABLE
-        depends on X86_32
-        help
-          This adds the CPUFreq driver for certain mobile Intel Pentium III
-          (Coppermine), all mobile Intel Pentium III-M (Tualatin) and all
-          mobile Intel Pentium 4 P4-M on systems which have an Intel ICH2,
-          ICH3 or ICH4 southbridge.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-config X86_SPEEDSTEP_SMI
-        tristate "Intel SpeedStep on 440BX/ZX/MX chipsets (SMI interface)"
-        select CPU_FREQ_TABLE
-        depends on X86_32 && EXPERIMENTAL
-        help
-          This adds the CPUFreq driver for certain mobile Intel Pentium III
-          (Coppermine), all mobile Intel Pentium III-M (Tualatin)
-          on systems which have an Intel 440BX/ZX/MX southbridge.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-config X86_P4_CLOCKMOD
-        tristate "Intel Pentium 4 clock modulation"
-        select CPU_FREQ_TABLE
-        help
-          This adds the CPUFreq driver for Intel Pentium 4 / XEON
-          processors.  When enabled it will lower CPU temperature by skipping
-          clocks.
-
-          This driver should be only used in exceptional
-          circumstances when very low power is needed because it causes severe
-          slowdowns and noticeable latencies.  Normally Speedstep should be used
-          instead.
-
-          To compile this driver as a module, choose M here: the
-          module will be called p4-clockmod.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          Unless you are absolutely sure say N.
-
-config X86_CPUFREQ_NFORCE2
-        tristate "nVidia nForce2 FSB changing"
-        depends on X86_32 && EXPERIMENTAL
-        help
-          This adds the CPUFreq driver for FSB changing on nVidia nForce2
-          platforms.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-config X86_LONGRUN
-        tristate "Transmeta LongRun"
-        depends on X86_32
-        help
-          This adds the CPUFreq driver for Transmeta Crusoe and Efficeon processors
-          which support LongRun.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-config X86_LONGHAUL
-        tristate "VIA Cyrix III Longhaul"
-        select CPU_FREQ_TABLE
-        depends on X86_32 && ACPI_PROCESSOR
-        help
-          This adds the CPUFreq driver for VIA Samuel/CyrixIII,
-          VIA Cyrix Samuel/C3, VIA Cyrix Ezra and VIA Cyrix Ezra-T
-          processors.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-config X86_E_POWERSAVER
-        tristate "VIA C7 Enhanced PowerSaver (DANGEROUS)"
-        select CPU_FREQ_TABLE
-        depends on X86_32 && EXPERIMENTAL
-        help
-          This adds the CPUFreq driver for VIA C7 processors.  However, this driver
-          does not have any safeguards to prevent operating the CPU out of spec
-          and is thus considered dangerous.  Please use the regular ACPI cpufreq
-          driver, enabled by CONFIG_X86_ACPI_CPUFREQ.
-
-          If in doubt, say N.
-
-comment "shared options"
-
-config X86_SPEEDSTEP_LIB
-        tristate
-        default (X86_SPEEDSTEP_ICH || X86_SPEEDSTEP_SMI || X86_P4_CLOCKMOD)
-
-config X86_SPEEDSTEP_RELAXED_CAP_CHECK
-        bool "Relaxed speedstep capability checks"
-        depends on X86_32 && (X86_SPEEDSTEP_SMI || X86_SPEEDSTEP_ICH)
-        help
-          Don't perform all checks for a speedstep capable system which would
-          normally be done. Some ancient or strange systems, though speedstep
-          capable, don't always indicate that they are speedstep capable. This
-          option lets the probing code bypass some of those checks if the
-          parameter "relaxed_check=1" is passed to the module.
-
-endif   # CPU_FREQ
-
-endmenu
diff --git a/arch/x86/kernel/cpu/cpufreq/Makefile b/arch/x86/kernel/cpu/cpufreq/Makefile
deleted file mode 100644
index bd54bf67e6fb..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Link order matters. K8 is preferred to ACPI because of firmware bugs in early
-# K8 systems. ACPI is preferred to all other hardware-specific drivers.
-# speedstep-* is preferred over p4-clockmod.
-
-obj-$(CONFIG_X86_POWERNOW_K8)           += powernow-k8.o mperf.o
-obj-$(CONFIG_X86_ACPI_CPUFREQ)          += acpi-cpufreq.o mperf.o
-obj-$(CONFIG_X86_PCC_CPUFREQ)           += pcc-cpufreq.o
-obj-$(CONFIG_X86_POWERNOW_K6)           += powernow-k6.o
-obj-$(CONFIG_X86_POWERNOW_K7)           += powernow-k7.o
-obj-$(CONFIG_X86_LONGHAUL)              += longhaul.o
-obj-$(CONFIG_X86_E_POWERSAVER)          += e_powersaver.o
-obj-$(CONFIG_ELAN_CPUFREQ)              += elanfreq.o
-obj-$(CONFIG_SC520_CPUFREQ)             += sc520_freq.o
-obj-$(CONFIG_X86_LONGRUN)               += longrun.o  
-obj-$(CONFIG_X86_GX_SUSPMOD)            += gx-suspmod.o
-obj-$(CONFIG_X86_SPEEDSTEP_ICH)         += speedstep-ich.o
-obj-$(CONFIG_X86_SPEEDSTEP_LIB)         += speedstep-lib.o
-obj-$(CONFIG_X86_SPEEDSTEP_SMI)         += speedstep-smi.o
-obj-$(CONFIG_X86_SPEEDSTEP_CENTRINO)    += speedstep-centrino.o
-obj-$(CONFIG_X86_P4_CLOCKMOD)           += p4-clockmod.o
-obj-$(CONFIG_X86_CPUFREQ_NFORCE2)       += cpufreq-nforce2.o
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
deleted file mode 100644
index a2baafb2fe6d..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ /dev/null
@@ -1,776 +0,0 @@
-/*
- * acpi-cpufreq.c - ACPI Processor P-States Driver
- *
- *  Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
- *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
- *  Copyright (C) 2002 - 2004 Dominik Brodowski <linux@brodo.de>
- *  Copyright (C) 2006       Denis Sadykov <denis.m.sadykov@intel.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.
- *
- *  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/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/smp.h>
-#include <linux/sched.h>
-#include <linux/cpufreq.h>
-#include <linux/compiler.h>
-#include <linux/dmi.h>
-#include <linux/slab.h>
-
-#include <linux/acpi.h>
-#include <linux/io.h>
-#include <linux/delay.h>
-#include <linux/uaccess.h>
-
-#include <acpi/processor.h>
-
-#include <asm/msr.h>
-#include <asm/processor.h>
-#include <asm/cpufeature.h>
-#include "mperf.h"
-
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \
-                "acpi-cpufreq", msg)
-
-MODULE_AUTHOR("Paul Diefenbaugh, Dominik Brodowski");
-MODULE_DESCRIPTION("ACPI Processor P-States Driver");
-MODULE_LICENSE("GPL");
-
-enum {
-        UNDEFINED_CAPABLE = 0,
-        SYSTEM_INTEL_MSR_CAPABLE,
-        SYSTEM_IO_CAPABLE,
-};
-
-#define INTEL_MSR_RANGE         (0xffff)
-
-struct acpi_cpufreq_data {
-        struct acpi_processor_performance *acpi_data;
-        struct cpufreq_frequency_table *freq_table;
-        unsigned int resume;
-        unsigned int cpu_feature;
-};
-
-static DEFINE_PER_CPU(struct acpi_cpufreq_data *, acfreq_data);
-
-/* acpi_perf_data is a pointer to percpu data. */
-static struct acpi_processor_performance __percpu *acpi_perf_data;
-
-static struct cpufreq_driver acpi_cpufreq_driver;
-
-static unsigned int acpi_pstate_strict;
-
-static int check_est_cpu(unsigned int cpuid)
-{
-        struct cpuinfo_x86 *cpu = &cpu_data(cpuid);
-
-        return cpu_has(cpu, X86_FEATURE_EST);
-}
-
-static unsigned extract_io(u32 value, struct acpi_cpufreq_data *data)
-{
-        struct acpi_processor_performance *perf;
-        int i;
-
-        perf = data->acpi_data;
-
-        for (i = 0; i < perf->state_count; i++) {
-                if (value == perf->states[i].status)
-                        return data->freq_table[i].frequency;
-        }
-        return 0;
-}
-
-static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
-{
-        int i;
-        struct acpi_processor_performance *perf;
-
-        msr &= INTEL_MSR_RANGE;
-        perf = data->acpi_data;
-
-        for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {
-                if (msr == perf->states[data->freq_table[i].index].status)
-                        return data->freq_table[i].frequency;
-        }
-        return data->freq_table[0].frequency;
-}
-
-static unsigned extract_freq(u32 val, struct acpi_cpufreq_data *data)
-{
-        switch (data->cpu_feature) {
-        case SYSTEM_INTEL_MSR_CAPABLE:
-                return extract_msr(val, data);
-        case SYSTEM_IO_CAPABLE:
-                return extract_io(val, data);
-        default:
-                return 0;
-        }
-}
-
-struct msr_addr {
-        u32 reg;
-};
-
-struct io_addr {
-        u16 port;
-        u8 bit_width;
-};
-
-struct drv_cmd {
-        unsigned int type;
-        const struct cpumask *mask;
-        union {
-                struct msr_addr msr;
-                struct io_addr io;
-        } addr;
-        u32 val;
-};
-
-/* Called via smp_call_function_single(), on the target CPU */
-static void do_drv_read(void *_cmd)
-{
-        struct drv_cmd *cmd = _cmd;
-        u32 h;
-
-        switch (cmd->type) {
-        case SYSTEM_INTEL_MSR_CAPABLE:
-                rdmsr(cmd->addr.msr.reg, cmd->val, h);
-                break;
-        case SYSTEM_IO_CAPABLE:
-                acpi_os_read_port((acpi_io_address)cmd->addr.io.port,
-                                &cmd->val,
-                                (u32)cmd->addr.io.bit_width);
-                break;
-        default:
-                break;
-        }
-}
-
-/* Called via smp_call_function_many(), on the target CPUs */
-static void do_drv_write(void *_cmd)
-{
-        struct drv_cmd *cmd = _cmd;
-        u32 lo, hi;
-
-        switch (cmd->type) {
-        case SYSTEM_INTEL_MSR_CAPABLE:
-                rdmsr(cmd->addr.msr.reg, lo, hi);
-                lo = (lo & ~INTEL_MSR_RANGE) | (cmd->val & INTEL_MSR_RANGE);
-                wrmsr(cmd->addr.msr.reg, lo, hi);
-                break;
-        case SYSTEM_IO_CAPABLE:
-                acpi_os_write_port((acpi_io_address)cmd->addr.io.port,
-                                cmd->val,
-                                (u32)cmd->addr.io.bit_width);
-                break;
-        default:
-                break;
-        }
-}
-
-static void drv_read(struct drv_cmd *cmd)
-{
-        int err;
-        cmd->val = 0;
-
-        err = smp_call_function_any(cmd->mask, do_drv_read, cmd, 1);
-        WARN_ON_ONCE(err);      /* smp_call_function_any() was buggy? */
-}
-
-static void drv_write(struct drv_cmd *cmd)
-{
-        int this_cpu;
-
-        this_cpu = get_cpu();
-        if (cpumask_test_cpu(this_cpu, cmd->mask))
-                do_drv_write(cmd);
-        smp_call_function_many(cmd->mask, do_drv_write, cmd, 1);
-        put_cpu();
-}
-
-static u32 get_cur_val(const struct cpumask *mask)
-{
-        struct acpi_processor_performance *perf;
-        struct drv_cmd cmd;
-
-        if (unlikely(cpumask_empty(mask)))
-                return 0;
-
-        switch (per_cpu(acfreq_data, cpumask_first(mask))->cpu_feature) {
-        case SYSTEM_INTEL_MSR_CAPABLE:
-                cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
-                cmd.addr.msr.reg = MSR_IA32_PERF_STATUS;
-                break;
-        case SYSTEM_IO_CAPABLE:
-                cmd.type = SYSTEM_IO_CAPABLE;
-                perf = per_cpu(acfreq_data, cpumask_first(mask))->acpi_data;
-                cmd.addr.io.port = perf->control_register.address;
-                cmd.addr.io.bit_width = perf->control_register.bit_width;
-                break;
-        default:
-                return 0;
-        }
-
-        cmd.mask = mask;
-        drv_read(&cmd);
-
-        dprintk("get_cur_val = %u\n", cmd.val);
-
-        return cmd.val;
-}
-
-static unsigned int get_cur_freq_on_cpu(unsigned int cpu)
-{
-        struct acpi_cpufreq_data *data = per_cpu(acfreq_data, cpu);
-        unsigned int freq;
-        unsigned int cached_freq;
-
-        dprintk("get_cur_freq_on_cpu (%d)\n", cpu);
-
-        if (unlikely(data == NULL ||
-                     data->acpi_data == NULL || data->freq_table == NULL)) {
-                return 0;
-        }
-
-        cached_freq = data->freq_table[data->acpi_data->state].frequency;
-        freq = extract_freq(get_cur_val(cpumask_of(cpu)), data);
-        if (freq != cached_freq) {
-                /*
-                 * The dreaded BIOS frequency change behind our back.
-                 * Force set the frequency on next target call.
-                 */
-                data->resume = 1;
-        }
-
-        dprintk("cur freq = %u\n", freq);
-
-        return freq;
-}
-
-static unsigned int check_freqs(const struct cpumask *mask, unsigned int freq,
-                                struct acpi_cpufreq_data *data)
-{
-        unsigned int cur_freq;
-        unsigned int i;
-
-        for (i = 0; i < 100; i++) {
-                cur_freq = extract_freq(get_cur_val(mask), data);
-                if (cur_freq == freq)
-                        return 1;
-                udelay(10);
-        }
-        return 0;
-}
-
-static int acpi_cpufreq_target(struct cpufreq_policy *policy,
-                               unsigned int target_freq, unsigned int relation)
-{
-        struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-        struct acpi_processor_performance *perf;
-        struct cpufreq_freqs freqs;
-        struct drv_cmd cmd;
-        unsigned int next_state = 0; /* Index into freq_table */
-        unsigned int next_perf_state = 0; /* Index into perf table */
-        unsigned int i;
-        int result = 0;
-
-        dprintk("acpi_cpufreq_target %d (%d)\n", target_freq, policy->cpu);
-
-        if (unlikely(data == NULL ||
-             data->acpi_data == NULL || data->freq_table == NULL)) {
-                return -ENODEV;
-        }
-
-        perf = data->acpi_data;
-        result = cpufreq_frequency_table_target(policy,
-                                                data->freq_table,
-                                                target_freq,
-                                                relation, &next_state);
-        if (unlikely(result)) {
-                result = -ENODEV;
-                goto out;
-        }
-
-        next_perf_state = data->freq_table[next_state].index;
-        if (perf->state == next_perf_state) {
-                if (unlikely(data->resume)) {
-                        dprintk("Called after resume, resetting to P%d\n",
-                                next_perf_state);
-                        data->resume = 0;
-                } else {
-                        dprintk("Already at target state (P%d)\n",
-                                next_perf_state);
-                        goto out;
-                }
-        }
-
-        switch (data->cpu_feature) {
-        case SYSTEM_INTEL_MSR_CAPABLE:
-                cmd.type = SYSTEM_INTEL_MSR_CAPABLE;
-                cmd.addr.msr.reg = MSR_IA32_PERF_CTL;
-                cmd.val = (u32) perf->states[next_perf_state].control;
-                break;
-        case SYSTEM_IO_CAPABLE:
-                cmd.type = SYSTEM_IO_CAPABLE;
-                cmd.addr.io.port = perf->control_register.address;
-                cmd.addr.io.bit_width = perf->control_register.bit_width;
-                cmd.val = (u32) perf->states[next_perf_state].control;
-                break;
-        default:
-                result = -ENODEV;
-                goto out;
-        }
-
-        /* cpufreq holds the hotplug lock, so we are safe from here on */
-        if (policy->shared_type != CPUFREQ_SHARED_TYPE_ANY)
-                cmd.mask = policy->cpus;
-        else
-                cmd.mask = cpumask_of(policy->cpu);
-
-        freqs.old = perf->states[perf->state].core_frequency * 1000;
-        freqs.new = data->freq_table[next_state].frequency;
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        }
-
-        drv_write(&cmd);
-
-        if (acpi_pstate_strict) {
-                if (!check_freqs(cmd.mask, freqs.new, data)) {
-                        dprintk("acpi_cpufreq_target failed (%d)\n",
-                                policy->cpu);
-                        result = -EAGAIN;
-                        goto out;
-                }
-        }
-
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
-        perf->state = next_perf_state;
-
-out:
-        return result;
-}
-
-static int acpi_cpufreq_verify(struct cpufreq_policy *policy)
-{
-        struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-
-        dprintk("acpi_cpufreq_verify\n");
-
-        return cpufreq_frequency_table_verify(policy, data->freq_table);
-}
-
-static unsigned long
-acpi_cpufreq_guess_freq(struct acpi_cpufreq_data *data, unsigned int cpu)
-{
-        struct acpi_processor_performance *perf = data->acpi_data;
-
-        if (cpu_khz) {
-                /* search the closest match to cpu_khz */
-                unsigned int i;
-                unsigned long freq;
-                unsigned long freqn = perf->states[0].core_frequency * 1000;
-
-                for (i = 0; i < (perf->state_count-1); i++) {
-                        freq = freqn;
-                        freqn = perf->states[i+1].core_frequency * 1000;
-                        if ((2 * cpu_khz) > (freqn + freq)) {
-                                perf->state = i;
-                                return freq;
-                        }
-                }
-                perf->state = perf->state_count-1;
-                return freqn;
-        } else {
-                /* assume CPU is at P0... */
-                perf->state = 0;
-                return perf->states[0].core_frequency * 1000;
-        }
-}
-
-static void free_acpi_perf_data(void)
-{
-        unsigned int i;
-
-        /* Freeing a NULL pointer is OK, and alloc_percpu zeroes. */
-        for_each_possible_cpu(i)
-                free_cpumask_var(per_cpu_ptr(acpi_perf_data, i)
-                                 ->shared_cpu_map);
-        free_percpu(acpi_perf_data);
-}
-
-/*
- * acpi_cpufreq_early_init - initialize ACPI P-States library
- *
- * Initialize the ACPI P-States library (drivers/acpi/processor_perflib.c)
- * in order to determine correct frequency and voltage pairings. We can
- * do _PDC and _PSD and find out the processor dependency for the
- * actual init that will happen later...
- */
-static int __init acpi_cpufreq_early_init(void)
-{
-        unsigned int i;
-        dprintk("acpi_cpufreq_early_init\n");
-
-        acpi_perf_data = alloc_percpu(struct acpi_processor_performance);
-        if (!acpi_perf_data) {
-                dprintk("Memory allocation error for acpi_perf_data.\n");
-                return -ENOMEM;
-        }
-        for_each_possible_cpu(i) {
-                if (!zalloc_cpumask_var_node(
-                        &per_cpu_ptr(acpi_perf_data, i)->shared_cpu_map,
-                        GFP_KERNEL, cpu_to_node(i))) {
-
-                        /* Freeing a NULL pointer is OK: alloc_percpu zeroes. */
-                        free_acpi_perf_data();
-                        return -ENOMEM;
-                }
-        }
-
-        /* Do initialization in ACPI core */
-        acpi_processor_preregister_performance(acpi_perf_data);
-        return 0;
-}
-
-#ifdef CONFIG_SMP
-/*
- * Some BIOSes do SW_ANY coordination internally, either set it up in hw
- * or do it in BIOS firmware and won't inform about it to OS. If not
- * detected, this has a side effect of making CPU run at a different speed
- * than OS intended it to run at. Detect it and handle it cleanly.
- */
-static int bios_with_sw_any_bug;
-
-static int sw_any_bug_found(const struct dmi_system_id *d)
-{
-        bios_with_sw_any_bug = 1;
-        return 0;
-}
-
-static const struct dmi_system_id sw_any_bug_dmi_table[] = {
-        {
-                .callback = sw_any_bug_found,
-                .ident = "Supermicro Server X6DLP",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Supermicro"),
-                        DMI_MATCH(DMI_BIOS_VERSION, "080010"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
-                },
-        },
-        { }
-};
-
-static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
-{
-        /* Intel Xeon Processor 7100 Series Specification Update
-         * http://www.intel.com/Assets/PDF/specupdate/314554.pdf
-         * AL30: A Machine Check Exception (MCE) Occurring during an
-         * Enhanced Intel SpeedStep Technology Ratio Change May Cause
-         * Both Processor Cores to Lock Up. */
-        if (c->x86_vendor == X86_VENDOR_INTEL) {
-                if ((c->x86 == 15) &&
-                    (c->x86_model == 6) &&
-                    (c->x86_mask == 8)) {
-                        printk(KERN_INFO "acpi-cpufreq: Intel(R) "
-                            "Xeon(R) 7100 Errata AL30, processors may "
-                            "lock up on frequency changes: disabling "
-                            "acpi-cpufreq.\n");
-                        return -ENODEV;
-                    }
-                }
-        return 0;
-}
-#endif
-
-static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
-{
-        unsigned int i;
-        unsigned int valid_states = 0;
-        unsigned int cpu = policy->cpu;
-        struct acpi_cpufreq_data *data;
-        unsigned int result = 0;
-        struct cpuinfo_x86 *c = &cpu_data(policy->cpu);
-        struct acpi_processor_performance *perf;
-#ifdef CONFIG_SMP
-        static int blacklisted;
-#endif
-
-        dprintk("acpi_cpufreq_cpu_init\n");
-
-#ifdef CONFIG_SMP
-        if (blacklisted)
-                return blacklisted;
-        blacklisted = acpi_cpufreq_blacklist(c);
-        if (blacklisted)
-                return blacklisted;
-#endif
-
-        data = kzalloc(sizeof(struct acpi_cpufreq_data), GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-
-        data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
-        per_cpu(acfreq_data, cpu) = data;
-
-        if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
-                acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
-
-        result = acpi_processor_register_performance(data->acpi_data, cpu);
-        if (result)
-                goto err_free;
-
-        perf = data->acpi_data;
-        policy->shared_type = perf->shared_type;
-
-        /*
-         * Will let policy->cpus know about dependency only when software
-         * coordination is required.
-         */
-        if (policy->shared_type == CPUFREQ_SHARED_TYPE_ALL ||
-            policy->shared_type == CPUFREQ_SHARED_TYPE_ANY) {
-                cpumask_copy(policy->cpus, perf->shared_cpu_map);
-        }
-        cpumask_copy(policy->related_cpus, perf->shared_cpu_map);
-
-#ifdef CONFIG_SMP
-        dmi_check_system(sw_any_bug_dmi_table);
-        if (bios_with_sw_any_bug && cpumask_weight(policy->cpus) == 1) {
-                policy->shared_type = CPUFREQ_SHARED_TYPE_ALL;
-                cpumask_copy(policy->cpus, cpu_core_mask(cpu));
-        }
-#endif
-
-        /* capability check */
-        if (perf->state_count <= 1) {
-                dprintk("No P-States\n");
-                result = -ENODEV;
-                goto err_unreg;
-        }
-
-        if (perf->control_register.space_id != perf->status_register.space_id) {
-                result = -ENODEV;
-                goto err_unreg;
-        }
-
-        switch (perf->control_register.space_id) {
-        case ACPI_ADR_SPACE_SYSTEM_IO:
-                dprintk("SYSTEM IO addr space\n");
-                data->cpu_feature = SYSTEM_IO_CAPABLE;
-                break;
-        case ACPI_ADR_SPACE_FIXED_HARDWARE:
-                dprintk("HARDWARE addr space\n");
-                if (!check_est_cpu(cpu)) {
-                        result = -ENODEV;
-                        goto err_unreg;
-                }
-                data->cpu_feature = SYSTEM_INTEL_MSR_CAPABLE;
-                break;
-        default:
-                dprintk("Unknown addr space %d\n",
-                        (u32) (perf->control_register.space_id));
-                result = -ENODEV;
-                goto err_unreg;
-        }
-
-        data->freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) *
-                    (perf->state_count+1), GFP_KERNEL);
-        if (!data->freq_table) {
-                result = -ENOMEM;
-                goto err_unreg;
-        }
-
-        /* detect transition latency */
-        policy->cpuinfo.transition_latency = 0;
-        for (i = 0; i < perf->state_count; i++) {
-                if ((perf->states[i].transition_latency * 1000) >
-                    policy->cpuinfo.transition_latency)
-                        policy->cpuinfo.transition_latency =
-                            perf->states[i].transition_latency * 1000;
-        }
-
-        /* Check for high latency (>20uS) from buggy BIOSes, like on T42 */
-        if (perf->control_register.space_id == ACPI_ADR_SPACE_FIXED_HARDWARE &&
-            policy->cpuinfo.transition_latency > 20 * 1000) {
-                policy->cpuinfo.transition_latency = 20 * 1000;
-                printk_once(KERN_INFO
-                            "P-state transition latency capped at 20 uS\n");
-        }
-
-        /* table init */
-        for (i = 0; i < perf->state_count; i++) {
-                if (i > 0 && perf->states[i].core_frequency >=
-                    data->freq_table[valid_states-1].frequency / 1000)
-                        continue;
-
-                data->freq_table[valid_states].index = i;
-                data->freq_table[valid_states].frequency =
-                    perf->states[i].core_frequency * 1000;
-                valid_states++;
-        }
-        data->freq_table[valid_states].frequency = CPUFREQ_TABLE_END;
-        perf->state = 0;
-
-        result = cpufreq_frequency_table_cpuinfo(policy, data->freq_table);
-        if (result)
-                goto err_freqfree;
-
-        if (perf->states[0].core_frequency * 1000 != policy->cpuinfo.max_freq)
-                printk(KERN_WARNING FW_WARN "P-state 0 is not max freq\n");
-
-        switch (perf->control_register.space_id) {
-        case ACPI_ADR_SPACE_SYSTEM_IO:
-                /* Current speed is unknown and not detectable by IO port */
-                policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
-                break;
-        case ACPI_ADR_SPACE_FIXED_HARDWARE:
-                acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
-                policy->cur = get_cur_freq_on_cpu(cpu);
-                break;
-        default:
-                break;
-        }
-
-        /* notify BIOS that we exist */
-        acpi_processor_notify_smm(THIS_MODULE);
-
-        /* Check for APERF/MPERF support in hardware */
-        if (cpu_has(c, X86_FEATURE_APERFMPERF))
-                acpi_cpufreq_driver.getavg = cpufreq_get_measured_perf;
-
-        dprintk("CPU%u - ACPI performance management activated.\n", cpu);
-        for (i = 0; i < perf->state_count; i++)
-                dprintk("     %cP%d: %d MHz, %d mW, %d uS\n",
-                        (i == perf->state ? '*' : ' '), i,
-                        (u32) perf->states[i].core_frequency,
-                        (u32) perf->states[i].power,
-                        (u32) perf->states[i].transition_latency);
-
-        cpufreq_frequency_table_get_attr(data->freq_table, policy->cpu);
-
-        /*
-         * the first call to ->target() should result in us actually
-         * writing something to the appropriate registers.
-         */
-        data->resume = 1;
-
-        return result;
-
-err_freqfree:
-        kfree(data->freq_table);
-err_unreg:
-        acpi_processor_unregister_performance(perf, cpu);
-err_free:
-        kfree(data);
-        per_cpu(acfreq_data, cpu) = NULL;
-
-        return result;
-}
-
-static int acpi_cpufreq_cpu_exit(struct cpufreq_policy *policy)
-{
-        struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-
-        dprintk("acpi_cpufreq_cpu_exit\n");
-
-        if (data) {
-                cpufreq_frequency_table_put_attr(policy->cpu);
-                per_cpu(acfreq_data, policy->cpu) = NULL;
-                acpi_processor_unregister_performance(data->acpi_data,
-                                                      policy->cpu);
-                kfree(data->freq_table);
-                kfree(data);
-        }
-
-        return 0;
-}
-
-static int acpi_cpufreq_resume(struct cpufreq_policy *policy)
-{
-        struct acpi_cpufreq_data *data = per_cpu(acfreq_data, policy->cpu);
-
-        dprintk("acpi_cpufreq_resume\n");
-
-        data->resume = 1;
-
-        return 0;
-}
-
-static struct freq_attr *acpi_cpufreq_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver acpi_cpufreq_driver = {
-        .verify         = acpi_cpufreq_verify,
-        .target         = acpi_cpufreq_target,
-        .bios_limit     = acpi_processor_get_bios_limit,
-        .init           = acpi_cpufreq_cpu_init,
-        .exit           = acpi_cpufreq_cpu_exit,
-        .resume         = acpi_cpufreq_resume,
-        .name           = "acpi-cpufreq",
-        .owner          = THIS_MODULE,
-        .attr           = acpi_cpufreq_attr,
-};
-
-static int __init acpi_cpufreq_init(void)
-{
-        int ret;
-
-        if (acpi_disabled)
-                return 0;
-
-        dprintk("acpi_cpufreq_init\n");
-
-        ret = acpi_cpufreq_early_init();
-        if (ret)
-                return ret;
-
-        ret = cpufreq_register_driver(&acpi_cpufreq_driver);
-        if (ret)
-                free_acpi_perf_data();
-
-        return ret;
-}
-
-static void __exit acpi_cpufreq_exit(void)
-{
-        dprintk("acpi_cpufreq_exit\n");
-
-        cpufreq_unregister_driver(&acpi_cpufreq_driver);
-
-        free_percpu(acpi_perf_data);
-}
-
-module_param(acpi_pstate_strict, uint, 0644);
-MODULE_PARM_DESC(acpi_pstate_strict,
-        "value 0 or non-zero. non-zero -> strict ACPI checks are "
-        "performed during frequency changes.");
-
-late_initcall(acpi_cpufreq_init);
-module_exit(acpi_cpufreq_exit);
-
-MODULE_ALIAS("acpi");
diff --git a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c b/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
deleted file mode 100644
index 141abebc4516..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * (C) 2004-2006  Sebastian Witt <se.witt@gmx.net>
- *
- *  Licensed under the terms of the GNU GPL License version 2.
- *  Based upon reverse engineered information
- *
- *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-
-#define NFORCE2_XTAL 25
-#define NFORCE2_BOOTFSB 0x48
-#define NFORCE2_PLLENABLE 0xa8
-#define NFORCE2_PLLREG 0xa4
-#define NFORCE2_PLLADR 0xa0
-#define NFORCE2_PLL(mul, div) (0x100000 | (mul << 8) | div)
-
-#define NFORCE2_MIN_FSB 50
-#define NFORCE2_SAFE_DISTANCE 50
-
-/* Delay in ms between FSB changes */
-/* #define NFORCE2_DELAY 10 */
-
-/*
- * nforce2_chipset:
- * FSB is changed using the chipset
- */
-static struct pci_dev *nforce2_dev;
-
-/* fid:
- * multiplier * 10
- */
-static int fid;
-
-/* min_fsb, max_fsb:
- * minimum and maximum FSB (= FSB at boot time)
- */
-static int min_fsb;
-static int max_fsb;
-
-MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
-MODULE_DESCRIPTION("nForce2 FSB changing cpufreq driver");
-MODULE_LICENSE("GPL");
-
-module_param(fid, int, 0444);
-module_param(min_fsb, int, 0444);
-
-MODULE_PARM_DESC(fid, "CPU multiplier to use (11.5 = 115)");
-MODULE_PARM_DESC(min_fsb,
-                "Minimum FSB to use, if not defined: current FSB - 50");
-
-#define PFX "cpufreq-nforce2: "
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \
-                "cpufreq-nforce2", msg)
-
-/**
- * nforce2_calc_fsb - calculate FSB
- * @pll: PLL value
- *
- *   Calculates FSB from PLL value
- */
-static int nforce2_calc_fsb(int pll)
-{
-        unsigned char mul, div;
-
-        mul = (pll >> 8) & 0xff;
-        div = pll & 0xff;
-
-        if (div > 0)
-                return NFORCE2_XTAL * mul / div;
-
-        return 0;
-}
-
-/**
- * nforce2_calc_pll - calculate PLL value
- * @fsb: FSB
- *
- *   Calculate PLL value for given FSB
- */
-static int nforce2_calc_pll(unsigned int fsb)
-{
-        unsigned char xmul, xdiv;
-        unsigned char mul = 0, div = 0;
-        int tried = 0;
-
-        /* Try to calculate multiplier and divider up to 4 times */
-        while (((mul == 0) || (div == 0)) && (tried <= 3)) {
-                for (xdiv = 2; xdiv <= 0x80; xdiv++)
-                        for (xmul = 1; xmul <= 0xfe; xmul++)
-                                if (nforce2_calc_fsb(NFORCE2_PLL(xmul, xdiv)) ==
-                                    fsb + tried) {
-                                        mul = xmul;
-                                        div = xdiv;
-                                }
-                tried++;
-        }
-
-        if ((mul == 0) || (div == 0))
-                return -1;
-
-        return NFORCE2_PLL(mul, div);
-}
-
-/**
- * nforce2_write_pll - write PLL value to chipset
- * @pll: PLL value
- *
- *   Writes new FSB PLL value to chipset
- */
-static void nforce2_write_pll(int pll)
-{
-        int temp;
-
-        /* Set the pll addr. to 0x00 */
-        pci_write_config_dword(nforce2_dev, NFORCE2_PLLADR, 0);
-
-        /* Now write the value in all 64 registers */
-        for (temp = 0; temp <= 0x3f; temp++)
-                pci_write_config_dword(nforce2_dev, NFORCE2_PLLREG, pll);
-
-        return;
-}
-
-/**
- * nforce2_fsb_read - Read FSB
- *
- *   Read FSB from chipset
- *   If bootfsb != 0, return FSB at boot-time
- */
-static unsigned int nforce2_fsb_read(int bootfsb)
-{
-        struct pci_dev *nforce2_sub5;
-        u32 fsb, temp = 0;
-
-        /* Get chipset boot FSB from subdevice 5 (FSB at boot-time) */
-        nforce2_sub5 = pci_get_subsys(PCI_VENDOR_ID_NVIDIA, 0x01EF,
-                                PCI_ANY_ID, PCI_ANY_ID, NULL);
-        if (!nforce2_sub5)
-                return 0;
-
-        pci_read_config_dword(nforce2_sub5, NFORCE2_BOOTFSB, &fsb);
-        fsb /= 1000000;
-
-        /* Check if PLL register is already set */
-        pci_read_config_byte(nforce2_dev, NFORCE2_PLLENABLE, (u8 *)&temp);
-
-        if (bootfsb || !temp)
-                return fsb;
-
-        /* Use PLL register FSB value */
-        pci_read_config_dword(nforce2_dev, NFORCE2_PLLREG, &temp);
-        fsb = nforce2_calc_fsb(temp);
-
-        return fsb;
-}
-
-/**
- * nforce2_set_fsb - set new FSB
- * @fsb: New FSB
- *
- *   Sets new FSB
- */
-static int nforce2_set_fsb(unsigned int fsb)
-{
-        u32 temp = 0;
-        unsigned int tfsb;
-        int diff;
-        int pll = 0;
-
-        if ((fsb > max_fsb) || (fsb < NFORCE2_MIN_FSB)) {
-                printk(KERN_ERR PFX "FSB %d is out of range!\n", fsb);
-                return -EINVAL;
-        }
-
-        tfsb = nforce2_fsb_read(0);
-        if (!tfsb) {
-                printk(KERN_ERR PFX "Error while reading the FSB\n");
-                return -EINVAL;
-        }
-
-        /* First write? Then set actual value */
-        pci_read_config_byte(nforce2_dev, NFORCE2_PLLENABLE, (u8 *)&temp);
-        if (!temp) {
-                pll = nforce2_calc_pll(tfsb);
-
-                if (pll < 0)
-                        return -EINVAL;
-
-                nforce2_write_pll(pll);
-        }
-
-        /* Enable write access */
-        temp = 0x01;
-        pci_write_config_byte(nforce2_dev, NFORCE2_PLLENABLE, (u8)temp);
-
-        diff = tfsb - fsb;
-
-        if (!diff)
-                return 0;
-
-        while ((tfsb != fsb) && (tfsb <= max_fsb) && (tfsb >= min_fsb)) {
-                if (diff < 0)
-                        tfsb++;
-                else
-                        tfsb--;
-
-                /* Calculate the PLL reg. value */
-                pll = nforce2_calc_pll(tfsb);
-                if (pll == -1)
-                        return -EINVAL;
-
-                nforce2_write_pll(pll);
-#ifdef NFORCE2_DELAY
-                mdelay(NFORCE2_DELAY);
-#endif
-        }
-
-        temp = 0x40;
-        pci_write_config_byte(nforce2_dev, NFORCE2_PLLADR, (u8)temp);
-
-        return 0;
-}
-
-/**
- * nforce2_get - get the CPU frequency
- * @cpu: CPU number
- *
- * Returns the CPU frequency
- */
-static unsigned int nforce2_get(unsigned int cpu)
-{
-        if (cpu)
-                return 0;
-        return nforce2_fsb_read(0) * fid * 100;
-}
-
-/**
- * nforce2_target - set a new CPUFreq policy
- * @policy: new policy
- * @target_freq: the target frequency
- * @relation: how that frequency relates to achieved frequency
- *  (CPUFREQ_RELATION_L or CPUFREQ_RELATION_H)
- *
- * Sets a new CPUFreq policy.
- */
-static int nforce2_target(struct cpufreq_policy *policy,
-                          unsigned int target_freq, unsigned int relation)
-{
-/*        unsigned long         flags; */
-        struct cpufreq_freqs freqs;
-        unsigned int target_fsb;
-
-        if ((target_freq > policy->max) || (target_freq < policy->min))
-                return -EINVAL;
-
-        target_fsb = target_freq / (fid * 100);
-
-        freqs.old = nforce2_get(policy->cpu);
-        freqs.new = target_fsb * fid * 100;
-        freqs.cpu = 0;          /* Only one CPU on nForce2 platforms */
-
-        if (freqs.old == freqs.new)
-                return 0;
-
-        dprintk("Old CPU frequency %d kHz, new %d kHz\n",
-               freqs.old, freqs.new);
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        /* Disable IRQs */
-        /* local_irq_save(flags); */
-
-        if (nforce2_set_fsb(target_fsb) < 0)
-                printk(KERN_ERR PFX "Changing FSB to %d failed\n",
-                        target_fsb);
-        else
-                dprintk("Changed FSB successfully to %d\n",
-                        target_fsb);
-
-        /* Enable IRQs */
-        /* local_irq_restore(flags); */
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        return 0;
-}
-
-/**
- * nforce2_verify - verifies a new CPUFreq policy
- * @policy: new policy
- */
-static int nforce2_verify(struct cpufreq_policy *policy)
-{
-        unsigned int fsb_pol_max;
-
-        fsb_pol_max = policy->max / (fid * 100);
-
-        if (policy->min < (fsb_pol_max * fid * 100))
-                policy->max = (fsb_pol_max + 1) * fid * 100;
-
-        cpufreq_verify_within_limits(policy,
-                                     policy->cpuinfo.min_freq,
-                                     policy->cpuinfo.max_freq);
-        return 0;
-}
-
-static int nforce2_cpu_init(struct cpufreq_policy *policy)
-{
-        unsigned int fsb;
-        unsigned int rfid;
-
-        /* capability check */
-        if (policy->cpu != 0)
-                return -ENODEV;
-
-        /* Get current FSB */
-        fsb = nforce2_fsb_read(0);
-
-        if (!fsb)
-                return -EIO;
-
-        /* FIX: Get FID from CPU */
-        if (!fid) {
-                if (!cpu_khz) {
-                        printk(KERN_WARNING PFX
-                        "cpu_khz not set, can't calculate multiplier!\n");
-                        return -ENODEV;
-                }
-
-                fid = cpu_khz / (fsb * 100);
-                rfid = fid % 5;
-
-                if (rfid) {
-                        if (rfid > 2)
-                                fid += 5 - rfid;
-                        else
-                                fid -= rfid;
-                }
-        }
-
-        printk(KERN_INFO PFX "FSB currently at %i MHz, FID %d.%d\n", fsb,
-               fid / 10, fid % 10);
-
-        /* Set maximum FSB to FSB at boot time */
-        max_fsb = nforce2_fsb_read(1);
-
-        if (!max_fsb)
-                return -EIO;
-
-        if (!min_fsb)
-                min_fsb = max_fsb - NFORCE2_SAFE_DISTANCE;
-
-        if (min_fsb < NFORCE2_MIN_FSB)
-                min_fsb = NFORCE2_MIN_FSB;
-
-        /* cpuinfo and default policy values */
-        policy->cpuinfo.min_freq = min_fsb * fid * 100;
-        policy->cpuinfo.max_freq = max_fsb * fid * 100;
-        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
-        policy->cur = nforce2_get(policy->cpu);
-        policy->min = policy->cpuinfo.min_freq;
-        policy->max = policy->cpuinfo.max_freq;
-
-        return 0;
-}
-
-static int nforce2_cpu_exit(struct cpufreq_policy *policy)
-{
-        return 0;
-}
-
-static struct cpufreq_driver nforce2_driver = {
-        .name = "nforce2",
-        .verify = nforce2_verify,
-        .target = nforce2_target,
-        .get = nforce2_get,
-        .init = nforce2_cpu_init,
-        .exit = nforce2_cpu_exit,
-        .owner = THIS_MODULE,
-};
-
-/**
- * nforce2_detect_chipset - detect the Southbridge which contains FSB PLL logic
- *
- * Detects nForce2 A2 and C1 stepping
- *
- */
-static int nforce2_detect_chipset(void)
-{
-        nforce2_dev = pci_get_subsys(PCI_VENDOR_ID_NVIDIA,
-                                        PCI_DEVICE_ID_NVIDIA_NFORCE2,
-                                        PCI_ANY_ID, PCI_ANY_ID, NULL);
-
-        if (nforce2_dev == NULL)
-                return -ENODEV;
-
-        printk(KERN_INFO PFX "Detected nForce2 chipset revision %X\n",
-               nforce2_dev->revision);
-        printk(KERN_INFO PFX
-               "FSB changing is maybe unstable and can lead to "
-               "crashes and data loss.\n");
-
-        return 0;
-}
-
-/**
- * nforce2_init - initializes the nForce2 CPUFreq driver
- *
- * Initializes the nForce2 FSB support. Returns -ENODEV on unsupported
- * devices, -EINVAL on problems during initiatization, and zero on
- * success.
- */
-static int __init nforce2_init(void)
-{
-        /* TODO: do we need to detect the processor? */
-
-        /* detect chipset */
-        if (nforce2_detect_chipset()) {
-                printk(KERN_INFO PFX "No nForce2 chipset.\n");
-                return -ENODEV;
-        }
-
-        return cpufreq_register_driver(&nforce2_driver);
-}
-
-/**
- * nforce2_exit - unregisters cpufreq module
- *
- *   Unregisters nForce2 FSB change support.
- */
-static void __exit nforce2_exit(void)
-{
-        cpufreq_unregister_driver(&nforce2_driver);
-}
-
-module_init(nforce2_init);
-module_exit(nforce2_exit);
-
diff --git a/arch/x86/kernel/cpu/cpufreq/e_powersaver.c b/arch/x86/kernel/cpu/cpufreq/e_powersaver.c
deleted file mode 100644
index 35a257dd4bb7..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/e_powersaver.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- *  Based on documentation provided by Dave Jones. Thanks!
- *
- *  Licensed under the terms of the GNU GPL License version 2.
- *
- *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/timex.h>
-#include <linux/io.h>
-#include <linux/delay.h>
-
-#include <asm/msr.h>
-#include <asm/tsc.h>
-
-#define EPS_BRAND_C7M   0
-#define EPS_BRAND_C7    1
-#define EPS_BRAND_EDEN  2
-#define EPS_BRAND_C3    3
-#define EPS_BRAND_C7D   4
-
-struct eps_cpu_data {
-        u32 fsb;
-        struct cpufreq_frequency_table freq_table[];
-};
-
-static struct eps_cpu_data *eps_cpu[NR_CPUS];
-
-
-static unsigned int eps_get(unsigned int cpu)
-{
-        struct eps_cpu_data *centaur;
-        u32 lo, hi;
-
-        if (cpu)
-                return 0;
-        centaur = eps_cpu[cpu];
-        if (centaur == NULL)
-                return 0;
-
-        /* Return current frequency */
-        rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
-        return centaur->fsb * ((lo >> 8) & 0xff);
-}
-
-static int eps_set_state(struct eps_cpu_data *centaur,
-                         unsigned int cpu,
-                         u32 dest_state)
-{
-        struct cpufreq_freqs freqs;
-        u32 lo, hi;
-        int err = 0;
-        int i;
-
-        freqs.old = eps_get(cpu);
-        freqs.new = centaur->fsb * ((dest_state >> 8) & 0xff);
-        freqs.cpu = cpu;
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        /* Wait while CPU is busy */
-        rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
-        i = 0;
-        while (lo & ((1 << 16) | (1 << 17))) {
-                udelay(16);
-                rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
-                i++;
-                if (unlikely(i > 64)) {
-                        err = -ENODEV;
-                        goto postchange;
-                }
-        }
-        /* Set new multiplier and voltage */
-        wrmsr(MSR_IA32_PERF_CTL, dest_state & 0xffff, 0);
-        /* Wait until transition end */
-        i = 0;
-        do {
-                udelay(16);
-                rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
-                i++;
-                if (unlikely(i > 64)) {
-                        err = -ENODEV;
-                        goto postchange;
-                }
-        } while (lo & ((1 << 16) | (1 << 17)));
-
-        /* Return current frequency */
-postchange:
-        rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
-        freqs.new = centaur->fsb * ((lo >> 8) & 0xff);
-
-#ifdef DEBUG
-        {
-        u8 current_multiplier, current_voltage;
-
-        /* Print voltage and multiplier */
-        rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
-        current_voltage = lo & 0xff;
-        printk(KERN_INFO "eps: Current voltage = %dmV\n",
-                current_voltage * 16 + 700);
-        current_multiplier = (lo >> 8) & 0xff;
-        printk(KERN_INFO "eps: Current multiplier = %d\n",
-                current_multiplier);
-        }
-#endif
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        return err;
-}
-
-static int eps_target(struct cpufreq_policy *policy,
-                               unsigned int target_freq,
-                               unsigned int relation)
-{
-        struct eps_cpu_data *centaur;
-        unsigned int newstate = 0;
-        unsigned int cpu = policy->cpu;
-        unsigned int dest_state;
-        int ret;
-
-        if (unlikely(eps_cpu[cpu] == NULL))
-                return -ENODEV;
-        centaur = eps_cpu[cpu];
-
-        if (unlikely(cpufreq_frequency_table_target(policy,
-                        &eps_cpu[cpu]->freq_table[0],
-                        target_freq,
-                        relation,
-                        &newstate))) {
-                return -EINVAL;
-        }
-
-        /* Make frequency transition */
-        dest_state = centaur->freq_table[newstate].index & 0xffff;
-        ret = eps_set_state(centaur, cpu, dest_state);
-        if (ret)
-                printk(KERN_ERR "eps: Timeout!\n");
-        return ret;
-}
-
-static int eps_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy,
-                        &eps_cpu[policy->cpu]->freq_table[0]);
-}
-
-static int eps_cpu_init(struct cpufreq_policy *policy)
-{
-        unsigned int i;
-        u32 lo, hi;
-        u64 val;
-        u8 current_multiplier, current_voltage;
-        u8 max_multiplier, max_voltage;
-        u8 min_multiplier, min_voltage;
-        u8 brand = 0;
-        u32 fsb;
-        struct eps_cpu_data *centaur;
-        struct cpuinfo_x86 *c = &cpu_data(0);
-        struct cpufreq_frequency_table *f_table;
-        int k, step, voltage;
-        int ret;
-        int states;
-
-        if (policy->cpu != 0)
-                return -ENODEV;
-
-        /* Check brand */
-        printk(KERN_INFO "eps: Detected VIA ");
-
-        switch (c->x86_model) {
-        case 10:
-                rdmsr(0x1153, lo, hi);
-                brand = (((lo >> 2) ^ lo) >> 18) & 3;
-                printk(KERN_CONT "Model A ");
-                break;
-        case 13:
-                rdmsr(0x1154, lo, hi);
-                brand = (((lo >> 4) ^ (lo >> 2))) & 0x000000ff;
-                printk(KERN_CONT "Model D ");
-                break;
-        }
-
-        switch (brand) {
-        case EPS_BRAND_C7M:
-                printk(KERN_CONT "C7-M\n");
-                break;
-        case EPS_BRAND_C7:
-                printk(KERN_CONT "C7\n");
-                break;
-        case EPS_BRAND_EDEN:
-                printk(KERN_CONT "Eden\n");
-                break;
-        case EPS_BRAND_C7D:
-                printk(KERN_CONT "C7-D\n");
-                break;
-        case EPS_BRAND_C3:
-                printk(KERN_CONT "C3\n");
-                return -ENODEV;
-                break;
-        }
-        /* Enable Enhanced PowerSaver */
-        rdmsrl(MSR_IA32_MISC_ENABLE, val);
-        if (!(val & MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP)) {
-                val |= MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP;
-                wrmsrl(MSR_IA32_MISC_ENABLE, val);
-                /* Can be locked at 0 */
-                rdmsrl(MSR_IA32_MISC_ENABLE, val);
-                if (!(val & MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP)) {
-                        printk(KERN_INFO "eps: Can't enable Enhanced PowerSaver\n");
-                        return -ENODEV;
-                }
-        }
-
-        /* Print voltage and multiplier */
-        rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
-        current_voltage = lo & 0xff;
-        printk(KERN_INFO "eps: Current voltage = %dmV\n",
-                        current_voltage * 16 + 700);
-        current_multiplier = (lo >> 8) & 0xff;
-        printk(KERN_INFO "eps: Current multiplier = %d\n", current_multiplier);
-
-        /* Print limits */
-        max_voltage = hi & 0xff;
-        printk(KERN_INFO "eps: Highest voltage = %dmV\n",
-                        max_voltage * 16 + 700);
-        max_multiplier = (hi >> 8) & 0xff;
-        printk(KERN_INFO "eps: Highest multiplier = %d\n", max_multiplier);
-        min_voltage = (hi >> 16) & 0xff;
-        printk(KERN_INFO "eps: Lowest voltage = %dmV\n",
-                        min_voltage * 16 + 700);
-        min_multiplier = (hi >> 24) & 0xff;
-        printk(KERN_INFO "eps: Lowest multiplier = %d\n", min_multiplier);
-
-        /* Sanity checks */
-        if (current_multiplier == 0 || max_multiplier == 0
-            || min_multiplier == 0)
-                return -EINVAL;
-        if (current_multiplier > max_multiplier
-            || max_multiplier <= min_multiplier)
-                return -EINVAL;
-        if (current_voltage > 0x1f || max_voltage > 0x1f)
-                return -EINVAL;
-        if (max_voltage < min_voltage)
-                return -EINVAL;
-
-        /* Calc FSB speed */
-        fsb = cpu_khz / current_multiplier;
-        /* Calc number of p-states supported */
-        if (brand == EPS_BRAND_C7M)
-                states = max_multiplier - min_multiplier + 1;
-        else
-                states = 2;
-
-        /* Allocate private data and frequency table for current cpu */
-        centaur = kzalloc(sizeof(struct eps_cpu_data)
-                    + (states + 1) * sizeof(struct cpufreq_frequency_table),
-                    GFP_KERNEL);
-        if (!centaur)
-                return -ENOMEM;
-        eps_cpu[0] = centaur;
-
-        /* Copy basic values */
-        centaur->fsb = fsb;
-
-        /* Fill frequency and MSR value table */
-        f_table = &centaur->freq_table[0];
-        if (brand != EPS_BRAND_C7M) {
-                f_table[0].frequency = fsb * min_multiplier;
-                f_table[0].index = (min_multiplier << 8) | min_voltage;
-                f_table[1].frequency = fsb * max_multiplier;
-                f_table[1].index = (max_multiplier << 8) | max_voltage;
-                f_table[2].frequency = CPUFREQ_TABLE_END;
-        } else {
-                k = 0;
-                step = ((max_voltage - min_voltage) * 256)
-                        / (max_multiplier - min_multiplier);
-                for (i = min_multiplier; i <= max_multiplier; i++) {
-                        voltage = (k * step) / 256 + min_voltage;
-                        f_table[k].frequency = fsb * i;
-                        f_table[k].index = (i << 8) | voltage;
-                        k++;
-                }
-                f_table[k].frequency = CPUFREQ_TABLE_END;
-        }
-
-        policy->cpuinfo.transition_latency = 140000; /* 844mV -> 700mV in ns */
-        policy->cur = fsb * current_multiplier;
-
-        ret = cpufreq_frequency_table_cpuinfo(policy, &centaur->freq_table[0]);
-        if (ret) {
-                kfree(centaur);
-                return ret;
-        }
-
-        cpufreq_frequency_table_get_attr(&centaur->freq_table[0], policy->cpu);
-        return 0;
-}
-
-static int eps_cpu_exit(struct cpufreq_policy *policy)
-{
-        unsigned int cpu = policy->cpu;
-        struct eps_cpu_data *centaur;
-        u32 lo, hi;
-
-        if (eps_cpu[cpu] == NULL)
-                return -ENODEV;
-        centaur = eps_cpu[cpu];
-
-        /* Get max frequency */
-        rdmsr(MSR_IA32_PERF_STATUS, lo, hi);
-        /* Set max frequency */
-        eps_set_state(centaur, cpu, hi & 0xffff);
-        /* Bye */
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        kfree(eps_cpu[cpu]);
-        eps_cpu[cpu] = NULL;
-        return 0;
-}
-
-static struct freq_attr *eps_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver eps_driver = {
-        .verify         = eps_verify,
-        .target         = eps_target,
-        .init           = eps_cpu_init,
-        .exit           = eps_cpu_exit,
-        .get            = eps_get,
-        .name           = "e_powersaver",
-        .owner          = THIS_MODULE,
-        .attr           = eps_attr,
-};
-
-static int __init eps_init(void)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-
-        /* This driver will work only on Centaur C7 processors with
-         * Enhanced SpeedStep/PowerSaver registers */
-        if (c->x86_vendor != X86_VENDOR_CENTAUR
-            || c->x86 != 6 || c->x86_model < 10)
-                return -ENODEV;
-        if (!cpu_has(c, X86_FEATURE_EST))
-                return -ENODEV;
-
-        if (cpufreq_register_driver(&eps_driver))
-                return -EINVAL;
-        return 0;
-}
-
-static void __exit eps_exit(void)
-{
-        cpufreq_unregister_driver(&eps_driver);
-}
-
-MODULE_AUTHOR("Rafal Bilski <rafalbilski@interia.pl>");
-MODULE_DESCRIPTION("Enhanced PowerSaver driver for VIA C7 CPU's.");
-MODULE_LICENSE("GPL");
-
-module_init(eps_init);
-module_exit(eps_exit);
diff --git a/arch/x86/kernel/cpu/cpufreq/elanfreq.c b/arch/x86/kernel/cpu/cpufreq/elanfreq.c
deleted file mode 100644
index c587db472a75..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/elanfreq.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- *      elanfreq:       cpufreq driver for the AMD ELAN family
- *
- *      (c) Copyright 2002 Robert Schwebel <r.schwebel@pengutronix.de>
- *
- *      Parts of this code are (c) Sven Geggus <sven@geggus.net>
- *
- *      All Rights Reserved.
- *
- *      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.
- *
- *      2002-02-13: - initial revision for 2.4.18-pre9 by Robert Schwebel
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-
-#include <linux/delay.h>
-#include <linux/cpufreq.h>
-
-#include <asm/msr.h>
-#include <linux/timex.h>
-#include <linux/io.h>
-
-#define REG_CSCIR 0x22          /* Chip Setup and Control Index Register    */
-#define REG_CSCDR 0x23          /* Chip Setup and Control Data  Register    */
-
-/* Module parameter */
-static int max_freq;
-
-struct s_elan_multiplier {
-        int clock;              /* frequency in kHz                         */
-        int val40h;             /* PMU Force Mode register                  */
-        int val80h;             /* CPU Clock Speed Register                 */
-};
-
-/*
- * It is important that the frequencies
- * are listed in ascending order here!
- */
-static struct s_elan_multiplier elan_multiplier[] = {
-        {1000,  0x02,   0x18},
-        {2000,  0x02,   0x10},
-        {4000,  0x02,   0x08},
-        {8000,  0x00,   0x00},
-        {16000, 0x00,   0x02},
-        {33000, 0x00,   0x04},
-        {66000, 0x01,   0x04},
-        {99000, 0x01,   0x05}
-};
-
-static struct cpufreq_frequency_table elanfreq_table[] = {
-        {0,     1000},
-        {1,     2000},
-        {2,     4000},
-        {3,     8000},
-        {4,     16000},
-        {5,     33000},
-        {6,     66000},
-        {7,     99000},
-        {0,     CPUFREQ_TABLE_END},
-};
-
-
-/**
- *      elanfreq_get_cpu_frequency: determine current cpu speed
- *
- *      Finds out at which frequency the CPU of the Elan SOC runs
- *      at the moment. Frequencies from 1 to 33 MHz are generated
- *      the normal way, 66 and 99 MHz are called "Hyperspeed Mode"
- *      and have the rest of the chip running with 33 MHz.
- */
-
-static unsigned int elanfreq_get_cpu_frequency(unsigned int cpu)
-{
-        u8 clockspeed_reg;    /* Clock Speed Register */
-
-        local_irq_disable();
-        outb_p(0x80, REG_CSCIR);
-        clockspeed_reg = inb_p(REG_CSCDR);
-        local_irq_enable();
-
-        if ((clockspeed_reg & 0xE0) == 0xE0)
-                return 0;
-
-        /* Are we in CPU clock multiplied mode (66/99 MHz)? */
-        if ((clockspeed_reg & 0xE0) == 0xC0) {
-                if ((clockspeed_reg & 0x01) == 0)
-                        return 66000;
-                else
-                        return 99000;
-        }
-
-        /* 33 MHz is not 32 MHz... */
-        if ((clockspeed_reg & 0xE0) == 0xA0)
-                return 33000;
-
-        return (1<<((clockspeed_reg & 0xE0) >> 5)) * 1000;
-}
-
-
-/**
- *      elanfreq_set_cpu_frequency: Change the CPU core frequency
- *      @cpu: cpu number
- *      @freq: frequency in kHz
- *
- *      This function takes a frequency value and changes the CPU frequency
- *      according to this. Note that the frequency has to be checked by
- *      elanfreq_validatespeed() for correctness!
- *
- *      There is no return value.
- */
-
-static void elanfreq_set_cpu_state(unsigned int state)
-{
-        struct cpufreq_freqs    freqs;
-
-        freqs.old = elanfreq_get_cpu_frequency(0);
-        freqs.new = elan_multiplier[state].clock;
-        freqs.cpu = 0; /* elanfreq.c is UP only driver */
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        printk(KERN_INFO "elanfreq: attempting to set frequency to %i kHz\n",
-                        elan_multiplier[state].clock);
-
-
-        /*
-         * Access to the Elan's internal registers is indexed via
-         * 0x22: Chip Setup & Control Register Index Register (CSCI)
-         * 0x23: Chip Setup & Control Register Data  Register (CSCD)
-         *
-         */
-
-        /*
-         * 0x40 is the Power Management Unit's Force Mode Register.
-         * Bit 6 enables Hyperspeed Mode (66/100 MHz core frequency)
-         */
-
-        local_irq_disable();
-        outb_p(0x40, REG_CSCIR);                /* Disable hyperspeed mode */
-        outb_p(0x00, REG_CSCDR);
-        local_irq_enable();             /* wait till internal pipelines and */
-        udelay(1000);                   /* buffers have cleaned up          */
-
-        local_irq_disable();
-
-        /* now, set the CPU clock speed register (0x80) */
-        outb_p(0x80, REG_CSCIR);
-        outb_p(elan_multiplier[state].val80h, REG_CSCDR);
-
-        /* now, the hyperspeed bit in PMU Force Mode Register (0x40) */
-        outb_p(0x40, REG_CSCIR);
-        outb_p(elan_multiplier[state].val40h, REG_CSCDR);
-        udelay(10000);
-        local_irq_enable();
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-};
-
-
-/**
- *      elanfreq_validatespeed: test if frequency range is valid
- *      @policy: the policy to validate
- *
- *      This function checks if a given frequency range in kHz is valid
- *      for the hardware supported by the driver.
- */
-
-static int elanfreq_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, &elanfreq_table[0]);
-}
-
-static int elanfreq_target(struct cpufreq_policy *policy,
-                            unsigned int target_freq,
-                            unsigned int relation)
-{
-        unsigned int newstate = 0;
-
-        if (cpufreq_frequency_table_target(policy, &elanfreq_table[0],
-                                target_freq, relation, &newstate))
-                return -EINVAL;
-
-        elanfreq_set_cpu_state(newstate);
-
-        return 0;
-}
-
-
-/*
- *      Module init and exit code
- */
-
-static int elanfreq_cpu_init(struct cpufreq_policy *policy)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-        unsigned int i;
-        int result;
-
-        /* capability check */
-        if ((c->x86_vendor != X86_VENDOR_AMD) ||
-            (c->x86 != 4) || (c->x86_model != 10))
-                return -ENODEV;
-
-        /* max freq */
-        if (!max_freq)
-                max_freq = elanfreq_get_cpu_frequency(0);
-
-        /* table init */
-        for (i = 0; (elanfreq_table[i].frequency != CPUFREQ_TABLE_END); i++) {
-                if (elanfreq_table[i].frequency > max_freq)
-                        elanfreq_table[i].frequency = CPUFREQ_ENTRY_INVALID;
-        }
-
-        /* cpuinfo and default policy values */
-        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
-        policy->cur = elanfreq_get_cpu_frequency(0);
-
-        result = cpufreq_frequency_table_cpuinfo(policy, elanfreq_table);
-        if (result)
-                return result;
-
-        cpufreq_frequency_table_get_attr(elanfreq_table, policy->cpu);
-        return 0;
-}
-
-
-static int elanfreq_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        return 0;
-}
-
-
-#ifndef MODULE
-/**
- * elanfreq_setup - elanfreq command line parameter parsing
- *
- * elanfreq command line parameter.  Use:
- *  elanfreq=66000
- * to set the maximum CPU frequency to 66 MHz. Note that in
- * case you do not give this boot parameter, the maximum
- * frequency will fall back to _current_ CPU frequency which
- * might be lower. If you build this as a module, use the
- * max_freq module parameter instead.
- */
-static int __init elanfreq_setup(char *str)
-{
-        max_freq = simple_strtoul(str, &str, 0);
-        printk(KERN_WARNING "You're using the deprecated elanfreq command line option. Use elanfreq.max_freq instead, please!\n");
-        return 1;
-}
-__setup("elanfreq=", elanfreq_setup);
-#endif
-
-
-static struct freq_attr *elanfreq_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-
-static struct cpufreq_driver elanfreq_driver = {
-        .get            = elanfreq_get_cpu_frequency,
-        .verify         = elanfreq_verify,
-        .target         = elanfreq_target,
-        .init           = elanfreq_cpu_init,
-        .exit           = elanfreq_cpu_exit,
-        .name           = "elanfreq",
-        .owner          = THIS_MODULE,
-        .attr           = elanfreq_attr,
-};
-
-
-static int __init elanfreq_init(void)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-
-        /* Test if we have the right hardware */
-        if ((c->x86_vendor != X86_VENDOR_AMD) ||
-                (c->x86 != 4) || (c->x86_model != 10)) {
-                printk(KERN_INFO "elanfreq: error: no Elan processor found!\n");
-                return -ENODEV;
-        }
-        return cpufreq_register_driver(&elanfreq_driver);
-}
-
-
-static void __exit elanfreq_exit(void)
-{
-        cpufreq_unregister_driver(&elanfreq_driver);
-}
-
-
-module_param(max_freq, int, 0444);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Robert Schwebel <r.schwebel@pengutronix.de>, "
-                "Sven Geggus <sven@geggus.net>");
-MODULE_DESCRIPTION("cpufreq driver for AMD's Elan CPUs");
-
-module_init(elanfreq_init);
-module_exit(elanfreq_exit);
diff --git a/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c b/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c
deleted file mode 100644
index 32974cf84232..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/gx-suspmod.c
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
- *      Cyrix MediaGX and NatSemi Geode Suspend Modulation
- *      (C) 2002 Zwane Mwaikambo <zwane@commfireservices.com>
- *      (C) 2002 Hiroshi Miura   <miura@da-cha.org>
- *      All Rights Reserved
- *
- *      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
- *
- *      The author(s) of this software shall not be held liable for damages
- *      of any nature resulting due to the use of this software. This
- *      software is provided AS-IS with no warranties.
- *
- * Theoretical note:
- *
- *      (see Geode(tm) CS5530 manual (rev.4.1) page.56)
- *
- *      CPU frequency control on NatSemi Geode GX1/GXLV processor and CS55x0
- *      are based on Suspend Modulation.
- *
- *      Suspend Modulation works by asserting and de-asserting the SUSP# pin
- *      to CPU(GX1/GXLV) for configurable durations. When asserting SUSP#
- *      the CPU enters an idle state. GX1 stops its core clock when SUSP# is
- *      asserted then power consumption is reduced.
- *
- *      Suspend Modulation's OFF/ON duration are configurable
- *      with 'Suspend Modulation OFF Count Register'
- *      and 'Suspend Modulation ON Count Register'.
- *      These registers are 8bit counters that represent the number of
- *      32us intervals which the SUSP# pin is asserted(ON)/de-asserted(OFF)
- *      to the processor.
- *
- *      These counters define a ratio which is the effective frequency
- *      of operation of the system.
- *
- *                             OFF Count
- *      F_eff = Fgx * ----------------------
- *                      OFF Count + ON Count
- *
- *      0 <= On Count, Off Count <= 255
- *
- *      From these limits, we can get register values
- *
- *      off_duration + on_duration <= MAX_DURATION
- *      on_duration = off_duration * (stock_freq - freq) / freq
- *
- *      off_duration  =  (freq * DURATION) / stock_freq
- *      on_duration = DURATION - off_duration
- *
- *
- *---------------------------------------------------------------------------
- *
- * ChangeLog:
- *      Dec. 12, 2003   Hiroshi Miura <miura@da-cha.org>
- *              - fix on/off register mistake
- *              - fix cpu_khz calc when it stops cpu modulation.
- *
- *      Dec. 11, 2002   Hiroshi Miura <miura@da-cha.org>
- *              - rewrite for Cyrix MediaGX Cx5510/5520 and
- *                NatSemi Geode Cs5530(A).
- *
- *      Jul. ??, 2002  Zwane Mwaikambo <zwane@commfireservices.com>
- *              - cs5530_mod patch for 2.4.19-rc1.
- *
- *---------------------------------------------------------------------------
- *
- * Todo
- *      Test on machines with 5510, 5530, 5530A
- */
-
-/************************************************************************
- *                      Suspend Modulation - Definitions                *
- ************************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/smp.h>
-#include <linux/cpufreq.h>
-#include <linux/pci.h>
-#include <linux/errno.h>
-#include <linux/slab.h>
-
-#include <asm/processor-cyrix.h>
-
-/* PCI config registers, all at F0 */
-#define PCI_PMER1       0x80    /* power management enable register 1 */
-#define PCI_PMER2       0x81    /* power management enable register 2 */
-#define PCI_PMER3       0x82    /* power management enable register 3 */
-#define PCI_IRQTC       0x8c    /* irq speedup timer counter register:typical 2 to 4ms */
-#define PCI_VIDTC       0x8d    /* video speedup timer counter register: typical 50 to 100ms */
-#define PCI_MODOFF      0x94    /* suspend modulation OFF counter register, 1 = 32us */
-#define PCI_MODON       0x95    /* suspend modulation ON counter register */
-#define PCI_SUSCFG      0x96    /* suspend configuration register */
-
-/* PMER1 bits */
-#define GPM             (1<<0)  /* global power management */
-#define GIT             (1<<1)  /* globally enable PM device idle timers */
-#define GTR             (1<<2)  /* globally enable IO traps */
-#define IRQ_SPDUP       (1<<3)  /* disable clock throttle during interrupt handling */
-#define VID_SPDUP       (1<<4)  /* disable clock throttle during vga video handling */
-
-/* SUSCFG bits */
-#define SUSMOD          (1<<0)  /* enable/disable suspend modulation */
-/* the below is supported only with cs5530 (after rev.1.2)/cs5530A */
-#define SMISPDUP        (1<<1)  /* select how SMI re-enable suspend modulation: */
-                                /* IRQTC timer or read SMI speedup disable reg.(F1BAR[08-09h]) */
-#define SUSCFG          (1<<2)  /* enable powering down a GXLV processor. "Special 3Volt Suspend" mode */
-/* the below is supported only with cs5530A */
-#define PWRSVE_ISA      (1<<3)  /* stop ISA clock  */
-#define PWRSVE          (1<<4)  /* active idle */
-
-struct gxfreq_params {
-        u8 on_duration;
-        u8 off_duration;
-        u8 pci_suscfg;
-        u8 pci_pmer1;
-        u8 pci_pmer2;
-        struct pci_dev *cs55x0;
-};
-
-static struct gxfreq_params *gx_params;
-static int stock_freq;
-
-/* PCI bus clock - defaults to 30.000 if cpu_khz is not available */
-static int pci_busclk;
-module_param(pci_busclk, int, 0444);
-
-/* maximum duration for which the cpu may be suspended
- * (32us * MAX_DURATION). If no parameter is given, this defaults
- * to 255.
- * Note that this leads to a maximum of 8 ms(!) where the CPU clock
- * is suspended -- processing power is just 0.39% of what it used to be,
- * though. 781.25 kHz(!) for a 200 MHz processor -- wow. */
-static int max_duration = 255;
-module_param(max_duration, int, 0444);
-
-/* For the default policy, we want at least some processing power
- * - let's say 5%. (min = maxfreq / POLICY_MIN_DIV)
- */
-#define POLICY_MIN_DIV 20
-
-
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \
-                "gx-suspmod", msg)
-
-/**
- * we can detect a core multipiler from dir0_lsb
- * from GX1 datasheet p.56,
- *      MULT[3:0]:
- *      0000 = SYSCLK multiplied by 4 (test only)
- *      0001 = SYSCLK multiplied by 10
- *      0010 = SYSCLK multiplied by 4
- *      0011 = SYSCLK multiplied by 6
- *      0100 = SYSCLK multiplied by 9
- *      0101 = SYSCLK multiplied by 5
- *      0110 = SYSCLK multiplied by 7
- *      0111 = SYSCLK multiplied by 8
- *              of 33.3MHz
- **/
-static int gx_freq_mult[16] = {
-                4, 10, 4, 6, 9, 5, 7, 8,
-                0, 0, 0, 0, 0, 0, 0, 0
-};
-
-
-/****************************************************************
- *      Low Level chipset interface                             *
- ****************************************************************/
-static struct pci_device_id gx_chipset_tbl[] __initdata = {
-        { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY), },
-        { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5520), },
-        { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5510), },
-        { 0, },
-};
-
-static void gx_write_byte(int reg, int value)
-{
-        pci_write_config_byte(gx_params->cs55x0, reg, value);
-}
-
-/**
- * gx_detect_chipset:
- *
- **/
-static __init struct pci_dev *gx_detect_chipset(void)
-{
-        struct pci_dev *gx_pci = NULL;
-
-        /* check if CPU is a MediaGX or a Geode. */
-        if ((boot_cpu_data.x86_vendor != X86_VENDOR_NSC) &&
-            (boot_cpu_data.x86_vendor != X86_VENDOR_CYRIX)) {
-                dprintk("error: no MediaGX/Geode processor found!\n");
-                return NULL;
-        }
-
-        /* detect which companion chip is used */
-        for_each_pci_dev(gx_pci) {
-                if ((pci_match_id(gx_chipset_tbl, gx_pci)) != NULL)
-                        return gx_pci;
-        }
-
-        dprintk("error: no supported chipset found!\n");
-        return NULL;
-}
-
-/**
- * gx_get_cpuspeed:
- *
- * Finds out at which efficient frequency the Cyrix MediaGX/NatSemi
- * Geode CPU runs.
- */
-static unsigned int gx_get_cpuspeed(unsigned int cpu)
-{
-        if ((gx_params->pci_suscfg & SUSMOD) == 0)
-                return stock_freq;
-
-        return (stock_freq * gx_params->off_duration)
-                / (gx_params->on_duration + gx_params->off_duration);
-}
-
-/**
- *      gx_validate_speed:
- *      determine current cpu speed
- *
- **/
-
-static unsigned int gx_validate_speed(unsigned int khz, u8 *on_duration,
-                u8 *off_duration)
-{
-        unsigned int i;
-        u8 tmp_on, tmp_off;
-        int old_tmp_freq = stock_freq;
-        int tmp_freq;
-
-        *off_duration = 1;
-        *on_duration = 0;
-
-        for (i = max_duration; i > 0; i--) {
-                tmp_off = ((khz * i) / stock_freq) & 0xff;
-                tmp_on = i - tmp_off;
-                tmp_freq = (stock_freq * tmp_off) / i;
-                /* if this relation is closer to khz, use this. If it's equal,
-                 * prefer it, too - lower latency */
-                if (abs(tmp_freq - khz) <= abs(old_tmp_freq - khz)) {
-                        *on_duration = tmp_on;
-                        *off_duration = tmp_off;
-                        old_tmp_freq = tmp_freq;
-                }
-        }
-
-        return old_tmp_freq;
-}
-
-
-/**
- * gx_set_cpuspeed:
- * set cpu speed in khz.
- **/
-
-static void gx_set_cpuspeed(unsigned int khz)
-{
-        u8 suscfg, pmer1;
-        unsigned int new_khz;
-        unsigned long flags;
-        struct cpufreq_freqs freqs;
-
-        freqs.cpu = 0;
-        freqs.old = gx_get_cpuspeed(0);
-
-        new_khz = gx_validate_speed(khz, &gx_params->on_duration,
-                        &gx_params->off_duration);
-
-        freqs.new = new_khz;
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        local_irq_save(flags);
-
-
-
-        if (new_khz != stock_freq) {
-                /* if new khz == 100% of CPU speed, it is special case */
-                switch (gx_params->cs55x0->device) {
-                case PCI_DEVICE_ID_CYRIX_5530_LEGACY:
-                        pmer1 = gx_params->pci_pmer1 | IRQ_SPDUP | VID_SPDUP;
-                        /* FIXME: need to test other values -- Zwane,Miura */
-                        /* typical 2 to 4ms */
-                        gx_write_byte(PCI_IRQTC, 4);
-                        /* typical 50 to 100ms */
-                        gx_write_byte(PCI_VIDTC, 100);
-                        gx_write_byte(PCI_PMER1, pmer1);
-
-                        if (gx_params->cs55x0->revision < 0x10) {
-                                /* CS5530(rev 1.2, 1.3) */
-                                suscfg = gx_params->pci_suscfg|SUSMOD;
-                        } else {
-                                /* CS5530A,B.. */
-                                suscfg = gx_params->pci_suscfg|SUSMOD|PWRSVE;
-                        }
-                        break;
-                case PCI_DEVICE_ID_CYRIX_5520:
-                case PCI_DEVICE_ID_CYRIX_5510:
-                        suscfg = gx_params->pci_suscfg | SUSMOD;
-                        break;
-                default:
-                        local_irq_restore(flags);
-                        dprintk("fatal: try to set unknown chipset.\n");
-                        return;
-                }
-        } else {
-                suscfg = gx_params->pci_suscfg & ~(SUSMOD);
-                gx_params->off_duration = 0;
-                gx_params->on_duration = 0;
-                dprintk("suspend modulation disabled: cpu runs 100%% speed.\n");
-        }
-
-        gx_write_byte(PCI_MODOFF, gx_params->off_duration);
-        gx_write_byte(PCI_MODON, gx_params->on_duration);
-
-        gx_write_byte(PCI_SUSCFG, suscfg);
-        pci_read_config_byte(gx_params->cs55x0, PCI_SUSCFG, &suscfg);
-
-        local_irq_restore(flags);
-
-        gx_params->pci_suscfg = suscfg;
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        dprintk("suspend modulation w/ duration of ON:%d us, OFF:%d us\n",
-                gx_params->on_duration * 32, gx_params->off_duration * 32);
-        dprintk("suspend modulation w/ clock speed: %d kHz.\n", freqs.new);
-}
-
-/****************************************************************
- *             High level functions                             *
- ****************************************************************/
-
-/*
- *      cpufreq_gx_verify: test if frequency range is valid
- *
- *      This function checks if a given frequency range in kHz is valid
- *      for the hardware supported by the driver.
- */
-
-static int cpufreq_gx_verify(struct cpufreq_policy *policy)
-{
-        unsigned int tmp_freq = 0;
-        u8 tmp1, tmp2;
-
-        if (!stock_freq || !policy)
-                return -EINVAL;
-
-        policy->cpu = 0;
-        cpufreq_verify_within_limits(policy, (stock_freq / max_duration),
-                        stock_freq);
-
-        /* it needs to be assured that at least one supported frequency is
-         * within policy->min and policy->max. If it is not, policy->max
-         * needs to be increased until one freuqency is supported.
-         * policy->min may not be decreased, though. This way we guarantee a
-         * specific processing capacity.
-         */
-        tmp_freq = gx_validate_speed(policy->min, &tmp1, &tmp2);
-        if (tmp_freq < policy->min)
-                tmp_freq += stock_freq / max_duration;
-        policy->min = tmp_freq;
-        if (policy->min > policy->max)
-                policy->max = tmp_freq;
-        tmp_freq = gx_validate_speed(policy->max, &tmp1, &tmp2);
-        if (tmp_freq > policy->max)
-                tmp_freq -= stock_freq / max_duration;
-        policy->max = tmp_freq;
-        if (policy->max < policy->min)
-                policy->max = policy->min;
-        cpufreq_verify_within_limits(policy, (stock_freq / max_duration),
-                        stock_freq);
-
-        return 0;
-}
-
-/*
- *      cpufreq_gx_target:
- *
- */
-static int cpufreq_gx_target(struct cpufreq_policy *policy,
-                             unsigned int target_freq,
-                             unsigned int relation)
-{
-        u8 tmp1, tmp2;
-        unsigned int tmp_freq;
-
-        if (!stock_freq || !policy)
-                return -EINVAL;
-
-        policy->cpu = 0;
-
-        tmp_freq = gx_validate_speed(target_freq, &tmp1, &tmp2);
-        while (tmp_freq < policy->min) {
-                tmp_freq += stock_freq / max_duration;
-                tmp_freq = gx_validate_speed(tmp_freq, &tmp1, &tmp2);
-        }
-        while (tmp_freq > policy->max) {
-                tmp_freq -= stock_freq / max_duration;
-                tmp_freq = gx_validate_speed(tmp_freq, &tmp1, &tmp2);
-        }
-
-        gx_set_cpuspeed(tmp_freq);
-
-        return 0;
-}
-
-static int cpufreq_gx_cpu_init(struct cpufreq_policy *policy)
-{
-        unsigned int maxfreq, curfreq;
-
-        if (!policy || policy->cpu != 0)
-                return -ENODEV;
-
-        /* determine maximum frequency */
-        if (pci_busclk)
-                maxfreq = pci_busclk * gx_freq_mult[getCx86(CX86_DIR1) & 0x0f];
-        else if (cpu_khz)
-                maxfreq = cpu_khz;
-        else
-                maxfreq = 30000 * gx_freq_mult[getCx86(CX86_DIR1) & 0x0f];
-
-        stock_freq = maxfreq;
-        curfreq = gx_get_cpuspeed(0);
-
-        dprintk("cpu max frequency is %d.\n", maxfreq);
-        dprintk("cpu current frequency is %dkHz.\n", curfreq);
-
-        /* setup basic struct for cpufreq API */
-        policy->cpu = 0;
-
-        if (max_duration < POLICY_MIN_DIV)
-                policy->min = maxfreq / max_duration;
-        else
-                policy->min = maxfreq / POLICY_MIN_DIV;
-        policy->max = maxfreq;
-        policy->cur = curfreq;
-        policy->cpuinfo.min_freq = maxfreq / max_duration;
-        policy->cpuinfo.max_freq = maxfreq;
-        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
-
-        return 0;
-}
-
-/*
- * cpufreq_gx_init:
- *   MediaGX/Geode GX initialize cpufreq driver
- */
-static struct cpufreq_driver gx_suspmod_driver = {
-        .get            = gx_get_cpuspeed,
-        .verify         = cpufreq_gx_verify,
-        .target         = cpufreq_gx_target,
-        .init           = cpufreq_gx_cpu_init,
-        .name           = "gx-suspmod",
-        .owner          = THIS_MODULE,
-};
-
-static int __init cpufreq_gx_init(void)
-{
-        int ret;
-        struct gxfreq_params *params;
-        struct pci_dev *gx_pci;
-
-        /* Test if we have the right hardware */
-        gx_pci = gx_detect_chipset();
-        if (gx_pci == NULL)
-                return -ENODEV;
-
-        /* check whether module parameters are sane */
-        if (max_duration > 0xff)
-                max_duration = 0xff;
-
-        dprintk("geode suspend modulation available.\n");
-
-        params = kzalloc(sizeof(struct gxfreq_params), GFP_KERNEL);
-        if (params == NULL)
-                return -ENOMEM;
-
-        params->cs55x0 = gx_pci;
-        gx_params = params;
-
-        /* keep cs55x0 configurations */
-        pci_read_config_byte(params->cs55x0, PCI_SUSCFG, &(params->pci_suscfg));
-        pci_read_config_byte(params->cs55x0, PCI_PMER1, &(params->pci_pmer1));
-        pci_read_config_byte(params->cs55x0, PCI_PMER2, &(params->pci_pmer2));
-        pci_read_config_byte(params->cs55x0, PCI_MODON, &(params->on_duration));
-        pci_read_config_byte(params->cs55x0, PCI_MODOFF,
-                        &(params->off_duration));
-
-        ret = cpufreq_register_driver(&gx_suspmod_driver);
-        if (ret) {
-                kfree(params);
-                return ret;                   /* register error! */
-        }
-
-        return 0;
-}
-
-static void __exit cpufreq_gx_exit(void)
-{
-        cpufreq_unregister_driver(&gx_suspmod_driver);
-        pci_dev_put(gx_params->cs55x0);
-        kfree(gx_params);
-}
-
-MODULE_AUTHOR("Hiroshi Miura <miura@da-cha.org>");
-MODULE_DESCRIPTION("Cpufreq driver for Cyrix MediaGX and NatSemi Geode");
-MODULE_LICENSE("GPL");
-
-module_init(cpufreq_gx_init);
-module_exit(cpufreq_gx_exit);
-
diff --git a/arch/x86/kernel/cpu/cpufreq/longhaul.c b/arch/x86/kernel/cpu/cpufreq/longhaul.c
deleted file mode 100644
index cf48cdd6907d..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/longhaul.c
+++ /dev/null
@@ -1,1029 +0,0 @@
-/*
- *  (C) 2001-2004  Dave Jones. <davej@redhat.com>
- *  (C) 2002  Padraig Brady. <padraig@antefacto.com>
- *
- *  Licensed under the terms of the GNU GPL License version 2.
- *  Based upon datasheets & sample CPUs kindly provided by VIA.
- *
- *  VIA have currently 3 different versions of Longhaul.
- *  Version 1 (Longhaul) uses the BCR2 MSR at 0x1147.
- *   It is present only in Samuel 1 (C5A), Samuel 2 (C5B) stepping 0.
- *  Version 2 of longhaul is backward compatible with v1, but adds
- *   LONGHAUL MSR for purpose of both frequency and voltage scaling.
- *   Present in Samuel 2 (steppings 1-7 only) (C5B), and Ezra (C5C).
- *  Version 3 of longhaul got renamed to Powersaver and redesigned
- *   to use only the POWERSAVER MSR at 0x110a.
- *   It is present in Ezra-T (C5M), Nehemiah (C5X) and above.
- *   It's pretty much the same feature wise to longhaul v2, though
- *   there is provision for scaling FSB too, but this doesn't work
- *   too well in practice so we don't even try to use this.
- *
- *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/delay.h>
-#include <linux/timex.h>
-#include <linux/io.h>
-#include <linux/acpi.h>
-
-#include <asm/msr.h>
-#include <acpi/processor.h>
-
-#include "longhaul.h"
-
-#define PFX "longhaul: "
-
-#define TYPE_LONGHAUL_V1        1
-#define TYPE_LONGHAUL_V2        2
-#define TYPE_POWERSAVER         3
-
-#define CPU_SAMUEL      1
-#define CPU_SAMUEL2     2
-#define CPU_EZRA        3
-#define CPU_EZRA_T      4
-#define CPU_NEHEMIAH    5
-#define CPU_NEHEMIAH_C  6
-
-/* Flags */
-#define USE_ACPI_C3             (1 << 1)
-#define USE_NORTHBRIDGE         (1 << 2)
-
-static int cpu_model;
-static unsigned int numscales = 16;
-static unsigned int fsb;
-
-static const struct mV_pos *vrm_mV_table;
-static const unsigned char *mV_vrm_table;
-
-static unsigned int highest_speed, lowest_speed; /* kHz */
-static unsigned int minmult, maxmult;
-static int can_scale_voltage;
-static struct acpi_processor *pr;
-static struct acpi_processor_cx *cx;
-static u32 acpi_regs_addr;
-static u8 longhaul_flags;
-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)
-
-
-/* Clock ratios multiplied by 10 */
-static int mults[32];
-static int eblcr[32];
-static int longhaul_version;
-static struct cpufreq_frequency_table *longhaul_table;
-
-#ifdef CONFIG_CPU_FREQ_DEBUG
-static char speedbuffer[8];
-
-static char *print_speed(int speed)
-{
-        if (speed < 1000) {
-                snprintf(speedbuffer, sizeof(speedbuffer), "%dMHz", speed);
-                return speedbuffer;
-        }
-
-        if (speed%1000 == 0)
-                snprintf(speedbuffer, sizeof(speedbuffer),
-                        "%dGHz", speed/1000);
-        else
-                snprintf(speedbuffer, sizeof(speedbuffer),
-                        "%d.%dGHz", speed/1000, (speed%1000)/100);
-
-        return speedbuffer;
-}
-#endif
-
-
-static unsigned int calc_speed(int mult)
-{
-        int khz;
-        khz = (mult/10)*fsb;
-        if (mult%10)
-                khz += fsb/2;
-        khz *= 1000;
-        return khz;
-}
-
-
-static int longhaul_get_cpu_mult(void)
-{
-        unsigned long invalue = 0, lo, hi;
-
-        rdmsr(MSR_IA32_EBL_CR_POWERON, lo, hi);
-        invalue = (lo & (1<<22|1<<23|1<<24|1<<25))>>22;
-        if (longhaul_version == TYPE_LONGHAUL_V2 ||
-            longhaul_version == TYPE_POWERSAVER) {
-                if (lo & (1<<27))
-                        invalue += 16;
-        }
-        return eblcr[invalue];
-}
-
-/* For processor with BCR2 MSR */
-
-static void do_longhaul1(unsigned int mults_index)
-{
-        union msr_bcr2 bcr2;
-
-        rdmsrl(MSR_VIA_BCR2, bcr2.val);
-        /* Enable software clock multiplier */
-        bcr2.bits.ESOFTBF = 1;
-        bcr2.bits.CLOCKMUL = mults_index & 0xff;
-
-        /* Sync to timer tick */
-        safe_halt();
-        /* Change frequency on next halt or sleep */
-        wrmsrl(MSR_VIA_BCR2, bcr2.val);
-        /* Invoke transition */
-        ACPI_FLUSH_CPU_CACHE();
-        halt();
-
-        /* Disable software clock multiplier */
-        local_irq_disable();
-        rdmsrl(MSR_VIA_BCR2, bcr2.val);
-        bcr2.bits.ESOFTBF = 0;
-        wrmsrl(MSR_VIA_BCR2, bcr2.val);
-}
-
-/* For processor with Longhaul MSR */
-
-static void do_powersaver(int cx_address, unsigned int mults_index,
-                          unsigned int dir)
-{
-        union msr_longhaul longhaul;
-        u32 t;
-
-        rdmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-        /* Setup new frequency */
-        if (!revid_errata)
-                longhaul.bits.RevisionKey = longhaul.bits.RevisionID;
-        else
-                longhaul.bits.RevisionKey = 0;
-        longhaul.bits.SoftBusRatio = mults_index & 0xf;
-        longhaul.bits.SoftBusRatio4 = (mults_index & 0x10) >> 4;
-        /* Setup new voltage */
-        if (can_scale_voltage)
-                longhaul.bits.SoftVID = (mults_index >> 8) & 0x1f;
-        /* Sync to timer tick */
-        safe_halt();
-        /* Raise voltage if necessary */
-        if (can_scale_voltage && dir) {
-                longhaul.bits.EnableSoftVID = 1;
-                wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-                /* Change voltage */
-                if (!cx_address) {
-                        ACPI_FLUSH_CPU_CACHE();
-                        halt();
-                } else {
-                        ACPI_FLUSH_CPU_CACHE();
-                        /* Invoke C3 */
-                        inb(cx_address);
-                        /* Dummy op - must do something useless after P_LVL3
-                         * read */
-                        t = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                }
-                longhaul.bits.EnableSoftVID = 0;
-                wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-        }
-
-        /* Change frequency on next halt or sleep */
-        longhaul.bits.EnableSoftBusRatio = 1;
-        wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-        if (!cx_address) {
-                ACPI_FLUSH_CPU_CACHE();
-                halt();
-        } else {
-                ACPI_FLUSH_CPU_CACHE();
-                /* Invoke C3 */
-                inb(cx_address);
-                /* Dummy op - must do something useless after P_LVL3 read */
-                t = inl(acpi_gbl_FADT.xpm_timer_block.address);
-        }
-        /* Disable bus ratio bit */
-        longhaul.bits.EnableSoftBusRatio = 0;
-        wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-
-        /* Reduce voltage if necessary */
-        if (can_scale_voltage && !dir) {
-                longhaul.bits.EnableSoftVID = 1;
-                wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-                /* Change voltage */
-                if (!cx_address) {
-                        ACPI_FLUSH_CPU_CACHE();
-                        halt();
-                } else {
-                        ACPI_FLUSH_CPU_CACHE();
-                        /* Invoke C3 */
-                        inb(cx_address);
-                        /* Dummy op - must do something useless after P_LVL3
-                         * read */
-                        t = inl(acpi_gbl_FADT.xpm_timer_block.address);
-                }
-                longhaul.bits.EnableSoftVID = 0;
-                wrmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-        }
-}
-
-/**
- * longhaul_set_cpu_frequency()
- * @mults_index : bitpattern of the new multiplier.
- *
- * Sets a new clock ratio.
- */
-
-static void longhaul_setstate(unsigned int table_index)
-{
-        unsigned int mults_index;
-        int speed, mult;
-        struct cpufreq_freqs freqs;
-        unsigned long flags;
-        unsigned int pic1_mask, pic2_mask;
-        u16 bm_status = 0;
-        u32 bm_timeout = 1000;
-        unsigned int dir = 0;
-
-        mults_index = longhaul_table[table_index].index;
-        /* Safety precautions */
-        mult = mults[mults_index & 0x1f];
-        if (mult == -1)
-                return;
-        speed = calc_speed(mult);
-        if ((speed > highest_speed) || (speed < lowest_speed))
-                return;
-        /* Voltage transition before frequency transition? */
-        if (can_scale_voltage && longhaul_index < table_index)
-                dir = 1;
-
-        freqs.old = calc_speed(longhaul_get_cpu_mult());
-        freqs.new = speed;
-        freqs.cpu = 0; /* longhaul.c is UP only driver */
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        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);
-
-        pic2_mask = inb(0xA1);
-        pic1_mask = inb(0x21);  /* works on C3. save mask. */
-        outb(0xFF, 0xA1);       /* Overkill */
-        outb(0xFE, 0x21);       /* TMR0 only */
-
-        /* Wait while PCI bus is busy. */
-        if (acpi_regs_addr && (longhaul_flags & USE_NORTHBRIDGE
-            || ((pr != NULL) && pr->flags.bm_control))) {
-                bm_status = inw(acpi_regs_addr);
-                bm_status &= 1 << 4;
-                while (bm_status && bm_timeout) {
-                        outw(1 << 4, acpi_regs_addr);
-                        bm_timeout--;
-                        bm_status = inw(acpi_regs_addr);
-                        bm_status &= 1 << 4;
-                }
-        }
-
-        if (longhaul_flags & USE_NORTHBRIDGE) {
-                /* Disable AGP and PCI arbiters */
-                outb(3, 0x22);
-        } else if ((pr != NULL) && pr->flags.bm_control) {
-                /* Disable bus master arbitration */
-                acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 1);
-        }
-        switch (longhaul_version) {
-
-        /*
-         * Longhaul v1. (Samuel[C5A] and Samuel2 stepping 0[C5B])
-         * Software controlled multipliers only.
-         */
-        case TYPE_LONGHAUL_V1:
-                do_longhaul1(mults_index);
-                break;
-
-        /*
-         * Longhaul v2 appears in Samuel2 Steppings 1->7 [C5B] and Ezra [C5C]
-         *
-         * Longhaul v3 (aka Powersaver). (Ezra-T [C5M] & Nehemiah [C5N])
-         * Nehemiah can do FSB scaling too, but this has never been proven
-         * to work in practice.
-         */
-        case TYPE_LONGHAUL_V2:
-        case TYPE_POWERSAVER:
-                if (longhaul_flags & USE_ACPI_C3) {
-                        /* Don't allow wakeup */
-                        acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, 0);
-                        do_powersaver(cx->address, mults_index, dir);
-                } else {
-                        do_powersaver(0, mults_index, dir);
-                }
-                break;
-        }
-
-        if (longhaul_flags & USE_NORTHBRIDGE) {
-                /* Enable arbiters */
-                outb(0, 0x22);
-        } else if ((pr != NULL) && pr->flags.bm_control) {
-                /* Enable bus master arbitration */
-                acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 0);
-        }
-        outb(pic2_mask, 0xA1);  /* restore mask */
-        outb(pic1_mask, 0x21);
-
-        local_irq_restore(flags);
-        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)
-                printk(KERN_INFO PFX "Warning: Timeout while waiting for "
-                                "idle PCI bus.\n");
-}
-
-/*
- * Centaur decided to make life a little more tricky.
- * Only longhaul v1 is allowed to read EBLCR BSEL[0:1].
- * Samuel2 and above have to try and guess what the FSB is.
- * We do this by assuming we booted at maximum multiplier, and interpolate
- * between that value multiplied by possible FSBs and cpu_mhz which
- * was calculated at boot time. Really ugly, but no other way to do this.
- */
-
-#define ROUNDING        0xf
-
-static int guess_fsb(int mult)
-{
-        int speed = cpu_khz / 1000;
-        int i;
-        int speeds[] = { 666, 1000, 1333, 2000 };
-        int f_max, f_min;
-
-        for (i = 0; i < 4; i++) {
-                f_max = ((speeds[i] * mult) + 50) / 100;
-                f_max += (ROUNDING / 2);
-                f_min = f_max - ROUNDING;
-                if ((speed <= f_max) && (speed >= f_min))
-                        return speeds[i] / 10;
-        }
-        return 0;
-}
-
-
-static int __cpuinit longhaul_get_ranges(void)
-{
-        unsigned int i, j, k = 0;
-        unsigned int ratio;
-        int mult;
-
-        /* Get current frequency */
-        mult = longhaul_get_cpu_mult();
-        if (mult == -1) {
-                printk(KERN_INFO PFX "Invalid (reserved) multiplier!\n");
-                return -EINVAL;
-        }
-        fsb = guess_fsb(mult);
-        if (fsb == 0) {
-                printk(KERN_INFO PFX "Invalid (reserved) FSB!\n");
-                return -EINVAL;
-        }
-        /* Get max multiplier - as we always did.
-         * Longhaul MSR is useful only when voltage scaling is enabled.
-         * C3 is booting at max anyway. */
-        maxmult = mult;
-        /* Get min multiplier */
-        switch (cpu_model) {
-        case CPU_NEHEMIAH:
-                minmult = 50;
-                break;
-        case CPU_NEHEMIAH_C:
-                minmult = 40;
-                break;
-        default:
-                minmult = 30;
-                break;
-        }
-
-        dprintk("MinMult:%d.%dx MaxMult:%d.%dx\n",
-                 minmult/10, minmult%10, maxmult/10, maxmult%10);
-
-        highest_speed = calc_speed(maxmult);
-        lowest_speed = calc_speed(minmult);
-        dprintk("FSB:%dMHz  Lowest speed: %s   Highest speed:%s\n", fsb,
-                 print_speed(lowest_speed/1000),
-                 print_speed(highest_speed/1000));
-
-        if (lowest_speed == highest_speed) {
-                printk(KERN_INFO PFX "highestspeed == lowest, aborting.\n");
-                return -EINVAL;
-        }
-        if (lowest_speed > highest_speed) {
-                printk(KERN_INFO PFX "nonsense! lowest (%d > %d) !\n",
-                        lowest_speed, highest_speed);
-                return -EINVAL;
-        }
-
-        longhaul_table = kmalloc((numscales + 1) * sizeof(*longhaul_table),
-                        GFP_KERNEL);
-        if (!longhaul_table)
-                return -ENOMEM;
-
-        for (j = 0; j < numscales; j++) {
-                ratio = mults[j];
-                if (ratio == -1)
-                        continue;
-                if (ratio > maxmult || ratio < minmult)
-                        continue;
-                longhaul_table[k].frequency = calc_speed(ratio);
-                longhaul_table[k].index = j;
-                k++;
-        }
-        if (k <= 1) {
-                kfree(longhaul_table);
-                return -ENODEV;
-        }
-        /* Sort */
-        for (j = 0; j < k - 1; j++) {
-                unsigned int min_f, min_i;
-                min_f = longhaul_table[j].frequency;
-                min_i = j;
-                for (i = j + 1; i < k; i++) {
-                        if (longhaul_table[i].frequency < min_f) {
-                                min_f = longhaul_table[i].frequency;
-                                min_i = i;
-                        }
-                }
-                if (min_i != j) {
-                        swap(longhaul_table[j].frequency,
-                             longhaul_table[min_i].frequency);
-                        swap(longhaul_table[j].index,
-                             longhaul_table[min_i].index);
-                }
-        }
-
-        longhaul_table[k].frequency = CPUFREQ_TABLE_END;
-
-        /* Find index we are running on */
-        for (j = 0; j < k; j++) {
-                if (mults[longhaul_table[j].index & 0x1f] == mult) {
-                        longhaul_index = j;
-                        break;
-                }
-        }
-        return 0;
-}
-
-
-static void __cpuinit longhaul_setup_voltagescaling(void)
-{
-        union msr_longhaul longhaul;
-        struct mV_pos minvid, maxvid, vid;
-        unsigned int j, speed, pos, kHz_step, numvscales;
-        int min_vid_speed;
-
-        rdmsrl(MSR_VIA_LONGHAUL, longhaul.val);
-        if (!(longhaul.bits.RevisionID & 1)) {
-                printk(KERN_INFO PFX "Voltage scaling not supported by CPU.\n");
-                return;
-        }
-
-        if (!longhaul.bits.VRMRev) {
-                printk(KERN_INFO PFX "VRM 8.5\n");
-                vrm_mV_table = &vrm85_mV[0];
-                mV_vrm_table = &mV_vrm85[0];
-        } else {
-                printk(KERN_INFO PFX "Mobile VRM\n");
-                if (cpu_model < CPU_NEHEMIAH)
-                        return;
-                vrm_mV_table = &mobilevrm_mV[0];
-                mV_vrm_table = &mV_mobilevrm[0];
-        }
-
-        minvid = vrm_mV_table[longhaul.bits.MinimumVID];
-        maxvid = vrm_mV_table[longhaul.bits.MaximumVID];
-
-        if (minvid.mV == 0 || maxvid.mV == 0 || minvid.mV > maxvid.mV) {
-                printk(KERN_INFO PFX "Bogus values Min:%d.%03d Max:%d.%03d. "
-                                        "Voltage scaling disabled.\n",
-                                        minvid.mV/1000, minvid.mV%1000,
-                                        maxvid.mV/1000, maxvid.mV%1000);
-                return;
-        }
-
-        if (minvid.mV == maxvid.mV) {
-                printk(KERN_INFO PFX "Claims to support voltage scaling but "
-                                "min & max are both %d.%03d. "
-                                "Voltage scaling disabled\n",
-                                maxvid.mV/1000, maxvid.mV%1000);
-                return;
-        }
-
-        /* How many voltage steps*/
-        numvscales = maxvid.pos - minvid.pos + 1;
-        printk(KERN_INFO PFX
-                "Max VID=%d.%03d  "
-                "Min VID=%d.%03d, "
-                "%d possible voltage scales\n",
-                maxvid.mV/1000, maxvid.mV%1000,
-                minvid.mV/1000, minvid.mV%1000,
-                numvscales);
-
-        /* Calculate max frequency at min voltage */
-        j = longhaul.bits.MinMHzBR;
-        if (longhaul.bits.MinMHzBR4)
-                j += 16;
-        min_vid_speed = eblcr[j];
-        if (min_vid_speed == -1)
-                return;
-        switch (longhaul.bits.MinMHzFSB) {
-        case 0:
-                min_vid_speed *= 13333;
-                break;
-        case 1:
-                min_vid_speed *= 10000;
-                break;
-        case 3:
-                min_vid_speed *= 6666;
-                break;
-        default:
-                return;
-                break;
-        }
-        if (min_vid_speed >= highest_speed)
-                return;
-        /* Calculate kHz for one voltage step */
-        kHz_step = (highest_speed - min_vid_speed) / numvscales;
-
-        j = 0;
-        while (longhaul_table[j].frequency != CPUFREQ_TABLE_END) {
-                speed = longhaul_table[j].frequency;
-                if (speed > min_vid_speed)
-                        pos = (speed - min_vid_speed) / kHz_step + minvid.pos;
-                else
-                        pos = minvid.pos;
-                longhaul_table[j].index |= mV_vrm_table[pos] << 8;
-                vid = vrm_mV_table[mV_vrm_table[pos]];
-                printk(KERN_INFO PFX "f: %d kHz, index: %d, vid: %d mV\n",
-                                speed, j, vid.mV);
-                j++;
-        }
-
-        can_scale_voltage = 1;
-        printk(KERN_INFO PFX "Voltage scaling enabled.\n");
-}
-
-
-static int longhaul_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, longhaul_table);
-}
-
-
-static int longhaul_target(struct cpufreq_policy *policy,
-                            unsigned int target_freq, unsigned int relation)
-{
-        unsigned int table_index = 0;
-        unsigned int i;
-        unsigned int dir = 0;
-        u8 vid, current_vid;
-
-        if (cpufreq_frequency_table_target(policy, longhaul_table, target_freq,
-                                relation, &table_index))
-                return -EINVAL;
-
-        /* Don't set same frequency again */
-        if (longhaul_index == table_index)
-                return 0;
-
-        if (!can_scale_voltage)
-                longhaul_setstate(table_index);
-        else {
-                /* On test system voltage transitions exceeding single
-                 * step up or down were turning motherboard off. Both
-                 * "ondemand" and "userspace" are unsafe. C7 is doing
-                 * this in hardware, C3 is old and we need to do this
-                 * in software. */
-                i = longhaul_index;
-                current_vid = (longhaul_table[longhaul_index].index >> 8);
-                current_vid &= 0x1f;
-                if (table_index > longhaul_index)
-                        dir = 1;
-                while (i != table_index) {
-                        vid = (longhaul_table[i].index >> 8) & 0x1f;
-                        if (vid != current_vid) {
-                                longhaul_setstate(i);
-                                current_vid = vid;
-                                msleep(200);
-                        }
-                        if (dir)
-                                i++;
-                        else
-                                i--;
-                }
-                longhaul_setstate(table_index);
-        }
-        longhaul_index = table_index;
-        return 0;
-}
-
-
-static unsigned int longhaul_get(unsigned int cpu)
-{
-        if (cpu)
-                return 0;
-        return calc_speed(longhaul_get_cpu_mult());
-}
-
-static acpi_status longhaul_walk_callback(acpi_handle obj_handle,
-                                          u32 nesting_level,
-                                          void *context, void **return_value)
-{
-        struct acpi_device *d;
-
-        if (acpi_bus_get_device(obj_handle, &d))
-                return 0;
-
-        *return_value = acpi_driver_data(d);
-        return 1;
-}
-
-/* VIA don't support PM2 reg, but have something similar */
-static int enable_arbiter_disable(void)
-{
-        struct pci_dev *dev;
-        int status = 1;
-        int reg;
-        u8 pci_cmd;
-
-        /* Find PLE133 host bridge */
-        reg = 0x78;
-        dev = pci_get_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8601_0,
-                             NULL);
-        /* Find PM133/VT8605 host bridge */
-        if (dev == NULL)
-                dev = pci_get_device(PCI_VENDOR_ID_VIA,
-                                     PCI_DEVICE_ID_VIA_8605_0, NULL);
-        /* Find CLE266 host bridge */
-        if (dev == NULL) {
-                reg = 0x76;
-                dev = pci_get_device(PCI_VENDOR_ID_VIA,
-                                     PCI_DEVICE_ID_VIA_862X_0, NULL);
-                /* Find CN400 V-Link host bridge */
-                if (dev == NULL)
-                        dev = pci_get_device(PCI_VENDOR_ID_VIA, 0x7259, NULL);
-        }
-        if (dev != NULL) {
-                /* Enable access to port 0x22 */
-                pci_read_config_byte(dev, reg, &pci_cmd);
-                if (!(pci_cmd & 1<<7)) {
-                        pci_cmd |= 1<<7;
-                        pci_write_config_byte(dev, reg, pci_cmd);
-                        pci_read_config_byte(dev, reg, &pci_cmd);
-                        if (!(pci_cmd & 1<<7)) {
-                                printk(KERN_ERR PFX
-                                        "Can't enable access to port 0x22.\n");
-                                status = 0;
-                        }
-                }
-                pci_dev_put(dev);
-                return status;
-        }
-        return 0;
-}
-
-static int longhaul_setup_southbridge(void)
-{
-        struct pci_dev *dev;
-        u8 pci_cmd;
-
-        /* Find VT8235 southbridge */
-        dev = pci_get_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235, NULL);
-        if (dev == NULL)
-                /* Find VT8237 southbridge */
-                dev = pci_get_device(PCI_VENDOR_ID_VIA,
-                                     PCI_DEVICE_ID_VIA_8237, NULL);
-        if (dev != NULL) {
-                /* Set transition time to max */
-                pci_read_config_byte(dev, 0xec, &pci_cmd);
-                pci_cmd &= ~(1 << 2);
-                pci_write_config_byte(dev, 0xec, pci_cmd);
-                pci_read_config_byte(dev, 0xe4, &pci_cmd);
-                pci_cmd &= ~(1 << 7);
-                pci_write_config_byte(dev, 0xe4, pci_cmd);
-                pci_read_config_byte(dev, 0xe5, &pci_cmd);
-                pci_cmd |= 1 << 7;
-                pci_write_config_byte(dev, 0xe5, pci_cmd);
-                /* Get address of ACPI registers block*/
-                pci_read_config_byte(dev, 0x81, &pci_cmd);
-                if (pci_cmd & 1 << 7) {
-                        pci_read_config_dword(dev, 0x88, &acpi_regs_addr);
-                        acpi_regs_addr &= 0xff00;
-                        printk(KERN_INFO PFX "ACPI I/O at 0x%x\n",
-                                        acpi_regs_addr);
-                }
-
-                pci_dev_put(dev);
-                return 1;
-        }
-        return 0;
-}
-
-static int __cpuinit longhaul_cpu_init(struct cpufreq_policy *policy)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-        char *cpuname = NULL;
-        int ret;
-        u32 lo, hi;
-
-        /* Check what we have on this motherboard */
-        switch (c->x86_model) {
-        case 6:
-                cpu_model = CPU_SAMUEL;
-                cpuname = "C3 'Samuel' [C5A]";
-                longhaul_version = TYPE_LONGHAUL_V1;
-                memcpy(mults, samuel1_mults, sizeof(samuel1_mults));
-                memcpy(eblcr, samuel1_eblcr, sizeof(samuel1_eblcr));
-                break;
-
-        case 7:
-                switch (c->x86_mask) {
-                case 0:
-                        longhaul_version = TYPE_LONGHAUL_V1;
-                        cpu_model = CPU_SAMUEL2;
-                        cpuname = "C3 'Samuel 2' [C5B]";
-                        /* Note, this is not a typo, early Samuel2's had
-                         * Samuel1 ratios. */
-                        memcpy(mults, samuel1_mults, sizeof(samuel1_mults));
-                        memcpy(eblcr, samuel2_eblcr, sizeof(samuel2_eblcr));
-                        break;
-                case 1 ... 15:
-                        longhaul_version = TYPE_LONGHAUL_V2;
-                        if (c->x86_mask < 8) {
-                                cpu_model = CPU_SAMUEL2;
-                                cpuname = "C3 'Samuel 2' [C5B]";
-                        } else {
-                                cpu_model = CPU_EZRA;
-                                cpuname = "C3 'Ezra' [C5C]";
-                        }
-                        memcpy(mults, ezra_mults, sizeof(ezra_mults));
-                        memcpy(eblcr, ezra_eblcr, sizeof(ezra_eblcr));
-                        break;
-                }
-                break;
-
-        case 8:
-                cpu_model = CPU_EZRA_T;
-                cpuname = "C3 'Ezra-T' [C5M]";
-                longhaul_version = TYPE_POWERSAVER;
-                numscales = 32;
-                memcpy(mults, ezrat_mults, sizeof(ezrat_mults));
-                memcpy(eblcr, ezrat_eblcr, sizeof(ezrat_eblcr));
-                break;
-
-        case 9:
-                longhaul_version = TYPE_POWERSAVER;
-                numscales = 32;
-                memcpy(mults, nehemiah_mults, sizeof(nehemiah_mults));
-                memcpy(eblcr, nehemiah_eblcr, sizeof(nehemiah_eblcr));
-                switch (c->x86_mask) {
-                case 0 ... 1:
-                        cpu_model = CPU_NEHEMIAH;
-                        cpuname = "C3 'Nehemiah A' [C5XLOE]";
-                        break;
-                case 2 ... 4:
-                        cpu_model = CPU_NEHEMIAH;
-                        cpuname = "C3 'Nehemiah B' [C5XLOH]";
-                        break;
-                case 5 ... 15:
-                        cpu_model = CPU_NEHEMIAH_C;
-                        cpuname = "C3 'Nehemiah C' [C5P]";
-                        break;
-                }
-                break;
-
-        default:
-                cpuname = "Unknown";
-                break;
-        }
-        /* Check Longhaul ver. 2 */
-        if (longhaul_version == TYPE_LONGHAUL_V2) {
-                rdmsr(MSR_VIA_LONGHAUL, lo, hi);
-                if (lo == 0 && hi == 0)
-                        /* Looks like MSR isn't present */
-                        longhaul_version = TYPE_LONGHAUL_V1;
-        }
-
-        printk(KERN_INFO PFX "VIA %s CPU detected.  ", cpuname);
-        switch (longhaul_version) {
-        case TYPE_LONGHAUL_V1:
-        case TYPE_LONGHAUL_V2:
-                printk(KERN_CONT "Longhaul v%d supported.\n", longhaul_version);
-                break;
-        case TYPE_POWERSAVER:
-                printk(KERN_CONT "Powersaver supported.\n");
-                break;
-        };
-
-        /* Doesn't hurt */
-        longhaul_setup_southbridge();
-
-        /* Find ACPI data for processor */
-        acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,
-                                ACPI_UINT32_MAX, &longhaul_walk_callback, NULL,
-                                NULL, (void *)&pr);
-
-        /* Check ACPI support for C3 state */
-        if (pr != NULL && longhaul_version == TYPE_POWERSAVER) {
-                cx = &pr->power.states[ACPI_STATE_C3];
-                if (cx->address > 0 && cx->latency <= 1000)
-                        longhaul_flags |= USE_ACPI_C3;
-        }
-        /* Disable if it isn't working */
-        if (disable_acpi_c3)
-                longhaul_flags &= ~USE_ACPI_C3;
-        /* Check if northbridge is friendly */
-        if (enable_arbiter_disable())
-                longhaul_flags |= USE_NORTHBRIDGE;
-
-        /* Check ACPI support for bus master arbiter disable */
-        if (!(longhaul_flags & USE_ACPI_C3
-             || longhaul_flags & USE_NORTHBRIDGE)
-            && ((pr == NULL) || !(pr->flags.bm_control))) {
-                printk(KERN_ERR PFX
-                        "No ACPI support. Unsupported northbridge.\n");
-                return -ENODEV;
-        }
-
-        if (longhaul_flags & USE_NORTHBRIDGE)
-                printk(KERN_INFO PFX "Using northbridge support.\n");
-        if (longhaul_flags & USE_ACPI_C3)
-                printk(KERN_INFO PFX "Using ACPI support.\n");
-
-        ret = longhaul_get_ranges();
-        if (ret != 0)
-                return ret;
-
-        if ((longhaul_version != TYPE_LONGHAUL_V1) && (scale_voltage != 0))
-                longhaul_setup_voltagescaling();
-
-        policy->cpuinfo.transition_latency = 200000;    /* nsec */
-        policy->cur = calc_speed(longhaul_get_cpu_mult());
-
-        ret = cpufreq_frequency_table_cpuinfo(policy, longhaul_table);
-        if (ret)
-                return ret;
-
-        cpufreq_frequency_table_get_attr(longhaul_table, policy->cpu);
-
-        return 0;
-}
-
-static int __devexit longhaul_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        return 0;
-}
-
-static struct freq_attr *longhaul_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver longhaul_driver = {
-        .verify = longhaul_verify,
-        .target = longhaul_target,
-        .get    = longhaul_get,
-        .init   = longhaul_cpu_init,
-        .exit   = __devexit_p(longhaul_cpu_exit),
-        .name   = "longhaul",
-        .owner  = THIS_MODULE,
-        .attr   = longhaul_attr,
-};
-
-
-static int __init longhaul_init(void)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-
-        if (c->x86_vendor != X86_VENDOR_CENTAUR || c->x86 != 6)
-                return -ENODEV;
-
-#ifdef CONFIG_SMP
-        if (num_online_cpus() > 1) {
-                printk(KERN_ERR PFX "More than 1 CPU detected, "
-                                "longhaul disabled.\n");
-                return -ENODEV;
-        }
-#endif
-#ifdef CONFIG_X86_IO_APIC
-        if (cpu_has_apic) {
-                printk(KERN_ERR PFX "APIC detected. Longhaul is currently "
-                                "broken in this configuration.\n");
-                return -ENODEV;
-        }
-#endif
-        switch (c->x86_model) {
-        case 6 ... 9:
-                return cpufreq_register_driver(&longhaul_driver);
-        case 10:
-                printk(KERN_ERR PFX "Use acpi-cpufreq driver for VIA C7\n");
-        default:
-                ;
-        }
-
-        return -ENODEV;
-}
-
-
-static void __exit longhaul_exit(void)
-{
-        int i;
-
-        for (i = 0; i < numscales; i++) {
-                if (mults[i] == maxmult) {
-                        longhaul_setstate(i);
-                        break;
-                }
-        }
-
-        cpufreq_unregister_driver(&longhaul_driver);
-        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 useful 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@redhat.com>");
-MODULE_DESCRIPTION("Longhaul driver for VIA Cyrix processors.");
-MODULE_LICENSE("GPL");
-
-late_initcall(longhaul_init);
-module_exit(longhaul_exit);
diff --git a/arch/x86/kernel/cpu/cpufreq/longhaul.h b/arch/x86/kernel/cpu/cpufreq/longhaul.h
deleted file mode 100644
index cbf48fbca881..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/longhaul.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
- *  longhaul.h
- *  (C) 2003 Dave Jones.
- *
- *  Licensed under the terms of the GNU GPL License version 2.
- *
- *  VIA-specific information
- */
-
-union msr_bcr2 {
-        struct {
-                unsigned Reseved:19,    // 18:0
-                ESOFTBF:1,              // 19
-                Reserved2:3,            // 22:20
-                CLOCKMUL:4,             // 26:23
-                Reserved3:5;            // 31:27
-        } bits;
-        unsigned long val;
-};
-
-union msr_longhaul {
-        struct {
-                unsigned RevisionID:4,  // 3:0
-                RevisionKey:4,          // 7:4
-                EnableSoftBusRatio:1,   // 8
-                EnableSoftVID:1,        // 9
-                EnableSoftBSEL:1,       // 10
-                Reserved:3,             // 11:13
-                SoftBusRatio4:1,        // 14
-                VRMRev:1,               // 15
-                SoftBusRatio:4,         // 19:16
-                SoftVID:5,              // 24:20
-                Reserved2:3,            // 27:25
-                SoftBSEL:2,             // 29:28
-                Reserved3:2,            // 31:30
-                MaxMHzBR:4,             // 35:32
-                MaximumVID:5,           // 40:36
-                MaxMHzFSB:2,            // 42:41
-                MaxMHzBR4:1,            // 43
-                Reserved4:4,            // 47:44
-                MinMHzBR:4,             // 51:48
-                MinimumVID:5,           // 56:52
-                MinMHzFSB:2,            // 58:57
-                MinMHzBR4:1,            // 59
-                Reserved5:4;            // 63:60
-        } bits;
-        unsigned long long val;
-};
-
-/*
- * Clock ratio tables. Div/Mod by 10 to get ratio.
- * The eblcr values specify the ratio read from the CPU.
- * The mults values specify what to write to the CPU.
- */
-
-/*
- * VIA C3 Samuel 1  & Samuel 2 (stepping 0)
- */
-static const int __cpuinitdata samuel1_mults[16] = {
-        -1, /* 0000 -> RESERVED */
-        30, /* 0001 ->  3.0x */
-        40, /* 0010 ->  4.0x */
-        -1, /* 0011 -> RESERVED */
-        -1, /* 0100 -> RESERVED */
-        35, /* 0101 ->  3.5x */
-        45, /* 0110 ->  4.5x */
-        55, /* 0111 ->  5.5x */
-        60, /* 1000 ->  6.0x */
-        70, /* 1001 ->  7.0x */
-        80, /* 1010 ->  8.0x */
-        50, /* 1011 ->  5.0x */
-        65, /* 1100 ->  6.5x */
-        75, /* 1101 ->  7.5x */
-        -1, /* 1110 -> RESERVED */
-        -1, /* 1111 -> RESERVED */
-};
-
-static const int __cpuinitdata samuel1_eblcr[16] = {
-        50, /* 0000 -> RESERVED */
-        30, /* 0001 ->  3.0x */
-        40, /* 0010 ->  4.0x */
-        -1, /* 0011 -> RESERVED */
-        55, /* 0100 ->  5.5x */
-        35, /* 0101 ->  3.5x */
-        45, /* 0110 ->  4.5x */
-        -1, /* 0111 -> RESERVED */
-        -1, /* 1000 -> RESERVED */
-        70, /* 1001 ->  7.0x */
-        80, /* 1010 ->  8.0x */
-        60, /* 1011 ->  6.0x */
-        -1, /* 1100 -> RESERVED */
-        75, /* 1101 ->  7.5x */
-        -1, /* 1110 -> RESERVED */
-        65, /* 1111 ->  6.5x */
-};
-
-/*
- * VIA C3 Samuel2 Stepping 1->15
- */
-static const int __cpuinitdata samuel2_eblcr[16] = {
-        50,  /* 0000 ->  5.0x */
-        30,  /* 0001 ->  3.0x */
-        40,  /* 0010 ->  4.0x */
-        100, /* 0011 -> 10.0x */
-        55,  /* 0100 ->  5.5x */
-        35,  /* 0101 ->  3.5x */
-        45,  /* 0110 ->  4.5x */
-        110, /* 0111 -> 11.0x */
-        90,  /* 1000 ->  9.0x */
-        70,  /* 1001 ->  7.0x */
-        80,  /* 1010 ->  8.0x */
-        60,  /* 1011 ->  6.0x */
-        120, /* 1100 -> 12.0x */
-        75,  /* 1101 ->  7.5x */
-        130, /* 1110 -> 13.0x */
-        65,  /* 1111 ->  6.5x */
-};
-
-/*
- * VIA C3 Ezra
- */
-static const int __cpuinitdata ezra_mults[16] = {
-        100, /* 0000 -> 10.0x */
-        30,  /* 0001 ->  3.0x */
-        40,  /* 0010 ->  4.0x */
-        90,  /* 0011 ->  9.0x */
-        95,  /* 0100 ->  9.5x */
-        35,  /* 0101 ->  3.5x */
-        45,  /* 0110 ->  4.5x */
-        55,  /* 0111 ->  5.5x */
-        60,  /* 1000 ->  6.0x */
-        70,  /* 1001 ->  7.0x */
-        80,  /* 1010 ->  8.0x */
-        50,  /* 1011 ->  5.0x */
-        65,  /* 1100 ->  6.5x */
-        75,  /* 1101 ->  7.5x */
-        85,  /* 1110 ->  8.5x */
-        120, /* 1111 -> 12.0x */
-};
-
-static const int __cpuinitdata ezra_eblcr[16] = {
-        50,  /* 0000 ->  5.0x */
-        30,  /* 0001 ->  3.0x */
-        40,  /* 0010 ->  4.0x */
-        100, /* 0011 -> 10.0x */
-        55,  /* 0100 ->  5.5x */
-        35,  /* 0101 ->  3.5x */
-        45,  /* 0110 ->  4.5x */
-        95,  /* 0111 ->  9.5x */
-        90,  /* 1000 ->  9.0x */
-        70,  /* 1001 ->  7.0x */
-        80,  /* 1010 ->  8.0x */
-        60,  /* 1011 ->  6.0x */
-        120, /* 1100 -> 12.0x */
-        75,  /* 1101 ->  7.5x */
-        85,  /* 1110 ->  8.5x */
-        65,  /* 1111 ->  6.5x */
-};
-
-/*
- * VIA C3 (Ezra-T) [C5M].
- */
-static const int __cpuinitdata ezrat_mults[32] = {
-        100, /* 0000 -> 10.0x */
-        30,  /* 0001 ->  3.0x */
-        40,  /* 0010 ->  4.0x */
-        90,  /* 0011 ->  9.0x */
-        95,  /* 0100 ->  9.5x */
-        35,  /* 0101 ->  3.5x */
-        45,  /* 0110 ->  4.5x */
-        55,  /* 0111 ->  5.5x */
-        60,  /* 1000 ->  6.0x */
-        70,  /* 1001 ->  7.0x */
-        80,  /* 1010 ->  8.0x */
-        50,  /* 1011 ->  5.0x */
-        65,  /* 1100 ->  6.5x */
-        75,  /* 1101 ->  7.5x */
-        85,  /* 1110 ->  8.5x */
-        120, /* 1111 ->  12.0x */
-
-        -1,  /* 0000 -> RESERVED (10.0x) */
-        110, /* 0001 -> 11.0x */
-        -1, /* 0010 -> 12.0x */
-        -1,  /* 0011 -> RESERVED (9.0x)*/
-        105, /* 0100 -> 10.5x */
-        115, /* 0101 -> 11.5x */
-        125, /* 0110 -> 12.5x */
-        135, /* 0111 -> 13.5x */
-        140, /* 1000 -> 14.0x */
-        150, /* 1001 -> 15.0x */
-        160, /* 1010 -> 16.0x */
-        130, /* 1011 -> 13.0x */
-        145, /* 1100 -> 14.5x */
-        155, /* 1101 -> 15.5x */
-        -1,  /* 1110 -> RESERVED (13.0x) */
-        -1,  /* 1111 -> RESERVED (12.0x) */
-};
-
-static const int __cpuinitdata ezrat_eblcr[32] = {
-        50,  /* 0000 ->  5.0x */
-        30,  /* 0001 ->  3.0x */
-        40,  /* 0010 ->  4.0x */
-        100, /* 0011 -> 10.0x */
-        55,  /* 0100 ->  5.5x */
-        35,  /* 0101 ->  3.5x */
-        45,  /* 0110 ->  4.5x */
-        95,  /* 0111 ->  9.5x */
-        90,  /* 1000 ->  9.0x */
-        70,  /* 1001 ->  7.0x */
-        80,  /* 1010 ->  8.0x */
-        60,  /* 1011 ->  6.0x */
-        120, /* 1100 -> 12.0x */
-        75,  /* 1101 ->  7.5x */
-        85,  /* 1110 ->  8.5x */
-        65,  /* 1111 ->  6.5x */
-
-        -1,  /* 0000 -> RESERVED (9.0x) */
-        110, /* 0001 -> 11.0x */
-        120, /* 0010 -> 12.0x */
-        -1,  /* 0011 -> RESERVED (10.0x)*/
-        135, /* 0100 -> 13.5x */
-        115, /* 0101 -> 11.5x */
-        125, /* 0110 -> 12.5x */
-        105, /* 0111 -> 10.5x */
-        130, /* 1000 -> 13.0x */
-        150, /* 1001 -> 15.0x */
-        160, /* 1010 -> 16.0x */
-        140, /* 1011 -> 14.0x */
-        -1,  /* 1100 -> RESERVED (12.0x) */
-        155, /* 1101 -> 15.5x */
-        -1,  /* 1110 -> RESERVED (13.0x) */
-        145, /* 1111 -> 14.5x */
-};
-
-/*
- * VIA C3 Nehemiah */
-
-static const int __cpuinitdata nehemiah_mults[32] = {
-        100, /* 0000 -> 10.0x */
-        -1, /* 0001 -> 16.0x */
-        40,  /* 0010 ->  4.0x */
-        90,  /* 0011 ->  9.0x */
-        95,  /* 0100 ->  9.5x */
-        -1,  /* 0101 ->  RESERVED */
-        45,  /* 0110 ->  4.5x */
-        55,  /* 0111 ->  5.5x */
-        60,  /* 1000 ->  6.0x */
-        70,  /* 1001 ->  7.0x */
-        80,  /* 1010 ->  8.0x */
-        50,  /* 1011 ->  5.0x */
-        65,  /* 1100 ->  6.5x */
-        75,  /* 1101 ->  7.5x */
-        85,  /* 1110 ->  8.5x */
-        120, /* 1111 -> 12.0x */
-        -1, /* 0000 -> 10.0x */
-        110, /* 0001 -> 11.0x */
-        -1, /* 0010 -> 12.0x */
-        -1,  /* 0011 ->  9.0x */
-        105, /* 0100 -> 10.5x */
-        115, /* 0101 -> 11.5x */
-        125, /* 0110 -> 12.5x */
-        135, /* 0111 -> 13.5x */
-        140, /* 1000 -> 14.0x */
-        150, /* 1001 -> 15.0x */
-        160, /* 1010 -> 16.0x */
-        130, /* 1011 -> 13.0x */
-        145, /* 1100 -> 14.5x */
-        155, /* 1101 -> 15.5x */
-        -1,  /* 1110 -> RESERVED (13.0x) */
-        -1, /* 1111 -> 12.0x */
-};
-
-static const int __cpuinitdata nehemiah_eblcr[32] = {
-        50,  /* 0000 ->  5.0x */
-        160, /* 0001 -> 16.0x */
-        40,  /* 0010 ->  4.0x */
-        100, /* 0011 -> 10.0x */
-        55,  /* 0100 ->  5.5x */
-        -1,  /* 0101 ->  RESERVED */
-        45,  /* 0110 ->  4.5x */
-        95,  /* 0111 ->  9.5x */
-        90,  /* 1000 ->  9.0x */
-        70,  /* 1001 ->  7.0x */
-        80,  /* 1010 ->  8.0x */
-        60,  /* 1011 ->  6.0x */
-        120, /* 1100 -> 12.0x */
-        75,  /* 1101 ->  7.5x */
-        85,  /* 1110 ->  8.5x */
-        65,  /* 1111 ->  6.5x */
-        90,  /* 0000 ->  9.0x */
-        110, /* 0001 -> 11.0x */
-        120, /* 0010 -> 12.0x */
-        100, /* 0011 -> 10.0x */
-        135, /* 0100 -> 13.5x */
-        115, /* 0101 -> 11.5x */
-        125, /* 0110 -> 12.5x */
-        105, /* 0111 -> 10.5x */
-        130, /* 1000 -> 13.0x */
-        150, /* 1001 -> 15.0x */
-        160, /* 1010 -> 16.0x */
-        140, /* 1011 -> 14.0x */
-        120, /* 1100 -> 12.0x */
-        155, /* 1101 -> 15.5x */
-        -1,  /* 1110 -> RESERVED (13.0x) */
-        145 /* 1111 -> 14.5x */
-};
-
-/*
- * Voltage scales. Div/Mod by 1000 to get actual voltage.
- * Which scale to use depends on the VRM type in use.
- */
-
-struct mV_pos {
-        unsigned short mV;
-        unsigned short pos;
-};
-
-static const struct mV_pos __cpuinitdata vrm85_mV[32] = {
-        {1250, 8},      {1200, 6},      {1150, 4},      {1100, 2},
-        {1050, 0},      {1800, 30},     {1750, 28},     {1700, 26},
-        {1650, 24},     {1600, 22},     {1550, 20},     {1500, 18},
-        {1450, 16},     {1400, 14},     {1350, 12},     {1300, 10},
-        {1275, 9},      {1225, 7},      {1175, 5},      {1125, 3},
-        {1075, 1},      {1825, 31},     {1775, 29},     {1725, 27},
-        {1675, 25},     {1625, 23},     {1575, 21},     {1525, 19},
-        {1475, 17},     {1425, 15},     {1375, 13},     {1325, 11}
-};
-
-static const unsigned char __cpuinitdata mV_vrm85[32] = {
-        0x04,   0x14,   0x03,   0x13,   0x02,   0x12,   0x01,   0x11,
-        0x00,   0x10,   0x0f,   0x1f,   0x0e,   0x1e,   0x0d,   0x1d,
-        0x0c,   0x1c,   0x0b,   0x1b,   0x0a,   0x1a,   0x09,   0x19,
-        0x08,   0x18,   0x07,   0x17,   0x06,   0x16,   0x05,   0x15
-};
-
-static const struct mV_pos __cpuinitdata mobilevrm_mV[32] = {
-        {1750, 31},     {1700, 30},     {1650, 29},     {1600, 28},
-        {1550, 27},     {1500, 26},     {1450, 25},     {1400, 24},
-        {1350, 23},     {1300, 22},     {1250, 21},     {1200, 20},
-        {1150, 19},     {1100, 18},     {1050, 17},     {1000, 16},
-        {975, 15},      {950, 14},      {925, 13},      {900, 12},
-        {875, 11},      {850, 10},      {825, 9},       {800, 8},
-        {775, 7},       {750, 6},       {725, 5},       {700, 4},
-        {675, 3},       {650, 2},       {625, 1},       {600, 0}
-};
-
-static const unsigned char __cpuinitdata mV_mobilevrm[32] = {
-        0x1f,   0x1e,   0x1d,   0x1c,   0x1b,   0x1a,   0x19,   0x18,
-        0x17,   0x16,   0x15,   0x14,   0x13,   0x12,   0x11,   0x10,
-        0x0f,   0x0e,   0x0d,   0x0c,   0x0b,   0x0a,   0x09,   0x08,
-        0x07,   0x06,   0x05,   0x04,   0x03,   0x02,   0x01,   0x00
-};
-
diff --git a/arch/x86/kernel/cpu/cpufreq/longrun.c b/arch/x86/kernel/cpu/cpufreq/longrun.c
deleted file mode 100644
index d9f51367666b..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/longrun.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * (C) 2002 - 2003  Dominik Brodowski <linux@brodo.de>
- *
- *  Licensed under the terms of the GNU GPL License version 2.
- *
- *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/timex.h>
-
-#include <asm/msr.h>
-#include <asm/processor.h>
-
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \
-                "longrun", msg)
-
-static struct cpufreq_driver    longrun_driver;
-
-/**
- * longrun_{low,high}_freq is needed for the conversion of cpufreq kHz
- * values into per cent values. In TMTA microcode, the following is valid:
- * performance_pctg = (current_freq - low_freq)/(high_freq - low_freq)
- */
-static unsigned int longrun_low_freq, longrun_high_freq;
-
-
-/**
- * longrun_get_policy - get the current LongRun policy
- * @policy: struct cpufreq_policy where current policy is written into
- *
- * Reads the current LongRun policy by access to MSR_TMTA_LONGRUN_FLAGS
- * and MSR_TMTA_LONGRUN_CTRL
- */
-static void __cpuinit longrun_get_policy(struct cpufreq_policy *policy)
-{
-        u32 msr_lo, msr_hi;
-
-        rdmsr(MSR_TMTA_LONGRUN_FLAGS, msr_lo, msr_hi);
-        dprintk("longrun flags are %x - %x\n", msr_lo, msr_hi);
-        if (msr_lo & 0x01)
-                policy->policy = CPUFREQ_POLICY_PERFORMANCE;
-        else
-                policy->policy = CPUFREQ_POLICY_POWERSAVE;
-
-        rdmsr(MSR_TMTA_LONGRUN_CTRL, msr_lo, msr_hi);
-        dprintk("longrun ctrl is %x - %x\n", msr_lo, msr_hi);
-        msr_lo &= 0x0000007F;
-        msr_hi &= 0x0000007F;
-
-        if (longrun_high_freq <= longrun_low_freq) {
-                /* Assume degenerate Longrun table */
-                policy->min = policy->max = longrun_high_freq;
-        } else {
-                policy->min = longrun_low_freq + msr_lo *
-                        ((longrun_high_freq - longrun_low_freq) / 100);
-                policy->max = longrun_low_freq + msr_hi *
-                        ((longrun_high_freq - longrun_low_freq) / 100);
-        }
-        policy->cpu = 0;
-}
-
-
-/**
- * longrun_set_policy - sets a new CPUFreq policy
- * @policy: new policy
- *
- * Sets a new CPUFreq policy on LongRun-capable processors. This function
- * has to be called with cpufreq_driver locked.
- */
-static int longrun_set_policy(struct cpufreq_policy *policy)
-{
-        u32 msr_lo, msr_hi;
-        u32 pctg_lo, pctg_hi;
-
-        if (!policy)
-                return -EINVAL;
-
-        if (longrun_high_freq <= longrun_low_freq) {
-                /* Assume degenerate Longrun table */
-                pctg_lo = pctg_hi = 100;
-        } else {
-                pctg_lo = (policy->min - longrun_low_freq) /
-                        ((longrun_high_freq - longrun_low_freq) / 100);
-                pctg_hi = (policy->max - longrun_low_freq) /
-                        ((longrun_high_freq - longrun_low_freq) / 100);
-        }
-
-        if (pctg_hi > 100)
-                pctg_hi = 100;
-        if (pctg_lo > pctg_hi)
-                pctg_lo = pctg_hi;
-
-        /* performance or economy mode */
-        rdmsr(MSR_TMTA_LONGRUN_FLAGS, msr_lo, msr_hi);
-        msr_lo &= 0xFFFFFFFE;
-        switch (policy->policy) {
-        case CPUFREQ_POLICY_PERFORMANCE:
-                msr_lo |= 0x00000001;
-                break;
-        case CPUFREQ_POLICY_POWERSAVE:
-                break;
-        }
-        wrmsr(MSR_TMTA_LONGRUN_FLAGS, msr_lo, msr_hi);
-
-        /* lower and upper boundary */
-        rdmsr(MSR_TMTA_LONGRUN_CTRL, msr_lo, msr_hi);
-        msr_lo &= 0xFFFFFF80;
-        msr_hi &= 0xFFFFFF80;
-        msr_lo |= pctg_lo;
-        msr_hi |= pctg_hi;
-        wrmsr(MSR_TMTA_LONGRUN_CTRL, msr_lo, msr_hi);
-
-        return 0;
-}
-
-
-/**
- * longrun_verify_poliy - verifies a new CPUFreq policy
- * @policy: the policy to verify
- *
- * Validates a new CPUFreq policy. This function has to be called with
- * cpufreq_driver locked.
- */
-static int longrun_verify_policy(struct cpufreq_policy *policy)
-{
-        if (!policy)
-                return -EINVAL;
-
-        policy->cpu = 0;
-        cpufreq_verify_within_limits(policy,
-                policy->cpuinfo.min_freq,
-                policy->cpuinfo.max_freq);
-
-        if ((policy->policy != CPUFREQ_POLICY_POWERSAVE) &&
-            (policy->policy != CPUFREQ_POLICY_PERFORMANCE))
-                return -EINVAL;
-
-        return 0;
-}
-
-static unsigned int longrun_get(unsigned int cpu)
-{
-        u32 eax, ebx, ecx, edx;
-
-        if (cpu)
-                return 0;
-
-        cpuid(0x80860007, &eax, &ebx, &ecx, &edx);
-        dprintk("cpuid eax is %u\n", eax);
-
-        return eax * 1000;
-}
-
-/**
- * longrun_determine_freqs - determines the lowest and highest possible core frequency
- * @low_freq: an int to put the lowest frequency into
- * @high_freq: an int to put the highest frequency into
- *
- * Determines the lowest and highest possible core frequencies on this CPU.
- * This is necessary to calculate the performance percentage according to
- * TMTA rules:
- * performance_pctg = (target_freq - low_freq)/(high_freq - low_freq)
- */
-static int __cpuinit longrun_determine_freqs(unsigned int *low_freq,
-                                                      unsigned int *high_freq)
-{
-        u32 msr_lo, msr_hi;
-        u32 save_lo, save_hi;
-        u32 eax, ebx, ecx, edx;
-        u32 try_hi;
-        struct cpuinfo_x86 *c = &cpu_data(0);
-
-        if (!low_freq || !high_freq)
-                return -EINVAL;
-
-        if (cpu_has(c, X86_FEATURE_LRTI)) {
-                /* if the LongRun Table Interface is present, the
-                 * detection is a bit easier:
-                 * For minimum frequency, read out the maximum
-                 * level (msr_hi), write that into "currently
-                 * selected level", and read out the frequency.
-                 * For maximum frequency, read out level zero.
-                 */
-                /* minimum */
-                rdmsr(MSR_TMTA_LRTI_READOUT, msr_lo, msr_hi);
-                wrmsr(MSR_TMTA_LRTI_READOUT, msr_hi, msr_hi);
-                rdmsr(MSR_TMTA_LRTI_VOLT_MHZ, msr_lo, msr_hi);
-                *low_freq = msr_lo * 1000; /* to kHz */
-
-                /* maximum */
-                wrmsr(MSR_TMTA_LRTI_READOUT, 0, msr_hi);
-                rdmsr(MSR_TMTA_LRTI_VOLT_MHZ, msr_lo, msr_hi);
-                *high_freq = msr_lo * 1000; /* to kHz */
-
-                dprintk("longrun table interface told %u - %u kHz\n",
-                                *low_freq, *high_freq);
-
-                if (*low_freq > *high_freq)
-                        *low_freq = *high_freq;
-                return 0;
-        }
-
-        /* set the upper border to the value determined during TSC init */
-        *high_freq = (cpu_khz / 1000);
-        *high_freq = *high_freq * 1000;
-        dprintk("high frequency is %u kHz\n", *high_freq);
-
-        /* get current borders */
-        rdmsr(MSR_TMTA_LONGRUN_CTRL, msr_lo, msr_hi);
-        save_lo = msr_lo & 0x0000007F;
-        save_hi = msr_hi & 0x0000007F;
-
-        /* if current perf_pctg is larger than 90%, we need to decrease the
-         * upper limit to make the calculation more accurate.
-         */
-        cpuid(0x80860007, &eax, &ebx, &ecx, &edx);
-        /* try decreasing in 10% steps, some processors react only
-         * on some barrier values */
-        for (try_hi = 80; try_hi > 0 && ecx > 90; try_hi -= 10) {
-                /* set to 0 to try_hi perf_pctg */
-                msr_lo &= 0xFFFFFF80;
-                msr_hi &= 0xFFFFFF80;
-                msr_hi |= try_hi;
-                wrmsr(MSR_TMTA_LONGRUN_CTRL, msr_lo, msr_hi);
-
-                /* read out current core MHz and current perf_pctg */
-                cpuid(0x80860007, &eax, &ebx, &ecx, &edx);
-
-                /* restore values */
-                wrmsr(MSR_TMTA_LONGRUN_CTRL, save_lo, save_hi);
-        }
-        dprintk("percentage is %u %%, freq is %u MHz\n", ecx, eax);
-
-        /* performance_pctg = (current_freq - low_freq)/(high_freq - low_freq)
-         * eqals
-         * low_freq * (1 - perf_pctg) = (cur_freq - high_freq * perf_pctg)
-         *
-         * high_freq * perf_pctg is stored tempoarily into "ebx".
-         */
-        ebx = (((cpu_khz / 1000) * ecx) / 100); /* to MHz */
-
-        if ((ecx > 95) || (ecx == 0) || (eax < ebx))
-                return -EIO;
-
-        edx = ((eax - ebx) * 100) / (100 - ecx);
-        *low_freq = edx * 1000; /* back to kHz */
-
-        dprintk("low frequency is %u kHz\n", *low_freq);
-
-        if (*low_freq > *high_freq)
-                *low_freq = *high_freq;
-
-        return 0;
-}
-
-
-static int __cpuinit longrun_cpu_init(struct cpufreq_policy *policy)
-{
-        int result = 0;
-
-        /* capability check */
-        if (policy->cpu != 0)
-                return -ENODEV;
-
-        /* detect low and high frequency */
-        result = longrun_determine_freqs(&longrun_low_freq, &longrun_high_freq);
-        if (result)
-                return result;
-
-        /* cpuinfo and default policy values */
-        policy->cpuinfo.min_freq = longrun_low_freq;
-        policy->cpuinfo.max_freq = longrun_high_freq;
-        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
-        longrun_get_policy(policy);
-
-        return 0;
-}
-
-
-static struct cpufreq_driver longrun_driver = {
-        .flags          = CPUFREQ_CONST_LOOPS,
-        .verify         = longrun_verify_policy,
-        .setpolicy      = longrun_set_policy,
-        .get            = longrun_get,
-        .init           = longrun_cpu_init,
-        .name           = "longrun",
-        .owner          = THIS_MODULE,
-};
-
-
-/**
- * longrun_init - initializes the Transmeta Crusoe LongRun CPUFreq driver
- *
- * Initializes the LongRun support.
- */
-static int __init longrun_init(void)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-
-        if (c->x86_vendor != X86_VENDOR_TRANSMETA ||
-            !cpu_has(c, X86_FEATURE_LONGRUN))
-                return -ENODEV;
-
-        return cpufreq_register_driver(&longrun_driver);
-}
-
-
-/**
- * longrun_exit - unregisters LongRun support
- */
-static void __exit longrun_exit(void)
-{
-        cpufreq_unregister_driver(&longrun_driver);
-}
-
-
-MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>");
-MODULE_DESCRIPTION("LongRun driver for Transmeta Crusoe and "
-                "Efficeon processors.");
-MODULE_LICENSE("GPL");
-
-module_init(longrun_init);
-module_exit(longrun_exit);
diff --git a/arch/x86/kernel/cpu/cpufreq/mperf.c b/arch/x86/kernel/cpu/cpufreq/mperf.c
deleted file mode 100644
index 911e193018ae..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/mperf.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/smp.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/slab.h>
-
-#include "mperf.h"
-
-static DEFINE_PER_CPU(struct aperfmperf, acfreq_old_perf);
-
-/* Called via smp_call_function_single(), on the target CPU */
-static void read_measured_perf_ctrs(void *_cur)
-{
-        struct aperfmperf *am = _cur;
-
-        get_aperfmperf(am);
-}
-
-/*
- * Return the measured active (C0) frequency on this CPU since last call
- * to this function.
- * Input: cpu number
- * Return: Average CPU frequency in terms of max frequency (zero on error)
- *
- * We use IA32_MPERF and IA32_APERF MSRs to get the measured performance
- * over a period of time, while CPU is in C0 state.
- * IA32_MPERF counts at the rate of max advertised frequency
- * IA32_APERF counts at the rate of actual CPU frequency
- * Only IA32_APERF/IA32_MPERF ratio is architecturally defined and
- * no meaning should be associated with absolute values of these MSRs.
- */
-unsigned int cpufreq_get_measured_perf(struct cpufreq_policy *policy,
-                                        unsigned int cpu)
-{
-        struct aperfmperf perf;
-        unsigned long ratio;
-        unsigned int retval;
-
-        if (smp_call_function_single(cpu, read_measured_perf_ctrs, &perf, 1))
-                return 0;
-
-        ratio = calc_aperfmperf_ratio(&per_cpu(acfreq_old_perf, cpu), &perf);
-        per_cpu(acfreq_old_perf, cpu) = perf;
-
-        retval = (policy->cpuinfo.max_freq * ratio) >> APERFMPERF_SHIFT;
-
-        return retval;
-}
-EXPORT_SYMBOL_GPL(cpufreq_get_measured_perf);
-MODULE_LICENSE("GPL");
diff --git a/arch/x86/kernel/cpu/cpufreq/mperf.h b/arch/x86/kernel/cpu/cpufreq/mperf.h
deleted file mode 100644
index 5dbf2950dc22..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/mperf.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- *  (c) 2010 Advanced Micro Devices, Inc.
- *  Your use of this code is subject to the terms and conditions of the
- *  GNU general public license version 2. See "COPYING" or
- *  http://www.gnu.org/licenses/gpl.html
- */
-
-unsigned int cpufreq_get_measured_perf(struct cpufreq_policy *policy,
-                                        unsigned int cpu);
diff --git a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
deleted file mode 100644
index 52c93648e492..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- *      Pentium 4/Xeon CPU on demand clock modulation/speed scaling
- *      (C) 2002 - 2003 Dominik Brodowski <linux@brodo.de>
- *      (C) 2002 Zwane Mwaikambo <zwane@commfireservices.com>
- *      (C) 2002 Arjan van de Ven <arjanv@redhat.com>
- *      (C) 2002 Tora T. Engstad
- *      All Rights Reserved
- *
- *      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.
- *
- *      The author(s) of this software shall not be held liable for damages
- *      of any nature resulting due to the use of this software. This
- *      software is provided AS-IS with no warranties.
- *
- *      Date            Errata                  Description
- *      20020525        N44, O17        12.5% or 25% DC causes lockup
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/smp.h>
-#include <linux/cpufreq.h>
-#include <linux/cpumask.h>
-#include <linux/timex.h>
-
-#include <asm/processor.h>
-#include <asm/msr.h>
-#include <asm/timer.h>
-
-#include "speedstep-lib.h"
-
-#define PFX     "p4-clockmod: "
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \
-                "p4-clockmod", msg)
-
-/*
- * Duty Cycle (3bits), note DC_DISABLE is not specified in
- * intel docs i just use it to mean disable
- */
-enum {
-        DC_RESV, DC_DFLT, DC_25PT, DC_38PT, DC_50PT,
-        DC_64PT, DC_75PT, DC_88PT, DC_DISABLE
-};
-
-#define DC_ENTRIES      8
-
-
-static int has_N44_O17_errata[NR_CPUS];
-static unsigned int stock_freq;
-static struct cpufreq_driver p4clockmod_driver;
-static unsigned int cpufreq_p4_get(unsigned int cpu);
-
-static int cpufreq_p4_setdc(unsigned int cpu, unsigned int newstate)
-{
-        u32 l, h;
-
-        if (!cpu_online(cpu) ||
-            (newstate > DC_DISABLE) || (newstate == DC_RESV))
-                return -EINVAL;
-
-        rdmsr_on_cpu(cpu, MSR_IA32_THERM_STATUS, &l, &h);
-
-        if (l & 0x01)
-                dprintk("CPU#%d currently thermal throttled\n", cpu);
-
-        if (has_N44_O17_errata[cpu] &&
-            (newstate == DC_25PT || newstate == DC_DFLT))
-                newstate = DC_38PT;
-
-        rdmsr_on_cpu(cpu, MSR_IA32_THERM_CONTROL, &l, &h);
-        if (newstate == DC_DISABLE) {
-                dprintk("CPU#%d disabling modulation\n", cpu);
-                wrmsr_on_cpu(cpu, MSR_IA32_THERM_CONTROL, l & ~(1<<4), h);
-        } else {
-                dprintk("CPU#%d setting duty cycle to %d%%\n",
-                        cpu, ((125 * newstate) / 10));
-                /* bits 63 - 5  : reserved
-                 * bit  4       : enable/disable
-                 * bits 3-1     : duty cycle
-                 * bit  0       : reserved
-                 */
-                l = (l & ~14);
-                l = l | (1<<4) | ((newstate & 0x7)<<1);
-                wrmsr_on_cpu(cpu, MSR_IA32_THERM_CONTROL, l, h);
-        }
-
-        return 0;
-}
-
-
-static struct cpufreq_frequency_table p4clockmod_table[] = {
-        {DC_RESV, CPUFREQ_ENTRY_INVALID},
-        {DC_DFLT, 0},
-        {DC_25PT, 0},
-        {DC_38PT, 0},
-        {DC_50PT, 0},
-        {DC_64PT, 0},
-        {DC_75PT, 0},
-        {DC_88PT, 0},
-        {DC_DISABLE, 0},
-        {DC_RESV, CPUFREQ_TABLE_END},
-};
-
-
-static int cpufreq_p4_target(struct cpufreq_policy *policy,
-                             unsigned int target_freq,
-                             unsigned int relation)
-{
-        unsigned int    newstate = DC_RESV;
-        struct cpufreq_freqs freqs;
-        int i;
-
-        if (cpufreq_frequency_table_target(policy, &p4clockmod_table[0],
-                                target_freq, relation, &newstate))
-                return -EINVAL;
-
-        freqs.old = cpufreq_p4_get(policy->cpu);
-        freqs.new = stock_freq * p4clockmod_table[newstate].index / 8;
-
-        if (freqs.new == freqs.old)
-                return 0;
-
-        /* notifiers */
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        }
-
-        /* run on each logical CPU,
-         * see section 13.15.3 of IA32 Intel Architecture Software
-         * Developer's Manual, Volume 3
-         */
-        for_each_cpu(i, policy->cpus)
-                cpufreq_p4_setdc(i, p4clockmod_table[newstate].index);
-
-        /* notifiers */
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
-
-        return 0;
-}
-
-
-static int cpufreq_p4_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, &p4clockmod_table[0]);
-}
-
-
-static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
-{
-        if (c->x86 == 0x06) {
-                if (cpu_has(c, X86_FEATURE_EST))
-                        printk_once(KERN_WARNING PFX "Warning: EST-capable "
-                               "CPU detected. The acpi-cpufreq module offers "
-                               "voltage scaling in addition to frequency "
-                               "scaling. You should use that instead of "
-                               "p4-clockmod, if possible.\n");
-                switch (c->x86_model) {
-                case 0x0E: /* Core */
-                case 0x0F: /* Core Duo */
-                case 0x16: /* Celeron Core */
-                case 0x1C: /* Atom */
-                        p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
-                        return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
-                case 0x0D: /* Pentium M (Dothan) */
-                        p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
-                        /* fall through */
-                case 0x09: /* Pentium M (Banias) */
-                        return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
-                }
-        }
-
-        if (c->x86 != 0xF)
-                return 0;
-
-        /* on P-4s, the TSC runs with constant frequency independent whether
-         * throttling is active or not. */
-        p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
-
-        if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
-                printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
-                       "The speedstep-ich or acpi cpufreq modules offer "
-                       "voltage scaling in addition of frequency scaling. "
-                       "You should use either one instead of p4-clockmod, "
-                       "if possible.\n");
-                return speedstep_get_frequency(SPEEDSTEP_CPU_P4M);
-        }
-
-        return speedstep_get_frequency(SPEEDSTEP_CPU_P4D);
-}
-
-
-
-static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy)
-{
-        struct cpuinfo_x86 *c = &cpu_data(policy->cpu);
-        int cpuid = 0;
-        unsigned int i;
-
-#ifdef CONFIG_SMP
-        cpumask_copy(policy->cpus, cpu_sibling_mask(policy->cpu));
-#endif
-
-        /* Errata workaround */
-        cpuid = (c->x86 << 8) | (c->x86_model << 4) | c->x86_mask;
-        switch (cpuid) {
-        case 0x0f07:
-        case 0x0f0a:
-        case 0x0f11:
-        case 0x0f12:
-                has_N44_O17_errata[policy->cpu] = 1;
-                dprintk("has errata -- disabling low frequencies\n");
-        }
-
-        if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4D &&
-            c->x86_model < 2) {
-                /* switch to maximum frequency and measure result */
-                cpufreq_p4_setdc(policy->cpu, DC_DISABLE);
-                recalibrate_cpu_khz();
-        }
-        /* get max frequency */
-        stock_freq = cpufreq_p4_get_frequency(c);
-        if (!stock_freq)
-                return -EINVAL;
-
-        /* table init */
-        for (i = 1; (p4clockmod_table[i].frequency != CPUFREQ_TABLE_END); i++) {
-                if ((i < 2) && (has_N44_O17_errata[policy->cpu]))
-                        p4clockmod_table[i].frequency = CPUFREQ_ENTRY_INVALID;
-                else
-                        p4clockmod_table[i].frequency = (stock_freq * i)/8;
-        }
-        cpufreq_frequency_table_get_attr(p4clockmod_table, policy->cpu);
-
-        /* cpuinfo and default policy values */
-
-        /* the transition latency is set to be 1 higher than the maximum
-         * transition latency of the ondemand governor */
-        policy->cpuinfo.transition_latency = 10000001;
-        policy->cur = stock_freq;
-
-        return cpufreq_frequency_table_cpuinfo(policy, &p4clockmod_table[0]);
-}
-
-
-static int cpufreq_p4_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        return 0;
-}
-
-static unsigned int cpufreq_p4_get(unsigned int cpu)
-{
-        u32 l, h;
-
-        rdmsr_on_cpu(cpu, MSR_IA32_THERM_CONTROL, &l, &h);
-
-        if (l & 0x10) {
-                l = l >> 1;
-                l &= 0x7;
-        } else
-                l = DC_DISABLE;
-
-        if (l != DC_DISABLE)
-                return stock_freq * l / 8;
-
-        return stock_freq;
-}
-
-static struct freq_attr *p4clockmod_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver p4clockmod_driver = {
-        .verify         = cpufreq_p4_verify,
-        .target         = cpufreq_p4_target,
-        .init           = cpufreq_p4_cpu_init,
-        .exit           = cpufreq_p4_cpu_exit,
-        .get            = cpufreq_p4_get,
-        .name           = "p4-clockmod",
-        .owner          = THIS_MODULE,
-        .attr           = p4clockmod_attr,
-};
-
-
-static int __init cpufreq_p4_init(void)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-        int ret;
-
-        /*
-         * THERM_CONTROL is architectural for IA32 now, so
-         * we can rely on the capability checks
-         */
-        if (c->x86_vendor != X86_VENDOR_INTEL)
-                return -ENODEV;
-
-        if (!test_cpu_cap(c, X86_FEATURE_ACPI) ||
-                                !test_cpu_cap(c, X86_FEATURE_ACC))
-                return -ENODEV;
-
-        ret = cpufreq_register_driver(&p4clockmod_driver);
-        if (!ret)
-                printk(KERN_INFO PFX "P4/Xeon(TM) CPU On-Demand Clock "
-                                "Modulation available\n");
-
-        return ret;
-}
-
-
-static void __exit cpufreq_p4_exit(void)
-{
-        cpufreq_unregister_driver(&p4clockmod_driver);
-}
-
-
-MODULE_AUTHOR("Zwane Mwaikambo <zwane@commfireservices.com>");
-MODULE_DESCRIPTION("cpufreq driver for Pentium(TM) 4/Xeon(TM)");
-MODULE_LICENSE("GPL");
-
-late_initcall(cpufreq_p4_init);
-module_exit(cpufreq_p4_exit);
diff --git a/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c
deleted file mode 100644
index 755a31e0f5b0..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c
+++ /dev/null
@@ -1,624 +0,0 @@
-/*
- *  pcc-cpufreq.c - Processor Clocking Control firmware cpufreq interface
- *
- *  Copyright (C) 2009 Red Hat, Matthew Garrett <mjg@redhat.com>
- *  Copyright (C) 2009 Hewlett-Packard Development Company, L.P.
- *      Nagananda Chumbalkar <nagananda.chumbalkar@hp.com>
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  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, GOOD TITLE or NON
- *  INFRINGEMENT. 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/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/smp.h>
-#include <linux/sched.h>
-#include <linux/cpufreq.h>
-#include <linux/compiler.h>
-#include <linux/slab.h>
-
-#include <linux/acpi.h>
-#include <linux/io.h>
-#include <linux/spinlock.h>
-#include <linux/uaccess.h>
-
-#include <acpi/processor.h>
-
-#define PCC_VERSION     "1.00.00"
-#define POLL_LOOPS      300
-
-#define CMD_COMPLETE    0x1
-#define CMD_GET_FREQ    0x0
-#define CMD_SET_FREQ    0x1
-
-#define BUF_SZ          4
-
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER,      \
-                                             "pcc-cpufreq", msg)
-
-struct pcc_register_resource {
-        u8 descriptor;
-        u16 length;
-        u8 space_id;
-        u8 bit_width;
-        u8 bit_offset;
-        u8 access_size;
-        u64 address;
-} __attribute__ ((packed));
-
-struct pcc_memory_resource {
-        u8 descriptor;
-        u16 length;
-        u8 space_id;
-        u8 resource_usage;
-        u8 type_specific;
-        u64 granularity;
-        u64 minimum;
-        u64 maximum;
-        u64 translation_offset;
-        u64 address_length;
-} __attribute__ ((packed));
-
-static struct cpufreq_driver pcc_cpufreq_driver;
-
-struct pcc_header {
-        u32 signature;
-        u16 length;
-        u8 major;
-        u8 minor;
-        u32 features;
-        u16 command;
-        u16 status;
-        u32 latency;
-        u32 minimum_time;
-        u32 maximum_time;
-        u32 nominal;
-        u32 throttled_frequency;
-        u32 minimum_frequency;
-};
-
-static void __iomem *pcch_virt_addr;
-static struct pcc_header __iomem *pcch_hdr;
-
-static DEFINE_SPINLOCK(pcc_lock);
-
-static struct acpi_generic_address doorbell;
-
-static u64 doorbell_preserve;
-static u64 doorbell_write;
-
-static u8 OSC_UUID[16] = {0x63, 0x9B, 0x2C, 0x9F, 0x70, 0x91, 0x49, 0x1f,
-                          0xBB, 0x4F, 0xA5, 0x98, 0x2F, 0xA1, 0xB5, 0x46};
-
-struct pcc_cpu {
-        u32 input_offset;
-        u32 output_offset;
-};
-
-static struct pcc_cpu __percpu *pcc_cpu_info;
-
-static int pcc_cpufreq_verify(struct cpufreq_policy *policy)
-{
-        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
-                                     policy->cpuinfo.max_freq);
-        return 0;
-}
-
-static inline void pcc_cmd(void)
-{
-        u64 doorbell_value;
-        int i;
-
-        acpi_read(&doorbell_value, &doorbell);
-        acpi_write((doorbell_value & doorbell_preserve) | doorbell_write,
-                   &doorbell);
-
-        for (i = 0; i < POLL_LOOPS; i++) {
-                if (ioread16(&pcch_hdr->status) & CMD_COMPLETE)
-                        break;
-        }
-}
-
-static inline void pcc_clear_mapping(void)
-{
-        if (pcch_virt_addr)
-                iounmap(pcch_virt_addr);
-        pcch_virt_addr = NULL;
-}
-
-static unsigned int pcc_get_freq(unsigned int cpu)
-{
-        struct pcc_cpu *pcc_cpu_data;
-        unsigned int curr_freq;
-        unsigned int freq_limit;
-        u16 status;
-        u32 input_buffer;
-        u32 output_buffer;
-
-        spin_lock(&pcc_lock);
-
-        dprintk("get: get_freq for CPU %d\n", cpu);
-        pcc_cpu_data = per_cpu_ptr(pcc_cpu_info, cpu);
-
-        input_buffer = 0x1;
-        iowrite32(input_buffer,
-                        (pcch_virt_addr + pcc_cpu_data->input_offset));
-        iowrite16(CMD_GET_FREQ, &pcch_hdr->command);
-
-        pcc_cmd();
-
-        output_buffer =
-                ioread32(pcch_virt_addr + pcc_cpu_data->output_offset);
-
-        /* Clear the input buffer - we are done with the current command */
-        memset_io((pcch_virt_addr + pcc_cpu_data->input_offset), 0, BUF_SZ);
-
-        status = ioread16(&pcch_hdr->status);
-        if (status != CMD_COMPLETE) {
-                dprintk("get: FAILED: for CPU %d, status is %d\n",
-                        cpu, status);
-                goto cmd_incomplete;
-        }
-        iowrite16(0, &pcch_hdr->status);
-        curr_freq = (((ioread32(&pcch_hdr->nominal) * (output_buffer & 0xff))
-                        / 100) * 1000);
-
-        dprintk("get: SUCCESS: (virtual) output_offset for cpu %d is "
-                "0x%x, contains a value of: 0x%x. Speed is: %d MHz\n",
-                cpu, (pcch_virt_addr + pcc_cpu_data->output_offset),
-                output_buffer, curr_freq);
-
-        freq_limit = (output_buffer >> 8) & 0xff;
-        if (freq_limit != 0xff) {
-                dprintk("get: frequency for cpu %d is being temporarily"
-                        " capped at %d\n", cpu, curr_freq);
-        }
-
-        spin_unlock(&pcc_lock);
-        return curr_freq;
-
-cmd_incomplete:
-        iowrite16(0, &pcch_hdr->status);
-        spin_unlock(&pcc_lock);
-        return 0;
-}
-
-static int pcc_cpufreq_target(struct cpufreq_policy *policy,
-                              unsigned int target_freq,
-                              unsigned int relation)
-{
-        struct pcc_cpu *pcc_cpu_data;
-        struct cpufreq_freqs freqs;
-        u16 status;
-        u32 input_buffer;
-        int cpu;
-
-        spin_lock(&pcc_lock);
-        cpu = policy->cpu;
-        pcc_cpu_data = per_cpu_ptr(pcc_cpu_info, cpu);
-
-        dprintk("target: CPU %d should go to target freq: %d "
-                "(virtual) input_offset is 0x%x\n",
-                cpu, target_freq,
-                (pcch_virt_addr + pcc_cpu_data->input_offset));
-
-        freqs.new = target_freq;
-        freqs.cpu = cpu;
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        input_buffer = 0x1 | (((target_freq * 100)
-                               / (ioread32(&pcch_hdr->nominal) * 1000)) << 8);
-        iowrite32(input_buffer,
-                        (pcch_virt_addr + pcc_cpu_data->input_offset));
-        iowrite16(CMD_SET_FREQ, &pcch_hdr->command);
-
-        pcc_cmd();
-
-        /* Clear the input buffer - we are done with the current command */
-        memset_io((pcch_virt_addr + pcc_cpu_data->input_offset), 0, BUF_SZ);
-
-        status = ioread16(&pcch_hdr->status);
-        if (status != CMD_COMPLETE) {
-                dprintk("target: FAILED for cpu %d, with status: 0x%x\n",
-                        cpu, status);
-                goto cmd_incomplete;
-        }
-        iowrite16(0, &pcch_hdr->status);
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        dprintk("target: was SUCCESSFUL for cpu %d\n", cpu);
-        spin_unlock(&pcc_lock);
-
-        return 0;
-
-cmd_incomplete:
-        iowrite16(0, &pcch_hdr->status);
-        spin_unlock(&pcc_lock);
-        return -EINVAL;
-}
-
-static int pcc_get_offset(int cpu)
-{
-        acpi_status status;
-        struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-        union acpi_object *pccp, *offset;
-        struct pcc_cpu *pcc_cpu_data;
-        struct acpi_processor *pr;
-        int ret = 0;
-
-        pr = per_cpu(processors, cpu);
-        pcc_cpu_data = per_cpu_ptr(pcc_cpu_info, cpu);
-
-        status = acpi_evaluate_object(pr->handle, "PCCP", NULL, &buffer);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
-
-        pccp = buffer.pointer;
-        if (!pccp || pccp->type != ACPI_TYPE_PACKAGE) {
-                ret = -ENODEV;
-                goto out_free;
-        };
-
-        offset = &(pccp->package.elements[0]);
-        if (!offset || offset->type != ACPI_TYPE_INTEGER) {
-                ret = -ENODEV;
-                goto out_free;
-        }
-
-        pcc_cpu_data->input_offset = offset->integer.value;
-
-        offset = &(pccp->package.elements[1]);
-        if (!offset || offset->type != ACPI_TYPE_INTEGER) {
-                ret = -ENODEV;
-                goto out_free;
-        }
-
-        pcc_cpu_data->output_offset = offset->integer.value;
-
-        memset_io((pcch_virt_addr + pcc_cpu_data->input_offset), 0, BUF_SZ);
-        memset_io((pcch_virt_addr + pcc_cpu_data->output_offset), 0, BUF_SZ);
-
-        dprintk("pcc_get_offset: for CPU %d: pcc_cpu_data "
-                "input_offset: 0x%x, pcc_cpu_data output_offset: 0x%x\n",
-                cpu, pcc_cpu_data->input_offset, pcc_cpu_data->output_offset);
-out_free:
-        kfree(buffer.pointer);
-        return ret;
-}
-
-static int __init pcc_cpufreq_do_osc(acpi_handle *handle)
-{
-        acpi_status status;
-        struct acpi_object_list input;
-        struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
-        union acpi_object in_params[4];
-        union acpi_object *out_obj;
-        u32 capabilities[2];
-        u32 errors;
-        u32 supported;
-        int ret = 0;
-
-        input.count = 4;
-        input.pointer = in_params;
-        in_params[0].type               = ACPI_TYPE_BUFFER;
-        in_params[0].buffer.length      = 16;
-        in_params[0].buffer.pointer     = OSC_UUID;
-        in_params[1].type               = ACPI_TYPE_INTEGER;
-        in_params[1].integer.value      = 1;
-        in_params[2].type               = ACPI_TYPE_INTEGER;
-        in_params[2].integer.value      = 2;
-        in_params[3].type               = ACPI_TYPE_BUFFER;
-        in_params[3].buffer.length      = 8;
-        in_params[3].buffer.pointer     = (u8 *)&capabilities;
-
-        capabilities[0] = OSC_QUERY_ENABLE;
-        capabilities[1] = 0x1;
-
-        status = acpi_evaluate_object(*handle, "_OSC", &input, &output);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
-
-        if (!output.length)
-                return -ENODEV;
-
-        out_obj = output.pointer;
-        if (out_obj->type != ACPI_TYPE_BUFFER) {
-                ret = -ENODEV;
-                goto out_free;
-        }
-
-        errors = *((u32 *)out_obj->buffer.pointer) & ~(1 << 0);
-        if (errors) {
-                ret = -ENODEV;
-                goto out_free;
-        }
-
-        supported = *((u32 *)(out_obj->buffer.pointer + 4));
-        if (!(supported & 0x1)) {
-                ret = -ENODEV;
-                goto out_free;
-        }
-
-        kfree(output.pointer);
-        capabilities[0] = 0x0;
-        capabilities[1] = 0x1;
-
-        status = acpi_evaluate_object(*handle, "_OSC", &input, &output);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
-
-        if (!output.length)
-                return -ENODEV;
-
-        out_obj = output.pointer;
-        if (out_obj->type != ACPI_TYPE_BUFFER) {
-                ret = -ENODEV;
-                goto out_free;
-        }
-
-        errors = *((u32 *)out_obj->buffer.pointer) & ~(1 << 0);
-        if (errors) {
-                ret = -ENODEV;
-                goto out_free;
-        }
-
-        supported = *((u32 *)(out_obj->buffer.pointer + 4));
-        if (!(supported & 0x1)) {
-                ret = -ENODEV;
-                goto out_free;
-        }
-
-out_free:
-        kfree(output.pointer);
-        return ret;
-}
-
-static int __init pcc_cpufreq_probe(void)
-{
-        acpi_status status;
-        struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
-        struct pcc_memory_resource *mem_resource;
-        struct pcc_register_resource *reg_resource;
-        union acpi_object *out_obj, *member;
-        acpi_handle handle, osc_handle, pcch_handle;
-        int ret = 0;
-
-        status = acpi_get_handle(NULL, "\\_SB", &handle);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
-
-        status = acpi_get_handle(handle, "PCCH", &pcch_handle);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
-
-        status = acpi_get_handle(handle, "_OSC", &osc_handle);
-        if (ACPI_SUCCESS(status)) {
-                ret = pcc_cpufreq_do_osc(&osc_handle);
-                if (ret)
-                        dprintk("probe: _OSC evaluation did not succeed\n");
-                /* Firmware's use of _OSC is optional */
-                ret = 0;
-        }
-
-        status = acpi_evaluate_object(handle, "PCCH", NULL, &output);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
-
-        out_obj = output.pointer;
-        if (out_obj->type != ACPI_TYPE_PACKAGE) {
-                ret = -ENODEV;
-                goto out_free;
-        }
-
-        member = &out_obj->package.elements[0];
-        if (member->type != ACPI_TYPE_BUFFER) {
-                ret = -ENODEV;
-                goto out_free;
-        }
-
-        mem_resource = (struct pcc_memory_resource *)member->buffer.pointer;
-
-        dprintk("probe: mem_resource descriptor: 0x%x,"
-                " length: %d, space_id: %d, resource_usage: %d,"
-                " type_specific: %d, granularity: 0x%llx,"
-                " minimum: 0x%llx, maximum: 0x%llx,"
-                " translation_offset: 0x%llx, address_length: 0x%llx\n",
-                mem_resource->descriptor, mem_resource->length,
-                mem_resource->space_id, mem_resource->resource_usage,
-                mem_resource->type_specific, mem_resource->granularity,
-                mem_resource->minimum, mem_resource->maximum,
-                mem_resource->translation_offset,
-                mem_resource->address_length);
-
-        if (mem_resource->space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY) {
-                ret = -ENODEV;
-                goto out_free;
-        }
-
-        pcch_virt_addr = ioremap_nocache(mem_resource->minimum,
-                                        mem_resource->address_length);
-        if (pcch_virt_addr == NULL) {
-                dprintk("probe: could not map shared mem region\n");
-                goto out_free;
-        }
-        pcch_hdr = pcch_virt_addr;
-
-        dprintk("probe: PCCH header (virtual) addr: 0x%p\n", pcch_hdr);
-        dprintk("probe: PCCH header is at physical address: 0x%llx,"
-                " signature: 0x%x, length: %d bytes, major: %d, minor: %d,"
-                " supported features: 0x%x, command field: 0x%x,"
-                " status field: 0x%x, nominal latency: %d us\n",
-                mem_resource->minimum, ioread32(&pcch_hdr->signature),
-                ioread16(&pcch_hdr->length), ioread8(&pcch_hdr->major),
-                ioread8(&pcch_hdr->minor), ioread32(&pcch_hdr->features),
-                ioread16(&pcch_hdr->command), ioread16(&pcch_hdr->status),
-                ioread32(&pcch_hdr->latency));
-
-        dprintk("probe: min time between commands: %d us,"
-                " max time between commands: %d us,"
-                " nominal CPU frequency: %d MHz,"
-                " minimum CPU frequency: %d MHz,"
-                " minimum CPU frequency without throttling: %d MHz\n",
-                ioread32(&pcch_hdr->minimum_time),
-                ioread32(&pcch_hdr->maximum_time),
-                ioread32(&pcch_hdr->nominal),
-                ioread32(&pcch_hdr->throttled_frequency),
-                ioread32(&pcch_hdr->minimum_frequency));
-
-        member = &out_obj->package.elements[1];
-        if (member->type != ACPI_TYPE_BUFFER) {
-                ret = -ENODEV;
-                goto pcch_free;
-        }
-
-        reg_resource = (struct pcc_register_resource *)member->buffer.pointer;
-
-        doorbell.space_id = reg_resource->space_id;
-        doorbell.bit_width = reg_resource->bit_width;
-        doorbell.bit_offset = reg_resource->bit_offset;
-        doorbell.access_width = 64;
-        doorbell.address = reg_resource->address;
-
-        dprintk("probe: doorbell: space_id is %d, bit_width is %d, "
-                "bit_offset is %d, access_width is %d, address is 0x%llx\n",
-                doorbell.space_id, doorbell.bit_width, doorbell.bit_offset,
-                doorbell.access_width, reg_resource->address);
-
-        member = &out_obj->package.elements[2];
-        if (member->type != ACPI_TYPE_INTEGER) {
-                ret = -ENODEV;
-                goto pcch_free;
-        }
-
-        doorbell_preserve = member->integer.value;
-
-        member = &out_obj->package.elements[3];
-        if (member->type != ACPI_TYPE_INTEGER) {
-                ret = -ENODEV;
-                goto pcch_free;
-        }
-
-        doorbell_write = member->integer.value;
-
-        dprintk("probe: doorbell_preserve: 0x%llx,"
-                " doorbell_write: 0x%llx\n",
-                doorbell_preserve, doorbell_write);
-
-        pcc_cpu_info = alloc_percpu(struct pcc_cpu);
-        if (!pcc_cpu_info) {
-                ret = -ENOMEM;
-                goto pcch_free;
-        }
-
-        printk(KERN_DEBUG "pcc-cpufreq: (v%s) driver loaded with frequency"
-               " limits: %d MHz, %d MHz\n", PCC_VERSION,
-               ioread32(&pcch_hdr->minimum_frequency),
-               ioread32(&pcch_hdr->nominal));
-        kfree(output.pointer);
-        return ret;
-pcch_free:
-        pcc_clear_mapping();
-out_free:
-        kfree(output.pointer);
-        return ret;
-}
-
-static int pcc_cpufreq_cpu_init(struct cpufreq_policy *policy)
-{
-        unsigned int cpu = policy->cpu;
-        unsigned int result = 0;
-
-        if (!pcch_virt_addr) {
-                result = -1;
-                goto out;
-        }
-
-        result = pcc_get_offset(cpu);
-        if (result) {
-                dprintk("init: PCCP evaluation failed\n");
-                goto out;
-        }
-
-        policy->max = policy->cpuinfo.max_freq =
-                ioread32(&pcch_hdr->nominal) * 1000;
-        policy->min = policy->cpuinfo.min_freq =
-                ioread32(&pcch_hdr->minimum_frequency) * 1000;
-        policy->cur = pcc_get_freq(cpu);
-
-        if (!policy->cur) {
-                dprintk("init: Unable to get current CPU frequency\n");
-                result = -EINVAL;
-                goto out;
-        }
-
-        dprintk("init: policy->max is %d, policy->min is %d\n",
-                policy->max, policy->min);
-out:
-        return result;
-}
-
-static int pcc_cpufreq_cpu_exit(struct cpufreq_policy *policy)
-{
-        return 0;
-}
-
-static struct cpufreq_driver pcc_cpufreq_driver = {
-        .flags = CPUFREQ_CONST_LOOPS,
-        .get = pcc_get_freq,
-        .verify = pcc_cpufreq_verify,
-        .target = pcc_cpufreq_target,
-        .init = pcc_cpufreq_cpu_init,
-        .exit = pcc_cpufreq_cpu_exit,
-        .name = "pcc-cpufreq",
-        .owner = THIS_MODULE,
-};
-
-static int __init pcc_cpufreq_init(void)
-{
-        int ret;
-
-        if (acpi_disabled)
-                return 0;
-
-        ret = pcc_cpufreq_probe();
-        if (ret) {
-                dprintk("pcc_cpufreq_init: PCCH evaluation failed\n");
-                return ret;
-        }
-
-        ret = cpufreq_register_driver(&pcc_cpufreq_driver);
-
-        return ret;
-}
-
-static void __exit pcc_cpufreq_exit(void)
-{
-        cpufreq_unregister_driver(&pcc_cpufreq_driver);
-
-        pcc_clear_mapping();
-
-        free_percpu(pcc_cpu_info);
-}
-
-MODULE_AUTHOR("Matthew Garrett, Naga Chumbalkar");
-MODULE_VERSION(PCC_VERSION);
-MODULE_DESCRIPTION("Processor Clocking Control interface driver");
-MODULE_LICENSE("GPL");
-
-late_initcall(pcc_cpufreq_init);
-module_exit(pcc_cpufreq_exit);
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k6.c b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
deleted file mode 100644
index b3379d6a5c57..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- *  This file was based upon code in Powertweak Linux (http://powertweak.sf.net)
- *  (C) 2000-2003  Dave Jones, Arjan van de Ven, Janne Pänkälä,
- *                 Dominik Brodowski.
- *
- *  Licensed under the terms of the GNU GPL License version 2.
- *
- *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/ioport.h>
-#include <linux/timex.h>
-#include <linux/io.h>
-
-#include <asm/msr.h>
-
-#define POWERNOW_IOPORT 0xfff0          /* it doesn't matter where, as long
-                                           as it is unused */
-
-#define PFX "powernow-k6: "
-static unsigned int                     busfreq;   /* FSB, in 10 kHz */
-static unsigned int                     max_multiplier;
-
-
-/* Clock ratio multiplied by 10 - see table 27 in AMD#23446 */
-static struct cpufreq_frequency_table clock_ratio[] = {
-        {45,  /* 000 -> 4.5x */ 0},
-        {50,  /* 001 -> 5.0x */ 0},
-        {40,  /* 010 -> 4.0x */ 0},
-        {55,  /* 011 -> 5.5x */ 0},
-        {20,  /* 100 -> 2.0x */ 0},
-        {30,  /* 101 -> 3.0x */ 0},
-        {60,  /* 110 -> 6.0x */ 0},
-        {35,  /* 111 -> 3.5x */ 0},
-        {0, CPUFREQ_TABLE_END}
-};
-
-
-/**
- * powernow_k6_get_cpu_multiplier - returns the current FSB multiplier
- *
- *   Returns the current setting of the frequency multiplier. Core clock
- * speed is frequency of the Front-Side Bus multiplied with this value.
- */
-static int powernow_k6_get_cpu_multiplier(void)
-{
-        u64 invalue = 0;
-        u32 msrval;
-
-        msrval = POWERNOW_IOPORT + 0x1;
-        wrmsr(MSR_K6_EPMR, msrval, 0); /* enable the PowerNow port */
-        invalue = inl(POWERNOW_IOPORT + 0x8);
-        msrval = POWERNOW_IOPORT + 0x0;
-        wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */
-
-        return clock_ratio[(invalue >> 5)&7].index;
-}
-
-
-/**
- * powernow_k6_set_state - set the PowerNow! multiplier
- * @best_i: clock_ratio[best_i] is the target multiplier
- *
- *   Tries to change the PowerNow! multiplier
- */
-static void powernow_k6_set_state(unsigned int best_i)
-{
-        unsigned long outvalue = 0, invalue = 0;
-        unsigned long msrval;
-        struct cpufreq_freqs freqs;
-
-        if (clock_ratio[best_i].index > max_multiplier) {
-                printk(KERN_ERR PFX "invalid target frequency\n");
-                return;
-        }
-
-        freqs.old = busfreq * powernow_k6_get_cpu_multiplier();
-        freqs.new = busfreq * clock_ratio[best_i].index;
-        freqs.cpu = 0; /* powernow-k6.c is UP only driver */
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        /* we now need to transform best_i to the BVC format, see AMD#23446 */
-
-        outvalue = (1<<12) | (1<<10) | (1<<9) | (best_i<<5);
-
-        msrval = POWERNOW_IOPORT + 0x1;
-        wrmsr(MSR_K6_EPMR, msrval, 0); /* enable the PowerNow port */
-        invalue = inl(POWERNOW_IOPORT + 0x8);
-        invalue = invalue & 0xf;
-        outvalue = outvalue | invalue;
-        outl(outvalue , (POWERNOW_IOPORT + 0x8));
-        msrval = POWERNOW_IOPORT + 0x0;
-        wrmsr(MSR_K6_EPMR, msrval, 0); /* disable it again */
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        return;
-}
-
-
-/**
- * powernow_k6_verify - verifies a new CPUfreq policy
- * @policy: new policy
- *
- * Policy must be within lowest and highest possible CPU Frequency,
- * and at least one possible state must be within min and max.
- */
-static int powernow_k6_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, &clock_ratio[0]);
-}
-
-
-/**
- * powernow_k6_setpolicy - sets a new CPUFreq policy
- * @policy: new policy
- * @target_freq: the target frequency
- * @relation: how that frequency relates to achieved frequency
- *  (CPUFREQ_RELATION_L or CPUFREQ_RELATION_H)
- *
- * sets a new CPUFreq policy
- */
-static int powernow_k6_target(struct cpufreq_policy *policy,
-                               unsigned int target_freq,
-                               unsigned int relation)
-{
-        unsigned int newstate = 0;
-
-        if (cpufreq_frequency_table_target(policy, &clock_ratio[0],
-                                target_freq, relation, &newstate))
-                return -EINVAL;
-
-        powernow_k6_set_state(newstate);
-
-        return 0;
-}
-
-
-static int powernow_k6_cpu_init(struct cpufreq_policy *policy)
-{
-        unsigned int i, f;
-        int result;
-
-        if (policy->cpu != 0)
-                return -ENODEV;
-
-        /* get frequencies */
-        max_multiplier = powernow_k6_get_cpu_multiplier();
-        busfreq = cpu_khz / max_multiplier;
-
-        /* table init */
-        for (i = 0; (clock_ratio[i].frequency != CPUFREQ_TABLE_END); i++) {
-                f = clock_ratio[i].index;
-                if (f > max_multiplier)
-                        clock_ratio[i].frequency = CPUFREQ_ENTRY_INVALID;
-                else
-                        clock_ratio[i].frequency = busfreq * f;
-        }
-
-        /* cpuinfo and default policy values */
-        policy->cpuinfo.transition_latency = 200000;
-        policy->cur = busfreq * max_multiplier;
-
-        result = cpufreq_frequency_table_cpuinfo(policy, clock_ratio);
-        if (result)
-                return result;
-
-        cpufreq_frequency_table_get_attr(clock_ratio, policy->cpu);
-
-        return 0;
-}
-
-
-static int powernow_k6_cpu_exit(struct cpufreq_policy *policy)
-{
-        unsigned int i;
-        for (i = 0; i < 8; i++) {
-                if (i == max_multiplier)
-                        powernow_k6_set_state(i);
-        }
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        return 0;
-}
-
-static unsigned int powernow_k6_get(unsigned int cpu)
-{
-        unsigned int ret;
-        ret = (busfreq * powernow_k6_get_cpu_multiplier());
-        return ret;
-}
-
-static struct freq_attr *powernow_k6_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver powernow_k6_driver = {
-        .verify         = powernow_k6_verify,
-        .target         = powernow_k6_target,
-        .init           = powernow_k6_cpu_init,
-        .exit           = powernow_k6_cpu_exit,
-        .get            = powernow_k6_get,
-        .name           = "powernow-k6",
-        .owner          = THIS_MODULE,
-        .attr           = powernow_k6_attr,
-};
-
-
-/**
- * powernow_k6_init - initializes the k6 PowerNow! CPUFreq driver
- *
- *   Initializes the K6 PowerNow! support. Returns -ENODEV on unsupported
- * devices, -EINVAL or -ENOMEM on problems during initiatization, and zero
- * on success.
- */
-static int __init powernow_k6_init(void)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-
-        if ((c->x86_vendor != X86_VENDOR_AMD) || (c->x86 != 5) ||
-                ((c->x86_model != 12) && (c->x86_model != 13)))
-                return -ENODEV;
-
-        if (!request_region(POWERNOW_IOPORT, 16, "PowerNow!")) {
-                printk(KERN_INFO PFX "PowerNow IOPORT region already used.\n");
-                return -EIO;
-        }
-
-        if (cpufreq_register_driver(&powernow_k6_driver)) {
-                release_region(POWERNOW_IOPORT, 16);
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-
-/**
- * powernow_k6_exit - unregisters AMD K6-2+/3+ PowerNow! support
- *
- *   Unregisters AMD K6-2+ / K6-3+ PowerNow! support.
- */
-static void __exit powernow_k6_exit(void)
-{
-        cpufreq_unregister_driver(&powernow_k6_driver);
-        release_region(POWERNOW_IOPORT, 16);
-}
-
-
-MODULE_AUTHOR("Arjan van de Ven, Dave Jones <davej@redhat.com>, "
-                "Dominik Brodowski <linux@brodo.de>");
-MODULE_DESCRIPTION("PowerNow! driver for AMD K6-2+ / K6-3+ processors.");
-MODULE_LICENSE("GPL");
-
-module_init(powernow_k6_init);
-module_exit(powernow_k6_exit);
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k7.c b/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
deleted file mode 100644
index 4a45fd6e41ba..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k7.c
+++ /dev/null
@@ -1,752 +0,0 @@
-/*
- *  AMD K7 Powernow driver.
- *  (C) 2003 Dave Jones on behalf of SuSE Labs.
- *  (C) 2003-2004 Dave Jones <davej@redhat.com>
- *
- *  Licensed under the terms of the GNU GPL License version 2.
- *  Based upon datasheets & sample CPUs kindly provided by AMD.
- *
- * Errata 5:
- *  CPU may fail to execute a FID/VID change in presence of interrupt.
- *  - We cli/sti on stepping A0 CPUs around the FID/VID transition.
- * Errata 15:
- *  CPU with half frequency multipliers may hang upon wakeup from disconnect.
- *  - We disable half multipliers if ACPI is used on A0 stepping CPUs.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/dmi.h>
-#include <linux/timex.h>
-#include <linux/io.h>
-
-#include <asm/timer.h>          /* Needed for recalibrate_cpu_khz() */
-#include <asm/msr.h>
-#include <asm/system.h>
-
-#ifdef CONFIG_X86_POWERNOW_K7_ACPI
-#include <linux/acpi.h>
-#include <acpi/processor.h>
-#endif
-
-#include "powernow-k7.h"
-
-#define PFX "powernow: "
-
-
-struct psb_s {
-        u8 signature[10];
-        u8 tableversion;
-        u8 flags;
-        u16 settlingtime;
-        u8 reserved1;
-        u8 numpst;
-};
-
-struct pst_s {
-        u32 cpuid;
-        u8 fsbspeed;
-        u8 maxfid;
-        u8 startvid;
-        u8 numpstates;
-};
-
-#ifdef CONFIG_X86_POWERNOW_K7_ACPI
-union powernow_acpi_control_t {
-        struct {
-                unsigned long fid:5,
-                        vid:5,
-                        sgtc:20,
-                        res1:2;
-        } bits;
-        unsigned long val;
-};
-#endif
-
-#ifdef CONFIG_CPU_FREQ_DEBUG
-/* divide by 1000 to get VCore voltage in V. */
-static const int mobile_vid_table[32] = {
-    2000, 1950, 1900, 1850, 1800, 1750, 1700, 1650,
-    1600, 1550, 1500, 1450, 1400, 1350, 1300, 0,
-    1275, 1250, 1225, 1200, 1175, 1150, 1125, 1100,
-    1075, 1050, 1025, 1000, 975, 950, 925, 0,
-};
-#endif
-
-/* divide by 10 to get FID. */
-static const int fid_codes[32] = {
-    110, 115, 120, 125, 50, 55, 60, 65,
-    70, 75, 80, 85, 90, 95, 100, 105,
-    30, 190, 40, 200, 130, 135, 140, 210,
-    150, 225, 160, 165, 170, 180, -1, -1,
-};
-
-/* This parameter is used in order to force ACPI instead of legacy method for
- * configuration purpose.
- */
-
-static int acpi_force;
-
-static struct cpufreq_frequency_table *powernow_table;
-
-static unsigned int can_scale_bus;
-static unsigned int can_scale_vid;
-static unsigned int minimum_speed = -1;
-static unsigned int maximum_speed;
-static unsigned int number_scales;
-static unsigned int fsb;
-static unsigned int latency;
-static char have_a0;
-
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \
-                "powernow-k7", msg)
-
-static int check_fsb(unsigned int fsbspeed)
-{
-        int delta;
-        unsigned int f = fsb / 1000;
-
-        delta = (fsbspeed > f) ? fsbspeed - f : f - fsbspeed;
-        return delta < 5;
-}
-
-static int check_powernow(void)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-        unsigned int maxei, eax, ebx, ecx, edx;
-
-        if ((c->x86_vendor != X86_VENDOR_AMD) || (c->x86 != 6)) {
-#ifdef MODULE
-                printk(KERN_INFO PFX "This module only works with "
-                                "AMD K7 CPUs\n");
-#endif
-                return 0;
-        }
-
-        /* Get maximum capabilities */
-        maxei = cpuid_eax(0x80000000);
-        if (maxei < 0x80000007) {       /* Any powernow info ? */
-#ifdef MODULE
-                printk(KERN_INFO PFX "No powernow capabilities detected\n");
-#endif
-                return 0;
-        }
-
-        if ((c->x86_model == 6) && (c->x86_mask == 0)) {
-                printk(KERN_INFO PFX "K7 660[A0] core detected, "
-                                "enabling errata workarounds\n");
-                have_a0 = 1;
-        }
-
-        cpuid(0x80000007, &eax, &ebx, &ecx, &edx);
-
-        /* Check we can actually do something before we say anything.*/
-        if (!(edx & (1 << 1 | 1 << 2)))
-                return 0;
-
-        printk(KERN_INFO PFX "PowerNOW! Technology present. Can scale: ");
-
-        if (edx & 1 << 1) {
-                printk("frequency");
-                can_scale_bus = 1;
-        }
-
-        if ((edx & (1 << 1 | 1 << 2)) == 0x6)
-                printk(" and ");
-
-        if (edx & 1 << 2) {
-                printk("voltage");
-                can_scale_vid = 1;
-        }
-
-        printk(".\n");
-        return 1;
-}
-
-#ifdef CONFIG_X86_POWERNOW_K7_ACPI
-static void invalidate_entry(unsigned int entry)
-{
-        powernow_table[entry].frequency = CPUFREQ_ENTRY_INVALID;
-}
-#endif
-
-static int get_ranges(unsigned char *pst)
-{
-        unsigned int j;
-        unsigned int speed;
-        u8 fid, vid;
-
-        powernow_table = kzalloc((sizeof(struct cpufreq_frequency_table) *
-                                (number_scales + 1)), GFP_KERNEL);
-        if (!powernow_table)
-                return -ENOMEM;
-
-        for (j = 0 ; j < number_scales; j++) {
-                fid = *pst++;
-
-                powernow_table[j].frequency = (fsb * fid_codes[fid]) / 10;
-                powernow_table[j].index = fid; /* lower 8 bits */
-
-                speed = powernow_table[j].frequency;
-
-                if ((fid_codes[fid] % 10) == 5) {
-#ifdef CONFIG_X86_POWERNOW_K7_ACPI
-                        if (have_a0 == 1)
-                                invalidate_entry(j);
-#endif
-                }
-
-                if (speed < minimum_speed)
-                        minimum_speed = speed;
-                if (speed > maximum_speed)
-                        maximum_speed = speed;
-
-                vid = *pst++;
-                powernow_table[j].index |= (vid << 8); /* upper 8 bits */
-
-                dprintk("   FID: 0x%x (%d.%dx [%dMHz])  "
-                         "VID: 0x%x (%d.%03dV)\n", fid, fid_codes[fid] / 10,
-                         fid_codes[fid] % 10, speed/1000, vid,
-                         mobile_vid_table[vid]/1000,
-                         mobile_vid_table[vid]%1000);
-        }
-        powernow_table[number_scales].frequency = CPUFREQ_TABLE_END;
-        powernow_table[number_scales].index = 0;
-
-        return 0;
-}
-
-
-static void change_FID(int fid)
-{
-        union msr_fidvidctl fidvidctl;
-
-        rdmsrl(MSR_K7_FID_VID_CTL, fidvidctl.val);
-        if (fidvidctl.bits.FID != fid) {
-                fidvidctl.bits.SGTC = latency;
-                fidvidctl.bits.FID = fid;
-                fidvidctl.bits.VIDC = 0;
-                fidvidctl.bits.FIDC = 1;
-                wrmsrl(MSR_K7_FID_VID_CTL, fidvidctl.val);
-        }
-}
-
-
-static void change_VID(int vid)
-{
-        union msr_fidvidctl fidvidctl;
-
-        rdmsrl(MSR_K7_FID_VID_CTL, fidvidctl.val);
-        if (fidvidctl.bits.VID != vid) {
-                fidvidctl.bits.SGTC = latency;
-                fidvidctl.bits.VID = vid;
-                fidvidctl.bits.FIDC = 0;
-                fidvidctl.bits.VIDC = 1;
-                wrmsrl(MSR_K7_FID_VID_CTL, fidvidctl.val);
-        }
-}
-
-
-static void change_speed(unsigned int index)
-{
-        u8 fid, vid;
-        struct cpufreq_freqs freqs;
-        union msr_fidvidstatus fidvidstatus;
-        int cfid;
-
-        /* fid are the lower 8 bits of the index we stored into
-         * the cpufreq frequency table in powernow_decode_bios,
-         * vid are the upper 8 bits.
-         */
-
-        fid = powernow_table[index].index & 0xFF;
-        vid = (powernow_table[index].index & 0xFF00) >> 8;
-
-        freqs.cpu = 0;
-
-        rdmsrl(MSR_K7_FID_VID_STATUS, fidvidstatus.val);
-        cfid = fidvidstatus.bits.CFID;
-        freqs.old = fsb * fid_codes[cfid] / 10;
-
-        freqs.new = powernow_table[index].frequency;
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        /* Now do the magic poking into the MSRs.  */
-
-        if (have_a0 == 1)       /* A0 errata 5 */
-                local_irq_disable();
-
-        if (freqs.old > freqs.new) {
-                /* Going down, so change FID first */
-                change_FID(fid);
-                change_VID(vid);
-        } else {
-                /* Going up, so change VID first */
-                change_VID(vid);
-                change_FID(fid);
-        }
-
-
-        if (have_a0 == 1)
-                local_irq_enable();
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-}
-
-
-#ifdef CONFIG_X86_POWERNOW_K7_ACPI
-
-static struct acpi_processor_performance *acpi_processor_perf;
-
-static int powernow_acpi_init(void)
-{
-        int i;
-        int retval = 0;
-        union powernow_acpi_control_t pc;
-
-        if (acpi_processor_perf != NULL && powernow_table != NULL) {
-                retval = -EINVAL;
-                goto err0;
-        }
-
-        acpi_processor_perf = kzalloc(sizeof(struct acpi_processor_performance),
-                                      GFP_KERNEL);
-        if (!acpi_processor_perf) {
-                retval = -ENOMEM;
-                goto err0;
-        }
-
-        if (!zalloc_cpumask_var(&acpi_processor_perf->shared_cpu_map,
-                                                                GFP_KERNEL)) {
-                retval = -ENOMEM;
-                goto err05;
-        }
-
-        if (acpi_processor_register_performance(acpi_processor_perf, 0)) {
-                retval = -EIO;
-                goto err1;
-        }
-
-        if (acpi_processor_perf->control_register.space_id !=
-                        ACPI_ADR_SPACE_FIXED_HARDWARE) {
-                retval = -ENODEV;
-                goto err2;
-        }
-
-        if (acpi_processor_perf->status_register.space_id !=
-                        ACPI_ADR_SPACE_FIXED_HARDWARE) {
-                retval = -ENODEV;
-                goto err2;
-        }
-
-        number_scales = acpi_processor_perf->state_count;
-
-        if (number_scales < 2) {
-                retval = -ENODEV;
-                goto err2;
-        }
-
-        powernow_table = kzalloc((sizeof(struct cpufreq_frequency_table) *
-                                (number_scales + 1)), GFP_KERNEL);
-        if (!powernow_table) {
-                retval = -ENOMEM;
-                goto err2;
-        }
-
-        pc.val = (unsigned long) acpi_processor_perf->states[0].control;
-        for (i = 0; i < number_scales; i++) {
-                u8 fid, vid;
-                struct acpi_processor_px *state =
-                        &acpi_processor_perf->states[i];
-                unsigned int speed, speed_mhz;
-
-                pc.val = (unsigned long) state->control;
-                dprintk("acpi:  P%d: %d MHz %d mW %d uS control %08x SGTC %d\n",
-                         i,
-                         (u32) state->core_frequency,
-                         (u32) state->power,
-                         (u32) state->transition_latency,
-                         (u32) state->control,
-                         pc.bits.sgtc);
-
-                vid = pc.bits.vid;
-                fid = pc.bits.fid;
-
-                powernow_table[i].frequency = fsb * fid_codes[fid] / 10;
-                powernow_table[i].index = fid; /* lower 8 bits */
-                powernow_table[i].index |= (vid << 8); /* upper 8 bits */
-
-                speed = powernow_table[i].frequency;
-                speed_mhz = speed / 1000;
-
-                /* processor_perflib will multiply the MHz value by 1000 to
-                 * get a KHz value (e.g. 1266000). However, powernow-k7 works
-                 * with true KHz values (e.g. 1266768). To ensure that all
-                 * powernow frequencies are available, we must ensure that
-                 * ACPI doesn't restrict them, so we round up the MHz value
-                 * to ensure that perflib's computed KHz value is greater than
-                 * or equal to powernow's KHz value.
-                 */
-                if (speed % 1000 > 0)
-                        speed_mhz++;
-
-                if ((fid_codes[fid] % 10) == 5) {
-                        if (have_a0 == 1)
-                                invalidate_entry(i);
-                }
-
-                dprintk("   FID: 0x%x (%d.%dx [%dMHz])  "
-                         "VID: 0x%x (%d.%03dV)\n", fid, fid_codes[fid] / 10,
-                         fid_codes[fid] % 10, speed_mhz, vid,
-                         mobile_vid_table[vid]/1000,
-                         mobile_vid_table[vid]%1000);
-
-                if (state->core_frequency != speed_mhz) {
-                        state->core_frequency = speed_mhz;
-                        dprintk("   Corrected ACPI frequency to %d\n",
-                                speed_mhz);
-                }
-
-                if (latency < pc.bits.sgtc)
-                        latency = pc.bits.sgtc;
-
-                if (speed < minimum_speed)
-                        minimum_speed = speed;
-                if (speed > maximum_speed)
-                        maximum_speed = speed;
-        }
-
-        powernow_table[i].frequency = CPUFREQ_TABLE_END;
-        powernow_table[i].index = 0;
-
-        /* notify BIOS that we exist */
-        acpi_processor_notify_smm(THIS_MODULE);
-
-        return 0;
-
-err2:
-        acpi_processor_unregister_performance(acpi_processor_perf, 0);
-err1:
-        free_cpumask_var(acpi_processor_perf->shared_cpu_map);
-err05:
-        kfree(acpi_processor_perf);
-err0:
-        printk(KERN_WARNING PFX "ACPI perflib can not be used on "
-                        "this platform\n");
-        acpi_processor_perf = NULL;
-        return retval;
-}
-#else
-static int powernow_acpi_init(void)
-{
-        printk(KERN_INFO PFX "no support for ACPI processor found."
-               "  Please recompile your kernel with ACPI processor\n");
-        return -EINVAL;
-}
-#endif
-
-static void print_pst_entry(struct pst_s *pst, unsigned int j)
-{
-        dprintk("PST:%d (@%p)\n", j, pst);
-        dprintk(" cpuid: 0x%x  fsb: %d  maxFID: 0x%x  startvid: 0x%x\n",
-                pst->cpuid, pst->fsbspeed, pst->maxfid, pst->startvid);
-}
-
-static int powernow_decode_bios(int maxfid, int startvid)
-{
-        struct psb_s *psb;
-        struct pst_s *pst;
-        unsigned int i, j;
-        unsigned char *p;
-        unsigned int etuple;
-        unsigned int ret;
-
-        etuple = cpuid_eax(0x80000001);
-
-        for (i = 0xC0000; i < 0xffff0 ; i += 16) {
-
-                p = phys_to_virt(i);
-
-                if (memcmp(p, "AMDK7PNOW!",  10) == 0) {
-                        dprintk("Found PSB header at %p\n", p);
-                        psb = (struct psb_s *) p;
-                        dprintk("Table version: 0x%x\n", psb->tableversion);
-                        if (psb->tableversion != 0x12) {
-                                printk(KERN_INFO PFX "Sorry, only v1.2 tables"
-                                                " supported right now\n");
-                                return -ENODEV;
-                        }
-
-                        dprintk("Flags: 0x%x\n", psb->flags);
-                        if ((psb->flags & 1) == 0)
-                                dprintk("Mobile voltage regulator\n");
-                        else
-                                dprintk("Desktop voltage regulator\n");
-
-                        latency = psb->settlingtime;
-                        if (latency < 100) {
-                                printk(KERN_INFO PFX "BIOS set settling time "
-                                                "to %d microseconds. "
-                                                "Should be at least 100. "
-                                                "Correcting.\n", latency);
-                                latency = 100;
-                        }
-                        dprintk("Settling Time: %d microseconds.\n",
-                                        psb->settlingtime);
-                        dprintk("Has %d PST tables. (Only dumping ones "
-                                        "relevant to this CPU).\n",
-                                        psb->numpst);
-
-                        p += sizeof(struct psb_s);
-
-                        pst = (struct pst_s *) p;
-
-                        for (j = 0; j < psb->numpst; j++) {
-                                pst = (struct pst_s *) p;
-                                number_scales = pst->numpstates;
-
-                                if ((etuple == pst->cpuid) &&
-                                    check_fsb(pst->fsbspeed) &&
-                                    (maxfid == pst->maxfid) &&
-                                    (startvid == pst->startvid)) {
-                                        print_pst_entry(pst, j);
-                                        p = (char *)pst + sizeof(struct pst_s);
-                                        ret = get_ranges(p);
-                                        return ret;
-                                } else {
-                                        unsigned int k;
-                                        p = (char *)pst + sizeof(struct pst_s);
-                                        for (k = 0; k < number_scales; k++)
-                                                p += 2;
-                                }
-                        }
-                        printk(KERN_INFO PFX "No PST tables match this cpuid "
-                                        "(0x%x)\n", etuple);
-                        printk(KERN_INFO PFX "This is indicative of a broken "
-                                        "BIOS.\n");
-
-                        return -EINVAL;
-                }
-                p++;
-        }
-
-        return -ENODEV;
-}
-
-
-static int powernow_target(struct cpufreq_policy *policy,
-                            unsigned int target_freq,
-                            unsigned int relation)
-{
-        unsigned int newstate;
-
-        if (cpufreq_frequency_table_target(policy, powernow_table, target_freq,
-                                relation, &newstate))
-                return -EINVAL;
-
-        change_speed(newstate);
-
-        return 0;
-}
-
-
-static int powernow_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, powernow_table);
-}
-
-/*
- * We use the fact that the bus frequency is somehow
- * a multiple of 100000/3 khz, then we compute sgtc according
- * to this multiple.
- * That way, we match more how AMD thinks all of that work.
- * We will then get the same kind of behaviour already tested under
- * the "well-known" other OS.
- */
-static int __cpuinit fixup_sgtc(void)
-{
-        unsigned int sgtc;
-        unsigned int m;
-
-        m = fsb / 3333;
-        if ((m % 10) >= 5)
-                m += 5;
-
-        m /= 10;
-
-        sgtc = 100 * m * latency;
-        sgtc = sgtc / 3;
-        if (sgtc > 0xfffff) {
-                printk(KERN_WARNING PFX "SGTC too large %d\n", sgtc);
-                sgtc = 0xfffff;
-        }
-        return sgtc;
-}
-
-static unsigned int powernow_get(unsigned int cpu)
-{
-        union msr_fidvidstatus fidvidstatus;
-        unsigned int cfid;
-
-        if (cpu)
-                return 0;
-        rdmsrl(MSR_K7_FID_VID_STATUS, fidvidstatus.val);
-        cfid = fidvidstatus.bits.CFID;
-
-        return fsb * fid_codes[cfid] / 10;
-}
-
-
-static int __cpuinit acer_cpufreq_pst(const struct dmi_system_id *d)
-{
-        printk(KERN_WARNING PFX
-                "%s laptop with broken PST tables in BIOS detected.\n",
-                d->ident);
-        printk(KERN_WARNING PFX
-                "You need to downgrade to 3A21 (09/09/2002), or try a newer "
-                "BIOS than 3A71 (01/20/2003)\n");
-        printk(KERN_WARNING PFX
-                "cpufreq scaling has been disabled as a result of this.\n");
-        return 0;
-}
-
-/*
- * Some Athlon laptops have really fucked PST tables.
- * A BIOS update is all that can save them.
- * Mention this, and disable cpufreq.
- */
-static struct dmi_system_id __cpuinitdata powernow_dmi_table[] = {
-        {
-                .callback = acer_cpufreq_pst,
-                .ident = "Acer Aspire",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Insyde Software"),
-                        DMI_MATCH(DMI_BIOS_VERSION, "3A71"),
-                },
-        },
-        { }
-};
-
-static int __cpuinit powernow_cpu_init(struct cpufreq_policy *policy)
-{
-        union msr_fidvidstatus fidvidstatus;
-        int result;
-
-        if (policy->cpu != 0)
-                return -ENODEV;
-
-        rdmsrl(MSR_K7_FID_VID_STATUS, fidvidstatus.val);
-
-        recalibrate_cpu_khz();
-
-        fsb = (10 * cpu_khz) / fid_codes[fidvidstatus.bits.CFID];
-        if (!fsb) {
-                printk(KERN_WARNING PFX "can not determine bus frequency\n");
-                return -EINVAL;
-        }
-        dprintk("FSB: %3dMHz\n", fsb/1000);
-
-        if (dmi_check_system(powernow_dmi_table) || acpi_force) {
-                printk(KERN_INFO PFX "PSB/PST known to be broken.  "
-                                "Trying ACPI instead\n");
-                result = powernow_acpi_init();
-        } else {
-                result = powernow_decode_bios(fidvidstatus.bits.MFID,
-                                fidvidstatus.bits.SVID);
-                if (result) {
-                        printk(KERN_INFO PFX "Trying ACPI perflib\n");
-                        maximum_speed = 0;
-                        minimum_speed = -1;
-                        latency = 0;
-                        result = powernow_acpi_init();
-                        if (result) {
-                                printk(KERN_INFO PFX
-                                        "ACPI and legacy methods failed\n");
-                        }
-                } else {
-                        /* SGTC use the bus clock as timer */
-                        latency = fixup_sgtc();
-                        printk(KERN_INFO PFX "SGTC: %d\n", latency);
-                }
-        }
-
-        if (result)
-                return result;
-
-        printk(KERN_INFO PFX "Minimum speed %d MHz. Maximum speed %d MHz.\n",
-                                minimum_speed/1000, maximum_speed/1000);
-
-        policy->cpuinfo.transition_latency =
-                cpufreq_scale(2000000UL, fsb, latency);
-
-        policy->cur = powernow_get(0);
-
-        cpufreq_frequency_table_get_attr(powernow_table, policy->cpu);
-
-        return cpufreq_frequency_table_cpuinfo(policy, powernow_table);
-}
-
-static int powernow_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_put_attr(policy->cpu);
-
-#ifdef CONFIG_X86_POWERNOW_K7_ACPI
-        if (acpi_processor_perf) {
-                acpi_processor_unregister_performance(acpi_processor_perf, 0);
-                free_cpumask_var(acpi_processor_perf->shared_cpu_map);
-                kfree(acpi_processor_perf);
-        }
-#endif
-
-        kfree(powernow_table);
-        return 0;
-}
-
-static struct freq_attr *powernow_table_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver powernow_driver = {
-        .verify         = powernow_verify,
-        .target         = powernow_target,
-        .get            = powernow_get,
-#ifdef CONFIG_X86_POWERNOW_K7_ACPI
-        .bios_limit     = acpi_processor_get_bios_limit,
-#endif
-        .init           = powernow_cpu_init,
-        .exit           = powernow_cpu_exit,
-        .name           = "powernow-k7",
-        .owner          = THIS_MODULE,
-        .attr           = powernow_table_attr,
-};
-
-static int __init powernow_init(void)
-{
-        if (check_powernow() == 0)
-                return -ENODEV;
-        return cpufreq_register_driver(&powernow_driver);
-}
-
-
-static void __exit powernow_exit(void)
-{
-        cpufreq_unregister_driver(&powernow_driver);
-}
-
-module_param(acpi_force,  int, 0444);
-MODULE_PARM_DESC(acpi_force, "Force ACPI to be used.");
-
-MODULE_AUTHOR("Dave Jones <davej@redhat.com>");
-MODULE_DESCRIPTION("Powernow driver for AMD K7 processors.");
-MODULE_LICENSE("GPL");
-
-late_initcall(powernow_init);
-module_exit(powernow_exit);
-
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k7.h b/arch/x86/kernel/cpu/cpufreq/powernow-k7.h
deleted file mode 100644
index 35fb4eaf6e1c..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k7.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  (C) 2003 Dave Jones.
- *
- *  Licensed under the terms of the GNU GPL License version 2.
- *
- *  AMD-specific information
- *
- */
-
-union msr_fidvidctl {
-        struct {
-                unsigned FID:5,                 // 4:0
-                reserved1:3,    // 7:5
-                VID:5,                  // 12:8
-                reserved2:3,    // 15:13
-                FIDC:1,                 // 16
-                VIDC:1,                 // 17
-                reserved3:2,    // 19:18
-                FIDCHGRATIO:1,  // 20
-                reserved4:11,   // 31-21
-                SGTC:20,                // 32:51
-                reserved5:12;   // 63:52
-        } bits;
-        unsigned long long val;
-};
-
-union msr_fidvidstatus {
-        struct {
-                unsigned CFID:5,                        // 4:0
-                reserved1:3,    // 7:5
-                SFID:5,                 // 12:8
-                reserved2:3,    // 15:13
-                MFID:5,                 // 20:16
-                reserved3:11,   // 31:21
-                CVID:5,                 // 36:32
-                reserved4:3,    // 39:37
-                SVID:5,                 // 44:40
-                reserved5:3,    // 47:45
-                MVID:5,                 // 52:48
-                reserved6:11;   // 63:53
-        } bits;
-        unsigned long long val;
-};
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
deleted file mode 100644
index 2368e38327b3..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ /dev/null
@@ -1,1607 +0,0 @@
-/*
- *   (c) 2003-2010 Advanced Micro Devices, Inc.
- *  Your use of this code is subject to the terms and conditions of the
- *  GNU general public license version 2. See "COPYING" or
- *  http://www.gnu.org/licenses/gpl.html
- *
- *  Support : mark.langsdorf@amd.com
- *
- *  Based on the powernow-k7.c module written by Dave Jones.
- *  (C) 2003 Dave Jones on behalf of SuSE Labs
- *  (C) 2004 Dominik Brodowski <linux@brodo.de>
- *  (C) 2004 Pavel Machek <pavel@ucw.cz>
- *  Licensed under the terms of the GNU GPL License version 2.
- *  Based upon datasheets & sample CPUs kindly provided by AMD.
- *
- *  Valuable input gratefully received from Dave Jones, Pavel Machek,
- *  Dominik Brodowski, Jacob Shin, and others.
- *  Originally developed by Paul Devriendt.
- *  Processor information obtained from Chapter 9 (Power and Thermal Management)
- *  of the "BIOS and Kernel Developer's Guide for the AMD Athlon 64 and AMD
- *  Opteron Processors" available for download from www.amd.com
- *
- *  Tables for specific CPUs can be inferred from
- *     http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/30430.pdf
- */
-
-#include <linux/kernel.h>
-#include <linux/smp.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/cpumask.h>
-#include <linux/sched.h>        /* for current / set_cpus_allowed() */
-#include <linux/io.h>
-#include <linux/delay.h>
-
-#include <asm/msr.h>
-
-#include <linux/acpi.h>
-#include <linux/mutex.h>
-#include <acpi/processor.h>
-
-#define PFX "powernow-k8: "
-#define VERSION "version 2.20.00"
-#include "powernow-k8.h"
-#include "mperf.h"
-
-/* serialize freq changes  */
-static DEFINE_MUTEX(fidvid_mutex);
-
-static DEFINE_PER_CPU(struct powernow_k8_data *, powernow_data);
-
-static int cpu_family = CPU_OPTERON;
-
-/* core performance boost */
-static bool cpb_capable, cpb_enabled;
-static struct msr __percpu *msrs;
-
-static struct cpufreq_driver cpufreq_amd64_driver;
-
-#ifndef CONFIG_SMP
-static inline const struct cpumask *cpu_core_mask(int cpu)
-{
-        return cpumask_of(0);
-}
-#endif
-
-/* Return a frequency in MHz, given an input fid */
-static u32 find_freq_from_fid(u32 fid)
-{
-        return 800 + (fid * 100);
-}
-
-/* Return a frequency in KHz, given an input fid */
-static u32 find_khz_freq_from_fid(u32 fid)
-{
-        return 1000 * find_freq_from_fid(fid);
-}
-
-static u32 find_khz_freq_from_pstate(struct cpufreq_frequency_table *data,
-                u32 pstate)
-{
-        return data[pstate].frequency;
-}
-
-/* Return the vco fid for an input fid
- *
- * Each "low" fid has corresponding "high" fid, and you can get to "low" fids
- * only from corresponding high fids. This returns "high" fid corresponding to
- * "low" one.
- */
-static u32 convert_fid_to_vco_fid(u32 fid)
-{
-        if (fid < HI_FID_TABLE_BOTTOM)
-                return 8 + (2 * fid);
-        else
-                return fid;
-}
-
-/*
- * Return 1 if the pending bit is set. Unless we just instructed the processor
- * to transition to a new state, seeing this bit set is really bad news.
- */
-static int pending_bit_stuck(void)
-{
-        u32 lo, hi;
-
-        if (cpu_family == CPU_HW_PSTATE)
-                return 0;
-
-        rdmsr(MSR_FIDVID_STATUS, lo, hi);
-        return lo & MSR_S_LO_CHANGE_PENDING ? 1 : 0;
-}
-
-/*
- * Update the global current fid / vid values from the status msr.
- * Returns 1 on error.
- */
-static int query_current_values_with_pending_wait(struct powernow_k8_data *data)
-{
-        u32 lo, hi;
-        u32 i = 0;
-
-        if (cpu_family == CPU_HW_PSTATE) {
-                rdmsr(MSR_PSTATE_STATUS, lo, hi);
-                i = lo & HW_PSTATE_MASK;
-                data->currpstate = i;
-
-                /*
-                 * a workaround for family 11h erratum 311 might cause
-                 * an "out-of-range Pstate if the core is in Pstate-0
-                 */
-                if ((boot_cpu_data.x86 == 0x11) && (i >= data->numps))
-                        data->currpstate = HW_PSTATE_0;
-
-                return 0;
-        }
-        do {
-                if (i++ > 10000) {
-                        dprintk("detected change pending stuck\n");
-                        return 1;
-                }
-                rdmsr(MSR_FIDVID_STATUS, lo, hi);
-        } while (lo & MSR_S_LO_CHANGE_PENDING);
-
-        data->currvid = hi & MSR_S_HI_CURRENT_VID;
-        data->currfid = lo & MSR_S_LO_CURRENT_FID;
-
-        return 0;
-}
-
-/* the isochronous relief time */
-static void count_off_irt(struct powernow_k8_data *data)
-{
-        udelay((1 << data->irt) * 10);
-        return;
-}
-
-/* the voltage stabilization time */
-static void count_off_vst(struct powernow_k8_data *data)
-{
-        udelay(data->vstable * VST_UNITS_20US);
-        return;
-}
-
-/* need to init the control msr to a safe value (for each cpu) */
-static void fidvid_msr_init(void)
-{
-        u32 lo, hi;
-        u8 fid, vid;
-
-        rdmsr(MSR_FIDVID_STATUS, lo, hi);
-        vid = hi & MSR_S_HI_CURRENT_VID;
-        fid = lo & MSR_S_LO_CURRENT_FID;
-        lo = fid | (vid << MSR_C_LO_VID_SHIFT);
-        hi = MSR_C_HI_STP_GNT_BENIGN;
-        dprintk("cpu%d, init lo 0x%x, hi 0x%x\n", smp_processor_id(), lo, hi);
-        wrmsr(MSR_FIDVID_CTL, lo, hi);
-}
-
-/* write the new fid value along with the other control fields to the msr */
-static int write_new_fid(struct powernow_k8_data *data, u32 fid)
-{
-        u32 lo;
-        u32 savevid = data->currvid;
-        u32 i = 0;
-
-        if ((fid & INVALID_FID_MASK) || (data->currvid & INVALID_VID_MASK)) {
-                printk(KERN_ERR PFX "internal error - overflow on fid write\n");
-                return 1;
-        }
-
-        lo = fid;
-        lo |= (data->currvid << MSR_C_LO_VID_SHIFT);
-        lo |= MSR_C_LO_INIT_FID_VID;
-
-        dprintk("writing fid 0x%x, lo 0x%x, hi 0x%x\n",
-                fid, lo, data->plllock * PLL_LOCK_CONVERSION);
-
-        do {
-                wrmsr(MSR_FIDVID_CTL, lo, data->plllock * PLL_LOCK_CONVERSION);
-                if (i++ > 100) {
-                        printk(KERN_ERR PFX
-                                "Hardware error - pending bit very stuck - "
-                                "no further pstate changes possible\n");
-                        return 1;
-                }
-        } while (query_current_values_with_pending_wait(data));
-
-        count_off_irt(data);
-
-        if (savevid != data->currvid) {
-                printk(KERN_ERR PFX
-                        "vid change on fid trans, old 0x%x, new 0x%x\n",
-                        savevid, data->currvid);
-                return 1;
-        }
-
-        if (fid != data->currfid) {
-                printk(KERN_ERR PFX
-                        "fid trans failed, fid 0x%x, curr 0x%x\n", fid,
-                        data->currfid);
-                return 1;
-        }
-
-        return 0;
-}
-
-/* Write a new vid to the hardware */
-static int write_new_vid(struct powernow_k8_data *data, u32 vid)
-{
-        u32 lo;
-        u32 savefid = data->currfid;
-        int i = 0;
-
-        if ((data->currfid & INVALID_FID_MASK) || (vid & INVALID_VID_MASK)) {
-                printk(KERN_ERR PFX "internal error - overflow on vid write\n");
-                return 1;
-        }
-
-        lo = data->currfid;
-        lo |= (vid << MSR_C_LO_VID_SHIFT);
-        lo |= MSR_C_LO_INIT_FID_VID;
-
-        dprintk("writing vid 0x%x, lo 0x%x, hi 0x%x\n",
-                vid, lo, STOP_GRANT_5NS);
-
-        do {
-                wrmsr(MSR_FIDVID_CTL, lo, STOP_GRANT_5NS);
-                if (i++ > 100) {
-                        printk(KERN_ERR PFX "internal error - pending bit "
-                                        "very stuck - no further pstate "
-                                        "changes possible\n");
-                        return 1;
-                }
-        } while (query_current_values_with_pending_wait(data));
-
-        if (savefid != data->currfid) {
-                printk(KERN_ERR PFX "fid changed on vid trans, old "
-                        "0x%x new 0x%x\n",
-                       savefid, data->currfid);
-                return 1;
-        }
-
-        if (vid != data->currvid) {
-                printk(KERN_ERR PFX "vid trans failed, vid 0x%x, "
-                                "curr 0x%x\n",
-                                vid, data->currvid);
-                return 1;
-        }
-
-        return 0;
-}
-
-/*
- * Reduce the vid by the max of step or reqvid.
- * Decreasing vid codes represent increasing voltages:
- * vid of 0 is 1.550V, vid of 0x1e is 0.800V, vid of VID_OFF is off.
- */
-static int decrease_vid_code_by_step(struct powernow_k8_data *data,
-                u32 reqvid, u32 step)
-{
-        if ((data->currvid - reqvid) > step)
-                reqvid = data->currvid - step;
-
-        if (write_new_vid(data, reqvid))
-                return 1;
-
-        count_off_vst(data);
-
-        return 0;
-}
-
-/* Change hardware pstate by single MSR write */
-static int transition_pstate(struct powernow_k8_data *data, u32 pstate)
-{
-        wrmsr(MSR_PSTATE_CTRL, pstate, 0);
-        data->currpstate = pstate;
-        return 0;
-}
-
-/* Change Opteron/Athlon64 fid and vid, by the 3 phases. */
-static int transition_fid_vid(struct powernow_k8_data *data,
-                u32 reqfid, u32 reqvid)
-{
-        if (core_voltage_pre_transition(data, reqvid, reqfid))
-                return 1;
-
-        if (core_frequency_transition(data, reqfid))
-                return 1;
-
-        if (core_voltage_post_transition(data, reqvid))
-                return 1;
-
-        if (query_current_values_with_pending_wait(data))
-                return 1;
-
-        if ((reqfid != data->currfid) || (reqvid != data->currvid)) {
-                printk(KERN_ERR PFX "failed (cpu%d): req 0x%x 0x%x, "
-                                "curr 0x%x 0x%x\n",
-                                smp_processor_id(),
-                                reqfid, reqvid, data->currfid, data->currvid);
-                return 1;
-        }
-
-        dprintk("transitioned (cpu%d): new fid 0x%x, vid 0x%x\n",
-                smp_processor_id(), data->currfid, data->currvid);
-
-        return 0;
-}
-
-/* Phase 1 - core voltage transition ... setup voltage */
-static int core_voltage_pre_transition(struct powernow_k8_data *data,
-                u32 reqvid, u32 reqfid)
-{
-        u32 rvosteps = data->rvo;
-        u32 savefid = data->currfid;
-        u32 maxvid, lo, rvomult = 1;
-
-        dprintk("ph1 (cpu%d): start, currfid 0x%x, currvid 0x%x, "
-                "reqvid 0x%x, rvo 0x%x\n",
-                smp_processor_id(),
-                data->currfid, data->currvid, reqvid, data->rvo);
-
-        if ((savefid < LO_FID_TABLE_TOP) && (reqfid < LO_FID_TABLE_TOP))
-                rvomult = 2;
-        rvosteps *= rvomult;
-        rdmsr(MSR_FIDVID_STATUS, lo, maxvid);
-        maxvid = 0x1f & (maxvid >> 16);
-        dprintk("ph1 maxvid=0x%x\n", maxvid);
-        if (reqvid < maxvid) /* lower numbers are higher voltages */
-                reqvid = maxvid;
-
-        while (data->currvid > reqvid) {
-                dprintk("ph1: curr 0x%x, req vid 0x%x\n",
-                        data->currvid, reqvid);
-                if (decrease_vid_code_by_step(data, reqvid, data->vidmvs))
-                        return 1;
-        }
-
-        while ((rvosteps > 0) &&
-                        ((rvomult * data->rvo + data->currvid) > reqvid)) {
-                if (data->currvid == maxvid) {
-                        rvosteps = 0;
-                } else {
-                        dprintk("ph1: changing vid for rvo, req 0x%x\n",
-                                data->currvid - 1);
-                        if (decrease_vid_code_by_step(data, data->currvid-1, 1))
-                                return 1;
-                        rvosteps--;
-                }
-        }
-
-        if (query_current_values_with_pending_wait(data))
-                return 1;
-
-        if (savefid != data->currfid) {
-                printk(KERN_ERR PFX "ph1 err, currfid changed 0x%x\n",
-                                data->currfid);
-                return 1;
-        }
-
-        dprintk("ph1 complete, currfid 0x%x, currvid 0x%x\n",
-                data->currfid, data->currvid);
-
-        return 0;
-}
-
-/* Phase 2 - core frequency transition */
-static int core_frequency_transition(struct powernow_k8_data *data, u32 reqfid)
-{
-        u32 vcoreqfid, vcocurrfid, vcofiddiff;
-        u32 fid_interval, savevid = data->currvid;
-
-        if (data->currfid == reqfid) {
-                printk(KERN_ERR PFX "ph2 null fid transition 0x%x\n",
-                                data->currfid);
-                return 0;
-        }
-
-        dprintk("ph2 (cpu%d): starting, currfid 0x%x, currvid 0x%x, "
-                "reqfid 0x%x\n",
-                smp_processor_id(),
-                data->currfid, data->currvid, reqfid);
-
-        vcoreqfid = convert_fid_to_vco_fid(reqfid);
-        vcocurrfid = convert_fid_to_vco_fid(data->currfid);
-        vcofiddiff = vcocurrfid > vcoreqfid ? vcocurrfid - vcoreqfid
-            : vcoreqfid - vcocurrfid;
-
-        if ((reqfid <= LO_FID_TABLE_TOP) && (data->currfid <= LO_FID_TABLE_TOP))
-                vcofiddiff = 0;
-
-        while (vcofiddiff > 2) {
-                (data->currfid & 1) ? (fid_interval = 1) : (fid_interval = 2);
-
-                if (reqfid > data->currfid) {
-                        if (data->currfid > LO_FID_TABLE_TOP) {
-                                if (write_new_fid(data,
-                                                data->currfid + fid_interval))
-                                        return 1;
-                        } else {
-                                if (write_new_fid
-                                    (data,
-                                     2 + convert_fid_to_vco_fid(data->currfid)))
-                                        return 1;
-                        }
-                } else {
-                        if (write_new_fid(data, data->currfid - fid_interval))
-                                return 1;
-                }
-
-                vcocurrfid = convert_fid_to_vco_fid(data->currfid);
-                vcofiddiff = vcocurrfid > vcoreqfid ? vcocurrfid - vcoreqfid
-                    : vcoreqfid - vcocurrfid;
-        }
-
-        if (write_new_fid(data, reqfid))
-                return 1;
-
-        if (query_current_values_with_pending_wait(data))
-                return 1;
-
-        if (data->currfid != reqfid) {
-                printk(KERN_ERR PFX
-                        "ph2: mismatch, failed fid transition, "
-                        "curr 0x%x, req 0x%x\n",
-                        data->currfid, reqfid);
-                return 1;
-        }
-
-        if (savevid != data->currvid) {
-                printk(KERN_ERR PFX "ph2: vid changed, save 0x%x, curr 0x%x\n",
-                        savevid, data->currvid);
-                return 1;
-        }
-
-        dprintk("ph2 complete, currfid 0x%x, currvid 0x%x\n",
-                data->currfid, data->currvid);
-
-        return 0;
-}
-
-/* Phase 3 - core voltage transition flow ... jump to the final vid. */
-static int core_voltage_post_transition(struct powernow_k8_data *data,
-                u32 reqvid)
-{
-        u32 savefid = data->currfid;
-        u32 savereqvid = reqvid;
-
-        dprintk("ph3 (cpu%d): starting, currfid 0x%x, currvid 0x%x\n",
-                smp_processor_id(),
-                data->currfid, data->currvid);
-
-        if (reqvid != data->currvid) {
-                if (write_new_vid(data, reqvid))
-                        return 1;
-
-                if (savefid != data->currfid) {
-                        printk(KERN_ERR PFX
-                               "ph3: bad fid change, save 0x%x, curr 0x%x\n",
-                               savefid, data->currfid);
-                        return 1;
-                }
-
-                if (data->currvid != reqvid) {
-                        printk(KERN_ERR PFX
-                               "ph3: failed vid transition\n, "
-                               "req 0x%x, curr 0x%x",
-                               reqvid, data->currvid);
-                        return 1;
-                }
-        }
-
-        if (query_current_values_with_pending_wait(data))
-                return 1;
-
-        if (savereqvid != data->currvid) {
-                dprintk("ph3 failed, currvid 0x%x\n", data->currvid);
-                return 1;
-        }
-
-        if (savefid != data->currfid) {
-                dprintk("ph3 failed, currfid changed 0x%x\n",
-                        data->currfid);
-                return 1;
-        }
-
-        dprintk("ph3 complete, currfid 0x%x, currvid 0x%x\n",
-                data->currfid, data->currvid);
-
-        return 0;
-}
-
-static void check_supported_cpu(void *_rc)
-{
-        u32 eax, ebx, ecx, edx;
-        int *rc = _rc;
-
-        *rc = -ENODEV;
-
-        if (__this_cpu_read(cpu_info.x86_vendor) != X86_VENDOR_AMD)
-                return;
-
-        eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE);
-        if (((eax & CPUID_XFAM) != CPUID_XFAM_K8) &&
-            ((eax & CPUID_XFAM) < CPUID_XFAM_10H))
-                return;
-
-        if ((eax & CPUID_XFAM) == CPUID_XFAM_K8) {
-                if (((eax & CPUID_USE_XFAM_XMOD) != CPUID_USE_XFAM_XMOD) ||
-                    ((eax & CPUID_XMOD) > CPUID_XMOD_REV_MASK)) {
-                        printk(KERN_INFO PFX
-                                "Processor cpuid %x not supported\n", eax);
-                        return;
-                }
-
-                eax = cpuid_eax(CPUID_GET_MAX_CAPABILITIES);
-                if (eax < CPUID_FREQ_VOLT_CAPABILITIES) {
-                        printk(KERN_INFO PFX
-                               "No frequency change capabilities detected\n");
-                        return;
-                }
-
-                cpuid(CPUID_FREQ_VOLT_CAPABILITIES, &eax, &ebx, &ecx, &edx);
-                if ((edx & P_STATE_TRANSITION_CAPABLE)
-                        != P_STATE_TRANSITION_CAPABLE) {
-                        printk(KERN_INFO PFX
-                                "Power state transitions not supported\n");
-                        return;
-                }
-        } else { /* must be a HW Pstate capable processor */
-                cpuid(CPUID_FREQ_VOLT_CAPABILITIES, &eax, &ebx, &ecx, &edx);
-                if ((edx & USE_HW_PSTATE) == USE_HW_PSTATE)
-                        cpu_family = CPU_HW_PSTATE;
-                else
-                        return;
-        }
-
-        *rc = 0;
-}
-
-static int check_pst_table(struct powernow_k8_data *data, struct pst_s *pst,
-                u8 maxvid)
-{
-        unsigned int j;
-        u8 lastfid = 0xff;
-
-        for (j = 0; j < data->numps; j++) {
-                if (pst[j].vid > LEAST_VID) {
-                        printk(KERN_ERR FW_BUG PFX "vid %d invalid : 0x%x\n",
-                               j, pst[j].vid);
-                        return -EINVAL;
-                }
-                if (pst[j].vid < data->rvo) {
-                        /* vid + rvo >= 0 */
-                        printk(KERN_ERR FW_BUG PFX "0 vid exceeded with pstate"
-                               " %d\n", j);
-                        return -ENODEV;
-                }
-                if (pst[j].vid < maxvid + data->rvo) {
-                        /* vid + rvo >= maxvid */
-                        printk(KERN_ERR FW_BUG PFX "maxvid exceeded with pstate"
-                               " %d\n", j);
-                        return -ENODEV;
-                }
-                if (pst[j].fid > MAX_FID) {
-                        printk(KERN_ERR FW_BUG PFX "maxfid exceeded with pstate"
-                               " %d\n", j);
-                        return -ENODEV;
-                }
-                if (j && (pst[j].fid < HI_FID_TABLE_BOTTOM)) {
-                        /* Only first fid is allowed to be in "low" range */
-                        printk(KERN_ERR FW_BUG PFX "two low fids - %d : "
-                               "0x%x\n", j, pst[j].fid);
-                        return -EINVAL;
-                }
-                if (pst[j].fid < lastfid)
-                        lastfid = pst[j].fid;
-        }
-        if (lastfid & 1) {
-                printk(KERN_ERR FW_BUG PFX "lastfid invalid\n");
-                return -EINVAL;
-        }
-        if (lastfid > LO_FID_TABLE_TOP)
-                printk(KERN_INFO FW_BUG PFX
-                        "first fid not from lo freq table\n");
-
-        return 0;
-}
-
-static void invalidate_entry(struct cpufreq_frequency_table *powernow_table,
-                unsigned int entry)
-{
-        powernow_table[entry].frequency = CPUFREQ_ENTRY_INVALID;
-}
-
-static void print_basics(struct powernow_k8_data *data)
-{
-        int j;
-        for (j = 0; j < data->numps; j++) {
-                if (data->powernow_table[j].frequency !=
-                                CPUFREQ_ENTRY_INVALID) {
-                        if (cpu_family == CPU_HW_PSTATE) {
-                                printk(KERN_INFO PFX
-                                        "   %d : pstate %d (%d MHz)\n", j,
-                                        data->powernow_table[j].index,
-                                        data->powernow_table[j].frequency/1000);
-                        } else {
-                                printk(KERN_INFO PFX
-                                        "fid 0x%x (%d MHz), vid 0x%x\n",
-                                        data->powernow_table[j].index & 0xff,
-                                        data->powernow_table[j].frequency/1000,
-                                        data->powernow_table[j].index >> 8);
-                        }
-                }
-        }
-        if (data->batps)
-                printk(KERN_INFO PFX "Only %d pstates on battery\n",
-                                data->batps);
-}
-
-static u32 freq_from_fid_did(u32 fid, u32 did)
-{
-        u32 mhz = 0;
-
-        if (boot_cpu_data.x86 == 0x10)
-                mhz = (100 * (fid + 0x10)) >> did;
-        else if (boot_cpu_data.x86 == 0x11)
-                mhz = (100 * (fid + 8)) >> did;
-        else
-                BUG();
-
-        return mhz * 1000;
-}
-
-static int fill_powernow_table(struct powernow_k8_data *data,
-                struct pst_s *pst, u8 maxvid)
-{
-        struct cpufreq_frequency_table *powernow_table;
-        unsigned int j;
-
-        if (data->batps) {
-                /* use ACPI support to get full speed on mains power */
-                printk(KERN_WARNING PFX
-                        "Only %d pstates usable (use ACPI driver for full "
-                        "range\n", data->batps);
-                data->numps = data->batps;
-        }
-
-        for (j = 1; j < data->numps; j++) {
-                if (pst[j-1].fid >= pst[j].fid) {
-                        printk(KERN_ERR PFX "PST out of sequence\n");
-                        return -EINVAL;
-                }
-        }
-
-        if (data->numps < 2) {
-                printk(KERN_ERR PFX "no p states to transition\n");
-                return -ENODEV;
-        }
-
-        if (check_pst_table(data, pst, maxvid))
-                return -EINVAL;
-
-        powernow_table = kmalloc((sizeof(struct cpufreq_frequency_table)
-                * (data->numps + 1)), GFP_KERNEL);
-        if (!powernow_table) {
-                printk(KERN_ERR PFX "powernow_table memory alloc failure\n");
-                return -ENOMEM;
-        }
-
-        for (j = 0; j < data->numps; j++) {
-                int freq;
-                powernow_table[j].index = pst[j].fid; /* lower 8 bits */
-                powernow_table[j].index |= (pst[j].vid << 8); /* upper 8 bits */
-                freq = find_khz_freq_from_fid(pst[j].fid);
-                powernow_table[j].frequency = freq;
-        }
-        powernow_table[data->numps].frequency = CPUFREQ_TABLE_END;
-        powernow_table[data->numps].index = 0;
-
-        if (query_current_values_with_pending_wait(data)) {
-                kfree(powernow_table);
-                return -EIO;
-        }
-
-        dprintk("cfid 0x%x, cvid 0x%x\n", data->currfid, data->currvid);
-        data->powernow_table = powernow_table;
-        if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu)
-                print_basics(data);
-
-        for (j = 0; j < data->numps; j++)
-                if ((pst[j].fid == data->currfid) &&
-                    (pst[j].vid == data->currvid))
-                        return 0;
-
-        dprintk("currfid/vid do not match PST, ignoring\n");
-        return 0;
-}
-
-/* Find and validate the PSB/PST table in BIOS. */
-static int find_psb_table(struct powernow_k8_data *data)
-{
-        struct psb_s *psb;
-        unsigned int i;
-        u32 mvs;
-        u8 maxvid;
-        u32 cpst = 0;
-        u32 thiscpuid;
-
-        for (i = 0xc0000; i < 0xffff0; i += 0x10) {
-                /* Scan BIOS looking for the signature. */
-                /* It can not be at ffff0 - it is too big. */
-
-                psb = phys_to_virt(i);
-                if (memcmp(psb, PSB_ID_STRING, PSB_ID_STRING_LEN) != 0)
-                        continue;
-
-                dprintk("found PSB header at 0x%p\n", psb);
-
-                dprintk("table vers: 0x%x\n", psb->tableversion);
-                if (psb->tableversion != PSB_VERSION_1_4) {
-                        printk(KERN_ERR FW_BUG PFX "PSB table is not v1.4\n");
-                        return -ENODEV;
-                }
-
-                dprintk("flags: 0x%x\n", psb->flags1);
-                if (psb->flags1) {
-                        printk(KERN_ERR FW_BUG PFX "unknown flags\n");
-                        return -ENODEV;
-                }
-
-                data->vstable = psb->vstable;
-                dprintk("voltage stabilization time: %d(*20us)\n",
-                                data->vstable);
-
-                dprintk("flags2: 0x%x\n", psb->flags2);
-                data->rvo = psb->flags2 & 3;
-                data->irt = ((psb->flags2) >> 2) & 3;
-                mvs = ((psb->flags2) >> 4) & 3;
-                data->vidmvs = 1 << mvs;
-                data->batps = ((psb->flags2) >> 6) & 3;
-
-                dprintk("ramp voltage offset: %d\n", data->rvo);
-                dprintk("isochronous relief time: %d\n", data->irt);
-                dprintk("maximum voltage step: %d - 0x%x\n", mvs, data->vidmvs);
-
-                dprintk("numpst: 0x%x\n", psb->num_tables);
-                cpst = psb->num_tables;
-                if ((psb->cpuid == 0x00000fc0) ||
-                    (psb->cpuid == 0x00000fe0)) {
-                        thiscpuid = cpuid_eax(CPUID_PROCESSOR_SIGNATURE);
-                        if ((thiscpuid == 0x00000fc0) ||
-                            (thiscpuid == 0x00000fe0))
-                                cpst = 1;
-                }
-                if (cpst != 1) {
-                        printk(KERN_ERR FW_BUG PFX "numpst must be 1\n");
-                        return -ENODEV;
-                }
-
-                data->plllock = psb->plllocktime;
-                dprintk("plllocktime: 0x%x (units 1us)\n", psb->plllocktime);
-                dprintk("maxfid: 0x%x\n", psb->maxfid);
-                dprintk("maxvid: 0x%x\n", psb->maxvid);
-                maxvid = psb->maxvid;
-
-                data->numps = psb->numps;
-                dprintk("numpstates: 0x%x\n", data->numps);
-                return fill_powernow_table(data,
-                                (struct pst_s *)(psb+1), maxvid);
-        }
-        /*
-         * If you see this message, complain to BIOS manufacturer. If
-         * he tells you "we do not support Linux" or some similar
-         * nonsense, remember that Windows 2000 uses the same legacy
-         * mechanism that the old Linux PSB driver uses. Tell them it
-         * is broken with Windows 2000.
-         *
-         * The reference to the AMD documentation is chapter 9 in the
-         * BIOS and Kernel Developer's Guide, which is available on
-         * www.amd.com
-         */
-        printk(KERN_ERR FW_BUG PFX "No PSB or ACPI _PSS objects\n");
-        printk(KERN_ERR PFX "Make sure that your BIOS is up to date"
-                " and Cool'N'Quiet support is enabled in BIOS setup\n");
-        return -ENODEV;
-}
-
-static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data,
-                unsigned int index)
-{
-        u64 control;
-
-        if (!data->acpi_data.state_count || (cpu_family == CPU_HW_PSTATE))
-                return;
-
-        control = data->acpi_data.states[index].control;
-        data->irt = (control >> IRT_SHIFT) & IRT_MASK;
-        data->rvo = (control >> RVO_SHIFT) & RVO_MASK;
-        data->exttype = (control >> EXT_TYPE_SHIFT) & EXT_TYPE_MASK;
-        data->plllock = (control >> PLL_L_SHIFT) & PLL_L_MASK;
-        data->vidmvs = 1 << ((control >> MVS_SHIFT) & MVS_MASK);
-        data->vstable = (control >> VST_SHIFT) & VST_MASK;
-}
-
-static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)
-{
-        struct cpufreq_frequency_table *powernow_table;
-        int ret_val = -ENODEV;
-        u64 control, status;
-
-        if (acpi_processor_register_performance(&data->acpi_data, data->cpu)) {
-                dprintk("register performance failed: bad ACPI data\n");
-                return -EIO;
-        }
-
-        /* verify the data contained in the ACPI structures */
-        if (data->acpi_data.state_count <= 1) {
-                dprintk("No ACPI P-States\n");
-                goto err_out;
-        }
-
-        control = data->acpi_data.control_register.space_id;
-        status = data->acpi_data.status_register.space_id;
-
-        if ((control != ACPI_ADR_SPACE_FIXED_HARDWARE) ||
-            (status != ACPI_ADR_SPACE_FIXED_HARDWARE)) {
-                dprintk("Invalid control/status registers (%x - %x)\n",
-                        control, status);
-                goto err_out;
-        }
-
-        /* fill in data->powernow_table */
-        powernow_table = kmalloc((sizeof(struct cpufreq_frequency_table)
-                * (data->acpi_data.state_count + 1)), GFP_KERNEL);
-        if (!powernow_table) {
-                dprintk("powernow_table memory alloc failure\n");
-                goto err_out;
-        }
-
-        /* fill in data */
-        data->numps = data->acpi_data.state_count;
-        powernow_k8_acpi_pst_values(data, 0);
-
-        if (cpu_family == CPU_HW_PSTATE)
-                ret_val = fill_powernow_table_pstate(data, powernow_table);
-        else
-                ret_val = fill_powernow_table_fidvid(data, powernow_table);
-        if (ret_val)
-                goto err_out_mem;
-
-        powernow_table[data->acpi_data.state_count].frequency =
-                CPUFREQ_TABLE_END;
-        powernow_table[data->acpi_data.state_count].index = 0;
-        data->powernow_table = powernow_table;
-
-        if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu)
-                print_basics(data);
-
-        /* notify BIOS that we exist */
-        acpi_processor_notify_smm(THIS_MODULE);
-
-        if (!zalloc_cpumask_var(&data->acpi_data.shared_cpu_map, GFP_KERNEL)) {
-                printk(KERN_ERR PFX
-                                "unable to alloc powernow_k8_data cpumask\n");
-                ret_val = -ENOMEM;
-                goto err_out_mem;
-        }
-
-        return 0;
-
-err_out_mem:
-        kfree(powernow_table);
-
-err_out:
-        acpi_processor_unregister_performance(&data->acpi_data, data->cpu);
-
-        /* data->acpi_data.state_count informs us at ->exit()
-         * whether ACPI was used */
-        data->acpi_data.state_count = 0;
-
-        return ret_val;
-}
-
-static int fill_powernow_table_pstate(struct powernow_k8_data *data,
-                struct cpufreq_frequency_table *powernow_table)
-{
-        int i;
-        u32 hi = 0, lo = 0;
-        rdmsr(MSR_PSTATE_CUR_LIMIT, lo, hi);
-        data->max_hw_pstate = (lo & HW_PSTATE_MAX_MASK) >> HW_PSTATE_MAX_SHIFT;
-
-        for (i = 0; i < data->acpi_data.state_count; i++) {
-                u32 index;
-
-                index = data->acpi_data.states[i].control & HW_PSTATE_MASK;
-                if (index > data->max_hw_pstate) {
-                        printk(KERN_ERR PFX "invalid pstate %d - "
-                                        "bad value %d.\n", i, index);
-                        printk(KERN_ERR PFX "Please report to BIOS "
-                                        "manufacturer\n");
-                        invalidate_entry(powernow_table, i);
-                        continue;
-                }
-                rdmsr(MSR_PSTATE_DEF_BASE + index, lo, hi);
-                if (!(hi & HW_PSTATE_VALID_MASK)) {
-                        dprintk("invalid pstate %d, ignoring\n", index);
-                        invalidate_entry(powernow_table, i);
-                        continue;
-                }
-
-                powernow_table[i].index = index;
-
-                /* Frequency may be rounded for these */
-                if ((boot_cpu_data.x86 == 0x10 && boot_cpu_data.x86_model < 10)
-                                 || boot_cpu_data.x86 == 0x11) {
-                        powernow_table[i].frequency =
-                                freq_from_fid_did(lo & 0x3f, (lo >> 6) & 7);
-                } else
-                        powernow_table[i].frequency =
-                                data->acpi_data.states[i].core_frequency * 1000;
-        }
-        return 0;
-}
-
-static int fill_powernow_table_fidvid(struct powernow_k8_data *data,
-                struct cpufreq_frequency_table *powernow_table)
-{
-        int i;
-
-        for (i = 0; i < data->acpi_data.state_count; i++) {
-                u32 fid;
-                u32 vid;
-                u32 freq, index;
-                u64 status, control;
-
-                if (data->exttype) {
-                        status =  data->acpi_data.states[i].status;
-                        fid = status & EXT_FID_MASK;
-                        vid = (status >> VID_SHIFT) & EXT_VID_MASK;
-                } else {
-                        control =  data->acpi_data.states[i].control;
-                        fid = control & FID_MASK;
-                        vid = (control >> VID_SHIFT) & VID_MASK;
-                }
-
-                dprintk("   %d : fid 0x%x, vid 0x%x\n", i, fid, vid);
-
-                index = fid | (vid<<8);
-                powernow_table[i].index = index;
-
-                freq = find_khz_freq_from_fid(fid);
-                powernow_table[i].frequency = freq;
-
-                /* verify frequency is OK */
-                if ((freq > (MAX_FREQ * 1000)) || (freq < (MIN_FREQ * 1000))) {
-                        dprintk("invalid freq %u kHz, ignoring\n", freq);
-                        invalidate_entry(powernow_table, i);
-                        continue;
-                }
-
-                /* verify voltage is OK -
-                 * BIOSs are using "off" to indicate invalid */
-                if (vid == VID_OFF) {
-                        dprintk("invalid vid %u, ignoring\n", vid);
-                        invalidate_entry(powernow_table, i);
-                        continue;
-                }
-
-                if (freq != (data->acpi_data.states[i].core_frequency * 1000)) {
-                        printk(KERN_INFO PFX "invalid freq entries "
-                                "%u kHz vs. %u kHz\n", freq,
-                                (unsigned int)
-                                (data->acpi_data.states[i].core_frequency
-                                 * 1000));
-                        invalidate_entry(powernow_table, i);
-                        continue;
-                }
-        }
-        return 0;
-}
-
-static void powernow_k8_cpu_exit_acpi(struct powernow_k8_data *data)
-{
-        if (data->acpi_data.state_count)
-                acpi_processor_unregister_performance(&data->acpi_data,
-                                data->cpu);
-        free_cpumask_var(data->acpi_data.shared_cpu_map);
-}
-
-static int get_transition_latency(struct powernow_k8_data *data)
-{
-        int max_latency = 0;
-        int i;
-        for (i = 0; i < data->acpi_data.state_count; i++) {
-                int cur_latency = data->acpi_data.states[i].transition_latency
-                        + data->acpi_data.states[i].bus_master_latency;
-                if (cur_latency > max_latency)
-                        max_latency = cur_latency;
-        }
-        if (max_latency == 0) {
-                /*
-                 * Fam 11h and later may return 0 as transition latency. This
-                 * is intended and means "very fast". While cpufreq core and
-                 * governors currently can handle that gracefully, better set it
-                 * to 1 to avoid problems in the future.
-                 */
-                if (boot_cpu_data.x86 < 0x11)
-                        printk(KERN_ERR FW_WARN PFX "Invalid zero transition "
-                                "latency\n");
-                max_latency = 1;
-        }
-        /* value in usecs, needs to be in nanoseconds */
-        return 1000 * max_latency;
-}
-
-/* Take a frequency, and issue the fid/vid transition command */
-static int transition_frequency_fidvid(struct powernow_k8_data *data,
-                unsigned int index)
-{
-        u32 fid = 0;
-        u32 vid = 0;
-        int res, i;
-        struct cpufreq_freqs freqs;
-
-        dprintk("cpu %d transition to index %u\n", smp_processor_id(), index);
-
-        /* fid/vid correctness check for k8 */
-        /* fid are the lower 8 bits of the index we stored into
-         * the cpufreq frequency table in find_psb_table, vid
-         * are the upper 8 bits.
-         */
-        fid = data->powernow_table[index].index & 0xFF;
-        vid = (data->powernow_table[index].index & 0xFF00) >> 8;
-
-        dprintk("table matched fid 0x%x, giving vid 0x%x\n", fid, vid);
-
-        if (query_current_values_with_pending_wait(data))
-                return 1;
-
-        if ((data->currvid == vid) && (data->currfid == fid)) {
-                dprintk("target matches current values (fid 0x%x, vid 0x%x)\n",
-                        fid, vid);
-                return 0;
-        }
-
-        dprintk("cpu %d, changing to fid 0x%x, vid 0x%x\n",
-                smp_processor_id(), fid, vid);
-        freqs.old = find_khz_freq_from_fid(data->currfid);
-        freqs.new = find_khz_freq_from_fid(fid);
-
-        for_each_cpu(i, data->available_cores) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        }
-
-        res = transition_fid_vid(data, fid, vid);
-        freqs.new = find_khz_freq_from_fid(data->currfid);
-
-        for_each_cpu(i, data->available_cores) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
-        return res;
-}
-
-/* Take a frequency, and issue the hardware pstate transition command */
-static int transition_frequency_pstate(struct powernow_k8_data *data,
-                unsigned int index)
-{
-        u32 pstate = 0;
-        int res, i;
-        struct cpufreq_freqs freqs;
-
-        dprintk("cpu %d transition to index %u\n", smp_processor_id(), index);
-
-        /* get MSR index for hardware pstate transition */
-        pstate = index & HW_PSTATE_MASK;
-        if (pstate > data->max_hw_pstate)
-                return 0;
-        freqs.old = find_khz_freq_from_pstate(data->powernow_table,
-                        data->currpstate);
-        freqs.new = find_khz_freq_from_pstate(data->powernow_table, pstate);
-
-        for_each_cpu(i, data->available_cores) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        }
-
-        res = transition_pstate(data, pstate);
-        freqs.new = find_khz_freq_from_pstate(data->powernow_table, pstate);
-
-        for_each_cpu(i, data->available_cores) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
-        return res;
-}
-
-/* Driver entry point to switch to the target frequency */
-static int powernowk8_target(struct cpufreq_policy *pol,
-                unsigned targfreq, unsigned relation)
-{
-        cpumask_var_t oldmask;
-        struct powernow_k8_data *data = per_cpu(powernow_data, pol->cpu);
-        u32 checkfid;
-        u32 checkvid;
-        unsigned int newstate;
-        int ret = -EIO;
-
-        if (!data)
-                return -EINVAL;
-
-        checkfid = data->currfid;
-        checkvid = data->currvid;
-
-        /* only run on specific CPU from here on. */
-        /* This is poor form: use a workqueue or smp_call_function_single */
-        if (!alloc_cpumask_var(&oldmask, GFP_KERNEL))
-                return -ENOMEM;
-
-        cpumask_copy(oldmask, tsk_cpus_allowed(current));
-        set_cpus_allowed_ptr(current, cpumask_of(pol->cpu));
-
-        if (smp_processor_id() != pol->cpu) {
-                printk(KERN_ERR PFX "limiting to cpu %u failed\n", pol->cpu);
-                goto err_out;
-        }
-
-        if (pending_bit_stuck()) {
-                printk(KERN_ERR PFX "failing targ, change pending bit set\n");
-                goto err_out;
-        }
-
-        dprintk("targ: cpu %d, %d kHz, min %d, max %d, relation %d\n",
-                pol->cpu, targfreq, pol->min, pol->max, relation);
-
-        if (query_current_values_with_pending_wait(data))
-                goto err_out;
-
-        if (cpu_family != CPU_HW_PSTATE) {
-                dprintk("targ: curr fid 0x%x, vid 0x%x\n",
-                data->currfid, data->currvid);
-
-                if ((checkvid != data->currvid) ||
-                    (checkfid != data->currfid)) {
-                        printk(KERN_INFO PFX
-                                "error - out of sync, fix 0x%x 0x%x, "
-                                "vid 0x%x 0x%x\n",
-                                checkfid, data->currfid,
-                                checkvid, data->currvid);
-                }
-        }
-
-        if (cpufreq_frequency_table_target(pol, data->powernow_table,
-                                targfreq, relation, &newstate))
-                goto err_out;
-
-        mutex_lock(&fidvid_mutex);
-
-        powernow_k8_acpi_pst_values(data, newstate);
-
-        if (cpu_family == CPU_HW_PSTATE)
-                ret = transition_frequency_pstate(data, newstate);
-        else
-                ret = transition_frequency_fidvid(data, newstate);
-        if (ret) {
-                printk(KERN_ERR PFX "transition frequency failed\n");
-                ret = 1;
-                mutex_unlock(&fidvid_mutex);
-                goto err_out;
-        }
-        mutex_unlock(&fidvid_mutex);
-
-        if (cpu_family == CPU_HW_PSTATE)
-                pol->cur = find_khz_freq_from_pstate(data->powernow_table,
-                                newstate);
-        else
-                pol->cur = find_khz_freq_from_fid(data->currfid);
-        ret = 0;
-
-err_out:
-        set_cpus_allowed_ptr(current, oldmask);
-        free_cpumask_var(oldmask);
-        return ret;
-}
-
-/* Driver entry point to verify the policy and range of frequencies */
-static int powernowk8_verify(struct cpufreq_policy *pol)
-{
-        struct powernow_k8_data *data = per_cpu(powernow_data, pol->cpu);
-
-        if (!data)
-                return -EINVAL;
-
-        return cpufreq_frequency_table_verify(pol, data->powernow_table);
-}
-
-struct init_on_cpu {
-        struct powernow_k8_data *data;
-        int rc;
-};
-
-static void __cpuinit powernowk8_cpu_init_on_cpu(void *_init_on_cpu)
-{
-        struct init_on_cpu *init_on_cpu = _init_on_cpu;
-
-        if (pending_bit_stuck()) {
-                printk(KERN_ERR PFX "failing init, change pending bit set\n");
-                init_on_cpu->rc = -ENODEV;
-                return;
-        }
-
-        if (query_current_values_with_pending_wait(init_on_cpu->data)) {
-                init_on_cpu->rc = -ENODEV;
-                return;
-        }
-
-        if (cpu_family == CPU_OPTERON)
-                fidvid_msr_init();
-
-        init_on_cpu->rc = 0;
-}
-
-/* per CPU init entry point to the driver */
-static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
-{
-        static const char ACPI_PSS_BIOS_BUG_MSG[] =
-                KERN_ERR FW_BUG PFX "No compatible ACPI _PSS objects found.\n"
-                FW_BUG PFX "Try again with latest BIOS.\n";
-        struct powernow_k8_data *data;
-        struct init_on_cpu init_on_cpu;
-        int rc;
-        struct cpuinfo_x86 *c = &cpu_data(pol->cpu);
-
-        if (!cpu_online(pol->cpu))
-                return -ENODEV;
-
-        smp_call_function_single(pol->cpu, check_supported_cpu, &rc, 1);
-        if (rc)
-                return -ENODEV;
-
-        data = kzalloc(sizeof(struct powernow_k8_data), GFP_KERNEL);
-        if (!data) {
-                printk(KERN_ERR PFX "unable to alloc powernow_k8_data");
-                return -ENOMEM;
-        }
-
-        data->cpu = pol->cpu;
-        data->currpstate = HW_PSTATE_INVALID;
-
-        if (powernow_k8_cpu_init_acpi(data)) {
-                /*
-                 * Use the PSB BIOS structure. This is only available on
-                 * an UP version, and is deprecated by AMD.
-                 */
-                if (num_online_cpus() != 1) {
-                        printk_once(ACPI_PSS_BIOS_BUG_MSG);
-                        goto err_out;
-                }
-                if (pol->cpu != 0) {
-                        printk(KERN_ERR FW_BUG PFX "No ACPI _PSS objects for "
-                               "CPU other than CPU0. Complain to your BIOS "
-                               "vendor.\n");
-                        goto err_out;
-                }
-                rc = find_psb_table(data);
-                if (rc)
-                        goto err_out;
-
-                /* Take a crude guess here.
-                 * That guess was in microseconds, so multiply with 1000 */
-                pol->cpuinfo.transition_latency = (
-                         ((data->rvo + 8) * data->vstable * VST_UNITS_20US) +
-                         ((1 << data->irt) * 30)) * 1000;
-        } else /* ACPI _PSS objects available */
-                pol->cpuinfo.transition_latency = get_transition_latency(data);
-
-        /* only run on specific CPU from here on */
-        init_on_cpu.data = data;
-        smp_call_function_single(data->cpu, powernowk8_cpu_init_on_cpu,
-                                 &init_on_cpu, 1);
-        rc = init_on_cpu.rc;
-        if (rc != 0)
-                goto err_out_exit_acpi;
-
-        if (cpu_family == CPU_HW_PSTATE)
-                cpumask_copy(pol->cpus, cpumask_of(pol->cpu));
-        else
-                cpumask_copy(pol->cpus, cpu_core_mask(pol->cpu));
-        data->available_cores = pol->cpus;
-
-        if (cpu_family == CPU_HW_PSTATE)
-                pol->cur = find_khz_freq_from_pstate(data->powernow_table,
-                                data->currpstate);
-        else
-                pol->cur = find_khz_freq_from_fid(data->currfid);
-        dprintk("policy current frequency %d kHz\n", pol->cur);
-
-        /* min/max the cpu is capable of */
-        if (cpufreq_frequency_table_cpuinfo(pol, data->powernow_table)) {
-                printk(KERN_ERR FW_BUG PFX "invalid powernow_table\n");
-                powernow_k8_cpu_exit_acpi(data);
-                kfree(data->powernow_table);
-                kfree(data);
-                return -EINVAL;
-        }
-
-        /* Check for APERF/MPERF support in hardware */
-        if (cpu_has(c, X86_FEATURE_APERFMPERF))
-                cpufreq_amd64_driver.getavg = cpufreq_get_measured_perf;
-
-        cpufreq_frequency_table_get_attr(data->powernow_table, pol->cpu);
-
-        if (cpu_family == CPU_HW_PSTATE)
-                dprintk("cpu_init done, current pstate 0x%x\n",
-                                data->currpstate);
-        else
-                dprintk("cpu_init done, current fid 0x%x, vid 0x%x\n",
-                        data->currfid, data->currvid);
-
-        per_cpu(powernow_data, pol->cpu) = data;
-
-        return 0;
-
-err_out_exit_acpi:
-        powernow_k8_cpu_exit_acpi(data);
-
-err_out:
-        kfree(data);
-        return -ENODEV;
-}
-
-static int __devexit powernowk8_cpu_exit(struct cpufreq_policy *pol)
-{
-        struct powernow_k8_data *data = per_cpu(powernow_data, pol->cpu);
-
-        if (!data)
-                return -EINVAL;
-
-        powernow_k8_cpu_exit_acpi(data);
-
-        cpufreq_frequency_table_put_attr(pol->cpu);
-
-        kfree(data->powernow_table);
-        kfree(data);
-        per_cpu(powernow_data, pol->cpu) = NULL;
-
-        return 0;
-}
-
-static void query_values_on_cpu(void *_err)
-{
-        int *err = _err;
-        struct powernow_k8_data *data = __this_cpu_read(powernow_data);
-
-        *err = query_current_values_with_pending_wait(data);
-}
-
-static unsigned int powernowk8_get(unsigned int cpu)
-{
-        struct powernow_k8_data *data = per_cpu(powernow_data, cpu);
-        unsigned int khz = 0;
-        int err;
-
-        if (!data)
-                return 0;
-
-        smp_call_function_single(cpu, query_values_on_cpu, &err, true);
-        if (err)
-                goto out;
-
-        if (cpu_family == CPU_HW_PSTATE)
-                khz = find_khz_freq_from_pstate(data->powernow_table,
-                                                data->currpstate);
-        else
-                khz = find_khz_freq_from_fid(data->currfid);
-
-
-out:
-        return khz;
-}
-
-static void _cpb_toggle_msrs(bool t)
-{
-        int cpu;
-
-        get_online_cpus();
-
-        rdmsr_on_cpus(cpu_online_mask, MSR_K7_HWCR, msrs);
-
-        for_each_cpu(cpu, cpu_online_mask) {
-                struct msr *reg = per_cpu_ptr(msrs, cpu);
-                if (t)
-                        reg->l &= ~BIT(25);
-                else
-                        reg->l |= BIT(25);
-        }
-        wrmsr_on_cpus(cpu_online_mask, MSR_K7_HWCR, msrs);
-
-        put_online_cpus();
-}
-
-/*
- * Switch on/off core performance boosting.
- *
- * 0=disable
- * 1=enable.
- */
-static void cpb_toggle(bool t)
-{
-        if (!cpb_capable)
-                return;
-
-        if (t && !cpb_enabled) {
-                cpb_enabled = true;
-                _cpb_toggle_msrs(t);
-                printk(KERN_INFO PFX "Core Boosting enabled.\n");
-        } else if (!t && cpb_enabled) {
-                cpb_enabled = false;
-                _cpb_toggle_msrs(t);
-                printk(KERN_INFO PFX "Core Boosting disabled.\n");
-        }
-}
-
-static ssize_t store_cpb(struct cpufreq_policy *policy, const char *buf,
-                                 size_t count)
-{
-        int ret = -EINVAL;
-        unsigned long val = 0;
-
-        ret = strict_strtoul(buf, 10, &val);
-        if (!ret && (val == 0 || val == 1) && cpb_capable)
-                cpb_toggle(val);
-        else
-                return -EINVAL;
-
-        return count;
-}
-
-static ssize_t show_cpb(struct cpufreq_policy *policy, char *buf)
-{
-        return sprintf(buf, "%u\n", cpb_enabled);
-}
-
-#define define_one_rw(_name) \
-static struct freq_attr _name = \
-__ATTR(_name, 0644, show_##_name, store_##_name)
-
-define_one_rw(cpb);
-
-static struct freq_attr *powernow_k8_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        &cpb,
-        NULL,
-};
-
-static struct cpufreq_driver cpufreq_amd64_driver = {
-        .verify         = powernowk8_verify,
-        .target         = powernowk8_target,
-        .bios_limit     = acpi_processor_get_bios_limit,
-        .init           = powernowk8_cpu_init,
-        .exit           = __devexit_p(powernowk8_cpu_exit),
-        .get            = powernowk8_get,
-        .name           = "powernow-k8",
-        .owner          = THIS_MODULE,
-        .attr           = powernow_k8_attr,
-};
-
-/*
- * Clear the boost-disable flag on the CPU_DOWN path so that this cpu
- * cannot block the remaining ones from boosting. On the CPU_UP path we
- * simply keep the boost-disable flag in sync with the current global
- * state.
- */
-static int cpb_notify(struct notifier_block *nb, unsigned long action,
-                      void *hcpu)
-{
-        unsigned cpu = (long)hcpu;
-        u32 lo, hi;
-
-        switch (action) {
-        case CPU_UP_PREPARE:
-        case CPU_UP_PREPARE_FROZEN:
-
-                if (!cpb_enabled) {
-                        rdmsr_on_cpu(cpu, MSR_K7_HWCR, &lo, &hi);
-                        lo |= BIT(25);
-                        wrmsr_on_cpu(cpu, MSR_K7_HWCR, lo, hi);
-                }
-                break;
-
-        case CPU_DOWN_PREPARE:
-        case CPU_DOWN_PREPARE_FROZEN:
-                rdmsr_on_cpu(cpu, MSR_K7_HWCR, &lo, &hi);
-                lo &= ~BIT(25);
-                wrmsr_on_cpu(cpu, MSR_K7_HWCR, lo, hi);
-                break;
-
-        default:
-                break;
-        }
-
-        return NOTIFY_OK;
-}
-
-static struct notifier_block cpb_nb = {
-        .notifier_call          = cpb_notify,
-};
-
-/* driver entry point for init */
-static int __cpuinit powernowk8_init(void)
-{
-        unsigned int i, supported_cpus = 0, cpu;
-        int rv;
-
-        for_each_online_cpu(i) {
-                int rc;
-                smp_call_function_single(i, check_supported_cpu, &rc, 1);
-                if (rc == 0)
-                        supported_cpus++;
-        }
-
-        if (supported_cpus != num_online_cpus())
-                return -ENODEV;
-
-        printk(KERN_INFO PFX "Found %d %s (%d cpu cores) (" VERSION ")\n",
-                num_online_nodes(), boot_cpu_data.x86_model_id, supported_cpus);
-
-        if (boot_cpu_has(X86_FEATURE_CPB)) {
-
-                cpb_capable = true;
-
-                msrs = msrs_alloc();
-                if (!msrs) {
-                        printk(KERN_ERR "%s: Error allocating msrs!\n", __func__);
-                        return -ENOMEM;
-                }
-
-                register_cpu_notifier(&cpb_nb);
-
-                rdmsr_on_cpus(cpu_online_mask, MSR_K7_HWCR, msrs);
-
-                for_each_cpu(cpu, cpu_online_mask) {
-                        struct msr *reg = per_cpu_ptr(msrs, cpu);
-                        cpb_enabled |= !(!!(reg->l & BIT(25)));
-                }
-
-                printk(KERN_INFO PFX "Core Performance Boosting: %s.\n",
-                        (cpb_enabled ? "on" : "off"));
-        }
-
-        rv = cpufreq_register_driver(&cpufreq_amd64_driver);
-        if (rv < 0 && boot_cpu_has(X86_FEATURE_CPB)) {
-                unregister_cpu_notifier(&cpb_nb);
-                msrs_free(msrs);
-                msrs = NULL;
-        }
-        return rv;
-}
-
-/* driver entry point for term */
-static void __exit powernowk8_exit(void)
-{
-        dprintk("exit\n");
-
-        if (boot_cpu_has(X86_FEATURE_CPB)) {
-                msrs_free(msrs);
-                msrs = NULL;
-
-                unregister_cpu_notifier(&cpb_nb);
-        }
-
-        cpufreq_unregister_driver(&cpufreq_amd64_driver);
-}
-
-MODULE_AUTHOR("Paul Devriendt <paul.devriendt@amd.com> and "
-                "Mark Langsdorf <mark.langsdorf@amd.com>");
-MODULE_DESCRIPTION("AMD Athlon 64 and Opteron processor frequency driver.");
-MODULE_LICENSE("GPL");
-
-late_initcall(powernowk8_init);
-module_exit(powernowk8_exit);
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h b/arch/x86/kernel/cpu/cpufreq/powernow-k8.h
deleted file mode 100644
index df3529b1c02d..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- *  (c) 2003-2006 Advanced Micro Devices, Inc.
- *  Your use of this code is subject to the terms and conditions of the
- *  GNU general public license version 2. See "COPYING" or
- *  http://www.gnu.org/licenses/gpl.html
- */
-
-enum pstate {
-        HW_PSTATE_INVALID = 0xff,
-        HW_PSTATE_0 = 0,
-        HW_PSTATE_1 = 1,
-        HW_PSTATE_2 = 2,
-        HW_PSTATE_3 = 3,
-        HW_PSTATE_4 = 4,
-        HW_PSTATE_5 = 5,
-        HW_PSTATE_6 = 6,
-        HW_PSTATE_7 = 7,
-};
-
-struct powernow_k8_data {
-        unsigned int cpu;
-
-        u32 numps;  /* number of p-states */
-        u32 batps;  /* number of p-states supported on battery */
-        u32 max_hw_pstate; /* maximum legal hardware pstate */
-
-        /* these values are constant when the PSB is used to determine
-         * vid/fid pairings, but are modified during the ->target() call
-         * when ACPI is used */
-        u32 rvo;     /* ramp voltage offset */
-        u32 irt;     /* isochronous relief time */
-        u32 vidmvs;  /* usable value calculated from mvs */
-        u32 vstable; /* voltage stabilization time, units 20 us */
-        u32 plllock; /* pll lock time, units 1 us */
-        u32 exttype; /* extended interface = 1 */
-
-        /* keep track of the current fid / vid or pstate */
-        u32 currvid;
-        u32 currfid;
-        enum pstate currpstate;
-
-        /* the powernow_table includes all frequency and vid/fid pairings:
-         * fid are the lower 8 bits of the index, vid are the upper 8 bits.
-         * frequency is in kHz */
-        struct cpufreq_frequency_table  *powernow_table;
-
-        /* the acpi table needs to be kept. it's only available if ACPI was
-         * used to determine valid frequency/vid/fid states */
-        struct acpi_processor_performance acpi_data;
-
-        /* we need to keep track of associated cores, but let cpufreq
-         * handle hotplug events - so just point at cpufreq pol->cpus
-         * structure */
-        struct cpumask *available_cores;
-};
-
-/* processor's cpuid instruction support */
-#define CPUID_PROCESSOR_SIGNATURE       1       /* function 1 */
-#define CPUID_XFAM                      0x0ff00000      /* extended family */
-#define CPUID_XFAM_K8                   0
-#define CPUID_XMOD                      0x000f0000      /* extended model */
-#define CPUID_XMOD_REV_MASK             0x000c0000
-#define CPUID_XFAM_10H                  0x00100000      /* family 0x10 */
-#define CPUID_USE_XFAM_XMOD             0x00000f00
-#define CPUID_GET_MAX_CAPABILITIES      0x80000000
-#define CPUID_FREQ_VOLT_CAPABILITIES    0x80000007
-#define P_STATE_TRANSITION_CAPABLE      6
-
-/* Model Specific Registers for p-state transitions. MSRs are 64-bit. For     */
-/* writes (wrmsr - opcode 0f 30), the register number is placed in ecx, and   */
-/* the value to write is placed in edx:eax. For reads (rdmsr - opcode 0f 32), */
-/* the register number is placed in ecx, and the data is returned in edx:eax. */
-
-#define MSR_FIDVID_CTL      0xc0010041
-#define MSR_FIDVID_STATUS   0xc0010042
-
-/* Field definitions within the FID VID Low Control MSR : */
-#define MSR_C_LO_INIT_FID_VID     0x00010000
-#define MSR_C_LO_NEW_VID          0x00003f00
-#define MSR_C_LO_NEW_FID          0x0000003f
-#define MSR_C_LO_VID_SHIFT        8
-
-/* Field definitions within the FID VID High Control MSR : */
-#define MSR_C_HI_STP_GNT_TO       0x000fffff
-
-/* Field definitions within the FID VID Low Status MSR : */
-#define MSR_S_LO_CHANGE_PENDING   0x80000000   /* cleared when completed */
-#define MSR_S_LO_MAX_RAMP_VID     0x3f000000
-#define MSR_S_LO_MAX_FID          0x003f0000
-#define MSR_S_LO_START_FID        0x00003f00
-#define MSR_S_LO_CURRENT_FID      0x0000003f
-
-/* Field definitions within the FID VID High Status MSR : */
-#define MSR_S_HI_MIN_WORKING_VID  0x3f000000
-#define MSR_S_HI_MAX_WORKING_VID  0x003f0000
-#define MSR_S_HI_START_VID        0x00003f00
-#define MSR_S_HI_CURRENT_VID      0x0000003f
-#define MSR_C_HI_STP_GNT_BENIGN   0x00000001
-
-
-/* Hardware Pstate _PSS and MSR definitions */
-#define USE_HW_PSTATE           0x00000080
-#define HW_PSTATE_MASK          0x00000007
-#define HW_PSTATE_VALID_MASK    0x80000000
-#define HW_PSTATE_MAX_MASK      0x000000f0
-#define HW_PSTATE_MAX_SHIFT     4
-#define MSR_PSTATE_DEF_BASE     0xc0010064 /* base of Pstate MSRs */
-#define MSR_PSTATE_STATUS       0xc0010063 /* Pstate Status MSR */
-#define MSR_PSTATE_CTRL         0xc0010062 /* Pstate control MSR */
-#define MSR_PSTATE_CUR_LIMIT    0xc0010061 /* pstate current limit MSR */
-
-/* define the two driver architectures */
-#define CPU_OPTERON 0
-#define CPU_HW_PSTATE 1
-
-
-/*
- * There are restrictions frequencies have to follow:
- * - only 1 entry in the low fid table ( <=1.4GHz )
- * - lowest entry in the high fid table must be >= 2 * the entry in the
- *   low fid table
- * - lowest entry in the high fid table must be a <= 200MHz + 2 * the entry
- *   in the low fid table
- * - the parts can only step at <= 200 MHz intervals, odd fid values are
- *   supported in revision G and later revisions.
- * - lowest frequency must be >= interprocessor hypertransport link speed
- *   (only applies to MP systems obviously)
- */
-
-/* fids (frequency identifiers) are arranged in 2 tables - lo and hi */
-#define LO_FID_TABLE_TOP     7  /* fid values marking the boundary    */
-#define HI_FID_TABLE_BOTTOM  8  /* between the low and high tables    */
-
-#define LO_VCOFREQ_TABLE_TOP    1400    /* corresponding vco frequency values */
-#define HI_VCOFREQ_TABLE_BOTTOM 1600
-
-#define MIN_FREQ_RESOLUTION  200 /* fids jump by 2 matching freq jumps by 200 */
-
-#define MAX_FID 0x2a    /* Spec only gives FID values as far as 5 GHz */
-#define LEAST_VID 0x3e  /* Lowest (numerically highest) useful vid value */
-
-#define MIN_FREQ 800    /* Min and max freqs, per spec */
-#define MAX_FREQ 5000
-
-#define INVALID_FID_MASK 0xffffffc0  /* not a valid fid if these bits are set */
-#define INVALID_VID_MASK 0xffffffc0  /* not a valid vid if these bits are set */
-
-#define VID_OFF 0x3f
-
-#define STOP_GRANT_5NS 1 /* min poss memory access latency for voltage change */
-
-#define PLL_LOCK_CONVERSION (1000/5) /* ms to ns, then divide by clock period */
-
-#define MAXIMUM_VID_STEPS 1  /* Current cpus only allow a single step of 25mV */
-#define VST_UNITS_20US 20   /* Voltage Stabilization Time is in units of 20us */
-
-/*
- * Most values of interest are encoded in a single field of the _PSS
- * entries: the "control" value.
- */
-
-#define IRT_SHIFT      30
-#define RVO_SHIFT      28
-#define EXT_TYPE_SHIFT 27
-#define PLL_L_SHIFT    20
-#define MVS_SHIFT      18
-#define VST_SHIFT      11
-#define VID_SHIFT       6
-#define IRT_MASK        3
-#define RVO_MASK        3
-#define EXT_TYPE_MASK   1
-#define PLL_L_MASK   0x7f
-#define MVS_MASK        3
-#define VST_MASK     0x7f
-#define VID_MASK     0x1f
-#define FID_MASK     0x1f
-#define EXT_VID_MASK 0x3f
-#define EXT_FID_MASK 0x3f
-
-
-/*
- * Version 1.4 of the PSB table. This table is constructed by BIOS and is
- * to tell the OS's power management driver which VIDs and FIDs are
- * supported by this particular processor.
- * If the data in the PSB / PST is wrong, then this driver will program the
- * wrong values into hardware, which is very likely to lead to a crash.
- */
-
-#define PSB_ID_STRING      "AMDK7PNOW!"
-#define PSB_ID_STRING_LEN  10
-
-#define PSB_VERSION_1_4  0x14
-
-struct psb_s {
-        u8 signature[10];
-        u8 tableversion;
-        u8 flags1;
-        u16 vstable;
-        u8 flags2;
-        u8 num_tables;
-        u32 cpuid;
-        u8 plllocktime;
-        u8 maxfid;
-        u8 maxvid;
-        u8 numps;
-};
-
-/* Pairs of fid/vid values are appended to the version 1.4 PSB table. */
-struct pst_s {
-        u8 fid;
-        u8 vid;
-};
-
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "powernow-k8", msg)
-
-static int core_voltage_pre_transition(struct powernow_k8_data *data,
-        u32 reqvid, u32 regfid);
-static int core_voltage_post_transition(struct powernow_k8_data *data, u32 reqvid);
-static int core_frequency_transition(struct powernow_k8_data *data, u32 reqfid);
-
-static void powernow_k8_acpi_pst_values(struct powernow_k8_data *data, unsigned int index);
-
-static int fill_powernow_table_pstate(struct powernow_k8_data *data, struct cpufreq_frequency_table *powernow_table);
-static int fill_powernow_table_fidvid(struct powernow_k8_data *data, struct cpufreq_frequency_table *powernow_table);
diff --git a/arch/x86/kernel/cpu/cpufreq/sc520_freq.c b/arch/x86/kernel/cpu/cpufreq/sc520_freq.c
deleted file mode 100644
index 435a996a613a..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/sc520_freq.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- *      sc520_freq.c: cpufreq driver for the AMD Elan sc520
- *
- *      Copyright (C) 2005 Sean Young <sean@mess.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.
- *
- *      Based on elanfreq.c
- *
- *      2005-03-30: - initial revision
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-
-#include <linux/delay.h>
-#include <linux/cpufreq.h>
-#include <linux/timex.h>
-#include <linux/io.h>
-
-#include <asm/msr.h>
-
-#define MMCR_BASE       0xfffef000      /* The default base address */
-#define OFFS_CPUCTL     0x2   /* CPU Control Register */
-
-static __u8 __iomem *cpuctl;
-
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \
-                "sc520_freq", msg)
-#define PFX "sc520_freq: "
-
-static struct cpufreq_frequency_table sc520_freq_table[] = {
-        {0x01,  100000},
-        {0x02,  133000},
-        {0,     CPUFREQ_TABLE_END},
-};
-
-static unsigned int sc520_freq_get_cpu_frequency(unsigned int cpu)
-{
-        u8 clockspeed_reg = *cpuctl;
-
-        switch (clockspeed_reg & 0x03) {
-        default:
-                printk(KERN_ERR PFX "error: cpuctl register has unexpected "
-                                "value %02x\n", clockspeed_reg);
-        case 0x01:
-                return 100000;
-        case 0x02:
-                return 133000;
-        }
-}
-
-static void sc520_freq_set_cpu_state(unsigned int state)
-{
-
-        struct cpufreq_freqs    freqs;
-        u8 clockspeed_reg;
-
-        freqs.old = sc520_freq_get_cpu_frequency(0);
-        freqs.new = sc520_freq_table[state].frequency;
-        freqs.cpu = 0; /* AMD Elan is UP */
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        dprintk("attempting to set frequency to %i kHz\n",
-                        sc520_freq_table[state].frequency);
-
-        local_irq_disable();
-
-        clockspeed_reg = *cpuctl & ~0x03;
-        *cpuctl = clockspeed_reg | sc520_freq_table[state].index;
-
-        local_irq_enable();
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-};
-
-static int sc520_freq_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, &sc520_freq_table[0]);
-}
-
-static int sc520_freq_target(struct cpufreq_policy *policy,
-                            unsigned int target_freq,
-                            unsigned int relation)
-{
-        unsigned int newstate = 0;
-
-        if (cpufreq_frequency_table_target(policy, sc520_freq_table,
-                                target_freq, relation, &newstate))
-                return -EINVAL;
-
-        sc520_freq_set_cpu_state(newstate);
-
-        return 0;
-}
-
-
-/*
- *      Module init and exit code
- */
-
-static int sc520_freq_cpu_init(struct cpufreq_policy *policy)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-        int result;
-
-        /* capability check */
-        if (c->x86_vendor != X86_VENDOR_AMD ||
-            c->x86 != 4 || c->x86_model != 9)
-                return -ENODEV;
-
-        /* cpuinfo and default policy values */
-        policy->cpuinfo.transition_latency = 1000000; /* 1ms */
-        policy->cur = sc520_freq_get_cpu_frequency(0);
-
-        result = cpufreq_frequency_table_cpuinfo(policy, sc520_freq_table);
-        if (result)
-                return result;
-
-        cpufreq_frequency_table_get_attr(sc520_freq_table, policy->cpu);
-
-        return 0;
-}
-
-
-static int sc520_freq_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        return 0;
-}
-
-
-static struct freq_attr *sc520_freq_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-
-static struct cpufreq_driver sc520_freq_driver = {
-        .get    = sc520_freq_get_cpu_frequency,
-        .verify = sc520_freq_verify,
-        .target = sc520_freq_target,
-        .init   = sc520_freq_cpu_init,
-        .exit   = sc520_freq_cpu_exit,
-        .name   = "sc520_freq",
-        .owner  = THIS_MODULE,
-        .attr   = sc520_freq_attr,
-};
-
-
-static int __init sc520_freq_init(void)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-        int err;
-
-        /* Test if we have the right hardware */
-        if (c->x86_vendor != X86_VENDOR_AMD ||
-            c->x86 != 4 || c->x86_model != 9) {
-                dprintk("no Elan SC520 processor found!\n");
-                return -ENODEV;
-        }
-        cpuctl = ioremap((unsigned long)(MMCR_BASE + OFFS_CPUCTL), 1);
-        if (!cpuctl) {
-                printk(KERN_ERR "sc520_freq: error: failed to remap memory\n");
-                return -ENOMEM;
-        }
-
-        err = cpufreq_register_driver(&sc520_freq_driver);
-        if (err)
-                iounmap(cpuctl);
-
-        return err;
-}
-
-
-static void __exit sc520_freq_exit(void)
-{
-        cpufreq_unregister_driver(&sc520_freq_driver);
-        iounmap(cpuctl);
-}
-
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Sean Young <sean@mess.org>");
-MODULE_DESCRIPTION("cpufreq driver for AMD's Elan sc520 CPU");
-
-module_init(sc520_freq_init);
-module_exit(sc520_freq_exit);
-
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
deleted file mode 100644
index 9b1ff37de46a..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+++ /dev/null
@@ -1,636 +0,0 @@
-/*
- * cpufreq driver for Enhanced SpeedStep, as found in Intel's Pentium
- * M (part of the Centrino chipset).
- *
- * Since the original Pentium M, most new Intel CPUs support Enhanced
- * SpeedStep.
- *
- * Despite the "SpeedStep" in the name, this is almost entirely unlike
- * traditional SpeedStep.
- *
- * Modelled on speedstep.c
- *
- * Copyright (C) 2003 Jeremy Fitzhardinge <jeremy@goop.org>
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/sched.h>        /* current */
-#include <linux/delay.h>
-#include <linux/compiler.h>
-#include <linux/gfp.h>
-
-#include <asm/msr.h>
-#include <asm/processor.h>
-#include <asm/cpufeature.h>
-
-#define PFX             "speedstep-centrino: "
-#define MAINTAINER      "cpufreq@vger.kernel.org"
-
-#define dprintk(msg...) \
-        cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "speedstep-centrino", msg)
-
-#define INTEL_MSR_RANGE (0xffff)
-
-struct cpu_id
-{
-        __u8    x86;            /* CPU family */
-        __u8    x86_model;      /* model */
-        __u8    x86_mask;       /* stepping */
-};
-
-enum {
-        CPU_BANIAS,
-        CPU_DOTHAN_A1,
-        CPU_DOTHAN_A2,
-        CPU_DOTHAN_B0,
-        CPU_MP4HT_D0,
-        CPU_MP4HT_E0,
-};
-
-static const struct cpu_id cpu_ids[] = {
-        [CPU_BANIAS]    = { 6,  9, 5 },
-        [CPU_DOTHAN_A1] = { 6, 13, 1 },
-        [CPU_DOTHAN_A2] = { 6, 13, 2 },
-        [CPU_DOTHAN_B0] = { 6, 13, 6 },
-        [CPU_MP4HT_D0]  = {15,  3, 4 },
-        [CPU_MP4HT_E0]  = {15,  4, 1 },
-};
-#define N_IDS   ARRAY_SIZE(cpu_ids)
-
-struct cpu_model
-{
-        const struct cpu_id *cpu_id;
-        const char      *model_name;
-        unsigned        max_freq; /* max clock in kHz */
-
-        struct cpufreq_frequency_table *op_points; /* clock/voltage pairs */
-};
-static int centrino_verify_cpu_id(const struct cpuinfo_x86 *c,
-                                  const struct cpu_id *x);
-
-/* Operating points for current CPU */
-static DEFINE_PER_CPU(struct cpu_model *, centrino_model);
-static DEFINE_PER_CPU(const struct cpu_id *, centrino_cpu);
-
-static struct cpufreq_driver centrino_driver;
-
-#ifdef CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE
-
-/* Computes the correct form for IA32_PERF_CTL MSR for a particular
-   frequency/voltage operating point; frequency in MHz, volts in mV.
-   This is stored as "index" in the structure. */
-#define OP(mhz, mv)                                                     \
-        {                                                               \
-                .frequency = (mhz) * 1000,                              \
-                .index = (((mhz)/100) << 8) | ((mv - 700) / 16)         \
-        }
-
-/*
- * These voltage tables were derived from the Intel Pentium M
- * datasheet, document 25261202.pdf, Table 5.  I have verified they
- * are consistent with my IBM ThinkPad X31, which has a 1.3GHz Pentium
- * M.
- */
-
-/* Ultra Low Voltage Intel Pentium M processor 900MHz (Banias) */
-static struct cpufreq_frequency_table banias_900[] =
-{
-        OP(600,  844),
-        OP(800,  988),
-        OP(900, 1004),
-        { .frequency = CPUFREQ_TABLE_END }
-};
-
-/* Ultra Low Voltage Intel Pentium M processor 1000MHz (Banias) */
-static struct cpufreq_frequency_table banias_1000[] =
-{
-        OP(600,   844),
-        OP(800,   972),
-        OP(900,   988),
-        OP(1000, 1004),
-        { .frequency = CPUFREQ_TABLE_END }
-};
-
-/* Low Voltage Intel Pentium M processor 1.10GHz (Banias) */
-static struct cpufreq_frequency_table banias_1100[] =
-{
-        OP( 600,  956),
-        OP( 800, 1020),
-        OP( 900, 1100),
-        OP(1000, 1164),
-        OP(1100, 1180),
-        { .frequency = CPUFREQ_TABLE_END }
-};
-
-
-/* Low Voltage Intel Pentium M processor 1.20GHz (Banias) */
-static struct cpufreq_frequency_table banias_1200[] =
-{
-        OP( 600,  956),
-        OP( 800, 1004),
-        OP( 900, 1020),
-        OP(1000, 1100),
-        OP(1100, 1164),
-        OP(1200, 1180),
-        { .frequency = CPUFREQ_TABLE_END }
-};
-
-/* Intel Pentium M processor 1.30GHz (Banias) */
-static struct cpufreq_frequency_table banias_1300[] =
-{
-        OP( 600,  956),
-        OP( 800, 1260),
-        OP(1000, 1292),
-        OP(1200, 1356),
-        OP(1300, 1388),
-        { .frequency = CPUFREQ_TABLE_END }
-};
-
-/* Intel Pentium M processor 1.40GHz (Banias) */
-static struct cpufreq_frequency_table banias_1400[] =
-{
-        OP( 600,  956),
-        OP( 800, 1180),
-        OP(1000, 1308),
-        OP(1200, 1436),
-        OP(1400, 1484),
-        { .frequency = CPUFREQ_TABLE_END }
-};
-
-/* Intel Pentium M processor 1.50GHz (Banias) */
-static struct cpufreq_frequency_table banias_1500[] =
-{
-        OP( 600,  956),
-        OP( 800, 1116),
-        OP(1000, 1228),
-        OP(1200, 1356),
-        OP(1400, 1452),
-        OP(1500, 1484),
-        { .frequency = CPUFREQ_TABLE_END }
-};
-
-/* Intel Pentium M processor 1.60GHz (Banias) */
-static struct cpufreq_frequency_table banias_1600[] =
-{
-        OP( 600,  956),
-        OP( 800, 1036),
-        OP(1000, 1164),
-        OP(1200, 1276),
-        OP(1400, 1420),
-        OP(1600, 1484),
-        { .frequency = CPUFREQ_TABLE_END }
-};
-
-/* Intel Pentium M processor 1.70GHz (Banias) */
-static struct cpufreq_frequency_table banias_1700[] =
-{
-        OP( 600,  956),
-        OP( 800, 1004),
-        OP(1000, 1116),
-        OP(1200, 1228),
-        OP(1400, 1308),
-        OP(1700, 1484),
-        { .frequency = CPUFREQ_TABLE_END }
-};
-#undef OP
-
-#define _BANIAS(cpuid, max, name)       \
-{       .cpu_id         = cpuid,        \
-        .model_name     = "Intel(R) Pentium(R) M processor " name "MHz", \
-        .max_freq       = (max)*1000,   \
-        .op_points      = banias_##max, \
-}
-#define BANIAS(max)     _BANIAS(&cpu_ids[CPU_BANIAS], max, #max)
-
-/* CPU models, their operating frequency range, and freq/voltage
-   operating points */
-static struct cpu_model models[] =
-{
-        _BANIAS(&cpu_ids[CPU_BANIAS], 900, " 900"),
-        BANIAS(1000),
-        BANIAS(1100),
-        BANIAS(1200),
-        BANIAS(1300),
-        BANIAS(1400),
-        BANIAS(1500),
-        BANIAS(1600),
-        BANIAS(1700),
-
-        /* NULL model_name is a wildcard */
-        { &cpu_ids[CPU_DOTHAN_A1], NULL, 0, NULL },
-        { &cpu_ids[CPU_DOTHAN_A2], NULL, 0, NULL },
-        { &cpu_ids[CPU_DOTHAN_B0], NULL, 0, NULL },
-        { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
-        { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
-
-        { NULL, }
-};
-#undef _BANIAS
-#undef BANIAS
-
-static int centrino_cpu_init_table(struct cpufreq_policy *policy)
-{
-        struct cpuinfo_x86 *cpu = &cpu_data(policy->cpu);
-        struct cpu_model *model;
-
-        for(model = models; model->cpu_id != NULL; model++)
-                if (centrino_verify_cpu_id(cpu, model->cpu_id) &&
-                    (model->model_name == NULL ||
-                     strcmp(cpu->x86_model_id, model->model_name) == 0))
-                        break;
-
-        if (model->cpu_id == NULL) {
-                /* No match at all */
-                dprintk("no support for CPU model \"%s\": "
-                       "send /proc/cpuinfo to " MAINTAINER "\n",
-                       cpu->x86_model_id);
-                return -ENOENT;
-        }
-
-        if (model->op_points == NULL) {
-                /* Matched a non-match */
-                dprintk("no table support for CPU model \"%s\"\n",
-                       cpu->x86_model_id);
-                dprintk("try using the acpi-cpufreq driver\n");
-                return -ENOENT;
-        }
-
-        per_cpu(centrino_model, policy->cpu) = model;
-
-        dprintk("found \"%s\": max frequency: %dkHz\n",
-               model->model_name, model->max_freq);
-
-        return 0;
-}
-
-#else
-static inline int centrino_cpu_init_table(struct cpufreq_policy *policy)
-{
-        return -ENODEV;
-}
-#endif /* CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE */
-
-static int centrino_verify_cpu_id(const struct cpuinfo_x86 *c,
-                                  const struct cpu_id *x)
-{
-        if ((c->x86 == x->x86) &&
-            (c->x86_model == x->x86_model) &&
-            (c->x86_mask == x->x86_mask))
-                return 1;
-        return 0;
-}
-
-/* To be called only after centrino_model is initialized */
-static unsigned extract_clock(unsigned msr, unsigned int cpu, int failsafe)
-{
-        int i;
-
-        /*
-         * Extract clock in kHz from PERF_CTL value
-         * for centrino, as some DSDTs are buggy.
-         * Ideally, this can be done using the acpi_data structure.
-         */
-        if ((per_cpu(centrino_cpu, cpu) == &cpu_ids[CPU_BANIAS]) ||
-            (per_cpu(centrino_cpu, cpu) == &cpu_ids[CPU_DOTHAN_A1]) ||
-            (per_cpu(centrino_cpu, cpu) == &cpu_ids[CPU_DOTHAN_B0])) {
-                msr = (msr >> 8) & 0xff;
-                return msr * 100000;
-        }
-
-        if ((!per_cpu(centrino_model, cpu)) ||
-            (!per_cpu(centrino_model, cpu)->op_points))
-                return 0;
-
-        msr &= 0xffff;
-        for (i = 0;
-                per_cpu(centrino_model, cpu)->op_points[i].frequency
-                                                        != CPUFREQ_TABLE_END;
-             i++) {
-                if (msr == per_cpu(centrino_model, cpu)->op_points[i].index)
-                        return per_cpu(centrino_model, cpu)->
-                                                        op_points[i].frequency;
-        }
-        if (failsafe)
-                return per_cpu(centrino_model, cpu)->op_points[i-1].frequency;
-        else
-                return 0;
-}
-
-/* Return the current CPU frequency in kHz */
-static unsigned int get_cur_freq(unsigned int cpu)
-{
-        unsigned l, h;
-        unsigned clock_freq;
-
-        rdmsr_on_cpu(cpu, MSR_IA32_PERF_STATUS, &l, &h);
-        clock_freq = extract_clock(l, cpu, 0);
-
-        if (unlikely(clock_freq == 0)) {
-                /*
-                 * On some CPUs, we can see transient MSR values (which are
-                 * not present in _PSS), while CPU is doing some automatic
-                 * P-state transition (like TM2). Get the last freq set 
-                 * in PERF_CTL.
-                 */
-                rdmsr_on_cpu(cpu, MSR_IA32_PERF_CTL, &l, &h);
-                clock_freq = extract_clock(l, cpu, 1);
-        }
-        return clock_freq;
-}
-
-
-static int centrino_cpu_init(struct cpufreq_policy *policy)
-{
-        struct cpuinfo_x86 *cpu = &cpu_data(policy->cpu);
-        unsigned freq;
-        unsigned l, h;
-        int ret;
-        int i;
-
-        /* Only Intel makes Enhanced Speedstep-capable CPUs */
-        if (cpu->x86_vendor != X86_VENDOR_INTEL ||
-            !cpu_has(cpu, X86_FEATURE_EST))
-                return -ENODEV;
-
-        if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
-                centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
-
-        if (policy->cpu != 0)
-                return -ENODEV;
-
-        for (i = 0; i < N_IDS; i++)
-                if (centrino_verify_cpu_id(cpu, &cpu_ids[i]))
-                        break;
-
-        if (i != N_IDS)
-                per_cpu(centrino_cpu, policy->cpu) = &cpu_ids[i];
-
-        if (!per_cpu(centrino_cpu, policy->cpu)) {
-                dprintk("found unsupported CPU with "
-                "Enhanced SpeedStep: send /proc/cpuinfo to "
-                MAINTAINER "\n");
-                return -ENODEV;
-        }
-
-        if (centrino_cpu_init_table(policy)) {
-                return -ENODEV;
-        }
-
-        /* Check to see if Enhanced SpeedStep is enabled, and try to
-           enable it if not. */
-        rdmsr(MSR_IA32_MISC_ENABLE, l, h);
-
-        if (!(l & MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP)) {
-                l |= MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP;
-                dprintk("trying to enable Enhanced SpeedStep (%x)\n", l);
-                wrmsr(MSR_IA32_MISC_ENABLE, l, h);
-
-                /* check to see if it stuck */
-                rdmsr(MSR_IA32_MISC_ENABLE, l, h);
-                if (!(l & MSR_IA32_MISC_ENABLE_ENHANCED_SPEEDSTEP)) {
-                        printk(KERN_INFO PFX
-                                "couldn't enable Enhanced SpeedStep\n");
-                        return -ENODEV;
-                }
-        }
-
-        freq = get_cur_freq(policy->cpu);
-        policy->cpuinfo.transition_latency = 10000;
-                                                /* 10uS transition latency */
-        policy->cur = freq;
-
-        dprintk("centrino_cpu_init: cur=%dkHz\n", policy->cur);
-
-        ret = cpufreq_frequency_table_cpuinfo(policy,
-                per_cpu(centrino_model, policy->cpu)->op_points);
-        if (ret)
-                return (ret);
-
-        cpufreq_frequency_table_get_attr(
-                per_cpu(centrino_model, policy->cpu)->op_points, policy->cpu);
-
-        return 0;
-}
-
-static int centrino_cpu_exit(struct cpufreq_policy *policy)
-{
-        unsigned int cpu = policy->cpu;
-
-        if (!per_cpu(centrino_model, cpu))
-                return -ENODEV;
-
-        cpufreq_frequency_table_put_attr(cpu);
-
-        per_cpu(centrino_model, cpu) = NULL;
-
-        return 0;
-}
-
-/**
- * centrino_verify - verifies a new CPUFreq policy
- * @policy: new policy
- *
- * Limit must be within this model's frequency range at least one
- * border included.
- */
-static int centrino_verify (struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy,
-                        per_cpu(centrino_model, policy->cpu)->op_points);
-}
-
-/**
- * centrino_setpolicy - set a new CPUFreq policy
- * @policy: new policy
- * @target_freq: the target frequency
- * @relation: how that frequency relates to achieved frequency
- *      (CPUFREQ_RELATION_L or CPUFREQ_RELATION_H)
- *
- * Sets a new CPUFreq policy.
- */
-static int centrino_target (struct cpufreq_policy *policy,
-                            unsigned int target_freq,
-                            unsigned int relation)
-{
-        unsigned int    newstate = 0;
-        unsigned int    msr, oldmsr = 0, h = 0, cpu = policy->cpu;
-        struct cpufreq_freqs    freqs;
-        int                     retval = 0;
-        unsigned int            j, k, first_cpu, tmp;
-        cpumask_var_t covered_cpus;
-
-        if (unlikely(!zalloc_cpumask_var(&covered_cpus, GFP_KERNEL)))
-                return -ENOMEM;
-
-        if (unlikely(per_cpu(centrino_model, cpu) == NULL)) {
-                retval = -ENODEV;
-                goto out;
-        }
-
-        if (unlikely(cpufreq_frequency_table_target(policy,
-                        per_cpu(centrino_model, cpu)->op_points,
-                        target_freq,
-                        relation,
-                        &newstate))) {
-                retval = -EINVAL;
-                goto out;
-        }
-
-        first_cpu = 1;
-        for_each_cpu(j, policy->cpus) {
-                int good_cpu;
-
-                /* cpufreq holds the hotplug lock, so we are safe here */
-                if (!cpu_online(j))
-                        continue;
-
-                /*
-                 * Support for SMP systems.
-                 * Make sure we are running on CPU that wants to change freq
-                 */
-                if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
-                        good_cpu = cpumask_any_and(policy->cpus,
-                                                   cpu_online_mask);
-                else
-                        good_cpu = j;
-
-                if (good_cpu >= nr_cpu_ids) {
-                        dprintk("couldn't limit to CPUs in this domain\n");
-                        retval = -EAGAIN;
-                        if (first_cpu) {
-                                /* We haven't started the transition yet. */
-                                goto out;
-                        }
-                        break;
-                }
-
-                msr = per_cpu(centrino_model, cpu)->op_points[newstate].index;
-
-                if (first_cpu) {
-                        rdmsr_on_cpu(good_cpu, MSR_IA32_PERF_CTL, &oldmsr, &h);
-                        if (msr == (oldmsr & 0xffff)) {
-                                dprintk("no change needed - msr was and needs "
-                                        "to be %x\n", oldmsr);
-                                retval = 0;
-                                goto out;
-                        }
-
-                        freqs.old = extract_clock(oldmsr, cpu, 0);
-                        freqs.new = extract_clock(msr, cpu, 0);
-
-                        dprintk("target=%dkHz old=%d new=%d msr=%04x\n",
-                                target_freq, freqs.old, freqs.new, msr);
-
-                        for_each_cpu(k, policy->cpus) {
-                                if (!cpu_online(k))
-                                        continue;
-                                freqs.cpu = k;
-                                cpufreq_notify_transition(&freqs,
-                                        CPUFREQ_PRECHANGE);
-                        }
-
-                        first_cpu = 0;
-                        /* all but 16 LSB are reserved, treat them with care */
-                        oldmsr &= ~0xffff;
-                        msr &= 0xffff;
-                        oldmsr |= msr;
-                }
-
-                wrmsr_on_cpu(good_cpu, MSR_IA32_PERF_CTL, oldmsr, h);
-                if (policy->shared_type == CPUFREQ_SHARED_TYPE_ANY)
-                        break;
-
-                cpumask_set_cpu(j, covered_cpus);
-        }
-
-        for_each_cpu(k, policy->cpus) {
-                if (!cpu_online(k))
-                        continue;
-                freqs.cpu = k;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
-
-        if (unlikely(retval)) {
-                /*
-                 * We have failed halfway through the frequency change.
-                 * We have sent callbacks to policy->cpus and
-                 * MSRs have already been written on coverd_cpus.
-                 * Best effort undo..
-                 */
-
-                for_each_cpu(j, covered_cpus)
-                        wrmsr_on_cpu(j, MSR_IA32_PERF_CTL, oldmsr, h);
-
-                tmp = freqs.new;
-                freqs.new = freqs.old;
-                freqs.old = tmp;
-                for_each_cpu(j, policy->cpus) {
-                        if (!cpu_online(j))
-                                continue;
-                        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-                        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-                }
-        }
-        retval = 0;
-
-out:
-        free_cpumask_var(covered_cpus);
-        return retval;
-}
-
-static struct freq_attr* centrino_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver centrino_driver = {
-        .name           = "centrino", /* should be speedstep-centrino,
-                                         but there's a 16 char limit */
-        .init           = centrino_cpu_init,
-        .exit           = centrino_cpu_exit,
-        .verify         = centrino_verify,
-        .target         = centrino_target,
-        .get            = get_cur_freq,
-        .attr           = centrino_attr,
-        .owner          = THIS_MODULE,
-};
-
-
-/**
- * centrino_init - initializes the Enhanced SpeedStep CPUFreq driver
- *
- * Initializes the Enhanced SpeedStep support. Returns -ENODEV on
- * unsupported devices, -ENOENT if there's no voltage table for this
- * particular CPU model, -EINVAL on problems during initiatization,
- * and zero on success.
- *
- * This is quite picky.  Not only does the CPU have to advertise the
- * "est" flag in the cpuid capability flags, we look for a specific
- * CPU model and stepping, and we need to have the exact model name in
- * our voltage tables.  That is, be paranoid about not releasing
- * someone's valuable magic smoke.
- */
-static int __init centrino_init(void)
-{
-        struct cpuinfo_x86 *cpu = &cpu_data(0);
-
-        if (!cpu_has(cpu, X86_FEATURE_EST))
-                return -ENODEV;
-
-        return cpufreq_register_driver(&centrino_driver);
-}
-
-static void __exit centrino_exit(void)
-{
-        cpufreq_unregister_driver(&centrino_driver);
-}
-
-MODULE_AUTHOR ("Jeremy Fitzhardinge <jeremy@goop.org>");
-MODULE_DESCRIPTION ("Enhanced SpeedStep driver for Intel Pentium M processors.");
-MODULE_LICENSE ("GPL");
-
-late_initcall(centrino_init);
-module_exit(centrino_exit);
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
deleted file mode 100644
index 561758e95180..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * (C) 2001  Dave Jones, Arjan van de ven.
- * (C) 2002 - 2003  Dominik Brodowski <linux@brodo.de>
- *
- *  Licensed under the terms of the GNU GPL License version 2.
- *  Based upon reverse engineered information, and on Intel documentation
- *  for chipsets ICH2-M and ICH3-M.
- *
- *  Many thanks to Ducrot Bruno for finding and fixing the last
- *  "missing link" for ICH2-M/ICH3-M support, and to Thomas Winkler
- *  for extensive testing.
- *
- *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
- */
-
-
-/*********************************************************************
- *                        SPEEDSTEP - DEFINITIONS                    *
- *********************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/pci.h>
-#include <linux/sched.h>
-
-#include "speedstep-lib.h"
-
-
-/* speedstep_chipset:
- *   It is necessary to know which chipset is used. As accesses to
- * this device occur at various places in this module, we need a
- * static struct pci_dev * pointing to that device.
- */
-static struct pci_dev *speedstep_chipset_dev;
-
-
-/* speedstep_processor
- */
-static enum speedstep_processor speedstep_processor;
-
-static u32 pmbase;
-
-/*
- *   There are only two frequency states for each processor. Values
- * are in kHz for the time being.
- */
-static struct cpufreq_frequency_table speedstep_freqs[] = {
-        {SPEEDSTEP_HIGH,        0},
-        {SPEEDSTEP_LOW,         0},
-        {0,                     CPUFREQ_TABLE_END},
-};
-
-
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \
-                "speedstep-ich", msg)
-
-
-/**
- * speedstep_find_register - read the PMBASE address
- *
- * Returns: -ENODEV if no register could be found
- */
-static int speedstep_find_register(void)
-{
-        if (!speedstep_chipset_dev)
-                return -ENODEV;
-
-        /* get PMBASE */
-        pci_read_config_dword(speedstep_chipset_dev, 0x40, &pmbase);
-        if (!(pmbase & 0x01)) {
-                printk(KERN_ERR "speedstep-ich: could not find speedstep register\n");
-                return -ENODEV;
-        }
-
-        pmbase &= 0xFFFFFFFE;
-        if (!pmbase) {
-                printk(KERN_ERR "speedstep-ich: could not find speedstep register\n");
-                return -ENODEV;
-        }
-
-        dprintk("pmbase is 0x%x\n", pmbase);
-        return 0;
-}
-
-/**
- * speedstep_set_state - set the SpeedStep state
- * @state: new processor frequency state (SPEEDSTEP_LOW or SPEEDSTEP_HIGH)
- *
- *   Tries to change the SpeedStep state.  Can be called from
- *   smp_call_function_single.
- */
-static void speedstep_set_state(unsigned int state)
-{
-        u8 pm2_blk;
-        u8 value;
-        unsigned long flags;
-
-        if (state > 0x1)
-                return;
-
-        /* Disable IRQs */
-        local_irq_save(flags);
-
-        /* read state */
-        value = inb(pmbase + 0x50);
-
-        dprintk("read at pmbase 0x%x + 0x50 returned 0x%x\n", pmbase, value);
-
-        /* write new state */
-        value &= 0xFE;
-        value |= state;
-
-        dprintk("writing 0x%x to pmbase 0x%x + 0x50\n", value, pmbase);
-
-        /* Disable bus master arbitration */
-        pm2_blk = inb(pmbase + 0x20);
-        pm2_blk |= 0x01;
-        outb(pm2_blk, (pmbase + 0x20));
-
-        /* Actual transition */
-        outb(value, (pmbase + 0x50));
-
-        /* Restore bus master arbitration */
-        pm2_blk &= 0xfe;
-        outb(pm2_blk, (pmbase + 0x20));
-
-        /* check if transition was successful */
-        value = inb(pmbase + 0x50);
-
-        /* Enable IRQs */
-        local_irq_restore(flags);
-
-        dprintk("read at pmbase 0x%x + 0x50 returned 0x%x\n", pmbase, value);
-
-        if (state == (value & 0x1))
-                dprintk("change to %u MHz succeeded\n",
-                        speedstep_get_frequency(speedstep_processor) / 1000);
-        else
-                printk(KERN_ERR "cpufreq: change failed - I/O error\n");
-
-        return;
-}
-
-/* Wrapper for smp_call_function_single. */
-static void _speedstep_set_state(void *_state)
-{
-        speedstep_set_state(*(unsigned int *)_state);
-}
-
-/**
- * speedstep_activate - activate SpeedStep control in the chipset
- *
- *   Tries to activate the SpeedStep status and control registers.
- * Returns -EINVAL on an unsupported chipset, and zero on success.
- */
-static int speedstep_activate(void)
-{
-        u16 value = 0;
-
-        if (!speedstep_chipset_dev)
-                return -EINVAL;
-
-        pci_read_config_word(speedstep_chipset_dev, 0x00A0, &value);
-        if (!(value & 0x08)) {
-                value |= 0x08;
-                dprintk("activating SpeedStep (TM) registers\n");
-                pci_write_config_word(speedstep_chipset_dev, 0x00A0, value);
-        }
-
-        return 0;
-}
-
-
-/**
- * speedstep_detect_chipset - detect the Southbridge which contains SpeedStep logic
- *
- *   Detects ICH2-M, ICH3-M and ICH4-M so far. The pci_dev points to
- * the LPC bridge / PM module which contains all power-management
- * functions. Returns the SPEEDSTEP_CHIPSET_-number for the detected
- * chipset, or zero on failure.
- */
-static unsigned int speedstep_detect_chipset(void)
-{
-        speedstep_chipset_dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
-                              PCI_DEVICE_ID_INTEL_82801DB_12,
-                              PCI_ANY_ID, PCI_ANY_ID,
-                              NULL);
-        if (speedstep_chipset_dev)
-                return 4; /* 4-M */
-
-        speedstep_chipset_dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
-                              PCI_DEVICE_ID_INTEL_82801CA_12,
-                              PCI_ANY_ID, PCI_ANY_ID,
-                              NULL);
-        if (speedstep_chipset_dev)
-                return 3; /* 3-M */
-
-
-        speedstep_chipset_dev = pci_get_subsys(PCI_VENDOR_ID_INTEL,
-                              PCI_DEVICE_ID_INTEL_82801BA_10,
-                              PCI_ANY_ID, PCI_ANY_ID,
-                              NULL);
-        if (speedstep_chipset_dev) {
-                /* speedstep.c causes lockups on Dell Inspirons 8000 and
-                 * 8100 which use a pretty old revision of the 82815
-                 * host brige. Abort on these systems.
-                 */
-                static struct pci_dev *hostbridge;
-
-                hostbridge  = pci_get_subsys(PCI_VENDOR_ID_INTEL,
-                              PCI_DEVICE_ID_INTEL_82815_MC,
-                              PCI_ANY_ID, PCI_ANY_ID,
-                              NULL);
-
-                if (!hostbridge)
-                        return 2; /* 2-M */
-
-                if (hostbridge->revision < 5) {
-                        dprintk("hostbridge does not support speedstep\n");
-                        speedstep_chipset_dev = NULL;
-                        pci_dev_put(hostbridge);
-                        return 0;
-                }
-
-                pci_dev_put(hostbridge);
-                return 2; /* 2-M */
-        }
-
-        return 0;
-}
-
-static void get_freq_data(void *_speed)
-{
-        unsigned int *speed = _speed;
-
-        *speed = speedstep_get_frequency(speedstep_processor);
-}
-
-static unsigned int speedstep_get(unsigned int cpu)
-{
-        unsigned int speed;
-
-        /* You're supposed to ensure CPU is online. */
-        if (smp_call_function_single(cpu, get_freq_data, &speed, 1) != 0)
-                BUG();
-
-        dprintk("detected %u kHz as current frequency\n", speed);
-        return speed;
-}
-
-/**
- * speedstep_target - set a new CPUFreq policy
- * @policy: new policy
- * @target_freq: the target frequency
- * @relation: how that frequency relates to achieved frequency
- *      (CPUFREQ_RELATION_L or CPUFREQ_RELATION_H)
- *
- * Sets a new CPUFreq policy.
- */
-static int speedstep_target(struct cpufreq_policy *policy,
-                             unsigned int target_freq,
-                             unsigned int relation)
-{
-        unsigned int newstate = 0, policy_cpu;
-        struct cpufreq_freqs freqs;
-        int i;
-
-        if (cpufreq_frequency_table_target(policy, &speedstep_freqs[0],
-                                target_freq, relation, &newstate))
-                return -EINVAL;
-
-        policy_cpu = cpumask_any_and(policy->cpus, cpu_online_mask);
-        freqs.old = speedstep_get(policy_cpu);
-        freqs.new = speedstep_freqs[newstate].frequency;
-        freqs.cpu = policy->cpu;
-
-        dprintk("transiting from %u to %u kHz\n", freqs.old, freqs.new);
-
-        /* no transition necessary */
-        if (freqs.old == freqs.new)
-                return 0;
-
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        }
-
-        smp_call_function_single(policy_cpu, _speedstep_set_state, &newstate,
-                                 true);
-
-        for_each_cpu(i, policy->cpus) {
-                freqs.cpu = i;
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
-
-        return 0;
-}
-
-
-/**
- * speedstep_verify - verifies a new CPUFreq policy
- * @policy: new policy
- *
- * Limit must be within speedstep_low_freq and speedstep_high_freq, with
- * at least one border included.
- */
-static int speedstep_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, &speedstep_freqs[0]);
-}
-
-struct get_freqs {
-        struct cpufreq_policy *policy;
-        int ret;
-};
-
-static void get_freqs_on_cpu(void *_get_freqs)
-{
-        struct get_freqs *get_freqs = _get_freqs;
-
-        get_freqs->ret =
-                speedstep_get_freqs(speedstep_processor,
-                            &speedstep_freqs[SPEEDSTEP_LOW].frequency,
-                            &speedstep_freqs[SPEEDSTEP_HIGH].frequency,
-                            &get_freqs->policy->cpuinfo.transition_latency,
-                            &speedstep_set_state);
-}
-
-static int speedstep_cpu_init(struct cpufreq_policy *policy)
-{
-        int result;
-        unsigned int policy_cpu, speed;
-        struct get_freqs gf;
-
-        /* only run on CPU to be set, or on its sibling */
-#ifdef CONFIG_SMP
-        cpumask_copy(policy->cpus, cpu_sibling_mask(policy->cpu));
-#endif
-        policy_cpu = cpumask_any_and(policy->cpus, cpu_online_mask);
-
-        /* detect low and high frequency and transition latency */
-        gf.policy = policy;
-        smp_call_function_single(policy_cpu, get_freqs_on_cpu, &gf, 1);
-        if (gf.ret)
-                return gf.ret;
-
-        /* get current speed setting */
-        speed = speedstep_get(policy_cpu);
-        if (!speed)
-                return -EIO;
-
-        dprintk("currently at %s speed setting - %i MHz\n",
-                (speed == speedstep_freqs[SPEEDSTEP_LOW].frequency)
-                ? "low" : "high",
-                (speed / 1000));
-
-        /* cpuinfo and default policy values */
-        policy->cur = speed;
-
-        result = cpufreq_frequency_table_cpuinfo(policy, speedstep_freqs);
-        if (result)
-                return result;
-
-        cpufreq_frequency_table_get_attr(speedstep_freqs, policy->cpu);
-
-        return 0;
-}
-
-
-static int speedstep_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        return 0;
-}
-
-static struct freq_attr *speedstep_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-
-static struct cpufreq_driver speedstep_driver = {
-        .name   = "speedstep-ich",
-        .verify = speedstep_verify,
-        .target = speedstep_target,
-        .init   = speedstep_cpu_init,
-        .exit   = speedstep_cpu_exit,
-        .get    = speedstep_get,
-        .owner  = THIS_MODULE,
-        .attr   = speedstep_attr,
-};
-
-
-/**
- * speedstep_init - initializes the SpeedStep CPUFreq driver
- *
- *   Initializes the SpeedStep support. Returns -ENODEV on unsupported
- * devices, -EINVAL on problems during initiatization, and zero on
- * success.
- */
-static int __init speedstep_init(void)
-{
-        /* detect processor */
-        speedstep_processor = speedstep_detect_processor();
-        if (!speedstep_processor) {
-                dprintk("Intel(R) SpeedStep(TM) capable processor "
-                                "not found\n");
-                return -ENODEV;
-        }
-
-        /* detect chipset */
-        if (!speedstep_detect_chipset()) {
-                dprintk("Intel(R) SpeedStep(TM) for this chipset not "
-                                "(yet) available.\n");
-                return -ENODEV;
-        }
-
-        /* activate speedstep support */
-        if (speedstep_activate()) {
-                pci_dev_put(speedstep_chipset_dev);
-                return -EINVAL;
-        }
-
-        if (speedstep_find_register())
-                return -ENODEV;
-
-        return cpufreq_register_driver(&speedstep_driver);
-}
-
-
-/**
- * speedstep_exit - unregisters SpeedStep support
- *
- *   Unregisters SpeedStep support.
- */
-static void __exit speedstep_exit(void)
-{
-        pci_dev_put(speedstep_chipset_dev);
-        cpufreq_unregister_driver(&speedstep_driver);
-}
-
-
-MODULE_AUTHOR("Dave Jones <davej@redhat.com>, "
-                "Dominik Brodowski <linux@brodo.de>");
-MODULE_DESCRIPTION("Speedstep driver for Intel mobile processors on chipsets "
-                "with ICH-M southbridges.");
-MODULE_LICENSE("GPL");
-
-module_init(speedstep_init);
-module_exit(speedstep_exit);
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
deleted file mode 100644
index a94ec6be69fa..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * (C) 2002 - 2003 Dominik Brodowski <linux@brodo.de>
- *
- *  Licensed under the terms of the GNU GPL License version 2.
- *
- *  Library for common functions for Intel SpeedStep v.1 and v.2 support
- *
- *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-
-#include <asm/msr.h>
-#include <asm/tsc.h>
-#include "speedstep-lib.h"
-
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \
-                "speedstep-lib", msg)
-
-#define PFX "speedstep-lib: "
-
-#ifdef CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
-static int relaxed_check;
-#else
-#define relaxed_check 0
-#endif
-
-/*********************************************************************
- *                   GET PROCESSOR CORE SPEED IN KHZ                 *
- *********************************************************************/
-
-static unsigned int pentium3_get_frequency(enum speedstep_processor processor)
-{
-        /* See table 14 of p3_ds.pdf and table 22 of 29834003.pdf */
-        struct {
-                unsigned int ratio;     /* Frequency Multiplier (x10) */
-                u8 bitmap;              /* power on configuration bits
-                                        [27, 25:22] (in MSR 0x2a) */
-        } msr_decode_mult[] = {
-                { 30, 0x01 },
-                { 35, 0x05 },
-                { 40, 0x02 },
-                { 45, 0x06 },
-                { 50, 0x00 },
-                { 55, 0x04 },
-                { 60, 0x0b },
-                { 65, 0x0f },
-                { 70, 0x09 },
-                { 75, 0x0d },
-                { 80, 0x0a },
-                { 85, 0x26 },
-                { 90, 0x20 },
-                { 100, 0x2b },
-                { 0, 0xff }     /* error or unknown value */
-        };
-
-        /* PIII(-M) FSB settings: see table b1-b of 24547206.pdf */
-        struct {
-                unsigned int value;     /* Front Side Bus speed in MHz */
-                u8 bitmap;              /* power on configuration bits [18: 19]
-                                        (in MSR 0x2a) */
-        } msr_decode_fsb[] = {
-                {  66, 0x0 },
-                { 100, 0x2 },
-                { 133, 0x1 },
-                {   0, 0xff}
-        };
-
-        u32 msr_lo, msr_tmp;
-        int i = 0, j = 0;
-
-        /* read MSR 0x2a - we only need the low 32 bits */
-        rdmsr(MSR_IA32_EBL_CR_POWERON, msr_lo, msr_tmp);
-        dprintk("P3 - MSR_IA32_EBL_CR_POWERON: 0x%x 0x%x\n", msr_lo, msr_tmp);
-        msr_tmp = msr_lo;
-
-        /* decode the FSB */
-        msr_tmp &= 0x00c0000;
-        msr_tmp >>= 18;
-        while (msr_tmp != msr_decode_fsb[i].bitmap) {
-                if (msr_decode_fsb[i].bitmap == 0xff)
-                        return 0;
-                i++;
-        }
-
-        /* decode the multiplier */
-        if (processor == SPEEDSTEP_CPU_PIII_C_EARLY) {
-                dprintk("workaround for early PIIIs\n");
-                msr_lo &= 0x03c00000;
-        } else
-                msr_lo &= 0x0bc00000;
-        msr_lo >>= 22;
-        while (msr_lo != msr_decode_mult[j].bitmap) {
-                if (msr_decode_mult[j].bitmap == 0xff)
-                        return 0;
-                j++;
-        }
-
-        dprintk("speed is %u\n",
-                (msr_decode_mult[j].ratio * msr_decode_fsb[i].value * 100));
-
-        return msr_decode_mult[j].ratio * msr_decode_fsb[i].value * 100;
-}
-
-
-static unsigned int pentiumM_get_frequency(void)
-{
-        u32 msr_lo, msr_tmp;
-
-        rdmsr(MSR_IA32_EBL_CR_POWERON, msr_lo, msr_tmp);
-        dprintk("PM - MSR_IA32_EBL_CR_POWERON: 0x%x 0x%x\n", msr_lo, msr_tmp);
-
-        /* see table B-2 of 24547212.pdf */
-        if (msr_lo & 0x00040000) {
-                printk(KERN_DEBUG PFX "PM - invalid FSB: 0x%x 0x%x\n",
-                                msr_lo, msr_tmp);
-                return 0;
-        }
-
-        msr_tmp = (msr_lo >> 22) & 0x1f;
-        dprintk("bits 22-26 are 0x%x, speed is %u\n",
-                        msr_tmp, (msr_tmp * 100 * 1000));
-
-        return msr_tmp * 100 * 1000;
-}
-
-static unsigned int pentium_core_get_frequency(void)
-{
-        u32 fsb = 0;
-        u32 msr_lo, msr_tmp;
-        int ret;
-
-        rdmsr(MSR_FSB_FREQ, msr_lo, msr_tmp);
-        /* see table B-2 of 25366920.pdf */
-        switch (msr_lo & 0x07) {
-        case 5:
-                fsb = 100000;
-                break;
-        case 1:
-                fsb = 133333;
-                break;
-        case 3:
-                fsb = 166667;
-                break;
-        case 2:
-                fsb = 200000;
-                break;
-        case 0:
-                fsb = 266667;
-                break;
-        case 4:
-                fsb = 333333;
-                break;
-        default:
-                printk(KERN_ERR "PCORE - MSR_FSB_FREQ undefined value");
-        }
-
-        rdmsr(MSR_IA32_EBL_CR_POWERON, msr_lo, msr_tmp);
-        dprintk("PCORE - MSR_IA32_EBL_CR_POWERON: 0x%x 0x%x\n",
-                        msr_lo, msr_tmp);
-
-        msr_tmp = (msr_lo >> 22) & 0x1f;
-        dprintk("bits 22-26 are 0x%x, speed is %u\n",
-                        msr_tmp, (msr_tmp * fsb));
-
-        ret = (msr_tmp * fsb);
-        return ret;
-}
-
-
-static unsigned int pentium4_get_frequency(void)
-{
-        struct cpuinfo_x86 *c = &boot_cpu_data;
-        u32 msr_lo, msr_hi, mult;
-        unsigned int fsb = 0;
-        unsigned int ret;
-        u8 fsb_code;
-
-        /* Pentium 4 Model 0 and 1 do not have the Core Clock Frequency
-         * to System Bus Frequency Ratio Field in the Processor Frequency
-         * Configuration Register of the MSR. Therefore the current
-         * frequency cannot be calculated and has to be measured.
-         */
-        if (c->x86_model < 2)
-                return cpu_khz;
-
-        rdmsr(0x2c, msr_lo, msr_hi);
-
-        dprintk("P4 - MSR_EBC_FREQUENCY_ID: 0x%x 0x%x\n", msr_lo, msr_hi);
-
-        /* decode the FSB: see IA-32 Intel (C) Architecture Software
-         * Developer's Manual, Volume 3: System Prgramming Guide,
-         * revision #12 in Table B-1: MSRs in the Pentium 4 and
-         * Intel Xeon Processors, on page B-4 and B-5.
-         */
-        fsb_code = (msr_lo >> 16) & 0x7;
-        switch (fsb_code) {
-        case 0:
-                fsb = 100 * 1000;
-                break;
-        case 1:
-                fsb = 13333 * 10;
-                break;
-        case 2:
-                fsb = 200 * 1000;
-                break;
-        }
-
-        if (!fsb)
-                printk(KERN_DEBUG PFX "couldn't detect FSB speed. "
-                                "Please send an e-mail to <linux@brodo.de>\n");
-
-        /* Multiplier. */
-        mult = msr_lo >> 24;
-
-        dprintk("P4 - FSB %u kHz; Multiplier %u; Speed %u kHz\n",
-                        fsb, mult, (fsb * mult));
-
-        ret = (fsb * mult);
-        return ret;
-}
-
-
-/* Warning: may get called from smp_call_function_single. */
-unsigned int speedstep_get_frequency(enum speedstep_processor processor)
-{
-        switch (processor) {
-        case SPEEDSTEP_CPU_PCORE:
-                return pentium_core_get_frequency();
-        case SPEEDSTEP_CPU_PM:
-                return pentiumM_get_frequency();
-        case SPEEDSTEP_CPU_P4D:
-        case SPEEDSTEP_CPU_P4M:
-                return pentium4_get_frequency();
-        case SPEEDSTEP_CPU_PIII_T:
-        case SPEEDSTEP_CPU_PIII_C:
-        case SPEEDSTEP_CPU_PIII_C_EARLY:
-                return pentium3_get_frequency(processor);
-        default:
-                return 0;
-        };
-        return 0;
-}
-EXPORT_SYMBOL_GPL(speedstep_get_frequency);
-
-
-/*********************************************************************
- *                 DETECT SPEEDSTEP-CAPABLE PROCESSOR                *
- *********************************************************************/
-
-unsigned int speedstep_detect_processor(void)
-{
-        struct cpuinfo_x86 *c = &cpu_data(0);
-        u32 ebx, msr_lo, msr_hi;
-
-        dprintk("x86: %x, model: %x\n", c->x86, c->x86_model);
-
-        if ((c->x86_vendor != X86_VENDOR_INTEL) ||
-            ((c->x86 != 6) && (c->x86 != 0xF)))
-                return 0;
-
-        if (c->x86 == 0xF) {
-                /* Intel Mobile Pentium 4-M
-                 * or Intel Mobile Pentium 4 with 533 MHz FSB */
-                if (c->x86_model != 2)
-                        return 0;
-
-                ebx = cpuid_ebx(0x00000001);
-                ebx &= 0x000000FF;
-
-                dprintk("ebx value is %x, x86_mask is %x\n", ebx, c->x86_mask);
-
-                switch (c->x86_mask) {
-                case 4:
-                        /*
-                         * B-stepping [M-P4-M]
-                         * sample has ebx = 0x0f, production has 0x0e.
-                         */
-                        if ((ebx == 0x0e) || (ebx == 0x0f))
-                                return SPEEDSTEP_CPU_P4M;
-                        break;
-                case 7:
-                        /*
-                         * C-stepping [M-P4-M]
-                         * needs to have ebx=0x0e, else it's a celeron:
-                         * cf. 25130917.pdf / page 7, footnote 5 even
-                         * though 25072120.pdf / page 7 doesn't say
-                         * samples are only of B-stepping...
-                         */
-                        if (ebx == 0x0e)
-                                return SPEEDSTEP_CPU_P4M;
-                        break;
-                case 9:
-                        /*
-                         * D-stepping [M-P4-M or M-P4/533]
-                         *
-                         * this is totally strange: CPUID 0x0F29 is
-                         * used by M-P4-M, M-P4/533 and(!) Celeron CPUs.
-                         * The latter need to be sorted out as they don't
-                         * support speedstep.
-                         * Celerons with CPUID 0x0F29 may have either
-                         * ebx=0x8 or 0xf -- 25130917.pdf doesn't say anything
-                         * specific.
-                         * M-P4-Ms may have either ebx=0xe or 0xf [see above]
-                         * M-P4/533 have either ebx=0xe or 0xf. [25317607.pdf]
-                         * also, M-P4M HTs have ebx=0x8, too
-                         * For now, they are distinguished by the model_id
-                         * string
-                         */
-                        if ((ebx == 0x0e) ||
-                                (strstr(c->x86_model_id,
-                                    "Mobile Intel(R) Pentium(R) 4") != NULL))
-                                return SPEEDSTEP_CPU_P4M;
-                        break;
-                default:
-                        break;
-                }
-                return 0;
-        }
-
-        switch (c->x86_model) {
-        case 0x0B: /* Intel PIII [Tualatin] */
-                /* cpuid_ebx(1) is 0x04 for desktop PIII,
-                 * 0x06 for mobile PIII-M */
-                ebx = cpuid_ebx(0x00000001);
-                dprintk("ebx is %x\n", ebx);
-
-                ebx &= 0x000000FF;
-
-                if (ebx != 0x06)
-                        return 0;
-
-                /* So far all PIII-M processors support SpeedStep. See
-                 * Intel's 24540640.pdf of June 2003
-                 */
-                return SPEEDSTEP_CPU_PIII_T;
-
-        case 0x08: /* Intel PIII [Coppermine] */
-
-                /* all mobile PIII Coppermines have FSB 100 MHz
-                 * ==> sort out a few desktop PIIIs. */
-                rdmsr(MSR_IA32_EBL_CR_POWERON, msr_lo, msr_hi);
-                dprintk("Coppermine: MSR_IA32_EBL_CR_POWERON is 0x%x, 0x%x\n",
-                                msr_lo, msr_hi);
-                msr_lo &= 0x00c0000;
-                if (msr_lo != 0x0080000)
-                        return 0;
-
-                /*
-                 * If the processor is a mobile version,
-                 * platform ID has bit 50 set
-                 * it has SpeedStep technology if either
-                 * bit 56 or 57 is set
-                 */
-                rdmsr(MSR_IA32_PLATFORM_ID, msr_lo, msr_hi);
-                dprintk("Coppermine: MSR_IA32_PLATFORM ID is 0x%x, 0x%x\n",
-                                msr_lo, msr_hi);
-                if ((msr_hi & (1<<18)) &&
-                    (relaxed_check ? 1 : (msr_hi & (3<<24)))) {
-                        if (c->x86_mask == 0x01) {
-                                dprintk("early PIII version\n");
-                                return SPEEDSTEP_CPU_PIII_C_EARLY;
-                        } else
-                                return SPEEDSTEP_CPU_PIII_C;
-                }
-
-        default:
-                return 0;
-        }
-}
-EXPORT_SYMBOL_GPL(speedstep_detect_processor);
-
-
-/*********************************************************************
- *                     DETECT SPEEDSTEP SPEEDS                       *
- *********************************************************************/
-
-unsigned int speedstep_get_freqs(enum speedstep_processor processor,
-                                  unsigned int *low_speed,
-                                  unsigned int *high_speed,
-                                  unsigned int *transition_latency,
-                                  void (*set_state) (unsigned int state))
-{
-        unsigned int prev_speed;
-        unsigned int ret = 0;
-        unsigned long flags;
-        struct timeval tv1, tv2;
-
-        if ((!processor) || (!low_speed) || (!high_speed) || (!set_state))
-                return -EINVAL;
-
-        dprintk("trying to determine both speeds\n");
-
-        /* get current speed */
-        prev_speed = speedstep_get_frequency(processor);
-        if (!prev_speed)
-                return -EIO;
-
-        dprintk("previous speed is %u\n", prev_speed);
-
-        local_irq_save(flags);
-
-        /* switch to low state */
-        set_state(SPEEDSTEP_LOW);
-        *low_speed = speedstep_get_frequency(processor);
-        if (!*low_speed) {
-                ret = -EIO;
-                goto out;
-        }
-
-        dprintk("low speed is %u\n", *low_speed);
-
-        /* start latency measurement */
-        if (transition_latency)
-                do_gettimeofday(&tv1);
-
-        /* switch to high state */
-        set_state(SPEEDSTEP_HIGH);
-
-        /* end latency measurement */
-        if (transition_latency)
-                do_gettimeofday(&tv2);
-
-        *high_speed = speedstep_get_frequency(processor);
-        if (!*high_speed) {
-                ret = -EIO;
-                goto out;
-        }
-
-        dprintk("high speed is %u\n", *high_speed);
-
-        if (*low_speed == *high_speed) {
-                ret = -ENODEV;
-                goto out;
-        }
-
-        /* switch to previous state, if necessary */
-        if (*high_speed != prev_speed)
-                set_state(SPEEDSTEP_LOW);
-
-        if (transition_latency) {
-                *transition_latency = (tv2.tv_sec - tv1.tv_sec) * USEC_PER_SEC +
-                        tv2.tv_usec - tv1.tv_usec;
-                dprintk("transition latency is %u uSec\n", *transition_latency);
-
-                /* convert uSec to nSec and add 20% for safety reasons */
-                *transition_latency *= 1200;
-
-                /* check if the latency measurement is too high or too low
-                 * and set it to a safe value (500uSec) in that case
-                 */
-                if (*transition_latency > 10000000 ||
-                    *transition_latency < 50000) {
-                        printk(KERN_WARNING PFX "frequency transition "
-                                        "measured seems out of range (%u "
-                                        "nSec), falling back to a safe one of"
-                                        "%u nSec.\n",
-                                        *transition_latency, 500000);
-                        *transition_latency = 500000;
-                }
-        }
-
-out:
-        local_irq_restore(flags);
-        return ret;
-}
-EXPORT_SYMBOL_GPL(speedstep_get_freqs);
-
-#ifdef CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK
-module_param(relaxed_check, int, 0444);
-MODULE_PARM_DESC(relaxed_check,
-                "Don't do all checks for speedstep capability.");
-#endif
-
-MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>");
-MODULE_DESCRIPTION("Library for Intel SpeedStep 1 or 2 cpufreq drivers.");
-MODULE_LICENSE("GPL");
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-lib.h b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.h
deleted file mode 100644
index 70d9cea1219d..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-lib.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * (C) 2002 - 2003 Dominik Brodowski <linux@brodo.de>
- *
- *  Licensed under the terms of the GNU GPL License version 2.
- *
- *  Library for common functions for Intel SpeedStep v.1 and v.2 support
- *
- *  BIG FAT DISCLAIMER: Work in progress code. Possibly *dangerous*
- */
-
-
-
-/* processors */
-enum speedstep_processor {
-        SPEEDSTEP_CPU_PIII_C_EARLY = 0x00000001,  /* Coppermine core */
-        SPEEDSTEP_CPU_PIII_C       = 0x00000002,  /* Coppermine core */
-        SPEEDSTEP_CPU_PIII_T       = 0x00000003,  /* Tualatin core */
-        SPEEDSTEP_CPU_P4M          = 0x00000004,  /* P4-M  */
-/* the following processors are not speedstep-capable and are not auto-detected
- * in speedstep_detect_processor(). However, their speed can be detected using
- * the speedstep_get_frequency() call. */
-        SPEEDSTEP_CPU_PM           = 0xFFFFFF03,  /* Pentium M  */
-        SPEEDSTEP_CPU_P4D          = 0xFFFFFF04,  /* desktop P4  */
-        SPEEDSTEP_CPU_PCORE        = 0xFFFFFF05,  /* Core */
-};
-
-/* speedstep states -- only two of them */
-
-#define SPEEDSTEP_HIGH  0x00000000
-#define SPEEDSTEP_LOW   0x00000001
-
-
-/* detect a speedstep-capable processor */
-extern enum speedstep_processor speedstep_detect_processor(void);
-
-/* detect the current speed (in khz) of the processor */
-extern unsigned int speedstep_get_frequency(enum speedstep_processor processor);
-
-
-/* detect the low and high speeds of the processor. The callback
- * set_state"'s first argument is either SPEEDSTEP_HIGH or
- * SPEEDSTEP_LOW; the second argument is zero so that no
- * cpufreq_notify_transition calls are initiated.
- */
-extern unsigned int speedstep_get_freqs(enum speedstep_processor processor,
-        unsigned int *low_speed,
-        unsigned int *high_speed,
-        unsigned int *transition_latency,
-        void (*set_state) (unsigned int state));
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c b/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c
deleted file mode 100644
index 91bc25b67bc1..000000000000
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-smi.c
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- * Intel SpeedStep SMI driver.
- *
- * (C) 2003  Hiroshi Miura <miura@da-cha.org>
- *
- *  Licensed under the terms of the GNU GPL License version 2.
- *
- */
-
-
-/*********************************************************************
- *                        SPEEDSTEP - DEFINITIONS                    *
- *********************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <asm/ist.h>
-
-#include "speedstep-lib.h"
-
-/* speedstep system management interface port/command.
- *
- * These parameters are got from IST-SMI BIOS call.
- * If user gives it, these are used.
- *
- */
-static int smi_port;
-static int smi_cmd;
-static unsigned int smi_sig;
-
-/* info about the processor */
-static enum speedstep_processor speedstep_processor;
-
-/*
- * There are only two frequency states for each processor. Values
- * are in kHz for the time being.
- */
-static struct cpufreq_frequency_table speedstep_freqs[] = {
-        {SPEEDSTEP_HIGH,        0},
-        {SPEEDSTEP_LOW,         0},
-        {0,                     CPUFREQ_TABLE_END},
-};
-
-#define GET_SPEEDSTEP_OWNER 0
-#define GET_SPEEDSTEP_STATE 1
-#define SET_SPEEDSTEP_STATE 2
-#define GET_SPEEDSTEP_FREQS 4
-
-/* how often shall the SMI call be tried if it failed, e.g. because
- * of DMA activity going on? */
-#define SMI_TRIES 5
-
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, \
-                "speedstep-smi", msg)
-
-/**
- * speedstep_smi_ownership
- */
-static int speedstep_smi_ownership(void)
-{
-        u32 command, result, magic, dummy;
-        u32 function = GET_SPEEDSTEP_OWNER;
-        unsigned char magic_data[] = "Copyright (c) 1999 Intel Corporation";
-
-        command = (smi_sig & 0xffffff00) | (smi_cmd & 0xff);
-        magic = virt_to_phys(magic_data);
-
-        dprintk("trying to obtain ownership with command %x at port %x\n",
-                        command, smi_port);
-
-        __asm__ __volatile__(
-                "push %%ebp\n"
-                "out %%al, (%%dx)\n"
-                "pop %%ebp\n"
-                : "=D" (result),
-                  "=a" (dummy), "=b" (dummy), "=c" (dummy), "=d" (dummy),
-                  "=S" (dummy)
-                : "a" (command), "b" (function), "c" (0), "d" (smi_port),
-                  "D" (0), "S" (magic)
-                : "memory"
-        );
-
-        dprintk("result is %x\n", result);
-
-        return result;
-}
-
-/**
- * speedstep_smi_get_freqs - get SpeedStep preferred & current freq.
- * @low: the low frequency value is placed here
- * @high: the high frequency value is placed here
- *
- * Only available on later SpeedStep-enabled systems, returns false results or
- * even hangs [cf. bugme.osdl.org # 1422] on earlier systems. Empirical testing
- * shows that the latter occurs if !(ist_info.event & 0xFFFF).
- */
-static int speedstep_smi_get_freqs(unsigned int *low, unsigned int *high)
-{
-        u32 command, result = 0, edi, high_mhz, low_mhz, dummy;
-        u32 state = 0;
-        u32 function = GET_SPEEDSTEP_FREQS;
-
-        if (!(ist_info.event & 0xFFFF)) {
-                dprintk("bug #1422 -- can't read freqs from BIOS\n");
-                return -ENODEV;
-        }
-
-        command = (smi_sig & 0xffffff00) | (smi_cmd & 0xff);
-
-        dprintk("trying to determine frequencies with command %x at port %x\n",
-                        command, smi_port);
-
-        __asm__ __volatile__(
-                "push %%ebp\n"
-                "out %%al, (%%dx)\n"
-                "pop %%ebp"
-                : "=a" (result),
-                  "=b" (high_mhz),
-                  "=c" (low_mhz),
-                  "=d" (state), "=D" (edi), "=S" (dummy)
-                : "a" (command),
-                  "b" (function),
-                  "c" (state),
-                  "d" (smi_port), "S" (0), "D" (0)
-        );
-
-        dprintk("result %x, low_freq %u, high_freq %u\n",
-                        result, low_mhz, high_mhz);
-
-        /* abort if results are obviously incorrect... */
-        if ((high_mhz + low_mhz) < 600)
-                return -EINVAL;
-
-        *high = high_mhz * 1000;
-        *low  = low_mhz  * 1000;
-
-        return result;
-}
-
-/**
- * speedstep_get_state - set the SpeedStep state
- * @state: processor frequency state (SPEEDSTEP_LOW or SPEEDSTEP_HIGH)
- *
- */
-static int speedstep_get_state(void)
-{
-        u32 function = GET_SPEEDSTEP_STATE;
-        u32 result, state, edi, command, dummy;
-
-        command = (smi_sig & 0xffffff00) | (smi_cmd & 0xff);
-
-        dprintk("trying to determine current setting with command %x "
-                "at port %x\n", command, smi_port);
-
-        __asm__ __volatile__(
-                "push %%ebp\n"
-                "out %%al, (%%dx)\n"
-                "pop %%ebp\n"
-                : "=a" (result),
-                  "=b" (state), "=D" (edi),
-                  "=c" (dummy), "=d" (dummy), "=S" (dummy)
-                : "a" (command), "b" (function), "c" (0),
-                  "d" (smi_port), "S" (0), "D" (0)
-        );
-
-        dprintk("state is %x, result is %x\n", state, result);
-
-        return state & 1;
-}
-
-
-/**
- * speedstep_set_state - set the SpeedStep state
- * @state: new processor frequency state (SPEEDSTEP_LOW or SPEEDSTEP_HIGH)
- *
- */
-static void speedstep_set_state(unsigned int state)
-{
-        unsigned int result = 0, command, new_state, dummy;
-        unsigned long flags;
-        unsigned int function = SET_SPEEDSTEP_STATE;
-        unsigned int retry = 0;
-
-        if (state > 0x1)
-                return;
-
-        /* Disable IRQs */
-        local_irq_save(flags);
-
-        command = (smi_sig & 0xffffff00) | (smi_cmd & 0xff);
-
-        dprintk("trying to set frequency to state %u "
-                "with command %x at port %x\n",
-                state, command, smi_port);
-
-        do {
-                if (retry) {
-                        dprintk("retry %u, previous result %u, waiting...\n",
-                                        retry, result);
-                        mdelay(retry * 50);
-                }
-                retry++;
-                __asm__ __volatile__(
-                        "push %%ebp\n"
-                        "out %%al, (%%dx)\n"
-                        "pop %%ebp"
-                        : "=b" (new_state), "=D" (result),
-                          "=c" (dummy), "=a" (dummy),
-                          "=d" (dummy), "=S" (dummy)
-                        : "a" (command), "b" (function), "c" (state),
-                          "d" (smi_port), "S" (0), "D" (0)
-                        );
-        } while ((new_state != state) && (retry <= SMI_TRIES));
-
-        /* enable IRQs */
-        local_irq_restore(flags);
-
-        if (new_state == state)
-                dprintk("change to %u MHz succeeded after %u tries "
-                        "with result %u\n",
-                        (speedstep_freqs[new_state].frequency / 1000),
-                        retry, result);
-        else
-                printk(KERN_ERR "cpufreq: change to state %u "
-                        "failed with new_state %u and result %u\n",
-                        state, new_state, result);
-
-        return;
-}
-
-
-/**
- * speedstep_target - set a new CPUFreq policy
- * @policy: new policy
- * @target_freq: new freq
- * @relation:
- *
- * Sets a new CPUFreq policy/freq.
- */
-static int speedstep_target(struct cpufreq_policy *policy,
-                        unsigned int target_freq, unsigned int relation)
-{
-        unsigned int newstate = 0;
-        struct cpufreq_freqs freqs;
-
-        if (cpufreq_frequency_table_target(policy, &speedstep_freqs[0],
-                                target_freq, relation, &newstate))
-                return -EINVAL;
-
-        freqs.old = speedstep_freqs[speedstep_get_state()].frequency;
-        freqs.new = speedstep_freqs[newstate].frequency;
-        freqs.cpu = 0; /* speedstep.c is UP only driver */
-
-        if (freqs.old == freqs.new)
-                return 0;
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        speedstep_set_state(newstate);
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        return 0;
-}
-
-
-/**
- * speedstep_verify - verifies a new CPUFreq policy
- * @policy: new policy
- *
- * Limit must be within speedstep_low_freq and speedstep_high_freq, with
- * at least one border included.
- */
-static int speedstep_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, &speedstep_freqs[0]);
-}
-
-
-static int speedstep_cpu_init(struct cpufreq_policy *policy)
-{
-        int result;
-        unsigned int speed, state;
-        unsigned int *low, *high;
-
-        /* capability check */
-        if (policy->cpu != 0)
-                return -ENODEV;
-
-        result = speedstep_smi_ownership();
-        if (result) {
-                dprintk("fails in acquiring ownership of a SMI interface.\n");
-                return -EINVAL;
-        }
-
-        /* detect low and high frequency */
-        low = &speedstep_freqs[SPEEDSTEP_LOW].frequency;
-        high = &speedstep_freqs[SPEEDSTEP_HIGH].frequency;
-
-        result = speedstep_smi_get_freqs(low, high);
-        if (result) {
-                /* fall back to speedstep_lib.c dection mechanism:
-                 * try both states out */
-                dprintk("could not detect low and high frequencies "
-                                "by SMI call.\n");
-                result = speedstep_get_freqs(speedstep_processor,
-                                low, high,
-                                NULL,
-                                &speedstep_set_state);
-
-                if (result) {
-                        dprintk("could not detect two different speeds"
-                                        " -- aborting.\n");
-                        return result;
-                } else
-                        dprintk("workaround worked.\n");
-        }
-
-        /* get current speed setting */
-        state = speedstep_get_state();
-        speed = speedstep_freqs[state].frequency;
-
-        dprintk("currently at %s speed setting - %i MHz\n",
-                (speed == speedstep_freqs[SPEEDSTEP_LOW].frequency)
-                ? "low" : "high",
-                (speed / 1000));
-
-        /* cpuinfo and default policy values */
-        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
-        policy->cur = speed;
-
-        result = cpufreq_frequency_table_cpuinfo(policy, speedstep_freqs);
-        if (result)
-                return result;
-
-        cpufreq_frequency_table_get_attr(speedstep_freqs, policy->cpu);
-
-        return 0;
-}
-
-static int speedstep_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        return 0;
-}
-
-static unsigned int speedstep_get(unsigned int cpu)
-{
-        if (cpu)
-                return -ENODEV;
-        return speedstep_get_frequency(speedstep_processor);
-}
-
-
-static int speedstep_resume(struct cpufreq_policy *policy)
-{
-        int result = speedstep_smi_ownership();
-
-        if (result)
-                dprintk("fails in re-acquiring ownership of a SMI interface.\n");
-
-        return result;
-}
-
-static struct freq_attr *speedstep_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver speedstep_driver = {
-        .name           = "speedstep-smi",
-        .verify         = speedstep_verify,
-        .target         = speedstep_target,
-        .init           = speedstep_cpu_init,
-        .exit           = speedstep_cpu_exit,
-        .get            = speedstep_get,
-        .resume         = speedstep_resume,
-        .owner          = THIS_MODULE,
-        .attr           = speedstep_attr,
-};
-
-/**
- * speedstep_init - initializes the SpeedStep CPUFreq driver
- *
- *   Initializes the SpeedStep support. Returns -ENODEV on unsupported
- * BIOS, -EINVAL on problems during initiatization, and zero on
- * success.
- */
-static int __init speedstep_init(void)
-{
-        speedstep_processor = speedstep_detect_processor();
-
-        switch (speedstep_processor) {
-        case SPEEDSTEP_CPU_PIII_T:
-        case SPEEDSTEP_CPU_PIII_C:
-        case SPEEDSTEP_CPU_PIII_C_EARLY:
-                break;
-        default:
-                speedstep_processor = 0;
-        }
-
-        if (!speedstep_processor) {
-                dprintk("No supported Intel CPU detected.\n");
-                return -ENODEV;
-        }
-
-        dprintk("signature:0x%.8lx, command:0x%.8lx, "
-                "event:0x%.8lx, perf_level:0x%.8lx.\n",
-                ist_info.signature, ist_info.command,
-                ist_info.event, ist_info.perf_level);
-
-        /* Error if no IST-SMI BIOS or no PARM
-                 sig= 'ISGE' aka 'Intel Speedstep Gate E' */
-        if ((ist_info.signature !=  0x47534943) && (
-            (smi_port == 0) || (smi_cmd == 0)))
-                return -ENODEV;
-
-        if (smi_sig == 1)
-                smi_sig = 0x47534943;
-        else
-                smi_sig = ist_info.signature;
-
-        /* setup smi_port from MODLULE_PARM or BIOS */
-        if ((smi_port > 0xff) || (smi_port < 0))
-                return -EINVAL;
-        else if (smi_port == 0)
-                smi_port = ist_info.command & 0xff;
-
-        if ((smi_cmd > 0xff) || (smi_cmd < 0))
-                return -EINVAL;
-        else if (smi_cmd == 0)
-                smi_cmd = (ist_info.command >> 16) & 0xff;
-
-        return cpufreq_register_driver(&speedstep_driver);
-}
-
-
-/**
- * speedstep_exit - unregisters SpeedStep support
- *
- *   Unregisters SpeedStep support.
- */
-static void __exit speedstep_exit(void)
-{
-        cpufreq_unregister_driver(&speedstep_driver);
-}
-
-module_param(smi_port, int, 0444);
-module_param(smi_cmd,  int, 0444);
-module_param(smi_sig, uint, 0444);
-
-MODULE_PARM_DESC(smi_port, "Override the BIOS-given IST port with this value "
-                "-- Intel's default setting is 0xb2");
-MODULE_PARM_DESC(smi_cmd, "Override the BIOS-given IST command with this value "
-                "-- Intel's default setting is 0x82");
-MODULE_PARM_DESC(smi_sig, "Set to 1 to fake the IST signature when using the "
-                "SMI interface.");
-
-MODULE_AUTHOR("Hiroshi Miura");
-MODULE_DESCRIPTION("Speedstep driver for IST applet SMI interface.");
-MODULE_LICENSE("GPL");
-
-module_init(speedstep_init);
-module_exit(speedstep_exit);
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index df86bc8c859d..1edf5ba4fb2b 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -29,10 +29,10 @@
 
 static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
 {
+        u64 misc_enable;
+
         /* Unmask CPUID levels if masked: */
         if (c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xd)) {
-                u64 misc_enable;
-
                 rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
 
                 if (misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) {
@@ -118,8 +118,6 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
          * (model 2) with the same problem.
          */
         if (c->x86 == 15) {
-                u64 misc_enable;
-
                 rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
 
                 if (misc_enable & MSR_IA32_MISC_ENABLE_FAST_STRING) {
@@ -130,6 +128,19 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
                 }
         }
 #endif
+
+        /*
+         * If fast string is not enabled in IA32_MISC_ENABLE for any reason,
+         * clear the fast string and enhanced fast string CPU capabilities.
+         */
+        if (c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xd)) {
+                rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
+                if (!(misc_enable & MSR_IA32_MISC_ENABLE_FAST_STRING)) {
+                        printk(KERN_INFO "Disabled fast string operations\n");
+                        setup_clear_cpu_cap(X86_FEATURE_REP_GOOD);
+                        setup_clear_cpu_cap(X86_FEATURE_ERMS);
+                }
+        }
 }
 
 #ifdef CONFIG_X86_32
@@ -400,12 +411,10 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 
                 switch (c->x86_model) {
                 case 5:
-                        if (c->x86_mask == 0) {
-                                if (l2 == 0)
-                                        p = "Celeron (Covington)";
-                                else if (l2 == 256)
-                                        p = "Mobile Pentium II (Dixon)";
-                        }
+                        if (l2 == 0)
+                                p = "Celeron (Covington)";
+                        else if (l2 == 256)
+                                p = "Mobile Pentium II (Dixon)";
                         break;
 
                 case 6:
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 1ce1af2899df..c105c533ed94 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -327,7 +327,6 @@ static void __cpuinit amd_calc_l3_indices(struct amd_l3_cache *l3)
         l3->subcaches[2] = sc2 = !(val & BIT(8))  + !(val & BIT(9));
         l3->subcaches[3] = sc3 = !(val & BIT(12)) + !(val & BIT(13));
 
-        l3->indices = (max(max(max(sc0, sc1), sc2), sc3) << 10) - 1;
         l3->indices = (max(max3(sc0, sc1, sc2), sc3) << 10) - 1;
 }
 
@@ -454,27 +453,16 @@ int amd_set_l3_disable_slot(struct amd_l3_cache *l3, int cpu, unsigned slot,
 {
         int ret = 0;
 
-#define SUBCACHE_MASK   (3UL << 20)
-#define SUBCACHE_INDEX  0xfff
-
-        /*
-         * check whether this slot is already used or
-         * the index is already disabled
-         */
+        /*  check if @slot is already used or the index is already disabled */
         ret = amd_get_l3_disable_slot(l3, slot);
         if (ret >= 0)
                 return -EINVAL;
 
-        /*
-         * check whether the other slot has disabled the
-         * same index already
-         */
-        if (index == amd_get_l3_disable_slot(l3, !slot))
+        if (index > l3->indices)
                 return -EINVAL;
 
-        /* do not allow writes outside of allowed bits */
-        if ((index & ~(SUBCACHE_MASK | SUBCACHE_INDEX)) ||
-            ((index & SUBCACHE_INDEX) > l3->indices))
+        /* check whether the other slot has disabled the same index already */
+        if (index == amd_get_l3_disable_slot(l3, !slot))
                 return -EINVAL;
 
         amd_l3_disable_index(l3, cpu, slot, index);
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 3385ea26f684..ff1ae9b6464d 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -105,20 +105,6 @@ static int			cpu_missing;
 ATOMIC_NOTIFIER_HEAD(x86_mce_decoder_chain);
 EXPORT_SYMBOL_GPL(x86_mce_decoder_chain);
 
-static int default_decode_mce(struct notifier_block *nb, unsigned long val,
-                               void *data)
-{
-        pr_emerg(HW_ERR "No human readable MCE decoding support on this CPU type.\n");
-        pr_emerg(HW_ERR "Run the message through 'mcelog --ascii' to decode.\n");
-
-        return NOTIFY_STOP;
-}
-
-static struct notifier_block mce_dec_nb = {
-        .notifier_call = default_decode_mce,
-        .priority      = -1,
-};
-
 /* MCA banks polled by the period polling timer for corrected events */
 DEFINE_PER_CPU(mce_banks_t, mce_poll_banks) = {
         [0 ... BITS_TO_LONGS(MAX_NR_BANKS)-1] = ~0UL
@@ -212,6 +198,8 @@ void mce_log(struct mce *mce)
 
 static void print_mce(struct mce *m)
 {
+        int ret = 0;
+
         pr_emerg(HW_ERR "CPU %d: Machine Check Exception: %Lx Bank %d: %016Lx\n",
                m->extcpu, m->mcgstatus, m->bank, m->status);
 
@@ -239,7 +227,11 @@ static void print_mce(struct mce *m)
          * Print out human-readable details about the MCE error,
          * (if the CPU has an implementation for that)
          */
-        atomic_notifier_call_chain(&x86_mce_decoder_chain, 0, m);
+        ret = atomic_notifier_call_chain(&x86_mce_decoder_chain, 0, m);
+        if (ret == NOTIFY_STOP)
+                return;
+
+        pr_emerg_ratelimited(HW_ERR "Run the above through 'mcelog --ascii'\n");
 }
 
 #define PANIC_TIMEOUT 5 /* 5 seconds */
@@ -590,7 +582,6 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b)
                 if (!(flags & MCP_DONTLOG) && !mce_dont_log_ce) {
                         mce_log(&m);
                         atomic_notifier_call_chain(&x86_mce_decoder_chain, 0, &m);
-                        add_taint(TAINT_MACHINE_CHECK);
                 }
 
                 /*
@@ -1722,8 +1713,6 @@ __setup("mce", mcheck_enable);
 
 int __init mcheck_init(void)
 {
-        atomic_notifier_chain_register(&x86_mce_decoder_chain, &mce_dec_nb);
-
         mcheck_intel_therm_init();
 
         return 0;
diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index 0f034460260d..27c625178bf1 100644
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -187,8 +187,6 @@ static int therm_throt_process(bool new_event, int event, int level)
                                 this_cpu,
                                 level == CORE_LEVEL ? "Core" : "Package",
                                 state->count);
-
-                add_taint(TAINT_MACHINE_CHECK);
                 return 1;
         }
         if (old_event) {
@@ -355,7 +353,6 @@ static void notify_thresholds(__u64 msr_val)
 static void intel_thermal_interrupt(void)
 {
         __u64 msr_val;
-        struct cpuinfo_x86 *c = &cpu_data(smp_processor_id());
 
         rdmsrl(MSR_IA32_THERM_STATUS, msr_val);
 
@@ -367,19 +364,19 @@ static void intel_thermal_interrupt(void)
                                 CORE_LEVEL) != 0)
                 mce_log_therm_throt_event(CORE_THROTTLED | msr_val);
 
-        if (cpu_has(c, X86_FEATURE_PLN))
+        if (this_cpu_has(X86_FEATURE_PLN))
                 if (therm_throt_process(msr_val & THERM_STATUS_POWER_LIMIT,
                                         POWER_LIMIT_EVENT,
                                         CORE_LEVEL) != 0)
                         mce_log_therm_throt_event(CORE_POWER_LIMIT | msr_val);
 
-        if (cpu_has(c, X86_FEATURE_PTS)) {
+        if (this_cpu_has(X86_FEATURE_PTS)) {
                 rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val);
                 if (therm_throt_process(msr_val & PACKAGE_THERM_STATUS_PROCHOT,
                                         THERMAL_THROTTLING_EVENT,
                                         PACKAGE_LEVEL) != 0)
                         mce_log_therm_throt_event(PACKAGE_THROTTLED | msr_val);
-                if (cpu_has(c, X86_FEATURE_PLN))
+                if (this_cpu_has(X86_FEATURE_PLN))
                         if (therm_throt_process(msr_val &
                                         PACKAGE_THERM_STATUS_POWER_LIMIT,
                                         POWER_LIMIT_EVENT,
@@ -393,7 +390,6 @@ static void unexpected_thermal_interrupt(void)
 {
         printk(KERN_ERR "CPU%d: Unexpected LVT thermal interrupt!\n",
                         smp_processor_id());
-        add_taint(TAINT_MACHINE_CHECK);
 }
 
 static void (*smp_thermal_vector)(void) = unexpected_thermal_interrupt;
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index e638689279d3..3a0338b4b179 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -31,6 +31,7 @@
 #include <asm/nmi.h>
 #include <asm/compat.h>
 #include <asm/smp.h>
+#include <asm/alternative.h>
 
 #if 0
 #undef wrmsrl
@@ -363,12 +364,18 @@ again:
         return new_raw_count;
 }
 
-/* using X86_FEATURE_PERFCTR_CORE to later implement ALTERNATIVE() here */
 static inline int x86_pmu_addr_offset(int index)
 {
-        if (boot_cpu_has(X86_FEATURE_PERFCTR_CORE))
-                return index << 1;
-        return index;
+        int offset;
+
+        /* offset = X86_FEATURE_PERFCTR_CORE ? index << 1 : index */
+        alternative_io(ASM_NOP2,
+                       "shll $1, %%eax",
+                       X86_FEATURE_PERFCTR_CORE,
+                       "=a" (offset),
+                       "a"  (index));
+
+        return offset;
 }
 
 static inline unsigned int x86_pmu_config_addr(int index)
@@ -1766,17 +1773,6 @@ static struct pmu pmu = {
  * callchain support
  */
 
-static void
-backtrace_warning_symbol(void *data, char *msg, unsigned long symbol)
-{
-        /* Ignore warnings */
-}
-
-static void backtrace_warning(void *data, char *msg)
-{
-        /* Ignore warnings */
-}
-
 static int backtrace_stack(void *data, char *name)
 {
         return 0;
@@ -1790,8 +1786,6 @@ static void backtrace_address(void *data, unsigned long addr, int reliable)
 }
 
 static const struct stacktrace_ops backtrace_ops = {
-        .warning                = backtrace_warning,
-        .warning_symbol         = backtrace_warning_symbol,
         .stack                  = backtrace_stack,
         .address                = backtrace_address,
         .walk_stack             = print_context_stack_bp,
diff --git a/arch/x86/kernel/cpu/perf_event_amd.c b/arch/x86/kernel/cpu/perf_event_amd.c
index cf4e369cea67..fe29c1d2219e 100644
--- a/arch/x86/kernel/cpu/perf_event_amd.c
+++ b/arch/x86/kernel/cpu/perf_event_amd.c
@@ -96,12 +96,14 @@ static __initconst const u64 amd_hw_cache_event_ids
  */
 static const u64 amd_perfmon_event_map[] =
 {
-  [PERF_COUNT_HW_CPU_CYCLES]            = 0x0076,
-  [PERF_COUNT_HW_INSTRUCTIONS]          = 0x00c0,
-  [PERF_COUNT_HW_CACHE_REFERENCES]      = 0x0080,
-  [PERF_COUNT_HW_CACHE_MISSES]          = 0x0081,
-  [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]   = 0x00c2,
-  [PERF_COUNT_HW_BRANCH_MISSES]         = 0x00c3,
+  [PERF_COUNT_HW_CPU_CYCLES]                    = 0x0076,
+  [PERF_COUNT_HW_INSTRUCTIONS]                  = 0x00c0,
+  [PERF_COUNT_HW_CACHE_REFERENCES]              = 0x0080,
+  [PERF_COUNT_HW_CACHE_MISSES]                  = 0x0081,
+  [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]           = 0x00c2,
+  [PERF_COUNT_HW_BRANCH_MISSES]                 = 0x00c3,
+  [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND]       = 0x00d0, /* "Decoder empty" event */
+  [PERF_COUNT_HW_STALLED_CYCLES_BACKEND]        = 0x00d1, /* "Dispatch stalls" event */
 };
 
 static u64 amd_pmu_event_map(int hw_event)
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index 447a28de6f09..41178c826c48 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -36,7 +36,7 @@ static u64 intel_perfmon_event_map[PERF_COUNT_HW_MAX] __read_mostly =
   [PERF_COUNT_HW_BUS_CYCLES]            = 0x013c,
 };
 
-static struct event_constraint intel_core_event_constraints[] =
+static struct event_constraint intel_core_event_constraints[] __read_mostly =
 {
         INTEL_EVENT_CONSTRAINT(0x11, 0x2), /* FP_ASSIST */
         INTEL_EVENT_CONSTRAINT(0x12, 0x2), /* MUL */
@@ -47,7 +47,7 @@ static struct event_constraint intel_core_event_constraints[] =
         EVENT_CONSTRAINT_END
 };
 
-static struct event_constraint intel_core2_event_constraints[] =
+static struct event_constraint intel_core2_event_constraints[] __read_mostly =
 {
         FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
         FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
@@ -70,7 +70,7 @@ static struct event_constraint intel_core2_event_constraints[] =
         EVENT_CONSTRAINT_END
 };
 
-static struct event_constraint intel_nehalem_event_constraints[] =
+static struct event_constraint intel_nehalem_event_constraints[] __read_mostly =
 {
         FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
         FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
@@ -86,19 +86,19 @@ static struct event_constraint intel_nehalem_event_constraints[] =
         EVENT_CONSTRAINT_END
 };
 
-static struct extra_reg intel_nehalem_extra_regs[] =
+static struct extra_reg intel_nehalem_extra_regs[] __read_mostly =
 {
         INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0xffff),
         EVENT_EXTRA_END
 };
 
-static struct event_constraint intel_nehalem_percore_constraints[] =
+static struct event_constraint intel_nehalem_percore_constraints[] __read_mostly =
 {
         INTEL_EVENT_CONSTRAINT(0xb7, 0),
         EVENT_CONSTRAINT_END
 };
 
-static struct event_constraint intel_westmere_event_constraints[] =
+static struct event_constraint intel_westmere_event_constraints[] __read_mostly =
 {
         FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
         FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
@@ -110,7 +110,7 @@ static struct event_constraint intel_westmere_event_constraints[] =
         EVENT_CONSTRAINT_END
 };
 
-static struct event_constraint intel_snb_event_constraints[] =
+static struct event_constraint intel_snb_event_constraints[] __read_mostly =
 {
         FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
         FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
@@ -123,21 +123,21 @@ static struct event_constraint intel_snb_event_constraints[] =
         EVENT_CONSTRAINT_END
 };
 
-static struct extra_reg intel_westmere_extra_regs[] =
+static struct extra_reg intel_westmere_extra_regs[] __read_mostly =
 {
         INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0xffff),
         INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0xffff),
         EVENT_EXTRA_END
 };
 
-static struct event_constraint intel_westmere_percore_constraints[] =
+static struct event_constraint intel_westmere_percore_constraints[] __read_mostly =
 {
         INTEL_EVENT_CONSTRAINT(0xb7, 0),
         INTEL_EVENT_CONSTRAINT(0xbb, 0),
         EVENT_CONSTRAINT_END
 };
 
-static struct event_constraint intel_gen_event_constraints[] =
+static struct event_constraint intel_gen_event_constraints[] __read_mostly =
 {
         FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
         FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
@@ -1440,6 +1440,11 @@ static __init int intel_pmu_init(void)
                 x86_pmu.enable_all = intel_pmu_nhm_enable_all;
                 x86_pmu.extra_regs = intel_nehalem_extra_regs;
 
+                /* UOPS_ISSUED.STALLED_CYCLES */
+                intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 0x180010e;
+                /* UOPS_EXECUTED.CORE_ACTIVE_CYCLES,c=1,i=1 */
+                intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 0x1803fb1;
+
                 if (ebx & 0x40) {
                         /*
                          * Erratum AAJ80 detected, we work it around by using
@@ -1480,6 +1485,12 @@ static __init int intel_pmu_init(void)
                 x86_pmu.enable_all = intel_pmu_nhm_enable_all;
                 x86_pmu.pebs_constraints = intel_westmere_pebs_event_constraints;
                 x86_pmu.extra_regs = intel_westmere_extra_regs;
+
+                /* UOPS_ISSUED.STALLED_CYCLES */
+                intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 0x180010e;
+                /* UOPS_EXECUTED.CORE_ACTIVE_CYCLES,c=1,i=1 */
+                intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 0x1803fb1;
+
                 pr_cont("Westmere events, ");
                 break;
 
@@ -1491,6 +1502,12 @@ static __init int intel_pmu_init(void)
 
                 x86_pmu.event_constraints = intel_snb_event_constraints;
                 x86_pmu.pebs_constraints = intel_snb_pebs_events;
+
+                /* UOPS_ISSUED.ANY,c=1,i=1 to count stall cycles */
+                intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 0x180010e;
+                /* UOPS_DISPATCHED.THREAD,c=1,i=1 to count stall cycles*/
+                intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_BACKEND] = 0x18001b1;
+
                 pr_cont("SandyBridge events, ");
                 break;
 
diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c
index e93fcd55fae1..ead584fb6a7d 100644
--- a/arch/x86/kernel/cpu/perf_event_p4.c
+++ b/arch/x86/kernel/cpu/perf_event_p4.c
@@ -468,7 +468,7 @@ static struct p4_event_bind p4_event_bind_map[] = {
                 .opcode         = P4_OPCODE(P4_EVENT_MISPRED_BRANCH_RETIRED),
                 .escr_msr       = { MSR_P4_CRU_ESCR0, MSR_P4_CRU_ESCR1 },
                 .escr_emask     =
-                P4_ESCR_EMASK_BIT(P4_EVENT_MISPRED_BRANCH_RETIRED, NBOGUS),
+                        P4_ESCR_EMASK_BIT(P4_EVENT_MISPRED_BRANCH_RETIRED, NBOGUS),
                 .cntr           = { {12, 13, 16}, {14, 15, 17} },
         },
         [P4_EVENT_X87_ASSIST] = {
@@ -912,8 +912,7 @@ static int p4_pmu_handle_irq(struct pt_regs *regs)
         int idx, handled = 0;
         u64 val;
 
-        data.addr = 0;
-        data.raw = NULL;
+        perf_sample_data_init(&data, 0);
 
         cpuc = &__get_cpu_var(cpu_hw_events);
 
@@ -1197,7 +1196,7 @@ static __init int p4_pmu_init(void)
 {
         unsigned int low, high;
 
-        /* If we get stripped -- indexig fails */
+        /* If we get stripped -- indexing fails */
         BUILD_BUG_ON(ARCH_P4_MAX_CCCR > X86_PMC_MAX_GENERIC);
 
         rdmsr(MSR_IA32_MISC_ENABLE, low, high);
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index e90f08458e6b..690bc8461835 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -369,6 +369,7 @@ static struct of_ioapic_type of_ioapic_type[] =
 static int ioapic_xlate(struct irq_domain *id, const u32 *intspec, u32 intsize,
                         u32 *out_hwirq, u32 *out_type)
 {
+        struct mp_ioapic_gsi *gsi_cfg;
         struct io_apic_irq_attr attr;
         struct of_ioapic_type *it;
         u32 line, idx, type;
@@ -378,7 +379,8 @@ static int ioapic_xlate(struct irq_domain *id, const u32 *intspec, u32 intsize,
 
         line = *intspec;
         idx = (u32) id->priv;
-        *out_hwirq = line + mp_gsi_routing[idx].gsi_base;
+        gsi_cfg = mp_ioapic_gsi_routing(idx);
+        *out_hwirq = line + gsi_cfg->gsi_base;
 
         intspec++;
         type = *intspec;
@@ -407,7 +409,7 @@ static void __init ioapic_add_ofnode(struct device_node *np)
         }
 
         for (i = 0; i < nr_ioapics; i++) {
-                if (r.start == mp_ioapics[i].apicaddr) {
+                if (r.start == mpc_ioapic_addr(i)) {
                         struct irq_domain *id;
 
                         id = kzalloc(sizeof(*id), GFP_KERNEL);
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index e2a3f0606da4..1aae78f775fc 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -135,20 +135,6 @@ print_context_stack_bp(struct thread_info *tinfo,
 }
 EXPORT_SYMBOL_GPL(print_context_stack_bp);
 
-
-static void
-print_trace_warning_symbol(void *data, char *msg, unsigned long symbol)
-{
-        printk(data);
-        print_symbol(msg, symbol);
-        printk("\n");
-}
-
-static void print_trace_warning(void *data, char *msg)
-{
-        printk("%s%s\n", (char *)data, msg);
-}
-
 static int print_trace_stack(void *data, char *name)
 {
         printk("%s <%s> ", (char *)data, name);
@@ -166,8 +152,6 @@ static void print_trace_address(void *data, unsigned long addr, int reliable)
 }
 
 static const struct stacktrace_ops print_trace_ops = {
-        .warning                = print_trace_warning,
-        .warning_symbol         = print_trace_warning_symbol,
         .stack                  = print_trace_stack,
         .address                = print_trace_address,
         .walk_stack             = print_context_stack,
@@ -279,7 +263,6 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
         printk("DEBUG_PAGEALLOC");
 #endif
         printk("\n");
-        sysfs_printk_last_file();
         if (notify_die(DIE_OOPS, str, regs, err,
                         current->thread.trap_no, SIGSEGV) == NOTIFY_STOP)
                 return 1;
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index a93742a57468..0ba15a6cc57e 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -260,9 +260,9 @@ do_ftrace_mod_code(unsigned long ip, void *new_code)
         return mod_code_status;
 }
 
-static unsigned char *ftrace_nop_replace(void)
+static const unsigned char *ftrace_nop_replace(void)
 {
-        return ideal_nop5;
+        return ideal_nops[NOP_ATOMIC5];
 }
 
 static int
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index d6d6bb361931..3bb08509a7a1 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -23,7 +23,6 @@
 static void __init i386_default_early_setup(void)
 {
         /* Initialize 32bit specific setup functions */
-        x86_init.resources.probe_roms = probe_roms;
         x86_init.resources.reserve_resources = i386_reserve_resources;
         x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc;
 
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index bfe8f729e086..6781765b3a0d 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -217,7 +217,7 @@ static void hpet_reserve_platform_timers(unsigned int id) { }
 /*
  * Common hpet info
  */
-static unsigned long hpet_period;
+static unsigned long hpet_freq;
 
 static void hpet_legacy_set_mode(enum clock_event_mode mode,
                           struct clock_event_device *evt);
@@ -232,7 +232,6 @@ static struct clock_event_device hpet_clockevent = {
         .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
         .set_mode       = hpet_legacy_set_mode,
         .set_next_event = hpet_legacy_next_event,
-        .shift          = 32,
         .irq            = 0,
         .rating         = 50,
 };
@@ -290,28 +289,12 @@ static void hpet_legacy_clockevent_register(void)
         hpet_enable_legacy_int();
 
         /*
-         * The mult factor is defined as (include/linux/clockchips.h)
-         *  mult/2^shift = cyc/ns (in contrast to ns/cyc in clocksource.h)
-         * hpet_period is in units of femtoseconds (per cycle), so
-         *  mult/2^shift = cyc/ns = 10^6/hpet_period
-         *  mult = (10^6 * 2^shift)/hpet_period
-         *  mult = (FSEC_PER_NSEC << hpet_clockevent.shift)/hpet_period
-         */
-        hpet_clockevent.mult = div_sc((unsigned long) FSEC_PER_NSEC,
-                                      hpet_period, hpet_clockevent.shift);
-        /* Calculate the min / max delta */
-        hpet_clockevent.max_delta_ns = clockevent_delta2ns(0x7FFFFFFF,
-                                                           &hpet_clockevent);
-        /* Setup minimum reprogramming delta. */
-        hpet_clockevent.min_delta_ns = clockevent_delta2ns(HPET_MIN_PROG_DELTA,
-                                                           &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(smp_processor_id());
-        clockevents_register_device(&hpet_clockevent);
+        clockevents_config_and_register(&hpet_clockevent, hpet_freq,
+                                        HPET_MIN_PROG_DELTA, 0x7FFFFFFF);
         global_clock_event = &hpet_clockevent;
         printk(KERN_DEBUG "hpet clockevent registered\n");
 }
@@ -549,7 +532,6 @@ static int hpet_setup_irq(struct hpet_dev *dev)
 static void init_one_hpet_msi_clockevent(struct hpet_dev *hdev, int cpu)
 {
         struct clock_event_device *evt = &hdev->evt;
-        uint64_t hpet_freq;
 
         WARN_ON(cpu != smp_processor_id());
         if (!(hdev->flags & HPET_DEV_VALID))
@@ -571,24 +553,10 @@ static void init_one_hpet_msi_clockevent(struct hpet_dev *hdev, int cpu)
 
         evt->set_mode = hpet_msi_set_mode;
         evt->set_next_event = hpet_msi_next_event;
-        evt->shift = 32;
-
-        /*
-         * The period is a femto seconds value. We need to calculate the
-         * scaled math multiplication factor for nanosecond to hpet tick
-         * conversion.
-         */
-        hpet_freq = FSEC_PER_SEC;
-        do_div(hpet_freq, hpet_period);
-        evt->mult = div_sc((unsigned long) hpet_freq,
-                                      NSEC_PER_SEC, evt->shift);
-        /* Calculate the max delta */
-        evt->max_delta_ns = clockevent_delta2ns(0x7FFFFFFF, evt);
-        /* 5 usec minimum reprogramming delta. */
-        evt->min_delta_ns = 5000;
-
         evt->cpumask = cpumask_of(hdev->cpu);
-        clockevents_register_device(evt);
+
+        clockevents_config_and_register(evt, hpet_freq, HPET_MIN_PROG_DELTA,
+                                        0x7FFFFFFF);
 }
 
 #ifdef CONFIG_HPET
@@ -792,7 +760,6 @@ static struct clocksource clocksource_hpet = {
 static int hpet_clocksource_register(void)
 {
         u64 start, now;
-        u64 hpet_freq;
         cycle_t t1;
 
         /* Start the counter */
@@ -819,24 +786,7 @@ static int hpet_clocksource_register(void)
                 return -ENODEV;
         }
 
-        /*
-         * The definition of mult is (include/linux/clocksource.h)
-         * mult/2^shift = ns/cyc and hpet_period is in units of fsec/cyc
-         * so we first need to convert hpet_period to ns/cyc units:
-         *  mult/2^shift = ns/cyc = hpet_period/10^6
-         *  mult = (hpet_period * 2^shift)/10^6
-         *  mult = (hpet_period << shift)/FSEC_PER_NSEC
-         */
-
-        /* Need to convert hpet_period (fsec/cyc) to cyc/sec:
-         *
-         * cyc/sec = FSEC_PER_SEC/hpet_period(fsec/cyc)
-         * cyc/sec = (FSEC_PER_NSEC * NSEC_PER_SEC)/hpet_period
-         */
-        hpet_freq = FSEC_PER_SEC;
-        do_div(hpet_freq, hpet_period);
         clocksource_register_hz(&clocksource_hpet, (u32)hpet_freq);
-
         return 0;
 }
 
@@ -845,7 +795,9 @@ static int hpet_clocksource_register(void)
  */
 int __init hpet_enable(void)
 {
+        unsigned long hpet_period;
         unsigned int id;
+        u64 freq;
         int i;
 
         if (!is_hpet_capable())
@@ -884,6 +836,14 @@ int __init hpet_enable(void)
                 goto out_nohpet;
 
         /*
+         * The period is a femto seconds value. Convert it to a
+         * frequency.
+         */
+        freq = FSEC_PER_SEC;
+        do_div(freq, hpet_period);
+        hpet_freq = freq;
+
+        /*
          * Read the HPET ID register to retrieve the IRQ routing
          * information and the number of channels
          */
diff --git a/arch/x86/kernel/i8253.c b/arch/x86/kernel/i8253.c
index 2dfd31597443..fb66dc9e36cb 100644
--- a/arch/x86/kernel/i8253.c
+++ b/arch/x86/kernel/i8253.c
@@ -93,7 +93,6 @@ static struct clock_event_device pit_ce = {
         .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
         .set_mode       = init_pit_timer,
         .set_next_event = pit_next_event,
-        .shift          = 32,
         .irq            = 0,
 };
 
@@ -108,90 +107,12 @@ void __init setup_pit_timer(void)
          * IO_APIC has been initialized.
          */
         pit_ce.cpumask = cpumask_of(smp_processor_id());
-        pit_ce.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, pit_ce.shift);
-        pit_ce.max_delta_ns = clockevent_delta2ns(0x7FFF, &pit_ce);
-        pit_ce.min_delta_ns = clockevent_delta2ns(0xF, &pit_ce);
 
-        clockevents_register_device(&pit_ce);
+        clockevents_config_and_register(&pit_ce, CLOCK_TICK_RATE, 0xF, 0x7FFF);
         global_clock_event = &pit_ce;
 }
 
 #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
- * running counter:
- */
-static cycle_t pit_read(struct clocksource *cs)
-{
-        static int old_count;
-        static u32 old_jifs;
-        unsigned long flags;
-        int count;
-        u32 jifs;
-
-        raw_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_pit(0x00, PIT_MODE);       /* latch the count ASAP */
-        count = inb_pit(PIT_CH0);       /* read the latched count */
-        count |= inb_pit(PIT_CH0) << 8;
-
-        /* VIA686a test code... reset the latch if count > max + 1 */
-        if (count > LATCH) {
-                outb_pit(0x34, PIT_MODE);
-                outb_pit(LATCH & 0xff, PIT_CH0);
-                outb_pit(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;
-
-        raw_spin_unlock_irqrestore(&i8253_lock, flags);
-
-        count = (LATCH - 1) - count;
-
-        return (cycle_t)(jifs * LATCH) + count;
-}
-
-static struct clocksource pit_cs = {
-        .name           = "pit",
-        .rating         = 110,
-        .read           = pit_read,
-        .mask           = CLOCKSOURCE_MASK(32),
-        .mult           = 0,
-        .shift          = 20,
-};
-
 static int __init init_pit_clocksource(void)
 {
          /*
@@ -205,10 +126,7 @@ static int __init init_pit_clocksource(void)
             pit_ce.mode != CLOCK_EVT_MODE_PERIODIC)
                 return 0;
 
-        pit_cs.mult = clocksource_hz2mult(CLOCK_TICK_RATE, pit_cs.shift);
-
-        return clocksource_register(&pit_cs);
+        return clocksource_i8253_init();
 }
 arch_initcall(init_pit_clocksource);
-
 #endif /* !CONFIG_X86_64 */
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 1cb0b9fc78dc..6c0802eb2f7f 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -249,7 +249,7 @@ void fixup_irqs(void)
 
                 data = irq_desc_get_irq_data(desc);
                 affinity = data->affinity;
-                if (!irq_has_action(irq) ||
+                if (!irq_has_action(irq) || irqd_is_per_cpu(data) ||
                     cpumask_subset(affinity, cpu_online_mask)) {
                         raw_spin_unlock(&desc->lock);
                         continue;
@@ -276,7 +276,8 @@ void fixup_irqs(void)
                 else if (!(warned++))
                         set_affinity = 0;
 
-                if (!irqd_can_move_in_process_context(data) && chip->irq_unmask)
+                if (!irqd_can_move_in_process_context(data) &&
+                    !irqd_irq_disabled(data) && chip->irq_unmask)
                         chip->irq_unmask(data);
 
                 raw_spin_unlock(&desc->lock);
diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index 961b6b30ba90..3fee346ef545 100644
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -34,7 +34,7 @@ void arch_jump_label_transform(struct jump_entry *entry,
                 code.offset = entry->target -
                                 (entry->code + JUMP_LABEL_NOP_SIZE);
         } else
-                memcpy(&code, ideal_nop5, JUMP_LABEL_NOP_SIZE);
+                memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
         get_online_cpus();
         mutex_lock(&text_mutex);
         text_poke_smp((void *)entry->code, &code, JUMP_LABEL_NOP_SIZE);
@@ -44,7 +44,8 @@ void arch_jump_label_transform(struct jump_entry *entry,
 
 void arch_jump_label_text_poke_early(jump_label_t addr)
 {
-        text_poke_early((void *)addr, ideal_nop5, JUMP_LABEL_NOP_SIZE);
+        text_poke_early((void *)addr, ideal_nops[NOP_ATOMIC5],
+                        JUMP_LABEL_NOP_SIZE);
 }
 
 #endif
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index f98d3eafe07a..6389a6bca11b 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -26,8 +26,6 @@
 #include <asm/x86_init.h>
 #include <asm/reboot.h>
 
-#define KVM_SCALE 22
-
 static int kvmclock = 1;
 static int msr_kvm_system_time = MSR_KVM_SYSTEM_TIME;
 static int msr_kvm_wall_clock = MSR_KVM_WALL_CLOCK;
@@ -120,8 +118,6 @@ static struct clocksource kvm_clock = {
         .read = kvm_clock_get_cycles,
         .rating = 400,
         .mask = CLOCKSOURCE_MASK(64),
-        .mult = 1 << KVM_SCALE,
-        .shift = KVM_SCALE,
         .flags = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -203,7 +199,7 @@ void __init kvmclock_init(void)
         machine_ops.crash_shutdown  = kvm_crash_shutdown;
 #endif
         kvm_get_preset_lpj();
-        clocksource_register(&kvm_clock);
+        clocksource_register_hz(&kvm_clock, NSEC_PER_SEC);
         pv_info.paravirt_enabled = 1;
         pv_info.name = "KVM";
 
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
index ab23f1ad4bf1..52f256f2cc81 100644
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -24,6 +24,7 @@
 #include <linux/bug.h>
 #include <linux/mm.h>
 #include <linux/gfp.h>
+#include <linux/jump_label.h>
 
 #include <asm/system.h>
 #include <asm/page.h>
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 5a532ce646bf..9103b89c145a 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -285,7 +285,7 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type)
         intsrc.type = MP_INTSRC;
         intsrc.irqflag = 0;     /* conforming */
         intsrc.srcbus = 0;
-        intsrc.dstapic = mp_ioapics[0].apicid;
+        intsrc.dstapic = mpc_ioapic_id(0);
 
         intsrc.irqtype = mp_INT;
 
@@ -715,17 +715,15 @@ static void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)
         }
 }
 
-static int
+static int __init
 check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length, int count)
 {
-        int ret = 0;
-
         if (!mpc_new_phys || count <= mpc_new_length) {
                 WARN(1, "update_mptable: No spare slots (length: %x)\n", count);
                 return -1;
         }
 
-        return ret;
+        return 0;
 }
 #else /* CONFIG_X86_IO_APIC */
 static
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 9ea999a4dcc1..b49d00da2aed 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -68,74 +68,10 @@ int dma_set_mask(struct device *dev, u64 mask)
 }
 EXPORT_SYMBOL(dma_set_mask);
 
-#if defined(CONFIG_X86_64) && !defined(CONFIG_NUMA)
-static __initdata void *dma32_bootmem_ptr;
-static unsigned long dma32_bootmem_size __initdata = (128ULL<<20);
-
-static int __init parse_dma32_size_opt(char *p)
-{
-        if (!p)
-                return -EINVAL;
-        dma32_bootmem_size = memparse(p, &p);
-        return 0;
-}
-early_param("dma32_size", parse_dma32_size_opt);
-
-void __init dma32_reserve_bootmem(void)
-{
-        unsigned long size, align;
-        if (max_pfn <= MAX_DMA32_PFN)
-                return;
-
-        /*
-         * check aperture_64.c allocate_aperture() for reason about
-         * using 512M as goal
-         */
-        align = 64ULL<<20;
-        size = roundup(dma32_bootmem_size, align);
-        dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align,
-                                 512ULL<<20);
-        /*
-         * Kmemleak should not scan this block as it may not be mapped via the
-         * kernel direct mapping.
-         */
-        kmemleak_ignore(dma32_bootmem_ptr);
-        if (dma32_bootmem_ptr)
-                dma32_bootmem_size = size;
-        else
-                dma32_bootmem_size = 0;
-}
-static void __init dma32_free_bootmem(void)
-{
-
-        if (max_pfn <= MAX_DMA32_PFN)
-                return;
-
-        if (!dma32_bootmem_ptr)
-                return;
-
-        free_bootmem(__pa(dma32_bootmem_ptr), dma32_bootmem_size);
-
-        dma32_bootmem_ptr = NULL;
-        dma32_bootmem_size = 0;
-}
-#else
-void __init dma32_reserve_bootmem(void)
-{
-}
-static void __init dma32_free_bootmem(void)
-{
-}
-
-#endif
-
 void __init pci_iommu_alloc(void)
 {
         struct iommu_table_entry *p;
 
-        /* free the range so iommu could get some range less than 4G */
-        dma32_free_bootmem();
-
         sort_iommu_table(__iommu_table, __iommu_table_end);
         check_iommu_entries(__iommu_table, __iommu_table_end);
 
diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
index 55d745ec1181..35ccf75696eb 100644
--- a/arch/x86/kernel/pci-iommu_table.c
+++ b/arch/x86/kernel/pci-iommu_table.c
@@ -50,20 +50,14 @@ void __init check_iommu_entries(struct iommu_table_entry *start,
                                 struct iommu_table_entry *finish)
 {
         struct iommu_table_entry *p, *q, *x;
-        char sym_p[KSYM_SYMBOL_LEN];
-        char sym_q[KSYM_SYMBOL_LEN];
 
         /* Simple cyclic dependency checker. */
         for (p = start; p < finish; p++) {
                 q = find_dependents_of(start, finish, p);
                 x = find_dependents_of(start, finish, q);
                 if (p == x) {
-                        sprint_symbol(sym_p, (unsigned long)p->detect);
-                        sprint_symbol(sym_q, (unsigned long)q->detect);
-
-                        printk(KERN_ERR "CYCLIC DEPENDENCY FOUND! %s depends" \
-                                        " on %s and vice-versa. BREAKING IT.\n",
-                                        sym_p, sym_q);
+                        printk(KERN_ERR "CYCLIC DEPENDENCY FOUND! %pS depends on %pS and vice-versa. BREAKING IT.\n",
+                               p->detect, q->detect);
                         /* Heavy handed way..*/
                         x->depend = 0;
                 }
@@ -72,12 +66,8 @@ void __init check_iommu_entries(struct iommu_table_entry *start,
         for (p = start; p < finish; p++) {
                 q = find_dependents_of(p, finish, p);
                 if (q && q > p) {
-                        sprint_symbol(sym_p, (unsigned long)p->detect);
-                        sprint_symbol(sym_q, (unsigned long)q->detect);
-
-                        printk(KERN_ERR "EXECUTION ORDER INVALID! %s "\
-                                        "should be called before %s!\n",
-                                        sym_p, sym_q);
+                        printk(KERN_ERR "EXECUTION ORDER INVALID! %pS should be called before %pS!\n",
+                               p->detect, q->detect);
                 }
         }
 }
diff --git a/arch/x86/kernel/probe_roms_32.c b/arch/x86/kernel/probe_roms.c
index 071e7fea42e5..ba0a4cce53be 100644
--- a/arch/x86/kernel/probe_roms_32.c
+++ b/arch/x86/kernel/probe_roms.c
@@ -73,6 +73,107 @@ static struct resource video_rom_resource = {
         .flags  = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
 };
 
+/* does this oprom support the given pci device, or any of the devices
+ * that the driver supports?
+ */
+static bool match_id(struct pci_dev *pdev, unsigned short vendor, unsigned short device)
+{
+        struct pci_driver *drv = pdev->driver;
+        const struct pci_device_id *id;
+
+        if (pdev->vendor == vendor && pdev->device == device)
+                return true;
+
+        for (id = drv ? drv->id_table : NULL; id && id->vendor; id++)
+                if (id->vendor == vendor && id->device == device)
+                        break;
+
+        return id && id->vendor;
+}
+
+static bool probe_list(struct pci_dev *pdev, unsigned short vendor,
+                       const unsigned char *rom_list)
+{
+        unsigned short device;
+
+        do {
+                if (probe_kernel_address(rom_list, device) != 0)
+                        device = 0;
+
+                if (device && match_id(pdev, vendor, device))
+                        break;
+
+                rom_list += 2;
+        } while (device);
+
+        return !!device;
+}
+
+static struct resource *find_oprom(struct pci_dev *pdev)
+{
+        struct resource *oprom = NULL;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(adapter_rom_resources); i++) {
+                struct resource *res = &adapter_rom_resources[i];
+                unsigned short offset, vendor, device, list, rev;
+                const unsigned char *rom;
+
+                if (res->end == 0)
+                        break;
+
+                rom = isa_bus_to_virt(res->start);
+                if (probe_kernel_address(rom + 0x18, offset) != 0)
+                        continue;
+
+                if (probe_kernel_address(rom + offset + 0x4, vendor) != 0)
+                        continue;
+
+                if (probe_kernel_address(rom + offset + 0x6, device) != 0)
+                        continue;
+
+                if (match_id(pdev, vendor, device)) {
+                        oprom = res;
+                        break;
+                }
+
+                if (probe_kernel_address(rom + offset + 0x8, list) == 0 &&
+                    probe_kernel_address(rom + offset + 0xc, rev) == 0 &&
+                    rev >= 3 && list &&
+                    probe_list(pdev, vendor, rom + offset + list)) {
+                        oprom = res;
+                        break;
+                }
+        }
+
+        return oprom;
+}
+
+void *pci_map_biosrom(struct pci_dev *pdev)
+{
+        struct resource *oprom = find_oprom(pdev);
+
+        if (!oprom)
+                return NULL;
+
+        return ioremap(oprom->start, resource_size(oprom));
+}
+EXPORT_SYMBOL(pci_map_biosrom);
+
+void pci_unmap_biosrom(void __iomem *image)
+{
+        iounmap(image);
+}
+EXPORT_SYMBOL(pci_unmap_biosrom);
+
+size_t pci_biosrom_size(struct pci_dev *pdev)
+{
+        struct resource *oprom = find_oprom(pdev);
+
+        return oprom ? resource_size(oprom) : 0;
+}
+EXPORT_SYMBOL(pci_biosrom_size);
+
 #define ROMSIGNATURE 0xaa55
 
 static int __init romsignature(const unsigned char *rom)
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index d46cbe46b7ab..88a90a977f8e 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -449,7 +449,7 @@ EXPORT_SYMBOL_GPL(cpu_idle_wait);
 void mwait_idle_with_hints(unsigned long ax, unsigned long cx)
 {
         if (!need_resched()) {
-                if (cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_CLFLUSH_MONITOR))
+                if (this_cpu_has(X86_FEATURE_CLFLUSH_MONITOR))
                         clflush((void *)&current_thread_info()->flags);
 
                 __monitor((void *)&current_thread_info()->flags, 0, 0);
@@ -465,7 +465,7 @@ static void mwait_idle(void)
         if (!need_resched()) {
                 trace_power_start(POWER_CSTATE, 1, smp_processor_id());
                 trace_cpu_idle(1, smp_processor_id());
-                if (cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_CLFLUSH_MONITOR))
+                if (this_cpu_has(X86_FEATURE_CLFLUSH_MONITOR))
                         clflush((void *)&current_thread_info()->flags);
 
                 __monitor((void *)&current_thread_info()->flags, 0, 0);
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index f65e5b521dbd..807c2a2b80f1 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -1363,7 +1363,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
  * We must return the syscall number to actually look up in the table.
  * This can be -1L to skip running any syscall at all.
  */
-asmregparm long syscall_trace_enter(struct pt_regs *regs)
+long syscall_trace_enter(struct pt_regs *regs)
 {
         long ret = 0;
 
@@ -1408,7 +1408,7 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs)
         return ret ?: regs->orig_ax;
 }
 
-asmregparm void syscall_trace_leave(struct pt_regs *regs)
+void syscall_trace_leave(struct pt_regs *regs)
 {
         bool step;
 
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 08c44b08bf5b..0c016f727695 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -36,7 +36,7 @@ EXPORT_SYMBOL(pm_power_off);
 
 static const struct desc_ptr no_idt = {};
 static int reboot_mode;
-enum reboot_type reboot_type = BOOT_KBD;
+enum reboot_type reboot_type = BOOT_ACPI;
 int reboot_force;
 
 #if defined(CONFIG_X86_32) && defined(CONFIG_SMP)
@@ -478,9 +478,24 @@ void __attribute__((weak)) mach_reboot_fixups(void)
 {
 }
 
+/*
+ * Windows compatible x86 hardware expects the following on reboot:
+ *
+ * 1) If the FADT has the ACPI reboot register flag set, try it
+ * 2) If still alive, write to the keyboard controller
+ * 3) If still alive, write to the ACPI reboot register again
+ * 4) If still alive, write to the keyboard controller again
+ *
+ * If the machine is still alive at this stage, it gives up. We default to
+ * following the same pattern, except that if we're still alive after (4) we'll
+ * try to force a triple fault and then cycle between hitting the keyboard
+ * controller and doing that
+ */
 static void native_machine_emergency_restart(void)
 {
         int i;
+        int attempt = 0;
+        int orig_reboot_type = reboot_type;
 
         if (reboot_emergency)
                 emergency_vmx_disable_all();
@@ -502,6 +517,13 @@ static void native_machine_emergency_restart(void)
                                 outb(0xfe, 0x64); /* pulse reset low */
                                 udelay(50);
                         }
+                        if (attempt == 0 && orig_reboot_type == BOOT_ACPI) {
+                                attempt = 1;
+                                reboot_type = BOOT_ACPI;
+                        } else {
+                                reboot_type = BOOT_TRIPLE;
+                        }
+                        break;
 
                 case BOOT_TRIPLE:
                         load_idt(&no_idt);
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 4be9b398470e..a3e5948670c2 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -691,8 +691,6 @@ early_param("reservelow", parse_reservelow);
 
 void __init setup_arch(char **cmdline_p)
 {
-        unsigned long flags;
-
 #ifdef CONFIG_X86_32
         memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
         visws_early_detect();
@@ -948,6 +946,8 @@ void __init setup_arch(char **cmdline_p)
         if (init_ohci1394_dma_early)
                 init_ohci1394_dma_on_all_controllers();
 #endif
+        /* Allocate bigger log buffer */
+        setup_log_buf(1);
 
         reserve_initrd();
 
@@ -966,7 +966,6 @@ void __init setup_arch(char **cmdline_p)
 
         initmem_init();
         memblock_find_dma_reserve();
-        dma32_reserve_bootmem();
 
 #ifdef CONFIG_KVM_CLOCK
         kvmclock_init();
@@ -1041,9 +1040,7 @@ void __init setup_arch(char **cmdline_p)
 
         mcheck_init();
 
-        local_irq_save(flags);
-        arch_init_ideal_nop5();
-        local_irq_restore(flags);
+        arch_init_ideal_nops();
 }
 
 #ifdef CONFIG_X86_32
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index 4fd173cd8e57..40a24932a8a1 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -601,10 +601,7 @@ long sys_rt_sigreturn(struct pt_regs *regs)
                 goto badframe;
 
         sigdelsetmask(&set, ~_BLOCKABLE);
-        spin_lock_irq(&current->sighand->siglock);
-        current->blocked = set;
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+        set_current_blocked(&set);
 
         if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax))
                 goto badframe;
@@ -682,6 +679,7 @@ static int
 handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
               sigset_t *oldset, struct pt_regs *regs)
 {
+        sigset_t blocked;
         int ret;
 
         /* Are we from a system call? */
@@ -741,12 +739,10 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
          */
         regs->flags &= ~X86_EFLAGS_TF;
 
-        spin_lock_irq(&current->sighand->siglock);
-        sigorsets(&current->blocked, &current->blocked, &ka->sa.sa_mask);
+        sigorsets(&blocked, &current->blocked, &ka->sa.sa_mask);
         if (!(ka->sa.sa_flags & SA_NODEFER))
-                sigaddset(&current->blocked, sig);
-        recalc_sigpending();
-        spin_unlock_irq(&current->sighand->siglock);
+                sigaddset(&blocked, sig);
+        set_current_blocked(&blocked);
 
         tracehook_signal_handler(sig, info, ka, regs,
                                  test_thread_flag(TIF_SINGLESTEP));
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index 513deac7228d..013e7eba83bb 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -194,14 +194,13 @@ static void native_stop_other_cpus(int wait)
 }
 
 /*
- * Reschedule call back. Nothing to do,
- * all the work is done automatically when
- * we return from the interrupt.
+ * Reschedule call back.
  */
 void smp_reschedule_interrupt(struct pt_regs *regs)
 {
         ack_APIC_irq();
         inc_irq_stat(irq_resched_count);
+        scheduler_ipi();
         /*
          * KVM uses this interrupt to force a cpu out of guest mode
          */
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index c2871d3c71b6..a3c430bdfb60 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1332,9 +1332,9 @@ static inline void mwait_play_dead(void)
         void *mwait_ptr;
         struct cpuinfo_x86 *c = __this_cpu_ptr(&cpu_info);
 
-        if (!(cpu_has(c, X86_FEATURE_MWAIT) && mwait_usable(c)))
+        if (!this_cpu_has(X86_FEATURE_MWAIT) && mwait_usable(c))
                 return;
-        if (!cpu_has(__this_cpu_ptr(&cpu_info), X86_FEATURE_CLFLSH))
+        if (!this_cpu_has(X86_FEATURE_CLFLSH))
                 return;
         if (__this_cpu_read(cpu_info.cpuid_level) < CPUID_MWAIT_LEAF)
                 return;
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index 6515733a289d..55d9bc03f696 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -9,15 +9,6 @@
 #include <linux/uaccess.h>
 #include <asm/stacktrace.h>
 
-static void save_stack_warning(void *data, char *msg)
-{
-}
-
-static void
-save_stack_warning_symbol(void *data, char *msg, unsigned long symbol)
-{
-}
-
 static int save_stack_stack(void *data, char *name)
 {
         return 0;
@@ -53,16 +44,12 @@ save_stack_address_nosched(void *data, unsigned long addr, int reliable)
 }
 
 static const struct stacktrace_ops save_stack_ops = {
-        .warning        = save_stack_warning,
-        .warning_symbol = save_stack_warning_symbol,
         .stack          = save_stack_stack,
         .address        = save_stack_address,
         .walk_stack     = print_context_stack,
 };
 
 static const struct stacktrace_ops save_stack_ops_nosched = {
-        .warning        = save_stack_warning,
-        .warning_symbol = save_stack_warning_symbol,
         .stack          = save_stack_stack,
         .address        = save_stack_address_nosched,
         .walk_stack     = print_context_stack,
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
index abce34d5c79d..32cbffb0c494 100644
--- a/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@ -344,3 +344,4 @@ ENTRY(sys_call_table)
         .long sys_open_by_handle_at
         .long sys_clock_adjtime
         .long sys_syncfs
+        .long sys_sendmmsg              /* 345 */
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index 998e972f3b1a..30ac65df7d4e 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -110,7 +110,6 @@ static struct mm_struct tboot_mm = {
         .mmap_sem       = __RWSEM_INITIALIZER(init_mm.mmap_sem),
         .page_table_lock =  __SPIN_LOCK_UNLOCKED(init_mm.page_table_lock),
         .mmlist         = LIST_HEAD_INIT(init_mm.mmlist),
-        .cpu_vm_mask    = CPU_MASK_ALL,
 };
 
 static inline void switch_to_tboot_pt(void)
diff --git a/arch/x86/kernel/test_nx.c b/arch/x86/kernel/test_nx.c
index 787a5e499dd1..3f92ce07e525 100644
--- a/arch/x86/kernel/test_nx.c
+++ b/arch/x86/kernel/test_nx.c
@@ -161,7 +161,7 @@ static int test_NX(void)
         }
 
 #endif
-        return 0;
+        return ret;
 }
 
 static void test_exit(void)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 624a2016198e..61682f0ac264 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -306,6 +306,13 @@ SECTIONS
         }
 
         . = ALIGN(8);
+        .apicdrivers : AT(ADDR(.apicdrivers) - LOAD_OFFSET) {
+                __apicdrivers = .;
+                *(.apicdrivers);
+                __apicdrivers_end = .;
+        }
+
+        . = ALIGN(8);
         /*
          * .exit.text is discard at runtime, not link time, to deal with
          *  references from .altinstructions and .eh_frame
@@ -319,7 +326,7 @@ SECTIONS
         }
 
 #if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
-        PERCPU(INTERNODE_CACHE_BYTES, PAGE_SIZE)
+        PERCPU_SECTION(INTERNODE_CACHE_BYTES)
 #endif
 
         . = ALIGN(PAGE_SIZE);
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 75ef4b18e9b7..6f164bd5e14d 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -35,7 +35,7 @@ void iommu_shutdown_noop(void) { }
 struct x86_init_ops x86_init __initdata = {
 
         .resources = {
-                .probe_roms             = x86_init_noop,
+                .probe_roms             = probe_roms,
                 .reserve_resources      = reserve_standard_io_resources,
                 .memory_setup           = default_machine_specific_memory_setup,
         },
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 0ad47b819a8b..d6e2477feb18 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -73,9 +73,14 @@
 #define MemAbs      (1<<11)      /* Memory operand is absolute displacement */
 #define String      (1<<12)     /* String instruction (rep capable) */
 #define Stack       (1<<13)     /* Stack instruction (push/pop) */
+#define GroupMask   (7<<14)     /* Opcode uses one of the group mechanisms */
 #define Group       (1<<14)     /* Bits 3:5 of modrm byte extend opcode */
-#define GroupDual   (1<<15)     /* Alternate decoding of mod == 3 */
+#define GroupDual   (2<<14)     /* Alternate decoding of mod == 3 */
+#define Prefix      (3<<14)     /* Instruction varies with 66/f2/f3 prefix */
+#define RMExt       (4<<14)     /* Opcode extension in ModRM r/m if mod == 3 */
+#define Sse         (1<<17)     /* SSE Vector instruction */
 /* Misc flags */
+#define Prot        (1<<21) /* instruction generates #UD if not in prot-mode */
 #define VendorSpecific (1<<22) /* Vendor specific instruction */
 #define NoAccess    (1<<23) /* Don't access memory (lea/invlpg/verr etc) */
 #define Op3264      (1<<24) /* Operand is 64b in long mode, 32b otherwise */
@@ -102,11 +107,14 @@
 
 struct opcode {
         u32 flags;
+        u8 intercept;
         union {
                 int (*execute)(struct x86_emulate_ctxt *ctxt);
                 struct opcode *group;
                 struct group_dual *gdual;
+                struct gprefix *gprefix;
         } u;
+        int (*check_perm)(struct x86_emulate_ctxt *ctxt);
 };
 
 struct group_dual {
@@ -114,6 +122,13 @@ struct group_dual {
         struct opcode mod3[8];
 };
 
+struct gprefix {
+        struct opcode pfx_no;
+        struct opcode pfx_66;
+        struct opcode pfx_f2;
+        struct opcode pfx_f3;
+};
+
 /* EFLAGS bit definitions. */
 #define EFLG_ID (1<<21)
 #define EFLG_VIP (1<<20)
@@ -248,42 +263,42 @@ struct group_dual {
                              "w", "r", _LO32, "r", "", "r")
 
 /* Instruction has three operands and one operand is stored in ECX register */
-#define __emulate_2op_cl(_op, _cl, _src, _dst, _eflags, _suffix, _type)         \
-        do {                                                                    \
-                unsigned long _tmp;                                             \
-                _type _clv  = (_cl).val;                                        \
-                _type _srcv = (_src).val;                                       \
-                _type _dstv = (_dst).val;                                       \
-                                                                                \
-                __asm__ __volatile__ (                                          \
-                        _PRE_EFLAGS("0", "5", "2")                              \
-                        _op _suffix " %4,%1 \n"                                 \
-                        _POST_EFLAGS("0", "5", "2")                             \
-                        : "=m" (_eflags), "+r" (_dstv), "=&r" (_tmp)            \
-                        : "c" (_clv) , "r" (_srcv), "i" (EFLAGS_MASK)           \
-                        );                                                      \
-                                                                                \
-                (_cl).val  = (unsigned long) _clv;                              \
-                (_src).val = (unsigned long) _srcv;                             \
-                (_dst).val = (unsigned long) _dstv;                             \
+#define __emulate_2op_cl(_op, _cl, _src, _dst, _eflags, _suffix, _type) \
+        do {                                                            \
+                unsigned long _tmp;                                     \
+                _type _clv  = (_cl).val;                                \
+                _type _srcv = (_src).val;                               \
+                _type _dstv = (_dst).val;                               \
+                                                                        \
+                __asm__ __volatile__ (                                  \
+                        _PRE_EFLAGS("0", "5", "2")                      \
+                        _op _suffix " %4,%1 \n"                         \
+                        _POST_EFLAGS("0", "5", "2")                     \
+                        : "=m" (_eflags), "+r" (_dstv), "=&r" (_tmp)    \
+                        : "c" (_clv) , "r" (_srcv), "i" (EFLAGS_MASK)   \
+                        );                                              \
+                                                                        \
+                (_cl).val  = (unsigned long) _clv;                      \
+                (_src).val = (unsigned long) _srcv;                     \
+                (_dst).val = (unsigned long) _dstv;                     \
         } while (0)
 
-#define emulate_2op_cl(_op, _cl, _src, _dst, _eflags)                           \
-        do {                                                                    \
-                switch ((_dst).bytes) {                                         \
-                case 2:                                                         \
-                        __emulate_2op_cl(_op, _cl, _src, _dst, _eflags,         \
-                                                "w", unsigned short);           \
-                        break;                                                  \
-                case 4:                                                         \
-                        __emulate_2op_cl(_op, _cl, _src, _dst, _eflags,         \
-                                                "l", unsigned int);             \
-                        break;                                                  \
-                case 8:                                                         \
-                        ON64(__emulate_2op_cl(_op, _cl, _src, _dst, _eflags,    \
-                                                "q", unsigned long));           \
-                        break;                                                  \
-                }                                                               \
+#define emulate_2op_cl(_op, _cl, _src, _dst, _eflags)                   \
+        do {                                                            \
+                switch ((_dst).bytes) {                                 \
+                case 2:                                                 \
+                        __emulate_2op_cl(_op, _cl, _src, _dst, _eflags, \
+                                         "w", unsigned short);          \
+                        break;                                          \
+                case 4:                                                 \
+                        __emulate_2op_cl(_op, _cl, _src, _dst, _eflags, \
+                                         "l", unsigned int);            \
+                        break;                                          \
+                case 8:                                                 \
+                        ON64(__emulate_2op_cl(_op, _cl, _src, _dst, _eflags, \
+                                              "q", unsigned long));     \
+                        break;                                          \
+                }                                                       \
         } while (0)
 
 #define __emulate_1op(_op, _dst, _eflags, _suffix)                      \
@@ -346,13 +361,25 @@ struct group_dual {
         } while (0)
 
 /* instruction has only one source operand, destination is implicit (e.g. mul, div, imul, idiv) */
-#define emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags)                     \
-        do {                                                                    \
-                switch((_src).bytes) {                                          \
-                case 1: __emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags, "b"); break; \
-                case 2: __emulate_1op_rax_rdx(_op, _src, _rax, _rdx,  _eflags, "w"); break; \
-                case 4: __emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags, "l"); break; \
-                case 8: ON64(__emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags, "q")); break; \
+#define emulate_1op_rax_rdx(_op, _src, _rax, _rdx, _eflags)             \
+        do {                                                            \
+                switch((_src).bytes) {                                  \
+                case 1:                                                 \
+                        __emulate_1op_rax_rdx(_op, _src, _rax, _rdx,    \
+                                              _eflags, "b");            \
+                        break;                                          \
+                case 2:                                                 \
+                        __emulate_1op_rax_rdx(_op, _src, _rax, _rdx,    \
+                                              _eflags, "w");            \
+                        break;                                          \
+                case 4:                                                 \
+                        __emulate_1op_rax_rdx(_op, _src, _rax, _rdx,    \
+                                              _eflags, "l");            \
+                        break;                                          \
+                case 8:                                                 \
+                        ON64(__emulate_1op_rax_rdx(_op, _src, _rax, _rdx, \
+                                                   _eflags, "q"));      \
+                        break;                                          \
                 }                                                       \
         } while (0)
 
@@ -388,13 +415,33 @@ struct group_dual {
         (_type)_x;                                                      \
 })
 
-#define insn_fetch_arr(_arr, _size, _eip)                                \
+#define insn_fetch_arr(_arr, _size, _eip)                               \
 ({      rc = do_insn_fetch(ctxt, ops, (_eip), _arr, (_size));           \
         if (rc != X86EMUL_CONTINUE)                                     \
                 goto done;                                              \
         (_eip) += (_size);                                              \
 })
 
+static int emulator_check_intercept(struct x86_emulate_ctxt *ctxt,
+                                    enum x86_intercept intercept,
+                                    enum x86_intercept_stage stage)
+{
+        struct x86_instruction_info info = {
+                .intercept  = intercept,
+                .rep_prefix = ctxt->decode.rep_prefix,
+                .modrm_mod  = ctxt->decode.modrm_mod,
+                .modrm_reg  = ctxt->decode.modrm_reg,
+                .modrm_rm   = ctxt->decode.modrm_rm,
+                .src_val    = ctxt->decode.src.val64,
+                .src_bytes  = ctxt->decode.src.bytes,
+                .dst_bytes  = ctxt->decode.dst.bytes,
+                .ad_bytes   = ctxt->decode.ad_bytes,
+                .next_rip   = ctxt->eip,
+        };
+
+        return ctxt->ops->intercept(ctxt, &info, stage);
+}
+
 static inline unsigned long ad_mask(struct decode_cache *c)
 {
         return (1UL << (c->ad_bytes << 3)) - 1;
@@ -430,6 +477,13 @@ static inline void jmp_rel(struct decode_cache *c, int rel)
         register_address_increment(c, &c->eip, rel);
 }
 
+static u32 desc_limit_scaled(struct desc_struct *desc)
+{
+        u32 limit = get_desc_limit(desc);
+
+        return desc->g ? (limit << 12) | 0xfff : limit;
+}
+
 static void set_seg_override(struct decode_cache *c, int seg)
 {
         c->has_seg_override = true;
@@ -442,11 +496,10 @@ static unsigned long seg_base(struct x86_emulate_ctxt *ctxt,
         if (ctxt->mode == X86EMUL_MODE_PROT64 && seg < VCPU_SREG_FS)
                 return 0;
 
-        return ops->get_cached_segment_base(seg, ctxt->vcpu);
+        return ops->get_cached_segment_base(ctxt, seg);
 }
 
 static unsigned seg_override(struct x86_emulate_ctxt *ctxt,
-                             struct x86_emulate_ops *ops,
                              struct decode_cache *c)
 {
         if (!c->has_seg_override)
@@ -455,18 +508,6 @@ static unsigned seg_override(struct x86_emulate_ctxt *ctxt,
         return c->seg_override;
 }
 
-static ulong linear(struct x86_emulate_ctxt *ctxt,
-                    struct segmented_address addr)
-{
-        struct decode_cache *c = &ctxt->decode;
-        ulong la;
-
-        la = seg_base(ctxt, ctxt->ops, addr.seg) + addr.ea;
-        if (c->ad_bytes != 8)
-                la &= (u32)-1;
-        return la;
-}
-
 static int emulate_exception(struct x86_emulate_ctxt *ctxt, int vec,
                              u32 error, bool valid)
 {
@@ -476,11 +517,21 @@ static int emulate_exception(struct x86_emulate_ctxt *ctxt, int vec,
         return X86EMUL_PROPAGATE_FAULT;
 }
 
+static int emulate_db(struct x86_emulate_ctxt *ctxt)
+{
+        return emulate_exception(ctxt, DB_VECTOR, 0, false);
+}
+
 static int emulate_gp(struct x86_emulate_ctxt *ctxt, int err)
 {
         return emulate_exception(ctxt, GP_VECTOR, err, true);
 }
 
+static int emulate_ss(struct x86_emulate_ctxt *ctxt, int err)
+{
+        return emulate_exception(ctxt, SS_VECTOR, err, true);
+}
+
 static int emulate_ud(struct x86_emulate_ctxt *ctxt)
 {
         return emulate_exception(ctxt, UD_VECTOR, 0, false);
@@ -496,6 +547,128 @@ static int emulate_de(struct x86_emulate_ctxt *ctxt)
         return emulate_exception(ctxt, DE_VECTOR, 0, false);
 }
 
+static int emulate_nm(struct x86_emulate_ctxt *ctxt)
+{
+        return emulate_exception(ctxt, NM_VECTOR, 0, false);
+}
+
+static u16 get_segment_selector(struct x86_emulate_ctxt *ctxt, unsigned seg)
+{
+        u16 selector;
+        struct desc_struct desc;
+
+        ctxt->ops->get_segment(ctxt, &selector, &desc, NULL, seg);
+        return selector;
+}
+
+static void set_segment_selector(struct x86_emulate_ctxt *ctxt, u16 selector,
+                                 unsigned seg)
+{
+        u16 dummy;
+        u32 base3;
+        struct desc_struct desc;
+
+        ctxt->ops->get_segment(ctxt, &dummy, &desc, &base3, seg);
+        ctxt->ops->set_segment(ctxt, selector, &desc, base3, seg);
+}
+
+static int __linearize(struct x86_emulate_ctxt *ctxt,
+                     struct segmented_address addr,
+                     unsigned size, bool write, bool fetch,
+                     ulong *linear)
+{
+        struct decode_cache *c = &ctxt->decode;
+        struct desc_struct desc;
+        bool usable;
+        ulong la;
+        u32 lim;
+        u16 sel;
+        unsigned cpl, rpl;
+
+        la = seg_base(ctxt, ctxt->ops, addr.seg) + addr.ea;
+        switch (ctxt->mode) {
+        case X86EMUL_MODE_REAL:
+                break;
+        case X86EMUL_MODE_PROT64:
+                if (((signed long)la << 16) >> 16 != la)
+                        return emulate_gp(ctxt, 0);
+                break;
+        default:
+                usable = ctxt->ops->get_segment(ctxt, &sel, &desc, NULL,
+                                                addr.seg);
+                if (!usable)
+                        goto bad;
+                /* code segment or read-only data segment */
+                if (((desc.type & 8) || !(desc.type & 2)) && write)
+                        goto bad;
+                /* unreadable code segment */
+                if (!fetch && (desc.type & 8) && !(desc.type & 2))
+                        goto bad;
+                lim = desc_limit_scaled(&desc);
+                if ((desc.type & 8) || !(desc.type & 4)) {
+                        /* expand-up segment */
+                        if (addr.ea > lim || (u32)(addr.ea + size - 1) > lim)
+                                goto bad;
+                } else {
+                        /* exapand-down segment */
+                        if (addr.ea <= lim || (u32)(addr.ea + size - 1) <= lim)
+                                goto bad;
+                        lim = desc.d ? 0xffffffff : 0xffff;
+                        if (addr.ea > lim || (u32)(addr.ea + size - 1) > lim)
+                                goto bad;
+                }
+                cpl = ctxt->ops->cpl(ctxt);
+                rpl = sel & 3;
+                cpl = max(cpl, rpl);
+                if (!(desc.type & 8)) {
+                        /* data segment */
+                        if (cpl > desc.dpl)
+                                goto bad;
+                } else if ((desc.type & 8) && !(desc.type & 4)) {
+                        /* nonconforming code segment */
+                        if (cpl != desc.dpl)
+                                goto bad;
+                } else if ((desc.type & 8) && (desc.type & 4)) {
+                        /* conforming code segment */
+                        if (cpl < desc.dpl)
+                                goto bad;
+                }
+                break;
+        }
+        if (fetch ? ctxt->mode != X86EMUL_MODE_PROT64 : c->ad_bytes != 8)
+                la &= (u32)-1;
+        *linear = la;
+        return X86EMUL_CONTINUE;
+bad:
+        if (addr.seg == VCPU_SREG_SS)
+                return emulate_ss(ctxt, addr.seg);
+        else
+                return emulate_gp(ctxt, addr.seg);
+}
+
+static int linearize(struct x86_emulate_ctxt *ctxt,
+                     struct segmented_address addr,
+                     unsigned size, bool write,
+                     ulong *linear)
+{
+        return __linearize(ctxt, addr, size, write, false, linear);
+}
+
+
+static int segmented_read_std(struct x86_emulate_ctxt *ctxt,
+                              struct segmented_address addr,
+                              void *data,
+                              unsigned size)
+{
+        int rc;
+        ulong linear;
+
+        rc = linearize(ctxt, addr, size, false, &linear);
+        if (rc != X86EMUL_CONTINUE)
+                return rc;
+        return ctxt->ops->read_std(ctxt, linear, data, size, &ctxt->exception);
+}
+
 static int do_fetch_insn_byte(struct x86_emulate_ctxt *ctxt,
                               struct x86_emulate_ops *ops,
                               unsigned long eip, u8 *dest)
@@ -505,10 +678,15 @@ static int do_fetch_insn_byte(struct x86_emulate_ctxt *ctxt,
         int size, cur_size;
 
         if (eip == fc->end) {
+                unsigned long linear;
+                struct segmented_address addr = { .seg=VCPU_SREG_CS, .ea=eip};
                 cur_size = fc->end - fc->start;
                 size = min(15UL - cur_size, PAGE_SIZE - offset_in_page(eip));
-                rc = ops->fetch(ctxt->cs_base + eip, fc->data + cur_size,
-                                size, ctxt->vcpu, &ctxt->exception);
+                rc = __linearize(ctxt, addr, size, false, true, &linear);
+                if (rc != X86EMUL_CONTINUE)
+                        return rc;
+                rc = ops->fetch(ctxt, linear, fc->data + cur_size,
+                                size, &ctxt->exception);
                 if (rc != X86EMUL_CONTINUE)
                         return rc;
                 fc->end += size;
@@ -551,7 +729,6 @@ static void *decode_register(u8 modrm_reg, unsigned long *regs,
 }
 
 static int read_descriptor(struct x86_emulate_ctxt *ctxt,
-                           struct x86_emulate_ops *ops,
                            struct segmented_address addr,
                            u16 *size, unsigned long *address, int op_bytes)
 {
@@ -560,13 +737,11 @@ static int read_descriptor(struct x86_emulate_ctxt *ctxt,
         if (op_bytes == 2)
                 op_bytes = 3;
         *address = 0;
-        rc = ops->read_std(linear(ctxt, addr), (unsigned long *)size, 2,
-                           ctxt->vcpu, &ctxt->exception);
+        rc = segmented_read_std(ctxt, addr, size, 2);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
         addr.ea += 2;
-        rc = ops->read_std(linear(ctxt, addr), address, op_bytes,
-                           ctxt->vcpu, &ctxt->exception);
+        rc = segmented_read_std(ctxt, addr, address, op_bytes);
         return rc;
 }
 
@@ -623,7 +798,63 @@ static void fetch_register_operand(struct operand *op)
         }
 }
 
-static void decode_register_operand(struct operand *op,
+static void read_sse_reg(struct x86_emulate_ctxt *ctxt, sse128_t *data, int reg)
+{
+        ctxt->ops->get_fpu(ctxt);
+        switch (reg) {
+        case 0: asm("movdqu %%xmm0, %0" : "=m"(*data)); break;
+        case 1: asm("movdqu %%xmm1, %0" : "=m"(*data)); break;
+        case 2: asm("movdqu %%xmm2, %0" : "=m"(*data)); break;
+        case 3: asm("movdqu %%xmm3, %0" : "=m"(*data)); break;
+        case 4: asm("movdqu %%xmm4, %0" : "=m"(*data)); break;
+        case 5: asm("movdqu %%xmm5, %0" : "=m"(*data)); break;
+        case 6: asm("movdqu %%xmm6, %0" : "=m"(*data)); break;
+        case 7: asm("movdqu %%xmm7, %0" : "=m"(*data)); break;
+#ifdef CONFIG_X86_64
+        case 8: asm("movdqu %%xmm8, %0" : "=m"(*data)); break;
+        case 9: asm("movdqu %%xmm9, %0" : "=m"(*data)); break;
+        case 10: asm("movdqu %%xmm10, %0" : "=m"(*data)); break;
+        case 11: asm("movdqu %%xmm11, %0" : "=m"(*data)); break;
+        case 12: asm("movdqu %%xmm12, %0" : "=m"(*data)); break;
+        case 13: asm("movdqu %%xmm13, %0" : "=m"(*data)); break;
+        case 14: asm("movdqu %%xmm14, %0" : "=m"(*data)); break;
+        case 15: asm("movdqu %%xmm15, %0" : "=m"(*data)); break;
+#endif
+        default: BUG();
+        }
+        ctxt->ops->put_fpu(ctxt);
+}
+
+static void write_sse_reg(struct x86_emulate_ctxt *ctxt, sse128_t *data,
+                          int reg)
+{
+        ctxt->ops->get_fpu(ctxt);
+        switch (reg) {
+        case 0: asm("movdqu %0, %%xmm0" : : "m"(*data)); break;
+        case 1: asm("movdqu %0, %%xmm1" : : "m"(*data)); break;
+        case 2: asm("movdqu %0, %%xmm2" : : "m"(*data)); break;
+        case 3: asm("movdqu %0, %%xmm3" : : "m"(*data)); break;
+        case 4: asm("movdqu %0, %%xmm4" : : "m"(*data)); break;
+        case 5: asm("movdqu %0, %%xmm5" : : "m"(*data)); break;
+        case 6: asm("movdqu %0, %%xmm6" : : "m"(*data)); break;
+        case 7: asm("movdqu %0, %%xmm7" : : "m"(*data)); break;
+#ifdef CONFIG_X86_64
+        case 8: asm("movdqu %0, %%xmm8" : : "m"(*data)); break;
+        case 9: asm("movdqu %0, %%xmm9" : : "m"(*data)); break;
+        case 10: asm("movdqu %0, %%xmm10" : : "m"(*data)); break;
+        case 11: asm("movdqu %0, %%xmm11" : : "m"(*data)); break;
+        case 12: asm("movdqu %0, %%xmm12" : : "m"(*data)); break;
+        case 13: asm("movdqu %0, %%xmm13" : : "m"(*data)); break;
+        case 14: asm("movdqu %0, %%xmm14" : : "m"(*data)); break;
+        case 15: asm("movdqu %0, %%xmm15" : : "m"(*data)); break;
+#endif
+        default: BUG();
+        }
+        ctxt->ops->put_fpu(ctxt);
+}
+
+static void decode_register_operand(struct x86_emulate_ctxt *ctxt,
+                                    struct operand *op,
                                     struct decode_cache *c,
                                     int inhibit_bytereg)
 {
@@ -632,6 +863,15 @@ static void decode_register_operand(struct operand *op,
 
         if (!(c->d & ModRM))
                 reg = (c->b & 7) | ((c->rex_prefix & 1) << 3);
+
+        if (c->d & Sse) {
+                op->type = OP_XMM;
+                op->bytes = 16;
+                op->addr.xmm = reg;
+                read_sse_reg(ctxt, &op->vec_val, reg);
+                return;
+        }
+
         op->type = OP_REG;
         if ((c->d & ByteOp) && !inhibit_bytereg) {
                 op->addr.reg = decode_register(reg, c->regs, highbyte_regs);
@@ -671,6 +911,13 @@ static int decode_modrm(struct x86_emulate_ctxt *ctxt,
                 op->bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
                 op->addr.reg = decode_register(c->modrm_rm,
                                                c->regs, c->d & ByteOp);
+                if (c->d & Sse) {
+                        op->type = OP_XMM;
+                        op->bytes = 16;
+                        op->addr.xmm = c->modrm_rm;
+                        read_sse_reg(ctxt, &op->vec_val, c->modrm_rm);
+                        return rc;
+                }
                 fetch_register_operand(op);
                 return rc;
         }
@@ -819,8 +1066,8 @@ static int read_emulated(struct x86_emulate_ctxt *ctxt,
                 if (mc->pos < mc->end)
                         goto read_cached;
 
-                rc = ops->read_emulated(addr, mc->data + mc->end, n,
-                                        &ctxt->exception, ctxt->vcpu);
+                rc = ops->read_emulated(ctxt, addr, mc->data + mc->end, n,
+                                        &ctxt->exception);
                 if (rc != X86EMUL_CONTINUE)
                         return rc;
                 mc->end += n;
@@ -834,6 +1081,50 @@ static int read_emulated(struct x86_emulate_ctxt *ctxt,
         return X86EMUL_CONTINUE;
 }
 
+static int segmented_read(struct x86_emulate_ctxt *ctxt,
+                          struct segmented_address addr,
+                          void *data,
+                          unsigned size)
+{
+        int rc;
+        ulong linear;
+
+        rc = linearize(ctxt, addr, size, false, &linear);
+        if (rc != X86EMUL_CONTINUE)
+                return rc;
+        return read_emulated(ctxt, ctxt->ops, linear, data, size);
+}
+
+static int segmented_write(struct x86_emulate_ctxt *ctxt,
+                           struct segmented_address addr,
+                           const void *data,
+                           unsigned size)
+{
+        int rc;
+        ulong linear;
+
+        rc = linearize(ctxt, addr, size, true, &linear);
+        if (rc != X86EMUL_CONTINUE)
+                return rc;
+        return ctxt->ops->write_emulated(ctxt, linear, data, size,
+                                         &ctxt->exception);
+}
+
+static int segmented_cmpxchg(struct x86_emulate_ctxt *ctxt,
+                             struct segmented_address addr,
+                             const void *orig_data, const void *data,
+                             unsigned size)
+{
+        int rc;
+        ulong linear;
+
+        rc = linearize(ctxt, addr, size, true, &linear);
+        if (rc != X86EMUL_CONTINUE)
+                return rc;
+        return ctxt->ops->cmpxchg_emulated(ctxt, linear, orig_data, data,
+                                           size, &ctxt->exception);
+}
+
 static int pio_in_emulated(struct x86_emulate_ctxt *ctxt,
                            struct x86_emulate_ops *ops,
                            unsigned int size, unsigned short port,
@@ -854,7 +1145,7 @@ static int pio_in_emulated(struct x86_emulate_ctxt *ctxt,
                 if (n == 0)
                         n = 1;
                 rc->pos = rc->end = 0;
-                if (!ops->pio_in_emulated(size, port, rc->data, n, ctxt->vcpu))
+                if (!ops->pio_in_emulated(ctxt, size, port, rc->data, n))
                         return 0;
                 rc->end = n * size;
         }
@@ -864,28 +1155,22 @@ static int pio_in_emulated(struct x86_emulate_ctxt *ctxt,
         return 1;
 }
 
-static u32 desc_limit_scaled(struct desc_struct *desc)
-{
-        u32 limit = get_desc_limit(desc);
-
-        return desc->g ? (limit << 12) | 0xfff : limit;
-}
-
 static void get_descriptor_table_ptr(struct x86_emulate_ctxt *ctxt,
                                      struct x86_emulate_ops *ops,
                                      u16 selector, struct desc_ptr *dt)
 {
         if (selector & 1 << 2) {
                 struct desc_struct desc;
+                u16 sel;
+
                 memset (dt, 0, sizeof *dt);
-                if (!ops->get_cached_descriptor(&desc, NULL, VCPU_SREG_LDTR,
-                                                ctxt->vcpu))
+                if (!ops->get_segment(ctxt, &sel, &desc, NULL, VCPU_SREG_LDTR))
                         return;
 
                 dt->size = desc_limit_scaled(&desc); /* what if limit > 65535? */
                 dt->address = get_desc_base(&desc);
         } else
-                ops->get_gdt(dt, ctxt->vcpu);
+                ops->get_gdt(ctxt, dt);
 }
 
 /* allowed just for 8 bytes segments */
@@ -903,8 +1188,7 @@ static int read_segment_descriptor(struct x86_emulate_ctxt *ctxt,
         if (dt.size < index * 8 + 7)
                 return emulate_gp(ctxt, selector & 0xfffc);
         addr = dt.address + index * 8;
-        ret = ops->read_std(addr, desc, sizeof *desc, ctxt->vcpu,
-                            &ctxt->exception);
+        ret = ops->read_std(ctxt, addr, desc, sizeof *desc, &ctxt->exception);
 
        return ret;
 }
@@ -925,8 +1209,7 @@ static int write_segment_descriptor(struct x86_emulate_ctxt *ctxt,
                 return emulate_gp(ctxt, selector & 0xfffc);
 
         addr = dt.address + index * 8;
-        ret = ops->write_std(addr, desc, sizeof *desc, ctxt->vcpu,
-                             &ctxt->exception);
+        ret = ops->write_std(ctxt, addr, desc, sizeof *desc, &ctxt->exception);
 
         return ret;
 }
@@ -986,7 +1269,7 @@ static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
 
         rpl = selector & 3;
         dpl = seg_desc.dpl;
-        cpl = ops->cpl(ctxt->vcpu);
+        cpl = ops->cpl(ctxt);
 
         switch (seg) {
         case VCPU_SREG_SS:
@@ -1042,8 +1325,7 @@ static int load_segment_descriptor(struct x86_emulate_ctxt *ctxt,
                         return ret;
         }
 load:
-        ops->set_segment_selector(selector, seg, ctxt->vcpu);
-        ops->set_cached_descriptor(&seg_desc, 0, seg, ctxt->vcpu);
+        ops->set_segment(ctxt, selector, &seg_desc, 0, seg);
         return X86EMUL_CONTINUE;
 exception:
         emulate_exception(ctxt, err_vec, err_code, true);
@@ -1069,8 +1351,7 @@ static void write_register_operand(struct operand *op)
         }
 }
 
-static inline int writeback(struct x86_emulate_ctxt *ctxt,
-                            struct x86_emulate_ops *ops)
+static int writeback(struct x86_emulate_ctxt *ctxt)
 {
         int rc;
         struct decode_cache *c = &ctxt->decode;
@@ -1081,23 +1362,22 @@ static inline int writeback(struct x86_emulate_ctxt *ctxt,
                 break;
         case OP_MEM:
                 if (c->lock_prefix)
-                        rc = ops->cmpxchg_emulated(
-                                        linear(ctxt, c->dst.addr.mem),
-                                        &c->dst.orig_val,
-                                        &c->dst.val,
-                                        c->dst.bytes,
-                                        &ctxt->exception,
-                                        ctxt->vcpu);
+                        rc = segmented_cmpxchg(ctxt,
+                                               c->dst.addr.mem,
+                                               &c->dst.orig_val,
+                                               &c->dst.val,
+                                               c->dst.bytes);
                 else
-                        rc = ops->write_emulated(
-                                        linear(ctxt, c->dst.addr.mem),
-                                        &c->dst.val,
-                                        c->dst.bytes,
-                                        &ctxt->exception,
-                                        ctxt->vcpu);
+                        rc = segmented_write(ctxt,
+                                             c->dst.addr.mem,
+                                             &c->dst.val,
+                                             c->dst.bytes);
                 if (rc != X86EMUL_CONTINUE)
                         return rc;
                 break;
+        case OP_XMM:
+                write_sse_reg(ctxt, &c->dst.vec_val, c->dst.addr.xmm);
+                break;
         case OP_NONE:
                 /* no writeback */
                 break;
@@ -1107,21 +1387,21 @@ static inline int writeback(struct x86_emulate_ctxt *ctxt,
         return X86EMUL_CONTINUE;
 }
 
-static inline void emulate_push(struct x86_emulate_ctxt *ctxt,
-                                struct x86_emulate_ops *ops)
+static int em_push(struct x86_emulate_ctxt *ctxt)
 {
         struct decode_cache *c = &ctxt->decode;
+        struct segmented_address addr;
 
-        c->dst.type  = OP_MEM;
-        c->dst.bytes = c->op_bytes;
-        c->dst.val = c->src.val;
         register_address_increment(c, &c->regs[VCPU_REGS_RSP], -c->op_bytes);
-        c->dst.addr.mem.ea = register_address(c, c->regs[VCPU_REGS_RSP]);
-        c->dst.addr.mem.seg = VCPU_SREG_SS;
+        addr.ea = register_address(c, c->regs[VCPU_REGS_RSP]);
+        addr.seg = VCPU_SREG_SS;
+
+        /* Disable writeback. */
+        c->dst.type = OP_NONE;
+        return segmented_write(ctxt, addr, &c->src.val, c->op_bytes);
 }
 
 static int emulate_pop(struct x86_emulate_ctxt *ctxt,
-                       struct x86_emulate_ops *ops,
                        void *dest, int len)
 {
         struct decode_cache *c = &ctxt->decode;
@@ -1130,7 +1410,7 @@ static int emulate_pop(struct x86_emulate_ctxt *ctxt,
 
         addr.ea = register_address(c, c->regs[VCPU_REGS_RSP]);
         addr.seg = VCPU_SREG_SS;
-        rc = read_emulated(ctxt, ops, linear(ctxt, addr), dest, len);
+        rc = segmented_read(ctxt, addr, dest, len);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
 
@@ -1138,6 +1418,13 @@ static int emulate_pop(struct x86_emulate_ctxt *ctxt,
         return rc;
 }
 
+static int em_pop(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        return emulate_pop(ctxt, &c->dst.val, c->op_bytes);
+}
+
 static int emulate_popf(struct x86_emulate_ctxt *ctxt,
                        struct x86_emulate_ops *ops,
                        void *dest, int len)
@@ -1145,9 +1432,9 @@ static int emulate_popf(struct x86_emulate_ctxt *ctxt,
         int rc;
         unsigned long val, change_mask;
         int iopl = (ctxt->eflags & X86_EFLAGS_IOPL) >> IOPL_SHIFT;
-        int cpl = ops->cpl(ctxt->vcpu);
+        int cpl = ops->cpl(ctxt);
 
-        rc = emulate_pop(ctxt, ops, &val, len);
+        rc = emulate_pop(ctxt, &val, len);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
 
@@ -1179,14 +1466,24 @@ static int emulate_popf(struct x86_emulate_ctxt *ctxt,
         return rc;
 }
 
-static void emulate_push_sreg(struct x86_emulate_ctxt *ctxt,
-                              struct x86_emulate_ops *ops, int seg)
+static int em_popf(struct x86_emulate_ctxt *ctxt)
 {
         struct decode_cache *c = &ctxt->decode;
 
-        c->src.val = ops->get_segment_selector(seg, ctxt->vcpu);
+        c->dst.type = OP_REG;
+        c->dst.addr.reg = &ctxt->eflags;
+        c->dst.bytes = c->op_bytes;
+        return emulate_popf(ctxt, ctxt->ops, &c->dst.val, c->op_bytes);
+}
 
-        emulate_push(ctxt, ops);
+static int emulate_push_sreg(struct x86_emulate_ctxt *ctxt,
+                             struct x86_emulate_ops *ops, int seg)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        c->src.val = get_segment_selector(ctxt, seg);
+
+        return em_push(ctxt);
 }
 
 static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt,
@@ -1196,7 +1493,7 @@ static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt,
         unsigned long selector;
         int rc;
 
-        rc = emulate_pop(ctxt, ops, &selector, c->op_bytes);
+        rc = emulate_pop(ctxt, &selector, c->op_bytes);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
 
@@ -1204,8 +1501,7 @@ static int emulate_pop_sreg(struct x86_emulate_ctxt *ctxt,
         return rc;
 }
 
-static int emulate_pusha(struct x86_emulate_ctxt *ctxt,
-                          struct x86_emulate_ops *ops)
+static int em_pusha(struct x86_emulate_ctxt *ctxt)
 {
         struct decode_cache *c = &ctxt->decode;
         unsigned long old_esp = c->regs[VCPU_REGS_RSP];
@@ -1216,23 +1512,25 @@ static int emulate_pusha(struct x86_emulate_ctxt *ctxt,
                 (reg == VCPU_REGS_RSP) ?
                 (c->src.val = old_esp) : (c->src.val = c->regs[reg]);
 
-                emulate_push(ctxt, ops);
-
-                rc = writeback(ctxt, ops);
+                rc = em_push(ctxt);
                 if (rc != X86EMUL_CONTINUE)
                         return rc;
 
                 ++reg;
         }
 
-        /* Disable writeback. */
-        c->dst.type = OP_NONE;
-
         return rc;
 }
 
-static int emulate_popa(struct x86_emulate_ctxt *ctxt,
-                        struct x86_emulate_ops *ops)
+static int em_pushf(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        c->src.val =  (unsigned long)ctxt->eflags;
+        return em_push(ctxt);
+}
+
+static int em_popa(struct x86_emulate_ctxt *ctxt)
 {
         struct decode_cache *c = &ctxt->decode;
         int rc = X86EMUL_CONTINUE;
@@ -1245,7 +1543,7 @@ static int emulate_popa(struct x86_emulate_ctxt *ctxt,
                         --reg;
                 }
 
-                rc = emulate_pop(ctxt, ops, &c->regs[reg], c->op_bytes);
+                rc = emulate_pop(ctxt, &c->regs[reg], c->op_bytes);
                 if (rc != X86EMUL_CONTINUE)
                         break;
                 --reg;
@@ -1265,37 +1563,32 @@ int emulate_int_real(struct x86_emulate_ctxt *ctxt,
 
         /* TODO: Add limit checks */
         c->src.val = ctxt->eflags;
-        emulate_push(ctxt, ops);
-        rc = writeback(ctxt, ops);
+        rc = em_push(ctxt);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
 
         ctxt->eflags &= ~(EFLG_IF | EFLG_TF | EFLG_AC);
 
-        c->src.val = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
-        emulate_push(ctxt, ops);
-        rc = writeback(ctxt, ops);
+        c->src.val = get_segment_selector(ctxt, VCPU_SREG_CS);
+        rc = em_push(ctxt);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
 
         c->src.val = c->eip;
-        emulate_push(ctxt, ops);
-        rc = writeback(ctxt, ops);
+        rc = em_push(ctxt);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
 
-        c->dst.type = OP_NONE;
-
-        ops->get_idt(&dt, ctxt->vcpu);
+        ops->get_idt(ctxt, &dt);
 
         eip_addr = dt.address + (irq << 2);
         cs_addr = dt.address + (irq << 2) + 2;
 
-        rc = ops->read_std(cs_addr, &cs, 2, ctxt->vcpu, &ctxt->exception);
+        rc = ops->read_std(ctxt, cs_addr, &cs, 2, &ctxt->exception);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
 
-        rc = ops->read_std(eip_addr, &eip, 2, ctxt->vcpu, &ctxt->exception);
+        rc = ops->read_std(ctxt, eip_addr, &eip, 2, &ctxt->exception);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
 
@@ -1339,7 +1632,7 @@ static int emulate_iret_real(struct x86_emulate_ctxt *ctxt,
 
         /* TODO: Add stack limit check */
 
-        rc = emulate_pop(ctxt, ops, &temp_eip, c->op_bytes);
+        rc = emulate_pop(ctxt, &temp_eip, c->op_bytes);
 
         if (rc != X86EMUL_CONTINUE)
                 return rc;
@@ -1347,12 +1640,12 @@ static int emulate_iret_real(struct x86_emulate_ctxt *ctxt,
         if (temp_eip & ~0xffff)
                 return emulate_gp(ctxt, 0);
 
-        rc = emulate_pop(ctxt, ops, &cs, c->op_bytes);
+        rc = emulate_pop(ctxt, &cs, c->op_bytes);
 
         if (rc != X86EMUL_CONTINUE)
                 return rc;
 
-        rc = emulate_pop(ctxt, ops, &temp_eflags, c->op_bytes);
+        rc = emulate_pop(ctxt, &temp_eflags, c->op_bytes);
 
         if (rc != X86EMUL_CONTINUE)
                 return rc;
@@ -1394,15 +1687,31 @@ static inline int emulate_iret(struct x86_emulate_ctxt *ctxt,
         }
 }
 
-static inline int emulate_grp1a(struct x86_emulate_ctxt *ctxt,
-                                struct x86_emulate_ops *ops)
+static int em_jmp_far(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+        int rc;
+        unsigned short sel;
+
+        memcpy(&sel, c->src.valptr + c->op_bytes, 2);
+
+        rc = load_segment_descriptor(ctxt, ctxt->ops, sel, VCPU_SREG_CS);
+        if (rc != X86EMUL_CONTINUE)
+                return rc;
+
+        c->eip = 0;
+        memcpy(&c->eip, c->src.valptr, c->op_bytes);
+        return X86EMUL_CONTINUE;
+}
+
+static int em_grp1a(struct x86_emulate_ctxt *ctxt)
 {
         struct decode_cache *c = &ctxt->decode;
 
-        return emulate_pop(ctxt, ops, &c->dst.val, c->dst.bytes);
+        return emulate_pop(ctxt, &c->dst.val, c->dst.bytes);
 }
 
-static inline void emulate_grp2(struct x86_emulate_ctxt *ctxt)
+static int em_grp2(struct x86_emulate_ctxt *ctxt)
 {
         struct decode_cache *c = &ctxt->decode;
         switch (c->modrm_reg) {
@@ -1429,10 +1738,10 @@ static inline void emulate_grp2(struct x86_emulate_ctxt *ctxt)
                 emulate_2op_SrcB("sar", c->src, c->dst, ctxt->eflags);
                 break;
         }
+        return X86EMUL_CONTINUE;
 }
 
-static inline int emulate_grp3(struct x86_emulate_ctxt *ctxt,
-                               struct x86_emulate_ops *ops)
+static int em_grp3(struct x86_emulate_ctxt *ctxt)
 {
         struct decode_cache *c = &ctxt->decode;
         unsigned long *rax = &c->regs[VCPU_REGS_RAX];
@@ -1471,10 +1780,10 @@ static inline int emulate_grp3(struct x86_emulate_ctxt *ctxt,
         return X86EMUL_CONTINUE;
 }
 
-static inline int emulate_grp45(struct x86_emulate_ctxt *ctxt,
-                               struct x86_emulate_ops *ops)
+static int em_grp45(struct x86_emulate_ctxt *ctxt)
 {
         struct decode_cache *c = &ctxt->decode;
+        int rc = X86EMUL_CONTINUE;
 
         switch (c->modrm_reg) {
         case 0: /* inc */
@@ -1488,21 +1797,23 @@ static inline int emulate_grp45(struct x86_emulate_ctxt *ctxt,
                 old_eip = c->eip;
                 c->eip = c->src.val;
                 c->src.val = old_eip;
-                emulate_push(ctxt, ops);
+                rc = em_push(ctxt);
                 break;
         }
         case 4: /* jmp abs */
                 c->eip = c->src.val;
                 break;
+        case 5: /* jmp far */
+                rc = em_jmp_far(ctxt);
+                break;
         case 6: /* push */
-                emulate_push(ctxt, ops);
+                rc = em_push(ctxt);
                 break;
         }
-        return X86EMUL_CONTINUE;
+        return rc;
 }
 
-static inline int emulate_grp9(struct x86_emulate_ctxt *ctxt,
-                               struct x86_emulate_ops *ops)
+static int em_grp9(struct x86_emulate_ctxt *ctxt)
 {
         struct decode_cache *c = &ctxt->decode;
         u64 old = c->dst.orig_val64;
@@ -1528,12 +1839,12 @@ static int emulate_ret_far(struct x86_emulate_ctxt *ctxt,
         int rc;
         unsigned long cs;
 
-        rc = emulate_pop(ctxt, ops, &c->eip, c->op_bytes);
+        rc = emulate_pop(ctxt, &c->eip, c->op_bytes);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
         if (c->op_bytes == 4)
                 c->eip = (u32)c->eip;
-        rc = emulate_pop(ctxt, ops, &cs, c->op_bytes);
+        rc = emulate_pop(ctxt, &cs, c->op_bytes);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
         rc = load_segment_descriptor(ctxt, ops, (u16)cs, VCPU_SREG_CS);
@@ -1562,8 +1873,10 @@ setup_syscalls_segments(struct x86_emulate_ctxt *ctxt,
                         struct x86_emulate_ops *ops, struct desc_struct *cs,
                         struct desc_struct *ss)
 {
+        u16 selector;
+
         memset(cs, 0, sizeof(struct desc_struct));
-        ops->get_cached_descriptor(cs, NULL, VCPU_SREG_CS, ctxt->vcpu);
+        ops->get_segment(ctxt, &selector, cs, NULL, VCPU_SREG_CS);
         memset(ss, 0, sizeof(struct desc_struct));
 
         cs->l = 0;              /* will be adjusted later */
@@ -1593,44 +1906,44 @@ emulate_syscall(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
         struct desc_struct cs, ss;
         u64 msr_data;
         u16 cs_sel, ss_sel;
+        u64 efer = 0;
 
         /* syscall is not available in real mode */
         if (ctxt->mode == X86EMUL_MODE_REAL ||
             ctxt->mode == X86EMUL_MODE_VM86)
                 return emulate_ud(ctxt);
 
+        ops->get_msr(ctxt, MSR_EFER, &efer);
         setup_syscalls_segments(ctxt, ops, &cs, &ss);
 
-        ops->get_msr(ctxt->vcpu, MSR_STAR, &msr_data);
+        ops->get_msr(ctxt, MSR_STAR, &msr_data);
         msr_data >>= 32;
         cs_sel = (u16)(msr_data & 0xfffc);
         ss_sel = (u16)(msr_data + 8);
 
-        if (is_long_mode(ctxt->vcpu)) {
+        if (efer & EFER_LMA) {
                 cs.d = 0;
                 cs.l = 1;
         }
-        ops->set_cached_descriptor(&cs, 0, VCPU_SREG_CS, ctxt->vcpu);
-        ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu);
-        ops->set_cached_descriptor(&ss, 0, VCPU_SREG_SS, ctxt->vcpu);
-        ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu);
+        ops->set_segment(ctxt, cs_sel, &cs, 0, VCPU_SREG_CS);
+        ops->set_segment(ctxt, ss_sel, &ss, 0, VCPU_SREG_SS);
 
         c->regs[VCPU_REGS_RCX] = c->eip;
-        if (is_long_mode(ctxt->vcpu)) {
+        if (efer & EFER_LMA) {
 #ifdef CONFIG_X86_64
                 c->regs[VCPU_REGS_R11] = ctxt->eflags & ~EFLG_RF;
 
-                ops->get_msr(ctxt->vcpu,
+                ops->get_msr(ctxt,
                              ctxt->mode == X86EMUL_MODE_PROT64 ?
                              MSR_LSTAR : MSR_CSTAR, &msr_data);
                 c->eip = msr_data;
 
-                ops->get_msr(ctxt->vcpu, MSR_SYSCALL_MASK, &msr_data);
+                ops->get_msr(ctxt, MSR_SYSCALL_MASK, &msr_data);
                 ctxt->eflags &= ~(msr_data | EFLG_RF);
 #endif
         } else {
                 /* legacy mode */
-                ops->get_msr(ctxt->vcpu, MSR_STAR, &msr_data);
+                ops->get_msr(ctxt, MSR_STAR, &msr_data);
                 c->eip = (u32)msr_data;
 
                 ctxt->eflags &= ~(EFLG_VM | EFLG_IF | EFLG_RF);
@@ -1646,7 +1959,9 @@ emulate_sysenter(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
         struct desc_struct cs, ss;
         u64 msr_data;
         u16 cs_sel, ss_sel;
+        u64 efer = 0;
 
+        ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
         /* inject #GP if in real mode */
         if (ctxt->mode == X86EMUL_MODE_REAL)
                 return emulate_gp(ctxt, 0);
@@ -1659,7 +1974,7 @@ emulate_sysenter(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 
         setup_syscalls_segments(ctxt, ops, &cs, &ss);
 
-        ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_CS, &msr_data);
+        ops->get_msr(ctxt, MSR_IA32_SYSENTER_CS, &msr_data);
         switch (ctxt->mode) {
         case X86EMUL_MODE_PROT32:
                 if ((msr_data & 0xfffc) == 0x0)
@@ -1676,21 +1991,18 @@ emulate_sysenter(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
         cs_sel &= ~SELECTOR_RPL_MASK;
         ss_sel = cs_sel + 8;
         ss_sel &= ~SELECTOR_RPL_MASK;
-        if (ctxt->mode == X86EMUL_MODE_PROT64
-                || is_long_mode(ctxt->vcpu)) {
+        if (ctxt->mode == X86EMUL_MODE_PROT64 || (efer & EFER_LMA)) {
                 cs.d = 0;
                 cs.l = 1;
         }
 
-        ops->set_cached_descriptor(&cs, 0, VCPU_SREG_CS, ctxt->vcpu);
-        ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu);
-        ops->set_cached_descriptor(&ss, 0, VCPU_SREG_SS, ctxt->vcpu);
-        ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu);
+        ops->set_segment(ctxt, cs_sel, &cs, 0, VCPU_SREG_CS);
+        ops->set_segment(ctxt, ss_sel, &ss, 0, VCPU_SREG_SS);
 
-        ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_EIP, &msr_data);
+        ops->get_msr(ctxt, MSR_IA32_SYSENTER_EIP, &msr_data);
         c->eip = msr_data;
 
-        ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_ESP, &msr_data);
+        ops->get_msr(ctxt, MSR_IA32_SYSENTER_ESP, &msr_data);
         c->regs[VCPU_REGS_RSP] = msr_data;
 
         return X86EMUL_CONTINUE;
@@ -1719,7 +2031,7 @@ emulate_sysexit(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 
         cs.dpl = 3;
         ss.dpl = 3;
-        ops->get_msr(ctxt->vcpu, MSR_IA32_SYSENTER_CS, &msr_data);
+        ops->get_msr(ctxt, MSR_IA32_SYSENTER_CS, &msr_data);
         switch (usermode) {
         case X86EMUL_MODE_PROT32:
                 cs_sel = (u16)(msr_data + 16);
@@ -1739,10 +2051,8 @@ emulate_sysexit(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
         cs_sel |= SELECTOR_RPL_MASK;
         ss_sel |= SELECTOR_RPL_MASK;
 
-        ops->set_cached_descriptor(&cs, 0, VCPU_SREG_CS, ctxt->vcpu);
-        ops->set_segment_selector(cs_sel, VCPU_SREG_CS, ctxt->vcpu);
-        ops->set_cached_descriptor(&ss, 0, VCPU_SREG_SS, ctxt->vcpu);
-        ops->set_segment_selector(ss_sel, VCPU_SREG_SS, ctxt->vcpu);
+        ops->set_segment(ctxt, cs_sel, &cs, 0, VCPU_SREG_CS);
+        ops->set_segment(ctxt, ss_sel, &ss, 0, VCPU_SREG_SS);
 
         c->eip = c->regs[VCPU_REGS_RDX];
         c->regs[VCPU_REGS_RSP] = c->regs[VCPU_REGS_RCX];
@@ -1759,7 +2069,7 @@ static bool emulator_bad_iopl(struct x86_emulate_ctxt *ctxt,
         if (ctxt->mode == X86EMUL_MODE_VM86)
                 return true;
         iopl = (ctxt->eflags & X86_EFLAGS_IOPL) >> IOPL_SHIFT;
-        return ops->cpl(ctxt->vcpu) > iopl;
+        return ops->cpl(ctxt) > iopl;
 }
 
 static bool emulator_io_port_access_allowed(struct x86_emulate_ctxt *ctxt,
@@ -1769,11 +2079,11 @@ static bool emulator_io_port_access_allowed(struct x86_emulate_ctxt *ctxt,
         struct desc_struct tr_seg;
         u32 base3;
         int r;
-        u16 io_bitmap_ptr, perm, bit_idx = port & 0x7;
+        u16 tr, io_bitmap_ptr, perm, bit_idx = port & 0x7;
         unsigned mask = (1 << len) - 1;
         unsigned long base;
 
-        ops->get_cached_descriptor(&tr_seg, &base3, VCPU_SREG_TR, ctxt->vcpu);
+        ops->get_segment(ctxt, &tr, &tr_seg, &base3, VCPU_SREG_TR);
         if (!tr_seg.p)
                 return false;
         if (desc_limit_scaled(&tr_seg) < 103)
@@ -1782,13 +2092,12 @@ static bool emulator_io_port_access_allowed(struct x86_emulate_ctxt *ctxt,
 #ifdef CONFIG_X86_64
         base |= ((u64)base3) << 32;
 #endif
-        r = ops->read_std(base + 102, &io_bitmap_ptr, 2, ctxt->vcpu, NULL);
+        r = ops->read_std(ctxt, base + 102, &io_bitmap_ptr, 2, NULL);
         if (r != X86EMUL_CONTINUE)
                 return false;
         if (io_bitmap_ptr + port/8 > desc_limit_scaled(&tr_seg))
                 return false;
-        r = ops->read_std(base + io_bitmap_ptr + port/8, &perm, 2, ctxt->vcpu,
-                          NULL);
+        r = ops->read_std(ctxt, base + io_bitmap_ptr + port/8, &perm, 2, NULL);
         if (r != X86EMUL_CONTINUE)
                 return false;
         if ((perm >> bit_idx) & mask)
@@ -1829,11 +2138,11 @@ static void save_state_to_tss16(struct x86_emulate_ctxt *ctxt,
         tss->si = c->regs[VCPU_REGS_RSI];
         tss->di = c->regs[VCPU_REGS_RDI];
 
-        tss->es = ops->get_segment_selector(VCPU_SREG_ES, ctxt->vcpu);
-        tss->cs = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
-        tss->ss = ops->get_segment_selector(VCPU_SREG_SS, ctxt->vcpu);
-        tss->ds = ops->get_segment_selector(VCPU_SREG_DS, ctxt->vcpu);
-        tss->ldt = ops->get_segment_selector(VCPU_SREG_LDTR, ctxt->vcpu);
+        tss->es = get_segment_selector(ctxt, VCPU_SREG_ES);
+        tss->cs = get_segment_selector(ctxt, VCPU_SREG_CS);
+        tss->ss = get_segment_selector(ctxt, VCPU_SREG_SS);
+        tss->ds = get_segment_selector(ctxt, VCPU_SREG_DS);
+        tss->ldt = get_segment_selector(ctxt, VCPU_SREG_LDTR);
 }
 
 static int load_state_from_tss16(struct x86_emulate_ctxt *ctxt,
@@ -1858,11 +2167,11 @@ static int load_state_from_tss16(struct x86_emulate_ctxt *ctxt,
          * SDM says that segment selectors are loaded before segment
          * descriptors
          */
-        ops->set_segment_selector(tss->ldt, VCPU_SREG_LDTR, ctxt->vcpu);
-        ops->set_segment_selector(tss->es, VCPU_SREG_ES, ctxt->vcpu);
-        ops->set_segment_selector(tss->cs, VCPU_SREG_CS, ctxt->vcpu);
-        ops->set_segment_selector(tss->ss, VCPU_SREG_SS, ctxt->vcpu);
-        ops->set_segment_selector(tss->ds, VCPU_SREG_DS, ctxt->vcpu);
+        set_segment_selector(ctxt, tss->ldt, VCPU_SREG_LDTR);
+        set_segment_selector(ctxt, tss->es, VCPU_SREG_ES);
+        set_segment_selector(ctxt, tss->cs, VCPU_SREG_CS);
+        set_segment_selector(ctxt, tss->ss, VCPU_SREG_SS);
+        set_segment_selector(ctxt, tss->ds, VCPU_SREG_DS);
 
         /*
          * Now load segment descriptors. If fault happenes at this stage
@@ -1896,7 +2205,7 @@ static int task_switch_16(struct x86_emulate_ctxt *ctxt,
         int ret;
         u32 new_tss_base = get_desc_base(new_desc);
 
-        ret = ops->read_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+        ret = ops->read_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,
                             &ctxt->exception);
         if (ret != X86EMUL_CONTINUE)
                 /* FIXME: need to provide precise fault address */
@@ -1904,13 +2213,13 @@ static int task_switch_16(struct x86_emulate_ctxt *ctxt,
 
         save_state_to_tss16(ctxt, ops, &tss_seg);
 
-        ret = ops->write_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+        ret = ops->write_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,
                              &ctxt->exception);
         if (ret != X86EMUL_CONTINUE)
                 /* FIXME: need to provide precise fault address */
                 return ret;
 
-        ret = ops->read_std(new_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+        ret = ops->read_std(ctxt, new_tss_base, &tss_seg, sizeof tss_seg,
                             &ctxt->exception);
         if (ret != X86EMUL_CONTINUE)
                 /* FIXME: need to provide precise fault address */
@@ -1919,10 +2228,10 @@ static int task_switch_16(struct x86_emulate_ctxt *ctxt,
         if (old_tss_sel != 0xffff) {
                 tss_seg.prev_task_link = old_tss_sel;
 
-                ret = ops->write_std(new_tss_base,
+                ret = ops->write_std(ctxt, new_tss_base,
                                      &tss_seg.prev_task_link,
                                      sizeof tss_seg.prev_task_link,
-                                     ctxt->vcpu, &ctxt->exception);
+                                     &ctxt->exception);
                 if (ret != X86EMUL_CONTINUE)
                         /* FIXME: need to provide precise fault address */
                         return ret;
@@ -1937,7 +2246,7 @@ static void save_state_to_tss32(struct x86_emulate_ctxt *ctxt,
 {
         struct decode_cache *c = &ctxt->decode;
 
-        tss->cr3 = ops->get_cr(3, ctxt->vcpu);
+        tss->cr3 = ops->get_cr(ctxt, 3);
         tss->eip = c->eip;
         tss->eflags = ctxt->eflags;
         tss->eax = c->regs[VCPU_REGS_RAX];
@@ -1949,13 +2258,13 @@ static void save_state_to_tss32(struct x86_emulate_ctxt *ctxt,
         tss->esi = c->regs[VCPU_REGS_RSI];
         tss->edi = c->regs[VCPU_REGS_RDI];
 
-        tss->es = ops->get_segment_selector(VCPU_SREG_ES, ctxt->vcpu);
-        tss->cs = ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
-        tss->ss = ops->get_segment_selector(VCPU_SREG_SS, ctxt->vcpu);
-        tss->ds = ops->get_segment_selector(VCPU_SREG_DS, ctxt->vcpu);
-        tss->fs = ops->get_segment_selector(VCPU_SREG_FS, ctxt->vcpu);
-        tss->gs = ops->get_segment_selector(VCPU_SREG_GS, ctxt->vcpu);
-        tss->ldt_selector = ops->get_segment_selector(VCPU_SREG_LDTR, ctxt->vcpu);
+        tss->es = get_segment_selector(ctxt, VCPU_SREG_ES);
+        tss->cs = get_segment_selector(ctxt, VCPU_SREG_CS);
+        tss->ss = get_segment_selector(ctxt, VCPU_SREG_SS);
+        tss->ds = get_segment_selector(ctxt, VCPU_SREG_DS);
+        tss->fs = get_segment_selector(ctxt, VCPU_SREG_FS);
+        tss->gs = get_segment_selector(ctxt, VCPU_SREG_GS);
+        tss->ldt_selector = get_segment_selector(ctxt, VCPU_SREG_LDTR);
 }
 
 static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt,
@@ -1965,7 +2274,7 @@ static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt,
         struct decode_cache *c = &ctxt->decode;
         int ret;
 
-        if (ops->set_cr(3, tss->cr3, ctxt->vcpu))
+        if (ops->set_cr(ctxt, 3, tss->cr3))
                 return emulate_gp(ctxt, 0);
         c->eip = tss->eip;
         ctxt->eflags = tss->eflags | 2;
@@ -1982,13 +2291,13 @@ static int load_state_from_tss32(struct x86_emulate_ctxt *ctxt,
          * SDM says that segment selectors are loaded before segment
          * descriptors
          */
-        ops->set_segment_selector(tss->ldt_selector, VCPU_SREG_LDTR, ctxt->vcpu);
-        ops->set_segment_selector(tss->es, VCPU_SREG_ES, ctxt->vcpu);
-        ops->set_segment_selector(tss->cs, VCPU_SREG_CS, ctxt->vcpu);
-        ops->set_segment_selector(tss->ss, VCPU_SREG_SS, ctxt->vcpu);
-        ops->set_segment_selector(tss->ds, VCPU_SREG_DS, ctxt->vcpu);
-        ops->set_segment_selector(tss->fs, VCPU_SREG_FS, ctxt->vcpu);
-        ops->set_segment_selector(tss->gs, VCPU_SREG_GS, ctxt->vcpu);
+        set_segment_selector(ctxt, tss->ldt_selector, VCPU_SREG_LDTR);
+        set_segment_selector(ctxt, tss->es, VCPU_SREG_ES);
+        set_segment_selector(ctxt, tss->cs, VCPU_SREG_CS);
+        set_segment_selector(ctxt, tss->ss, VCPU_SREG_SS);
+        set_segment_selector(ctxt, tss->ds, VCPU_SREG_DS);
+        set_segment_selector(ctxt, tss->fs, VCPU_SREG_FS);
+        set_segment_selector(ctxt, tss->gs, VCPU_SREG_GS);
 
         /*
          * Now load segment descriptors. If fault happenes at this stage
@@ -2028,7 +2337,7 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt,
         int ret;
         u32 new_tss_base = get_desc_base(new_desc);
 
-        ret = ops->read_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+        ret = ops->read_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,
                             &ctxt->exception);
         if (ret != X86EMUL_CONTINUE)
                 /* FIXME: need to provide precise fault address */
@@ -2036,13 +2345,13 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt,
 
         save_state_to_tss32(ctxt, ops, &tss_seg);
 
-        ret = ops->write_std(old_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+        ret = ops->write_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,
                              &ctxt->exception);
         if (ret != X86EMUL_CONTINUE)
                 /* FIXME: need to provide precise fault address */
                 return ret;
 
-        ret = ops->read_std(new_tss_base, &tss_seg, sizeof tss_seg, ctxt->vcpu,
+        ret = ops->read_std(ctxt, new_tss_base, &tss_seg, sizeof tss_seg,
                             &ctxt->exception);
         if (ret != X86EMUL_CONTINUE)
                 /* FIXME: need to provide precise fault address */
@@ -2051,10 +2360,10 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt,
         if (old_tss_sel != 0xffff) {
                 tss_seg.prev_task_link = old_tss_sel;
 
-                ret = ops->write_std(new_tss_base,
+                ret = ops->write_std(ctxt, new_tss_base,
                                      &tss_seg.prev_task_link,
                                      sizeof tss_seg.prev_task_link,
-                                     ctxt->vcpu, &ctxt->exception);
+                                     &ctxt->exception);
                 if (ret != X86EMUL_CONTINUE)
                         /* FIXME: need to provide precise fault address */
                         return ret;
@@ -2070,9 +2379,9 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
 {
         struct desc_struct curr_tss_desc, next_tss_desc;
         int ret;
-        u16 old_tss_sel = ops->get_segment_selector(VCPU_SREG_TR, ctxt->vcpu);
+        u16 old_tss_sel = get_segment_selector(ctxt, VCPU_SREG_TR);
         ulong old_tss_base =
-                ops->get_cached_segment_base(VCPU_SREG_TR, ctxt->vcpu);
+                ops->get_cached_segment_base(ctxt, VCPU_SREG_TR);
         u32 desc_limit;
 
         /* FIXME: old_tss_base == ~0 ? */
@@ -2088,7 +2397,7 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
 
         if (reason != TASK_SWITCH_IRET) {
                 if ((tss_selector & 3) > next_tss_desc.dpl ||
-                    ops->cpl(ctxt->vcpu) > next_tss_desc.dpl)
+                    ops->cpl(ctxt) > next_tss_desc.dpl)
                         return emulate_gp(ctxt, 0);
         }
 
@@ -2132,9 +2441,8 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
                                          &next_tss_desc);
         }
 
-        ops->set_cr(0,  ops->get_cr(0, ctxt->vcpu) | X86_CR0_TS, ctxt->vcpu);
-        ops->set_cached_descriptor(&next_tss_desc, 0, VCPU_SREG_TR, ctxt->vcpu);
-        ops->set_segment_selector(tss_selector, VCPU_SREG_TR, ctxt->vcpu);
+        ops->set_cr(ctxt, 0,  ops->get_cr(ctxt, 0) | X86_CR0_TS);
+        ops->set_segment(ctxt, tss_selector, &next_tss_desc, 0, VCPU_SREG_TR);
 
         if (has_error_code) {
                 struct decode_cache *c = &ctxt->decode;
@@ -2142,7 +2450,7 @@ static int emulator_do_task_switch(struct x86_emulate_ctxt *ctxt,
                 c->op_bytes = c->ad_bytes = (next_tss_desc.type & 8) ? 4 : 2;
                 c->lock_prefix = 0;
                 c->src.val = (unsigned long) error_code;
-                emulate_push(ctxt, ops);
+                ret = em_push(ctxt);
         }
 
         return ret;
@@ -2162,13 +2470,10 @@ int emulator_task_switch(struct x86_emulate_ctxt *ctxt,
         rc = emulator_do_task_switch(ctxt, ops, tss_selector, reason,
                                      has_error_code, error_code);
 
-        if (rc == X86EMUL_CONTINUE) {
-                rc = writeback(ctxt, ops);
-                if (rc == X86EMUL_CONTINUE)
-                        ctxt->eip = c->eip;
-        }
+        if (rc == X86EMUL_CONTINUE)
+                ctxt->eip = c->eip;
 
-        return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
+        return (rc == X86EMUL_UNHANDLEABLE) ? EMULATION_FAILED : EMULATION_OK;
 }
 
 static void string_addr_inc(struct x86_emulate_ctxt *ctxt, unsigned seg,
@@ -2182,12 +2487,6 @@ static void string_addr_inc(struct x86_emulate_ctxt *ctxt, unsigned seg,
         op->addr.mem.seg = seg;
 }
 
-static int em_push(struct x86_emulate_ctxt *ctxt)
-{
-        emulate_push(ctxt, ctxt->ops);
-        return X86EMUL_CONTINUE;
-}
-
 static int em_das(struct x86_emulate_ctxt *ctxt)
 {
         struct decode_cache *c = &ctxt->decode;
@@ -2234,7 +2533,7 @@ static int em_call_far(struct x86_emulate_ctxt *ctxt)
         ulong old_eip;
         int rc;
 
-        old_cs = ctxt->ops->get_segment_selector(VCPU_SREG_CS, ctxt->vcpu);
+        old_cs = get_segment_selector(ctxt, VCPU_SREG_CS);
         old_eip = c->eip;
 
         memcpy(&sel, c->src.valptr + c->op_bytes, 2);
@@ -2245,20 +2544,12 @@ static int em_call_far(struct x86_emulate_ctxt *ctxt)
         memcpy(&c->eip, c->src.valptr, c->op_bytes);
 
         c->src.val = old_cs;
-        emulate_push(ctxt, ctxt->ops);
-        rc = writeback(ctxt, ctxt->ops);
+        rc = em_push(ctxt);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
 
         c->src.val = old_eip;
-        emulate_push(ctxt, ctxt->ops);
-        rc = writeback(ctxt, ctxt->ops);
-        if (rc != X86EMUL_CONTINUE)
-                return rc;
-
-        c->dst.type = OP_NONE;
-
-        return X86EMUL_CONTINUE;
+        return em_push(ctxt);
 }
 
 static int em_ret_near_imm(struct x86_emulate_ctxt *ctxt)
@@ -2269,13 +2560,79 @@ static int em_ret_near_imm(struct x86_emulate_ctxt *ctxt)
         c->dst.type = OP_REG;
         c->dst.addr.reg = &c->eip;
         c->dst.bytes = c->op_bytes;
-        rc = emulate_pop(ctxt, ctxt->ops, &c->dst.val, c->op_bytes);
+        rc = emulate_pop(ctxt, &c->dst.val, c->op_bytes);
         if (rc != X86EMUL_CONTINUE)
                 return rc;
         register_address_increment(c, &c->regs[VCPU_REGS_RSP], c->src.val);
         return X86EMUL_CONTINUE;
 }
 
+static int em_add(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        emulate_2op_SrcV("add", c->src, c->dst, ctxt->eflags);
+        return X86EMUL_CONTINUE;
+}
+
+static int em_or(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        emulate_2op_SrcV("or", c->src, c->dst, ctxt->eflags);
+        return X86EMUL_CONTINUE;
+}
+
+static int em_adc(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        emulate_2op_SrcV("adc", c->src, c->dst, ctxt->eflags);
+        return X86EMUL_CONTINUE;
+}
+
+static int em_sbb(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        emulate_2op_SrcV("sbb", c->src, c->dst, ctxt->eflags);
+        return X86EMUL_CONTINUE;
+}
+
+static int em_and(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        emulate_2op_SrcV("and", c->src, c->dst, ctxt->eflags);
+        return X86EMUL_CONTINUE;
+}
+
+static int em_sub(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        emulate_2op_SrcV("sub", c->src, c->dst, ctxt->eflags);
+        return X86EMUL_CONTINUE;
+}
+
+static int em_xor(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        emulate_2op_SrcV("xor", c->src, c->dst, ctxt->eflags);
+        return X86EMUL_CONTINUE;
+}
+
+static int em_cmp(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        emulate_2op_SrcV("cmp", c->src, c->dst, ctxt->eflags);
+        /* Disable writeback. */
+        c->dst.type = OP_NONE;
+        return X86EMUL_CONTINUE;
+}
+
 static int em_imul(struct x86_emulate_ctxt *ctxt)
 {
         struct decode_cache *c = &ctxt->decode;
@@ -2306,13 +2663,10 @@ static int em_cwd(struct x86_emulate_ctxt *ctxt)
 
 static int em_rdtsc(struct x86_emulate_ctxt *ctxt)
 {
-        unsigned cpl = ctxt->ops->cpl(ctxt->vcpu);
         struct decode_cache *c = &ctxt->decode;
         u64 tsc = 0;
 
-        if (cpl > 0 && (ctxt->ops->get_cr(4, ctxt->vcpu) & X86_CR4_TSD))
-                return emulate_gp(ctxt, 0);
-        ctxt->ops->get_msr(ctxt->vcpu, MSR_IA32_TSC, &tsc);
+        ctxt->ops->get_msr(ctxt, MSR_IA32_TSC, &tsc);
         c->regs[VCPU_REGS_RAX] = (u32)tsc;
         c->regs[VCPU_REGS_RDX] = tsc >> 32;
         return X86EMUL_CONTINUE;
@@ -2325,22 +2679,375 @@ static int em_mov(struct x86_emulate_ctxt *ctxt)
         return X86EMUL_CONTINUE;
 }
 
+static int em_movdqu(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+        memcpy(&c->dst.vec_val, &c->src.vec_val, c->op_bytes);
+        return X86EMUL_CONTINUE;
+}
+
+static int em_invlpg(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+        int rc;
+        ulong linear;
+
+        rc = linearize(ctxt, c->src.addr.mem, 1, false, &linear);
+        if (rc == X86EMUL_CONTINUE)
+                ctxt->ops->invlpg(ctxt, linear);
+        /* Disable writeback. */
+        c->dst.type = OP_NONE;
+        return X86EMUL_CONTINUE;
+}
+
+static int em_clts(struct x86_emulate_ctxt *ctxt)
+{
+        ulong cr0;
+
+        cr0 = ctxt->ops->get_cr(ctxt, 0);
+        cr0 &= ~X86_CR0_TS;
+        ctxt->ops->set_cr(ctxt, 0, cr0);
+        return X86EMUL_CONTINUE;
+}
+
+static int em_vmcall(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+        int rc;
+
+        if (c->modrm_mod != 3 || c->modrm_rm != 1)
+                return X86EMUL_UNHANDLEABLE;
+
+        rc = ctxt->ops->fix_hypercall(ctxt);
+        if (rc != X86EMUL_CONTINUE)
+                return rc;
+
+        /* Let the processor re-execute the fixed hypercall */
+        c->eip = ctxt->eip;
+        /* Disable writeback. */
+        c->dst.type = OP_NONE;
+        return X86EMUL_CONTINUE;
+}
+
+static int em_lgdt(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+        struct desc_ptr desc_ptr;
+        int rc;
+
+        rc = read_descriptor(ctxt, c->src.addr.mem,
+                             &desc_ptr.size, &desc_ptr.address,
+                             c->op_bytes);
+        if (rc != X86EMUL_CONTINUE)
+                return rc;
+        ctxt->ops->set_gdt(ctxt, &desc_ptr);
+        /* Disable writeback. */
+        c->dst.type = OP_NONE;
+        return X86EMUL_CONTINUE;
+}
+
+static int em_vmmcall(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+        int rc;
+
+        rc = ctxt->ops->fix_hypercall(ctxt);
+
+        /* Disable writeback. */
+        c->dst.type = OP_NONE;
+        return rc;
+}
+
+static int em_lidt(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+        struct desc_ptr desc_ptr;
+        int rc;
+
+        rc = read_descriptor(ctxt, c->src.addr.mem,
+                             &desc_ptr.size, &desc_ptr.address,
+                             c->op_bytes);
+        if (rc != X86EMUL_CONTINUE)
+                return rc;
+        ctxt->ops->set_idt(ctxt, &desc_ptr);
+        /* Disable writeback. */
+        c->dst.type = OP_NONE;
+        return X86EMUL_CONTINUE;
+}
+
+static int em_smsw(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        c->dst.bytes = 2;
+        c->dst.val = ctxt->ops->get_cr(ctxt, 0);
+        return X86EMUL_CONTINUE;
+}
+
+static int em_lmsw(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+        ctxt->ops->set_cr(ctxt, 0, (ctxt->ops->get_cr(ctxt, 0) & ~0x0eul)
+                          | (c->src.val & 0x0f));
+        c->dst.type = OP_NONE;
+        return X86EMUL_CONTINUE;
+}
+
+static bool valid_cr(int nr)
+{
+        switch (nr) {
+        case 0:
+        case 2 ... 4:
+        case 8:
+                return true;
+        default:
+                return false;
+        }
+}
+
+static int check_cr_read(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        if (!valid_cr(c->modrm_reg))
+                return emulate_ud(ctxt);
+
+        return X86EMUL_CONTINUE;
+}
+
+static int check_cr_write(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+        u64 new_val = c->src.val64;
+        int cr = c->modrm_reg;
+        u64 efer = 0;
+
+        static u64 cr_reserved_bits[] = {
+                0xffffffff00000000ULL,
+                0, 0, 0, /* CR3 checked later */
+                CR4_RESERVED_BITS,
+                0, 0, 0,
+                CR8_RESERVED_BITS,
+        };
+
+        if (!valid_cr(cr))
+                return emulate_ud(ctxt);
+
+        if (new_val & cr_reserved_bits[cr])
+                return emulate_gp(ctxt, 0);
+
+        switch (cr) {
+        case 0: {
+                u64 cr4;
+                if (((new_val & X86_CR0_PG) && !(new_val & X86_CR0_PE)) ||
+                    ((new_val & X86_CR0_NW) && !(new_val & X86_CR0_CD)))
+                        return emulate_gp(ctxt, 0);
+
+                cr4 = ctxt->ops->get_cr(ctxt, 4);
+                ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
+
+                if ((new_val & X86_CR0_PG) && (efer & EFER_LME) &&
+                    !(cr4 & X86_CR4_PAE))
+                        return emulate_gp(ctxt, 0);
+
+                break;
+                }
+        case 3: {
+                u64 rsvd = 0;
+
+                ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
+                if (efer & EFER_LMA)
+                        rsvd = CR3_L_MODE_RESERVED_BITS;
+                else if (ctxt->ops->get_cr(ctxt, 4) & X86_CR4_PAE)
+                        rsvd = CR3_PAE_RESERVED_BITS;
+                else if (ctxt->ops->get_cr(ctxt, 0) & X86_CR0_PG)
+                        rsvd = CR3_NONPAE_RESERVED_BITS;
+
+                if (new_val & rsvd)
+                        return emulate_gp(ctxt, 0);
+
+                break;
+                }
+        case 4: {
+                u64 cr4;
+
+                cr4 = ctxt->ops->get_cr(ctxt, 4);
+                ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
+
+                if ((efer & EFER_LMA) && !(new_val & X86_CR4_PAE))
+                        return emulate_gp(ctxt, 0);
+
+                break;
+                }
+        }
+
+        return X86EMUL_CONTINUE;
+}
+
+static int check_dr7_gd(struct x86_emulate_ctxt *ctxt)
+{
+        unsigned long dr7;
+
+        ctxt->ops->get_dr(ctxt, 7, &dr7);
+
+        /* Check if DR7.Global_Enable is set */
+        return dr7 & (1 << 13);
+}
+
+static int check_dr_read(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+        int dr = c->modrm_reg;
+        u64 cr4;
+
+        if (dr > 7)
+                return emulate_ud(ctxt);
+
+        cr4 = ctxt->ops->get_cr(ctxt, 4);
+        if ((cr4 & X86_CR4_DE) && (dr == 4 || dr == 5))
+                return emulate_ud(ctxt);
+
+        if (check_dr7_gd(ctxt))
+                return emulate_db(ctxt);
+
+        return X86EMUL_CONTINUE;
+}
+
+static int check_dr_write(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+        u64 new_val = c->src.val64;
+        int dr = c->modrm_reg;
+
+        if ((dr == 6 || dr == 7) && (new_val & 0xffffffff00000000ULL))
+                return emulate_gp(ctxt, 0);
+
+        return check_dr_read(ctxt);
+}
+
+static int check_svme(struct x86_emulate_ctxt *ctxt)
+{
+        u64 efer;
+
+        ctxt->ops->get_msr(ctxt, MSR_EFER, &efer);
+
+        if (!(efer & EFER_SVME))
+                return emulate_ud(ctxt);
+
+        return X86EMUL_CONTINUE;
+}
+
+static int check_svme_pa(struct x86_emulate_ctxt *ctxt)
+{
+        u64 rax = ctxt->decode.regs[VCPU_REGS_RAX];
+
+        /* Valid physical address? */
+        if (rax & 0xffff000000000000ULL)
+                return emulate_gp(ctxt, 0);
+
+        return check_svme(ctxt);
+}
+
+static int check_rdtsc(struct x86_emulate_ctxt *ctxt)
+{
+        u64 cr4 = ctxt->ops->get_cr(ctxt, 4);
+
+        if (cr4 & X86_CR4_TSD && ctxt->ops->cpl(ctxt))
+                return emulate_ud(ctxt);
+
+        return X86EMUL_CONTINUE;
+}
+
+static int check_rdpmc(struct x86_emulate_ctxt *ctxt)
+{
+        u64 cr4 = ctxt->ops->get_cr(ctxt, 4);
+        u64 rcx = ctxt->decode.regs[VCPU_REGS_RCX];
+
+        if ((!(cr4 & X86_CR4_PCE) && ctxt->ops->cpl(ctxt)) ||
+            (rcx > 3))
+                return emulate_gp(ctxt, 0);
+
+        return X86EMUL_CONTINUE;
+}
+
+static int check_perm_in(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        c->dst.bytes = min(c->dst.bytes, 4u);
+        if (!emulator_io_permited(ctxt, ctxt->ops, c->src.val, c->dst.bytes))
+                return emulate_gp(ctxt, 0);
+
+        return X86EMUL_CONTINUE;
+}
+
+static int check_perm_out(struct x86_emulate_ctxt *ctxt)
+{
+        struct decode_cache *c = &ctxt->decode;
+
+        c->src.bytes = min(c->src.bytes, 4u);
+        if (!emulator_io_permited(ctxt, ctxt->ops, c->dst.val, c->src.bytes))
+                return emulate_gp(ctxt, 0);
+
+        return X86EMUL_CONTINUE;
+}
+
 #define D(_y) { .flags = (_y) }
+#define DI(_y, _i) { .flags = (_y), .intercept = x86_intercept_##_i }
+#define DIP(_y, _i, _p) { .flags = (_y), .intercept = x86_intercept_##_i, \
+                      .check_perm = (_p) }
 #define N    D(0)
+#define EXT(_f, _e) { .flags = ((_f) | RMExt), .u.group = (_e) }
 #define G(_f, _g) { .flags = ((_f) | Group), .u.group = (_g) }
-#define GD(_f, _g) { .flags = ((_f) | Group | GroupDual), .u.gdual = (_g) }
+#define GD(_f, _g) { .flags = ((_f) | GroupDual), .u.gdual = (_g) }
 #define I(_f, _e) { .flags = (_f), .u.execute = (_e) }
+#define II(_f, _e, _i) \
+        { .flags = (_f), .u.execute = (_e), .intercept = x86_intercept_##_i }
+#define IIP(_f, _e, _i, _p) \
+        { .flags = (_f), .u.execute = (_e), .intercept = x86_intercept_##_i, \
+          .check_perm = (_p) }
+#define GP(_f, _g) { .flags = ((_f) | Prefix), .u.gprefix = (_g) }
 
 #define D2bv(_f)      D((_f) | ByteOp), D(_f)
+#define D2bvIP(_f, _i, _p) DIP((_f) | ByteOp, _i, _p), DIP(_f, _i, _p)
 #define I2bv(_f, _e)  I((_f) | ByteOp, _e), I(_f, _e)
 
-#define D6ALU(_f) D2bv((_f) | DstMem | SrcReg | ModRM),                 \
-                D2bv(((_f) | DstReg | SrcMem | ModRM) & ~Lock),         \
-                D2bv(((_f) & ~Lock) | DstAcc | SrcImm)
+#define I6ALU(_f, _e) I2bv((_f) | DstMem | SrcReg | ModRM, _e),         \
+                I2bv(((_f) | DstReg | SrcMem | ModRM) & ~Lock, _e),     \
+                I2bv(((_f) & ~Lock) | DstAcc | SrcImm, _e)
 
+static struct opcode group7_rm1[] = {
+        DI(SrcNone | ModRM | Priv, monitor),
+        DI(SrcNone | ModRM | Priv, mwait),
+        N, N, N, N, N, N,
+};
+
+static struct opcode group7_rm3[] = {
+        DIP(SrcNone | ModRM | Prot | Priv, vmrun,   check_svme_pa),
+        II(SrcNone | ModRM | Prot | VendorSpecific, em_vmmcall, vmmcall),
+        DIP(SrcNone | ModRM | Prot | Priv, vmload,  check_svme_pa),
+        DIP(SrcNone | ModRM | Prot | Priv, vmsave,  check_svme_pa),
+        DIP(SrcNone | ModRM | Prot | Priv, stgi,    check_svme),
+        DIP(SrcNone | ModRM | Prot | Priv, clgi,    check_svme),
+        DIP(SrcNone | ModRM | Prot | Priv, skinit,  check_svme),
+        DIP(SrcNone | ModRM | Prot | Priv, invlpga, check_svme),
+};
+
+static struct opcode group7_rm7[] = {
+        N,
+        DIP(SrcNone | ModRM, rdtscp, check_rdtsc),
+        N, N, N, N, N, N,
+};
 
 static struct opcode group1[] = {
-        X7(D(Lock)), N
+        I(Lock, em_add),
+        I(Lock, em_or),
+        I(Lock, em_adc),
+        I(Lock, em_sbb),
+        I(Lock, em_and),
+        I(Lock, em_sub),
+        I(Lock, em_xor),
+        I(0, em_cmp),
 };
 
 static struct opcode group1A[] = {
@@ -2366,16 +3073,28 @@ static struct opcode group5[] = {
         D(SrcMem | ModRM | Stack), N,
 };
 
+static struct opcode group6[] = {
+        DI(ModRM | Prot,        sldt),
+        DI(ModRM | Prot,        str),
+        DI(ModRM | Prot | Priv, lldt),
+        DI(ModRM | Prot | Priv, ltr),
+        N, N, N, N,
+};
+
 static struct group_dual group7 = { {
-        N, N, D(ModRM | SrcMem | Priv), D(ModRM | SrcMem | Priv),
-        D(SrcNone | ModRM | DstMem | Mov), N,
-        D(SrcMem16 | ModRM | Mov | Priv),
-        D(SrcMem | ModRM | ByteOp | Priv | NoAccess),
+        DI(ModRM | Mov | DstMem | Priv, sgdt),
+        DI(ModRM | Mov | DstMem | Priv, sidt),
+        II(ModRM | SrcMem | Priv, em_lgdt, lgdt),
+        II(ModRM | SrcMem | Priv, em_lidt, lidt),
+        II(SrcNone | ModRM | DstMem | Mov, em_smsw, smsw), N,
+        II(SrcMem16 | ModRM | Mov | Priv, em_lmsw, lmsw),
+        II(SrcMem | ModRM | ByteOp | Priv | NoAccess, em_invlpg, invlpg),
 }, {
-        D(SrcNone | ModRM | Priv | VendorSpecific), N,
-        N, D(SrcNone | ModRM | Priv | VendorSpecific),
-        D(SrcNone | ModRM | DstMem | Mov), N,
-        D(SrcMem16 | ModRM | Mov | Priv), N,
+        I(SrcNone | ModRM | Priv | VendorSpecific, em_vmcall),
+        EXT(0, group7_rm1),
+        N, EXT(0, group7_rm3),
+        II(SrcNone | ModRM | DstMem | Mov, em_smsw, smsw), N,
+        II(SrcMem16 | ModRM | Mov | Priv, em_lmsw, lmsw), EXT(0, group7_rm7),
 } };
 
 static struct opcode group8[] = {
@@ -2394,35 +3113,40 @@ static struct opcode group11[] = {
         I(DstMem | SrcImm | ModRM | Mov, em_mov), X7(D(Undefined)),
 };
 
+static struct gprefix pfx_0f_6f_0f_7f = {
+        N, N, N, I(Sse, em_movdqu),
+};
+
 static struct opcode opcode_table[256] = {
         /* 0x00 - 0x07 */
-        D6ALU(Lock),
+        I6ALU(Lock, em_add),
         D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
         /* 0x08 - 0x0F */
-        D6ALU(Lock),
+        I6ALU(Lock, em_or),
         D(ImplicitOps | Stack | No64), N,
         /* 0x10 - 0x17 */
-        D6ALU(Lock),
+        I6ALU(Lock, em_adc),
         D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
         /* 0x18 - 0x1F */
-        D6ALU(Lock),
+        I6ALU(Lock, em_sbb),
         D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
         /* 0x20 - 0x27 */
-        D6ALU(Lock), N, N,
+        I6ALU(Lock, em_and), N, N,
         /* 0x28 - 0x2F */
-        D6ALU(Lock), N, I(ByteOp | DstAcc | No64, em_das),
+        I6ALU(Lock, em_sub), N, I(ByteOp | DstAcc | No64, em_das),
         /* 0x30 - 0x37 */
-        D6ALU(Lock), N, N,
+        I6ALU(Lock, em_xor), N, N,
         /* 0x38 - 0x3F */
-        D6ALU(0), N, N,
+        I6ALU(0, em_cmp), N, N,
         /* 0x40 - 0x4F */
         X16(D(DstReg)),
         /* 0x50 - 0x57 */
         X8(I(SrcReg | Stack, em_push)),
         /* 0x58 - 0x5F */
-        X8(D(DstReg | Stack)),
+        X8(I(DstReg | Stack, em_pop)),
         /* 0x60 - 0x67 */
-        D(ImplicitOps | Stack | No64), D(ImplicitOps | Stack | No64),
+        I(ImplicitOps | Stack | No64, em_pusha),
+        I(ImplicitOps | Stack | No64, em_popa),
         N, D(DstReg | SrcMem32 | ModRM | Mov) /* movsxd (x86/64) */ ,
         N, N, N, N,
         /* 0x68 - 0x6F */
@@ -2430,8 +3154,8 @@ static struct opcode opcode_table[256] = {
         I(DstReg | SrcMem | ModRM | Src2Imm, em_imul_3op),
         I(SrcImmByte | Mov | Stack, em_push),
         I(DstReg | SrcMem | ModRM | Src2ImmByte, em_imul_3op),
-        D2bv(DstDI | Mov | String), /* insb, insw/insd */
-        D2bv(SrcSI | ImplicitOps | String), /* outsb, outsw/outsd */
+        D2bvIP(DstDI | Mov | String, ins, check_perm_in), /* insb, insw/insd */
+        D2bvIP(SrcSI | ImplicitOps | String, outs, check_perm_out), /* outsb, outsw/outsd */
         /* 0x70 - 0x7F */
         X16(D(SrcImmByte)),
         /* 0x80 - 0x87 */
@@ -2446,21 +3170,22 @@ static struct opcode opcode_table[256] = {
         D(DstMem | SrcNone | ModRM | Mov), D(ModRM | SrcMem | NoAccess | DstReg),
         D(ImplicitOps | SrcMem16 | ModRM), G(0, group1A),
         /* 0x90 - 0x97 */
-        X8(D(SrcAcc | DstReg)),
+        DI(SrcAcc | DstReg, pause), X7(D(SrcAcc | DstReg)),
         /* 0x98 - 0x9F */
         D(DstAcc | SrcNone), I(ImplicitOps | SrcAcc, em_cwd),
         I(SrcImmFAddr | No64, em_call_far), N,
-        D(ImplicitOps | Stack), D(ImplicitOps | Stack), N, N,
+        II(ImplicitOps | Stack, em_pushf, pushf),
+        II(ImplicitOps | Stack, em_popf, popf), N, N,
         /* 0xA0 - 0xA7 */
         I2bv(DstAcc | SrcMem | Mov | MemAbs, em_mov),
         I2bv(DstMem | SrcAcc | Mov | MemAbs, em_mov),
         I2bv(SrcSI | DstDI | Mov | String, em_mov),
-        D2bv(SrcSI | DstDI | String),
+        I2bv(SrcSI | DstDI | String, em_cmp),
         /* 0xA8 - 0xAF */
         D2bv(DstAcc | SrcImm),
         I2bv(SrcAcc | DstDI | Mov | String, em_mov),
         I2bv(SrcSI | DstAcc | Mov | String, em_mov),
-        D2bv(SrcAcc | DstDI | String),
+        I2bv(SrcAcc | DstDI | String, em_cmp),
         /* 0xB0 - 0xB7 */
         X8(I(ByteOp | DstReg | SrcImm | Mov, em_mov)),
         /* 0xB8 - 0xBF */
@@ -2473,7 +3198,8 @@ static struct opcode opcode_table[256] = {
         G(ByteOp, group11), G(0, group11),
         /* 0xC8 - 0xCF */
         N, N, N, D(ImplicitOps | Stack),
-        D(ImplicitOps), D(SrcImmByte), D(ImplicitOps | No64), D(ImplicitOps),
+        D(ImplicitOps), DI(SrcImmByte, intn),
+        D(ImplicitOps | No64), DI(ImplicitOps, iret),
         /* 0xD0 - 0xD7 */
         D2bv(DstMem | SrcOne | ModRM), D2bv(DstMem | ModRM),
         N, N, N, N,
@@ -2481,14 +3207,17 @@ static struct opcode opcode_table[256] = {
         N, N, N, N, N, N, N, N,
         /* 0xE0 - 0xE7 */
         X4(D(SrcImmByte)),
-        D2bv(SrcImmUByte | DstAcc), D2bv(SrcAcc | DstImmUByte),
+        D2bvIP(SrcImmUByte | DstAcc, in,  check_perm_in),
+        D2bvIP(SrcAcc | DstImmUByte, out, check_perm_out),
         /* 0xE8 - 0xEF */
         D(SrcImm | Stack), D(SrcImm | ImplicitOps),
         D(SrcImmFAddr | No64), D(SrcImmByte | ImplicitOps),
-        D2bv(SrcNone | DstAcc), D2bv(SrcAcc | ImplicitOps),
+        D2bvIP(SrcNone | DstAcc,     in,  check_perm_in),
+        D2bvIP(SrcAcc | ImplicitOps, out, check_perm_out),
         /* 0xF0 - 0xF7 */
-        N, N, N, N,
-        D(ImplicitOps | Priv), D(ImplicitOps), G(ByteOp, group3), G(0, group3),
+        N, DI(ImplicitOps, icebp), N, N,
+        DI(ImplicitOps | Priv, hlt), D(ImplicitOps),
+        G(ByteOp, group3), G(0, group3),
         /* 0xF8 - 0xFF */
         D(ImplicitOps), D(ImplicitOps), D(ImplicitOps), D(ImplicitOps),
         D(ImplicitOps), D(ImplicitOps), G(0, group4), G(0, group5),
@@ -2496,20 +3225,24 @@ static struct opcode opcode_table[256] = {
 
 static struct opcode twobyte_table[256] = {
         /* 0x00 - 0x0F */
-        N, GD(0, &group7), N, N,
-        N, D(ImplicitOps | VendorSpecific), D(ImplicitOps | Priv), N,
-        D(ImplicitOps | Priv), D(ImplicitOps | Priv), N, N,
+        G(0, group6), GD(0, &group7), N, N,
+        N, D(ImplicitOps | VendorSpecific), DI(ImplicitOps | Priv, clts), N,
+        DI(ImplicitOps | Priv, invd), DI(ImplicitOps | Priv, wbinvd), N, N,
         N, D(ImplicitOps | ModRM), N, N,
         /* 0x10 - 0x1F */
         N, N, N, N, N, N, N, N, D(ImplicitOps | ModRM), N, N, N, N, N, N, N,
         /* 0x20 - 0x2F */
-        D(ModRM | DstMem | Priv | Op3264), D(ModRM | DstMem | Priv | Op3264),
-        D(ModRM | SrcMem | Priv | Op3264), D(ModRM | SrcMem | Priv | Op3264),
+        DIP(ModRM | DstMem | Priv | Op3264, cr_read, check_cr_read),
+        DIP(ModRM | DstMem | Priv | Op3264, dr_read, check_dr_read),
+        DIP(ModRM | SrcMem | Priv | Op3264, cr_write, check_cr_write),
+        DIP(ModRM | SrcMem | Priv | Op3264, dr_write, check_dr_write),
         N, N, N, N,
         N, N, N, N, N, N, N, N,
         /* 0x30 - 0x3F */
-        D(ImplicitOps | Priv), I(ImplicitOps, em_rdtsc),
-        D(ImplicitOps | Priv), N,
+        DI(ImplicitOps | Priv, wrmsr),
+        IIP(ImplicitOps, em_rdtsc, rdtsc, check_rdtsc),
+        DI(ImplicitOps | Priv, rdmsr),
+        DIP(ImplicitOps | Priv, rdpmc, check_rdpmc),
         D(ImplicitOps | VendorSpecific), D(ImplicitOps | Priv | VendorSpecific),
         N, N,
         N, N, N, N, N, N, N, N,
@@ -2518,21 +3251,27 @@ static struct opcode twobyte_table[256] = {
         /* 0x50 - 0x5F */
         N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
         /* 0x60 - 0x6F */
-        N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
+        N, N, N, N,
+        N, N, N, N,
+        N, N, N, N,
+        N, N, N, GP(SrcMem | DstReg | ModRM | Mov, &pfx_0f_6f_0f_7f),
         /* 0x70 - 0x7F */
-        N, N, N, N, N, N, N, N, N, N, N, N, N, N, N, N,
+        N, N, N, N,
+        N, N, N, N,
+        N, N, N, N,
+        N, N, N, GP(SrcReg | DstMem | ModRM | Mov, &pfx_0f_6f_0f_7f),
         /* 0x80 - 0x8F */
         X16(D(SrcImm)),
         /* 0x90 - 0x9F */
         X16(D(ByteOp | DstMem | SrcNone | ModRM| Mov)),
         /* 0xA0 - 0xA7 */
         D(ImplicitOps | Stack), D(ImplicitOps | Stack),
-        N, D(DstMem | SrcReg | ModRM | BitOp),
+        DI(ImplicitOps, cpuid), D(DstMem | SrcReg | ModRM | BitOp),
         D(DstMem | SrcReg | Src2ImmByte | ModRM),
         D(DstMem | SrcReg | Src2CL | ModRM), N, N,
         /* 0xA8 - 0xAF */
         D(ImplicitOps | Stack), D(ImplicitOps | Stack),
-        N, D(DstMem | SrcReg | ModRM | BitOp | Lock),
+        DI(ImplicitOps, rsm), D(DstMem | SrcReg | ModRM | BitOp | Lock),
         D(DstMem | SrcReg | Src2ImmByte | ModRM),
         D(DstMem | SrcReg | Src2CL | ModRM),
         D(ModRM), I(DstReg | SrcMem | ModRM, em_imul),
@@ -2564,10 +3303,13 @@ static struct opcode twobyte_table[256] = {
 #undef G
 #undef GD
 #undef I
+#undef GP
+#undef EXT
 
 #undef D2bv
+#undef D2bvIP
 #undef I2bv
-#undef D6ALU
+#undef I6ALU
 
 static unsigned imm_size(struct decode_cache *c)
 {
@@ -2625,8 +3367,9 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len)
         struct decode_cache *c = &ctxt->decode;
         int rc = X86EMUL_CONTINUE;
         int mode = ctxt->mode;
-        int def_op_bytes, def_ad_bytes, dual, goffset;
-        struct opcode opcode, *g_mod012, *g_mod3;
+        int def_op_bytes, def_ad_bytes, goffset, simd_prefix;
+        bool op_prefix = false;
+        struct opcode opcode;
         struct operand memop = { .type = OP_NONE };
 
         c->eip = ctxt->eip;
@@ -2634,7 +3377,6 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len)
         c->fetch.end = c->fetch.start + insn_len;
         if (insn_len > 0)
                 memcpy(c->fetch.data, insn, insn_len);
-        ctxt->cs_base = seg_base(ctxt, ops, VCPU_SREG_CS);
 
         switch (mode) {
         case X86EMUL_MODE_REAL:
@@ -2662,6 +3404,7 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len)
         for (;;) {
                 switch (c->b = insn_fetch(u8, 1, c->eip)) {
                 case 0x66:      /* operand-size override */
+                        op_prefix = true;
                         /* switch between 2/4 bytes */
                         c->op_bytes = def_op_bytes ^ 6;
                         break;
@@ -2692,10 +3435,8 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, void *insn, int insn_len)
                         c->lock_prefix = 1;
                         break;
                 case 0xf2:      /* REPNE/REPNZ */
-                        c->rep_prefix = REPNE_PREFIX;
-                        break;
                 case 0xf3:      /* REP/REPE/REPZ */
-                        c->rep_prefix = REPE_PREFIX;
+                        c->rep_prefix = c->b;
                         break;
                 default:
                         goto done_prefixes;
@@ -2722,29 +3463,49 @@ done_prefixes:
         }
         c->d = opcode.flags;
 
-        if (c->d & Group) {
-                dual = c->d & GroupDual;
-                c->modrm = insn_fetch(u8, 1, c->eip);
-                --c->eip;
-
-                if (c->d & GroupDual) {
-                        g_mod012 = opcode.u.gdual->mod012;
-                        g_mod3 = opcode.u.gdual->mod3;
-                } else
-                        g_mod012 = g_mod3 = opcode.u.group;
-
-                c->d &= ~(Group | GroupDual);
-
-                goffset = (c->modrm >> 3) & 7;
+        while (c->d & GroupMask) {
+                switch (c->d & GroupMask) {
+                case Group:
+                        c->modrm = insn_fetch(u8, 1, c->eip);
+                        --c->eip;
+                        goffset = (c->modrm >> 3) & 7;
+                        opcode = opcode.u.group[goffset];
+                        break;
+                case GroupDual:
+                        c->modrm = insn_fetch(u8, 1, c->eip);
+                        --c->eip;
+                        goffset = (c->modrm >> 3) & 7;
+                        if ((c->modrm >> 6) == 3)
+                                opcode = opcode.u.gdual->mod3[goffset];
+                        else
+                                opcode = opcode.u.gdual->mod012[goffset];
+                        break;
+                case RMExt:
+                        goffset = c->modrm & 7;
+                        opcode = opcode.u.group[goffset];
+                        break;
+                case Prefix:
+                        if (c->rep_prefix && op_prefix)
+                                return X86EMUL_UNHANDLEABLE;
+                        simd_prefix = op_prefix ? 0x66 : c->rep_prefix;
+                        switch (simd_prefix) {
+                        case 0x00: opcode = opcode.u.gprefix->pfx_no; break;
+                        case 0x66: opcode = opcode.u.gprefix->pfx_66; break;
+                        case 0xf2: opcode = opcode.u.gprefix->pfx_f2; break;
+                        case 0xf3: opcode = opcode.u.gprefix->pfx_f3; break;
+                        }
+                        break;
+                default:
+                        return X86EMUL_UNHANDLEABLE;
+                }
 
-                if ((c->modrm >> 6) == 3)
-                        opcode = g_mod3[goffset];
-                else
-                        opcode = g_mod012[goffset];
+                c->d &= ~GroupMask;
                 c->d |= opcode.flags;
         }
 
         c->execute = opcode.u.execute;
+        c->check_perm = opcode.check_perm;
+        c->intercept = opcode.intercept;
 
         /* Unrecognised? */
         if (c->d == 0 || (c->d & Undefined))
@@ -2763,6 +3524,9 @@ done_prefixes:
                         c->op_bytes = 4;
         }
 
+        if (c->d & Sse)
+                c->op_bytes = 16;
+
         /* ModRM and SIB bytes. */
         if (c->d & ModRM) {
                 rc = decode_modrm(ctxt, ops, &memop);
@@ -2776,7 +3540,7 @@ done_prefixes:
         if (!c->has_seg_override)
                 set_seg_override(c, VCPU_SREG_DS);
 
-        memop.addr.mem.seg = seg_override(ctxt, ops, c);
+        memop.addr.mem.seg = seg_override(ctxt, c);
 
         if (memop.type == OP_MEM && c->ad_bytes != 8)
                 memop.addr.mem.ea = (u32)memop.addr.mem.ea;
@@ -2792,7 +3556,7 @@ done_prefixes:
         case SrcNone:
                 break;
         case SrcReg:
-                decode_register_operand(&c->src, c, 0);
+                decode_register_operand(ctxt, &c->src, c, 0);
                 break;
         case SrcMem16:
                 memop.bytes = 2;
@@ -2836,7 +3600,7 @@ done_prefixes:
                 c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes;
                 c->src.addr.mem.ea =
                         register_address(c, c->regs[VCPU_REGS_RSI]);
-                c->src.addr.mem.seg = seg_override(ctxt, ops, c),
+                c->src.addr.mem.seg = seg_override(ctxt, c);
                 c->src.val = 0;
                 break;
         case SrcImmFAddr:
@@ -2883,7 +3647,7 @@ done_prefixes:
         /* Decode and fetch the destination operand: register or memory. */
         switch (c->d & DstMask) {
         case DstReg:
-                decode_register_operand(&c->dst, c,
+                decode_register_operand(ctxt, &c->dst, c,
                          c->twobyte && (c->b == 0xb6 || c->b == 0xb7));
                 break;
         case DstImmUByte:
@@ -2926,7 +3690,7 @@ done_prefixes:
         }
 
 done:
-        return (rc == X86EMUL_UNHANDLEABLE) ? -1 : 0;
+        return (rc == X86EMUL_UNHANDLEABLE) ? EMULATION_FAILED : EMULATION_OK;
 }
 
 static bool string_insn_completed(struct x86_emulate_ctxt *ctxt)
@@ -2979,12 +3743,51 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
                 goto done;
         }
 
+        if ((c->d & Sse)
+            && ((ops->get_cr(ctxt, 0) & X86_CR0_EM)
+                || !(ops->get_cr(ctxt, 4) & X86_CR4_OSFXSR))) {
+                rc = emulate_ud(ctxt);
+                goto done;
+        }
+
+        if ((c->d & Sse) && (ops->get_cr(ctxt, 0) & X86_CR0_TS)) {
+                rc = emulate_nm(ctxt);
+                goto done;
+        }
+
+        if (unlikely(ctxt->guest_mode) && c->intercept) {
+                rc = emulator_check_intercept(ctxt, c->intercept,
+                                              X86_ICPT_PRE_EXCEPT);
+                if (rc != X86EMUL_CONTINUE)
+                        goto done;
+        }
+
         /* Privileged instruction can be executed only in CPL=0 */
-        if ((c->d & Priv) && ops->cpl(ctxt->vcpu)) {
+        if ((c->d & Priv) && ops->cpl(ctxt)) {
                 rc = emulate_gp(ctxt, 0);
                 goto done;
         }
 
+        /* Instruction can only be executed in protected mode */
+        if ((c->d & Prot) && !(ctxt->mode & X86EMUL_MODE_PROT)) {
+                rc = emulate_ud(ctxt);
+                goto done;
+        }
+
+        /* Do instruction specific permission checks */
+        if (c->check_perm) {
+                rc = c->check_perm(ctxt);
+                if (rc != X86EMUL_CONTINUE)
+                        goto done;
+        }
+
+        if (unlikely(ctxt->guest_mode) && c->intercept) {
+                rc = emulator_check_intercept(ctxt, c->intercept,
+                                              X86_ICPT_POST_EXCEPT);
+                if (rc != X86EMUL_CONTINUE)
+                        goto done;
+        }
+
         if (c->rep_prefix && (c->d & String)) {
                 /* All REP prefixes have the same first termination condition */
                 if (address_mask(c, c->regs[VCPU_REGS_RCX]) == 0) {
@@ -2994,16 +3797,16 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
         }
 
         if ((c->src.type == OP_MEM) && !(c->d & NoAccess)) {
-                rc = read_emulated(ctxt, ops, linear(ctxt, c->src.addr.mem),
-                                        c->src.valptr, c->src.bytes);
+                rc = segmented_read(ctxt, c->src.addr.mem,
+                                    c->src.valptr, c->src.bytes);
                 if (rc != X86EMUL_CONTINUE)
                         goto done;
                 c->src.orig_val64 = c->src.val64;
         }
 
         if (c->src2.type == OP_MEM) {
-                rc = read_emulated(ctxt, ops, linear(ctxt, c->src2.addr.mem),
-                                        &c->src2.val, c->src2.bytes);
+                rc = segmented_read(ctxt, c->src2.addr.mem,
+                                    &c->src2.val, c->src2.bytes);
                 if (rc != X86EMUL_CONTINUE)
                         goto done;
         }
@@ -3014,7 +3817,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
 
         if ((c->dst.type == OP_MEM) && !(c->d & Mov)) {
                 /* optimisation - avoid slow emulated read if Mov */
-                rc = read_emulated(ctxt, ops, linear(ctxt, c->dst.addr.mem),
+                rc = segmented_read(ctxt, c->dst.addr.mem,
                                    &c->dst.val, c->dst.bytes);
                 if (rc != X86EMUL_CONTINUE)
                         goto done;
@@ -3023,6 +3826,13 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
 
 special_insn:
 
+        if (unlikely(ctxt->guest_mode) && c->intercept) {
+                rc = emulator_check_intercept(ctxt, c->intercept,
+                                              X86_ICPT_POST_MEMACCESS);
+                if (rc != X86EMUL_CONTINUE)
+                        goto done;
+        }
+
         if (c->execute) {
                 rc = c->execute(ctxt);
                 if (rc != X86EMUL_CONTINUE)
@@ -3034,75 +3844,33 @@ special_insn:
                 goto twobyte_insn;
 
         switch (c->b) {
-        case 0x00 ... 0x05:
-              add:              /* add */
-                emulate_2op_SrcV("add", c->src, c->dst, ctxt->eflags);
-                break;
         case 0x06:              /* push es */
-                emulate_push_sreg(ctxt, ops, VCPU_SREG_ES);
+                rc = emulate_push_sreg(ctxt, ops, VCPU_SREG_ES);
                 break;
         case 0x07:              /* pop es */
                 rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_ES);
                 break;
-        case 0x08 ... 0x0d:
-              or:               /* or */
-                emulate_2op_SrcV("or", c->src, c->dst, ctxt->eflags);
-                break;
         case 0x0e:              /* push cs */
-                emulate_push_sreg(ctxt, ops, VCPU_SREG_CS);
-                break;
-        case 0x10 ... 0x15:
-              adc:              /* adc */
-                emulate_2op_SrcV("adc", c->src, c->dst, ctxt->eflags);
+                rc = emulate_push_sreg(ctxt, ops, VCPU_SREG_CS);
                 break;
         case 0x16:              /* push ss */
-                emulate_push_sreg(ctxt, ops, VCPU_SREG_SS);
+                rc = emulate_push_sreg(ctxt, ops, VCPU_SREG_SS);
                 break;
         case 0x17:              /* pop ss */
                 rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_SS);
                 break;
-        case 0x18 ... 0x1d:
-              sbb:              /* sbb */
-                emulate_2op_SrcV("sbb", c->src, c->dst, ctxt->eflags);
-                break;
         case 0x1e:              /* push ds */
-                emulate_push_sreg(ctxt, ops, VCPU_SREG_DS);
+                rc = emulate_push_sreg(ctxt, ops, VCPU_SREG_DS);
                 break;
         case 0x1f:              /* pop ds */
                 rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_DS);
                 break;
-        case 0x20 ... 0x25:
-              and:              /* and */
-                emulate_2op_SrcV("and", c->src, c->dst, ctxt->eflags);
-                break;
-        case 0x28 ... 0x2d:
-              sub:              /* sub */
-                emulate_2op_SrcV("sub", c->src, c->dst, ctxt->eflags);
-                break;
-        case 0x30 ... 0x35:
-              xor:              /* xor */
-                emulate_2op_SrcV("xor", c->src, c->dst, ctxt->eflags);
-                break;
-        case 0x38 ... 0x3d:
-              cmp:              /* cmp */
-                emulate_2op_SrcV("cmp", c->src, c->dst, ctxt->eflags);
-                break;
         case 0x40 ... 0x47: /* inc r16/r32 */
                 emulate_1op("inc", c->dst, ctxt->eflags);
                 break;
         case 0x48 ... 0x4f: /* dec r16/r32 */
                 emulate_1op("dec", c->dst, ctxt->eflags);
                 break;
-        case 0x58 ... 0x5f: /* pop reg */
-        pop_instruction:
-                rc = emulate_pop(ctxt, ops, &c->dst.val, c->op_bytes);
-                break;
-        case 0x60:      /* pusha */
-                rc = emulate_pusha(ctxt, ops);
-                break;
-        case 0x61:      /* popa */
-                rc = emulate_popa(ctxt, ops);
-                break;
         case 0x63:              /* movsxd */
                 if (ctxt->mode != X86EMUL_MODE_PROT64)
                         goto cannot_emulate;
@@ -3121,26 +3889,6 @@ special_insn:
                 if (test_cc(c->b, ctxt->eflags))
                         jmp_rel(c, c->src.val);
                 break;
-        case 0x80 ... 0x83:     /* Grp1 */
-                switch (c->modrm_reg) {
-                case 0:
-                        goto add;
-                case 1:
-                        goto or;
-                case 2:
-                        goto adc;
-                case 3:
-                        goto sbb;
-                case 4:
-                        goto and;
-                case 5:
-                        goto sub;
-                case 6:
-                        goto xor;
-                case 7:
-                        goto cmp;
-                }
-                break;
         case 0x84 ... 0x85:
         test:
                 emulate_2op_SrcV("test", c->src, c->dst, ctxt->eflags);
@@ -3162,7 +3910,7 @@ special_insn:
                         rc = emulate_ud(ctxt);
                         goto done;
                 }
-                c->dst.val = ops->get_segment_selector(c->modrm_reg, ctxt->vcpu);
+                c->dst.val = get_segment_selector(ctxt, c->modrm_reg);
                 break;
         case 0x8d: /* lea r16/r32, m */
                 c->dst.val = c->src.addr.mem.ea;
@@ -3187,7 +3935,7 @@ special_insn:
                 break;
         }
         case 0x8f:              /* pop (sole member of Grp1a) */
-                rc = emulate_grp1a(ctxt, ops);
+                rc = em_grp1a(ctxt);
                 break;
         case 0x90 ... 0x97: /* nop / xchg reg, rax */
                 if (c->dst.addr.reg == &c->regs[VCPU_REGS_RAX])
@@ -3200,31 +3948,17 @@ special_insn:
                 case 8: c->dst.val = (s32)c->dst.val; break;
                 }
                 break;
-        case 0x9c: /* pushf */
-                c->src.val =  (unsigned long) ctxt->eflags;
-                emulate_push(ctxt, ops);
-                break;
-        case 0x9d: /* popf */
-                c->dst.type = OP_REG;
-                c->dst.addr.reg = &ctxt->eflags;
-                c->dst.bytes = c->op_bytes;
-                rc = emulate_popf(ctxt, ops, &c->dst.val, c->op_bytes);
-                break;
-        case 0xa6 ... 0xa7:     /* cmps */
-                c->dst.type = OP_NONE; /* Disable writeback. */
-                goto cmp;
         case 0xa8 ... 0xa9:     /* test ax, imm */
                 goto test;
-        case 0xae ... 0xaf:     /* scas */
-                goto cmp;
         case 0xc0 ... 0xc1:
-                emulate_grp2(ctxt);
+                rc = em_grp2(ctxt);
                 break;
         case 0xc3: /* ret */
                 c->dst.type = OP_REG;
                 c->dst.addr.reg = &c->eip;
                 c->dst.bytes = c->op_bytes;
-                goto pop_instruction;
+                rc = em_pop(ctxt);
+                break;
         case 0xc4:              /* les */
                 rc = emulate_load_segment(ctxt, ops, VCPU_SREG_ES);
                 break;
@@ -3252,11 +3986,11 @@ special_insn:
                 rc = emulate_iret(ctxt, ops);
                 break;
         case 0xd0 ... 0xd1:     /* Grp2 */
-                emulate_grp2(ctxt);
+                rc = em_grp2(ctxt);
                 break;
         case 0xd2 ... 0xd3:     /* Grp2 */
                 c->src.val = c->regs[VCPU_REGS_RCX];
-                emulate_grp2(ctxt);
+                rc = em_grp2(ctxt);
                 break;
         case 0xe0 ... 0xe2:     /* loop/loopz/loopnz */
                 register_address_increment(c, &c->regs[VCPU_REGS_RCX], -1);
@@ -3278,23 +4012,14 @@ special_insn:
                 long int rel = c->src.val;
                 c->src.val = (unsigned long) c->eip;
                 jmp_rel(c, rel);
-                emulate_push(ctxt, ops);
+                rc = em_push(ctxt);
                 break;
         }
         case 0xe9: /* jmp rel */
                 goto jmp;
-        case 0xea: { /* jmp far */
-                unsigned short sel;
-        jump_far:
-                memcpy(&sel, c->src.valptr + c->op_bytes, 2);
-
-                if (load_segment_descriptor(ctxt, ops, sel, VCPU_SREG_CS))
-                        goto done;
-
-                c->eip = 0;
-                memcpy(&c->eip, c->src.valptr, c->op_bytes);
+        case 0xea: /* jmp far */
+                rc = em_jmp_far(ctxt);
                 break;
-        }
         case 0xeb:
               jmp:              /* jmp rel short */
                 jmp_rel(c, c->src.val);
@@ -3304,11 +4029,6 @@ special_insn:
         case 0xed: /* in (e/r)ax,dx */
                 c->src.val = c->regs[VCPU_REGS_RDX];
         do_io_in:
-                c->dst.bytes = min(c->dst.bytes, 4u);
-                if (!emulator_io_permited(ctxt, ops, c->src.val, c->dst.bytes)) {
-                        rc = emulate_gp(ctxt, 0);
-                        goto done;
-                }
                 if (!pio_in_emulated(ctxt, ops, c->dst.bytes, c->src.val,
                                      &c->dst.val))
                         goto done; /* IO is needed */
@@ -3317,25 +4037,19 @@ special_insn:
         case 0xef: /* out dx,(e/r)ax */
                 c->dst.val = c->regs[VCPU_REGS_RDX];
         do_io_out:
-                c->src.bytes = min(c->src.bytes, 4u);
-                if (!emulator_io_permited(ctxt, ops, c->dst.val,
-                                          c->src.bytes)) {
-                        rc = emulate_gp(ctxt, 0);
-                        goto done;
-                }
-                ops->pio_out_emulated(c->src.bytes, c->dst.val,
-                                      &c->src.val, 1, ctxt->vcpu);
+                ops->pio_out_emulated(ctxt, c->src.bytes, c->dst.val,
+                                      &c->src.val, 1);
                 c->dst.type = OP_NONE;  /* Disable writeback. */
                 break;
         case 0xf4:              /* hlt */
-                ctxt->vcpu->arch.halt_request = 1;
+                ctxt->ops->halt(ctxt);
                 break;
         case 0xf5:      /* cmc */
                 /* complement carry flag from eflags reg */
                 ctxt->eflags ^= EFLG_CF;
                 break;
         case 0xf6 ... 0xf7:     /* Grp3 */
-                rc = emulate_grp3(ctxt, ops);
+                rc = em_grp3(ctxt);
                 break;
         case 0xf8: /* clc */
                 ctxt->eflags &= ~EFLG_CF;
@@ -3366,13 +4080,11 @@ special_insn:
                 ctxt->eflags |= EFLG_DF;
                 break;
         case 0xfe: /* Grp4 */
-        grp45:
-                rc = emulate_grp45(ctxt, ops);
+                rc = em_grp45(ctxt);
                 break;
         case 0xff: /* Grp5 */
-                if (c->modrm_reg == 5)
-                        goto jump_far;
-                goto grp45;
+                rc = em_grp45(ctxt);
+                break;
         default:
                 goto cannot_emulate;
         }
@@ -3381,7 +4093,7 @@ special_insn:
                 goto done;
 
 writeback:
-        rc = writeback(ctxt, ops);
+        rc = writeback(ctxt);
         if (rc != X86EMUL_CONTINUE)
                 goto done;
 
@@ -3392,7 +4104,7 @@ writeback:
         c->dst.type = saved_dst_type;
 
         if ((c->d & SrcMask) == SrcSI)
-                string_addr_inc(ctxt, seg_override(ctxt, ops, c),
+                string_addr_inc(ctxt, seg_override(ctxt, c),
                                 VCPU_REGS_RSI, &c->src);
 
         if ((c->d & DstMask) == DstDI)
@@ -3427,115 +4139,34 @@ writeback:
 done:
         if (rc == X86EMUL_PROPAGATE_FAULT)
                 ctxt->have_exception = true;
+        if (rc == X86EMUL_INTERCEPTED)
+                return EMULATION_INTERCEPTED;
+
         return (rc == X86EMUL_UNHANDLEABLE) ? EMULATION_FAILED : EMULATION_OK;
 
 twobyte_insn:
         switch (c->b) {
-        case 0x01: /* lgdt, lidt, lmsw */
-                switch (c->modrm_reg) {
-                        u16 size;
-                        unsigned long address;
-
-                case 0: /* vmcall */
-                        if (c->modrm_mod != 3 || c->modrm_rm != 1)
-                                goto cannot_emulate;
-
-                        rc = kvm_fix_hypercall(ctxt->vcpu);
-                        if (rc != X86EMUL_CONTINUE)
-                                goto done;
-
-                        /* Let the processor re-execute the fixed hypercall */
-                        c->eip = ctxt->eip;
-                        /* Disable writeback. */
-                        c->dst.type = OP_NONE;
-                        break;
-                case 2: /* lgdt */
-                        rc = read_descriptor(ctxt, ops, c->src.addr.mem,
-                                             &size, &address, c->op_bytes);
-                        if (rc != X86EMUL_CONTINUE)
-                                goto done;
-                        realmode_lgdt(ctxt->vcpu, size, address);
-                        /* Disable writeback. */
-                        c->dst.type = OP_NONE;
-                        break;
-                case 3: /* lidt/vmmcall */
-                        if (c->modrm_mod == 3) {
-                                switch (c->modrm_rm) {
-                                case 1:
-                                        rc = kvm_fix_hypercall(ctxt->vcpu);
-                                        break;
-                                default:
-                                        goto cannot_emulate;
-                                }
-                        } else {
-                                rc = read_descriptor(ctxt, ops, c->src.addr.mem,
-                                                     &size, &address,
-                                                     c->op_bytes);
-                                if (rc != X86EMUL_CONTINUE)
-                                        goto done;
-                                realmode_lidt(ctxt->vcpu, size, address);
-                        }
-                        /* Disable writeback. */
-                        c->dst.type = OP_NONE;
-                        break;
-                case 4: /* smsw */
-                        c->dst.bytes = 2;
-                        c->dst.val = ops->get_cr(0, ctxt->vcpu);
-                        break;
-                case 6: /* lmsw */
-                        ops->set_cr(0, (ops->get_cr(0, ctxt->vcpu) & ~0x0eul) |
-                                    (c->src.val & 0x0f), ctxt->vcpu);
-                        c->dst.type = OP_NONE;
-                        break;
-                case 5: /* not defined */
-                        emulate_ud(ctxt);
-                        rc = X86EMUL_PROPAGATE_FAULT;
-                        goto done;
-                case 7: /* invlpg*/
-                        emulate_invlpg(ctxt->vcpu,
-                                       linear(ctxt, c->src.addr.mem));
-                        /* Disable writeback. */
-                        c->dst.type = OP_NONE;
-                        break;
-                default:
-                        goto cannot_emulate;
-                }
-                break;
         case 0x05:              /* syscall */
                 rc = emulate_syscall(ctxt, ops);
                 break;
         case 0x06:
-                emulate_clts(ctxt->vcpu);
+                rc = em_clts(ctxt);
                 break;
         case 0x09:              /* wbinvd */
-                kvm_emulate_wbinvd(ctxt->vcpu);
+                (ctxt->ops->wbinvd)(ctxt);
                 break;
         case 0x08:              /* invd */
         case 0x0d:              /* GrpP (prefetch) */
         case 0x18:              /* Grp16 (prefetch/nop) */
                 break;
         case 0x20: /* mov cr, reg */
-                switch (c->modrm_reg) {
-                case 1:
-                case 5 ... 7:
-                case 9 ... 15:
-                        emulate_ud(ctxt);
-                        rc = X86EMUL_PROPAGATE_FAULT;
-                        goto done;
-                }
-                c->dst.val = ops->get_cr(c->modrm_reg, ctxt->vcpu);
+                c->dst.val = ops->get_cr(ctxt, c->modrm_reg);
                 break;
         case 0x21: /* mov from dr to reg */
-                if ((ops->get_cr(4, ctxt->vcpu) & X86_CR4_DE) &&
-                    (c->modrm_reg == 4 || c->modrm_reg == 5)) {
-                        emulate_ud(ctxt);
-                        rc = X86EMUL_PROPAGATE_FAULT;
-                        goto done;
-                }
-                ops->get_dr(c->modrm_reg, &c->dst.val, ctxt->vcpu);
+                ops->get_dr(ctxt, c->modrm_reg, &c->dst.val);
                 break;
         case 0x22: /* mov reg, cr */
-                if (ops->set_cr(c->modrm_reg, c->src.val, ctxt->vcpu)) {
+                if (ops->set_cr(ctxt, c->modrm_reg, c->src.val)) {
                         emulate_gp(ctxt, 0);
                         rc = X86EMUL_PROPAGATE_FAULT;
                         goto done;
@@ -3543,16 +4174,9 @@ twobyte_insn:
                 c->dst.type = OP_NONE;
                 break;
         case 0x23: /* mov from reg to dr */
-                if ((ops->get_cr(4, ctxt->vcpu) & X86_CR4_DE) &&
-                    (c->modrm_reg == 4 || c->modrm_reg == 5)) {
-                        emulate_ud(ctxt);
-                        rc = X86EMUL_PROPAGATE_FAULT;
-                        goto done;
-                }
-
-                if (ops->set_dr(c->modrm_reg, c->src.val &
+                if (ops->set_dr(ctxt, c->modrm_reg, c->src.val &
                                 ((ctxt->mode == X86EMUL_MODE_PROT64) ?
-                                 ~0ULL : ~0U), ctxt->vcpu) < 0) {
+                                 ~0ULL : ~0U)) < 0) {
                         /* #UD condition is already handled by the code above */
                         emulate_gp(ctxt, 0);
                         rc = X86EMUL_PROPAGATE_FAULT;
@@ -3565,7 +4189,7 @@ twobyte_insn:
                 /* wrmsr */
                 msr_data = (u32)c->regs[VCPU_REGS_RAX]
                         | ((u64)c->regs[VCPU_REGS_RDX] << 32);
-                if (ops->set_msr(ctxt->vcpu, c->regs[VCPU_REGS_RCX], msr_data)) {
+                if (ops->set_msr(ctxt, c->regs[VCPU_REGS_RCX], msr_data)) {
                         emulate_gp(ctxt, 0);
                         rc = X86EMUL_PROPAGATE_FAULT;
                         goto done;
@@ -3574,7 +4198,7 @@ twobyte_insn:
                 break;
         case 0x32:
                 /* rdmsr */
-                if (ops->get_msr(ctxt->vcpu, c->regs[VCPU_REGS_RCX], &msr_data)) {
+                if (ops->get_msr(ctxt, c->regs[VCPU_REGS_RCX], &msr_data)) {
                         emulate_gp(ctxt, 0);
                         rc = X86EMUL_PROPAGATE_FAULT;
                         goto done;
@@ -3603,7 +4227,7 @@ twobyte_insn:
                 c->dst.val = test_cc(c->b, ctxt->eflags);
                 break;
         case 0xa0:        /* push fs */
-                emulate_push_sreg(ctxt, ops, VCPU_SREG_FS);
+                rc = emulate_push_sreg(ctxt, ops, VCPU_SREG_FS);
                 break;
         case 0xa1:       /* pop fs */
                 rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_FS);
@@ -3620,7 +4244,7 @@ twobyte_insn:
                 emulate_2op_cl("shld", c->src2, c->src, c->dst, ctxt->eflags);
                 break;
         case 0xa8:      /* push gs */
-                emulate_push_sreg(ctxt, ops, VCPU_SREG_GS);
+                rc = emulate_push_sreg(ctxt, ops, VCPU_SREG_GS);
                 break;
         case 0xa9:      /* pop gs */
                 rc = emulate_pop_sreg(ctxt, ops, VCPU_SREG_GS);
@@ -3727,7 +4351,7 @@ twobyte_insn:
                                                         (u64) c->src.val;
                 break;
         case 0xc7:              /* Grp9 (cmpxchg8b) */
-                rc = emulate_grp9(ctxt, ops);
+                rc = em_grp9(ctxt);
                 break;
         default:
                 goto cannot_emulate;
@@ -3739,5 +4363,5 @@ twobyte_insn:
         goto writeback;
 
 cannot_emulate:
-        return -1;
+        return EMULATION_FAILED;
 }
diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h
index 46d08ca0b48f..51a97426e791 100644
--- a/arch/x86/kvm/i8254.h
+++ b/arch/x86/kvm/i8254.h
@@ -33,7 +33,6 @@ struct kvm_kpit_state {
 };
 
 struct kvm_pit {
-        unsigned long base_addresss;
         struct kvm_io_device dev;
         struct kvm_io_device speaker_dev;
         struct kvm *kvm;
@@ -51,7 +50,6 @@ struct kvm_pit {
 #define KVM_MAX_PIT_INTR_INTERVAL   HZ / 100
 #define KVM_PIT_CHANNEL_MASK        0x3
 
-void kvm_inject_pit_timer_irqs(struct kvm_vcpu *vcpu);
 void kvm_pit_load_count(struct kvm *kvm, int channel, u32 val, int hpet_legacy_start);
 struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags);
 void kvm_free_pit(struct kvm *kvm);
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
index ba910d149410..53e2d084bffb 100644
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
@@ -75,7 +75,6 @@ struct kvm_pic *kvm_create_pic(struct kvm *kvm);
 void kvm_destroy_pic(struct kvm *kvm);
 int kvm_pic_read_irq(struct kvm *kvm);
 void kvm_pic_update_irq(struct kvm_pic *s);
-void kvm_pic_clear_isr_ack(struct kvm *kvm);
 
 static inline struct kvm_pic *pic_irqchip(struct kvm *kvm)
 {
@@ -100,7 +99,6 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu);
 void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu);
 void __kvm_migrate_timers(struct kvm_vcpu *vcpu);
 
-int pit_has_pending_timer(struct kvm_vcpu *vcpu);
 int apic_has_pending_timer(struct kvm_vcpu *vcpu);
 
 #endif
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 22fae7593ee7..bd14bb4c8594 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1206,7 +1206,7 @@ static void nonpaging_invlpg(struct kvm_vcpu *vcpu, gva_t gva)
 
 static void nonpaging_update_pte(struct kvm_vcpu *vcpu,
                                  struct kvm_mmu_page *sp, u64 *spte,
-                                 const void *pte, unsigned long mmu_seq)
+                                 const void *pte)
 {
         WARN_ON(1);
 }
@@ -3163,9 +3163,8 @@ static void mmu_pte_write_zap_pte(struct kvm_vcpu *vcpu,
 }
 
 static void mmu_pte_write_new_pte(struct kvm_vcpu *vcpu,
-                                  struct kvm_mmu_page *sp,
-                                  u64 *spte,
-                                  const void *new, unsigned long mmu_seq)
+                                  struct kvm_mmu_page *sp, u64 *spte,
+                                  const void *new)
 {
         if (sp->role.level != PT_PAGE_TABLE_LEVEL) {
                 ++vcpu->kvm->stat.mmu_pde_zapped;
@@ -3173,7 +3172,7 @@ static void mmu_pte_write_new_pte(struct kvm_vcpu *vcpu,
         }
 
         ++vcpu->kvm->stat.mmu_pte_updated;
-        vcpu->arch.mmu.update_pte(vcpu, sp, spte, new, mmu_seq);
+        vcpu->arch.mmu.update_pte(vcpu, sp, spte, new);
 }
 
 static bool need_remote_flush(u64 old, u64 new)
@@ -3229,7 +3228,6 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
         struct kvm_mmu_page *sp;
         struct hlist_node *node;
         LIST_HEAD(invalid_list);
-        unsigned long mmu_seq;
         u64 entry, gentry, *spte;
         unsigned pte_size, page_offset, misaligned, quadrant, offset;
         int level, npte, invlpg_counter, r, flooded = 0;
@@ -3271,9 +3269,6 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
                 break;
         }
 
-        mmu_seq = vcpu->kvm->mmu_notifier_seq;
-        smp_rmb();
-
         spin_lock(&vcpu->kvm->mmu_lock);
         if (atomic_read(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
                 gentry = 0;
@@ -3345,8 +3340,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
                         if (gentry &&
                               !((sp->role.word ^ vcpu->arch.mmu.base_role.word)
                               & mask.word))
-                                mmu_pte_write_new_pte(vcpu, sp, spte, &gentry,
-                                                      mmu_seq);
+                                mmu_pte_write_new_pte(vcpu, sp, spte, &gentry);
                         if (!remote_flush && need_remote_flush(entry, *spte))
                                 remote_flush = true;
                         ++spte;
@@ -3551,10 +3545,11 @@ static int kvm_mmu_remove_some_alloc_mmu_pages(struct kvm *kvm,
         return kvm_mmu_prepare_zap_page(kvm, page, invalid_list);
 }
 
-static int mmu_shrink(struct shrinker *shrink, int nr_to_scan, gfp_t gfp_mask)
+static int mmu_shrink(struct shrinker *shrink, struct shrink_control *sc)
 {
         struct kvm *kvm;
         struct kvm *kvm_freed = NULL;
+        int nr_to_scan = sc->nr_to_scan;
 
         if (nr_to_scan == 0)
                 goto out;
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index c6397795d865..6c4dc010c4cb 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -78,15 +78,19 @@ static gfn_t gpte_to_gfn_lvl(pt_element_t gpte, int lvl)
         return (gpte & PT_LVL_ADDR_MASK(lvl)) >> PAGE_SHIFT;
 }
 
-static bool FNAME(cmpxchg_gpte)(struct kvm *kvm,
-                         gfn_t table_gfn, unsigned index,
-                         pt_element_t orig_pte, pt_element_t new_pte)
+static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
+                               pt_element_t __user *ptep_user, unsigned index,
+                               pt_element_t orig_pte, pt_element_t new_pte)
 {
+        int npages;
         pt_element_t ret;
         pt_element_t *table;
         struct page *page;
 
-        page = gfn_to_page(kvm, table_gfn);
+        npages = get_user_pages_fast((unsigned long)ptep_user, 1, 1, &page);
+        /* Check if the user is doing something meaningless. */
+        if (unlikely(npages != 1))
+                return -EFAULT;
 
         table = kmap_atomic(page, KM_USER0);
         ret = CMPXCHG(&table[index], orig_pte, new_pte);
@@ -117,6 +121,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker,
                                     gva_t addr, u32 access)
 {
         pt_element_t pte;
+        pt_element_t __user *ptep_user;
         gfn_t table_gfn;
         unsigned index, pt_access, uninitialized_var(pte_access);
         gpa_t pte_gpa;
@@ -152,6 +157,9 @@ walk:
         pt_access = ACC_ALL;
 
         for (;;) {
+                gfn_t real_gfn;
+                unsigned long host_addr;
+
                 index = PT_INDEX(addr, walker->level);
 
                 table_gfn = gpte_to_gfn(pte);
@@ -160,43 +168,64 @@ walk:
                 walker->table_gfn[walker->level - 1] = table_gfn;
                 walker->pte_gpa[walker->level - 1] = pte_gpa;
 
-                if (kvm_read_guest_page_mmu(vcpu, mmu, table_gfn, &pte,
-                                            offset, sizeof(pte),
-                                            PFERR_USER_MASK|PFERR_WRITE_MASK)) {
+                real_gfn = mmu->translate_gpa(vcpu, gfn_to_gpa(table_gfn),
+                                              PFERR_USER_MASK|PFERR_WRITE_MASK);
+                if (unlikely(real_gfn == UNMAPPED_GVA)) {
+                        present = false;
+                        break;
+                }
+                real_gfn = gpa_to_gfn(real_gfn);
+
+                host_addr = gfn_to_hva(vcpu->kvm, real_gfn);
+                if (unlikely(kvm_is_error_hva(host_addr))) {
+                        present = false;
+                        break;
+                }
+
+                ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
+                if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte)))) {
                         present = false;
                         break;
                 }
 
                 trace_kvm_mmu_paging_element(pte, walker->level);
 
-                if (!is_present_gpte(pte)) {
+                if (unlikely(!is_present_gpte(pte))) {
                         present = false;
                         break;
                 }
 
-                if (is_rsvd_bits_set(&vcpu->arch.mmu, pte, walker->level)) {
+                if (unlikely(is_rsvd_bits_set(&vcpu->arch.mmu, pte,
+                                              walker->level))) {
                         rsvd_fault = true;
                         break;
                 }
 
-                if (write_fault && !is_writable_pte(pte))
-                        if (user_fault || is_write_protection(vcpu))
-                                eperm = true;
+                if (unlikely(write_fault && !is_writable_pte(pte)
+                             && (user_fault || is_write_protection(vcpu))))
+                        eperm = true;
 
-                if (user_fault && !(pte & PT_USER_MASK))
+                if (unlikely(user_fault && !(pte & PT_USER_MASK)))
                         eperm = true;
 
 #if PTTYPE == 64
-                if (fetch_fault && (pte & PT64_NX_MASK))
+                if (unlikely(fetch_fault && (pte & PT64_NX_MASK)))
                         eperm = true;
 #endif
 
-                if (!eperm && !rsvd_fault && !(pte & PT_ACCESSED_MASK)) {
+                if (!eperm && !rsvd_fault
+                    && unlikely(!(pte & PT_ACCESSED_MASK))) {
+                        int ret;
                         trace_kvm_mmu_set_accessed_bit(table_gfn, index,
                                                        sizeof(pte));
-                        if (FNAME(cmpxchg_gpte)(vcpu->kvm, table_gfn,
-                            index, pte, pte|PT_ACCESSED_MASK))
+                        ret = FNAME(cmpxchg_gpte)(vcpu, mmu, ptep_user, index,
+                                                  pte, pte|PT_ACCESSED_MASK);
+                        if (unlikely(ret < 0)) {
+                                present = false;
+                                break;
+                        } else if (ret)
                                 goto walk;
+
                         mark_page_dirty(vcpu->kvm, table_gfn);
                         pte |= PT_ACCESSED_MASK;
                 }
@@ -241,17 +270,21 @@ walk:
                 --walker->level;
         }
 
-        if (!present || eperm || rsvd_fault)
+        if (unlikely(!present || eperm || rsvd_fault))
                 goto error;
 
-        if (write_fault && !is_dirty_gpte(pte)) {
-                bool ret;
+        if (write_fault && unlikely(!is_dirty_gpte(pte))) {
+                int ret;
 
                 trace_kvm_mmu_set_dirty_bit(table_gfn, index, sizeof(pte));
-                ret = FNAME(cmpxchg_gpte)(vcpu->kvm, table_gfn, index, pte,
-                            pte|PT_DIRTY_MASK);
-                if (ret)
+                ret = FNAME(cmpxchg_gpte)(vcpu, mmu, ptep_user, index,
+                                          pte, pte|PT_DIRTY_MASK);
+                if (unlikely(ret < 0)) {
+                        present = false;
+                        goto error;
+                } else if (ret)
                         goto walk;
+
                 mark_page_dirty(vcpu->kvm, table_gfn);
                 pte |= PT_DIRTY_MASK;
                 walker->ptes[walker->level - 1] = pte;
@@ -325,7 +358,7 @@ no_present:
 }
 
 static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
-                              u64 *spte, const void *pte, unsigned long mmu_seq)
+                              u64 *spte, const void *pte)
 {
         pt_element_t gpte;
         unsigned pte_access;
@@ -342,8 +375,6 @@ static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
                 kvm_release_pfn_clean(pfn);
                 return;
         }
-        if (mmu_notifier_retry(vcpu, mmu_seq))
-                return;
 
         /*
          * we call mmu_set_spte() with host_writable = true because that
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 6bb15d583e47..506e4fe23adc 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -63,6 +63,10 @@ MODULE_LICENSE("GPL");
 
 #define DEBUGCTL_RESERVED_BITS (~(0x3fULL))
 
+#define TSC_RATIO_RSVD          0xffffff0000000000ULL
+#define TSC_RATIO_MIN           0x0000000000000001ULL
+#define TSC_RATIO_MAX           0x000000ffffffffffULL
+
 static bool erratum_383_found __read_mostly;
 
 static const u32 host_save_user_msrs[] = {
@@ -93,14 +97,6 @@ struct nested_state {
         /* A VMEXIT is required but not yet emulated */
         bool exit_required;
 
-        /*
-         * If we vmexit during an instruction emulation we need this to restore
-         * the l1 guest rip after the emulation
-         */
-        unsigned long vmexit_rip;
-        unsigned long vmexit_rsp;
-        unsigned long vmexit_rax;
-
         /* cache for intercepts of the guest */
         u32 intercept_cr;
         u32 intercept_dr;
@@ -144,8 +140,13 @@ struct vcpu_svm {
         unsigned int3_injected;
         unsigned long int3_rip;
         u32 apf_reason;
+
+        u64  tsc_ratio;
 };
 
+static DEFINE_PER_CPU(u64, current_tsc_ratio);
+#define TSC_RATIO_DEFAULT       0x0100000000ULL
+
 #define MSR_INVALID                     0xffffffffU
 
 static struct svm_direct_access_msrs {
@@ -190,6 +191,7 @@ static int nested_svm_intercept(struct vcpu_svm *svm);
 static int nested_svm_vmexit(struct vcpu_svm *svm);
 static int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr,
                                       bool has_error_code, u32 error_code);
+static u64 __scale_tsc(u64 ratio, u64 tsc);
 
 enum {
         VMCB_INTERCEPTS, /* Intercept vectors, TSC offset,
@@ -376,7 +378,6 @@ struct svm_cpu_data {
 };
 
 static DEFINE_PER_CPU(struct svm_cpu_data *, svm_data);
-static uint32_t svm_features;
 
 struct svm_init_data {
         int cpu;
@@ -569,6 +570,10 @@ static int has_svm(void)
 
 static void svm_hardware_disable(void *garbage)
 {
+        /* Make sure we clean up behind us */
+        if (static_cpu_has(X86_FEATURE_TSCRATEMSR))
+                wrmsrl(MSR_AMD64_TSC_RATIO, TSC_RATIO_DEFAULT);
+
         cpu_svm_disable();
 }
 
@@ -610,6 +615,11 @@ static int svm_hardware_enable(void *garbage)
 
         wrmsrl(MSR_VM_HSAVE_PA, page_to_pfn(sd->save_area) << PAGE_SHIFT);
 
+        if (static_cpu_has(X86_FEATURE_TSCRATEMSR)) {
+                wrmsrl(MSR_AMD64_TSC_RATIO, TSC_RATIO_DEFAULT);
+                __get_cpu_var(current_tsc_ratio) = TSC_RATIO_DEFAULT;
+        }
+
         svm_init_erratum_383();
 
         return 0;
@@ -791,6 +801,23 @@ static __init int svm_hardware_setup(void)
         if (boot_cpu_has(X86_FEATURE_FXSR_OPT))
                 kvm_enable_efer_bits(EFER_FFXSR);
 
+        if (boot_cpu_has(X86_FEATURE_TSCRATEMSR)) {
+                u64 max;
+
+                kvm_has_tsc_control = true;
+
+                /*
+                 * Make sure the user can only configure tsc_khz values that
+                 * fit into a signed integer.
+                 * A min value is not calculated needed because it will always
+                 * be 1 on all machines and a value of 0 is used to disable
+                 * tsc-scaling for the vcpu.
+                 */
+                max = min(0x7fffffffULL, __scale_tsc(tsc_khz, TSC_RATIO_MAX));
+
+                kvm_max_guest_tsc_khz = max;
+        }
+
         if (nested) {
                 printk(KERN_INFO "kvm: Nested Virtualization enabled\n");
                 kvm_enable_efer_bits(EFER_SVME | EFER_LMSLE);
@@ -802,8 +829,6 @@ static __init int svm_hardware_setup(void)
                         goto err;
         }
 
-        svm_features = cpuid_edx(SVM_CPUID_FUNC);
-
         if (!boot_cpu_has(X86_FEATURE_NPT))
                 npt_enabled = false;
 
@@ -854,6 +879,64 @@ static void init_sys_seg(struct vmcb_seg *seg, uint32_t type)
         seg->base = 0;
 }
 
+static u64 __scale_tsc(u64 ratio, u64 tsc)
+{
+        u64 mult, frac, _tsc;
+
+        mult  = ratio >> 32;
+        frac  = ratio & ((1ULL << 32) - 1);
+
+        _tsc  = tsc;
+        _tsc *= mult;
+        _tsc += (tsc >> 32) * frac;
+        _tsc += ((tsc & ((1ULL << 32) - 1)) * frac) >> 32;
+
+        return _tsc;
+}
+
+static u64 svm_scale_tsc(struct kvm_vcpu *vcpu, u64 tsc)
+{
+        struct vcpu_svm *svm = to_svm(vcpu);
+        u64 _tsc = tsc;
+
+        if (svm->tsc_ratio != TSC_RATIO_DEFAULT)
+                _tsc = __scale_tsc(svm->tsc_ratio, tsc);
+
+        return _tsc;
+}
+
+static void svm_set_tsc_khz(struct kvm_vcpu *vcpu, u32 user_tsc_khz)
+{
+        struct vcpu_svm *svm = to_svm(vcpu);
+        u64 ratio;
+        u64 khz;
+
+        /* TSC scaling supported? */
+        if (!boot_cpu_has(X86_FEATURE_TSCRATEMSR))
+                return;
+
+        /* TSC-Scaling disabled or guest TSC same frequency as host TSC? */
+        if (user_tsc_khz == 0) {
+                vcpu->arch.virtual_tsc_khz = 0;
+                svm->tsc_ratio = TSC_RATIO_DEFAULT;
+                return;
+        }
+
+        khz = user_tsc_khz;
+
+        /* TSC scaling required  - calculate ratio */
+        ratio = khz << 32;
+        do_div(ratio, tsc_khz);
+
+        if (ratio == 0 || ratio & TSC_RATIO_RSVD) {
+                WARN_ONCE(1, "Invalid TSC ratio - virtual-tsc-khz=%u\n",
+                                user_tsc_khz);
+                return;
+        }
+        vcpu->arch.virtual_tsc_khz = user_tsc_khz;
+        svm->tsc_ratio             = ratio;
+}
+
 static void svm_write_tsc_offset(struct kvm_vcpu *vcpu, u64 offset)
 {
         struct vcpu_svm *svm = to_svm(vcpu);
@@ -880,6 +963,15 @@ static void svm_adjust_tsc_offset(struct kvm_vcpu *vcpu, s64 adjustment)
         mark_dirty(svm->vmcb, VMCB_INTERCEPTS);
 }
 
+static u64 svm_compute_tsc_offset(struct kvm_vcpu *vcpu, u64 target_tsc)
+{
+        u64 tsc;
+
+        tsc = svm_scale_tsc(vcpu, native_read_tsc());
+
+        return target_tsc - tsc;
+}
+
 static void init_vmcb(struct vcpu_svm *svm)
 {
         struct vmcb_control_area *control = &svm->vmcb->control;
@@ -975,7 +1067,7 @@ static void init_vmcb(struct vcpu_svm *svm)
         svm_set_efer(&svm->vcpu, 0);
         save->dr6 = 0xffff0ff0;
         save->dr7 = 0x400;
-        save->rflags = 2;
+        kvm_set_rflags(&svm->vcpu, 2);
         save->rip = 0x0000fff0;
         svm->vcpu.arch.regs[VCPU_REGS_RIP] = save->rip;
 
@@ -1048,6 +1140,8 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id)
                 goto out;
         }
 
+        svm->tsc_ratio = TSC_RATIO_DEFAULT;
+
         err = kvm_vcpu_init(&svm->vcpu, kvm, id);
         if (err)
                 goto free_svm;
@@ -1141,6 +1235,12 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
 
         for (i = 0; i < NR_HOST_SAVE_USER_MSRS; i++)
                 rdmsrl(host_save_user_msrs[i], svm->host_user_msrs[i]);
+
+        if (static_cpu_has(X86_FEATURE_TSCRATEMSR) &&
+            svm->tsc_ratio != __get_cpu_var(current_tsc_ratio)) {
+                __get_cpu_var(current_tsc_ratio) = svm->tsc_ratio;
+                wrmsrl(MSR_AMD64_TSC_RATIO, svm->tsc_ratio);
+        }
 }
 
 static void svm_vcpu_put(struct kvm_vcpu *vcpu)
@@ -1365,31 +1465,6 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
 {
         struct vcpu_svm *svm = to_svm(vcpu);
 
-        if (is_guest_mode(vcpu)) {
-                /*
-                 * We are here because we run in nested mode, the host kvm
-                 * intercepts cr0 writes but the l1 hypervisor does not.
-                 * But the L1 hypervisor may intercept selective cr0 writes.
-                 * This needs to be checked here.
-                 */
-                unsigned long old, new;
-
-                /* Remove bits that would trigger a real cr0 write intercept */
-                old = vcpu->arch.cr0 & SVM_CR0_SELECTIVE_MASK;
-                new = cr0 & SVM_CR0_SELECTIVE_MASK;
-
-                if (old == new) {
-                        /* cr0 write with ts and mp unchanged */
-                        svm->vmcb->control.exit_code = SVM_EXIT_CR0_SEL_WRITE;
-                        if (nested_svm_exit_handled(svm) == NESTED_EXIT_DONE) {
-                                svm->nested.vmexit_rip = kvm_rip_read(vcpu);
-                                svm->nested.vmexit_rsp = kvm_register_read(vcpu, VCPU_REGS_RSP);
-                                svm->nested.vmexit_rax = kvm_register_read(vcpu, VCPU_REGS_RAX);
-                                return;
-                        }
-                }
-        }
-
 #ifdef CONFIG_X86_64
         if (vcpu->arch.efer & EFER_LME) {
                 if (!is_paging(vcpu) && (cr0 & X86_CR0_PG)) {
@@ -2127,7 +2202,7 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)
         nested_vmcb->save.cr3    = kvm_read_cr3(&svm->vcpu);
         nested_vmcb->save.cr2    = vmcb->save.cr2;
         nested_vmcb->save.cr4    = svm->vcpu.arch.cr4;
-        nested_vmcb->save.rflags = vmcb->save.rflags;
+        nested_vmcb->save.rflags = kvm_get_rflags(&svm->vcpu);
         nested_vmcb->save.rip    = vmcb->save.rip;
         nested_vmcb->save.rsp    = vmcb->save.rsp;
         nested_vmcb->save.rax    = vmcb->save.rax;
@@ -2184,7 +2259,7 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)
         svm->vmcb->save.ds = hsave->save.ds;
         svm->vmcb->save.gdtr = hsave->save.gdtr;
         svm->vmcb->save.idtr = hsave->save.idtr;
-        svm->vmcb->save.rflags = hsave->save.rflags;
+        kvm_set_rflags(&svm->vcpu, hsave->save.rflags);
         svm_set_efer(&svm->vcpu, hsave->save.efer);
         svm_set_cr0(&svm->vcpu, hsave->save.cr0 | X86_CR0_PE);
         svm_set_cr4(&svm->vcpu, hsave->save.cr4);
@@ -2312,7 +2387,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
         hsave->save.efer   = svm->vcpu.arch.efer;
         hsave->save.cr0    = kvm_read_cr0(&svm->vcpu);
         hsave->save.cr4    = svm->vcpu.arch.cr4;
-        hsave->save.rflags = vmcb->save.rflags;
+        hsave->save.rflags = kvm_get_rflags(&svm->vcpu);
         hsave->save.rip    = kvm_rip_read(&svm->vcpu);
         hsave->save.rsp    = vmcb->save.rsp;
         hsave->save.rax    = vmcb->save.rax;
@@ -2323,7 +2398,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
 
         copy_vmcb_control_area(hsave, vmcb);
 
-        if (svm->vmcb->save.rflags & X86_EFLAGS_IF)
+        if (kvm_get_rflags(&svm->vcpu) & X86_EFLAGS_IF)
                 svm->vcpu.arch.hflags |= HF_HIF_MASK;
         else
                 svm->vcpu.arch.hflags &= ~HF_HIF_MASK;
@@ -2341,7 +2416,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
         svm->vmcb->save.ds = nested_vmcb->save.ds;
         svm->vmcb->save.gdtr = nested_vmcb->save.gdtr;
         svm->vmcb->save.idtr = nested_vmcb->save.idtr;
-        svm->vmcb->save.rflags = nested_vmcb->save.rflags;
+        kvm_set_rflags(&svm->vcpu, nested_vmcb->save.rflags);
         svm_set_efer(&svm->vcpu, nested_vmcb->save.efer);
         svm_set_cr0(&svm->vcpu, nested_vmcb->save.cr0);
         svm_set_cr4(&svm->vcpu, nested_vmcb->save.cr4);
@@ -2443,13 +2518,13 @@ static int vmload_interception(struct vcpu_svm *svm)
         if (nested_svm_check_permissions(svm))
                 return 1;
 
-        svm->next_rip = kvm_rip_read(&svm->vcpu) + 3;
-        skip_emulated_instruction(&svm->vcpu);
-
         nested_vmcb = nested_svm_map(svm, svm->vmcb->save.rax, &page);
         if (!nested_vmcb)
                 return 1;
 
+        svm->next_rip = kvm_rip_read(&svm->vcpu) + 3;
+        skip_emulated_instruction(&svm->vcpu);
+
         nested_svm_vmloadsave(nested_vmcb, svm->vmcb);
         nested_svm_unmap(page);
 
@@ -2464,13 +2539,13 @@ static int vmsave_interception(struct vcpu_svm *svm)
         if (nested_svm_check_permissions(svm))
                 return 1;
 
-        svm->next_rip = kvm_rip_read(&svm->vcpu) + 3;
-        skip_emulated_instruction(&svm->vcpu);
-
         nested_vmcb = nested_svm_map(svm, svm->vmcb->save.rax, &page);
         if (!nested_vmcb)
                 return 1;
 
+        svm->next_rip = kvm_rip_read(&svm->vcpu) + 3;
+        skip_emulated_instruction(&svm->vcpu);
+
         nested_svm_vmloadsave(svm->vmcb, nested_vmcb);
         nested_svm_unmap(page);
 
@@ -2676,6 +2751,29 @@ static int emulate_on_interception(struct vcpu_svm *svm)
         return emulate_instruction(&svm->vcpu, 0) == EMULATE_DONE;
 }
 
+bool check_selective_cr0_intercepted(struct vcpu_svm *svm, unsigned long val)
+{
+        unsigned long cr0 = svm->vcpu.arch.cr0;
+        bool ret = false;
+        u64 intercept;
+
+        intercept = svm->nested.intercept;
+
+        if (!is_guest_mode(&svm->vcpu) ||
+            (!(intercept & (1ULL << INTERCEPT_SELECTIVE_CR0))))
+                return false;
+
+        cr0 &= ~SVM_CR0_SELECTIVE_MASK;
+        val &= ~SVM_CR0_SELECTIVE_MASK;
+
+        if (cr0 ^ val) {
+                svm->vmcb->control.exit_code = SVM_EXIT_CR0_SEL_WRITE;
+                ret = (nested_svm_exit_handled(svm) == NESTED_EXIT_DONE);
+        }
+
+        return ret;
+}
+
 #define CR_VALID (1ULL << 63)
 
 static int cr_interception(struct vcpu_svm *svm)
@@ -2699,7 +2797,11 @@ static int cr_interception(struct vcpu_svm *svm)
                 val = kvm_register_read(&svm->vcpu, reg);
                 switch (cr) {
                 case 0:
-                        err = kvm_set_cr0(&svm->vcpu, val);
+                        if (!check_selective_cr0_intercepted(svm, val))
+                                err = kvm_set_cr0(&svm->vcpu, val);
+                        else
+                                return 1;
+
                         break;
                 case 3:
                         err = kvm_set_cr3(&svm->vcpu, val);
@@ -2744,23 +2846,6 @@ static int cr_interception(struct vcpu_svm *svm)
         return 1;
 }
 
-static int cr0_write_interception(struct vcpu_svm *svm)
-{
-        struct kvm_vcpu *vcpu = &svm->vcpu;
-        int r;
-
-        r = cr_interception(svm);
-
-        if (svm->nested.vmexit_rip) {
-                kvm_register_write(vcpu, VCPU_REGS_RIP, svm->nested.vmexit_rip);
-                kvm_register_write(vcpu, VCPU_REGS_RSP, svm->nested.vmexit_rsp);
-                kvm_register_write(vcpu, VCPU_REGS_RAX, svm->nested.vmexit_rax);
-                svm->nested.vmexit_rip = 0;
-        }
-
-        return r;
-}
-
 static int dr_interception(struct vcpu_svm *svm)
 {
         int reg, dr;
@@ -2813,7 +2898,9 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data)
         case MSR_IA32_TSC: {
                 struct vmcb *vmcb = get_host_vmcb(svm);
 
-                *data = vmcb->control.tsc_offset + native_read_tsc();
+                *data = vmcb->control.tsc_offset +
+                        svm_scale_tsc(vcpu, native_read_tsc());
+
                 break;
         }
         case MSR_STAR:
@@ -3048,7 +3135,7 @@ static int (*svm_exit_handlers[])(struct vcpu_svm *svm) = {
         [SVM_EXIT_READ_CR4]                     = cr_interception,
         [SVM_EXIT_READ_CR8]                     = cr_interception,
         [SVM_EXIT_CR0_SEL_WRITE]                = emulate_on_interception,
-        [SVM_EXIT_WRITE_CR0]                    = cr0_write_interception,
+        [SVM_EXIT_WRITE_CR0]                    = cr_interception,
         [SVM_EXIT_WRITE_CR3]                    = cr_interception,
         [SVM_EXIT_WRITE_CR4]                    = cr_interception,
         [SVM_EXIT_WRITE_CR8]                    = cr8_write_interception,
@@ -3104,97 +3191,109 @@ static int (*svm_exit_handlers[])(struct vcpu_svm *svm) = {
         [SVM_EXIT_NPF]                          = pf_interception,
 };
 
-void dump_vmcb(struct kvm_vcpu *vcpu)
+static void dump_vmcb(struct kvm_vcpu *vcpu)
 {
         struct vcpu_svm *svm = to_svm(vcpu);
         struct vmcb_control_area *control = &svm->vmcb->control;
         struct vmcb_save_area *save = &svm->vmcb->save;
 
         pr_err("VMCB Control Area:\n");
-        pr_err("cr_read:            %04x\n", control->intercept_cr & 0xffff);
-        pr_err("cr_write:           %04x\n", control->intercept_cr >> 16);
-        pr_err("dr_read:            %04x\n", control->intercept_dr & 0xffff);
-        pr_err("dr_write:           %04x\n", control->intercept_dr >> 16);
-        pr_err("exceptions:         %08x\n", control->intercept_exceptions);
-        pr_err("intercepts:         %016llx\n", control->intercept);
-        pr_err("pause filter count: %d\n", control->pause_filter_count);
-        pr_err("iopm_base_pa:       %016llx\n", control->iopm_base_pa);
-        pr_err("msrpm_base_pa:      %016llx\n", control->msrpm_base_pa);
-        pr_err("tsc_offset:         %016llx\n", control->tsc_offset);
-        pr_err("asid:               %d\n", control->asid);
-        pr_err("tlb_ctl:            %d\n", control->tlb_ctl);
-        pr_err("int_ctl:            %08x\n", control->int_ctl);
-        pr_err("int_vector:         %08x\n", control->int_vector);
-        pr_err("int_state:          %08x\n", control->int_state);
-        pr_err("exit_code:          %08x\n", control->exit_code);
-        pr_err("exit_info1:         %016llx\n", control->exit_info_1);
-        pr_err("exit_info2:         %016llx\n", control->exit_info_2);
-        pr_err("exit_int_info:      %08x\n", control->exit_int_info);
-        pr_err("exit_int_info_err:  %08x\n", control->exit_int_info_err);
-        pr_err("nested_ctl:         %lld\n", control->nested_ctl);
-        pr_err("nested_cr3:         %016llx\n", control->nested_cr3);
-        pr_err("event_inj:          %08x\n", control->event_inj);
-        pr_err("event_inj_err:      %08x\n", control->event_inj_err);
-        pr_err("lbr_ctl:            %lld\n", control->lbr_ctl);
-        pr_err("next_rip:           %016llx\n", control->next_rip);
+        pr_err("%-20s%04x\n", "cr_read:", control->intercept_cr & 0xffff);
+        pr_err("%-20s%04x\n", "cr_write:", control->intercept_cr >> 16);
+        pr_err("%-20s%04x\n", "dr_read:", control->intercept_dr & 0xffff);
+        pr_err("%-20s%04x\n", "dr_write:", control->intercept_dr >> 16);
+        pr_err("%-20s%08x\n", "exceptions:", control->intercept_exceptions);
+        pr_err("%-20s%016llx\n", "intercepts:", control->intercept);
+        pr_err("%-20s%d\n", "pause filter count:", control->pause_filter_count);
+        pr_err("%-20s%016llx\n", "iopm_base_pa:", control->iopm_base_pa);
+        pr_err("%-20s%016llx\n", "msrpm_base_pa:", control->msrpm_base_pa);
+        pr_err("%-20s%016llx\n", "tsc_offset:", control->tsc_offset);
+        pr_err("%-20s%d\n", "asid:", control->asid);
+        pr_err("%-20s%d\n", "tlb_ctl:", control->tlb_ctl);
+        pr_err("%-20s%08x\n", "int_ctl:", control->int_ctl);
+        pr_err("%-20s%08x\n", "int_vector:", control->int_vector);
+        pr_err("%-20s%08x\n", "int_state:", control->int_state);
+        pr_err("%-20s%08x\n", "exit_code:", control->exit_code);
+        pr_err("%-20s%016llx\n", "exit_info1:", control->exit_info_1);
+        pr_err("%-20s%016llx\n", "exit_info2:", control->exit_info_2);
+        pr_err("%-20s%08x\n", "exit_int_info:", control->exit_int_info);
+        pr_err("%-20s%08x\n", "exit_int_info_err:", control->exit_int_info_err);
+        pr_err("%-20s%lld\n", "nested_ctl:", control->nested_ctl);
+        pr_err("%-20s%016llx\n", "nested_cr3:", control->nested_cr3);
+        pr_err("%-20s%08x\n", "event_inj:", control->event_inj);
+        pr_err("%-20s%08x\n", "event_inj_err:", control->event_inj_err);
+        pr_err("%-20s%lld\n", "lbr_ctl:", control->lbr_ctl);
+        pr_err("%-20s%016llx\n", "next_rip:", control->next_rip);
         pr_err("VMCB State Save Area:\n");
-        pr_err("es:   s: %04x a: %04x l: %08x b: %016llx\n",
-                save->es.selector, save->es.attrib,
-                save->es.limit, save->es.base);
-        pr_err("cs:   s: %04x a: %04x l: %08x b: %016llx\n",
-                save->cs.selector, save->cs.attrib,
-                save->cs.limit, save->cs.base);
-        pr_err("ss:   s: %04x a: %04x l: %08x b: %016llx\n",
-                save->ss.selector, save->ss.attrib,
-                save->ss.limit, save->ss.base);
-        pr_err("ds:   s: %04x a: %04x l: %08x b: %016llx\n",
-                save->ds.selector, save->ds.attrib,
-                save->ds.limit, save->ds.base);
-        pr_err("fs:   s: %04x a: %04x l: %08x b: %016llx\n",
-                save->fs.selector, save->fs.attrib,
-                save->fs.limit, save->fs.base);
-        pr_err("gs:   s: %04x a: %04x l: %08x b: %016llx\n",
-                save->gs.selector, save->gs.attrib,
-                save->gs.limit, save->gs.base);
-        pr_err("gdtr: s: %04x a: %04x l: %08x b: %016llx\n",
-                save->gdtr.selector, save->gdtr.attrib,
-                save->gdtr.limit, save->gdtr.base);
-        pr_err("ldtr: s: %04x a: %04x l: %08x b: %016llx\n",
-                save->ldtr.selector, save->ldtr.attrib,
-                save->ldtr.limit, save->ldtr.base);
-        pr_err("idtr: s: %04x a: %04x l: %08x b: %016llx\n",
-                save->idtr.selector, save->idtr.attrib,
-                save->idtr.limit, save->idtr.base);
-        pr_err("tr:   s: %04x a: %04x l: %08x b: %016llx\n",
-                save->tr.selector, save->tr.attrib,
-                save->tr.limit, save->tr.base);
+        pr_err("%-5s s: %04x a: %04x l: %08x b: %016llx\n",
+               "es:",
+               save->es.selector, save->es.attrib,
+               save->es.limit, save->es.base);
+        pr_err("%-5s s: %04x a: %04x l: %08x b: %016llx\n",
+               "cs:",
+               save->cs.selector, save->cs.attrib,
+               save->cs.limit, save->cs.base);
+        pr_err("%-5s s: %04x a: %04x l: %08x b: %016llx\n",
+               "ss:",
+               save->ss.selector, save->ss.attrib,
+               save->ss.limit, save->ss.base);
+        pr_err("%-5s s: %04x a: %04x l: %08x b: %016llx\n",
+               "ds:",
+               save->ds.selector, save->ds.attrib,
+               save->ds.limit, save->ds.base);
+        pr_err("%-5s s: %04x a: %04x l: %08x b: %016llx\n",
+               "fs:",
+               save->fs.selector, save->fs.attrib,
+               save->fs.limit, save->fs.base);
+        pr_err("%-5s s: %04x a: %04x l: %08x b: %016llx\n",
+               "gs:",
+               save->gs.selector, save->gs.attrib,
+               save->gs.limit, save->gs.base);
+        pr_err("%-5s s: %04x a: %04x l: %08x b: %016llx\n",
+               "gdtr:",
+               save->gdtr.selector, save->gdtr.attrib,
+               save->gdtr.limit, save->gdtr.base);
+        pr_err("%-5s s: %04x a: %04x l: %08x b: %016llx\n",
+               "ldtr:",
+               save->ldtr.selector, save->ldtr.attrib,
+               save->ldtr.limit, save->ldtr.base);
+        pr_err("%-5s s: %04x a: %04x l: %08x b: %016llx\n",
+               "idtr:",
+               save->idtr.selector, save->idtr.attrib,
+               save->idtr.limit, save->idtr.base);
+        pr_err("%-5s s: %04x a: %04x l: %08x b: %016llx\n",
+               "tr:",
+               save->tr.selector, save->tr.attrib,
+               save->tr.limit, save->tr.base);
         pr_err("cpl:            %d                efer:         %016llx\n",
                 save->cpl, save->efer);
-        pr_err("cr0:            %016llx cr2:          %016llx\n",
-                save->cr0, save->cr2);
-        pr_err("cr3:            %016llx cr4:          %016llx\n",
-                save->cr3, save->cr4);
-        pr_err("dr6:            %016llx dr7:          %016llx\n",
-                save->dr6, save->dr7);
-        pr_err("rip:            %016llx rflags:       %016llx\n",
-                save->rip, save->rflags);
-        pr_err("rsp:            %016llx rax:          %016llx\n",
-                save->rsp, save->rax);
-        pr_err("star:           %016llx lstar:        %016llx\n",
-                save->star, save->lstar);
-        pr_err("cstar:          %016llx sfmask:       %016llx\n",
-                save->cstar, save->sfmask);
-        pr_err("kernel_gs_base: %016llx sysenter_cs:  %016llx\n",
-                save->kernel_gs_base, save->sysenter_cs);
-        pr_err("sysenter_esp:   %016llx sysenter_eip: %016llx\n",
-                save->sysenter_esp, save->sysenter_eip);
-        pr_err("gpat:           %016llx dbgctl:       %016llx\n",
-                save->g_pat, save->dbgctl);
-        pr_err("br_from:        %016llx br_to:        %016llx\n",
-                save->br_from, save->br_to);
-        pr_err("excp_from:      %016llx excp_to:      %016llx\n",
-                save->last_excp_from, save->last_excp_to);
-
+        pr_err("%-15s %016llx %-13s %016llx\n",
+               "cr0:", save->cr0, "cr2:", save->cr2);
+        pr_err("%-15s %016llx %-13s %016llx\n",
+               "cr3:", save->cr3, "cr4:", save->cr4);
+        pr_err("%-15s %016llx %-13s %016llx\n",
+               "dr6:", save->dr6, "dr7:", save->dr7);
+        pr_err("%-15s %016llx %-13s %016llx\n",
+               "rip:", save->rip, "rflags:", save->rflags);
+        pr_err("%-15s %016llx %-13s %016llx\n",
+               "rsp:", save->rsp, "rax:", save->rax);
+        pr_err("%-15s %016llx %-13s %016llx\n",
+               "star:", save->star, "lstar:", save->lstar);
+        pr_err("%-15s %016llx %-13s %016llx\n",
+               "cstar:", save->cstar, "sfmask:", save->sfmask);
+        pr_err("%-15s %016llx %-13s %016llx\n",
+               "kernel_gs_base:", save->kernel_gs_base,
+               "sysenter_cs:", save->sysenter_cs);
+        pr_err("%-15s %016llx %-13s %016llx\n",
+               "sysenter_esp:", save->sysenter_esp,
+               "sysenter_eip:", save->sysenter_eip);
+        pr_err("%-15s %016llx %-13s %016llx\n",
+               "gpat:", save->g_pat, "dbgctl:", save->dbgctl);
+        pr_err("%-15s %016llx %-13s %016llx\n",
+               "br_from:", save->br_from, "br_to:", save->br_to);
+        pr_err("%-15s %016llx %-13s %016llx\n",
+               "excp_from:", save->last_excp_from,
+               "excp_to:", save->last_excp_to);
 }
 
 static void svm_get_exit_info(struct kvm_vcpu *vcpu, u64 *info1, u64 *info2)
@@ -3384,7 +3483,7 @@ static int svm_interrupt_allowed(struct kvm_vcpu *vcpu)
              (vmcb->control.int_state & SVM_INTERRUPT_SHADOW_MASK))
                 return 0;
 
-        ret = !!(vmcb->save.rflags & X86_EFLAGS_IF);
+        ret = !!(kvm_get_rflags(vcpu) & X86_EFLAGS_IF);
 
         if (is_guest_mode(vcpu))
                 return ret && !(svm->vcpu.arch.hflags & HF_VINTR_MASK);
@@ -3871,6 +3970,186 @@ static void svm_fpu_deactivate(struct kvm_vcpu *vcpu)
         update_cr0_intercept(svm);
 }
 
+#define PRE_EX(exit)  { .exit_code = (exit), \
+                        .stage = X86_ICPT_PRE_EXCEPT, }
+#define POST_EX(exit) { .exit_code = (exit), \
+                        .stage = X86_ICPT_POST_EXCEPT, }
+#define POST_MEM(exit) { .exit_code = (exit), \
+                        .stage = X86_ICPT_POST_MEMACCESS, }
+
+static struct __x86_intercept {
+        u32 exit_code;
+        enum x86_intercept_stage stage;
+} x86_intercept_map[] = {
+        [x86_intercept_cr_read]         = POST_EX(SVM_EXIT_READ_CR0),
+        [x86_intercept_cr_write]        = POST_EX(SVM_EXIT_WRITE_CR0),
+        [x86_intercept_clts]            = POST_EX(SVM_EXIT_WRITE_CR0),
+        [x86_intercept_lmsw]            = POST_EX(SVM_EXIT_WRITE_CR0),
+        [x86_intercept_smsw]            = POST_EX(SVM_EXIT_READ_CR0),
+        [x86_intercept_dr_read]         = POST_EX(SVM_EXIT_READ_DR0),
+        [x86_intercept_dr_write]        = POST_EX(SVM_EXIT_WRITE_DR0),
+        [x86_intercept_sldt]            = POST_EX(SVM_EXIT_LDTR_READ),
+        [x86_intercept_str]             = POST_EX(SVM_EXIT_TR_READ),
+        [x86_intercept_lldt]            = POST_EX(SVM_EXIT_LDTR_WRITE),
+        [x86_intercept_ltr]             = POST_EX(SVM_EXIT_TR_WRITE),
+        [x86_intercept_sgdt]            = POST_EX(SVM_EXIT_GDTR_READ),
+        [x86_intercept_sidt]            = POST_EX(SVM_EXIT_IDTR_READ),
+        [x86_intercept_lgdt]            = POST_EX(SVM_EXIT_GDTR_WRITE),
+        [x86_intercept_lidt]            = POST_EX(SVM_EXIT_IDTR_WRITE),
+        [x86_intercept_vmrun]           = POST_EX(SVM_EXIT_VMRUN),
+        [x86_intercept_vmmcall]         = POST_EX(SVM_EXIT_VMMCALL),
+        [x86_intercept_vmload]          = POST_EX(SVM_EXIT_VMLOAD),
+        [x86_intercept_vmsave]          = POST_EX(SVM_EXIT_VMSAVE),
+        [x86_intercept_stgi]            = POST_EX(SVM_EXIT_STGI),
+        [x86_intercept_clgi]            = POST_EX(SVM_EXIT_CLGI),
+        [x86_intercept_skinit]          = POST_EX(SVM_EXIT_SKINIT),
+        [x86_intercept_invlpga]         = POST_EX(SVM_EXIT_INVLPGA),
+        [x86_intercept_rdtscp]          = POST_EX(SVM_EXIT_RDTSCP),
+        [x86_intercept_monitor]         = POST_MEM(SVM_EXIT_MONITOR),
+        [x86_intercept_mwait]           = POST_EX(SVM_EXIT_MWAIT),
+        [x86_intercept_invlpg]          = POST_EX(SVM_EXIT_INVLPG),
+        [x86_intercept_invd]            = POST_EX(SVM_EXIT_INVD),
+        [x86_intercept_wbinvd]          = POST_EX(SVM_EXIT_WBINVD),
+        [x86_intercept_wrmsr]           = POST_EX(SVM_EXIT_MSR),
+        [x86_intercept_rdtsc]           = POST_EX(SVM_EXIT_RDTSC),
+        [x86_intercept_rdmsr]           = POST_EX(SVM_EXIT_MSR),
+        [x86_intercept_rdpmc]           = POST_EX(SVM_EXIT_RDPMC),
+        [x86_intercept_cpuid]           = PRE_EX(SVM_EXIT_CPUID),
+        [x86_intercept_rsm]             = PRE_EX(SVM_EXIT_RSM),
+        [x86_intercept_pause]           = PRE_EX(SVM_EXIT_PAUSE),
+        [x86_intercept_pushf]           = PRE_EX(SVM_EXIT_PUSHF),
+        [x86_intercept_popf]            = PRE_EX(SVM_EXIT_POPF),
+        [x86_intercept_intn]            = PRE_EX(SVM_EXIT_SWINT),
+        [x86_intercept_iret]            = PRE_EX(SVM_EXIT_IRET),
+        [x86_intercept_icebp]           = PRE_EX(SVM_EXIT_ICEBP),
+        [x86_intercept_hlt]             = POST_EX(SVM_EXIT_HLT),
+        [x86_intercept_in]              = POST_EX(SVM_EXIT_IOIO),
+        [x86_intercept_ins]             = POST_EX(SVM_EXIT_IOIO),
+        [x86_intercept_out]             = POST_EX(SVM_EXIT_IOIO),
+        [x86_intercept_outs]            = POST_EX(SVM_EXIT_IOIO),
+};
+
+#undef PRE_EX
+#undef POST_EX
+#undef POST_MEM
+
+static int svm_check_intercept(struct kvm_vcpu *vcpu,
+                               struct x86_instruction_info *info,
+                               enum x86_intercept_stage stage)
+{
+        struct vcpu_svm *svm = to_svm(vcpu);
+        int vmexit, ret = X86EMUL_CONTINUE;
+        struct __x86_intercept icpt_info;
+        struct vmcb *vmcb = svm->vmcb;
+
+        if (info->intercept >= ARRAY_SIZE(x86_intercept_map))
+                goto out;
+
+        icpt_info = x86_intercept_map[info->intercept];
+
+        if (stage != icpt_info.stage)
+                goto out;
+
+        switch (icpt_info.exit_code) {
+        case SVM_EXIT_READ_CR0:
+                if (info->intercept == x86_intercept_cr_read)
+                        icpt_info.exit_code += info->modrm_reg;
+                break;
+        case SVM_EXIT_WRITE_CR0: {
+                unsigned long cr0, val;
+                u64 intercept;
+
+                if (info->intercept == x86_intercept_cr_write)
+                        icpt_info.exit_code += info->modrm_reg;
+
+                if (icpt_info.exit_code != SVM_EXIT_WRITE_CR0)
+                        break;
+
+                intercept = svm->nested.intercept;
+
+                if (!(intercept & (1ULL << INTERCEPT_SELECTIVE_CR0)))
+                        break;
+
+                cr0 = vcpu->arch.cr0 & ~SVM_CR0_SELECTIVE_MASK;
+                val = info->src_val  & ~SVM_CR0_SELECTIVE_MASK;
+
+                if (info->intercept == x86_intercept_lmsw) {
+                        cr0 &= 0xfUL;
+                        val &= 0xfUL;
+                        /* lmsw can't clear PE - catch this here */
+                        if (cr0 & X86_CR0_PE)
+                                val |= X86_CR0_PE;
+                }
+
+                if (cr0 ^ val)
+                        icpt_info.exit_code = SVM_EXIT_CR0_SEL_WRITE;
+
+                break;
+        }
+        case SVM_EXIT_READ_DR0:
+        case SVM_EXIT_WRITE_DR0:
+                icpt_info.exit_code += info->modrm_reg;
+                break;
+        case SVM_EXIT_MSR:
+                if (info->intercept == x86_intercept_wrmsr)
+                        vmcb->control.exit_info_1 = 1;
+                else
+                        vmcb->control.exit_info_1 = 0;
+                break;
+        case SVM_EXIT_PAUSE:
+                /*
+                 * We get this for NOP only, but pause
+                 * is rep not, check this here
+                 */
+                if (info->rep_prefix != REPE_PREFIX)
+                        goto out;
+        case SVM_EXIT_IOIO: {
+                u64 exit_info;
+                u32 bytes;
+
+                exit_info = (vcpu->arch.regs[VCPU_REGS_RDX] & 0xffff) << 16;
+
+                if (info->intercept == x86_intercept_in ||
+                    info->intercept == x86_intercept_ins) {
+                        exit_info |= SVM_IOIO_TYPE_MASK;
+                        bytes = info->src_bytes;
+                } else {
+                        bytes = info->dst_bytes;
+                }
+
+                if (info->intercept == x86_intercept_outs ||
+                    info->intercept == x86_intercept_ins)
+                        exit_info |= SVM_IOIO_STR_MASK;
+
+                if (info->rep_prefix)
+                        exit_info |= SVM_IOIO_REP_MASK;
+
+                bytes = min(bytes, 4u);
+
+                exit_info |= bytes << SVM_IOIO_SIZE_SHIFT;
+
+                exit_info |= (u32)info->ad_bytes << (SVM_IOIO_ASIZE_SHIFT - 1);
+
+                vmcb->control.exit_info_1 = exit_info;
+                vmcb->control.exit_info_2 = info->next_rip;
+
+                break;
+        }
+        default:
+                break;
+        }
+
+        vmcb->control.next_rip  = info->next_rip;
+        vmcb->control.exit_code = icpt_info.exit_code;
+        vmexit = nested_svm_exit_handled(svm);
+
+        ret = (vmexit == NESTED_EXIT_DONE) ? X86EMUL_INTERCEPTED
+                                           : X86EMUL_CONTINUE;
+
+out:
+        return ret;
+}
+
 static struct kvm_x86_ops svm_x86_ops = {
         .cpu_has_kvm_support = has_svm,
         .disabled_by_bios = is_disabled,
@@ -3952,10 +4231,14 @@ static struct kvm_x86_ops svm_x86_ops = {
 
         .has_wbinvd_exit = svm_has_wbinvd_exit,
 
+        .set_tsc_khz = svm_set_tsc_khz,
         .write_tsc_offset = svm_write_tsc_offset,
         .adjust_tsc_offset = svm_adjust_tsc_offset,
+        .compute_tsc_offset = svm_compute_tsc_offset,
 
         .set_tdp_cr3 = set_tdp_cr3,
+
+        .check_intercept = svm_check_intercept,
 };
 
 static int __init svm_init(void)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 5b4cdcbd154c..4c3fa0f67469 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -128,8 +128,11 @@ struct vcpu_vmx {
         unsigned long         host_rsp;
         int                   launched;
         u8                    fail;
+        u8                    cpl;
+        bool                  nmi_known_unmasked;
         u32                   exit_intr_info;
         u32                   idt_vectoring_info;
+        ulong                 rflags;
         struct shared_msr_entry *guest_msrs;
         int                   nmsrs;
         int                   save_nmsrs;
@@ -159,6 +162,10 @@ struct vcpu_vmx {
                         u32 ar;
                 } tr, es, ds, fs, gs;
         } rmode;
+        struct {
+                u32 bitmask; /* 4 bits per segment (1 bit per field) */
+                struct kvm_save_segment seg[8];
+        } segment_cache;
         int vpid;
         bool emulation_required;
 
@@ -171,6 +178,15 @@ struct vcpu_vmx {
         bool rdtscp_enabled;
 };
 
+enum segment_cache_field {
+        SEG_FIELD_SEL = 0,
+        SEG_FIELD_BASE = 1,
+        SEG_FIELD_LIMIT = 2,
+        SEG_FIELD_AR = 3,
+
+        SEG_FIELD_NR = 4
+};
+
 static inline struct vcpu_vmx *to_vmx(struct kvm_vcpu *vcpu)
 {
         return container_of(vcpu, struct vcpu_vmx, vcpu);
@@ -643,6 +659,62 @@ static void vmcs_set_bits(unsigned long field, u32 mask)
         vmcs_writel(field, vmcs_readl(field) | mask);
 }
 
+static void vmx_segment_cache_clear(struct vcpu_vmx *vmx)
+{
+        vmx->segment_cache.bitmask = 0;
+}
+
+static bool vmx_segment_cache_test_set(struct vcpu_vmx *vmx, unsigned seg,
+                                       unsigned field)
+{
+        bool ret;
+        u32 mask = 1 << (seg * SEG_FIELD_NR + field);
+
+        if (!(vmx->vcpu.arch.regs_avail & (1 << VCPU_EXREG_SEGMENTS))) {
+                vmx->vcpu.arch.regs_avail |= (1 << VCPU_EXREG_SEGMENTS);
+                vmx->segment_cache.bitmask = 0;
+        }
+        ret = vmx->segment_cache.bitmask & mask;
+        vmx->segment_cache.bitmask |= mask;
+        return ret;
+}
+
+static u16 vmx_read_guest_seg_selector(struct vcpu_vmx *vmx, unsigned seg)
+{
+        u16 *p = &vmx->segment_cache.seg[seg].selector;
+
+        if (!vmx_segment_cache_test_set(vmx, seg, SEG_FIELD_SEL))
+                *p = vmcs_read16(kvm_vmx_segment_fields[seg].selector);
+        return *p;
+}
+
+static ulong vmx_read_guest_seg_base(struct vcpu_vmx *vmx, unsigned seg)
+{
+        ulong *p = &vmx->segment_cache.seg[seg].base;
+
+        if (!vmx_segment_cache_test_set(vmx, seg, SEG_FIELD_BASE))
+                *p = vmcs_readl(kvm_vmx_segment_fields[seg].base);
+        return *p;
+}
+
+static u32 vmx_read_guest_seg_limit(struct vcpu_vmx *vmx, unsigned seg)
+{
+        u32 *p = &vmx->segment_cache.seg[seg].limit;
+
+        if (!vmx_segment_cache_test_set(vmx, seg, SEG_FIELD_LIMIT))
+                *p = vmcs_read32(kvm_vmx_segment_fields[seg].limit);
+        return *p;
+}
+
+static u32 vmx_read_guest_seg_ar(struct vcpu_vmx *vmx, unsigned seg)
+{
+        u32 *p = &vmx->segment_cache.seg[seg].ar;
+
+        if (!vmx_segment_cache_test_set(vmx, seg, SEG_FIELD_AR))
+                *p = vmcs_read32(kvm_vmx_segment_fields[seg].ar_bytes);
+        return *p;
+}
+
 static void update_exception_bitmap(struct kvm_vcpu *vcpu)
 {
         u32 eb;
@@ -970,17 +1042,24 @@ static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu)
 {
         unsigned long rflags, save_rflags;
 
-        rflags = vmcs_readl(GUEST_RFLAGS);
-        if (to_vmx(vcpu)->rmode.vm86_active) {
-                rflags &= RMODE_GUEST_OWNED_EFLAGS_BITS;
-                save_rflags = to_vmx(vcpu)->rmode.save_rflags;
-                rflags |= save_rflags & ~RMODE_GUEST_OWNED_EFLAGS_BITS;
+        if (!test_bit(VCPU_EXREG_RFLAGS, (ulong *)&vcpu->arch.regs_avail)) {
+                __set_bit(VCPU_EXREG_RFLAGS, (ulong *)&vcpu->arch.regs_avail);
+                rflags = vmcs_readl(GUEST_RFLAGS);
+                if (to_vmx(vcpu)->rmode.vm86_active) {
+                        rflags &= RMODE_GUEST_OWNED_EFLAGS_BITS;
+                        save_rflags = to_vmx(vcpu)->rmode.save_rflags;
+                        rflags |= save_rflags & ~RMODE_GUEST_OWNED_EFLAGS_BITS;
+                }
+                to_vmx(vcpu)->rflags = rflags;
         }
-        return rflags;
+        return to_vmx(vcpu)->rflags;
 }
 
 static void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
 {
+        __set_bit(VCPU_EXREG_RFLAGS, (ulong *)&vcpu->arch.regs_avail);
+        __clear_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
+        to_vmx(vcpu)->rflags = rflags;
         if (to_vmx(vcpu)->rmode.vm86_active) {
                 to_vmx(vcpu)->rmode.save_rflags = rflags;
                 rflags |= X86_EFLAGS_IOPL | X86_EFLAGS_VM;
@@ -1053,7 +1132,10 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu, unsigned nr,
         }
 
         if (vmx->rmode.vm86_active) {
-                if (kvm_inject_realmode_interrupt(vcpu, nr) != EMULATE_DONE)
+                int inc_eip = 0;
+                if (kvm_exception_is_soft(nr))
+                        inc_eip = vcpu->arch.event_exit_inst_len;
+                if (kvm_inject_realmode_interrupt(vcpu, nr, inc_eip) != EMULATE_DONE)
                         kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
                 return;
         }
@@ -1151,6 +1233,16 @@ static u64 guest_read_tsc(void)
 }
 
 /*
+ * Empty call-back. Needs to be implemented when VMX enables the SET_TSC_KHZ
+ * ioctl. In this case the call-back should update internal vmx state to make
+ * the changes effective.
+ */
+static void vmx_set_tsc_khz(struct kvm_vcpu *vcpu, u32 user_tsc_khz)
+{
+        /* Nothing to do here */
+}
+
+/*
  * writes 'offset' into guest's timestamp counter offset register
  */
 static void vmx_write_tsc_offset(struct kvm_vcpu *vcpu, u64 offset)
@@ -1164,6 +1256,11 @@ static void vmx_adjust_tsc_offset(struct kvm_vcpu *vcpu, s64 adjustment)
         vmcs_write64(TSC_OFFSET, offset + adjustment);
 }
 
+static u64 vmx_compute_tsc_offset(struct kvm_vcpu *vcpu, u64 target_tsc)
+{
+        return target_tsc - native_read_tsc();
+}
+
 /*
  * Reads an msr value (of 'msr_index') into 'pdata'.
  * Returns 0 on success, non-0 otherwise.
@@ -1243,9 +1340,11 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)
                 break;
 #ifdef CONFIG_X86_64
         case MSR_FS_BASE:
+                vmx_segment_cache_clear(vmx);
                 vmcs_writel(GUEST_FS_BASE, data);
                 break;
         case MSR_GS_BASE:
+                vmx_segment_cache_clear(vmx);
                 vmcs_writel(GUEST_GS_BASE, data);
                 break;
         case MSR_KERNEL_GS_BASE:
@@ -1689,6 +1788,8 @@ static void enter_pmode(struct kvm_vcpu *vcpu)
         vmx->emulation_required = 1;
         vmx->rmode.vm86_active = 0;
 
+        vmx_segment_cache_clear(vmx);
+
         vmcs_write16(GUEST_TR_SELECTOR, vmx->rmode.tr.selector);
         vmcs_writel(GUEST_TR_BASE, vmx->rmode.tr.base);
         vmcs_write32(GUEST_TR_LIMIT, vmx->rmode.tr.limit);
@@ -1712,6 +1813,8 @@ static void enter_pmode(struct kvm_vcpu *vcpu)
         fix_pmode_dataseg(VCPU_SREG_GS, &vmx->rmode.gs);
         fix_pmode_dataseg(VCPU_SREG_FS, &vmx->rmode.fs);
 
+        vmx_segment_cache_clear(vmx);
+
         vmcs_write16(GUEST_SS_SELECTOR, 0);
         vmcs_write32(GUEST_SS_AR_BYTES, 0x93);
 
@@ -1775,6 +1878,8 @@ static void enter_rmode(struct kvm_vcpu *vcpu)
                 vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);
         }
 
+        vmx_segment_cache_clear(vmx);
+
         vmx->rmode.tr.selector = vmcs_read16(GUEST_TR_SELECTOR);
         vmx->rmode.tr.base = vmcs_readl(GUEST_TR_BASE);
         vmcs_writel(GUEST_TR_BASE, rmode_tss_base(vcpu->kvm));
@@ -1851,6 +1956,8 @@ static void enter_lmode(struct kvm_vcpu *vcpu)
 {
         u32 guest_tr_ar;
 
+        vmx_segment_cache_clear(to_vmx(vcpu));
+
         guest_tr_ar = vmcs_read32(GUEST_TR_AR_BYTES);
         if ((guest_tr_ar & AR_TYPE_MASK) != AR_TYPE_BUSY_64_TSS) {
                 printk(KERN_DEBUG "%s: tss fixup for long mode. \n",
@@ -1998,6 +2105,7 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
         vmcs_writel(CR0_READ_SHADOW, cr0);
         vmcs_writel(GUEST_CR0, hw_cr0);
         vcpu->arch.cr0 = cr0;
+        __clear_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
 }
 
 static u64 construct_eptp(unsigned long root_hpa)
@@ -2053,7 +2161,6 @@ static void vmx_get_segment(struct kvm_vcpu *vcpu,
                             struct kvm_segment *var, int seg)
 {
         struct vcpu_vmx *vmx = to_vmx(vcpu);
-        struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
         struct kvm_save_segment *save;
         u32 ar;
 
@@ -2075,13 +2182,13 @@ static void vmx_get_segment(struct kvm_vcpu *vcpu,
                 var->limit = save->limit;
                 ar = save->ar;
                 if (seg == VCPU_SREG_TR
-                    || var->selector == vmcs_read16(sf->selector))
+                    || var->selector == vmx_read_guest_seg_selector(vmx, seg))
                         goto use_saved_rmode_seg;
         }
-        var->base = vmcs_readl(sf->base);
-        var->limit = vmcs_read32(sf->limit);
-        var->selector = vmcs_read16(sf->selector);
-        ar = vmcs_read32(sf->ar_bytes);
+        var->base = vmx_read_guest_seg_base(vmx, seg);
+        var->limit = vmx_read_guest_seg_limit(vmx, seg);
+        var->selector = vmx_read_guest_seg_selector(vmx, seg);
+        ar = vmx_read_guest_seg_ar(vmx, seg);
 use_saved_rmode_seg:
         if ((ar & AR_UNUSABLE_MASK) && !emulate_invalid_guest_state)
                 ar = 0;
@@ -2098,27 +2205,37 @@ use_saved_rmode_seg:
 
 static u64 vmx_get_segment_base(struct kvm_vcpu *vcpu, int seg)
 {
-        struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
         struct kvm_segment s;
 
         if (to_vmx(vcpu)->rmode.vm86_active) {
                 vmx_get_segment(vcpu, &s, seg);
                 return s.base;
         }
-        return vmcs_readl(sf->base);
+        return vmx_read_guest_seg_base(to_vmx(vcpu), seg);
 }
 
-static int vmx_get_cpl(struct kvm_vcpu *vcpu)
+static int __vmx_get_cpl(struct kvm_vcpu *vcpu)
 {
         if (!is_protmode(vcpu))
                 return 0;
 
-        if (vmx_get_rflags(vcpu) & X86_EFLAGS_VM) /* if virtual 8086 */
+        if (!is_long_mode(vcpu)
+            && (kvm_get_rflags(vcpu) & X86_EFLAGS_VM)) /* if virtual 8086 */
                 return 3;
 
-        return vmcs_read16(GUEST_CS_SELECTOR) & 3;
+        return vmx_read_guest_seg_selector(to_vmx(vcpu), VCPU_SREG_CS) & 3;
 }
 
+static int vmx_get_cpl(struct kvm_vcpu *vcpu)
+{
+        if (!test_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail)) {
+                __set_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
+                to_vmx(vcpu)->cpl = __vmx_get_cpl(vcpu);
+        }
+        return to_vmx(vcpu)->cpl;
+}
+
+
 static u32 vmx_segment_access_rights(struct kvm_segment *var)
 {
         u32 ar;
@@ -2148,6 +2265,8 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu,
         struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
         u32 ar;
 
+        vmx_segment_cache_clear(vmx);
+
         if (vmx->rmode.vm86_active && seg == VCPU_SREG_TR) {
                 vmcs_write16(sf->selector, var->selector);
                 vmx->rmode.tr.selector = var->selector;
@@ -2184,11 +2303,12 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu,
                 ar |= 0x1; /* Accessed */
 
         vmcs_write32(sf->ar_bytes, ar);
+        __clear_bit(VCPU_EXREG_CPL, (ulong *)&vcpu->arch.regs_avail);
 }
 
 static void vmx_get_cs_db_l_bits(struct kvm_vcpu *vcpu, int *db, int *l)
 {
-        u32 ar = vmcs_read32(GUEST_CS_AR_BYTES);
+        u32 ar = vmx_read_guest_seg_ar(to_vmx(vcpu), VCPU_SREG_CS);
 
         *db = (ar >> 14) & 1;
         *l = (ar >> 13) & 1;
@@ -2775,6 +2895,8 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)
         if (ret != 0)
                 goto out;
 
+        vmx_segment_cache_clear(vmx);
+
         seg_setup(VCPU_SREG_CS);
         /*
          * GUEST_CS_BASE should really be 0xffff0000, but VT vm86 mode
@@ -2904,7 +3026,10 @@ static void vmx_inject_irq(struct kvm_vcpu *vcpu)
 
         ++vcpu->stat.irq_injections;
         if (vmx->rmode.vm86_active) {
-                if (kvm_inject_realmode_interrupt(vcpu, irq) != EMULATE_DONE)
+                int inc_eip = 0;
+                if (vcpu->arch.interrupt.soft)
+                        inc_eip = vcpu->arch.event_exit_inst_len;
+                if (kvm_inject_realmode_interrupt(vcpu, irq, inc_eip) != EMULATE_DONE)
                         kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
                 return;
         }
@@ -2937,8 +3062,9 @@ static void vmx_inject_nmi(struct kvm_vcpu *vcpu)
         }
 
         ++vcpu->stat.nmi_injections;
+        vmx->nmi_known_unmasked = false;
         if (vmx->rmode.vm86_active) {
-                if (kvm_inject_realmode_interrupt(vcpu, NMI_VECTOR) != EMULATE_DONE)
+                if (kvm_inject_realmode_interrupt(vcpu, NMI_VECTOR, 0) != EMULATE_DONE)
                         kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu);
                 return;
         }
@@ -2961,6 +3087,8 @@ static bool vmx_get_nmi_mask(struct kvm_vcpu *vcpu)
 {
         if (!cpu_has_virtual_nmis())
                 return to_vmx(vcpu)->soft_vnmi_blocked;
+        if (to_vmx(vcpu)->nmi_known_unmasked)
+                return false;
         return vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & GUEST_INTR_STATE_NMI;
 }
 
@@ -2974,6 +3102,7 @@ static void vmx_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked)
                         vmx->vnmi_blocked_time = 0;
                 }
         } else {
+                vmx->nmi_known_unmasked = !masked;
                 if (masked)
                         vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,
                                       GUEST_INTR_STATE_NMI);
@@ -3091,7 +3220,7 @@ static int handle_exception(struct kvm_vcpu *vcpu)
         enum emulation_result er;
 
         vect_info = vmx->idt_vectoring_info;
-        intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
+        intr_info = vmx->exit_intr_info;
 
         if (is_machine_check(intr_info))
                 return handle_machine_check(vcpu);
@@ -3122,7 +3251,6 @@ static int handle_exception(struct kvm_vcpu *vcpu)
         }
 
         error_code = 0;
-        rip = kvm_rip_read(vcpu);
         if (intr_info & INTR_INFO_DELIVER_CODE_MASK)
                 error_code = vmcs_read32(VM_EXIT_INTR_ERROR_CODE);
         if (is_page_fault(intr_info)) {
@@ -3169,6 +3297,7 @@ static int handle_exception(struct kvm_vcpu *vcpu)
                 vmx->vcpu.arch.event_exit_inst_len =
                         vmcs_read32(VM_EXIT_INSTRUCTION_LEN);
                 kvm_run->exit_reason = KVM_EXIT_DEBUG;
+                rip = kvm_rip_read(vcpu);
                 kvm_run->debug.arch.pc = vmcs_readl(GUEST_CS_BASE) + rip;
                 kvm_run->debug.arch.exception = ex_no;
                 break;
@@ -3505,9 +3634,7 @@ static int handle_task_switch(struct kvm_vcpu *vcpu)
                 switch (type) {
                 case INTR_TYPE_NMI_INTR:
                         vcpu->arch.nmi_injected = false;
-                        if (cpu_has_virtual_nmis())
-                                vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,
-                                              GUEST_INTR_STATE_NMI);
+                        vmx_set_nmi_mask(vcpu, true);
                         break;
                 case INTR_TYPE_EXT_INTR:
                 case INTR_TYPE_SOFT_INTR:
@@ -3867,12 +3994,17 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu, int tpr, int irr)
 
 static void vmx_complete_atomic_exit(struct vcpu_vmx *vmx)
 {
-        u32 exit_intr_info = vmx->exit_intr_info;
+        u32 exit_intr_info;
+
+        if (!(vmx->exit_reason == EXIT_REASON_MCE_DURING_VMENTRY
+              || vmx->exit_reason == EXIT_REASON_EXCEPTION_NMI))
+                return;
+
+        vmx->exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
+        exit_intr_info = vmx->exit_intr_info;
 
         /* Handle machine checks before interrupts are enabled */
-        if ((vmx->exit_reason == EXIT_REASON_MCE_DURING_VMENTRY)
-            || (vmx->exit_reason == EXIT_REASON_EXCEPTION_NMI
-                && is_machine_check(exit_intr_info)))
+        if (is_machine_check(exit_intr_info))
                 kvm_machine_check();
 
         /* We need to handle NMIs before interrupts are enabled */
@@ -3886,7 +4018,7 @@ static void vmx_complete_atomic_exit(struct vcpu_vmx *vmx)
 
 static void vmx_recover_nmi_blocking(struct vcpu_vmx *vmx)
 {
-        u32 exit_intr_info = vmx->exit_intr_info;
+        u32 exit_intr_info;
         bool unblock_nmi;
         u8 vector;
         bool idtv_info_valid;
@@ -3894,6 +4026,13 @@ static void vmx_recover_nmi_blocking(struct vcpu_vmx *vmx)
         idtv_info_valid = vmx->idt_vectoring_info & VECTORING_INFO_VALID_MASK;
 
         if (cpu_has_virtual_nmis()) {
+                if (vmx->nmi_known_unmasked)
+                        return;
+                /*
+                 * Can't use vmx->exit_intr_info since we're not sure what
+                 * the exit reason is.
+                 */
+                exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
                 unblock_nmi = (exit_intr_info & INTR_INFO_UNBLOCK_NMI) != 0;
                 vector = exit_intr_info & INTR_INFO_VECTOR_MASK;
                 /*
@@ -3910,6 +4049,10 @@ static void vmx_recover_nmi_blocking(struct vcpu_vmx *vmx)
                     vector != DF_VECTOR && !idtv_info_valid)
                         vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO,
                                       GUEST_INTR_STATE_NMI);
+                else
+                        vmx->nmi_known_unmasked =
+                                !(vmcs_read32(GUEST_INTERRUPTIBILITY_INFO)
+                                  & GUEST_INTR_STATE_NMI);
         } else if (unlikely(vmx->soft_vnmi_blocked))
                 vmx->vnmi_blocked_time +=
                         ktime_to_ns(ktime_sub(ktime_get(), vmx->entry_time));
@@ -3946,8 +4089,7 @@ static void __vmx_complete_interrupts(struct vcpu_vmx *vmx,
                  * Clear bit "block by NMI" before VM entry if a NMI
                  * delivery faulted.
                  */
-                vmcs_clear_bits(GUEST_INTERRUPTIBILITY_INFO,
-                                GUEST_INTR_STATE_NMI);
+                vmx_set_nmi_mask(&vmx->vcpu, false);
                 break;
         case INTR_TYPE_SOFT_EXCEPTION:
                 vmx->vcpu.arch.event_exit_inst_len =
@@ -4124,7 +4266,10 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
               );
 
         vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
+                                  | (1 << VCPU_EXREG_RFLAGS)
+                                  | (1 << VCPU_EXREG_CPL)
                                   | (1 << VCPU_EXREG_PDPTR)
+                                  | (1 << VCPU_EXREG_SEGMENTS)
                                   | (1 << VCPU_EXREG_CR3));
         vcpu->arch.regs_dirty = 0;
 
@@ -4134,7 +4279,6 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
         vmx->launched = 1;
 
         vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
-        vmx->exit_intr_info = vmcs_read32(VM_EXIT_INTR_INFO);
 
         vmx_complete_atomic_exit(vmx);
         vmx_recover_nmi_blocking(vmx);
@@ -4195,8 +4339,8 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
                 goto free_vcpu;
 
         vmx->guest_msrs = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        err = -ENOMEM;
         if (!vmx->guest_msrs) {
-                err = -ENOMEM;
                 goto uninit_vcpu;
         }
 
@@ -4215,7 +4359,8 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
         if (err)
                 goto free_vmcs;
         if (vm_need_virtualize_apic_accesses(kvm))
-                if (alloc_apic_access_page(kvm) != 0)
+                err = alloc_apic_access_page(kvm);
+                if (err)
                         goto free_vmcs;
 
         if (enable_ept) {
@@ -4368,6 +4513,13 @@ static void vmx_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)
 {
 }
 
+static int vmx_check_intercept(struct kvm_vcpu *vcpu,
+                               struct x86_instruction_info *info,
+                               enum x86_intercept_stage stage)
+{
+        return X86EMUL_CONTINUE;
+}
+
 static struct kvm_x86_ops vmx_x86_ops = {
         .cpu_has_kvm_support = cpu_has_kvm_support,
         .disabled_by_bios = vmx_disabled_by_bios,
@@ -4449,10 +4601,14 @@ static struct kvm_x86_ops vmx_x86_ops = {
 
         .has_wbinvd_exit = cpu_has_vmx_wbinvd_exit,
 
+        .set_tsc_khz = vmx_set_tsc_khz,
         .write_tsc_offset = vmx_write_tsc_offset,
         .adjust_tsc_offset = vmx_adjust_tsc_offset,
+        .compute_tsc_offset = vmx_compute_tsc_offset,
 
         .set_tdp_cr3 = vmx_set_cr3,
+
+        .check_intercept = vmx_check_intercept,
 };
 
 static int __init vmx_init(void)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 934b4c6b0bf9..77c9d8673dc4 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -60,22 +60,12 @@
 #include <asm/div64.h>
 
 #define MAX_IO_MSRS 256
-#define CR0_RESERVED_BITS                                               \
-        (~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \
-                          | X86_CR0_ET | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM \
-                          | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))
-#define CR4_RESERVED_BITS                                               \
-        (~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\
-                          | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE     \
-                          | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR  \
-                          | X86_CR4_OSXSAVE \
-                          | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE))
-
-#define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)
-
 #define KVM_MAX_MCE_BANKS 32
 #define KVM_MCE_CAP_SUPPORTED (MCG_CTL_P | MCG_SER_P)
 
+#define emul_to_vcpu(ctxt) \
+        container_of(ctxt, struct kvm_vcpu, arch.emulate_ctxt)
+
 /* EFER defaults:
  * - enable syscall per default because its emulated by KVM
  * - enable LME and LMA per default on 64 bit KVM
@@ -100,6 +90,11 @@ EXPORT_SYMBOL_GPL(kvm_x86_ops);
 int ignore_msrs = 0;
 module_param_named(ignore_msrs, ignore_msrs, bool, S_IRUGO | S_IWUSR);
 
+bool kvm_has_tsc_control;
+EXPORT_SYMBOL_GPL(kvm_has_tsc_control);
+u32  kvm_max_guest_tsc_khz;
+EXPORT_SYMBOL_GPL(kvm_max_guest_tsc_khz);
+
 #define KVM_NR_SHARED_MSRS 16
 
 struct kvm_shared_msrs_global {
@@ -157,6 +152,8 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
 
 u64 __read_mostly host_xcr0;
 
+int emulator_fix_hypercall(struct x86_emulate_ctxt *ctxt);
+
 static inline void kvm_async_pf_hash_reset(struct kvm_vcpu *vcpu)
 {
         int i;
@@ -361,8 +358,8 @@ void kvm_propagate_fault(struct kvm_vcpu *vcpu, struct x86_exception *fault)
 
 void kvm_inject_nmi(struct kvm_vcpu *vcpu)
 {
-        kvm_make_request(KVM_REQ_NMI, vcpu);
         kvm_make_request(KVM_REQ_EVENT, vcpu);
+        vcpu->arch.nmi_pending = 1;
 }
 EXPORT_SYMBOL_GPL(kvm_inject_nmi);
 
@@ -982,7 +979,15 @@ static inline int kvm_tsc_changes_freq(void)
         return ret;
 }
 
-static inline u64 nsec_to_cycles(u64 nsec)
+static u64 vcpu_tsc_khz(struct kvm_vcpu *vcpu)
+{
+        if (vcpu->arch.virtual_tsc_khz)
+                return vcpu->arch.virtual_tsc_khz;
+        else
+                return __this_cpu_read(cpu_tsc_khz);
+}
+
+static inline u64 nsec_to_cycles(struct kvm_vcpu *vcpu, u64 nsec)
 {
         u64 ret;
 
@@ -990,25 +995,24 @@ static inline u64 nsec_to_cycles(u64 nsec)
         if (kvm_tsc_changes_freq())
                 printk_once(KERN_WARNING
                  "kvm: unreliable cycle conversion on adjustable rate TSC\n");
-        ret = nsec * __this_cpu_read(cpu_tsc_khz);
+        ret = nsec * vcpu_tsc_khz(vcpu);
         do_div(ret, USEC_PER_SEC);
         return ret;
 }
 
-static void kvm_arch_set_tsc_khz(struct kvm *kvm, u32 this_tsc_khz)
+static void kvm_init_tsc_catchup(struct kvm_vcpu *vcpu, u32 this_tsc_khz)
 {
         /* Compute a scale to convert nanoseconds in TSC cycles */
         kvm_get_time_scale(this_tsc_khz, NSEC_PER_SEC / 1000,
-                           &kvm->arch.virtual_tsc_shift,
-                           &kvm->arch.virtual_tsc_mult);
-        kvm->arch.virtual_tsc_khz = this_tsc_khz;
+                           &vcpu->arch.tsc_catchup_shift,
+                           &vcpu->arch.tsc_catchup_mult);
 }
 
 static u64 compute_guest_tsc(struct kvm_vcpu *vcpu, s64 kernel_ns)
 {
         u64 tsc = pvclock_scale_delta(kernel_ns-vcpu->arch.last_tsc_nsec,
-                                      vcpu->kvm->arch.virtual_tsc_mult,
-                                      vcpu->kvm->arch.virtual_tsc_shift);
+                                      vcpu->arch.tsc_catchup_mult,
+                                      vcpu->arch.tsc_catchup_shift);
         tsc += vcpu->arch.last_tsc_write;
         return tsc;
 }
@@ -1021,7 +1025,7 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, u64 data)
         s64 sdiff;
 
         raw_spin_lock_irqsave(&kvm->arch.tsc_write_lock, flags);
-        offset = data - native_read_tsc();
+        offset = kvm_x86_ops->compute_tsc_offset(vcpu, data);
         ns = get_kernel_ns();
         elapsed = ns - kvm->arch.last_tsc_nsec;
         sdiff = data - kvm->arch.last_tsc_write;
@@ -1037,13 +1041,13 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, u64 data)
          * In that case, for a reliable TSC, we can match TSC offsets,
          * or make a best guest using elapsed value.
          */
-        if (sdiff < nsec_to_cycles(5ULL * NSEC_PER_SEC) &&
+        if (sdiff < nsec_to_cycles(vcpu, 5ULL * NSEC_PER_SEC) &&
             elapsed < 5ULL * NSEC_PER_SEC) {
                 if (!check_tsc_unstable()) {
                         offset = kvm->arch.last_tsc_offset;
                         pr_debug("kvm: matched tsc offset for %llu\n", data);
                 } else {
-                        u64 delta = nsec_to_cycles(elapsed);
+                        u64 delta = nsec_to_cycles(vcpu, elapsed);
                         offset += delta;
                         pr_debug("kvm: adjusted tsc offset by %llu\n", delta);
                 }
@@ -1075,8 +1079,7 @@ static int kvm_guest_time_update(struct kvm_vcpu *v)
         local_irq_save(flags);
         kvm_get_msr(v, MSR_IA32_TSC, &tsc_timestamp);
         kernel_ns = get_kernel_ns();
-        this_tsc_khz = __this_cpu_read(cpu_tsc_khz);
-
+        this_tsc_khz = vcpu_tsc_khz(v);
         if (unlikely(this_tsc_khz == 0)) {
                 local_irq_restore(flags);
                 kvm_make_request(KVM_REQ_CLOCK_UPDATE, v);
@@ -1993,6 +1996,7 @@ int kvm_dev_ioctl_check_extension(long ext)
         case KVM_CAP_X86_ROBUST_SINGLESTEP:
         case KVM_CAP_XSAVE:
         case KVM_CAP_ASYNC_PF:
+        case KVM_CAP_GET_TSC_KHZ:
                 r = 1;
                 break;
         case KVM_CAP_COALESCED_MMIO:
@@ -2019,6 +2023,9 @@ int kvm_dev_ioctl_check_extension(long ext)
         case KVM_CAP_XCRS:
                 r = cpu_has_xsave;
                 break;
+        case KVM_CAP_TSC_CONTROL:
+                r = kvm_has_tsc_control;
+                break;
         default:
                 r = 0;
                 break;
@@ -2120,8 +2127,13 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
         kvm_x86_ops->vcpu_load(vcpu, cpu);
         if (unlikely(vcpu->cpu != cpu) || check_tsc_unstable()) {
                 /* Make sure TSC doesn't go backwards */
-                s64 tsc_delta = !vcpu->arch.last_host_tsc ? 0 :
-                                native_read_tsc() - vcpu->arch.last_host_tsc;
+                s64 tsc_delta;
+                u64 tsc;
+
+                kvm_get_msr(vcpu, MSR_IA32_TSC, &tsc);
+                tsc_delta = !vcpu->arch.last_guest_tsc ? 0 :
+                             tsc - vcpu->arch.last_guest_tsc;
+
                 if (tsc_delta < 0)
                         mark_tsc_unstable("KVM discovered backwards TSC");
                 if (check_tsc_unstable()) {
@@ -2139,7 +2151,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
 {
         kvm_x86_ops->vcpu_put(vcpu);
         kvm_put_guest_fpu(vcpu);
-        vcpu->arch.last_host_tsc = native_read_tsc();
+        kvm_get_msr(vcpu, MSR_IA32_TSC, &vcpu->arch.last_guest_tsc);
 }
 
 static int is_efer_nx(void)
@@ -2324,6 +2336,12 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
                 F(3DNOWPREFETCH) | 0 /* OSVW */ | 0 /* IBS */ | F(XOP) |
                 0 /* SKINIT, WDT, LWP */ | F(FMA4) | F(TBM);
 
+        /* cpuid 0xC0000001.edx */
+        const u32 kvm_supported_word5_x86_features =
+                F(XSTORE) | F(XSTORE_EN) | F(XCRYPT) | F(XCRYPT_EN) |
+                F(ACE2) | F(ACE2_EN) | F(PHE) | F(PHE_EN) |
+                F(PMM) | F(PMM_EN);
+
         /* all calls to cpuid_count() should be made on the same cpu */
         get_cpu();
         do_cpuid_1_ent(entry, function, index);
@@ -2418,6 +2436,7 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
                 entry->eax = (1 << KVM_FEATURE_CLOCKSOURCE) |
                              (1 << KVM_FEATURE_NOP_IO_DELAY) |
                              (1 << KVM_FEATURE_CLOCKSOURCE2) |
+                             (1 << KVM_FEATURE_ASYNC_PF) |
                              (1 << KVM_FEATURE_CLOCKSOURCE_STABLE_BIT);
                 entry->ebx = 0;
                 entry->ecx = 0;
@@ -2432,6 +2451,20 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
                 entry->ecx &= kvm_supported_word6_x86_features;
                 cpuid_mask(&entry->ecx, 6);
                 break;
+        /*Add support for Centaur's CPUID instruction*/
+        case 0xC0000000:
+                /*Just support up to 0xC0000004 now*/
+                entry->eax = min(entry->eax, 0xC0000004);
+                break;
+        case 0xC0000001:
+                entry->edx &= kvm_supported_word5_x86_features;
+                cpuid_mask(&entry->edx, 5);
+                break;
+        case 0xC0000002:
+        case 0xC0000003:
+        case 0xC0000004:
+                /*Now nothing to do, reserved for the future*/
+                break;
         }
 
         kvm_x86_ops->set_supported_cpuid(function, entry);
@@ -2478,6 +2511,26 @@ static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
         if (nent >= cpuid->nent)
                 goto out_free;
 
+        /* Add support for Centaur's CPUID instruction. */
+        if (boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR) {
+                do_cpuid_ent(&cpuid_entries[nent], 0xC0000000, 0,
+                                &nent, cpuid->nent);
+
+                r = -E2BIG;
+                if (nent >= cpuid->nent)
+                        goto out_free;
+
+                limit = cpuid_entries[nent - 1].eax;
+                for (func = 0xC0000001;
+                        func <= limit && nent < cpuid->nent; ++func)
+                        do_cpuid_ent(&cpuid_entries[nent], func, 0,
+                                        &nent, cpuid->nent);
+
+                r = -E2BIG;
+                if (nent >= cpuid->nent)
+                        goto out_free;
+        }
+
         do_cpuid_ent(&cpuid_entries[nent], KVM_CPUID_SIGNATURE, 0, &nent,
                      cpuid->nent);
 
@@ -3046,6 +3099,32 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
                 r = kvm_vcpu_ioctl_x86_set_xcrs(vcpu, u.xcrs);
                 break;
         }
+        case KVM_SET_TSC_KHZ: {
+                u32 user_tsc_khz;
+
+                r = -EINVAL;
+                if (!kvm_has_tsc_control)
+                        break;
+
+                user_tsc_khz = (u32)arg;
+
+                if (user_tsc_khz >= kvm_max_guest_tsc_khz)
+                        goto out;
+
+                kvm_x86_ops->set_tsc_khz(vcpu, user_tsc_khz);
+
+                r = 0;
+                goto out;
+        }
+        case KVM_GET_TSC_KHZ: {
+                r = -EIO;
+                if (check_tsc_unstable())
+                        goto out;
+
+                r = vcpu_tsc_khz(vcpu);
+
+                goto out;
+        }
         default:
                 r = -EINVAL;
         }
@@ -3595,20 +3674,43 @@ static void kvm_init_msr_list(void)
 static int vcpu_mmio_write(struct kvm_vcpu *vcpu, gpa_t addr, int len,
                            const void *v)
 {
-        if (vcpu->arch.apic &&
-            !kvm_iodevice_write(&vcpu->arch.apic->dev, addr, len, v))
-                return 0;
+        int handled = 0;
+        int n;
 
-        return kvm_io_bus_write(vcpu->kvm, KVM_MMIO_BUS, addr, len, v);
+        do {
+                n = min(len, 8);
+                if (!(vcpu->arch.apic &&
+                      !kvm_iodevice_write(&vcpu->arch.apic->dev, addr, n, v))
+                    && kvm_io_bus_write(vcpu->kvm, KVM_MMIO_BUS, addr, n, v))
+                        break;
+                handled += n;
+                addr += n;
+                len -= n;
+                v += n;
+        } while (len);
+
+        return handled;
 }
 
 static int vcpu_mmio_read(struct kvm_vcpu *vcpu, gpa_t addr, int len, void *v)
 {
-        if (vcpu->arch.apic &&
-            !kvm_iodevice_read(&vcpu->arch.apic->dev, addr, len, v))
-                return 0;
+        int handled = 0;
+        int n;
+
+        do {
+                n = min(len, 8);
+                if (!(vcpu->arch.apic &&
+                      !kvm_iodevice_read(&vcpu->arch.apic->dev, addr, n, v))
+                    && kvm_io_bus_read(vcpu->kvm, KVM_MMIO_BUS, addr, n, v))
+                        break;
+                trace_kvm_mmio(KVM_TRACE_MMIO_READ, n, addr, *(u64 *)v);
+                handled += n;
+                addr += n;
+                len -= n;
+                v += n;
+        } while (len);
 
-        return kvm_io_bus_read(vcpu->kvm, KVM_MMIO_BUS, addr, len, v);
+        return handled;
 }
 
 static void kvm_set_segment(struct kvm_vcpu *vcpu,
@@ -3703,37 +3805,43 @@ out:
 }
 
 /* used for instruction fetching */
-static int kvm_fetch_guest_virt(gva_t addr, void *val, unsigned int bytes,
-                                struct kvm_vcpu *vcpu,
+static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt,
+                                gva_t addr, void *val, unsigned int bytes,
                                 struct x86_exception *exception)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
         u32 access = (kvm_x86_ops->get_cpl(vcpu) == 3) ? PFERR_USER_MASK : 0;
+
         return kvm_read_guest_virt_helper(addr, val, bytes, vcpu,
                                           access | PFERR_FETCH_MASK,
                                           exception);
 }
 
-static int kvm_read_guest_virt(gva_t addr, void *val, unsigned int bytes,
-                               struct kvm_vcpu *vcpu,
+static int kvm_read_guest_virt(struct x86_emulate_ctxt *ctxt,
+                               gva_t addr, void *val, unsigned int bytes,
                                struct x86_exception *exception)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
         u32 access = (kvm_x86_ops->get_cpl(vcpu) == 3) ? PFERR_USER_MASK : 0;
+
         return kvm_read_guest_virt_helper(addr, val, bytes, vcpu, access,
                                           exception);
 }
 
-static int kvm_read_guest_virt_system(gva_t addr, void *val, unsigned int bytes,
-                                      struct kvm_vcpu *vcpu,
+static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt,
+                                      gva_t addr, void *val, unsigned int bytes,
                                       struct x86_exception *exception)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
         return kvm_read_guest_virt_helper(addr, val, bytes, vcpu, 0, exception);
 }
 
-static int kvm_write_guest_virt_system(gva_t addr, void *val,
+static int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,
+                                       gva_t addr, void *val,
                                        unsigned int bytes,
-                                       struct kvm_vcpu *vcpu,
                                        struct x86_exception *exception)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
         void *data = val;
         int r = X86EMUL_CONTINUE;
 
@@ -3761,13 +3869,15 @@ out:
         return r;
 }
 
-static int emulator_read_emulated(unsigned long addr,
+static int emulator_read_emulated(struct x86_emulate_ctxt *ctxt,
+                                  unsigned long addr,
                                   void *val,
                                   unsigned int bytes,
-                                  struct x86_exception *exception,
-                                  struct kvm_vcpu *vcpu)
+                                  struct x86_exception *exception)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
         gpa_t                 gpa;
+        int handled;
 
         if (vcpu->mmio_read_completed) {
                 memcpy(val, vcpu->mmio_data, bytes);
@@ -3786,7 +3896,7 @@ static int emulator_read_emulated(unsigned long addr,
         if ((gpa & PAGE_MASK) == APIC_DEFAULT_PHYS_BASE)
                 goto mmio;
 
-        if (kvm_read_guest_virt(addr, val, bytes, vcpu, exception)
+        if (kvm_read_guest_virt(ctxt, addr, val, bytes, exception)
             == X86EMUL_CONTINUE)
                 return X86EMUL_CONTINUE;
 
@@ -3794,18 +3904,24 @@ mmio:
         /*
          * Is this MMIO handled locally?
          */
-        if (!vcpu_mmio_read(vcpu, gpa, bytes, val)) {
-                trace_kvm_mmio(KVM_TRACE_MMIO_READ, bytes, gpa, *(u64 *)val);
+        handled = vcpu_mmio_read(vcpu, gpa, bytes, val);
+
+        if (handled == bytes)
                 return X86EMUL_CONTINUE;
-        }
+
+        gpa += handled;
+        bytes -= handled;
+        val += handled;
 
         trace_kvm_mmio(KVM_TRACE_MMIO_READ_UNSATISFIED, bytes, gpa, 0);
 
         vcpu->mmio_needed = 1;
         vcpu->run->exit_reason = KVM_EXIT_MMIO;
         vcpu->run->mmio.phys_addr = vcpu->mmio_phys_addr = gpa;
-        vcpu->run->mmio.len = vcpu->mmio_size = bytes;
+        vcpu->mmio_size = bytes;
+        vcpu->run->mmio.len = min(vcpu->mmio_size, 8);
         vcpu->run->mmio.is_write = vcpu->mmio_is_write = 0;
+        vcpu->mmio_index = 0;
 
         return X86EMUL_IO_NEEDED;
 }
@@ -3829,6 +3945,7 @@ static int emulator_write_emulated_onepage(unsigned long addr,
                                            struct kvm_vcpu *vcpu)
 {
         gpa_t                 gpa;
+        int handled;
 
         gpa = kvm_mmu_gva_to_gpa_write(vcpu, addr, exception);
 
@@ -3847,25 +3964,35 @@ mmio:
         /*
          * Is this MMIO handled locally?
          */
-        if (!vcpu_mmio_write(vcpu, gpa, bytes, val))
+        handled = vcpu_mmio_write(vcpu, gpa, bytes, val);
+        if (handled == bytes)
                 return X86EMUL_CONTINUE;
 
+        gpa += handled;
+        bytes -= handled;
+        val += handled;
+
         vcpu->mmio_needed = 1;
+        memcpy(vcpu->mmio_data, val, bytes);
         vcpu->run->exit_reason = KVM_EXIT_MMIO;
         vcpu->run->mmio.phys_addr = vcpu->mmio_phys_addr = gpa;
-        vcpu->run->mmio.len = vcpu->mmio_size = bytes;
+        vcpu->mmio_size = bytes;
+        vcpu->run->mmio.len = min(vcpu->mmio_size, 8);
         vcpu->run->mmio.is_write = vcpu->mmio_is_write = 1;
-        memcpy(vcpu->run->mmio.data, val, bytes);
+        memcpy(vcpu->run->mmio.data, vcpu->mmio_data, 8);
+        vcpu->mmio_index = 0;
 
         return X86EMUL_CONTINUE;
 }
 
-int emulator_write_emulated(unsigned long addr,
+int emulator_write_emulated(struct x86_emulate_ctxt *ctxt,
+                            unsigned long addr,
                             const void *val,
                             unsigned int bytes,
-                            struct x86_exception *exception,
-                            struct kvm_vcpu *vcpu)
+                            struct x86_exception *exception)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
+
         /* Crossing a page boundary? */
         if (((addr + bytes - 1) ^ addr) & PAGE_MASK) {
                 int rc, now;
@@ -3893,13 +4020,14 @@ int emulator_write_emulated(unsigned long addr,
         (cmpxchg64((u64 *)(ptr), *(u64 *)(old), *(u64 *)(new)) == *(u64 *)(old))
 #endif
 
-static int emulator_cmpxchg_emulated(unsigned long addr,
+static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
+                                     unsigned long addr,
                                      const void *old,
                                      const void *new,
                                      unsigned int bytes,
-                                     struct x86_exception *exception,
-                                     struct kvm_vcpu *vcpu)
+                                     struct x86_exception *exception)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
         gpa_t gpa;
         struct page *page;
         char *kaddr;
@@ -3955,7 +4083,7 @@ static int emulator_cmpxchg_emulated(unsigned long addr,
 emul_write:
         printk_once(KERN_WARNING "kvm: emulating exchange as write\n");
 
-        return emulator_write_emulated(addr, new, bytes, exception, vcpu);
+        return emulator_write_emulated(ctxt, addr, new, bytes, exception);
 }
 
 static int kernel_pio(struct kvm_vcpu *vcpu, void *pd)
@@ -3974,9 +4102,12 @@ static int kernel_pio(struct kvm_vcpu *vcpu, void *pd)
 }
 
 
-static int emulator_pio_in_emulated(int size, unsigned short port, void *val,
-                             unsigned int count, struct kvm_vcpu *vcpu)
+static int emulator_pio_in_emulated(struct x86_emulate_ctxt *ctxt,
+                                    int size, unsigned short port, void *val,
+                                    unsigned int count)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
+
         if (vcpu->arch.pio.count)
                 goto data_avail;
 
@@ -4004,10 +4135,12 @@ static int emulator_pio_in_emulated(int size, unsigned short port, void *val,
         return 0;
 }
 
-static int emulator_pio_out_emulated(int size, unsigned short port,
-                              const void *val, unsigned int count,
-                              struct kvm_vcpu *vcpu)
+static int emulator_pio_out_emulated(struct x86_emulate_ctxt *ctxt,
+                                     int size, unsigned short port,
+                                     const void *val, unsigned int count)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
+
         trace_kvm_pio(1, port, size, count);
 
         vcpu->arch.pio.port = port;
@@ -4037,10 +4170,9 @@ static unsigned long get_segment_base(struct kvm_vcpu *vcpu, int seg)
         return kvm_x86_ops->get_segment_base(vcpu, seg);
 }
 
-int emulate_invlpg(struct kvm_vcpu *vcpu, gva_t address)
+static void emulator_invlpg(struct x86_emulate_ctxt *ctxt, ulong address)
 {
-        kvm_mmu_invlpg(vcpu, address);
-        return X86EMUL_CONTINUE;
+        kvm_mmu_invlpg(emul_to_vcpu(ctxt), address);
 }
 
 int kvm_emulate_wbinvd(struct kvm_vcpu *vcpu)
@@ -4062,22 +4194,20 @@ int kvm_emulate_wbinvd(struct kvm_vcpu *vcpu)
 }
 EXPORT_SYMBOL_GPL(kvm_emulate_wbinvd);
 
-int emulate_clts(struct kvm_vcpu *vcpu)
+static void emulator_wbinvd(struct x86_emulate_ctxt *ctxt)
 {
-        kvm_x86_ops->set_cr0(vcpu, kvm_read_cr0_bits(vcpu, ~X86_CR0_TS));
-        kvm_x86_ops->fpu_activate(vcpu);
-        return X86EMUL_CONTINUE;
+        kvm_emulate_wbinvd(emul_to_vcpu(ctxt));
 }
 
-int emulator_get_dr(int dr, unsigned long *dest, struct kvm_vcpu *vcpu)
+int emulator_get_dr(struct x86_emulate_ctxt *ctxt, int dr, unsigned long *dest)
 {
-        return _kvm_get_dr(vcpu, dr, dest);
+        return _kvm_get_dr(emul_to_vcpu(ctxt), dr, dest);
 }
 
-int emulator_set_dr(int dr, unsigned long value, struct kvm_vcpu *vcpu)
+int emulator_set_dr(struct x86_emulate_ctxt *ctxt, int dr, unsigned long value)
 {
 
-        return __kvm_set_dr(vcpu, dr, value);
+        return __kvm_set_dr(emul_to_vcpu(ctxt), dr, value);
 }
 
 static u64 mk_cr_64(u64 curr_cr, u32 new_val)
@@ -4085,8 +4215,9 @@ static u64 mk_cr_64(u64 curr_cr, u32 new_val)
         return (curr_cr & ~((1ULL << 32) - 1)) | new_val;
 }
 
-static unsigned long emulator_get_cr(int cr, struct kvm_vcpu *vcpu)
+static unsigned long emulator_get_cr(struct x86_emulate_ctxt *ctxt, int cr)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
         unsigned long value;
 
         switch (cr) {
@@ -4113,8 +4244,9 @@ static unsigned long emulator_get_cr(int cr, struct kvm_vcpu *vcpu)
         return value;
 }
 
-static int emulator_set_cr(int cr, unsigned long val, struct kvm_vcpu *vcpu)
+static int emulator_set_cr(struct x86_emulate_ctxt *ctxt, int cr, ulong val)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
         int res = 0;
 
         switch (cr) {
@@ -4141,33 +4273,45 @@ static int emulator_set_cr(int cr, unsigned long val, struct kvm_vcpu *vcpu)
         return res;
 }
 
-static int emulator_get_cpl(struct kvm_vcpu *vcpu)
+static int emulator_get_cpl(struct x86_emulate_ctxt *ctxt)
+{
+        return kvm_x86_ops->get_cpl(emul_to_vcpu(ctxt));
+}
+
+static void emulator_get_gdt(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt)
+{
+        kvm_x86_ops->get_gdt(emul_to_vcpu(ctxt), dt);
+}
+
+static void emulator_get_idt(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt)
 {
-        return kvm_x86_ops->get_cpl(vcpu);
+        kvm_x86_ops->get_idt(emul_to_vcpu(ctxt), dt);
 }
 
-static void emulator_get_gdt(struct desc_ptr *dt, struct kvm_vcpu *vcpu)
+static void emulator_set_gdt(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt)
 {
-        kvm_x86_ops->get_gdt(vcpu, dt);
+        kvm_x86_ops->set_gdt(emul_to_vcpu(ctxt), dt);
 }
 
-static void emulator_get_idt(struct desc_ptr *dt, struct kvm_vcpu *vcpu)
+static void emulator_set_idt(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt)
 {
-        kvm_x86_ops->get_idt(vcpu, dt);
+        kvm_x86_ops->set_idt(emul_to_vcpu(ctxt), dt);
 }
 
-static unsigned long emulator_get_cached_segment_base(int seg,
-                                                      struct kvm_vcpu *vcpu)
+static unsigned long emulator_get_cached_segment_base(
+        struct x86_emulate_ctxt *ctxt, int seg)
 {
-        return get_segment_base(vcpu, seg);
+        return get_segment_base(emul_to_vcpu(ctxt), seg);
 }
 
-static bool emulator_get_cached_descriptor(struct desc_struct *desc, u32 *base3,
-                                           int seg, struct kvm_vcpu *vcpu)
+static bool emulator_get_segment(struct x86_emulate_ctxt *ctxt, u16 *selector,
+                                 struct desc_struct *desc, u32 *base3,
+                                 int seg)
 {
         struct kvm_segment var;
 
-        kvm_get_segment(vcpu, &var, seg);
+        kvm_get_segment(emul_to_vcpu(ctxt), &var, seg);
+        *selector = var.selector;
 
         if (var.unusable)
                 return false;
@@ -4192,14 +4336,14 @@ static bool emulator_get_cached_descriptor(struct desc_struct *desc, u32 *base3,
         return true;
 }
 
-static void emulator_set_cached_descriptor(struct desc_struct *desc, u32 base3,
-                                           int seg, struct kvm_vcpu *vcpu)
+static void emulator_set_segment(struct x86_emulate_ctxt *ctxt, u16 selector,
+                                 struct desc_struct *desc, u32 base3,
+                                 int seg)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
         struct kvm_segment var;
 
-        /* needed to preserve selector */
-        kvm_get_segment(vcpu, &var, seg);
-
+        var.selector = selector;
         var.base = get_desc_base(desc);
 #ifdef CONFIG_X86_64
         var.base |= ((u64)base3) << 32;
@@ -4223,22 +4367,44 @@ static void emulator_set_cached_descriptor(struct desc_struct *desc, u32 base3,
         return;
 }
 
-static u16 emulator_get_segment_selector(int seg, struct kvm_vcpu *vcpu)
+static int emulator_get_msr(struct x86_emulate_ctxt *ctxt,
+                            u32 msr_index, u64 *pdata)
 {
-        struct kvm_segment kvm_seg;
+        return kvm_get_msr(emul_to_vcpu(ctxt), msr_index, pdata);
+}
 
-        kvm_get_segment(vcpu, &kvm_seg, seg);
-        return kvm_seg.selector;
+static int emulator_set_msr(struct x86_emulate_ctxt *ctxt,
+                            u32 msr_index, u64 data)
+{
+        return kvm_set_msr(emul_to_vcpu(ctxt), msr_index, data);
 }
 
-static void emulator_set_segment_selector(u16 sel, int seg,
-                                          struct kvm_vcpu *vcpu)
+static void emulator_halt(struct x86_emulate_ctxt *ctxt)
 {
-        struct kvm_segment kvm_seg;
+        emul_to_vcpu(ctxt)->arch.halt_request = 1;
+}
 
-        kvm_get_segment(vcpu, &kvm_seg, seg);
-        kvm_seg.selector = sel;
-        kvm_set_segment(vcpu, &kvm_seg, seg);
+static void emulator_get_fpu(struct x86_emulate_ctxt *ctxt)
+{
+        preempt_disable();
+        kvm_load_guest_fpu(emul_to_vcpu(ctxt));
+        /*
+         * CR0.TS may reference the host fpu state, not the guest fpu state,
+         * so it may be clear at this point.
+         */
+        clts();
+}
+
+static void emulator_put_fpu(struct x86_emulate_ctxt *ctxt)
+{
+        preempt_enable();
+}
+
+static int emulator_intercept(struct x86_emulate_ctxt *ctxt,
+                              struct x86_instruction_info *info,
+                              enum x86_intercept_stage stage)
+{
+        return kvm_x86_ops->check_intercept(emul_to_vcpu(ctxt), info, stage);
 }
 
 static struct x86_emulate_ops emulate_ops = {
@@ -4248,22 +4414,29 @@ static struct x86_emulate_ops emulate_ops = {
         .read_emulated       = emulator_read_emulated,
         .write_emulated      = emulator_write_emulated,
         .cmpxchg_emulated    = emulator_cmpxchg_emulated,
+        .invlpg              = emulator_invlpg,
         .pio_in_emulated     = emulator_pio_in_emulated,
         .pio_out_emulated    = emulator_pio_out_emulated,
-        .get_cached_descriptor = emulator_get_cached_descriptor,
-        .set_cached_descriptor = emulator_set_cached_descriptor,
-        .get_segment_selector = emulator_get_segment_selector,
-        .set_segment_selector = emulator_set_segment_selector,
+        .get_segment         = emulator_get_segment,
+        .set_segment         = emulator_set_segment,
         .get_cached_segment_base = emulator_get_cached_segment_base,
         .get_gdt             = emulator_get_gdt,
         .get_idt             = emulator_get_idt,
+        .set_gdt             = emulator_set_gdt,
+        .set_idt             = emulator_set_idt,
         .get_cr              = emulator_get_cr,
         .set_cr              = emulator_set_cr,
         .cpl                 = emulator_get_cpl,
         .get_dr              = emulator_get_dr,
         .set_dr              = emulator_set_dr,
-        .set_msr             = kvm_set_msr,
-        .get_msr             = kvm_get_msr,
+        .set_msr             = emulator_set_msr,
+        .get_msr             = emulator_get_msr,
+        .halt                = emulator_halt,
+        .wbinvd              = emulator_wbinvd,
+        .fix_hypercall       = emulator_fix_hypercall,
+        .get_fpu             = emulator_get_fpu,
+        .put_fpu             = emulator_put_fpu,
+        .intercept           = emulator_intercept,
 };
 
 static void cache_all_regs(struct kvm_vcpu *vcpu)
@@ -4305,12 +4478,17 @@ static void init_emulate_ctxt(struct kvm_vcpu *vcpu)
         struct decode_cache *c = &vcpu->arch.emulate_ctxt.decode;
         int cs_db, cs_l;
 
+        /*
+         * TODO: fix emulate.c to use guest_read/write_register
+         * instead of direct ->regs accesses, can save hundred cycles
+         * on Intel for instructions that don't read/change RSP, for
+         * for example.
+         */
         cache_all_regs(vcpu);
 
         kvm_x86_ops->get_cs_db_l_bits(vcpu, &cs_db, &cs_l);
 
-        vcpu->arch.emulate_ctxt.vcpu = vcpu;
-        vcpu->arch.emulate_ctxt.eflags = kvm_x86_ops->get_rflags(vcpu);
+        vcpu->arch.emulate_ctxt.eflags = kvm_get_rflags(vcpu);
         vcpu->arch.emulate_ctxt.eip = kvm_rip_read(vcpu);
         vcpu->arch.emulate_ctxt.mode =
                 (!is_protmode(vcpu)) ? X86EMUL_MODE_REAL :
@@ -4318,11 +4496,13 @@ static void init_emulate_ctxt(struct kvm_vcpu *vcpu)
                 ? X86EMUL_MODE_VM86 : cs_l
                 ? X86EMUL_MODE_PROT64 : cs_db
                 ? X86EMUL_MODE_PROT32 : X86EMUL_MODE_PROT16;
+        vcpu->arch.emulate_ctxt.guest_mode = is_guest_mode(vcpu);
         memset(c, 0, sizeof(struct decode_cache));
         memcpy(c->regs, vcpu->arch.regs, sizeof c->regs);
+        vcpu->arch.emulate_regs_need_sync_from_vcpu = false;
 }
 
-int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq)
+int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq, int inc_eip)
 {
         struct decode_cache *c = &vcpu->arch.emulate_ctxt.decode;
         int ret;
@@ -4331,7 +4511,8 @@ int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq)
 
         vcpu->arch.emulate_ctxt.decode.op_bytes = 2;
         vcpu->arch.emulate_ctxt.decode.ad_bytes = 2;
-        vcpu->arch.emulate_ctxt.decode.eip = vcpu->arch.emulate_ctxt.eip;
+        vcpu->arch.emulate_ctxt.decode.eip = vcpu->arch.emulate_ctxt.eip +
+                                                                 inc_eip;
         ret = emulate_int_real(&vcpu->arch.emulate_ctxt, &emulate_ops, irq);
 
         if (ret != X86EMUL_CONTINUE)
@@ -4340,7 +4521,7 @@ int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq)
         vcpu->arch.emulate_ctxt.eip = c->eip;
         memcpy(vcpu->arch.regs, c->regs, sizeof c->regs);
         kvm_rip_write(vcpu, vcpu->arch.emulate_ctxt.eip);
-        kvm_x86_ops->set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
+        kvm_set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
 
         if (irq == NMI_VECTOR)
                 vcpu->arch.nmi_pending = false;
@@ -4402,16 +4583,9 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
 {
         int r;
         struct decode_cache *c = &vcpu->arch.emulate_ctxt.decode;
+        bool writeback = true;
 
         kvm_clear_exception_queue(vcpu);
-        vcpu->arch.mmio_fault_cr2 = cr2;
-        /*
-         * TODO: fix emulate.c to use guest_read/write_register
-         * instead of direct ->regs accesses, can save hundred cycles
-         * on Intel for instructions that don't read/change RSP, for
-         * for example.
-         */
-        cache_all_regs(vcpu);
 
         if (!(emulation_type & EMULTYPE_NO_DECODE)) {
                 init_emulate_ctxt(vcpu);
@@ -4442,13 +4616,19 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
                 return EMULATE_DONE;
         }
 
-        /* this is needed for vmware backdor interface to work since it
+        /* this is needed for vmware backdoor interface to work since it
            changes registers values  during IO operation */
-        memcpy(c->regs, vcpu->arch.regs, sizeof c->regs);
+        if (vcpu->arch.emulate_regs_need_sync_from_vcpu) {
+                vcpu->arch.emulate_regs_need_sync_from_vcpu = false;
+                memcpy(c->regs, vcpu->arch.regs, sizeof c->regs);
+        }
 
 restart:
         r = x86_emulate_insn(&vcpu->arch.emulate_ctxt);
 
+        if (r == EMULATION_INTERCEPTED)
+                return EMULATE_DONE;
+
         if (r == EMULATION_FAILED) {
                 if (reexecute_instruction(vcpu, cr2))
                         return EMULATE_DONE;
@@ -4462,21 +4642,28 @@ restart:
         } else if (vcpu->arch.pio.count) {
                 if (!vcpu->arch.pio.in)
                         vcpu->arch.pio.count = 0;
+                else
+                        writeback = false;
                 r = EMULATE_DO_MMIO;
         } else if (vcpu->mmio_needed) {
-                if (vcpu->mmio_is_write)
-                        vcpu->mmio_needed = 0;
+                if (!vcpu->mmio_is_write)
+                        writeback = false;
                 r = EMULATE_DO_MMIO;
         } else if (r == EMULATION_RESTART)
                 goto restart;
         else
                 r = EMULATE_DONE;
 
-        toggle_interruptibility(vcpu, vcpu->arch.emulate_ctxt.interruptibility);
-        kvm_x86_ops->set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
-        kvm_make_request(KVM_REQ_EVENT, vcpu);
-        memcpy(vcpu->arch.regs, c->regs, sizeof c->regs);
-        kvm_rip_write(vcpu, vcpu->arch.emulate_ctxt.eip);
+        if (writeback) {
+                toggle_interruptibility(vcpu,
+                                vcpu->arch.emulate_ctxt.interruptibility);
+                kvm_set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
+                kvm_make_request(KVM_REQ_EVENT, vcpu);
+                memcpy(vcpu->arch.regs, c->regs, sizeof c->regs);
+                vcpu->arch.emulate_regs_need_sync_to_vcpu = false;
+                kvm_rip_write(vcpu, vcpu->arch.emulate_ctxt.eip);
+        } else
+                vcpu->arch.emulate_regs_need_sync_to_vcpu = true;
 
         return r;
 }
@@ -4485,7 +4672,8 @@ EXPORT_SYMBOL_GPL(x86_emulate_instruction);
 int kvm_fast_pio_out(struct kvm_vcpu *vcpu, int size, unsigned short port)
 {
         unsigned long val = kvm_register_read(vcpu, VCPU_REGS_RAX);
-        int ret = emulator_pio_out_emulated(size, port, &val, 1, vcpu);
+        int ret = emulator_pio_out_emulated(&vcpu->arch.emulate_ctxt,
+                                            size, port, &val, 1);
         /* do not return to emulator after return from userspace */
         vcpu->arch.pio.count = 0;
         return ret;
@@ -4879,8 +5067,9 @@ out:
 }
 EXPORT_SYMBOL_GPL(kvm_emulate_hypercall);
 
-int kvm_fix_hypercall(struct kvm_vcpu *vcpu)
+int emulator_fix_hypercall(struct x86_emulate_ctxt *ctxt)
 {
+        struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
         char instruction[3];
         unsigned long rip = kvm_rip_read(vcpu);
 
@@ -4893,21 +5082,8 @@ int kvm_fix_hypercall(struct kvm_vcpu *vcpu)
 
         kvm_x86_ops->patch_hypercall(vcpu, instruction);
 
-        return emulator_write_emulated(rip, instruction, 3, NULL, vcpu);
-}
-
-void realmode_lgdt(struct kvm_vcpu *vcpu, u16 limit, unsigned long base)
-{
-        struct desc_ptr dt = { limit, base };
-
-        kvm_x86_ops->set_gdt(vcpu, &dt);
-}
-
-void realmode_lidt(struct kvm_vcpu *vcpu, u16 limit, unsigned long base)
-{
-        struct desc_ptr dt = { limit, base };
-
-        kvm_x86_ops->set_idt(vcpu, &dt);
+        return emulator_write_emulated(&vcpu->arch.emulate_ctxt,
+                                       rip, instruction, 3, NULL);
 }
 
 static int move_to_next_stateful_cpuid_entry(struct kvm_vcpu *vcpu, int i)
@@ -5170,6 +5346,7 @@ static void kvm_put_guest_xcr0(struct kvm_vcpu *vcpu)
 static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
 {
         int r;
+        bool nmi_pending;
         bool req_int_win = !irqchip_in_kernel(vcpu->kvm) &&
                 vcpu->run->request_interrupt_window;
 
@@ -5207,19 +5384,25 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
                         r = 1;
                         goto out;
                 }
-                if (kvm_check_request(KVM_REQ_NMI, vcpu))
-                        vcpu->arch.nmi_pending = true;
         }
 
         r = kvm_mmu_reload(vcpu);
         if (unlikely(r))
                 goto out;
 
+        /*
+         * An NMI can be injected between local nmi_pending read and
+         * vcpu->arch.nmi_pending read inside inject_pending_event().
+         * But in that case, KVM_REQ_EVENT will be set, which makes
+         * the race described above benign.
+         */
+        nmi_pending = ACCESS_ONCE(vcpu->arch.nmi_pending);
+
         if (kvm_check_request(KVM_REQ_EVENT, vcpu) || req_int_win) {
                 inject_pending_event(vcpu);
 
                 /* enable NMI/IRQ window open exits if needed */
-                if (vcpu->arch.nmi_pending)
+                if (nmi_pending)
                         kvm_x86_ops->enable_nmi_window(vcpu);
                 else if (kvm_cpu_has_interrupt(vcpu) || req_int_win)
                         kvm_x86_ops->enable_irq_window(vcpu);
@@ -5399,6 +5582,41 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)
         return r;
 }
 
+static int complete_mmio(struct kvm_vcpu *vcpu)
+{
+        struct kvm_run *run = vcpu->run;
+        int r;
+
+        if (!(vcpu->arch.pio.count || vcpu->mmio_needed))
+                return 1;
+
+        if (vcpu->mmio_needed) {
+                vcpu->mmio_needed = 0;
+                if (!vcpu->mmio_is_write)
+                        memcpy(vcpu->mmio_data + vcpu->mmio_index,
+                               run->mmio.data, 8);
+                vcpu->mmio_index += 8;
+                if (vcpu->mmio_index < vcpu->mmio_size) {
+                        run->exit_reason = KVM_EXIT_MMIO;
+                        run->mmio.phys_addr = vcpu->mmio_phys_addr + vcpu->mmio_index;
+                        memcpy(run->mmio.data, vcpu->mmio_data + vcpu->mmio_index, 8);
+                        run->mmio.len = min(vcpu->mmio_size - vcpu->mmio_index, 8);
+                        run->mmio.is_write = vcpu->mmio_is_write;
+                        vcpu->mmio_needed = 1;
+                        return 0;
+                }
+                if (vcpu->mmio_is_write)
+                        return 1;
+                vcpu->mmio_read_completed = 1;
+        }
+        vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);
+        r = emulate_instruction(vcpu, EMULTYPE_NO_DECODE);
+        srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);
+        if (r != EMULATE_DONE)
+                return 0;
+        return 1;
+}
+
 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
         int r;
@@ -5425,20 +5643,10 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
                 }
         }
 
-        if (vcpu->arch.pio.count || vcpu->mmio_needed) {
-                if (vcpu->mmio_needed) {
-                        memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8);
-                        vcpu->mmio_read_completed = 1;
-                        vcpu->mmio_needed = 0;
-                }
-                vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);
-                r = emulate_instruction(vcpu, EMULTYPE_NO_DECODE);
-                srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx);
-                if (r != EMULATE_DONE) {
-                        r = 0;
-                        goto out;
-                }
-        }
+        r = complete_mmio(vcpu);
+        if (r <= 0)
+                goto out;
+
         if (kvm_run->exit_reason == KVM_EXIT_HYPERCALL)
                 kvm_register_write(vcpu, VCPU_REGS_RAX,
                                      kvm_run->hypercall.ret);
@@ -5455,6 +5663,18 @@ out:
 
 int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
 {
+        if (vcpu->arch.emulate_regs_need_sync_to_vcpu) {
+                /*
+                 * We are here if userspace calls get_regs() in the middle of
+                 * instruction emulation. Registers state needs to be copied
+                 * back from emulation context to vcpu. Usrapace shouldn't do
+                 * that usually, but some bad designed PV devices (vmware
+                 * backdoor interface) need this to work
+                 */
+                struct decode_cache *c = &vcpu->arch.emulate_ctxt.decode;
+                memcpy(vcpu->arch.regs, c->regs, sizeof c->regs);
+                vcpu->arch.emulate_regs_need_sync_to_vcpu = false;
+        }
         regs->rax = kvm_register_read(vcpu, VCPU_REGS_RAX);
         regs->rbx = kvm_register_read(vcpu, VCPU_REGS_RBX);
         regs->rcx = kvm_register_read(vcpu, VCPU_REGS_RCX);
@@ -5482,6 +5702,9 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
 
 int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
 {
+        vcpu->arch.emulate_regs_need_sync_from_vcpu = true;
+        vcpu->arch.emulate_regs_need_sync_to_vcpu = false;
+
         kvm_register_write(vcpu, VCPU_REGS_RAX, regs->rax);
         kvm_register_write(vcpu, VCPU_REGS_RBX, regs->rbx);
         kvm_register_write(vcpu, VCPU_REGS_RCX, regs->rcx);
@@ -5592,7 +5815,7 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason,
 
         memcpy(vcpu->arch.regs, c->regs, sizeof c->regs);
         kvm_rip_write(vcpu, vcpu->arch.emulate_ctxt.eip);
-        kvm_x86_ops->set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
+        kvm_set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
         kvm_make_request(KVM_REQ_EVENT, vcpu);
         return EMULATE_DONE;
 }
@@ -5974,8 +6197,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
         }
         vcpu->arch.pio_data = page_address(page);
 
-        if (!kvm->arch.virtual_tsc_khz)
-                kvm_arch_set_tsc_khz(kvm, max_tsc_khz);
+        kvm_init_tsc_catchup(vcpu, max_tsc_khz);
 
         r = kvm_mmu_create(vcpu);
         if (r < 0)
diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
index c600da830ce0..e407ed3df817 100644
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@ -77,7 +77,7 @@ static inline u32 bit(int bitno)
 
 void kvm_before_handle_nmi(struct kvm_vcpu *vcpu);
 void kvm_after_handle_nmi(struct kvm_vcpu *vcpu);
-int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq);
+int kvm_inject_realmode_interrupt(struct kvm_vcpu *vcpu, int irq, int inc_eip);
 
 void kvm_write_tsc(struct kvm_vcpu *vcpu, u64 data);
 
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 1cd608973ce5..e191c096ab90 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -7,7 +7,7 @@
  * kernel and insert a module (lg.ko) which allows us to run other Linux
  * kernels the same way we'd run processes.  We call the first kernel the Host,
  * and the others the Guests.  The program which sets up and configures Guests
- * (such as the example in Documentation/lguest/lguest.c) is called the
+ * (such as the example in Documentation/virtual/lguest/lguest.c) is called the
  * Launcher.
  *
  * Secondly, we only run specially modified Guests, not normal kernels: setting
@@ -913,8 +913,6 @@ static struct clocksource lguest_clock = {
         .rating         = 200,
         .read           = lguest_clock_read,
         .mask           = CLOCKSOURCE_MASK(64),
-        .mult           = 1 << 22,
-        .shift          = 22,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -997,7 +995,7 @@ static void lguest_time_init(void)
         /* Set up the timer interrupt (0) to go to our simple timer routine */
         irq_set_handler(0, lguest_time_irq);
 
-        clocksource_register(&lguest_clock);
+        clocksource_register_hz(&lguest_clock, NSEC_PER_SEC);
 
         /* We can't set cpumask in the initializer: damn C limitations!  Set it
          * here and register our timer device. */
diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
index aa4326bfb24a..f2145cfa12a6 100644
--- a/arch/x86/lib/clear_page_64.S
+++ b/arch/x86/lib/clear_page_64.S
@@ -1,5 +1,6 @@
 #include <linux/linkage.h>
 #include <asm/dwarf2.h>
+#include <asm/alternative-asm.h>
 
 /*
  * Zero a page.         
@@ -14,6 +15,15 @@ ENTRY(clear_page_c)
         CFI_ENDPROC
 ENDPROC(clear_page_c)
 
+ENTRY(clear_page_c_e)
+        CFI_STARTPROC
+        movl $4096,%ecx
+        xorl %eax,%eax
+        rep stosb
+        ret
+        CFI_ENDPROC
+ENDPROC(clear_page_c_e)
+
 ENTRY(clear_page)
         CFI_STARTPROC
         xorl   %eax,%eax
@@ -38,21 +48,26 @@ ENTRY(clear_page)
 .Lclear_page_end:
 ENDPROC(clear_page)
 
-        /* Some CPUs run faster using the string instructions.
-           It is also a lot simpler. Use this when possible */
+        /*
+         * Some CPUs support enhanced REP MOVSB/STOSB instructions.
+         * It is recommended to use this when possible.
+         * If enhanced REP MOVSB/STOSB is not available, try to use fast string.
+         * Otherwise, use original function.
+         *
+         */
 
 #include <asm/cpufeature.h>
 
         .section .altinstr_replacement,"ax"
 1:      .byte 0xeb                                      /* jmp <disp8> */
         .byte (clear_page_c - clear_page) - (2f - 1b)   /* offset */
-2:
+2:      .byte 0xeb                                      /* jmp <disp8> */
+        .byte (clear_page_c_e - clear_page) - (3f - 2b) /* offset */
+3:
         .previous
         .section .altinstructions,"a"
-        .align 8
-        .quad clear_page
-        .quad 1b
-        .word X86_FEATURE_REP_GOOD
-        .byte .Lclear_page_end - clear_page
-        .byte 2b - 1b
+        altinstruction_entry clear_page,1b,X86_FEATURE_REP_GOOD,\
+                             .Lclear_page_end-clear_page, 2b-1b
+        altinstruction_entry clear_page,2b,X86_FEATURE_ERMS,   \
+                             .Lclear_page_end-clear_page,3b-2b
         .previous
diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
index 99e482615195..024840266ba0 100644
--- a/arch/x86/lib/copy_user_64.S
+++ b/arch/x86/lib/copy_user_64.S
@@ -15,23 +15,30 @@
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/cpufeature.h>
+#include <asm/alternative-asm.h>
 
-        .macro ALTERNATIVE_JUMP feature,orig,alt
+/*
+ * By placing feature2 after feature1 in altinstructions section, we logically
+ * implement:
+ * If CPU has feature2, jmp to alt2 is used
+ * else if CPU has feature1, jmp to alt1 is used
+ * else jmp to orig is used.
+ */
+        .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
 0:
         .byte 0xe9      /* 32bit jump */
         .long \orig-1f  /* by default jump to orig */
 1:
         .section .altinstr_replacement,"ax"
 2:      .byte 0xe9                      /* near jump with 32bit immediate */
-        .long \alt-1b /* offset */   /* or alternatively to alt */
+        .long \alt1-1b /* offset */   /* or alternatively to alt1 */
+3:      .byte 0xe9                      /* near jump with 32bit immediate */
+        .long \alt2-1b /* offset */   /* or alternatively to alt2 */
         .previous
+
         .section .altinstructions,"a"
-        .align 8
-        .quad  0b
-        .quad  2b
-        .word  \feature                 /* when feature is set */
-        .byte  5
-        .byte  5
+        altinstruction_entry 0b,2b,\feature1,5,5
+        altinstruction_entry 0b,3b,\feature2,5,5
         .previous
         .endm
 
@@ -72,8 +79,10 @@ ENTRY(_copy_to_user)
         addq %rdx,%rcx
         jc bad_to_user
         cmpq TI_addr_limit(%rax),%rcx
-        jae bad_to_user
-        ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
+        ja bad_to_user
+        ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
+                copy_user_generic_unrolled,copy_user_generic_string,    \
+                copy_user_enhanced_fast_string
         CFI_ENDPROC
 ENDPROC(_copy_to_user)
 
@@ -85,8 +94,10 @@ ENTRY(_copy_from_user)
         addq %rdx,%rcx
         jc bad_from_user
         cmpq TI_addr_limit(%rax),%rcx
-        jae bad_from_user
-        ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
+        ja bad_from_user
+        ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
+                copy_user_generic_unrolled,copy_user_generic_string,    \
+                copy_user_enhanced_fast_string
         CFI_ENDPROC
 ENDPROC(_copy_from_user)
 
@@ -255,3 +266,37 @@ ENTRY(copy_user_generic_string)
         .previous
         CFI_ENDPROC
 ENDPROC(copy_user_generic_string)
+
+/*
+ * Some CPUs are adding enhanced REP MOVSB/STOSB instructions.
+ * It's recommended to use enhanced REP MOVSB/STOSB if it's enabled.
+ *
+ * Input:
+ * rdi destination
+ * rsi source
+ * rdx count
+ *
+ * Output:
+ * eax uncopied bytes or 0 if successful.
+ */
+ENTRY(copy_user_enhanced_fast_string)
+        CFI_STARTPROC
+        andl %edx,%edx
+        jz 2f
+        movl %edx,%ecx
+1:      rep
+        movsb
+2:      xorl %eax,%eax
+        ret
+
+        .section .fixup,"ax"
+12:     movl %ecx,%edx          /* ecx is zerorest also */
+        jmp copy_user_handle_tail
+        .previous
+
+        .section __ex_table,"a"
+        .align 8
+        .quad 1b,12b
+        .previous
+        CFI_ENDPROC
+ENDPROC(copy_user_enhanced_fast_string)
diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
index 75ef61e35e38..efbf2a0ecdea 100644
--- a/arch/x86/lib/memcpy_64.S
+++ b/arch/x86/lib/memcpy_64.S
@@ -4,6 +4,7 @@
 
 #include <asm/cpufeature.h>
 #include <asm/dwarf2.h>
+#include <asm/alternative-asm.h>
 
 /*
  * memcpy - Copy a memory block.
@@ -37,6 +38,23 @@
 .Lmemcpy_e:
         .previous
 
+/*
+ * memcpy_c_e() - enhanced fast string memcpy. This is faster and simpler than
+ * memcpy_c. Use memcpy_c_e when possible.
+ *
+ * This gets patched over the unrolled variant (below) via the
+ * alternative instructions framework:
+ */
+        .section .altinstr_replacement, "ax", @progbits
+.Lmemcpy_c_e:
+        movq %rdi, %rax
+
+        movl %edx, %ecx
+        rep movsb
+        ret
+.Lmemcpy_e_e:
+        .previous
+
 ENTRY(__memcpy)
 ENTRY(memcpy)
         CFI_STARTPROC
@@ -49,7 +67,7 @@ ENTRY(memcpy)
         jb .Lhandle_tail
 
         /*
-         * We check whether memory false dependece could occur,
+         * We check whether memory false dependence could occur,
          * then jump to corresponding copy mode.
          */
         cmp  %dil, %sil
@@ -171,21 +189,22 @@ ENDPROC(memcpy)
 ENDPROC(__memcpy)
 
         /*
-         * Some CPUs run faster using the string copy instructions.
-         * It is also a lot simpler. Use this when possible:
-         */
-
-        .section .altinstructions, "a"
-        .align 8
-        .quad memcpy
-        .quad .Lmemcpy_c
-        .word X86_FEATURE_REP_GOOD
-
-        /*
+         * Some CPUs are adding enhanced REP MOVSB/STOSB feature
+         * If the feature is supported, memcpy_c_e() is the first choice.
+         * If enhanced rep movsb copy is not available, use fast string copy
+         * memcpy_c() when possible. This is faster and code is simpler than
+         * original memcpy().
+         * Otherwise, original memcpy() is used.
+         * In .altinstructions section, ERMS feature is placed after REG_GOOD
+         * feature to implement the right patch order.
+         *
          * Replace only beginning, memcpy is used to apply alternatives,
          * so it is silly to overwrite itself with nops - reboot is the
          * only outcome...
          */
-        .byte .Lmemcpy_e - .Lmemcpy_c
-        .byte .Lmemcpy_e - .Lmemcpy_c
+        .section .altinstructions, "a"
+        altinstruction_entry memcpy,.Lmemcpy_c,X86_FEATURE_REP_GOOD,\
+                             .Lmemcpy_e-.Lmemcpy_c,.Lmemcpy_e-.Lmemcpy_c
+        altinstruction_entry memcpy,.Lmemcpy_c_e,X86_FEATURE_ERMS, \
+                             .Lmemcpy_e_e-.Lmemcpy_c_e,.Lmemcpy_e_e-.Lmemcpy_c_e
         .previous
diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
index 0ecb8433e5a8..d0ec9c2936d7 100644
--- a/arch/x86/lib/memmove_64.S
+++ b/arch/x86/lib/memmove_64.S
@@ -8,6 +8,7 @@
 #define _STRING_C
 #include <linux/linkage.h>
 #include <asm/dwarf2.h>
+#include <asm/cpufeature.h>
 
 #undef memmove
 
@@ -24,6 +25,7 @@
  */
 ENTRY(memmove)
         CFI_STARTPROC
+
         /* Handle more 32bytes in loop */
         mov %rdi, %rax
         cmp $0x20, %rdx
@@ -31,8 +33,13 @@ ENTRY(memmove)
 
         /* Decide forward/backward copy mode */
         cmp %rdi, %rsi
-        jb      2f
+        jge .Lmemmove_begin_forward
+        mov %rsi, %r8
+        add %rdx, %r8
+        cmp %rdi, %r8
+        jg 2f
 
+.Lmemmove_begin_forward:
         /*
          * movsq instruction have many startup latency
          * so we handle small size by general register.
@@ -78,6 +85,8 @@ ENTRY(memmove)
         rep movsq
         movq %r11, (%r10)
         jmp 13f
+.Lmemmove_end_forward:
+
         /*
          * Handle data backward by movsq.
          */
@@ -194,4 +203,22 @@ ENTRY(memmove)
 13:
         retq
         CFI_ENDPROC
+
+        .section .altinstr_replacement,"ax"
+.Lmemmove_begin_forward_efs:
+        /* Forward moving data. */
+        movq %rdx, %rcx
+        rep movsb
+        retq
+.Lmemmove_end_forward_efs:
+        .previous
+
+        .section .altinstructions,"a"
+        .align 8
+        .quad .Lmemmove_begin_forward
+        .quad .Lmemmove_begin_forward_efs
+        .word X86_FEATURE_ERMS
+        .byte .Lmemmove_end_forward-.Lmemmove_begin_forward
+        .byte .Lmemmove_end_forward_efs-.Lmemmove_begin_forward_efs
+        .previous
 ENDPROC(memmove)
diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
index 09d344269652..79bd454b78a3 100644
--- a/arch/x86/lib/memset_64.S
+++ b/arch/x86/lib/memset_64.S
@@ -2,9 +2,13 @@
 
 #include <linux/linkage.h>
 #include <asm/dwarf2.h>
+#include <asm/cpufeature.h>
+#include <asm/alternative-asm.h>
 
 /*
- * ISO C memset - set a memory block to a byte value.
+ * ISO C memset - set a memory block to a byte value. This function uses fast
+ * string to get better performance than the original function. The code is
+ * simpler and shorter than the orignal function as well.
  *      
  * rdi   destination
  * rsi   value (char) 
@@ -31,6 +35,28 @@
 .Lmemset_e:
         .previous
 
+/*
+ * ISO C memset - set a memory block to a byte value. This function uses
+ * enhanced rep stosb to override the fast string function.
+ * The code is simpler and shorter than the fast string function as well.
+ *
+ * rdi   destination
+ * rsi   value (char)
+ * rdx   count (bytes)
+ *
+ * rax   original destination
+ */
+        .section .altinstr_replacement, "ax", @progbits
+.Lmemset_c_e:
+        movq %rdi,%r9
+        movb %sil,%al
+        movl %edx,%ecx
+        rep stosb
+        movq %r9,%rax
+        ret
+.Lmemset_e_e:
+        .previous
+
 ENTRY(memset)
 ENTRY(__memset)
         CFI_STARTPROC
@@ -112,16 +138,20 @@ ENTRY(__memset)
 ENDPROC(memset)
 ENDPROC(__memset)
 
-        /* Some CPUs run faster using the string instructions.
-           It is also a lot simpler. Use this when possible */
-
-#include <asm/cpufeature.h>
-
+        /* Some CPUs support enhanced REP MOVSB/STOSB feature.
+         * It is recommended to use this when possible.
+         *
+         * If enhanced REP MOVSB/STOSB feature is not available, use fast string
+         * instructions.
+         *
+         * Otherwise, use original memset function.
+         *
+         * In .altinstructions section, ERMS feature is placed after REG_GOOD
+         * feature to implement the right patch order.
+         */
         .section .altinstructions,"a"
-        .align 8
-        .quad memset
-        .quad .Lmemset_c
-        .word X86_FEATURE_REP_GOOD
-        .byte .Lfinal - memset
-        .byte .Lmemset_e - .Lmemset_c
+        altinstruction_entry memset,.Lmemset_c,X86_FEATURE_REP_GOOD,\
+                             .Lfinal-memset,.Lmemset_e-.Lmemset_c
+        altinstruction_entry memset,.Lmemset_c_e,X86_FEATURE_ERMS, \
+                             .Lfinal-memset,.Lmemset_e_e-.Lmemset_c_e
         .previous
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 3e608edf9958..3d11327c9ab4 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -23,8 +23,8 @@ mmiotrace-y			:= kmmio.o pf_in.o mmio-mod.o
 obj-$(CONFIG_MMIOTRACE_TEST)    += testmmiotrace.o
 
 obj-$(CONFIG_NUMA)              += numa.o numa_$(BITS).o
-obj-$(CONFIG_AMD_NUMA)          += amdtopology_64.o
-obj-$(CONFIG_ACPI_NUMA)         += srat_$(BITS).o
+obj-$(CONFIG_AMD_NUMA)          += amdtopology.o
+obj-$(CONFIG_ACPI_NUMA)         += srat.o
 obj-$(CONFIG_NUMA_EMU)          += numa_emulation.o
 
 obj-$(CONFIG_HAVE_MEMBLOCK)             += memblock.o
diff --git a/arch/x86/mm/amdtopology_64.c b/arch/x86/mm/amdtopology.c
index 0919c26820d4..5247d01329ca 100644
--- a/arch/x86/mm/amdtopology_64.c
+++ b/arch/x86/mm/amdtopology.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/nodemask.h>
 #include <linux/memblock.h>
+#include <linux/bootmem.h>
 
 #include <asm/io.h>
 #include <linux/pci_ids.h>
@@ -69,10 +70,10 @@ static __init void early_get_boot_cpu_id(void)
 
 int __init amd_numa_init(void)
 {
-        unsigned long start = PFN_PHYS(0);
-        unsigned long end = PFN_PHYS(max_pfn);
+        u64 start = PFN_PHYS(0);
+        u64 end = PFN_PHYS(max_pfn);
         unsigned numnodes;
-        unsigned long prevbase;
+        u64 prevbase;
         int i, j, nb;
         u32 nodeid, reg;
         unsigned int bits, cores, apicid_base;
@@ -95,7 +96,7 @@ int __init amd_numa_init(void)
 
         prevbase = 0;
         for (i = 0; i < 8; i++) {
-                unsigned long base, limit;
+                u64 base, limit;
 
                 base = read_pci_config(0, nb, 1, 0x40 + i*8);
                 limit = read_pci_config(0, nb, 1, 0x44 + i*8);
@@ -107,18 +108,18 @@ int __init amd_numa_init(void)
                         continue;
                 }
                 if (nodeid >= numnodes) {
-                        pr_info("Ignoring excess node %d (%lx:%lx)\n", nodeid,
+                        pr_info("Ignoring excess node %d (%Lx:%Lx)\n", nodeid,
                                 base, limit);
                         continue;
                 }
 
                 if (!limit) {
-                        pr_info("Skipping node entry %d (base %lx)\n",
+                        pr_info("Skipping node entry %d (base %Lx)\n",
                                 i, base);
                         continue;
                 }
                 if ((base >> 8) & 3 || (limit >> 8) & 3) {
-                        pr_err("Node %d using interleaving mode %lx/%lx\n",
+                        pr_err("Node %d using interleaving mode %Lx/%Lx\n",
                                nodeid, (base >> 8) & 3, (limit >> 8) & 3);
                         return -EINVAL;
                 }
@@ -150,19 +151,19 @@ int __init amd_numa_init(void)
                         continue;
                 }
                 if (limit < base) {
-                        pr_err("Node %d bogus settings %lx-%lx.\n",
+                        pr_err("Node %d bogus settings %Lx-%Lx.\n",
                                nodeid, base, limit);
                         continue;
                 }
 
                 /* Could sort here, but pun for now. Should not happen anyroads. */
                 if (prevbase > base) {
-                        pr_err("Node map not sorted %lx,%lx\n",
+                        pr_err("Node map not sorted %Lx,%Lx\n",
                                prevbase, base);
                         return -EINVAL;
                 }
 
-                pr_info("Node %d MemBase %016lx Limit %016lx\n",
+                pr_info("Node %d MemBase %016Lx Limit %016Lx\n",
                         nodeid, base, limit);
 
                 prevbase = base;
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 20e3f8702d1e..f7a2a054a3c0 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -12,6 +12,7 @@
 #include <linux/mmiotrace.h>            /* kmmio_handler, ...           */
 #include <linux/perf_event.h>           /* perf_sw_event                */
 #include <linux/hugetlb.h>              /* hstate_index_to_shift        */
+#include <linux/prefetch.h>             /* prefetchw                    */
 
 #include <asm/traps.h>                  /* dotraplinkage, ...           */
 #include <asm/pgalloc.h>                /* pgd_*(), ...                 */
@@ -964,7 +965,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
         struct mm_struct *mm;
         int fault;
         int write = error_code & PF_WRITE;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY |
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
                                         (write ? FAULT_FLAG_WRITE : 0);
 
         tsk = current;
@@ -1138,6 +1139,16 @@ good_area:
         }
 
         /*
+         * Pagefault was interrupted by SIGKILL. We have no reason to
+         * continue pagefault.
+         */
+        if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)) {
+                if (!(error_code & PF_USER))
+                        no_context(regs, error_code, address);
+                return;
+        }
+
+        /*
          * Major/minor page fault accounting is only done on the
          * initial attempt. If we go through a retry, it is extremely
          * likely that the page will be found in page cache at that point.
diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
index d4203988504a..f581a18c0d4d 100644
--- a/arch/x86/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
@@ -72,7 +72,7 @@ static void huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)
         if (!vma_shareable(vma, addr))
                 return;
 
-        spin_lock(&mapping->i_mmap_lock);
+        mutex_lock(&mapping->i_mmap_mutex);
         vma_prio_tree_foreach(svma, &iter, &mapping->i_mmap, idx, idx) {
                 if (svma == vma)
                         continue;
@@ -97,7 +97,7 @@ static void huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud)
                 put_page(virt_to_page(spte));
         spin_unlock(&mm->page_table_lock);
 out:
-        spin_unlock(&mapping->i_mmap_lock);
+        mutex_unlock(&mapping->i_mmap_mutex);
 }
 
 /*
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 37b8b0fe8320..30326443ab81 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -16,8 +16,6 @@
 #include <asm/tlb.h>
 #include <asm/proto.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 unsigned long __initdata pgt_buf_start;
 unsigned long __meminitdata pgt_buf_end;
 unsigned long __meminitdata pgt_buf_top;
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 80088f994193..29f7c6d98179 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -678,8 +678,10 @@ static void __init zone_sizes_init(void)
 {
         unsigned long max_zone_pfns[MAX_NR_ZONES];
         memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
+#ifdef CONFIG_ZONE_DMA
         max_zone_pfns[ZONE_DMA] =
                 virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;
+#endif
         max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
 #ifdef CONFIG_HIGHMEM
         max_zone_pfns[ZONE_HIGHMEM] = highend_pfn;
@@ -716,6 +718,7 @@ void __init paging_init(void)
          * NOTE: at this point the bootmem allocator is fully available.
          */
         olpc_dt_build_devicetree();
+        sparse_memory_present_with_active_regions(MAX_NUMNODES);
         sparse_init();
         zone_sizes_init();
 }
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 794233587287..d865c4aeec55 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -616,7 +616,9 @@ void __init paging_init(void)
         unsigned long max_zone_pfns[MAX_NR_ZONES];
 
         memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
+#ifdef CONFIG_ZONE_DMA
         max_zone_pfns[ZONE_DMA] = MAX_DMA_PFN;
+#endif
         max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
         max_zone_pfns[ZONE_NORMAL] = max_pfn;
 
@@ -679,14 +681,6 @@ int arch_add_memory(int nid, u64 start, u64 size)
 }
 EXPORT_SYMBOL_GPL(arch_add_memory);
 
-#if !defined(CONFIG_ACPI_NUMA) && defined(CONFIG_NUMA)
-int memory_add_physaddr_to_nid(u64 start)
-{
-        return 0;
-}
-EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
-#endif
-
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
 static struct kcore_list kcore_vsyscall;
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 0369843511dc..be1ef574ce9a 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -91,13 +91,6 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
                 return (__force void __iomem *)phys_to_virt(phys_addr);
 
         /*
-         * Check if the request spans more than any BAR in the iomem resource
-         * tree.
-         */
-        WARN_ONCE(iomem_map_sanity_check(phys_addr, size),
-                  KERN_INFO "Info: mapping multiple BARs. Your kernel is fine.");
-
-        /*
          * Don't allow anybody to remap normal RAM that we're using..
          */
         last_pfn = last_addr >> PAGE_SHIFT;
@@ -170,6 +163,13 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
         ret_addr = (void __iomem *) (vaddr + offset);
         mmiotrace_ioremap(unaligned_phys_addr, unaligned_size, ret_addr);
 
+        /*
+         * Check if the request spans more than any BAR in the iomem resource
+         * tree.
+         */
+        WARN_ONCE(iomem_map_sanity_check(unaligned_phys_addr, unaligned_size),
+                  KERN_INFO "Info: mapping multiple BARs. Your kernel is fine.");
+
         return ret_addr;
 err_free_area:
         free_vm_area(area);
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 745258dfc4dc..f5510d889a22 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -1,11 +1,39 @@
 /* Common code for 32 and 64-bit NUMA */
-#include <linux/topology.h>
-#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/string.h>
+#include <linux/init.h>
 #include <linux/bootmem.h>
-#include <asm/numa.h>
+#include <linux/memblock.h>
+#include <linux/mmzone.h>
+#include <linux/ctype.h>
+#include <linux/module.h>
+#include <linux/nodemask.h>
+#include <linux/sched.h>
+#include <linux/topology.h>
+
+#include <asm/e820.h>
+#include <asm/proto.h>
+#include <asm/dma.h>
 #include <asm/acpi.h>
+#include <asm/amd_nb.h>
+
+#include "numa_internal.h"
 
 int __initdata numa_off;
+nodemask_t numa_nodes_parsed __initdata;
+
+struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
+EXPORT_SYMBOL(node_data);
+
+static struct numa_meminfo numa_meminfo
+#ifndef CONFIG_MEMORY_HOTPLUG
+__initdata
+#endif
+;
+
+static int numa_distance_cnt;
+static u8 *numa_distance;
 
 static __init int numa_setup(char *opt)
 {
@@ -32,6 +60,15 @@ s16 __apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = {
         [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE
 };
 
+int __cpuinit numa_cpu_node(int cpu)
+{
+        int apicid = early_per_cpu(x86_cpu_to_apicid, cpu);
+
+        if (apicid != BAD_APICID)
+                return __apicid_to_node[apicid];
+        return NUMA_NO_NODE;
+}
+
 cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];
 EXPORT_SYMBOL(node_to_cpumask_map);
 
@@ -95,6 +132,407 @@ void __init setup_node_to_cpumask_map(void)
         pr_debug("Node to cpumask map for %d nodes\n", nr_node_ids);
 }
 
+static int __init numa_add_memblk_to(int nid, u64 start, u64 end,
+                                     struct numa_meminfo *mi)
+{
+        /* ignore zero length blks */
+        if (start == end)
+                return 0;
+
+        /* whine about and ignore invalid blks */
+        if (start > end || nid < 0 || nid >= MAX_NUMNODES) {
+                pr_warning("NUMA: Warning: invalid memblk node %d (%Lx-%Lx)\n",
+                           nid, start, end);
+                return 0;
+        }
+
+        if (mi->nr_blks >= NR_NODE_MEMBLKS) {
+                pr_err("NUMA: too many memblk ranges\n");
+                return -EINVAL;
+        }
+
+        mi->blk[mi->nr_blks].start = start;
+        mi->blk[mi->nr_blks].end = end;
+        mi->blk[mi->nr_blks].nid = nid;
+        mi->nr_blks++;
+        return 0;
+}
+
+/**
+ * numa_remove_memblk_from - Remove one numa_memblk from a numa_meminfo
+ * @idx: Index of memblk to remove
+ * @mi: numa_meminfo to remove memblk from
+ *
+ * Remove @idx'th numa_memblk from @mi by shifting @mi->blk[] and
+ * decrementing @mi->nr_blks.
+ */
+void __init numa_remove_memblk_from(int idx, struct numa_meminfo *mi)
+{
+        mi->nr_blks--;
+        memmove(&mi->blk[idx], &mi->blk[idx + 1],
+                (mi->nr_blks - idx) * sizeof(mi->blk[0]));
+}
+
+/**
+ * numa_add_memblk - Add one numa_memblk to numa_meminfo
+ * @nid: NUMA node ID of the new memblk
+ * @start: Start address of the new memblk
+ * @end: End address of the new memblk
+ *
+ * Add a new memblk to the default numa_meminfo.
+ *
+ * RETURNS:
+ * 0 on success, -errno on failure.
+ */
+int __init numa_add_memblk(int nid, u64 start, u64 end)
+{
+        return numa_add_memblk_to(nid, start, end, &numa_meminfo);
+}
+
+/* Initialize NODE_DATA for a node on the local memory */
+static void __init setup_node_data(int nid, u64 start, u64 end)
+{
+        const u64 nd_low = PFN_PHYS(MAX_DMA_PFN);
+        const u64 nd_high = PFN_PHYS(max_pfn_mapped);
+        const size_t nd_size = roundup(sizeof(pg_data_t), PAGE_SIZE);
+        bool remapped = false;
+        u64 nd_pa;
+        void *nd;
+        int tnid;
+
+        /*
+         * Don't confuse VM with a node that doesn't have the
+         * minimum amount of memory:
+         */
+        if (end && (end - start) < NODE_MIN_SIZE)
+                return;
+
+        /* initialize remap allocator before aligning to ZONE_ALIGN */
+        init_alloc_remap(nid, start, end);
+
+        start = roundup(start, ZONE_ALIGN);
+
+        printk(KERN_INFO "Initmem setup node %d %016Lx-%016Lx\n",
+               nid, start, end);
+
+        /*
+         * Allocate node data.  Try remap allocator first, node-local
+         * memory and then any node.  Never allocate in DMA zone.
+         */
+        nd = alloc_remap(nid, nd_size);
+        if (nd) {
+                nd_pa = __pa(nd);
+                remapped = true;
+        } else {
+                nd_pa = memblock_x86_find_in_range_node(nid, nd_low, nd_high,
+                                                nd_size, SMP_CACHE_BYTES);
+                if (nd_pa == MEMBLOCK_ERROR)
+                        nd_pa = memblock_find_in_range(nd_low, nd_high,
+                                                nd_size, SMP_CACHE_BYTES);
+                if (nd_pa == MEMBLOCK_ERROR) {
+                        pr_err("Cannot find %zu bytes in node %d\n",
+                               nd_size, nid);
+                        return;
+                }
+                memblock_x86_reserve_range(nd_pa, nd_pa + nd_size, "NODE_DATA");
+                nd = __va(nd_pa);
+        }
+
+        /* report and initialize */
+        printk(KERN_INFO "  NODE_DATA [%016Lx - %016Lx]%s\n",
+               nd_pa, nd_pa + nd_size - 1, remapped ? " (remapped)" : "");
+        tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT);
+        if (!remapped && tnid != nid)
+                printk(KERN_INFO "    NODE_DATA(%d) on node %d\n", nid, tnid);
+
+        node_data[nid] = nd;
+        memset(NODE_DATA(nid), 0, sizeof(pg_data_t));
+        NODE_DATA(nid)->node_id = nid;
+        NODE_DATA(nid)->node_start_pfn = start >> PAGE_SHIFT;
+        NODE_DATA(nid)->node_spanned_pages = (end - start) >> PAGE_SHIFT;
+
+        node_set_online(nid);
+}
+
+/**
+ * numa_cleanup_meminfo - Cleanup a numa_meminfo
+ * @mi: numa_meminfo to clean up
+ *
+ * Sanitize @mi by merging and removing unncessary memblks.  Also check for
+ * conflicts and clear unused memblks.
+ *
+ * RETURNS:
+ * 0 on success, -errno on failure.
+ */
+int __init numa_cleanup_meminfo(struct numa_meminfo *mi)
+{
+        const u64 low = 0;
+        const u64 high = PFN_PHYS(max_pfn);
+        int i, j, k;
+
+        /* first, trim all entries */
+        for (i = 0; i < mi->nr_blks; i++) {
+                struct numa_memblk *bi = &mi->blk[i];
+
+                /* make sure all blocks are inside the limits */
+                bi->start = max(bi->start, low);
+                bi->end = min(bi->end, high);
+
+                /* and there's no empty block */
+                if (bi->start >= bi->end)
+                        numa_remove_memblk_from(i--, mi);
+        }
+
+        /* merge neighboring / overlapping entries */
+        for (i = 0; i < mi->nr_blks; i++) {
+                struct numa_memblk *bi = &mi->blk[i];
+
+                for (j = i + 1; j < mi->nr_blks; j++) {
+                        struct numa_memblk *bj = &mi->blk[j];
+                        u64 start, end;
+
+                        /*
+                         * See whether there are overlapping blocks.  Whine
+                         * about but allow overlaps of the same nid.  They
+                         * will be merged below.
+                         */
+                        if (bi->end > bj->start && bi->start < bj->end) {
+                                if (bi->nid != bj->nid) {
+                                        pr_err("NUMA: node %d (%Lx-%Lx) overlaps with node %d (%Lx-%Lx)\n",
+                                               bi->nid, bi->start, bi->end,
+                                               bj->nid, bj->start, bj->end);
+                                        return -EINVAL;
+                                }
+                                pr_warning("NUMA: Warning: node %d (%Lx-%Lx) overlaps with itself (%Lx-%Lx)\n",
+                                           bi->nid, bi->start, bi->end,
+                                           bj->start, bj->end);
+                        }
+
+                        /*
+                         * Join together blocks on the same node, holes
+                         * between which don't overlap with memory on other
+                         * nodes.
+                         */
+                        if (bi->nid != bj->nid)
+                                continue;
+                        start = min(bi->start, bj->start);
+                        end = max(bi->end, bj->end);
+                        for (k = 0; k < mi->nr_blks; k++) {
+                                struct numa_memblk *bk = &mi->blk[k];
+
+                                if (bi->nid == bk->nid)
+                                        continue;
+                                if (start < bk->end && end > bk->start)
+                                        break;
+                        }
+                        if (k < mi->nr_blks)
+                                continue;
+                        printk(KERN_INFO "NUMA: Node %d [%Lx,%Lx) + [%Lx,%Lx) -> [%Lx,%Lx)\n",
+                               bi->nid, bi->start, bi->end, bj->start, bj->end,
+                               start, end);
+                        bi->start = start;
+                        bi->end = end;
+                        numa_remove_memblk_from(j--, mi);
+                }
+        }
+
+        /* clear unused ones */
+        for (i = mi->nr_blks; i < ARRAY_SIZE(mi->blk); i++) {
+                mi->blk[i].start = mi->blk[i].end = 0;
+                mi->blk[i].nid = NUMA_NO_NODE;
+        }
+
+        return 0;
+}
+
+/*
+ * Set nodes, which have memory in @mi, in *@nodemask.
+ */
+static void __init numa_nodemask_from_meminfo(nodemask_t *nodemask,
+                                              const struct numa_meminfo *mi)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(mi->blk); i++)
+                if (mi->blk[i].start != mi->blk[i].end &&
+                    mi->blk[i].nid != NUMA_NO_NODE)
+                        node_set(mi->blk[i].nid, *nodemask);
+}
+
+/**
+ * numa_reset_distance - Reset NUMA distance table
+ *
+ * The current table is freed.  The next numa_set_distance() call will
+ * create a new one.
+ */
+void __init numa_reset_distance(void)
+{
+        size_t size = numa_distance_cnt * numa_distance_cnt * sizeof(numa_distance[0]);
+
+        /* numa_distance could be 1LU marking allocation failure, test cnt */
+        if (numa_distance_cnt)
+                memblock_x86_free_range(__pa(numa_distance),
+                                        __pa(numa_distance) + size);
+        numa_distance_cnt = 0;
+        numa_distance = NULL;   /* enable table creation */
+}
+
+static int __init numa_alloc_distance(void)
+{
+        nodemask_t nodes_parsed;
+        size_t size;
+        int i, j, cnt = 0;
+        u64 phys;
+
+        /* size the new table and allocate it */
+        nodes_parsed = numa_nodes_parsed;
+        numa_nodemask_from_meminfo(&nodes_parsed, &numa_meminfo);
+
+        for_each_node_mask(i, nodes_parsed)
+                cnt = i;
+        cnt++;
+        size = cnt * cnt * sizeof(numa_distance[0]);
+
+        phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped),
+                                      size, PAGE_SIZE);
+        if (phys == MEMBLOCK_ERROR) {
+                pr_warning("NUMA: Warning: can't allocate distance table!\n");
+                /* don't retry until explicitly reset */
+                numa_distance = (void *)1LU;
+                return -ENOMEM;
+        }
+        memblock_x86_reserve_range(phys, phys + size, "NUMA DIST");
+
+        numa_distance = __va(phys);
+        numa_distance_cnt = cnt;
+
+        /* fill with the default distances */
+        for (i = 0; i < cnt; i++)
+                for (j = 0; j < cnt; j++)
+                        numa_distance[i * cnt + j] = i == j ?
+                                LOCAL_DISTANCE : REMOTE_DISTANCE;
+        printk(KERN_DEBUG "NUMA: Initialized distance table, cnt=%d\n", cnt);
+
+        return 0;
+}
+
+/**
+ * numa_set_distance - Set NUMA distance from one NUMA to another
+ * @from: the 'from' node to set distance
+ * @to: the 'to'  node to set distance
+ * @distance: NUMA distance
+ *
+ * Set the distance from node @from to @to to @distance.  If distance table
+ * doesn't exist, one which is large enough to accommodate all the currently
+ * known nodes will be created.
+ *
+ * If such table cannot be allocated, a warning is printed and further
+ * calls are ignored until the distance table is reset with
+ * numa_reset_distance().
+ *
+ * If @from or @to is higher than the highest known node at the time of
+ * table creation or @distance doesn't make sense, the call is ignored.
+ * This is to allow simplification of specific NUMA config implementations.
+ */
+void __init numa_set_distance(int from, int to, int distance)
+{
+        if (!numa_distance && numa_alloc_distance() < 0)
+                return;
+
+        if (from >= numa_distance_cnt || to >= numa_distance_cnt) {
+                printk_once(KERN_DEBUG "NUMA: Debug: distance out of bound, from=%d to=%d distance=%d\n",
+                            from, to, distance);
+                return;
+        }
+
+        if ((u8)distance != distance ||
+            (from == to && distance != LOCAL_DISTANCE)) {
+                pr_warn_once("NUMA: Warning: invalid distance parameter, from=%d to=%d distance=%d\n",
+                             from, to, distance);
+                return;
+        }
+
+        numa_distance[from * numa_distance_cnt + to] = distance;
+}
+
+int __node_distance(int from, int to)
+{
+        if (from >= numa_distance_cnt || to >= numa_distance_cnt)
+                return from == to ? LOCAL_DISTANCE : REMOTE_DISTANCE;
+        return numa_distance[from * numa_distance_cnt + to];
+}
+EXPORT_SYMBOL(__node_distance);
+
+/*
+ * Sanity check to catch more bad NUMA configurations (they are amazingly
+ * common).  Make sure the nodes cover all memory.
+ */
+static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
+{
+        u64 numaram, e820ram;
+        int i;
+
+        numaram = 0;
+        for (i = 0; i < mi->nr_blks; i++) {
+                u64 s = mi->blk[i].start >> PAGE_SHIFT;
+                u64 e = mi->blk[i].end >> PAGE_SHIFT;
+                numaram += e - s;
+                numaram -= __absent_pages_in_range(mi->blk[i].nid, s, e);
+                if ((s64)numaram < 0)
+                        numaram = 0;
+        }
+
+        e820ram = max_pfn - (memblock_x86_hole_size(0,
+                                        PFN_PHYS(max_pfn)) >> PAGE_SHIFT);
+        /* We seem to lose 3 pages somewhere. Allow 1M of slack. */
+        if ((s64)(e820ram - numaram) >= (1 << (20 - PAGE_SHIFT))) {
+                printk(KERN_ERR "NUMA: nodes only cover %LuMB of your %LuMB e820 RAM. Not used.\n",
+                       (numaram << PAGE_SHIFT) >> 20,
+                       (e820ram << PAGE_SHIFT) >> 20);
+                return false;
+        }
+        return true;
+}
+
+static int __init numa_register_memblks(struct numa_meminfo *mi)
+{
+        int i, nid;
+
+        /* Account for nodes with cpus and no memory */
+        node_possible_map = numa_nodes_parsed;
+        numa_nodemask_from_meminfo(&node_possible_map, mi);
+        if (WARN_ON(nodes_empty(node_possible_map)))
+                return -EINVAL;
+
+        for (i = 0; i < mi->nr_blks; i++)
+                memblock_x86_register_active_regions(mi->blk[i].nid,
+                                        mi->blk[i].start >> PAGE_SHIFT,
+                                        mi->blk[i].end >> PAGE_SHIFT);
+
+        /* for out of order entries */
+        sort_node_map();
+        if (!numa_meminfo_cover_memory(mi))
+                return -EINVAL;
+
+        /* Finally register nodes. */
+        for_each_node_mask(nid, node_possible_map) {
+                u64 start = PFN_PHYS(max_pfn);
+                u64 end = 0;
+
+                for (i = 0; i < mi->nr_blks; i++) {
+                        if (nid != mi->blk[i].nid)
+                                continue;
+                        start = min(mi->blk[i].start, start);
+                        end = max(mi->blk[i].end, end);
+                }
+
+                if (start < end)
+                        setup_node_data(nid, start, end);
+        }
+
+        return 0;
+}
+
 /*
  * There are unfortunately some poorly designed mainboards around that
  * only connect memory to a single CPU. This breaks the 1:1 cpu->node
@@ -102,7 +540,7 @@ void __init setup_node_to_cpumask_map(void)
  * as the number of CPUs is not known yet. We round robin the existing
  * nodes.
  */
-void __init numa_init_array(void)
+static void __init numa_init_array(void)
 {
         int rr, i;
 
@@ -117,6 +555,95 @@ void __init numa_init_array(void)
         }
 }
 
+static int __init numa_init(int (*init_func)(void))
+{
+        int i;
+        int ret;
+
+        for (i = 0; i < MAX_LOCAL_APIC; i++)
+                set_apicid_to_node(i, NUMA_NO_NODE);
+
+        nodes_clear(numa_nodes_parsed);
+        nodes_clear(node_possible_map);
+        nodes_clear(node_online_map);
+        memset(&numa_meminfo, 0, sizeof(numa_meminfo));
+        remove_all_active_ranges();
+        numa_reset_distance();
+
+        ret = init_func();
+        if (ret < 0)
+                return ret;
+        ret = numa_cleanup_meminfo(&numa_meminfo);
+        if (ret < 0)
+                return ret;
+
+        numa_emulation(&numa_meminfo, numa_distance_cnt);
+
+        ret = numa_register_memblks(&numa_meminfo);
+        if (ret < 0)
+                return ret;
+
+        for (i = 0; i < nr_cpu_ids; i++) {
+                int nid = early_cpu_to_node(i);
+
+                if (nid == NUMA_NO_NODE)
+                        continue;
+                if (!node_online(nid))
+                        numa_clear_node(i);
+        }
+        numa_init_array();
+        return 0;
+}
+
+/**
+ * dummy_numa_init - Fallback dummy NUMA init
+ *
+ * Used if there's no underlying NUMA architecture, NUMA initialization
+ * fails, or NUMA is disabled on the command line.
+ *
+ * Must online at least one node and add memory blocks that cover all
+ * allowed memory.  This function must not fail.
+ */
+static int __init dummy_numa_init(void)
+{
+        printk(KERN_INFO "%s\n",
+               numa_off ? "NUMA turned off" : "No NUMA configuration found");
+        printk(KERN_INFO "Faking a node at %016Lx-%016Lx\n",
+               0LLU, PFN_PHYS(max_pfn));
+
+        node_set(0, numa_nodes_parsed);
+        numa_add_memblk(0, 0, PFN_PHYS(max_pfn));
+
+        return 0;
+}
+
+/**
+ * x86_numa_init - Initialize NUMA
+ *
+ * Try each configured NUMA initialization method until one succeeds.  The
+ * last fallback is dummy single node config encomapssing whole memory and
+ * never fails.
+ */
+void __init x86_numa_init(void)
+{
+        if (!numa_off) {
+#ifdef CONFIG_X86_NUMAQ
+                if (!numa_init(numaq_numa_init))
+                        return;
+#endif
+#ifdef CONFIG_ACPI_NUMA
+                if (!numa_init(x86_acpi_numa_init))
+                        return;
+#endif
+#ifdef CONFIG_AMD_NUMA
+                if (!numa_init(amd_numa_init))
+                        return;
+#endif
+        }
+
+        numa_init(dummy_numa_init);
+}
+
 static __init int find_near_online_node(int node)
 {
         int n, val;
@@ -282,3 +809,18 @@ const struct cpumask *cpumask_of_node(int node)
 EXPORT_SYMBOL(cpumask_of_node);
 
 #endif  /* !CONFIG_DEBUG_PER_CPU_MAPS */
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+int memory_add_physaddr_to_nid(u64 start)
+{
+        struct numa_meminfo *mi = &numa_meminfo;
+        int nid = mi->blk[0].nid;
+        int i;
+
+        for (i = 0; i < mi->nr_blks; i++)
+                if (mi->blk[i].start <= start && mi->blk[i].end > start)
+                        nid = mi->blk[i].nid;
+        return nid;
+}
+EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
+#endif
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index bde3906420df..849a975d3fa0 100644
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -22,39 +22,11 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/mm.h>
 #include <linux/bootmem.h>
 #include <linux/memblock.h>
-#include <linux/mmzone.h>
-#include <linux/highmem.h>
-#include <linux/initrd.h>
-#include <linux/nodemask.h>
 #include <linux/module.h>
-#include <linux/kexec.h>
-#include <linux/pfn.h>
-#include <linux/swap.h>
-#include <linux/acpi.h>
-
-#include <asm/e820.h>
-#include <asm/setup.h>
-#include <asm/mmzone.h>
-#include <asm/bios_ebda.h>
-#include <asm/proto.h>
-
-struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
-EXPORT_SYMBOL(node_data);
-
-/*
- * numa interface - we expect the numa architecture specific code to have
- *                  populated the following initialisation.
- *
- * 1) node_online_map  - the map of all nodes configured (online) in the system
- * 2) node_start_pfn   - the starting page frame number for a node
- * 3) node_end_pfn     - the ending page fram number for a node
- */
-unsigned long node_start_pfn[MAX_NUMNODES] __read_mostly;
-unsigned long node_end_pfn[MAX_NUMNODES] __read_mostly;
 
+#include "numa_internal.h"
 
 #ifdef CONFIG_DISCONTIGMEM
 /*
@@ -99,108 +71,46 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,
 }
 #endif
 
-extern unsigned long find_max_low_pfn(void);
 extern unsigned long highend_pfn, highstart_pfn;
 
 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
 
-unsigned long node_remap_size[MAX_NUMNODES];
 static void *node_remap_start_vaddr[MAX_NUMNODES];
 void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags);
 
-static unsigned long kva_start_pfn;
-static unsigned long kva_pages;
-
-int __cpuinit numa_cpu_node(int cpu)
-{
-        return apic->x86_32_numa_cpu_node(cpu);
-}
-
-/*
- * FLAT - support for basic PC memory model with discontig enabled, essentially
- *        a single node with all available processors in it with a flat
- *        memory map.
- */
-int __init get_memcfg_numa_flat(void)
-{
-        printk(KERN_DEBUG "NUMA - single node, flat memory mode\n");
-
-        node_start_pfn[0] = 0;
-        node_end_pfn[0] = max_pfn;
-        memblock_x86_register_active_regions(0, 0, max_pfn);
-        memory_present(0, 0, max_pfn);
-        node_remap_size[0] = node_memmap_size_bytes(0, 0, max_pfn);
-
-        /* Indicate there is one node available. */
-        nodes_clear(node_online_map);
-        node_set_online(0);
-        return 1;
-}
-
-/*
- * Find the highest page frame number we have available for the node
- */
-static void __init propagate_e820_map_node(int nid)
-{
-        if (node_end_pfn[nid] > max_pfn)
-                node_end_pfn[nid] = max_pfn;
-        /*
-         * if a user has given mem=XXXX, then we need to make sure 
-         * that the node _starts_ before that, too, not just ends
-         */
-        if (node_start_pfn[nid] > max_pfn)
-                node_start_pfn[nid] = max_pfn;
-        BUG_ON(node_start_pfn[nid] > node_end_pfn[nid]);
-}
-
-/* 
- * Allocate memory for the pg_data_t for this node via a crude pre-bootmem
- * method.  For node zero take this from the bottom of memory, for
- * subsequent nodes place them at node_remap_start_vaddr which contains
- * node local data in physically node local memory.  See setup_memory()
- * for details.
- */
-static void __init allocate_pgdat(int nid)
-{
-        char buf[16];
-
-        if (node_has_online_mem(nid) && node_remap_start_vaddr[nid])
-                NODE_DATA(nid) = (pg_data_t *)node_remap_start_vaddr[nid];
-        else {
-                unsigned long pgdat_phys;
-                pgdat_phys = memblock_find_in_range(min_low_pfn<<PAGE_SHIFT,
-                                 max_pfn_mapped<<PAGE_SHIFT,
-                                 sizeof(pg_data_t),
-                                 PAGE_SIZE);
-                NODE_DATA(nid) = (pg_data_t *)(pfn_to_kaddr(pgdat_phys>>PAGE_SHIFT));
-                memset(buf, 0, sizeof(buf));
-                sprintf(buf, "NODE_DATA %d",  nid);
-                memblock_x86_reserve_range(pgdat_phys, pgdat_phys + sizeof(pg_data_t), buf);
-        }
-        printk(KERN_DEBUG "allocate_pgdat: node %d NODE_DATA %08lx\n",
-                nid, (unsigned long)NODE_DATA(nid));
-}
-
 /*
- * In the DISCONTIGMEM and SPARSEMEM memory model, a portion of the kernel
- * virtual address space (KVA) is reserved and portions of nodes are mapped
- * using it. This is to allow node-local memory to be allocated for
- * structures that would normally require ZONE_NORMAL. The memory is
- * allocated with alloc_remap() and callers should be prepared to allocate
- * from the bootmem allocator instead.
+ * Remap memory allocator
  */
 static unsigned long node_remap_start_pfn[MAX_NUMNODES];
 static void *node_remap_end_vaddr[MAX_NUMNODES];
 static void *node_remap_alloc_vaddr[MAX_NUMNODES];
-static unsigned long node_remap_offset[MAX_NUMNODES];
 
+/**
+ * alloc_remap - Allocate remapped memory
+ * @nid: NUMA node to allocate memory from
+ * @size: The size of allocation
+ *
+ * Allocate @size bytes from the remap area of NUMA node @nid.  The
+ * size of the remap area is predetermined by init_alloc_remap() and
+ * only the callers considered there should call this function.  For
+ * more info, please read the comment on top of init_alloc_remap().
+ *
+ * The caller must be ready to handle allocation failure from this
+ * function and fall back to regular memory allocator in such cases.
+ *
+ * CONTEXT:
+ * Single CPU early boot context.
+ *
+ * RETURNS:
+ * Pointer to the allocated memory on success, %NULL on failure.
+ */
 void *alloc_remap(int nid, unsigned long size)
 {
         void *allocation = node_remap_alloc_vaddr[nid];
 
         size = ALIGN(size, L1_CACHE_BYTES);
 
-        if (!allocation || (allocation + size) >= node_remap_end_vaddr[nid])
+        if (!allocation || (allocation + size) > node_remap_end_vaddr[nid])
                 return NULL;
 
         node_remap_alloc_vaddr[nid] += size;
@@ -209,26 +119,6 @@ void *alloc_remap(int nid, unsigned long size)
         return allocation;
 }
 
-static void __init remap_numa_kva(void)
-{
-        void *vaddr;
-        unsigned long pfn;
-        int node;
-
-        for_each_online_node(node) {
-                printk(KERN_DEBUG "remap_numa_kva: node %d\n", node);
-                for (pfn=0; pfn < node_remap_size[node]; pfn += PTRS_PER_PTE) {
-                        vaddr = node_remap_start_vaddr[node]+(pfn<<PAGE_SHIFT);
-                        printk(KERN_DEBUG "remap_numa_kva: %08lx to pfn %08lx\n",
-                                (unsigned long)vaddr,
-                                node_remap_start_pfn[node] + pfn);
-                        set_pmd_pfn((ulong) vaddr, 
-                                node_remap_start_pfn[node] + pfn, 
-                                PAGE_KERNEL_LARGE);
-                }
-        }
-}
-
 #ifdef CONFIG_HIBERNATION
 /**
  * resume_map_numa_kva - add KVA mapping to the temporary page tables created
@@ -240,15 +130,16 @@ void resume_map_numa_kva(pgd_t *pgd_base)
         int node;
 
         for_each_online_node(node) {
-                unsigned long start_va, start_pfn, size, pfn;
+                unsigned long start_va, start_pfn, nr_pages, pfn;
 
                 start_va = (unsigned long)node_remap_start_vaddr[node];
                 start_pfn = node_remap_start_pfn[node];
-                size = node_remap_size[node];
+                nr_pages = (node_remap_end_vaddr[node] -
+                            node_remap_start_vaddr[node]) >> PAGE_SHIFT;
 
                 printk(KERN_DEBUG "%s: node %d\n", __func__, node);
 
-                for (pfn = 0; pfn < size; pfn += PTRS_PER_PTE) {
+                for (pfn = 0; pfn < nr_pages; pfn += PTRS_PER_PTE) {
                         unsigned long vaddr = start_va + (pfn << PAGE_SHIFT);
                         pgd_t *pgd = pgd_base + pgd_index(vaddr);
                         pud_t *pud = pud_offset(pgd, vaddr);
@@ -264,132 +155,89 @@ void resume_map_numa_kva(pgd_t *pgd_base)
 }
 #endif
 
-static __init unsigned long calculate_numa_remap_pages(void)
+/**
+ * init_alloc_remap - Initialize remap allocator for a NUMA node
+ * @nid: NUMA node to initizlie remap allocator for
+ *
+ * NUMA nodes may end up without any lowmem.  As allocating pgdat and
+ * memmap on a different node with lowmem is inefficient, a special
+ * remap allocator is implemented which can be used by alloc_remap().
+ *
+ * For each node, the amount of memory which will be necessary for
+ * pgdat and memmap is calculated and two memory areas of the size are
+ * allocated - one in the node and the other in lowmem; then, the area
+ * in the node is remapped to the lowmem area.
+ *
+ * As pgdat and memmap must be allocated in lowmem anyway, this
+ * doesn't waste lowmem address space; however, the actual lowmem
+ * which gets remapped over is wasted.  The amount shouldn't be
+ * problematic on machines this feature will be used.
+ *
+ * Initialization failure isn't fatal.  alloc_remap() is used
+ * opportunistically and the callers will fall back to other memory
+ * allocation mechanisms on failure.
+ */
+void __init init_alloc_remap(int nid, u64 start, u64 end)
 {
-        int nid;
-        unsigned long size, reserve_pages = 0;
-
-        for_each_online_node(nid) {
-                u64 node_kva_target;
-                u64 node_kva_final;
-
-                /*
-                 * The acpi/srat node info can show hot-add memroy zones
-                 * where memory could be added but not currently present.
-                 */
-                printk(KERN_DEBUG "node %d pfn: [%lx - %lx]\n",
-                        nid, node_start_pfn[nid], node_end_pfn[nid]);
-                if (node_start_pfn[nid] > max_pfn)
-                        continue;
-                if (!node_end_pfn[nid])
-                        continue;
-                if (node_end_pfn[nid] > max_pfn)
-                        node_end_pfn[nid] = max_pfn;
-
-                /* ensure the remap includes space for the pgdat. */
-                size = node_remap_size[nid] + sizeof(pg_data_t);
-
-                /* convert size to large (pmd size) pages, rounding up */
-                size = (size + LARGE_PAGE_BYTES - 1) / LARGE_PAGE_BYTES;
-                /* now the roundup is correct, convert to PAGE_SIZE pages */
-                size = size * PTRS_PER_PTE;
-
-                node_kva_target = round_down(node_end_pfn[nid] - size,
-                                                 PTRS_PER_PTE);
-                node_kva_target <<= PAGE_SHIFT;
-                do {
-                        node_kva_final = memblock_find_in_range(node_kva_target,
-                                        ((u64)node_end_pfn[nid])<<PAGE_SHIFT,
-                                                ((u64)size)<<PAGE_SHIFT,
-                                                LARGE_PAGE_BYTES);
-                        node_kva_target -= LARGE_PAGE_BYTES;
-                } while (node_kva_final == MEMBLOCK_ERROR &&
-                         (node_kva_target>>PAGE_SHIFT) > (node_start_pfn[nid]));
-
-                if (node_kva_final == MEMBLOCK_ERROR)
-                        panic("Can not get kva ram\n");
-
-                node_remap_size[nid] = size;
-                node_remap_offset[nid] = reserve_pages;
-                reserve_pages += size;
-                printk(KERN_DEBUG "Reserving %ld pages of KVA for lmem_map of"
-                                  " node %d at %llx\n",
-                                size, nid, node_kva_final>>PAGE_SHIFT);
-
-                /*
-                 *  prevent kva address below max_low_pfn want it on system
-                 *  with less memory later.
-                 *  layout will be: KVA address , KVA RAM
-                 *
-                 *  we are supposed to only record the one less then max_low_pfn
-                 *  but we could have some hole in high memory, and it will only
-                 *  check page_is_ram(pfn) && !page_is_reserved_early(pfn) to decide
-                 *  to use it as free.
-                 *  So memblock_x86_reserve_range here, hope we don't run out of that array
-                 */
-                memblock_x86_reserve_range(node_kva_final,
-                              node_kva_final+(((u64)size)<<PAGE_SHIFT),
-                              "KVA RAM");
-
-                node_remap_start_pfn[nid] = node_kva_final>>PAGE_SHIFT;
-        }
-        printk(KERN_INFO "Reserving total of %lx pages for numa KVA remap\n",
-                        reserve_pages);
-        return reserve_pages;
-}
+        unsigned long start_pfn = start >> PAGE_SHIFT;
+        unsigned long end_pfn = end >> PAGE_SHIFT;
+        unsigned long size, pfn;
+        u64 node_pa, remap_pa;
+        void *remap_va;
 
-static void init_remap_allocator(int nid)
-{
-        node_remap_start_vaddr[nid] = pfn_to_kaddr(
-                        kva_start_pfn + node_remap_offset[nid]);
-        node_remap_end_vaddr[nid] = node_remap_start_vaddr[nid] +
-                (node_remap_size[nid] * PAGE_SIZE);
-        node_remap_alloc_vaddr[nid] = node_remap_start_vaddr[nid] +
-                ALIGN(sizeof(pg_data_t), PAGE_SIZE);
-
-        printk(KERN_DEBUG "node %d will remap to vaddr %08lx - %08lx\n", nid,
-                (ulong) node_remap_start_vaddr[nid],
-                (ulong) node_remap_end_vaddr[nid]);
+        /*
+         * The acpi/srat node info can show hot-add memroy zones where
+         * memory could be added but not currently present.
+         */
+        printk(KERN_DEBUG "node %d pfn: [%lx - %lx]\n",
+               nid, start_pfn, end_pfn);
+
+        /* calculate the necessary space aligned to large page size */
+        size = node_memmap_size_bytes(nid, start_pfn, end_pfn);
+        size += ALIGN(sizeof(pg_data_t), PAGE_SIZE);
+        size = ALIGN(size, LARGE_PAGE_BYTES);
+
+        /* allocate node memory and the lowmem remap area */
+        node_pa = memblock_find_in_range(start, end, size, LARGE_PAGE_BYTES);
+        if (node_pa == MEMBLOCK_ERROR) {
+                pr_warning("remap_alloc: failed to allocate %lu bytes for node %d\n",
+                           size, nid);
+                return;
+        }
+        memblock_x86_reserve_range(node_pa, node_pa + size, "KVA RAM");
+
+        remap_pa = memblock_find_in_range(min_low_pfn << PAGE_SHIFT,
+                                          max_low_pfn << PAGE_SHIFT,
+                                          size, LARGE_PAGE_BYTES);
+        if (remap_pa == MEMBLOCK_ERROR) {
+                pr_warning("remap_alloc: failed to allocate %lu bytes remap area for node %d\n",
+                           size, nid);
+                memblock_x86_free_range(node_pa, node_pa + size);
+                return;
+        }
+        memblock_x86_reserve_range(remap_pa, remap_pa + size, "KVA PG");
+        remap_va = phys_to_virt(remap_pa);
+
+        /* perform actual remap */
+        for (pfn = 0; pfn < size >> PAGE_SHIFT; pfn += PTRS_PER_PTE)
+                set_pmd_pfn((unsigned long)remap_va + (pfn << PAGE_SHIFT),
+                            (node_pa >> PAGE_SHIFT) + pfn,
+                            PAGE_KERNEL_LARGE);
+
+        /* initialize remap allocator parameters */
+        node_remap_start_pfn[nid] = node_pa >> PAGE_SHIFT;
+        node_remap_start_vaddr[nid] = remap_va;
+        node_remap_end_vaddr[nid] = remap_va + size;
+        node_remap_alloc_vaddr[nid] = remap_va;
+
+        printk(KERN_DEBUG "remap_alloc: node %d [%08llx-%08llx) -> [%p-%p)\n",
+               nid, node_pa, node_pa + size, remap_va, remap_va + size);
 }
 
 void __init initmem_init(void)
 {
-        int nid;
-        long kva_target_pfn;
-
-        /*
-         * When mapping a NUMA machine we allocate the node_mem_map arrays
-         * from node local memory.  They are then mapped directly into KVA
-         * between zone normal and vmalloc space.  Calculate the size of
-         * this space and use it to adjust the boundary between ZONE_NORMAL
-         * and ZONE_HIGHMEM.
-         */
-
-        get_memcfg_numa();
-        numa_init_array();
-
-        kva_pages = roundup(calculate_numa_remap_pages(), PTRS_PER_PTE);
+        x86_numa_init();
 
-        kva_target_pfn = round_down(max_low_pfn - kva_pages, PTRS_PER_PTE);
-        do {
-                kva_start_pfn = memblock_find_in_range(kva_target_pfn<<PAGE_SHIFT,
-                                        max_low_pfn<<PAGE_SHIFT,
-                                        kva_pages<<PAGE_SHIFT,
-                                        PTRS_PER_PTE<<PAGE_SHIFT) >> PAGE_SHIFT;
-                kva_target_pfn -= PTRS_PER_PTE;
-        } while (kva_start_pfn == MEMBLOCK_ERROR && kva_target_pfn > min_low_pfn);
-
-        if (kva_start_pfn == MEMBLOCK_ERROR)
-                panic("Can not get kva space\n");
-
-        printk(KERN_INFO "kva_start_pfn ~ %lx max_low_pfn ~ %lx\n",
-                kva_start_pfn, max_low_pfn);
-        printk(KERN_INFO "max_pfn = %lx\n", max_pfn);
-
-        /* avoid clash with initrd */
-        memblock_x86_reserve_range(kva_start_pfn<<PAGE_SHIFT,
-                      (kva_start_pfn + kva_pages)<<PAGE_SHIFT,
-                     "KVA PG");
 #ifdef CONFIG_HIGHMEM
         highstart_pfn = highend_pfn = max_pfn;
         if (max_pfn > max_low_pfn)
@@ -409,51 +257,9 @@ void __init initmem_init(void)
 
         printk(KERN_DEBUG "Low memory ends at vaddr %08lx\n",
                         (ulong) pfn_to_kaddr(max_low_pfn));
-        for_each_online_node(nid) {
-                init_remap_allocator(nid);
-
-                allocate_pgdat(nid);
-        }
-        remap_numa_kva();
 
         printk(KERN_DEBUG "High memory starts at vaddr %08lx\n",
                         (ulong) pfn_to_kaddr(highstart_pfn));
-        for_each_online_node(nid)
-                propagate_e820_map_node(nid);
-
-        for_each_online_node(nid) {
-                memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
-                NODE_DATA(nid)->node_id = nid;
-        }
 
         setup_bootmem_allocator();
 }
-
-#ifdef CONFIG_MEMORY_HOTPLUG
-static int paddr_to_nid(u64 addr)
-{
-        int nid;
-        unsigned long pfn = PFN_DOWN(addr);
-
-        for_each_node(nid)
-                if (node_start_pfn[nid] <= pfn &&
-                    pfn < node_end_pfn[nid])
-                        return nid;
-
-        return -1;
-}
-
-/*
- * This function is used to ask node id BEFORE memmap and mem_section's
- * initialization (pfn_to_nid() can't be used yet).
- * If _PXM is not defined on ACPI's DSDT, node id must be found by this.
- */
-int memory_add_physaddr_to_nid(u64 addr)
-{
-        int nid = paddr_to_nid(addr);
-        return (nid >= 0) ? nid : 0;
-}
-
-EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
-#endif
-
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 85b52fc03084..dd27f401f0a0 100644
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -2,646 +2,13 @@
  * Generic VM initialization for x86-64 NUMA setups.
  * Copyright 2002,2003 Andi Kleen, SuSE Labs.
  */
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/init.h>
 #include <linux/bootmem.h>
-#include <linux/memblock.h>
-#include <linux/mmzone.h>
-#include <linux/ctype.h>
-#include <linux/module.h>
-#include <linux/nodemask.h>
-#include <linux/sched.h>
-#include <linux/acpi.h>
-
-#include <asm/e820.h>
-#include <asm/proto.h>
-#include <asm/dma.h>
-#include <asm/acpi.h>
-#include <asm/amd_nb.h>
 
 #include "numa_internal.h"
 
-struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
-EXPORT_SYMBOL(node_data);
-
-nodemask_t numa_nodes_parsed __initdata;
-
-struct memnode memnode;
-
-static unsigned long __initdata nodemap_addr;
-static unsigned long __initdata nodemap_size;
-
-static struct numa_meminfo numa_meminfo __initdata;
-
-static int numa_distance_cnt;
-static u8 *numa_distance;
-
-/*
- * Given a shift value, try to populate memnodemap[]
- * Returns :
- * 1 if OK
- * 0 if memnodmap[] too small (of shift too small)
- * -1 if node overlap or lost ram (shift too big)
- */
-static int __init populate_memnodemap(const struct numa_meminfo *mi, int shift)
-{
-        unsigned long addr, end;
-        int i, res = -1;
-
-        memset(memnodemap, 0xff, sizeof(s16)*memnodemapsize);
-        for (i = 0; i < mi->nr_blks; i++) {
-                addr = mi->blk[i].start;
-                end = mi->blk[i].end;
-                if (addr >= end)
-                        continue;
-                if ((end >> shift) >= memnodemapsize)
-                        return 0;
-                do {
-                        if (memnodemap[addr >> shift] != NUMA_NO_NODE)
-                                return -1;
-                        memnodemap[addr >> shift] = mi->blk[i].nid;
-                        addr += (1UL << shift);
-                } while (addr < end);
-                res = 1;
-        }
-        return res;
-}
-
-static int __init allocate_cachealigned_memnodemap(void)
-{
-        unsigned long addr;
-
-        memnodemap = memnode.embedded_map;
-        if (memnodemapsize <= ARRAY_SIZE(memnode.embedded_map))
-                return 0;
-
-        addr = 0x8000;
-        nodemap_size = roundup(sizeof(s16) * memnodemapsize, L1_CACHE_BYTES);
-        nodemap_addr = memblock_find_in_range(addr, get_max_mapped(),
-                                      nodemap_size, L1_CACHE_BYTES);
-        if (nodemap_addr == MEMBLOCK_ERROR) {
-                printk(KERN_ERR
-                       "NUMA: Unable to allocate Memory to Node hash map\n");
-                nodemap_addr = nodemap_size = 0;
-                return -1;
-        }
-        memnodemap = phys_to_virt(nodemap_addr);
-        memblock_x86_reserve_range(nodemap_addr, nodemap_addr + nodemap_size, "MEMNODEMAP");
-
-        printk(KERN_DEBUG "NUMA: Allocated memnodemap from %lx - %lx\n",
-               nodemap_addr, nodemap_addr + nodemap_size);
-        return 0;
-}
-
-/*
- * The LSB of all start and end addresses in the node map is the value of the
- * maximum possible shift.
- */
-static int __init extract_lsb_from_nodes(const struct numa_meminfo *mi)
-{
-        int i, nodes_used = 0;
-        unsigned long start, end;
-        unsigned long bitfield = 0, memtop = 0;
-
-        for (i = 0; i < mi->nr_blks; i++) {
-                start = mi->blk[i].start;
-                end = mi->blk[i].end;
-                if (start >= end)
-                        continue;
-                bitfield |= start;
-                nodes_used++;
-                if (end > memtop)
-                        memtop = end;
-        }
-        if (nodes_used <= 1)
-                i = 63;
-        else
-                i = find_first_bit(&bitfield, sizeof(unsigned long)*8);
-        memnodemapsize = (memtop >> i)+1;
-        return i;
-}
-
-static int __init compute_hash_shift(const struct numa_meminfo *mi)
-{
-        int shift;
-
-        shift = extract_lsb_from_nodes(mi);
-        if (allocate_cachealigned_memnodemap())
-                return -1;
-        printk(KERN_DEBUG "NUMA: Using %d for the hash shift.\n",
-                shift);
-
-        if (populate_memnodemap(mi, shift) != 1) {
-                printk(KERN_INFO "Your memory is not aligned you need to "
-                       "rebuild your kernel with a bigger NODEMAPSIZE "
-                       "shift=%d\n", shift);
-                return -1;
-        }
-        return shift;
-}
-
-int __meminit  __early_pfn_to_nid(unsigned long pfn)
-{
-        return phys_to_nid(pfn << PAGE_SHIFT);
-}
-
-static void * __init early_node_mem(int nodeid, unsigned long start,
-                                    unsigned long end, unsigned long size,
-                                    unsigned long align)
-{
-        unsigned long mem;
-
-        /*
-         * put it on high as possible
-         * something will go with NODE_DATA
-         */
-        if (start < (MAX_DMA_PFN<<PAGE_SHIFT))
-                start = MAX_DMA_PFN<<PAGE_SHIFT;
-        if (start < (MAX_DMA32_PFN<<PAGE_SHIFT) &&
-            end > (MAX_DMA32_PFN<<PAGE_SHIFT))
-                start = MAX_DMA32_PFN<<PAGE_SHIFT;
-        mem = memblock_x86_find_in_range_node(nodeid, start, end, size, align);
-        if (mem != MEMBLOCK_ERROR)
-                return __va(mem);
-
-        /* extend the search scope */
-        end = max_pfn_mapped << PAGE_SHIFT;
-        start = MAX_DMA_PFN << PAGE_SHIFT;
-        mem = memblock_find_in_range(start, end, size, align);
-        if (mem != MEMBLOCK_ERROR)
-                return __va(mem);
-
-        printk(KERN_ERR "Cannot find %lu bytes in node %d\n",
-                       size, nodeid);
-
-        return NULL;
-}
-
-static int __init numa_add_memblk_to(int nid, u64 start, u64 end,
-                                     struct numa_meminfo *mi)
-{
-        /* ignore zero length blks */
-        if (start == end)
-                return 0;
-
-        /* whine about and ignore invalid blks */
-        if (start > end || nid < 0 || nid >= MAX_NUMNODES) {
-                pr_warning("NUMA: Warning: invalid memblk node %d (%Lx-%Lx)\n",
-                           nid, start, end);
-                return 0;
-        }
-
-        if (mi->nr_blks >= NR_NODE_MEMBLKS) {
-                pr_err("NUMA: too many memblk ranges\n");
-                return -EINVAL;
-        }
-
-        mi->blk[mi->nr_blks].start = start;
-        mi->blk[mi->nr_blks].end = end;
-        mi->blk[mi->nr_blks].nid = nid;
-        mi->nr_blks++;
-        return 0;
-}
-
-/**
- * numa_remove_memblk_from - Remove one numa_memblk from a numa_meminfo
- * @idx: Index of memblk to remove
- * @mi: numa_meminfo to remove memblk from
- *
- * Remove @idx'th numa_memblk from @mi by shifting @mi->blk[] and
- * decrementing @mi->nr_blks.
- */
-void __init numa_remove_memblk_from(int idx, struct numa_meminfo *mi)
-{
-        mi->nr_blks--;
-        memmove(&mi->blk[idx], &mi->blk[idx + 1],
-                (mi->nr_blks - idx) * sizeof(mi->blk[0]));
-}
-
-/**
- * numa_add_memblk - Add one numa_memblk to numa_meminfo
- * @nid: NUMA node ID of the new memblk
- * @start: Start address of the new memblk
- * @end: End address of the new memblk
- *
- * Add a new memblk to the default numa_meminfo.
- *
- * RETURNS:
- * 0 on success, -errno on failure.
- */
-int __init numa_add_memblk(int nid, u64 start, u64 end)
-{
-        return numa_add_memblk_to(nid, start, end, &numa_meminfo);
-}
-
-/* Initialize bootmem allocator for a node */
-void __init
-setup_node_bootmem(int nodeid, unsigned long start, unsigned long end)
-{
-        unsigned long start_pfn, last_pfn, nodedata_phys;
-        const int pgdat_size = roundup(sizeof(pg_data_t), PAGE_SIZE);
-        int nid;
-
-        if (!end)
-                return;
-
-        /*
-         * Don't confuse VM with a node that doesn't have the
-         * minimum amount of memory:
-         */
-        if (end && (end - start) < NODE_MIN_SIZE)
-                return;
-
-        start = roundup(start, ZONE_ALIGN);
-
-        printk(KERN_INFO "Initmem setup node %d %016lx-%016lx\n", nodeid,
-               start, end);
-
-        start_pfn = start >> PAGE_SHIFT;
-        last_pfn = end >> PAGE_SHIFT;
-
-        node_data[nodeid] = early_node_mem(nodeid, start, end, pgdat_size,
-                                           SMP_CACHE_BYTES);
-        if (node_data[nodeid] == NULL)
-                return;
-        nodedata_phys = __pa(node_data[nodeid]);
-        memblock_x86_reserve_range(nodedata_phys, nodedata_phys + pgdat_size, "NODE_DATA");
-        printk(KERN_INFO "  NODE_DATA [%016lx - %016lx]\n", nodedata_phys,
-                nodedata_phys + pgdat_size - 1);
-        nid = phys_to_nid(nodedata_phys);
-        if (nid != nodeid)
-                printk(KERN_INFO "    NODE_DATA(%d) on node %d\n", nodeid, nid);
-
-        memset(NODE_DATA(nodeid), 0, sizeof(pg_data_t));
-        NODE_DATA(nodeid)->node_id = nodeid;
-        NODE_DATA(nodeid)->node_start_pfn = start_pfn;
-        NODE_DATA(nodeid)->node_spanned_pages = last_pfn - start_pfn;
-
-        node_set_online(nodeid);
-}
-
-/**
- * numa_cleanup_meminfo - Cleanup a numa_meminfo
- * @mi: numa_meminfo to clean up
- *
- * Sanitize @mi by merging and removing unncessary memblks.  Also check for
- * conflicts and clear unused memblks.
- *
- * RETURNS:
- * 0 on success, -errno on failure.
- */
-int __init numa_cleanup_meminfo(struct numa_meminfo *mi)
-{
-        const u64 low = 0;
-        const u64 high = (u64)max_pfn << PAGE_SHIFT;
-        int i, j, k;
-
-        for (i = 0; i < mi->nr_blks; i++) {
-                struct numa_memblk *bi = &mi->blk[i];
-
-                /* make sure all blocks are inside the limits */
-                bi->start = max(bi->start, low);
-                bi->end = min(bi->end, high);
-
-                /* and there's no empty block */
-                if (bi->start >= bi->end) {
-                        numa_remove_memblk_from(i--, mi);
-                        continue;
-                }
-
-                for (j = i + 1; j < mi->nr_blks; j++) {
-                        struct numa_memblk *bj = &mi->blk[j];
-                        unsigned long start, end;
-
-                        /*
-                         * See whether there are overlapping blocks.  Whine
-                         * about but allow overlaps of the same nid.  They
-                         * will be merged below.
-                         */
-                        if (bi->end > bj->start && bi->start < bj->end) {
-                                if (bi->nid != bj->nid) {
-                                        pr_err("NUMA: node %d (%Lx-%Lx) overlaps with node %d (%Lx-%Lx)\n",
-                                               bi->nid, bi->start, bi->end,
-                                               bj->nid, bj->start, bj->end);
-                                        return -EINVAL;
-                                }
-                                pr_warning("NUMA: Warning: node %d (%Lx-%Lx) overlaps with itself (%Lx-%Lx)\n",
-                                           bi->nid, bi->start, bi->end,
-                                           bj->start, bj->end);
-                        }
-
-                        /*
-                         * Join together blocks on the same node, holes
-                         * between which don't overlap with memory on other
-                         * nodes.
-                         */
-                        if (bi->nid != bj->nid)
-                                continue;
-                        start = max(min(bi->start, bj->start), low);
-                        end = min(max(bi->end, bj->end), high);
-                        for (k = 0; k < mi->nr_blks; k++) {
-                                struct numa_memblk *bk = &mi->blk[k];
-
-                                if (bi->nid == bk->nid)
-                                        continue;
-                                if (start < bk->end && end > bk->start)
-                                        break;
-                        }
-                        if (k < mi->nr_blks)
-                                continue;
-                        printk(KERN_INFO "NUMA: Node %d [%Lx,%Lx) + [%Lx,%Lx) -> [%lx,%lx)\n",
-                               bi->nid, bi->start, bi->end, bj->start, bj->end,
-                               start, end);
-                        bi->start = start;
-                        bi->end = end;
-                        numa_remove_memblk_from(j--, mi);
-                }
-        }
-
-        for (i = mi->nr_blks; i < ARRAY_SIZE(mi->blk); i++) {
-                mi->blk[i].start = mi->blk[i].end = 0;
-                mi->blk[i].nid = NUMA_NO_NODE;
-        }
-
-        return 0;
-}
-
-/*
- * Set nodes, which have memory in @mi, in *@nodemask.
- */
-static void __init numa_nodemask_from_meminfo(nodemask_t *nodemask,
-                                              const struct numa_meminfo *mi)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(mi->blk); i++)
-                if (mi->blk[i].start != mi->blk[i].end &&
-                    mi->blk[i].nid != NUMA_NO_NODE)
-                        node_set(mi->blk[i].nid, *nodemask);
-}
-
-/**
- * numa_reset_distance - Reset NUMA distance table
- *
- * The current table is freed.  The next numa_set_distance() call will
- * create a new one.
- */
-void __init numa_reset_distance(void)
-{
-        size_t size = numa_distance_cnt * numa_distance_cnt * sizeof(numa_distance[0]);
-
-        /* numa_distance could be 1LU marking allocation failure, test cnt */
-        if (numa_distance_cnt)
-                memblock_x86_free_range(__pa(numa_distance),
-                                        __pa(numa_distance) + size);
-        numa_distance_cnt = 0;
-        numa_distance = NULL;   /* enable table creation */
-}
-
-static int __init numa_alloc_distance(void)
-{
-        nodemask_t nodes_parsed;
-        size_t size;
-        int i, j, cnt = 0;
-        u64 phys;
-
-        /* size the new table and allocate it */
-        nodes_parsed = numa_nodes_parsed;
-        numa_nodemask_from_meminfo(&nodes_parsed, &numa_meminfo);
-
-        for_each_node_mask(i, nodes_parsed)
-                cnt = i;
-        cnt++;
-        size = cnt * cnt * sizeof(numa_distance[0]);
-
-        phys = memblock_find_in_range(0, (u64)max_pfn_mapped << PAGE_SHIFT,
-                                      size, PAGE_SIZE);
-        if (phys == MEMBLOCK_ERROR) {
-                pr_warning("NUMA: Warning: can't allocate distance table!\n");
-                /* don't retry until explicitly reset */
-                numa_distance = (void *)1LU;
-                return -ENOMEM;
-        }
-        memblock_x86_reserve_range(phys, phys + size, "NUMA DIST");
-
-        numa_distance = __va(phys);
-        numa_distance_cnt = cnt;
-
-        /* fill with the default distances */
-        for (i = 0; i < cnt; i++)
-                for (j = 0; j < cnt; j++)
-                        numa_distance[i * cnt + j] = i == j ?
-                                LOCAL_DISTANCE : REMOTE_DISTANCE;
-        printk(KERN_DEBUG "NUMA: Initialized distance table, cnt=%d\n", cnt);
-
-        return 0;
-}
-
-/**
- * numa_set_distance - Set NUMA distance from one NUMA to another
- * @from: the 'from' node to set distance
- * @to: the 'to'  node to set distance
- * @distance: NUMA distance
- *
- * Set the distance from node @from to @to to @distance.  If distance table
- * doesn't exist, one which is large enough to accommodate all the currently
- * known nodes will be created.
- *
- * If such table cannot be allocated, a warning is printed and further
- * calls are ignored until the distance table is reset with
- * numa_reset_distance().
- *
- * If @from or @to is higher than the highest known node at the time of
- * table creation or @distance doesn't make sense, the call is ignored.
- * This is to allow simplification of specific NUMA config implementations.
- */
-void __init numa_set_distance(int from, int to, int distance)
-{
-        if (!numa_distance && numa_alloc_distance() < 0)
-                return;
-
-        if (from >= numa_distance_cnt || to >= numa_distance_cnt) {
-                printk_once(KERN_DEBUG "NUMA: Debug: distance out of bound, from=%d to=%d distance=%d\n",
-                            from, to, distance);
-                return;
-        }
-
-        if ((u8)distance != distance ||
-            (from == to && distance != LOCAL_DISTANCE)) {
-                pr_warn_once("NUMA: Warning: invalid distance parameter, from=%d to=%d distance=%d\n",
-                             from, to, distance);
-                return;
-        }
-
-        numa_distance[from * numa_distance_cnt + to] = distance;
-}
-
-int __node_distance(int from, int to)
-{
-        if (from >= numa_distance_cnt || to >= numa_distance_cnt)
-                return from == to ? LOCAL_DISTANCE : REMOTE_DISTANCE;
-        return numa_distance[from * numa_distance_cnt + to];
-}
-EXPORT_SYMBOL(__node_distance);
-
-/*
- * Sanity check to catch more bad NUMA configurations (they are amazingly
- * common).  Make sure the nodes cover all memory.
- */
-static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
-{
-        unsigned long numaram, e820ram;
-        int i;
-
-        numaram = 0;
-        for (i = 0; i < mi->nr_blks; i++) {
-                unsigned long s = mi->blk[i].start >> PAGE_SHIFT;
-                unsigned long e = mi->blk[i].end >> PAGE_SHIFT;
-                numaram += e - s;
-                numaram -= __absent_pages_in_range(mi->blk[i].nid, s, e);
-                if ((long)numaram < 0)
-                        numaram = 0;
-        }
-
-        e820ram = max_pfn - (memblock_x86_hole_size(0,
-                                        max_pfn << PAGE_SHIFT) >> PAGE_SHIFT);
-        /* We seem to lose 3 pages somewhere. Allow 1M of slack. */
-        if ((long)(e820ram - numaram) >= (1 << (20 - PAGE_SHIFT))) {
-                printk(KERN_ERR "NUMA: nodes only cover %luMB of your %luMB e820 RAM. Not used.\n",
-                       (numaram << PAGE_SHIFT) >> 20,
-                       (e820ram << PAGE_SHIFT) >> 20);
-                return false;
-        }
-        return true;
-}
-
-static int __init numa_register_memblks(struct numa_meminfo *mi)
-{
-        int i, nid;
-
-        /* Account for nodes with cpus and no memory */
-        node_possible_map = numa_nodes_parsed;
-        numa_nodemask_from_meminfo(&node_possible_map, mi);
-        if (WARN_ON(nodes_empty(node_possible_map)))
-                return -EINVAL;
-
-        memnode_shift = compute_hash_shift(mi);
-        if (memnode_shift < 0) {
-                printk(KERN_ERR "NUMA: No NUMA node hash function found. Contact maintainer\n");
-                return -EINVAL;
-        }
-
-        for (i = 0; i < mi->nr_blks; i++)
-                memblock_x86_register_active_regions(mi->blk[i].nid,
-                                        mi->blk[i].start >> PAGE_SHIFT,
-                                        mi->blk[i].end >> PAGE_SHIFT);
-
-        /* for out of order entries */
-        sort_node_map();
-        if (!numa_meminfo_cover_memory(mi))
-                return -EINVAL;
-
-        /* Finally register nodes. */
-        for_each_node_mask(nid, node_possible_map) {
-                u64 start = (u64)max_pfn << PAGE_SHIFT;
-                u64 end = 0;
-
-                for (i = 0; i < mi->nr_blks; i++) {
-                        if (nid != mi->blk[i].nid)
-                                continue;
-                        start = min(mi->blk[i].start, start);
-                        end = max(mi->blk[i].end, end);
-                }
-
-                if (start < end)
-                        setup_node_bootmem(nid, start, end);
-        }
-
-        return 0;
-}
-
-/**
- * dummy_numma_init - Fallback dummy NUMA init
- *
- * Used if there's no underlying NUMA architecture, NUMA initialization
- * fails, or NUMA is disabled on the command line.
- *
- * Must online at least one node and add memory blocks that cover all
- * allowed memory.  This function must not fail.
- */
-static int __init dummy_numa_init(void)
-{
-        printk(KERN_INFO "%s\n",
-               numa_off ? "NUMA turned off" : "No NUMA configuration found");
-        printk(KERN_INFO "Faking a node at %016lx-%016lx\n",
-               0LU, max_pfn << PAGE_SHIFT);
-
-        node_set(0, numa_nodes_parsed);
-        numa_add_memblk(0, 0, (u64)max_pfn << PAGE_SHIFT);
-
-        return 0;
-}
-
-static int __init numa_init(int (*init_func)(void))
-{
-        int i;
-        int ret;
-
-        for (i = 0; i < MAX_LOCAL_APIC; i++)
-                set_apicid_to_node(i, NUMA_NO_NODE);
-
-        nodes_clear(numa_nodes_parsed);
-        nodes_clear(node_possible_map);
-        nodes_clear(node_online_map);
-        memset(&numa_meminfo, 0, sizeof(numa_meminfo));
-        remove_all_active_ranges();
-        numa_reset_distance();
-
-        ret = init_func();
-        if (ret < 0)
-                return ret;
-        ret = numa_cleanup_meminfo(&numa_meminfo);
-        if (ret < 0)
-                return ret;
-
-        numa_emulation(&numa_meminfo, numa_distance_cnt);
-
-        ret = numa_register_memblks(&numa_meminfo);
-        if (ret < 0)
-                return ret;
-
-        for (i = 0; i < nr_cpu_ids; i++) {
-                int nid = early_cpu_to_node(i);
-
-                if (nid == NUMA_NO_NODE)
-                        continue;
-                if (!node_online(nid))
-                        numa_clear_node(i);
-        }
-        numa_init_array();
-        return 0;
-}
-
 void __init initmem_init(void)
 {
-        int ret;
-
-        if (!numa_off) {
-#ifdef CONFIG_ACPI_NUMA
-                ret = numa_init(x86_acpi_numa_init);
-                if (!ret)
-                        return;
-#endif
-#ifdef CONFIG_AMD_NUMA
-                ret = numa_init(amd_numa_init);
-                if (!ret)
-                        return;
-#endif
-        }
-
-        numa_init(dummy_numa_init);
+        x86_numa_init();
 }
 
 unsigned long __init numa_free_all_bootmem(void)
@@ -656,12 +23,3 @@ unsigned long __init numa_free_all_bootmem(void)
 
         return pages;
 }
-
-int __cpuinit numa_cpu_node(int cpu)
-{
-        int apicid = early_per_cpu(x86_cpu_to_apicid, cpu);
-
-        if (apicid != BAD_APICID)
-                return __apicid_to_node[apicid];
-        return NUMA_NO_NODE;
-}
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index de84cc140379..d0ed086b6247 100644
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -5,6 +5,7 @@
 #include <linux/errno.h>
 #include <linux/topology.h>
 #include <linux/memblock.h>
+#include <linux/bootmem.h>
 #include <asm/dma.h>
 
 #include "numa_internal.h"
@@ -84,7 +85,13 @@ static int __init split_nodes_interleave(struct numa_meminfo *ei,
                 nr_nodes = MAX_NUMNODES;
         }
 
-        size = (max_addr - addr - memblock_x86_hole_size(addr, max_addr)) / nr_nodes;
+        /*
+         * Calculate target node size.  x86_32 freaks on __udivdi3() so do
+         * the division in ulong number of pages and convert back.
+         */
+        size = max_addr - addr - memblock_x86_hole_size(addr, max_addr);
+        size = PFN_PHYS((unsigned long)(size >> PAGE_SHIFT) / nr_nodes);
+
         /*
          * Calculate the number of big nodes that can be allocated as a result
          * of consolidating the remainder.
@@ -226,7 +233,7 @@ static int __init split_nodes_size_interleave(struct numa_meminfo *ei,
          */
         while (nodes_weight(physnode_mask)) {
                 for_each_node_mask(i, physnode_mask) {
-                        u64 dma32_end = MAX_DMA32_PFN << PAGE_SHIFT;
+                        u64 dma32_end = PFN_PHYS(MAX_DMA32_PFN);
                         u64 start, limit, end;
                         int phys_blk;
 
@@ -298,7 +305,7 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt)
 {
         static struct numa_meminfo ei __initdata;
         static struct numa_meminfo pi __initdata;
-        const u64 max_addr = max_pfn << PAGE_SHIFT;
+        const u64 max_addr = PFN_PHYS(max_pfn);
         u8 *phys_dist = NULL;
         size_t phys_size = numa_dist_cnt * numa_dist_cnt * sizeof(phys_dist[0]);
         int max_emu_nid, dfl_phys_nid;
@@ -342,8 +349,7 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt)
         if (numa_dist_cnt) {
                 u64 phys;
 
-                phys = memblock_find_in_range(0,
-                                              (u64)max_pfn_mapped << PAGE_SHIFT,
+                phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped),
                                               phys_size, PAGE_SIZE);
                 if (phys == MEMBLOCK_ERROR) {
                         pr_warning("NUMA: Warning: can't allocate copy of distance table, disabling emulation\n");
diff --git a/arch/x86/mm/numa_internal.h b/arch/x86/mm/numa_internal.h
index ef2d97377d7c..7178c3afe05e 100644
--- a/arch/x86/mm/numa_internal.h
+++ b/arch/x86/mm/numa_internal.h
@@ -19,6 +19,14 @@ void __init numa_remove_memblk_from(int idx, struct numa_meminfo *mi);
 int __init numa_cleanup_meminfo(struct numa_meminfo *mi);
 void __init numa_reset_distance(void);
 
+void __init x86_numa_init(void);
+
+#ifdef CONFIG_X86_64
+static inline void init_alloc_remap(int nid, u64 start, u64 end)        { }
+#else
+void __init init_alloc_remap(int nid, u64 start, u64 end);
+#endif
+
 #ifdef CONFIG_NUMA_EMU
 void __init numa_emulation(struct numa_meminfo *numa_meminfo,
                            int numa_dist_cnt);
diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
index 38e6d174c497..9f0614daea85 100644
--- a/arch/x86/mm/pf_in.c
+++ b/arch/x86/mm/pf_in.c
@@ -414,22 +414,17 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
         unsigned char *p;
         struct prefix_bits prf;
         int i;
-        unsigned long rv;
 
         p = (unsigned char *)ins_addr;
         p += skip_prefix(p, &prf);
         p += get_opcode(p, &opcode);
         for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
-                if (reg_rop[i] == opcode) {
-                        rv = REG_READ;
+                if (reg_rop[i] == opcode)
                         goto do_work;
-                }
 
         for (i = 0; i < ARRAY_SIZE(reg_wop); i++)
-                if (reg_wop[i] == opcode) {
-                        rv = REG_WRITE;
+                if (reg_wop[i] == opcode)
                         goto do_work;
-                }
 
         printk(KERN_ERR "mmiotrace: Not a register instruction, opcode "
                                                         "0x%02x\n", opcode);
@@ -474,16 +469,13 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
         unsigned char *p;
         struct prefix_bits prf;
         int i;
-        unsigned long rv;
 
         p = (unsigned char *)ins_addr;
         p += skip_prefix(p, &prf);
         p += get_opcode(p, &opcode);
         for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
-                if (imm_wop[i] == opcode) {
-                        rv = IMM_WRITE;
+                if (imm_wop[i] == opcode)
                         goto do_work;
-                }
 
         printk(KERN_ERR "mmiotrace: Not an immediate instruction, opcode "
                                                         "0x%02x\n", opcode);
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat.c
index 8e9d3394f6d4..81dbfdeb080d 100644
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat.c
@@ -26,8 +26,6 @@
 
 int acpi_numa __initdata;
 
-static struct bootnode nodes_add[MAX_NUMNODES];
-
 static __init int setup_node(int pxm)
 {
         return acpi_map_pxm_to_node(pxm);
@@ -37,7 +35,6 @@ static __init void bad_srat(void)
 {
         printk(KERN_ERR "SRAT: SRAT not used.\n");
         acpi_numa = -1;
-        memset(nodes_add, 0, sizeof(nodes_add));
 }
 
 static __init inline int srat_disabled(void)
@@ -131,73 +128,17 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
                pxm, apic_id, node);
 }
 
-#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
+#ifdef CONFIG_MEMORY_HOTPLUG
 static inline int save_add_info(void) {return 1;}
 #else
 static inline int save_add_info(void) {return 0;}
 #endif
-/*
- * Update nodes_add[]
- * This code supports one contiguous hot add area per node
- */
-static void __init
-update_nodes_add(int node, unsigned long start, unsigned long end)
-{
-        unsigned long s_pfn = start >> PAGE_SHIFT;
-        unsigned long e_pfn = end >> PAGE_SHIFT;
-        int changed = 0;
-        struct bootnode *nd = &nodes_add[node];
-
-        /* I had some trouble with strange memory hotadd regions breaking
-           the boot. Be very strict here and reject anything unexpected.
-           If you want working memory hotadd write correct SRATs.
-
-           The node size check is a basic sanity check to guard against
-           mistakes */
-        if ((signed long)(end - start) < NODE_MIN_SIZE) {
-                printk(KERN_ERR "SRAT: Hotplug area too small\n");
-                return;
-        }
-
-        /* This check might be a bit too strict, but I'm keeping it for now. */
-        if (absent_pages_in_range(s_pfn, e_pfn) != e_pfn - s_pfn) {
-                printk(KERN_ERR
-                        "SRAT: Hotplug area %lu -> %lu has existing memory\n",
-                        s_pfn, e_pfn);
-                return;
-        }
-
-        /* Looks good */
-
-        if (nd->start == nd->end) {
-                nd->start = start;
-                nd->end = end;
-                changed = 1;
-        } else {
-                if (nd->start == end) {
-                        nd->start = start;
-                        changed = 1;
-                }
-                if (nd->end == start) {
-                        nd->end = end;
-                        changed = 1;
-                }
-                if (!changed)
-                        printk(KERN_ERR "SRAT: Hotplug zone not continuous. Partly ignored\n");
-        }
-
-        if (changed) {
-                node_set(node, numa_nodes_parsed);
-                printk(KERN_INFO "SRAT: hot plug zone found %Lx - %Lx\n",
-                                 nd->start, nd->end);
-        }
-}
 
 /* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
 void __init
 acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
 {
-        unsigned long start, end;
+        u64 start, end;
         int node, pxm;
 
         if (srat_disabled())
@@ -226,11 +167,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
                 return;
         }
 
-        printk(KERN_INFO "SRAT: Node %u PXM %u %lx-%lx\n", node, pxm,
+        printk(KERN_INFO "SRAT: Node %u PXM %u %Lx-%Lx\n", node, pxm,
                start, end);
-
-        if (ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)
-                update_nodes_add(node, start, end);
 }
 
 void __init acpi_numa_arch_fixup(void) {}
@@ -244,17 +182,3 @@ int __init x86_acpi_numa_init(void)
                 return ret;
         return srat_disabled() ? -EINVAL : 0;
 }
-
-#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) || defined(CONFIG_ACPI_HOTPLUG_MEMORY)
-int memory_add_physaddr_to_nid(u64 start)
-{
-        int i, ret = 0;
-
-        for_each_node(i)
-                if (nodes_add[i].start <= start && nodes_add[i].end > start)
-                        ret = i;
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
-#endif
diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c
deleted file mode 100644
index 364f36bdfad8..000000000000
--- a/arch/x86/mm/srat_32.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Some of the code in this file has been gleaned from the 64 bit 
- * discontigmem support code base.
- *
- * Copyright (C) 2002, IBM Corp.
- *
- * All rights reserved.          
- *
- * 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, GOOD TITLE or
- * NON INFRINGEMENT.  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.
- *
- * Send feedback to Pat Gaughen <gone@us.ibm.com>
- */
-#include <linux/mm.h>
-#include <linux/bootmem.h>
-#include <linux/memblock.h>
-#include <linux/mmzone.h>
-#include <linux/acpi.h>
-#include <linux/nodemask.h>
-#include <asm/srat.h>
-#include <asm/topology.h>
-#include <asm/smp.h>
-#include <asm/e820.h>
-
-/*
- * proximity macros and definitions
- */
-#define NODE_ARRAY_INDEX(x)     ((x) / 8)       /* 8 bits/char */
-#define NODE_ARRAY_OFFSET(x)    ((x) % 8)       /* 8 bits/char */
-#define BMAP_SET(bmap, bit)     ((bmap)[NODE_ARRAY_INDEX(bit)] |= 1 << NODE_ARRAY_OFFSET(bit))
-#define BMAP_TEST(bmap, bit)    ((bmap)[NODE_ARRAY_INDEX(bit)] & (1 << NODE_ARRAY_OFFSET(bit)))
-/* bitmap length; _PXM is at most 255 */
-#define PXM_BITMAP_LEN (MAX_PXM_DOMAINS / 8) 
-static u8 __initdata pxm_bitmap[PXM_BITMAP_LEN];        /* bitmap of proximity domains */
-
-#define MAX_CHUNKS_PER_NODE     3
-#define MAXCHUNKS               (MAX_CHUNKS_PER_NODE * MAX_NUMNODES)
-struct node_memory_chunk_s {
-        unsigned long   start_pfn;
-        unsigned long   end_pfn;
-        u8      pxm;            // proximity domain of node
-        u8      nid;            // which cnode contains this chunk?
-        u8      bank;           // which mem bank on this node
-};
-static struct node_memory_chunk_s __initdata node_memory_chunk[MAXCHUNKS];
-
-static int __initdata num_memory_chunks; /* total number of memory chunks */
-static u8 __initdata apicid_to_pxm[MAX_LOCAL_APIC];
-
-int acpi_numa __initdata;
-
-static __init void bad_srat(void)
-{
-        printk(KERN_ERR "SRAT: SRAT not used.\n");
-        acpi_numa = -1;
-        num_memory_chunks = 0;
-}
-
-static __init inline int srat_disabled(void)
-{
-        return numa_off || acpi_numa < 0;
-}
-
-/* Identify CPU proximity domains */
-void __init
-acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *cpu_affinity)
-{
-        if (srat_disabled())
-                return;
-        if (cpu_affinity->header.length !=
-             sizeof(struct acpi_srat_cpu_affinity)) {
-                bad_srat();
-                return;
-        }
-
-        if ((cpu_affinity->flags & ACPI_SRAT_CPU_ENABLED) == 0)
-                return;         /* empty entry */
-
-        /* mark this node as "seen" in node bitmap */
-        BMAP_SET(pxm_bitmap, cpu_affinity->proximity_domain_lo);
-
-        /* don't need to check apic_id here, because it is always 8 bits */
-        apicid_to_pxm[cpu_affinity->apic_id] = cpu_affinity->proximity_domain_lo;
-
-        printk(KERN_DEBUG "CPU %02x in proximity domain %02x\n",
-                cpu_affinity->apic_id, cpu_affinity->proximity_domain_lo);
-}
-
-/*
- * Identify memory proximity domains and hot-remove capabilities.
- * Fill node memory chunk list structure.
- */
-void __init
-acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *memory_affinity)
-{
-        unsigned long long paddr, size;
-        unsigned long start_pfn, end_pfn;
-        u8 pxm;
-        struct node_memory_chunk_s *p, *q, *pend;
-
-        if (srat_disabled())
-                return;
-        if (memory_affinity->header.length !=
-             sizeof(struct acpi_srat_mem_affinity)) {
-                bad_srat();
-                return;
-        }
-
-        if ((memory_affinity->flags & ACPI_SRAT_MEM_ENABLED) == 0)
-                return;         /* empty entry */
-
-        pxm = memory_affinity->proximity_domain & 0xff;
-
-        /* mark this node as "seen" in node bitmap */
-        BMAP_SET(pxm_bitmap, pxm);
-
-        /* calculate info for memory chunk structure */
-        paddr = memory_affinity->base_address;
-        size = memory_affinity->length;
-
-        start_pfn = paddr >> PAGE_SHIFT;
-        end_pfn = (paddr + size) >> PAGE_SHIFT;
-
-
-        if (num_memory_chunks >= MAXCHUNKS) {
-                printk(KERN_WARNING "Too many mem chunks in SRAT."
-                        " Ignoring %lld MBytes at %llx\n",
-                        size/(1024*1024), paddr);
-                return;
-        }
-
-        /* Insertion sort based on base address */
-        pend = &node_memory_chunk[num_memory_chunks];
-        for (p = &node_memory_chunk[0]; p < pend; p++) {
-                if (start_pfn < p->start_pfn)
-                        break;
-        }
-        if (p < pend) {
-                for (q = pend; q >= p; q--)
-                        *(q + 1) = *q;
-        }
-        p->start_pfn = start_pfn;
-        p->end_pfn = end_pfn;
-        p->pxm = pxm;
-
-        num_memory_chunks++;
-
-        printk(KERN_DEBUG "Memory range %08lx to %08lx"
-                          " in proximity domain %02x %s\n",
-                start_pfn, end_pfn,
-                pxm,
-                ((memory_affinity->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) ?
-                 "enabled and removable" : "enabled" ) );
-}
-
-/* Callback for SLIT parsing */
-void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
-{
-}
-
-void acpi_numa_arch_fixup(void)
-{
-}
-/*
- * The SRAT table always lists ascending addresses, so can always
- * assume that the first "start" address that you see is the real
- * start of the node, and that the current "end" address is after
- * the previous one.
- */
-static __init int node_read_chunk(int nid, struct node_memory_chunk_s *memory_chunk)
-{
-        /*
-         * Only add present memory as told by the e820.
-         * There is no guarantee from the SRAT that the memory it
-         * enumerates is present at boot time because it represents
-         * *possible* memory hotplug areas the same as normal RAM.
-         */
-        if (memory_chunk->start_pfn >= max_pfn) {
-                printk(KERN_INFO "Ignoring SRAT pfns: %08lx - %08lx\n",
-                        memory_chunk->start_pfn, memory_chunk->end_pfn);
-                return -1;
-        }
-        if (memory_chunk->nid != nid)
-                return -1;
-
-        if (!node_has_online_mem(nid))
-                node_start_pfn[nid] = memory_chunk->start_pfn;
-
-        if (node_start_pfn[nid] > memory_chunk->start_pfn)
-                node_start_pfn[nid] = memory_chunk->start_pfn;
-
-        if (node_end_pfn[nid] < memory_chunk->end_pfn)
-                node_end_pfn[nid] = memory_chunk->end_pfn;
-
-        return 0;
-}
-
-int __init get_memcfg_from_srat(void)
-{
-        int i, j, nid;
-
-        if (srat_disabled())
-                goto out_fail;
-
-        if (acpi_numa_init() < 0)
-                goto out_fail;
-
-        if (num_memory_chunks == 0) {
-                printk(KERN_DEBUG
-                         "could not find any ACPI SRAT memory areas.\n");
-                goto out_fail;
-        }
-
-        /* Calculate total number of nodes in system from PXM bitmap and create
-         * a set of sequential node IDs starting at zero.  (ACPI doesn't seem
-         * to specify the range of _PXM values.)
-         */
-        /*
-         * MCD - we no longer HAVE to number nodes sequentially.  PXM domain
-         * numbers could go as high as 256, and MAX_NUMNODES for i386 is typically
-         * 32, so we will continue numbering them in this manner until MAX_NUMNODES
-         * approaches MAX_PXM_DOMAINS for i386.
-         */
-        nodes_clear(node_online_map);
-        for (i = 0; i < MAX_PXM_DOMAINS; i++) {
-                if (BMAP_TEST(pxm_bitmap, i)) {
-                        int nid = acpi_map_pxm_to_node(i);
-                        node_set_online(nid);
-                }
-        }
-        BUG_ON(num_online_nodes() == 0);
-
-        /* set cnode id in memory chunk structure */
-        for (i = 0; i < num_memory_chunks; i++)
-                node_memory_chunk[i].nid = pxm_to_node(node_memory_chunk[i].pxm);
-
-        printk(KERN_DEBUG "pxm bitmap: ");
-        for (i = 0; i < sizeof(pxm_bitmap); i++) {
-                printk(KERN_CONT "%02x ", pxm_bitmap[i]);
-        }
-        printk(KERN_CONT "\n");
-        printk(KERN_DEBUG "Number of logical nodes in system = %d\n",
-                         num_online_nodes());
-        printk(KERN_DEBUG "Number of memory chunks in system = %d\n",
-                         num_memory_chunks);
-
-        for (i = 0; i < MAX_LOCAL_APIC; i++)
-                set_apicid_to_node(i, pxm_to_node(apicid_to_pxm[i]));
-
-        for (j = 0; j < num_memory_chunks; j++){
-                struct node_memory_chunk_s * chunk = &node_memory_chunk[j];
-                printk(KERN_DEBUG
-                        "chunk %d nid %d start_pfn %08lx end_pfn %08lx\n",
-                       j, chunk->nid, chunk->start_pfn, chunk->end_pfn);
-                if (node_read_chunk(chunk->nid, chunk))
-                        continue;
-
-                memblock_x86_register_active_regions(chunk->nid, chunk->start_pfn,
-                                             min(chunk->end_pfn, max_pfn));
-        }
-        /* for out of order entries in SRAT */
-        sort_node_map();
-
-        for_each_online_node(nid) {
-                unsigned long start = node_start_pfn[nid];
-                unsigned long end = min(node_end_pfn[nid], max_pfn);
-
-                memory_present(nid, start, end);
-                node_remap_size[nid] = node_memmap_size_bytes(nid, start, end);
-        }
-        return 1;
-out_fail:
-        printk(KERN_DEBUG "failed to get NUMA memory information from SRAT"
-                        " table\n");
-        return 0;
-}
diff --git a/arch/x86/net/Makefile b/arch/x86/net/Makefile
new file mode 100644
index 000000000000..90568c33ddb0
--- /dev/null
+++ b/arch/x86/net/Makefile
@@ -0,0 +1,4 @@
+#
+# Arch-specific network modules
+#
+obj-$(CONFIG_BPF_JIT) += bpf_jit.o bpf_jit_comp.o
diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
new file mode 100644
index 000000000000..66870223f8c5
--- /dev/null
+++ b/arch/x86/net/bpf_jit.S
@@ -0,0 +1,140 @@
+/* bpf_jit.S : BPF JIT helper functions
+ *
+ * Copyright (C) 2011 Eric Dumazet (eric.dumazet@gmail.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/linkage.h>
+#include <asm/dwarf2.h>
+
+/*
+ * Calling convention :
+ * rdi : skb pointer
+ * esi : offset of byte(s) to fetch in skb (can be scratched)
+ * r8  : copy of skb->data
+ * r9d : hlen = skb->len - skb->data_len
+ */
+#define SKBDATA %r8
+
+sk_load_word_ind:
+        .globl  sk_load_word_ind
+
+        add     %ebx,%esi       /* offset += X */
+#       test    %esi,%esi       /* if (offset < 0) goto bpf_error; */
+        js      bpf_error
+
+sk_load_word:
+        .globl  sk_load_word
+
+        mov     %r9d,%eax               # hlen
+        sub     %esi,%eax               # hlen - offset
+        cmp     $3,%eax
+        jle     bpf_slow_path_word
+        mov     (SKBDATA,%rsi),%eax
+        bswap   %eax                    /* ntohl() */
+        ret
+
+
+sk_load_half_ind:
+        .globl sk_load_half_ind
+
+        add     %ebx,%esi       /* offset += X */
+        js      bpf_error
+
+sk_load_half:
+        .globl  sk_load_half
+
+        mov     %r9d,%eax
+        sub     %esi,%eax               #       hlen - offset
+        cmp     $1,%eax
+        jle     bpf_slow_path_half
+        movzwl  (SKBDATA,%rsi),%eax
+        rol     $8,%ax                  # ntohs()
+        ret
+
+sk_load_byte_ind:
+        .globl sk_load_byte_ind
+        add     %ebx,%esi       /* offset += X */
+        js      bpf_error
+
+sk_load_byte:
+        .globl  sk_load_byte
+
+        cmp     %esi,%r9d   /* if (offset >= hlen) goto bpf_slow_path_byte */
+        jle     bpf_slow_path_byte
+        movzbl  (SKBDATA,%rsi),%eax
+        ret
+
+/**
+ * sk_load_byte_msh - BPF_S_LDX_B_MSH helper
+ *
+ * Implements BPF_S_LDX_B_MSH : ldxb  4*([offset]&0xf)
+ * Must preserve A accumulator (%eax)
+ * Inputs : %esi is the offset value, already known positive
+ */
+ENTRY(sk_load_byte_msh)
+        CFI_STARTPROC
+        cmp     %esi,%r9d      /* if (offset >= hlen) goto bpf_slow_path_byte_msh */
+        jle     bpf_slow_path_byte_msh
+        movzbl  (SKBDATA,%rsi),%ebx
+        and     $15,%bl
+        shl     $2,%bl
+        ret
+        CFI_ENDPROC
+ENDPROC(sk_load_byte_msh)
+
+bpf_error:
+# force a return 0 from jit handler
+        xor             %eax,%eax
+        mov             -8(%rbp),%rbx
+        leaveq
+        ret
+
+/* rsi contains offset and can be scratched */
+#define bpf_slow_path_common(LEN)               \
+        push    %rdi;    /* save skb */         \
+        push    %r9;                            \
+        push    SKBDATA;                        \
+/* rsi already has offset */                    \
+        mov     $LEN,%ecx;      /* len */       \
+        lea     -12(%rbp),%rdx;                 \
+        call    skb_copy_bits;                  \
+        test    %eax,%eax;                      \
+        pop     SKBDATA;                        \
+        pop     %r9;                            \
+        pop     %rdi
+
+
+bpf_slow_path_word:
+        bpf_slow_path_common(4)
+        js      bpf_error
+        mov     -12(%rbp),%eax
+        bswap   %eax
+        ret
+
+bpf_slow_path_half:
+        bpf_slow_path_common(2)
+        js      bpf_error
+        mov     -12(%rbp),%ax
+        rol     $8,%ax
+        movzwl  %ax,%eax
+        ret
+
+bpf_slow_path_byte:
+        bpf_slow_path_common(1)
+        js      bpf_error
+        movzbl  -12(%rbp),%eax
+        ret
+
+bpf_slow_path_byte_msh:
+        xchg    %eax,%ebx /* dont lose A , X is about to be scratched */
+        bpf_slow_path_common(1)
+        js      bpf_error
+        movzbl  -12(%rbp),%eax
+        and     $15,%al
+        shl     $2,%al
+        xchg    %eax,%ebx
+        ret
diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
new file mode 100644
index 000000000000..bfab3fa10edc
--- /dev/null
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -0,0 +1,654 @@
+/* bpf_jit_comp.c : BPF JIT compiler
+ *
+ * Copyright (C) 2011 Eric Dumazet (eric.dumazet@gmail.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+#include <linux/moduleloader.h>
+#include <asm/cacheflush.h>
+#include <linux/netdevice.h>
+#include <linux/filter.h>
+
+/*
+ * Conventions :
+ *  EAX : BPF A accumulator
+ *  EBX : BPF X accumulator
+ *  RDI : pointer to skb   (first argument given to JIT function)
+ *  RBP : frame pointer (even if CONFIG_FRAME_POINTER=n)
+ *  ECX,EDX,ESI : scratch registers
+ *  r9d : skb->len - skb->data_len (headlen)
+ *  r8  : skb->data
+ * -8(RBP) : saved RBX value
+ * -16(RBP)..-80(RBP) : BPF_MEMWORDS values
+ */
+int bpf_jit_enable __read_mostly;
+
+/*
+ * assembly code in arch/x86/net/bpf_jit.S
+ */
+extern u8 sk_load_word[], sk_load_half[], sk_load_byte[], sk_load_byte_msh[];
+extern u8 sk_load_word_ind[], sk_load_half_ind[], sk_load_byte_ind[];
+
+static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
+{
+        if (len == 1)
+                *ptr = bytes;
+        else if (len == 2)
+                *(u16 *)ptr = bytes;
+        else {
+                *(u32 *)ptr = bytes;
+                barrier();
+        }
+        return ptr + len;
+}
+
+#define EMIT(bytes, len)        do { prog = emit_code(prog, bytes, len); } while (0)
+
+#define EMIT1(b1)               EMIT(b1, 1)
+#define EMIT2(b1, b2)           EMIT((b1) + ((b2) << 8), 2)
+#define EMIT3(b1, b2, b3)       EMIT((b1) + ((b2) << 8) + ((b3) << 16), 3)
+#define EMIT4(b1, b2, b3, b4)   EMIT((b1) + ((b2) << 8) + ((b3) << 16) + ((b4) << 24), 4)
+#define EMIT1_off32(b1, off)    do { EMIT1(b1); EMIT(off, 4);} while (0)
+
+#define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
+#define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
+
+static inline bool is_imm8(int value)
+{
+        return value <= 127 && value >= -128;
+}
+
+static inline bool is_near(int offset)
+{
+        return offset <= 127 && offset >= -128;
+}
+
+#define EMIT_JMP(offset)                                                \
+do {                                                                    \
+        if (offset) {                                                   \
+                if (is_near(offset))                                    \
+                        EMIT2(0xeb, offset); /* jmp .+off8 */           \
+                else                                                    \
+                        EMIT1_off32(0xe9, offset); /* jmp .+off32 */    \
+        }                                                               \
+} while (0)
+
+/* list of x86 cond jumps opcodes (. + s8)
+ * Add 0x10 (and an extra 0x0f) to generate far jumps (. + s32)
+ */
+#define X86_JB  0x72
+#define X86_JAE 0x73
+#define X86_JE  0x74
+#define X86_JNE 0x75
+#define X86_JBE 0x76
+#define X86_JA  0x77
+
+#define EMIT_COND_JMP(op, offset)                               \
+do {                                                            \
+        if (is_near(offset))                                    \
+                EMIT2(op, offset); /* jxx .+off8 */             \
+        else {                                                  \
+                EMIT2(0x0f, op + 0x10);                         \
+                EMIT(offset, 4); /* jxx .+off32 */              \
+        }                                                       \
+} while (0)
+
+#define COND_SEL(CODE, TOP, FOP)        \
+        case CODE:                      \
+                t_op = TOP;             \
+                f_op = FOP;             \
+                goto cond_branch
+
+
+#define SEEN_DATAREF 1 /* might call external helpers */
+#define SEEN_XREG    2 /* ebx is used */
+#define SEEN_MEM     4 /* use mem[] for temporary storage */
+
+static inline void bpf_flush_icache(void *start, void *end)
+{
+        mm_segment_t old_fs = get_fs();
+
+        set_fs(KERNEL_DS);
+        smp_wmb();
+        flush_icache_range((unsigned long)start, (unsigned long)end);
+        set_fs(old_fs);
+}
+
+
+void bpf_jit_compile(struct sk_filter *fp)
+{
+        u8 temp[64];
+        u8 *prog;
+        unsigned int proglen, oldproglen = 0;
+        int ilen, i;
+        int t_offset, f_offset;
+        u8 t_op, f_op, seen = 0, pass;
+        u8 *image = NULL;
+        u8 *func;
+        int pc_ret0 = -1; /* bpf index of first RET #0 instruction (if any) */
+        unsigned int cleanup_addr; /* epilogue code offset */
+        unsigned int *addrs;
+        const struct sock_filter *filter = fp->insns;
+        int flen = fp->len;
+
+        if (!bpf_jit_enable)
+                return;
+
+        addrs = kmalloc(flen * sizeof(*addrs), GFP_KERNEL);
+        if (addrs == NULL)
+                return;
+
+        /* Before first pass, make a rough estimation of addrs[]
+         * each bpf instruction is translated to less than 64 bytes
+         */
+        for (proglen = 0, i = 0; i < flen; i++) {
+                proglen += 64;
+                addrs[i] = proglen;
+        }
+        cleanup_addr = proglen; /* epilogue address */
+
+        for (pass = 0; pass < 10; pass++) {
+                /* no prologue/epilogue for trivial filters (RET something) */
+                proglen = 0;
+                prog = temp;
+
+                if (seen) {
+                        EMIT4(0x55, 0x48, 0x89, 0xe5); /* push %rbp; mov %rsp,%rbp */
+                        EMIT4(0x48, 0x83, 0xec, 96);    /* subq  $96,%rsp       */
+                        /* note : must save %rbx in case bpf_error is hit */
+                        if (seen & (SEEN_XREG | SEEN_DATAREF))
+                                EMIT4(0x48, 0x89, 0x5d, 0xf8); /* mov %rbx, -8(%rbp) */
+                        if (seen & SEEN_XREG)
+                                CLEAR_X(); /* make sure we dont leek kernel memory */
+
+                        /*
+                         * If this filter needs to access skb data,
+                         * loads r9 and r8 with :
+                         *  r9 = skb->len - skb->data_len
+                         *  r8 = skb->data
+                         */
+                        if (seen & SEEN_DATAREF) {
+                                if (offsetof(struct sk_buff, len) <= 127)
+                                        /* mov    off8(%rdi),%r9d */
+                                        EMIT4(0x44, 0x8b, 0x4f, offsetof(struct sk_buff, len));
+                                else {
+                                        /* mov    off32(%rdi),%r9d */
+                                        EMIT3(0x44, 0x8b, 0x8f);
+                                        EMIT(offsetof(struct sk_buff, len), 4);
+                                }
+                                if (is_imm8(offsetof(struct sk_buff, data_len)))
+                                        /* sub    off8(%rdi),%r9d */
+                                        EMIT4(0x44, 0x2b, 0x4f, offsetof(struct sk_buff, data_len));
+                                else {
+                                        EMIT3(0x44, 0x2b, 0x8f);
+                                        EMIT(offsetof(struct sk_buff, data_len), 4);
+                                }
+
+                                if (is_imm8(offsetof(struct sk_buff, data)))
+                                        /* mov off8(%rdi),%r8 */
+                                        EMIT4(0x4c, 0x8b, 0x47, offsetof(struct sk_buff, data));
+                                else {
+                                        /* mov off32(%rdi),%r8 */
+                                        EMIT3(0x4c, 0x8b, 0x87);
+                                        EMIT(offsetof(struct sk_buff, data), 4);
+                                }
+                        }
+                }
+
+                switch (filter[0].code) {
+                case BPF_S_RET_K:
+                case BPF_S_LD_W_LEN:
+                case BPF_S_ANC_PROTOCOL:
+                case BPF_S_ANC_IFINDEX:
+                case BPF_S_ANC_MARK:
+                case BPF_S_ANC_RXHASH:
+                case BPF_S_ANC_CPU:
+                case BPF_S_ANC_QUEUE:
+                case BPF_S_LD_W_ABS:
+                case BPF_S_LD_H_ABS:
+                case BPF_S_LD_B_ABS:
+                        /* first instruction sets A register (or is RET 'constant') */
+                        break;
+                default:
+                        /* make sure we dont leak kernel information to user */
+                        CLEAR_A(); /* A = 0 */
+                }
+
+                for (i = 0; i < flen; i++) {
+                        unsigned int K = filter[i].k;
+
+                        switch (filter[i].code) {
+                        case BPF_S_ALU_ADD_X: /* A += X; */
+                                seen |= SEEN_XREG;
+                                EMIT2(0x01, 0xd8);              /* add %ebx,%eax */
+                                break;
+                        case BPF_S_ALU_ADD_K: /* A += K; */
+                                if (!K)
+                                        break;
+                                if (is_imm8(K))
+                                        EMIT3(0x83, 0xc0, K);   /* add imm8,%eax */
+                                else
+                                        EMIT1_off32(0x05, K);   /* add imm32,%eax */
+                                break;
+                        case BPF_S_ALU_SUB_X: /* A -= X; */
+                                seen |= SEEN_XREG;
+                                EMIT2(0x29, 0xd8);              /* sub    %ebx,%eax */
+                                break;
+                        case BPF_S_ALU_SUB_K: /* A -= K */
+                                if (!K)
+                                        break;
+                                if (is_imm8(K))
+                                        EMIT3(0x83, 0xe8, K); /* sub imm8,%eax */
+                                else
+                                        EMIT1_off32(0x2d, K); /* sub imm32,%eax */
+                                break;
+                        case BPF_S_ALU_MUL_X: /* A *= X; */
+                                seen |= SEEN_XREG;
+                                EMIT3(0x0f, 0xaf, 0xc3);        /* imul %ebx,%eax */
+                                break;
+                        case BPF_S_ALU_MUL_K: /* A *= K */
+                                if (is_imm8(K))
+                                        EMIT3(0x6b, 0xc0, K); /* imul imm8,%eax,%eax */
+                                else {
+                                        EMIT2(0x69, 0xc0);              /* imul imm32,%eax */
+                                        EMIT(K, 4);
+                                }
+                                break;
+                        case BPF_S_ALU_DIV_X: /* A /= X; */
+                                seen |= SEEN_XREG;
+                                EMIT2(0x85, 0xdb);      /* test %ebx,%ebx */
+                                if (pc_ret0 != -1)
+                                        EMIT_COND_JMP(X86_JE, addrs[pc_ret0] - (addrs[i] - 4));
+                                else {
+                                        EMIT_COND_JMP(X86_JNE, 2 + 5);
+                                        CLEAR_A();
+                                        EMIT1_off32(0xe9, cleanup_addr - (addrs[i] - 4)); /* jmp .+off32 */
+                                }
+                                EMIT4(0x31, 0xd2, 0xf7, 0xf3); /* xor %edx,%edx; div %ebx */
+                                break;
+                        case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K); */
+                                EMIT3(0x48, 0x69, 0xc0); /* imul imm32,%rax,%rax */
+                                EMIT(K, 4);
+                                EMIT4(0x48, 0xc1, 0xe8, 0x20); /* shr $0x20,%rax */
+                                break;
+                        case BPF_S_ALU_AND_X:
+                                seen |= SEEN_XREG;
+                                EMIT2(0x21, 0xd8);              /* and %ebx,%eax */
+                                break;
+                        case BPF_S_ALU_AND_K:
+                                if (K >= 0xFFFFFF00) {
+                                        EMIT2(0x24, K & 0xFF); /* and imm8,%al */
+                                } else if (K >= 0xFFFF0000) {
+                                        EMIT2(0x66, 0x25);      /* and imm16,%ax */
+                                        EMIT2(K, 2);
+                                } else {
+                                        EMIT1_off32(0x25, K);   /* and imm32,%eax */
+                                }
+                                break;
+                        case BPF_S_ALU_OR_X:
+                                seen |= SEEN_XREG;
+                                EMIT2(0x09, 0xd8);              /* or %ebx,%eax */
+                                break;
+                        case BPF_S_ALU_OR_K:
+                                if (is_imm8(K))
+                                        EMIT3(0x83, 0xc8, K); /* or imm8,%eax */
+                                else
+                                        EMIT1_off32(0x0d, K);   /* or imm32,%eax */
+                                break;
+                        case BPF_S_ALU_LSH_X: /* A <<= X; */
+                                seen |= SEEN_XREG;
+                                EMIT4(0x89, 0xd9, 0xd3, 0xe0);  /* mov %ebx,%ecx; shl %cl,%eax */
+                                break;
+                        case BPF_S_ALU_LSH_K:
+                                if (K == 0)
+                                        break;
+                                else if (K == 1)
+                                        EMIT2(0xd1, 0xe0); /* shl %eax */
+                                else
+                                        EMIT3(0xc1, 0xe0, K);
+                                break;
+                        case BPF_S_ALU_RSH_X: /* A >>= X; */
+                                seen |= SEEN_XREG;
+                                EMIT4(0x89, 0xd9, 0xd3, 0xe8);  /* mov %ebx,%ecx; shr %cl,%eax */
+                                break;
+                        case BPF_S_ALU_RSH_K: /* A >>= K; */
+                                if (K == 0)
+                                        break;
+                                else if (K == 1)
+                                        EMIT2(0xd1, 0xe8); /* shr %eax */
+                                else
+                                        EMIT3(0xc1, 0xe8, K);
+                                break;
+                        case BPF_S_ALU_NEG:
+                                EMIT2(0xf7, 0xd8);              /* neg %eax */
+                                break;
+                        case BPF_S_RET_K:
+                                if (!K) {
+                                        if (pc_ret0 == -1)
+                                                pc_ret0 = i;
+                                        CLEAR_A();
+                                } else {
+                                        EMIT1_off32(0xb8, K);   /* mov $imm32,%eax */
+                                }
+                                /* fallinto */
+                        case BPF_S_RET_A:
+                                if (seen) {
+                                        if (i != flen - 1) {
+                                                EMIT_JMP(cleanup_addr - addrs[i]);
+                                                break;
+                                        }
+                                        if (seen & SEEN_XREG)
+                                                EMIT4(0x48, 0x8b, 0x5d, 0xf8);  /* mov  -8(%rbp),%rbx */
+                                        EMIT1(0xc9);            /* leaveq */
+                                }
+                                EMIT1(0xc3);            /* ret */
+                                break;
+                        case BPF_S_MISC_TAX: /* X = A */
+                                seen |= SEEN_XREG;
+                                EMIT2(0x89, 0xc3);      /* mov    %eax,%ebx */
+                                break;
+                        case BPF_S_MISC_TXA: /* A = X */
+                                seen |= SEEN_XREG;
+                                EMIT2(0x89, 0xd8);      /* mov    %ebx,%eax */
+                                break;
+                        case BPF_S_LD_IMM: /* A = K */
+                                if (!K)
+                                        CLEAR_A();
+                                else
+                                        EMIT1_off32(0xb8, K); /* mov $imm32,%eax */
+                                break;
+                        case BPF_S_LDX_IMM: /* X = K */
+                                seen |= SEEN_XREG;
+                                if (!K)
+                                        CLEAR_X();
+                                else
+                                        EMIT1_off32(0xbb, K); /* mov $imm32,%ebx */
+                                break;
+                        case BPF_S_LD_MEM: /* A = mem[K] : mov off8(%rbp),%eax */
+                                seen |= SEEN_MEM;
+                                EMIT3(0x8b, 0x45, 0xf0 - K*4);
+                                break;
+                        case BPF_S_LDX_MEM: /* X = mem[K] : mov off8(%rbp),%ebx */
+                                seen |= SEEN_XREG | SEEN_MEM;
+                                EMIT3(0x8b, 0x5d, 0xf0 - K*4);
+                                break;
+                        case BPF_S_ST: /* mem[K] = A : mov %eax,off8(%rbp) */
+                                seen |= SEEN_MEM;
+                                EMIT3(0x89, 0x45, 0xf0 - K*4);
+                                break;
+                        case BPF_S_STX: /* mem[K] = X : mov %ebx,off8(%rbp) */
+                                seen |= SEEN_XREG | SEEN_MEM;
+                                EMIT3(0x89, 0x5d, 0xf0 - K*4);
+                                break;
+                        case BPF_S_LD_W_LEN: /* A = skb->len; */
+                                BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, len) != 4);
+                                if (is_imm8(offsetof(struct sk_buff, len)))
+                                        /* mov    off8(%rdi),%eax */
+                                        EMIT3(0x8b, 0x47, offsetof(struct sk_buff, len));
+                                else {
+                                        EMIT2(0x8b, 0x87);
+                                        EMIT(offsetof(struct sk_buff, len), 4);
+                                }
+                                break;
+                        case BPF_S_LDX_W_LEN: /* X = skb->len; */
+                                seen |= SEEN_XREG;
+                                if (is_imm8(offsetof(struct sk_buff, len)))
+                                        /* mov off8(%rdi),%ebx */
+                                        EMIT3(0x8b, 0x5f, offsetof(struct sk_buff, len));
+                                else {
+                                        EMIT2(0x8b, 0x9f);
+                                        EMIT(offsetof(struct sk_buff, len), 4);
+                                }
+                                break;
+                        case BPF_S_ANC_PROTOCOL: /* A = ntohs(skb->protocol); */
+                                BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, protocol) != 2);
+                                if (is_imm8(offsetof(struct sk_buff, protocol))) {
+                                        /* movzwl off8(%rdi),%eax */
+                                        EMIT4(0x0f, 0xb7, 0x47, offsetof(struct sk_buff, protocol));
+                                } else {
+                                        EMIT3(0x0f, 0xb7, 0x87); /* movzwl off32(%rdi),%eax */
+                                        EMIT(offsetof(struct sk_buff, protocol), 4);
+                                }
+                                EMIT2(0x86, 0xc4); /* ntohs() : xchg   %al,%ah */
+                                break;
+                        case BPF_S_ANC_IFINDEX:
+                                if (is_imm8(offsetof(struct sk_buff, dev))) {
+                                        /* movq off8(%rdi),%rax */
+                                        EMIT4(0x48, 0x8b, 0x47, offsetof(struct sk_buff, dev));
+                                } else {
+                                        EMIT3(0x48, 0x8b, 0x87); /* movq off32(%rdi),%rax */
+                                        EMIT(offsetof(struct sk_buff, dev), 4);
+                                }
+                                EMIT3(0x48, 0x85, 0xc0);        /* test %rax,%rax */
+                                EMIT_COND_JMP(X86_JE, cleanup_addr - (addrs[i] - 6));
+                                BUILD_BUG_ON(FIELD_SIZEOF(struct net_device, ifindex) != 4);
+                                EMIT2(0x8b, 0x80);      /* mov off32(%rax),%eax */
+                                EMIT(offsetof(struct net_device, ifindex), 4);
+                                break;
+                        case BPF_S_ANC_MARK:
+                                BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, mark) != 4);
+                                if (is_imm8(offsetof(struct sk_buff, mark))) {
+                                        /* mov off8(%rdi),%eax */
+                                        EMIT3(0x8b, 0x47, offsetof(struct sk_buff, mark));
+                                } else {
+                                        EMIT2(0x8b, 0x87);
+                                        EMIT(offsetof(struct sk_buff, mark), 4);
+                                }
+                                break;
+                        case BPF_S_ANC_RXHASH:
+                                BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, rxhash) != 4);
+                                if (is_imm8(offsetof(struct sk_buff, rxhash))) {
+                                        /* mov off8(%rdi),%eax */
+                                        EMIT3(0x8b, 0x47, offsetof(struct sk_buff, rxhash));
+                                } else {
+                                        EMIT2(0x8b, 0x87);
+                                        EMIT(offsetof(struct sk_buff, rxhash), 4);
+                                }
+                                break;
+                        case BPF_S_ANC_QUEUE:
+                                BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, queue_mapping) != 2);
+                                if (is_imm8(offsetof(struct sk_buff, queue_mapping))) {
+                                        /* movzwl off8(%rdi),%eax */
+                                        EMIT4(0x0f, 0xb7, 0x47, offsetof(struct sk_buff, queue_mapping));
+                                } else {
+                                        EMIT3(0x0f, 0xb7, 0x87); /* movzwl off32(%rdi),%eax */
+                                        EMIT(offsetof(struct sk_buff, queue_mapping), 4);
+                                }
+                                break;
+                        case BPF_S_ANC_CPU:
+#ifdef CONFIG_SMP
+                                EMIT4(0x65, 0x8b, 0x04, 0x25); /* mov %gs:off32,%eax */
+                                EMIT((u32)(unsigned long)&cpu_number, 4); /* A = smp_processor_id(); */
+#else
+                                CLEAR_A();
+#endif
+                                break;
+                        case BPF_S_LD_W_ABS:
+                                func = sk_load_word;
+common_load:                    seen |= SEEN_DATAREF;
+                                if ((int)K < 0)
+                                        goto out;
+                                t_offset = func - (image + addrs[i]);
+                                EMIT1_off32(0xbe, K); /* mov imm32,%esi */
+                                EMIT1_off32(0xe8, t_offset); /* call */
+                                break;
+                        case BPF_S_LD_H_ABS:
+                                func = sk_load_half;
+                                goto common_load;
+                        case BPF_S_LD_B_ABS:
+                                func = sk_load_byte;
+                                goto common_load;
+                        case BPF_S_LDX_B_MSH:
+                                if ((int)K < 0) {
+                                        if (pc_ret0 != -1) {
+                                                EMIT_JMP(addrs[pc_ret0] - addrs[i]);
+                                                break;
+                                        }
+                                        CLEAR_A();
+                                        EMIT_JMP(cleanup_addr - addrs[i]);
+                                        break;
+                                }
+                                seen |= SEEN_DATAREF | SEEN_XREG;
+                                t_offset = sk_load_byte_msh - (image + addrs[i]);
+                                EMIT1_off32(0xbe, K);   /* mov imm32,%esi */
+                                EMIT1_off32(0xe8, t_offset); /* call sk_load_byte_msh */
+                                break;
+                        case BPF_S_LD_W_IND:
+                                func = sk_load_word_ind;
+common_load_ind:                seen |= SEEN_DATAREF | SEEN_XREG;
+                                t_offset = func - (image + addrs[i]);
+                                EMIT1_off32(0xbe, K);   /* mov imm32,%esi   */
+                                EMIT1_off32(0xe8, t_offset);    /* call sk_load_xxx_ind */
+                                break;
+                        case BPF_S_LD_H_IND:
+                                func = sk_load_half_ind;
+                                goto common_load_ind;
+                        case BPF_S_LD_B_IND:
+                                func = sk_load_byte_ind;
+                                goto common_load_ind;
+                        case BPF_S_JMP_JA:
+                                t_offset = addrs[i + K] - addrs[i];
+                                EMIT_JMP(t_offset);
+                                break;
+                        COND_SEL(BPF_S_JMP_JGT_K, X86_JA, X86_JBE);
+                        COND_SEL(BPF_S_JMP_JGE_K, X86_JAE, X86_JB);
+                        COND_SEL(BPF_S_JMP_JEQ_K, X86_JE, X86_JNE);
+                        COND_SEL(BPF_S_JMP_JSET_K,X86_JNE, X86_JE);
+                        COND_SEL(BPF_S_JMP_JGT_X, X86_JA, X86_JBE);
+                        COND_SEL(BPF_S_JMP_JGE_X, X86_JAE, X86_JB);
+                        COND_SEL(BPF_S_JMP_JEQ_X, X86_JE, X86_JNE);
+                        COND_SEL(BPF_S_JMP_JSET_X,X86_JNE, X86_JE);
+
+cond_branch:                    f_offset = addrs[i + filter[i].jf] - addrs[i];
+                                t_offset = addrs[i + filter[i].jt] - addrs[i];
+
+                                /* same targets, can avoid doing the test :) */
+                                if (filter[i].jt == filter[i].jf) {
+                                        EMIT_JMP(t_offset);
+                                        break;
+                                }
+
+                                switch (filter[i].code) {
+                                case BPF_S_JMP_JGT_X:
+                                case BPF_S_JMP_JGE_X:
+                                case BPF_S_JMP_JEQ_X:
+                                        seen |= SEEN_XREG;
+                                        EMIT2(0x39, 0xd8); /* cmp %ebx,%eax */
+                                        break;
+                                case BPF_S_JMP_JSET_X:
+                                        seen |= SEEN_XREG;
+                                        EMIT2(0x85, 0xd8); /* test %ebx,%eax */
+                                        break;
+                                case BPF_S_JMP_JEQ_K:
+                                        if (K == 0) {
+                                                EMIT2(0x85, 0xc0); /* test   %eax,%eax */
+                                                break;
+                                        }
+                                case BPF_S_JMP_JGT_K:
+                                case BPF_S_JMP_JGE_K:
+                                        if (K <= 127)
+                                                EMIT3(0x83, 0xf8, K); /* cmp imm8,%eax */
+                                        else
+                                                EMIT1_off32(0x3d, K); /* cmp imm32,%eax */
+                                        break;
+                                case BPF_S_JMP_JSET_K:
+                                        if (K <= 0xFF)
+                                                EMIT2(0xa8, K); /* test imm8,%al */
+                                        else if (!(K & 0xFFFF00FF))
+                                                EMIT3(0xf6, 0xc4, K >> 8); /* test imm8,%ah */
+                                        else if (K <= 0xFFFF) {
+                                                EMIT2(0x66, 0xa9); /* test imm16,%ax */
+                                                EMIT(K, 2);
+                                        } else {
+                                                EMIT1_off32(0xa9, K); /* test imm32,%eax */
+                                        }
+                                        break;
+                                }
+                                if (filter[i].jt != 0) {
+                                        if (filter[i].jf)
+                                                t_offset += is_near(f_offset) ? 2 : 6;
+                                        EMIT_COND_JMP(t_op, t_offset);
+                                        if (filter[i].jf)
+                                                EMIT_JMP(f_offset);
+                                        break;
+                                }
+                                EMIT_COND_JMP(f_op, f_offset);
+                                break;
+                        default:
+                                /* hmm, too complex filter, give up with jit compiler */
+                                goto out;
+                        }
+                        ilen = prog - temp;
+                        if (image) {
+                                if (unlikely(proglen + ilen > oldproglen)) {
+                                        pr_err("bpb_jit_compile fatal error\n");
+                                        kfree(addrs);
+                                        module_free(NULL, image);
+                                        return;
+                                }
+                                memcpy(image + proglen, temp, ilen);
+                        }
+                        proglen += ilen;
+                        addrs[i] = proglen;
+                        prog = temp;
+                }
+                /* last bpf instruction is always a RET :
+                 * use it to give the cleanup instruction(s) addr
+                 */
+                cleanup_addr = proglen - 1; /* ret */
+                if (seen)
+                        cleanup_addr -= 1; /* leaveq */
+                if (seen & SEEN_XREG)
+                        cleanup_addr -= 4; /* mov  -8(%rbp),%rbx */
+
+                if (image) {
+                        WARN_ON(proglen != oldproglen);
+                        break;
+                }
+                if (proglen == oldproglen) {
+                        image = module_alloc(max_t(unsigned int,
+                                                   proglen,
+                                                   sizeof(struct work_struct)));
+                        if (!image)
+                                goto out;
+                }
+                oldproglen = proglen;
+        }
+        if (bpf_jit_enable > 1)
+                pr_err("flen=%d proglen=%u pass=%d image=%p\n",
+                       flen, proglen, pass, image);
+
+        if (image) {
+                if (bpf_jit_enable > 1)
+                        print_hex_dump(KERN_ERR, "JIT code: ", DUMP_PREFIX_ADDRESS,
+                                       16, 1, image, proglen, false);
+
+                bpf_flush_icache(image, image + proglen);
+
+                fp->bpf_func = (void *)image;
+        }
+out:
+        kfree(addrs);
+        return;
+}
+
+static void jit_free_defer(struct work_struct *arg)
+{
+        module_free(NULL, arg);
+}
+
+/* run from softirq, we must use a work_struct to call
+ * module_free() from process context
+ */
+void bpf_jit_free(struct sk_filter *fp)
+{
+        if (fp->bpf_func != sk_run_filter) {
+                struct work_struct *work = (struct work_struct *)fp->bpf_func;
+
+                INIT_WORK(work, jit_free_defer);
+                schedule_work(work);
+        }
+}
diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
index 2d49d4e19a36..a5b64ab4cd6e 100644
--- a/arch/x86/oprofile/backtrace.c
+++ b/arch/x86/oprofile/backtrace.c
@@ -16,17 +16,6 @@
 #include <asm/stacktrace.h>
 #include <linux/compat.h>
 
-static void backtrace_warning_symbol(void *data, char *msg,
-                                     unsigned long symbol)
-{
-        /* Ignore warnings */
-}
-
-static void backtrace_warning(void *data, char *msg)
-{
-        /* Ignore warnings */
-}
-
 static int backtrace_stack(void *data, char *name)
 {
         /* Yes, we want all stacks */
@@ -42,8 +31,6 @@ static void backtrace_address(void *data, unsigned long addr, int reliable)
 }
 
 static struct stacktrace_ops backtrace_ops = {
-        .warning        = backtrace_warning,
-        .warning_symbol = backtrace_warning_symbol,
         .stack          = backtrace_stack,
         .address        = backtrace_address,
         .walk_stack     = print_context_stack,
diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c
index bd33620b0071..e6fd8473fb7b 100644
--- a/arch/x86/pci/direct.c
+++ b/arch/x86/pci/direct.c
@@ -280,12 +280,9 @@ void __init pci_direct_init(int type)
 
 int __init pci_direct_probe(void)
 {
-        struct resource *region, *region2;
-
         if ((pci_probe & PCI_PROBE_CONF1) == 0)
                 goto type2;
-        region = request_region(0xCF8, 8, "PCI conf1");
-        if (!region)
+        if (!request_region(0xCF8, 8, "PCI conf1"))
                 goto type2;
 
         if (pci_check_type1()) {
@@ -293,16 +290,14 @@ int __init pci_direct_probe(void)
                 port_cf9_safe = true;
                 return 1;
         }
-        release_resource(region);
+        release_region(0xCF8, 8);
 
  type2:
         if ((pci_probe & PCI_PROBE_CONF2) == 0)
                 return 0;
-        region = request_region(0xCF8, 4, "PCI conf2");
-        if (!region)
+        if (!request_region(0xCF8, 4, "PCI conf2"))
                 return 0;
-        region2 = request_region(0xC000, 0x1000, "PCI conf2");
-        if (!region2)
+        if (!request_region(0xC000, 0x1000, "PCI conf2"))
                 goto fail2;
 
         if (pci_check_type2()) {
@@ -311,8 +306,8 @@ int __init pci_direct_probe(void)
                 return 2;
         }
 
-        release_resource(region2);
+        release_region(0xC000, 0x1000);
  fail2:
-        release_resource(region);
+        release_region(0xCF8, 4);
         return 0;
 }
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 8201165bae28..372e9b8989b3 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -602,7 +602,9 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
         ||  (device >= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MIN && 
              device <= PCI_DEVICE_ID_INTEL_COUGARPOINT_LPC_MAX)
         ||  (device >= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MIN &&
-             device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)) {
+             device <= PCI_DEVICE_ID_INTEL_DH89XXCC_LPC_MAX)
+        ||  (device >= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MIN &&
+             device <= PCI_DEVICE_ID_INTEL_PANTHERPOINT_LPC_MAX)) {
                 r->name = "PIIX/ICH";
                 r->get = pirq_piix_get;
                 r->set = pirq_piix_set;
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index e282886616a0..750c346ef50a 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -606,6 +606,16 @@ static void __init __pci_mmcfg_init(int early)
         if (list_empty(&pci_mmcfg_list))
                 return;
 
+        if (pcibios_last_bus < 0) {
+                const struct pci_mmcfg_region *cfg;
+
+                list_for_each_entry(cfg, &pci_mmcfg_list, list) {
+                        if (cfg->segment)
+                                break;
+                        pcibios_last_bus = cfg->end_bus;
+                }
+        }
+
         if (pci_mmcfg_arch_init())
                 pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
         else {
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index e37b407a0ee8..8214724ce54d 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -108,7 +108,8 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                 }
                 irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq, 0,
                                                (type == PCI_CAP_ID_MSIX) ?
-                                               "msi-x" : "msi");
+                                               "msi-x" : "msi",
+                                               DOMID_SELF);
                 if (irq < 0)
                         goto error;
                 dev_dbg(&dev->dev,
@@ -148,7 +149,8 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                 irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i], 0,
                                                (type == PCI_CAP_ID_MSIX) ?
                                                "pcifront-msi-x" :
-                                               "pcifront-msi");
+                                               "pcifront-msi",
+                                                DOMID_SELF);
                 if (irq < 0)
                         goto free;
                 i++;
@@ -190,9 +192,16 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 
         list_for_each_entry(msidesc, &dev->msi_list, list) {
                 struct physdev_map_pirq map_irq;
+                domid_t domid;
+
+                domid = ret = xen_find_device_domain_owner(dev);
+                /* N.B. Casting int's -ENODEV to uint16_t results in 0xFFED,
+                 * hence check ret value for < 0. */
+                if (ret < 0)
+                        domid = DOMID_SELF;
 
                 memset(&map_irq, 0, sizeof(map_irq));
-                map_irq.domid = DOMID_SELF;
+                map_irq.domid = domid;
                 map_irq.type = MAP_PIRQ_TYPE_MSI;
                 map_irq.index = -1;
                 map_irq.pirq = -1;
@@ -215,14 +224,16 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 
                 ret = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
                 if (ret) {
-                        dev_warn(&dev->dev, "xen map irq failed %d\n", ret);
+                        dev_warn(&dev->dev, "xen map irq failed %d for %d domain\n",
+                                 ret, domid);
                         goto out;
                 }
 
                 ret = xen_bind_pirq_msi_to_irq(dev, msidesc,
                                                map_irq.pirq, map_irq.index,
                                                (type == PCI_CAP_ID_MSIX) ?
-                                               "msi-x" : "msi");
+                                               "msi-x" : "msi",
+                                                domid);
                 if (ret < 0)
                         goto out;
         }
@@ -461,3 +472,78 @@ void __init xen_setup_pirqs(void)
         }
 }
 #endif
+
+#ifdef CONFIG_XEN_DOM0
+struct xen_device_domain_owner {
+        domid_t domain;
+        struct pci_dev *dev;
+        struct list_head list;
+};
+
+static DEFINE_SPINLOCK(dev_domain_list_spinlock);
+static struct list_head dev_domain_list = LIST_HEAD_INIT(dev_domain_list);
+
+static struct xen_device_domain_owner *find_device(struct pci_dev *dev)
+{
+        struct xen_device_domain_owner *owner;
+
+        list_for_each_entry(owner, &dev_domain_list, list) {
+                if (owner->dev == dev)
+                        return owner;
+        }
+        return NULL;
+}
+
+int xen_find_device_domain_owner(struct pci_dev *dev)
+{
+        struct xen_device_domain_owner *owner;
+        int domain = -ENODEV;
+
+        spin_lock(&dev_domain_list_spinlock);
+        owner = find_device(dev);
+        if (owner)
+                domain = owner->domain;
+        spin_unlock(&dev_domain_list_spinlock);
+        return domain;
+}
+EXPORT_SYMBOL_GPL(xen_find_device_domain_owner);
+
+int xen_register_device_domain_owner(struct pci_dev *dev, uint16_t domain)
+{
+        struct xen_device_domain_owner *owner;
+
+        owner = kzalloc(sizeof(struct xen_device_domain_owner), GFP_KERNEL);
+        if (!owner)
+                return -ENODEV;
+
+        spin_lock(&dev_domain_list_spinlock);
+        if (find_device(dev)) {
+                spin_unlock(&dev_domain_list_spinlock);
+                kfree(owner);
+                return -EEXIST;
+        }
+        owner->domain = domain;
+        owner->dev = dev;
+        list_add_tail(&owner->list, &dev_domain_list);
+        spin_unlock(&dev_domain_list_spinlock);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(xen_register_device_domain_owner);
+
+int xen_unregister_device_domain_owner(struct pci_dev *dev)
+{
+        struct xen_device_domain_owner *owner;
+
+        spin_lock(&dev_domain_list_spinlock);
+        owner = find_device(dev);
+        if (!owner) {
+                spin_unlock(&dev_domain_list_spinlock);
+                return -ENODEV;
+        }
+        list_del(&owner->list);
+        spin_unlock(&dev_domain_list_spinlock);
+        kfree(owner);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(xen_unregister_device_domain_owner);
+#endif
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 0fe27d7c6258..b30aa26a8df2 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -145,17 +145,6 @@ static void virt_efi_reset_system(int reset_type,
                        data_size, data);
 }
 
-static efi_status_t virt_efi_set_virtual_address_map(
-        unsigned long memory_map_size,
-        unsigned long descriptor_size,
-        u32 descriptor_version,
-        efi_memory_desc_t *virtual_map)
-{
-        return efi_call_virt4(set_virtual_address_map,
-                              memory_map_size, descriptor_size,
-                              descriptor_version, virtual_map);
-}
-
 static efi_status_t __init phys_efi_set_virtual_address_map(
         unsigned long memory_map_size,
         unsigned long descriptor_size,
@@ -468,11 +457,25 @@ void __init efi_init(void)
 #endif
 }
 
+void __init efi_set_executable(efi_memory_desc_t *md, bool executable)
+{
+        u64 addr, npages;
+
+        addr = md->virt_addr;
+        npages = md->num_pages;
+
+        memrange_efi_to_native(&addr, &npages);
+
+        if (executable)
+                set_memory_x(addr, npages);
+        else
+                set_memory_nx(addr, npages);
+}
+
 static void __init runtime_code_page_mkexec(void)
 {
         efi_memory_desc_t *md;
         void *p;
-        u64 addr, npages;
 
         /* Make EFI runtime service code area executable */
         for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
@@ -481,10 +484,7 @@ static void __init runtime_code_page_mkexec(void)
                 if (md->type != EFI_RUNTIME_SERVICES_CODE)
                         continue;
 
-                addr = md->virt_addr;
-                npages = md->num_pages;
-                memrange_efi_to_native(&addr, &npages);
-                set_memory_x(addr, npages);
+                efi_set_executable(md, true);
         }
 }
 
@@ -498,13 +498,42 @@ static void __init runtime_code_page_mkexec(void)
  */
 void __init efi_enter_virtual_mode(void)
 {
-        efi_memory_desc_t *md;
+        efi_memory_desc_t *md, *prev_md = NULL;
         efi_status_t status;
         unsigned long size;
         u64 end, systab, addr, npages, end_pfn;
-        void *p, *va;
+        void *p, *va, *new_memmap = NULL;
+        int count = 0;
 
         efi.systab = NULL;
+
+        /* Merge contiguous regions of the same type and attribute */
+        for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
+                u64 prev_size;
+                md = p;
+
+                if (!prev_md) {
+                        prev_md = md;
+                        continue;
+                }
+
+                if (prev_md->type != md->type ||
+                    prev_md->attribute != md->attribute) {
+                        prev_md = md;
+                        continue;
+                }
+
+                prev_size = prev_md->num_pages << EFI_PAGE_SHIFT;
+
+                if (md->phys_addr == (prev_md->phys_addr + prev_size)) {
+                        prev_md->num_pages += md->num_pages;
+                        md->type = EFI_RESERVED_TYPE;
+                        md->attribute = 0;
+                        continue;
+                }
+                prev_md = md;
+        }
+
         for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
                 md = p;
                 if (!(md->attribute & EFI_MEMORY_RUNTIME))
@@ -541,15 +570,21 @@ void __init efi_enter_virtual_mode(void)
                         systab += md->virt_addr - md->phys_addr;
                         efi.systab = (efi_system_table_t *) (unsigned long) systab;
                 }
+                new_memmap = krealloc(new_memmap,
+                                      (count + 1) * memmap.desc_size,
+                                      GFP_KERNEL);
+                memcpy(new_memmap + (count * memmap.desc_size), md,
+                       memmap.desc_size);
+                count++;
         }
 
         BUG_ON(!efi.systab);
 
         status = phys_efi_set_virtual_address_map(
-                memmap.desc_size * memmap.nr_map,
+                memmap.desc_size * count,
                 memmap.desc_size,
                 memmap.desc_version,
-                memmap.phys_map);
+                (efi_memory_desc_t *)__pa(new_memmap));
 
         if (status != EFI_SUCCESS) {
                 printk(KERN_ALERT "Unable to switch EFI into virtual mode "
@@ -572,11 +607,12 @@ void __init efi_enter_virtual_mode(void)
         efi.set_variable = virt_efi_set_variable;
         efi.get_next_high_mono_count = virt_efi_get_next_high_mono_count;
         efi.reset_system = virt_efi_reset_system;
-        efi.set_virtual_address_map = virt_efi_set_virtual_address_map;
+        efi.set_virtual_address_map = NULL;
         if (__supported_pte_mask & _PAGE_NX)
                 runtime_code_page_mkexec();
         early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size);
         memmap.map = NULL;
+        kfree(new_memmap);
 }
 
 /*
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index ac0621a7ac3d..2649426a7905 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -41,22 +41,7 @@
 static pgd_t save_pgd __initdata;
 static unsigned long efi_flags __initdata;
 
-static void __init early_mapping_set_exec(unsigned long start,
-                                          unsigned long end,
-                                          int executable)
-{
-        unsigned long num_pages;
-
-        start &= PMD_MASK;
-        end = (end + PMD_SIZE - 1) & PMD_MASK;
-        num_pages = (end - start) >> PAGE_SHIFT;
-        if (executable)
-                set_memory_x((unsigned long)__va(start), num_pages);
-        else
-                set_memory_nx((unsigned long)__va(start), num_pages);
-}
-
-static void __init early_runtime_code_mapping_set_exec(int executable)
+static void __init early_code_mapping_set_exec(int executable)
 {
         efi_memory_desc_t *md;
         void *p;
@@ -67,11 +52,8 @@ static void __init early_runtime_code_mapping_set_exec(int executable)
         /* Make EFI runtime service code area executable */
         for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
                 md = p;
-                if (md->type == EFI_RUNTIME_SERVICES_CODE) {
-                        unsigned long end;
-                        end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT);
-                        early_mapping_set_exec(md->phys_addr, end, executable);
-                }
+                if (md->type == EFI_RUNTIME_SERVICES_CODE)
+                        efi_set_executable(md, executable);
         }
 }
 
@@ -79,7 +61,7 @@ void __init efi_call_phys_prelog(void)
 {
         unsigned long vaddress;
 
-        early_runtime_code_mapping_set_exec(1);
+        early_code_mapping_set_exec(1);
         local_irq_save(efi_flags);
         vaddress = (unsigned long)__va(0x0UL);
         save_pgd = *pgd_offset_k(0x0UL);
@@ -95,7 +77,7 @@ void __init efi_call_phys_epilog(void)
         set_pgd(pgd_offset_k(0x0UL), save_pgd);
         __flush_tlb_all();
         local_irq_restore(efi_flags);
-        early_runtime_code_mapping_set_exec(0);
+        early_code_mapping_set_exec(0);
 }
 
 void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,
@@ -107,8 +89,10 @@ void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,
                 return ioremap(phys_addr, size);
 
         last_map_pfn = init_memory_mapping(phys_addr, phys_addr + size);
-        if ((last_map_pfn << PAGE_SHIFT) < phys_addr + size)
-                return NULL;
+        if ((last_map_pfn << PAGE_SHIFT) < phys_addr + size) {
+                unsigned long top = last_map_pfn << PAGE_SHIFT;
+                efi_ioremap(top, size - (top - phys_addr), type);
+        }
 
         return (void __iomem *)__va(phys_addr);
 }
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index 275dbc19e2cf..7000e74b3087 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -194,7 +194,7 @@ static unsigned long __init mrst_calibrate_tsc(void)
         return 0;
 }
 
-void __init mrst_time_init(void)
+static void __init mrst_time_init(void)
 {
         sfi_table_parse(SFI_SIG_MTMR, NULL, NULL, sfi_parse_mtmr);
         switch (mrst_timer_options) {
@@ -216,7 +216,7 @@ void __init mrst_time_init(void)
         apbt_time_init();
 }
 
-void __cpuinit mrst_arch_setup(void)
+static void __cpuinit mrst_arch_setup(void)
 {
         if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x27)
                 __mrst_cpu_chip = MRST_CPU_CHIP_PENWELL;
diff --git a/arch/x86/platform/olpc/Makefile b/arch/x86/platform/olpc/Makefile
index c2a8cab65e5d..81c5e2165c24 100644
--- a/arch/x86/platform/olpc/Makefile
+++ b/arch/x86/platform/olpc/Makefile
@@ -1,4 +1,2 @@
-obj-$(CONFIG_OLPC)              += olpc.o
+obj-$(CONFIG_OLPC)              += olpc.o olpc_ofw.o olpc_dt.o
 obj-$(CONFIG_OLPC_XO1)          += olpc-xo1.o
-obj-$(CONFIG_OLPC)              += olpc_ofw.o
-obj-$(CONFIG_OF_PROMTREE)       += olpc_dt.o
diff --git a/arch/x86/platform/olpc/olpc.c b/arch/x86/platform/olpc/olpc.c
index edaf3fe8dc5e..0060fd59ea00 100644
--- a/arch/x86/platform/olpc/olpc.c
+++ b/arch/x86/platform/olpc/olpc.c
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <linux/string.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 
 #include <asm/geode.h>
 #include <asm/setup.h>
@@ -187,41 +188,43 @@ err:
 }
 EXPORT_SYMBOL_GPL(olpc_ec_cmd);
 
-static bool __init check_ofw_architecture(void)
+static bool __init check_ofw_architecture(struct device_node *root)
 {
-        size_t propsize;
-        char olpc_arch[5];
-        const void *args[] = { NULL, "architecture", olpc_arch, (void *)5 };
-        void *res[] = { &propsize };
+        const char *olpc_arch;
+        int propsize;
 
-        if (olpc_ofw("getprop", args, res)) {
-                printk(KERN_ERR "ofw: getprop call failed!\n");
-                return false;
-        }
+        olpc_arch = of_get_property(root, "architecture", &propsize);
         return propsize == 5 && strncmp("OLPC", olpc_arch, 5) == 0;
 }
 
-static u32 __init get_board_revision(void)
+static u32 __init get_board_revision(struct device_node *root)
 {
-        size_t propsize;
-        __be32 rev;
-        const void *args[] = { NULL, "board-revision-int", &rev, (void *)4 };
-        void *res[] = { &propsize };
-
-        if (olpc_ofw("getprop", args, res) || propsize != 4) {
-                printk(KERN_ERR "ofw: getprop call failed!\n");
-                return cpu_to_be32(0);
-        }
-        return be32_to_cpu(rev);
+        int propsize;
+        const __be32 *rev;
+
+        rev = of_get_property(root, "board-revision-int", &propsize);
+        if (propsize != 4)
+                return 0;
+
+        return be32_to_cpu(*rev);
 }
 
 static bool __init platform_detect(void)
 {
-        if (!check_ofw_architecture())
+        struct device_node *root = of_find_node_by_path("/");
+        bool success;
+
+        if (!root)
                 return false;
-        olpc_platform_info.flags |= OLPC_F_PRESENT;
-        olpc_platform_info.boardrev = get_board_revision();
-        return true;
+
+        success = check_ofw_architecture(root);
+        if (success) {
+                olpc_platform_info.boardrev = get_board_revision(root);
+                olpc_platform_info.flags |= OLPC_F_PRESENT;
+        }
+
+        of_node_put(root);
+        return success;
 }
 
 static int __init add_xo1_platform_devices(void)
diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
index 044bda5b3174..d39f63d017d2 100644
--- a/arch/x86/platform/olpc/olpc_dt.c
+++ b/arch/x86/platform/olpc/olpc_dt.c
@@ -19,7 +19,9 @@
 #include <linux/kernel.h>
 #include <linux/bootmem.h>
 #include <linux/of.h>
+#include <linux/of_platform.h>
 #include <linux/of_pdt.h>
+#include <asm/olpc.h>
 #include <asm/olpc_ofw.h>
 
 static phandle __init olpc_dt_getsibling(phandle node)
@@ -180,3 +182,20 @@ void __init olpc_dt_build_devicetree(void)
         pr_info("PROM DT: Built device tree with %u bytes of memory.\n",
                         prom_early_allocated);
 }
+
+/* A list of DT node/bus matches that we want to expose as platform devices */
+static struct of_device_id __initdata of_ids[] = {
+        { .compatible = "olpc,xo1-battery" },
+        { .compatible = "olpc,xo1-dcon" },
+        { .compatible = "olpc,xo1-rtc" },
+        {},
+};
+
+static int __init olpc_create_platform_devices(void)
+{
+        if (machine_is_olpc())
+                return of_platform_bus_probe(NULL, of_ids, NULL);
+        else
+                return 0;
+}
+device_initcall(olpc_create_platform_devices);
diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
index 9daf5d1af9f1..0eb90184515f 100644
--- a/arch/x86/platform/uv/uv_time.c
+++ b/arch/x86/platform/uv/uv_time.c
@@ -40,7 +40,6 @@ static struct clocksource clocksource_uv = {
         .rating         = 400,
         .read           = uv_read_rtc,
         .mask           = (cycle_t)UVH_RTC_REAL_TIME_CLOCK_MASK,
-        .shift          = 10,
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -372,14 +371,11 @@ static __init int uv_rtc_setup_clock(void)
         if (!is_uv_system())
                 return -ENODEV;
 
-        clocksource_uv.mult = clocksource_hz2mult(sn_rtc_cycles_per_second,
-                                clocksource_uv.shift);
-
         /* If single blade, prefer tsc */
         if (uv_num_possible_blades() == 1)
                 clocksource_uv.rating = 250;
 
-        rc = clocksource_register(&clocksource_uv);
+        rc = clocksource_register_hz(&clocksource_uv, sn_rtc_cycles_per_second);
         if (rc)
                 printk(KERN_INFO "UV RTC clocksource failed rc %d\n", rc);
         else
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index e3c6a06cf725..dd7b88f2ec7a 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -235,7 +235,7 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
         *dx &= maskedx;
 }
 
-static __init void xen_init_cpuid_mask(void)
+static void __init xen_init_cpuid_mask(void)
 {
         unsigned int ax, bx, cx, dx;
         unsigned int xsave_mask;
@@ -400,7 +400,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
 /*
  * load_gdt for early boot, when the gdt is only mapped once
  */
-static __init void xen_load_gdt_boot(const struct desc_ptr *dtr)
+static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
 {
         unsigned long va = dtr->address;
         unsigned int size = dtr->size + 1;
@@ -662,7 +662,7 @@ static void xen_write_gdt_entry(struct desc_struct *dt, int entry,
  * Version of write_gdt_entry for use at early boot-time needed to
  * update an entry as simply as possible.
  */
-static __init void xen_write_gdt_entry_boot(struct desc_struct *dt, int entry,
+static void __init xen_write_gdt_entry_boot(struct desc_struct *dt, int entry,
                                             const void *desc, int type)
 {
         switch (type) {
@@ -933,18 +933,18 @@ static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf,
         return ret;
 }
 
-static const struct pv_info xen_info __initdata = {
+static const struct pv_info xen_info __initconst = {
         .paravirt_enabled = 1,
         .shared_kernel_pmd = 0,
 
         .name = "Xen",
 };
 
-static const struct pv_init_ops xen_init_ops __initdata = {
+static const struct pv_init_ops xen_init_ops __initconst = {
         .patch = xen_patch,
 };
 
-static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+static const struct pv_cpu_ops xen_cpu_ops __initconst = {
         .cpuid = xen_cpuid,
 
         .set_debugreg = xen_set_debugreg,
@@ -1004,7 +1004,7 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
         .end_context_switch = xen_end_context_switch,
 };
 
-static const struct pv_apic_ops xen_apic_ops __initdata = {
+static const struct pv_apic_ops xen_apic_ops __initconst = {
 #ifdef CONFIG_X86_LOCAL_APIC
         .startup_ipi_hook = paravirt_nop,
 #endif
@@ -1055,7 +1055,7 @@ int xen_panic_handler_init(void)
         return 0;
 }
 
-static const struct machine_ops __initdata xen_machine_ops = {
+static const struct machine_ops xen_machine_ops __initconst = {
         .restart = xen_restart,
         .halt = xen_machine_halt,
         .power_off = xen_machine_halt,
@@ -1332,7 +1332,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
         return NOTIFY_OK;
 }
 
-static struct notifier_block __cpuinitdata xen_hvm_cpu_notifier = {
+static struct notifier_block xen_hvm_cpu_notifier __cpuinitdata = {
         .notifier_call  = xen_hvm_cpu_notify,
 };
 
@@ -1381,7 +1381,7 @@ bool xen_hvm_need_lapic(void)
 }
 EXPORT_SYMBOL_GPL(xen_hvm_need_lapic);
 
-const __refconst struct hypervisor_x86 x86_hyper_xen_hvm = {
+const struct hypervisor_x86 x86_hyper_xen_hvm __refconst = {
         .name                   = "Xen HVM",
         .detect                 = xen_hvm_platform,
         .init_platform          = xen_hvm_guest_init,
diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c
index 6a6fe8939645..8bbb465b6f0a 100644
--- a/arch/x86/xen/irq.c
+++ b/arch/x86/xen/irq.c
@@ -113,7 +113,7 @@ static void xen_halt(void)
                 xen_safe_halt();
 }
 
-static const struct pv_irq_ops xen_irq_ops __initdata = {
+static const struct pv_irq_ops xen_irq_ops __initconst = {
         .save_fl = PV_CALLEE_SAVE(xen_save_fl),
         .restore_fl = PV_CALLEE_SAVE(xen_restore_fl),
         .irq_disable = PV_CALLEE_SAVE(xen_irq_disable),
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 0684f3c74d53..02d752460371 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1054,7 +1054,7 @@ void xen_mm_pin_all(void)
  * that's before we have page structures to store the bits.  So do all
  * the book-keeping now.
  */
-static __init int xen_mark_pinned(struct mm_struct *mm, struct page *page,
+static int __init xen_mark_pinned(struct mm_struct *mm, struct page *page,
                                   enum pt_level level)
 {
         SetPagePinned(page);
@@ -1187,7 +1187,7 @@ static void drop_other_mm_ref(void *info)
 
         active_mm = percpu_read(cpu_tlbstate.active_mm);
 
-        if (active_mm == mm)
+        if (active_mm == mm && percpu_read(cpu_tlbstate.state) != TLBSTATE_OK)
                 leave_mm(smp_processor_id());
 
         /* If this cpu still has a stale cr3 reference, then make sure
@@ -1271,7 +1271,7 @@ void xen_exit_mmap(struct mm_struct *mm)
         spin_unlock(&mm->page_table_lock);
 }
 
-static __init void xen_pagetable_setup_start(pgd_t *base)
+static void __init xen_pagetable_setup_start(pgd_t *base)
 {
 }
 
@@ -1291,7 +1291,7 @@ static __init void xen_mapping_pagetable_reserve(u64 start, u64 end)
 
 static void xen_post_allocator_init(void);
 
-static __init void xen_pagetable_setup_done(pgd_t *base)
+static void __init xen_pagetable_setup_done(pgd_t *base)
 {
         xen_setup_shared_info();
         xen_post_allocator_init();
@@ -1488,7 +1488,7 @@ static void xen_pgd_free(struct mm_struct *mm, pgd_t *pgd)
 }
 
 #ifdef CONFIG_X86_32
-static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte)
+static pte_t __init mask_rw_pte(pte_t *ptep, pte_t pte)
 {
         /* If there's an existing pte, then don't allow _PAGE_RW to be set */
         if (pte_val_ma(*ptep) & _PAGE_PRESENT)
@@ -1498,7 +1498,7 @@ static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte)
         return pte;
 }
 #else /* CONFIG_X86_64 */
-static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte)
+static pte_t __init mask_rw_pte(pte_t *ptep, pte_t pte)
 {
         unsigned long pfn = pte_pfn(pte);
 
@@ -1519,7 +1519,7 @@ static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte)
 
 /* Init-time set_pte while constructing initial pagetables, which
    doesn't allow RO pagetable pages to be remapped RW */
-static __init void xen_set_pte_init(pte_t *ptep, pte_t pte)
+static void __init xen_set_pte_init(pte_t *ptep, pte_t pte)
 {
         pte = mask_rw_pte(ptep, pte);
 
@@ -1537,7 +1537,7 @@ static void pin_pagetable_pfn(unsigned cmd, unsigned long pfn)
 
 /* Early in boot, while setting up the initial pagetable, assume
    everything is pinned. */
-static __init void xen_alloc_pte_init(struct mm_struct *mm, unsigned long pfn)
+static void __init xen_alloc_pte_init(struct mm_struct *mm, unsigned long pfn)
 {
 #ifdef CONFIG_FLATMEM
         BUG_ON(mem_map);        /* should only be used early */
@@ -1547,7 +1547,7 @@ static __init void xen_alloc_pte_init(struct mm_struct *mm, unsigned long pfn)
 }
 
 /* Used for pmd and pud */
-static __init void xen_alloc_pmd_init(struct mm_struct *mm, unsigned long pfn)
+static void __init xen_alloc_pmd_init(struct mm_struct *mm, unsigned long pfn)
 {
 #ifdef CONFIG_FLATMEM
         BUG_ON(mem_map);        /* should only be used early */
@@ -1557,13 +1557,13 @@ static __init void xen_alloc_pmd_init(struct mm_struct *mm, unsigned long pfn)
 
 /* Early release_pte assumes that all pts are pinned, since there's
    only init_mm and anything attached to that is pinned. */
-static __init void xen_release_pte_init(unsigned long pfn)
+static void __init xen_release_pte_init(unsigned long pfn)
 {
         pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, pfn);
         make_lowmem_page_readwrite(__va(PFN_PHYS(pfn)));
 }
 
-static __init void xen_release_pmd_init(unsigned long pfn)
+static void __init xen_release_pmd_init(unsigned long pfn)
 {
         make_lowmem_page_readwrite(__va(PFN_PHYS(pfn)));
 }
@@ -1689,7 +1689,7 @@ static void set_page_prot(void *addr, pgprot_t prot)
                 BUG();
 }
 
-static __init void xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn)
+static void __init xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn)
 {
         unsigned pmdidx, pteidx;
         unsigned ident_pte;
@@ -1772,7 +1772,7 @@ static void convert_pfn_mfn(void *v)
  * of the physical mapping once some sort of allocator has been set
  * up.
  */
-__init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
+pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
                                          unsigned long max_pfn)
 {
         pud_t *l3;
@@ -1843,7 +1843,7 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
 static RESERVE_BRK_ARRAY(pmd_t, initial_kernel_pmd, PTRS_PER_PMD);
 static RESERVE_BRK_ARRAY(pmd_t, swapper_kernel_pmd, PTRS_PER_PMD);
 
-static __init void xen_write_cr3_init(unsigned long cr3)
+static void __init xen_write_cr3_init(unsigned long cr3)
 {
         unsigned long pfn = PFN_DOWN(__pa(swapper_pg_dir));
 
@@ -1880,7 +1880,7 @@ static __init void xen_write_cr3_init(unsigned long cr3)
         pv_mmu_ops.write_cr3 = &xen_write_cr3;
 }
 
-__init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
+pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
                                          unsigned long max_pfn)
 {
         pmd_t *kernel_pmd;
@@ -1986,7 +1986,7 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
 #endif
 }
 
-__init void xen_ident_map_ISA(void)
+void __init xen_ident_map_ISA(void)
 {
         unsigned long pa;
 
@@ -2009,7 +2009,7 @@ __init void xen_ident_map_ISA(void)
         xen_flush_tlb();
 }
 
-static __init void xen_post_allocator_init(void)
+static void __init xen_post_allocator_init(void)
 {
 #ifdef CONFIG_XEN_DEBUG
         pv_mmu_ops.make_pte = PV_CALLEE_SAVE(xen_make_pte_debug);
@@ -2046,7 +2046,7 @@ static void xen_leave_lazy_mmu(void)
         preempt_enable();
 }
 
-static const struct pv_mmu_ops xen_mmu_ops __initdata = {
+static const struct pv_mmu_ops xen_mmu_ops __initconst = {
         .read_cr2 = xen_read_cr2,
         .write_cr2 = xen_write_cr2,
 
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
index 141eb0de8b06..58efeb9d5440 100644
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@ -522,11 +522,20 @@ static bool __init __early_alloc_p2m(unsigned long pfn)
         /* Boundary cross-over for the edges: */
         if (idx) {
                 unsigned long *p2m = extend_brk(PAGE_SIZE, PAGE_SIZE);
+                unsigned long *mid_mfn_p;
 
                 p2m_init(p2m);
 
                 p2m_top[topidx][mididx] = p2m;
 
+                /* For save/restore we need to MFN of the P2M saved */
+                
+                mid_mfn_p = p2m_top_mfn_p[topidx];
+                WARN(mid_mfn_p[mididx] != virt_to_mfn(p2m_missing),
+                        "P2M_TOP_P[%d][%d] != MFN of p2m_missing!\n",
+                        topidx, mididx);
+                mid_mfn_p[mididx] = virt_to_mfn(p2m);
+
         }
         return idx != 0;
 }
@@ -549,12 +558,29 @@ unsigned long __init set_phys_range_identity(unsigned long pfn_s,
                 pfn += P2M_MID_PER_PAGE * P2M_PER_PAGE)
         {
                 unsigned topidx = p2m_top_index(pfn);
-                if (p2m_top[topidx] == p2m_mid_missing) {
-                        unsigned long **mid = extend_brk(PAGE_SIZE, PAGE_SIZE);
+                unsigned long *mid_mfn_p;
+                unsigned long **mid;
+
+                mid = p2m_top[topidx];
+                mid_mfn_p = p2m_top_mfn_p[topidx];
+                if (mid == p2m_mid_missing) {
+                        mid = extend_brk(PAGE_SIZE, PAGE_SIZE);
 
                         p2m_mid_init(mid);
 
                         p2m_top[topidx] = mid;
+
+                        BUG_ON(mid_mfn_p != p2m_mid_missing_mfn);
+                }
+                /* And the save/restore P2M tables.. */
+                if (mid_mfn_p == p2m_mid_missing_mfn) {
+                        mid_mfn_p = extend_brk(PAGE_SIZE, PAGE_SIZE);
+                        p2m_mid_mfn_init(mid_mfn_p);
+
+                        p2m_top_mfn_p[topidx] = mid_mfn_p;
+                        p2m_top_mfn[topidx] = virt_to_mfn(mid_mfn_p);
+                        /* Note: we don't set mid_mfn_p[midix] here,
+                         * look in __early_alloc_p2m */
                 }
         }
 
@@ -650,7 +676,7 @@ static unsigned long mfn_hash(unsigned long mfn)
 }
 
 /* Add an MFN override for a particular page */
-int m2p_add_override(unsigned long mfn, struct page *page)
+int m2p_add_override(unsigned long mfn, struct page *page, bool clear_pte)
 {
         unsigned long flags;
         unsigned long pfn;
@@ -662,7 +688,6 @@ int m2p_add_override(unsigned long mfn, struct page *page)
         if (!PageHighMem(page)) {
                 address = (unsigned long)__va(pfn << PAGE_SHIFT);
                 ptep = lookup_address(address, &level);
-
                 if (WARN(ptep == NULL || level != PG_LEVEL_4K,
                                         "m2p_add_override: pfn %lx not mapped", pfn))
                         return -EINVAL;
@@ -674,18 +699,17 @@ int m2p_add_override(unsigned long mfn, struct page *page)
         if (unlikely(!set_phys_to_machine(pfn, FOREIGN_FRAME(mfn))))
                 return -ENOMEM;
 
-        if (!PageHighMem(page))
+        if (clear_pte && !PageHighMem(page))
                 /* Just zap old mapping for now */
                 pte_clear(&init_mm, address, ptep);
-
         spin_lock_irqsave(&m2p_override_lock, flags);
         list_add(&page->lru,  &m2p_overrides[mfn_hash(mfn)]);
         spin_unlock_irqrestore(&m2p_override_lock, flags);
 
         return 0;
 }
-
-int m2p_remove_override(struct page *page)
+EXPORT_SYMBOL_GPL(m2p_add_override);
+int m2p_remove_override(struct page *page, bool clear_pte)
 {
         unsigned long flags;
         unsigned long mfn;
@@ -713,7 +737,7 @@ int m2p_remove_override(struct page *page)
         spin_unlock_irqrestore(&m2p_override_lock, flags);
         set_phys_to_machine(pfn, page->index);
 
-        if (!PageHighMem(page))
+        if (clear_pte && !PageHighMem(page))
                 set_pte_at(&init_mm, address, ptep,
                                 pfn_pte(pfn, PAGE_KERNEL));
                 /* No tlb flush necessary because the caller already
@@ -721,6 +745,7 @@ int m2p_remove_override(struct page *page)
 
         return 0;
 }
+EXPORT_SYMBOL_GPL(m2p_remove_override);
 
 struct page *m2p_find_override(unsigned long mfn)
 {
diff --git a/arch/x86/xen/pci-swiotlb-xen.c b/arch/x86/xen/pci-swiotlb-xen.c
index bfd0632fe65e..b480d4207a4c 100644
--- a/arch/x86/xen/pci-swiotlb-xen.c
+++ b/arch/x86/xen/pci-swiotlb-xen.c
@@ -36,7 +36,7 @@ int __init pci_xen_swiotlb_detect(void)
 
         /* If running as PV guest, either iommu=soft, or swiotlb=force will
          * activate this IOMMU. If running as PV privileged, activate it
-         * irregardlesss.
+         * irregardless.
          */
         if ((xen_initial_domain() || swiotlb || swiotlb_force) &&
             (xen_pv_domain()))
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 90bac0aac3a5..be1a464f6d66 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -50,7 +50,7 @@ phys_addr_t xen_extra_mem_start, xen_extra_mem_size;
  */
 #define EXTRA_MEM_RATIO         (10)
 
-static __init void xen_add_extra_mem(unsigned long pages)
+static void __init xen_add_extra_mem(unsigned long pages)
 {
         unsigned long pfn;
 
@@ -166,7 +166,7 @@ static unsigned long __init xen_set_identity(const struct e820entry *list,
                 if (last > end)
                         continue;
 
-                if (entry->type == E820_RAM) {
+                if ((entry->type == E820_RAM) || (entry->type == E820_UNUSABLE)) {
                         if (start > start_pci)
                                 identity += set_phys_range_identity(
                                                 PFN_UP(start_pci), PFN_DOWN(start));
@@ -227,7 +227,11 @@ char * __init xen_memory_setup(void)
 
         memcpy(map_raw, map, sizeof(map));
         e820.nr_map = 0;
+#ifdef CONFIG_X86_32
+        xen_extra_mem_start = mem_end;
+#else
         xen_extra_mem_start = max((1ULL << 32), mem_end);
+#endif
         for (i = 0; i < memmap.nr_entries; i++) {
                 unsigned long long end;
 
@@ -336,7 +340,7 @@ static void __init fiddle_vdso(void)
 #endif
 }
 
-static __cpuinit int register_callback(unsigned type, const void *func)
+static int __cpuinit register_callback(unsigned type, const void *func)
 {
         struct callback_register callback = {
                 .type = type,
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 30612441ed99..41038c01de40 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -46,18 +46,17 @@ static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id);
 static irqreturn_t xen_call_function_single_interrupt(int irq, void *dev_id);
 
 /*
- * Reschedule call back. Nothing to do,
- * all the work is done automatically when
- * we return from the interrupt.
+ * Reschedule call back.
  */
 static irqreturn_t xen_reschedule_interrupt(int irq, void *dev_id)
 {
         inc_irq_stat(irq_resched_count);
+        scheduler_ipi();
 
         return IRQ_HANDLED;
 }
 
-static __cpuinit void cpu_bringup(void)
+static void __cpuinit cpu_bringup(void)
 {
         int cpu = smp_processor_id();
 
@@ -85,7 +84,7 @@ static __cpuinit void cpu_bringup(void)
         wmb();                  /* make sure everything is out */
 }
 
-static __cpuinit void cpu_bringup_and_idle(void)
+static void __cpuinit cpu_bringup_and_idle(void)
 {
         cpu_bringup();
         cpu_idle();
@@ -242,7 +241,7 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus)
         }
 }
 
-static __cpuinit int
+static int __cpuinit
 cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
 {
         struct vcpu_guest_context *ctxt;
@@ -486,7 +485,7 @@ static irqreturn_t xen_call_function_single_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static const struct smp_ops xen_smp_ops __initdata = {
+static const struct smp_ops xen_smp_ops __initconst = {
         .smp_prepare_boot_cpu = xen_smp_prepare_boot_cpu,
         .smp_prepare_cpus = xen_smp_prepare_cpus,
         .smp_cpus_done = xen_smp_cpus_done,
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 2e2d370a47b1..5158c505bef9 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -26,8 +26,6 @@
 
 #include "xen-ops.h"
 
-#define XEN_SHIFT 22
-
 /* Xen may fire a timer up to this many ns early */
 #define TIMER_SLOP      100000
 #define NS_PER_TICK     (1000000000LL / HZ)
@@ -211,8 +209,6 @@ static struct clocksource xen_clocksource __read_mostly = {
         .rating = 400,
         .read = xen_clocksource_get_cycles,
         .mask = ~0,
-        .mult = 1<<XEN_SHIFT,           /* time directly in nanoseconds */
-        .shift = XEN_SHIFT,
         .flags = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -439,16 +435,16 @@ void xen_timer_resume(void)
         }
 }
 
-static const struct pv_time_ops xen_time_ops __initdata = {
+static const struct pv_time_ops xen_time_ops __initconst = {
         .sched_clock = xen_clocksource_read,
 };
 
-static __init void xen_time_init(void)
+static void __init xen_time_init(void)
 {
         int cpu = smp_processor_id();
         struct timespec tp;
 
-        clocksource_register(&xen_clocksource);
+        clocksource_register_hz(&xen_clocksource, NSEC_PER_SEC);
 
         if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL) == 0) {
                 /* Successfully turned off 100Hz tick, so we have the
@@ -468,7 +464,7 @@ static __init void xen_time_init(void)
         xen_setup_cpu_clockevents();
 }
 
-__init void xen_init_time_ops(void)
+void __init xen_init_time_ops(void)
 {
         pv_time_ops = xen_time_ops;
 
@@ -490,7 +486,7 @@ static void xen_hvm_setup_cpu_clockevents(void)
         xen_setup_cpu_clockevents();
 }
 
-__init void xen_hvm_init_time_ops(void)
+void __init xen_hvm_init_time_ops(void)
 {
         /* vector callback is needed otherwise we cannot receive interrupts
          * on cpu > 0 and at this point we don't know how many cpus are
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index 3112f55638c4..97dfdc8757b3 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -74,7 +74,7 @@ static inline void xen_hvm_smp_init(void) {}
 
 #ifdef CONFIG_PARAVIRT_SPINLOCKS
 void __init xen_init_spinlocks(void);
-__cpuinit void xen_init_lock_cpu(int cpu);
+void __cpuinit xen_init_lock_cpu(int cpu);
 void xen_uninit_lock_cpu(int cpu);
 #else
 static inline void xen_init_spinlocks(void)
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig
index 42b7feba71b7..4891abbf16bc 100644
--- a/arch/xtensa/configs/s6105_defconfig
+++ b/arch/xtensa/configs/s6105_defconfig
@@ -23,7 +23,6 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
diff --git a/arch/xtensa/include/asm/page.h b/arch/xtensa/include/asm/page.h
index 161bb89e98c8..7a5591a71f85 100644
--- a/arch/xtensa/include/asm/page.h
+++ b/arch/xtensa/include/asm/page.h
@@ -171,10 +171,6 @@ extern void copy_user_page(void*, void*, unsigned long, struct page*);
 #define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
 #define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
 
-#ifdef CONFIG_MMU
-#define WANT_PAGE_VIRTUAL
-#endif
-
 #endif /* __ASSEMBLY__ */
 
 #define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_EXEC | \
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index a2820065927e..88ecea3facb4 100644
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -155,7 +155,7 @@ SECTIONS
     INIT_RAM_FS
   }
 
-  PERCPU(XCHAL_ICACHE_LINESIZE, PAGE_SIZE)
+  PERCPU_SECTION(XCHAL_ICACHE_LINESIZE)
 
   /* We need this dummy segment here */
 
diff --git a/arch/xtensa/mm/mmu.c b/arch/xtensa/mm/mmu.c
index 4bb91a970f1f..ca81654f3ec2 100644
--- a/arch/xtensa/mm/mmu.c
+++ b/arch/xtensa/mm/mmu.c
@@ -14,8 +14,6 @@
 #include <asm/mmu_context.h>
 #include <asm/page.h>
 
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-
 void __init paging_init(void)
 {
         memset(swapper_pg_dir, 0, PAGE_SIZE);
diff --git a/arch/xtensa/mm/pgtable.c b/arch/xtensa/mm/pgtable.c
deleted file mode 100644
index 697992738205..000000000000
--- a/arch/xtensa/mm/pgtable.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * arch/xtensa/mm/pgtable.c
- *
- * 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) 2001 - 2005 Tensilica Inc.
- *
- * Chris Zankel <chris@zankel.net>
- */
-
-#if (DCACHE_SIZE > PAGE_SIZE)
-
-pte_t* pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
-{
-        pte_t *pte = NULL, *p;
-        int color = ADDR_COLOR(address);
-        int i;
-
-        p = (pte_t*) __get_free_pages(GFP_KERNEL|__GFP_REPEAT, COLOR_ORDER);
-
-        if (likely(p)) {
-                split_page(virt_to_page(p), COLOR_ORDER);
-
-                for (i = 0; i < COLOR_SIZE; i++) {
-                        if (ADDR_COLOR(p) == color)
-                                pte = p;
-                        else
-                                free_page(p);
-                        p += PTRS_PER_PTE;
-                }
-                clear_page(pte);
-        }
-        return pte;
-}
-
-#ifdef PROFILING
-
-int mask;
-int hit;
-int flush;
-
-#endif
-
-struct page* pte_alloc_one(struct mm_struct *mm, unsigned long address)
-{
-        struct page *page = NULL, *p;
-        int color = ADDR_COLOR(address);
-
-        p = alloc_pages(GFP_KERNEL | __GFP_REPEAT, PTE_ORDER);
-
-        if (likely(p)) {
-                split_page(p, COLOR_ORDER);
-
-                for (i = 0; i < PAGE_ORDER; i++) {
-                        if (PADDR_COLOR(page_address(p)) == color)
-                                page = p;
-                        else
-                                __free_page(p);
-                        p++;
-                }
-                clear_highpage(page);
-        }
-
-        return page;
-}
-
-#endif
-
-
-